diff --git a/.cvsignore b/.cvsignore
index 5cb0a2e..4650dfe 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-wxGTK-2.6.3.tar.bz2
+wxGTK-2.8.0.tar.bz2
diff --git a/sources b/sources
index 00b068f..062c743 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3cd76c3c47913e52a3175dd47239c6ec wxGTK-2.6.3.tar.bz2
+9de30aeaad9bac6f8869907fa42fe950 wxGTK-2.8.0.tar.bz2
diff --git a/wxGTK-2.6.3.2-cvs.patch b/wxGTK-2.6.3.2-cvs.patch
deleted file mode 100644
index ae19d1f..0000000
--- a/wxGTK-2.6.3.2-cvs.patch
+++ /dev/null
@@ -1,16603 +0,0 @@
-diff -ur wxGTK-2.6.3/configure wxGTK-2.6.3.2/configure
---- wxGTK-2.6.3/configure 2006-03-21 18:42:05.000000000 -0500
-+++ wxGTK-2.6.3.2/configure 2006-03-30 12:05:51.000000000 -0500
-@@ -1669,7 +1669,7 @@
- wx_major_version_number=2
- wx_minor_version_number=6
- wx_release_number=3
--wx_subrelease_number=1
-+wx_subrelease_number=2
-
- WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
- WX_VERSION=$WX_RELEASE.$wx_release_number
-diff -ur wxGTK-2.6.3/configure.in wxGTK-2.6.3.2/configure.in
---- wxGTK-2.6.3/configure.in 2006-03-21 18:42:05.000000000 -0500
-+++ wxGTK-2.6.3.2/configure.in 2006-03-30 12:05:49.000000000 -0500
-@@ -1,5 +1,5 @@
- dnl Process this file with autoconf to produce a configure script.
--AC_REVISION($Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $)dnl
-+AC_REVISION($Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $)dnl
-
- dnl ---------------------------------------------------------------------------
- dnl
-@@ -8,7 +8,7 @@
- dnl
- dnl This script is under the wxWidgets licence.
- dnl
--dnl Version: $Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $
-+dnl Version: $Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $
- dnl ---------------------------------------------------------------------------
-
- dnl ---------------------------------------------------------------------------
-@@ -33,7 +33,7 @@
- wx_major_version_number=2
- wx_minor_version_number=6
- wx_release_number=3
--wx_subrelease_number=1
-+wx_subrelease_number=2
-
- WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
- WX_VERSION=$WX_RELEASE.$wx_release_number
-diff -ur wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c
---- wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c 2006-03-21 18:42:22.000000000 -0500
-+++ wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c 2005-05-04 14:57:49.000000000 -0400
-@@ -3,7 +3,7 @@
- /* Licence: wxWindows Licence */
-
- /* scanner skeleton version:
-- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
-+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
- Last change: JS 13 Jul 97 6:17 pm
- */
-
-diff -ur wxGTK-2.6.3/contrib/src/deprecated/doslex.c wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c
---- wxGTK-2.6.3/contrib/src/deprecated/doslex.c 2006-03-21 18:42:22.000000000 -0500
-+++ wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c 2005-06-09 14:37:44.000000000 -0400
-@@ -1,7 +1,7 @@
- /* A lexical scanner generated by flex */
-
- /* scanner skeleton version:
-- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
-+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
- Last change: JS 13 Jul 97 6:17 pm
- */
- /* Copyright: (c) Julian Smart */
-diff -ur wxGTK-2.6.3/include/wx/version.h wxGTK-2.6.3.2/include/wx/version.h
---- wxGTK-2.6.3/include/wx/version.h 2006-03-21 18:42:08.000000000 -0500
-+++ wxGTK-2.6.3.2/include/wx/version.h 2006-03-30 12:05:48.000000000 -0500
-@@ -4,7 +4,7 @@
- * Author: Julian Smart
- * Modified by: Ryan Norton (Converted to C)
- * Created: 29/01/98
--* RCS-ID: $Id: version.h,v 1.69.2.2 2006/01/18 10:25:00 JS Exp $
-+* RCS-ID: $Id: version.h,v 1.69.2.3 2006/03/30 17:05:48 RD Exp $
- * Copyright: (c) 1998 Julian Smart
- * Licence: wxWindows licence
- */
-@@ -22,7 +22,7 @@
- #define wxMAJOR_VERSION 2
- #define wxMINOR_VERSION 6
- #define wxRELEASE_NUMBER 3
--#define wxSUBRELEASE_NUMBER 0
-+#define wxSUBRELEASE_NUMBER 2
- #define wxVERSION_STRING _T("wxWidgets 2.6.3")
-
- /* nothing to update below this line when updating the version */
-diff -ur wxGTK-2.6.3/locale/fr.po wxGTK-2.6.3.2/locale/fr.po
---- wxGTK-2.6.3/locale/fr.po 2006-03-21 18:42:51.000000000 -0500
-+++ wxGTK-2.6.3.2/locale/fr.po 2005-09-20 11:18:55.000000000 -0400
-@@ -4,7 +4,7 @@
- msgstr ""
- "Project-Id-Version: wxWidgets-2.6.2\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2005-08-21 17:37+0200\n"
-+"POT-Creation-Date: 2005-04-11 22:24+0200\n"
- "PO-Revision-Date: 2005-09-07 09:34+0200\n"
- "Last-Translator: Thomas Huriaux <thomas.huriaux@gmail.com>\n"
- "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-@@ -13,12 +13,12 @@
- "Content-Transfer-Encoding: 8bit\n"
- "plural-forms: nplurals=2; plural=n > 1\n"
-
--#: ../src/common/debugrpt.cpp:569
-+#: ../src/common/debugrpt.cpp:547
- #, c-format
- msgid "\t%s: %s\n"
- msgstr "\t%s�: %s\n"
-
--#: ../src/common/debugrpt.cpp:572
-+#: ../src/common/debugrpt.cpp:550
- msgid ""
- "\n"
- "Please send this report to the program maintainer, thank you!\n"
-@@ -26,20 +26,20 @@
- "\n"
- "Veuillez envoyer ce rapport au responsable du programme.\n"
-
--#: ../src/palmos/utils.cpp:206
-+#: ../src/palmos/utils.cpp:210
- msgid " "
- msgstr " "
-
--#: ../src/generic/dbgrptg.cpp:312
-+#: ../src/generic/dbgrptg.cpp:293
- msgid " Thank you and we're sorry for the inconvenience!\n"
- msgstr " Merci et d�sol� pour le d�rangement.\n"
-
--#: ../src/common/log.cpp:321
-+#: ../src/common/log.cpp:322
- #, c-format
- msgid " (error %ld: %s)"
- msgstr " (erreur %ld�: %s)"
-
--#: ../src/common/docview.cpp:1419
-+#: ../src/common/docview.cpp:1380
- msgid " - "
- msgstr " - "
-
-@@ -47,23 +47,23 @@
- msgid " Preview"
- msgstr " Aper�u"
-
--#: ../src/common/paper.cpp:124
-+#: ../src/common/paper.cpp:134
- msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
- msgstr "Enveloppe n��10 (4,125 x 9,5 pouces)"
-
--#: ../src/common/paper.cpp:125
-+#: ../src/common/paper.cpp:135
- msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
- msgstr "Enveloppe n��11 (4,5 x 10,375 pouces)"
-
--#: ../src/common/paper.cpp:126
-+#: ../src/common/paper.cpp:136
- msgid "#12 Envelope, 4 3/4 x 11 in"
- msgstr "Enveloppe n��12 (4,75 x 11 pouces)"
-
--#: ../src/common/paper.cpp:127
-+#: ../src/common/paper.cpp:137
- msgid "#14 Envelope, 5 x 11 1/2 in"
- msgstr "Enveloppe n��14 (5 x 11,5 pouces)"
-
--#: ../src/common/paper.cpp:123
-+#: ../src/common/paper.cpp:133
- msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
- msgstr "Enveloppe n��9 (3,875 x 8,875 pouces)"
-
-@@ -74,13 +74,13 @@
- msgid "#define %s must be an integer."
- msgstr "#define %s doit �tre un entier."
-
--#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
--#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
-+#: ../src/html/helpfrm.cpp:1019 ../src/html/helpfrm.cpp:1021
-+#: ../src/html/helpfrm.cpp:1689 ../src/html/helpfrm.cpp:1722
- #, c-format
- msgid "%i of %i"
- msgstr "%i de %i"
-
--#: ../src/generic/filedlgg.cpp:288
-+#: ../src/generic/filedlgg.cpp:287
- #, c-format
- msgid "%ld bytes"
- msgstr "%ld octets"
-@@ -90,27 +90,27 @@
- msgid "%s (or %s)"
- msgstr "%s (ou %s)"
-
--#: ../src/generic/logg.cpp:261
-+#: ../src/generic/logg.cpp:262
- #, c-format
- msgid "%s Error"
- msgstr "%s Erreur"
-
--#: ../src/generic/logg.cpp:269
-+#: ../src/generic/logg.cpp:270
- #, c-format
- msgid "%s Information"
- msgstr "%s Information"
-
--#: ../src/generic/logg.cpp:265
-+#: ../src/generic/logg.cpp:266
- #, c-format
- msgid "%s Warning"
- msgstr "%s Avertissement"
-
--#: ../src/common/fldlgcmn.cpp:81
-+#: ../src/common/fldlgcmn.cpp:74
- #, c-format
- msgid "%s files (%s)|%s"
- msgstr "%s fichiers (%s)|%s"
-
--#: ../src/common/msgout.cpp:229
-+#: ../src/common/msgout.cpp:189
- #, c-format
- msgid "%s message"
- msgstr "%s message"
-@@ -128,11 +128,10 @@
- #: ../contrib/src/deprecated/resource.cpp:1901
- #: ../contrib/src/deprecated/resource.cpp:2030
- #: ../contrib/src/deprecated/resource.cpp:3123
--#, c-format
- msgid "%s: ill-formed resource file syntax."
- msgstr "%s�: syntaxe du fichier de ressource malform�e."
-
--#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359
-+#: ../src/html/helpfrm.cpp:341 ../src/html/helpfrm.cpp:343
- msgid "&About..."
- msgstr "� &propos..."
-
-@@ -144,7 +143,7 @@
- msgid "&Apply"
- msgstr "&Appliquer"
-
--#: ../src/msw/mdi.cpp:187
-+#: ../src/msw/mdi.cpp:190
- msgid "&Arrange Icons"
- msgstr "&Arranger les ic�nes"
-
-@@ -156,12 +155,12 @@
- msgid "&Bold"
- msgstr "&Gras"
-
--#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363
--#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:422
-+#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:356
-+#: ../src/generic/fontdlgg.cpp:375 ../src/generic/wizard.cpp:418
- msgid "&Cancel"
- msgstr "&Annuler"
-
--#: ../src/msw/mdi.cpp:183
-+#: ../src/msw/mdi.cpp:186
- msgid "&Cascade"
- msgstr "&Cascade"
-
-@@ -169,26 +168,24 @@
- msgid "&Clear"
- msgstr "&Effacer"
-
--#: ../src/common/prntbase.cpp:875 ../src/common/stockitem.cpp:112
--#: ../src/generic/logg.cpp:509 ../src/html/helpfrm.cpp:354
-+#: ../src/common/prntbase.cpp:829 ../src/common/stockitem.cpp:112
-+#: ../src/generic/logg.cpp:508 ../src/html/helpfrm.cpp:338
- msgid "&Close"
- msgstr "&Fermer"
-
--#: ../src/common/stockitem.cpp:113 ../src/mac/carbon/textctrl.cpp:1074
--#: ../src/msw/textctrl.cpp:2064
-+#: ../src/common/stockitem.cpp:113 ../src/msw/textctrl.cpp:2058
- msgid "&Copy"
- msgstr "&Copier"
-
--#: ../src/generic/dbgrptg.cpp:320
-+#: ../src/generic/dbgrptg.cpp:301
- msgid "&Debug report preview:"
- msgstr "Aper�u du rapport de &d�bogage�:"
-
--#: ../src/common/stockitem.cpp:115 ../src/mac/carbon/textctrl.cpp:1076
--#: ../src/msw/textctrl.cpp:2066
-+#: ../src/common/stockitem.cpp:115 ../src/msw/textctrl.cpp:2060
- msgid "&Delete"
- msgstr "&Supprimer"
-
--#: ../src/generic/logg.cpp:717
-+#: ../src/generic/logg.cpp:710
- msgid "&Details"
- msgstr "&D�tails"
-
-@@ -196,7 +193,7 @@
- msgid "&Down"
- msgstr "&Bas"
-
--#: ../src/html/helpfrm.cpp:361
-+#: ../src/html/helpfrm.cpp:345
- msgid "&File"
- msgstr "&Fichier"
-
-@@ -204,11 +201,11 @@
- msgid "&Find"
- msgstr "&Trouver"
-
--#: ../src/generic/wizard.cpp:634
-+#: ../src/generic/wizard.cpp:606
- msgid "&Finish"
- msgstr "&Finir"
-
--#: ../src/generic/fontdlgg.cpp:273
-+#: ../src/generic/fontdlgg.cpp:271
- msgid "&Font family:"
- msgstr "&Famille de polices�:"
-
-@@ -216,12 +213,12 @@
- msgid "&Forward"
- msgstr "&Suivant"
-
--#: ../src/common/prntbase.cpp:910
-+#: ../src/common/prntbase.cpp:864
- msgid "&Goto..."
- msgstr "&Aller �..."
-
--#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:418
--#: ../src/generic/wizard.cpp:425 ../src/html/helpfrm.cpp:362
-+#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:414
-+#: ../src/generic/wizard.cpp:421 ../src/html/helpfrm.cpp:346
- msgid "&Help"
- msgstr "&Aide"
-
-@@ -237,11 +234,11 @@
- msgid "&Italic"
- msgstr "&Italique"
-
--#: ../src/generic/logg.cpp:510
-+#: ../src/generic/logg.cpp:509
- msgid "&Log"
- msgstr "&Journal"
-
--#: ../src/univ/themes/win32.cpp:4923
-+#: ../src/univ/themes/win32.cpp:4817
- msgid "&Move"
- msgstr "&D�placer"
-
-@@ -249,15 +246,15 @@
- msgid "&New"
- msgstr "&Nouveau"
-
--#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:188
-+#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:191
- msgid "&Next"
- msgstr "&Suivant"
-
--#: ../src/generic/wizard.cpp:421 ../src/generic/wizard.cpp:636
-+#: ../src/generic/wizard.cpp:417 ../src/generic/wizard.cpp:608
- msgid "&Next >"
- msgstr "&Suivant >"
-
--#: ../src/generic/tipdlg.cpp:243
-+#: ../src/generic/tipdlg.cpp:238
- msgid "&Next Tip"
- msgstr "&Astuce suivante"
-
-@@ -265,12 +262,12 @@
- msgid "&No"
- msgstr "&Non"
-
--#: ../src/generic/dbgrptg.cpp:342
-+#: ../src/generic/dbgrptg.cpp:323
- msgid "&Notes:"
- msgstr "&Notes�:"
-
--#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368
--#: ../src/generic/fontdlgg.cpp:375
-+#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:361
-+#: ../src/generic/fontdlgg.cpp:368
- msgid "&OK"
- msgstr "&Accepter"
-
-@@ -278,16 +275,15 @@
- msgid "&Open"
- msgstr "&Ouvrir"
-
--#: ../src/html/helpfrm.cpp:352
-+#: ../src/html/helpfrm.cpp:336
- msgid "&Open..."
- msgstr "&Ouvrir..."
-
--#: ../src/common/stockitem.cpp:135 ../src/mac/carbon/textctrl.cpp:1075
--#: ../src/msw/textctrl.cpp:2065
-+#: ../src/common/stockitem.cpp:135 ../src/msw/textctrl.cpp:2059
- msgid "&Paste"
- msgstr "&Coller"
-
--#: ../src/generic/fontdlgg.cpp:324
-+#: ../src/generic/fontdlgg.cpp:318
- msgid "&Point size:"
- msgstr "Taille de &point�:"
-
-@@ -295,7 +291,7 @@
- msgid "&Preferences"
- msgstr "&Pr�f�rences"
-
--#: ../src/generic/mdig.cpp:119 ../src/msw/mdi.cpp:189
-+#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:192
- msgid "&Previous"
- msgstr "&Pr�c�dent"
-
-@@ -303,7 +299,7 @@
- msgid "&Print"
- msgstr "&Imprimer"
-
--#: ../src/common/prntbase.cpp:880
-+#: ../src/common/prntbase.cpp:834
- msgid "&Print..."
- msgstr "&Imprimer..."
-
-@@ -315,21 +311,20 @@
- msgid "&Quit"
- msgstr "&Quitter"
-
--#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299
--#: ../src/common/stockitem.cpp:141 ../src/mac/carbon/textctrl.cpp:1071
--#: ../src/msw/textctrl.cpp:2061
-+#: ../src/common/cmdproc.cpp:283 ../src/common/cmdproc.cpp:290
-+#: ../src/common/stockitem.cpp:141 ../src/msw/textctrl.cpp:2055
- msgid "&Redo"
- msgstr "&Refaire"
-
--#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308
-+#: ../src/common/cmdproc.cpp:279 ../src/common/cmdproc.cpp:299
- msgid "&Redo "
- msgstr "&Refaire "
-
--#: ../src/generic/fdrepdlg.cpp:185
-+#: ../src/generic/fdrepdlg.cpp:168
- msgid "&Replace"
- msgstr "&Remplacer"
-
--#: ../src/univ/themes/win32.cpp:4922
-+#: ../src/univ/themes/win32.cpp:4816
- msgid "&Restore"
- msgstr "&Restaurer"
-
-@@ -337,15 +332,15 @@
- msgid "&Save"
- msgstr "&Enregistrer"
-
--#: ../src/generic/logg.cpp:505
-+#: ../src/generic/logg.cpp:504
- msgid "&Save..."
- msgstr "&Enregistrer..."
-
--#: ../src/generic/tipdlg.cpp:238
-+#: ../src/generic/tipdlg.cpp:233
- msgid "&Show tips at startup"
- msgstr "&Afficher les astuces au d�marrage"
-
--#: ../src/univ/themes/win32.cpp:4925
-+#: ../src/univ/themes/win32.cpp:4819
- msgid "&Size"
- msgstr "&Taille"
-
-@@ -353,20 +348,20 @@
- msgid "&Stop"
- msgstr "&Arr�ter"
-
--#: ../src/generic/fontdlgg.cpp:284
-+#: ../src/generic/fontdlgg.cpp:282
- msgid "&Style:"
- msgstr "&Style�:"
-
--#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337
-+#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:331
- msgid "&Underline"
- msgstr "&Souligner"
-
--#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150
--#: ../src/mac/carbon/textctrl.cpp:1070 ../src/msw/textctrl.cpp:2060
-+#: ../src/common/cmdproc.cpp:261 ../src/common/stockitem.cpp:150
-+#: ../src/msw/textctrl.cpp:2054
- msgid "&Undo"
- msgstr "&Annuler"
-
--#: ../src/common/cmdproc.cpp:264
-+#: ../src/common/cmdproc.cpp:255
- msgid "&Undo "
- msgstr "&Annuler "
-
-@@ -378,13 +373,13 @@
- msgid "&Up"
- msgstr "&Haut"
-
--#: ../src/generic/fontdlgg.cpp:295
-+#: ../src/generic/fontdlgg.cpp:293
- msgid "&Weight:"
- msgstr "&Largeur�:"
-
--#: ../src/generic/mdig.cpp:298 ../src/generic/mdig.cpp:314
--#: ../src/generic/mdig.cpp:318 ../src/msw/mdi.cpp:1410 ../src/msw/mdi.cpp:1417
--#: ../src/msw/mdi.cpp:1447
-+#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
-+#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1384 ../src/msw/mdi.cpp:1391
-+#: ../src/msw/mdi.cpp:1421
- msgid "&Window"
- msgstr "&Fen�tre"
-
-@@ -392,8 +387,7 @@
- msgid "&Yes"
- msgstr "&Oui"
-
--#: ../src/common/config.cpp:433 ../src/msw/regconf.cpp:258
--#, c-format
-+#: ../src/common/config.cpp:432 ../src/msw/regconf.cpp:258
- msgid "'%s' has extra '..', ignored."
- msgstr "��%s�� a trop de ��..���: ils sont ignor�s."
-
-@@ -408,7 +402,7 @@
- msgid "'%s' is not a correct numeric value for option '%s'."
- msgstr "��%s�� n'est pas une valeur num�rique correcte pour l'option ��%s��."
-
--#: ../src/common/intl.cpp:1147
-+#: ../src/common/intl.cpp:1152
- #, c-format
- msgid "'%s' is not a valid message catalog."
- msgstr "��%s�� n'est pas un catalogue valable de messages."
-@@ -438,24 +432,24 @@
- msgid "'%s' should only contain alphabetic or numeric characters."
- msgstr "��%s�� ne doit contenir que des caract�res alphanum�riques."
-
--#: ../src/html/helpfrm.cpp:976
-+#: ../src/html/helpfrm.cpp:953
- msgid "(Help)"
- msgstr "(Aide)"
-
--#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114
--#: ../src/html/helpfrm.cpp:1764
-+#: ../src/html/helpfrm.cpp:415 ../src/html/helpfrm.cpp:1091
-+#: ../src/html/helpfrm.cpp:1750
- msgid "(bookmarks)"
- msgstr "(signets)"
-
--#: ../src/common/debugrpt.cpp:559
-+#: ../src/common/debugrpt.cpp:537
- msgid "*** A debug report has been generated\n"
- msgstr "*** Un rapport de d�bogage a �t� cr��\n"
-
--#: ../src/common/debugrpt.cpp:562
-+#: ../src/common/debugrpt.cpp:540
- msgid "*** And includes the following files:\n"
- msgstr "*** Et inclut les fichiers suivants�:\n"
-
--#: ../src/common/debugrpt.cpp:560
-+#: ../src/common/debugrpt.cpp:538
- #, c-format
- msgid "*** It can be found in \"%s\"\n"
- msgstr "*** Il peut �tre trouv� dans ��%s��\n"
-@@ -470,103 +464,83 @@
- ", static, #include ou #define\n"
- "attendu lors de l'analyse des ressources."
-
--#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:740
-+#: ../src/generic/dirctrlg.cpp:655 ../src/generic/filedlgg.cpp:739
- msgid "."
- msgstr "."
-
--#: ../src/generic/dirctrlg.cpp:684 ../src/generic/filedlgg.cpp:741
-+#: ../src/generic/dirctrlg.cpp:656 ../src/generic/filedlgg.cpp:740
- msgid ".."
- msgstr ".."
-
--#: ../src/common/paper.cpp:147
--#, fuzzy
--msgid "10 x 11 in"
--msgstr "10 x 14 pouces"
--
--#: ../src/common/paper.cpp:120
-+#: ../src/common/paper.cpp:130
- msgid "10 x 14 in"
- msgstr "10 x 14 pouces"
-
--#: ../src/common/paper.cpp:121
-+#: ../src/common/paper.cpp:131
- msgid "11 x 17 in"
- msgstr "11 x 17 pouces"
-
--#: ../src/common/paper.cpp:191
--#, fuzzy
--msgid "12 x 11 in"
--msgstr "10 x 14 pouces"
--
--#: ../src/common/paper.cpp:148
--#, fuzzy
--msgid "15 x 11 in"
--msgstr "10 x 14 pouces"
--
--#: ../src/common/paper.cpp:139
-+#: ../src/common/paper.cpp:149
- msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
- msgstr "Enveloppe 6 3/4 (3,625 x 6,5 pouces)"
-
--#: ../src/common/paper.cpp:146
--#, fuzzy
--msgid "9 x 11 in"
--msgstr "11 x 17 pouces"
--
- #: ../src/html/htmprint.cpp:309
- msgid ": file does not exist!"
- msgstr "�: le fichier n'existe pas."
-
--#: ../src/common/fontmap.cpp:200
-+#: ../src/common/fontmap.cpp:186
- msgid ": unknown charset"
- msgstr "�: jeu de caract�res inconnu"
-
--#: ../src/common/fontmap.cpp:414
-+#: ../src/common/fontmap.cpp:400
- msgid ": unknown encoding"
- msgstr "�: codage inconnu"
-
--#: ../src/generic/wizard.cpp:427
-+#: ../src/generic/wizard.cpp:423
- msgid "< &Back"
- msgstr "< &Retour"
-
--#: ../src/common/prntbase.cpp:892
-+#: ../src/common/prntbase.cpp:846
- msgid "<<"
- msgstr "<<"
-
--#: ../src/generic/filedlgg.cpp:259 ../src/generic/filedlgg.cpp:282
-+#: ../src/generic/filedlgg.cpp:258 ../src/generic/filedlgg.cpp:281
- msgid "<DIR>"
- msgstr "<R�P.>"
-
--#: ../src/generic/filedlgg.cpp:263 ../src/generic/filedlgg.cpp:286
-+#: ../src/generic/filedlgg.cpp:262 ../src/generic/filedlgg.cpp:285
- msgid "<DRIVE>"
- msgstr "<DISQUE>"
-
--#: ../src/generic/filedlgg.cpp:261 ../src/generic/filedlgg.cpp:284
-+#: ../src/generic/filedlgg.cpp:260 ../src/generic/filedlgg.cpp:283
- msgid "<LINK>"
- msgstr "<LIEN>"
-
--#: ../src/html/helpfrm.cpp:1276
-+#: ../src/html/helpfrm.cpp:1253
- msgid "<b><i>Bold italic face.</i></b><br>"
- msgstr "<b><i>Gras italique.</i></b><br>"
-
--#: ../src/html/helpfrm.cpp:1280
-+#: ../src/html/helpfrm.cpp:1257
- msgid "<b><i>bold italic <u>underlined</u></i></b><br>"
- msgstr "<b><i>gras italique <u>soulign�</u></i></b><br>"
-
--#: ../src/html/helpfrm.cpp:1275
-+#: ../src/html/helpfrm.cpp:1252
- msgid "<b>Bold face.</b> "
- msgstr "<b>Gras.</b> "
-
--#: ../src/html/helpfrm.cpp:1274
-+#: ../src/html/helpfrm.cpp:1251
- msgid "<i>Italic face.</i> "
- msgstr "<i>Italique.</i> "
-
--#: ../src/common/prntbase.cpp:898
-+#: ../src/common/prntbase.cpp:852
- msgid ">>"
- msgstr ">>"
-
--#: ../src/common/prntbase.cpp:904
-+#: ../src/common/prntbase.cpp:858
- msgid ">>|"
- msgstr ">>|"
-
--#: ../src/generic/dbgrptg.cpp:304
-+#: ../src/generic/dbgrptg.cpp:285
- msgid "A debug report has been generated in the directory\n"
- msgstr "Un rapport de d�bogage a �t� cr�� dans le dossier\n"
-
-@@ -574,90 +548,23 @@
- msgid "A non empty collection must consist of 'element' nodes"
- msgstr "Une collection non vide doit comprendre des noeuds ���l�ments��"
-
--#: ../src/common/paper.cpp:166
--msgid "A2 420 x 594 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:163
--#, fuzzy
--msgid "A3 Extra 322 x 445 mm"
--msgstr "Enveloppe C3, 324 x 458 mm"
--
--#: ../src/common/paper.cpp:168
--#, fuzzy
--msgid "A3 Extra Transverse 322 x 445 mm"
--msgstr "Enveloppe C3, 324 x 458 mm"
--
--#: ../src/common/paper.cpp:177
--#, fuzzy
--msgid "A3 Rotated 420 x 297 mm"
--msgstr "Feuille A4, 210 x 297 mm"
--
--#: ../src/common/paper.cpp:167
--#, fuzzy
--msgid "A3 Transverse 297 x 420 mm"
--msgstr "Feuille A3, 297 x 420 mm"
--
--#: ../src/common/paper.cpp:113
-+#: ../src/common/paper.cpp:123
- msgid "A3 sheet, 297 x 420 mm"
- msgstr "Feuille A3, 297 x 420 mm"
-
--#: ../src/common/paper.cpp:153
--msgid "A4 Extra 9.27 x 12.69 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:160
--#, fuzzy
--msgid "A4 Plus 210 x 330 mm"
--msgstr "Feuille A4, 210 x 297 mm"
--
--#: ../src/common/paper.cpp:178
--#, fuzzy
--msgid "A4 Rotated 297 x 210 mm"
--msgstr "Feuille A3, 297 x 420 mm"
--
--#: ../src/common/paper.cpp:155
--#, fuzzy
--msgid "A4 Transverse 210 x 297 mm"
--msgstr "Feuille A4, 210 x 297 mm"
--
--#: ../src/common/paper.cpp:104
-+#: ../src/common/paper.cpp:114
- msgid "A4 sheet, 210 x 297 mm"
- msgstr "Feuille A4, 210 x 297 mm"
-
--#: ../src/common/paper.cpp:114
-+#: ../src/common/paper.cpp:124
- msgid "A4 small sheet, 210 x 297 mm"
- msgstr "Petite feuille A4, 210 x 297 mm"
-
--#: ../src/common/paper.cpp:164
--#, fuzzy
--msgid "A5 Extra 174 x 235 mm"
--msgstr "Feuille A5, 148 x 210 mm"
--
--#: ../src/common/paper.cpp:179
--msgid "A5 Rotated 210 x 148 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:161
--#, fuzzy
--msgid "A5 Transverse 148 x 210 mm"
--msgstr "Feuille A5, 148 x 210 mm"
--
--#: ../src/common/paper.cpp:115
-+#: ../src/common/paper.cpp:125
- msgid "A5 sheet, 148 x 210 mm"
- msgstr "Feuille A5, 148 x 210 mm"
-
--#: ../src/common/paper.cpp:171
--#, fuzzy
--msgid "A6 105 x 148 mm"
--msgstr "10 x 14 pouces"
--
--#: ../src/common/paper.cpp:184
--#, fuzzy
--msgid "A6 Rotated 148 x 105 mm"
--msgstr "Feuille A5, 148 x 210 mm"
--
--#: ../src/generic/fontdlgg.cpp:87
-+#: ../src/generic/fontdlgg.cpp:85
- msgid "ABCDEFGabcdefg12345"
- msgstr "ABCDEFGabcdefg12345"
-
-@@ -669,19 +576,19 @@
- msgid "Add"
- msgstr "Ajouter"
-
--#: ../src/html/helpfrm.cpp:444
-+#: ../src/html/helpfrm.cpp:428
- msgid "Add current page to bookmarks"
- msgstr "Ajouter la page courante aux signets"
-
--#: ../src/generic/colrdlgg.cpp:299
-+#: ../src/generic/colrdlgg.cpp:297
- msgid "Add to custom colours"
- msgstr "Ajouter aux couleurs personnalis�es"
-
--#: ../include/wx/xti.h:902
-+#: ../include/wx/xti.h:900
- msgid "AddToPropertyCollection called on a generic accessor"
- msgstr "AddToPropertyCollection appel� sur un assesseur g�n�rique"
-
--#: ../include/wx/xti.h:849
-+#: ../include/wx/xti.h:847
- msgid "AddToPropertyCollection called w/o valid adder"
- msgstr "AddToPropertyCollection appel� sans additionneur valable"
-
-@@ -702,20 +609,20 @@
- msgid "All"
- msgstr "Tout"
-
--#: ../src/common/fldlgcmn.cpp:64
-+#: ../src/common/fldlgcmn.cpp:57
- #, c-format
- msgid "All files (%s)|%s"
- msgstr "Tous les fichiers (%s)|%s"
-
--#: ../include/wx/defs.h:2302
-+#: ../include/wx/defs.h:2207
- msgid "All files (*)|*"
- msgstr "Tous les fichiers (*)|*"
-
--#: ../src/html/helpfrm.cpp:1578
-+#: ../src/html/helpfrm.cpp:1564
- msgid "All files (*.*)|*"
- msgstr "Tous les fichiers (*.*)|*"
-
--#: ../include/wx/defs.h:2299
-+#: ../include/wx/defs.h:2204
- msgid "All files (*.*)|*.*"
- msgstr "Tous les fichiers (*.*)|*.*"
-
-@@ -727,12 +634,12 @@
- msgid "Already dialling ISP."
- msgstr "D�j� en cours d'appel du FAI."
-
--#: ../src/generic/logg.cpp:1163
-+#: ../src/generic/logg.cpp:1100
- #, c-format
- msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
- msgstr "Ajouter le journal au fichier ��%s�� (choisir [Non] l'�crasera)�?"
-
--#: ../src/common/fmapbase.cpp:109
-+#: ../src/common/fmapbase.cpp:108
- msgid "Arabic (ISO-8859-6)"
- msgstr "Arabe (ISO-8859-6)"
-
-@@ -740,57 +647,27 @@
- msgid "Archive doesnt contain #SYSTEM file"
- msgstr "L'archive ne contient pas de fichier #SYSTEM"
-
--#: ../src/generic/filedlgg.cpp:440
-+#: ../src/generic/filedlgg.cpp:439
- msgid "Attributes"
- msgstr "Attributs"
-
- #: ../src/common/paper.cpp:144
--#, fuzzy
--msgid "B4 (ISO) 250 x 353 mm"
--msgstr "Feuille B4, 250 x 354 mm"
--
--#: ../src/common/paper.cpp:180
--msgid "B4 (JIS) Rotated 364 x 257 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:134
- msgid "B4 Envelope, 250 x 353 mm"
- msgstr "Enveloppe B4, 250 x 353 mm"
-
--#: ../src/common/paper.cpp:116
-+#: ../src/common/paper.cpp:126
- msgid "B4 sheet, 250 x 354 mm"
- msgstr "Feuille B4, 250 x 354 mm"
-
--#: ../src/common/paper.cpp:165
--msgid "B5 (ISO) Extra 201 x 276 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:181
--msgid "B5 (JIS) Rotated 257 x 182 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:162
--#, fuzzy
--msgid "B5 (JIS) Transverse 182 x 257 mm"
--msgstr "Feuille B5, 182 x 257 mm"
--
--#: ../src/common/paper.cpp:135
-+#: ../src/common/paper.cpp:145
- msgid "B5 Envelope, 176 x 250 mm"
- msgstr "Enveloppe B5, 176 x 250 mm"
-
--#: ../src/common/paper.cpp:117
-+#: ../src/common/paper.cpp:127
- msgid "B5 sheet, 182 x 257 millimeter"
- msgstr "Feuille B5, 182 x 257 mm"
-
--#: ../src/common/paper.cpp:189
--msgid "B6 (JIS) 128 x 182 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:190
--msgid "B6 (JIS) Rotated 182 x 128 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:136
-+#: ../src/common/paper.cpp:146
- msgid "B6 Envelope, 176 x 125 mm"
- msgstr "Enveloppe B6, 176 x 125 mm"
-
-@@ -822,11 +699,11 @@
- msgid "BMP: wxImage doesn't have own wxPalette."
- msgstr "BMP�: wxImage n'a pas sa propre wxPalette."
-
--#: ../src/common/fmapbase.cpp:116
-+#: ../src/common/fmapbase.cpp:115
- msgid "Baltic (ISO-8859-13)"
- msgstr "Balte (ISO-8859-13)"
-
--#: ../src/common/fmapbase.cpp:107
-+#: ../src/common/fmapbase.cpp:106
- msgid "Baltic (old) (ISO-8859-4)"
- msgstr "Balte (ancien) (ISO-8859-4)"
-
-@@ -835,43 +712,43 @@
- msgid "Bitmap resource specification %s not found."
- msgstr "Sp�cification %s de la ressource bitmap introuvable."
-
--#: ../src/generic/fontdlgg.cpp:237
-+#: ../src/generic/fontdlgg.cpp:235
- msgid "Bold"
- msgstr "Gras"
-
--#: ../src/generic/prntdlgg.cpp:892
-+#: ../src/generic/prntdlgg.cpp:888
- msgid "Bottom margin (mm):"
- msgstr "Marge de bas de page (mm)�:"
-
--#: ../src/common/paper.cpp:105
-+#: ../src/common/paper.cpp:115
- msgid "C sheet, 17 x 22 in"
- msgstr "Feuille C, 17 x 22 mm"
-
--#: ../src/generic/logg.cpp:507
-+#: ../src/generic/logg.cpp:506
- msgid "C&lear"
- msgstr "&Effacer"
-
--#: ../src/generic/fontdlgg.cpp:308
-+#: ../src/generic/fontdlgg.cpp:306
- msgid "C&olour:"
- msgstr "C&ouleur�:"
-
--#: ../src/common/paper.cpp:130
-+#: ../src/common/paper.cpp:140
- msgid "C3 Envelope, 324 x 458 mm"
- msgstr "Enveloppe C3, 324 x 458 mm"
-
--#: ../src/common/paper.cpp:131
-+#: ../src/common/paper.cpp:141
- msgid "C4 Envelope, 229 x 324 mm"
- msgstr "Enveloppe C4, 229 x 324 mm"
-
--#: ../src/common/paper.cpp:129
-+#: ../src/common/paper.cpp:139
- msgid "C5 Envelope, 162 x 229 mm"
- msgstr "Enveloppe C5, 162 x 229 mm"
-
--#: ../src/common/paper.cpp:132
-+#: ../src/common/paper.cpp:142
- msgid "C6 Envelope, 114 x 162 mm"
- msgstr "Enveloppe C6, 114 x 162 mm"
-
--#: ../src/common/paper.cpp:133
-+#: ../src/common/paper.cpp:143
- msgid "C65 Envelope, 114 x 229 mm"
- msgstr "Enveloppe C65, 114 x 229 mm"
-
-@@ -879,11 +756,11 @@
- msgid "CHM handler currently supports only local files!"
- msgstr "Le gestionnaire CHM ne g�re actuellement que les fichiers locaux."
-
--#: ../src/os2/thread.cpp:117
-+#: ../src/os2/thread.cpp:121
- msgid "Can not create mutex."
- msgstr "Impossible de cr�er le mutex."
-
--#: ../src/common/filefn.cpp:1297
-+#: ../src/common/filefn.cpp:1262
- #, c-format
- msgid "Can not enumerate files '%s'"
- msgstr "Impossible d'�num�rer les fichiers ��%s��"
-@@ -893,12 +770,12 @@
- msgid "Can not enumerate files in directory '%s'"
- msgstr "Impossible d'�num�rer les fichiers dans le r�pertoire ��%s��"
-
--#: ../src/os2/thread.cpp:519
-+#: ../src/os2/thread.cpp:523
- #, c-format
- msgid "Can not resume thread %lu"
- msgstr "Impossible de reprendre le processus %lu"
-
--#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:827
-+#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:830
- #, c-format
- msgid "Can not resume thread %x"
- msgstr "Impossible de reprendre le processus %x"
-@@ -907,88 +784,87 @@
- msgid "Can not start thread: error writing TLS."
- msgstr "Impossible de lancer le processus�: erreur lors de l'�criture de TLS."
-
--#: ../src/os2/thread.cpp:505
-+#: ../src/os2/thread.cpp:510
- #, c-format
- msgid "Can not suspend thread %lu"
- msgstr "Impossible de suspendre le processus %lu"
-
--#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:812
--#, c-format
-+#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:815
- msgid "Can not suspend thread %x"
- msgstr "Impossible de suspendre le processus %x"
-
--#: ../src/msw/thread.cpp:725
-+#: ../src/msw/thread.cpp:728
- msgid "Can not wait for thread termination"
- msgstr "Impossible d'attendre la fin du processus"
-
--#: ../src/common/cmdproc.cpp:266
-+#: ../src/common/cmdproc.cpp:257
- msgid "Can't &Undo "
- msgstr "Impossible d'&annuler "
-
--#: ../src/common/image.cpp:1939
-+#: ../src/common/image.cpp:1550
- #, c-format
- msgid "Can't check image format of file '%s': file does not exist."
- msgstr ""
- "Impossible de v�rifier le format d'image du fichier ��%s���: le fichier "
- "n'existe pas."
-
--#: ../src/msw/registry.cpp:442
-+#: ../src/msw/registry.cpp:434
- #, c-format
- msgid "Can't close registry key '%s'"
- msgstr "Impossible de fermer la cl� de registre ��%s��"
-
--#: ../src/msw/registry.cpp:518
-+#: ../src/msw/registry.cpp:510
- #, c-format
- msgid "Can't copy values of unsupported type %d."
- msgstr "Impossible de copier les valeurs de type %d non g�r�."
-
--#: ../src/msw/registry.cpp:423
-+#: ../src/msw/registry.cpp:415
- #, c-format
- msgid "Can't create registry key '%s'"
- msgstr "Impossible de cr�er la cl� de registre ��%s��"
-
- #: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100
--#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594
--#: ../src/os2/thread.cpp:486
-+#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:593
-+#: ../src/os2/thread.cpp:491
- msgid "Can't create thread"
- msgstr "Impossible de cr�er le processus"
-
--#: ../src/msw/window.cpp:3130
-+#: ../src/msw/window.cpp:3052
- #, c-format
- msgid "Can't create window of class %s"
- msgstr "Impossible de cr�er la fen�tre de classe %s"
-
--#: ../src/msw/registry.cpp:694
-+#: ../src/msw/registry.cpp:686
- #, c-format
- msgid "Can't delete key '%s'"
- msgstr "Impossible d'effacer la cl� ��%s��"
-
--#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:458
-+#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
- #, c-format
- msgid "Can't delete the INI file '%s'"
- msgstr "Impossible d'effacer le fichier INI ��%s��"
-
--#: ../src/msw/registry.cpp:722
-+#: ../src/msw/registry.cpp:713
- #, c-format
- msgid "Can't delete value '%s' from key '%s'"
- msgstr "Impossible d'effacer la valeur ��%s�� de la cl� ��%s��"
-
--#: ../src/msw/registry.cpp:1071
-+#: ../src/msw/registry.cpp:1061
- #, c-format
- msgid "Can't enumerate subkeys of key '%s'"
- msgstr "Impossible d'�num�rer les sous-cl�s de la cl� ��%s��"
-
--#: ../src/msw/registry.cpp:1026
-+#: ../src/msw/registry.cpp:1016
- #, c-format
- msgid "Can't enumerate values of key '%s'"
- msgstr "Impossible d'�num�rer les valeurs de la cl� ��%s��"
-
--#: ../src/msw/registry.cpp:1288
-+#: ../src/msw/registry.cpp:1267
- #, c-format
- msgid "Can't export value of unsupported type %d."
- msgstr "Impossible d'exporter les valeurs de type non g�r� %d."
-
--#: ../src/common/ffile.cpp:238
-+#: ../src/common/ffile.cpp:241
- #, c-format
- msgid "Can't find current position in file '%s'"
- msgstr "Impossible de trouver la position courante dans le fichier ��%s��"
-@@ -1006,13 +882,13 @@
- msgid "Can't initialize zlib inflate stream."
- msgstr "Impossible d'initialiser le flux de chargement de zlib"
-
--#: ../src/common/image.cpp:1367 ../src/common/image.cpp:1387
-+#: ../src/common/image.cpp:1137 ../src/common/image.cpp:1157
- #, c-format
- msgid "Can't load image from file '%s': file does not exist."
- msgstr ""
- "Impossible de charger l'image du fichier ��%s���: le fichier n'existe pas."
-
--#: ../src/msw/registry.cpp:387
-+#: ../src/msw/registry.cpp:381
- #, c-format
- msgid "Can't open registry key '%s'"
- msgstr "Impossible d'ouvrir la cl� de registre ��%s��"
-@@ -1028,33 +904,33 @@
- "Impossible de lire le flux de chargement�: EOF inattendu dans le flux "
- "inf�rieur."
-
--#: ../src/msw/registry.cpp:960
-+#: ../src/msw/registry.cpp:950
- #, c-format
- msgid "Can't read value of '%s'"
- msgstr "Impossible de lire la valeur de ��%s��"
-
--#: ../src/msw/registry.cpp:795 ../src/msw/registry.cpp:825
--#: ../src/msw/registry.cpp:885
-+#: ../src/msw/registry.cpp:786 ../src/msw/registry.cpp:816
-+#: ../src/msw/registry.cpp:876
- #, c-format
- msgid "Can't read value of key '%s'"
- msgstr "Impossible de lire la valeur de la cl� ��%s��"
-
--#: ../src/common/image.cpp:1409
-+#: ../src/common/image.cpp:1179
- #, c-format
- msgid "Can't save image to file '%s': unknown extension."
- msgstr ""
- "Impossible d'enregistrer l'image dans le fichier ��%s���: extension inconnue."
-
--#: ../src/generic/logg.cpp:569 ../src/generic/logg.cpp:1020
-+#: ../src/generic/logg.cpp:568 ../src/generic/logg.cpp:976
- msgid "Can't save log contents to file."
- msgstr "Impossible d'enregistrer le contenu du journal dans le fichier."
-
--#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:469
-+#: ../src/msw/thread.cpp:549 ../src/os2/thread.cpp:473
- msgid "Can't set thread priority"
- msgstr "Impossible de sp�cifier la priorit� du processus"
-
--#: ../src/msw/registry.cpp:812 ../src/msw/registry.cpp:854
--#: ../src/msw/registry.cpp:975
-+#: ../src/msw/registry.cpp:803 ../src/msw/registry.cpp:845
-+#: ../src/msw/registry.cpp:965
- #, c-format
- msgid "Can't set value of '%s'"
- msgstr "Impossible de sp�cifier la valeur de ��%s��"
-@@ -1064,67 +940,67 @@
- msgid "Can't write to deflate stream: %s"
- msgstr "impossible d'�crire pour d�charger le flux�: %s"
-
--#: ../src/generic/choicdgg.cpp:291 ../src/generic/dirdlgg.cpp:114
--#: ../src/generic/numdlgg.cpp:136 ../src/generic/textdlgg.cpp:120
--#: ../src/gtk/fontdlg.cpp:155 ../src/motif/msgdlg.cpp:204
-+#: ../src/generic/choicdgg.cpp:285 ../src/generic/dirdlgg.cpp:116
-+#: ../src/generic/numdlgg.cpp:131 ../src/generic/textdlgg.cpp:118
-+#: ../src/gtk/fontdlg.cpp:149 ../src/motif/msgdlg.cpp:185
- #: ../contrib/src/deprecated/proplist.cpp:518
- msgid "Cancel"
- msgstr "Annuler"
-
--#: ../src/xrc/xmlres.cpp:1188 ../src/xrc/xmlres.cpp:1236
-+#: ../src/xrc/xmlres.cpp:1118 ../src/xrc/xmlres.cpp:1158
- msgid "Cannot convert dialog units: dialog unknown."
- msgstr ""
- "Impossible de convertir les unit�s de la fen�tre de dialogue�: fen�tre de "
- "dialogue inconnue."
-
--#: ../src/common/strconv.cpp:2665
-+#: ../src/common/strconv.cpp:2481
- #, c-format
- msgid "Cannot convert from the charset '%s'!"
- msgstr "Impossible de convertir depuis le jeu de caract�res ��%s��."
-
--#: ../src/msw/dialup.cpp:546
-+#: ../src/msw/dialup.cpp:509
- #, c-format
- msgid "Cannot find active dialup connection: %s"
- msgstr "Impossible de trouver une connexion active�: %s"
-
--#: ../src/xrc/xmlres.cpp:330
-+#: ../src/xrc/xmlres.cpp:269
- #, c-format
- msgid "Cannot find container for unknown control '%s'."
- msgstr "Impossible de trouver un conteneur pour le contr�le inconnu ��%s��"
-
--#: ../src/xrc/xmlres.cpp:1271
-+#: ../src/xrc/xmlres.cpp:1193
- #, c-format
- msgid "Cannot find font node '%s'."
- msgstr "Impossible de trouver le noeud de la police de caract�res ��%s��."
-
--#: ../src/msw/dialup.cpp:851
-+#: ../src/msw/dialup.cpp:814
- msgid "Cannot find the location of address book file"
- msgstr "Impossible de trouver l'emplacement du fichier du manuel des adresses"
-
--#: ../src/unix/threadpsx.cpp:1100
-+#: ../src/unix/threadpsx.cpp:1099
- #, c-format
- msgid "Cannot get priority range for scheduling policy %d."
- msgstr ""
- "Impossible d'obtenir une gamme de priorit�s pour la charte de planification %"
- "d."
-
--#: ../src/unix/utilsunx.cpp:775
-+#: ../src/unix/utilsunx.cpp:758
- msgid "Cannot get the hostname"
- msgstr "Impossible d'obtenir le nom d'h�te"
-
--#: ../src/unix/utilsunx.cpp:811
-+#: ../src/unix/utilsunx.cpp:794
- msgid "Cannot get the official hostname"
- msgstr "Impossible d'obtenir le nom d'h�te officiel"
-
--#: ../src/msw/dialup.cpp:945
-+#: ../src/msw/dialup.cpp:908
- msgid "Cannot hang up - no active dialup connection."
- msgstr "Impossible de raccrocher - pas de connexion active."
-
--#: ../include/wx/msw/ole/oleutils.h:47
-+#: ../src/msw/app.cpp:308 ../src/msw/app.cpp:311
- msgid "Cannot initialize OLE"
- msgstr "Impossible d'initialiser l'OLE"
-
--#: ../src/mgl/app.cpp:286
-+#: ../src/mgl/app.cpp:292
- msgid "Cannot initialize SciTech MGL!"
- msgstr "Impossible d'initialiser SciTech MGL."
-
-@@ -1137,7 +1013,7 @@
- msgid "Cannot load icon from '%s'."
- msgstr "Impossible de charger l'ic�ne depuis ��%s��."
-
--#: ../src/xrc/xmlres.cpp:453
-+#: ../src/xrc/xmlres.cpp:392
- #, c-format
- msgid "Cannot load resources from file '%s'."
- msgstr "Impossible de charger les ressources du fichier ��%s��."
-@@ -1152,7 +1028,7 @@
- msgid "Cannot open HTML help book: %s"
- msgstr "Impossible d'ouvrir le manuel d'aide HTML�: %s"
-
--#: ../src/generic/helpext.cpp:123
-+#: ../src/generic/helpext.cpp:122
- #, c-format
- msgid "Cannot open URL '%s'"
- msgstr "Impossible d'ouvrir le lien ��%s��"
-@@ -1162,12 +1038,12 @@
- msgid "Cannot open contents file: %s"
- msgstr "Impossible d'ouvrir le fichier de table des mati�res�: %s"
-
--#: ../src/xrc/xmlres.cpp:421
-+#: ../src/xrc/xmlres.cpp:360
- #, c-format
- msgid "Cannot open file '%s'."
- msgstr "Impossible d'ouvrir le fichier ��%s��."
-
--#: ../src/generic/dcpsg.cpp:1569
-+#: ../src/generic/dcpsg.cpp:1568
- msgid "Cannot open file for PostScript printing!"
- msgstr "Impossible d'ouvrir le fichier pour une impression PostScript."
-
-@@ -1176,22 +1052,22 @@
- msgid "Cannot open index file: %s"
- msgstr "Impossible d'ouvrir le fichier d'index�: %s"
-
--#: ../src/common/intl.cpp:1203
-+#: ../src/common/intl.cpp:1208
- #, c-format
- msgid "Cannot parse Plural-Forms:'%s'"
- msgstr "Impossible de parcourir l'en-t�te Plural-Forms�: ��%s��"
-
--#: ../src/xrc/xmlres.cpp:1172
-+#: ../src/xrc/xmlres.cpp:1108
- #, c-format
- msgid "Cannot parse coordinates from '%s'."
- msgstr "Impossible de parcourir les coordonn�es dans ��%s��."
-
--#: ../src/xrc/xmlres.cpp:1220
-+#: ../src/xrc/xmlres.cpp:1148
- #, c-format
- msgid "Cannot parse dimension from '%s'."
- msgstr "Impossible de parcourir les dimensions dans ��%s��."
-
--#: ../src/html/helpfrm.cpp:1562
-+#: ../src/html/helpfrm.cpp:1548
- msgid "Cannot print empty page."
- msgstr "Impossible d'imprimer une page vide."
-
-@@ -1200,11 +1076,11 @@
- msgid "Cannot read typename from '%s'!"
- msgstr "Impossible de lire le nom de type de ��%s��."
-
--#: ../src/unix/threadpsx.cpp:1081
-+#: ../src/unix/threadpsx.cpp:1080
- msgid "Cannot retrieve thread scheduling policy."
- msgstr "Impossible de r�cup�rer la charte de planification des processus."
-
--#: ../src/unix/threadpsx.cpp:729
-+#: ../src/unix/threadpsx.cpp:728
- msgid "Cannot start thread: error writing TLS"
- msgstr "Impossible de lancer le processus�: erreur lors de l'�criture de TLS"
-
-@@ -1216,11 +1092,11 @@
- msgid "Cant create the thread event queue"
- msgstr "Impossible de cr�er la queue d'�v�nements du processus"
-
--#: ../src/html/helpfrm.cpp:534
-+#: ../src/html/helpfrm.cpp:511
- msgid "Case sensitive"
- msgstr "Sensible � la casse"
-
--#: ../src/common/fmapbase.cpp:117
-+#: ../src/common/fmapbase.cpp:116
- msgid "Celtic (ISO-8859-14)"
- msgstr "Celtique (ISO-8859-14)"
-
-@@ -1228,92 +1104,92 @@
- msgid "Centered"
- msgstr "Centr�"
-
--#: ../src/common/fmapbase.cpp:105
-+#: ../src/common/fmapbase.cpp:104
- msgid "Central European (ISO-8859-2)"
- msgstr "Europe centrale (ISO-8859-2)"
-
--#: ../src/msw/dialup.cpp:786
-+#: ../src/msw/dialup.cpp:749
- msgid "Choose ISP to dial"
- msgstr "Choisir le FAI � appeler"
-
- #: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45
--#: ../src/palmos/colordlg.cpp:79
-+#: ../src/palmos/colordlg.cpp:76
- msgid "Choose colour"
- msgstr "Choisir la couleur"
-
--#: ../src/gtk/fontdlg.cpp:133
-+#: ../src/gtk/fontdlg.cpp:127
- msgid "Choose font"
- msgstr "Choisir la police"
-
--#: ../src/generic/mdig.cpp:115
-+#: ../src/generic/mdig.cpp:114
- msgid "Cl&ose"
- msgstr "&Fermer"
-
--#: ../src/generic/logg.cpp:507
-+#: ../src/generic/logg.cpp:506
- msgid "Clear the log contents"
- msgstr "Effacer le contenu du journal"
-
--#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384
-+#: ../src/generic/fontdlgg.cpp:358 ../src/generic/fontdlgg.cpp:377
- msgid "Click to cancel the font selection."
- msgstr "Cliquer pour annuler la s�lection de la police."
-
-+#: ../src/generic/fontdlgg.cpp:363 ../src/generic/fontdlgg.cpp:365
- #: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372
--#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379
- msgid "Click to confirm the font selection."
- msgstr "Cliquer pour confirmer la s�lection de la police."
-
--#: ../src/generic/dbgrptg.cpp:92 ../src/generic/progdlgg.cpp:629
--#: ../src/generic/progdlgg.cpp:634 ../contrib/src/deprecated/proplist.cpp:513
-+#: ../src/generic/progdlgg.cpp:624 ../src/generic/progdlgg.cpp:629
-+#: ../contrib/src/deprecated/proplist.cpp:513
- msgid "Close"
- msgstr "Fermer"
-
--#: ../src/univ/themes/win32.cpp:4931
-+#: ../src/univ/themes/win32.cpp:4825
- msgid "Close\tAlt-F4"
- msgstr "Fermer\tAlt-F4"
-
--#: ../src/generic/mdig.cpp:116
-+#: ../src/generic/mdig.cpp:115
- msgid "Close All"
- msgstr "Fermer tout"
-
--#: ../src/generic/logg.cpp:509
-+#: ../src/generic/logg.cpp:508
- msgid "Close this window"
- msgstr "Fermer cette fen�tre"
-
--#: ../src/html/helpfrm.cpp:1576
-+#: ../src/html/helpfrm.cpp:1562
- msgid "Compressed HTML Help file (*.chm)|*.chm|"
- msgstr "Fichier HTML compil� (*.chm)|*.chm|"
-
--#: ../src/generic/dirctrlg.cpp:590
-+#: ../src/generic/dirctrlg.cpp:548
- msgid "Computer"
- msgstr "L'ordinateur"
-
--#: ../src/common/fileconf.cpp:962
-+#: ../src/common/fileconf.cpp:929
- #, c-format
- msgid "Config entry name cannot start with '%c'."
- msgstr "Le nom d'entr�e de configuration ne peut pas commencer par ��%c��."
-
--#: ../src/generic/filedlgg.cpp:1318 ../src/gtk/filedlg.cpp:67
-+#: ../src/generic/filedlgg.cpp:1287 ../src/gtk/filedlg.cpp:56
- msgid "Confirm"
- msgstr "Confirmer"
-
--#: ../src/msw/mimetype.cpp:678
-+#: ../src/msw/mimetype.cpp:677
- msgid "Confirm registry update"
- msgstr "Confirmer la mise � jour du registre"
-
--#: ../src/html/htmlwin.cpp:386
-+#: ../src/html/htmlwin.cpp:381
- msgid "Connecting..."
- msgstr "Connexion en cours..."
-
--#: ../src/html/helpfrm.cpp:476
-+#: ../src/html/helpfrm.cpp:453
- msgid "Contents"
- msgstr "Table des mati�res"
-
--#: ../src/common/strconv.cpp:1416
-+#: ../src/common/strconv.cpp:1258
- #, c-format
- msgid "Conversion to charset '%s' doesn't work."
- msgstr "La conversion vers le jeu de caract�res ��%s�� ne fonctionne pas."
-
--#: ../src/html/htmlwin.cpp:824
-+#: ../src/html/htmlwin.cpp:819
- #, c-format
- msgid "Copied to clipboard:\"%s\""
- msgstr "Copi� dans le presse-papiers ��%s��"
-@@ -1338,7 +1214,7 @@
- msgid "Could not find resource include file %s."
- msgstr "Impossible de trouver le fichier de ressources inclus %s."
-
--#: ../src/generic/tabg.cpp:1048
-+#: ../src/generic/tabg.cpp:1049
- msgid "Could not find tab for id"
- msgstr "Impossible de trouver l'onglet pour l'identifiant"
-
-@@ -1367,16 +1243,16 @@
- "un entier (non nul) ou sp�cifier un #define (voir le manuel pour les mises\n"
- "en garde)"
-
--#: ../src/common/prntbase.cpp:1272
-+#: ../src/common/prntbase.cpp:1226
- msgid "Could not start document preview."
- msgstr "Impossible de lancer l'aper�u du document."
-
--#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:763
--#: ../src/msw/printwin.cpp:235
-+#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:756
-+#: ../src/msw/printwin.cpp:237
- msgid "Could not start printing."
- msgstr "Impossible de lancer l'impression."
-
--#: ../src/common/wincmn.cpp:1498
-+#: ../src/common/wincmn.cpp:1450
- msgid "Could not transfer data to window"
- msgstr "Impossible de transf�rer les donn�es � la fen�tre"
-
-@@ -1385,13 +1261,13 @@
- msgid "Could not unlock mutex"
- msgstr "Impossible de d�verrouiller le mutex"
-
--#: ../src/os2/thread.cpp:150
-+#: ../src/os2/thread.cpp:154
- msgid "Couldn't acquire a mutex lock"
- msgstr "Impossible de r�cup�rer un verrou pour le mutex"
-
- #: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
--#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176
--#: ../src/msw/imaglist.cpp:188
-+#: ../src/msw/imaglist.cpp:157 ../src/msw/imaglist.cpp:175
-+#: ../src/msw/imaglist.cpp:187
- msgid "Couldn't add an image to the image list."
- msgstr "Impossible d'ajouter une image � la liste des images."
-
-@@ -1403,12 +1279,12 @@
- msgid "Couldn't create cursor."
- msgstr "Impossible de cr�er un curseur."
-
--#: ../src/common/dynlib.cpp:199
-+#: ../src/common/dynlib.cpp:198
- #, c-format
- msgid "Couldn't find symbol '%s' in a dynamic library"
- msgstr "Impossible de trouver le symbole ��%s�� dans la biblioth�que dynamique"
-
--#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:853
-+#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:856
- msgid "Couldn't get the current thread pointer"
- msgstr "Impossible d'obtenir le pointeur du processus actuel"
-
-@@ -1433,11 +1309,11 @@
- msgid "Couldn't register clipboard format '%s'."
- msgstr "Impossible d'enregistrer le format de presse-papiers ��%s��."
-
--#: ../src/os2/thread.cpp:167
-+#: ../src/os2/thread.cpp:171
- msgid "Couldn't release a mutex"
- msgstr "Impossible de lib�rer un mutex"
-
--#: ../src/msw/listctrl.cpp:745
-+#: ../src/msw/listctrl.cpp:738
- #, c-format
- msgid "Couldn't retrieve information about list control item %d."
- msgstr ""
-@@ -1449,7 +1325,7 @@
- msgid "Couldn't save PNG image."
- msgstr "Impossible de sauvegarder l'image PNG."
-
--#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611
-+#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:610
- msgid "Couldn't terminate thread"
- msgstr "Impossible d'arr�ter le processus"
-
-@@ -1461,28 +1337,27 @@
- msgid "Create directory"
- msgstr "Cr�er le r�pertoire"
-
--#: ../src/generic/dirdlgg.cpp:140 ../src/generic/filedlgg.cpp:999
-+#: ../src/generic/dirdlgg.cpp:142 ../src/generic/filedlgg.cpp:977
- msgid "Create new directory"
- msgstr "Cr�er un nouveau r�pertoire"
-
--#: ../src/common/stockitem.cpp:114 ../src/mac/carbon/textctrl.cpp:1073
--#: ../src/msw/textctrl.cpp:2063
-+#: ../src/common/stockitem.cpp:114 ../src/msw/textctrl.cpp:2057
- msgid "Cu&t"
- msgstr "Cou&per"
-
--#: ../src/generic/filedlgg.cpp:1010
-+#: ../src/generic/filedlgg.cpp:988
- msgid "Current directory:"
- msgstr "R�pertoire courant�:"
-
--#: ../src/common/fmapbase.cpp:108
-+#: ../src/common/fmapbase.cpp:107
- msgid "Cyrillic (ISO-8859-5)"
- msgstr "Cyrillique (ISO-8859-5)"
-
--#: ../src/common/paper.cpp:106
-+#: ../src/common/paper.cpp:116
- msgid "D sheet, 22 x 34 in"
- msgstr "Feuille D, 22 x 34 mm"
-
--#: ../src/msw/dde.cpp:631
-+#: ../src/msw/dde.cpp:633
- msgid "DDE poke request failed"
- msgstr "�chec de la demande de transfert DDE"
-
-@@ -1508,11 +1383,11 @@
- msgid "DIB Header: Unknown encoding in file."
- msgstr "En-t�te DIB�: codage inconnu dans le fichier."
-
--#: ../src/common/paper.cpp:128
-+#: ../src/common/paper.cpp:138
- msgid "DL Envelope, 110 x 220 mm"
- msgstr "Enveloppe DL, 110 x 220 mm"
-
--#: ../src/generic/dbgrptg.cpp:295
-+#: ../src/generic/dbgrptg.cpp:276
- #, c-format
- msgid "Debug report \"%s\""
- msgstr "Rapport de d�bogage ��%s��"
-@@ -1521,15 +1396,15 @@
- msgid "Debug report couldn't be created."
- msgstr "�chec de la cr�ation du rapport de d�bogage."
-
--#: ../src/common/debugrpt.cpp:539
-+#: ../src/common/debugrpt.cpp:517
- msgid "Debug report generation has failed."
- msgstr "�chec de la cr�ation du rapport de d�bogage."
-
--#: ../src/generic/fontdlgg.cpp:227
-+#: ../src/generic/fontdlgg.cpp:225
- msgid "Decorative"
- msgstr "D�coratif"
-
--#: ../src/common/fmapbase.cpp:681
-+#: ../src/common/fmapbase.cpp:671
- msgid "Default encoding"
- msgstr "Codage par d�faut"
-
-@@ -1546,11 +1421,11 @@
- msgid "Deleted stale lock file '%s'."
- msgstr "Suppression du fichier verrou p�rim� ��%s��."
-
--#: ../src/generic/dirctrlg.cpp:656
-+#: ../src/generic/dirctrlg.cpp:628
- msgid "Desktop"
- msgstr "Bureau"
-
--#: ../src/msw/dialup.cpp:395
-+#: ../src/msw/dialup.cpp:358
- msgid ""
- "Dial up functions are unavailable because the remote access service (RAS) is "
- "not installed on this machine. Please install it."
-@@ -1558,16 +1433,11 @@
- "Les fonctions d'appel ne sont pas disponibles car le service d'acc�s � "
- "distance (RAS) n'est pas install� sur cet ordinateur. Veuillez l'installer."
-
--#: ../src/generic/tipdlg.cpp:246
-+#: ../src/generic/tipdlg.cpp:241
- msgid "Did you know..."
- msgstr "Saviez-vous que..."
-
--#: ../src/motif/filedlg.cpp:225
--#, fuzzy
--msgid "Directories"
--msgstr "D�coratif"
--
--#: ../src/common/filefn.cpp:1177
-+#: ../src/common/filefn.cpp:1152
- #, c-format
- msgid "Directory '%s' couldn't be created"
- msgstr "Le r�pertoire ��%s�� n'a pas pu �tre cr��"
-@@ -1581,11 +1451,11 @@
- msgid "Directory does not exist"
- msgstr "R�pertoire inexistant"
-
--#: ../src/generic/filedlgg.cpp:1295
-+#: ../src/generic/filedlgg.cpp:1264
- msgid "Directory doesn't exist."
- msgstr "R�pertoire inexistant."
-
--#: ../src/html/helpfrm.cpp:503
-+#: ../src/html/helpfrm.cpp:480
- msgid ""
- "Display all index items that contain given substring. Search is case "
- "insensitive."
-@@ -1593,11 +1463,11 @@
- "Afficher tous les �l�ments de l'index qui contiennent une sous-cha�ne "
- "donn�e. Recherche non sensible � la casse."
-
--#: ../src/html/helpfrm.cpp:685
-+#: ../src/html/helpfrm.cpp:662
- msgid "Display options dialog"
- msgstr "Dialogue d'options de l'affichage"
-
--#: ../src/msw/mimetype.cpp:671
-+#: ../src/msw/mimetype.cpp:670
- msgid ""
- "Do you want to overwrite the command used to %s files with extension \"%s"
- "\" ?\n"
-@@ -1613,37 +1483,33 @@
- "La nouvelle valeur est \n"
- "%s %1"
-
--#: ../src/common/docview.cpp:464
-+#: ../src/common/docview.cpp:444
- #, c-format
- msgid "Do you want to save changes to document %s?"
- msgstr "Voulez-vous sauvegarder les modifications dans le document %s�?"
-
--#: ../src/common/sizer.cpp:1839
-+#: ../src/common/sizer.cpp:1758
- msgid "Don't Save"
- msgstr "Ne pas enregistrer"
-
--#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211
-+#: ../src/html/htmlwin.cpp:446 ../src/msw/frame.cpp:197
- msgid "Done"
- msgstr "Fait"
-
--#: ../src/generic/progdlgg.cpp:433
-+#: ../src/generic/progdlgg.cpp:428
- msgid "Done."
- msgstr "Fait."
-
--#: ../src/common/paper.cpp:183
--msgid "Double Japanese Postcard Rotated 148 x 200 mm"
--msgstr ""
--
- #: ../src/common/xtixml.cpp:271
- #, c-format
- msgid "Doubly used id : %d"
- msgstr "Identifiant utilis� deux fois�: %d"
-
--#: ../src/generic/fdrepdlg.cpp:158
-+#: ../src/generic/fdrepdlg.cpp:151
- msgid "Down"
- msgstr "Bas"
-
--#: ../src/common/paper.cpp:107
-+#: ../src/common/paper.cpp:117
- msgid "E sheet, 34 x 44 in"
- msgstr "Feuille E (34 x 44 pouces)"
-
-@@ -1651,30 +1517,25 @@
- msgid "Edit item"
- msgstr "�diter l'�l�ment"
-
--#: ../src/generic/progdlgg.cpp:194
-+#: ../src/generic/progdlgg.cpp:192
- msgid "Elapsed time : "
- msgstr "Temps �coul�: "
-
--#: ../src/common/prntbase.cpp:846
-+#: ../src/common/prntbase.cpp:800
- #, c-format
- msgid "Enter a page number between %d and %d:"
- msgstr "Saisir un num�ro de page entre %d et %d�:"
-
--#: ../src/generic/dbgrptg.cpp:169
-+#: ../src/generic/dbgrptg.cpp:158
- #, c-format
- msgid "Enter command to open file \"%s\":"
- msgstr "Entrer la commande pour ouvrir le fichier ��%s���:"
-
--#: ../src/generic/helpext.cpp:443
-+#: ../src/generic/helpext.cpp:442
- msgid "Entries found"
- msgstr "Entr�es trouv�es"
-
--#: ../src/common/paper.cpp:149
--#, fuzzy
--msgid "Envelope Invite 220 x 220 mm"
--msgstr "Enveloppe DL, 110 x 220 mm"
--
--#: ../src/common/config.cpp:384
-+#: ../src/common/config.cpp:383
- #, c-format
- msgid ""
- "Environment variables expansion failed: missing '%c' at position %u in '%s'."
-@@ -1682,17 +1543,17 @@
- "�chec de l'expansion des variables d'environnement�: ��%c�� manquant � la "
- "position %u dans ��%s��."
-
--#: ../src/generic/dirctrlg.cpp:689 ../src/generic/dirctrlg.cpp:707
--#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
--#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:744
--#: ../src/generic/filedlgg.cpp:758 ../src/generic/filedlgg.cpp:772
--#: ../src/generic/filedlgg.cpp:1269 ../src/generic/filedlgg.cpp:1295
--#: ../src/generic/filedlgg.cpp:1325 ../src/gtk/fontdlg.cpp:81
-+#: ../src/generic/dirctrlg.cpp:661 ../src/generic/dirctrlg.cpp:679
-+#: ../src/generic/dirctrlg.cpp:690 ../src/generic/dirdlgg.cpp:342
-+#: ../src/generic/filedlgg.cpp:631 ../src/generic/filedlgg.cpp:743
-+#: ../src/generic/filedlgg.cpp:757 ../src/generic/filedlgg.cpp:771
-+#: ../src/generic/filedlgg.cpp:1239 ../src/generic/filedlgg.cpp:1264
-+#: ../src/generic/filedlgg.cpp:1294 ../src/gtk/filedlg.cpp:68
-+#: ../src/gtk/fontdlg.cpp:78
- msgid "Error"
- msgstr "Erreur"
-
--#: ../src/msdos/utilsdos.cpp:213 ../src/unix/utilsunx.cpp:1090
--#: ../src/unix/utilsunx.cpp:1098
-+#: ../src/unix/utilsunx.cpp:1073 ../src/unix/utilsunx.cpp:1081
- msgid "Error "
- msgstr "Erreur "
-
-@@ -1704,11 +1565,11 @@
- msgid "Error in reading image DIB ."
- msgstr "Erreur lors de la lecture d'une image DIB."
-
--#: ../src/common/fileconf.cpp:504
-+#: ../src/common/fileconf.cpp:501
- msgid "Error reading config options."
- msgstr "Erreur lors de la lecture des options de configuration."
-
--#: ../src/common/fileconf.cpp:1050
-+#: ../src/common/fileconf.cpp:1015
- msgid "Error saving user configuration data."
- msgstr ""
- "Erreur lors de l'enregistrement des donn�es de configuration de "
-@@ -1718,19 +1579,19 @@
- msgid "Error while waiting on semaphore"
- msgstr "Erreur lors de l'attente d'une s�maphore"
-
--#: ../src/common/log.cpp:476
-+#: ../src/common/log.cpp:477
- msgid "Error: "
- msgstr "Erreur�: "
-
--#: ../src/common/fmapbase.cpp:106
-+#: ../src/common/fmapbase.cpp:105
- msgid "Esperanto (ISO-8859-3)"
- msgstr "Esp�ranto (ISO-8859-3)"
-
--#: ../src/generic/progdlgg.cpp:202
-+#: ../src/generic/progdlgg.cpp:200
- msgid "Estimated time : "
- msgstr "Temps estim�: "
-
--#: ../src/generic/dbgrptg.cpp:229
-+#: ../src/generic/dbgrptg.cpp:211
- msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||"
- msgstr "Fichiers ex�cutables (*.exe)|*.exe|Tous les fichiers (*.*)|*.*||"
-
-@@ -1739,12 +1600,12 @@
- msgid "Execution of command '%s' failed"
- msgstr "�chec de l'ex�cution de la commande ��%s��"
-
--#: ../src/os2/utilsexc.cpp:165
-+#: ../src/os2/utilsexc.cpp:169
- #, c-format
- msgid "Execution of command '%s' failed with error: %ul"
- msgstr "�chec de l'ex�cution de la commande ��%s�� avec l'erreur�: %ul"
-
--#: ../src/common/paper.cpp:112
-+#: ../src/common/paper.cpp:122
- msgid "Executive, 7 1/4 x 10 1/2 in"
- msgstr "Executive (7,25 x 10,5 pouces)"
-
-@@ -1766,15 +1627,15 @@
- msgid "Expected 'char' while parsing resource."
- msgstr "��char�� attendu lors du parcours de la ressource."
-
--#: ../src/msw/registry.cpp:1140
-+#: ../src/msw/registry.cpp:1125
- #, c-format
- msgid ""
- "Exporting registry key: file \"%s\" already exists and won't be overwritten."
- msgstr ""
--"Exportation de la cl� de registre�: le fichier ��%s�� existe d�j� et ne sera "
--"pas �cras�."
-+"Exportation de la cl� de registre�: le fichier ��%s�� existe d�j� et ne sera pas "
-+"�cras�."
-
--#: ../src/common/fmapbase.cpp:143
-+#: ../src/common/fmapbase.cpp:141
- msgid "Extended Unix Codepage for Japanese (EUC-JP)"
- msgstr "Codepage Unix �tendu pour le japonais (EUC-JP)"
-
-@@ -1783,7 +1644,7 @@
- msgid "Extraction of '%s' into '%s' failed."
- msgstr "�chec de l'extraction de ��%s�� de ��%s��."
-
--#: ../src/msw/dialup.cpp:880
-+#: ../src/msw/dialup.cpp:843
- #, c-format
- msgid "Failed to %s dialup connection: %s"
- msgstr "N'a pas r�ussi � %s la connexion�: %s"
-@@ -1792,7 +1653,7 @@
- msgid "Failed to access lock file."
- msgstr "�chec de l'acc�s au fichier verrou."
-
--#: ../src/msw/dib.cpp:563
-+#: ../src/msw/dib.cpp:543
- #, c-format
- msgid "Failed to allocated %luKb of memory for bitmap data."
- msgstr "�chec de l'allocation de %lu�Ko de m�moire pour les donn�es bitmap."
-@@ -1815,43 +1676,43 @@
- msgid "Failed to close lock file '%s'"
- msgstr "�chec de la fermeture du fichier verrou ��%s��"
-
--#: ../src/msw/clipbrd.cpp:119
-+#: ../src/msw/clipbrd.cpp:122
- msgid "Failed to close the clipboard."
- msgstr "�chec de la fermeture du presse-papiers."
-
--#: ../src/msw/dialup.cpp:820
-+#: ../src/msw/dialup.cpp:783
- msgid "Failed to connect: missing username/password."
- msgstr "�chec de la connexion�: nom d'utilisateur ou mot de passe manquant."
-
--#: ../src/msw/dialup.cpp:766
-+#: ../src/msw/dialup.cpp:729
- msgid "Failed to connect: no ISP to dial."
- msgstr "�chec de la connexion�: pas de FAI � appeler."
-
--#: ../src/msw/registry.cpp:626
-+#: ../src/msw/registry.cpp:618
- #, c-format
- msgid "Failed to copy registry value '%s'"
- msgstr "�chec de la copie de la valeur de registre ��%s��"
-
--#: ../src/msw/registry.cpp:635
-+#: ../src/msw/registry.cpp:627
- #, c-format
- msgid "Failed to copy the contents of registry key '%s' to '%s'."
- msgstr "�chec de la copie du contenu de la cl� de registre ��%s�� vers ��%s��"
-
--#: ../src/common/filefn.cpp:1003
-+#: ../src/common/filefn.cpp:996
- #, c-format
- msgid "Failed to copy the file '%s' to '%s'"
- msgstr "�chec de la copie du fichier ��%s�� vers ��%s��"
-
--#: ../src/msw/registry.cpp:613
-+#: ../src/msw/registry.cpp:605
- #, c-format
- msgid "Failed to copy the registry subkey '%s' to '%s'."
- msgstr "�chec de la copie de la sous-cl� de registre ��%s�� vers ��%s��."
-
--#: ../src/msw/dde.cpp:989
-+#: ../src/msw/dde.cpp:988
- msgid "Failed to create DDE string"
- msgstr "�chec de la cr�ation de la cha�ne DDE"
-
--#: ../src/msw/mdi.cpp:473
-+#: ../src/msw/mdi.cpp:455
- msgid "Failed to create MDI parent frame."
- msgstr "�chec de la cr�ation du cadre parent MDI."
-
-@@ -1859,7 +1720,7 @@
- msgid "Failed to create a status bar."
- msgstr "�chec de la cr�ation d'une barre d'�tat."
-
--#: ../src/common/filename.cpp:766
-+#: ../src/common/filename.cpp:754
- msgid "Failed to create a temporary file name"
- msgstr "�chec de la cr�ation d'un nom de fichier temporaire."
-
-@@ -1867,13 +1728,13 @@
- msgid "Failed to create an anonymous pipe"
- msgstr "�chec de la cr�ation d'un tube anonyme"
-
--#: ../src/msw/dde.cpp:447
-+#: ../src/msw/dde.cpp:450
- #, c-format
- msgid "Failed to create connection to server '%s' on topic '%s'"
- msgstr ""
- "�chec de la cr�ation d'une connexion au serveur ��%s�� sur le sujet ��%s��"
-
--#: ../src/msw/cursor.cpp:218
-+#: ../src/msw/cursor.cpp:198
- msgid "Failed to create cursor."
- msgstr "�chec de la cr�ation d'un curseur."
-
-@@ -1907,7 +1768,7 @@
- msgstr ""
- "�chec de la cr�ation d'une entr�e dans le registre pour les fichiers ��%s��."
-
--#: ../src/msw/fdrepdlg.cpp:474
-+#: ../src/msw/fdrepdlg.cpp:479
- #, c-format
- msgid "Failed to create the standard find/replace dialog (error code %d)"
- msgstr ""
-@@ -1919,8 +1780,8 @@
- msgid "Failed to display HTML document in %s encoding"
- msgstr "�chec de l'affichage du document HTML avec le codage %s"
-
--#: ../src/mac/carbon/clipbrd.cpp:194 ../src/mac/classic/clipbrd.cpp:185
--#: ../src/msw/clipbrd.cpp:131
-+#: ../src/mac/carbon/clipbrd.cpp:187 ../src/mac/classic/clipbrd.cpp:185
-+#: ../src/msw/clipbrd.cpp:134
- msgid "Failed to empty the clipboard."
- msgstr "�chec du vidage du presse-papiers."
-
-@@ -1928,22 +1789,22 @@
- msgid "Failed to enumerate video modes"
- msgstr "�chec de l'�num�ration des modes vid�o"
-
--#: ../src/msw/dde.cpp:650
-+#: ../src/msw/dde.cpp:652
- msgid "Failed to establish an advise loop with DDE server"
- msgstr ""
- "�chec de l'�tablissement d'une boucle d'instructions avec le serveur DDE"
-
--#: ../src/msw/dialup.cpp:658
-+#: ../src/msw/dialup.cpp:621
- #, c-format
- msgid "Failed to establish dialup connection: %s"
- msgstr "�chec de l'�tablissement d'une connexion�: %s"
-
--#: ../src/unix/utilsunx.cpp:508 ../src/unix/utilsunx.cpp:524
-+#: ../src/unix/utilsunx.cpp:491 ../src/unix/utilsunx.cpp:507
- #, c-format
- msgid "Failed to execute '%s'\n"
- msgstr "�chec de l'ex�cution de ��%s��\n"
-
--#: ../src/common/debugrpt.cpp:666
-+#: ../src/common/debugrpt.cpp:652
- msgid "Failed to execute curl, please install it in PATH."
- msgstr "�chec de l'ex�cution de curl, veuillez l'installer dans le PATH"
-
-@@ -1974,38 +1835,47 @@
- "Ressource XPM %s introuvable.\n"
- "Avez-vous oubli� d'utiliser wxResourceLoadBitmapData�?"
-
--#: ../src/msw/dialup.cpp:718
-+#: ../src/msw/dialup.cpp:681
- #, c-format
- msgid "Failed to get ISP names: %s"
- msgstr "�chec de l'obtention des noms des FAI�: %s"
-
--#: ../src/mac/carbon/clipbrd.cpp:143 ../src/mac/classic/clipbrd.cpp:134
-+#: ../src/mac/carbon/clipbrd.cpp:136 ../src/mac/classic/clipbrd.cpp:134
- msgid "Failed to get clipboard data."
- msgstr "�chec de l'obtention des donn�es du presse-papiers."
-
--#: ../src/msw/clipbrd.cpp:723
-+#: ../src/msw/clipbrd.cpp:716
- msgid "Failed to get data from the clipboard"
- msgstr "�chec de l'obtention des donn�es du presse-papiers"
-
--#: ../src/common/stopwatch.cpp:233
-+#: ../src/msw/stackwalk.cpp:221
-+#, c-format
-+msgid ""
-+"Failed to get stack backtrace:\n"
-+"%s"
-+msgstr ""
-+"�chec de l'obtention de la pile d'appel�:\n"
-+"%s"
-+
-+#: ../src/common/stopwatch.cpp:189
- msgid "Failed to get the local system time"
- msgstr "�chec de l'obtention de l'heure locale du syst�me"
-
--#: ../src/common/filefn.cpp:1430
-+#: ../src/common/filefn.cpp:1389
- msgid "Failed to get the working directory"
- msgstr "�chec de l'obtention du r�pertoire courant"
-
- #: ../src/univ/theme.cpp:122
- msgid "Failed to initialize GUI: no built-in themes found."
- msgstr ""
--"�chec de l'initialisation de l'interface graphique�: aucun th�me pr�fabriqu� "
--"n'a �t� trouv�."
-+"�chec de l'initialisation de l'interface graphique�: aucun th�me pr�fabriqu� n'a "
-+"�t� trouv�."
-
- #: ../src/msw/helpchm.cpp:69
- msgid "Failed to initialize MS HTML Help."
- msgstr "�chec de l'initialisation de l'aide MS HTML."
-
--#: ../src/msw/glcanvas.cpp:809
-+#: ../src/msw/glcanvas.cpp:808
- msgid "Failed to initialize OpenGL"
- msgstr "�chec de l'initialisation d'OpenGL"
-
-@@ -2014,15 +1884,15 @@
- msgid "Failed to inspect the lock file '%s'"
- msgstr "�chec de l'inspection du fichier verrou ��%s��"
-
--#: ../src/unix/threadpsx.cpp:897
-+#: ../src/unix/threadpsx.cpp:896
- msgid ""
- "Failed to join a thread, potential memory leak detected - please restart the "
- "program"
- msgstr ""
--"�chec de l'adjonction d'un processus�: fuite potentielle de m�moire "
--"d�tect�e, red�marrez le programme"
-+"�chec de l'adjonction d'un processus�: fuite potentielle de m�moire d�tect�e, "
-+"red�marrez le programme"
-
--#: ../src/msw/utils.cpp:703
-+#: ../src/msw/utils.cpp:693
- #, c-format
- msgid "Failed to kill process %d"
- msgstr "�chec de l'arr�t du processus %d"
-@@ -2041,12 +1911,12 @@
- msgid "Failed to load mpr.dll."
- msgstr "�chec du chargement de mpr.dll"
-
--#: ../src/common/dynlib.cpp:133
-+#: ../src/common/dynlib.cpp:132
- #, c-format
- msgid "Failed to load shared library '%s'"
- msgstr "�chec du chargement de la biblioth�que partag�e ��%s��"
-
--#: ../src/common/dynlib.cpp:115
-+#: ../src/common/dynlib.cpp:114
- #, c-format
- msgid "Failed to load shared library '%s' Error '%s'"
- msgstr "�chec du chargement de la biblioth�que partag�e ��%s���: erreur ��%s��"
-@@ -2062,7 +1932,7 @@
- msgstr ""
- "�chec de la correspondance de ��%s�� avec l'expression rationnelle�: %s"
-
--#: ../src/common/filename.cpp:1918
-+#: ../src/common/filename.cpp:1894
- #, c-format
- msgid "Failed to modify file times for '%s'"
- msgstr "�chec de la modification de la date du fichier ��%s��"
-@@ -2077,15 +1947,15 @@
- msgid "Failed to open CHM archive '%s'."
- msgstr "�chec de l'ouverture de l'archive CHM ��%s��."
-
--#: ../src/common/filename.cpp:788
-+#: ../src/common/filename.cpp:776
- msgid "Failed to open temporary file."
- msgstr "�chec de l'ouverture d'un fichier temporaire."
-
--#: ../src/msw/clipbrd.cpp:99
-+#: ../src/msw/clipbrd.cpp:102
- msgid "Failed to open the clipboard."
- msgstr "�chec de l'ouverture du presse-papiers."
-
--#: ../src/msw/clipbrd.cpp:626
-+#: ../src/msw/clipbrd.cpp:619
- msgid "Failed to put data on the clipboard"
- msgstr "�chec de l'ajout de donn�es dans le presse-papiers"
-
-@@ -2094,7 +1964,7 @@
- msgstr ""
- "�chec de la lecture du num�ro de processus (PID) depuis le fichier verrou."
-
--#: ../src/unix/utilsunx.cpp:598
-+#: ../src/unix/utilsunx.cpp:581
- msgid "Failed to redirect child process input/output"
- msgstr "�chec de la redirection des entr�es et sorties du processus fils"
-
-@@ -2102,16 +1972,16 @@
- msgid "Failed to redirect the child process IO"
- msgstr "�chec de la redirection des entr�es et sorties du processus fils"
-
--#: ../src/msw/dde.cpp:297
-+#: ../src/msw/dde.cpp:300
- #, c-format
- msgid "Failed to register DDE server '%s'"
- msgstr "�chec de l'enregistrement du serveur DDE ��%s��"
-
--#: ../src/msw/glcanvas.cpp:363
-+#: ../src/msw/glcanvas.cpp:368
- msgid "Failed to register OpenGL window class."
- msgstr "�chec de l'enregistrement de la classe de fen�tres OpenGL."
-
--#: ../src/common/fontmap.cpp:246
-+#: ../src/common/fontmap.cpp:232
- #, c-format
- msgid "Failed to remember the encoding for the charset '%s'."
- msgstr "�chec du rappel du codage du jeu de caract�res ��%s��."
-@@ -2131,39 +2001,39 @@
- msgid "Failed to remove stale lock file '%s'."
- msgstr "�chec de la suppression du fichier verrou p�rim� ��%s��."
-
--#: ../src/msw/registry.cpp:464
-+#: ../src/msw/registry.cpp:456
- #, c-format
- msgid "Failed to rename registry value '%s' to '%s'."
- msgstr "�chec du renommage de la valeur de registre ��%s�� en ��%s��."
-
--#: ../src/msw/registry.cpp:568
-+#: ../src/msw/registry.cpp:560
- #, c-format
- msgid "Failed to rename the registry key '%s' to '%s'."
- msgstr "�chec du renommage de la cl� de registre ��%s�� en ��%s��."
-
--#: ../src/msw/clipbrd.cpp:503
-+#: ../src/msw/clipbrd.cpp:506
- msgid "Failed to retrieve data from the clipboard."
- msgstr "�chec de la r�cup�ration de donn�es du presse-papiers."
-
--#: ../src/common/filename.cpp:2011
-+#: ../src/common/filename.cpp:1984
- #, c-format
- msgid "Failed to retrieve file times for '%s'"
- msgstr "�chec de la r�cup�ration de la date du fichier ��%s��"
-
--#: ../src/msw/dialup.cpp:491
-+#: ../src/msw/dialup.cpp:454
- msgid "Failed to retrieve text of RAS error message"
- msgstr "�chec de la r�cup�ration du texte du message d'erreur RAS"
-
--#: ../src/msw/clipbrd.cpp:760
-+#: ../src/msw/clipbrd.cpp:753
- msgid "Failed to retrieve the supported clipboard formats"
- msgstr "�chec de la r�cup�ration des formats de presse-papiers g�r�s"
-
--#: ../src/msw/dib.cpp:341
-+#: ../src/msw/dib.cpp:345
- #, c-format
- msgid "Failed to save the bitmap image to file \"%s\"."
- msgstr "�chec de l'enregistrement de l'image bitmap dans le fichier ��%s��"
-
--#: ../src/msw/dde.cpp:695
-+#: ../src/msw/dde.cpp:697
- msgid "Failed to send DDE advise notification"
- msgstr "�chec de l'envoi d'une notification d'instructions au DDE"
-
-@@ -2172,7 +2042,7 @@
- msgid "Failed to set FTP transfer mode to %s."
- msgstr "�chec de la configuration du mode de transfert FTP en %s."
-
--#: ../src/msw/clipbrd.cpp:379
-+#: ../src/msw/clipbrd.cpp:382
- msgid "Failed to set clipboard data."
- msgstr "�chec de la configuration des donn�es du presse-papiers."
-
-@@ -2181,11 +2051,11 @@
- msgid "Failed to set permissions on lock file '%s'"
- msgstr "�chec de la configuration des permissions du fichier verrou ��%s��"
-
--#: ../src/common/file.cpp:523
-+#: ../src/common/file.cpp:525
- msgid "Failed to set temporary file permissions"
- msgstr "�chec de la configuration des permissions du fichier temporaire"
-
--#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256
-+#: ../src/unix/threadpsx.cpp:1244 ../src/unix/threadpsx.cpp:1255
- #, c-format
- msgid "Failed to set thread priority %d."
- msgstr "�chec de la configuration de la priorit� %d du processus."
-@@ -2196,21 +2066,21 @@
- msgstr "�chec du stockage de l'image ��%s�� dans la m�moire VFS."
-
- #: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465
--#: ../src/unix/threadpsx.cpp:1429
-+#: ../src/unix/threadpsx.cpp:1428
- msgid "Failed to terminate a thread."
- msgstr "�chec de la terminaison d'un processus."
-
--#: ../src/msw/dde.cpp:669
-+#: ../src/msw/dde.cpp:671
- msgid "Failed to terminate the advise loop with DDE server"
- msgstr ""
- "�chec de la terminaison de la boucle d'instructions avec le serveur DDE"
-
--#: ../src/msw/dialup.cpp:955
-+#: ../src/msw/dialup.cpp:916
- #, c-format
- msgid "Failed to terminate the dialup connection: %s"
- msgstr "�chec de la terminaison de la connexion�: %s"
-
--#: ../src/common/filename.cpp:1933
-+#: ../src/common/filename.cpp:1909
- #, c-format
- msgid "Failed to touch the file '%s'"
- msgstr "�chec de la mise � jour de la date du fichier ��%s��"
-@@ -2220,16 +2090,16 @@
- msgid "Failed to unlock lock file '%s'"
- msgstr "�chec du d�verrouillage du fichier verrou ��%s��"
-
--#: ../src/msw/dde.cpp:318
-+#: ../src/msw/dde.cpp:321
- #, c-format
- msgid "Failed to unregister DDE server '%s'"
- msgstr "�chec du d�senregistrement du serveur DDE ��%s��"
-
--#: ../src/common/fileconf.cpp:1023
-+#: ../src/common/fileconf.cpp:990
- msgid "Failed to update user configuration file."
- msgstr "�chec de la mise � jour du fichier de configuration utilisateur"
-
--#: ../src/common/debugrpt.cpp:679
-+#: ../src/common/debugrpt.cpp:665
- #, c-format
- msgid "Failed to upload the debug report (error code %d)."
- msgstr "�chec de l'envoi du rapport de bogue (code d'erreur %d)."
-@@ -2239,11 +2109,11 @@
- msgid "Failed to write to lock file '%s'"
- msgstr "�chec de l'�criture dans le fichier verrou ��%s��"
-
--#: ../src/generic/logg.cpp:394
-+#: ../src/generic/logg.cpp:395
- msgid "Fatal error"
- msgstr "Erreur fatale"
-
--#: ../src/common/log.cpp:465
-+#: ../src/common/log.cpp:466
- msgid "Fatal error: "
- msgstr "Erreur fatale�: "
-
-@@ -2256,12 +2126,12 @@
- msgid "File %s does not exist."
- msgstr "Fichier ��%s�� inexistant."
-
--#: ../src/generic/filedlgg.cpp:1316 ../src/gtk/filedlg.cpp:64
-+#: ../src/generic/filedlgg.cpp:1285 ../src/gtk/filedlg.cpp:53
- #, c-format
- msgid "File '%s' already exists, do you really want to overwrite it?"
- msgstr "Le fichier ��%s�� existe d�j�, voulez-vous vraiment l'�craser�?"
-
--#: ../src/os2/filedlg.cpp:310
-+#: ../src/os2/filedlg.cpp:307
- #, c-format
- msgid ""
- "File '%s' already exists.\n"
-@@ -2274,50 +2144,41 @@
- msgid "File couldn't be loaded."
- msgstr "Le fichier n'a pas pu �tre charg�."
-
--#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:1596
-+#: ../src/common/docview.cpp:551 ../src/common/docview.cpp:583
-+#: ../src/common/docview.cpp:1557
- msgid "File error"
- msgstr "Erreur fichier"
-
--#: ../src/generic/dirctrlg.cpp:707 ../src/generic/filedlgg.cpp:758
-+#: ../src/generic/dirctrlg.cpp:679 ../src/generic/filedlgg.cpp:757
- msgid "File name exists already."
- msgstr "Nom de fichier existant."
-
--#: ../src/motif/filedlg.cpp:226
--#, fuzzy
--msgid "Files"
--msgstr "Fichier"
--
--#: ../src/common/filefn.cpp:1746
-+#: ../src/common/filefn.cpp:1702
- #, c-format
- msgid "Files (%s)"
- msgstr "Fichiers (%s)"
-
--#: ../src/motif/filedlg.cpp:224
--#, fuzzy
--msgid "Filter"
--msgstr "Fichier"
--
--#: ../src/html/helpfrm.cpp:491
-+#: ../src/html/helpfrm.cpp:468
- msgid "Find"
- msgstr "Trouver"
-
--#: ../src/html/helpfrm.cpp:1219
-+#: ../src/html/helpfrm.cpp:1196
- msgid "Fixed font:"
- msgstr "Police de taille fixe�:"
-
--#: ../src/html/helpfrm.cpp:1279
-+#: ../src/html/helpfrm.cpp:1256
- msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
- msgstr "Police de taille fixe.<br> <b>gras</b> <i>italique</i> "
-
--#: ../src/common/paper.cpp:118
-+#: ../src/common/paper.cpp:128
- msgid "Folio, 8 1/2 x 13 in"
- msgstr "Folio (8,5 x 13 pouces)"
-
--#: ../src/html/helpfrm.cpp:1220
-+#: ../src/html/helpfrm.cpp:1197
- msgid "Font size:"
- msgstr "Taille de la police�:"
-
--#: ../src/unix/utilsunx.cpp:545
-+#: ../src/unix/utilsunx.cpp:528
- msgid "Fork failed"
- msgstr "�chec du clonage"
-
-@@ -2331,7 +2192,7 @@
- msgid "Found "
- msgstr "A trouv� "
-
--#: ../src/html/helpfrm.cpp:886
-+#: ../src/html/helpfrm.cpp:863
- #, c-format
- msgid "Found %i matches"
- msgstr "A trouv� %i correspondances"
-@@ -2364,55 +2225,55 @@
- msgid "GTK+ theme"
- msgstr "Th�me GTK+"
-
--#: ../src/common/prntbase.cpp:228
-+#: ../src/common/prntbase.cpp:229
- msgid "Generic PostScript"
- msgstr "Fichier PostScript"
-
--#: ../src/common/paper.cpp:142
-+#: ../src/common/paper.cpp:152
- msgid "German Legal Fanfold, 8 1/2 x 13 in"
- msgstr "L�gal allemand en accord�on (8,5 x 13 pouces)"
-
--#: ../src/common/paper.cpp:141
-+#: ../src/common/paper.cpp:151
- msgid "German Std Fanfold, 8 1/2 x 12 in"
- msgstr "Standard allemand en accord�on (8,5 x 12 pouces)"
-
--#: ../include/wx/xti.h:845
-+#: ../include/wx/xti.h:843
- msgid "GetProperty called w/o valid getter"
- msgstr "GetProperty appel� sans r�cup�rateur valable"
-
--#: ../include/wx/xti.h:906
-+#: ../include/wx/xti.h:904
- msgid "GetPropertyCollection called on a generic accessor"
- msgstr "GetPropertyCollection appel� sur un assesseur g�n�rique"
-
--#: ../include/wx/xti.h:853
-+#: ../include/wx/xti.h:851
- msgid "GetPropertyCollection called w/o valid collection getter"
- msgstr "GetPropertyCollection appel� sans r�cup�rateur de collection valable"
-
--#: ../src/html/helpfrm.cpp:651
-+#: ../src/html/helpfrm.cpp:628
- msgid "Go back"
- msgstr "Revenir"
-
--#: ../src/html/helpfrm.cpp:654
-+#: ../src/html/helpfrm.cpp:631
- msgid "Go forward"
- msgstr "Continuer"
-
--#: ../src/html/helpfrm.cpp:659
-+#: ../src/html/helpfrm.cpp:636
- msgid "Go one level up in document hierarchy"
- msgstr "Monter au niveau sup�rieur dans la hi�rarchie du document"
-
--#: ../src/generic/dirdlgg.cpp:145 ../src/generic/filedlgg.cpp:989
-+#: ../src/generic/dirdlgg.cpp:147 ../src/generic/filedlgg.cpp:967
- msgid "Go to home directory"
- msgstr "Aller au r�pertoire personnel"
-
--#: ../src/generic/filedlgg.cpp:981
-+#: ../src/generic/filedlgg.cpp:959
- msgid "Go to parent directory"
- msgstr "Aller au r�pertoire parent"
-
--#: ../src/common/prntbase.cpp:851
-+#: ../src/common/prntbase.cpp:805
- msgid "Goto Page"
- msgstr "Aller � la page"
-
--#: ../src/common/fmapbase.cpp:110
-+#: ../src/common/fmapbase.cpp:109
- msgid "Greek (ISO-8859-7)"
- msgstr "Grec (ISO-8859-7)"
-
-@@ -2420,44 +2281,45 @@
- msgid "Gzip not supported by this version of zlib"
- msgstr "Gzip n'est pas g�r� par cette version de zlib"
-
--#: ../src/html/helpfrm.cpp:1574
-+#: ../src/html/helpfrm.cpp:1560
- msgid "HTML Help Project (*.hhp)|*.hhp|"
- msgstr "Projet d'aide HTML (*.hhp)|*.hhp|"
-
--#: ../src/html/htmlwin.cpp:498
-+#: ../src/html/htmlwin.cpp:493
- #, c-format
- msgid "HTML anchor %s does not exist."
- msgstr "Ancre HTML %s inexistante."
-
--#: ../src/html/helpfrm.cpp:1572
-+#: ../src/html/helpfrm.cpp:1558
- msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
- msgstr "Fichiers HTML (*.html;*.htm)|*.html;*.htm|"
-
--#: ../src/common/fmapbase.cpp:111
-+#: ../src/common/fmapbase.cpp:110
- msgid "Hebrew (ISO-8859-8)"
- msgstr "H�breu (ISO-8859-8)"
-
--#: ../src/html/helpfrm.cpp:337 ../contrib/src/deprecated/proplist.cpp:523
-+#: ../src/generic/mdig.cpp:310 ../src/html/helpfrm.cpp:321
-+#: ../src/msw/mdi.cpp:1380 ../contrib/src/deprecated/proplist.cpp:523
- msgid "Help"
- msgstr "Aide"
-
--#: ../src/html/helpfrm.cpp:1213
-+#: ../src/html/helpfrm.cpp:1190
- msgid "Help Browser Options"
- msgstr "Aide Options Navigateur"
-
--#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443
-+#: ../src/generic/helpext.cpp:441 ../src/generic/helpext.cpp:442
- msgid "Help Index"
- msgstr "Aide Index"
-
--#: ../src/html/helpfrm.cpp:1560
-+#: ../src/html/helpfrm.cpp:1546
- msgid "Help Printing"
- msgstr "Aide Impression"
-
--#: ../src/html/helpfrm.cpp:814
-+#: ../src/html/helpfrm.cpp:791
- msgid "Help Topics"
- msgstr "Sujets Aide"
-
--#: ../src/html/helpfrm.cpp:1573
-+#: ../src/html/helpfrm.cpp:1559
- msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
- msgstr "Livres d'aide (*.htb)|*.htb|Help books (*.zip)|*.zip|"
-
-@@ -2466,15 +2328,15 @@
- msgid "Help: %s"
- msgstr "Aide�: %s"
-
--#: ../src/generic/dirdlgg.cpp:105
-+#: ../src/generic/dirdlgg.cpp:107
- msgid "Home"
- msgstr "R�pertoire personnel"
-
--#: ../src/generic/dirctrlg.cpp:654
-+#: ../src/generic/dirctrlg.cpp:626
- msgid "Home directory"
- msgstr "R�pertoire personnel"
-
--#: ../include/wx/filefn.h:145
-+#: ../include/wx/filefn.h:142
- msgid "I64"
- msgstr "I64"
-
-@@ -2523,7 +2385,7 @@
- msgid "Icon resource specification %s not found."
- msgstr "Sp�cification %s de la ressource de l'ic�ne non trouv�e."
-
--#: ../src/generic/dbgrptg.cpp:344
-+#: ../src/generic/dbgrptg.cpp:325
- msgid ""
- "If you have any additional information pertaining to this bug\n"
- "report, please enter it here and it will be joined to it:"
-@@ -2531,7 +2393,7 @@
- "Si vous avez des informations suppl�mentaires concernant ce rapport\n"
- "de bogue, veuillez les saisir ici pour qu'elles soient incluses�:"
-
--#: ../src/generic/dbgrptg.cpp:310
-+#: ../src/generic/dbgrptg.cpp:291
- msgid ""
- "If you wish to suppress this debug report completely, please choose the "
- "\"Cancel\" button,\n"
-@@ -2542,7 +2404,7 @@
- "choisir le bouton ��Annuler��, mais cela peut emp�cher l'am�lioration du\n"
- "programme, donc veuillez si possible continuer la cr�ation de ce rapport.\n"
-
--#: ../src/msw/registry.cpp:1304
-+#: ../src/msw/registry.cpp:1281
- #, c-format
- msgid "Ignoring value \"%s\" of the key \"%s\"."
- msgstr "Valeur ��%s�� de la cl� ��%s�� ignor�e."
-@@ -2556,32 +2418,32 @@
- msgstr ""
- "Classe d'objet non valable en tant que source d'�v�nement (Non-wxEvtHandler)"
-
--#: ../include/wx/xti.h:1650
-+#: ../include/wx/xti.h:1648
- msgid "Illegal Parameter Count for ConstructObject Method"
- msgstr "Nombre de param�tres ill�gal pour la m�thode ConstructObject"
-
--#: ../include/wx/xti.h:1723
-+#: ../include/wx/xti.h:1721
- msgid "Illegal Parameter Count for Create Method"
- msgstr "Nombre de param�tres ill�gal pour la m�thode Create"
-
--#: ../src/generic/dirctrlg.cpp:689 ../src/generic/filedlgg.cpp:744
-+#: ../src/generic/dirctrlg.cpp:661 ../src/generic/filedlgg.cpp:743
- msgid "Illegal directory name."
- msgstr "Nom de r�pertoire ill�gal."
-
--#: ../src/generic/filedlgg.cpp:1269
-+#: ../src/generic/filedlgg.cpp:1239
- msgid "Illegal file specification."
- msgstr "Sp�cification de fichier ill�gale."
-
--#: ../src/common/image.cpp:1192
-+#: ../src/common/image.cpp:969
- msgid "Image and mask have different sizes."
- msgstr "L'image et le masque sont de tailles diff�rentes."
-
--#: ../src/common/image.cpp:1523
-+#: ../src/common/image.cpp:1289
- #, c-format
- msgid "Image file is not of type %d."
- msgstr "Le fichier image n'est pas du type %d."
-
--#: ../src/msw/textctrl.cpp:361
-+#: ../src/msw/textctrl.cpp:330
- msgid ""
- "Impossible to create a rich edit control, using simple text control instead. "
- "Please reinstall riched32.dll"
-@@ -2589,21 +2451,21 @@
- "Impossible de cr�er un contr�le d'�dition riche, va utiliser un contr�le de "
- "texte simple � la place. Veuillez r�installer riched32.dll"
-
--#: ../src/unix/utilsunx.cpp:428
-+#: ../src/unix/utilsunx.cpp:411
- msgid "Impossible to get child process input"
- msgstr "Impossible d'obtenir l'entr�e du processus fils"
-
--#: ../src/common/filefn.cpp:1022
-+#: ../src/common/filefn.cpp:1012
- #, c-format
- msgid "Impossible to get permissions for file '%s'"
- msgstr "Impossible d'obtenir les permissions du fichier ��%s��"
-
--#: ../src/common/filefn.cpp:1036
-+#: ../src/common/filefn.cpp:1026
- #, c-format
- msgid "Impossible to overwrite the file '%s'"
- msgstr "Impossible d'�craser le fichier ��%s��"
-
--#: ../src/common/filefn.cpp:1080
-+#: ../src/common/filefn.cpp:1070
- #, c-format
- msgid "Impossible to set permissions for the file '%s'"
- msgstr "Impossible de configurer les permissions du fichier ��%s��"
-@@ -2612,27 +2474,23 @@
- msgid "Indent"
- msgstr "Indenter"
-
--#: ../src/html/helpfrm.cpp:516
-+#: ../src/html/helpfrm.cpp:493
- msgid "Index"
- msgstr "Index"
-
--#: ../src/common/fmapbase.cpp:115
-+#: ../src/common/fmapbase.cpp:114
- msgid "Indian (ISO-8859-12)"
- msgstr "Indien (ISO-8859-12)"
-
--#: ../src/common/init.cpp:232
--msgid "Initialization failed in post init, aborting."
--msgstr ""
--
- #: ../src/common/xtistrm.cpp:704
- msgid "Internal error, illegal wxCustomTypeInfo"
- msgstr "Erreur interne�: wxCustomTypeInfo ill�gal"
-
--#: ../src/common/imagtiff.cpp:227
-+#: ../src/common/imagtiff.cpp:211
- msgid "Invalid TIFF image index."
- msgstr "Index d'image TIFF non valable."
-
--#: ../src/xrc/xmlres.cpp:460
-+#: ../src/xrc/xmlres.cpp:399
- #, c-format
- msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
- msgstr ""
-@@ -2666,11 +2524,11 @@
- msgid "Invalid regular expression '%s': %s"
- msgstr "Expression rationnelle ��%s�� non valable�: %s"
-
--#: ../src/generic/fontdlgg.cpp:233
-+#: ../src/generic/fontdlgg.cpp:231
- msgid "Italic"
- msgstr "Italique"
-
--#: ../src/common/paper.cpp:137
-+#: ../src/common/paper.cpp:147
- msgid "Italy Envelope, 110 x 230 mm"
- msgstr "Enveloppe italienne, 110 x 230 mm"
-
-@@ -2682,124 +2540,43 @@
- msgid "JPEG: Couldn't save image."
- msgstr "JPEG�: �chec de la sauvegarde de l'image."
-
--#: ../src/common/paper.cpp:170
--msgid "Japanese Double Postcard 200 x 148 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:174
--msgid "Japanese Envelope Chou #3"
--msgstr ""
--
--#: ../src/common/paper.cpp:187
--msgid "Japanese Envelope Chou #3 Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:175
--msgid "Japanese Envelope Chou #4"
--msgstr ""
--
--#: ../src/common/paper.cpp:188
--msgid "Japanese Envelope Chou #4 Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:172
--msgid "Japanese Envelope Kaku #2"
--msgstr ""
--
--#: ../src/common/paper.cpp:185
--msgid "Japanese Envelope Kaku #2 Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:173
--msgid "Japanese Envelope Kaku #3"
--msgstr ""
--
--#: ../src/common/paper.cpp:186
--msgid "Japanese Envelope Kaku #3 Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:192
--msgid "Japanese Envelope You #4"
--msgstr ""
--
--#: ../src/common/paper.cpp:193
--msgid "Japanese Envelope You #4 Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:145
--msgid "Japanese Postcard 100 x 148 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:182
--msgid "Japanese Postcard Rotated 148 x 100 mm"
--msgstr ""
--
- #: ../src/common/stockitem.cpp:128
- msgid "Justified"
- msgstr "Justifi�"
-
--#: ../src/common/fmapbase.cpp:119
-+#: ../src/common/fmapbase.cpp:118
- msgid "KOI8-R"
- msgstr "KOI8-R"
-
--#: ../src/common/fmapbase.cpp:120
-+#: ../src/common/fmapbase.cpp:119
- msgid "KOI8-U"
- msgstr "KOI8-U"
-
--#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867
-+#: ../src/generic/prntdlgg.cpp:605 ../src/generic/prntdlgg.cpp:863
- msgid "Landscape"
- msgstr "Paysage"
-
--#: ../src/common/paper.cpp:110
-+#: ../src/common/paper.cpp:120
- msgid "Ledger, 17 x 11 in"
- msgstr "Grand livre (17 x 11 pouces)"
-
--#: ../src/generic/prntdlgg.cpp:879
-+#: ../src/generic/prntdlgg.cpp:875
- msgid "Left margin (mm):"
- msgstr "Marge gauche (mm)�:"
-
--#: ../src/common/paper.cpp:151
--#, fuzzy
--msgid "Legal Extra 9 1/2 x 15 in"
--msgstr "L�gal (8,5 x 14 pouces)"
--
--#: ../src/common/paper.cpp:103
-+#: ../src/common/paper.cpp:113
- msgid "Legal, 8 1/2 x 14 in"
- msgstr "L�gal (8,5 x 14 pouces)"
-
--#: ../src/common/paper.cpp:150
--#, fuzzy
--msgid "Letter Extra 9 1/2 x 12 in"
--msgstr "Lettre (8,5 x 11 pouces)"
--
--#: ../src/common/paper.cpp:156
--msgid "Letter Extra Transverse 9.275 x 12 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:159
--#, fuzzy
--msgid "Letter Plus 8 1/2 x 12.69 in"
--msgstr "Lettre (8,5 x 11 pouces)"
--
--#: ../src/common/paper.cpp:176
--#, fuzzy
--msgid "Letter Rotated 11 x 8 1/2 in"
--msgstr "Lettre (8,5 x 11 pouces)"
--
--#: ../src/common/paper.cpp:108
-+#: ../src/common/paper.cpp:118
- msgid "Letter Small, 8 1/2 x 11 in"
- msgstr "Lettre r�duite (8,5 x 11 pouces)"
-
--#: ../src/common/paper.cpp:154
--#, fuzzy
--msgid "Letter Transverse 8 1/2 x 11 in"
--msgstr "Lettre (8,5 x 11 pouces)"
--
--#: ../src/common/paper.cpp:102
-+#: ../src/common/paper.cpp:112
- msgid "Letter, 8 1/2 x 11 in"
- msgstr "Lettre (8,5 x 11 pouces)"
-
--#: ../src/generic/fontdlgg.cpp:236
-+#: ../src/generic/fontdlgg.cpp:234
- msgid "Light"
- msgstr "L�ger"
-
-@@ -2807,15 +2584,27 @@
- msgid "Link contained '//', converted to absolute link."
- msgstr "Le lien contenait ��//�� et a �t� converti en lien absolu."
-
--#: ../src/common/fldlgcmn.cpp:257
-+#: ../src/common/fldlgcmn.cpp:248
- #, c-format
- msgid "Load %s file"
- msgstr "Charger le fichier %s"
-
--#: ../src/html/htmlwin.cpp:416
-+#: ../src/html/htmlwin.cpp:411
- msgid "Loading : "
- msgstr "Chargement�: "
-
-+#: ../src/common/imagpnm.cpp:72
-+msgid "Loading Grey Ascii PNM image is not yet implemented."
-+msgstr ""
-+"Le chargement d'une image PNM ASCII en niveau de gris n'est pas encore "
-+"impl�ment�."
-+
-+#: ../src/common/imagpnm.cpp:75
-+msgid "Loading Grey Raw PNM image is not yet implemented."
-+msgstr ""
-+"Le chargement d'une image PNM source en niveau de gris n'est pas encore "
-+"impl�ment�."
-+
- #: ../src/unix/snglinst.cpp:251
- #, c-format
- msgid "Lock file '%s' has incorrect owner."
-@@ -2826,16 +2615,16 @@
- msgid "Lock file '%s' has incorrect permissions."
- msgstr "Le fichier verrou ��%s�� a des permissions incorrectes."
-
--#: ../src/generic/logg.cpp:572
-+#: ../src/generic/logg.cpp:571
- #, c-format
- msgid "Log saved to the file '%s'."
- msgstr "Journal sauv� dans le fichier ��%s��."
-
--#: ../include/wx/xti.h:501 ../include/wx/xti.h:505
-+#: ../include/wx/xti.h:500 ../include/wx/xti.h:504
- msgid "Long Conversions not supported"
- msgstr "Conversions longues non g�r�es"
-
--#: ../src/gtk/mdi.cpp:465
-+#: ../src/gtk/mdi.cpp:461
- msgid "MDI child"
- msgstr "Fils MDI"
-
-@@ -2851,7 +2640,7 @@
- "Les fonctions de l'aide MS HTML ne sont pas disponibles car la biblioth�que "
- "MS HTML Help n'est pas pr�sente sur cette machine. Veuillez l'installer."
-
--#: ../src/univ/themes/win32.cpp:4929
-+#: ../src/univ/themes/win32.cpp:4823
- msgid "Ma&ximize"
- msgstr "Ma&ximiser"
-
-@@ -2860,7 +2649,7 @@
- msgid "Mailcap file %s, line %d: incomplete entry ignored."
- msgstr "Fichier mailcap %s, ligne %d�: entr�e incompl�te ignor�e."
-
--#: ../src/generic/fdrepdlg.cpp:153
-+#: ../src/generic/fdrepdlg.cpp:146
- msgid "Match case"
- msgstr "Respecter la casse"
-
-@@ -2869,7 +2658,7 @@
- msgid "Memory VFS already contains file '%s'!"
- msgstr "La m�moire VFS contient d�j� le fichier ��%s��."
-
--#: ../src/msw/frame.cpp:374
-+#: ../src/msw/frame.cpp:345
- msgid "Menu"
- msgstr "Menu"
-
-@@ -2877,7 +2666,7 @@
- msgid "Metal theme"
- msgstr "Th�me m�tallique"
-
--#: ../src/univ/themes/win32.cpp:4927
-+#: ../src/univ/themes/win32.cpp:4821
- msgid "Mi&nimize"
- msgstr "Mi&nimiser"
-
-@@ -2892,20 +2681,15 @@
- msgid "Mode %ix%i-%i not available."
- msgstr "Le mode %ix%i-%i n'est pas disponible."
-
--#: ../src/generic/fontdlgg.cpp:228
-+#: ../src/generic/fontdlgg.cpp:226
- msgid "Modern"
- msgstr "Moderne"
-
--#: ../src/generic/filedlgg.cpp:434
-+#: ../src/generic/filedlgg.cpp:433
- msgid "Modified"
- msgstr "Modifi�"
-
--#: ../src/common/module.cpp:77
--#, c-format
--msgid "Module \"%s\" initialization failed"
--msgstr ""
--
--#: ../src/common/paper.cpp:138
-+#: ../src/common/paper.cpp:148
- msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
- msgstr "Enveloppe monarchique (3,875 x 7,5 pouces)"
-
-@@ -2917,11 +2701,11 @@
- msgid "Move up"
- msgstr "Monter"
-
--#: ../src/generic/filedlgg.cpp:431
-+#: ../src/generic/filedlgg.cpp:430
- msgid "Name"
- msgstr "Nom"
-
--#: ../src/generic/dirdlgg.cpp:109
-+#: ../src/generic/dirdlgg.cpp:111
- msgid "New directory"
- msgstr "Nouveau r�pertoire"
-
-@@ -2930,21 +2714,21 @@
- msgstr "Nouvel �l�ment"
-
- #: ../src/generic/dirdlgg.cpp:316 ../src/generic/dirdlgg.cpp:326
--#: ../src/generic/filedlgg.cpp:608 ../src/generic/filedlgg.cpp:617
-+#: ../src/generic/filedlgg.cpp:607 ../src/generic/filedlgg.cpp:616
- msgid "NewName"
- msgstr "NouveauNom"
-
--#: ../src/generic/tipdlg.cpp:305
-+#: ../src/generic/tipdlg.cpp:295
- msgid "Next"
- msgstr "Suivant"
-
--#: ../src/html/helpfrm.cpp:665
-+#: ../src/html/helpfrm.cpp:642
- msgid "Next page"
- msgstr "Page suivante"
-
- #: ../src/mac/carbon/msgdlg.cpp:58 ../src/mac/carbon/msgdlg.cpp:143
- #: ../src/mac/classic/msgdlg.cpp:56 ../src/mac/classic/msgdlg.cpp:140
--#: ../src/motif/msgdlg.cpp:204
-+#: ../src/motif/msgdlg.cpp:185
- msgid "No"
- msgstr "Non"
-
-@@ -2957,11 +2741,11 @@
- msgid "No XPM icon facility available!"
- msgstr "Aucune fonctionnalit� disponible pour les ic�nes XPM."
-
--#: ../src/generic/helpext.cpp:437
-+#: ../src/generic/helpext.cpp:436
- msgid "No entries found."
- msgstr "Aucune entr�e trouv�e."
-
--#: ../src/common/fontmap.cpp:422
-+#: ../src/common/fontmap.cpp:408
- #, c-format
- msgid ""
- "No font for displaying text in encoding '%s' found,\n"
-@@ -2973,7 +2757,7 @@
- "mais le codage similaire ��%s�� est disponible.\n"
- "Souhaitez-vous l'utiliser (sinon, vous devrez en choisir un autre)�?"
-
--#: ../src/common/fontmap.cpp:427
-+#: ../src/common/fontmap.cpp:413
- #, c-format
- msgid ""
- "No font for displaying text in encoding '%s' found.\n"
-@@ -2984,28 +2768,28 @@
- "Souhaitez-vous choisir une police � utiliser pour ce codage\n"
- "(sinon le texte avec ce codage n'appara�tra pas correctement)�?"
-
--#: ../src/xrc/xmlres.cpp:677
-+#: ../src/xrc/xmlres.cpp:616
- #, c-format
- msgid "No handler found for XML node '%s', class '%s'!"
- msgstr ""
- "Aucun gestionnaire trouv� pour le noeud XML ��%s�� de la classe ��%s��."
-
--#: ../src/common/image.cpp:1505 ../src/common/image.cpp:1548
-+#: ../src/common/image.cpp:1271 ../src/common/image.cpp:1314
- msgid "No handler found for image type."
- msgstr "Aucun gestionnaire trouv� pour le type d'image."
-
--#: ../src/common/image.cpp:1513 ../src/common/image.cpp:1556
--#: ../src/common/image.cpp:1589
-+#: ../src/common/image.cpp:1279 ../src/common/image.cpp:1322
-+#: ../src/common/image.cpp:1356
- #, c-format
- msgid "No image handler for type %d defined."
- msgstr "Aucun gestionnaire d'image d�fini pour le type %d."
-
--#: ../src/common/image.cpp:1574 ../src/common/image.cpp:1604
-+#: ../src/common/image.cpp:1340 ../src/common/image.cpp:1372
- #, c-format
- msgid "No image handler for type %s defined."
- msgstr "Aucun gestionnaire d'image d�fini pour le type %s."
-
--#: ../src/html/helpfrm.cpp:869
-+#: ../src/html/helpfrm.cpp:846
- msgid "No matching page found yet"
- msgstr "Aucune page correspondante n'a encore �t� trouv�e"
-
-@@ -3013,35 +2797,35 @@
- msgid "No sound"
- msgstr "Pas de son"
-
--#: ../src/common/image.cpp:1200 ../src/common/image.cpp:1239
-+#: ../src/common/image.cpp:977 ../src/common/image.cpp:1016
- msgid "No unused colour in image being masked."
- msgstr "Aucune couleur n'est disponible dans l'image en cours de masquage."
-
--#: ../src/common/image.cpp:1997
-+#: ../src/common/image.cpp:1608
- msgid "No unused colour in image."
- msgstr "Aucune couleur n'est disponible dans l'image."
-
--#: ../src/common/fmapbase.cpp:113
-+#: ../src/common/fmapbase.cpp:112
- msgid "Nordic (ISO-8859-10)"
- msgstr "Nordique (ISO-8859-10)"
-
--#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235
-+#: ../src/generic/fontdlgg.cpp:230 ../src/generic/fontdlgg.cpp:233
- msgid "Normal"
- msgstr "Normal"
-
--#: ../src/html/helpfrm.cpp:1273
-+#: ../src/html/helpfrm.cpp:1250
- msgid "Normal face<br>and <u>underlined</u>. "
- msgstr "Normal<br>et <u>soulign�</u>. "
-
--#: ../src/html/helpfrm.cpp:1218
-+#: ../src/html/helpfrm.cpp:1195
- msgid "Normal font:"
- msgstr "Police normale�:"
-
--#: ../src/common/paper.cpp:122
-+#: ../src/common/paper.cpp:132
- msgid "Note, 8 1/2 x 11 in"
- msgstr "Note (8,5 x 11 pouces)"
-
--#: ../src/gtk/fontdlg.cpp:147 ../src/msw/dialog.cpp:194
-+#: ../src/gtk/fontdlg.cpp:141 ../src/msw/dialog.cpp:188
- #: ../contrib/src/deprecated/proplist.cpp:506
- msgid "OK"
- msgstr "Accepter"
-@@ -3050,21 +2834,21 @@
- msgid "Objects must have an id attribute"
- msgstr "Les objets doivent avoir un attribut id"
-
--#: ../src/common/docview.cpp:1269 ../src/common/docview.cpp:1619
-+#: ../src/common/docview.cpp:1252 ../src/common/docview.cpp:1580
- msgid "Open File"
- msgstr "Ouvrir un fichier"
-
--#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579
-+#: ../src/html/helpfrm.cpp:650 ../src/html/helpfrm.cpp:1565
- msgid "Open HTML document"
- msgstr "Ouvrir un document HTML"
-
--#: ../src/generic/dbgrptg.cpp:158
-+#: ../src/generic/dbgrptg.cpp:147
- #, c-format
- msgid "Open file \"%s\""
- msgstr "Ouvrir le fichier ��%s��"
-
--#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
--#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:772
-+#: ../src/generic/dirctrlg.cpp:690 ../src/generic/dirdlgg.cpp:342
-+#: ../src/generic/filedlgg.cpp:631 ../src/generic/filedlgg.cpp:771
- msgid "Operation not permitted."
- msgstr "Op�ration interdite."
-
-@@ -3083,11 +2867,11 @@
- msgid "Option '%s': '%s' cannot be converted to a date."
- msgstr "Option ��%s���: ��%s�� ne peut pas �tre converti en date."
-
--#: ../src/generic/dirdlgg.cpp:116 ../src/generic/prntdlgg.cpp:614
-+#: ../src/generic/dirdlgg.cpp:118 ../src/generic/prntdlgg.cpp:610
- msgid "Options"
- msgstr "Options"
-
--#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868
-+#: ../src/generic/prntdlgg.cpp:607 ../src/generic/prntdlgg.cpp:864
- msgid "Orientation"
- msgstr "Orientation"
-
-@@ -3115,158 +2899,33 @@
- msgid "PCX: version number too low"
- msgstr "PCX�: num�ro de version trop petit"
-
--#: ../src/common/imagpnm.cpp:92
-+#: ../src/common/imagpnm.cpp:96
- msgid "PNM: Couldn't allocate memory."
- msgstr "PNM�: impossible d'allouer de la m�moire."
-
--#: ../src/common/imagpnm.cpp:76
-+#: ../src/common/imagpnm.cpp:80
- msgid "PNM: File format is not recognized."
- msgstr "PNM�: le format de fichier n'est pas reconnu."
-
--#: ../src/common/imagpnm.cpp:108 ../src/common/imagpnm.cpp:125
--#: ../src/common/imagpnm.cpp:142
-+#: ../src/common/imagpnm.cpp:112
- msgid "PNM: File seems truncated."
- msgstr "PNM�: le fichier semble tronqu�."
-
--#: ../src/common/paper.cpp:194
--msgid "PRC 16K 146 x 215 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:207
--msgid "PRC 16K Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:195
--msgid "PRC 32K 97 x 151 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:208
--msgid "PRC 32K Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:196
--msgid "PRC 32K(Big) 97 x 151 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:209
--msgid "PRC 32K(Big) Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:197
--#, fuzzy
--msgid "PRC Envelope #1 102 x 165 mm"
--msgstr "Enveloppe C6, 114 x 162 mm"
--
--#: ../src/common/paper.cpp:210
--#, fuzzy
--msgid "PRC Envelope #1 Rotated 165 x 102 mm"
--msgstr "Enveloppe C6, 114 x 162 mm"
--
--#: ../src/common/paper.cpp:206
--#, fuzzy
--msgid "PRC Envelope #10 324 x 458 mm"
--msgstr "Enveloppe C3, 324 x 458 mm"
--
--#: ../src/common/paper.cpp:219
--#, fuzzy
--msgid "PRC Envelope #10 Rotated 458 x 324 m"
--msgstr "Enveloppe C4, 229 x 324 mm"
--
--#: ../src/common/paper.cpp:198
--#, fuzzy
--msgid "PRC Envelope #2 102 x 176 mm"
--msgstr "Enveloppe C6, 114 x 162 mm"
--
--#: ../src/common/paper.cpp:211
--#, fuzzy
--msgid "PRC Envelope #2 Rotated 176 x 102 mm"
--msgstr "Enveloppe B6, 176 x 125 mm"
--
--#: ../src/common/paper.cpp:199
--#, fuzzy
--msgid "PRC Envelope #3 125 x 176 mm"
--msgstr "Enveloppe C6, 114 x 162 mm"
--
--#: ../src/common/paper.cpp:212
--#, fuzzy
--msgid "PRC Envelope #3 Rotated 176 x 125 mm"
--msgstr "Enveloppe B6, 176 x 125 mm"
--
--#: ../src/common/paper.cpp:200
--#, fuzzy
--msgid "PRC Envelope #4 110 x 208 mm"
--msgstr "Enveloppe DL, 110 x 220 mm"
--
--#: ../src/common/paper.cpp:213
--#, fuzzy
--msgid "PRC Envelope #4 Rotated 208 x 110 mm"
--msgstr "Enveloppe C6, 114 x 162 mm"
--
--#: ../src/common/paper.cpp:201
--#, fuzzy
--msgid "PRC Envelope #5 110 x 220 mm"
--msgstr "Enveloppe DL, 110 x 220 mm"
--
--#: ../src/common/paper.cpp:214
--#, fuzzy
--msgid "PRC Envelope #5 Rotated 220 x 110 mm"
--msgstr "Enveloppe C4, 229 x 324 mm"
--
--#: ../src/common/paper.cpp:202
--#, fuzzy
--msgid "PRC Envelope #6 120 x 230 mm"
--msgstr "Enveloppe C5, 162 x 229 mm"
--
--#: ../src/common/paper.cpp:215
--#, fuzzy
--msgid "PRC Envelope #6 Rotated 230 x 120 mm"
--msgstr "Enveloppe C5, 162 x 229 mm"
--
--#: ../src/common/paper.cpp:203
--#, fuzzy
--msgid "PRC Envelope #7 160 x 230 mm"
--msgstr "Enveloppe B5, 176 x 250 mm"
--
--#: ../src/common/paper.cpp:216
--#, fuzzy
--msgid "PRC Envelope #7 Rotated 230 x 160 mm"
--msgstr "Enveloppe C6, 114 x 162 mm"
--
--#: ../src/common/paper.cpp:204
--#, fuzzy
--msgid "PRC Envelope #8 120 x 309 mm"
--msgstr "Enveloppe C5, 162 x 229 mm"
--
--#: ../src/common/paper.cpp:217
--#, fuzzy
--msgid "PRC Envelope #8 Rotated 309 x 120 mm"
--msgstr "Enveloppe C4, 229 x 324 mm"
--
--#: ../src/common/paper.cpp:205
--#, fuzzy
--msgid "PRC Envelope #9 229 x 324 mm"
--msgstr "Enveloppe C4, 229 x 324 mm"
--
--#: ../src/common/paper.cpp:218
--#, fuzzy
--msgid "PRC Envelope #9 Rotated 324 x 229 mm"
--msgstr "Enveloppe C5, 162 x 229 mm"
--
--#: ../src/common/prntbase.cpp:1294
-+#: ../src/common/prntbase.cpp:1248
- #, c-format
- msgid "Page %d"
- msgstr "Page %d"
-
--#: ../src/common/prntbase.cpp:1292
-+#: ../src/common/prntbase.cpp:1246
- #, c-format
- msgid "Page %d of %d"
- msgstr "Page %d de %d"
-
--#: ../src/generic/prntdlgg.cpp:827
-+#: ../src/generic/prntdlgg.cpp:823
- msgid "Page Setup"
- msgstr "Mise en page"
-
--#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:540
-+#: ../src/common/prntbase.cpp:452 ../src/gtk/gnome/gprint.cpp:533
- msgid "Page setup"
- msgstr "Mise en page"
-
-@@ -3274,13 +2933,13 @@
- msgid "Pages"
- msgstr "Pages"
-
--#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854
--#: ../src/generic/prntdlgg.cpp:1056
-+#: ../src/generic/prntdlgg.cpp:796 ../src/generic/prntdlgg.cpp:850
-+#: ../src/generic/prntdlgg.cpp:1052
- msgid "Paper Size"
- msgstr "Taille de la page"
-
--#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841
--#: ../src/generic/prntdlgg.cpp:1051
-+#: ../src/generic/prntdlgg.cpp:594 ../src/generic/prntdlgg.cpp:837
-+#: ../src/generic/prntdlgg.cpp:1047
- msgid "Paper size"
- msgstr "Taille de la page"
-
-@@ -3296,7 +2955,7 @@
- msgid "Passing an unkown object to GetObject"
- msgstr "Objet inconnu indiqu� � GetObject"
-
--#: ../src/generic/filedlgg.cpp:437
-+#: ../src/generic/filedlgg.cpp:436
- msgid "Permissions"
- msgstr "Permissions"
-
-@@ -3304,23 +2963,23 @@
- msgid "Pipe creation failed"
- msgstr "�chec de la cr�ation du tube"
-
--#: ../src/gtk/fontdlg.cpp:81
-+#: ../src/gtk/fontdlg.cpp:78
- msgid "Please choose a valid font."
- msgstr "Choisissez une police valable."
-
--#: ../src/generic/filedlgg.cpp:1325
-+#: ../src/generic/filedlgg.cpp:1294 ../src/gtk/filedlg.cpp:67
- msgid "Please choose an existing file."
- msgstr "Choisissez un fichier existant."
-
--#: ../src/html/helpfrm.cpp:813
-+#: ../src/html/helpfrm.cpp:790
- msgid "Please choose the page to display:"
- msgstr "Choisissez la page � afficher�:"
-
--#: ../src/msw/dialup.cpp:787
-+#: ../src/msw/dialup.cpp:750
- msgid "Please choose which ISP do you want to connect to"
- msgstr "Veuillez choisir � quel FAI vous voulez vous connecter"
-
--#: ../src/msw/listctrl.cpp:444
-+#: ../src/msw/listctrl.cpp:434
- #, c-format
- msgid ""
- "Please install a newer version of comctl32.dll\n"
-@@ -3331,11 +2990,11 @@
- "(la version 4.70 au minimum est n�cessaire, contre la version %d.%02d\n"
- "actuellement), sinon ce programme ne fonctionnera pas correctement."
-
--#: ../src/common/prntbase.cpp:313
-+#: ../src/common/prntbase.cpp:314
- msgid "Please wait while printing\n"
- msgstr "Patientez pendant l'impression\n"
-
--#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866
-+#: ../src/generic/prntdlgg.cpp:604 ../src/generic/prntdlgg.cpp:862
- msgid "Portrait"
- msgstr "Portrait"
-
-@@ -3343,25 +3002,25 @@
- msgid "PostScript file"
- msgstr "Fichier PostScript"
-
--#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235
-+#: ../src/generic/fontdlgg.cpp:341 ../src/html/helpfrm.cpp:1212
- msgid "Preview:"
- msgstr "Aper�u�:"
-
--#: ../src/html/helpfrm.cpp:662
-+#: ../src/html/helpfrm.cpp:639
- msgid "Previous page"
- msgstr "Page pr�c�dente"
-
--#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138
--#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:395
--#: ../src/gtk/gnome/gprint.cpp:407
-+#: ../src/common/prntbase.cpp:394 ../src/generic/prntdlgg.cpp:138
-+#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:388
-+#: ../src/gtk/gnome/gprint.cpp:400
- msgid "Print"
- msgstr "Imprimer"
-
--#: ../src/common/docview.cpp:1032
-+#: ../src/common/docview.cpp:1025
- msgid "Print Preview"
- msgstr "Aper�u avant impression"
-
--#: ../src/common/prntbase.cpp:1246 ../src/common/prntbase.cpp:1272
-+#: ../src/common/prntbase.cpp:1200 ../src/common/prntbase.cpp:1226
- msgid "Print Preview Failure"
- msgstr "Erreur de l'aper�u avant impression"
-
-@@ -3373,7 +3032,7 @@
- msgid "Print Setup"
- msgstr "Configuration de l'impression"
-
--#: ../src/generic/prntdlgg.cpp:617
-+#: ../src/generic/prntdlgg.cpp:613
- msgid "Print in colour"
- msgstr "Imprimer en couleur"
-
-@@ -3381,15 +3040,15 @@
- msgid "Print previe&w"
- msgstr "&Aper�u avant impression"
-
--#: ../src/gtk/gnome/gprint.cpp:785
-+#: ../src/gtk/gnome/gprint.cpp:778
- msgid "Print preview"
- msgstr "Aper�u avant impression"
-
--#: ../src/generic/prntdlgg.cpp:626
-+#: ../src/generic/prntdlgg.cpp:622
- msgid "Print spooling"
- msgstr "Queue d'impression"
-
--#: ../src/html/helpfrm.cpp:679
-+#: ../src/html/helpfrm.cpp:656
- msgid "Print this page"
- msgstr "Imprimer cette page"
-
-@@ -3401,7 +3060,7 @@
- msgid "Printer"
- msgstr "Imprimante"
-
--#: ../src/generic/prntdlgg.cpp:629
-+#: ../src/generic/prntdlgg.cpp:625
- msgid "Printer command:"
- msgstr "Commande pour l'imprimante�:"
-
-@@ -3409,11 +3068,11 @@
- msgid "Printer options"
- msgstr "Options de l'imprimante"
-
--#: ../src/generic/prntdlgg.cpp:641
-+#: ../src/generic/prntdlgg.cpp:637
- msgid "Printer options:"
- msgstr "Options de l'imprimante�:"
-
--#: ../src/generic/prntdlgg.cpp:915
-+#: ../src/generic/prntdlgg.cpp:911
- msgid "Printer..."
- msgstr "Imprimante..."
-
-@@ -3421,11 +3080,11 @@
- msgid "Printer:"
- msgstr "Imprimante�:"
-
--#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531
-+#: ../src/common/prntbase.cpp:311 ../src/common/prntbase.cpp:532
- msgid "Printing "
- msgstr "Impression en cours"
-
--#: ../src/common/prntbase.cpp:327
-+#: ../src/common/prntbase.cpp:328
- msgid "Printing Error"
- msgstr "Erreur d'impression"
-
-@@ -3438,7 +3097,7 @@
- msgid "Printing..."
- msgstr "Impression en cours..."
-
--#: ../src/common/debugrpt.cpp:546
-+#: ../src/common/debugrpt.cpp:524
- #, c-format
- msgid ""
- "Processing debug report has failed, leaving the files in \"%s\" directory."
-@@ -3446,28 +3105,28 @@
- "�chec du traitement du rapport de d�bogage, les fichiers sont maintenus dans "
- "le r�pertoire ��%s��."
-
--#: ../src/common/log.cpp:466
-+#: ../src/common/log.cpp:467
- msgid "Program aborted."
- msgstr "Programme interrompu."
-
--#: ../src/common/paper.cpp:119
-+#: ../src/common/paper.cpp:129
- msgid "Quarto, 215 x 275 mm"
- msgstr "Quarto, 215 x 275 mm"
-
--#: ../src/generic/logg.cpp:1165
-+#: ../src/generic/logg.cpp:1102
- msgid "Question"
- msgstr "Question"
-
--#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144
-+#: ../src/common/ffile.cpp:126 ../src/common/ffile.cpp:147
- #, c-format
- msgid "Read error on file '%s'"
- msgstr "Erreur de lecture dans le fichier ��%s��"
-
--#: ../src/common/prntbase.cpp:242
-+#: ../src/common/prntbase.cpp:243
- msgid "Ready"
- msgstr "Pr�t"
-
--#: ../src/xrc/xmlres.cpp:643
-+#: ../src/xrc/xmlres.cpp:582
- #, c-format
- msgid "Referenced object node with ref=\"%s\" not found!"
- msgstr "Le noeud objet r�f�renc� par ref=\"%s\" est introuvable."
-@@ -3476,18 +3135,18 @@
- msgid "Refresh"
- msgstr "Actualiser"
-
--#: ../src/msw/registry.cpp:560
-+#: ../src/msw/registry.cpp:552
- #, c-format
- msgid "Registry key '%s' already exists."
- msgstr "La cl� de registre ��%s�� existe d�j�."
-
--#: ../src/msw/registry.cpp:529
-+#: ../src/msw/registry.cpp:521
- #, c-format
- msgid "Registry key '%s' does not exist, cannot rename it."
- msgstr ""
- "Impossible de renommer la cl� de registre ��%s��, celle-ci n'existe pas."
-
--#: ../src/msw/registry.cpp:661
-+#: ../src/msw/registry.cpp:653
- #, c-format
- msgid ""
- "Registry key '%s' is needed for normal system operation,\n"
-@@ -3498,16 +3157,16 @@
- "du syst�me�; sa suppression laissera votre syst�me inutilisable�:\n"
- "op�ration abandonn�e."
-
--#: ../src/msw/registry.cpp:456
-+#: ../src/msw/registry.cpp:448
- #, c-format
- msgid "Registry value '%s' already exists."
- msgstr "La valeur de registre ��%s�� existe d�j�."
-
--#: ../src/generic/helpext.cpp:442
-+#: ../src/generic/helpext.cpp:441
- msgid "Relevant entries:"
- msgstr "Entr�es pertinentes�:"
-
--#: ../src/generic/progdlgg.cpp:210
-+#: ../src/generic/progdlgg.cpp:208
- msgid "Remaining time : "
- msgstr "Temps restant�: "
-
-@@ -3515,11 +3174,11 @@
- msgid "Remove"
- msgstr "Supprimer"
-
--#: ../src/html/helpfrm.cpp:445
-+#: ../src/html/helpfrm.cpp:429
- msgid "Remove current page from bookmarks"
- msgstr "Retirer la page courante de vos signets"
-
--#: ../src/common/rendcmn.cpp:196
-+#: ../src/common/rendcmn.cpp:193
- #, c-format
- msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
- msgstr ""
-@@ -3530,15 +3189,15 @@
- msgid "Rep&lace"
- msgstr "Remp&lacer"
-
--#: ../src/generic/fdrepdlg.cpp:188
-+#: ../src/generic/fdrepdlg.cpp:171
- msgid "Replace &all"
- msgstr "Rempl&acer tout"
-
--#: ../src/generic/fdrepdlg.cpp:130
-+#: ../src/generic/fdrepdlg.cpp:123
- msgid "Replace with:"
- msgstr "Remplacer par�:"
-
--#: ../src/xrc/xmlres.cpp:479
-+#: ../src/xrc/xmlres.cpp:418
- msgid "Resource files must have same version number!"
- msgstr "Les fichiers de ressource doivent avoir le m�me num�ro de version."
-
-@@ -3546,19 +3205,19 @@
- msgid "Revert to Saved"
- msgstr "Changer en enregistr�"
-
--#: ../src/generic/prntdlgg.cpp:891
-+#: ../src/generic/prntdlgg.cpp:887
- msgid "Right margin (mm):"
- msgstr "Marge droite (mm)�:"
-
--#: ../src/generic/fontdlgg.cpp:226
-+#: ../src/generic/fontdlgg.cpp:224
- msgid "Roman"
- msgstr "Roman"
-
--#: ../src/common/sizer.cpp:1838
-+#: ../src/common/sizer.cpp:1757
- msgid "Save"
- msgstr "Enregistrer"
-
--#: ../src/common/fldlgcmn.cpp:259
-+#: ../src/common/fldlgcmn.cpp:250
- #, c-format
- msgid "Save %s file"
- msgstr "Enregistrer le fichier %s"
-@@ -3567,23 +3226,23 @@
- msgid "Save &As..."
- msgstr "Enregistrer &sous..."
-
--#: ../src/common/docview.cpp:305
-+#: ../src/common/docview.cpp:285
- msgid "Save as"
- msgstr "Enregistrer sous"
-
--#: ../src/generic/logg.cpp:505
-+#: ../src/generic/logg.cpp:504
- msgid "Save log contents to file"
- msgstr "Enregistrer le contenu du journal dans un fichier"
-
--#: ../src/generic/fontdlgg.cpp:229
-+#: ../src/generic/fontdlgg.cpp:227
- msgid "Script"
- msgstr "Script"
-
--#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551
-+#: ../src/html/helpfrm.cpp:513 ../src/html/helpfrm.cpp:528
- msgid "Search"
- msgstr "Chercher"
-
--#: ../src/html/helpfrm.cpp:538
-+#: ../src/html/helpfrm.cpp:515
- msgid ""
- "Search contents of help book(s) for all occurences of the text you typed "
- "above"
-@@ -3591,65 +3250,60 @@
- "Rechercher dans la table des mati�res du/des manuel(s) d'aide toutes les "
- "occurrences du texte que vous avez tap� ci-dessus"
-
--#: ../src/generic/fdrepdlg.cpp:166
-+#: ../src/generic/fdrepdlg.cpp:152
- msgid "Search direction"
- msgstr "Direction de la recherche"
-
--#: ../src/generic/fdrepdlg.cpp:118
-+#: ../src/generic/fdrepdlg.cpp:111
- msgid "Search for:"
- msgstr "Chercher�:"
-
--#: ../src/html/helpfrm.cpp:1060
-+#: ../src/html/helpfrm.cpp:1037
- msgid "Search in all books"
- msgstr "Chercher dans tous les manuels"
-
--#: ../src/html/helpfrm.cpp:868
-+#: ../src/html/helpfrm.cpp:845
- msgid "Searching..."
- msgstr "Recherche..."
-
--#: ../src/generic/dirctrlg.cpp:592
-+#: ../src/generic/dirctrlg.cpp:550
- msgid "Sections"
- msgstr "Sections"
-
--#: ../src/common/ffile.cpp:222
-+#: ../src/common/ffile.cpp:225
- #, c-format
- msgid "Seek error on file '%s'"
- msgstr "Erreur de recherche dans le fichier ��%s��"
-
--#: ../src/common/ffile.cpp:212
-+#: ../src/common/ffile.cpp:215
- #, c-format
- msgid "Seek error on file '%s' (large files not supported by stdio)"
- msgstr ""
- "Erreur de recherche dans le fichier ��%s�� (les fichiers importants ne sont "
- "pas g�r�s par stdio)"
-
--#: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068
-+#: ../src/msw/textctrl.cpp:2062
- msgid "Select &All"
- msgstr "&Tout s�lectionner"
-
--#: ../src/common/docview.cpp:1699
-+#: ../src/common/docview.cpp:1660
- msgid "Select a document template"
- msgstr "S�lectionner un mod�le de document"
-
--#: ../src/common/docview.cpp:1776
-+#: ../src/common/docview.cpp:1737
- msgid "Select a document view"
- msgstr "S�lectionner une vue du document"
-
--#: ../src/common/docview.cpp:1579
-+#: ../src/common/docview.cpp:1540
- msgid "Select a file"
- msgstr "S�lectionner un fichier"
-
--#: ../src/motif/filedlg.cpp:226
--#, fuzzy
--msgid "Selection"
--msgstr "Sections"
--
- #: ../src/common/cmdline.cpp:739
- #, c-format
- msgid "Separator expected after the option '%s'."
- msgstr "S�parateur attendu apr�s l'option ��%s��."
-
--#: ../include/wx/xti.h:841
-+#: ../include/wx/xti.h:839
- msgid "SetProperty called w/o valid setter"
- msgstr "SetProperty appel� sans monteur valable"
-
-@@ -3657,68 +3311,69 @@
- msgid "Setup..."
- msgstr "Configurer..."
-
--#: ../src/msw/dialup.cpp:567
-+#: ../src/msw/dialup.cpp:530
- msgid "Several active dialup connections found, choosing one randomly."
- msgstr "Plusieurs connexions actives trouv�es, s�lection unique al�atoire."
-
--#: ../src/html/helpfrm.cpp:493
-+#: ../src/html/helpfrm.cpp:470
- msgid "Show all"
- msgstr "Tout montrer"
-
--#: ../src/html/helpfrm.cpp:504
-+#: ../src/html/helpfrm.cpp:481
- msgid "Show all items in index"
- msgstr "Montrer tous les �l�ments de l'index"
-
--#: ../src/generic/dirdlgg.cpp:112 ../src/generic/dirdlgg.cpp:175
-+#: ../src/generic/dirdlgg.cpp:114 ../src/generic/dirdlgg.cpp:177
- msgid "Show hidden directories"
- msgstr "Montrer les r�pertoires cach�s"
-
--#: ../src/generic/filedlgg.cpp:1056
-+#: ../src/generic/filedlgg.cpp:1034
- msgid "Show hidden files"
- msgstr "Montrer les fichiers cach�s"
-
--#: ../src/html/helpfrm.cpp:646
-+#: ../src/html/helpfrm.cpp:623
- msgid "Show/hide navigation panel"
- msgstr "Montrer/cacher le panneau de navigation"
-
--#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355
-+#: ../src/generic/fontdlgg.cpp:346 ../src/generic/fontdlgg.cpp:348
- msgid "Shows the font preview."
- msgstr "Montrer un aper�u des polices."
-
--#: ../src/generic/filedlgg.cpp:432
-+#: ../src/generic/filedlgg.cpp:431
- msgid "Size"
- msgstr "Taille"
-
--#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
--#: ../src/generic/progdlgg.cpp:598
-+#: ../src/generic/progdlgg.cpp:220 ../src/generic/progdlgg.cpp:238
-+#: ../src/generic/progdlgg.cpp:593
- msgid "Skip"
- msgstr "Sauter"
-
--#: ../src/generic/fontdlgg.cpp:234
-+#: ../src/generic/fontdlgg.cpp:232
- msgid "Slant"
- msgstr "Inclin�"
-
--#: ../src/common/docview.cpp:581
-+#: ../src/common/docview.cpp:561
- msgid "Sorry, could not open this file for saving."
- msgstr "Impossible d'ouvrir ce fichier pour l'enregistrement."
-
--#: ../src/common/docview.cpp:617 ../src/common/docview.cpp:1598
-+#: ../src/common/docview.cpp:593 ../src/common/docview.cpp:606
-+#: ../src/common/docview.cpp:1559
- msgid "Sorry, could not open this file."
- msgstr "Impossible d'ouvrir ce fichier."
-
--#: ../src/common/docview.cpp:588
-+#: ../src/common/docview.cpp:568
- msgid "Sorry, could not save this file."
- msgstr "Impossible d'enregistrer ce fichier."
-
--#: ../src/common/prntbase.cpp:1246
-+#: ../src/common/prntbase.cpp:1200
- msgid "Sorry, not enough memory to create a preview."
- msgstr "M�moire insuffisante pour cr�er un aper�u."
-
--#: ../src/common/docview.cpp:1028
-+#: ../src/common/docview.cpp:1021
- msgid "Sorry, print preview needs a printer to be installed."
- msgstr "L'aper�u avant impression n�cessite une imprimante install�e."
-
--#: ../src/common/docview.cpp:1268 ../src/common/docview.cpp:1618
-+#: ../src/common/docview.cpp:1251 ../src/common/docview.cpp:1579
- msgid "Sorry, the format for this file is unknown."
- msgstr "Format de fichier inconnu."
-
-@@ -3731,7 +3386,7 @@
- msgid "Sound file '%s' is in unsupported format."
- msgstr "Format du fichier sonore ��%s�� non g�r�."
-
--#: ../src/common/paper.cpp:111
-+#: ../src/common/paper.cpp:121
- msgid "Statement, 5 1/2 x 8 1/2 in"
- msgstr "Communiqu� (5,5 x 8,5 pouces)"
-
-@@ -3739,7 +3394,7 @@
- msgid "Status:"
- msgstr "�tat�:"
-
--#: ../src/generic/logg.cpp:622
-+#: ../src/generic/logg.cpp:621
- msgid "Status: "
- msgstr "�tat�: "
-
-@@ -3756,76 +3411,55 @@
- "Conversion de cha�ne en couleur�: sp�cification de la couleur non valable�: %"
- "s"
-
--#: ../include/wx/xti.h:428 ../include/wx/xti.h:432
-+#: ../include/wx/xti.h:427 ../include/wx/xti.h:431
- msgid "String conversions not supported"
- msgstr "Conversion des cha�nes non g�r�e"
-
--#: ../src/xrc/xmlres.cpp:750
-+#: ../src/xrc/xmlres.cpp:689
- #, c-format
- msgid "Subclass '%s' not found for resource '%s', not subclassing!"
- msgstr ""
- "Sous-classe ��%s�� non trouv�e pour la ressource ��%s��, pas de sous-"
- "classement."
-
--#: ../src/common/paper.cpp:157
--msgid "SuperA/SuperA/A4 227 x 356 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:158
--msgid "SuperB/SuperB/A3 305 x 487 mm"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:230
-+#: ../src/generic/fontdlgg.cpp:228
- msgid "Swiss"
- msgstr "Suisse"
-
--#: ../src/common/imagtiff.cpp:165
--msgid "TIFF library error."
--msgstr ""
--
--#: ../src/common/imagtiff.cpp:149
--msgid "TIFF library warning."
--msgstr ""
--
--#: ../src/common/imagtiff.cpp:248 ../src/common/imagtiff.cpp:259
--#: ../src/common/imagtiff.cpp:399
-+#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
-+#: ../src/common/imagtiff.cpp:354
- msgid "TIFF: Couldn't allocate memory."
- msgstr "TIFF�: allocation de m�moire impossible."
-
--#: ../src/common/imagtiff.cpp:219
-+#: ../src/common/imagtiff.cpp:203
- msgid "TIFF: Error loading image."
- msgstr "TIFF�: erreur au chargement de l'image."
-
--#: ../src/common/imagtiff.cpp:270
-+#: ../src/common/imagtiff.cpp:254
- msgid "TIFF: Error reading image."
- msgstr "TIFF�: erreur � la lecture de l'image."
-
--#: ../src/common/imagtiff.cpp:347
-+#: ../src/common/imagtiff.cpp:331
- msgid "TIFF: Error saving image."
- msgstr "TIFF�: erreur � la sauvegarde de l'image."
-
--#: ../src/common/imagtiff.cpp:445
-+#: ../src/common/imagtiff.cpp:378
- msgid "TIFF: Error writing image."
- msgstr "TIFF�: erreur � l'�criture de l'image."
-
--#: ../src/common/paper.cpp:152
--#, fuzzy
--msgid "Tabloid Extra 11.69 x 18 in"
--msgstr "Tablo�de (11 x 17 pouces)"
--
--#: ../src/common/paper.cpp:109
-+#: ../src/common/paper.cpp:119
- msgid "Tabloid, 11 x 17 in"
- msgstr "Tablo�de (11 x 17 pouces)"
-
--#: ../src/generic/fontdlgg.cpp:231
-+#: ../src/generic/fontdlgg.cpp:229
- msgid "Teletype"
- msgstr "T�l�type"
-
--#: ../src/common/docview.cpp:1700
-+#: ../src/common/docview.cpp:1661
- msgid "Templates"
- msgstr "Mod�les"
-
--#: ../src/common/fmapbase.cpp:114
-+#: ../src/common/fmapbase.cpp:113
- msgid "Thai (ISO-8859-11)"
- msgstr "Tha� (ISO-8859-11)"
-
-@@ -3837,7 +3471,7 @@
- msgid "The FTP server doesn't support the PORT command."
- msgstr "Commande PORT non g�r�e par le serveur FTP."
-
--#: ../src/common/fontmap.cpp:204
-+#: ../src/common/fontmap.cpp:190
- #, c-format
- msgid ""
- "The charset '%s' is unknown. You may select\n"
-@@ -3861,7 +3495,7 @@
- "R�pertoire ��%s�� inexistant\n"
- "Le cr�er maintenant�?"
-
--#: ../src/common/docview.cpp:1949
-+#: ../src/common/docview.cpp:1910
- #, c-format
- msgid ""
- "The file '%s' couldn't be opened.\n"
-@@ -3870,7 +3504,7 @@
- "Le fichier ��%s�� n'a pas pu �tre ouvert et a �t� retir�\n"
- "de la liste des fichiers r�cemment utilis�s."
-
--#: ../src/common/docview.cpp:1959
-+#: ../src/common/docview.cpp:1920
- #, c-format
- msgid ""
- "The file '%s' doesn't exist and couldn't be opened.\n"
-@@ -3879,32 +3513,32 @@
- "Le fichier ��%s�� n'existe pas et n'a pas pu �tre ouvert.\n"
- "Il a �t� retir� de la liste des fichiers r�cemment utilis�s."
-
--#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318
-+#: ../src/generic/fontdlgg.cpp:310 ../src/generic/fontdlgg.cpp:312
- msgid "The font colour."
- msgstr "Couleur de police."
-
--#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279
-+#: ../src/generic/fontdlgg.cpp:275 ../src/generic/fontdlgg.cpp:277
- msgid "The font family."
- msgstr "Famille de police."
-
--#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
-+#: ../src/generic/fontdlgg.cpp:322 ../src/generic/fontdlgg.cpp:324
- msgid "The font point size."
- msgstr "Taille du point de la police."
-
--#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290
-+#: ../src/generic/fontdlgg.cpp:286 ../src/generic/fontdlgg.cpp:288
- msgid "The font style."
- msgstr "Style de police."
-
--#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301
-+#: ../src/generic/fontdlgg.cpp:297 ../src/generic/fontdlgg.cpp:299
- msgid "The font weight."
- msgstr "Largeur de police."
-
--#: ../src/common/filename.cpp:966
-+#: ../src/common/filename.cpp:952
- #, c-format
- msgid "The path '%s' contains too many \"..\"!"
- msgstr "Le chemin ��%s�� contient trop de ��..��."
-
--#: ../src/generic/dbgrptg.cpp:308
-+#: ../src/generic/dbgrptg.cpp:289
- msgid ""
- "The report contains the files listed below. If any of these files contain "
- "private information,\n"
-@@ -3928,7 +3562,7 @@
- msgid "The value for the option '%s' must be specified."
- msgstr "La valeur de l'option ��%s�� doit �tre pr�cis�e."
-
--#: ../src/msw/dialup.cpp:455
-+#: ../src/msw/dialup.cpp:418
- #, c-format
- msgid ""
- "The version of remote access service (RAS) installed on this machine is "
-@@ -3945,7 +3579,7 @@
- "Un probl�me est apparu lors de la mise en page�: la configuration d'une "
- "imprimante par d�faut peut �tre n�cessaire."
-
--#: ../src/msw/datectrl.cpp:109
-+#: ../src/msw/datectrl.cpp:116
- msgid ""
- "This system doesn't support date picker control, please upgrade your version "
- "of comctl32.dll"
-@@ -3953,7 +3587,7 @@
- "Ce syst�me ne g�re pas le contr�le des ramasseurs de donn�es, veuillez "
- "mettre � niveau votre version de comctl32.dll"
-
--#: ../src/msw/thread.cpp:1206
-+#: ../src/msw/thread.cpp:1210
- msgid ""
- "Thread module initialization failed: can not store value in thread local "
- "storage"
-@@ -3961,13 +3595,13 @@
- "�chec de l'initialisation du module du processus�: enregistrement impossible "
- "de la valeur dans le stockage local des processus"
-
--#: ../src/unix/threadpsx.cpp:1603
-+#: ../src/unix/threadpsx.cpp:1602
- msgid "Thread module initialization failed: failed to create thread key"
- msgstr ""
- "�chec de l'initialisation du module du processus�: �chec de la cr�ation de "
- "la cl� du processus"
-
--#: ../src/msw/thread.cpp:1194
-+#: ../src/msw/thread.cpp:1198
- msgid ""
- "Thread module initialization failed: impossible to allocate index in thread "
- "local storage"
-@@ -3975,15 +3609,15 @@
- "�chec de l'initialisation du module du processus�: impossible d'allouer un "
- "index dans le stockage local des processus"
-
--#: ../src/unix/threadpsx.cpp:1108
-+#: ../src/unix/threadpsx.cpp:1107
- msgid "Thread priority setting is ignored."
- msgstr "La priorit� donn�e au processus est ignor�e."
-
--#: ../src/msw/mdi.cpp:184
-+#: ../src/msw/mdi.cpp:187
- msgid "Tile &Horizontally"
- msgstr "R�partir &horizontalement"
-
--#: ../src/msw/mdi.cpp:185
-+#: ../src/msw/mdi.cpp:188
- msgid "Tile &Vertically"
- msgstr "R�partir &verticalement"
-
-@@ -4012,7 +3646,7 @@
- msgid "Too many colours in PNG, the image may be slightly blurred."
- msgstr "Trop de couleurs dans l'image PNG, elle peut �tre l�g�rement trouble."
-
--#: ../src/generic/prntdlgg.cpp:880
-+#: ../src/generic/prntdlgg.cpp:876
- msgid "Top margin (mm):"
- msgstr "Marge de haut de page (mm)�:"
-
-@@ -4027,11 +3661,11 @@
- msgid "Trying to solve a NULL hostname: giving up"
- msgstr "Tentative de r�soudre le nom d'h�te NULL�: abandon"
-
--#: ../src/common/fmapbase.cpp:112
-+#: ../src/common/fmapbase.cpp:111
- msgid "Turkish (ISO-8859-9)"
- msgstr "Turc (ISO-8859-9)"
-
--#: ../src/generic/filedlgg.cpp:433
-+#: ../src/generic/filedlgg.cpp:432
- msgid "Type"
- msgstr "Type"
-
-@@ -4040,11 +3674,11 @@
- msgid "Type must have enum - long conversion"
- msgstr "Le type doit �tre �num�rable - conversion longue"
-
--#: ../src/common/paper.cpp:140
-+#: ../src/common/paper.cpp:150
- msgid "US Std Fanfold, 14 7/8 x 11 in"
- msgstr "Standard US en accord�on (14,875 x 11 pouces)"
-
--#: ../src/html/htmlwin.cpp:403
-+#: ../src/html/htmlwin.cpp:398
- #, c-format
- msgid "Unable to open requested HTML document: %s"
- msgstr "Impossible d'ouvrir le document HTML demand�: %s"
-@@ -4077,39 +3711,39 @@
- msgid "Unexpected parameter '%s'"
- msgstr "Param�tre ��%s�� inattendu"
-
--#: ../src/common/fmapbase.cpp:137
-+#: ../src/common/fmapbase.cpp:135
- msgid "Unicode 16 bit (UTF-16)"
- msgstr "Unicode 16 bit (UTF-16)"
-
--#: ../src/common/fmapbase.cpp:138
-+#: ../src/common/fmapbase.cpp:136
- msgid "Unicode 16 bit Big Endian (UTF-16BE)"
- msgstr "Unicode 16 bit gros-boutiste (UTF-16BE)"
-
--#: ../src/common/fmapbase.cpp:139
-+#: ../src/common/fmapbase.cpp:137
- msgid "Unicode 16 bit Little Endian (UTF-16LE)"
- msgstr "Unicode 16 bit petit-boutiste (UTF-16LE)"
-
--#: ../src/common/fmapbase.cpp:140
-+#: ../src/common/fmapbase.cpp:138
- msgid "Unicode 32 bit (UTF-32)"
- msgstr "Unicode 32 bit (UTF-32)"
-
--#: ../src/common/fmapbase.cpp:141
-+#: ../src/common/fmapbase.cpp:139
- msgid "Unicode 32 bit Big Endian (UTF-32BE)"
- msgstr "Unicode 32 bit gros-boutiste (UTF-32BE)"
-
--#: ../src/common/fmapbase.cpp:142
-+#: ../src/common/fmapbase.cpp:140
- msgid "Unicode 32 bit Little Endian (UTF-32LE)"
- msgstr "Unicode 32 bit petit-boutiste (UTF-8)"
-
--#: ../src/common/fmapbase.cpp:135
-+#: ../src/common/fmapbase.cpp:133
- msgid "Unicode 7 bit (UTF-7)"
- msgstr "Unicode 7 bit (UTF-7)"
-
--#: ../src/common/fmapbase.cpp:136
-+#: ../src/common/fmapbase.cpp:134
- msgid "Unicode 8 bit (UTF-8)"
- msgstr "Unicode 8 bit (UTF-8)"
-
--#: ../src/msw/dde.cpp:1093
-+#: ../src/msw/dde.cpp:1092
- #, c-format
- msgid "Unknown DDE error %08x"
- msgstr "Erreur DDE inconnue�: %08x"
-@@ -4118,11 +3752,11 @@
- msgid "Unknown Object passed to GetObjectClassInfo"
- msgstr "Objet inconnu indiqu� � GetObjectClassInfo"
-
--#: ../src/unix/dlunix.cpp:275
-+#: ../src/unix/dlunix.cpp:282
- msgid "Unknown dynamic library error"
- msgstr "Erreur de biblioth�que dynamique inconnue"
-
--#: ../src/common/fmapbase.cpp:695
-+#: ../src/common/fmapbase.cpp:685
- #, c-format
- msgid "Unknown encoding (%d)"
- msgstr "Codage inconnu (%d)"
-@@ -4142,7 +3776,7 @@
- msgid "Unknown option '%s'"
- msgstr "Option ��%s�� inconnue"
-
--#: ../src/xrc/xmlres.cpp:823
-+#: ../src/xrc/xmlres.cpp:760
- msgid "Unknown style flag "
- msgstr "Indicateur de style inconnu"
-
-@@ -4151,13 +3785,13 @@
- msgid "Unkown Property %s"
- msgstr "Option ��%s�� inconnue"
-
--#: ../src/common/mimecmn.cpp:163
-+#: ../src/common/mimecmn.cpp:161
- #, c-format
- msgid "Unmatched '{' in an entry for mime type %s."
- msgstr "Symbole ��{�� non assorti dans une entr�e pour le type mime %s."
-
--#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287
--#: ../src/common/cmdproc.cpp:307
-+#: ../src/common/cmdproc.cpp:252 ../src/common/cmdproc.cpp:278
-+#: ../src/common/cmdproc.cpp:298
- msgid "Unnamed command"
- msgstr "Commande sans nom"
-
-@@ -4166,8 +3800,8 @@
- msgid "Unrecognized style %s while parsing resource."
- msgstr "Style %s non reconnu pendant l'analyse des ressources."
-
--#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64
--#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445
-+#: ../src/mac/carbon/clipbrd.cpp:66 ../src/mac/classic/clipbrd.cpp:64
-+#: ../src/msw/clipbrd.cpp:276 ../src/msw/clipbrd.cpp:448
- msgid "Unsupported clipboard format."
- msgstr "Format de presse-papiers non g�r�."
-
-@@ -4176,11 +3810,11 @@
- msgid "Unsupported theme '%s'."
- msgstr "Th�me ��%s�� non g�r�."
-
--#: ../src/generic/fdrepdlg.cpp:158
-+#: ../src/generic/fdrepdlg.cpp:151
- msgid "Up"
- msgstr "Haut"
-
--#: ../src/common/cmdline.cpp:954
-+#: ../src/common/cmdline.cpp:953
- #, c-format
- msgid "Usage: %s"
- msgstr "Utilisation�: %s"
-@@ -4193,15 +3827,15 @@
- msgid "Video Output"
- msgstr "Sortie vid�o"
-
--#: ../src/generic/filedlgg.cpp:972
-+#: ../src/generic/filedlgg.cpp:950
- msgid "View files as a detailed view"
- msgstr "Voir les fichiers - vue d�taill�e"
-
--#: ../src/generic/filedlgg.cpp:965
-+#: ../src/generic/filedlgg.cpp:943
- msgid "View files as a list view"
- msgstr "Voir les fichiers - liste"
-
--#: ../src/common/docview.cpp:1777
-+#: ../src/common/docview.cpp:1738
- msgid "Views"
- msgstr "Vues"
-
-@@ -4209,37 +3843,37 @@
- msgid "Waiting for subprocess termination failed"
- msgstr "�chec de l'attente de fin du sous-processus"
-
--#: ../src/common/docview.cpp:461
-+#: ../src/common/docview.cpp:441
- msgid "Warning"
- msgstr "Avertissement"
-
--#: ../src/common/log.cpp:480
-+#: ../src/common/log.cpp:481
- msgid "Warning: "
- msgstr "Avertissement�:"
-
--#: ../src/html/htmlpars.cpp:391
-+#: ../src/html/htmlpars.cpp:395
- msgid "Warning: attempt to remove HTML tag handler from empty stack."
- msgstr ""
- "Avertissement�: tentative de suppression d'un gestionnaire d'�tiquette HTML "
- "d'une pile vide."
-
--#: ../src/common/fmapbase.cpp:104
-+#: ../src/common/fmapbase.cpp:103
- msgid "Western European (ISO-8859-1)"
- msgstr "Europe de l'Ouest (ISO-8859-1)"
-
--#: ../src/common/fmapbase.cpp:118
-+#: ../src/common/fmapbase.cpp:117
- msgid "Western European with Euro (ISO-8859-15)"
- msgstr "Europe de l'Ouest avec l'Euro (ISO-8859-15)"
-
--#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341
-+#: ../src/generic/fontdlgg.cpp:333 ../src/generic/fontdlgg.cpp:335
- msgid "Whether the font is underlined."
- msgstr "Si la police est soulign�e."
-
--#: ../src/generic/fdrepdlg.cpp:150
-+#: ../src/generic/fdrepdlg.cpp:143
- msgid "Whole word"
- msgstr "Mot complet"
-
--#: ../src/html/helpfrm.cpp:535
-+#: ../src/html/helpfrm.cpp:512
- msgid "Whole words only"
- msgstr "Mots complets seulement"
-
-@@ -4247,143 +3881,138 @@
- msgid "Win32 theme"
- msgstr "Th�me Win32"
-
--#: ../src/msw/utils.cpp:1063
-+#: ../src/msw/utils.cpp:1085
- msgid "Win32s on Windows 3.1"
- msgstr "Win32s sur Windows 3.1"
-
--#: ../src/msw/utils.cpp:1112
-+#: ../src/msw/utils.cpp:1134
- #, c-format
- msgid "Windows 2000 (build %lu"
- msgstr "Windows 2000 (construction %lu"
-
--#: ../src/msw/utils.cpp:1077
-+#: ../src/msw/utils.cpp:1099
- msgid "Windows 95"
- msgstr "Windows 95"
-
--#: ../src/msw/utils.cpp:1073
-+#: ../src/msw/utils.cpp:1095
- msgid "Windows 95 OSR2"
- msgstr "Windows 95 OSR2"
-
--#: ../src/msw/utils.cpp:1088
-+#: ../src/msw/utils.cpp:1110
- msgid "Windows 98"
- msgstr "Windows 98"
-
--#: ../src/msw/utils.cpp:1084
-+#: ../src/msw/utils.cpp:1106
- msgid "Windows 98 SE"
- msgstr "Windows 98 SE"
-
--#: ../src/msw/utils.cpp:1095
-+#: ../src/msw/utils.cpp:1117
- #, c-format
- msgid "Windows 9x (%d.%d)"
- msgstr "Windows 9x (%d.%d)"
-
--#: ../src/common/fmapbase.cpp:132
-+#: ../src/common/fmapbase.cpp:130
- msgid "Windows Arabic (CP 1256)"
- msgstr "Arabe limit� � Windows (CP 1256)"
-
--#: ../src/common/fmapbase.cpp:133
-+#: ../src/common/fmapbase.cpp:131
- msgid "Windows Baltic (CP 1257)"
- msgstr "Balte limit� � Windows (CP 1257)"
-
--#: ../src/common/fmapbase.cpp:126
-+#: ../src/common/fmapbase.cpp:124
- msgid "Windows Central European (CP 1250)"
- msgstr "Europ�en central limit� � Windows (CP 1255)"
-
--#: ../src/common/fmapbase.cpp:123
-+#: ../src/common/fmapbase.cpp:121
- msgid "Windows Chinese Simplified (CP 936)"
- msgstr "Chinois simplifi� limit� � Windows (CP 936)"
-
--#: ../src/common/fmapbase.cpp:125
-+#: ../src/common/fmapbase.cpp:123
- msgid "Windows Chinese Traditional (CP 950)"
- msgstr "Chinois traditionnel limit� � Windows (CP 950)"
-
--#: ../src/common/fmapbase.cpp:127
-+#: ../src/common/fmapbase.cpp:125
- msgid "Windows Cyrillic (CP 1251)"
- msgstr "Cyrillique limit� � Windows (CP 1251)"
-
--#: ../src/common/fmapbase.cpp:129
-+#: ../src/common/fmapbase.cpp:127
- msgid "Windows Greek (CP 1253)"
- msgstr "Grec limit� � Windows (CP 1253)"
-
--#: ../src/common/fmapbase.cpp:131
-+#: ../src/common/fmapbase.cpp:129
- msgid "Windows Hebrew (CP 1255)"
- msgstr "H�breu limit� � Windows (CP 1255)"
-
--#: ../src/common/fmapbase.cpp:122
-+#: ../src/common/fmapbase.cpp:120
- msgid "Windows Japanese (CP 932)"
- msgstr "Japonais limit� � Windows (CP 932)"
-
--#: ../src/common/fmapbase.cpp:124
-+#: ../src/common/fmapbase.cpp:122
- msgid "Windows Korean (CP 949)"
- msgstr "Cor�en limit� � Windows (CP 949)"
-
--#: ../src/msw/utils.cpp:1092
-+#: ../src/msw/utils.cpp:1114
- msgid "Windows ME"
- msgstr "Windows ME"
-
--#: ../src/msw/utils.cpp:1127
-+#: ../src/msw/utils.cpp:1149
- #, c-format
- msgid "Windows NT %lu.%lu (build %lu"
- msgstr "Windows NT %lu.%lu (construction %lu"
-
--#: ../src/msw/utils.cpp:1120
-+#: ../src/msw/utils.cpp:1142
- #, c-format
- msgid "Windows Server 2003 (build %lu"
- msgstr "Windows Server 2003 (construction %lu"
-
--#: ../src/common/fmapbase.cpp:121
--#, fuzzy
--msgid "Windows Thai (CP 874)"
--msgstr "Balte limit� � Windows (CP 1257)"
--
--#: ../src/common/fmapbase.cpp:130
-+#: ../src/common/fmapbase.cpp:128
- msgid "Windows Turkish (CP 1254)"
- msgstr "Turc limit� � Windows (CP 1254)"
-
--#: ../src/common/fmapbase.cpp:128
-+#: ../src/common/fmapbase.cpp:126
- msgid "Windows Western European (CP 1252)"
- msgstr "Europ�en occidental limit� � Windows (CP 1252 )"
-
--#: ../src/msw/utils.cpp:1116
-+#: ../src/msw/utils.cpp:1138
- #, c-format
- msgid "Windows XP (build %lu"
- msgstr "Windows XP (construction %lu"
-
--#: ../src/common/fmapbase.cpp:134
-+#: ../src/common/fmapbase.cpp:132
- msgid "Windows/DOS OEM (CP 437)"
- msgstr "Windows/DOS OEM (CP 437)"
-
--#: ../src/common/ffile.cpp:158
-+#: ../src/common/ffile.cpp:161
- #, c-format
- msgid "Write error on file '%s'"
- msgstr "Erreur d'�criture dans le fichier ��%s��"
-
--#: ../src/xml/xml.cpp:562
-+#: ../src/xml/xml.cpp:550
- #, c-format
- msgid "XML parsing error: '%s' at line %d"
- msgstr "Erreur d'analyse XML�: ��%s�� � la ligne %d"
-
--#: ../src/common/xpmdecod.cpp:774
-+#: ../src/common/xpmdecod.cpp:776
- msgid "XPM: Malformed pixel data!"
- msgstr "XPM�: donn�es de pixel malform�es."
-
--#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721
-+#: ../src/common/xpmdecod.cpp:711 ../src/common/xpmdecod.cpp:721
- #, c-format
- msgid "XPM: malformed colour definition '%s'!"
- msgstr "XPM�: d�finition de couleur ��%s�� malform�e."
-
--#: ../src/xrc/xmlres.cpp:579
-+#: ../src/xrc/xmlres.cpp:518
- #, c-format
- msgid "XRC resource '%s' (class '%s') not found!"
- msgstr "Ressource XRC ��%s�� (classe ��%s��) introuvable."
-
--#: ../src/xrc/xmlres.cpp:1080 ../src/xrc/xmlres.cpp:1092
-+#: ../src/xrc/xmlres.cpp:1017 ../src/xrc/xmlres.cpp:1029
- #, c-format
- msgid "XRC resource: Cannot create bitmap from '%s'."
- msgstr ""
- "Ressource XRC�: impossible de cr�er une image bitmap � partir de ��%s��."
-
--#: ../src/xrc/xmlres.cpp:1036
-+#: ../src/xrc/xmlres.cpp:973
- #, c-format
- msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
- msgstr ""
-@@ -4392,7 +4021,7 @@
-
- #: ../src/mac/carbon/msgdlg.cpp:59 ../src/mac/carbon/msgdlg.cpp:142
- #: ../src/mac/classic/msgdlg.cpp:57 ../src/mac/classic/msgdlg.cpp:139
--#: ../src/motif/msgdlg.cpp:204
-+#: ../src/motif/msgdlg.cpp:185
- msgid "Yes"
- msgstr "Oui"
-
-@@ -4412,15 +4041,15 @@
- msgid "Zoom to &Fit"
- msgstr "Zoom a&just�"
-
--#: ../src/common/docview.cpp:2133
-+#: ../src/common/docview.cpp:2094
- msgid "[EMPTY]"
- msgstr "[VIDE]"
-
--#: ../src/msw/dde.cpp:1060
-+#: ../src/msw/dde.cpp:1059
- msgid "a DDEML application has created a prolonged race condition."
- msgstr "une application DDEML a cr�� une situation de concurrence prolong�e."
-
--#: ../src/msw/dde.cpp:1048
-+#: ../src/msw/dde.cpp:1047
- msgid ""
- "a DDEML function was called without first calling the DdeInitialize "
- "function,\n"
-@@ -4431,39 +4060,39 @@
- "DdeInitialize, ou un identifiant non valable a �t� fourni � la fonction\n"
- "DDEML."
-
--#: ../src/msw/dde.cpp:1066
-+#: ../src/msw/dde.cpp:1065
- msgid "a client's attempt to establish a conversation has failed."
- msgstr "une tentative d'un client pour �tablir une conversation a �chou�."
-
--#: ../src/msw/dde.cpp:1063
-+#: ../src/msw/dde.cpp:1062
- msgid "a memory allocation failed."
- msgstr "une allocation de m�moire a �chou�."
-
--#: ../src/msw/dde.cpp:1057
-+#: ../src/msw/dde.cpp:1056
- msgid "a parameter failed to be validated by the DDEML."
- msgstr "un param�tre n'a pas pu �tre valid� par la DDEML."
-
--#: ../src/msw/dde.cpp:1039
-+#: ../src/msw/dde.cpp:1038
- msgid "a request for a synchronous advise transaction has timed out."
- msgstr "une demande de transaction synchrone d'instructions a expir�."
-
--#: ../src/msw/dde.cpp:1045
-+#: ../src/msw/dde.cpp:1044
- msgid "a request for a synchronous data transaction has timed out."
- msgstr "une demande de transaction synchrone de donn�es a expir�."
-
--#: ../src/msw/dde.cpp:1054
-+#: ../src/msw/dde.cpp:1053
- msgid "a request for a synchronous execute transaction has timed out."
- msgstr "une demande de transaction synchrone d'ex�cutions a expir�."
-
--#: ../src/msw/dde.cpp:1072
-+#: ../src/msw/dde.cpp:1071
- msgid "a request for a synchronous poke transaction has timed out."
- msgstr "une demande de transaction synchrone de stockage a expir�."
-
--#: ../src/msw/dde.cpp:1087
-+#: ../src/msw/dde.cpp:1086
- msgid "a request to end an advise transaction has timed out."
- msgstr "une demande pour terminer une transaction d'instructions a expir�."
-
--#: ../src/msw/dde.cpp:1081
-+#: ../src/msw/dde.cpp:1080
- msgid ""
- "a server-side transaction was attempted on a conversation\n"
- "that was terminated by the client, or the server\n"
-@@ -4472,7 +4101,7 @@
- "une transaction a �t� tent�e du c�t� serveur lors d'une conversation d�j�\n"
- "termin�e par le client, ou le serveur a achev� la transaction avant la fin."
-
--#: ../src/msw/dde.cpp:1069
-+#: ../src/msw/dde.cpp:1068
- msgid "a transaction failed."
- msgstr "une transaction a �chou�."
-
-@@ -4480,7 +4109,7 @@
- msgid "alt"
- msgstr "alt"
-
--#: ../src/msw/dde.cpp:1051
-+#: ../src/msw/dde.cpp:1050
- msgid ""
- "an application initialized as APPCLASS_MONITOR has\n"
- "attempted to perform a DDE transaction,\n"
-@@ -4491,15 +4120,15 @@
- "d'effectuer une transaction DDE, ou une application initialis�e en tant\n"
- "que APPCMD_CLIENTONLY a tent� d'effectuer des transactions serveur."
-
--#: ../src/msw/dde.cpp:1075
-+#: ../src/msw/dde.cpp:1074
- msgid "an internal call to the PostMessage function has failed. "
- msgstr "un appel interne � la fonction PostMessage a �chou�."
-
--#: ../src/msw/dde.cpp:1084
-+#: ../src/msw/dde.cpp:1083
- msgid "an internal error has occurred in the DDEML."
- msgstr "une erreur interne s'est produite dans le DDEML."
-
--#: ../src/msw/dde.cpp:1090
-+#: ../src/msw/dde.cpp:1089
- msgid ""
- "an invalid transaction identifier was passed to a DDEML function.\n"
- "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
-@@ -4509,11 +4138,11 @@
- "Quand l'application sort d'un rappel XTYP_XACT_COMPLETE, l'identifiant de\n"
- "transaction pour ce rappel n'est plus valable."
-
--#: ../src/common/zipstrm.cpp:1330
-+#: ../src/common/zipstrm.cpp:1317
- msgid "assuming this is a multi-part zip concatenated"
- msgstr "suppose qu'il s'agit d'un zip recombin�"
-
--#: ../src/common/fileconf.cpp:1847
-+#: ../src/common/fileconf.cpp:1804
- #, c-format
- msgid "attempt to change immutable key '%s' ignored."
- msgstr "tentative de modifier la touche non configurable ��%s�� ignor�e."
-@@ -4526,7 +4155,7 @@
- msgid "bad signature"
- msgstr "mauvaise signature"
-
--#: ../src/common/zipstrm.cpp:1580
-+#: ../src/common/zipstrm.cpp:1567
- msgid "bad zipfile offset to entry"
- msgstr "Mauvais d�calage de fichier zip dans l'entr�e"
-
-@@ -4534,18 +4163,14 @@
- msgid "binary"
- msgstr "binaire"
-
--#: ../src/common/fontcmn.cpp:646
-+#: ../src/common/fontcmn.cpp:645
- msgid "bold"
- msgstr "gras"
-
--#: ../src/common/fontcmn.cpp:570
-+#: ../src/common/fontcmn.cpp:569
- msgid "bold "
- msgstr "gras "
-
--#: ../src/os2/iniconf.cpp:451
--msgid "buffer is too small for Windows directory."
--msgstr ""
--
- #: ../src/common/ffile.cpp:91
- #, c-format
- msgid "can't close file '%s'"
-@@ -4556,7 +4181,7 @@
- msgid "can't close file descriptor %d"
- msgstr "impossible de fermer le descripteur de fichier %d"
-
--#: ../src/common/file.cpp:551
-+#: ../src/common/file.cpp:553
- #, c-format
- msgid "can't commit changes to file '%s'"
- msgstr "impossible d'appliquer les changements au fichier ��%s��"
-@@ -4566,34 +4191,29 @@
- msgid "can't create file '%s'"
- msgstr "impossible de cr�er le fichier ��%s��"
-
--#: ../src/common/fileconf.cpp:1159
-+#: ../src/common/fileconf.cpp:1123
- #, c-format
- msgid "can't delete user configuration file '%s'"
- msgstr "impossible d'effacer le fichier de configuration utilisateur ��%s��"
-
--#: ../src/common/file.cpp:457
-+#: ../src/common/file.cpp:459
- #, c-format
- msgid "can't determine if the end of file is reached on descriptor %d"
- msgstr ""
- "impossible de d�terminer si la fin du fichier est atteinte dans le "
- "descripteur %d"
-
--#: ../src/msdos/utilsdos.cpp:307 ../src/msdos/utilsdos.cpp:466
--#, fuzzy, c-format
--msgid "can't execute '%s'"
--msgstr "�chec de l'ex�cution de ��%s��\n"
--
--#: ../src/common/zipstrm.cpp:1357
-+#: ../src/common/zipstrm.cpp:1344
- msgid "can't find central directory in zip"
- msgstr "impossible de trouver le r�pertoire principale dans le zip"
-
--#: ../src/common/file.cpp:427
-+#: ../src/common/file.cpp:429
- #, c-format
- msgid "can't find length of file on file descriptor %d"
- msgstr ""
- "impossible de trouver la taille du fichier dans le descripteur de fichier %d"
-
--#: ../src/msw/utils.cpp:380
-+#: ../src/msw/utils.cpp:367
- msgid "can't find user's HOME, using current directory."
- msgstr ""
- "impossible de trouver le r�pertoire HOME de l'utilisateur - utilisation du "
-@@ -4605,14 +4225,14 @@
- msgstr ""
- "impossible de forcer l'�criture sur disque du descripteur de fichier %d"
-
--#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202
-+#: ../src/common/file.cpp:401 ../src/msw/wince/filefnwce.cpp:202
- #, c-format
- msgid "can't get seek position on file descriptor %d"
- msgstr ""
- "impossible de trouver la position de recherche sur le descripteur de fichier "
- "%d"
-
--#: ../src/common/fontmap.cpp:326
-+#: ../src/common/fontmap.cpp:312
- msgid "can't load any font, aborting"
- msgstr "impossible de charger une police de caract�res - abandon"
-
-@@ -4621,31 +4241,31 @@
- msgid "can't open file '%s'"
- msgstr "impossible d'ouvrir le fichier ��%s��"
-
--#: ../src/common/fileconf.cpp:404
-+#: ../src/common/fileconf.cpp:401
- #, c-format
- msgid "can't open global configuration file '%s'."
- msgstr "impossible d'ouvrir le fichier de configuration global ��%s��."
-
--#: ../src/common/fileconf.cpp:419
-+#: ../src/common/fileconf.cpp:416
- #, c-format
- msgid "can't open user configuration file '%s'."
- msgstr "impossible d'ouvrir le fichier de configuration utilisateur ��%s��."
-
--#: ../src/common/fileconf.cpp:1005
-+#: ../src/common/fileconf.cpp:972
- msgid "can't open user configuration file."
- msgstr "impossible d'ouvrir le fichier de configuration utilisateur."
-
--#: ../src/common/dynlib.cpp:253
-+#: ../src/common/dynlib.cpp:252
- msgid "can't query for GUI plugins name in console applications"
- msgstr ""
- "ne peut chercher des noms de greffon graphique dans les applications en "
- "console"
-
--#: ../src/common/zipstrm.cpp:436
-+#: ../src/common/zipstrm.cpp:432
- msgid "can't re-initialize zlib deflate stream"
- msgstr "impossible de r�initialiser le flux de d�chargement de zlib"
-
--#: ../src/common/zipstrm.cpp:461
-+#: ../src/common/zipstrm.cpp:457
- msgid "can't re-initialize zlib inflate stream"
- msgstr "impossible de r�initialiser le flux de chargement de zlib"
-
-@@ -4654,17 +4274,17 @@
- msgid "can't read from file descriptor %d"
- msgstr "impossible de lire le descripteur de fichier %d"
-
--#: ../src/common/file.cpp:546
-+#: ../src/common/file.cpp:548
- #, c-format
- msgid "can't remove file '%s'"
- msgstr "impossible de supprimer le fichier ��%s��"
-
--#: ../src/common/file.cpp:562
-+#: ../src/common/file.cpp:564
- #, c-format
- msgid "can't remove temporary file '%s'"
- msgstr "impossible de supprimer le fichier temporaire ��%s��"
-
--#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189
-+#: ../src/common/file.cpp:387 ../src/msw/wince/filefnwce.cpp:189
- #, c-format
- msgid "can't seek on file descriptor %d"
- msgstr "recherche impossible sur le descripteur de fichier %d"
-@@ -4679,11 +4299,11 @@
- msgid "can't write to file descriptor %d"
- msgstr "impossible d'�crire dans le descripteur de fichier %d"
-
--#: ../src/common/fileconf.cpp:1016
-+#: ../src/common/fileconf.cpp:983
- msgid "can't write user configuration file."
- msgstr "impossible d'�crire le fichier de configuration utilisateur."
-
--#: ../src/common/intl.cpp:1110
-+#: ../src/common/intl.cpp:1114
- #, c-format
- msgid "catalog file for domain '%s' not found."
- msgstr "fichier catalogue introuvable pour le domaine ��%s��."
-@@ -4704,7 +4324,7 @@
- msgid "ctrl"
- msgstr "ctrl"
-
--#: ../src/common/cmdline.cpp:1094
-+#: ../src/common/cmdline.cpp:1093
- msgid "date"
- msgstr "date"
-
-@@ -4712,7 +4332,7 @@
- msgid "decompression error"
- msgstr "erreur de d�compression"
-
--#: ../src/common/fmapbase.cpp:705 ../src/common/fmapbase.cpp:737
-+#: ../src/common/fmapbase.cpp:695 ../src/common/fmapbase.cpp:727
- msgid "default"
- msgstr "d�faut"
-
-@@ -4720,28 +4340,27 @@
- msgid "delegate has no type info"
- msgstr "Le d�l�gu� n'a pas d'information sur le type"
-
--#: ../src/common/debugrpt.cpp:524
-+#: ../src/common/debugrpt.cpp:502
- msgid "dump of the process state (binary)"
- msgstr "D�charger l'�tat du processus (binaire)"
-
--#: ../src/common/datetime.cpp:3882
-+#: ../src/common/datetime.cpp:3674
- msgid "eighteenth"
- msgstr "dix-huiti�me"
-
--#: ../src/common/datetime.cpp:3872
-+#: ../src/common/datetime.cpp:3664
- msgid "eighth"
- msgstr "huiti�me"
-
--#: ../src/common/datetime.cpp:3875
-+#: ../src/common/datetime.cpp:3667
- msgid "eleventh"
- msgstr "onzi�me"
-
--#: ../src/common/strconv.cpp:2671
--#, c-format
-+#: ../src/common/strconv.cpp:2487
- msgid "encoding %s"
- msgstr "codage %s"
-
--#: ../src/common/fileconf.cpp:1833
-+#: ../src/common/fileconf.cpp:1790
- #, c-format
- msgid "entry '%s' appears more than once in group '%s'"
- msgstr "l'entr�e ��%s�� appara�t plus d'une fois dans le groupe ��%s��"
-@@ -4750,91 +4369,85 @@
- msgid "error in data format"
- msgstr "erreur dans le format des donn�es"
-
--#: ../src/msdos/utilsdos.cpp:407
--#, fuzzy, c-format
--msgid "error opening '%s'"
--msgstr "erreur � l'ouverture du fichier"
--
- #: ../src/html/chm.cpp:332
- msgid "error opening file"
- msgstr "erreur � l'ouverture du fichier"
-
--#: ../src/common/zipstrm.cpp:1442
-+#: ../src/common/zipstrm.cpp:1429
- msgid "error reading zip central directory"
- msgstr "erreur � la lecture du r�pertoire principale du zip"
-
--#: ../src/common/zipstrm.cpp:1520
-+#: ../src/common/zipstrm.cpp:1507
- msgid "error reading zip local header"
- msgstr "erreur � la lecture de l'en-t�te local du zip"
-
--#: ../src/common/zipstrm.cpp:2236
-+#: ../src/common/zipstrm.cpp:2208
- #, c-format
- msgid "error writing zip entry '%s': bad crc or length"
- msgstr "erreur � l'�criture de l'entr�e zip ��%s���: mauvaise crc ou longueur"
-
--#: ../src/msw/dialup.cpp:881
-+#: ../src/msw/dialup.cpp:844
- msgid "establish"
- msgstr "�tablir"
-
--#: ../src/common/ffile.cpp:172
-+#: ../src/common/ffile.cpp:175
- #, c-format
- msgid "failed to flush the file '%s'"
- msgstr "�chec de la mise � jour du fichier ��%s��"
-
--#: ../src/common/datetime.cpp:3879
-+#: ../src/common/datetime.cpp:3671
- msgid "fifteenth"
- msgstr "quinzi�me"
-
--#: ../src/common/datetime.cpp:3869
-+#: ../src/common/datetime.cpp:3661
- msgid "fifth"
- msgstr "cinqui�me"
-
--#: ../src/common/fileconf.cpp:664
-+#: ../src/common/fileconf.cpp:655
- #, c-format
- msgid "file '%s', line %d: '%s' ignored after group header."
--msgstr ""
--"fichier ��%s��, ligne %d�: ��%s�� est ignor� apr�s l'en-t�te de groupe."
-+msgstr "fichier ��%s��, ligne %d�: ��%s�� est ignor� apr�s l'en-t�te de groupe."
-
--#: ../src/common/fileconf.cpp:693
-+#: ../src/common/fileconf.cpp:684
- #, c-format
- msgid "file '%s', line %d: '=' expected."
- msgstr "fichier ��%s��, ligne %d�: symbole ��=�� attendu."
-
--#: ../src/common/fileconf.cpp:716
-+#: ../src/common/fileconf.cpp:707
- #, c-format
- msgid "file '%s', line %d: key '%s' was first found at line %d."
- msgstr ""
- "fichier ��%s��, ligne %d�: premi�re occurrence de la cl� %s � la ligne %d."
-
--#: ../src/common/fileconf.cpp:706
-+#: ../src/common/fileconf.cpp:697
- #, c-format
- msgid "file '%s', line %d: value for immutable key '%s' ignored."
- msgstr ""
- "fichier ��%s��, ligne %d�: valeur pour la touche non configurable ��%s�� "
- "ignor�e."
-
--#: ../src/common/fileconf.cpp:628
-+#: ../src/common/fileconf.cpp:619
- #, c-format
- msgid "file '%s': unexpected character %c at line %d."
- msgstr "fichier %s�: caract�re %c inattendu a la ligne %d."
-
--#: ../src/common/datetime.cpp:3865
-+#: ../src/common/datetime.cpp:3657
- msgid "first"
- msgstr "premier"
-
--#: ../src/html/helpfrm.cpp:1262
-+#: ../src/html/helpfrm.cpp:1239
- msgid "font size"
- msgstr "taille de police"
-
--#: ../src/common/datetime.cpp:3878
-+#: ../src/common/datetime.cpp:3670
- msgid "fourteenth"
- msgstr "quatorzi�me"
-
--#: ../src/common/datetime.cpp:3868
-+#: ../src/common/datetime.cpp:3660
- msgid "fourth"
- msgstr "quatri�me"
-
--#: ../src/common/appbase.cpp:367
-+#: ../src/common/appbase.cpp:350
- msgid "generate verbose log messages"
- msgstr "cr�er des messages de journalisation verbeux"
-
-@@ -4842,57 +4455,57 @@
- msgid "incorrect event handler string, missing dot"
- msgstr "cha�ne de gestion des �v�nements non valable, point manquant"
-
--#: ../src/msw/dialup.cpp:881
-+#: ../src/msw/dialup.cpp:844
- msgid "initiate"
- msgstr "initialiser"
-
--#: ../src/common/file.cpp:459
-+#: ../src/common/file.cpp:461
- msgid "invalid eof() return value."
- msgstr "eof() a renvoy� une valeur non valable."
-
--#: ../src/generic/logg.cpp:1179
-+#: ../src/generic/logg.cpp:1116
- msgid "invalid message box return value"
- msgstr "la bo�te de message a renvoy� une valeur non valable"
-
--#: ../src/common/zipstrm.cpp:1306
-+#: ../src/common/zipstrm.cpp:1293
- msgid "invalid zip file"
- msgstr "fichier zip non valable"
-
--#: ../src/common/fontcmn.cpp:586 ../src/common/fontcmn.cpp:650
-+#: ../src/common/fontcmn.cpp:585 ../src/common/fontcmn.cpp:649
- msgid "italic"
- msgstr "italique"
-
--#: ../src/common/fontcmn.cpp:642
-+#: ../src/common/fontcmn.cpp:641
- msgid "light"
- msgstr "l�ger"
-
--#: ../src/common/fontcmn.cpp:566
-+#: ../src/common/fontcmn.cpp:565
- msgid "light "
- msgstr "l�ger "
-
--#: ../src/common/intl.cpp:1456
-+#: ../src/common/intl.cpp:1461
- #, c-format
- msgid "locale '%s' can not be set."
- msgstr "la locale ��%s�� ne peut pas �tre sp�cifi�e."
-
--#: ../src/common/intl.cpp:1103
-+#: ../src/common/intl.cpp:1109
- #, c-format
- msgid "looking for catalog '%s' in path '%s'."
- msgstr "recherche le catalogue ��%s�� dans ��%s��."
-
--#: ../src/common/datetime.cpp:4029
-+#: ../src/common/datetime.cpp:3821
- msgid "midnight"
- msgstr "minuit"
-
--#: ../src/common/datetime.cpp:3883
-+#: ../src/common/datetime.cpp:3675
- msgid "nineteenth"
- msgstr "dix-neuvi�me"
-
--#: ../src/common/datetime.cpp:3873
-+#: ../src/common/datetime.cpp:3665
- msgid "ninth"
- msgstr "neuvi�me"
-
--#: ../src/msw/dde.cpp:1035
-+#: ../src/msw/dde.cpp:1034
- msgid "no DDE error."
- msgstr "erreur - pas de DDE."
-
-@@ -4904,11 +4517,11 @@
- msgid "noname"
- msgstr "pas de nom"
-
--#: ../src/common/datetime.cpp:4028
-+#: ../src/common/datetime.cpp:3820
- msgid "noon"
- msgstr "midi"
-
--#: ../src/common/cmdline.cpp:1090
-+#: ../src/common/cmdline.cpp:1089
- msgid "num"
- msgstr "num"
-
-@@ -4920,7 +4533,7 @@
- msgid "out of memory"
- msgstr "capacit� m�moire d�pass�e"
-
--#: ../src/common/debugrpt.cpp:500
-+#: ../src/common/debugrpt.cpp:478
- msgid "process context description"
- msgstr "description du contexte du processus"
-
-@@ -4932,21 +4545,21 @@
- msgid "reading"
- msgstr "lecture"
-
--#: ../src/common/zipstrm.cpp:1743
-+#: ../src/common/zipstrm.cpp:1730
- #, c-format
- msgid "reading zip stream (entry %s): bad crc"
- msgstr "lecture du flux zip (entr�e %s)�: mauvaise crc"
-
--#: ../src/common/zipstrm.cpp:1740
-+#: ../src/common/zipstrm.cpp:1727
- #, c-format
- msgid "reading zip stream (entry %s): bad length"
- msgstr "lecture du flux zip (entr�e %s)�: mauvaise longueur"
-
--#: ../src/msw/dde.cpp:1078
-+#: ../src/msw/dde.cpp:1077
- msgid "reentrancy problem."
- msgstr "probl�me de double entr�e."
-
--#: ../src/common/datetime.cpp:3866
-+#: ../src/common/datetime.cpp:3658
- msgid "second"
- msgstr "deuxi�me"
-
-@@ -4954,11 +4567,11 @@
- msgid "seek error"
- msgstr "erreur de recherche"
-
--#: ../src/common/datetime.cpp:3881
-+#: ../src/common/datetime.cpp:3673
- msgid "seventeenth"
- msgstr "dix-septi�me"
-
--#: ../src/common/datetime.cpp:3871
-+#: ../src/common/datetime.cpp:3663
- msgid "seventh"
- msgstr "septi�me"
-
-@@ -4966,15 +4579,15 @@
- msgid "shift"
- msgstr "majuscule"
-
--#: ../src/common/appbase.cpp:357
-+#: ../src/common/appbase.cpp:340
- msgid "show this help message"
- msgstr "montrer ce message d'aide"
-
--#: ../src/common/datetime.cpp:3880
-+#: ../src/common/datetime.cpp:3672
- msgid "sixteenth"
- msgstr "seizi�me"
-
--#: ../src/common/datetime.cpp:3870
-+#: ../src/common/datetime.cpp:3662
- msgid "sixth"
- msgstr "sixi�me"
-
-@@ -4986,66 +4599,66 @@
- msgid "specify the theme to use"
- msgstr "sp�cifier le th�me � utiliser"
-
--#: ../src/common/zipstrm.cpp:1646
-+#: ../src/common/zipstrm.cpp:1633
- msgid "stored file length not in Zip header"
- msgstr "longueur du fichier enregistr� absente de l'en-t�te du Zip"
-
--#: ../src/common/cmdline.cpp:1086
-+#: ../src/common/cmdline.cpp:1085
- msgid "str"
- msgstr "str"
-
--#: ../src/common/datetime.cpp:3874
-+#: ../src/common/datetime.cpp:3666
- msgid "tenth"
- msgstr "dixi�me"
-
--#: ../src/msw/dde.cpp:1042
-+#: ../src/msw/dde.cpp:1041
- msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
- msgstr ""
- "la r�ponse � la transaction a provoqu� la sp�cification du bit DDE_FBUSY."
-
--#: ../src/common/datetime.cpp:3867
-+#: ../src/common/datetime.cpp:3659
- msgid "third"
- msgstr "troisi�me"
-
--#: ../src/common/datetime.cpp:3877
-+#: ../src/common/datetime.cpp:3669
- msgid "thirteenth"
- msgstr "treizi�me"
-
--#: ../src/common/imagtiff.cpp:145 ../src/common/imagtiff.cpp:161
-+#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
- #, c-format
- msgid "tiff module: %s"
- msgstr "module tiff�: %s"
-
--#: ../src/common/datetime.cpp:3694
-+#: ../src/common/datetime.cpp:3486
- msgid "today"
- msgstr "aujourd'hui"
-
--#: ../src/common/datetime.cpp:3696
-+#: ../src/common/datetime.cpp:3488
- msgid "tomorrow"
- msgstr "demain"
-
--#: ../src/common/datetime.cpp:3876
-+#: ../src/common/datetime.cpp:3668
- msgid "twelfth"
- msgstr "douzi�me"
-
--#: ../src/common/datetime.cpp:3884
-+#: ../src/common/datetime.cpp:3676
- msgid "twentieth"
- msgstr "vingti�me"
-
--#: ../src/common/fontcmn.cpp:638
-+#: ../src/common/fontcmn.cpp:637
- msgid "underlined"
- msgstr "soulign�"
-
--#: ../src/common/fontcmn.cpp:553
-+#: ../src/common/fontcmn.cpp:552
- msgid "underlined "
- msgstr "soulign� "
-
--#: ../src/common/fileconf.cpp:1960
-+#: ../src/common/fileconf.cpp:1926
- #, c-format
- msgid "unexpected \" at position %d in '%s'."
- msgstr "symbole \" inattendu � la position %d dans ��%s��."
-
--#: ../src/generic/progdlgg.cpp:307
-+#: ../src/generic/progdlgg.cpp:302
- msgid "unknown"
- msgstr "inconnu"
-
-@@ -5058,7 +4671,7 @@
- msgid "unknown error"
- msgstr "erreur inconnue"
-
--#: ../src/msw/dialup.cpp:494
-+#: ../src/msw/dialup.cpp:457
- #, c-format
- msgid "unknown error (error code %08x)."
- msgstr "erreur inconnue (code d'erreur %08x)."
-@@ -5067,33 +4680,33 @@
- msgid "unknown line terminator"
- msgstr "fin de ligne inconnue"
-
--#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170
-+#: ../src/common/file.cpp:364 ../src/msw/wince/filefnwce.cpp:170
- msgid "unknown seek origin"
- msgstr "origine de la recherche inconnue"
-
--#: ../src/common/fmapbase.cpp:719
-+#: ../src/common/fmapbase.cpp:709
- #, c-format
- msgid "unknown-%d"
- msgstr "inconnu-%d"
-
--#: ../src/common/docview.cpp:430
-+#: ../src/common/docview.cpp:410
- msgid "unnamed"
- msgstr "sans�nom"
-
--#: ../src/common/docview.cpp:1401
-+#: ../src/common/docview.cpp:1362
- #, c-format
- msgid "unnamed%d"
- msgstr "sans�nom�%d"
-
--#: ../src/common/zipstrm.cpp:1660 ../src/common/zipstrm.cpp:2030
-+#: ../src/common/zipstrm.cpp:1647 ../src/common/zipstrm.cpp:2002
- msgid "unsupported Zip compression method"
- msgstr "m�thode de compression zip non g�r�e"
-
--#: ../src/common/zipstrm.cpp:1142
-+#: ../src/common/zipstrm.cpp:1137
- msgid "unsupported zip archive"
- msgstr "archive zip non g�r�e"
-
--#: ../src/common/intl.cpp:1115
-+#: ../src/common/intl.cpp:1119
- #, c-format
- msgid "using catalog '%s' from '%s'."
- msgstr "utilisation du catalogue ��%s�� de ��%s��."
-@@ -5106,20 +4719,20 @@
- msgid "writing"
- msgstr "�criture"
-
--#: ../src/common/stopwatch.cpp:291
-+#: ../src/common/stopwatch.cpp:235
- msgid "wxGetTimeOfDay failed."
- msgstr "wxGetTimeOfDay a �chou�."
-
--#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469
-+#: ../src/common/socket.cpp:414 ../src/common/socket.cpp:468
- #: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506
- msgid "wxSocket: invalid signature in ReadMsg."
- msgstr "wxSocket�: signature non valable dans ReadMsg."
-
--#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006
-+#: ../src/common/socket.cpp:965 ../src/mac/carbon/cfsocket.cpp:1006
- msgid "wxSocket: unknown event!."
- msgstr "wxSocket�: �v�nement inconnu."
-
--#: ../src/motif/app.cpp:214
-+#: ../src/motif/app.cpp:210
- #, c-format
- msgid "wxWidgets could not open display for '%s': exiting."
- msgstr "wxWidgets n'a pas pu ouvrir d'affichage pour %s�: abandon."
-@@ -5128,7 +4741,7 @@
- msgid "wxWidgets could not open display. Exiting."
- msgstr "wxWidgets n'a pas pu ouvrir d'affichage�: abandon."
-
--#: ../src/common/datetime.cpp:3695
-+#: ../src/common/datetime.cpp:3487
- msgid "yesterday"
- msgstr "hier"
-
-@@ -5137,23 +4750,7 @@
- msgid "zlib error %d"
- msgstr "erreur zlib %d"
-
--#: ../src/common/prntbase.cpp:886
-+#: ../src/common/prntbase.cpp:840
- msgid "|<<"
- msgstr "|<<"
-
--#~ msgid ""
--#~ "Failed to get stack backtrace:\n"
--#~ "%s"
--#~ msgstr ""
--#~ "�chec de l'obtention de la pile d'appel�:\n"
--#~ "%s"
--
--#~ msgid "Loading Grey Ascii PNM image is not yet implemented."
--#~ msgstr ""
--#~ "Le chargement d'une image PNM ASCII en niveau de gris n'est pas encore "
--#~ "impl�ment�."
--
--#~ msgid "Loading Grey Raw PNM image is not yet implemented."
--#~ msgstr ""
--#~ "Le chargement d'une image PNM source en niveau de gris n'est pas encore "
--#~ "impl�ment�."
-diff -ur wxGTK-2.6.3/locale/msw/it.po wxGTK-2.6.3.2/locale/msw/it.po
---- wxGTK-2.6.3/locale/msw/it.po 2006-03-21 18:42:54.000000000 -0500
-+++ wxGTK-2.6.3.2/locale/msw/it.po 2005-08-12 11:29:57.000000000 -0400
-@@ -3,8 +3,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: $Id: it.po,v 1.1 2005/08/12 15:29:57 MW Exp $\n"
--"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2005-08-21 17:37+0200\n"
-+"POT-Creation-Date: 2005-08-12 14:23:42+0100\n"
- "PO-Revision-Date: 2005-08-12 14:23:42+0100\n"
- "Last-Translator: Mike Wetherell <mike.wetherell@ntlworld.com>\n"
- "Language-Team: wxWidgets translators <wx-translators@lists.wxwidgets.org>\n"
-@@ -12,4927 +11,6 @@
- "Content-Type: text/plain; charset=iso-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
-
--#: ../src/common/debugrpt.cpp:569
--#, c-format
--msgid "\t%s: %s\n"
--msgstr ""
--
--#: ../src/common/debugrpt.cpp:572
--msgid ""
--"\n"
--"Please send this report to the program maintainer, thank you!\n"
--msgstr ""
--
--#: ../src/palmos/utils.cpp:206
--msgid " "
--msgstr ""
--
--#: ../src/generic/dbgrptg.cpp:312
--msgid " Thank you and we're sorry for the inconvenience!\n"
--msgstr ""
--
--#: ../src/common/log.cpp:321
--#, c-format
--msgid " (error %ld: %s)"
--msgstr ""
--
--#: ../src/common/docview.cpp:1419
--msgid " - "
--msgstr ""
--
--#: ../src/html/htmprint.cpp:570
--msgid " Preview"
--msgstr ""
--
--#: ../src/common/paper.cpp:124
--msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:125
--msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:126
--msgid "#12 Envelope, 4 3/4 x 11 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:127
--msgid "#14 Envelope, 5 x 11 1/2 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:123
--msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:1808
--#: ../contrib/src/deprecated/resource.cpp:1938
--#: ../contrib/src/deprecated/resource.cpp:3026
--#, c-format
--msgid "#define %s must be an integer."
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
--#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
--#, c-format
--msgid "%i of %i"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:288
--#, c-format
--msgid "%ld bytes"
--msgstr ""
--
--#: ../src/common/cmdline.cpp:851
--#, c-format
--msgid "%s (or %s)"
--msgstr ""
--
--#: ../src/generic/logg.cpp:261
--#, c-format
--msgid "%s Error"
--msgstr ""
--
--#: ../src/generic/logg.cpp:269
--#, c-format
--msgid "%s Information"
--msgstr ""
--
--#: ../src/generic/logg.cpp:265
--#, c-format
--msgid "%s Warning"
--msgstr ""
--
--#: ../src/common/fldlgcmn.cpp:81
--#, c-format
--msgid "%s files (%s)|%s"
--msgstr ""
--
--#: ../src/common/msgout.cpp:229
--#, c-format
--msgid "%s message"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:2390
--#, c-format
--msgid "%s not a bitmap resource specification."
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:2544
--#, c-format
--msgid "%s not an icon resource specification."
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:1901
--#: ../contrib/src/deprecated/resource.cpp:2030
--#: ../contrib/src/deprecated/resource.cpp:3123
--#, c-format
--msgid "%s: ill-formed resource file syntax."
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359
--msgid "&About..."
--msgstr ""
--
--#: ../src/common/stockitem.cpp:153
--msgid "&Actual Size"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:108
--msgid "&Apply"
--msgstr ""
--
--#: ../src/msw/mdi.cpp:187
--msgid "&Arrange Icons"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:118
--msgid "&Back"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:109
--msgid "&Bold"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363
--#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:422
--msgid "&Cancel"
--msgstr ""
--
--#: ../src/msw/mdi.cpp:183
--msgid "&Cascade"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:111
--msgid "&Clear"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:875 ../src/common/stockitem.cpp:112
--#: ../src/generic/logg.cpp:509 ../src/html/helpfrm.cpp:354
--msgid "&Close"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:113 ../src/mac/carbon/textctrl.cpp:1074
--#: ../src/msw/textctrl.cpp:2064
--msgid "&Copy"
--msgstr ""
--
--#: ../src/generic/dbgrptg.cpp:320
--msgid "&Debug report preview:"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:115 ../src/mac/carbon/textctrl.cpp:1076
--#: ../src/msw/textctrl.cpp:2066
--msgid "&Delete"
--msgstr ""
--
--#: ../src/generic/logg.cpp:717
--msgid "&Details"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:119
--msgid "&Down"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:361
--msgid "&File"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:116
--msgid "&Find"
--msgstr ""
--
--#: ../src/generic/wizard.cpp:634
--msgid "&Finish"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:273
--msgid "&Font family:"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:120
--msgid "&Forward"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:910
--msgid "&Goto..."
--msgstr ""
--
- # The help menu is called just '?' on Italian versions of Windows
--#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:418
--#: ../src/generic/wizard.cpp:425 ../src/html/helpfrm.cpp:362
- msgid "&Help"
- msgstr "&?"
--
--# The help menu is called just '?' on Italian versions of Windows
--#: ../src/common/stockitem.cpp:123
--#, fuzzy
--msgid "&Home"
--msgstr "&?"
--
--#: ../src/common/stockitem.cpp:125
--msgid "&Index"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:126
--msgid "&Italic"
--msgstr ""
--
--#: ../src/generic/logg.cpp:510
--msgid "&Log"
--msgstr ""
--
--#: ../src/univ/themes/win32.cpp:4923
--msgid "&Move"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:131
--msgid "&New"
--msgstr ""
--
--#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:188
--msgid "&Next"
--msgstr ""
--
--#: ../src/generic/wizard.cpp:421 ../src/generic/wizard.cpp:636
--msgid "&Next >"
--msgstr ""
--
--#: ../src/generic/tipdlg.cpp:243
--msgid "&Next Tip"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:132
--msgid "&No"
--msgstr ""
--
--#: ../src/generic/dbgrptg.cpp:342
--msgid "&Notes:"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368
--#: ../src/generic/fontdlgg.cpp:375
--msgid "&OK"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:134
--msgid "&Open"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:352
--msgid "&Open..."
--msgstr ""
--
--#: ../src/common/stockitem.cpp:135 ../src/mac/carbon/textctrl.cpp:1075
--#: ../src/msw/textctrl.cpp:2065
--msgid "&Paste"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:324
--msgid "&Point size:"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:136
--msgid "&Preferences"
--msgstr ""
--
--#: ../src/generic/mdig.cpp:119 ../src/msw/mdi.cpp:189
--msgid "&Previous"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:137
--msgid "&Print"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:880
--msgid "&Print..."
--msgstr ""
--
--#: ../src/common/stockitem.cpp:139
--msgid "&Properties"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:140
--msgid "&Quit"
--msgstr ""
--
--#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299
--#: ../src/common/stockitem.cpp:141 ../src/mac/carbon/textctrl.cpp:1071
--#: ../src/msw/textctrl.cpp:2061
--msgid "&Redo"
--msgstr ""
--
--#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308
--msgid "&Redo "
--msgstr ""
--
--#: ../src/generic/fdrepdlg.cpp:185
--msgid "&Replace"
--msgstr ""
--
--#: ../src/univ/themes/win32.cpp:4922
--msgid "&Restore"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:145
--msgid "&Save"
--msgstr ""
--
--#: ../src/generic/logg.cpp:505
--msgid "&Save..."
--msgstr ""
--
--#: ../src/generic/tipdlg.cpp:238
--msgid "&Show tips at startup"
--msgstr ""
--
--#: ../src/univ/themes/win32.cpp:4925
--msgid "&Size"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:147
--msgid "&Stop"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:284
--msgid "&Style:"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337
--msgid "&Underline"
--msgstr ""
--
--#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150
--#: ../src/mac/carbon/textctrl.cpp:1070 ../src/msw/textctrl.cpp:2060
--msgid "&Undo"
--msgstr ""
--
--#: ../src/common/cmdproc.cpp:264
--msgid "&Undo "
--msgstr ""
--
--#: ../src/common/stockitem.cpp:151
--msgid "&Unindent"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:121
--msgid "&Up"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:295
--msgid "&Weight:"
--msgstr ""
--
--#: ../src/generic/mdig.cpp:298 ../src/generic/mdig.cpp:314
--#: ../src/generic/mdig.cpp:318 ../src/msw/mdi.cpp:1410 ../src/msw/mdi.cpp:1417
--#: ../src/msw/mdi.cpp:1447
--msgid "&Window"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:152
--msgid "&Yes"
--msgstr ""
--
--#: ../src/common/config.cpp:433 ../src/msw/regconf.cpp:258
--#, c-format
--msgid "'%s' has extra '..', ignored."
--msgstr ""
--
--#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162
--#: ../src/common/valtext.cpp:168
--#, c-format
--msgid "'%s' is invalid"
--msgstr ""
--
--#: ../src/common/cmdline.cpp:769
--#, c-format
--msgid "'%s' is not a correct numeric value for option '%s'."
--msgstr ""
--
--#: ../src/common/intl.cpp:1147
--#, c-format
--msgid "'%s' is not a valid message catalog."
--msgstr ""
--
--#: ../src/common/textbuf.cpp:246
--#, c-format
--msgid "'%s' is probably a binary buffer."
--msgstr ""
--
--#: ../src/common/valtext.cpp:157
--#, c-format
--msgid "'%s' should be numeric."
--msgstr ""
--
--#: ../src/common/valtext.cpp:139
--#, c-format
--msgid "'%s' should only contain ASCII characters."
--msgstr ""
--
--#: ../src/common/valtext.cpp:145
--#, c-format
--msgid "'%s' should only contain alphabetic characters."
--msgstr ""
--
--#: ../src/common/valtext.cpp:151
--#, c-format
--msgid "'%s' should only contain alphabetic or numeric characters."
--msgstr ""
--
--# The help menu is called just '?' on Italian versions of Windows
--#: ../src/html/helpfrm.cpp:976
--#, fuzzy
--msgid "(Help)"
--msgstr "&?"
--
--#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114
--#: ../src/html/helpfrm.cpp:1764
--msgid "(bookmarks)"
--msgstr ""
--
--#: ../src/common/debugrpt.cpp:559
--msgid "*** A debug report has been generated\n"
--msgstr ""
--
--#: ../src/common/debugrpt.cpp:562
--msgid "*** And includes the following files:\n"
--msgstr ""
--
--#: ../src/common/debugrpt.cpp:560
--#, c-format
--msgid "*** It can be found in \"%s\"\n"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:1840
--#: ../contrib/src/deprecated/resource.cpp:1970
--#: ../contrib/src/deprecated/resource.cpp:3062
--msgid ""
--", expected static, #include or #define\n"
--"while parsing resource."
--msgstr ""
--
--#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:740
--msgid "."
--msgstr ""
--
--#: ../src/generic/dirctrlg.cpp:684 ../src/generic/filedlgg.cpp:741
--msgid ".."
--msgstr ""
--
--#: ../src/common/paper.cpp:147
--msgid "10 x 11 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:120
--msgid "10 x 14 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:121
--msgid "11 x 17 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:191
--msgid "12 x 11 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:148
--msgid "15 x 11 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:139
--msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:146
--msgid "9 x 11 in"
--msgstr ""
--
--#: ../src/html/htmprint.cpp:309
--msgid ": file does not exist!"
--msgstr ""
--
--#: ../src/common/fontmap.cpp:200
--msgid ": unknown charset"
--msgstr ""
--
--#: ../src/common/fontmap.cpp:414
--msgid ": unknown encoding"
--msgstr ""
--
--#: ../src/generic/wizard.cpp:427
--msgid "< &Back"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:892
--msgid "<<"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:259 ../src/generic/filedlgg.cpp:282
--msgid "<DIR>"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:263 ../src/generic/filedlgg.cpp:286
--msgid "<DRIVE>"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:261 ../src/generic/filedlgg.cpp:284
--msgid "<LINK>"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1276
--msgid "<b><i>Bold italic face.</i></b><br>"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1280
--msgid "<b><i>bold italic <u>underlined</u></i></b><br>"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1275
--msgid "<b>Bold face.</b> "
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1274
--msgid "<i>Italic face.</i> "
--msgstr ""
--
--#: ../src/common/prntbase.cpp:898
--msgid ">>"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:904
--msgid ">>|"
--msgstr ""
--
--#: ../src/generic/dbgrptg.cpp:304
--msgid "A debug report has been generated in the directory\n"
--msgstr ""
--
--#: ../src/common/xtixml.cpp:409
--msgid "A non empty collection must consist of 'element' nodes"
--msgstr ""
--
--#: ../src/common/paper.cpp:166
--msgid "A2 420 x 594 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:163
--msgid "A3 Extra 322 x 445 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:168
--msgid "A3 Extra Transverse 322 x 445 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:177
--msgid "A3 Rotated 420 x 297 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:167
--msgid "A3 Transverse 297 x 420 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:113
--msgid "A3 sheet, 297 x 420 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:153
--msgid "A4 Extra 9.27 x 12.69 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:160
--msgid "A4 Plus 210 x 330 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:178
--msgid "A4 Rotated 297 x 210 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:155
--msgid "A4 Transverse 210 x 297 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:104
--msgid "A4 sheet, 210 x 297 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:114
--msgid "A4 small sheet, 210 x 297 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:164
--msgid "A5 Extra 174 x 235 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:179
--msgid "A5 Rotated 210 x 148 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:161
--msgid "A5 Transverse 148 x 210 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:115
--msgid "A5 sheet, 148 x 210 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:171
--msgid "A6 105 x 148 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:184
--msgid "A6 Rotated 148 x 105 mm"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:87
--msgid "ABCDEFGabcdefg12345"
--msgstr ""
--
--#: ../src/common/ftp.cpp:385
--msgid "ASCII"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:107
--msgid "Add"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:444
--msgid "Add current page to bookmarks"
--msgstr ""
--
--#: ../src/generic/colrdlgg.cpp:299
--msgid "Add to custom colours"
--msgstr ""
--
--#: ../include/wx/xti.h:902
--msgid "AddToPropertyCollection called on a generic accessor"
--msgstr ""
--
--#: ../include/wx/xti.h:849
--msgid "AddToPropertyCollection called w/o valid adder"
--msgstr ""
--
--#: ../src/html/helpctrl.cpp:106
--#, c-format
--msgid "Adding book %s"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:129
--msgid "Align Left"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:130
--msgid "Align Right"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:209
--msgid "All"
--msgstr ""
--
--#: ../src/common/fldlgcmn.cpp:64
--#, c-format
--msgid "All files (%s)|%s"
--msgstr ""
--
--#: ../include/wx/defs.h:2302
--msgid "All files (*)|*"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1578
--msgid "All files (*.*)|*"
--msgstr ""
--
--#: ../include/wx/defs.h:2299
--msgid "All files (*.*)|*.*"
--msgstr ""
--
--#: ../src/common/xtistrm.cpp:385
--msgid "Already Registered Object passed to SetObjectClassInfo"
--msgstr ""
--
--#: ../src/unix/dialup.cpp:362
--msgid "Already dialling ISP."
--msgstr ""
--
--#: ../src/generic/logg.cpp:1163
--#, c-format
--msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:109
--msgid "Arabic (ISO-8859-6)"
--msgstr ""
--
--#: ../src/html/chm.cpp:564
--msgid "Archive doesnt contain #SYSTEM file"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:440
--msgid "Attributes"
--msgstr ""
--
--#: ../src/common/paper.cpp:144
--msgid "B4 (ISO) 250 x 353 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:180
--msgid "B4 (JIS) Rotated 364 x 257 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:134
--msgid "B4 Envelope, 250 x 353 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:116
--msgid "B4 sheet, 250 x 354 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:165
--msgid "B5 (ISO) Extra 201 x 276 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:181
--msgid "B5 (JIS) Rotated 257 x 182 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:162
--msgid "B5 (JIS) Transverse 182 x 257 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:135
--msgid "B5 Envelope, 176 x 250 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:117
--msgid "B5 sheet, 182 x 257 millimeter"
--msgstr ""
--
--#: ../src/common/paper.cpp:189
--msgid "B6 (JIS) 128 x 182 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:190
--msgid "B6 (JIS) Rotated 182 x 128 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:136
--msgid "B6 Envelope, 176 x 125 mm"
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493
--msgid "BMP: Couldn't allocate memory."
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:94
--msgid "BMP: Couldn't save invalid image."
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:298
--msgid "BMP: Couldn't write RGB color map."
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:431
--msgid "BMP: Couldn't write data."
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:203
--msgid "BMP: Couldn't write the file (Bitmap) header."
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:224
--msgid "BMP: Couldn't write the file (BitmapInfo) header."
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:128
--msgid "BMP: wxImage doesn't have own wxPalette."
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:116
--msgid "Baltic (ISO-8859-13)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:107
--msgid "Baltic (old) (ISO-8859-4)"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:2524
--#, c-format
--msgid "Bitmap resource specification %s not found."
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:237
--msgid "Bold"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:892
--msgid "Bottom margin (mm):"
--msgstr ""
--
--#: ../src/common/paper.cpp:105
--msgid "C sheet, 17 x 22 in"
--msgstr ""
--
--#: ../src/generic/logg.cpp:507
--msgid "C&lear"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:308
--msgid "C&olour:"
--msgstr ""
--
--#: ../src/common/paper.cpp:130
--msgid "C3 Envelope, 324 x 458 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:131
--msgid "C4 Envelope, 229 x 324 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:129
--msgid "C5 Envelope, 162 x 229 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:132
--msgid "C6 Envelope, 114 x 162 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:133
--msgid "C65 Envelope, 114 x 229 mm"
--msgstr ""
--
--#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856
--msgid "CHM handler currently supports only local files!"
--msgstr ""
--
--#: ../src/os2/thread.cpp:117
--msgid "Can not create mutex."
--msgstr ""
--
--#: ../src/common/filefn.cpp:1297
--#, c-format
--msgid "Can not enumerate files '%s'"
--msgstr ""
--
--#: ../src/msw/dir.cpp:205 ../src/unix/dir.cpp:232
--#, c-format
--msgid "Can not enumerate files in directory '%s'"
--msgstr ""
--
--#: ../src/os2/thread.cpp:519
--#, c-format
--msgid "Can not resume thread %lu"
--msgstr ""
--
--#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:827
--#, c-format
--msgid "Can not resume thread %x"
--msgstr ""
--
--#: ../src/msw/thread.cpp:498
--msgid "Can not start thread: error writing TLS."
--msgstr ""
--
--#: ../src/os2/thread.cpp:505
--#, c-format
--msgid "Can not suspend thread %lu"
--msgstr ""
--
--#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:812
--#, c-format
--msgid "Can not suspend thread %x"
--msgstr ""
--
--#: ../src/msw/thread.cpp:725
--msgid "Can not wait for thread termination"
--msgstr ""
--
--#: ../src/common/cmdproc.cpp:266
--msgid "Can't &Undo "
--msgstr ""
--
--#: ../src/common/image.cpp:1939
--#, c-format
--msgid "Can't check image format of file '%s': file does not exist."
--msgstr ""
--
--#: ../src/msw/registry.cpp:442
--#, c-format
--msgid "Can't close registry key '%s'"
--msgstr ""
--
--#: ../src/msw/registry.cpp:518
--#, c-format
--msgid "Can't copy values of unsupported type %d."
--msgstr ""
--
--#: ../src/msw/registry.cpp:423
--#, c-format
--msgid "Can't create registry key '%s'"
--msgstr ""
--
--#: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100
--#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594
--#: ../src/os2/thread.cpp:486
--msgid "Can't create thread"
--msgstr ""
--
--#: ../src/msw/window.cpp:3130
--#, c-format
--msgid "Can't create window of class %s"
--msgstr ""
--
--#: ../src/msw/registry.cpp:694
--#, c-format
--msgid "Can't delete key '%s'"
--msgstr ""
--
--#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:458
--#, c-format
--msgid "Can't delete the INI file '%s'"
--msgstr ""
--
--#: ../src/msw/registry.cpp:722
--#, c-format
--msgid "Can't delete value '%s' from key '%s'"
--msgstr ""
--
--#: ../src/msw/registry.cpp:1071
--#, c-format
--msgid "Can't enumerate subkeys of key '%s'"
--msgstr ""
--
--#: ../src/msw/registry.cpp:1026
--#, c-format
--msgid "Can't enumerate values of key '%s'"
--msgstr ""
--
--#: ../src/msw/registry.cpp:1288
--#, c-format
--msgid "Can't export value of unsupported type %d."
--msgstr ""
--
--#: ../src/common/ffile.cpp:238
--#, c-format
--msgid "Can't find current position in file '%s'"
--msgstr ""
--
--#: ../src/msw/registry.cpp:351
--#, c-format
--msgid "Can't get info about registry key '%s'"
--msgstr ""
--
--#: ../src/common/zstream.cpp:237
--msgid "Can't initialize zlib deflate stream."
--msgstr ""
--
--#: ../src/common/zstream.cpp:99
--msgid "Can't initialize zlib inflate stream."
--msgstr ""
--
--#: ../src/common/image.cpp:1367 ../src/common/image.cpp:1387
--#, c-format
--msgid "Can't load image from file '%s': file does not exist."
--msgstr ""
--
--#: ../src/msw/registry.cpp:387
--#, c-format
--msgid "Can't open registry key '%s'"
--msgstr ""
--
--#: ../src/common/zstream.cpp:166
--#, c-format
--msgid "Can't read from inflate stream: %s"
--msgstr ""
--
--#: ../src/common/zstream.cpp:159
--msgid "Can't read inflate stream: unexpected EOF in underlying stream."
--msgstr ""
--
--#: ../src/msw/registry.cpp:960
--#, c-format
--msgid "Can't read value of '%s'"
--msgstr ""
--
--#: ../src/msw/registry.cpp:795 ../src/msw/registry.cpp:825
--#: ../src/msw/registry.cpp:885
--#, c-format
--msgid "Can't read value of key '%s'"
--msgstr ""
--
--#: ../src/common/image.cpp:1409
--#, c-format
--msgid "Can't save image to file '%s': unknown extension."
--msgstr ""
--
--#: ../src/generic/logg.cpp:569 ../src/generic/logg.cpp:1020
--msgid "Can't save log contents to file."
--msgstr ""
--
--#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:469
--msgid "Can't set thread priority"
--msgstr ""
--
--#: ../src/msw/registry.cpp:812 ../src/msw/registry.cpp:854
--#: ../src/msw/registry.cpp:975
--#, c-format
--msgid "Can't set value of '%s'"
--msgstr ""
--
--#: ../src/common/zstream.cpp:316
--#, c-format
--msgid "Can't write to deflate stream: %s"
--msgstr ""
--
--#: ../src/generic/choicdgg.cpp:291 ../src/generic/dirdlgg.cpp:114
--#: ../src/generic/numdlgg.cpp:136 ../src/generic/textdlgg.cpp:120
--#: ../src/gtk/fontdlg.cpp:155 ../src/motif/msgdlg.cpp:204
--#: ../contrib/src/deprecated/proplist.cpp:518
--msgid "Cancel"
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:1188 ../src/xrc/xmlres.cpp:1236
--msgid "Cannot convert dialog units: dialog unknown."
--msgstr ""
--
--#: ../src/common/strconv.cpp:2665
--#, c-format
--msgid "Cannot convert from the charset '%s'!"
--msgstr ""
--
--#: ../src/msw/dialup.cpp:546
--#, c-format
--msgid "Cannot find active dialup connection: %s"
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:330
--#, c-format
--msgid "Cannot find container for unknown control '%s'."
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:1271
--#, c-format
--msgid "Cannot find font node '%s'."
--msgstr ""
--
--#: ../src/msw/dialup.cpp:851
--msgid "Cannot find the location of address book file"
--msgstr ""
--
--#: ../src/unix/threadpsx.cpp:1100
--#, c-format
--msgid "Cannot get priority range for scheduling policy %d."
--msgstr ""
--
--#: ../src/unix/utilsunx.cpp:775
--msgid "Cannot get the hostname"
--msgstr ""
--
--#: ../src/unix/utilsunx.cpp:811
--msgid "Cannot get the official hostname"
--msgstr ""
--
--#: ../src/msw/dialup.cpp:945
--msgid "Cannot hang up - no active dialup connection."
--msgstr ""
--
--#: ../include/wx/msw/ole/oleutils.h:47
--msgid "Cannot initialize OLE"
--msgstr ""
--
--#: ../src/mgl/app.cpp:286
--msgid "Cannot initialize SciTech MGL!"
--msgstr ""
--
--#: ../src/mgl/window.cpp:546
--msgid "Cannot initialize display."
--msgstr ""
--
--#: ../src/msw/volume.cpp:601
--#, c-format
--msgid "Cannot load icon from '%s'."
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:453
--#, c-format
--msgid "Cannot load resources from file '%s'."
--msgstr ""
--
--#: ../src/html/htmlfilt.cpp:164
--#, c-format
--msgid "Cannot open HTML document: %s"
--msgstr ""
--
--#: ../src/html/helpdata.cpp:672
--#, c-format
--msgid "Cannot open HTML help book: %s"
--msgstr ""
--
--#: ../src/generic/helpext.cpp:123
--#, c-format
--msgid "Cannot open URL '%s'"
--msgstr ""
--
--#: ../src/html/helpdata.cpp:312
--#, c-format
--msgid "Cannot open contents file: %s"
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:421
--#, c-format
--msgid "Cannot open file '%s'."
--msgstr ""
--
--#: ../src/generic/dcpsg.cpp:1569
--msgid "Cannot open file for PostScript printing!"
--msgstr ""
--
--#: ../src/html/helpdata.cpp:326
--#, c-format
--msgid "Cannot open index file: %s"
--msgstr ""
--
--#: ../src/common/intl.cpp:1203
--#, c-format
--msgid "Cannot parse Plural-Forms:'%s'"
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:1172
--#, c-format
--msgid "Cannot parse coordinates from '%s'."
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:1220
--#, c-format
--msgid "Cannot parse dimension from '%s'."
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1562
--msgid "Cannot print empty page."
--msgstr ""
--
--#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
--#, c-format
--msgid "Cannot read typename from '%s'!"
--msgstr ""
--
--#: ../src/unix/threadpsx.cpp:1081
--msgid "Cannot retrieve thread scheduling policy."
--msgstr ""
--
--#: ../src/unix/threadpsx.cpp:729
--msgid "Cannot start thread: error writing TLS"
--msgstr ""
--
--#: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174
--msgid "Cannot wait for thread termination."
--msgstr ""
--
--#: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082
--msgid "Cant create the thread event queue"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:534
--msgid "Case sensitive"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:117
--msgid "Celtic (ISO-8859-14)"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:127
--msgid "Centered"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:105
--msgid "Central European (ISO-8859-2)"
--msgstr ""
--
--#: ../src/msw/dialup.cpp:786
--msgid "Choose ISP to dial"
--msgstr ""
--
--#: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45
--#: ../src/palmos/colordlg.cpp:79
--msgid "Choose colour"
--msgstr ""
--
--#: ../src/gtk/fontdlg.cpp:133
--msgid "Choose font"
--msgstr ""
--
--#: ../src/generic/mdig.cpp:115
--msgid "Cl&ose"
--msgstr ""
--
--#: ../src/generic/logg.cpp:507
--msgid "Clear the log contents"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384
--msgid "Click to cancel the font selection."
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372
--#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379
--msgid "Click to confirm the font selection."
--msgstr ""
--
--#: ../src/generic/dbgrptg.cpp:92 ../src/generic/progdlgg.cpp:629
--#: ../src/generic/progdlgg.cpp:634 ../contrib/src/deprecated/proplist.cpp:513
--msgid "Close"
--msgstr ""
--
--#: ../src/univ/themes/win32.cpp:4931
--msgid "Close\tAlt-F4"
--msgstr ""
--
--#: ../src/generic/mdig.cpp:116
--msgid "Close All"
--msgstr ""
--
--#: ../src/generic/logg.cpp:509
--msgid "Close this window"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1576
--msgid "Compressed HTML Help file (*.chm)|*.chm|"
--msgstr ""
--
--#: ../src/generic/dirctrlg.cpp:590
--msgid "Computer"
--msgstr ""
--
--#: ../src/common/fileconf.cpp:962
--#, c-format
--msgid "Config entry name cannot start with '%c'."
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:1318 ../src/gtk/filedlg.cpp:67
--msgid "Confirm"
--msgstr ""
--
--#: ../src/msw/mimetype.cpp:678
--msgid "Confirm registry update"
--msgstr ""
--
--#: ../src/html/htmlwin.cpp:386
--msgid "Connecting..."
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:476
--msgid "Contents"
--msgstr ""
--
--#: ../src/common/strconv.cpp:1416
--#, c-format
--msgid "Conversion to charset '%s' doesn't work."
--msgstr ""
--
--#: ../src/html/htmlwin.cpp:824
--#, c-format
--msgid "Copied to clipboard:\"%s\""
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:242
--msgid "Copies:"
--msgstr ""
--
--#: ../src/html/chm.cpp:703
--#, c-format
--msgid "Could not create temporary file '%s'"
--msgstr ""
--
--#: ../src/html/chm.cpp:274
--#, c-format
--msgid "Could not extract %s into %s: %s"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:1830
--#: ../contrib/src/deprecated/resource.cpp:1960
--#, c-format
--msgid "Could not find resource include file %s."
--msgstr ""
--
--#: ../src/generic/tabg.cpp:1048
--msgid "Could not find tab for id"
--msgstr ""
--
--#: ../src/html/chm.cpp:445
--#, c-format
--msgid "Could not locate file '%s'."
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:829
--#, c-format
--msgid ""
--"Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
--" or provide #define (see manual for caveats)"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:1278
--#, c-format
--msgid ""
--"Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
--"or provide #define (see manual for caveats)"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:1272
--msgid "Could not start document preview."
--msgstr ""
--
--#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:763
--#: ../src/msw/printwin.cpp:235
--msgid "Could not start printing."
--msgstr ""
--
--#: ../src/common/wincmn.cpp:1498
--msgid "Could not transfer data to window"
--msgstr ""
--
--#: ../src/mac/carbon/mpthread.cpp:227 ../src/mac/carbon/mpthread.cpp:306
--#: ../src/mac/carbon/thread.cpp:414 ../src/mac/carbon/thread.cpp:495
--msgid "Could not unlock mutex"
--msgstr ""
--
--#: ../src/os2/thread.cpp:150
--msgid "Couldn't acquire a mutex lock"
--msgstr ""
--
--#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
--#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176
--#: ../src/msw/imaglist.cpp:188
--msgid "Couldn't add an image to the image list."
--msgstr ""
--
--#: ../src/msw/timer.cpp:106 ../src/os2/timer.cpp:155
--msgid "Couldn't create a timer"
--msgstr ""
--
--#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166
--msgid "Couldn't create cursor."
--msgstr ""
--
--#: ../src/common/dynlib.cpp:199
--#, c-format
--msgid "Couldn't find symbol '%s' in a dynamic library"
--msgstr ""
--
--#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:853
--msgid "Couldn't get the current thread pointer"
--msgstr ""
--
--#: ../src/common/imagpng.cpp:596
--msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
--msgstr ""
--
--#: ../src/unix/sound.cpp:472
--#, c-format
--msgid "Couldn't load sound data from '%s'."
--msgstr ""
--
--#: ../src/unix/sound_sdl.cpp:230
--#, c-format
--msgid "Couldn't open audio: %s"
--msgstr ""
--
--#: ../src/msw/ole/dataobj.cpp:147
--#, c-format
--msgid "Couldn't register clipboard format '%s'."
--msgstr ""
--
--#: ../src/os2/thread.cpp:167
--msgid "Couldn't release a mutex"
--msgstr ""
--
--#: ../src/msw/listctrl.cpp:745
--#, c-format
--msgid "Couldn't retrieve information about list control item %d."
--msgstr ""
--
--#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651
--#: ../src/common/imagpng.cpp:659
--msgid "Couldn't save PNG image."
--msgstr ""
--
--#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611
--msgid "Couldn't terminate thread"
--msgstr ""
--
--#: ../src/common/xtistrm.cpp:161
--msgid "Create Parameter not found in declared RTTI Parameters"
--msgstr ""
--
--#: ../src/generic/dirdlgg.cpp:307
--msgid "Create directory"
--msgstr ""
--
--#: ../src/generic/dirdlgg.cpp:140 ../src/generic/filedlgg.cpp:999
--msgid "Create new directory"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:114 ../src/mac/carbon/textctrl.cpp:1073
--#: ../src/msw/textctrl.cpp:2063
--msgid "Cu&t"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:1010
--msgid "Current directory:"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:108
--msgid "Cyrillic (ISO-8859-5)"
--msgstr ""
--
--#: ../src/common/paper.cpp:106
--msgid "D sheet, 22 x 34 in"
--msgstr ""
--
--#: ../src/msw/dde.cpp:631
--msgid "DDE poke request failed"
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:921
--msgid "DIB Header: Encoding doesn't match bitdepth."
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:883
--msgid "DIB Header: Image height > 32767 pixels for file."
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:877
--msgid "DIB Header: Image width > 32767 pixels for file."
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:897
--msgid "DIB Header: Unknown bitdepth in file."
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:907
--msgid "DIB Header: Unknown encoding in file."
--msgstr ""
--
--#: ../src/common/paper.cpp:128
--msgid "DL Envelope, 110 x 220 mm"
--msgstr ""
--
--#: ../src/generic/dbgrptg.cpp:295
--#, c-format
--msgid "Debug report \"%s\""
--msgstr ""
--
--#: ../src/common/debugrpt.cpp:203
--msgid "Debug report couldn't be created."
--msgstr ""
--
--#: ../src/common/debugrpt.cpp:539
--msgid "Debug report generation has failed."
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:227
--msgid "Decorative"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:681
--msgid "Default encoding"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:506
--msgid "Default printer"
--msgstr ""
--
--#: ../contrib/src/gizmos/editlbox.cpp:160
--msgid "Delete item"
--msgstr ""
--
--#: ../src/unix/snglinst.cpp:300
--#, c-format
--msgid "Deleted stale lock file '%s'."
--msgstr ""
--
--#: ../src/generic/dirctrlg.cpp:656
--msgid "Desktop"
--msgstr ""
--
--#: ../src/msw/dialup.cpp:395
--msgid ""
--"Dial up functions are unavailable because the remote access service (RAS) is "
--"not installed on this machine. Please install it."
--msgstr ""
--
--#: ../src/generic/tipdlg.cpp:246
--msgid "Did you know..."
--msgstr ""
--
--#: ../src/motif/filedlg.cpp:225
--msgid "Directories"
--msgstr ""
--
--#: ../src/common/filefn.cpp:1177
--#, c-format
--msgid "Directory '%s' couldn't be created"
--msgstr ""
--
--#: ../src/mgl/dirmgl.cpp:217
--#, c-format
--msgid "Directory '%s' doesn't exist!"
--msgstr ""
--
--#: ../src/generic/dirdlgg.cpp:226
--msgid "Directory does not exist"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:1295
--msgid "Directory doesn't exist."
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:503
--msgid ""
--"Display all index items that contain given substring. Search is case "
--"insensitive."
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:685
--msgid "Display options dialog"
--msgstr ""
--
--#: ../src/msw/mimetype.cpp:671
--msgid ""
--"Do you want to overwrite the command used to %s files with extension \"%s"
--"\" ?\n"
--"Current value is \n"
--"%s, \n"
--"New value is \n"
--"%s %1"
--msgstr ""
--
--#: ../src/common/docview.cpp:464
--#, c-format
--msgid "Do you want to save changes to document %s?"
--msgstr ""
--
--#: ../src/common/sizer.cpp:1839
--msgid "Don't Save"
--msgstr ""
--
--#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211
--msgid "Done"
--msgstr ""
--
--#: ../src/generic/progdlgg.cpp:433
--msgid "Done."
--msgstr ""
--
--#: ../src/common/paper.cpp:183
--msgid "Double Japanese Postcard Rotated 148 x 200 mm"
--msgstr ""
--
--#: ../src/common/xtixml.cpp:271
--#, c-format
--msgid "Doubly used id : %d"
--msgstr ""
--
--#: ../src/generic/fdrepdlg.cpp:158
--msgid "Down"
--msgstr ""
--
--#: ../src/common/paper.cpp:107
--msgid "E sheet, 34 x 44 in"
--msgstr ""
--
--#: ../contrib/src/gizmos/editlbox.cpp:158
--msgid "Edit item"
--msgstr ""
--
--#: ../src/generic/progdlgg.cpp:194
--msgid "Elapsed time : "
--msgstr ""
--
--#: ../src/common/prntbase.cpp:846
--#, c-format
--msgid "Enter a page number between %d and %d:"
--msgstr ""
--
--#: ../src/generic/dbgrptg.cpp:169
--#, c-format
--msgid "Enter command to open file \"%s\":"
--msgstr ""
--
--#: ../src/generic/helpext.cpp:443
--msgid "Entries found"
--msgstr ""
--
--#: ../src/common/paper.cpp:149
--msgid "Envelope Invite 220 x 220 mm"
--msgstr ""
--
--#: ../src/common/config.cpp:384
--#, c-format
--msgid ""
--"Environment variables expansion failed: missing '%c' at position %u in '%s'."
--msgstr ""
--
--#: ../src/generic/dirctrlg.cpp:689 ../src/generic/dirctrlg.cpp:707
--#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
--#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:744
--#: ../src/generic/filedlgg.cpp:758 ../src/generic/filedlgg.cpp:772
--#: ../src/generic/filedlgg.cpp:1269 ../src/generic/filedlgg.cpp:1295
--#: ../src/generic/filedlgg.cpp:1325 ../src/gtk/fontdlg.cpp:81
--msgid "Error"
--msgstr ""
--
--#: ../src/msdos/utilsdos.cpp:213 ../src/unix/utilsunx.cpp:1090
--#: ../src/unix/utilsunx.cpp:1098
--msgid "Error "
--msgstr ""
--
--#: ../src/generic/dirdlgg.cpp:241
--msgid "Error creating directory"
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:930
--msgid "Error in reading image DIB ."
--msgstr ""
--
--#: ../src/common/fileconf.cpp:504
--msgid "Error reading config options."
--msgstr ""
--
--#: ../src/common/fileconf.cpp:1050
--msgid "Error saving user configuration data."
--msgstr ""
--
--#: ../src/mac/carbon/mpthread.cpp:482 ../src/mac/carbon/thread.cpp:672
--msgid "Error while waiting on semaphore"
--msgstr ""
--
--#: ../src/common/log.cpp:476
--msgid "Error: "
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:106
--msgid "Esperanto (ISO-8859-3)"
--msgstr ""
--
--#: ../src/generic/progdlgg.cpp:202
--msgid "Estimated time : "
--msgstr ""
--
--#: ../src/generic/dbgrptg.cpp:229
--msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||"
--msgstr ""
--
--#: ../src/msw/utilsexc.cpp:753
--#, c-format
--msgid "Execution of command '%s' failed"
--msgstr ""
--
--#: ../src/os2/utilsexc.cpp:165
--#, c-format
--msgid "Execution of command '%s' failed with error: %ul"
--msgstr ""
--
--#: ../src/common/paper.cpp:112
--msgid "Executive, 7 1/4 x 10 1/2 in"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:1869
--#: ../contrib/src/deprecated/resource.cpp:1999
--#: ../contrib/src/deprecated/resource.cpp:3091
--msgid "Expected '*' while parsing resource."
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:1886
--#: ../contrib/src/deprecated/resource.cpp:2015
--#: ../contrib/src/deprecated/resource.cpp:3108
--msgid "Expected '=' while parsing resource."
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:1855
--#: ../contrib/src/deprecated/resource.cpp:1985
--#: ../contrib/src/deprecated/resource.cpp:3077
--msgid "Expected 'char' while parsing resource."
--msgstr ""
--
--#: ../src/msw/registry.cpp:1140
--#, c-format
--msgid ""
--"Exporting registry key: file \"%s\" already exists and won't be overwritten."
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:143
--msgid "Extended Unix Codepage for Japanese (EUC-JP)"
--msgstr ""
--
--#: ../src/html/chm.cpp:710
--#, c-format
--msgid "Extraction of '%s' into '%s' failed."
--msgstr ""
--
--#: ../src/msw/dialup.cpp:880
--#, c-format
--msgid "Failed to %s dialup connection: %s"
--msgstr ""
--
--#: ../src/unix/snglinst.cpp:274
--msgid "Failed to access lock file."
--msgstr ""
--
--#: ../src/msw/dib.cpp:563
--#, c-format
--msgid "Failed to allocated %luKb of memory for bitmap data."
--msgstr ""
--
--#: ../src/unix/displayx11.cpp:224
--msgid "Failed to change video mode"
--msgstr ""
--
--#: ../src/common/debugrpt.cpp:237
--#, c-format
--msgid "Failed to clean up debug report directory \"%s\""
--msgstr ""
--
--#: ../src/common/filename.cpp:191
--msgid "Failed to close file handle"
--msgstr ""
--
--#: ../src/unix/snglinst.cpp:339
--#, c-format
--msgid "Failed to close lock file '%s'"
--msgstr ""
--
--#: ../src/msw/clipbrd.cpp:119
--msgid "Failed to close the clipboard."
--msgstr ""
--
--#: ../src/msw/dialup.cpp:820
--msgid "Failed to connect: missing username/password."
--msgstr ""
--
--#: ../src/msw/dialup.cpp:766
--msgid "Failed to connect: no ISP to dial."
--msgstr ""
--
--#: ../src/msw/registry.cpp:626
--#, c-format
--msgid "Failed to copy registry value '%s'"
--msgstr ""
--
--#: ../src/msw/registry.cpp:635
--#, c-format
--msgid "Failed to copy the contents of registry key '%s' to '%s'."
--msgstr ""
--
--#: ../src/common/filefn.cpp:1003
--#, c-format
--msgid "Failed to copy the file '%s' to '%s'"
--msgstr ""
--
--#: ../src/msw/registry.cpp:613
--#, c-format
--msgid "Failed to copy the registry subkey '%s' to '%s'."
--msgstr ""
--
--#: ../src/msw/dde.cpp:989
--msgid "Failed to create DDE string"
--msgstr ""
--
--#: ../src/msw/mdi.cpp:473
--msgid "Failed to create MDI parent frame."
--msgstr ""
--
--#: ../src/msw/statbr95.cpp:112
--msgid "Failed to create a status bar."
--msgstr ""
--
--#: ../src/common/filename.cpp:766
--msgid "Failed to create a temporary file name"
--msgstr ""
--
--#: ../src/msw/utilsexc.cpp:227
--msgid "Failed to create an anonymous pipe"
--msgstr ""
--
--#: ../src/msw/dde.cpp:447
--#, c-format
--msgid "Failed to create connection to server '%s' on topic '%s'"
--msgstr ""
--
--#: ../src/msw/cursor.cpp:218
--msgid "Failed to create cursor."
--msgstr ""
--
--#: ../src/common/debugrpt.cpp:202
--#, c-format
--msgid "Failed to create directory \"%s\""
--msgstr ""
--
--#: ../src/unix/mimetype.cpp:370
--#, c-format
--msgid "Failed to create directory %s/.gnome."
--msgstr ""
--
--#: ../src/unix/mimetype.cpp:379
--#, c-format
--msgid "Failed to create directory %s/mime-info."
--msgstr ""
--
--#: ../src/generic/dirdlgg.cpp:239
--#, c-format
--msgid ""
--"Failed to create directory '%s'\n"
--"(Do you have the required permissions?)"
--msgstr ""
--
--#: ../src/msw/mimetype.cpp:193
--#, c-format
--msgid "Failed to create registry entry for '%s' files."
--msgstr ""
--
--#: ../src/msw/fdrepdlg.cpp:474
--#, c-format
--msgid "Failed to create the standard find/replace dialog (error code %d)"
--msgstr ""
--
--#: ../src/html/winpars.cpp:549
--#, c-format
--msgid "Failed to display HTML document in %s encoding"
--msgstr ""
--
--#: ../src/mac/carbon/clipbrd.cpp:194 ../src/mac/classic/clipbrd.cpp:185
--#: ../src/msw/clipbrd.cpp:131
--msgid "Failed to empty the clipboard."
--msgstr ""
--
--#: ../src/unix/displayx11.cpp:201
--msgid "Failed to enumerate video modes"
--msgstr ""
--
--#: ../src/msw/dde.cpp:650
--msgid "Failed to establish an advise loop with DDE server"
--msgstr ""
--
--#: ../src/msw/dialup.cpp:658
--#, c-format
--msgid "Failed to establish dialup connection: %s"
--msgstr ""
--
--#: ../src/unix/utilsunx.cpp:508 ../src/unix/utilsunx.cpp:524
--#, c-format
--msgid "Failed to execute '%s'\n"
--msgstr ""
--
--#: ../src/common/debugrpt.cpp:666
--msgid "Failed to execute curl, please install it in PATH."
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:2489
--#, c-format
--msgid ""
--"Failed to find XBM resource %s.\n"
--"Forgot to use wxResourceLoadBitmapData?"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:2643
--#, c-format
--msgid ""
--"Failed to find XBM resource %s.\n"
--"Forgot to use wxResourceLoadIconData?"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:2504
--#, c-format
--msgid ""
--"Failed to find XPM resource %s.\n"
--"Forgot to use wxResourceLoadBitmapData?"
--msgstr ""
--
--#: ../src/msw/dialup.cpp:718
--#, c-format
--msgid "Failed to get ISP names: %s"
--msgstr ""
--
--#: ../src/mac/carbon/clipbrd.cpp:143 ../src/mac/classic/clipbrd.cpp:134
--msgid "Failed to get clipboard data."
--msgstr ""
--
--#: ../src/msw/clipbrd.cpp:723
--msgid "Failed to get data from the clipboard"
--msgstr ""
--
--#: ../src/common/stopwatch.cpp:233
--msgid "Failed to get the local system time"
--msgstr ""
--
--#: ../src/common/filefn.cpp:1430
--msgid "Failed to get the working directory"
--msgstr ""
--
--#: ../src/univ/theme.cpp:122
--msgid "Failed to initialize GUI: no built-in themes found."
--msgstr ""
--
--#: ../src/msw/helpchm.cpp:69
--msgid "Failed to initialize MS HTML Help."
--msgstr ""
--
--#: ../src/msw/glcanvas.cpp:809
--msgid "Failed to initialize OpenGL"
--msgstr ""
--
--#: ../src/unix/snglinst.cpp:246
--#, c-format
--msgid "Failed to inspect the lock file '%s'"
--msgstr ""
--
--#: ../src/unix/threadpsx.cpp:897
--msgid ""
--"Failed to join a thread, potential memory leak detected - please restart the "
--"program"
--msgstr ""
--
--#: ../src/msw/utils.cpp:703
--#, c-format
--msgid "Failed to kill process %d"
--msgstr ""
--
--#: ../src/common/iconbndl.cpp:72
--#, c-format
--msgid "Failed to load image %d from file '%s'."
--msgstr ""
--
--#: ../src/msw/enhmeta.cpp:84
--#, c-format
--msgid "Failed to load metafile from file \"%s\"."
--msgstr ""
--
--#: ../src/msw/volume.cpp:312
--msgid "Failed to load mpr.dll."
--msgstr ""
--
--#: ../src/common/dynlib.cpp:133
--#, c-format
--msgid "Failed to load shared library '%s'"
--msgstr ""
--
--#: ../src/common/dynlib.cpp:115
--#, c-format
--msgid "Failed to load shared library '%s' Error '%s'"
--msgstr ""
--
--#: ../src/unix/snglinst.cpp:203
--#, c-format
--msgid "Failed to lock the lock file '%s'"
--msgstr ""
--
--#: ../src/common/regex.cpp:300
--#, c-format
--msgid "Failed to match '%s' in regular expression: %s"
--msgstr ""
--
--#: ../src/common/filename.cpp:1918
--#, c-format
--msgid "Failed to modify file times for '%s'"
--msgstr ""
--
--#: ../src/common/filename.cpp:179
--#, c-format
--msgid "Failed to open '%s' for %s"
--msgstr ""
--
--#: ../src/html/chm.cpp:142
--#, c-format
--msgid "Failed to open CHM archive '%s'."
--msgstr ""
--
--#: ../src/common/filename.cpp:788
--msgid "Failed to open temporary file."
--msgstr ""
--
--#: ../src/msw/clipbrd.cpp:99
--msgid "Failed to open the clipboard."
--msgstr ""
--
--#: ../src/msw/clipbrd.cpp:626
--msgid "Failed to put data on the clipboard"
--msgstr ""
--
--#: ../src/unix/snglinst.cpp:283
--msgid "Failed to read PID from lock file."
--msgstr ""
--
--#: ../src/unix/utilsunx.cpp:598
--msgid "Failed to redirect child process input/output"
--msgstr ""
--
--#: ../src/msw/utilsexc.cpp:653
--msgid "Failed to redirect the child process IO"
--msgstr ""
--
--#: ../src/msw/dde.cpp:297
--#, c-format
--msgid "Failed to register DDE server '%s'"
--msgstr ""
--
--#: ../src/msw/glcanvas.cpp:363
--msgid "Failed to register OpenGL window class."
--msgstr ""
--
--#: ../src/common/fontmap.cpp:246
--#, c-format
--msgid "Failed to remember the encoding for the charset '%s'."
--msgstr ""
--
--#: ../src/common/debugrpt.cpp:220
--#, c-format
--msgid "Failed to remove debug report file \"%s\""
--msgstr ""
--
--#: ../src/unix/snglinst.cpp:327
--#, c-format
--msgid "Failed to remove lock file '%s'"
--msgstr ""
--
--#: ../src/unix/snglinst.cpp:293
--#, c-format
--msgid "Failed to remove stale lock file '%s'."
--msgstr ""
--
--#: ../src/msw/registry.cpp:464
--#, c-format
--msgid "Failed to rename registry value '%s' to '%s'."
--msgstr ""
--
--#: ../src/msw/registry.cpp:568
--#, c-format
--msgid "Failed to rename the registry key '%s' to '%s'."
--msgstr ""
--
--#: ../src/msw/clipbrd.cpp:503
--msgid "Failed to retrieve data from the clipboard."
--msgstr ""
--
--#: ../src/common/filename.cpp:2011
--#, c-format
--msgid "Failed to retrieve file times for '%s'"
--msgstr ""
--
--#: ../src/msw/dialup.cpp:491
--msgid "Failed to retrieve text of RAS error message"
--msgstr ""
--
--#: ../src/msw/clipbrd.cpp:760
--msgid "Failed to retrieve the supported clipboard formats"
--msgstr ""
--
--#: ../src/msw/dib.cpp:341
--#, c-format
--msgid "Failed to save the bitmap image to file \"%s\"."
--msgstr ""
--
--#: ../src/msw/dde.cpp:695
--msgid "Failed to send DDE advise notification"
--msgstr ""
--
--#: ../src/common/ftp.cpp:384
--#, c-format
--msgid "Failed to set FTP transfer mode to %s."
--msgstr ""
--
--#: ../src/msw/clipbrd.cpp:379
--msgid "Failed to set clipboard data."
--msgstr ""
--
--#: ../src/unix/snglinst.cpp:186
--#, c-format
--msgid "Failed to set permissions on lock file '%s'"
--msgstr ""
--
--#: ../src/common/file.cpp:523
--msgid "Failed to set temporary file permissions"
--msgstr ""
--
--#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256
--#, c-format
--msgid "Failed to set thread priority %d."
--msgstr ""
--
--#: ../src/common/fs_mem.cpp:231
--#, c-format
--msgid "Failed to store image '%s' to memory VFS!"
--msgstr ""
--
--#: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465
--#: ../src/unix/threadpsx.cpp:1429
--msgid "Failed to terminate a thread."
--msgstr ""
--
--#: ../src/msw/dde.cpp:669
--msgid "Failed to terminate the advise loop with DDE server"
--msgstr ""
--
--#: ../src/msw/dialup.cpp:955
--#, c-format
--msgid "Failed to terminate the dialup connection: %s"
--msgstr ""
--
--#: ../src/common/filename.cpp:1933
--#, c-format
--msgid "Failed to touch the file '%s'"
--msgstr ""
--
--#: ../src/unix/snglinst.cpp:333
--#, c-format
--msgid "Failed to unlock lock file '%s'"
--msgstr ""
--
--#: ../src/msw/dde.cpp:318
--#, c-format
--msgid "Failed to unregister DDE server '%s'"
--msgstr ""
--
--#: ../src/common/fileconf.cpp:1023
--msgid "Failed to update user configuration file."
--msgstr ""
--
--#: ../src/common/debugrpt.cpp:679
--#, c-format
--msgid "Failed to upload the debug report (error code %d)."
--msgstr ""
--
--#: ../src/unix/snglinst.cpp:173
--#, c-format
--msgid "Failed to write to lock file '%s'"
--msgstr ""
--
--#: ../src/generic/logg.cpp:394
--msgid "Fatal error"
--msgstr ""
--
--#: ../src/common/log.cpp:465
--msgid "Fatal error: "
--msgstr ""
--
--#: ../src/msw/wince/filedlgwce.cpp:120
--msgid "File"
--msgstr ""
--
--#: ../src/mgl/bitmap.cpp:544
--#, c-format
--msgid "File %s does not exist."
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:1316 ../src/gtk/filedlg.cpp:64
--#, c-format
--msgid "File '%s' already exists, do you really want to overwrite it?"
--msgstr ""
--
--#: ../src/os2/filedlg.cpp:310
--#, c-format
--msgid ""
--"File '%s' already exists.\n"
--"Do you want to replace it?"
--msgstr ""
--
--#: ../src/common/textcmn.cpp:215
--msgid "File couldn't be loaded."
--msgstr ""
--
--#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:1596
--msgid "File error"
--msgstr ""
--
--#: ../src/generic/dirctrlg.cpp:707 ../src/generic/filedlgg.cpp:758
--msgid "File name exists already."
--msgstr ""
--
--#: ../src/motif/filedlg.cpp:226
--msgid "Files"
--msgstr ""
--
--#: ../src/common/filefn.cpp:1746
--#, c-format
--msgid "Files (%s)"
--msgstr ""
--
--#: ../src/motif/filedlg.cpp:224
--msgid "Filter"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:491
--msgid "Find"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1219
--msgid "Fixed font:"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1279
--msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
--msgstr ""
--
--#: ../src/common/paper.cpp:118
--msgid "Folio, 8 1/2 x 13 in"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1220
--msgid "Font size:"
--msgstr ""
--
--#: ../src/unix/utilsunx.cpp:545
--msgid "Fork failed"
--msgstr ""
--
--#: ../src/common/xtixml.cpp:235
--msgid "Forward hrefs are not supported"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:1838
--#: ../contrib/src/deprecated/resource.cpp:1968
--#: ../contrib/src/deprecated/resource.cpp:3060
--msgid "Found "
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:886
--#, c-format
--msgid "Found %i matches"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:233
--msgid "From:"
--msgstr ""
--
--#: ../src/common/imaggif.cpp:100
--msgid "GIF: Invalid gif index."
--msgstr ""
--
--#: ../src/common/imaggif.cpp:75
--msgid "GIF: data stream seems to be truncated."
--msgstr ""
--
--#: ../src/common/imaggif.cpp:59
--msgid "GIF: error in GIF image format."
--msgstr ""
--
--#: ../src/common/imaggif.cpp:62
--msgid "GIF: not enough memory."
--msgstr ""
--
--#: ../src/common/imaggif.cpp:65
--msgid "GIF: unknown error!!!"
--msgstr ""
--
--#: ../src/univ/themes/gtk.cpp:634
--msgid "GTK+ theme"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:228
--msgid "Generic PostScript"
--msgstr ""
--
--#: ../src/common/paper.cpp:142
--msgid "German Legal Fanfold, 8 1/2 x 13 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:141
--msgid "German Std Fanfold, 8 1/2 x 12 in"
--msgstr ""
--
--#: ../include/wx/xti.h:845
--msgid "GetProperty called w/o valid getter"
--msgstr ""
--
--#: ../include/wx/xti.h:906
--msgid "GetPropertyCollection called on a generic accessor"
--msgstr ""
--
--#: ../include/wx/xti.h:853
--msgid "GetPropertyCollection called w/o valid collection getter"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:651
--msgid "Go back"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:654
--msgid "Go forward"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:659
--msgid "Go one level up in document hierarchy"
--msgstr ""
--
--#: ../src/generic/dirdlgg.cpp:145 ../src/generic/filedlgg.cpp:989
--msgid "Go to home directory"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:981
--msgid "Go to parent directory"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:851
--msgid "Goto Page"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:110
--msgid "Greek (ISO-8859-7)"
--msgstr ""
--
--#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
--msgid "Gzip not supported by this version of zlib"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1574
--msgid "HTML Help Project (*.hhp)|*.hhp|"
--msgstr ""
--
--#: ../src/html/htmlwin.cpp:498
--#, c-format
--msgid "HTML anchor %s does not exist."
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1572
--msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:111
--msgid "Hebrew (ISO-8859-8)"
--msgstr ""
--
--# The help menu is called just '?' on Italian versions of Windows
--#: ../src/html/helpfrm.cpp:337 ../contrib/src/deprecated/proplist.cpp:523
--#, fuzzy
--msgid "Help"
--msgstr "&?"
--
--#: ../src/html/helpfrm.cpp:1213
--msgid "Help Browser Options"
--msgstr ""
--
--#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443
--msgid "Help Index"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1560
--msgid "Help Printing"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:814
--msgid "Help Topics"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1573
--msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
--msgstr ""
--
--# The help menu is called just '?' on Italian versions of Windows
--#: ../src/html/helpctrl.cpp:55
--#, fuzzy, c-format
--msgid "Help: %s"
--msgstr "&?"
--
--#: ../src/generic/dirdlgg.cpp:105
--msgid "Home"
--msgstr ""
--
--#: ../src/generic/dirctrlg.cpp:654
--msgid "Home directory"
--msgstr ""
--
--#: ../include/wx/filefn.h:145
--msgid "I64"
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:943
--msgid "ICO: Error in reading mask DIB."
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:1048 ../src/common/imagbmp.cpp:1107
--#: ../src/common/imagbmp.cpp:1116 ../src/common/imagbmp.cpp:1127
--#: ../src/common/imagbmp.cpp:1171 ../src/common/imagbmp.cpp:1181
--#: ../src/common/imagbmp.cpp:1190
--msgid "ICO: Error writing the image file!"
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:1016
--msgid "ICO: Image too tall for an icon."
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:1022
--msgid "ICO: Image too wide for an icon."
--msgstr ""
--
--#: ../src/common/imagbmp.cpp:1255
--msgid "ICO: Invalid icon index."
--msgstr ""
--
--#: ../src/common/imagiff.cpp:771
--msgid "IFF: data stream seems to be truncated."
--msgstr ""
--
--#: ../src/common/imagiff.cpp:755
--msgid "IFF: error in IFF image format."
--msgstr ""
--
--#: ../src/common/imagiff.cpp:758
--msgid "IFF: not enough memory."
--msgstr ""
--
--#: ../src/common/imagiff.cpp:761
--msgid "IFF: unknown error!!!"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:2673
--#: ../contrib/src/deprecated/resource.cpp:2684
--#, c-format
--msgid "Icon resource specification %s not found."
--msgstr ""
--
--#: ../src/generic/dbgrptg.cpp:344
--msgid ""
--"If you have any additional information pertaining to this bug\n"
--"report, please enter it here and it will be joined to it:"
--msgstr ""
--
--#: ../src/generic/dbgrptg.cpp:310
--msgid ""
--"If you wish to suppress this debug report completely, please choose the "
--"\"Cancel\" button,\n"
--"but be warned that it may hinder improving the program, so if\n"
--"at all possible please do continue with the report generation.\n"
--msgstr ""
--
--#: ../src/msw/registry.cpp:1304
--#, c-format
--msgid "Ignoring value \"%s\" of the key \"%s\"."
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:271
--msgid "Ill-formed resource file syntax."
--msgstr ""
--
--#: ../src/common/xtistrm.cpp:260
--msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
--msgstr ""
--
--#: ../include/wx/xti.h:1650
--msgid "Illegal Parameter Count for ConstructObject Method"
--msgstr ""
--
--#: ../include/wx/xti.h:1723
--msgid "Illegal Parameter Count for Create Method"
--msgstr ""
--
--#: ../src/generic/dirctrlg.cpp:689 ../src/generic/filedlgg.cpp:744
--msgid "Illegal directory name."
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:1269
--msgid "Illegal file specification."
--msgstr ""
--
--#: ../src/common/image.cpp:1192
--msgid "Image and mask have different sizes."
--msgstr ""
--
--#: ../src/common/image.cpp:1523
--#, c-format
--msgid "Image file is not of type %d."
--msgstr ""
--
--#: ../src/msw/textctrl.cpp:361
--msgid ""
--"Impossible to create a rich edit control, using simple text control instead. "
--"Please reinstall riched32.dll"
--msgstr ""
--
--#: ../src/unix/utilsunx.cpp:428
--msgid "Impossible to get child process input"
--msgstr ""
--
--#: ../src/common/filefn.cpp:1022
--#, c-format
--msgid "Impossible to get permissions for file '%s'"
--msgstr ""
--
--#: ../src/common/filefn.cpp:1036
--#, c-format
--msgid "Impossible to overwrite the file '%s'"
--msgstr ""
--
--#: ../src/common/filefn.cpp:1080
--#, c-format
--msgid "Impossible to set permissions for the file '%s'"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:124
--msgid "Indent"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:516
--msgid "Index"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:115
--msgid "Indian (ISO-8859-12)"
--msgstr ""
--
--#: ../src/common/init.cpp:232
--msgid "Initialization failed in post init, aborting."
--msgstr ""
--
--#: ../src/common/xtistrm.cpp:704
--msgid "Internal error, illegal wxCustomTypeInfo"
--msgstr ""
--
--#: ../src/common/imagtiff.cpp:227
--msgid "Invalid TIFF image index."
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:460
--#, c-format
--msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
--msgstr ""
--
--#: ../src/common/appcmn.cpp:249
--#, c-format
--msgid "Invalid display mode specification '%s'."
--msgstr ""
--
--#: ../src/x11/app.cpp:128
--#, c-format
--msgid "Invalid geometry specification '%s'"
--msgstr ""
--
--#: ../src/unix/snglinst.cpp:311
--#, c-format
--msgid "Invalid lock file '%s'."
--msgstr ""
--
--#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380
--msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
--msgstr ""
--
--#: ../src/common/xtistrm.cpp:395
--msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
--msgstr ""
--
--#: ../src/common/regex.cpp:210
--#, c-format
--msgid "Invalid regular expression '%s': %s"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:233
--msgid "Italic"
--msgstr ""
--
--#: ../src/common/paper.cpp:137
--msgid "Italy Envelope, 110 x 230 mm"
--msgstr ""
--
--#: ../src/common/imagjpeg.cpp:225
--msgid "JPEG: Couldn't load - file is probably corrupted."
--msgstr ""
--
--#: ../src/common/imagjpeg.cpp:339
--msgid "JPEG: Couldn't save image."
--msgstr ""
--
--#: ../src/common/paper.cpp:170
--msgid "Japanese Double Postcard 200 x 148 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:174
--msgid "Japanese Envelope Chou #3"
--msgstr ""
--
--#: ../src/common/paper.cpp:187
--msgid "Japanese Envelope Chou #3 Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:175
--msgid "Japanese Envelope Chou #4"
--msgstr ""
--
--#: ../src/common/paper.cpp:188
--msgid "Japanese Envelope Chou #4 Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:172
--msgid "Japanese Envelope Kaku #2"
--msgstr ""
--
--#: ../src/common/paper.cpp:185
--msgid "Japanese Envelope Kaku #2 Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:173
--msgid "Japanese Envelope Kaku #3"
--msgstr ""
--
--#: ../src/common/paper.cpp:186
--msgid "Japanese Envelope Kaku #3 Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:192
--msgid "Japanese Envelope You #4"
--msgstr ""
--
--#: ../src/common/paper.cpp:193
--msgid "Japanese Envelope You #4 Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:145
--msgid "Japanese Postcard 100 x 148 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:182
--msgid "Japanese Postcard Rotated 148 x 100 mm"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:128
--msgid "Justified"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:119
--msgid "KOI8-R"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:120
--msgid "KOI8-U"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867
--msgid "Landscape"
--msgstr ""
--
--#: ../src/common/paper.cpp:110
--msgid "Ledger, 17 x 11 in"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:879
--msgid "Left margin (mm):"
--msgstr ""
--
--#: ../src/common/paper.cpp:151
--msgid "Legal Extra 9 1/2 x 15 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:103
--msgid "Legal, 8 1/2 x 14 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:150
--msgid "Letter Extra 9 1/2 x 12 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:156
--msgid "Letter Extra Transverse 9.275 x 12 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:159
--msgid "Letter Plus 8 1/2 x 12.69 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:176
--msgid "Letter Rotated 11 x 8 1/2 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:108
--msgid "Letter Small, 8 1/2 x 11 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:154
--msgid "Letter Transverse 8 1/2 x 11 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:102
--msgid "Letter, 8 1/2 x 11 in"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:236
--msgid "Light"
--msgstr ""
--
--#: ../src/html/chm.cpp:820
--msgid "Link contained '//', converted to absolute link."
--msgstr ""
--
--#: ../src/common/fldlgcmn.cpp:257
--#, c-format
--msgid "Load %s file"
--msgstr ""
--
--#: ../src/html/htmlwin.cpp:416
--msgid "Loading : "
--msgstr ""
--
--#: ../src/unix/snglinst.cpp:251
--#, c-format
--msgid "Lock file '%s' has incorrect owner."
--msgstr ""
--
--#: ../src/unix/snglinst.cpp:256
--#, c-format
--msgid "Lock file '%s' has incorrect permissions."
--msgstr ""
--
--#: ../src/generic/logg.cpp:572
--#, c-format
--msgid "Log saved to the file '%s'."
--msgstr ""
--
--#: ../include/wx/xti.h:501 ../include/wx/xti.h:505
--msgid "Long Conversions not supported"
--msgstr ""
--
--#: ../src/gtk/mdi.cpp:465
--msgid "MDI child"
--msgstr ""
--
--#: ../src/mac/carbon/thread.cpp:1635
--msgid "MP Thread Support is not available on this System"
--msgstr ""
--
--#: ../src/msw/helpchm.cpp:60
--msgid ""
--"MS HTML Help functions are unavailable because the MS HTML Help library is "
--"not installed on this machine. Please install it."
--msgstr ""
--
--#: ../src/univ/themes/win32.cpp:4929
--msgid "Ma&ximize"
--msgstr ""
--
--#: ../src/unix/mimetype.cpp:2671
--#, c-format
--msgid "Mailcap file %s, line %d: incomplete entry ignored."
--msgstr ""
--
--#: ../src/generic/fdrepdlg.cpp:153
--msgid "Match case"
--msgstr ""
--
--#: ../src/common/fs_mem.cpp:176
--#, c-format
--msgid "Memory VFS already contains file '%s'!"
--msgstr ""
--
--#: ../src/msw/frame.cpp:374
--msgid "Menu"
--msgstr ""
--
--#: ../src/univ/themes/metal.cpp:174
--msgid "Metal theme"
--msgstr ""
--
--#: ../src/univ/themes/win32.cpp:4927
--msgid "Mi&nimize"
--msgstr ""
--
--#: ../src/unix/mimetype.cpp:2292
--#, c-format
--msgid "Mime.types file %s, line %d: unterminated quoted string."
--msgstr ""
--
--#: ../src/mgl/app.cpp:165
--#, c-format
--msgid "Mode %ix%i-%i not available."
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:228
--msgid "Modern"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:434
--msgid "Modified"
--msgstr ""
--
--#: ../src/common/module.cpp:77
--#, c-format
--msgid "Module \"%s\" initialization failed"
--msgstr ""
--
--#: ../src/common/paper.cpp:138
--msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
--msgstr ""
--
--#: ../contrib/src/gizmos/editlbox.cpp:162
--msgid "Move down"
--msgstr ""
--
--#: ../contrib/src/gizmos/editlbox.cpp:161
--msgid "Move up"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:431
--msgid "Name"
--msgstr ""
--
--#: ../src/generic/dirdlgg.cpp:109
--msgid "New directory"
--msgstr ""
--
--#: ../contrib/src/gizmos/editlbox.cpp:159
--msgid "New item"
--msgstr ""
--
--#: ../src/generic/dirdlgg.cpp:316 ../src/generic/dirdlgg.cpp:326
--#: ../src/generic/filedlgg.cpp:608 ../src/generic/filedlgg.cpp:617
--msgid "NewName"
--msgstr ""
--
--#: ../src/generic/tipdlg.cpp:305
--msgid "Next"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:665
--msgid "Next page"
--msgstr ""
--
--#: ../src/mac/carbon/msgdlg.cpp:58 ../src/mac/carbon/msgdlg.cpp:143
--#: ../src/mac/classic/msgdlg.cpp:56 ../src/mac/classic/msgdlg.cpp:140
--#: ../src/motif/msgdlg.cpp:204
--msgid "No"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:2495
--#: ../contrib/src/deprecated/resource.cpp:2649
--msgid "No XBM facility available!"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:2667
--msgid "No XPM icon facility available!"
--msgstr ""
--
--#: ../src/generic/helpext.cpp:437
--msgid "No entries found."
--msgstr ""
--
--#: ../src/common/fontmap.cpp:422
--#, c-format
--msgid ""
--"No font for displaying text in encoding '%s' found,\n"
--"but an alternative encoding '%s' is available.\n"
--"Do you want to use this encoding (otherwise you will have to choose another "
--"one)?"
--msgstr ""
--
--#: ../src/common/fontmap.cpp:427
--#, c-format
--msgid ""
--"No font for displaying text in encoding '%s' found.\n"
--"Would you like to select a font to be used for this encoding\n"
--"(otherwise the text in this encoding will not be shown correctly)?"
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:677
--#, c-format
--msgid "No handler found for XML node '%s', class '%s'!"
--msgstr ""
--
--#: ../src/common/image.cpp:1505 ../src/common/image.cpp:1548
--msgid "No handler found for image type."
--msgstr ""
--
--#: ../src/common/image.cpp:1513 ../src/common/image.cpp:1556
--#: ../src/common/image.cpp:1589
--#, c-format
--msgid "No image handler for type %d defined."
--msgstr ""
--
--#: ../src/common/image.cpp:1574 ../src/common/image.cpp:1604
--#, c-format
--msgid "No image handler for type %s defined."
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:869
--msgid "No matching page found yet"
--msgstr ""
--
--#: ../src/unix/sound.cpp:89
--msgid "No sound"
--msgstr ""
--
--#: ../src/common/image.cpp:1200 ../src/common/image.cpp:1239
--msgid "No unused colour in image being masked."
--msgstr ""
--
--#: ../src/common/image.cpp:1997
--msgid "No unused colour in image."
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:113
--msgid "Nordic (ISO-8859-10)"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235
--msgid "Normal"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1273
--msgid "Normal face<br>and <u>underlined</u>. "
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1218
--msgid "Normal font:"
--msgstr ""
--
--#: ../src/common/paper.cpp:122
--msgid "Note, 8 1/2 x 11 in"
--msgstr ""
--
--#: ../src/gtk/fontdlg.cpp:147 ../src/msw/dialog.cpp:194
--#: ../contrib/src/deprecated/proplist.cpp:506
--msgid "OK"
--msgstr ""
--
--#: ../src/common/xtixml.cpp:263
--msgid "Objects must have an id attribute"
--msgstr ""
--
--#: ../src/common/docview.cpp:1269 ../src/common/docview.cpp:1619
--msgid "Open File"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579
--msgid "Open HTML document"
--msgstr ""
--
--#: ../src/generic/dbgrptg.cpp:158
--#, c-format
--msgid "Open file \"%s\""
--msgstr ""
--
--#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
--#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:772
--msgid "Operation not permitted."
--msgstr ""
--
--#: ../src/common/cmdline.cpp:702
--#, c-format
--msgid "Option '%s' requires a value, '=' expected."
--msgstr ""
--
--#: ../src/common/cmdline.cpp:722
--#, c-format
--msgid "Option '%s' requires a value."
--msgstr ""
--
--#: ../src/common/cmdline.cpp:784
--#, c-format
--msgid "Option '%s': '%s' cannot be converted to a date."
--msgstr ""
--
--#: ../src/generic/dirdlgg.cpp:116 ../src/generic/prntdlgg.cpp:614
--msgid "Options"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868
--msgid "Orientation"
--msgstr ""
--
--#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485
--msgid "PCX: couldn't allocate memory"
--msgstr ""
--
--#: ../src/common/imagpcx.cpp:461
--msgid "PCX: image format unsupported"
--msgstr ""
--
--#: ../src/common/imagpcx.cpp:484
--msgid "PCX: invalid image"
--msgstr ""
--
--#: ../src/common/imagpcx.cpp:448
--msgid "PCX: this is not a PCX file."
--msgstr ""
--
--#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486
--msgid "PCX: unknown error !!!"
--msgstr ""
--
--#: ../src/common/imagpcx.cpp:463
--msgid "PCX: version number too low"
--msgstr ""
--
--#: ../src/common/imagpnm.cpp:92
--msgid "PNM: Couldn't allocate memory."
--msgstr ""
--
--#: ../src/common/imagpnm.cpp:76
--msgid "PNM: File format is not recognized."
--msgstr ""
--
--#: ../src/common/imagpnm.cpp:108 ../src/common/imagpnm.cpp:125
--#: ../src/common/imagpnm.cpp:142
--msgid "PNM: File seems truncated."
--msgstr ""
--
--#: ../src/common/paper.cpp:194
--msgid "PRC 16K 146 x 215 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:207
--msgid "PRC 16K Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:195
--msgid "PRC 32K 97 x 151 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:208
--msgid "PRC 32K Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:196
--msgid "PRC 32K(Big) 97 x 151 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:209
--msgid "PRC 32K(Big) Rotated"
--msgstr ""
--
--#: ../src/common/paper.cpp:197
--msgid "PRC Envelope #1 102 x 165 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:210
--msgid "PRC Envelope #1 Rotated 165 x 102 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:206
--msgid "PRC Envelope #10 324 x 458 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:219
--msgid "PRC Envelope #10 Rotated 458 x 324 m"
--msgstr ""
--
--#: ../src/common/paper.cpp:198
--msgid "PRC Envelope #2 102 x 176 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:211
--msgid "PRC Envelope #2 Rotated 176 x 102 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:199
--msgid "PRC Envelope #3 125 x 176 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:212
--msgid "PRC Envelope #3 Rotated 176 x 125 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:200
--msgid "PRC Envelope #4 110 x 208 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:213
--msgid "PRC Envelope #4 Rotated 208 x 110 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:201
--msgid "PRC Envelope #5 110 x 220 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:214
--msgid "PRC Envelope #5 Rotated 220 x 110 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:202
--msgid "PRC Envelope #6 120 x 230 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:215
--msgid "PRC Envelope #6 Rotated 230 x 120 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:203
--msgid "PRC Envelope #7 160 x 230 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:216
--msgid "PRC Envelope #7 Rotated 230 x 160 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:204
--msgid "PRC Envelope #8 120 x 309 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:217
--msgid "PRC Envelope #8 Rotated 309 x 120 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:205
--msgid "PRC Envelope #9 229 x 324 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:218
--msgid "PRC Envelope #9 Rotated 324 x 229 mm"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:1294
--#, c-format
--msgid "Page %d"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:1292
--#, c-format
--msgid "Page %d of %d"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:827
--msgid "Page Setup"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:540
--msgid "Page setup"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:210
--msgid "Pages"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854
--#: ../src/generic/prntdlgg.cpp:1056
--msgid "Paper Size"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841
--#: ../src/generic/prntdlgg.cpp:1051
--msgid "Paper size"
--msgstr ""
--
--#: ../src/common/xtistrm.cpp:425
--msgid "Passing a already registered object to SetObject"
--msgstr ""
--
--#: ../src/common/xtistrm.cpp:643
--msgid "Passing a already registered object to SetObjectName"
--msgstr ""
--
--#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
--msgid "Passing an unkown object to GetObject"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:437
--msgid "Permissions"
--msgstr ""
--
--#: ../include/wx/unix/pipe.h:47
--msgid "Pipe creation failed"
--msgstr ""
--
--#: ../src/gtk/fontdlg.cpp:81
--msgid "Please choose a valid font."
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:1325
--msgid "Please choose an existing file."
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:813
--msgid "Please choose the page to display:"
--msgstr ""
--
--#: ../src/msw/dialup.cpp:787
--msgid "Please choose which ISP do you want to connect to"
--msgstr ""
--
--#: ../src/msw/listctrl.cpp:444
--#, c-format
--msgid ""
--"Please install a newer version of comctl32.dll\n"
--"(at least version 4.70 is required but you have %d.%02d)\n"
--"or this program won't operate correctly."
--msgstr ""
--
--#: ../src/common/prntbase.cpp:313
--msgid "Please wait while printing\n"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866
--msgid "Portrait"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:296
--msgid "PostScript file"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235
--msgid "Preview:"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:662
--msgid "Previous page"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138
--#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:395
--#: ../src/gtk/gnome/gprint.cpp:407
--msgid "Print"
--msgstr ""
--
--#: ../src/common/docview.cpp:1032
--msgid "Print Preview"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:1246 ../src/common/prntbase.cpp:1272
--msgid "Print Preview Failure"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:218
--msgid "Print Range"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:445
--msgid "Print Setup"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:617
--msgid "Print in colour"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:138
--msgid "Print previe&w"
--msgstr ""
--
--#: ../src/gtk/gnome/gprint.cpp:785
--msgid "Print preview"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:626
--msgid "Print spooling"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:679
--msgid "Print this page"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:179
--msgid "Print to File"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:489
--msgid "Printer"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:629
--msgid "Printer command:"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:174
--msgid "Printer options"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:641
--msgid "Printer options:"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:915
--msgid "Printer..."
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:190
--msgid "Printer:"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531
--msgid "Printing "
--msgstr ""
--
--#: ../src/common/prntbase.cpp:327
--msgid "Printing Error"
--msgstr ""
--
--#: ../src/generic/printps.cpp:208
--#, c-format
--msgid "Printing page %d..."
--msgstr ""
--
--#: ../src/generic/printps.cpp:168
--msgid "Printing..."
--msgstr ""
--
--#: ../src/common/debugrpt.cpp:546
--#, c-format
--msgid ""
--"Processing debug report has failed, leaving the files in \"%s\" directory."
--msgstr ""
--
--#: ../src/common/log.cpp:466
--msgid "Program aborted."
--msgstr ""
--
--#: ../src/common/paper.cpp:119
--msgid "Quarto, 215 x 275 mm"
--msgstr ""
--
--#: ../src/generic/logg.cpp:1165
--msgid "Question"
--msgstr ""
--
--#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144
--#, c-format
--msgid "Read error on file '%s'"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:242
--msgid "Ready"
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:643
--#, c-format
--msgid "Referenced object node with ref=\"%s\" not found!"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:142
--msgid "Refresh"
--msgstr ""
--
--#: ../src/msw/registry.cpp:560
--#, c-format
--msgid "Registry key '%s' already exists."
--msgstr ""
--
--#: ../src/msw/registry.cpp:529
--#, c-format
--msgid "Registry key '%s' does not exist, cannot rename it."
--msgstr ""
--
--#: ../src/msw/registry.cpp:661
--#, c-format
--msgid ""
--"Registry key '%s' is needed for normal system operation,\n"
--"deleting it will leave your system in unusable state:\n"
--"operation aborted."
--msgstr ""
--
--#: ../src/msw/registry.cpp:456
--#, c-format
--msgid "Registry value '%s' already exists."
--msgstr ""
--
--#: ../src/generic/helpext.cpp:442
--msgid "Relevant entries:"
--msgstr ""
--
--#: ../src/generic/progdlgg.cpp:210
--msgid "Remaining time : "
--msgstr ""
--
--#: ../src/common/stockitem.cpp:143
--msgid "Remove"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:445
--msgid "Remove current page from bookmarks"
--msgstr ""
--
--#: ../src/common/rendcmn.cpp:196
--#, c-format
--msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
--msgstr ""
--
--#: ../src/common/stockitem.cpp:117
--msgid "Rep&lace"
--msgstr ""
--
--#: ../src/generic/fdrepdlg.cpp:188
--msgid "Replace &all"
--msgstr ""
--
--#: ../src/generic/fdrepdlg.cpp:130
--msgid "Replace with:"
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:479
--msgid "Resource files must have same version number!"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:144
--msgid "Revert to Saved"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:891
--msgid "Right margin (mm):"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:226
--msgid "Roman"
--msgstr ""
--
--#: ../src/common/sizer.cpp:1838
--msgid "Save"
--msgstr ""
--
--#: ../src/common/fldlgcmn.cpp:259
--#, c-format
--msgid "Save %s file"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:146
--msgid "Save &As..."
--msgstr ""
--
--#: ../src/common/docview.cpp:305
--msgid "Save as"
--msgstr ""
--
--#: ../src/generic/logg.cpp:505
--msgid "Save log contents to file"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:229
--msgid "Script"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551
--msgid "Search"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:538
--msgid ""
--"Search contents of help book(s) for all occurences of the text you typed "
--"above"
--msgstr ""
--
--#: ../src/generic/fdrepdlg.cpp:166
--msgid "Search direction"
--msgstr ""
--
--#: ../src/generic/fdrepdlg.cpp:118
--msgid "Search for:"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1060
--msgid "Search in all books"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:868
--msgid "Searching..."
--msgstr ""
--
--#: ../src/generic/dirctrlg.cpp:592
--msgid "Sections"
--msgstr ""
--
--#: ../src/common/ffile.cpp:222
--#, c-format
--msgid "Seek error on file '%s'"
--msgstr ""
--
--#: ../src/common/ffile.cpp:212
--#, c-format
--msgid "Seek error on file '%s' (large files not supported by stdio)"
--msgstr ""
--
--#: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068
--msgid "Select &All"
--msgstr ""
--
--#: ../src/common/docview.cpp:1699
--msgid "Select a document template"
--msgstr ""
--
--#: ../src/common/docview.cpp:1776
--msgid "Select a document view"
--msgstr ""
--
--#: ../src/common/docview.cpp:1579
--msgid "Select a file"
--msgstr ""
--
--#: ../src/motif/filedlg.cpp:226
--msgid "Selection"
--msgstr ""
--
--#: ../src/common/cmdline.cpp:739
--#, c-format
--msgid "Separator expected after the option '%s'."
--msgstr ""
--
--#: ../include/wx/xti.h:841
--msgid "SetProperty called w/o valid setter"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:182
--msgid "Setup..."
--msgstr ""
--
--#: ../src/msw/dialup.cpp:567
--msgid "Several active dialup connections found, choosing one randomly."
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:493
--msgid "Show all"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:504
--msgid "Show all items in index"
--msgstr ""
--
--#: ../src/generic/dirdlgg.cpp:112 ../src/generic/dirdlgg.cpp:175
--msgid "Show hidden directories"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:1056
--msgid "Show hidden files"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:646
--msgid "Show/hide navigation panel"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355
--msgid "Shows the font preview."
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:432
--msgid "Size"
--msgstr ""
--
--#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
--#: ../src/generic/progdlgg.cpp:598
--msgid "Skip"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:234
--msgid "Slant"
--msgstr ""
--
--#: ../src/common/docview.cpp:581
--msgid "Sorry, could not open this file for saving."
--msgstr ""
--
--#: ../src/common/docview.cpp:617 ../src/common/docview.cpp:1598
--msgid "Sorry, could not open this file."
--msgstr ""
--
--#: ../src/common/docview.cpp:588
--msgid "Sorry, could not save this file."
--msgstr ""
--
--#: ../src/common/prntbase.cpp:1246
--msgid "Sorry, not enough memory to create a preview."
--msgstr ""
--
--#: ../src/common/docview.cpp:1028
--msgid "Sorry, print preview needs a printer to be installed."
--msgstr ""
--
--#: ../src/common/docview.cpp:1268 ../src/common/docview.cpp:1618
--msgid "Sorry, the format for this file is unknown."
--msgstr ""
--
--#: ../src/unix/sound.cpp:493
--msgid "Sound data are in unsupported format."
--msgstr ""
--
--#: ../src/unix/sound.cpp:478
--#, c-format
--msgid "Sound file '%s' is in unsupported format."
--msgstr ""
--
--#: ../src/common/paper.cpp:111
--msgid "Statement, 5 1/2 x 8 1/2 in"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:198
--msgid "Status:"
--msgstr ""
--
--#: ../src/generic/logg.cpp:622
--msgid "Status: "
--msgstr ""
--
--#: ../src/common/xtistrm.cpp:253
--msgid "Streaming delegates for not already streamed objects not yet supported"
--msgstr ""
--
--#: ../src/msw/colour.cpp:38 ../src/palmos/colour.cpp:38
--#, c-format
--msgid "String To Colour : Incorrect colour specification : %s"
--msgstr ""
--
--#: ../include/wx/xti.h:428 ../include/wx/xti.h:432
--msgid "String conversions not supported"
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:750
--#, c-format
--msgid "Subclass '%s' not found for resource '%s', not subclassing!"
--msgstr ""
--
--#: ../src/common/paper.cpp:157
--msgid "SuperA/SuperA/A4 227 x 356 mm"
--msgstr ""
--
--#: ../src/common/paper.cpp:158
--msgid "SuperB/SuperB/A3 305 x 487 mm"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:230
--msgid "Swiss"
--msgstr ""
--
--#: ../src/common/imagtiff.cpp:165
--msgid "TIFF library error."
--msgstr ""
--
--#: ../src/common/imagtiff.cpp:149
--msgid "TIFF library warning."
--msgstr ""
--
--#: ../src/common/imagtiff.cpp:248 ../src/common/imagtiff.cpp:259
--#: ../src/common/imagtiff.cpp:399
--msgid "TIFF: Couldn't allocate memory."
--msgstr ""
--
--#: ../src/common/imagtiff.cpp:219
--msgid "TIFF: Error loading image."
--msgstr ""
--
--#: ../src/common/imagtiff.cpp:270
--msgid "TIFF: Error reading image."
--msgstr ""
--
--#: ../src/common/imagtiff.cpp:347
--msgid "TIFF: Error saving image."
--msgstr ""
--
--#: ../src/common/imagtiff.cpp:445
--msgid "TIFF: Error writing image."
--msgstr ""
--
--#: ../src/common/paper.cpp:152
--msgid "Tabloid Extra 11.69 x 18 in"
--msgstr ""
--
--#: ../src/common/paper.cpp:109
--msgid "Tabloid, 11 x 17 in"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:231
--msgid "Teletype"
--msgstr ""
--
--#: ../src/common/docview.cpp:1700
--msgid "Templates"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:114
--msgid "Thai (ISO-8859-11)"
--msgstr ""
--
--#: ../src/common/ftp.cpp:708
--msgid "The FTP server doesn't support passive mode."
--msgstr ""
--
--#: ../src/common/ftp.cpp:696
--msgid "The FTP server doesn't support the PORT command."
--msgstr ""
--
--#: ../src/common/fontmap.cpp:204
--#, c-format
--msgid ""
--"The charset '%s' is unknown. You may select\n"
--"another charset to replace it with or choose\n"
--"[Cancel] if it cannot be replaced"
--msgstr ""
--
--#: ../src/msw/ole/dataobj.cpp:164
--#, c-format
--msgid "The clipboard format '%d' doesn't exist."
--msgstr ""
--
--#: ../src/generic/dirdlgg.cpp:224
--#, c-format
--msgid ""
--"The directory '%s' does not exist\n"
--"Create it now?"
--msgstr ""
--
--#: ../src/common/docview.cpp:1949
--#, c-format
--msgid ""
--"The file '%s' couldn't be opened.\n"
--"It has been removed from the most recently used files list."
--msgstr ""
--
--#: ../src/common/docview.cpp:1959
--#, c-format
--msgid ""
--"The file '%s' doesn't exist and couldn't be opened.\n"
--"It has been removed from the most recently used files list."
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318
--msgid "The font colour."
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279
--msgid "The font family."
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
--msgid "The font point size."
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290
--msgid "The font style."
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301
--msgid "The font weight."
--msgstr ""
--
--#: ../src/common/filename.cpp:966
--#, c-format
--msgid "The path '%s' contains too many \"..\"!"
--msgstr ""
--
--#: ../src/generic/dbgrptg.cpp:308
--msgid ""
--"The report contains the files listed below. If any of these files contain "
--"private information,\n"
--"please uncheck them and they will be removed from the report.\n"
--msgstr ""
--
--#: ../src/common/cmdline.cpp:883
--#, c-format
--msgid "The required parameter '%s' was not specified."
--msgstr ""
--
--#: ../src/common/textcmn.cpp:246
--msgid "The text couldn't be saved."
--msgstr ""
--
--#: ../src/common/cmdline.cpp:862
--#, c-format
--msgid "The value for the option '%s' must be specified."
--msgstr ""
--
--#: ../src/msw/dialup.cpp:455
--#, c-format
--msgid ""
--"The version of remote access service (RAS) installed on this machine is "
--"tooold, please upgrade (the following required function is missing: %s)."
--msgstr ""
--
--#: ../src/html/htmprint.cpp:601
--msgid ""
--"There was a problem during page setup: you may need to set a default printer."
--msgstr ""
--
--#: ../src/msw/datectrl.cpp:109
--msgid ""
--"This system doesn't support date picker control, please upgrade your version "
--"of comctl32.dll"
--msgstr ""
--
--#: ../src/msw/thread.cpp:1206
--msgid ""
--"Thread module initialization failed: can not store value in thread local "
--"storage"
--msgstr ""
--
--#: ../src/unix/threadpsx.cpp:1603
--msgid "Thread module initialization failed: failed to create thread key"
--msgstr ""
--
--#: ../src/msw/thread.cpp:1194
--msgid ""
--"Thread module initialization failed: impossible to allocate index in thread "
--"local storage"
--msgstr ""
--
--#: ../src/unix/threadpsx.cpp:1108
--msgid "Thread priority setting is ignored."
--msgstr ""
--
--#: ../src/msw/mdi.cpp:184
--msgid "Tile &Horizontally"
--msgstr ""
--
--#: ../src/msw/mdi.cpp:185
--msgid "Tile &Vertically"
--msgstr ""
--
--#: ../src/common/ftp.cpp:635
--msgid "Timeout while waiting for FTP server to connect, try passive mode."
--msgstr ""
--
--#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141
--msgid "Timer creation failed."
--msgstr ""
--
--#: ../src/generic/tipdlg.cpp:220
--msgid "Tip of the Day"
--msgstr ""
--
--#: ../src/generic/tipdlg.cpp:157
--msgid "Tips not available, sorry!"
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:237
--msgid "To:"
--msgstr ""
--
--#: ../src/common/imagpng.cpp:292
--msgid "Too many colours in PNG, the image may be slightly blurred."
--msgstr ""
--
--#: ../src/generic/prntdlgg.cpp:880
--msgid "Top margin (mm):"
--msgstr ""
--
--#: ../src/common/fs_mem.cpp:205
--#, c-format
--msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
--msgstr ""
--
--#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250
--msgid "Trying to solve a NULL hostname: giving up"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:112
--msgid "Turkish (ISO-8859-9)"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:433
--msgid "Type"
--msgstr ""
--
--#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351
--#: ../src/common/xtixml.cpp:498
--msgid "Type must have enum - long conversion"
--msgstr ""
--
--#: ../src/common/paper.cpp:140
--msgid "US Std Fanfold, 14 7/8 x 11 in"
--msgstr ""
--
--#: ../src/html/htmlwin.cpp:403
--#, c-format
--msgid "Unable to open requested HTML document: %s"
--msgstr ""
--
--#: ../src/unix/sound.cpp:376
--msgid "Unable to play sound asynchronously."
--msgstr ""
--
--#: ../src/common/stockitem.cpp:148
--msgid "Undelete"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:1848
--#: ../contrib/src/deprecated/resource.cpp:1862
--#: ../contrib/src/deprecated/resource.cpp:1879
--#: ../contrib/src/deprecated/resource.cpp:1893
--#: ../contrib/src/deprecated/resource.cpp:1978
--#: ../contrib/src/deprecated/resource.cpp:1992
--#: ../contrib/src/deprecated/resource.cpp:2008
--#: ../contrib/src/deprecated/resource.cpp:2022
--#: ../contrib/src/deprecated/resource.cpp:3070
--#: ../contrib/src/deprecated/resource.cpp:3084
--#: ../contrib/src/deprecated/resource.cpp:3101
--#: ../contrib/src/deprecated/resource.cpp:3115
--msgid "Unexpected end of file while parsing resource."
--msgstr ""
--
--#: ../src/common/cmdline.cpp:826
--#, c-format
--msgid "Unexpected parameter '%s'"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:137
--msgid "Unicode 16 bit (UTF-16)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:138
--msgid "Unicode 16 bit Big Endian (UTF-16BE)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:139
--msgid "Unicode 16 bit Little Endian (UTF-16LE)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:140
--msgid "Unicode 32 bit (UTF-32)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:141
--msgid "Unicode 32 bit Big Endian (UTF-32BE)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:142
--msgid "Unicode 32 bit Little Endian (UTF-32LE)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:135
--msgid "Unicode 7 bit (UTF-7)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:136
--msgid "Unicode 8 bit (UTF-8)"
--msgstr ""
--
--#: ../src/msw/dde.cpp:1093
--#, c-format
--msgid "Unknown DDE error %08x"
--msgstr ""
--
--#: ../src/common/xtistrm.cpp:370
--msgid "Unknown Object passed to GetObjectClassInfo"
--msgstr ""
--
--#: ../src/unix/dlunix.cpp:275
--msgid "Unknown dynamic library error"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:695
--#, c-format
--msgid "Unknown encoding (%d)"
--msgstr ""
--
--#: ../src/unix/mimetype.cpp:2344
--#, c-format
--msgid "Unknown field in file %s, line %d: '%s'."
--msgstr ""
--
--#: ../src/common/cmdline.cpp:599
--#, c-format
--msgid "Unknown long option '%s'"
--msgstr ""
--
--#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629
--#, c-format
--msgid "Unknown option '%s'"
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:823
--msgid "Unknown style flag "
--msgstr ""
--
--#: ../src/common/xtixml.cpp:324
--#, c-format
--msgid "Unkown Property %s"
--msgstr ""
--
--#: ../src/common/mimecmn.cpp:163
--#, c-format
--msgid "Unmatched '{' in an entry for mime type %s."
--msgstr ""
--
--#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287
--#: ../src/common/cmdproc.cpp:307
--msgid "Unnamed command"
--msgstr ""
--
--#: ../contrib/src/deprecated/resource.cpp:2367
--#, c-format
--msgid "Unrecognized style %s while parsing resource."
--msgstr ""
--
--#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64
--#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445
--msgid "Unsupported clipboard format."
--msgstr ""
--
--#: ../src/common/appcmn.cpp:232
--#, c-format
--msgid "Unsupported theme '%s'."
--msgstr ""
--
--#: ../src/generic/fdrepdlg.cpp:158
--msgid "Up"
--msgstr ""
--
--#: ../src/common/cmdline.cpp:954
--#, c-format
--msgid "Usage: %s"
--msgstr ""
--
--#: ../src/common/valtext.cpp:181
--msgid "Validation conflict"
--msgstr ""
--
--#: ../contrib/src/mmedia/vidbase.cpp:65
--msgid "Video Output"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:972
--msgid "View files as a detailed view"
--msgstr ""
--
--#: ../src/generic/filedlgg.cpp:965
--msgid "View files as a list view"
--msgstr ""
--
--#: ../src/common/docview.cpp:1777
--msgid "Views"
--msgstr ""
--
--#: ../src/unix/baseunix.cpp:78
--msgid "Waiting for subprocess termination failed"
--msgstr ""
--
--#: ../src/common/docview.cpp:461
--msgid "Warning"
--msgstr ""
--
--#: ../src/common/log.cpp:480
--msgid "Warning: "
--msgstr ""
--
--#: ../src/html/htmlpars.cpp:391
--msgid "Warning: attempt to remove HTML tag handler from empty stack."
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:104
--msgid "Western European (ISO-8859-1)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:118
--msgid "Western European with Euro (ISO-8859-15)"
--msgstr ""
--
--#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341
--msgid "Whether the font is underlined."
--msgstr ""
--
--#: ../src/generic/fdrepdlg.cpp:150
--msgid "Whole word"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:535
--msgid "Whole words only"
--msgstr ""
--
--#: ../src/univ/themes/win32.cpp:1235
--msgid "Win32 theme"
--msgstr ""
--
--#: ../src/msw/utils.cpp:1063
--msgid "Win32s on Windows 3.1"
--msgstr ""
--
--#: ../src/msw/utils.cpp:1112
--#, c-format
--msgid "Windows 2000 (build %lu"
--msgstr ""
--
--#: ../src/msw/utils.cpp:1077
--msgid "Windows 95"
--msgstr ""
--
--#: ../src/msw/utils.cpp:1073
--msgid "Windows 95 OSR2"
--msgstr ""
--
--#: ../src/msw/utils.cpp:1088
--msgid "Windows 98"
--msgstr ""
--
--#: ../src/msw/utils.cpp:1084
--msgid "Windows 98 SE"
--msgstr ""
--
--#: ../src/msw/utils.cpp:1095
--#, c-format
--msgid "Windows 9x (%d.%d)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:132
--msgid "Windows Arabic (CP 1256)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:133
--msgid "Windows Baltic (CP 1257)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:126
--msgid "Windows Central European (CP 1250)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:123
--msgid "Windows Chinese Simplified (CP 936)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:125
--msgid "Windows Chinese Traditional (CP 950)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:127
--msgid "Windows Cyrillic (CP 1251)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:129
--msgid "Windows Greek (CP 1253)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:131
--msgid "Windows Hebrew (CP 1255)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:122
--msgid "Windows Japanese (CP 932)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:124
--msgid "Windows Korean (CP 949)"
--msgstr ""
--
--#: ../src/msw/utils.cpp:1092
--msgid "Windows ME"
--msgstr ""
--
--#: ../src/msw/utils.cpp:1127
--#, c-format
--msgid "Windows NT %lu.%lu (build %lu"
--msgstr ""
--
--#: ../src/msw/utils.cpp:1120
--#, c-format
--msgid "Windows Server 2003 (build %lu"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:121
--msgid "Windows Thai (CP 874)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:130
--msgid "Windows Turkish (CP 1254)"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:128
--msgid "Windows Western European (CP 1252)"
--msgstr ""
--
--#: ../src/msw/utils.cpp:1116
--#, c-format
--msgid "Windows XP (build %lu"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:134
--msgid "Windows/DOS OEM (CP 437)"
--msgstr ""
--
--#: ../src/common/ffile.cpp:158
--#, c-format
--msgid "Write error on file '%s'"
--msgstr ""
--
--#: ../src/xml/xml.cpp:562
--#, c-format
--msgid "XML parsing error: '%s' at line %d"
--msgstr ""
--
--#: ../src/common/xpmdecod.cpp:774
--msgid "XPM: Malformed pixel data!"
--msgstr ""
--
--#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721
--#, c-format
--msgid "XPM: malformed colour definition '%s'!"
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:579
--#, c-format
--msgid "XRC resource '%s' (class '%s') not found!"
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:1080 ../src/xrc/xmlres.cpp:1092
--#, c-format
--msgid "XRC resource: Cannot create bitmap from '%s'."
--msgstr ""
--
--#: ../src/xrc/xmlres.cpp:1036
--#, c-format
--msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
--msgstr ""
--
--#: ../src/mac/carbon/msgdlg.cpp:59 ../src/mac/carbon/msgdlg.cpp:142
--#: ../src/mac/classic/msgdlg.cpp:57 ../src/mac/classic/msgdlg.cpp:139
--#: ../src/motif/msgdlg.cpp:204
--msgid "Yes"
--msgstr ""
--
--#: ../src/generic/dirdlgg.cpp:306
--msgid "You cannot add a new directory to this section."
--msgstr ""
--
--#: ../src/common/stockitem.cpp:155
--msgid "Zoom &In"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:156
--msgid "Zoom &Out"
--msgstr ""
--
--#: ../src/common/stockitem.cpp:154
--msgid "Zoom to &Fit"
--msgstr ""
--
--#: ../src/common/docview.cpp:2133
--msgid "[EMPTY]"
--msgstr ""
--
--#: ../src/msw/dde.cpp:1060
--msgid "a DDEML application has created a prolonged race condition."
--msgstr ""
--
--#: ../src/msw/dde.cpp:1048
--msgid ""
--"a DDEML function was called without first calling the DdeInitialize "
--"function,\n"
--"or an invalid instance identifier\n"
--"was passed to a DDEML function."
--msgstr ""
--
--#: ../src/msw/dde.cpp:1066
--msgid "a client's attempt to establish a conversation has failed."
--msgstr ""
--
--#: ../src/msw/dde.cpp:1063
--msgid "a memory allocation failed."
--msgstr ""
--
--#: ../src/msw/dde.cpp:1057
--msgid "a parameter failed to be validated by the DDEML."
--msgstr ""
--
--#: ../src/msw/dde.cpp:1039
--msgid "a request for a synchronous advise transaction has timed out."
--msgstr ""
--
--#: ../src/msw/dde.cpp:1045
--msgid "a request for a synchronous data transaction has timed out."
--msgstr ""
--
--#: ../src/msw/dde.cpp:1054
--msgid "a request for a synchronous execute transaction has timed out."
--msgstr ""
--
--#: ../src/msw/dde.cpp:1072
--msgid "a request for a synchronous poke transaction has timed out."
--msgstr ""
--
--#: ../src/msw/dde.cpp:1087
--msgid "a request to end an advise transaction has timed out."
--msgstr ""
--
--#: ../src/msw/dde.cpp:1081
--msgid ""
--"a server-side transaction was attempted on a conversation\n"
--"that was terminated by the client, or the server\n"
--"terminated before completing a transaction."
--msgstr ""
--
--#: ../src/msw/dde.cpp:1069
--msgid "a transaction failed."
--msgstr ""
--
--#: ../src/common/menucmn.cpp:114
--msgid "alt"
--msgstr ""
--
--#: ../src/msw/dde.cpp:1051
--msgid ""
--"an application initialized as APPCLASS_MONITOR has\n"
--"attempted to perform a DDE transaction,\n"
--"or an application initialized as APPCMD_CLIENTONLY has \n"
--"attempted to perform server transactions."
--msgstr ""
--
--#: ../src/msw/dde.cpp:1075
--msgid "an internal call to the PostMessage function has failed. "
--msgstr ""
--
--#: ../src/msw/dde.cpp:1084
--msgid "an internal error has occurred in the DDEML."
--msgstr ""
--
--#: ../src/msw/dde.cpp:1090
--msgid ""
--"an invalid transaction identifier was passed to a DDEML function.\n"
--"Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
--"the transaction identifier for that callback is no longer valid."
--msgstr ""
--
--#: ../src/common/zipstrm.cpp:1330
--msgid "assuming this is a multi-part zip concatenated"
--msgstr ""
--
--#: ../src/common/fileconf.cpp:1847
--#, c-format
--msgid "attempt to change immutable key '%s' ignored."
--msgstr ""
--
--#: ../src/html/chm.cpp:330
--msgid "bad arguments to library function"
--msgstr ""
--
--#: ../src/html/chm.cpp:342
--msgid "bad signature"
--msgstr ""
--
--#: ../src/common/zipstrm.cpp:1580
--msgid "bad zipfile offset to entry"
--msgstr ""
--
--#: ../src/common/ftp.cpp:385
--msgid "binary"
--msgstr ""
--
--#: ../src/common/fontcmn.cpp:646
--msgid "bold"
--msgstr ""
--
--#: ../src/common/fontcmn.cpp:570
--msgid "bold "
--msgstr ""
--
--#: ../src/os2/iniconf.cpp:451
--msgid "buffer is too small for Windows directory."
--msgstr ""
--
--#: ../src/common/ffile.cpp:91
--#, c-format
--msgid "can't close file '%s'"
--msgstr ""
--
--#: ../src/common/file.cpp:286
--#, c-format
--msgid "can't close file descriptor %d"
--msgstr ""
--
--#: ../src/common/file.cpp:551
--#, c-format
--msgid "can't commit changes to file '%s'"
--msgstr ""
--
--#: ../src/common/file.cpp:217
--#, c-format
--msgid "can't create file '%s'"
--msgstr ""
--
--#: ../src/common/fileconf.cpp:1159
--#, c-format
--msgid "can't delete user configuration file '%s'"
--msgstr ""
--
--#: ../src/common/file.cpp:457
--#, c-format
--msgid "can't determine if the end of file is reached on descriptor %d"
--msgstr ""
--
--#: ../src/msdos/utilsdos.cpp:307 ../src/msdos/utilsdos.cpp:466
--#, c-format
--msgid "can't execute '%s'"
--msgstr ""
--
--#: ../src/common/zipstrm.cpp:1357
--msgid "can't find central directory in zip"
--msgstr ""
--
--#: ../src/common/file.cpp:427
--#, c-format
--msgid "can't find length of file on file descriptor %d"
--msgstr ""
--
--#: ../src/msw/utils.cpp:380
--msgid "can't find user's HOME, using current directory."
--msgstr ""
--
--#: ../src/common/file.cpp:341
--#, c-format
--msgid "can't flush file descriptor %d"
--msgstr ""
--
--#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202
--#, c-format
--msgid "can't get seek position on file descriptor %d"
--msgstr ""
--
--#: ../src/common/fontmap.cpp:326
--msgid "can't load any font, aborting"
--msgstr ""
--
--#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271
--#, c-format
--msgid "can't open file '%s'"
--msgstr ""
--
--#: ../src/common/fileconf.cpp:404
--#, c-format
--msgid "can't open global configuration file '%s'."
--msgstr ""
--
--#: ../src/common/fileconf.cpp:419
--#, c-format
--msgid "can't open user configuration file '%s'."
--msgstr ""
--
--#: ../src/common/fileconf.cpp:1005
--msgid "can't open user configuration file."
--msgstr ""
--
--#: ../src/common/dynlib.cpp:253
--msgid "can't query for GUI plugins name in console applications"
--msgstr ""
--
--#: ../src/common/zipstrm.cpp:436
--msgid "can't re-initialize zlib deflate stream"
--msgstr ""
--
--#: ../src/common/zipstrm.cpp:461
--msgid "can't re-initialize zlib inflate stream"
--msgstr ""
--
--#: ../src/common/file.cpp:310
--#, c-format
--msgid "can't read from file descriptor %d"
--msgstr ""
--
--#: ../src/common/file.cpp:546
--#, c-format
--msgid "can't remove file '%s'"
--msgstr ""
--
--#: ../src/common/file.cpp:562
--#, c-format
--msgid "can't remove temporary file '%s'"
--msgstr ""
--
--#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189
--#, c-format
--msgid "can't seek on file descriptor %d"
--msgstr ""
--
--#: ../src/common/textfile.cpp:196
--#, c-format
--msgid "can't write buffer '%s' to disk."
--msgstr ""
--
--#: ../src/common/file.cpp:326
--#, c-format
--msgid "can't write to file descriptor %d"
--msgstr ""
--
--#: ../src/common/fileconf.cpp:1016
--msgid "can't write user configuration file."
--msgstr ""
--
--#: ../src/common/intl.cpp:1110
--#, c-format
--msgid "catalog file for domain '%s' not found."
--msgstr ""
--
--#: ../src/html/chm.cpp:346
--msgid "checksum error"
--msgstr ""
--
--#: ../src/html/chm.cpp:348
--msgid "compression error"
--msgstr ""
--
--#: ../src/common/regex.cpp:141
--msgid "conversion to 8-bit encoding failed"
--msgstr ""
--
--#: ../src/common/menucmn.cpp:112
--msgid "ctrl"
--msgstr ""
--
--#: ../src/common/cmdline.cpp:1094
--msgid "date"
--msgstr ""
--
--#: ../src/html/chm.cpp:350
--msgid "decompression error"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:705 ../src/common/fmapbase.cpp:737
--msgid "default"
--msgstr ""
--
--#: ../src/common/xtistrm.cpp:843
--msgid "delegate has no type info"
--msgstr ""
--
--#: ../src/common/debugrpt.cpp:524
--msgid "dump of the process state (binary)"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3882
--msgid "eighteenth"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3872
--msgid "eighth"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3875
--msgid "eleventh"
--msgstr ""
--
--#: ../src/common/strconv.cpp:2671
--#, c-format
--msgid "encoding %s"
--msgstr ""
--
--#: ../src/common/fileconf.cpp:1833
--#, c-format
--msgid "entry '%s' appears more than once in group '%s'"
--msgstr ""
--
--#: ../src/html/chm.cpp:344
--msgid "error in data format"
--msgstr ""
--
--#: ../src/msdos/utilsdos.cpp:407
--#, c-format
--msgid "error opening '%s'"
--msgstr ""
--
--#: ../src/html/chm.cpp:332
--msgid "error opening file"
--msgstr ""
--
--#: ../src/common/zipstrm.cpp:1442
--msgid "error reading zip central directory"
--msgstr ""
--
--#: ../src/common/zipstrm.cpp:1520
--msgid "error reading zip local header"
--msgstr ""
--
--#: ../src/common/zipstrm.cpp:2236
--#, c-format
--msgid "error writing zip entry '%s': bad crc or length"
--msgstr ""
--
--#: ../src/msw/dialup.cpp:881
--msgid "establish"
--msgstr ""
--
--#: ../src/common/ffile.cpp:172
--#, c-format
--msgid "failed to flush the file '%s'"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3879
--msgid "fifteenth"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3869
--msgid "fifth"
--msgstr ""
--
--#: ../src/common/fileconf.cpp:664
--#, c-format
--msgid "file '%s', line %d: '%s' ignored after group header."
--msgstr ""
--
--#: ../src/common/fileconf.cpp:693
--#, c-format
--msgid "file '%s', line %d: '=' expected."
--msgstr ""
--
--#: ../src/common/fileconf.cpp:716
--#, c-format
--msgid "file '%s', line %d: key '%s' was first found at line %d."
--msgstr ""
--
--#: ../src/common/fileconf.cpp:706
--#, c-format
--msgid "file '%s', line %d: value for immutable key '%s' ignored."
--msgstr ""
--
--#: ../src/common/fileconf.cpp:628
--#, c-format
--msgid "file '%s': unexpected character %c at line %d."
--msgstr ""
--
--#: ../src/common/datetime.cpp:3865
--msgid "first"
--msgstr ""
--
--#: ../src/html/helpfrm.cpp:1262
--msgid "font size"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3878
--msgid "fourteenth"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3868
--msgid "fourth"
--msgstr ""
--
--#: ../src/common/appbase.cpp:367
--msgid "generate verbose log messages"
--msgstr ""
--
--#: ../src/common/xtixml.cpp:479
--msgid "incorrect event handler string, missing dot"
--msgstr ""
--
--#: ../src/msw/dialup.cpp:881
--msgid "initiate"
--msgstr ""
--
--#: ../src/common/file.cpp:459
--msgid "invalid eof() return value."
--msgstr ""
--
--#: ../src/generic/logg.cpp:1179
--msgid "invalid message box return value"
--msgstr ""
--
--#: ../src/common/zipstrm.cpp:1306
--msgid "invalid zip file"
--msgstr ""
--
--#: ../src/common/fontcmn.cpp:586 ../src/common/fontcmn.cpp:650
--msgid "italic"
--msgstr ""
--
--#: ../src/common/fontcmn.cpp:642
--msgid "light"
--msgstr ""
--
--#: ../src/common/fontcmn.cpp:566
--msgid "light "
--msgstr ""
--
--#: ../src/common/intl.cpp:1456
--#, c-format
--msgid "locale '%s' can not be set."
--msgstr ""
--
--#: ../src/common/intl.cpp:1103
--#, c-format
--msgid "looking for catalog '%s' in path '%s'."
--msgstr ""
--
--#: ../src/common/datetime.cpp:4029
--msgid "midnight"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3883
--msgid "nineteenth"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3873
--msgid "ninth"
--msgstr ""
--
--#: ../src/msw/dde.cpp:1035
--msgid "no DDE error."
--msgstr ""
--
--#: ../src/html/chm.cpp:328
--msgid "no error"
--msgstr ""
--
--#: ../src/html/helpdata.cpp:662
--msgid "noname"
--msgstr ""
--
--#: ../src/common/datetime.cpp:4028
--msgid "noon"
--msgstr ""
--
--#: ../src/common/cmdline.cpp:1090
--msgid "num"
--msgstr ""
--
--#: ../src/common/xtixml.cpp:258
--msgid "objects cannot have XML Text Nodes"
--msgstr ""
--
--#: ../src/html/chm.cpp:340
--msgid "out of memory"
--msgstr ""
--
--#: ../src/common/debugrpt.cpp:500
--msgid "process context description"
--msgstr ""
--
--#: ../src/html/chm.cpp:334
--msgid "read error"
--msgstr ""
--
--#: ../src/common/filename.cpp:181
--msgid "reading"
--msgstr ""
--
--#: ../src/common/zipstrm.cpp:1743
--#, c-format
--msgid "reading zip stream (entry %s): bad crc"
--msgstr ""
--
--#: ../src/common/zipstrm.cpp:1740
--#, c-format
--msgid "reading zip stream (entry %s): bad length"
--msgstr ""
--
--#: ../src/msw/dde.cpp:1078
--msgid "reentrancy problem."
--msgstr ""
--
--#: ../src/common/datetime.cpp:3866
--msgid "second"
--msgstr ""
--
--#: ../src/html/chm.cpp:338
--msgid "seek error"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3881
--msgid "seventeenth"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3871
--msgid "seventh"
--msgstr ""
--
--#: ../src/common/menucmn.cpp:116
--msgid "shift"
--msgstr ""
--
--#: ../src/common/appbase.cpp:357
--msgid "show this help message"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3880
--msgid "sixteenth"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3870
--msgid "sixth"
--msgstr ""
--
--#: ../src/common/appcmn.cpp:203
--msgid "specify display mode to use (e.g. 640x480-16)"
--msgstr ""
--
--#: ../src/common/appcmn.cpp:189
--msgid "specify the theme to use"
--msgstr ""
--
--#: ../src/common/zipstrm.cpp:1646
--msgid "stored file length not in Zip header"
--msgstr ""
--
--#: ../src/common/cmdline.cpp:1086
--msgid "str"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3874
--msgid "tenth"
--msgstr ""
--
--#: ../src/msw/dde.cpp:1042
--msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
--msgstr ""
--
--#: ../src/common/datetime.cpp:3867
--msgid "third"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3877
--msgid "thirteenth"
--msgstr ""
--
--#: ../src/common/imagtiff.cpp:145 ../src/common/imagtiff.cpp:161
--#, c-format
--msgid "tiff module: %s"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3694
--msgid "today"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3696
--msgid "tomorrow"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3876
--msgid "twelfth"
--msgstr ""
--
--#: ../src/common/datetime.cpp:3884
--msgid "twentieth"
--msgstr ""
--
--#: ../src/common/fontcmn.cpp:638
--msgid "underlined"
--msgstr ""
--
--#: ../src/common/fontcmn.cpp:553
--msgid "underlined "
--msgstr ""
--
--#: ../src/common/fileconf.cpp:1960
--#, c-format
--msgid "unexpected \" at position %d in '%s'."
--msgstr ""
--
--#: ../src/generic/progdlgg.cpp:307
--msgid "unknown"
--msgstr ""
--
--#: ../src/common/xtixml.cpp:252
--#, c-format
--msgid "unknown class %s"
--msgstr ""
--
--#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
--msgid "unknown error"
--msgstr ""
--
--#: ../src/msw/dialup.cpp:494
--#, c-format
--msgid "unknown error (error code %08x)."
--msgstr ""
--
--#: ../src/common/textbuf.cpp:230
--msgid "unknown line terminator"
--msgstr ""
--
--#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170
--msgid "unknown seek origin"
--msgstr ""
--
--#: ../src/common/fmapbase.cpp:719
--#, c-format
--msgid "unknown-%d"
--msgstr ""
--
--#: ../src/common/docview.cpp:430
--msgid "unnamed"
--msgstr ""
--
--#: ../src/common/docview.cpp:1401
--#, c-format
--msgid "unnamed%d"
--msgstr ""
--
--#: ../src/common/zipstrm.cpp:1660 ../src/common/zipstrm.cpp:2030
--msgid "unsupported Zip compression method"
--msgstr ""
--
--#: ../src/common/zipstrm.cpp:1142
--msgid "unsupported zip archive"
--msgstr ""
--
--#: ../src/common/intl.cpp:1115
--#, c-format
--msgid "using catalog '%s' from '%s'."
--msgstr ""
--
--#: ../src/html/chm.cpp:336
--msgid "write error"
--msgstr ""
--
--#: ../src/common/filename.cpp:181
--msgid "writing"
--msgstr ""
--
--#: ../src/common/stopwatch.cpp:291
--msgid "wxGetTimeOfDay failed."
--msgstr ""
--
--#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469
--#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506
--msgid "wxSocket: invalid signature in ReadMsg."
--msgstr ""
--
--#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006
--msgid "wxSocket: unknown event!."
--msgstr ""
--
--#: ../src/motif/app.cpp:214
--#, c-format
--msgid "wxWidgets could not open display for '%s': exiting."
--msgstr ""
--
--#: ../src/x11/app.cpp:176
--msgid "wxWidgets could not open display. Exiting."
--msgstr ""
--
--#: ../src/common/datetime.cpp:3695
--msgid "yesterday"
--msgstr ""
--
--#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
--#, c-format
--msgid "zlib error %d"
--msgstr ""
--
--#: ../src/common/prntbase.cpp:886
--msgid "|<<"
--msgstr ""
-diff -ur wxGTK-2.6.3/locale/pl.po wxGTK-2.6.3.2/locale/pl.po
---- wxGTK-2.6.3/locale/pl.po 2006-03-21 18:42:51.000000000 -0500
-+++ wxGTK-2.6.3.2/locale/pl.po 2005-09-20 09:54:38.000000000 -0400
-@@ -71,8 +71,10 @@
- msgid "#define %s must be an integer."
- msgstr "#define %s musi by� liczb� ca�kowit�."
-
--#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
--#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
-+#: ../src/html/helpfrm.cpp:1042
-+#: ../src/html/helpfrm.cpp:1044
-+#: ../src/html/helpfrm.cpp:1703
-+#: ../src/html/helpfrm.cpp:1736
- #, c-format
- msgid "%i of %i"
- msgstr "%i z %i"
-@@ -129,7 +131,8 @@
- msgid "%s: ill-formed resource file syntax."
- msgstr "%s: b��dna sk�adnia pliku zasobu."
-
--#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359
-+#: ../src/html/helpfrm.cpp:357
-+#: ../src/html/helpfrm.cpp:359
- msgid "&About..."
- msgstr "Inform&acje..."
-
-@@ -153,8 +156,10 @@
- msgid "&Bold"
- msgstr "Pogru&biony"
-
--#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363
--#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:422
-+#: ../src/common/stockitem.cpp:110
-+#: ../src/generic/fontdlgg.cpp:363
-+#: ../src/generic/fontdlgg.cpp:382
-+#: ../src/generic/wizard.cpp:422
- msgid "&Cancel"
- msgstr "&Anuluj"
-
-@@ -166,12 +171,15 @@
- msgid "&Clear"
- msgstr "Wy&czy��"
-
--#: ../src/common/prntbase.cpp:875 ../src/common/stockitem.cpp:112
--#: ../src/generic/logg.cpp:509 ../src/html/helpfrm.cpp:354
-+#: ../src/common/prntbase.cpp:875
-+#: ../src/common/stockitem.cpp:112
-+#: ../src/generic/logg.cpp:509
-+#: ../src/html/helpfrm.cpp:354
- msgid "&Close"
- msgstr "Zam&knij"
-
--#: ../src/common/stockitem.cpp:113 ../src/mac/carbon/textctrl.cpp:1074
-+#: ../src/common/stockitem.cpp:113
-+#: ../src/mac/carbon/textctrl.cpp:1074
- #: ../src/msw/textctrl.cpp:2064
- msgid "&Copy"
- msgstr "&Kopiuj"
-@@ -180,7 +188,8 @@
- msgid "&Debug report preview:"
- msgstr "Po&dgl�d raportu b��d�w:"
-
--#: ../src/common/stockitem.cpp:115 ../src/mac/carbon/textctrl.cpp:1076
-+#: ../src/common/stockitem.cpp:115
-+#: ../src/mac/carbon/textctrl.cpp:1076
- #: ../src/msw/textctrl.cpp:2066
- msgid "&Delete"
- msgstr "&Usu�"
-@@ -217,8 +226,10 @@
- msgid "&Goto..."
- msgstr "&Przejd� do..."
-
--#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:418
--#: ../src/generic/wizard.cpp:425 ../src/html/helpfrm.cpp:362
-+#: ../src/common/stockitem.cpp:122
-+#: ../src/generic/wizard.cpp:418
-+#: ../src/generic/wizard.cpp:425
-+#: ../src/html/helpfrm.cpp:362
- msgid "&Help"
- msgstr "&Pomoc"
-
-@@ -246,11 +257,13 @@
- msgid "&New"
- msgstr "&Nowy"
-
--#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:188
-+#: ../src/generic/mdig.cpp:118
-+#: ../src/msw/mdi.cpp:188
- msgid "&Next"
- msgstr "&Nast�pne"
-
--#: ../src/generic/wizard.cpp:421 ../src/generic/wizard.cpp:636
-+#: ../src/generic/wizard.cpp:421
-+#: ../src/generic/wizard.cpp:636
- msgid "&Next >"
- msgstr "&Dalej >"
-
-@@ -266,7 +279,8 @@
- msgid "&Notes:"
- msgstr "&Uwagi:"
-
--#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368
-+#: ../src/common/stockitem.cpp:133
-+#: ../src/generic/fontdlgg.cpp:368
- #: ../src/generic/fontdlgg.cpp:375
- msgid "&OK"
- msgstr "&OK"
-@@ -279,7 +293,8 @@
- msgid "&Open..."
- msgstr "&Otw�rz..."
-
--#: ../src/common/stockitem.cpp:135 ../src/mac/carbon/textctrl.cpp:1075
-+#: ../src/common/stockitem.cpp:135
-+#: ../src/mac/carbon/textctrl.cpp:1075
- #: ../src/msw/textctrl.cpp:2065
- msgid "&Paste"
- msgstr "Wkl&ej"
-@@ -292,7 +307,8 @@
- msgid "&Preferences"
- msgstr "&Preferencje"
-
--#: ../src/generic/mdig.cpp:119 ../src/msw/mdi.cpp:189
-+#: ../src/generic/mdig.cpp:119
-+#: ../src/msw/mdi.cpp:189
- msgid "&Previous"
- msgstr "&Poprzednie"
-
-@@ -312,13 +328,16 @@
- msgid "&Quit"
- msgstr "&Wyj�cie"
-
--#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299
--#: ../src/common/stockitem.cpp:141 ../src/mac/carbon/textctrl.cpp:1071
-+#: ../src/common/cmdproc.cpp:292
-+#: ../src/common/cmdproc.cpp:299
-+#: ../src/common/stockitem.cpp:141
-+#: ../src/mac/carbon/textctrl.cpp:1071
- #: ../src/msw/textctrl.cpp:2061
- msgid "&Redo"
- msgstr "&Pon�w"
-
--#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308
-+#: ../src/common/cmdproc.cpp:288
-+#: ../src/common/cmdproc.cpp:308
- msgid "&Redo "
- msgstr "&Pon�w "
-
-@@ -354,12 +373,15 @@
- msgid "&Style:"
- msgstr "&Styl:"
-
--#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337
-+#: ../src/common/stockitem.cpp:149
-+#: ../src/generic/fontdlgg.cpp:337
- msgid "&Underline"
- msgstr "&Podkre�lony"
-
--#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150
--#: ../src/mac/carbon/textctrl.cpp:1070 ../src/msw/textctrl.cpp:2060
-+#: ../src/common/cmdproc.cpp:270
-+#: ../src/common/stockitem.cpp:150
-+#: ../src/mac/carbon/textctrl.cpp:1070
-+#: ../src/msw/textctrl.cpp:2060
- msgid "&Undo"
- msgstr "&Cofnij"
-
-@@ -379,8 +401,11 @@
- msgid "&Weight:"
- msgstr "&Waga"
-
--#: ../src/generic/mdig.cpp:298 ../src/generic/mdig.cpp:314
--#: ../src/generic/mdig.cpp:318 ../src/msw/mdi.cpp:1410 ../src/msw/mdi.cpp:1417
-+#: ../src/generic/mdig.cpp:298
-+#: ../src/generic/mdig.cpp:314
-+#: ../src/generic/mdig.cpp:318
-+#: ../src/msw/mdi.cpp:1410
-+#: ../src/msw/mdi.cpp:1417
- #: ../src/msw/mdi.cpp:1447
- msgid "&Window"
- msgstr "&Okno"
-@@ -389,12 +414,14 @@
- msgid "&Yes"
- msgstr "&Tak"
-
--#: ../src/common/config.cpp:433 ../src/msw/regconf.cpp:258
-+#: ../src/common/config.cpp:433
-+#: ../src/msw/regconf.cpp:258
- #, c-format
- msgid "'%s' has extra '..', ignored."
- msgstr "'%s' ma nadmiarowe '..', zignorowane."
-
--#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162
-+#: ../src/common/valtext.cpp:132
-+#: ../src/common/valtext.cpp:162
- #: ../src/common/valtext.cpp:168
- #, c-format
- msgid "'%s' is invalid"
-@@ -439,7 +466,8 @@
- msgid "(Help)"
- msgstr "(Pomoc)"
-
--#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114
-+#: ../src/html/helpfrm.cpp:431
-+#: ../src/html/helpfrm.cpp:1114
- #: ../src/html/helpfrm.cpp:1764
- msgid "(bookmarks)"
- msgstr "(zak�adki)"
-@@ -467,11 +495,13 @@
- ", oczekiwano static, #include or #define\n"
- "podczas przetwarzania zasobu."
-
--#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:740
-+#: ../src/generic/dirctrlg.cpp:683
-+#: ../src/generic/filedlgg.cpp:740
- msgid "."
- msgstr "."
-
--#: ../src/generic/dirctrlg.cpp:684 ../src/generic/filedlgg.cpp:741
-+#: ../src/generic/dirctrlg.cpp:684
-+#: ../src/generic/filedlgg.cpp:741
- msgid ".."
- msgstr ".."
-
-@@ -523,15 +553,18 @@
- msgid "<<"
- msgstr "<<"
-
--#: ../src/generic/filedlgg.cpp:259 ../src/generic/filedlgg.cpp:282
-+#: ../src/generic/filedlgg.cpp:259
-+#: ../src/generic/filedlgg.cpp:282
- msgid "<DIR>"
- msgstr "<KATALOG>"
-
--#: ../src/generic/filedlgg.cpp:263 ../src/generic/filedlgg.cpp:286
-+#: ../src/generic/filedlgg.cpp:263
-+#: ../src/generic/filedlgg.cpp:286
- msgid "<DRIVE>"
- msgstr "<NAP�D>"
-
--#: ../src/generic/filedlgg.cpp:261 ../src/generic/filedlgg.cpp:284
-+#: ../src/generic/filedlgg.cpp:261
-+#: ../src/generic/filedlgg.cpp:284
- msgid "<LINK>"
- msgstr "<��CZE>"
-
-@@ -665,8 +698,7 @@
-
- #: ../include/wx/xti.h:849
- msgid "AddToPropertyCollection called w/o valid adder"
--msgstr ""
--"Funkcja AddToPropertyCollection wywo�ana bez poprawnego modu�u dodaj�cego"
-+msgstr "Funkcja AddToPropertyCollection wywo�ana bez poprawnego modu�u dodaj�cego"
-
- #: ../src/html/helpctrl.cpp:106
- #, c-format
-@@ -704,8 +736,7 @@
-
- #: ../src/common/xtistrm.cpp:385
- msgid "Already Registered Object passed to SetObjectClassInfo"
--msgstr ""
--"Zarejestrowany wcze�niej obiekt przekazany do funkcji SetObjectClassInfo"
-+msgstr "Zarejestrowany wcze�niej obiekt przekazany do funkcji SetObjectClassInfo"
-
- #: ../src/unix/dialup.cpp:362
- msgid "Already dialling ISP."
-@@ -776,7 +807,8 @@
- msgid "B6 Envelope, 176 x 125 mm"
- msgstr "Koperta B6, 176 x 125 mm"
-
--#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493
-+#: ../src/common/imagbmp.cpp:477
-+#: ../src/common/imagbmp.cpp:493
- msgid "BMP: Couldn't allocate memory."
- msgstr "BMP: Nie mo�na przydzieli� pami�ci."
-
-@@ -857,7 +889,8 @@
- msgid "C65 Envelope, 114 x 229 mm"
- msgstr "Koperta C65, 114 x 229 mm"
-
--#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856
-+#: ../src/html/chm.cpp:797
-+#: ../src/html/chm.cpp:856
- msgid "CHM handler currently supports only local files!"
- msgstr "Obs�uga CHM obecnie wspiera tylko pliki lokalne!"
-
-@@ -870,7 +903,8 @@
- msgid "Can not enumerate files '%s'"
- msgstr "Nie mo�na wyliczy� plik�w '%s'"
-
--#: ../src/msw/dir.cpp:205 ../src/unix/dir.cpp:232
-+#: ../src/msw/dir.cpp:205
-+#: ../src/unix/dir.cpp:232
- #, c-format
- msgid "Can not enumerate files in directory '%s'"
- msgstr "Nie mo�na wyliczy� plik�w w katalogu '%s'"
-@@ -880,7 +914,8 @@
- msgid "Can not resume thread %lu"
- msgstr "Nie mo�na wznowi� w�tku %lu"
-
--#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:827
-+#: ../src/mac/classic/thread.cpp:491
-+#: ../src/msw/thread.cpp:827
- #, c-format
- msgid "Can not resume thread %x"
- msgstr "Nie mo�na wznowi� w�tku %x"
-@@ -894,7 +929,8 @@
- msgid "Can not suspend thread %lu"
- msgstr "Nie mo�na zawiesi� w�tku %lu"
-
--#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:812
-+#: ../src/mac/classic/thread.cpp:464
-+#: ../src/msw/thread.cpp:812
- #, c-format
- msgid "Can not suspend thread %x"
- msgstr "Nie mo�na zawiesi� w�tku %x"
-@@ -927,8 +963,10 @@
- msgid "Can't create registry key '%s'"
- msgstr "Nie mo�na utworzy� klucza rejestru '%s'"
-
--#: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100
--#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594
-+#: ../src/mac/carbon/mpthread.cpp:911
-+#: ../src/mac/carbon/thread.cpp:1100
-+#: ../src/mac/classic/thread.cpp:439
-+#: ../src/msw/thread.cpp:594
- #: ../src/os2/thread.cpp:486
- msgid "Can't create thread"
- msgstr "Nie mo�na utworzy� w�tku"
-@@ -943,7 +981,8 @@
- msgid "Can't delete key '%s'"
- msgstr "Nie mo�na usun�� klucza '%s'"
-
--#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:458
-+#: ../src/msw/iniconf.cpp:444
-+#: ../src/os2/iniconf.cpp:458
- #, c-format
- msgid "Can't delete the INI file '%s'"
- msgstr "Nie mo�na usun�� pliku INI '%s'"
-@@ -986,7 +1025,8 @@
- msgid "Can't initialize zlib inflate stream."
- msgstr "Nie mo�na zainicjowa� strumienia dekompresji biblioteki zlib."
-
--#: ../src/common/image.cpp:1367 ../src/common/image.cpp:1387
-+#: ../src/common/image.cpp:1367
-+#: ../src/common/image.cpp:1387
- #, c-format
- msgid "Can't load image from file '%s': file does not exist."
- msgstr "Nie mo�na wczyta� obrazu z pliku '%s': plik nie istnieje."
-@@ -1003,16 +1043,15 @@
-
- #: ../src/common/zstream.cpp:159
- msgid "Can't read inflate stream: unexpected EOF in underlying stream."
--msgstr ""
--"Nie mo�na odczyta� dekompresowanego strumienia: nieoczekiwany koniec w "
--"strumieniu."
-+msgstr "Nie mo�na odczyta� dekompresowanego strumienia: nieoczekiwany koniec w strumieniu."
-
- #: ../src/msw/registry.cpp:960
- #, c-format
- msgid "Can't read value of '%s'"
- msgstr "Nie mo�na odczyta� warto�ci '%s'"
-
--#: ../src/msw/registry.cpp:795 ../src/msw/registry.cpp:825
-+#: ../src/msw/registry.cpp:795
-+#: ../src/msw/registry.cpp:825
- #: ../src/msw/registry.cpp:885
- #, c-format
- msgid "Can't read value of key '%s'"
-@@ -1023,16 +1062,19 @@
- msgid "Can't save image to file '%s': unknown extension."
- msgstr "Nie mo�na zapisa� obrazu do pliku '%s': nieznane rozszerzenie."
-
--#: ../src/generic/logg.cpp:569 ../src/generic/logg.cpp:1020
-+#: ../src/generic/logg.cpp:569
-+#: ../src/generic/logg.cpp:1020
- msgid "Can't save log contents to file."
- msgstr "Nie mo�na zapisa� zawarto�ci dziennika w pliku."
-
- # ustali�?
--#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:469
-+#: ../src/msw/thread.cpp:550
-+#: ../src/os2/thread.cpp:469
- msgid "Can't set thread priority"
- msgstr "Nie mo�na zmieni� priorytetu w�tku"
-
--#: ../src/msw/registry.cpp:812 ../src/msw/registry.cpp:854
-+#: ../src/msw/registry.cpp:812
-+#: ../src/msw/registry.cpp:854
- #: ../src/msw/registry.cpp:975
- #, c-format
- msgid "Can't set value of '%s'"
-@@ -1043,18 +1085,21 @@
- msgid "Can't write to deflate stream: %s"
- msgstr "Nie mo�na zapisywa� do kompresowanego strumienia: %s"
-
--#: ../src/generic/choicdgg.cpp:291 ../src/generic/dirdlgg.cpp:114
--#: ../src/generic/numdlgg.cpp:136 ../src/generic/textdlgg.cpp:120
--#: ../src/gtk/fontdlg.cpp:155 ../src/motif/msgdlg.cpp:204
-+#: ../src/generic/choicdgg.cpp:291
-+#: ../src/generic/dirdlgg.cpp:114
-+#: ../src/generic/numdlgg.cpp:136
-+#: ../src/generic/textdlgg.cpp:120
-+#: ../src/gtk/fontdlg.cpp:155
-+#: ../src/motif/msgdlg.cpp:204
- #: ../contrib/src/deprecated/proplist.cpp:518
- msgid "Cancel"
- msgstr "Zrezygnuj"
-
- # units --> ?
--#: ../src/xrc/xmlres.cpp:1188 ../src/xrc/xmlres.cpp:1236
-+#: ../src/xrc/xmlres.cpp:1188
-+#: ../src/xrc/xmlres.cpp:1236
- msgid "Cannot convert dialog units: dialog unknown."
--msgstr ""
--"Nie mo�na wykona� konwersji okien dialogowych: nieznane okno dialogowe."
-+msgstr "Nie mo�na wykona� konwersji okien dialogowych: nieznane okno dialogowe."
-
- #: ../src/common/strconv.cpp:2665
- #, c-format
-@@ -1172,7 +1217,8 @@
- msgid "Cannot print empty page."
- msgstr "Nie mo�na wydrukowa� pustej strony."
-
--#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
-+#: ../src/msw/volume.cpp:160
-+#: ../src/msw/volume.cpp:491
- #, c-format
- msgid "Cannot read typename from '%s'!"
- msgstr "Nie mo�na odczyta� nazwy typu z '%s'!"
-@@ -1185,11 +1231,13 @@
- msgid "Cannot start thread: error writing TLS"
- msgstr "Nie mo�na wystartowa� w�tku: b��d zapisu TLS"
-
--#: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174
-+#: ../src/mac/carbon/mpthread.cpp:977
-+#: ../src/mac/carbon/thread.cpp:1174
- msgid "Cannot wait for thread termination."
- msgstr "Nie mo�na czeka� na zako�czenie w�tku."
-
--#: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082
-+#: ../src/mac/carbon/mpthread.cpp:893
-+#: ../src/mac/carbon/thread.cpp:1082
- msgid "Cant create the thread event queue"
- msgstr "Nie mo�na utworzy� kolejki zdarze� w�tku"
-
-@@ -1213,7 +1261,8 @@
- msgid "Choose ISP to dial"
- msgstr "Wybierz ISP do po��czenia"
-
--#: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45
-+#: ../src/generic/colrdlgg.cpp:151
-+#: ../src/gtk/colordlg.cpp:45
- #: ../src/palmos/colordlg.cpp:79
- msgid "Choose colour"
- msgstr "Wybierz kolor"
-@@ -1230,17 +1279,22 @@
- msgid "Clear the log contents"
- msgstr "Wyczy�� zawarto�� dziennika"
-
--#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384
-+#: ../src/generic/fontdlgg.cpp:365
-+#: ../src/generic/fontdlgg.cpp:384
- msgid "Click to cancel the font selection."
- msgstr "Anulowanie wyboru czcionki"
-
--#: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372
--#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379
-+#: ../src/generic/fontdlgg.cpp:370
-+#: ../src/generic/fontdlgg.cpp:372
-+#: ../src/generic/fontdlgg.cpp:377
-+#: ../src/generic/fontdlgg.cpp:379
- msgid "Click to confirm the font selection."
- msgstr "Potwierdzenie wyboru czcionki"
-
--#: ../src/generic/dbgrptg.cpp:92 ../src/generic/progdlgg.cpp:629
--#: ../src/generic/progdlgg.cpp:634 ../contrib/src/deprecated/proplist.cpp:513
-+#: ../src/generic/dbgrptg.cpp:92
-+#: ../src/generic/progdlgg.cpp:629
-+#: ../src/generic/progdlgg.cpp:634
-+#: ../contrib/src/deprecated/proplist.cpp:513
- msgid "Close"
- msgstr "Zamknij"
-
-@@ -1269,7 +1323,8 @@
- msgid "Config entry name cannot start with '%c'."
- msgstr "Nazwa pozycji konfiguracji nie mo�e zaczyna� si� od '%c'."
-
--#: ../src/generic/filedlgg.cpp:1318 ../src/gtk/filedlg.cpp:67
-+#: ../src/generic/filedlgg.cpp:1318
-+#: ../src/gtk/filedlg.cpp:67
- msgid "Confirm"
- msgstr "Potwierd�"
-
-@@ -1330,8 +1385,7 @@
- "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
- " or provide #define (see manual for caveats)"
- msgstr ""
--"Nie rozpoznano klasy lub identyfikatora '%s'. U�yj (niezerow�) liczb� "
--"ca�kowit� \n"
-+"Nie rozpoznano klasy lub identyfikatora '%s'. U�yj (niezerow�) liczb� ca�kowit� \n"
- " lub #define (szukaj szczeg��w w dokumentacji)"
-
- #: ../contrib/src/deprecated/resource.cpp:1278
-@@ -1347,7 +1401,8 @@
- msgid "Could not start document preview."
- msgstr "Nie mo�na wystartowa� podgl�du dokumentu."
-
--#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:763
-+#: ../src/generic/printps.cpp:185
-+#: ../src/gtk/gnome/gprint.cpp:763
- #: ../src/msw/printwin.cpp:235
- msgid "Could not start printing."
- msgstr "Nie mo�na rozpocz�� drukowania."
-@@ -1357,8 +1412,10 @@
- msgid "Could not transfer data to window"
- msgstr "Nie mo�na przenie�� danych do okna"
-
--#: ../src/mac/carbon/mpthread.cpp:227 ../src/mac/carbon/mpthread.cpp:306
--#: ../src/mac/carbon/thread.cpp:414 ../src/mac/carbon/thread.cpp:495
-+#: ../src/mac/carbon/mpthread.cpp:227
-+#: ../src/mac/carbon/mpthread.cpp:306
-+#: ../src/mac/carbon/thread.cpp:414
-+#: ../src/mac/carbon/thread.cpp:495
- msgid "Could not unlock mutex"
- msgstr "Nie odblokowano muteksu"
-
-@@ -1366,17 +1423,21 @@
- msgid "Couldn't acquire a mutex lock"
- msgstr "Nie mo�na przechwyci� muteksu"
-
--#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
--#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176
-+#: ../src/msw/dragimag.cpp:166
-+#: ../src/msw/dragimag.cpp:206
-+#: ../src/msw/imaglist.cpp:158
-+#: ../src/msw/imaglist.cpp:176
- #: ../src/msw/imaglist.cpp:188
- msgid "Couldn't add an image to the image list."
- msgstr "Nie mo�na doda� obrazu do listy obraz�w."
-
--#: ../src/msw/timer.cpp:106 ../src/os2/timer.cpp:155
-+#: ../src/msw/timer.cpp:106
-+#: ../src/os2/timer.cpp:155
- msgid "Couldn't create a timer"
- msgstr "Nie mo�na utworzy� stopera"
-
--#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166
-+#: ../src/mgl/cursor.cpp:135
-+#: ../src/mgl/cursor.cpp:166
- msgid "Couldn't create cursor."
- msgstr "Nie mo�na utworzy� kursora."
-
-@@ -1386,14 +1447,14 @@
- msgid "Couldn't find symbol '%s' in a dynamic library"
- msgstr "Nie mo�na znale�� symbolu '%s' w bibliotece"
-
--#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:853
-+#: ../src/mac/classic/thread.cpp:521
-+#: ../src/msw/thread.cpp:853
- msgid "Couldn't get the current thread pointer"
- msgstr "Nie mo�na pobra� wska�nika aktualnego w�tku"
-
- #: ../src/common/imagpng.cpp:596
- msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
--msgstr ""
--"Nie mo�na wczyta� obrazu PNG - plik jest uszkodzony lub zabrak�o pami�ci."
-+msgstr "Nie mo�na wczyta� obrazu PNG - plik jest uszkodzony lub zabrak�o pami�ci."
-
- #: ../src/unix/sound.cpp:472
- #, c-format
-@@ -1419,12 +1480,14 @@
- msgid "Couldn't retrieve information about list control item %d."
- msgstr "Nie mo�na pobra� informacji o elemencie listy kontroli %d."
-
--#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651
-+#: ../src/common/imagpng.cpp:642
-+#: ../src/common/imagpng.cpp:651
- #: ../src/common/imagpng.cpp:659
- msgid "Couldn't save PNG image."
- msgstr "Nie mo�na zapisa� obrazu PNG."
-
--#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611
-+#: ../src/mac/classic/thread.cpp:779
-+#: ../src/msw/thread.cpp:611
- msgid "Couldn't terminate thread"
- msgstr "Nie mo�na zako�czy� w�tku"
-
-@@ -1436,11 +1499,13 @@
- msgid "Create directory"
- msgstr "Tworzenie katalogu"
-
--#: ../src/generic/dirdlgg.cpp:140 ../src/generic/filedlgg.cpp:999
-+#: ../src/generic/dirdlgg.cpp:140
-+#: ../src/generic/filedlgg.cpp:999
- msgid "Create new directory"
- msgstr "Utw�rz nowy katalog"
-
--#: ../src/common/stockitem.cpp:114 ../src/mac/carbon/textctrl.cpp:1073
-+#: ../src/common/stockitem.cpp:114
-+#: ../src/mac/carbon/textctrl.cpp:1073
- #: ../src/msw/textctrl.cpp:2063
- msgid "Cu&t"
- msgstr "&Wytnij"
-@@ -1525,12 +1590,8 @@
- msgstr "Pulpit"
-
- #: ../src/msw/dialup.cpp:395
--msgid ""
--"Dial up functions are unavailable because the remote access service (RAS) is "
--"not installed on this machine. Please install it."
--msgstr ""
--"Funkcje Dial up nie s� dost�pne, poniewa� serwis zdalnego dost�pu (RAS) nie "
--"jest zainstalowany na tej maszynie. Zainstaluj go."
-+msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."
-+msgstr "Funkcje Dial up nie s� dost�pne, poniewa� serwis zdalnego dost�pu (RAS) nie jest zainstalowany na tej maszynie. Zainstaluj go."
-
- #: ../src/generic/tipdlg.cpp:246
- msgid "Did you know..."
-@@ -1559,12 +1620,8 @@
- msgstr "Katalog nie istnieje."
-
- #: ../src/html/helpfrm.cpp:503
--msgid ""
--"Display all index items that contain given substring. Search is case "
--"insensitive."
--msgstr ""
--"Wy�wietla wszystkie elementy indeksu zawieraj�ce podany �a�cuch. Szuka bez "
--"uwzgl�dniania wielko�ci liter."
-+msgid "Display all index items that contain given substring. Search is case insensitive."
-+msgstr "Wy�wietla wszystkie elementy indeksu zawieraj�ce podany �a�cuch. Szuka bez uwzgl�dniania wielko�ci liter."
-
- #: ../src/html/helpfrm.cpp:685
- msgid "Display options dialog"
-@@ -1572,8 +1629,7 @@
-
- #: ../src/msw/mimetype.cpp:671
- msgid ""
--"Do you want to overwrite the command used to %s files with extension \"%s"
--"\" ?\n"
-+"Do you want to overwrite the command used to %s files with extension \"%s\" ?\n"
- "Current value is \n"
- "%s, \n"
- "New value is \n"
-@@ -1594,7 +1650,8 @@
- msgid "Don't Save"
- msgstr "Nie Zapisuj"
-
--#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211
-+#: ../src/html/htmlwin.cpp:451
-+#: ../src/msw/frame.cpp:211
- msgid "Done"
- msgstr "Zrobione"
-
-@@ -1647,22 +1704,26 @@
-
- #: ../src/common/config.cpp:384
- #, c-format
--msgid ""
--"Environment variables expansion failed: missing '%c' at position %u in '%s'."
--msgstr ""
--"Rozwini�cie zmiennych �rodowiskowych nie powiod�o si�: zabrak�o '%c' na "
--"pozycji '%u' w '%s'."
-+msgid "Environment variables expansion failed: missing '%c' at position %u in '%s'."
-+msgstr "Rozwini�cie zmiennych �rodowiskowych nie powiod�o si�: zabrak�o '%c' na pozycji '%u' w '%s'."
-
--#: ../src/generic/dirctrlg.cpp:689 ../src/generic/dirctrlg.cpp:707
--#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
--#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:744
--#: ../src/generic/filedlgg.cpp:758 ../src/generic/filedlgg.cpp:772
--#: ../src/generic/filedlgg.cpp:1269 ../src/generic/filedlgg.cpp:1295
--#: ../src/generic/filedlgg.cpp:1325 ../src/gtk/fontdlg.cpp:81
-+#: ../src/generic/dirctrlg.cpp:689
-+#: ../src/generic/dirctrlg.cpp:707
-+#: ../src/generic/dirctrlg.cpp:718
-+#: ../src/generic/dirdlgg.cpp:342
-+#: ../src/generic/filedlgg.cpp:632
-+#: ../src/generic/filedlgg.cpp:744
-+#: ../src/generic/filedlgg.cpp:758
-+#: ../src/generic/filedlgg.cpp:772
-+#: ../src/generic/filedlgg.cpp:1269
-+#: ../src/generic/filedlgg.cpp:1295
-+#: ../src/generic/filedlgg.cpp:1325
-+#: ../src/gtk/fontdlg.cpp:81
- msgid "Error"
- msgstr "B��d"
-
--#: ../src/msdos/utilsdos.cpp:213 ../src/unix/utilsunx.cpp:1090
-+#: ../src/msdos/utilsdos.cpp:213
-+#: ../src/unix/utilsunx.cpp:1090
- #: ../src/unix/utilsunx.cpp:1098
- msgid "Error "
- msgstr "B��d "
-@@ -1683,7 +1744,8 @@
- msgid "Error saving user configuration data."
- msgstr "B��d zapisu konfiguracji u�ytkownika."
-
--#: ../src/mac/carbon/mpthread.cpp:482 ../src/mac/carbon/thread.cpp:672
-+#: ../src/mac/carbon/mpthread.cpp:482
-+#: ../src/mac/carbon/thread.cpp:672
- msgid "Error while waiting on semaphore"
- msgstr "B��d oczekiwania na semafor"
-
-@@ -1737,11 +1799,8 @@
-
- #: ../src/msw/registry.cpp:1140
- #, c-format
--msgid ""
--"Exporting registry key: file \"%s\" already exists and won't be overwritten."
--msgstr ""
--"Eksport klucza rejestr�w: plik \"%s\" ju� istnieje i nie mo�e zosta� "
--"nadpisany."
-+msgid "Exporting registry key: file \"%s\" already exists and won't be overwritten."
-+msgstr "Eksport klucza rejestr�w: plik \"%s\" ju� istnieje i nie mo�e zosta� nadpisany."
-
- #: ../src/common/fmapbase.cpp:143
- msgid "Extended Unix Codepage for Japanese (EUC-JP)"
-@@ -1880,16 +1939,15 @@
- #: ../src/msw/fdrepdlg.cpp:474
- #, c-format
- msgid "Failed to create the standard find/replace dialog (error code %d)"
--msgstr ""
--"Nie uda�o si� utworzy� standardowego okna dialogowego wyszukaj/zast�p (kod "
--"b��du %d)"
-+msgstr "Nie uda�o si� utworzy� standardowego okna dialogowego wyszukaj/zast�p (kod b��du %d)"
-
- #: ../src/html/winpars.cpp:549
- #, c-format
- msgid "Failed to display HTML document in %s encoding"
- msgstr "Nie uda�o si� wy�wieli� dokumentu HTML w kodowaniu %s"
-
--#: ../src/mac/carbon/clipbrd.cpp:194 ../src/mac/classic/clipbrd.cpp:185
-+#: ../src/mac/carbon/clipbrd.cpp:194
-+#: ../src/mac/classic/clipbrd.cpp:185
- #: ../src/msw/clipbrd.cpp:131
- msgid "Failed to empty the clipboard."
- msgstr "Nie uda�o si� opr�ni� schowka."
-@@ -1901,24 +1959,22 @@
- # to moja swobodna interpretacja
- #: ../src/msw/dde.cpp:650
- msgid "Failed to establish an advise loop with DDE server"
--msgstr ""
--"Nie uda�o si� rozpocz�� transakcji doradzaj�cej (advise) z serwerem DDE"
-+msgstr "Nie uda�o si� rozpocz�� transakcji doradzaj�cej (advise) z serwerem DDE"
-
- #: ../src/msw/dialup.cpp:658
- #, c-format
- msgid "Failed to establish dialup connection: %s"
- msgstr "Nie uda�o si� nawi�za� po��czenia dialup: %s"
-
--#: ../src/unix/utilsunx.cpp:508 ../src/unix/utilsunx.cpp:524
-+#: ../src/unix/utilsunx.cpp:508
-+#: ../src/unix/utilsunx.cpp:524
- #, c-format
- msgid "Failed to execute '%s'\n"
- msgstr "Nie uda�o si� wykona� '%s'\n"
-
- #: ../src/common/debugrpt.cpp:666
- msgid "Failed to execute curl, please install it in PATH."
--msgstr ""
--"Nie powiod�o si� uruchomienie curl, prosz� zainstalowa� go w dost�pnym "
--"katalogu (PATH)."
-+msgstr "Nie powiod�o si� uruchomienie curl, prosz� zainstalowa� go w dost�pnym katalogu (PATH)."
-
- #: ../contrib/src/deprecated/resource.cpp:2489
- #, c-format
-@@ -1952,7 +2008,8 @@
- msgid "Failed to get ISP names: %s"
- msgstr "Nie uda�o si� usyska� listy ISP: %s"
-
--#: ../src/mac/carbon/clipbrd.cpp:143 ../src/mac/classic/clipbrd.cpp:134
-+#: ../src/mac/carbon/clipbrd.cpp:143
-+#: ../src/mac/classic/clipbrd.cpp:134
- msgid "Failed to get clipboard data."
- msgstr "Nie uda�o si� pobra� danych ze schowka."
-
-@@ -1988,12 +2045,8 @@
- # po��czy�?
- # wyciek?
- #: ../src/unix/threadpsx.cpp:897
--msgid ""
--"Failed to join a thread, potential memory leak detected - please restart the "
--"program"
--msgstr ""
--"Nie uda�o po��czy� z w�tkiem, potencjalny wyciek pami�ci - uruchom program "
--"ponownie"
-+msgid "Failed to join a thread, potential memory leak detected - please restart the program"
-+msgstr "Nie uda�o po��czy� z w�tkiem, potencjalny wyciek pami�ci - uruchom program ponownie"
-
- #: ../src/msw/utils.cpp:703
- #, c-format
-@@ -2159,7 +2212,8 @@
- msgid "Failed to set temporary file permissions"
- msgstr "Nie uda�o si� nada� praw dost�pu pliku tymczasowemu"
-
--#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256
-+#: ../src/unix/threadpsx.cpp:1245
-+#: ../src/unix/threadpsx.cpp:1256
- #, c-format
- msgid "Failed to set thread priority %d."
- msgstr "Nie uda�o si� zmieni� priorytetu w�tku na %d."
-@@ -2169,15 +2223,15 @@
- msgid "Failed to store image '%s' to memory VFS!"
- msgstr "Nie uda�o si� od�o�y� obrazu '%s' do pami�ci VFS!"
-
--#: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465
-+#: ../src/mac/carbon/mpthread.cpp:1273
-+#: ../src/mac/carbon/thread.cpp:1465
- #: ../src/unix/threadpsx.cpp:1429
- msgid "Failed to terminate a thread."
- msgstr "Nie uda�o si� zako�czy� w�tku."
-
- #: ../src/msw/dde.cpp:669
- msgid "Failed to terminate the advise loop with DDE server"
--msgstr ""
--"Nie uda�o si� zako�czy� transakcji doradzaj�cej (advise) z serwerem DDE"
-+msgstr "Nie uda�o si� zako�czy� transakcji doradzaj�cej (advise) z serwerem DDE"
-
- #: ../src/msw/dialup.cpp:955
- #, c-format
-@@ -2231,7 +2285,8 @@
- msgid "File %s does not exist."
- msgstr "Plik %s nie istnieje."
-
--#: ../src/generic/filedlgg.cpp:1316 ../src/gtk/filedlg.cpp:64
-+#: ../src/generic/filedlgg.cpp:1316
-+#: ../src/gtk/filedlg.cpp:64
- #, c-format
- msgid "File '%s' already exists, do you really want to overwrite it?"
- msgstr "Plik '%s' ju� istnieje, naprawd� chcesz go zast�pi�?"
-@@ -2249,11 +2304,13 @@
- msgid "File couldn't be loaded."
- msgstr "Plik nie mo�e by� wczytany."
-
--#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:1596
-+#: ../src/common/docview.cpp:571
-+#: ../src/common/docview.cpp:1596
- msgid "File error"
- msgstr "B��d plikowy"
-
--#: ../src/generic/dirctrlg.cpp:707 ../src/generic/filedlgg.cpp:758
-+#: ../src/generic/dirctrlg.cpp:707
-+#: ../src/generic/filedlgg.cpp:758
- msgid "File name exists already."
- msgstr "Plik o tej nazwie ju� istnieje."
-
-@@ -2361,8 +2418,7 @@
-
- #: ../include/wx/xti.h:853
- msgid "GetPropertyCollection called w/o valid collection getter"
--msgstr ""
--"Funkcja GetPropertyCollection wywo�ana bez poprawnego modu�u pobieraj�cego"
-+msgstr "Funkcja GetPropertyCollection wywo�ana bez poprawnego modu�u pobieraj�cego"
-
- #: ../src/html/helpfrm.cpp:651
- msgid "Go back"
-@@ -2376,7 +2432,8 @@
- msgid "Go one level up in document hierarchy"
- msgstr "Id� poziom wy�ej w hierarchi dokumentu"
-
--#: ../src/generic/dirdlgg.cpp:145 ../src/generic/filedlgg.cpp:989
-+#: ../src/generic/dirdlgg.cpp:145
-+#: ../src/generic/filedlgg.cpp:989
- msgid "Go to home directory"
- msgstr "Id� do katalogu domowego"
-
-@@ -2392,7 +2449,8 @@
- msgid "Greek (ISO-8859-7)"
- msgstr "Grecki (ISO-8859-7)"
-
--#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
-+#: ../src/common/zstream.cpp:72
-+#: ../src/common/zstream.cpp:209
- msgid "Gzip not supported by this version of zlib"
- msgstr "Format Gzip nie jest wspierany przez t� wersj� biblioteki zlib"
-
-@@ -2414,7 +2472,8 @@
- msgid "Hebrew (ISO-8859-8)"
- msgstr "Hebrajski (ISO-8859-8)"
-
--#: ../src/html/helpfrm.cpp:337 ../contrib/src/deprecated/proplist.cpp:523
-+#: ../src/html/helpfrm.cpp:337
-+#: ../contrib/src/deprecated/proplist.cpp:523
- msgid "Help"
- msgstr "Pomoc"
-
-@@ -2422,7 +2481,8 @@
- msgid "Help Browser Options"
- msgstr "Opcje przegl�darki pomocy"
-
--#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443
-+#: ../src/generic/helpext.cpp:442
-+#: ../src/generic/helpext.cpp:443
- msgid "Help Index"
- msgstr "Spis tre�ci"
-
-@@ -2460,9 +2520,12 @@
- msgid "ICO: Error in reading mask DIB."
- msgstr "ICO: B��d odczytu maski DIB."
-
--#: ../src/common/imagbmp.cpp:1048 ../src/common/imagbmp.cpp:1107
--#: ../src/common/imagbmp.cpp:1116 ../src/common/imagbmp.cpp:1127
--#: ../src/common/imagbmp.cpp:1171 ../src/common/imagbmp.cpp:1181
-+#: ../src/common/imagbmp.cpp:1048
-+#: ../src/common/imagbmp.cpp:1107
-+#: ../src/common/imagbmp.cpp:1116
-+#: ../src/common/imagbmp.cpp:1127
-+#: ../src/common/imagbmp.cpp:1171
-+#: ../src/common/imagbmp.cpp:1181
- #: ../src/common/imagbmp.cpp:1190
- msgid "ICO: Error writing the image file!"
- msgstr "ICO: B��d przy zapisie do pliku."
-@@ -2513,8 +2576,7 @@
-
- #: ../src/generic/dbgrptg.cpp:310
- msgid ""
--"If you wish to suppress this debug report completely, please choose the "
--"\"Cancel\" button,\n"
-+"If you wish to suppress this debug report completely, please choose the \"Cancel\" button,\n"
- "but be warned that it may hinder improving the program, so if\n"
- "at all possible please do continue with the report generation.\n"
- msgstr ""
-@@ -2543,7 +2605,8 @@
- msgid "Illegal Parameter Count for Create Method"
- msgstr "Nieprawid�owa Liczba Parametr�w w Metodzie Create"
-
--#: ../src/generic/dirctrlg.cpp:689 ../src/generic/filedlgg.cpp:744
-+#: ../src/generic/dirctrlg.cpp:689
-+#: ../src/generic/filedlgg.cpp:744
- msgid "Illegal directory name."
- msgstr "Niedozwolona nazwa katalogu."
-
-@@ -2561,12 +2624,8 @@
- msgstr "Nie jest to obraz typu %d."
-
- #: ../src/msw/textctrl.cpp:361
--msgid ""
--"Impossible to create a rich edit control, using simple text control instead. "
--"Please reinstall riched32.dll"
--msgstr ""
--"Nie jest mo�liwe utworzenie kontrolki rich edit, u�yj zamiast tego prostego "
--"'text control'. Przeinstaluj riched32.dll"
-+msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"
-+msgstr "Nie jest mo�liwe utworzenie kontrolki rich edit, u�yj zamiast tego prostego 'text control'. Przeinstaluj riched32.dll"
-
- #: ../src/unix/utilsunx.cpp:428
- msgid "Impossible to get child process input"
-@@ -2635,17 +2694,14 @@
- msgid "Invalid lock file '%s'."
- msgstr "Nieprawid�owy plik blokuj�cy '%s'."
-
--#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380
-+#: ../src/common/xtistrm.cpp:365
-+#: ../src/common/xtistrm.cpp:380
- msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
--msgstr ""
--"B��dny lub Pusty Identyfikator Obiektu przekazany do funkcji "
--"GetObjectClassInfo"
-+msgstr "B��dny lub Pusty Identyfikator Obiektu przekazany do funkcji GetObjectClassInfo"
-
- #: ../src/common/xtistrm.cpp:395
- msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
--msgstr ""
--"B��dny lub Pusty Identyfikator Obiektu przekazany do funkcji "
--"HasObjectClassInfo"
-+msgstr "B��dny lub Pusty Identyfikator Obiektu przekazany do funkcji HasObjectClassInfo"
-
- #: ../src/common/regex.cpp:210
- #, c-format
-@@ -2732,7 +2788,8 @@
- msgid "KOI8-U"
- msgstr "KOI8-U"
-
--#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867
-+#: ../src/generic/prntdlgg.cpp:609
-+#: ../src/generic/prntdlgg.cpp:867
- msgid "Landscape"
- msgstr "Pejza�"
-
-@@ -2812,7 +2869,8 @@
- msgid "Log saved to the file '%s'."
- msgstr "Log zosta� zapisany do pliku '%s'."
-
--#: ../include/wx/xti.h:501 ../include/wx/xti.h:505
-+#: ../include/wx/xti.h:501
-+#: ../include/wx/xti.h:505
- msgid "Long Conversions not supported"
- msgstr "Konwersja typu 'Long' nie jest wspierana."
-
-@@ -2825,12 +2883,8 @@
- msgstr "MP Thread Support jest niedost�pny w tym systemie"
-
- #: ../src/msw/helpchm.cpp:60
--msgid ""
--"MS HTML Help functions are unavailable because the MS HTML Help library is "
--"not installed on this machine. Please install it."
--msgstr ""
--"Funkcje pomocy dla MS HTML Help nie s� dost�pne, poniewa� biblioteka MS HTML "
--"Help nie jest zainstalowana na tej maszynie. Zainstaluj j�."
-+msgid "MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it."
-+msgstr "Funkcje pomocy dla MS HTML Help nie s� dost�pne, poniewa� biblioteka MS HTML Help nie jest zainstalowana na tej maszynie. Zainstaluj j�."
-
- #: ../src/univ/themes/win32.cpp:4929
- msgid "Ma&ximize"
-@@ -2911,8 +2965,10 @@
- msgstr "Nowa pozycja"
-
- # To jest maska do tworzenia nazw typu NowaNaz1 itd
--#: ../src/generic/dirdlgg.cpp:316 ../src/generic/dirdlgg.cpp:326
--#: ../src/generic/filedlgg.cpp:608 ../src/generic/filedlgg.cpp:617
-+#: ../src/generic/dirdlgg.cpp:316
-+#: ../src/generic/dirdlgg.cpp:326
-+#: ../src/generic/filedlgg.cpp:608
-+#: ../src/generic/filedlgg.cpp:617
- msgid "NewName"
- msgstr "NowaNaz"
-
-@@ -2924,8 +2980,10 @@
- msgid "Next page"
- msgstr "Nast�pna strona"
-
--#: ../src/mac/carbon/msgdlg.cpp:58 ../src/mac/carbon/msgdlg.cpp:143
--#: ../src/mac/classic/msgdlg.cpp:56 ../src/mac/classic/msgdlg.cpp:140
-+#: ../src/mac/carbon/msgdlg.cpp:58
-+#: ../src/mac/carbon/msgdlg.cpp:143
-+#: ../src/mac/classic/msgdlg.cpp:56
-+#: ../src/mac/classic/msgdlg.cpp:140
- #: ../src/motif/msgdlg.cpp:204
- msgid "No"
- msgstr "Nie"
-@@ -2948,8 +3006,7 @@
- msgid ""
- "No font for displaying text in encoding '%s' found,\n"
- "but an alternative encoding '%s' is available.\n"
--"Do you want to use this encoding (otherwise you will have to choose another "
--"one)?"
-+"Do you want to use this encoding (otherwise you will have to choose another one)?"
- msgstr ""
- "Brak czcionki do wy�wielenia tekstu w kodowaniu '%s',\n"
- "jednak dost�pne jest alternatywne kodowanie '%s'.\n"
-@@ -2971,17 +3028,20 @@
- msgid "No handler found for XML node '%s', class '%s'!"
- msgstr "Brak procedury obs�ugi dla w�z�a XML '%s', klasa '%s'!"
-
--#: ../src/common/image.cpp:1505 ../src/common/image.cpp:1548
-+#: ../src/common/image.cpp:1505
-+#: ../src/common/image.cpp:1548
- msgid "No handler found for image type."
- msgstr "Brak procedury obs�ugi grafiki."
-
--#: ../src/common/image.cpp:1513 ../src/common/image.cpp:1556
-+#: ../src/common/image.cpp:1513
-+#: ../src/common/image.cpp:1556
- #: ../src/common/image.cpp:1589
- #, c-format
- msgid "No image handler for type %d defined."
- msgstr "Brak procedury obs�ugi obraz�w typu %d."
-
--#: ../src/common/image.cpp:1574 ../src/common/image.cpp:1604
-+#: ../src/common/image.cpp:1574
-+#: ../src/common/image.cpp:1604
- #, c-format
- msgid "No image handler for type %s defined."
- msgstr "Brak procedury obs�ugi obraz�w typu %s."
-@@ -2994,7 +3054,8 @@
- msgid "No sound"
- msgstr "Brak d�wi�ku"
-
--#: ../src/common/image.cpp:1200 ../src/common/image.cpp:1239
-+#: ../src/common/image.cpp:1200
-+#: ../src/common/image.cpp:1239
- msgid "No unused colour in image being masked."
- msgstr "Brak nieu�ywanych kolor�w w maskowanym obrazie."
-
-@@ -3006,7 +3067,8 @@
- msgid "Nordic (ISO-8859-10)"
- msgstr "Nordycki (ISO-8859-10)"
-
--#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235
-+#: ../src/generic/fontdlgg.cpp:232
-+#: ../src/generic/fontdlgg.cpp:235
- msgid "Normal"
- msgstr "Normalny"
-
-@@ -3022,7 +3084,8 @@
- msgid "Note, 8 1/2 x 11 in"
- msgstr "Note, 8 1/2 x 11 cali"
-
--#: ../src/gtk/fontdlg.cpp:147 ../src/msw/dialog.cpp:194
-+#: ../src/gtk/fontdlg.cpp:147
-+#: ../src/msw/dialog.cpp:194
- #: ../contrib/src/deprecated/proplist.cpp:506
- msgid "OK"
- msgstr "OK"
-@@ -3031,11 +3094,13 @@
- msgid "Objects must have an id attribute"
- msgstr "Obiekty musz� posiada� w�a�ciwo�� typu 'id'"
-
--#: ../src/common/docview.cpp:1269 ../src/common/docview.cpp:1619
-+#: ../src/common/docview.cpp:1269
-+#: ../src/common/docview.cpp:1619
- msgid "Open File"
- msgstr "Otwieranie Pliku"
-
--#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579
-+#: ../src/html/helpfrm.cpp:673
-+#: ../src/html/helpfrm.cpp:1579
- msgid "Open HTML document"
- msgstr "Otw�rz dokument HTML"
-
-@@ -3044,8 +3109,10 @@
- msgid "Open file \"%s\""
- msgstr "Otwieranie pliku \"%s\""
-
--#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
--#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:772
-+#: ../src/generic/dirctrlg.cpp:718
-+#: ../src/generic/dirdlgg.cpp:342
-+#: ../src/generic/filedlgg.cpp:632
-+#: ../src/generic/filedlgg.cpp:772
- msgid "Operation not permitted."
- msgstr "Operacja nie jest dozwolona."
-
-@@ -3064,15 +3131,18 @@
- msgid "Option '%s': '%s' cannot be converted to a date."
- msgstr "Opcja '%s': nie mo�na przekszta�ci� '%s' na dat�."
-
--#: ../src/generic/dirdlgg.cpp:116 ../src/generic/prntdlgg.cpp:614
-+#: ../src/generic/dirdlgg.cpp:116
-+#: ../src/generic/prntdlgg.cpp:614
- msgid "Options"
- msgstr "Opcje"
-
--#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868
-+#: ../src/generic/prntdlgg.cpp:611
-+#: ../src/generic/prntdlgg.cpp:868
- msgid "Orientation"
- msgstr "Orientacja"
-
--#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485
-+#: ../src/common/imagpcx.cpp:462
-+#: ../src/common/imagpcx.cpp:485
- msgid "PCX: couldn't allocate memory"
- msgstr "PCX: Nie mo�na przydzieli� pami�ci."
-
-@@ -3088,7 +3158,8 @@
- msgid "PCX: this is not a PCX file."
- msgstr "PCX: To nie jest plik w formacie PCX."
-
--#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486
-+#: ../src/common/imagpcx.cpp:464
-+#: ../src/common/imagpcx.cpp:486
- msgid "PCX: unknown error !!!"
- msgstr "PCX: nieznany b��d !!!"
-
-@@ -3104,7 +3175,8 @@
- msgid "PNM: File format is not recognized."
- msgstr "PNM: Nieznany format pliku."
-
--#: ../src/common/imagpnm.cpp:108 ../src/common/imagpnm.cpp:125
-+#: ../src/common/imagpnm.cpp:108
-+#: ../src/common/imagpnm.cpp:125
- #: ../src/common/imagpnm.cpp:142
- msgid "PNM: File seems truncated."
- msgstr "PNM: Plik wygl�da na obci�ty."
-@@ -3227,7 +3299,8 @@
- msgid "Page Setup"
- msgstr "Ustawienia strony"
-
--#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:540
-+#: ../src/common/prntbase.cpp:451
-+#: ../src/gtk/gnome/gprint.cpp:540
- msgid "Page setup"
- msgstr "Ustawienia strony"
-
-@@ -3235,12 +3308,14 @@
- msgid "Pages"
- msgstr "Strony"
-
--#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854
-+#: ../src/generic/prntdlgg.cpp:800
-+#: ../src/generic/prntdlgg.cpp:854
- #: ../src/generic/prntdlgg.cpp:1056
- msgid "Paper Size"
- msgstr "Rozmiar papieru"
-
--#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841
-+#: ../src/generic/prntdlgg.cpp:598
-+#: ../src/generic/prntdlgg.cpp:841
- #: ../src/generic/prntdlgg.cpp:1051
- msgid "Paper size"
- msgstr "Rozmiar papieru"
-@@ -3253,7 +3328,8 @@
- msgid "Passing a already registered object to SetObjectName"
- msgstr "Przekazano ju� zarejestrowany obiekt do funkcji SetObjectName"
-
--#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
-+#: ../src/common/xtistrm.cpp:436
-+#: ../src/common/xtistrm.cpp:656
- msgid "Passing an unkown object to GetObject"
- msgstr "Przekazanie nieznanego obiektu do funkcji GetObject"
-
-@@ -3297,7 +3373,8 @@
- msgid "Please wait while printing\n"
- msgstr "Prosz� czeka�, trwa drukowanie\n"
-
--#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866
-+#: ../src/generic/prntdlgg.cpp:608
-+#: ../src/generic/prntdlgg.cpp:866
- msgid "Portrait"
- msgstr "Portret"
-
-@@ -3305,7 +3382,8 @@
- msgid "PostScript file"
- msgstr "plik PostScript"
-
--#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235
-+#: ../src/generic/fontdlgg.cpp:348
-+#: ../src/html/helpfrm.cpp:1235
- msgid "Preview:"
- msgstr "Podgl�d:"
-
-@@ -3313,8 +3391,10 @@
- msgid "Previous page"
- msgstr "Poprzednia strona"
-
--#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138
--#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:395
-+#: ../src/common/prntbase.cpp:393
-+#: ../src/generic/prntdlgg.cpp:138
-+#: ../src/generic/prntdlgg.cpp:151
-+#: ../src/gtk/gnome/gprint.cpp:395
- #: ../src/gtk/gnome/gprint.cpp:407
- msgid "Print"
- msgstr "Drukuj"
-@@ -3323,7 +3403,8 @@
- msgid "Print Preview"
- msgstr "Podgl�d wydruku"
-
--#: ../src/common/prntbase.cpp:1246 ../src/common/prntbase.cpp:1272
-+#: ../src/common/prntbase.cpp:1246
-+#: ../src/common/prntbase.cpp:1272
- msgid "Print Preview Failure"
- msgstr "Awaria podgl�du wydruku"
-
-@@ -3383,7 +3464,8 @@
- msgid "Printer:"
- msgstr "Drukarka:"
-
--#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531
-+#: ../src/common/prntbase.cpp:310
-+#: ../src/common/prntbase.cpp:531
- msgid "Printing "
- msgstr "Drukowanie "
-
-@@ -3402,11 +3484,8 @@
-
- #: ../src/common/debugrpt.cpp:546
- #, c-format
--msgid ""
--"Processing debug report has failed, leaving the files in \"%s\" directory."
--msgstr ""
--"Przetwarzanie raportu b��d�w nie powiod�o si�, pozostawiaj�c pliku w "
--"katalogu \"%s\"."
-+msgid "Processing debug report has failed, leaving the files in \"%s\" directory."
-+msgstr "Przetwarzanie raportu b��d�w nie powiod�o si�, pozostawiaj�c pliku w katalogu \"%s\"."
-
- #: ../src/common/log.cpp:466
- msgid "Program aborted."
-@@ -3420,7 +3499,8 @@
- msgid "Question"
- msgstr "Pytanie"
-
--#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144
-+#: ../src/common/ffile.cpp:125
-+#: ../src/common/ffile.cpp:144
- #, c-format
- msgid "Read error on file '%s'"
- msgstr "B��d odczytu pliku '%s'"
-@@ -3483,8 +3563,7 @@
- #: ../src/common/rendcmn.cpp:196
- #, c-format
- msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
--msgstr ""
--"Wizualizator \"%s\" ma niezgodn� wersj� %d.%d i nie mo�e by� za�adowany."
-+msgstr "Wizualizator \"%s\" ma niezgodn� wersj� %d.%d i nie mo�e by� za�adowany."
-
- #: ../src/common/stockitem.cpp:117
- msgid "Rep&lace"
-@@ -3539,17 +3618,14 @@
- msgid "Script"
- msgstr "Script"
-
--#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551
-+#: ../src/html/helpfrm.cpp:536
-+#: ../src/html/helpfrm.cpp:551
- msgid "Search"
- msgstr "Szukaj"
-
- #: ../src/html/helpfrm.cpp:538
--msgid ""
--"Search contents of help book(s) for all occurences of the text you typed "
--"above"
--msgstr ""
--"Przeszukuje zawarto�� pliku(�w) pomocy dla wszystkich wyst�pie� "
--"wprowadzonego powy�ej tekstu"
-+msgid "Search contents of help book(s) for all occurences of the text you typed above"
-+msgstr "Przeszukuje zawarto�� pliku(�w) pomocy dla wszystkich wyst�pie� wprowadzonego powy�ej tekstu"
-
- #: ../src/generic/fdrepdlg.cpp:166
- msgid "Search direction"
-@@ -3582,7 +3658,8 @@
- msgid "Seek error on file '%s' (large files not supported by stdio)"
- msgstr "B��d wyszukiwania w pliku '%s' (stdio nie wspiera olbrzymich plik�w)"
-
--#: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068
-+#: ../src/mac/carbon/textctrl.cpp:1078
-+#: ../src/msw/textctrl.cpp:2068
- msgid "Select &All"
- msgstr "&Zaznacz wszystko"
-
-@@ -3610,8 +3687,7 @@
-
- #: ../include/wx/xti.h:841
- msgid "SetProperty called w/o valid setter"
--msgstr ""
--"Funkcja SetProperty wywo�ana bez poprawnej modu�y ustawiaj�cego w�a�ciwo��"
-+msgstr "Funkcja SetProperty wywo�ana bez poprawnej modu�y ustawiaj�cego w�a�ciwo��"
-
- #: ../src/generic/prntdlgg.cpp:182
- msgid "Setup..."
-@@ -3629,7 +3705,8 @@
- msgid "Show all items in index"
- msgstr "Poka� wszystkie elementy indeksu"
-
--#: ../src/generic/dirdlgg.cpp:112 ../src/generic/dirdlgg.cpp:175
-+#: ../src/generic/dirdlgg.cpp:112
-+#: ../src/generic/dirdlgg.cpp:175
- msgid "Show hidden directories"
- msgstr "Poka� ukryte katalogi"
-
-@@ -3641,7 +3718,8 @@
- msgid "Show/hide navigation panel"
- msgstr "Poka�/ukryj panel sterowania"
-
--#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355
-+#: ../src/generic/fontdlgg.cpp:353
-+#: ../src/generic/fontdlgg.cpp:355
- msgid "Shows the font preview."
- msgstr "Podgl�d czcionki."
-
-@@ -3649,7 +3727,8 @@
- msgid "Size"
- msgstr "Rozmiar"
-
--#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
-+#: ../src/generic/progdlgg.cpp:222
-+#: ../src/generic/progdlgg.cpp:240
- #: ../src/generic/progdlgg.cpp:598
- msgid "Skip"
- msgstr "Pomi�"
-@@ -3662,7 +3741,8 @@
- msgid "Sorry, could not open this file for saving."
- msgstr "Niestety nie mo�na otworzy� tego pliku do zapisu."
-
--#: ../src/common/docview.cpp:617 ../src/common/docview.cpp:1598
-+#: ../src/common/docview.cpp:617
-+#: ../src/common/docview.cpp:1598
- msgid "Sorry, could not open this file."
- msgstr "Niestety nie mo�na otworzy� tego pliku."
-
-@@ -3678,7 +3758,8 @@
- msgid "Sorry, print preview needs a printer to be installed."
- msgstr "Niestety, podgl�d wydruku wymaga zainstalowania drukarki."
-
--#: ../src/common/docview.cpp:1268 ../src/common/docview.cpp:1618
-+#: ../src/common/docview.cpp:1268
-+#: ../src/common/docview.cpp:1618
- msgid "Sorry, the format for this file is unknown."
- msgstr "Niestety, nieznany format pliku."
-
-@@ -3705,16 +3786,16 @@
-
- #: ../src/common/xtistrm.cpp:253
- msgid "Streaming delegates for not already streamed objects not yet supported"
--msgstr ""
--"Delegacja w strumieniu dlaobiektu kt�ry nie jest ju� w strumieniu nie jest "
--"jeszcze wspierana"
-+msgstr "Delegacja w strumieniu dlaobiektu kt�ry nie jest ju� w strumieniu nie jest jeszcze wspierana"
-
--#: ../src/msw/colour.cpp:38 ../src/palmos/colour.cpp:38
-+#: ../src/msw/colour.cpp:38
-+#: ../src/palmos/colour.cpp:38
- #, c-format
- msgid "String To Colour : Incorrect colour specification : %s"
- msgstr "Nieprawid�owa specyfikacja koloru : %s"
-
--#: ../include/wx/xti.h:428 ../include/wx/xti.h:432
-+#: ../include/wx/xti.h:428
-+#: ../include/wx/xti.h:432
- msgid "String conversions not supported"
- msgstr "Konwersja tekstu nie jest wspierana"
-
-@@ -3743,7 +3824,8 @@
- msgid "TIFF library warning."
- msgstr "Ostrze�enie biblioteki TIFF."
-
--#: ../src/common/imagtiff.cpp:248 ../src/common/imagtiff.cpp:259
-+#: ../src/common/imagtiff.cpp:248
-+#: ../src/common/imagtiff.cpp:259
- #: ../src/common/imagtiff.cpp:399
- msgid "TIFF: Couldn't allocate memory."
- msgstr "TIFF: Nie mo�na przydzieli� pami�ci."
-@@ -3835,23 +3917,28 @@
- "Plik '%s' nie istnieje i nie mo�na go otworzy�.\n"
- "Informacja o nim zosta�a usuni�ta z listy ostatnio u�ywanych plik�w."
-
--#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318
-+#: ../src/generic/fontdlgg.cpp:316
-+#: ../src/generic/fontdlgg.cpp:318
- msgid "The font colour."
- msgstr "Kolor czcionki."
-
--#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279
-+#: ../src/generic/fontdlgg.cpp:277
-+#: ../src/generic/fontdlgg.cpp:279
- msgid "The font family."
- msgstr "Rodzina czcionki."
-
--#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
-+#: ../src/generic/fontdlgg.cpp:328
-+#: ../src/generic/fontdlgg.cpp:330
- msgid "The font point size."
- msgstr "Rozmiar czcionki."
-
--#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290
-+#: ../src/generic/fontdlgg.cpp:288
-+#: ../src/generic/fontdlgg.cpp:290
- msgid "The font style."
- msgstr "Styl czcionki."
-
--#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301
-+#: ../src/generic/fontdlgg.cpp:299
-+#: ../src/generic/fontdlgg.cpp:301
- msgid "The font weight."
- msgstr "Waga czcionki."
-
-@@ -3862,12 +3949,10 @@
-
- #: ../src/generic/dbgrptg.cpp:308
- msgid ""
--"The report contains the files listed below. If any of these files contain "
--"private information,\n"
-+"The report contains the files listed below. If any of these files contain private information,\n"
- "please uncheck them and they will be removed from the report.\n"
- msgstr ""
--"Raport zawiera pliki wymienione ni�ej. Je�li kt�rykolwiek z tych plik�w "
--"zawiera prywatne informacje,\n"
-+"Raport zawiera pliki wymienione ni�ej. Je�li kt�rykolwiek z tych plik�w zawiera prywatne informacje,\n"
- "prosz� odznacz go w celu usuni�cia go z raportu.\n"
-
- #: ../src/common/cmdline.cpp:883
-@@ -3886,49 +3971,28 @@
-
- #: ../src/msw/dialup.cpp:455
- #, c-format
--msgid ""
--"The version of remote access service (RAS) installed on this machine is "
--"tooold, please upgrade (the following required function is missing: %s)."
--msgstr ""
--"Zainstalowana wersja serwiisu zdalnego dost�pu (RAS) jest zbyt stara, "
--"zainstaluj nowsz� (brakuj�ca funkcja to: %s)."
-+msgid "The version of remote access service (RAS) installed on this machine is tooold, please upgrade (the following required function is missing: %s)."
-+msgstr "Zainstalowana wersja serwiisu zdalnego dost�pu (RAS) jest zbyt stara, zainstaluj nowsz� (brakuj�ca funkcja to: %s)."
-
- #: ../src/html/htmprint.cpp:601
--msgid ""
--"There was a problem during page setup: you may need to set a default printer."
--msgstr ""
--"Wyst�pi� b��d podczas konfigurowania strony: powiniene� okre�li� domy�ln� "
--"drukark�."
-+msgid "There was a problem during page setup: you may need to set a default printer."
-+msgstr "Wyst�pi� b��d podczas konfigurowania strony: powiniene� okre�li� domy�ln� drukark�."
-
- #: ../src/msw/datectrl.cpp:109
--msgid ""
--"This system doesn't support date picker control, please upgrade your version "
--"of comctl32.dll"
--msgstr ""
--"Ten system nie wspiera komponentu wyboru daty, nale�y zaktualizowa� "
--"bibliotek� comctl32.dll"
-+msgid "This system doesn't support date picker control, please upgrade your version of comctl32.dll"
-+msgstr "Ten system nie wspiera komponentu wyboru daty, nale�y zaktualizowa� bibliotek� comctl32.dll"
-
- #: ../src/msw/thread.cpp:1206
--msgid ""
--"Thread module initialization failed: can not store value in thread local "
--"storage"
--msgstr ""
--"Zainicjowanie modu�u w�tk�w nie powiod�o si�: nie mo�na od�o�y� warto�ci do "
--"lokalnej pami�ci w�tk�w"
-+msgid "Thread module initialization failed: can not store value in thread local storage"
-+msgstr "Zainicjowanie modu�u w�tk�w nie powiod�o si�: nie mo�na od�o�y� warto�ci do lokalnej pami�ci w�tk�w"
-
- #: ../src/unix/threadpsx.cpp:1603
- msgid "Thread module initialization failed: failed to create thread key"
--msgstr ""
--"Zainicjowanie modu�u w�tk�w nie powiod�o si�: nie uda�o si� utworzy� klucza "
--"w�tk�w"
-+msgstr "Zainicjowanie modu�u w�tk�w nie powiod�o si�: nie uda�o si� utworzy� klucza w�tk�w"
-
- #: ../src/msw/thread.cpp:1194
--msgid ""
--"Thread module initialization failed: impossible to allocate index in thread "
--"local storage"
--msgstr ""
--"Zainicjowanie modu�u w�tk�w nie powiod�o si�: nie jest mo�liwe przydzielenie "
--"indeksu w lokalnej pami�ci w�tk�w."
-+msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
-+msgstr "Zainicjowanie modu�u w�tk�w nie powiod�o si�: nie jest mo�liwe przydzielenie indeksu w lokalnej pami�ci w�tk�w."
-
- #: ../src/unix/threadpsx.cpp:1108
- msgid "Thread priority setting is ignored."
-@@ -3944,10 +4008,10 @@
-
- #: ../src/common/ftp.cpp:635
- msgid "Timeout while waiting for FTP server to connect, try passive mode."
--msgstr ""
--"Przekroczono czas oczekiwania dla serwera FTP, spr�buj trybu pasywnego."
-+msgstr "Przekroczono czas oczekiwania dla serwera FTP, spr�buj trybu pasywnego."
-
--#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141
-+#: ../src/msw/timer.cpp:116
-+#: ../src/os2/timer.cpp:141
- msgid "Timer creation failed."
- msgstr "Nie powiod�o si� utworzenie stopera."
-
-@@ -3976,7 +4040,8 @@
- msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
- msgstr "Pr�b� usuni�cia pliku '%s' z pami�ci VFS, kt�ry nie zosta� wczytany!"
-
--#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250
-+#: ../src/common/sckaddr.cpp:146
-+#: ../src/common/sckaddr.cpp:250
- msgid "Trying to solve a NULL hostname: giving up"
- msgstr "pr�ba u�ycia niezdefiniowej (NULL) nazwy serwera: rezygnacja"
-
-@@ -3988,7 +4053,8 @@
- msgid "Type"
- msgstr "Typ"
-
--#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351
-+#: ../src/common/xtistrm.cpp:281
-+#: ../src/common/xtixml.cpp:351
- #: ../src/common/xtixml.cpp:498
- msgid "Type must have enum - long conversion"
- msgstr "Typ musi umo�liwia� konswersj� enum - long"
-@@ -4090,7 +4156,8 @@
- msgid "Unknown long option '%s'"
- msgstr "Nieznana d�uga opcja '%s'"
-
--#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629
-+#: ../src/common/cmdline.cpp:608
-+#: ../src/common/cmdline.cpp:629
- #, c-format
- msgid "Unknown option '%s'"
- msgstr "Nieznana opcja '%s'"
-@@ -4110,7 +4177,8 @@
- msgid "Unmatched '{' in an entry for mime type %s."
- msgstr "Nieodpowiedni '{' w pozycji dla typu mime %s."
-
--#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287
-+#: ../src/common/cmdproc.cpp:261
-+#: ../src/common/cmdproc.cpp:287
- #: ../src/common/cmdproc.cpp:307
- msgid "Unnamed command"
- msgstr "Polecenie bez nazwy"
-@@ -4120,8 +4188,10 @@
- msgid "Unrecognized style %s while parsing resource."
- msgstr "Nierozpoznany styl %s podczas przetwarzania zasobu."
-
--#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64
--#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445
-+#: ../src/mac/carbon/clipbrd.cpp:68
-+#: ../src/mac/classic/clipbrd.cpp:64
-+#: ../src/msw/clipbrd.cpp:273
-+#: ../src/msw/clipbrd.cpp:445
- msgid "Unsupported clipboard format."
- msgstr "Nieobs�ugiwany format schowka."
-
-@@ -4174,9 +4244,7 @@
-
- #: ../src/html/htmlpars.cpp:391
- msgid "Warning: attempt to remove HTML tag handler from empty stack."
--msgstr ""
--"Ostrze�enie: pr�ba usuni�cia procedury obs�ugi znacznika HTML z pustego "
--"stosu."
-+msgstr "Ostrze�enie: pr�ba usuni�cia procedury obs�ugi znacznika HTML z pustego stosu."
-
- #: ../src/common/fmapbase.cpp:104
- msgid "Western European (ISO-8859-1)"
-@@ -4186,7 +4254,8 @@
- msgid "Western European with Euro (ISO-8859-15)"
- msgstr "Zachodnioeuropejski z Euro (ISO-8859-15)"
-
--#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341
-+#: ../src/generic/fontdlgg.cpp:339
-+#: ../src/generic/fontdlgg.cpp:341
- msgid "Whether the font is underlined."
- msgstr "Okre�lenie podkre�lenia."
-
-@@ -4321,7 +4390,8 @@
- msgid "XPM: Malformed pixel data!"
- msgstr "XPM: Zniekszta�cone dane obrazu!"
-
--#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721
-+#: ../src/common/xpmdecod.cpp:712
-+#: ../src/common/xpmdecod.cpp:721
- #, c-format
- msgid "XPM: malformed colour definition '%s'!"
- msgstr "XPM: niepoprawna definicja koloru '%s'!"
-@@ -4331,7 +4401,8 @@
- msgid "XRC resource '%s' (class '%s') not found!"
- msgstr "Nie znaleziono zasobu XRC '%s' (klasa '%s')!"
-
--#: ../src/xrc/xmlres.cpp:1080 ../src/xrc/xmlres.cpp:1092
-+#: ../src/xrc/xmlres.cpp:1080
-+#: ../src/xrc/xmlres.cpp:1092
- #, c-format
- msgid "XRC resource: Cannot create bitmap from '%s'."
- msgstr "Zasoby XRC: Nie mo�na utworzy� mapy bitowej z '%s'."
-@@ -4339,11 +4410,12 @@
- #: ../src/xrc/xmlres.cpp:1036
- #, c-format
- msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
--msgstr ""
--"Zasoby XRC: Nieprawid�owa specyfikacja koloru '%s' dla w�a�ciwo�ci '%s'."
-+msgstr "Zasoby XRC: Nieprawid�owa specyfikacja koloru '%s' dla w�a�ciwo�ci '%s'."
-
--#: ../src/mac/carbon/msgdlg.cpp:59 ../src/mac/carbon/msgdlg.cpp:142
--#: ../src/mac/classic/msgdlg.cpp:57 ../src/mac/classic/msgdlg.cpp:139
-+#: ../src/mac/carbon/msgdlg.cpp:59
-+#: ../src/mac/carbon/msgdlg.cpp:142
-+#: ../src/mac/classic/msgdlg.cpp:57
-+#: ../src/mac/classic/msgdlg.cpp:139
- #: ../src/motif/msgdlg.cpp:204
- msgid "Yes"
- msgstr "Tak"
-@@ -4375,13 +4447,11 @@
- # instance -->
- #: ../src/msw/dde.cpp:1048
- msgid ""
--"a DDEML function was called without first calling the DdeInitialize "
--"function,\n"
-+"a DDEML function was called without first calling the DdeInitialize function,\n"
- "or an invalid instance identifier\n"
- "was passed to a DDEML function."
- msgstr ""
--"zosta�a wywo�ana funkcja DDEML bez wcze�niejszego wywo�ania funkcji "
--"DdeInitialize,\n"
-+"zosta�a wywo�ana funkcja DDEML bez wcze�niejszego wywo�ania funkcji DdeInitialize,\n"
- "lub do funkcji DDEML przes�ano\n"
- "nieprawid�owy identyfikator instancji."
-
-@@ -4399,23 +4469,19 @@
-
- #: ../src/msw/dde.cpp:1039
- msgid "a request for a synchronous advise transaction has timed out."
--msgstr ""
--"up�yn�� czas oczekiwania na rozpocz�cie synchronicznej transakcji advise."
-+msgstr "up�yn�� czas oczekiwania na rozpocz�cie synchronicznej transakcji advise."
-
- #: ../src/msw/dde.cpp:1045
- msgid "a request for a synchronous data transaction has timed out."
--msgstr ""
--"up�yn�� czas oczekiwania na rozpocz�cie synchronicznej transakcji data."
-+msgstr "up�yn�� czas oczekiwania na rozpocz�cie synchronicznej transakcji data."
-
- #: ../src/msw/dde.cpp:1054
- msgid "a request for a synchronous execute transaction has timed out."
--msgstr ""
--"up�yn�� czas oczekiwania na rozpocz�cie synchronicznej transakcji execute."
-+msgstr "up�yn�� czas oczekiwania na rozpocz�cie synchronicznej transakcji execute."
-
- #: ../src/msw/dde.cpp:1072
- msgid "a request for a synchronous poke transaction has timed out."
--msgstr ""
--"up�yn�� czas oczekiwania na rozpocz�cie synchronicznej transakcji poke."
-+msgstr "up�yn�� czas oczekiwania na rozpocz�cie synchronicznej transakcji poke."
-
- #: ../src/msw/dde.cpp:1087
- msgid "a request to end an advise transaction has timed out."
-@@ -4537,7 +4603,8 @@
- msgid "can't determine if the end of file is reached on descriptor %d"
- msgstr "nie mo�na okre�li� czy osi�gni�to koniec pliku w deskryptorze %d"
-
--#: ../src/msdos/utilsdos.cpp:307 ../src/msdos/utilsdos.cpp:466
-+#: ../src/msdos/utilsdos.cpp:307
-+#: ../src/msdos/utilsdos.cpp:466
- #, c-format
- msgid "can't execute '%s'"
- msgstr "nie uda�o si� wykona� '%s'"
-@@ -4560,7 +4627,8 @@
- msgid "can't flush file descriptor %d"
- msgstr "nie mo�na opr�ni� deskryptora pliku %d"
-
--#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202
-+#: ../src/common/file.cpp:399
-+#: ../src/msw/wince/filefnwce.cpp:202
- #, c-format
- msgid "can't get seek position on file descriptor %d"
- msgstr "nie mo�na odczyta� bie��cej pozycji w deskryptorze pliku %d"
-@@ -4569,7 +4637,8 @@
- msgid "can't load any font, aborting"
- msgstr "nie mo�na za�adowa� �adnej czcionki, program ko�czy prac�"
-
--#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271
-+#: ../src/common/ffile.cpp:75
-+#: ../src/common/file.cpp:271
- #, c-format
- msgid "can't open file '%s'"
- msgstr "nie mo�na otworzy� pliku '%s'"
-@@ -4591,9 +4660,7 @@
-
- #: ../src/common/dynlib.cpp:253
- msgid "can't query for GUI plugins name in console applications"
--msgstr ""
--"nie mo�na pobiera� nazw wtyczek interfejsu graficznego w aplikacji "
--"przeznaczonej dla trybu tekstowego"
-+msgstr "nie mo�na pobiera� nazw wtyczek interfejsu graficznego w aplikacji przeznaczonej dla trybu tekstowego"
-
- #: ../src/common/zipstrm.cpp:436
- msgid "can't re-initialize zlib deflate stream"
-@@ -4618,7 +4685,8 @@
- msgid "can't remove temporary file '%s'"
- msgstr "nie mo�na usun�� tymczasowego pliku '%s'"
-
--#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189
-+#: ../src/common/file.cpp:385
-+#: ../src/msw/wince/filefnwce.cpp:189
- #, c-format
- msgid "can't seek on file descriptor %d"
- msgstr "nie mo�na ustawi� pozycji w deskryptorze pliku %d"
-@@ -4668,7 +4736,8 @@
- msgid "decompression error"
- msgstr "b��d dekompresji"
-
--#: ../src/common/fmapbase.cpp:705 ../src/common/fmapbase.cpp:737
-+#: ../src/common/fmapbase.cpp:705
-+#: ../src/common/fmapbase.cpp:737
- msgid "default"
- msgstr "domy�lny"
-
-@@ -4814,7 +4883,8 @@
- msgid "invalid zip file"
- msgstr "nieprawid�owy plik zip"
-
--#: ../src/common/fontcmn.cpp:586 ../src/common/fontcmn.cpp:650
-+#: ../src/common/fontcmn.cpp:586
-+#: ../src/common/fontcmn.cpp:650
- msgid "italic"
- msgstr "kursywa"
-
-@@ -4968,7 +5038,8 @@
- msgid "thirteenth"
- msgstr "trzynasty"
-
--#: ../src/common/imagtiff.cpp:145 ../src/common/imagtiff.cpp:161
-+#: ../src/common/imagtiff.cpp:145
-+#: ../src/common/imagtiff.cpp:161
- #, c-format
- msgid "tiff module: %s"
- msgstr "modu� tiff: %s"
-@@ -5011,7 +5082,8 @@
- msgid "unknown class %s"
- msgstr "nieznana klasa %s"
-
--#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
-+#: ../src/common/regex.cpp:163
-+#: ../src/html/chm.cpp:352
- msgid "unknown error"
- msgstr "nieznany b��d"
-
-@@ -5024,7 +5096,8 @@
- msgid "unknown line terminator"
- msgstr "nieznany znacznik ko�ca linii"
-
--#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170
-+#: ../src/common/file.cpp:367
-+#: ../src/msw/wince/filefnwce.cpp:170
- msgid "unknown seek origin"
- msgstr "nieznany odno�nik pozycjonowania"
-
-@@ -5042,7 +5115,8 @@
- msgid "unnamed%d"
- msgstr "beznazwy%d"
-
--#: ../src/common/zipstrm.cpp:1660 ../src/common/zipstrm.cpp:2030
-+#: ../src/common/zipstrm.cpp:1660
-+#: ../src/common/zipstrm.cpp:2030
- msgid "unsupported Zip compression method"
- msgstr "niewspierana metoda kompresji Zip"
-
-@@ -5067,12 +5141,15 @@
- msgid "wxGetTimeOfDay failed."
- msgstr "wxGetTimeOfDay zwr�ci�o b��d."
-
--#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469
--#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506
-+#: ../src/common/socket.cpp:415
-+#: ../src/common/socket.cpp:469
-+#: ../src/mac/carbon/cfsocket.cpp:452
-+#: ../src/mac/carbon/cfsocket.cpp:506
- msgid "wxSocket: invalid signature in ReadMsg."
- msgstr "wxSocket: b��dna sygnatura w ReadMsg."
-
--#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006
-+#: ../src/common/socket.cpp:966
-+#: ../src/mac/carbon/cfsocket.cpp:1006
- msgid "wxSocket: unknown event!."
- msgstr "wxSocket: nieznane zdarzenie!"
-
-@@ -5089,7 +5166,8 @@
- msgid "yesterday"
- msgstr "wczoraj"
-
--#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
-+#: ../src/common/zstream.cpp:165
-+#: ../src/common/zstream.cpp:315
- #, c-format
- msgid "zlib error %d"
- msgstr "b��d biblioteki zlib %d"
-@@ -5103,20 +5181,16 @@
- #~ "Failed to get stack backtrace:\n"
- #~ "%s"
- #~ msgstr "Nie uda�o si� usyska� listy ISP: %s"
--
- #~ msgid "Loading Grey Ascii PNM image is not yet implemented."
- #~ msgstr "�adowanie obraz�w Grey Ascii PNM nie jest jeszcze zaimplementowane."
--
- #~ msgid "Loading Grey Raw PNM image is not yet implemented."
- #~ msgstr "�adowanie obraz�w Grey Raw PNM nie jest jeszcze zaimplementowane."
-
- #, fuzzy
- #~ msgid "Cannot wait on thread to exit."
- #~ msgstr "Nie mo�na czeka� na zako�czenie w�tku"
--
- #~ msgid "Could not load Rich Edit DLL '%s'"
- #~ msgstr "Nie mo�na wczyta� biblioteki Rich Edit '%s'"
--
- #~ msgid "ZIP handler currently supports only local files!"
- #~ msgstr "Obs�ugiwane s� tylko lokalne pliki ZIP!"
-
-@@ -5124,18 +5198,14 @@
- #~ msgid ""
- #~ "can't seek on file descriptor %d, large files support is not enabled."
- #~ msgstr "nie mo�na ustawi� pozycji w deskryptorze pliku %d"
--
- #~ msgid "More..."
- #~ msgstr "Wi�cej..."
--
- #~ msgid "Setup"
- #~ msgstr "Ustawienia"
--
- #~ msgid "/#SYSTEM"
- #~ msgstr "/#SYSTEM"
--
- #~ msgid "Backward"
- #~ msgstr "Wstecz"
--
- #~ msgid "GetUnusedColour:: No Unused Color in image "
- #~ msgstr "Brak wolnych kolor�w w obrazie (GetUnusedColour)"
-+
-diff -ur wxGTK-2.6.3/locale/pt_BR.po wxGTK-2.6.3.2/locale/pt_BR.po
---- wxGTK-2.6.3/locale/pt_BR.po 2006-03-21 18:42:51.000000000 -0500
-+++ wxGTK-2.6.3.2/locale/pt_BR.po 2005-08-31 18:16:08.000000000 -0400
-@@ -933,8 +933,7 @@
- #, c-format
- msgid "Can't check image format of file '%s': file does not exist."
- msgstr ""
--"Imposs�vel verificar formato de imagem do arquivo '%s': arquivo does n�o "
--"existe."
-+"Imposs�vel verificar formato de imagem do arquivo '%s': arquivo does n�o existe."
-
- #: ../src/msw/registry.cpp:442
- #, c-format
-@@ -1554,8 +1553,8 @@
- "Dial up functions are unavailable because the remote access service (RAS) is "
- "not installed on this machine. Please install it."
- msgstr ""
--"Fun��es de discagem est�o indispon�veis porque o servi�o de acesso remoto "
--"(RAS) n�o foi instalado nesta m�quina. Por favor instale."
-+"Fun��es de discagem est�o indispon�veis porque o servi�o de acesso remoto (RAS) "
-+"n�o foi instalado nesta m�quina. Por favor instale."
-
- #: ../src/generic/tipdlg.cpp:246
- msgid "Did you know..."
-@@ -1589,8 +1588,8 @@
- "Display all index items that contain given substring. Search is case "
- "insensitive."
- msgstr ""
--"Mostra todos os itens que contem uma dada substring. Busca n�o importando se "
--"s�o mai�sculas ou min�sculas."
-+"Mostra todos os itens que contem uma dada substring. Busca n�o importando "
-+"se s�o mai�sculas ou min�sculas."
-
- #: ../src/html/helpfrm.cpp:685
- msgid "Display options dialog"
-@@ -1768,8 +1767,7 @@
- msgid ""
- "Exporting registry key: file \"%s\" already exists and won't be overwritten."
- msgstr ""
--"Exportando chave de registro: arquivo \"%s\" j� existe e n�o pode ser "
--"reescrito."
-+"Exportando chave de registro: arquivo \"%s\" j� existe e n�o pode ser reescrito."
-
- #: ../src/common/fmapbase.cpp:143
- msgid "Extended Unix Codepage for Japanese (EUC-JP)"
-@@ -2010,8 +2008,8 @@
- "Failed to join a thread, potential memory leak detected - please restart the "
- "program"
- msgstr ""
--"Falha ao unir a thread, falha de mem�ria encontrada - por favor reinicialize "
--"o programa"
-+"Falha ao unir a thread, falha de mem�ria encontrada - por favor reinicialize o "
-+"programa"
-
- #: ../src/msw/utils.cpp:703
- #, c-format
-@@ -2222,7 +2220,8 @@
- #: ../src/common/debugrpt.cpp:679
- #, fuzzy, c-format
- msgid "Failed to upload the debug report (error code %d)."
--msgstr "Falha ao carregar o relat�rio de depura��o (c�digo de erro %d)"
-+msgstr ""
-+"Falha ao carregar o relat�rio de depura��o (c�digo de erro %d)"
-
- #: ../src/unix/snglinst.cpp:173
- #, c-format
-@@ -2531,8 +2530,8 @@
- "but be warned that it may hinder improving the program, so if\n"
- "at all possible please do continue with the report generation.\n"
- msgstr ""
--"Se voc� desejar suprimir completamente o relat�rio de depura��o, por favor "
--"escolha o bot�o \"Cancela\",\n"
-+"Se voc� desejar suprimir completamente o relat�rio de depura��o, por favor escolha o "
-+"bot�o \"Cancela\",\n"
- "mas ser� advertido que isto pode impedir a execu��o do programa, ent�o se\n"
- "isto for poss�vel por favor continue com a gera��o de relat�rio.\n"
-
-@@ -2580,8 +2579,8 @@
- "Impossible to create a rich edit control, using simple text control instead. "
- "Please reinstall riched32.dll"
- msgstr ""
--"Imposs�vel criar um rich edit control, usando controle de texto simples. Por "
--"favor reinstale riched32.dll"
-+"Imposs�vel criar um rich edit control, usando controle de texto simples. "
-+"Por favor reinstale riched32.dll"
-
- #: ../src/unix/utilsunx.cpp:428
- msgid "Impossible to get child process input"
-@@ -2844,8 +2843,8 @@
- "MS HTML Help functions are unavailable because the MS HTML Help library is "
- "not installed on this machine. Please install it."
- msgstr ""
--"A fun��es de aux�lio MS HTML n�o est�o dispon�veis porque a biblioteca MS "
--"HTML Help n�o foi instalada nesta m�quina. Por favor instale."
-+"A fun��es de aux�lio MS HTML n�o est�o dispon�veis porque a biblioteca MS HTML Help n�o "
-+"foi instalada nesta m�quina. Por favor instale."
-
- #: ../src/univ/themes/win32.cpp:4929
- msgid "Ma&ximize"
-@@ -3449,8 +3448,7 @@
- msgid ""
- "Processing debug report has failed, leaving the files in \"%s\" directory."
- msgstr ""
--"Processamento do relat�rio de depura��o falhou, abandonando os arquivos no "
--"diret�rio \"%s\"."
-+"Processamento do relat�rio de depura��o falhou, abandonando os arquivos no diret�rio \"%s\"."
-
- #: ../src/common/log.cpp:466
- msgid "Program aborted."
-@@ -3597,8 +3595,8 @@
- "Search contents of help book(s) for all occurences of the text you typed "
- "above"
- msgstr ""
--"Busca conte�do de livro(s) de aux�lio para todas as ocorrencias do texo que "
--"voc� digitou acima"
-+"Busca conte�do de livro(s) de aux�lio para todas as ocorrencias do texo que voc� digitou "
-+"acima"
-
- #: ../src/generic/fdrepdlg.cpp:166
- msgid "Search direction"
-@@ -3628,8 +3626,7 @@
- #: ../src/common/ffile.cpp:212
- #, c-format
- msgid "Seek error on file '%s' (large files not supported by stdio)"
--msgstr ""
--"Procura erro no arquivo '%s' (arquivos grandes n�o s�o suportados por stdio)"
-+msgstr "Procura erro no arquivo '%s' (arquivos grandes n�o s�o suportados por stdio)"
-
- #: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068
- msgid "Select &All"
-@@ -3922,8 +3919,8 @@
- "private information,\n"
- "please uncheck them and they will be removed from the report.\n"
- msgstr ""
--"O relat�rio cont�m os arquivos listados abaixo. Se qualquer destes arquivos "
--"contiver informa��o privada,\n"
-+"O relat�rio cont�m os arquivos listados abaixo. Se qualquer destes arquivos contiver "
-+"informa��o privada,\n"
- "por favore desmarque ele e ele ser� removido do relat�rio.\n"
-
- #: ../src/common/cmdline.cpp:883
-@@ -3941,28 +3938,27 @@
- msgstr "O valor da op��o '%s' precisa ser especificado."
-
- #: ../src/msw/dialup.cpp:455
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "The version of remote access service (RAS) installed on this machine is "
--"tooold, please upgrade (the following required function is missing: %s)."
-+"too old, please upgrade (the following required function is missing: %s)."
- msgstr ""
--"A vers�o do servi�o de acesso remoto (RAS) instalado nets m�quina � muito "
--"antigo, por favor atualize (a seguinte fun��o desejada est� faltando: %s)."
-+"A vers�o do servi�o de acesso remoto (RAS) instalado nets m�quina � "
-+"muito antigo, por favor atualize (a seguinte fun��o desejada est� faltando: %s)."
-
- #: ../src/html/htmprint.cpp:601
- msgid ""
- "There was a problem during page setup: you may need to set a default printer."
- msgstr ""
--"Existe um problema durante a configura��o da p�gina: voc� pode precisar "
--"configurar a impressora default"
-+"Existe um problema durante a configura��o da p�gina: voc� pode precisar configurar a impressora default"
-
- #: ../src/msw/datectrl.cpp:109
- msgid ""
- "This system doesn't support date picker control, please upgrade your version "
- "of comctl32.dll"
- msgstr ""
--"Este sistema n�o suporta o controle de escolha de data, por favor atualize "
--"sua vers�o do comctl32.dll"
-+"Este sistema n�o suporta o controle de escolha de data, por favor atualize sua vers�o "
-+"do comctl32.dll"
-
- #: ../src/msw/thread.cpp:1206
- #, fuzzy
-@@ -4000,9 +3996,7 @@
- #: ../src/common/ftp.cpp:635
- #, fuzzy
- msgid "Timeout while waiting for FTP server to connect, try passive mode."
--msgstr ""
--"Timeout ocorreu enquanto esperava pelo servidor FTP para conectar, tente o "
--"modo passivo."
-+msgstr "Timeout ocorreu enquanto esperava pelo servidor FTP para conectar, tente o modo passivo."
-
- #: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141
- msgid "Timer creation failed."
-@@ -4263,8 +4257,8 @@
- msgstr "Win32s em Windows 3.1"
-
- #: ../src/msw/utils.cpp:1112
--#, fuzzy, c-format
--msgid "Windows 2000 (build %lu"
-+#, c-format
-+msgid "Windows 2000 (build %lu)"
- msgstr "Windows 2000 (contru��o %lu)"
-
- #: ../src/msw/utils.cpp:1077
-diff -ur wxGTK-2.6.3/locale/sl.po wxGTK-2.6.3.2/locale/sl.po
---- wxGTK-2.6.3/locale/sl.po 2006-03-21 18:42:51.000000000 -0500
-+++ wxGTK-2.6.3.2/locale/sl.po 2005-08-29 06:32:02.000000000 -0400
-@@ -2,7 +2,7 @@
- msgstr ""
- "Project-Id-Version: wxWidgets 2.6.2\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2005-08-21 17:37+0200\n"
-+"POT-Creation-Date: 2004-10-13 04:17+0930\n"
- "PO-Revision-Date: 2005-08-29 09:29+0100\n"
- "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
- "Language-Team: LUGOS <lugos@lugos.si>\n"
-@@ -11,8 +11,7 @@
- "Content-Transfer-Encoding: 8bit\n"
- "X-Poedit-Language: Slovenian\n"
- "X-Poedit-Country: SLOVENIA\n"
--"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
--"%100==4 ? 3 : 0);\n"
-+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
- "X-Poedit-SourceCharset: iso-8859-1\n"
-
- #: ../src/common/debugrpt.cpp:569
-@@ -83,8 +82,10 @@
- # html/helpfrm.cpp:719
- # html/helpfrm.cpp:1277
- # html/helpfrm.cpp:1304
--#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
--#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
-+#: ../src/html/helpfrm.cpp:1042
-+#: ../src/html/helpfrm.cpp:1044
-+#: ../src/html/helpfrm.cpp:1703
-+#: ../src/html/helpfrm.cpp:1736
- #, c-format
- msgid "%i of %i"
- msgstr "%i od %i"
-@@ -147,7 +148,8 @@
- msgid "%s: ill-formed resource file syntax."
- msgstr "%s: slabo oblikovana skladnja datoteke vira."
-
--#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359
-+#: ../src/html/helpfrm.cpp:357
-+#: ../src/html/helpfrm.cpp:359
- msgid "&About..."
- msgstr "&O programu ..."
-
-@@ -185,8 +187,10 @@
- # generic/proplist.cpp:523
- # generic/wizard.cpp:192
- # html/helpfrm.cpp:910
--#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363
--#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:422
-+#: ../src/common/stockitem.cpp:110
-+#: ../src/generic/fontdlgg.cpp:363
-+#: ../src/generic/fontdlgg.cpp:382
-+#: ../src/generic/wizard.cpp:422
- msgid "&Cancel"
- msgstr "&Prekli�i"
-
-@@ -202,12 +206,15 @@
-
- # generic/logg.cpp:477
- # generic/tipdlg.cpp:170
--#: ../src/common/prntbase.cpp:875 ../src/common/stockitem.cpp:112
--#: ../src/generic/logg.cpp:509 ../src/html/helpfrm.cpp:354
-+#: ../src/common/prntbase.cpp:875
-+#: ../src/common/stockitem.cpp:112
-+#: ../src/generic/logg.cpp:509
-+#: ../src/html/helpfrm.cpp:354
- msgid "&Close"
- msgstr "&Zapri"
-
--#: ../src/common/stockitem.cpp:113 ../src/mac/carbon/textctrl.cpp:1074
-+#: ../src/common/stockitem.cpp:113
-+#: ../src/mac/carbon/textctrl.cpp:1074
- #: ../src/msw/textctrl.cpp:2064
- msgid "&Copy"
- msgstr "&Kopiraj"
-@@ -216,7 +223,8 @@
- msgid "&Debug report preview:"
- msgstr "&Predogled poro�ila o razhro��evanju:"
-
--#: ../src/common/stockitem.cpp:115 ../src/mac/carbon/textctrl.cpp:1076
-+#: ../src/common/stockitem.cpp:115
-+#: ../src/mac/carbon/textctrl.cpp:1076
- #: ../src/msw/textctrl.cpp:2066
- msgid "&Delete"
- msgstr "&Zbri�i"
-@@ -264,8 +272,10 @@
- # generic/proplist.cpp:528
- # html/helpfrm.cpp:208
- # msw/mdi.cpp:1283
--#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:418
--#: ../src/generic/wizard.cpp:425 ../src/html/helpfrm.cpp:362
-+#: ../src/common/stockitem.cpp:122
-+#: ../src/generic/wizard.cpp:418
-+#: ../src/generic/wizard.cpp:425
-+#: ../src/html/helpfrm.cpp:362
- msgid "&Help"
- msgstr "&Pomo�"
-
-@@ -299,13 +309,15 @@
- msgstr "&Nov"
-
- # msw/mdi.cpp:188
--#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:188
-+#: ../src/generic/mdig.cpp:118
-+#: ../src/msw/mdi.cpp:188
- msgid "&Next"
- msgstr "&Naslednji"
-
- # generic/wizard.cpp:189
- # generic/wizard.cpp:286
--#: ../src/generic/wizard.cpp:421 ../src/generic/wizard.cpp:636
-+#: ../src/generic/wizard.cpp:421
-+#: ../src/generic/wizard.cpp:636
- msgid "&Next >"
- msgstr "&Naslednji >"
-
-@@ -333,7 +345,8 @@
- # generic/prntdlgg.cpp:467
- # generic/proplist.cpp:511
- # html/helpfrm.cpp:909
--#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368
-+#: ../src/common/stockitem.cpp:133
-+#: ../src/generic/fontdlgg.cpp:368
- #: ../src/generic/fontdlgg.cpp:375
- msgid "&OK"
- msgstr "&V redu"
-@@ -351,7 +364,8 @@
- msgstr "&Odpri ..."
-
- # common/cmdline.cpp:912
--#: ../src/common/stockitem.cpp:135 ../src/mac/carbon/textctrl.cpp:1075
-+#: ../src/common/stockitem.cpp:135
-+#: ../src/mac/carbon/textctrl.cpp:1075
- #: ../src/msw/textctrl.cpp:2065
- msgid "&Paste"
- msgstr "&Prilepi"
-@@ -366,7 +380,8 @@
- msgstr "&Mo�nosti"
-
- # html/helpfrm.cpp:512
--#: ../src/generic/mdig.cpp:119 ../src/msw/mdi.cpp:189
-+#: ../src/generic/mdig.cpp:119
-+#: ../src/msw/mdi.cpp:189
- msgid "&Previous"
- msgstr "&Prej�nji"
-
-@@ -392,15 +407,18 @@
-
- # common/docview.cpp:1945
- # common/docview.cpp:1956
--#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299
--#: ../src/common/stockitem.cpp:141 ../src/mac/carbon/textctrl.cpp:1071
-+#: ../src/common/cmdproc.cpp:292
-+#: ../src/common/cmdproc.cpp:299
-+#: ../src/common/stockitem.cpp:141
-+#: ../src/mac/carbon/textctrl.cpp:1071
- #: ../src/msw/textctrl.cpp:2061
- msgid "&Redo"
- msgstr "&Ponovi"
-
- # common/docview.cpp:1939
- # common/docview.cpp:1966
--#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308
-+#: ../src/common/cmdproc.cpp:288
-+#: ../src/common/cmdproc.cpp:308
- msgid "&Redo "
- msgstr "&Ponovi "
-
-@@ -446,13 +464,16 @@
- msgstr "&Slog:"
-
- # generic/fontdlgg.cpp:242
--#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337
-+#: ../src/common/stockitem.cpp:149
-+#: ../src/generic/fontdlgg.cpp:337
- msgid "&Underline"
- msgstr "&Pod�rtaj"
-
- # common/docview.cpp:1951
--#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150
--#: ../src/mac/carbon/textctrl.cpp:1070 ../src/msw/textctrl.cpp:2060
-+#: ../src/common/cmdproc.cpp:270
-+#: ../src/common/stockitem.cpp:150
-+#: ../src/mac/carbon/textctrl.cpp:1070
-+#: ../src/msw/textctrl.cpp:2060
- msgid "&Undo"
- msgstr "&Razveljavi"
-
-@@ -477,8 +498,11 @@
- # msw/mdi.cpp:1287
- # msw/mdi.cpp:1294
- # msw/window.cpp:2286
--#: ../src/generic/mdig.cpp:298 ../src/generic/mdig.cpp:314
--#: ../src/generic/mdig.cpp:318 ../src/msw/mdi.cpp:1410 ../src/msw/mdi.cpp:1417
-+#: ../src/generic/mdig.cpp:298
-+#: ../src/generic/mdig.cpp:314
-+#: ../src/generic/mdig.cpp:318
-+#: ../src/msw/mdi.cpp:1410
-+#: ../src/msw/mdi.cpp:1417
- #: ../src/msw/mdi.cpp:1447
- msgid "&Window"
- msgstr "&Okno"
-@@ -491,13 +515,15 @@
-
- # common/config.cpp:396
- # msw/regconf.cpp:264
--#: ../src/common/config.cpp:433 ../src/msw/regconf.cpp:258
-+#: ../src/common/config.cpp:433
-+#: ../src/msw/regconf.cpp:258
- #, c-format
- msgid "'%s' has extra '..', ignored."
- msgstr "'%s' ima dodaten '..', ignorirano."
-
- # common/valtext.cpp:140
--#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162
-+#: ../src/common/valtext.cpp:132
-+#: ../src/common/valtext.cpp:162
- #: ../src/common/valtext.cpp:168
- #, c-format
- msgid "'%s' is invalid"
-@@ -552,7 +578,8 @@
- # html/helpfrm.cpp:276
- # html/helpfrm.cpp:783
- # html/helpfrm.cpp:1330
--#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114
-+#: ../src/html/helpfrm.cpp:431
-+#: ../src/html/helpfrm.cpp:1114
- #: ../src/html/helpfrm.cpp:1764
- msgid "(bookmarks)"
- msgstr "(zaznamki)"
-@@ -582,13 +609,15 @@
-
- # generic/dirdlgg.cpp:264
- # generic/filedlgg.cpp:713
--#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:740
-+#: ../src/generic/dirctrlg.cpp:683
-+#: ../src/generic/filedlgg.cpp:740
- msgid "."
- msgstr "."
-
- # generic/dirdlgg.cpp:265
- # generic/filedlgg.cpp:714
--#: ../src/generic/dirctrlg.cpp:684 ../src/generic/filedlgg.cpp:741
-+#: ../src/generic/dirctrlg.cpp:684
-+#: ../src/generic/filedlgg.cpp:741
- msgid ".."
- msgstr ".."
-
-@@ -645,17 +674,20 @@
- msgstr "<<"
-
- # generic/filedlgg.cpp:356
--#: ../src/generic/filedlgg.cpp:259 ../src/generic/filedlgg.cpp:282
-+#: ../src/generic/filedlgg.cpp:259
-+#: ../src/generic/filedlgg.cpp:282
- msgid "<DIR>"
- msgstr "<IMENIK>"
-
- # generic/filedlgg.cpp:356
--#: ../src/generic/filedlgg.cpp:263 ../src/generic/filedlgg.cpp:286
-+#: ../src/generic/filedlgg.cpp:263
-+#: ../src/generic/filedlgg.cpp:286
- msgid "<DRIVE>"
- msgstr "<POGON>"
-
- # generic/filedlgg.cpp:357
--#: ../src/generic/filedlgg.cpp:261 ../src/generic/filedlgg.cpp:284
-+#: ../src/generic/filedlgg.cpp:261
-+#: ../src/generic/filedlgg.cpp:284
- msgid "<LINK>"
- msgstr "<POVEZAVA>"
-
-@@ -859,9 +891,7 @@
- #: ../src/generic/logg.cpp:1163
- #, c-format
- msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
--msgstr ""
--"�elite dopisati dnevnik v datoteko '%s' (izbira [Ne] povzro�i prepis "
--"datoteke)?"
-+msgstr "�elite dopisati dnevnik v datoteko '%s' (izbira [Ne] povzro�i prepis datoteke)?"
-
- #: ../src/common/fmapbase.cpp:109
- msgid "Arabic (ISO-8859-6)"
-@@ -929,7 +959,8 @@
-
- # common/imagbmp.cpp:266
- # common/imagbmp.cpp:278
--#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493
-+#: ../src/common/imagbmp.cpp:477
-+#: ../src/common/imagbmp.cpp:493
- msgid "BMP: Couldn't allocate memory."
- msgstr "BMP: pomnilnika ni mogo�e alocirati."
-
-@@ -1019,7 +1050,8 @@
- msgid "C65 Envelope, 114 x 229 mm"
- msgstr "kuverta C65, 114 x 229 mm"
-
--#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856
-+#: ../src/html/chm.cpp:797
-+#: ../src/html/chm.cpp:856
- msgid "CHM handler currently supports only local files!"
- msgstr "Upravljalec CHM trenutno podpira le lokalne datoteke!"
-
-@@ -1041,7 +1073,8 @@
-
- # common/filefn.cpp:1287
- # msw/dir.cpp:294
--#: ../src/msw/dir.cpp:205 ../src/unix/dir.cpp:232
-+#: ../src/msw/dir.cpp:205
-+#: ../src/unix/dir.cpp:232
- #, c-format
- msgid "Can not enumerate files in directory '%s'"
- msgstr "O�tevil�enje datotek v imeniku '%s' ni mo�no."
-@@ -1057,7 +1090,8 @@
- msgstr "Niti %lu ni mogo�e nadaljevati."
-
- # msw/thread.cpp:552
--#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:827
-+#: ../src/mac/classic/thread.cpp:491
-+#: ../src/msw/thread.cpp:827
- #, c-format
- msgid "Can not resume thread %x"
- msgstr "Niti %x ni mogo�e nadaljevati"
-@@ -1073,7 +1107,8 @@
- msgstr "Niti %lu ni mogo�e za�asno ustaviti."
-
- # msw/thread.cpp:537
--#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:812
-+#: ../src/mac/classic/thread.cpp:464
-+#: ../src/msw/thread.cpp:812
- #, c-format
- msgid "Can not suspend thread %x"
- msgstr "Niti %x ni mogo�e za�asno ustaviti."
-@@ -1092,8 +1127,7 @@
- #: ../src/common/image.cpp:1939
- #, c-format
- msgid "Can't check image format of file '%s': file does not exist."
--msgstr ""
--"Formata slike v datoteki '%s' ni mogo�e preveriti: datoteka ne obstaja."
-+msgstr "Formata slike v datoteki '%s' ni mogo�e preveriti: datoteka ne obstaja."
-
- # SOME DESCRIPTIVE TITLE.
- # Copyright (C) YEAR Free Software Foundation, Inc.
-@@ -1126,8 +1160,10 @@
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
- # msw/thread.cpp:519
--#: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100
--#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594
-+#: ../src/mac/carbon/mpthread.cpp:911
-+#: ../src/mac/carbon/thread.cpp:1100
-+#: ../src/mac/classic/thread.cpp:439
-+#: ../src/msw/thread.cpp:594
- #: ../src/os2/thread.cpp:486
- msgid "Can't create thread"
- msgstr "Niti ni mogo�e ustvariti."
-@@ -1157,7 +1193,8 @@
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
- # msw/iniconf.cpp:476
--#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:458
-+#: ../src/msw/iniconf.cpp:444
-+#: ../src/os2/iniconf.cpp:458
- #, c-format
- msgid "Can't delete the INI file '%s'"
- msgstr "Datoteke INI '%s' ni mogo�e izbrisati."
-@@ -1218,7 +1255,8 @@
-
- # common/image.cpp:653
- # common/image.cpp:673
--#: ../src/common/image.cpp:1367 ../src/common/image.cpp:1387
-+#: ../src/common/image.cpp:1367
-+#: ../src/common/image.cpp:1387
- #, c-format
- msgid "Can't load image from file '%s': file does not exist."
- msgstr "Slike iz datoteke '%s' ni mogo�e nalo�iti: datoteka ne obstaja"
-@@ -1255,7 +1293,8 @@
- #
- # msw/registry.cpp:774
- # msw/registry.cpp:813
--#: ../src/msw/registry.cpp:795 ../src/msw/registry.cpp:825
-+#: ../src/msw/registry.cpp:795
-+#: ../src/msw/registry.cpp:825
- #: ../src/msw/registry.cpp:885
- #, c-format
- msgid "Can't read value of key '%s'"
-@@ -1270,12 +1309,14 @@
-
- # generic/logg.cpp:535
- # generic/logg.cpp:932
--#: ../src/generic/logg.cpp:569 ../src/generic/logg.cpp:1020
-+#: ../src/generic/logg.cpp:569
-+#: ../src/generic/logg.cpp:1020
- msgid "Can't save log contents to file."
- msgstr "Vsebine dnevnika ni mogo�e shraniti v datoteko."
-
- # msw/thread.cpp:485
--#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:469
-+#: ../src/msw/thread.cpp:550
-+#: ../src/os2/thread.cpp:469
- msgid "Can't set thread priority"
- msgstr "Prioritet niti ni bilo mogo�e nastaviti."
-
-@@ -1285,7 +1326,8 @@
- #
- # msw/registry.cpp:799
- # msw/registry.cpp:923
--#: ../src/msw/registry.cpp:812 ../src/msw/registry.cpp:854
-+#: ../src/msw/registry.cpp:812
-+#: ../src/msw/registry.cpp:854
- #: ../src/msw/registry.cpp:975
- #, c-format
- msgid "Can't set value of '%s'"
-@@ -1308,14 +1350,18 @@
- # generic/proplist.cpp:523
- # generic/wizard.cpp:192
- # html/helpfrm.cpp:910
--#: ../src/generic/choicdgg.cpp:291 ../src/generic/dirdlgg.cpp:114
--#: ../src/generic/numdlgg.cpp:136 ../src/generic/textdlgg.cpp:120
--#: ../src/gtk/fontdlg.cpp:155 ../src/motif/msgdlg.cpp:204
-+#: ../src/generic/choicdgg.cpp:291
-+#: ../src/generic/dirdlgg.cpp:114
-+#: ../src/generic/numdlgg.cpp:136
-+#: ../src/generic/textdlgg.cpp:120
-+#: ../src/gtk/fontdlg.cpp:155
-+#: ../src/motif/msgdlg.cpp:204
- #: ../contrib/src/deprecated/proplist.cpp:518
- msgid "Cancel"
- msgstr "Prekli�i"
-
--#: ../src/xrc/xmlres.cpp:1188 ../src/xrc/xmlres.cpp:1236
-+#: ../src/xrc/xmlres.cpp:1188
-+#: ../src/xrc/xmlres.cpp:1236
- msgid "Cannot convert dialog units: dialog unknown."
- msgstr "Enot pogovornih oken ni mogo�e pretvoriti: pogovorno okno neznano."
-
-@@ -1459,7 +1505,8 @@
- msgstr "Prazne strani ni mogo�e natisniti."
-
- # html/helpdata.cpp:353
--#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
-+#: ../src/msw/volume.cpp:160
-+#: ../src/msw/volume.cpp:491
- #, c-format
- msgid "Cannot read typename from '%s'!"
- msgstr "Imena tipa ni mogo�e prebrati iz '%s'!"
-@@ -1473,7 +1520,8 @@
- msgstr "Niti ni mo�no zagnati: napaka pri pisanju TLS"
-
- # msw/thread.cpp:871
--#: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174
-+#: ../src/mac/carbon/mpthread.cpp:977
-+#: ../src/mac/carbon/thread.cpp:1174
- msgid "Cannot wait for thread termination."
- msgstr "Na ustavitev niti ni mogo�e po�akati."
-
-@@ -1482,7 +1530,8 @@
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
- # msw/thread.cpp:519
--#: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082
-+#: ../src/mac/carbon/mpthread.cpp:893
-+#: ../src/mac/carbon/thread.cpp:1082
- msgid "Cant create the thread event queue"
- msgstr "�akalne vrste nitnih dogodkov ni mogo�e ustvariti"
-
-@@ -1509,7 +1558,8 @@
- msgid "Choose ISP to dial"
- msgstr "Izberite ponudnika spletnih storitev, ki ga �elite poklicati."
-
--#: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45
-+#: ../src/generic/colrdlgg.cpp:151
-+#: ../src/gtk/colordlg.cpp:45
- #: ../src/palmos/colordlg.cpp:79
- msgid "Choose colour"
- msgstr "Izberite barvo"
-@@ -1530,20 +1580,25 @@
- msgid "Clear the log contents"
- msgstr "Izprazni vsebino dnevnika"
-
--#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384
-+#: ../src/generic/fontdlgg.cpp:365
-+#: ../src/generic/fontdlgg.cpp:384
- msgid "Click to cancel the font selection."
- msgstr "Kliknite za preklic izbire pisave."
-
--#: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372
--#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379
-+#: ../src/generic/fontdlgg.cpp:370
-+#: ../src/generic/fontdlgg.cpp:372
-+#: ../src/generic/fontdlgg.cpp:377
-+#: ../src/generic/fontdlgg.cpp:379
- msgid "Click to confirm the font selection."
- msgstr "Kliknite za potrditev izbire pisave."
-
- # common/prntbase.cpp:359
- # generic/progdlgg.cpp:307
- # generic/proplist.cpp:518
--#: ../src/generic/dbgrptg.cpp:92 ../src/generic/progdlgg.cpp:629
--#: ../src/generic/progdlgg.cpp:634 ../contrib/src/deprecated/proplist.cpp:513
-+#: ../src/generic/dbgrptg.cpp:92
-+#: ../src/generic/progdlgg.cpp:629
-+#: ../src/generic/progdlgg.cpp:634
-+#: ../contrib/src/deprecated/proplist.cpp:513
- msgid "Close"
- msgstr "Zapri "
-
-@@ -1579,7 +1634,8 @@
- msgstr "Vstopno konfiguracijsko ime se ne more za�eti s '%c'."
-
- # generic/filedlgg.cpp:1077
--#: ../src/generic/filedlgg.cpp:1318 ../src/gtk/filedlg.cpp:67
-+#: ../src/generic/filedlgg.cpp:1318
-+#: ../src/gtk/filedlg.cpp:67
- msgid "Confirm"
- msgstr "Potrdi"
-
-@@ -1655,8 +1711,7 @@
- "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
- " or provide #define (see manual for caveats)"
- msgstr ""
--"Razre�itev nadzornega razreda ali id '%s' ni uspela. Namesto tega uporabite "
--"(ne-ni�elno) celo �tevilo\n"
-+"Razre�itev nadzornega razreda ali id '%s' ni uspela. Namesto tega uporabite (ne-ni�elno) celo �tevilo\n"
- " ali priskrbite #define (oglejte si priro�nik za opombe)."
-
- #: ../contrib/src/deprecated/resource.cpp:1278
-@@ -1665,8 +1720,7 @@
- "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
- "or provide #define (see manual for caveats)"
- msgstr ""
--"Menijskega id '%s' ni mogo�e razre�iti. Namesto tega uporabite (ne-ni�elno) "
--"celo �tevilo\n"
-+"Menijskega id '%s' ni mogo�e razre�iti. Namesto tega uporabite (ne-ni�elno) celo �tevilo\n"
- "ali preskrbite #define (oglejte si priro�nik za opozorila)."
-
- # common/prntbase.cpp:711
-@@ -1676,7 +1730,8 @@
-
- # generic/printps.cpp:209
- # msw/printwin.cpp:252
--#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:763
-+#: ../src/generic/printps.cpp:185
-+#: ../src/gtk/gnome/gprint.cpp:763
- #: ../src/msw/printwin.cpp:235
- msgid "Could not start printing."
- msgstr "Tiskanja ni mogo�e pognati."
-@@ -1688,8 +1743,10 @@
-
- # common/imagbmp.cpp:266
- # common/imagbmp.cpp:278
--#: ../src/mac/carbon/mpthread.cpp:227 ../src/mac/carbon/mpthread.cpp:306
--#: ../src/mac/carbon/thread.cpp:414 ../src/mac/carbon/thread.cpp:495
-+#: ../src/mac/carbon/mpthread.cpp:227
-+#: ../src/mac/carbon/mpthread.cpp:306
-+#: ../src/mac/carbon/thread.cpp:414
-+#: ../src/mac/carbon/thread.cpp:495
- msgid "Could not unlock mutex"
- msgstr "Mutexa ni mogo�e odkleniti."
-
-@@ -1704,20 +1761,24 @@
- # msw/imaglist.cpp:152
- # msw/imaglist.cpp:174
- # msw/imaglist.cpp:187
--#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
--#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176
-+#: ../src/msw/dragimag.cpp:166
-+#: ../src/msw/dragimag.cpp:206
-+#: ../src/msw/imaglist.cpp:158
-+#: ../src/msw/imaglist.cpp:176
- #: ../src/msw/imaglist.cpp:188
- msgid "Couldn't add an image to the image list."
- msgstr "Na seznam slik ni mogo�e dodati slike."
-
- # msw/timer.cpp:96
--#: ../src/msw/timer.cpp:106 ../src/os2/timer.cpp:155
-+#: ../src/msw/timer.cpp:106
-+#: ../src/os2/timer.cpp:155
- msgid "Couldn't create a timer"
- msgstr "�asovnika ni mogo�e ustvariti"
-
- # common/imagbmp.cpp:266
- # common/imagbmp.cpp:278
--#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166
-+#: ../src/mgl/cursor.cpp:135
-+#: ../src/mgl/cursor.cpp:166
- msgid "Couldn't create cursor."
- msgstr "Kazalke ni mogo�e ustvariti."
-
-@@ -1728,16 +1789,15 @@
- msgstr "Simbola '%s' v dinami�ni knji�nici ni mogo�e najti."
-
- # msw/thread.cpp:578
--#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:853
-+#: ../src/mac/classic/thread.cpp:521
-+#: ../src/msw/thread.cpp:853
- msgid "Couldn't get the current thread pointer"
- msgstr "Trenutnega kazalca niti ni mogo�e dobiti"
-
- # common/imagpng.cpp:251
- #: ../src/common/imagpng.cpp:596
- msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
--msgstr ""
--"Slike PNG ni mogo�e nalo�iti - datoteka je pokvarjena ali pa primanjkuje "
--"spomina."
-+msgstr "Slike PNG ni mogo�e nalo�iti - datoteka je pokvarjena ali pa primanjkuje spomina."
-
- # common/filefn.cpp:1287
- # msw/dir.cpp:294
-@@ -1771,20 +1831,21 @@
- msgstr "Podatkov o kontrolnem elementu seznama %d ni mogo�e pridobiti."
-
- # common/imagbmp.cpp:62
--#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651
-+#: ../src/common/imagpng.cpp:642
-+#: ../src/common/imagpng.cpp:651
- #: ../src/common/imagpng.cpp:659
- msgid "Couldn't save PNG image."
- msgstr "Slike PNG ni mogo�e shraniti."
-
- # msw/thread.cpp:958
--#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611
-+#: ../src/mac/classic/thread.cpp:779
-+#: ../src/msw/thread.cpp:611
- msgid "Couldn't terminate thread"
- msgstr "Niti ni mogo�e kon�ati."
-
- #: ../src/common/xtistrm.cpp:161
- msgid "Create Parameter not found in declared RTTI Parameters"
--msgstr ""
--"V prijavljenih spremenljivkah RTTI ustvarjenega parametra ni mogo�e najti."
-+msgstr "V prijavljenih spremenljivkah RTTI ustvarjenega parametra ni mogo�e najti."
-
- # generic/dirdlgg.cpp:572
- #: ../src/generic/dirdlgg.cpp:307
-@@ -1792,11 +1853,13 @@
- msgstr "Ustvari imenik"
-
- # generic/filedlgg.cpp:883
--#: ../src/generic/dirdlgg.cpp:140 ../src/generic/filedlgg.cpp:999
-+#: ../src/generic/dirdlgg.cpp:140
-+#: ../src/generic/filedlgg.cpp:999
- msgid "Create new directory"
- msgstr "Ustvari nov imenik"
-
--#: ../src/common/stockitem.cpp:114 ../src/mac/carbon/textctrl.cpp:1073
-+#: ../src/common/stockitem.cpp:114
-+#: ../src/mac/carbon/textctrl.cpp:1073
- #: ../src/msw/textctrl.cpp:2063
- msgid "Cu&t"
- msgstr "&Izre�i"
-@@ -1896,12 +1959,8 @@
-
- # msw/dialup.cpp:354
- #: ../src/msw/dialup.cpp:395
--msgid ""
--"Dial up functions are unavailable because the remote access service (RAS) is "
--"not installed on this machine. Please install it."
--msgstr ""
--"Funkcije klicne povezave niso na voljo, ker storitev oddaljenega dostopa "
--"(RAS) na tem ra�unalniku ni name��ena. Prosimo namestite jo."
-+msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."
-+msgstr "Funkcije klicne povezave niso na voljo, ker storitev oddaljenega dostopa (RAS) na tem ra�unalniku ni name��ena. Prosimo namestite jo."
-
- # generic/tipdlg.cpp:177
- #: ../src/generic/tipdlg.cpp:246
-@@ -1937,12 +1996,8 @@
-
- # html/helpfrm.cpp:366
- #: ../src/html/helpfrm.cpp:503
--msgid ""
--"Display all index items that contain given substring. Search is case "
--"insensitive."
--msgstr ""
--"Poka�i vse indeksirane predmete, ki vsebujejo podtekst. Iskanje je "
--"ob�utljivo na velikost �rk"
-+msgid "Display all index items that contain given substring. Search is case insensitive."
-+msgstr "Poka�i vse indeksirane predmete, ki vsebujejo podtekst. Iskanje je ob�utljivo na velikost �rk"
-
- # html/helpfrm.cpp:535
- #: ../src/html/helpfrm.cpp:685
-@@ -1951,8 +2006,7 @@
-
- #: ../src/msw/mimetype.cpp:671
- msgid ""
--"Do you want to overwrite the command used to %s files with extension \"%s"
--"\" ?\n"
-+"Do you want to overwrite the command used to %s files with extension \"%s\" ?\n"
- "Current value is \n"
- "%s, \n"
- "New value is \n"
-@@ -1975,7 +2029,8 @@
- msgstr "Ne shrani"
-
- # html/htmlwin.cpp:216
--#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211
-+#: ../src/html/htmlwin.cpp:451
-+#: ../src/msw/frame.cpp:211
- msgid "Done"
- msgstr "Kon�ano"
-
-@@ -2035,10 +2090,8 @@
- # common/config.cpp:349
- #: ../src/common/config.cpp:384
- #, c-format
--msgid ""
--"Environment variables expansion failed: missing '%c' at position %u in '%s'."
--msgstr ""
--"Raz�iritev okoljske spremenjivke ni uspela: manjka '%c' na mestu %u v '%s'."
-+msgid "Environment variables expansion failed: missing '%c' at position %u in '%s'."
-+msgstr "Raz�iritev okoljske spremenjivke ni uspela: manjka '%c' na mestu %u v '%s'."
-
- # generic/dirdlgg.cpp:268
- # generic/dirdlgg.cpp:286
-@@ -2051,17 +2104,24 @@
- # generic/filedlgg.cpp:1043
- # generic/filedlgg.cpp:1092
- # generic/helpxlp.cpp:241
--#: ../src/generic/dirctrlg.cpp:689 ../src/generic/dirctrlg.cpp:707
--#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
--#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:744
--#: ../src/generic/filedlgg.cpp:758 ../src/generic/filedlgg.cpp:772
--#: ../src/generic/filedlgg.cpp:1269 ../src/generic/filedlgg.cpp:1295
--#: ../src/generic/filedlgg.cpp:1325 ../src/gtk/fontdlg.cpp:81
-+#: ../src/generic/dirctrlg.cpp:689
-+#: ../src/generic/dirctrlg.cpp:707
-+#: ../src/generic/dirctrlg.cpp:718
-+#: ../src/generic/dirdlgg.cpp:342
-+#: ../src/generic/filedlgg.cpp:632
-+#: ../src/generic/filedlgg.cpp:744
-+#: ../src/generic/filedlgg.cpp:758
-+#: ../src/generic/filedlgg.cpp:772
-+#: ../src/generic/filedlgg.cpp:1269
-+#: ../src/generic/filedlgg.cpp:1295
-+#: ../src/generic/filedlgg.cpp:1325
-+#: ../src/gtk/fontdlg.cpp:81
- msgid "Error"
- msgstr "Napaka"
-
- # common/log.cpp:362
--#: ../src/msdos/utilsdos.cpp:213 ../src/unix/utilsunx.cpp:1090
-+#: ../src/msdos/utilsdos.cpp:213
-+#: ../src/unix/utilsunx.cpp:1090
- #: ../src/unix/utilsunx.cpp:1098
- msgid "Error "
- msgstr "Napaka"
-@@ -2085,7 +2145,8 @@
- msgid "Error saving user configuration data."
- msgstr "Napaka pri shranjevanju podatkov nastavitev uporabnika."
-
--#: ../src/mac/carbon/mpthread.cpp:482 ../src/mac/carbon/thread.cpp:672
-+#: ../src/mac/carbon/mpthread.cpp:482
-+#: ../src/mac/carbon/thread.cpp:672
- msgid "Error while waiting on semaphore"
- msgstr "Napaka pri �akanju na semafor"
-
-@@ -2142,10 +2203,8 @@
-
- #: ../src/msw/registry.cpp:1140
- #, c-format
--msgid ""
--"Exporting registry key: file \"%s\" already exists and won't be overwritten."
--msgstr ""
--"Izvoz registrskega klju�a: datoteka \"%s\" �e obstaja in ne bo prepisana."
-+msgid "Exporting registry key: file \"%s\" already exists and won't be overwritten."
-+msgstr "Izvoz registrskega klju�a: datoteka \"%s\" �e obstaja in ne bo prepisana."
-
- #: ../src/common/fmapbase.cpp:143
- msgid "Extended Unix Codepage for Japanese (EUC-JP)"
-@@ -2326,9 +2385,7 @@
- #: ../src/msw/fdrepdlg.cpp:474
- #, c-format
- msgid "Failed to create the standard find/replace dialog (error code %d)"
--msgstr ""
--"Standardnega najdi/zamenjaj pogovornega okna ni bilo uspe�no ustvarjeno "
--"(koda napake %d)"
-+msgstr "Standardnega najdi/zamenjaj pogovornega okna ni bilo uspe�no ustvarjeno (koda napake %d)"
-
- # html/winpars.cpp:364
- #: ../src/html/winpars.cpp:549
-@@ -2337,7 +2394,8 @@
- msgstr "Dokumenta HTML, kodiranega v %s, ni mogo�e prikazati."
-
- # msw/clipbrd.cpp:134
--#: ../src/mac/carbon/clipbrd.cpp:194 ../src/mac/classic/clipbrd.cpp:185
-+#: ../src/mac/carbon/clipbrd.cpp:194
-+#: ../src/mac/classic/clipbrd.cpp:185
- #: ../src/msw/clipbrd.cpp:131
- msgid "Failed to empty the clipboard."
- msgstr "Izpraznitev odlo�i��a ni uspela."
-@@ -2363,7 +2421,8 @@
- msgstr "Klicna povezava ni bila uspe�no vzpostavljena: %s"
-
- # common/ffile.cpp:182
--#: ../src/unix/utilsunx.cpp:508 ../src/unix/utilsunx.cpp:524
-+#: ../src/unix/utilsunx.cpp:508
-+#: ../src/unix/utilsunx.cpp:524
- #, c-format
- msgid "Failed to execute '%s'\n"
- msgstr "'%s' ni mogo�e izvesti\n"
-@@ -2406,7 +2465,8 @@
- msgstr "Neuspe�no pridobivanje imen ISP: %s"
-
- # generic/dirdlgg.cpp:550
--#: ../src/mac/carbon/clipbrd.cpp:143 ../src/mac/classic/clipbrd.cpp:134
-+#: ../src/mac/carbon/clipbrd.cpp:143
-+#: ../src/mac/classic/clipbrd.cpp:134
- msgid "Failed to get clipboard data."
- msgstr "Pridobivanje podatkov z odlo�i��a ni uspelo."
-
-@@ -2444,12 +2504,8 @@
- msgstr "Zaklenjene datoteke '%s' ni mogo�e pregledati."
-
- #: ../src/unix/threadpsx.cpp:897
--msgid ""
--"Failed to join a thread, potential memory leak detected - please restart the "
--"program"
--msgstr ""
--"Pridru�itev k niti ni uspela, odkrita mo�na izguba spomina - prosimo ponovno "
--"za�enite program"
-+msgid "Failed to join a thread, potential memory leak detected - please restart the program"
-+msgstr "Pridru�itev k niti ni uspela, odkrita mo�na izguba spomina - prosimo ponovno za�enite program"
-
- #: ../src/msw/utils.cpp:703
- #, c-format
-@@ -2668,7 +2724,8 @@
- msgstr "Neuspe�no nastavljanje pravic za trenutno datoteko"
-
- # generic/dirdlgg.cpp:550
--#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256
-+#: ../src/unix/threadpsx.cpp:1245
-+#: ../src/unix/threadpsx.cpp:1256
- #, c-format
- msgid "Failed to set thread priority %d."
- msgstr "Prioritete niti %d ni bilo mogo�e nastaviti."
-@@ -2680,7 +2737,8 @@
- msgstr "Slike '%s' ni mogo�e shraniti v spominski VFS!"
-
- # generic/dirdlgg.cpp:550
--#: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465
-+#: ../src/mac/carbon/mpthread.cpp:1273
-+#: ../src/mac/carbon/thread.cpp:1465
- #: ../src/unix/threadpsx.cpp:1429
- msgid "Failed to terminate a thread."
- msgstr "Niti ni mogo�e prekiniti."
-@@ -2752,7 +2810,8 @@
- msgstr "Datoteka %s ne obstaja."
-
- # generic/filedlgg.cpp:1074
--#: ../src/generic/filedlgg.cpp:1316 ../src/gtk/filedlg.cpp:64
-+#: ../src/generic/filedlgg.cpp:1316
-+#: ../src/gtk/filedlg.cpp:64
- #, c-format
- msgid "File '%s' already exists, do you really want to overwrite it?"
- msgstr "Datoteka %s �e obstaja, jo resni�no �elite prepisati?"
-@@ -2775,13 +2834,15 @@
- # common/docview.cpp:296
- # common/docview.cpp:332
- # common/docview.cpp:1388
--#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:1596
-+#: ../src/common/docview.cpp:571
-+#: ../src/common/docview.cpp:1596
- msgid "File error"
- msgstr "Datote�na napaka"
-
- # generic/dirdlgg.cpp:286
- # generic/filedlgg.cpp:731
--#: ../src/generic/dirctrlg.cpp:707 ../src/generic/filedlgg.cpp:758
-+#: ../src/generic/dirctrlg.cpp:707
-+#: ../src/generic/filedlgg.cpp:758
- msgid "File name exists already."
- msgstr "Ime datoteke �e obstaja."
-
-@@ -2919,7 +2980,8 @@
- msgstr "Pojdi nivo vi�je v hierarhiji dokumenta"
-
- # generic/filedlgg.cpp:875
--#: ../src/generic/dirdlgg.cpp:145 ../src/generic/filedlgg.cpp:989
-+#: ../src/generic/dirdlgg.cpp:145
-+#: ../src/generic/filedlgg.cpp:989
- msgid "Go to home directory"
- msgstr "Pojdi na doma�i imenik"
-
-@@ -2936,7 +2998,8 @@
- msgid "Greek (ISO-8859-7)"
- msgstr "gr�ko (ISO-8859-7)"
-
--#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
-+#: ../src/common/zstream.cpp:72
-+#: ../src/common/zstream.cpp:209
- msgid "Gzip not supported by this version of zlib"
- msgstr "Ta razli�ica zlib ne podpira Gzip"
-
-@@ -2962,7 +3025,8 @@
- # generic/proplist.cpp:528
- # html/helpfrm.cpp:208
- # msw/mdi.cpp:1283
--#: ../src/html/helpfrm.cpp:337 ../contrib/src/deprecated/proplist.cpp:523
-+#: ../src/html/helpfrm.cpp:337
-+#: ../contrib/src/deprecated/proplist.cpp:523
- msgid "Help"
- msgstr "Pomo�"
-
-@@ -2973,7 +3037,8 @@
-
- # generic/helphtml.cpp:319
- # generic/helphtml.cpp:320
--#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443
-+#: ../src/generic/helpext.cpp:442
-+#: ../src/generic/helpext.cpp:443
- msgid "Help Index"
- msgstr "Indeks pomo�i"
-
-@@ -3017,9 +3082,12 @@
- msgid "ICO: Error in reading mask DIB."
- msgstr "ICO: napaka pri branju maske DIB."
-
--#: ../src/common/imagbmp.cpp:1048 ../src/common/imagbmp.cpp:1107
--#: ../src/common/imagbmp.cpp:1116 ../src/common/imagbmp.cpp:1127
--#: ../src/common/imagbmp.cpp:1171 ../src/common/imagbmp.cpp:1181
-+#: ../src/common/imagbmp.cpp:1048
-+#: ../src/common/imagbmp.cpp:1107
-+#: ../src/common/imagbmp.cpp:1116
-+#: ../src/common/imagbmp.cpp:1127
-+#: ../src/common/imagbmp.cpp:1171
-+#: ../src/common/imagbmp.cpp:1181
- #: ../src/common/imagbmp.cpp:1190
- msgid "ICO: Error writing the image file!"
- msgstr "ICO: napaka pri pisanju v datoteko slike!"
-@@ -3070,13 +3138,11 @@
-
- #: ../src/generic/dbgrptg.cpp:310
- msgid ""
--"If you wish to suppress this debug report completely, please choose the "
--"\"Cancel\" button,\n"
-+"If you wish to suppress this debug report completely, please choose the \"Cancel\" button,\n"
- "but be warned that it may hinder improving the program, so if\n"
- "at all possible please do continue with the report generation.\n"
- msgstr ""
--"�e �elite popolnoma prepre�iti to poro�ilo o razhro��evanju, prosimo "
--"izberite gumb \"Razveljavi\",\n"
-+"�e �elite popolnoma prepre�iti to poro�ilo o razhro��evanju, prosimo izberite gumb \"Razveljavi\",\n"
- "vendar vedite, da to lahko onemogo�a izbolj�anje programa, tako da �e je\n"
- "le mogo�e, prosimo nadaljujte s tvorbo poro�ila.\n"
-
-@@ -3103,7 +3169,8 @@
-
- # generic/dirdlgg.cpp:268
- # generic/filedlgg.cpp:717
--#: ../src/generic/dirctrlg.cpp:689 ../src/generic/filedlgg.cpp:744
-+#: ../src/generic/dirctrlg.cpp:689
-+#: ../src/generic/filedlgg.cpp:744
- msgid "Illegal directory name."
- msgstr "Napa�no ime imenika"
-
-@@ -3123,13 +3190,8 @@
-
- # msw/textctrl.cpp:219
- #: ../src/msw/textctrl.cpp:361
--msgid ""
--"Impossible to create a rich edit control, using simple text control instead. "
--"Please reinstall riched32.dll"
--msgstr ""
--"Kontrolnika za bogato urejanje ni mogo�e ustvariti, namesto tega bo "
--"uporabljen kontrolnik za enostavno urejanje besedila. Prosimo ponovno "
--"namestite riched32.dll"
-+msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"
-+msgstr "Kontrolnika za bogato urejanje ni mogo�e ustvariti, namesto tega bo uporabljen kontrolnik za enostavno urejanje besedila. Prosimo ponovno namestite riched32.dll"
-
- #: ../src/unix/utilsunx.cpp:428
- msgid "Impossible to get child process input"
-@@ -3201,7 +3263,8 @@
- msgid "Invalid lock file '%s'."
- msgstr "Datoteka '%s' ni veljavna datoteka zaklopa."
-
--#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380
-+#: ../src/common/xtistrm.cpp:365
-+#: ../src/common/xtistrm.cpp:380
- msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
- msgstr "V GetObjectClassInfo podan neveljaven ali ni�elni predmetni ID."
-
-@@ -3300,7 +3363,8 @@
- # generic/dcpsg.cpp:2262
- # generic/prntdlgg.cpp:441
- # generic/prntdlgg.cpp:637
--#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867
-+#: ../src/generic/prntdlgg.cpp:609
-+#: ../src/generic/prntdlgg.cpp:867
- msgid "Landscape"
- msgstr "Pokrajina"
-
-@@ -3390,7 +3454,8 @@
- msgid "Log saved to the file '%s'."
- msgstr "Dnevnik je bil shranjen v datoteko '%s'"
-
--#: ../include/wx/xti.h:501 ../include/wx/xti.h:505
-+#: ../include/wx/xti.h:501
-+#: ../include/wx/xti.h:505
- msgid "Long Conversions not supported"
- msgstr "Dolge pretvorbe niso podprte"
-
-@@ -3403,12 +3468,8 @@
- msgstr "Na tem sistemu podpora nitim MP ni na voljo."
-
- #: ../src/msw/helpchm.cpp:60
--msgid ""
--"MS HTML Help functions are unavailable because the MS HTML Help library is "
--"not installed on this machine. Please install it."
--msgstr ""
--"Funkcije MS HTML Help niso na voljo, ker knji�nica MS HTML Help ni name��ena "
--"na tem ra�unalniku. Prosimo namestite jo."
-+msgid "MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it."
-+msgstr "Funkcije MS HTML Help niso na voljo, ker knji�nica MS HTML Help ni name��ena na tem ra�unalniku. Prosimo namestite jo."
-
- #: ../src/univ/themes/win32.cpp:4929
- msgid "Ma&ximize"
-@@ -3493,8 +3554,10 @@
- msgstr "Nov element"
-
- # generic/filedlgg.cpp:610
--#: ../src/generic/dirdlgg.cpp:316 ../src/generic/dirdlgg.cpp:326
--#: ../src/generic/filedlgg.cpp:608 ../src/generic/filedlgg.cpp:617
-+#: ../src/generic/dirdlgg.cpp:316
-+#: ../src/generic/dirdlgg.cpp:326
-+#: ../src/generic/filedlgg.cpp:608
-+#: ../src/generic/filedlgg.cpp:617
- msgid "NewName"
- msgstr "NovoIme"
-
-@@ -3510,8 +3573,10 @@
-
- # common/dlgcmn.cpp:111
- # common/dlgcmn.cpp:121
--#: ../src/mac/carbon/msgdlg.cpp:58 ../src/mac/carbon/msgdlg.cpp:143
--#: ../src/mac/classic/msgdlg.cpp:56 ../src/mac/classic/msgdlg.cpp:140
-+#: ../src/mac/carbon/msgdlg.cpp:58
-+#: ../src/mac/carbon/msgdlg.cpp:143
-+#: ../src/mac/classic/msgdlg.cpp:56
-+#: ../src/mac/classic/msgdlg.cpp:140
- #: ../src/motif/msgdlg.cpp:204
- msgid "No"
- msgstr "Ne"
-@@ -3536,8 +3601,7 @@
- msgid ""
- "No font for displaying text in encoding '%s' found,\n"
- "but an alternative encoding '%s' is available.\n"
--"Do you want to use this encoding (otherwise you will have to choose another "
--"one)?"
-+"Do you want to use this encoding (otherwise you will have to choose another one)?"
- msgstr ""
- "Nobena pisava za prikaz besedila, kodiranega v '%s', ne obstaja,\n"
- "na voljo pa je druga�no kodiranje '%s'.\n"
-@@ -3561,13 +3625,15 @@
- msgstr "Za vozel XML '%s', razred '%s' ni mogo�e najti nobenega upravljalca!"
-
- # common/image.cpp:758
--#: ../src/common/image.cpp:1505 ../src/common/image.cpp:1548
-+#: ../src/common/image.cpp:1505
-+#: ../src/common/image.cpp:1548
- msgid "No handler found for image type."
- msgstr "Upravljalca za vrsto slike ni mogo�e najti."
-
- # common/image.cpp:766
- # common/image.cpp:800
--#: ../src/common/image.cpp:1513 ../src/common/image.cpp:1556
-+#: ../src/common/image.cpp:1513
-+#: ../src/common/image.cpp:1556
- #: ../src/common/image.cpp:1589
- #, c-format
- msgid "No image handler for type %d defined."
-@@ -3575,7 +3641,8 @@
-
- # common/image.cpp:784
- # common/image.cpp:816
--#: ../src/common/image.cpp:1574 ../src/common/image.cpp:1604
-+#: ../src/common/image.cpp:1574
-+#: ../src/common/image.cpp:1604
- #, c-format
- msgid "No image handler for type %s defined."
- msgstr "Ta vrsto %s ni dolo�en noben upravljalec slik."
-@@ -3590,7 +3657,8 @@
- msgid "No sound"
- msgstr "Brez zvoka"
-
--#: ../src/common/image.cpp:1200 ../src/common/image.cpp:1239
-+#: ../src/common/image.cpp:1200
-+#: ../src/common/image.cpp:1239
- msgid "No unused colour in image being masked."
- msgstr "Nobena neuporabljena barva v sliki ni maskirana."
-
-@@ -3604,7 +3672,8 @@
-
- # generic/fontdlgg.cpp:212
- # generic/fontdlgg.cpp:215
--#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235
-+#: ../src/generic/fontdlgg.cpp:232
-+#: ../src/generic/fontdlgg.cpp:235
- msgid "Normal"
- msgstr "Obi�ajno"
-
-@@ -3630,7 +3699,8 @@
- # generic/prntdlgg.cpp:467
- # generic/proplist.cpp:511
- # html/helpfrm.cpp:909
--#: ../src/gtk/fontdlg.cpp:147 ../src/msw/dialog.cpp:194
-+#: ../src/gtk/fontdlg.cpp:147
-+#: ../src/msw/dialog.cpp:194
- #: ../contrib/src/deprecated/proplist.cpp:506
- msgid "OK"
- msgstr "V redu"
-@@ -3639,13 +3709,15 @@
- msgid "Objects must have an id attribute"
- msgstr "Objekti morajo imeti atribut id"
-
--#: ../src/common/docview.cpp:1269 ../src/common/docview.cpp:1619
-+#: ../src/common/docview.cpp:1269
-+#: ../src/common/docview.cpp:1619
- msgid "Open File"
- msgstr "Odpri datoteko"
-
- # html/helpfrm.cpp:523
- # html/helpfrm.cpp:1183
--#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579
-+#: ../src/html/helpfrm.cpp:673
-+#: ../src/html/helpfrm.cpp:1579
- msgid "Open HTML document"
- msgstr "Odpri dokument HTML"
-
-@@ -3658,8 +3730,10 @@
- # generic/dirdlgg.cpp:605
- # generic/filedlgg.cpp:625
- # generic/filedlgg.cpp:744
--#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
--#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:772
-+#: ../src/generic/dirctrlg.cpp:718
-+#: ../src/generic/dirdlgg.cpp:342
-+#: ../src/generic/filedlgg.cpp:632
-+#: ../src/generic/filedlgg.cpp:772
- msgid "Operation not permitted."
- msgstr "Operacija ni dovoljena."
-
-@@ -3682,19 +3756,22 @@
- msgstr "Opcije '%s':'%s' ne morem pretvoriti v datum"
-
- # generic/prntdlgg.cpp:447
--#: ../src/generic/dirdlgg.cpp:116 ../src/generic/prntdlgg.cpp:614
-+#: ../src/generic/dirdlgg.cpp:116
-+#: ../src/generic/prntdlgg.cpp:614
- msgid "Options"
- msgstr "Mo�nosti"
-
- # generic/prntdlgg.cpp:443
- # generic/prntdlgg.cpp:638
--#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868
-+#: ../src/generic/prntdlgg.cpp:611
-+#: ../src/generic/prntdlgg.cpp:868
- msgid "Orientation"
- msgstr "Orientacija"
-
- # common/imagpcx.cpp:448
- # common/imagpcx.cpp:471
--#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485
-+#: ../src/common/imagpcx.cpp:462
-+#: ../src/common/imagpcx.cpp:485
- msgid "PCX: couldn't allocate memory"
- msgstr "PCX: spomina ni mogo�e alocirati."
-
-@@ -3715,7 +3792,8 @@
-
- # common/imagpcx.cpp:450
- # common/imagpcx.cpp:472
--#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486
-+#: ../src/common/imagpcx.cpp:464
-+#: ../src/common/imagpcx.cpp:486
- msgid "PCX: unknown error !!!"
- msgstr "PCX: neznana napaka!"
-
-@@ -3735,7 +3813,8 @@
- msgstr "PNM: datote�ni zapis ni prepoznan."
-
- # common/imagpnm.cpp:112
--#: ../src/common/imagpnm.cpp:108 ../src/common/imagpnm.cpp:125
-+#: ../src/common/imagpnm.cpp:108
-+#: ../src/common/imagpnm.cpp:125
- #: ../src/common/imagpnm.cpp:142
- msgid "PNM: File seems truncated."
- msgstr "PNM: datoteka se zdi okrnjena."
-@@ -3862,7 +3941,8 @@
- msgstr "Nastavitev strani"
-
- # generic/prntdlgg.cpp:604
--#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:540
-+#: ../src/common/prntbase.cpp:451
-+#: ../src/gtk/gnome/gprint.cpp:540
- msgid "Page setup"
- msgstr "Nastavitev strani"
-
-@@ -3874,7 +3954,8 @@
- # generic/prntdlgg.cpp:555
- # generic/prntdlgg.cpp:626
- # generic/prntdlgg.cpp:808
--#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854
-+#: ../src/generic/prntdlgg.cpp:800
-+#: ../src/generic/prntdlgg.cpp:854
- #: ../src/generic/prntdlgg.cpp:1056
- msgid "Paper Size"
- msgstr "Velikost papirja"
-@@ -3882,7 +3963,8 @@
- # generic/prntdlgg.cpp:433
- # generic/prntdlgg.cpp:615
- # generic/prntdlgg.cpp:804
--#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841
-+#: ../src/generic/prntdlgg.cpp:598
-+#: ../src/generic/prntdlgg.cpp:841
- #: ../src/generic/prntdlgg.cpp:1051
- msgid "Paper size"
- msgstr "Velikost papirja"
-@@ -3895,7 +3977,8 @@
- msgid "Passing a already registered object to SetObjectName"
- msgstr "Podajanje �e registriranega objekta k SetObjectName"
-
--#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
-+#: ../src/common/xtistrm.cpp:436
-+#: ../src/common/xtistrm.cpp:656
- msgid "Passing an unkown object to GetObject"
- msgstr "Podajanje neznanega objekta k GetObject"
-
-@@ -3926,8 +4009,7 @@
- # msw/dialup.cpp:768
- #: ../src/msw/dialup.cpp:787
- msgid "Please choose which ISP do you want to connect to"
--msgstr ""
--"Prosimo izberite ponudnika spletnih storitev, s katerim se �elite povezati."
-+msgstr "Prosimo izberite ponudnika spletnih storitev, s katerim se �elite povezati."
-
- #: ../src/msw/listctrl.cpp:444
- #, c-format
-@@ -3947,7 +4029,8 @@
- # generic/dcpsg.cpp:2261
- # generic/prntdlgg.cpp:440
- # generic/prntdlgg.cpp:636
--#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866
-+#: ../src/generic/prntdlgg.cpp:608
-+#: ../src/generic/prntdlgg.cpp:866
- msgid "Portrait"
- msgstr "Portet"
-
-@@ -3957,7 +4040,8 @@
- msgstr "PostScript datoteka"
-
- # html/helpfrm.cpp:903
--#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235
-+#: ../src/generic/fontdlgg.cpp:348
-+#: ../src/html/helpfrm.cpp:1235
- msgid "Preview:"
- msgstr "Predogled:"
-
-@@ -3968,8 +4052,10 @@
-
- # generic/prntdlgg.cpp:113
- # generic/prntdlgg.cpp:127
--#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138
--#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:395
-+#: ../src/common/prntbase.cpp:393
-+#: ../src/generic/prntdlgg.cpp:138
-+#: ../src/generic/prntdlgg.cpp:151
-+#: ../src/gtk/gnome/gprint.cpp:395
- #: ../src/gtk/gnome/gprint.cpp:407
- msgid "Print"
- msgstr "Tiskanje"
-@@ -3981,7 +4067,8 @@
-
- # common/prntbase.cpp:687
- # common/prntbase.cpp:711
--#: ../src/common/prntbase.cpp:1246 ../src/common/prntbase.cpp:1272
-+#: ../src/common/prntbase.cpp:1246
-+#: ../src/common/prntbase.cpp:1272
- msgid "Print Preview Failure"
- msgstr "Napaka pri predogledu tiskanja"
-
-@@ -4060,7 +4147,8 @@
-
- # common/prntbase.cpp:106
- # common/prntbase.cpp:148
--#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531
-+#: ../src/common/prntbase.cpp:310
-+#: ../src/common/prntbase.cpp:531
- msgid "Printing "
- msgstr "Tiskanje poteka"
-
-@@ -4082,11 +4170,8 @@
-
- #: ../src/common/debugrpt.cpp:546
- #, c-format
--msgid ""
--"Processing debug report has failed, leaving the files in \"%s\" directory."
--msgstr ""
--"Obdelava poro�ila o razhro��evanju ni uspela, datoteke so ostale v imeniku "
--"\"%s\"."
-+msgid "Processing debug report has failed, leaving the files in \"%s\" directory."
-+msgstr "Obdelava poro�ila o razhro��evanju ni uspela, datoteke so ostale v imeniku \"%s\"."
-
- # common/log.cpp:356
- #: ../src/common/log.cpp:466
-@@ -4105,7 +4190,8 @@
-
- # common/ffile.cpp:133
- # common/ffile.cpp:154
--#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144
-+#: ../src/common/ffile.cpp:125
-+#: ../src/common/ffile.cpp:144
- #, c-format
- msgid "Read error on file '%s'"
- msgstr "Napaka pri branju datoteke '%s'"
-@@ -4175,9 +4261,7 @@
- #: ../src/common/rendcmn.cpp:196
- #, c-format
- msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
--msgstr ""
--"Prikazovalnik \"%s\" je nezdru�ljive razli�ice %d.%d in ga ni mogo�e "
--"nalo�iti."
-+msgstr "Prikazovalnik \"%s\" je nezdru�ljive razli�ice %d.%d in ga ni mogo�e nalo�iti."
-
- # SOME DESCRIPTIVE TITLE.
- # Copyright (C) YEAR Free Software Foundation, Inc.
-@@ -4256,17 +4340,15 @@
- # generic/helpwxht.cpp:161
- # html/helpfrm.cpp:414
- # html/helpfrm.cpp:434
--#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551
-+#: ../src/html/helpfrm.cpp:536
-+#: ../src/html/helpfrm.cpp:551
- msgid "Search"
- msgstr "Iskanje"
-
- # html/helpfrm.cpp:416
- #: ../src/html/helpfrm.cpp:538
--msgid ""
--"Search contents of help book(s) for all occurences of the text you typed "
--"above"
--msgstr ""
--"Iskanje v knjigah s pomo�jo za vse pojavitve zgoraj natipkanega besedila"
-+msgid "Search contents of help book(s) for all occurences of the text you typed above"
-+msgstr "Iskanje v knjigah s pomo�jo za vse pojavitve zgoraj natipkanega besedila"
-
- # generic/dirdlgg.cpp:572
- #: ../src/generic/fdrepdlg.cpp:166
-@@ -4308,7 +4390,8 @@
-
- # common/docview.cpp:1371
- # common/docview.cpp:1422
--#: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068
-+#: ../src/mac/carbon/textctrl.cpp:1078
-+#: ../src/msw/textctrl.cpp:2068
- msgid "Select &All"
- msgstr "Izberi &vse"
-
-@@ -4351,8 +4434,7 @@
- # msw/dialup.cpp:539
- #: ../src/msw/dialup.cpp:567
- msgid "Several active dialup connections found, choosing one randomly."
--msgstr ""
--"Najdenih je ve� aktivnih klicnih povezav, izbrana bo naklju�na med njimi."
-+msgstr "Najdenih je ve� aktivnih klicnih povezav, izbrana bo naklju�na med njimi."
-
- # html/helpfrm.cpp:331
- #: ../src/html/helpfrm.cpp:493
-@@ -4365,7 +4447,8 @@
- msgstr "Poka�i vse predmete v indeksu"
-
- # generic/filedlgg.cpp:913
--#: ../src/generic/dirdlgg.cpp:112 ../src/generic/dirdlgg.cpp:175
-+#: ../src/generic/dirdlgg.cpp:112
-+#: ../src/generic/dirdlgg.cpp:175
- msgid "Show hidden directories"
- msgstr "Poka�i skrite imenike"
-
-@@ -4379,7 +4462,8 @@
- msgid "Show/hide navigation panel"
- msgstr "Poka�i/skrij navigacijski pano"
-
--#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355
-+#: ../src/generic/fontdlgg.cpp:353
-+#: ../src/generic/fontdlgg.cpp:355
- msgid "Shows the font preview."
- msgstr "Prika�e predogled pisave."
-
-@@ -4388,7 +4472,8 @@
- msgid "Size"
- msgstr "Velikost"
-
--#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
-+#: ../src/generic/progdlgg.cpp:222
-+#: ../src/generic/progdlgg.cpp:240
- #: ../src/generic/progdlgg.cpp:598
- msgid "Skip"
- msgstr "Presko�i"
-@@ -4406,7 +4491,8 @@
- # common/docview.cpp:342
- # common/docview.cpp:354
- # common/docview.cpp:1390
--#: ../src/common/docview.cpp:617 ../src/common/docview.cpp:1598
-+#: ../src/common/docview.cpp:617
-+#: ../src/common/docview.cpp:1598
- msgid "Sorry, could not open this file."
- msgstr "Oprostite, te datoteke ni mo� odpreti."
-
-@@ -4427,7 +4513,8 @@
- # common/docview.cpp:342
- # common/docview.cpp:354
- # common/docview.cpp:1390
--#: ../src/common/docview.cpp:1268 ../src/common/docview.cpp:1618
-+#: ../src/common/docview.cpp:1268
-+#: ../src/common/docview.cpp:1618
- msgid "Sorry, the format for this file is unknown."
- msgstr "Oprostite, ta zapis datoteke je neznan."
-
-@@ -4458,21 +4545,21 @@
- msgid "Streaming delegates for not already streamed objects not yet supported"
- msgstr "Preto�ni predstavniki za �e ne preto�ene predmete �e niso podprti."
-
--#: ../src/msw/colour.cpp:38 ../src/palmos/colour.cpp:38
-+#: ../src/msw/colour.cpp:38
-+#: ../src/palmos/colour.cpp:38
- #, c-format
- msgid "String To Colour : Incorrect colour specification : %s"
- msgstr "Niz v barvo: nepravilna specifikacija barve: %s"
-
--#: ../include/wx/xti.h:428 ../include/wx/xti.h:432
-+#: ../include/wx/xti.h:428
-+#: ../include/wx/xti.h:432
- msgid "String conversions not supported"
- msgstr "Pretvorbe nizov niso podprte"
-
- #: ../src/xrc/xmlres.cpp:750
- #, c-format
- msgid "Subclass '%s' not found for resource '%s', not subclassing!"
--msgstr ""
--"Podrazreda '%s' ni mo� najti za vir '%s', brez razdelitve na podrazrede "
--"(subclassing)!"
-+msgstr "Podrazreda '%s' ni mo� najti za vir '%s', brez razdelitve na podrazrede (subclassing)!"
-
- #: ../src/common/paper.cpp:157
- msgid "SuperA/SuperA/A4 227 x 356 mm"
-@@ -4498,7 +4585,8 @@
- # common/imagtiff.cpp:192
- # common/imagtiff.cpp:203
- # common/imagtiff.cpp:314
--#: ../src/common/imagtiff.cpp:248 ../src/common/imagtiff.cpp:259
-+#: ../src/common/imagtiff.cpp:248
-+#: ../src/common/imagtiff.cpp:259
- #: ../src/common/imagtiff.cpp:399
- msgid "TIFF: Couldn't allocate memory."
- msgstr "TIFF: spomina ni mogo�e alocirati."
-@@ -4601,24 +4689,29 @@
- "Datoteka '%s' ne obstaja in je ni mogo�e odpreti.\n"
- "Izbisana je bila iz seznama zadnjih uporabljenih datotek."
-
--#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318
-+#: ../src/generic/fontdlgg.cpp:316
-+#: ../src/generic/fontdlgg.cpp:318
- msgid "The font colour."
- msgstr "Barva pisave."
-
--#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279
-+#: ../src/generic/fontdlgg.cpp:277
-+#: ../src/generic/fontdlgg.cpp:279
- msgid "The font family."
- msgstr "Dru�ina pisave."
-
- # html/helpfrm.cpp:899
--#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
-+#: ../src/generic/fontdlgg.cpp:328
-+#: ../src/generic/fontdlgg.cpp:330
- msgid "The font point size."
- msgstr "Velikost pisave."
-
--#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290
-+#: ../src/generic/fontdlgg.cpp:288
-+#: ../src/generic/fontdlgg.cpp:290
- msgid "The font style."
- msgstr "Slog pisave."
-
--#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301
-+#: ../src/generic/fontdlgg.cpp:299
-+#: ../src/generic/fontdlgg.cpp:301
- msgid "The font weight."
- msgstr "Odebeljenost pisave."
-
-@@ -4629,12 +4722,10 @@
-
- #: ../src/generic/dbgrptg.cpp:308
- msgid ""
--"The report contains the files listed below. If any of these files contain "
--"private information,\n"
-+"The report contains the files listed below. If any of these files contain private information,\n"
- "please uncheck them and they will be removed from the report.\n"
- msgstr ""
--"Poro�ilo vsebuje datoteke, navedene spodaj. �e katere od teh datotek "
--"vsebujejo zasebne podatke,\n"
-+"Poro�ilo vsebuje datoteke, navedene spodaj. �e katere od teh datotek vsebujejo zasebne podatke,\n"
- "jih prosimo odzna�ite in odstranjene bodo iz poro�ila.\n"
-
- # common/cmdline.cpp:761
-@@ -4656,37 +4747,21 @@
-
- #: ../src/msw/dialup.cpp:455
- #, c-format
--msgid ""
--"The version of remote access service (RAS) installed on this machine is "
--"tooold, please upgrade (the following required function is missing: %s)."
--msgstr ""
--"Razli�ica storitve oddaljenega dostopa (RAS), name��ena na tem ra�unalniku, "
--"je zastarela, prosimo nadgradite jo (manjka naslednja zahtevana funkcija: %"
--"s)."
-+msgid "The version of remote access service (RAS) installed on this machine is tooold, please upgrade (the following required function is missing: %s)."
-+msgstr "Razli�ica storitve oddaljenega dostopa (RAS), name��ena na tem ra�unalniku, je zastarela, prosimo nadgradite jo (manjka naslednja zahtevana funkcija: %s)."
-
- #: ../src/html/htmprint.cpp:601
--msgid ""
--"There was a problem during page setup: you may need to set a default printer."
--msgstr ""
--"Med pripravo strani je pri�lo do te�ave: morda morate nastaviti privzeti "
--"tiskalnik."
-+msgid "There was a problem during page setup: you may need to set a default printer."
-+msgstr "Med pripravo strani je pri�lo do te�ave: morda morate nastaviti privzeti tiskalnik."
-
- #: ../src/msw/datectrl.cpp:109
--msgid ""
--"This system doesn't support date picker control, please upgrade your version "
--"of comctl32.dll"
--msgstr ""
--"Ta sistem ne podpira kontrolnika za izbor datuma, prosimo nadgradite svojo "
--"razli�ico comctl32.dll"
-+msgid "This system doesn't support date picker control, please upgrade your version of comctl32.dll"
-+msgstr "Ta sistem ne podpira kontrolnika za izbor datuma, prosimo nadgradite svojo razli�ico comctl32.dll"
-
- # msw/thread.cpp:1083
- #: ../src/msw/thread.cpp:1206
--msgid ""
--"Thread module initialization failed: can not store value in thread local "
--"storage"
--msgstr ""
--"Inicializacija modula niti ni uspela: vrednosti ni mogo�e shraniti v lokalni "
--"shrambi niti"
-+msgid "Thread module initialization failed: can not store value in thread local storage"
-+msgstr "Inicializacija modula niti ni uspela: vrednosti ni mogo�e shraniti v lokalni shrambi niti"
-
- #: ../src/unix/threadpsx.cpp:1603
- msgid "Thread module initialization failed: failed to create thread key"
-@@ -4694,12 +4769,8 @@
-
- # msw/thread.cpp:1071
- #: ../src/msw/thread.cpp:1194
--msgid ""
--"Thread module initialization failed: impossible to allocate index in thread "
--"local storage"
--msgstr ""
--"Inicializacija modula niti ni uspela: indeksa ni mogo�e alocirati v lokalni "
--"shrambi niti"
-+msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
-+msgstr "Inicializacija modula niti ni uspela: indeksa ni mogo�e alocirati v lokalni shrambi niti"
-
- #: ../src/unix/threadpsx.cpp:1108
- msgid "Thread priority setting is ignored."
-@@ -4717,11 +4788,10 @@
-
- #: ../src/common/ftp.cpp:635
- msgid "Timeout while waiting for FTP server to connect, try passive mode."
--msgstr ""
--"�asovna prekora�itev pri �akanju na stre�nik FTP za povezavo, poskusite "
--"pasiven na�in."
-+msgstr "�asovna prekora�itev pri �akanju na stre�nik FTP za povezavo, poskusite pasiven na�in."
-
--#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141
-+#: ../src/msw/timer.cpp:116
-+#: ../src/os2/timer.cpp:141
- msgid "Timer creation failed."
- msgstr "Ustvarjanje �asovnika (timer) ni uspelo."
-
-@@ -4753,11 +4823,11 @@
- #: ../src/common/fs_mem.cpp:205
- #, c-format
- msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
--msgstr ""
--"Poskus odstanitve datoteke '%s' iz spominskega VFS, vendar ni nalo�ena!"
-+msgstr "Poskus odstanitve datoteke '%s' iz spominskega VFS, vendar ni nalo�ena!"
-
- # common/sckaddr.cpp:107
--#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250
-+#: ../src/common/sckaddr.cpp:146
-+#: ../src/common/sckaddr.cpp:250
- msgid "Trying to solve a NULL hostname: giving up"
- msgstr "Poskus razre�evanja imena stre�nika NULL: opu��anje"
-
-@@ -4769,7 +4839,8 @@
- msgid "Type"
- msgstr "Vrsta"
-
--#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351
-+#: ../src/common/xtistrm.cpp:281
-+#: ../src/common/xtixml.cpp:351
- #: ../src/common/xtixml.cpp:498
- msgid "Type must have enum - long conversion"
- msgstr "Tip mora imeti pretvorbo enum - long"
-@@ -4878,7 +4949,8 @@
- msgstr "Nepoznana dolga opcija '%s'"
-
- # common/cmdline.cpp:518
--#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629
-+#: ../src/common/cmdline.cpp:608
-+#: ../src/common/cmdline.cpp:629
- #, c-format
- msgid "Unknown option '%s'"
- msgstr "Nepoznana opcija '%s'"
-@@ -4902,7 +4974,8 @@
- # common/docview.cpp:1923
- # common/docview.cpp:1938
- # common/docview.cpp:1965
--#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287
-+#: ../src/common/cmdproc.cpp:261
-+#: ../src/common/cmdproc.cpp:287
- #: ../src/common/cmdproc.cpp:307
- msgid "Unnamed command"
- msgstr "Neimenovan ukaz"
-@@ -4914,8 +4987,10 @@
-
- # msw/clipbrd.cpp:268
- # msw/clipbrd.cpp:369
--#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64
--#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445
-+#: ../src/mac/carbon/clipbrd.cpp:68
-+#: ../src/mac/classic/clipbrd.cpp:64
-+#: ../src/msw/clipbrd.cpp:273
-+#: ../src/msw/clipbrd.cpp:445
- msgid "Unsupported clipboard format."
- msgstr "Nepodprta oblika zapisa za odlo�i��e."
-
-@@ -4986,7 +5061,8 @@
- msgid "Western European with Euro (ISO-8859-15)"
- msgstr "zahodnoevropsko z Evrom (ISO-8859-15)"
-
--#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341
-+#: ../src/generic/fontdlgg.cpp:339
-+#: ../src/generic/fontdlgg.cpp:341
- msgid "Whether the font is underlined."
- msgstr "�e je pisava pod�rtana ali ne."
-
-@@ -5131,7 +5207,8 @@
- msgid "XPM: Malformed pixel data!"
- msgstr "XPM: napa�no oblikovani podatki to�k!"
-
--#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721
-+#: ../src/common/xpmdecod.cpp:712
-+#: ../src/common/xpmdecod.cpp:721
- #, c-format
- msgid "XPM: malformed colour definition '%s'!"
- msgstr "XPM: napa�no oblikovana definicija barve '%s'!"
-@@ -5141,7 +5218,8 @@
- msgid "XRC resource '%s' (class '%s') not found!"
- msgstr "Vira XRC '%s' (razred '%s') ni mo� najti!"
-
--#: ../src/xrc/xmlres.cpp:1080 ../src/xrc/xmlres.cpp:1092
-+#: ../src/xrc/xmlres.cpp:1080
-+#: ../src/xrc/xmlres.cpp:1092
- #, c-format
- msgid "XRC resource: Cannot create bitmap from '%s'."
- msgstr "XRC-vir: iz '%s' ni mogo�e ustvariti bitne slike."
-@@ -5153,8 +5231,10 @@
-
- # common/dlgcmn.cpp:109
- # common/dlgcmn.cpp:116
--#: ../src/mac/carbon/msgdlg.cpp:59 ../src/mac/carbon/msgdlg.cpp:142
--#: ../src/mac/classic/msgdlg.cpp:57 ../src/mac/classic/msgdlg.cpp:139
-+#: ../src/mac/carbon/msgdlg.cpp:59
-+#: ../src/mac/carbon/msgdlg.cpp:142
-+#: ../src/mac/classic/msgdlg.cpp:57
-+#: ../src/mac/classic/msgdlg.cpp:139
- #: ../src/motif/msgdlg.cpp:204
- msgid "Yes"
- msgstr "Da"
-@@ -5189,8 +5269,7 @@
- # msw/dde.cpp:985
- #: ../src/msw/dde.cpp:1048
- msgid ""
--"a DDEML function was called without first calling the DdeInitialize "
--"function,\n"
-+"a DDEML function was called without first calling the DdeInitialize function,\n"
- "or an invalid instance identifier\n"
- "was passed to a DDEML function."
- msgstr ""
-@@ -5380,11 +5459,11 @@
- #: ../src/common/file.cpp:457
- #, c-format
- msgid "can't determine if the end of file is reached on descriptor %d"
--msgstr ""
--"ni mogo�e ugotoviti, ali je bil konec datoteke na deskriptorju %d dose�en"
-+msgstr "ni mogo�e ugotoviti, ali je bil konec datoteke na deskriptorju %d dose�en"
-
- # common/ffile.cpp:182
--#: ../src/msdos/utilsdos.cpp:307 ../src/msdos/utilsdos.cpp:466
-+#: ../src/msdos/utilsdos.cpp:307
-+#: ../src/msdos/utilsdos.cpp:466
- #, c-format
- msgid "can't execute '%s'"
- msgstr "'%s' ni mogo�e izvesti"
-@@ -5407,8 +5486,7 @@
- # msw/utils.cpp:376
- #: ../src/msw/utils.cpp:380
- msgid "can't find user's HOME, using current directory."
--msgstr ""
--"uporabnikovega imenika HOME ni mogo�e najti, v uporabi je trenuten imenik."
-+msgstr "uporabnikovega imenika HOME ni mogo�e najti, v uporabi je trenuten imenik."
-
- # common/file.cpp:319
- #: ../src/common/file.cpp:341
-@@ -5417,7 +5495,8 @@
- msgstr "ni mogo�e izprazniti deskriptorja %d"
-
- # common/file.cpp:373
--#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202
-+#: ../src/common/file.cpp:399
-+#: ../src/msw/wince/filefnwce.cpp:202
- #, c-format
- msgid "can't get seek position on file descriptor %d"
- msgstr "ni mogo�e najti iskalne pozicije v datote�nem deskriptorju %d"
-@@ -5429,7 +5508,8 @@
-
- # common/ffile.cpp:85
- # common/file.cpp:243
--#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271
-+#: ../src/common/ffile.cpp:75
-+#: ../src/common/file.cpp:271
- #, c-format
- msgid "can't open file '%s'"
- msgstr "ni mogo�e odpreti datoteke '%s'"
-@@ -5453,8 +5533,7 @@
-
- #: ../src/common/dynlib.cpp:253
- msgid "can't query for GUI plugins name in console applications"
--msgstr ""
--"Povpra�evanje po imenu vti�nikov GUI v aplikacijah ukazne vrstice ni mo�no."
-+msgstr "Povpra�evanje po imenu vti�nikov GUI v aplikacijah ukazne vrstice ni mo�no."
-
- # html/helpfrm.cpp:1174
- #: ../src/common/zipstrm.cpp:436
-@@ -5495,7 +5574,8 @@
- msgstr "ni mogo�e odstraniti za�asne datoteke '%s'"
-
- # common/file.cpp:359
--#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189
-+#: ../src/common/file.cpp:385
-+#: ../src/msw/wince/filefnwce.cpp:189
- #, c-format
- msgid "can't seek on file descriptor %d"
- msgstr "ni mogo�e iskati na datote�nem deskriptorju %d"
-@@ -5553,7 +5633,8 @@
- msgid "decompression error"
- msgstr "napaka pri raz�irjanju"
-
--#: ../src/common/fmapbase.cpp:705 ../src/common/fmapbase.cpp:737
-+#: ../src/common/fmapbase.cpp:705
-+#: ../src/common/fmapbase.cpp:737
- msgid "default"
- msgstr "privzeto"
-
-@@ -5716,7 +5797,8 @@
- msgstr "neveljavna datoteka zip"
-
- # generic/fontdlgg.cpp:213
--#: ../src/common/fontcmn.cpp:586 ../src/common/fontcmn.cpp:650
-+#: ../src/common/fontcmn.cpp:586
-+#: ../src/common/fontcmn.cpp:650
- msgid "italic"
- msgstr "le�e�e"
-
-@@ -5893,7 +5975,8 @@
- msgid "thirteenth"
- msgstr "trinajsti"
-
--#: ../src/common/imagtiff.cpp:145 ../src/common/imagtiff.cpp:161
-+#: ../src/common/imagtiff.cpp:145
-+#: ../src/common/imagtiff.cpp:161
- #, c-format
- msgid "tiff module: %s"
- msgstr "modul tiff: %s"
-@@ -5942,7 +6025,8 @@
- msgstr "neznani razred %s"
-
- # generic/progdlgg.cpp:241
--#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
-+#: ../src/common/regex.cpp:163
-+#: ../src/html/chm.cpp:352
- msgid "unknown error"
- msgstr "neznana napaka"
-
-@@ -5958,7 +6042,8 @@
- msgstr "neznana oznaka za konec vrstice"
-
- # common/file.cpp:342
--#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170
-+#: ../src/common/file.cpp:367
-+#: ../src/msw/wince/filefnwce.cpp:170
- msgid "unknown seek origin"
- msgstr "nepoznana smer iskanja"
-
-@@ -5979,7 +6064,8 @@
- msgid "unnamed%d"
- msgstr "neimenovana%d"
-
--#: ../src/common/zipstrm.cpp:1660 ../src/common/zipstrm.cpp:2030
-+#: ../src/common/zipstrm.cpp:1660
-+#: ../src/common/zipstrm.cpp:2030
- msgid "unsupported Zip compression method"
- msgstr "nepodprta metoda stiskanja Zip"
-
-@@ -6013,13 +6099,16 @@
-
- # common/socket.cpp:347
- # common/socket.cpp:401
--#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469
--#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506
-+#: ../src/common/socket.cpp:415
-+#: ../src/common/socket.cpp:469
-+#: ../src/mac/carbon/cfsocket.cpp:452
-+#: ../src/mac/carbon/cfsocket.cpp:506
- msgid "wxSocket: invalid signature in ReadMsg."
- msgstr "wxSocket: nepravilen podpis v ReadMsg."
-
- # common/socket.cpp:921
--#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006
-+#: ../src/common/socket.cpp:966
-+#: ../src/mac/carbon/cfsocket.cpp:1006
- msgid "wxSocket: unknown event!."
- msgstr "wxSocket: neznan dogodek!"
-
-@@ -6039,7 +6128,8 @@
- msgstr "v�eraj"
-
- # common/log.cpp:242
--#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
-+#: ../src/common/zstream.cpp:165
-+#: ../src/common/zstream.cpp:315
- #, c-format
- msgid "zlib error %d"
- msgstr "napaka zlib %d"
-@@ -6047,3 +6137,4 @@
- #: ../src/common/prntbase.cpp:886
- msgid "|<<"
- msgstr "|<<"
-+
-diff -ur wxGTK-2.6.3/locale/sv.po wxGTK-2.6.3.2/locale/sv.po
---- wxGTK-2.6.3/locale/sv.po 2006-03-21 18:42:51.000000000 -0500
-+++ wxGTK-2.6.3.2/locale/sv.po 2005-09-24 17:15:02.000000000 -0400
-@@ -1,7 +1,7 @@
- msgid ""
- msgstr ""
- "Project-Id-Version: wxWidgets-2.6.2\n"
--"Report-Msgid-Bugs-To: \n"
-+"Report-Msgid-Bugs-To: wxWidgets development team <wx-dev@lists.wxwidgets.org>\n"
- "POT-Creation-Date: 2005-08-21 17:37+0200\n"
- "PO-Revision-Date: 2005-09-19 02:32+0100\n"
- "Last-Translator: Jonas Rydberg <jonas@arbor.se>\n"
-@@ -72,8 +72,10 @@
- msgid "#define %s must be an integer."
- msgstr "#define %s m�ste vara ett heltal."
-
--#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
--#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
-+#: ../src/html/helpfrm.cpp:1042
-+#: ../src/html/helpfrm.cpp:1044
-+#: ../src/html/helpfrm.cpp:1703
-+#: ../src/html/helpfrm.cpp:1736
- #, c-format
- msgid "%i of %i"
- msgstr "%i av %i"
-@@ -130,7 +132,8 @@
- msgid "%s: ill-formed resource file syntax."
- msgstr "%s: felformaterad resursfilsyntax."
-
--#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359
-+#: ../src/html/helpfrm.cpp:357
-+#: ../src/html/helpfrm.cpp:359
- msgid "&About..."
- msgstr "&Om..."
-
-@@ -154,8 +157,10 @@
- msgid "&Bold"
- msgstr "&Fet"
-
--#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363
--#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:422
-+#: ../src/common/stockitem.cpp:110
-+#: ../src/generic/fontdlgg.cpp:363
-+#: ../src/generic/fontdlgg.cpp:382
-+#: ../src/generic/wizard.cpp:422
- msgid "&Cancel"
- msgstr "&Avbryt"
-
-@@ -167,12 +172,15 @@
- msgid "&Clear"
- msgstr "&T�m"
-
--#: ../src/common/prntbase.cpp:875 ../src/common/stockitem.cpp:112
--#: ../src/generic/logg.cpp:509 ../src/html/helpfrm.cpp:354
-+#: ../src/common/prntbase.cpp:875
-+#: ../src/common/stockitem.cpp:112
-+#: ../src/generic/logg.cpp:509
-+#: ../src/html/helpfrm.cpp:354
- msgid "&Close"
- msgstr "&St�ng"
-
--#: ../src/common/stockitem.cpp:113 ../src/mac/carbon/textctrl.cpp:1074
-+#: ../src/common/stockitem.cpp:113
-+#: ../src/mac/carbon/textctrl.cpp:1074
- #: ../src/msw/textctrl.cpp:2064
- msgid "&Copy"
- msgstr "K&opiera"
-@@ -181,7 +189,8 @@
- msgid "&Debug report preview:"
- msgstr "&Debugrapport f�rhandsgranskning:"
-
--#: ../src/common/stockitem.cpp:115 ../src/mac/carbon/textctrl.cpp:1076
-+#: ../src/common/stockitem.cpp:115
-+#: ../src/mac/carbon/textctrl.cpp:1076
- #: ../src/msw/textctrl.cpp:2066
- msgid "&Delete"
- msgstr "&Ta bort"
-@@ -218,8 +227,10 @@
- msgid "&Goto..."
- msgstr "&G� till..."
-
--#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:418
--#: ../src/generic/wizard.cpp:425 ../src/html/helpfrm.cpp:362
-+#: ../src/common/stockitem.cpp:122
-+#: ../src/generic/wizard.cpp:418
-+#: ../src/generic/wizard.cpp:425
-+#: ../src/html/helpfrm.cpp:362
- msgid "&Help"
- msgstr "&Hj�lp"
-
-@@ -247,11 +258,13 @@
- msgid "&New"
- msgstr "&Ny"
-
--#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:188
-+#: ../src/generic/mdig.cpp:118
-+#: ../src/msw/mdi.cpp:188
- msgid "&Next"
- msgstr "&N�sta"
-
--#: ../src/generic/wizard.cpp:421 ../src/generic/wizard.cpp:636
-+#: ../src/generic/wizard.cpp:421
-+#: ../src/generic/wizard.cpp:636
- msgid "&Next >"
- msgstr "&N�sta >"
-
-@@ -267,7 +280,8 @@
- msgid "&Notes:"
- msgstr "&Anteckningar:"
-
--#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368
-+#: ../src/common/stockitem.cpp:133
-+#: ../src/generic/fontdlgg.cpp:368
- #: ../src/generic/fontdlgg.cpp:375
- msgid "&OK"
- msgstr "&OK"
-@@ -280,7 +294,8 @@
- msgid "&Open..."
- msgstr "&�ppna..."
-
--#: ../src/common/stockitem.cpp:135 ../src/mac/carbon/textctrl.cpp:1075
-+#: ../src/common/stockitem.cpp:135
-+#: ../src/mac/carbon/textctrl.cpp:1075
- #: ../src/msw/textctrl.cpp:2065
- msgid "&Paste"
- msgstr "K&listra in"
-@@ -293,7 +308,8 @@
- msgid "&Preferences"
- msgstr "&Inst�llningar"
-
--#: ../src/generic/mdig.cpp:119 ../src/msw/mdi.cpp:189
-+#: ../src/generic/mdig.cpp:119
-+#: ../src/msw/mdi.cpp:189
- msgid "&Previous"
- msgstr "&F�reg�ende"
-
-@@ -313,13 +329,16 @@
- msgid "&Quit"
- msgstr "&Avsluta"
-
--#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299
--#: ../src/common/stockitem.cpp:141 ../src/mac/carbon/textctrl.cpp:1071
-+#: ../src/common/cmdproc.cpp:292
-+#: ../src/common/cmdproc.cpp:299
-+#: ../src/common/stockitem.cpp:141
-+#: ../src/mac/carbon/textctrl.cpp:1071
- #: ../src/msw/textctrl.cpp:2061
- msgid "&Redo"
- msgstr "&Upprepa"
-
--#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308
-+#: ../src/common/cmdproc.cpp:288
-+#: ../src/common/cmdproc.cpp:308
- msgid "&Redo "
- msgstr "&Upprepa "
-
-@@ -355,12 +374,15 @@
- msgid "&Style:"
- msgstr "&Stil:"
-
--#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337
-+#: ../src/common/stockitem.cpp:149
-+#: ../src/generic/fontdlgg.cpp:337
- msgid "&Underline"
- msgstr "&Understrykning"
-
--#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150
--#: ../src/mac/carbon/textctrl.cpp:1070 ../src/msw/textctrl.cpp:2060
-+#: ../src/common/cmdproc.cpp:270
-+#: ../src/common/stockitem.cpp:150
-+#: ../src/mac/carbon/textctrl.cpp:1070
-+#: ../src/msw/textctrl.cpp:2060
- msgid "&Undo"
- msgstr "&�ngra"
-
-@@ -380,8 +402,11 @@
- msgid "&Weight:"
- msgstr "&Vikt:"
-
--#: ../src/generic/mdig.cpp:298 ../src/generic/mdig.cpp:314
--#: ../src/generic/mdig.cpp:318 ../src/msw/mdi.cpp:1410 ../src/msw/mdi.cpp:1417
-+#: ../src/generic/mdig.cpp:298
-+#: ../src/generic/mdig.cpp:314
-+#: ../src/generic/mdig.cpp:318
-+#: ../src/msw/mdi.cpp:1410
-+#: ../src/msw/mdi.cpp:1417
- #: ../src/msw/mdi.cpp:1447
- msgid "&Window"
- msgstr "&F�nster"
-@@ -390,12 +415,14 @@
- msgid "&Yes"
- msgstr "&Ja"
-
--#: ../src/common/config.cpp:433 ../src/msw/regconf.cpp:258
-+#: ../src/common/config.cpp:433
-+#: ../src/msw/regconf.cpp:258
- #, c-format
- msgid "'%s' has extra '..', ignored."
- msgstr "\"%s\" har extra \"..\", ignoreras."
-
--#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162
-+#: ../src/common/valtext.cpp:132
-+#: ../src/common/valtext.cpp:162
- #: ../src/common/valtext.cpp:168
- #, c-format
- msgid "'%s' is invalid"
-@@ -440,7 +467,8 @@
- msgid "(Help)"
- msgstr "(Hj�lp)"
-
--#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114
-+#: ../src/html/helpfrm.cpp:431
-+#: ../src/html/helpfrm.cpp:1114
- #: ../src/html/helpfrm.cpp:1764
- msgid "(bookmarks)"
- msgstr "(bokm�rken)"
-@@ -468,11 +496,13 @@
- ", f�rv�ntade static, #include eller #define\n"
- "n�r resursen tolkades."
-
--#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:740
-+#: ../src/generic/dirctrlg.cpp:683
-+#: ../src/generic/filedlgg.cpp:740
- msgid "."
- msgstr "."
-
--#: ../src/generic/dirctrlg.cpp:684 ../src/generic/filedlgg.cpp:741
-+#: ../src/generic/dirctrlg.cpp:684
-+#: ../src/generic/filedlgg.cpp:741
- msgid ".."
- msgstr ".."
-
-@@ -524,15 +554,18 @@
- msgid "<<"
- msgstr "<<"
-
--#: ../src/generic/filedlgg.cpp:259 ../src/generic/filedlgg.cpp:282
-+#: ../src/generic/filedlgg.cpp:259
-+#: ../src/generic/filedlgg.cpp:282
- msgid "<DIR>"
- msgstr "<KAT>"
-
--#: ../src/generic/filedlgg.cpp:263 ../src/generic/filedlgg.cpp:286
-+#: ../src/generic/filedlgg.cpp:263
-+#: ../src/generic/filedlgg.cpp:286
- msgid "<DRIVE>"
- msgstr "<ENHET>"
-
--#: ../src/generic/filedlgg.cpp:261 ../src/generic/filedlgg.cpp:284
-+#: ../src/generic/filedlgg.cpp:261
-+#: ../src/generic/filedlgg.cpp:284
- msgid "<LINK>"
- msgstr "<L�NK>"
-
-@@ -775,7 +808,8 @@
- msgid "B6 Envelope, 176 x 125 mm"
- msgstr "B6 kuvert, 176 x 125 mm"
-
--#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493
-+#: ../src/common/imagbmp.cpp:477
-+#: ../src/common/imagbmp.cpp:493
- msgid "BMP: Couldn't allocate memory."
- msgstr "BMP: Kunde inte allokera minne."
-
-@@ -856,7 +890,8 @@
- msgid "C65 Envelope, 114 x 229 mm"
- msgstr "C65 kuvert, 114 x 229 mm"
-
--#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856
-+#: ../src/html/chm.cpp:797
-+#: ../src/html/chm.cpp:856
- msgid "CHM handler currently supports only local files!"
- msgstr "CHM-hanteraren st�der f�r n�rvarande endast lokala filer!"
-
-@@ -869,7 +904,8 @@
- msgid "Can not enumerate files '%s'"
- msgstr "Kan inte r�kna upp filerna \"%s\""
-
--#: ../src/msw/dir.cpp:205 ../src/unix/dir.cpp:232
-+#: ../src/msw/dir.cpp:205
-+#: ../src/unix/dir.cpp:232
- #, c-format
- msgid "Can not enumerate files in directory '%s'"
- msgstr "Kan inte r�kna upp filerna i katalogen \"%s\""
-@@ -879,7 +915,8 @@
- msgid "Can not resume thread %lu"
- msgstr "Kan inte forts�tta tr�den %lu"
-
--#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:827
-+#: ../src/mac/classic/thread.cpp:491
-+#: ../src/msw/thread.cpp:827
- #, c-format
- msgid "Can not resume thread %x"
- msgstr "Kan inte forts�tta tr�den %x"
-@@ -893,7 +930,8 @@
- msgid "Can not suspend thread %lu"
- msgstr "Kan inte h�lla inne tr�d %lu"
-
--#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:812
-+#: ../src/mac/classic/thread.cpp:464
-+#: ../src/msw/thread.cpp:812
- #, c-format
- msgid "Can not suspend thread %x"
- msgstr "Kan inte h�lla inne tr�d %x"
-@@ -926,8 +964,10 @@
- msgid "Can't create registry key '%s'"
- msgstr "Kan inte skapa registernyckel \"%s\""
-
--#: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100
--#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594
-+#: ../src/mac/carbon/mpthread.cpp:911
-+#: ../src/mac/carbon/thread.cpp:1100
-+#: ../src/mac/classic/thread.cpp:439
-+#: ../src/msw/thread.cpp:594
- #: ../src/os2/thread.cpp:486
- msgid "Can't create thread"
- msgstr "Kan inte skapa tr�d"
-@@ -942,7 +982,8 @@
- msgid "Can't delete key '%s'"
- msgstr "Kan inte ta bort nyckel \"%s\""
-
--#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:458
-+#: ../src/msw/iniconf.cpp:444
-+#: ../src/os2/iniconf.cpp:458
- #, c-format
- msgid "Can't delete the INI file '%s'"
- msgstr "Kan inte ta bort INI-filen \"%s\""
-@@ -985,7 +1026,8 @@
- msgid "Can't initialize zlib inflate stream."
- msgstr "Kan inte initialisera zlib inflate-str�m."
-
--#: ../src/common/image.cpp:1367 ../src/common/image.cpp:1387
-+#: ../src/common/image.cpp:1367
-+#: ../src/common/image.cpp:1387
- #, c-format
- msgid "Can't load image from file '%s': file does not exist."
- msgstr "Kan inte ladda bild fr�n fil \"%s\": filen finns inte."
-@@ -1009,7 +1051,8 @@
- msgid "Can't read value of '%s'"
- msgstr "Kan inte l�sa v�rdet av \"%s\""
-
--#: ../src/msw/registry.cpp:795 ../src/msw/registry.cpp:825
-+#: ../src/msw/registry.cpp:795
-+#: ../src/msw/registry.cpp:825
- #: ../src/msw/registry.cpp:885
- #, c-format
- msgid "Can't read value of key '%s'"
-@@ -1020,15 +1063,18 @@
- msgid "Can't save image to file '%s': unknown extension."
- msgstr "Kan inte spara bild till fil \"%s\": ok�nd fil�ndelse."
-
--#: ../src/generic/logg.cpp:569 ../src/generic/logg.cpp:1020
-+#: ../src/generic/logg.cpp:569
-+#: ../src/generic/logg.cpp:1020
- msgid "Can't save log contents to file."
- msgstr "Kan inte spara logginneh�llet till fil."
-
--#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:469
-+#: ../src/msw/thread.cpp:550
-+#: ../src/os2/thread.cpp:469
- msgid "Can't set thread priority"
- msgstr "Kan inte s�tta tr�dprioritet"
-
--#: ../src/msw/registry.cpp:812 ../src/msw/registry.cpp:854
-+#: ../src/msw/registry.cpp:812
-+#: ../src/msw/registry.cpp:854
- #: ../src/msw/registry.cpp:975
- #, c-format
- msgid "Can't set value of '%s'"
-@@ -1039,14 +1085,18 @@
- msgid "Can't write to deflate stream: %s"
- msgstr "Kan inte skriva till deflate-str�m: %s"
-
--#: ../src/generic/choicdgg.cpp:291 ../src/generic/dirdlgg.cpp:114
--#: ../src/generic/numdlgg.cpp:136 ../src/generic/textdlgg.cpp:120
--#: ../src/gtk/fontdlg.cpp:155 ../src/motif/msgdlg.cpp:204
-+#: ../src/generic/choicdgg.cpp:291
-+#: ../src/generic/dirdlgg.cpp:114
-+#: ../src/generic/numdlgg.cpp:136
-+#: ../src/generic/textdlgg.cpp:120
-+#: ../src/gtk/fontdlg.cpp:155
-+#: ../src/motif/msgdlg.cpp:204
- #: ../contrib/src/deprecated/proplist.cpp:518
- msgid "Cancel"
- msgstr "Avbryt"
-
--#: ../src/xrc/xmlres.cpp:1188 ../src/xrc/xmlres.cpp:1236
-+#: ../src/xrc/xmlres.cpp:1188
-+#: ../src/xrc/xmlres.cpp:1236
- msgid "Cannot convert dialog units: dialog unknown."
- msgstr "Kan inte konvertera dialogenheter: ok�nd dialog."
-
-@@ -1166,7 +1216,8 @@
- msgid "Cannot print empty page."
- msgstr "Kan inte skriva ut tom sida."
-
--#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
-+#: ../src/msw/volume.cpp:160
-+#: ../src/msw/volume.cpp:491
- #, c-format
- msgid "Cannot read typename from '%s'!"
- msgstr "Kan inte l�sa typnamn fr�n \"%s\"!"
-@@ -1179,11 +1230,13 @@
- msgid "Cannot start thread: error writing TLS"
- msgstr "Kan inte starta tr�d: fel vid skrivning av TLS"
-
--#: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174
-+#: ../src/mac/carbon/mpthread.cpp:977
-+#: ../src/mac/carbon/thread.cpp:1174
- msgid "Cannot wait for thread termination."
- msgstr "Kan inte v�nta p� att tr�den avslutas."
-
--#: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082
-+#: ../src/mac/carbon/mpthread.cpp:893
-+#: ../src/mac/carbon/thread.cpp:1082
- msgid "Cant create the thread event queue"
- msgstr "Kan inte skapa tr�dens h�ndelsek�"
-
-@@ -1207,7 +1260,8 @@
- msgid "Choose ISP to dial"
- msgstr "V�lj Internetleverant�r att ringa upp"
-
--#: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45
-+#: ../src/generic/colrdlgg.cpp:151
-+#: ../src/gtk/colordlg.cpp:45
- #: ../src/palmos/colordlg.cpp:79
- msgid "Choose colour"
- msgstr "V�lj f�rg"
-@@ -1224,17 +1278,22 @@
- msgid "Clear the log contents"
- msgstr "T�m logginneh�llet"
-
--#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384
-+#: ../src/generic/fontdlgg.cpp:365
-+#: ../src/generic/fontdlgg.cpp:384
- msgid "Click to cancel the font selection."
- msgstr "Klicka f�r att avbryta typsnittsvalet."
-
--#: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372
--#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379
-+#: ../src/generic/fontdlgg.cpp:370
-+#: ../src/generic/fontdlgg.cpp:372
-+#: ../src/generic/fontdlgg.cpp:377
-+#: ../src/generic/fontdlgg.cpp:379
- msgid "Click to confirm the font selection."
- msgstr "Klicka f�r att bekr�fta typsnittsvalet."
-
--#: ../src/generic/dbgrptg.cpp:92 ../src/generic/progdlgg.cpp:629
--#: ../src/generic/progdlgg.cpp:634 ../contrib/src/deprecated/proplist.cpp:513
-+#: ../src/generic/dbgrptg.cpp:92
-+#: ../src/generic/progdlgg.cpp:629
-+#: ../src/generic/progdlgg.cpp:634
-+#: ../contrib/src/deprecated/proplist.cpp:513
- msgid "Close"
- msgstr "St�ng"
-
-@@ -1263,7 +1322,8 @@
- msgid "Config entry name cannot start with '%c'."
- msgstr "Konfigurationspost kan inte starta med \"%c\"."
-
--#: ../src/generic/filedlgg.cpp:1318 ../src/gtk/filedlg.cpp:67
-+#: ../src/generic/filedlgg.cpp:1318
-+#: ../src/gtk/filedlg.cpp:67
- msgid "Confirm"
- msgstr "Bekr�fta"
-
-@@ -1324,8 +1384,7 @@
- "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
- " or provide #define (see manual for caveats)"
- msgstr ""
--"Kunde inte sl� upp kontrollklass eller id '%s'. Anv�nd (ickenoll) heltal "
--"ist�llet\n"
-+"Kunde inte sl� upp kontrollklass eller id '%s'. Anv�nd (ickenoll) heltal ist�llet\n"
- "eller tillhandah�ll #define (se manualen f�r risker)"
-
- #: ../contrib/src/deprecated/resource.cpp:1278
-@@ -1341,7 +1400,8 @@
- msgid "Could not start document preview."
- msgstr "Kunde inte p�b�rja f�rhandsgranskning av dokumentet."
-
--#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:763
-+#: ../src/generic/printps.cpp:185
-+#: ../src/gtk/gnome/gprint.cpp:763
- #: ../src/msw/printwin.cpp:235
- msgid "Could not start printing."
- msgstr "Kunde inte p�b�rja utskrift."
-@@ -1350,8 +1410,10 @@
- msgid "Could not transfer data to window"
- msgstr "Kunde inte f�ra �ver data till f�nstret"
-
--#: ../src/mac/carbon/mpthread.cpp:227 ../src/mac/carbon/mpthread.cpp:306
--#: ../src/mac/carbon/thread.cpp:414 ../src/mac/carbon/thread.cpp:495
-+#: ../src/mac/carbon/mpthread.cpp:227
-+#: ../src/mac/carbon/mpthread.cpp:306
-+#: ../src/mac/carbon/thread.cpp:414
-+#: ../src/mac/carbon/thread.cpp:495
- msgid "Could not unlock mutex"
- msgstr "Kunde inte l�sa upp mutex"
-
-@@ -1359,17 +1421,21 @@
- msgid "Couldn't acquire a mutex lock"
- msgstr "Kunde inte f�rv�rva ett mutexl�s"
-
--#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
--#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176
-+#: ../src/msw/dragimag.cpp:166
-+#: ../src/msw/dragimag.cpp:206
-+#: ../src/msw/imaglist.cpp:158
-+#: ../src/msw/imaglist.cpp:176
- #: ../src/msw/imaglist.cpp:188
- msgid "Couldn't add an image to the image list."
- msgstr "Kunde inte l�gga till en bild till bildlistan."
-
--#: ../src/msw/timer.cpp:106 ../src/os2/timer.cpp:155
-+#: ../src/msw/timer.cpp:106
-+#: ../src/os2/timer.cpp:155
- msgid "Couldn't create a timer"
- msgstr "Kunde inte skapa en timer"
-
--#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166
-+#: ../src/mgl/cursor.cpp:135
-+#: ../src/mgl/cursor.cpp:166
- msgid "Couldn't create cursor."
- msgstr "Kunde inte skapa mark�r."
-
-@@ -1378,7 +1444,8 @@
- msgid "Couldn't find symbol '%s' in a dynamic library"
- msgstr "Kunde inte hitta symbolen \"%s\" i ett dynamiskt bibliotek"
-
--#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:853
-+#: ../src/mac/classic/thread.cpp:521
-+#: ../src/msw/thread.cpp:853
- msgid "Couldn't get the current thread pointer"
- msgstr "Kunde inte h�mta den aktuella tr�dpekaren"
-
-@@ -1410,12 +1477,14 @@
- msgid "Couldn't retrieve information about list control item %d."
- msgstr "Kunde inte h�mta information om listkontrollpost %d."
-
--#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651
-+#: ../src/common/imagpng.cpp:642
-+#: ../src/common/imagpng.cpp:651
- #: ../src/common/imagpng.cpp:659
- msgid "Couldn't save PNG image."
- msgstr "Kunde inte spara PNG-bild."
-
--#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611
-+#: ../src/mac/classic/thread.cpp:779
-+#: ../src/msw/thread.cpp:611
- msgid "Couldn't terminate thread"
- msgstr "Kunde inte avsluta tr�d"
-
-@@ -1427,11 +1496,13 @@
- msgid "Create directory"
- msgstr "Skapa katalog"
-
--#: ../src/generic/dirdlgg.cpp:140 ../src/generic/filedlgg.cpp:999
-+#: ../src/generic/dirdlgg.cpp:140
-+#: ../src/generic/filedlgg.cpp:999
- msgid "Create new directory"
- msgstr "Skapa ny katalog"
-
--#: ../src/common/stockitem.cpp:114 ../src/mac/carbon/textctrl.cpp:1073
-+#: ../src/common/stockitem.cpp:114
-+#: ../src/mac/carbon/textctrl.cpp:1073
- #: ../src/msw/textctrl.cpp:2063
- msgid "Cu&t"
- msgstr "&Klipp ut"
-@@ -1515,13 +1586,8 @@
- msgstr "Skrivbord"
-
- #: ../src/msw/dialup.cpp:395
--msgid ""
--"Dial up functions are unavailable because the remote access service (RAS) is "
--"not installed on this machine. Please install it."
--msgstr ""
--"Uppringningsfunktioner �r inte tillg�ngliga p� grund av att "
--"fj�rr�tkomstservice (RAS) inte �r installerad p� denna maskin. Var v�nlig "
--"och installera den."
-+msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."
-+msgstr "Uppringningsfunktioner �r inte tillg�ngliga p� grund av att fj�rr�tkomstservice (RAS) inte �r installerad p� denna maskin. Var v�nlig och installera den."
-
- #: ../src/generic/tipdlg.cpp:246
- msgid "Did you know..."
-@@ -1550,12 +1616,8 @@
- msgstr "Katalogen finns inte."
-
- #: ../src/html/helpfrm.cpp:503
--msgid ""
--"Display all index items that contain given substring. Search is case "
--"insensitive."
--msgstr ""
--"Visa alla indexposter som inneh�ller given delstr�ng. S�kningen �r "
--"skiftl�gesok�nslig."
-+msgid "Display all index items that contain given substring. Search is case insensitive."
-+msgstr "Visa alla indexposter som inneh�ller given delstr�ng. S�kningen �r skiftl�gesok�nslig."
-
- #: ../src/html/helpfrm.cpp:685
- msgid "Display options dialog"
-@@ -1563,8 +1625,7 @@
-
- #: ../src/msw/mimetype.cpp:671
- msgid ""
--"Do you want to overwrite the command used to %s files with extension \"%s"
--"\" ?\n"
-+"Do you want to overwrite the command used to %s files with extension \"%s\" ?\n"
- "Current value is \n"
- "%s, \n"
- "New value is \n"
-@@ -1585,7 +1646,8 @@
- msgid "Don't Save"
- msgstr "Spara inte"
-
--#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211
-+#: ../src/html/htmlwin.cpp:451
-+#: ../src/msw/frame.cpp:211
- msgid "Done"
- msgstr "F�rdigt"
-
-@@ -1638,21 +1700,26 @@
-
- #: ../src/common/config.cpp:384
- #, c-format
--msgid ""
--"Environment variables expansion failed: missing '%c' at position %u in '%s'."
--msgstr ""
--"Milj�variabelexpansion misslyckades: \"%c\" saknas p� position %u i \"%s\"."
-+msgid "Environment variables expansion failed: missing '%c' at position %u in '%s'."
-+msgstr "Milj�variabelexpansion misslyckades: \"%c\" saknas p� position %u i \"%s\"."
-
--#: ../src/generic/dirctrlg.cpp:689 ../src/generic/dirctrlg.cpp:707
--#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
--#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:744
--#: ../src/generic/filedlgg.cpp:758 ../src/generic/filedlgg.cpp:772
--#: ../src/generic/filedlgg.cpp:1269 ../src/generic/filedlgg.cpp:1295
--#: ../src/generic/filedlgg.cpp:1325 ../src/gtk/fontdlg.cpp:81
-+#: ../src/generic/dirctrlg.cpp:689
-+#: ../src/generic/dirctrlg.cpp:707
-+#: ../src/generic/dirctrlg.cpp:718
-+#: ../src/generic/dirdlgg.cpp:342
-+#: ../src/generic/filedlgg.cpp:632
-+#: ../src/generic/filedlgg.cpp:744
-+#: ../src/generic/filedlgg.cpp:758
-+#: ../src/generic/filedlgg.cpp:772
-+#: ../src/generic/filedlgg.cpp:1269
-+#: ../src/generic/filedlgg.cpp:1295
-+#: ../src/generic/filedlgg.cpp:1325
-+#: ../src/gtk/fontdlg.cpp:81
- msgid "Error"
- msgstr "Fel"
-
--#: ../src/msdos/utilsdos.cpp:213 ../src/unix/utilsunx.cpp:1090
-+#: ../src/msdos/utilsdos.cpp:213
-+#: ../src/unix/utilsunx.cpp:1090
- #: ../src/unix/utilsunx.cpp:1098
- msgid "Error "
- msgstr "Fel "
-@@ -1673,7 +1740,8 @@
- msgid "Error saving user configuration data."
- msgstr "Fel vid sparande av anv�ndarkonfigurationsdata."
-
--#: ../src/mac/carbon/mpthread.cpp:482 ../src/mac/carbon/thread.cpp:672
-+#: ../src/mac/carbon/mpthread.cpp:482
-+#: ../src/mac/carbon/thread.cpp:672
- msgid "Error while waiting on semaphore"
- msgstr "Fel vid v�ntande p� semafor"
-
-@@ -1727,11 +1795,8 @@
-
- #: ../src/msw/registry.cpp:1140
- #, c-format
--msgid ""
--"Exporting registry key: file \"%s\" already exists and won't be overwritten."
--msgstr ""
--"Exporterar registernyckel: filen \"%s\" finns redan och kommer inte att "
--"skrivas �ver."
-+msgid "Exporting registry key: file \"%s\" already exists and won't be overwritten."
-+msgstr "Exporterar registernyckel: filen \"%s\" finns redan och kommer inte att skrivas �ver."
-
- #: ../src/common/fmapbase.cpp:143
- msgid "Extended Unix Codepage for Japanese (EUC-JP)"
-@@ -1874,7 +1939,8 @@
- msgid "Failed to display HTML document in %s encoding"
- msgstr "Kunde inte visa HTML-dokument i %s-kodning"
-
--#: ../src/mac/carbon/clipbrd.cpp:194 ../src/mac/classic/clipbrd.cpp:185
-+#: ../src/mac/carbon/clipbrd.cpp:194
-+#: ../src/mac/classic/clipbrd.cpp:185
- #: ../src/msw/clipbrd.cpp:131
- msgid "Failed to empty the clipboard."
- msgstr "Kunde inte t�mma urklippsbordet."
-@@ -1892,7 +1958,8 @@
- msgid "Failed to establish dialup connection: %s"
- msgstr "Kunde inte etablera uppringningsanslutning: %s"
-
--#: ../src/unix/utilsunx.cpp:508 ../src/unix/utilsunx.cpp:524
-+#: ../src/unix/utilsunx.cpp:508
-+#: ../src/unix/utilsunx.cpp:524
- #, c-format
- msgid "Failed to execute '%s'\n"
- msgstr "Kunde inte utf�ra \"%s\"\n"
-@@ -1933,7 +2000,8 @@
- msgid "Failed to get ISP names: %s"
- msgstr "Kunde inte h�mta Internetleverant�rers namn: %s"
-
--#: ../src/mac/carbon/clipbrd.cpp:143 ../src/mac/classic/clipbrd.cpp:134
-+#: ../src/mac/carbon/clipbrd.cpp:143
-+#: ../src/mac/classic/clipbrd.cpp:134
- msgid "Failed to get clipboard data."
- msgstr "Kunde inte h�mta urklippsdata."
-
-@@ -1967,12 +2035,8 @@
- msgstr "Kunde inte inspektera l�sfilen \"%s\""
-
- #: ../src/unix/threadpsx.cpp:897
--msgid ""
--"Failed to join a thread, potential memory leak detected - please restart the "
--"program"
--msgstr ""
--"Kunde inte sl� ihop en tr�d, m�jlig minnesl�cka hittad - var v�nlig och "
--"starta om programmet"
-+msgid "Failed to join a thread, potential memory leak detected - please restart the program"
-+msgstr "Kunde inte sl� ihop en tr�d, m�jlig minnesl�cka hittad - var v�nlig och starta om programmet"
-
- #: ../src/msw/utils.cpp:703
- #, c-format
-@@ -2135,7 +2199,8 @@
- msgid "Failed to set temporary file permissions"
- msgstr "Kunde inte s�tta tempor�ra filbeh�righeter"
-
--#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256
-+#: ../src/unix/threadpsx.cpp:1245
-+#: ../src/unix/threadpsx.cpp:1256
- #, c-format
- msgid "Failed to set thread priority %d."
- msgstr "Kunde inte s�tta tr�dprioritet %d."
-@@ -2145,7 +2210,8 @@
- msgid "Failed to store image '%s' to memory VFS!"
- msgstr "Kunde inte spara bild \"%s\" till minnes-VFS!"
-
--#: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465
-+#: ../src/mac/carbon/mpthread.cpp:1273
-+#: ../src/mac/carbon/thread.cpp:1465
- #: ../src/unix/threadpsx.cpp:1429
- msgid "Failed to terminate a thread."
- msgstr "Kunde inte avsluta en tr�d."
-@@ -2205,7 +2271,8 @@
- msgid "File %s does not exist."
- msgstr "Filen %s finns inte."
-
--#: ../src/generic/filedlgg.cpp:1316 ../src/gtk/filedlg.cpp:64
-+#: ../src/generic/filedlgg.cpp:1316
-+#: ../src/gtk/filedlg.cpp:64
- #, c-format
- msgid "File '%s' already exists, do you really want to overwrite it?"
- msgstr "Filen \"%s\" finns redan, vill du verkligen skriva �ver den?"
-@@ -2223,11 +2290,13 @@
- msgid "File couldn't be loaded."
- msgstr "Filen kunde inte laddas."
-
--#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:1596
-+#: ../src/common/docview.cpp:571
-+#: ../src/common/docview.cpp:1596
- msgid "File error"
- msgstr "Filfel"
-
--#: ../src/generic/dirctrlg.cpp:707 ../src/generic/filedlgg.cpp:758
-+#: ../src/generic/dirctrlg.cpp:707
-+#: ../src/generic/filedlgg.cpp:758
- msgid "File name exists already."
- msgstr "Filnamnet finns redan."
-
-@@ -2347,7 +2416,8 @@
- msgid "Go one level up in document hierarchy"
- msgstr "G� upp en niv� i dokumenthierarki"
-
--#: ../src/generic/dirdlgg.cpp:145 ../src/generic/filedlgg.cpp:989
-+#: ../src/generic/dirdlgg.cpp:145
-+#: ../src/generic/filedlgg.cpp:989
- msgid "Go to home directory"
- msgstr "G� till hemkatalog"
-
-@@ -2363,7 +2433,8 @@
- msgid "Greek (ISO-8859-7)"
- msgstr "Grekiska (ISO-8859-7)"
-
--#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
-+#: ../src/common/zstream.cpp:72
-+#: ../src/common/zstream.cpp:209
- msgid "Gzip not supported by this version of zlib"
- msgstr "Gzip st�ds inte av den h�r versionen av zlib"
-
-@@ -2384,7 +2455,8 @@
- msgid "Hebrew (ISO-8859-8)"
- msgstr "Hebreiska (ISO-8859-8)"
-
--#: ../src/html/helpfrm.cpp:337 ../contrib/src/deprecated/proplist.cpp:523
-+#: ../src/html/helpfrm.cpp:337
-+#: ../contrib/src/deprecated/proplist.cpp:523
- msgid "Help"
- msgstr "Hj�lp"
-
-@@ -2392,7 +2464,8 @@
- msgid "Help Browser Options"
- msgstr "Hj�lpbl�ddraralternativ"
-
--#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443
-+#: ../src/generic/helpext.cpp:442
-+#: ../src/generic/helpext.cpp:443
- msgid "Help Index"
- msgstr "Hj�lpindex"
-
-@@ -2429,9 +2502,12 @@
- msgid "ICO: Error in reading mask DIB."
- msgstr "ICO: Fel vid l�sning av mask DIB."
-
--#: ../src/common/imagbmp.cpp:1048 ../src/common/imagbmp.cpp:1107
--#: ../src/common/imagbmp.cpp:1116 ../src/common/imagbmp.cpp:1127
--#: ../src/common/imagbmp.cpp:1171 ../src/common/imagbmp.cpp:1181
-+#: ../src/common/imagbmp.cpp:1048
-+#: ../src/common/imagbmp.cpp:1107
-+#: ../src/common/imagbmp.cpp:1116
-+#: ../src/common/imagbmp.cpp:1127
-+#: ../src/common/imagbmp.cpp:1171
-+#: ../src/common/imagbmp.cpp:1181
- #: ../src/common/imagbmp.cpp:1190
- msgid "ICO: Error writing the image file!"
- msgstr "ICO: Fel vid skrivning till bildfilen!"
-@@ -2480,8 +2556,7 @@
-
- #: ../src/generic/dbgrptg.cpp:310
- msgid ""
--"If you wish to suppress this debug report completely, please choose the "
--"\"Cancel\" button,\n"
-+"If you wish to suppress this debug report completely, please choose the \"Cancel\" button,\n"
- "but be warned that it may hinder improving the program, so if\n"
- "at all possible please do continue with the report generation.\n"
- msgstr ""
-@@ -2510,7 +2585,8 @@
- msgid "Illegal Parameter Count for Create Method"
- msgstr "Otill�tet antal parametrar f�r Create-metod"
-
--#: ../src/generic/dirctrlg.cpp:689 ../src/generic/filedlgg.cpp:744
-+#: ../src/generic/dirctrlg.cpp:689
-+#: ../src/generic/filedlgg.cpp:744
- msgid "Illegal directory name."
- msgstr "Ogiltigt katalognamn."
-
-@@ -2528,12 +2604,8 @@
- msgstr "Bildfilen �r inte av typen %d."
-
- #: ../src/msw/textctrl.cpp:361
--msgid ""
--"Impossible to create a rich edit control, using simple text control instead. "
--"Please reinstall riched32.dll"
--msgstr ""
--"Om�jligt att skapa en rich edit control, anv�nder enkel text control "
--"ist�llet. Installera om riched32.dll"
-+msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"
-+msgstr "Om�jligt att skapa en rich edit control, anv�nder enkel text control ist�llet. Installera om riched32.dll"
-
- #: ../src/unix/utilsunx.cpp:428
- msgid "Impossible to get child process input"
-@@ -2598,7 +2670,8 @@
- msgid "Invalid lock file '%s'."
- msgstr "Ogiltig l�sfil \"%s\"."
-
--#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380
-+#: ../src/common/xtistrm.cpp:365
-+#: ../src/common/xtistrm.cpp:380
- msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
- msgstr "Ogiltigt eller null objekt-id skickat till GetObjectClassInfo"
-
-@@ -2691,7 +2764,8 @@
- msgid "KOI8-U"
- msgstr "KOI8-U"
-
--#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867
-+#: ../src/generic/prntdlgg.cpp:609
-+#: ../src/generic/prntdlgg.cpp:867
- msgid "Landscape"
- msgstr "Liggande"
-
-@@ -2771,7 +2845,8 @@
- msgid "Log saved to the file '%s'."
- msgstr "Logg sparad till filen \"%s\"."
-
--#: ../include/wx/xti.h:501 ../include/wx/xti.h:505
-+#: ../include/wx/xti.h:501
-+#: ../include/wx/xti.h:505
- msgid "Long Conversions not supported"
- msgstr "Konvertering till long st�ds inte"
-
-@@ -2784,13 +2859,8 @@
- msgstr "MP-tr�dst�d �r inte tillg�ngligt p� det h�r systemet"
-
- #: ../src/msw/helpchm.cpp:60
--msgid ""
--"MS HTML Help functions are unavailable because the MS HTML Help library is "
--"not installed on this machine. Please install it."
--msgstr ""
--"MS HTML hj�lpfunktioner �r inte tillg�ngliga p� grund av att MS HTML "
--"hj�lpbiblioteket inte �r installerat p� den h�r maskinen. V�nligen "
--"installera det."
-+msgid "MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it."
-+msgstr "MS HTML hj�lpfunktioner �r inte tillg�ngliga p� grund av att MS HTML hj�lpbiblioteket inte �r installerat p� den h�r maskinen. V�nligen installera det."
-
- #: ../src/univ/themes/win32.cpp:4929
- msgid "Ma&ximize"
-@@ -2869,8 +2939,10 @@
- msgid "New item"
- msgstr "Nytt element"
-
--#: ../src/generic/dirdlgg.cpp:316 ../src/generic/dirdlgg.cpp:326
--#: ../src/generic/filedlgg.cpp:608 ../src/generic/filedlgg.cpp:617
-+#: ../src/generic/dirdlgg.cpp:316
-+#: ../src/generic/dirdlgg.cpp:326
-+#: ../src/generic/filedlgg.cpp:608
-+#: ../src/generic/filedlgg.cpp:617
- msgid "NewName"
- msgstr "Nytt namn"
-
-@@ -2882,8 +2954,10 @@
- msgid "Next page"
- msgstr "N�sta sida"
-
--#: ../src/mac/carbon/msgdlg.cpp:58 ../src/mac/carbon/msgdlg.cpp:143
--#: ../src/mac/classic/msgdlg.cpp:56 ../src/mac/classic/msgdlg.cpp:140
-+#: ../src/mac/carbon/msgdlg.cpp:58
-+#: ../src/mac/carbon/msgdlg.cpp:143
-+#: ../src/mac/classic/msgdlg.cpp:56
-+#: ../src/mac/classic/msgdlg.cpp:140
- #: ../src/motif/msgdlg.cpp:204
- msgid "No"
- msgstr "Nej"
-@@ -2906,8 +2980,7 @@
- msgid ""
- "No font for displaying text in encoding '%s' found,\n"
- "but an alternative encoding '%s' is available.\n"
--"Do you want to use this encoding (otherwise you will have to choose another "
--"one)?"
-+"Do you want to use this encoding (otherwise you will have to choose another one)?"
- msgstr ""
- "Inget typsnitt f�r att visa text med kodningen \"%s\" hittades,\n"
- "men en alternativ kodning \"%s\" �r tillg�nglig.\n"
-@@ -2929,17 +3002,20 @@
- msgid "No handler found for XML node '%s', class '%s'!"
- msgstr "Ingen hanterare hittades f�r XML-nod \"%s\", klass \"%s\"!"
-
--#: ../src/common/image.cpp:1505 ../src/common/image.cpp:1548
-+#: ../src/common/image.cpp:1505
-+#: ../src/common/image.cpp:1548
- msgid "No handler found for image type."
- msgstr "Ingen hanterare hittades f�r bildtyp."
-
--#: ../src/common/image.cpp:1513 ../src/common/image.cpp:1556
-+#: ../src/common/image.cpp:1513
-+#: ../src/common/image.cpp:1556
- #: ../src/common/image.cpp:1589
- #, c-format
- msgid "No image handler for type %d defined."
- msgstr "Ingen bildhanterare f�r typ %d �r definierad."
-
--#: ../src/common/image.cpp:1574 ../src/common/image.cpp:1604
-+#: ../src/common/image.cpp:1574
-+#: ../src/common/image.cpp:1604
- #, c-format
- msgid "No image handler for type %s defined."
- msgstr "Ingen bildhanterare f�r typ %s �r definierad."
-@@ -2952,7 +3028,8 @@
- msgid "No sound"
- msgstr "Inget ljud"
-
--#: ../src/common/image.cpp:1200 ../src/common/image.cpp:1239
-+#: ../src/common/image.cpp:1200
-+#: ../src/common/image.cpp:1239
- msgid "No unused colour in image being masked."
- msgstr "Ingen oanv�nd f�rg i bilden �r maskad."
-
-@@ -2964,7 +3041,8 @@
- msgid "Nordic (ISO-8859-10)"
- msgstr "Nordiska spr�k (ISO-8859-10)"
-
--#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235
-+#: ../src/generic/fontdlgg.cpp:232
-+#: ../src/generic/fontdlgg.cpp:235
- msgid "Normal"
- msgstr "Normal"
-
-@@ -2980,7 +3058,8 @@
- msgid "Note, 8 1/2 x 11 in"
- msgstr "Note, 8 1/2 x 11 tum"
-
--#: ../src/gtk/fontdlg.cpp:147 ../src/msw/dialog.cpp:194
-+#: ../src/gtk/fontdlg.cpp:147
-+#: ../src/msw/dialog.cpp:194
- #: ../contrib/src/deprecated/proplist.cpp:506
- msgid "OK"
- msgstr "OK"
-@@ -2989,11 +3068,13 @@
- msgid "Objects must have an id attribute"
- msgstr "Objekt m�ste ha ett id-attribut"
-
--#: ../src/common/docview.cpp:1269 ../src/common/docview.cpp:1619
-+#: ../src/common/docview.cpp:1269
-+#: ../src/common/docview.cpp:1619
- msgid "Open File"
- msgstr "�ppna fil"
-
--#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579
-+#: ../src/html/helpfrm.cpp:673
-+#: ../src/html/helpfrm.cpp:1579
- msgid "Open HTML document"
- msgstr "�ppna HTML-dokument"
-
-@@ -3002,8 +3083,10 @@
- msgid "Open file \"%s\""
- msgstr "�ppna fil \"%s\""
-
--#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
--#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:772
-+#: ../src/generic/dirctrlg.cpp:718
-+#: ../src/generic/dirdlgg.cpp:342
-+#: ../src/generic/filedlgg.cpp:632
-+#: ../src/generic/filedlgg.cpp:772
- msgid "Operation not permitted."
- msgstr "Operation ej till�ten."
-
-@@ -3022,15 +3105,18 @@
- msgid "Option '%s': '%s' cannot be converted to a date."
- msgstr "Flagga \"%s\": \"%s\" kan inte konverteras till ett datum."
-
--#: ../src/generic/dirdlgg.cpp:116 ../src/generic/prntdlgg.cpp:614
-+#: ../src/generic/dirdlgg.cpp:116
-+#: ../src/generic/prntdlgg.cpp:614
- msgid "Options"
- msgstr "Alternativ"
-
--#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868
-+#: ../src/generic/prntdlgg.cpp:611
-+#: ../src/generic/prntdlgg.cpp:868
- msgid "Orientation"
- msgstr "Orientering"
-
--#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485
-+#: ../src/common/imagpcx.cpp:462
-+#: ../src/common/imagpcx.cpp:485
- msgid "PCX: couldn't allocate memory"
- msgstr "PCX: Kunde inte allokera minne"
-
-@@ -3046,7 +3132,8 @@
- msgid "PCX: this is not a PCX file."
- msgstr "PCX: Detta �r inte en PCX fil."
-
--#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486
-+#: ../src/common/imagpcx.cpp:464
-+#: ../src/common/imagpcx.cpp:486
- msgid "PCX: unknown error !!!"
- msgstr "PCX: Ok�nt fel !!!"
-
-@@ -3062,7 +3149,8 @@
- msgid "PNM: File format is not recognized."
- msgstr "PNM: Filformat �r ok�nt."
-
--#: ../src/common/imagpnm.cpp:108 ../src/common/imagpnm.cpp:125
-+#: ../src/common/imagpnm.cpp:108
-+#: ../src/common/imagpnm.cpp:125
- #: ../src/common/imagpnm.cpp:142
- msgid "PNM: File seems truncated."
- msgstr "PNM: Filen tycks vara trunkerad."
-@@ -3185,7 +3273,8 @@
- msgid "Page Setup"
- msgstr "Sidinst�llningar"
-
--#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:540
-+#: ../src/common/prntbase.cpp:451
-+#: ../src/gtk/gnome/gprint.cpp:540
- msgid "Page setup"
- msgstr "Sidinst�llning"
-
-@@ -3193,12 +3282,14 @@
- msgid "Pages"
- msgstr "Sidor"
-
--#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854
-+#: ../src/generic/prntdlgg.cpp:800
-+#: ../src/generic/prntdlgg.cpp:854
- #: ../src/generic/prntdlgg.cpp:1056
- msgid "Paper Size"
- msgstr "Pappersstorlek"
-
--#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841
-+#: ../src/generic/prntdlgg.cpp:598
-+#: ../src/generic/prntdlgg.cpp:841
- #: ../src/generic/prntdlgg.cpp:1051
- msgid "Paper size"
- msgstr "Pappersstorlek"
-@@ -3211,7 +3302,8 @@
- msgid "Passing a already registered object to SetObjectName"
- msgstr "Skickade ett redan registrerat objekt till SetObjectName"
-
--#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
-+#: ../src/common/xtistrm.cpp:436
-+#: ../src/common/xtistrm.cpp:656
- msgid "Passing an unkown object to GetObject"
- msgstr "Skickade ett ok�nt objekt till GetObject"
-
-@@ -3254,7 +3346,8 @@
- msgid "Please wait while printing\n"
- msgstr "V�nta p� utskrift\n"
-
--#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866
-+#: ../src/generic/prntdlgg.cpp:608
-+#: ../src/generic/prntdlgg.cpp:866
- msgid "Portrait"
- msgstr "St�ende"
-
-@@ -3262,7 +3355,8 @@
- msgid "PostScript file"
- msgstr "PostScript-fil"
-
--#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235
-+#: ../src/generic/fontdlgg.cpp:348
-+#: ../src/html/helpfrm.cpp:1235
- msgid "Preview:"
- msgstr "F�rhandsgranska:"
-
-@@ -3270,8 +3364,10 @@
- msgid "Previous page"
- msgstr "F�reg�ende sida"
-
--#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138
--#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:395
-+#: ../src/common/prntbase.cpp:393
-+#: ../src/generic/prntdlgg.cpp:138
-+#: ../src/generic/prntdlgg.cpp:151
-+#: ../src/gtk/gnome/gprint.cpp:395
- #: ../src/gtk/gnome/gprint.cpp:407
- msgid "Print"
- msgstr "Skriv ut"
-@@ -3280,7 +3376,8 @@
- msgid "Print Preview"
- msgstr "F�rhandsgranska"
-
--#: ../src/common/prntbase.cpp:1246 ../src/common/prntbase.cpp:1272
-+#: ../src/common/prntbase.cpp:1246
-+#: ../src/common/prntbase.cpp:1272
- msgid "Print Preview Failure"
- msgstr "F�rhandsgranskning misslyckades"
-
-@@ -3340,7 +3437,8 @@
- msgid "Printer:"
- msgstr "Skrivare:"
-
--#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531
-+#: ../src/common/prntbase.cpp:310
-+#: ../src/common/prntbase.cpp:531
- msgid "Printing "
- msgstr "Skriver ut "
-
-@@ -3359,11 +3457,8 @@
-
- #: ../src/common/debugrpt.cpp:546
- #, c-format
--msgid ""
--"Processing debug report has failed, leaving the files in \"%s\" directory."
--msgstr ""
--"Behandling av debugrapport har misslyckats, l�mnar filerna i katalogen \"%s"
--"\"."
-+msgid "Processing debug report has failed, leaving the files in \"%s\" directory."
-+msgstr "Behandling av debugrapport har misslyckats, l�mnar filerna i katalogen \"%s\"."
-
- #: ../src/common/log.cpp:466
- msgid "Program aborted."
-@@ -3377,7 +3472,8 @@
- msgid "Question"
- msgstr "Fr�ga"
-
--#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144
-+#: ../src/common/ffile.cpp:125
-+#: ../src/common/ffile.cpp:144
- #, c-format
- msgid "Read error on file '%s'"
- msgstr "L�sfel p� fil \"%s\""
-@@ -3440,8 +3536,7 @@
- #: ../src/common/rendcmn.cpp:196
- #, c-format
- msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
--msgstr ""
--"Rendrerare \"%s\" har inkompatibel version %d.%d och kunde inte laddas."
-+msgstr "Rendrerare \"%s\" har inkompatibel version %d.%d och kunde inte laddas."
-
- #: ../src/common/stockitem.cpp:117
- msgid "Rep&lace"
-@@ -3496,17 +3591,14 @@
- msgid "Script"
- msgstr "Skrivstil"
-
--#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551
-+#: ../src/html/helpfrm.cpp:536
-+#: ../src/html/helpfrm.cpp:551
- msgid "Search"
- msgstr "S�k"
-
- #: ../src/html/helpfrm.cpp:538
--msgid ""
--"Search contents of help book(s) for all occurences of the text you typed "
--"above"
--msgstr ""
--"S�k i hj�lpboken/b�ckernas inneh�ll efter alla f�rekomster av texten du "
--"skrev in ovan"
-+msgid "Search contents of help book(s) for all occurences of the text you typed above"
-+msgstr "S�k i hj�lpboken/b�ckernas inneh�ll efter alla f�rekomster av texten du skrev in ovan"
-
- #: ../src/generic/fdrepdlg.cpp:166
- msgid "Search direction"
-@@ -3538,7 +3630,8 @@
- msgid "Seek error on file '%s' (large files not supported by stdio)"
- msgstr "S�kfel p� fil \"%s\" (stora filer st�ds inte av stdio)"
-
--#: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068
-+#: ../src/mac/carbon/textctrl.cpp:1078
-+#: ../src/msw/textctrl.cpp:2068
- msgid "Select &All"
- msgstr "Markera &allt"
-
-@@ -3583,7 +3676,8 @@
- msgid "Show all items in index"
- msgstr "Visa alla poster i index"
-
--#: ../src/generic/dirdlgg.cpp:112 ../src/generic/dirdlgg.cpp:175
-+#: ../src/generic/dirdlgg.cpp:112
-+#: ../src/generic/dirdlgg.cpp:175
- msgid "Show hidden directories"
- msgstr "Visa dolda kataloger"
-
-@@ -3595,7 +3689,8 @@
- msgid "Show/hide navigation panel"
- msgstr "Visa/d�lj navigeringspanel"
-
--#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355
-+#: ../src/generic/fontdlgg.cpp:353
-+#: ../src/generic/fontdlgg.cpp:355
- msgid "Shows the font preview."
- msgstr "Visar typsnittsgranskningen."
-
-@@ -3603,7 +3698,8 @@
- msgid "Size"
- msgstr "Storlek"
-
--#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
-+#: ../src/generic/progdlgg.cpp:222
-+#: ../src/generic/progdlgg.cpp:240
- #: ../src/generic/progdlgg.cpp:598
- msgid "Skip"
- msgstr "Hoppa �ver"
-@@ -3616,7 +3712,8 @@
- msgid "Sorry, could not open this file for saving."
- msgstr "Kunde inte �ppna denna fil f�r att spara."
-
--#: ../src/common/docview.cpp:617 ../src/common/docview.cpp:1598
-+#: ../src/common/docview.cpp:617
-+#: ../src/common/docview.cpp:1598
- msgid "Sorry, could not open this file."
- msgstr "Kunde inte �ppna denna fil."
-
-@@ -3632,7 +3729,8 @@
- msgid "Sorry, print preview needs a printer to be installed."
- msgstr "F�rhandsgranskning kr�ver en installerad skrivare."
-
--#: ../src/common/docview.cpp:1268 ../src/common/docview.cpp:1618
-+#: ../src/common/docview.cpp:1268
-+#: ../src/common/docview.cpp:1618
- msgid "Sorry, the format for this file is unknown."
- msgstr "Filformatet f�r denna fil �r ok�nt."
-
-@@ -3661,12 +3759,14 @@
- msgid "Streaming delegates for not already streamed objects not yet supported"
- msgstr "Str�mmande delegater f�r icke str�mmande objekt st�ds inte �nnu"
-
--#: ../src/msw/colour.cpp:38 ../src/palmos/colour.cpp:38
-+#: ../src/msw/colour.cpp:38
-+#: ../src/palmos/colour.cpp:38
- #, c-format
- msgid "String To Colour : Incorrect colour specification : %s"
- msgstr "Str�ng till f�rg: Felaktig f�rgspecifikation: %s"
-
--#: ../include/wx/xti.h:428 ../include/wx/xti.h:432
-+#: ../include/wx/xti.h:428
-+#: ../include/wx/xti.h:432
- msgid "String conversions not supported"
- msgstr "Str�ngomvandlingar st�ds inte"
-
-@@ -3695,7 +3795,8 @@
- msgid "TIFF library warning."
- msgstr "TIFF-bibliotek varning."
-
--#: ../src/common/imagtiff.cpp:248 ../src/common/imagtiff.cpp:259
-+#: ../src/common/imagtiff.cpp:248
-+#: ../src/common/imagtiff.cpp:259
- #: ../src/common/imagtiff.cpp:399
- msgid "TIFF: Couldn't allocate memory."
- msgstr "TIFF: Kunde inte allokera minne."
-@@ -3787,23 +3888,28 @@
- "Filen \"%s\" finns inte och kunde inte �ppnas.\n"
- "Den har tagits bort fr�n senast anv�nda filer-listan."
-
--#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318
-+#: ../src/generic/fontdlgg.cpp:316
-+#: ../src/generic/fontdlgg.cpp:318
- msgid "The font colour."
- msgstr "Typsnittets f�rg."
-
--#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279
-+#: ../src/generic/fontdlgg.cpp:277
-+#: ../src/generic/fontdlgg.cpp:279
- msgid "The font family."
- msgstr "Typsnittets familj."
-
--#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
-+#: ../src/generic/fontdlgg.cpp:328
-+#: ../src/generic/fontdlgg.cpp:330
- msgid "The font point size."
- msgstr "Typsnittsstorlek"
-
--#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290
-+#: ../src/generic/fontdlgg.cpp:288
-+#: ../src/generic/fontdlgg.cpp:290
- msgid "The font style."
- msgstr "Typsnittets stil."
-
--#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301
-+#: ../src/generic/fontdlgg.cpp:299
-+#: ../src/generic/fontdlgg.cpp:301
- msgid "The font weight."
- msgstr "Typsnittets vikt."
-
-@@ -3814,8 +3920,7 @@
-
- #: ../src/generic/dbgrptg.cpp:308
- msgid ""
--"The report contains the files listed below. If any of these files contain "
--"private information,\n"
-+"The report contains the files listed below. If any of these files contain private information,\n"
- "please uncheck them and they will be removed from the report.\n"
- msgstr ""
- "Rapporten inneh�ller filerna nedan. Om n�gon av filerna inneh�ller\n"
-@@ -3837,47 +3942,28 @@
-
- #: ../src/msw/dialup.cpp:455
- #, c-format
--msgid ""
--"The version of remote access service (RAS) installed on this machine is "
--"tooold, please upgrade (the following required function is missing: %s)."
--msgstr ""
--"Versionen av fj�rr�tkomsttj�nsten (RAS) som �r installerad p� denna maskin "
--"�r f�r gammal, uppgradera (f�ljande n�dv�ndig funktion saknas: %s)."
-+msgid "The version of remote access service (RAS) installed on this machine is tooold, please upgrade (the following required function is missing: %s)."
-+msgstr "Versionen av fj�rr�tkomsttj�nsten (RAS) som �r installerad p� denna maskin �r f�r gammal, uppgradera (f�ljande n�dv�ndig funktion saknas: %s)."
-
- #: ../src/html/htmprint.cpp:601
--msgid ""
--"There was a problem during page setup: you may need to set a default printer."
--msgstr ""
--"Det var problem n�r sidan st�lldes in: Du m�ste kanske ange en "
--"standardskrivare."
-+msgid "There was a problem during page setup: you may need to set a default printer."
-+msgstr "Det var problem n�r sidan st�lldes in: Du m�ste kanske ange en standardskrivare."
-
- #: ../src/msw/datectrl.cpp:109
--msgid ""
--"This system doesn't support date picker control, please upgrade your version "
--"of comctl32.dll"
--msgstr ""
--"Detta system st�der inte datumv�ljningskontrollen, uppgradera din version av "
--"comctl32.dll"
-+msgid "This system doesn't support date picker control, please upgrade your version of comctl32.dll"
-+msgstr "Detta system st�der inte datumv�ljningskontrollen, uppgradera din version av comctl32.dll"
-
- #: ../src/msw/thread.cpp:1206
--msgid ""
--"Thread module initialization failed: can not store value in thread local "
--"storage"
--msgstr ""
--"Tr�dmodulinitialisering misslyckades: Kan inte spara v�rde i tr�dens lokala "
--"lagring"
-+msgid "Thread module initialization failed: can not store value in thread local storage"
-+msgstr "Tr�dmodulinitialisering misslyckades: Kan inte spara v�rde i tr�dens lokala lagring"
-
- #: ../src/unix/threadpsx.cpp:1603
- msgid "Thread module initialization failed: failed to create thread key"
- msgstr "Tr�dmodulinitialisering misslyckades: Kunde inte skapa tr�dnyckel"
-
- #: ../src/msw/thread.cpp:1194
--msgid ""
--"Thread module initialization failed: impossible to allocate index in thread "
--"local storage"
--msgstr ""
--"Tr�dmodulinitialisering misslyckades: Om�jligt att allokera index i tr�dens "
--"lokala lagring"
-+msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
-+msgstr "Tr�dmodulinitialisering misslyckades: Om�jligt att allokera index i tr�dens lokala lagring"
-
- #: ../src/unix/threadpsx.cpp:1108
- msgid "Thread priority setting is ignored."
-@@ -3893,11 +3979,10 @@
-
- #: ../src/common/ftp.cpp:635
- msgid "Timeout while waiting for FTP server to connect, try passive mode."
--msgstr ""
--"Tiden f�r att v�nta p� att FTP-server skall ansluta har g�tt ut, f�rs�k med "
--"passivt l�ge."
-+msgstr "Tiden f�r att v�nta p� att FTP-server skall ansluta har g�tt ut, f�rs�k med passivt l�ge."
-
--#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141
-+#: ../src/msw/timer.cpp:116
-+#: ../src/os2/timer.cpp:141
- msgid "Timer creation failed."
- msgstr "Kunde inte skapa timer."
-
-@@ -3926,7 +4011,8 @@
- msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
- msgstr "F�rs�ker ta bort fil \"%s\" fr�n minnes-VFS, men den �r inte laddad!"
-
--#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250
-+#: ../src/common/sckaddr.cpp:146
-+#: ../src/common/sckaddr.cpp:250
- msgid "Trying to solve a NULL hostname: giving up"
- msgstr "F�rs�ker sl� upp ett NULL v�rdnamn: ger upp"
-
-@@ -3938,7 +4024,8 @@
- msgid "Type"
- msgstr "Typ"
-
--#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351
-+#: ../src/common/xtistrm.cpp:281
-+#: ../src/common/xtixml.cpp:351
- #: ../src/common/xtixml.cpp:498
- msgid "Type must have enum - long conversion"
- msgstr "Typen m�ste ha enum - long omvandling"
-@@ -4040,7 +4127,8 @@
- msgid "Unknown long option '%s'"
- msgstr "Ok�nd l�ng flagga \"%s\""
-
--#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629
-+#: ../src/common/cmdline.cpp:608
-+#: ../src/common/cmdline.cpp:629
- #, c-format
- msgid "Unknown option '%s'"
- msgstr "Ok�nd flagga \"%s\""
-@@ -4059,7 +4147,8 @@
- msgid "Unmatched '{' in an entry for mime type %s."
- msgstr "Omatchad \"{\" i en post f�r mime-typ %s."
-
--#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287
-+#: ../src/common/cmdproc.cpp:261
-+#: ../src/common/cmdproc.cpp:287
- #: ../src/common/cmdproc.cpp:307
- msgid "Unnamed command"
- msgstr "Namnl�st kommando"
-@@ -4069,8 +4158,10 @@
- msgid "Unrecognized style %s while parsing resource."
- msgstr "Ov�ntad stil %s n�r resursen tolkades."
-
--#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64
--#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445
-+#: ../src/mac/carbon/clipbrd.cpp:68
-+#: ../src/mac/classic/clipbrd.cpp:64
-+#: ../src/msw/clipbrd.cpp:273
-+#: ../src/msw/clipbrd.cpp:445
- msgid "Unsupported clipboard format."
- msgstr "Urklippsformatet st�ds inte."
-
-@@ -4132,7 +4223,8 @@
- msgid "Western European with Euro (ISO-8859-15)"
- msgstr "V�sterl�ndsk med Euro (ISO-8859-15)"
-
--#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341
-+#: ../src/generic/fontdlgg.cpp:339
-+#: ../src/generic/fontdlgg.cpp:341
- msgid "Whether the font is underlined."
- msgstr "Om typsnittet �r understruket."
-
-@@ -4267,7 +4359,8 @@
- msgid "XPM: Malformed pixel data!"
- msgstr "XPM: Felaktigt pixeldata!"
-
--#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721
-+#: ../src/common/xpmdecod.cpp:712
-+#: ../src/common/xpmdecod.cpp:721
- #, c-format
- msgid "XPM: malformed colour definition '%s'!"
- msgstr "XPM: Felaktig f�rgdefinition \"%s\"!"
-@@ -4277,7 +4370,8 @@
- msgid "XRC resource '%s' (class '%s') not found!"
- msgstr "XRC-resurs \"%s\" (klass \"%s\") hittades inte!"
-
--#: ../src/xrc/xmlres.cpp:1080 ../src/xrc/xmlres.cpp:1092
-+#: ../src/xrc/xmlres.cpp:1080
-+#: ../src/xrc/xmlres.cpp:1092
- #, c-format
- msgid "XRC resource: Cannot create bitmap from '%s'."
- msgstr "XRC-resurs: Kan inte skapa bild fr�n \"%s\"."
-@@ -4287,8 +4381,10 @@
- msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
- msgstr "XRC-resurs: Felaktig f�rgspecifikation \"%s\" f�r egenskap \"%s\"."
-
--#: ../src/mac/carbon/msgdlg.cpp:59 ../src/mac/carbon/msgdlg.cpp:142
--#: ../src/mac/classic/msgdlg.cpp:57 ../src/mac/classic/msgdlg.cpp:139
-+#: ../src/mac/carbon/msgdlg.cpp:59
-+#: ../src/mac/carbon/msgdlg.cpp:142
-+#: ../src/mac/classic/msgdlg.cpp:57
-+#: ../src/mac/classic/msgdlg.cpp:139
- #: ../src/motif/msgdlg.cpp:204
- msgid "Yes"
- msgstr "Ja"
-@@ -4319,8 +4415,7 @@
-
- #: ../src/msw/dde.cpp:1048
- msgid ""
--"a DDEML function was called without first calling the DdeInitialize "
--"function,\n"
-+"a DDEML function was called without first calling the DdeInitialize function,\n"
- "or an invalid instance identifier\n"
- "was passed to a DDEML function."
- msgstr ""
-@@ -4342,8 +4437,7 @@
-
- #: ../src/msw/dde.cpp:1039
- msgid "a request for a synchronous advise transaction has timed out."
--msgstr ""
--"tiden f�r en f�rfr�gan f�r en synkron meddelandetransaktion har g�tt ut."
-+msgstr "tiden f�r en f�rfr�gan f�r en synkron meddelandetransaktion har g�tt ut."
-
- #: ../src/msw/dde.cpp:1045
- msgid "a request for a synchronous data transaction has timed out."
-@@ -4351,8 +4445,7 @@
-
- #: ../src/msw/dde.cpp:1054
- msgid "a request for a synchronous execute transaction has timed out."
--msgstr ""
--"tiden f�r en f�rfr�gan f�r en synkron exekveringstransaktion har g�tt ut."
-+msgstr "tiden f�r en f�rfr�gan f�r en synkron exekveringstransaktion har g�tt ut."
-
- #: ../src/msw/dde.cpp:1072
- msgid "a request for a synchronous poke transaction has timed out."
-@@ -4360,8 +4453,7 @@
-
- #: ../src/msw/dde.cpp:1087
- msgid "a request to end an advise transaction has timed out."
--msgstr ""
--"tiden f�r en f�rfr�gan att avsluta en meddelandetransaktion har g�tt ut."
-+msgstr "tiden f�r en f�rfr�gan att avsluta en meddelandetransaktion har g�tt ut."
-
- #: ../src/msw/dde.cpp:1081
- msgid ""
-@@ -4478,7 +4570,8 @@
- msgid "can't determine if the end of file is reached on descriptor %d"
- msgstr "kan inte avg�ra om slutet p� filen �r uppn�tt p� identifierare %d"
-
--#: ../src/msdos/utilsdos.cpp:307 ../src/msdos/utilsdos.cpp:466
-+#: ../src/msdos/utilsdos.cpp:307
-+#: ../src/msdos/utilsdos.cpp:466
- #, c-format
- msgid "can't execute '%s'"
- msgstr "kan inte exekvera \"%s\""
-@@ -4501,7 +4594,8 @@
- msgid "can't flush file descriptor %d"
- msgstr "kan inte spola filidentifierare %d"
-
--#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202
-+#: ../src/common/file.cpp:399
-+#: ../src/msw/wince/filefnwce.cpp:202
- #, c-format
- msgid "can't get seek position on file descriptor %d"
- msgstr "kan inte hitta s�kposition p� filidentifierare %d"
-@@ -4510,7 +4604,8 @@
- msgid "can't load any font, aborting"
- msgstr "kan inte ladda n�got typsnitt, avbryter"
-
--#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271
-+#: ../src/common/ffile.cpp:75
-+#: ../src/common/file.cpp:271
- #, c-format
- msgid "can't open file '%s'"
- msgstr "kan inte �ppna fil \"%s\""
-@@ -4556,7 +4651,8 @@
- msgid "can't remove temporary file '%s'"
- msgstr "kan inte ta bort tempor�r fil \"%s\""
-
--#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189
-+#: ../src/common/file.cpp:385
-+#: ../src/msw/wince/filefnwce.cpp:189
- #, c-format
- msgid "can't seek on file descriptor %d"
- msgstr "kan inte s�ka p� filidentifierare %d"
-@@ -4604,7 +4700,8 @@
- msgid "decompression error"
- msgstr "dekompressionsfel"
-
--#: ../src/common/fmapbase.cpp:705 ../src/common/fmapbase.cpp:737
-+#: ../src/common/fmapbase.cpp:705
-+#: ../src/common/fmapbase.cpp:737
- msgid "default"
- msgstr "f�rvald"
-
-@@ -4746,7 +4843,8 @@
- msgid "invalid zip file"
- msgstr "ogiltig zip-fil"
-
--#: ../src/common/fontcmn.cpp:586 ../src/common/fontcmn.cpp:650
-+#: ../src/common/fontcmn.cpp:586
-+#: ../src/common/fontcmn.cpp:650
- msgid "italic"
- msgstr "kursiv"
-
-@@ -4898,7 +4996,8 @@
- msgid "thirteenth"
- msgstr "trettonde"
-
--#: ../src/common/imagtiff.cpp:145 ../src/common/imagtiff.cpp:161
-+#: ../src/common/imagtiff.cpp:145
-+#: ../src/common/imagtiff.cpp:161
- #, c-format
- msgid "tiff module: %s"
- msgstr "tiffmodul: %s"
-@@ -4941,7 +5040,8 @@
- msgid "unknown class %s"
- msgstr "ok�nd klass %s"
-
--#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
-+#: ../src/common/regex.cpp:163
-+#: ../src/html/chm.cpp:352
- msgid "unknown error"
- msgstr "ok�nt fel"
-
-@@ -4954,7 +5054,8 @@
- msgid "unknown line terminator"
- msgstr "ok�nt radavslut"
-
--#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170
-+#: ../src/common/file.cpp:367
-+#: ../src/msw/wince/filefnwce.cpp:170
- msgid "unknown seek origin"
- msgstr "ok�nd s�kstart"
-
-@@ -4972,7 +5073,8 @@
- msgid "unnamed%d"
- msgstr "namnl�s%d"
-
--#: ../src/common/zipstrm.cpp:1660 ../src/common/zipstrm.cpp:2030
-+#: ../src/common/zipstrm.cpp:1660
-+#: ../src/common/zipstrm.cpp:2030
- msgid "unsupported Zip compression method"
- msgstr "komprimeringsmetod i Zip st�ds inte"
-
-@@ -4997,12 +5099,15 @@
- msgid "wxGetTimeOfDay failed."
- msgstr "wxGetTimeOfDay misslyckades."
-
--#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469
--#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506
-+#: ../src/common/socket.cpp:415
-+#: ../src/common/socket.cpp:469
-+#: ../src/mac/carbon/cfsocket.cpp:452
-+#: ../src/mac/carbon/cfsocket.cpp:506
- msgid "wxSocket: invalid signature in ReadMsg."
- msgstr "wxSocket: Ogiltig signatur i ReadMsg."
-
--#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006
-+#: ../src/common/socket.cpp:966
-+#: ../src/mac/carbon/cfsocket.cpp:1006
- msgid "wxSocket: unknown event!."
- msgstr "wxSocket: Ok�nd h�ndelse!"
-
-@@ -5019,7 +5124,8 @@
- msgid "yesterday"
- msgstr "ig�r"
-
--#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
-+#: ../src/common/zstream.cpp:165
-+#: ../src/common/zstream.cpp:315
- #, c-format
- msgid "zlib error %d"
- msgstr "zlib-fel %d"
-@@ -5034,57 +5140,42 @@
- #~ msgstr ""
- #~ "Kunde inte h�mta stackbak�tsp�r:\n"
- #~ "%s"
--
- #~ msgid "Loading Grey Ascii PNM image is not yet implemented."
- #~ msgstr "Att ladda Grey Ascii PNM bilder �r �nnu inte implementerat."
--
- #~ msgid "Loading Grey Raw PNM image is not yet implemented."
- #~ msgstr "Att ladda Grey Raw PNM bilder �r �nnu inte implementerat."
--
- #~ msgid "Cannot wait on thread to exit."
- #~ msgstr "Kan inte v�nta p� att tr�den avslutas."
--
- #~ msgid "Could not load Rich Edit DLL '%s'"
- #~ msgstr "Kunde inte ladda Rich Edit DLL \"%s\""
--
- #~ msgid "ZIP handler currently supports only local files!"
- #~ msgstr "ZIP-hanteraren st�der f�r n�rvarande endast lokala filer!"
--
- #~ msgid ""
- #~ "can't seek on file descriptor %d, large files support is not enabled."
- #~ msgstr ""
- #~ "kan inte s�ka p� filidentifierare %d, st�d f�r stora filer �r inte "
- #~ "aktiverat."
--
- #~ msgid "More..."
- #~ msgstr "Mer..."
--
- #~ msgid "Setup"
- #~ msgstr "Inst�llningar"
--
- #~ msgid "/#SYSTEM"
- #~ msgstr "/#SYSTEM"
--
- #~ msgid "Backward"
- #~ msgstr "Bakl�nges"
--
- #~ msgid "GetUnusedColour:: No Unused Color in image "
- #~ msgstr "GetUnusedColour:: Ingen oanv�nd f�rg i bilden"
--
- #~ msgid ""
- #~ "Can't create list control window, check that comctl32.dll is installed."
- #~ msgstr ""
- #~ "Kan inte skapa listkontrollf�nster, kontrollera att comctl32.dll �r "
- #~ "installerad."
--
- #~ msgid "Can't delete value of key '%s'"
- #~ msgstr "Kan inte ta bort v�rdet fr�n nyckel \"%s\""
--
- #~ msgid "Failed to get the UTC system time."
- #~ msgstr "Kunde inte h�mta UTC-systemtiden."
--
- #~ msgid "gmtime() failed"
- #~ msgstr "gmtime() misslyckades"
--
- #~ msgid "mktime() failed"
- #~ msgstr "mktime() misslyckades"
-+
-diff -ur wxGTK-2.6.3/samples/listctrl/listtest.cpp wxGTK-2.6.3.2/samples/listctrl/listtest.cpp
---- wxGTK-2.6.3/samples/listctrl/listtest.cpp 2006-03-21 18:42:37.000000000 -0500
-+++ wxGTK-2.6.3.2/samples/listctrl/listtest.cpp 2006-04-02 11:51:15.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by:
- // Created: 04/01/98
--// RCS-ID: $Id: listtest.cpp,v 1.83.2.4 2006/03/18 16:57:18 VZ Exp $
-+// RCS-ID: $Id: listtest.cpp,v 1.83.2.5 2006/04/02 15:51:15 JS Exp $
- // Copyright: (c) Julian Smart
- // Licence: wxWindows license
- /////////////////////////////////////////////////////////////////////////////
-@@ -1053,10 +1053,10 @@
- SetItemData(tmp, i);
-
- buf.Printf(_T("Col 1, item %d"), i);
-- SetItem(i, 1, buf);
-+ SetItem(tmp, 1, buf);
-
- buf.Printf(_T("Item %d in column 2"), i);
-- SetItem(i, 2, buf);
-+ SetItem(tmp, 2, buf);
- }
-
- #if USE_CONTEXT_MENU
-diff -ur wxGTK-2.6.3/src/common/dobjcmn.cpp wxGTK-2.6.3.2/src/common/dobjcmn.cpp
---- wxGTK-2.6.3/src/common/dobjcmn.cpp 2006-03-21 18:42:10.000000000 -0500
-+++ wxGTK-2.6.3.2/src/common/dobjcmn.cpp 2006-03-30 04:52:54.000000000 -0500
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin, Robert Roebling
- // Modified by:
- // Created: 19.10.99
--// RCS-ID: $Id: dobjcmn.cpp,v 1.35.2.1 2006/03/24 23:51:30 RD Exp $
-+// RCS-ID: $Id: dobjcmn.cpp,v 1.35.2.2 2006/03/30 09:52:54 RR Exp $
- // Copyright: (c) wxWidgets Team
- // Licence: wxWindows licence
- ///////////////////////////////////////////////////////////////////////////////
-@@ -253,11 +253,15 @@
-
- bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
- {
-+ if ( !buf )
-+ return false;
-+
- wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
- if ( !buffer )
- return false;
-
-- strcpy( (char*) buf, buffer );
-+ memcpy( (char*) buf, buffer, GetDataSize(format) );
-+ // strcpy( (char*) buf, buffer );
-
- return true;
- }
-diff -ur wxGTK-2.6.3/src/common/gifdecod.cpp wxGTK-2.6.3.2/src/common/gifdecod.cpp
---- wxGTK-2.6.3/src/common/gifdecod.cpp 2006-03-21 18:42:10.000000000 -0500
-+++ wxGTK-2.6.3.2/src/common/gifdecod.cpp 2006-04-01 20:21:53.000000000 -0500
-@@ -3,7 +3,7 @@
- // Purpose: wxGIFDecoder, GIF reader for wxImage and wxAnimation
- // Author: Guillermo Rodriguez Garcia <guille@iies.es>
- // Version: 3.04
--// RCS-ID: $Id: gifdecod.cpp,v 1.37.2.1 2006/01/23 07:18:36 vell Exp $
-+// RCS-ID: $Id: gifdecod.cpp,v 1.37.2.2 2006/04/02 01:21:53 VZ Exp $
- // Copyright: (c) Guillermo Rodriguez Garcia
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -474,6 +474,25 @@
- /* make new entry in alphabet (only if NOT just cleared) */
- if (lastcode != -1)
- {
-+ // Normally, after the alphabet is full and can't grow any
-+ // further (ab_free == 4096), encoder should (must?) emit CLEAR
-+ // to reset it. This checks whether we really got it, otherwise
-+ // the GIF is damaged.
-+ if (ab_free > ab_max)
-+ {
-+ delete[] ab_prefix;
-+ delete[] ab_tail;
-+ delete[] stack;
-+ return wxGIF_INVFORMAT;
-+ }
-+
-+ // This assert seems unnecessary since the condition above
-+ // eliminates the only case in which it went false. But I really
-+ // don't like being forced to ask "Who in .text could have
-+ // written there?!" And I wouldn't have been forced to ask if
-+ // this line had already been here.
-+ wxASSERT(ab_free < allocSize);
-+
- ab_prefix[ab_free] = lastcode;
- ab_tail[ab_free] = code;
- ab_free++;
-diff -ur wxGTK-2.6.3/src/common/imagjpeg.cpp wxGTK-2.6.3.2/src/common/imagjpeg.cpp
---- wxGTK-2.6.3/src/common/imagjpeg.cpp 2006-03-21 18:42:10.000000000 -0500
-+++ wxGTK-2.6.3.2/src/common/imagjpeg.cpp 2006-04-01 20:27:36.000000000 -0500
-@@ -2,7 +2,7 @@
- // Name: imagjpeg.cpp
- // Purpose: wxImage JPEG handler
- // Author: Vaclav Slavik
--// RCS-ID: $Id: imagjpeg.cpp,v 1.47 2005/03/04 19:23:28 ABX Exp $
-+// RCS-ID: $Id: imagjpeg.cpp,v 1.47.2.1 2006/04/02 01:27:36 VZ Exp $
- // Copyright: (c) Vaclav Slavik
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -167,12 +167,22 @@
-
- /* Always display the message. */
- /* We could postpone this until after returning, if we chose. */
-- if (cinfo->err->output_message) (*cinfo->err->output_message) (cinfo);
-+ (*cinfo->err->output_message) (cinfo);
-
- /* Return control to the setjmp point */
- longjmp(myerr->setjmp_buffer, 1);
- }
-
-+/*
-+ * This will replace the standard output_message method when the user
-+ * wants us to be silent (verbose==false). We must have such method instead of
-+ * simply using NULL for cinfo->err->output_message because it's called
-+ * unconditionally from within libjpeg when there's "garbage input".
-+ */
-+CPP_METHODDEF(void) wx_ignore_message (j_common_ptr WXUNUSED(cinfo))
-+{
-+}
-+
- void wx_jpeg_io_src( j_decompress_ptr cinfo, wxInputStream& infile )
- {
- wx_src_ptr src;
-@@ -214,7 +224,8 @@
- cinfo.err = jpeg_std_error( &jerr.pub );
- jerr.pub.error_exit = wx_error_exit;
-
-- if (!verbose) cinfo.err->output_message=NULL;
-+ if (!verbose)
-+ cinfo.err->output_message = wx_ignore_message;
-
- /* Establish the setjmp return context for wx_error_exit to use. */
- if (setjmp(jerr.setjmp_buffer)) {
-@@ -327,7 +338,8 @@
- cinfo.err = jpeg_std_error(&jerr.pub);
- jerr.pub.error_exit = wx_error_exit;
-
-- if (!verbose) cinfo.err->output_message=NULL;
-+ if (!verbose)
-+ cinfo.err->output_message = wx_ignore_message;
-
- /* Establish the setjmp return context for wx_error_exit to use. */
- if (setjmp(jerr.setjmp_buffer))
-diff -ur wxGTK-2.6.3/src/common/socket.cpp wxGTK-2.6.3.2/src/common/socket.cpp
---- wxGTK-2.6.3/src/common/socket.cpp 2006-03-21 18:42:11.000000000 -0500
-+++ wxGTK-2.6.3.2/src/common/socket.cpp 2006-03-30 10:27:59.000000000 -0500
-@@ -5,7 +5,7 @@
- // Created: April 1997
- // Copyright: (C) 1999-1997, Guilhem Lavaux
- // (C) 2000-1999, Guillermo Rodriguez Garcia
--// RCS_ID: $Id: socket.cpp,v 1.133.2.2 2006/02/16 08:53:35 JS Exp $
-+// RCS_ID: $Id: socket.cpp,v 1.133.2.3 2006/03/30 15:27:59 KH Exp $
- // License: see wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-
-@@ -698,7 +698,7 @@
- else
- timeout = m_timeout * 1000;
-
-- bool has_event_loop = wxTheApp ? (wxTheApp->GetTraits() ? true : false) : false;
-+ bool has_event_loop = wxTheApp->GetTraits() ? (wxTheApp->GetTraits()->GetSocketGUIFunctionsTable() ? true : false) : false;
-
- // Wait in an active polling loop.
- //
-diff -ur wxGTK-2.6.3/src/generic/listctrl.cpp wxGTK-2.6.3.2/src/generic/listctrl.cpp
---- wxGTK-2.6.3/src/generic/listctrl.cpp 2006-03-21 18:42:14.000000000 -0500
-+++ wxGTK-2.6.3.2/src/generic/listctrl.cpp 2006-04-02 09:39:01.000000000 -0400
-@@ -3,7 +3,7 @@
- // Purpose: generic implementation of wxListCtrl
- // Author: Robert Roebling
- // Vadim Zeitlin (virtual list control support)
--// Id: $Id: listctrl.cpp,v 1.378.2.7 2006/03/10 21:37:20 RD Exp $
-+// Id: $Id: listctrl.cpp,v 1.378.2.9 2006/04/02 13:39:01 VZ Exp $
- // Copyright: (c) 1998 Robert Roebling
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -2914,6 +2914,7 @@
-
- void wxListMainWindow::OnMouse( wxMouseEvent &event )
- {
-+
- #ifdef __WXMAC__
- // On wxMac we can't depend on the EVT_KILL_FOCUS event to properly
- // shutdown the edit control when the mouse is clicked elsewhere on the
-@@ -2937,7 +2938,15 @@
- }
-
- if ( !HasCurrent() || IsEmpty() )
-+ {
-+ if (event.RightDown())
-+ {
-+ SendNotify( (size_t)-1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
-+ // Allow generation of context menu event
-+ event.Skip();
-+ }
- return;
-+ }
-
- if (m_dirty)
- return;
-@@ -3005,11 +3014,17 @@
- m_dragCount = 0;
- }
-
-- if ( !hitResult )
-+ if ( !hitResult )
- {
-- // outside of any item
-- return;
-- }
-+ if (event.RightDown())
-+ {
-+ SendNotify( (size_t) -1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
-+ // Allow generation of context menu event
-+ event.Skip();
-+ }
-+
-+ return;
-+ }
-
- bool forceClick = false;
- if (event.ButtonDClick())
-@@ -3319,6 +3334,10 @@
-
- case WXK_PRIOR:
- {
-+ // avoid floating point exception
-+ if (m_linesPerPage == 0)
-+ m_linesPerPage = 1;
-+
- int steps = InReportView() ? m_linesPerPage - 1 : m_current % m_linesPerPage;
-
- int index = m_current - steps;
-@@ -3331,6 +3350,10 @@
-
- case WXK_NEXT:
- {
-+ // avoid floating point exception
-+ if (m_linesPerPage == 0)
-+ m_linesPerPage = 1;
-+
- int steps = InReportView()
- ? m_linesPerPage - 1
- : m_linesPerPage - (m_current % m_linesPerPage) - 1;
-@@ -4667,7 +4690,13 @@
-
- void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
- {
-- // update our idea of which lines are shown when we redraw the window the
-+ int cw, ch, vw, vh;
-+ GetVirtualSize(&vw, &vh);
-+ GetClientSize(&cw, &ch);
-+ if (event.GetOrientation() == wxVERTICAL && ch >= vh)
-+ return;
-+
-+ // update our idea of which lines are shown when we redraw the window the
- // next time
- ResetVisibleLinesRange();
-
-@@ -5575,12 +5604,12 @@
- #if wxABI_VERSION >= 20603
- void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const
- {
-- return m_mainWin->DoClientToScreen(x, y);
-+ m_mainWin->DoClientToScreen(x, y);
- }
-
- void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const
- {
-- return m_mainWin->DoScreenToClient(x, y);
-+ m_mainWin->DoScreenToClient(x, y);
- }
- #endif // 2.6.3
-
-diff -ur wxGTK-2.6.3/src/gtk/clipbrd.cpp wxGTK-2.6.3.2/src/gtk/clipbrd.cpp
---- wxGTK-2.6.3/src/gtk/clipbrd.cpp 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/gtk/clipbrd.cpp 2006-03-29 20:31:36.000000000 -0500
-@@ -2,7 +2,7 @@
- // Name: gtk/clipbrd.cpp
- // Purpose:
- // Author: Robert Roebling
--// Id: $Id: clipbrd.cpp,v 1.60.2.3 2006/03/24 23:51:29 RD Exp $
-+// Id: $Id: clipbrd.cpp,v 1.60.2.4 2006/03/30 01:31:36 RD Exp $
- // Copyright: (c) 1998 Robert Roebling
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -493,17 +493,22 @@
- }
-
- delete[] array;
--
-+
-+#ifdef __WXGTK20__
- gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
- "selection_get",
- GTK_SIGNAL_FUNC(selection_handler),
- GUINT_TO_POINTER(
--#ifdef __WXGTK20__
- gtk_get_current_event_time()
-+ ) );
- #else
-+ gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
-+ "selection_get",
-+ GTK_SIGNAL_FUNC(selection_handler),
-+ GUINT_TO_POINTER(
- gdk_event_get_time(gtk_get_current_event())
-+ ) );
- #endif
-- ) );
-
- #if wxUSE_THREADS
- /* disable GUI threads */
-diff -ur wxGTK-2.6.3/src/gtk/window.cpp wxGTK-2.6.3.2/src/gtk/window.cpp
---- wxGTK-2.6.3/src/gtk/window.cpp 2006-03-21 18:42:17.000000000 -0500
-+++ wxGTK-2.6.3.2/src/gtk/window.cpp 2006-03-30 05:36:22.000000000 -0500
-@@ -2,7 +2,7 @@
- // Name: gtk/window.cpp
- // Purpose:
- // Author: Robert Roebling
--// Id: $Id: window.cpp,v 1.548.2.13 2006/03/18 21:58:19 VZ Exp $
-+// Id: $Id: window.cpp,v 1.548.2.14 2006/03/30 10:36:22 RR Exp $
- // Copyright: (c) 1998 Robert Roebling, Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -1014,9 +1014,6 @@
- event.m_scanCode = gdk_event->keyval;
- event.m_rawCode = (wxUint32) gdk_event->keyval;
- event.m_rawFlags = 0;
--#if wxUSE_UNICODE
-- event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval);
--#endif
- wxGetMousePosition( &x, &y );
- win->ScreenToClient( &x, &y );
- event.m_x = x;
-@@ -1327,11 +1324,11 @@
- if (event.ControlDown() && key_code >= 'a' && key_code <= 'z' )
- {
- event.m_keyCode = key_code - 'a' + 1;
--#if wxUSE_UNICODE
-- event.m_uniChar = event.m_keyCode;
--#endif
- }
-
-+#if wxUSE_UNICODE
-+ event.m_uniChar = event.m_keyCode;
-+#endif
- // Implement OnCharHook by checking ancesteror top level windows
- wxWindow *parent = win;
- while (parent && !parent->IsTopLevel())
-diff -ur wxGTK-2.6.3/src/tiff/mkg3states.c wxGTK-2.6.3.2/src/tiff/mkg3states.c
---- wxGTK-2.6.3/src/tiff/mkg3states.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/mkg3states.c 2004-11-19 19:17:38.000000000 -0500
-@@ -1,4 +1,4 @@
--/* "$Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/mkg3states.c,v 1.1 2004/11/20 00:17:38 VZ Exp $ */
-+/* "$Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/mkg3states.c,v 1.1 2004/11/20 00:17:38 VZ Exp $ */
-
- /*
- * Copyright (c) 1991-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/mkspans.c wxGTK-2.6.3.2/src/tiff/mkspans.c
---- wxGTK-2.6.3/src/tiff/mkspans.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/mkspans.c 2004-11-19 19:17:38.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/mkspans.c,v 1.1 2004/11/20 00:17:38 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/mkspans.c,v 1.1 2004/11/20 00:17:38 VZ Exp $ */
-
- /*
- * Copyright (c) 1991-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/mkversion.c wxGTK-2.6.3.2/src/tiff/mkversion.c
---- wxGTK-2.6.3/src/tiff/mkversion.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/mkversion.c 2004-11-19 19:17:38.000000000 -0500
-@@ -1,4 +1,4 @@
--/* "$Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/mkversion.c,v 1.1 2004/11/20 00:17:38 VZ Exp $ */
-+/* "$Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/mkversion.c,v 1.1 2004/11/20 00:17:38 VZ Exp $ */
-
- /*
- * Copyright (c) 1995-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/README wxGTK-2.6.3.2/src/tiff/README
---- wxGTK-2.6.3/src/tiff/README 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/README 2002-12-04 09:10:14.000000000 -0500
-@@ -1,4 +1,4 @@
--$Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/README,v 1.2 2002/12/04 14:10:14 VZ Exp $
-+$Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/README,v 1.2 2002/12/04 14:10:14 VZ Exp $
-
-
- TIFF Software Distribution
-diff -ur wxGTK-2.6.3/src/tiff/tif_acorn.c wxGTK-2.6.3.2/src/tiff/tif_acorn.c
---- wxGTK-2.6.3/src/tiff/tif_acorn.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_acorn.c 2004-11-19 17:29:41.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_acorn.c,v 1.3 2004/11/19 22:29:41 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_acorn.c,v 1.3 2004/11/19 22:29:41 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_apple.c wxGTK-2.6.3.2/src/tiff/tif_apple.c
---- wxGTK-2.6.3/src/tiff/tif_apple.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_apple.c 2005-04-19 08:26:07.000000000 -0400
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_apple.c,v 1.6 2005/04/19 12:26:07 SC Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_apple.c,v 1.6 2005/04/19 12:26:07 SC Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_atari.c wxGTK-2.6.3.2/src/tiff/tif_atari.c
---- wxGTK-2.6.3/src/tiff/tif_atari.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_atari.c 2004-11-19 17:29:42.000000000 -0500
-@@ -1,4 +1,4 @@
--/* "$Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_atari.c,v 1.3 2004/11/19 22:29:42 VZ Exp $" */
-+/* "$Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_atari.c,v 1.3 2004/11/19 22:29:42 VZ Exp $" */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_aux.c wxGTK-2.6.3.2/src/tiff/tif_aux.c
---- wxGTK-2.6.3/src/tiff/tif_aux.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_aux.c 2004-11-19 17:29:42.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_aux.c,v 1.3 2004/11/19 22:29:42 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_aux.c,v 1.3 2004/11/19 22:29:42 VZ Exp $ */
-
- /*
- * Copyright (c) 1991-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_close.c wxGTK-2.6.3.2/src/tiff/tif_close.c
---- wxGTK-2.6.3/src/tiff/tif_close.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_close.c 2004-11-19 17:29:42.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_close.c,v 1.3 2004/11/19 22:29:42 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_close.c,v 1.3 2004/11/19 22:29:42 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_codec.c wxGTK-2.6.3.2/src/tiff/tif_codec.c
---- wxGTK-2.6.3/src/tiff/tif_codec.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_codec.c 2004-11-19 17:29:42.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_codec.c,v 1.5 2004/11/19 22:29:42 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_codec.c,v 1.5 2004/11/19 22:29:42 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_color.c wxGTK-2.6.3.2/src/tiff/tif_color.c
---- wxGTK-2.6.3/src/tiff/tif_color.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_color.c 2004-11-19 19:17:38.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_color.c,v 1.1 2004/11/20 00:17:38 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_color.c,v 1.1 2004/11/20 00:17:38 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_compress.c wxGTK-2.6.3.2/src/tiff/tif_compress.c
---- wxGTK-2.6.3/src/tiff/tif_compress.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_compress.c 2004-11-19 17:29:42.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_compress.c,v 1.5 2004/11/19 22:29:42 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_compress.c,v 1.5 2004/11/19 22:29:42 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_dir.c wxGTK-2.6.3.2/src/tiff/tif_dir.c
---- wxGTK-2.6.3/src/tiff/tif_dir.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_dir.c 2004-11-19 17:29:42.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_dir.c,v 1.4 2004/11/19 22:29:42 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_dir.c,v 1.4 2004/11/19 22:29:42 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_dir.h wxGTK-2.6.3.2/src/tiff/tif_dir.h
---- wxGTK-2.6.3/src/tiff/tif_dir.h 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_dir.h 2004-11-19 17:29:43.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_dir.h,v 1.3 2004/11/19 22:29:43 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_dir.h,v 1.3 2004/11/19 22:29:43 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_dirinfo.c wxGTK-2.6.3.2/src/tiff/tif_dirinfo.c
---- wxGTK-2.6.3/src/tiff/tif_dirinfo.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_dirinfo.c 2004-11-19 17:29:43.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_dirinfo.c,v 1.4 2004/11/19 22:29:43 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_dirinfo.c,v 1.4 2004/11/19 22:29:43 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_dirread.c wxGTK-2.6.3.2/src/tiff/tif_dirread.c
---- wxGTK-2.6.3/src/tiff/tif_dirread.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_dirread.c 2004-12-24 06:48:14.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_dirread.c,v 1.4 2004/12/24 11:48:14 VS Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_dirread.c,v 1.4 2004/12/24 11:48:14 VS Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_dirwrite.c wxGTK-2.6.3.2/src/tiff/tif_dirwrite.c
---- wxGTK-2.6.3/src/tiff/tif_dirwrite.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_dirwrite.c 2004-11-19 17:29:43.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_dirwrite.c,v 1.3 2004/11/19 22:29:43 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_dirwrite.c,v 1.3 2004/11/19 22:29:43 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_dumpmode.c wxGTK-2.6.3.2/src/tiff/tif_dumpmode.c
---- wxGTK-2.6.3/src/tiff/tif_dumpmode.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_dumpmode.c 2004-11-19 17:29:43.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_dumpmode.c,v 1.4 2004/11/19 22:29:43 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_dumpmode.c,v 1.4 2004/11/19 22:29:43 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_error.c wxGTK-2.6.3.2/src/tiff/tif_error.c
---- wxGTK-2.6.3/src/tiff/tif_error.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_error.c 2004-11-19 17:29:43.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_error.c,v 1.3 2004/11/19 22:29:43 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_error.c,v 1.3 2004/11/19 22:29:43 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_extension.c wxGTK-2.6.3.2/src/tiff/tif_extension.c
---- wxGTK-2.6.3/src/tiff/tif_extension.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_extension.c 2004-11-19 19:17:39.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_extension.c,v 1.1 2004/11/20 00:17:39 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_extension.c,v 1.1 2004/11/20 00:17:39 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_fax3.c wxGTK-2.6.3.2/src/tiff/tif_fax3.c
---- wxGTK-2.6.3/src/tiff/tif_fax3.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_fax3.c 2005-09-01 17:47:12.000000000 -0400
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_fax3.c,v 1.9 2005/09/01 21:47:12 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_fax3.c,v 1.9 2005/09/01 21:47:12 VZ Exp $ */
-
- /*
- * Copyright (c) 1990-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tiffcomp.h wxGTK-2.6.3.2/src/tiff/tiffcomp.h
---- wxGTK-2.6.3/src/tiff/tiffcomp.h 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tiffcomp.h 2005-07-21 13:30:41.000000000 -0400
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tiffcomp.h,v 1.15 2005/07/21 17:30:41 ABX Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tiffcomp.h,v 1.15 2005/07/21 17:30:41 ABX Exp $ */
-
- /*
- * Copyright (c) 1990-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tiffconf.h wxGTK-2.6.3.2/src/tiff/tiffconf.h
---- wxGTK-2.6.3/src/tiff/tiffconf.h 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tiffconf.h 2004-11-19 17:29:47.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tiffconf.h,v 1.3 2004/11/19 22:29:47 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tiffconf.h,v 1.3 2004/11/19 22:29:47 VZ Exp $ */
- /*
- * Copyright (c) 1988-1997 Sam Leffler
- * Copyright (c) 1991-1997 Silicon Graphics, Inc.
-diff -ur wxGTK-2.6.3/src/tiff/tiff.h wxGTK-2.6.3.2/src/tiff/tiff.h
---- wxGTK-2.6.3/src/tiff/tiff.h 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tiff.h 2004-11-19 17:29:47.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tiff.h,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tiff.h,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tiffio.h wxGTK-2.6.3.2/src/tiff/tiffio.h
---- wxGTK-2.6.3/src/tiff/tiffio.h 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tiffio.h 2004-11-19 17:29:47.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tiffio.h,v 1.5 2004/11/19 22:29:47 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tiffio.h,v 1.5 2004/11/19 22:29:47 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tiffiop.h wxGTK-2.6.3.2/src/tiff/tiffiop.h
---- wxGTK-2.6.3/src/tiff/tiffiop.h 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tiffiop.h 2005-04-22 09:18:47.000000000 -0400
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tiffiop.h,v 1.7 2005/04/22 13:18:47 MW Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tiffiop.h,v 1.7 2005/04/22 13:18:47 MW Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_flush.c wxGTK-2.6.3.2/src/tiff/tif_flush.c
---- wxGTK-2.6.3/src/tiff/tif_flush.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_flush.c 2004-11-19 17:29:44.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_flush.c,v 1.3 2004/11/19 22:29:44 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_flush.c,v 1.3 2004/11/19 22:29:44 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_getimage.c wxGTK-2.6.3.2/src/tiff/tif_getimage.c
---- wxGTK-2.6.3/src/tiff/tif_getimage.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_getimage.c 2004-12-17 10:37:30.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_getimage.c,v 1.6 2004/12/17 15:37:30 RN Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_getimage.c,v 1.6 2004/12/17 15:37:30 RN Exp $ */
-
- /*
- * Copyright (c) 1991-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_jpeg.c wxGTK-2.6.3.2/src/tiff/tif_jpeg.c
---- wxGTK-2.6.3/src/tiff/tif_jpeg.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_jpeg.c 2004-11-19 17:29:44.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_jpeg.c,v 1.3 2004/11/19 22:29:44 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_jpeg.c,v 1.3 2004/11/19 22:29:44 VZ Exp $ */
-
- /*
- * Copyright (c) 1994-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_lzw.c wxGTK-2.6.3.2/src/tiff/tif_lzw.c
---- wxGTK-2.6.3/src/tiff/tif_lzw.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_lzw.c 2004-11-19 17:29:44.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_lzw.c,v 1.6 2004/11/19 22:29:44 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_lzw.c,v 1.6 2004/11/19 22:29:44 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_msdos.c wxGTK-2.6.3.2/src/tiff/tif_msdos.c
---- wxGTK-2.6.3/src/tiff/tif_msdos.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_msdos.c 2004-11-19 17:29:45.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_msdos.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_msdos.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_next.c wxGTK-2.6.3.2/src/tiff/tif_next.c
---- wxGTK-2.6.3/src/tiff/tif_next.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_next.c 2004-11-19 17:29:45.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_open.c wxGTK-2.6.3.2/src/tiff/tif_open.c
---- wxGTK-2.6.3/src/tiff/tif_open.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_open.c 2005-05-31 05:28:43.000000000 -0400
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_os2.c wxGTK-2.6.3.2/src/tiff/tif_os2.c
---- wxGTK-2.6.3/src/tiff/tif_os2.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_os2.c 2002-12-04 09:10:19.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_packbits.c wxGTK-2.6.3.2/src/tiff/tif_packbits.c
---- wxGTK-2.6.3/src/tiff/tif_packbits.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_packbits.c 2004-11-19 17:29:45.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_predict.c wxGTK-2.6.3.2/src/tiff/tif_predict.c
---- wxGTK-2.6.3/src/tiff/tif_predict.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_predict.c 2004-11-19 17:29:45.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_predict.h wxGTK-2.6.3.2/src/tiff/tif_predict.h
---- wxGTK-2.6.3/src/tiff/tif_predict.h 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_predict.h 2004-11-19 17:29:45.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
-
- /*
- * Copyright (c) 1995-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_print.c wxGTK-2.6.3.2/src/tiff/tif_print.c
---- wxGTK-2.6.3/src/tiff/tif_print.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_print.c 2004-11-19 17:29:45.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_read.c wxGTK-2.6.3.2/src/tiff/tif_read.c
---- wxGTK-2.6.3/src/tiff/tif_read.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_read.c 2004-11-19 17:29:45.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_strip.c wxGTK-2.6.3.2/src/tiff/tif_strip.c
---- wxGTK-2.6.3/src/tiff/tif_strip.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_strip.c 2004-11-19 17:29:45.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
-
- /*
- * Copyright (c) 1991-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_swab.c wxGTK-2.6.3.2/src/tiff/tif_swab.c
---- wxGTK-2.6.3/src/tiff/tif_swab.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_swab.c 2004-11-19 17:29:46.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_thunder.c wxGTK-2.6.3.2/src/tiff/tif_thunder.c
---- wxGTK-2.6.3/src/tiff/tif_thunder.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_thunder.c 2004-11-19 17:29:46.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_tile.c wxGTK-2.6.3.2/src/tiff/tif_tile.c
---- wxGTK-2.6.3/src/tiff/tif_tile.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_tile.c 2004-11-19 17:29:46.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-
- /*
- * Copyright (c) 1991-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_unix.c wxGTK-2.6.3.2/src/tiff/tif_unix.c
---- wxGTK-2.6.3/src/tiff/tif_unix.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_unix.c 2004-11-19 17:29:46.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_version.c wxGTK-2.6.3.2/src/tiff/tif_version.c
---- wxGTK-2.6.3/src/tiff/tif_version.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_version.c 2004-11-19 17:29:46.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
- /*
- * Copyright (c) 1992-1997 Sam Leffler
- * Copyright (c) 1992-1997 Silicon Graphics, Inc.
-diff -ur wxGTK-2.6.3/src/tiff/tif_vms.c wxGTK-2.6.3.2/src/tiff/tif_vms.c
---- wxGTK-2.6.3/src/tiff/tif_vms.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_vms.c 2004-11-19 17:29:46.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_warning.c wxGTK-2.6.3.2/src/tiff/tif_warning.c
---- wxGTK-2.6.3/src/tiff/tif_warning.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_warning.c 2004-11-19 17:29:46.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_win32.c wxGTK-2.6.3.2/src/tiff/tif_win32.c
---- wxGTK-2.6.3/src/tiff/tif_win32.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_win32.c 2004-11-19 17:29:46.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_win3.c wxGTK-2.6.3.2/src/tiff/tif_win3.c
---- wxGTK-2.6.3/src/tiff/tif_win3.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_win3.c 2004-11-19 17:29:46.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_write.c wxGTK-2.6.3.2/src/tiff/tif_write.c
---- wxGTK-2.6.3/src/tiff/tif_write.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_write.c 2004-11-19 17:29:46.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/src/tiff/tif_zip.c wxGTK-2.6.3.2/src/tiff/tif_zip.c
---- wxGTK-2.6.3/src/tiff/tif_zip.c 2006-03-21 18:42:16.000000000 -0500
-+++ wxGTK-2.6.3.2/src/tiff/tif_zip.c 2004-11-19 17:29:47.000000000 -0500
-@@ -1,4 +1,4 @@
--/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
-+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
-
- /*
- * Copyright (c) 1995-1997 Sam Leffler
-diff -ur wxGTK-2.6.3/utils/helpview/src/helpview.cpp wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp
---- wxGTK-2.6.3/utils/helpview/src/helpview.cpp 2006-03-21 18:42:49.000000000 -0500
-+++ wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp 2006-03-30 06:35:12.000000000 -0500
-@@ -5,7 +5,7 @@
- // Author: Vaclav Slavik, Julian Smart
- // Modified by:
- // Created: 2002-07-09
--// RCS-ID: $Id: helpview.cpp,v 1.14 2005/05/30 09:24:08 ABX Exp $
-+// RCS-ID: $Id: helpview.cpp,v 1.14.2.1 2006/03/30 11:35:12 JS Exp $
- // Copyright: (c) 2002 Vaclav Slavik, Julian Smart and others
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -63,7 +63,7 @@
-
- #ifdef __WXMAC__
- wxApp::s_macAboutMenuItemId = wxID_ABOUT;
-- wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
-+ wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
- #endif
-
- int istyle = wxHF_DEFAULT_STYLE;
diff --git a/wxGTK-2.6.3.3-cvs.patch b/wxGTK-2.6.3.3-cvs.patch
deleted file mode 100644
index 1444bee..0000000
--- a/wxGTK-2.6.3.3-cvs.patch
+++ /dev/null
@@ -1,6251 +0,0 @@
-diff -ur wxWidgets-2.6.3/build/aclocal/bakefile.m4 wxWidgets-2.6.3.3/build/aclocal/bakefile.m4
---- wxWidgets-2.6.3/build/aclocal/bakefile.m4 2006-02-12 03:50:55.000000000 -0500
-+++ wxWidgets-2.6.3.3/build/aclocal/bakefile.m4 2006-07-12 04:59:53.000000000 -0400
-@@ -421,6 +421,7 @@
-
- powerpc-apple-macos* | \
- *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
-+ *-*-mirbsd* | \
- *-*-sunos4* | \
- *-*-osf* | \
- *-*-dgux5* | \
-diff -ur wxWidgets-2.6.3/configure wxWidgets-2.6.3.3/configure
---- wxWidgets-2.6.3/configure 2006-03-21 14:33:33.000000000 -0500
-+++ wxWidgets-2.6.3.3/configure 2006-05-23 14:08:19.000000000 -0400
-@@ -892,6 +892,7 @@
- --enable-universal_binary create Mac PowerPC and Intel Universal binary (not yet working)
- --enable-compat22 enable wxWidgets 2.2 compatibility
- --disable-compat24 disable wxWidgets 2.4 compatibility
-+ --disable-reserved_virtual do not create unused vtable entries
- --disable-rpath disable use of rpath for uninstalled builds
- --enable-intl use internationalization system
- --enable-config use wxConfig (and derived) classes
-@@ -1669,7 +1670,7 @@
- wx_major_version_number=2
- wx_minor_version_number=6
- wx_release_number=3
--wx_subrelease_number=1
-+wx_subrelease_number=3
-
- WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
- WX_VERSION=$WX_RELEASE.$wx_release_number
-@@ -4241,6 +4242,49 @@
- fi
-
-
-+DEFAULT_WX_USE_RESERVED_VIRTUALS=yes
-+
-+ enablestring=
-+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-reserved_virtual" >&5
-+echo $ECHO_N "checking for --${enablestring:-enable}-reserved_virtual... $ECHO_C" >&6
-+ no_cache=0
-+ # Check whether --enable-reserved_virtual or --disable-reserved_virtual was given.
-+if test "${enable_reserved_virtual+set}" = set; then
-+ enableval="$enable_reserved_virtual"
-+
-+ if test "$enableval" = yes; then
-+ ac_cv_use_reserved_virtual='WX_USE_RESERVED_VIRTUALS=yes'
-+ else
-+ ac_cv_use_reserved_virtual='WX_USE_RESERVED_VIRTUALS=no'
-+ fi
-+
-+else
-+
-+ LINE=`grep "WX_USE_RESERVED_VIRTUALS" ${wx_arg_cache_file}`
-+ if test "x$LINE" != x ; then
-+ eval "DEFAULT_$LINE"
-+ else
-+ no_cache=1
-+ fi
-+
-+ ac_cv_use_reserved_virtual='WX_USE_RESERVED_VIRTUALS='$DEFAULT_WX_USE_RESERVED_VIRTUALS
-+
-+fi;
-+
-+ eval "$ac_cv_use_reserved_virtual"
-+ if test "$no_cache" != 1; then
-+ echo $ac_cv_use_reserved_virtual >> ${wx_arg_cache_file}.tmp
-+ fi
-+
-+ if test "$WX_USE_RESERVED_VIRTUALS" = yes; then
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ else
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ fi
-+
-+
-
- enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-rpath" >&5
-@@ -38289,6 +38333,13 @@
-
- fi
-
-+if test "x$WX_USE_RESERVED_VIRTUALS" != "xno"; then
-+ cat >>confdefs.h <<\_ACEOF
-+#define WX_USE_RESERVED_VIRTUALS 1
-+_ACEOF
-+
-+fi
-+
-
- if test "$wxUSE_GUI" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-@@ -42353,11 +42404,6 @@
- echo "$as_me: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&2;}
- wxUSE_TOGGLEBTN=no
- fi
-- if test "$wxUSE_UNIVERSAL" = "yes"; then
-- { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under wxUniversal... disabled" >&5
--echo "$as_me: WARNING: Toggle button not yet supported under wxUniversal... disabled" >&2;}
-- wxUSE_TOGGLEBTN=no
-- fi
-
- if test "$wxUSE_TOGGLEBTN" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-diff -ur wxWidgets-2.6.3/configure.in wxWidgets-2.6.3.3/configure.in
---- wxWidgets-2.6.3/configure.in 2006-03-21 14:33:57.000000000 -0500
-+++ wxWidgets-2.6.3.3/configure.in 2006-07-12 04:59:50.000000000 -0400
-@@ -1,5 +1,5 @@
- dnl Process this file with autoconf to produce a configure script.
--AC_REVISION($Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $)dnl
-+AC_REVISION($Id: configure.in,v 1.1063.2.23 2006/07/12 08:59:50 SN Exp $)dnl
-
- dnl ---------------------------------------------------------------------------
- dnl
-@@ -8,7 +8,7 @@
- dnl
- dnl This script is under the wxWidgets licence.
- dnl
--dnl Version: $Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $
-+dnl Version: $Id: configure.in,v 1.1063.2.23 2006/07/12 08:59:50 SN Exp $
- dnl ---------------------------------------------------------------------------
-
- dnl ---------------------------------------------------------------------------
-@@ -33,7 +33,7 @@
- wx_major_version_number=2
- wx_minor_version_number=6
- wx_release_number=3
--wx_subrelease_number=1
-+wx_subrelease_number=3
-
- WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
- WX_VERSION=$WX_RELEASE.$wx_release_number
-@@ -185,7 +185,7 @@
- AC_DEFINE(__BSD__)
- DEFAULT_DEFAULT_wxUSE_GTK=1
- ;;
-- *-*-openbsd*)
-+ *-*-openbsd*|*-*-mirbsd*)
- USE_BSD=1
- USE_OPENBSD=1
- AC_DEFINE(__OPENBSD__)
-@@ -857,6 +857,9 @@
- WX_ARG_ENABLE(compat22, [ --enable-compat22 enable wxWidgets 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
- WX_ARG_ENABLE(compat24, [ --disable-compat24 disable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable)
-
-+DEFAULT_WX_USE_RESERVED_VIRTUALS=yes
-+WX_ARG_ENABLE(reserved_virtual, [ --disable-reserved_virtual do not create unused vtable entries], WX_USE_RESERVED_VIRTUALS)
-+
- WX_ARG_ENABLE(rpath, [ --disable-rpath disable use of rpath for uninstalled builds], wxUSE_RPATH)
-
-
-@@ -5073,6 +5076,10 @@
- AC_DEFINE(WXWIN_COMPATIBILITY_2_4)
- fi
-
-+if test "x$WX_USE_RESERVED_VIRTUALS" != "xno"; then
-+ AC_DEFINE(WX_USE_RESERVED_VIRTUALS)
-+fi
-+
- dnl ---------------------------------------------------------------------------
- dnl the library may be built without GUI classes at all
- dnl ---------------------------------------------------------------------------
-@@ -6311,10 +6318,6 @@
- AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
- wxUSE_TOGGLEBTN=no
- fi
-- if test "$wxUSE_UNIVERSAL" = "yes"; then
-- AC_MSG_WARN([Toggle button not yet supported under wxUniversal... disabled])
-- wxUSE_TOGGLEBTN=no
-- fi
-
- if test "$wxUSE_TOGGLEBTN" = "yes"; then
- AC_DEFINE(wxUSE_TOGGLEBTN)
-diff -ur wxWidgets-2.6.3/contrib/src/gizmos/editlbox.cpp wxWidgets-2.6.3.3/contrib/src/gizmos/editlbox.cpp
---- wxWidgets-2.6.3/contrib/src/gizmos/editlbox.cpp 2005-01-14 08:06:52.000000000 -0500
-+++ wxWidgets-2.6.3.3/contrib/src/gizmos/editlbox.cpp 2006-05-23 15:30:03.000000000 -0400
-@@ -2,7 +2,7 @@
- // Name: editlbox.cpp
- // Purpose: ListBox with editable items
- // Author: Vaclav Slavik
--// RCS-ID: $Id: editlbox.cpp,v 1.21 2005/01/14 13:06:52 ABX Exp $
-+// RCS-ID: $Id: editlbox.cpp,v 1.21.2.1 2006/05/23 19:30:03 ABX Exp $
- // Copyright: (c) Vaclav Slavik
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -228,6 +228,12 @@
- // add new empty line here so that adding one more line is still
- // possible:
- m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), wxEmptyString);
-+
-+ // Simulate a wxEVT_COMMAND_LIST_ITEM_SELECTED event for the new item,
-+ // so that the buttons are enabled/disabled properly
-+ wxListEvent selectionEvent(wxEVT_COMMAND_LIST_ITEM_SELECTED, m_listCtrl->GetId());
-+ selectionEvent.m_itemIndex = event.GetIndex();
-+ m_listCtrl->GetEventHandler()->ProcessEvent(selectionEvent);
- }
- }
-
-diff -ur wxWidgets-2.6.3/contrib/src/stc/scintilla/src/Editor.cxx wxWidgets-2.6.3.3/contrib/src/stc/scintilla/src/Editor.cxx
---- wxWidgets-2.6.3/contrib/src/stc/scintilla/src/Editor.cxx 2006-03-12 01:03:37.000000000 -0500
-+++ wxWidgets-2.6.3.3/contrib/src/stc/scintilla/src/Editor.cxx 2006-06-28 15:32:14.000000000 -0400
-@@ -213,7 +213,7 @@
- }
-
- void LineLayoutCache::AllocateForLevel(int linesOnScreen, int linesInDoc) {
-- PLATFORM_ASSERT(useCount == 0);
-+// PLATFORM_ASSERT(useCount == 0);
- int lengthForLevel = 0;
- if (level == llcCaret) {
- lengthForLevel = 1;
-@@ -239,7 +239,7 @@
- }
-
- void LineLayoutCache::Deallocate() {
-- PLATFORM_ASSERT(useCount == 0);
-+// PLATFORM_ASSERT(useCount == 0);
- for (int i = 0; i < length; i++)
- delete cache[i];
- delete []cache;
-diff -ur wxWidgets-2.6.3/contrib/src/stc/ScintillaWX.cpp wxWidgets-2.6.3.3/contrib/src/stc/ScintillaWX.cpp
---- wxWidgets-2.6.3/contrib/src/stc/ScintillaWX.cpp 2006-03-12 01:03:52.000000000 -0500
-+++ wxWidgets-2.6.3.3/contrib/src/stc/ScintillaWX.cpp 2006-06-28 15:32:18.000000000 -0400
-@@ -9,7 +9,7 @@
- // Author: Robin Dunn
- //
- // Created: 13-Jan-2000
--// RCS-ID: $Id: ScintillaWX.cpp,v 1.85.2.1 2006/03/12 06:03:52 RD Exp $
-+// RCS-ID: $Id: ScintillaWX.cpp,v 1.85.2.3 2006/06/28 19:32:18 RD Exp $
- // Copyright: (c) 2000 by Total Control Software
- // Licence: wxWindows license
- /////////////////////////////////////////////////////////////////////////////
-@@ -483,7 +483,10 @@
- if (gotData) {
- wxString text = wxTextBuffer::Translate(data.GetText(),
- wxConvertEOLMode(pdoc->eolMode));
-+ data.SetText(wxEmptyString); // free the data object content
- wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-+ text = wxEmptyString; // free text
-+
- int len = strlen(buf);
- pdoc->InsertString(currentPos, buf, len);
- SetEmptySelection(currentPos + len);
-@@ -827,13 +830,15 @@
- }
-
- void ScintillaWX::DoLeftButtonUp(Point pt, unsigned int curTime, bool ctrl) {
-+ ButtonUp(pt, curTime, ctrl);
- #if wxUSE_DRAG_AND_DROP
- if (startDragTimer->IsRunning()) {
- startDragTimer->Stop();
-+ SetDragPosition(invalidPosition);
- SetEmptySelection(PositionFromLocation(pt));
-+ ShowCaretAtCurrentPosition();
- }
- #endif // wxUSE_DRAG_AND_DROP
-- ButtonUp(pt, curTime, ctrl);
- }
-
- void ScintillaWX::DoLeftButtonMove(Point pt) {
-diff -ur wxWidgets-2.6.3/contrib/src/stc/stc.cpp wxWidgets-2.6.3.3/contrib/src/stc/stc.cpp
---- wxWidgets-2.6.3/contrib/src/stc/stc.cpp 2006-03-12 01:03:51.000000000 -0500
-+++ wxWidgets-2.6.3.3/contrib/src/stc/stc.cpp 2006-06-28 15:32:18.000000000 -0400
-@@ -10,7 +10,7 @@
- // Author: Robin Dunn
- //
- // Created: 13-Jan-2000
--// RCS-ID: $Id: stc.cpp,v 1.97.2.1 2006/03/12 06:03:51 RD Exp $
-+// RCS-ID: $Id: stc.cpp,v 1.97.2.2 2006/06/28 19:32:18 RD Exp $
- // Copyright: (c) 2000 by Total Control Software
- // Licence: wxWindows license
- /////////////////////////////////////////////////////////////////////////////
-@@ -3186,12 +3186,7 @@
- size_t length) {
- if(!text) return;
-
-- // The unicode conversion MUST have a null byte to terminate the
-- // string so move it into a buffer first and give it one.
-- wxMemoryBuffer buf(length+1);
-- buf.AppendData((void*)text, length);
-- buf.AppendByte(0);
-- evt.SetText(stc2wx(buf));
-+ evt.SetText(stc2wx(text, length));
- }
-
-
-diff -ur wxWidgets-2.6.3/contrib/src/stc/stc.cpp.in wxWidgets-2.6.3.3/contrib/src/stc/stc.cpp.in
---- wxWidgets-2.6.3/contrib/src/stc/stc.cpp.in 2006-03-12 01:03:51.000000000 -0500
-+++ wxWidgets-2.6.3.3/contrib/src/stc/stc.cpp.in 2006-06-28 15:32:17.000000000 -0400
-@@ -10,7 +10,7 @@
- // Author: Robin Dunn
- //
- // Created: 13-Jan-2000
--// RCS-ID: $Id: stc.cpp.in,v 1.66.2.1 2006/03/12 06:03:51 RD Exp $
-+// RCS-ID: $Id: stc.cpp.in,v 1.66.2.2 2006/06/28 19:32:17 RD Exp $
- // Copyright: (c) 2000 by Total Control Software
- // Licence: wxWindows license
- /////////////////////////////////////////////////////////////////////////////
-@@ -854,12 +854,7 @@
- size_t length) {
- if(!text) return;
-
-- // The unicode conversion MUST have a null byte to terminate the
-- // string so move it into a buffer first and give it one.
-- wxMemoryBuffer buf(length+1);
-- buf.AppendData((void*)text, length);
-- buf.AppendByte(0);
-- evt.SetText(stc2wx(buf));
-+ evt.SetText(stc2wx(text, length));
- }
-
-
-diff -ur wxWidgets-2.6.3/include/wx/control.h wxWidgets-2.6.3.3/include/wx/control.h
---- wxWidgets-2.6.3/include/wx/control.h 2005-06-26 11:46:07.000000000 -0400
-+++ wxWidgets-2.6.3.3/include/wx/control.h 2006-04-19 05:33:32.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin
- // Modified by:
- // Created: 26.07.99
--// RCS-ID: $Id: control.h,v 1.45 2005/06/26 15:46:07 RR Exp $
-+// RCS-ID: $Id: control.h,v 1.45.2.1 2006/04/19 09:33:32 RL Exp $
- // Copyright: (c) wxWidgets team
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -66,6 +66,7 @@
- virtual void SetLabel( const wxString &label );
- virtual bool SetFont(const wxFont& font);
-
-+#if WX_USE_RESERVED_VIRTUALS
- // Reserved for future use
- virtual void ReservedControlFunc1() {}
- virtual void ReservedControlFunc2() {}
-@@ -76,6 +77,7 @@
- virtual void ReservedControlFunc7() {}
- virtual void ReservedControlFunc8() {}
- virtual void ReservedControlFunc9() {}
-+#endif
-
- protected:
- // creates the control (calls wxWindowBase::CreateBase inside) and adds it
-diff -ur wxWidgets-2.6.3/include/wx/dc.h wxWidgets-2.6.3.3/include/wx/dc.h
---- wxWidgets-2.6.3/include/wx/dc.h 2005-06-26 11:46:07.000000000 -0400
-+++ wxWidgets-2.6.3.3/include/wx/dc.h 2006-04-19 05:33:32.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin
- // Modified by:
- // Created: 05/25/99
--// RCS-ID: $Id: dc.h,v 1.69 2005/06/26 15:46:07 RR Exp $
-+// RCS-ID: $Id: dc.h,v 1.69.2.1 2006/04/19 09:33:32 RL Exp $
- // Copyright: (c) wxWidgets team
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -631,6 +631,7 @@
- if (h) *h = hh;
- }
-
-+#if WX_USE_RESERVED_VIRTUALS
- // Reserved for future use
- virtual void ReservedDCFunc1() {}
- virtual void ReservedDCFunc2() {}
-@@ -641,6 +642,7 @@
- virtual void ReservedDCFunc7() {}
- virtual void ReservedDCFunc8() {}
- virtual void ReservedDCFunc9() {}
-+#endif
-
- protected:
- // the pure virtual functions which should be implemented by wxDC
-diff -ur wxWidgets-2.6.3/include/wx/defs.h wxWidgets-2.6.3.3/include/wx/defs.h
---- wxWidgets-2.6.3/include/wx/defs.h 2006-01-26 08:15:47.000000000 -0500
-+++ wxWidgets-2.6.3.3/include/wx/defs.h 2006-05-29 13:34:40.000000000 -0400
-@@ -4,7 +4,7 @@
- * Author: Julian Smart and others
- * Modified by: Ryan Norton (Converted to C)
- * Created: 01/02/97
--* RCS-ID: $Id: defs.h,v 1.513.2.4 2006/01/26 13:15:47 JS Exp $
-+* RCS-ID: $Id: defs.h,v 1.513.2.5 2006/05/29 17:34:40 MW Exp $
- * Copyright: (c) Julian Smart
- * Licence: wxWindows licence
- */
-@@ -78,6 +78,12 @@
- # pragma warning(disable:4305) /* truncation of long to near ptr */
- #endif
-
-+ /* For VC++ 5.0 for release mode, the warning 'C4702: unreachable code */
-+ /* is buggy, and occurs for code that does actually get executed */
-+# if !defined __WXDEBUG__ && __VISUALC__ <= 1100
-+# pragma warning(disable:4702) /* unreachable code */
-+# endif
-+
- /* Deprecated functions such as sprintf, localtime */
- #if __VISUALC__ >= 1400
- #define _CRT_SECURE_NO_DEPRECATE 1
-diff -ur wxWidgets-2.6.3/include/wx/dlimpexp.h wxWidgets-2.6.3.3/include/wx/dlimpexp.h
---- wxWidgets-2.6.3/include/wx/dlimpexp.h 2005-06-22 16:58:47.000000000 -0400
-+++ wxWidgets-2.6.3.3/include/wx/dlimpexp.h 2006-06-25 20:03:33.000000000 -0400
-@@ -4,7 +4,7 @@
- * Author: Vadim Zeitlin
- * Modified by:
- * Created: 16.10.2003 (extracted from wx/defs.h)
-- * RCS-ID: $Id: dlimpexp.h,v 1.13 2005/06/22 20:58:47 MW Exp $
-+ * RCS-ID: $Id: dlimpexp.h,v 1.13.2.1 2006/06/26 00:03:33 VZ Exp $
- * Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
- * Licence: wxWindows licence
- */
-@@ -77,6 +77,7 @@
- # define WXMAKINGDLL_NET
- # define WXMAKINGDLL_CORE
- # define WXMAKINGDLL_ADV
-+# define WXMAKINGDLL_QA
- # define WXMAKINGDLL_ODBC
- # define WXMAKINGDLL_DBGRID
- # define WXMAKINGDLL_HTML
-diff -ur wxWidgets-2.6.3/include/wx/generic/fontdlgg.h wxWidgets-2.6.3.3/include/wx/generic/fontdlgg.h
---- wxWidgets-2.6.3/include/wx/generic/fontdlgg.h 2006-03-02 07:57:18.000000000 -0500
-+++ wxWidgets-2.6.3.3/include/wx/generic/fontdlgg.h 2006-05-23 07:16:34.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by:
- // Created: 01/02/97
--// RCS-ID: $Id: fontdlgg.h,v 1.18.2.1 2006/03/02 12:57:18 JS Exp $
-+// RCS-ID: $Id: fontdlgg.h,v 1.18.2.2 2006/05/23 11:16:34 JS Exp $
- // Copyright: (c) Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -52,6 +52,10 @@
- {
- public:
- wxGenericFontDialog() { Init(); }
-+#if wxABI_VERSION >= 20604
-+ wxGenericFontDialog(wxWindow *parent)
-+ : wxFontDialogBase(parent) { Init(); }
-+#endif
- wxGenericFontDialog(wxWindow *parent, const wxFontData& data)
- : wxFontDialogBase(parent, data) { Init(); }
- virtual ~wxGenericFontDialog();
-diff -ur wxWidgets-2.6.3/include/wx/generic/grid.h wxWidgets-2.6.3.3/include/wx/generic/grid.h
---- wxWidgets-2.6.3/include/wx/generic/grid.h 2005-09-25 16:46:22.000000000 -0400
-+++ wxWidgets-2.6.3.3/include/wx/generic/grid.h 2006-05-29 13:34:45.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Michael Bedward (based on code by Julian Smart, Robin Dunn)
- // Modified by:
- // Created: 1/08/1999
--// RCS-ID: $Id: grid.h,v 1.147.2.1 2005/09/25 20:46:22 MW Exp $
-+// RCS-ID: $Id: grid.h,v 1.147.2.2 2006/05/29 17:34:45 MW Exp $
- // Copyright: (c) Michael Bedward
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -105,7 +105,7 @@
- // calling DecRef() once will delete it. Calling IncRef() allows to lock
- // it until the matching DecRef() is called
- void IncRef() { m_nRef++; }
-- void DecRef() { if ( !--m_nRef ) delete this; }
-+ void DecRef() { if ( --m_nRef == 0 ) delete this; }
-
- // interpret renderer parameters: arbitrary string whose interpretatin is
- // left to the derived classes
-@@ -660,7 +660,7 @@
- // calling DecRef() once will delete it. Calling IncRef() allows to lock
- // it until the matching DecRef() is called
- void IncRef() { m_nRef++; }
-- void DecRef() { if ( !--m_nRef ) delete this; }
-+ void DecRef() { if ( --m_nRef == 0 ) delete this; }
-
- // setters
- void SetTextColour(const wxColour& colText) { m_colText = colText; }
-diff -ur wxWidgets-2.6.3/include/wx/gtk/scrolwin.h wxWidgets-2.6.3.3/include/wx/gtk/scrolwin.h
---- wxWidgets-2.6.3/include/wx/gtk/scrolwin.h 2005-03-17 16:21:42.000000000 -0500
-+++ wxWidgets-2.6.3.3/include/wx/gtk/scrolwin.h 2006-06-04 13:00:09.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Robert Roebling
- // Modified by:
- // Created: 01/02/97
--// RCS-ID: $Id: scrolwin.h,v 1.22 2005/03/17 21:21:42 JS Exp $
-+// RCS-ID: $Id: scrolwin.h,v 1.22.2.2 2006/06/04 17:00:09 PC Exp $
- // Copyright: (c) Robert Roebling
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -154,17 +154,9 @@
- void OnPaint(wxPaintEvent& event);
- void OnChar(wxKeyEvent& event);
-
-- void GtkVScroll( float value, unsigned int scroll_type );
-- void GtkHScroll( float value, unsigned int scroll_type );
-- void GtkVConnectEvent();
-- void GtkHConnectEvent();
-- void GtkVDisconnectEvent();
-- void GtkHDisconnectEvent();
--
- // Calculate scroll increment
- virtual int CalcScrollInc(wxScrollWinEvent& event);
-
-- // Overridden from wxWidgets due callback being static
- virtual void SetScrollPos( int orient, int pos, bool refresh = TRUE );
-
- #if WXWIN_COMPATIBILITY_2_2
-@@ -192,6 +184,13 @@
- double m_scaleY,m_scaleX;
-
- private:
-+ void DoScroll(int orient, int pos, int* posOld, int pixelsPerLine);
-+ void DoAdjustScrollbars(GtkAdjustment* adj,
-+ int pixelsPerLine,
-+ int winSize,
-+ int virtSize,
-+ int *linesPerPage);
-+
- DECLARE_EVENT_TABLE()
- DECLARE_DYNAMIC_CLASS(wxScrolledWindow)
- };
-diff -ur wxWidgets-2.6.3/include/wx/gtk/window.h wxWidgets-2.6.3.3/include/wx/gtk/window.h
---- wxWidgets-2.6.3/include/wx/gtk/window.h 2006-03-18 08:59:33.000000000 -0500
-+++ wxWidgets-2.6.3.3/include/wx/gtk/window.h 2006-05-29 03:31:23.000000000 -0400
-@@ -2,7 +2,7 @@
- // Name: wx/gtk/window.h
- // Purpose:
- // Author: Robert Roebling
--// Id: $Id: window.h,v 1.128.2.1 2006/03/18 13:59:33 RR Exp $
-+// Id: $Id: window.h,v 1.128.2.2 2006/05/29 07:31:23 PC Exp $
- // Copyright: (c) 1998 Robert Roebling
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -276,6 +276,8 @@
- virtual void DoSetToolTip( wxToolTip *tip );
- #endif // wxUSE_TOOLTIPS
-
-+ void HandleScrollEvent(GtkAdjustment* adj);
-+
- protected:
- // common part of all ctors (not virtual because called from ctor)
- void Init();
-diff -ur wxWidgets-2.6.3/include/wx/list.h wxWidgets-2.6.3.3/include/wx/list.h
---- wxWidgets-2.6.3/include/wx/list.h 2006-01-18 03:33:59.000000000 -0500
-+++ wxWidgets-2.6.3.3/include/wx/list.h 2006-07-01 21:27:37.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added
- // Created: 29/01/98
--// RCS-ID: $Id: list.h,v 1.93.2.2 2006/01/18 08:33:59 JS Exp $
-+// RCS-ID: $Id: list.h,v 1.93.2.3 2006/07/02 01:27:37 VZ Exp $
- // Copyright: (c) 1998 Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -178,7 +178,9 @@
- const compatibility_iterator* operator->() const { return this; } \
- \
- bool operator==(const compatibility_iterator& i) const \
-- { return (m_list == i.m_list) && (m_iter == i.m_iter); } \
-+ { return (m_list == i.m_list) && (m_iter == i.m_iter) \
-+ || !m_list && (i.m_iter == i.m_list->end()) \
-+ || !i.m_list && (m_iter == m_list->end()); } \
- bool operator!=(const compatibility_iterator& i) const \
- { return !( operator==( i ) ); } \
- operator bool() const \
-@@ -199,7 +201,8 @@
- compatibility_iterator GetPrevious() const \
- { \
- iterator i = m_iter; \
-- return compatibility_iterator( m_list, --i ); \
-+ i != m_list->begin() ? --i : i = m_list->end(); \
-+ return compatibility_iterator( m_list, i ); \
- } \
- int IndexOf() const \
- { \
-diff -ur wxWidgets-2.6.3/include/wx/metafile.h wxWidgets-2.6.3.3/include/wx/metafile.h
---- wxWidgets-2.6.3/include/wx/metafile.h 2005-08-19 09:48:19.000000000 -0400
-+++ wxWidgets-2.6.3.3/include/wx/metafile.h 2006-06-26 10:37:34.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: wxWidgets team
- // Modified by:
- // Created: 13.01.00
--// RCS-ID: $Id: metafile.h,v 1.14 2005/08/19 13:48:19 MW Exp $
-+// RCS-ID: $Id: metafile.h,v 1.14.2.1 2006/06/26 14:37:34 VZ Exp $
- // Copyright: (c) wxWidgets team
- // Licence: wxWindows licence
- ///////////////////////////////////////////////////////////////////////////////
-@@ -28,16 +28,19 @@
- #if defined(__WXPALMOS__)
- #include "wx/palmos/enhmeta.h"
- #else
-- #include "wx/msw/enhmeta.h"
-+ #include "wx/msw/enhmeta.h"
- #endif
-
-- // map all metafile classes to enh metafile
-- #if !wxUSE_WIN_METAFILES_ALWAYS
-+ #if wxUSE_WIN_METAFILES_ALWAYS
-+ // use normal metafiles as well
-+ #include "wx/msw/metafile.h"
-+ #else // also map all metafile classes to enh metafile
- typedef wxEnhMetaFile wxMetafile;
- typedef wxEnhMetaFileDC wxMetafileDC;
--#if wxUSE_DRAG_AND_DROP
-- typedef wxEnhMetaFileDataObject wxMetafileDataObject;
--#endif
-+ #if wxUSE_DRAG_AND_DROP
-+ typedef wxEnhMetaFileDataObject wxMetafileDataObject;
-+ #endif
-+
- // this flag will be set if wxMetafile class is wxEnhMetaFile
- #define wxMETAFILE_IS_ENH
- #endif // wxUSE_WIN_METAFILES_ALWAYS
-@@ -45,8 +48,8 @@
- #if defined(__WXPALMOS__)
- #include "wx/palmos/metafile.h"
- #else
-- #include "wx/msw/metafile.h"
-- #endif
-+ #include "wx/msw/metafile.h"
-+ #endif
- #endif
- #elif defined(__WXPM__)
- #include "wx/os2/metafile.h"
-@@ -55,5 +58,5 @@
- #endif
-
- #endif // wxUSE_METAFILE
--#endif
-- // _WX_METAFILE_H_BASE_
-+
-+#endif // _WX_METAFILE_H_BASE_
-diff -ur wxWidgets-2.6.3/include/wx/notebook.h wxWidgets-2.6.3.3/include/wx/notebook.h
---- wxWidgets-2.6.3/include/wx/notebook.h 2005-06-26 11:46:08.000000000 -0400
-+++ wxWidgets-2.6.3.3/include/wx/notebook.h 2006-04-19 05:33:32.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin
- // Modified by:
- // Created: 01.02.01
--// RCS-ID: $Id: notebook.h,v 1.53 2005/06/26 15:46:08 RR Exp $
-+// RCS-ID: $Id: notebook.h,v 1.53.2.1 2006/04/19 09:33:32 RL Exp $
- // Copyright: (c) 1996-2000 Vadim Zeitlin
- // Licence: wxWindows licence
- ///////////////////////////////////////////////////////////////////////////////
-@@ -95,12 +95,14 @@
- virtual wxColour GetThemeBackgroundColour() const { return wxNullColour; }
-
-
-+#if WX_USE_RESERVED_VIRTUALS
- // Reserved for future use
- virtual void ReservedNotebookFunc1() {}
- virtual void ReservedNotebookFunc2() {}
- virtual void ReservedNotebookFunc3() {}
- virtual void ReservedNotebookFunc4() {}
- virtual void ReservedNotebookFunc5() {}
-+#endif
-
- protected:
- DECLARE_NO_COPY_CLASS(wxNotebookBase)
-diff -ur wxWidgets-2.6.3/include/wx/object.h wxWidgets-2.6.3.3/include/wx/object.h
---- wxWidgets-2.6.3/include/wx/object.h 2005-07-22 12:56:23.000000000 -0400
-+++ wxWidgets-2.6.3.3/include/wx/object.h 2006-04-19 05:33:33.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by: Ron Lee
- // Created: 01/02/97
--// RCS-ID: $Id: object.h,v 1.119 2005/07/22 16:56:23 ABX Exp $
-+// RCS-ID: $Id: object.h,v 1.119.2.1 2006/04/19 09:33:33 RL Exp $
- // Copyright: (c) 1997 Julian Smart
- // (c) 2001 Ron Lee <ron@debian.org>
- // Licence: wxWindows licence
-@@ -469,6 +469,7 @@
- void UnRef();
-
-
-+#if WX_USE_RESERVED_VIRTUALS
- // Reserved for future use
- virtual void ReservedObjectFunc1() {}
- virtual void ReservedObjectFunc2() {}
-@@ -479,6 +480,7 @@
- virtual void ReservedObjectFunc7() {}
- virtual void ReservedObjectFunc8() {}
- virtual void ReservedObjectFunc9() {}
-+#endif
-
- protected:
- // ensure that our data is not shared with anybody else: if we have no
-diff -ur wxWidgets-2.6.3/include/wx/platform.h wxWidgets-2.6.3.3/include/wx/platform.h
---- wxWidgets-2.6.3/include/wx/platform.h 2006-01-18 05:25:00.000000000 -0500
-+++ wxWidgets-2.6.3.3/include/wx/platform.h 2006-05-19 12:57:07.000000000 -0400
-@@ -4,7 +4,7 @@
- * Author: Vadim Zeitlin
- * Modified by:
- * Created: 29.10.01 (extracted from wx/defs.h)
--* RCS-ID: $Id: platform.h,v 1.81.2.3 2006/01/18 10:25:00 JS Exp $
-+* RCS-ID: $Id: platform.h,v 1.81.2.4 2006/05/19 16:57:07 PC Exp $
- * Copyright: (c) 1997-2001 Vadim Zeitlin
- * Licence: wxWindows licence
- */
-@@ -513,10 +513,13 @@
- ... no gcc at all or gcc < 3.1 ...
- # endif
- */
--#define wxCHECK_GCC_VERSION( major, minor ) \
-- ( defined(__GNUC__) && defined(__GNUC_MINOR__) \
-- && ( ( __GNUC__ > (major) ) \
-- || ( __GNUC__ == (major) && __GNUC_MINOR__ >= (minor) ) ) )
-+#if defined(__GNUC__) && defined(__GNUC_MINOR__)
-+ #define wxCHECK_GCC_VERSION( major, minor ) \
-+ ( ( __GNUC__ > (major) ) \
-+ || ( __GNUC__ == (major) && __GNUC_MINOR__ >= (minor) ) )
-+#else
-+ #define wxCHECK_GCC_VERSION( major, minor ) 0
-+#endif
-
- /*
- This macro can be used to check that the version of mingw32 compiler is
-diff -ur wxWidgets-2.6.3/include/wx/prntbase.h wxWidgets-2.6.3.3/include/wx/prntbase.h
---- wxWidgets-2.6.3/include/wx/prntbase.h 2005-07-28 18:20:05.000000000 -0400
-+++ wxWidgets-2.6.3.3/include/wx/prntbase.h 2006-06-28 08:56:04.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by:
- // Created: 01/02/97
--// RCS-ID: $Id: prntbase.h,v 1.45 2005/07/28 22:20:05 VZ Exp $
-+// RCS-ID: $Id: prntbase.h,v 1.45.2.1 2006/06/28 12:56:04 JS Exp $
- // Copyright: (c) Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -571,6 +571,9 @@
- virtual void AdjustScrollbars(wxPreviewCanvas *canvas);
- virtual bool RenderPage(int pageNum);
- virtual void SetZoom(int percent);
-+#if wxABI_VERSION >= 20604
-+ virtual int GetZoom() const;
-+#endif
-
- virtual bool Print(bool interactive);
- virtual void DetermineScaling();
-diff -ur wxWidgets-2.6.3/include/wx/rawbmp.h wxWidgets-2.6.3.3/include/wx/rawbmp.h
---- wxWidgets-2.6.3/include/wx/rawbmp.h 2006-01-26 07:26:37.000000000 -0500
-+++ wxWidgets-2.6.3.3/include/wx/rawbmp.h 2006-05-29 13:54:54.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Eric Kidd, Vadim Zeitlin
- // Modified by:
- // Created: 10.03.03
--// RCS-ID: $Id: rawbmp.h,v 1.30.2.1 2006/01/26 12:26:37 RR Exp $
-+// RCS-ID: $Id: rawbmp.h,v 1.30.2.2 2006/05/29 17:54:54 MW Exp $
- // Copyright: (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
- // Licence: wxWindows licence
- ///////////////////////////////////////////////////////////////////////////////
-@@ -71,7 +71,7 @@
- }
- */
-
--#ifdef __VISUALC__
-+#if defined __VISUALC__ && __VISUALC__ >= 1200
- // VC++ gives an absolutely harmless warning for wxPixelData<wxBitmap> ctor
- #pragma warning(push)
- #pragma warning(disable: 4355) // 'this' used in initializer list
-@@ -717,7 +717,7 @@
- {
- };
-
--#ifdef __VISUALC__
-+#if defined __VISUALC__ && __VISUALC__ >= 1200
- #pragma warning(pop)
- #endif
-
-diff -ur wxWidgets-2.6.3/include/wx/setup_inc.h wxWidgets-2.6.3.3/include/wx/setup_inc.h
---- wxWidgets-2.6.3/include/wx/setup_inc.h 2005-07-29 20:36:30.000000000 -0400
-+++ wxWidgets-2.6.3.3/include/wx/setup_inc.h 2006-04-19 10:36:49.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin
- // Modified by:
- // Created:
--// RCS-ID: $Id: setup_inc.h,v 1.24 2005/07/30 00:36:30 VZ Exp $
-+// RCS-ID: $Id: setup_inc.h,v 1.24.2.1 2006/04/19 14:36:49 RL Exp $
- // Copyright: (c) Vadim Zeitlin
- // Licence: wxWindows licence
- ///////////////////////////////////////////////////////////////////////////////
-@@ -41,6 +41,14 @@
- // Recommended setting: 0 (please update your code)
- #define WXWIN_COMPATIBILITY_2_4 1
-
-+// This setting controls the inclusion of reserved virtual functions
-+// that were introduced just prior to the 2.6 freeze but have been
-+// removed again for 2.7+
-+//
-+// Default is 1, typically you should not change it unless you know
-+// exactly why you don't want them included.
-+#define WX_USE_RESERVED_VIRTUALS 1
-+
- // MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
- // default system font is used for wxWindow::GetCharWidth/Height() instead of
- // the current font.
-diff -ur wxWidgets-2.6.3/include/wx/stream.h wxWidgets-2.6.3.3/include/wx/stream.h
---- wxWidgets-2.6.3/include/wx/stream.h 2005-06-26 11:46:08.000000000 -0400
-+++ wxWidgets-2.6.3.3/include/wx/stream.h 2006-04-19 05:33:33.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Guilhem Lavaux, Guillermo Rodriguez Garcia, Vadim Zeitlin
- // Modified by:
- // Created: 11/07/98
--// RCS-ID: $Id: stream.h,v 1.71 2005/06/26 15:46:08 RR Exp $
-+// RCS-ID: $Id: stream.h,v 1.71.2.1 2006/04/19 09:33:33 RL Exp $
- // Copyright: (c) Guilhem Lavaux
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -95,6 +95,7 @@
- #endif // WXWIN_COMPATIBILITY_2_2
-
-
-+#if WX_USE_RESERVED_VIRTUALS
- // Reserved for future use
- virtual void ReservedStreamFunc1() {}
- virtual void ReservedStreamFunc2() {}
-@@ -105,6 +106,7 @@
- virtual void ReservedStreamFunc7() {}
- virtual void ReservedStreamFunc8() {}
- virtual void ReservedStreamFunc9() {}
-+#endif
-
- protected:
- virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
-diff -ur wxWidgets-2.6.3/include/wx/string.h wxWidgets-2.6.3.3/include/wx/string.h
---- wxWidgets-2.6.3/include/wx/string.h 2005-12-15 14:26:27.000000000 -0500
-+++ wxWidgets-2.6.3.3/include/wx/string.h 2006-07-06 06:29:58.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin
- // Modified by:
- // Created: 29/01/98
--// RCS-ID: $Id: string.h,v 1.206.2.3 2005/12/15 19:26:27 VZ Exp $
-+// RCS-ID: $Id: string.h,v 1.206.2.4 2006/07/06 10:29:58 ABX Exp $
- // Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
- // Licence: wxWindows licence
- ///////////////////////////////////////////////////////////////////////////////
-@@ -299,6 +299,53 @@
- typedef value_type *iterator;
- typedef const value_type *const_iterator;
-
-+#if wxABI_VERSION >= 20604
-+
-+#define wxSTRING_REVERSE_ITERATOR(name, const_or_not) \
-+ class name \
-+ { \
-+ public: \
-+ typedef wxChar value_type; \
-+ typedef const_or_not value_type& reference; \
-+ typedef const_or_not value_type *pointer; \
-+ typedef const_or_not value_type *iterator_type; \
-+ \
-+ name(iterator_type i) : m_cur(i) { } \
-+ name(const name& ri) : m_cur(ri.m_cur) { } \
-+ \
-+ iterator_type base() const { return m_cur; } \
-+ \
-+ reference operator*() const { return *(m_cur - 1); } \
-+ \
-+ name& operator++() { --m_cur; return *this; } \
-+ name operator++(int) { name tmp = *this; --m_cur; return tmp; } \
-+ name& operator--() { ++m_cur; return *this; } \
-+ name operator--(int) { name tmp = *this; ++m_cur; return tmp; } \
-+ \
-+ bool operator==(name ri) const { return m_cur == ri.m_cur; } \
-+ bool operator!=(name ri) const { return !(*this == ri); } \
-+ \
-+ private: \
-+ iterator_type m_cur; \
-+ }
-+
-+ wxSTRING_REVERSE_ITERATOR(const_reverse_iterator, const);
-+
-+ #define wxSTRING_CONST
-+ wxSTRING_REVERSE_ITERATOR(reverse_iterator, wxSTRING_CONST);
-+ #undef wxSTRING_CONST
-+
-+ #undef wxSTRING_REVERSE_ITERATOR
-+
-+ // first element of the reversed string
-+ const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); }
-+ reverse_iterator rbegin() { return reverse_iterator(end()); }
-+ // one beyond the end of the reversed string
-+ const_reverse_iterator rend() const { return const_reverse_iterator(begin()); }
-+ reverse_iterator rend() { return reverse_iterator(begin()); }
-+
-+#endif // ABI >= 2.6.4
-+
- // constructors and destructor
- // ctor for an empty string
- wxStringBase() { Init(); }
-diff -ur wxWidgets-2.6.3/include/wx/tglbtn.h wxWidgets-2.6.3.3/include/wx/tglbtn.h
---- wxWidgets-2.6.3/include/wx/tglbtn.h 2005-05-04 14:52:05.000000000 -0400
-+++ wxWidgets-2.6.3.3/include/wx/tglbtn.h 2006-05-23 13:53:50.000000000 -0400
-@@ -5,7 +5,7 @@
- // Author: John Norris, minor changes by Axel Schlueter
- // Modified by:
- // Created: 08.02.01
--// RCS-ID: $Id: tglbtn.h,v 1.11 2005/05/04 18:52:05 JS Exp $
-+// RCS-ID: $Id: tglbtn.h,v 1.11.2.1 2006/05/23 17:53:50 JS Exp $
- // Copyright: (c) 2000 Johnny C. Norris II
- // License: wxWindows Licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -27,7 +27,9 @@
- #define EVT_TOGGLEBUTTON(id, fn) \
- wx__DECLARE_EVT1(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, id, wxCommandEventHandler(fn))
-
--#if defined(__WXMSW__)
-+#if defined(__WXUNIVERSAL__)
-+ #include "wx/univ/tglbtn.h"
-+#elif defined(__WXMSW__)
- #include "wx/msw/tglbtn.h"
- #elif defined(__WXGTK__)
- #include "wx/gtk/tglbtn.h"
-diff -ur wxWidgets-2.6.3/include/wx/toplevel.h wxWidgets-2.6.3.3/include/wx/toplevel.h
---- wxWidgets-2.6.3/include/wx/toplevel.h 2005-06-26 11:46:08.000000000 -0400
-+++ wxWidgets-2.6.3.3/include/wx/toplevel.h 2006-04-19 05:33:33.000000000 -0400
-@@ -5,7 +5,7 @@
- // Author: Vadim Zeitlin, Vaclav Slavik
- // Modified by:
- // Created: 06.08.01
--// RCS-ID: $Id: toplevel.h,v 1.53 2005/06/26 15:46:08 RR Exp $
-+// RCS-ID: $Id: toplevel.h,v 1.53.2.1 2006/04/19 09:33:33 RL Exp $
- // Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
- // Vaclav Slavik <vaclav@wxwidgets.org>
- // Licence: wxWindows licence
-@@ -206,6 +206,7 @@
- // do the window-specific processing after processing the update event
- virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ;
-
-+#if WX_USE_RESERVED_VIRTUALS
- // Reserved for future use
- virtual void ReservedTopLevelWindowFunc1() {}
- virtual void ReservedTopLevelWindowFunc2() {}
-@@ -216,6 +217,7 @@
- virtual void ReservedTopLevelWindowFunc7() {}
- virtual void ReservedTopLevelWindowFunc8() {}
- virtual void ReservedTopLevelWindowFunc9() {}
-+#endif
-
- protected:
- // the frame client to screen translation should take account of the
-diff -ur wxWidgets-2.6.3/include/wx/version.h wxWidgets-2.6.3.3/include/wx/version.h
---- wxWidgets-2.6.3/include/wx/version.h 2006-01-18 05:25:00.000000000 -0500
-+++ wxWidgets-2.6.3.3/include/wx/version.h 2006-05-02 22:25:43.000000000 -0400
-@@ -4,7 +4,7 @@
- * Author: Julian Smart
- * Modified by: Ryan Norton (Converted to C)
- * Created: 29/01/98
--* RCS-ID: $Id: version.h,v 1.69.2.2 2006/01/18 10:25:00 JS Exp $
-+* RCS-ID: $Id: version.h,v 1.69.2.4 2006/05/03 02:25:43 RD Exp $
- * Copyright: (c) 1998 Julian Smart
- * Licence: wxWindows licence
- */
-@@ -22,7 +22,7 @@
- #define wxMAJOR_VERSION 2
- #define wxMINOR_VERSION 6
- #define wxRELEASE_NUMBER 3
--#define wxSUBRELEASE_NUMBER 0
-+#define wxSUBRELEASE_NUMBER 3
- #define wxVERSION_STRING _T("wxWidgets 2.6.3")
-
- /* nothing to update below this line when updating the version */
-diff -ur wxWidgets-2.6.3/include/wx/window.h wxWidgets-2.6.3.3/include/wx/window.h
---- wxWidgets-2.6.3/include/wx/window.h 2006-01-30 23:02:41.000000000 -0500
-+++ wxWidgets-2.6.3.3/include/wx/window.h 2006-04-19 05:33:34.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin
- // Modified by: Ron Lee
- // Created: 01/02/97
--// RCS-ID: $Id: window.h,v 1.189.2.2 2006/01/31 04:02:41 RD Exp $
-+// RCS-ID: $Id: window.h,v 1.189.2.3 2006/04/19 09:33:34 RL Exp $
- // Copyright: (c) Vadim Zeitlin
- // Licence: wxWindows licence
- ///////////////////////////////////////////////////////////////////////////////
-@@ -1073,6 +1073,7 @@
- // behaviour in the most common case
- virtual bool ShouldInheritColours() const { return false; }
-
-+#if WX_USE_RESERVED_VIRTUALS
- // Reserved for future use
- virtual void ReservedWindowFunc1() {}
- virtual void ReservedWindowFunc2() {}
-@@ -1083,6 +1084,7 @@
- virtual void ReservedWindowFunc7() {}
- virtual void ReservedWindowFunc8() {}
- virtual void ReservedWindowFunc9() {}
-+#endif
-
- protected:
- // event handling specific to wxWindow
-@@ -1316,8 +1318,10 @@
- // implements the window variants
- virtual void DoSetWindowVariant( wxWindowVariant variant ) ;
-
-+#if WX_USE_RESERVED_VIRTUALS
- // Reserved for future use
- void* m_windowReserved;
-+#endif
-
- private:
- // contains the last id generated by NewControlId
-diff -ur wxWidgets-2.6.3/include/wx/wx_cw_cm.h wxWidgets-2.6.3.3/include/wx/wx_cw_cm.h
---- wxWidgets-2.6.3/include/wx/wx_cw_cm.h 2006-01-18 09:12:23.000000000 -0500
-+++ wxWidgets-2.6.3.3/include/wx/wx_cw_cm.h 2006-05-09 10:30:49.000000000 -0400
-@@ -4,7 +4,7 @@
- Author: Stefan Csomor
- Modified by:
- Created:
-- RCS-ID: $Id: wx_cw_cm.h,v 1.22.2.1 2006/01/18 14:12:23 JS Exp $
-+ RCS-ID: $Id: wx_cw_cm.h,v 1.22.2.2 2006/05/09 14:30:49 VZ Exp $
- Copyright: (c) Stefan Csomor
- Licence: wxWindows licence
- */
-@@ -19,7 +19,9 @@
- #error "this file is only for builds with Metrowerks CodeWarrior"
- #endif
-
--#define WX_COMP_INLINE_NO_CLASS // defined if the compiler does not want the classname repeated for inlines within a class definition
-+// defined if the compiler does not want the classname repeated for inlines
-+// within a class definition
-+#define WX_COMP_INLINE_NO_CLASS
-
- #if __MWERKS__ >= 0x2400 && __MWERKS__ < 0x3200
- #pragma old_argmatch on
-@@ -55,22 +57,23 @@
- #endif
- #endif
- #elif defined( __WXMAC__)
-- #define USE_PRECOMPILED_MAC_HEADERS 0 /*Set to 0 if you don't want to use precompiled MacHeaders*/
-+ /* Set to 0 if you don't want to use precompiled MacHeaders */
-+ #define USE_PRECOMPILED_MAC_HEADERS 0
- #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
- #define OPAQUE_TOOLBOX_STRUCTS 1
--
-- /*CW9 has mbstate_t*/
-- #if defined(__MACH__) && __MWERKS__ < 0x3200
-- typedef int mbstate_t;
-- #define _MBSTATE_T
-+
-+ /* CW8.3+ has mbstate_t */
-+ #if defined(__MACH__) && __MWERKS__ < 0x3003
-+ typedef int mbstate_t;
-+ #define _MBSTATE_T
- #endif
--
-- /*CW9 has ssize_t*/
-+
-+ /* CW9 has ssize_t */
- #if defined(__MACH__) && __MWERKS__ >= 0x3200
- #define HAVE_SSIZE_T
-- #endif
--
-- #include <mslconfig>
-+ #endif
-+
-+ #include <mslconfig>
- // for getting the correct expat includes
- #define MACOS_CLASSIC
- /*
-diff -ur wxWidgets-2.6.3/locale/de.po wxWidgets-2.6.3.3/locale/de.po
---- wxWidgets-2.6.3/locale/de.po 2005-08-21 12:02:08.000000000 -0400
-+++ wxWidgets-2.6.3.3/locale/de.po 2006-04-16 00:13:50.000000000 -0400
-@@ -13,21 +13,22 @@
- #: ../src/common/debugrpt.cpp:569
- #, c-format
- msgid "\t%s: %s\n"
--msgstr ""
-+msgstr "\t%s: %s\n"
-
- #: ../src/common/debugrpt.cpp:572
- msgid ""
- "\n"
- "Please send this report to the program maintainer, thank you!\n"
- msgstr ""
-+"Senden Sie bitte diesen Bericht an den Programmbetreuer. Vielen Dank!\n"
-
- #: ../src/palmos/utils.cpp:206
- msgid " "
--msgstr ""
-+msgstr " "
-
- #: ../src/generic/dbgrptg.cpp:312
- msgid " Thank you and we're sorry for the inconvenience!\n"
--msgstr ""
-+msgstr " Vielen Dank und entschuldigen Sie die Unannehmlichkeiten!\n"
-
- #: ../src/common/log.cpp:321
- #, c-format
-@@ -113,23 +114,23 @@
- #: ../contrib/src/deprecated/resource.cpp:2390
- #, c-format
- msgid "%s not a bitmap resource specification."
--msgstr "%s gibt keine Quelle f�r eine Bitmap-Graphik an."
-+msgstr "%s gibt keine Quelle f�r eine Bitmap-Grafik an."
-
- #: ../contrib/src/deprecated/resource.cpp:2544
- #, c-format
- msgid "%s not an icon resource specification."
--msgstr "%s gibt keine Quelle f�r eine Icon-Graphik an."
-+msgstr "%s gibt keine Quelle f�r eine Icon-Grafik an."
-
- #: ../contrib/src/deprecated/resource.cpp:1901
- #: ../contrib/src/deprecated/resource.cpp:2030
- #: ../contrib/src/deprecated/resource.cpp:3123
- #, c-format
- msgid "%s: ill-formed resource file syntax."
--msgstr "%s: inkorrekter Syntax der Resource-Datei."
-+msgstr "%s: inkorrekte Syntax der Ressourcen-Datei."
-
- #: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359
- msgid "&About..."
--msgstr "�be&r..."
-+msgstr "�be&r ..."
-
- #: ../src/common/stockitem.cpp:153
- msgid "&Actual Size"
-@@ -176,7 +177,7 @@
-
- #: ../src/generic/dbgrptg.cpp:320
- msgid "&Debug report preview:"
--msgstr ""
-+msgstr "Voransicht des Fehlerberichts:"
-
- #: ../src/common/stockitem.cpp:115 ../src/mac/carbon/textctrl.cpp:1076
- #: ../src/msw/textctrl.cpp:2066
-@@ -261,9 +262,8 @@
- msgstr "&Nein"
-
- #: ../src/generic/dbgrptg.cpp:342
--#, fuzzy
- msgid "&Notes:"
--msgstr "&Nein"
-+msgstr "&Hinweise:"
-
- #: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368
- #: ../src/generic/fontdlgg.cpp:375
-@@ -272,11 +272,11 @@
-
- #: ../src/common/stockitem.cpp:134
- msgid "&Open"
--msgstr "&�ffnen..."
-+msgstr "&�ffnen ..."
-
- #: ../src/html/helpfrm.cpp:352
- msgid "&Open..."
--msgstr "�ffnen..."
-+msgstr "�ffnen ..."
-
- #: ../src/common/stockitem.cpp:135 ../src/mac/carbon/textctrl.cpp:1075
- #: ../src/msw/textctrl.cpp:2065
-@@ -301,7 +301,7 @@
-
- #: ../src/common/prntbase.cpp:880
- msgid "&Print..."
--msgstr "Drucken..."
-+msgstr "Drucken ..."
-
- #: ../src/common/stockitem.cpp:139
- msgid "&Properties"
-@@ -335,7 +335,7 @@
-
- #: ../src/generic/logg.cpp:505
- msgid "&Save..."
--msgstr "&Sichern..."
-+msgstr "&Sichern ..."
-
- #: ../src/generic/tipdlg.cpp:238
- msgid "&Show tips at startup"
-@@ -445,25 +445,25 @@
-
- #: ../src/common/debugrpt.cpp:559
- msgid "*** A debug report has been generated\n"
--msgstr ""
-+msgstr "*** Ein Fehlerbericht wurde erstellt.\n"
-
- #: ../src/common/debugrpt.cpp:562
- msgid "*** And includes the following files:\n"
--msgstr ""
-+msgstr "*** Und beinhaltet die folgenden Dateien:\n"
-
- #: ../src/common/debugrpt.cpp:560
- #, c-format
- msgid "*** It can be found in \"%s\"\n"
--msgstr ""
-+msgstr "*** Sie finden ihn in \"%s\"\n"
-
- #: ../contrib/src/deprecated/resource.cpp:1840
- #: ../contrib/src/deprecated/resource.cpp:1970
- #: ../contrib/src/deprecated/resource.cpp:3062
--#, fuzzy
- msgid ""
- ", expected static, #include or #define\n"
- "while parsing resource."
--msgstr "Erwarte 'char' w�hrend der Suche in einer Ressource."
-+msgstr ", erwartete static, #include oder #define\n"
-+"bei Abfrage einer Ressource."
-
- #: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:740
- msgid "."
-@@ -487,23 +487,20 @@
- msgstr "11 x 17 Zoll"
-
- #: ../src/common/paper.cpp:191
--#, fuzzy
- msgid "12 x 11 in"
--msgstr "10 x 14 Zoll"
-+msgstr "12 x 11 Zoll"
-
- #: ../src/common/paper.cpp:148
--#, fuzzy
- msgid "15 x 11 in"
--msgstr "10 x 14 Zoll"
-+msgstr "15 x 11 Zoll"
-
- #: ../src/common/paper.cpp:139
- msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
- msgstr "6 3/4 Umschlag, 3 5/8 x 6 1/2 Zoll"
-
- #: ../src/common/paper.cpp:146
--#, fuzzy
- msgid "9 x 11 in"
--msgstr "11 x 17 Zoll"
-+msgstr "9 x 11 Zoll"
-
- #: ../src/html/htmprint.cpp:309
- msgid ": file does not exist!"
-@@ -563,7 +560,7 @@
-
- #: ../src/generic/dbgrptg.cpp:304
- msgid "A debug report has been generated in the directory\n"
--msgstr ""
-+msgstr "Fehlerbericht wurde erstellt im Verzeichnis\n"
-
- #: ../src/common/xtixml.cpp:409
- msgid "A non empty collection must consist of 'element' nodes"
-@@ -574,24 +571,20 @@
- msgstr ""
-
- #: ../src/common/paper.cpp:163
--#, fuzzy
- msgid "A3 Extra 322 x 445 mm"
--msgstr "C3 Umschlag, 324 x 458 mm"
-+msgstr "A3 Extra, 322 x 445 mm"
-
- #: ../src/common/paper.cpp:168
--#, fuzzy
- msgid "A3 Extra Transverse 322 x 445 mm"
--msgstr "C3 Umschlag, 324 x 458 mm"
-+msgstr "A3 Extra quer, 322 x 445 mm"
-
- #: ../src/common/paper.cpp:177
--#, fuzzy
- msgid "A3 Rotated 420 x 297 mm"
--msgstr "A4 Blatt, 210 x 297 mm"
-+msgstr "A3 gedreht, 420 x 297 mm"
-
- #: ../src/common/paper.cpp:167
--#, fuzzy
- msgid "A3 Transverse 297 x 420 mm"
--msgstr "A3 Blatt, 297 x 420 mm"
-+msgstr "A3 quer, 297 x 420 mm"
-
- #: ../src/common/paper.cpp:113
- msgid "A3 sheet, 297 x 420 mm"
-@@ -602,19 +595,16 @@
- msgstr ""
-
- #: ../src/common/paper.cpp:160
--#, fuzzy
- msgid "A4 Plus 210 x 330 mm"
--msgstr "A4 Blatt, 210 x 297 mm"
-+msgstr "A4 Plus, 210 x 330 mm"
-
- #: ../src/common/paper.cpp:178
--#, fuzzy
- msgid "A4 Rotated 297 x 210 mm"
--msgstr "A3 Blatt, 297 x 420 mm"
-+msgstr "A4 gedreht, 297 x 210 mm"
-
- #: ../src/common/paper.cpp:155
--#, fuzzy
- msgid "A4 Transverse 210 x 297 mm"
--msgstr "A4 Blatt, 210 x 297 mm"
-+msgstr "A4 quer, 210 x 297 mm"
-
- #: ../src/common/paper.cpp:104
- msgid "A4 sheet, 210 x 297 mm"
-@@ -622,35 +612,31 @@
-
- #: ../src/common/paper.cpp:114
- msgid "A4 small sheet, 210 x 297 mm"
--msgstr "A4 klein Blatt, 210 x 297 mm"
-+msgstr "A4 kleines Blatt, 210 x 297 mm"
-
- #: ../src/common/paper.cpp:164
--#, fuzzy
- msgid "A5 Extra 174 x 235 mm"
--msgstr "A4 Blatt, 148 x 210 mm"
-+msgstr "A5 extra, 174 x 235 mm"
-
- #: ../src/common/paper.cpp:179
- msgid "A5 Rotated 210 x 148 mm"
--msgstr ""
-+msgstr "A5 gedreht, 210 x 148 mm"
-
- #: ../src/common/paper.cpp:161
--#, fuzzy
- msgid "A5 Transverse 148 x 210 mm"
--msgstr "A4 Blatt, 148 x 210 mm"
-+msgstr "A5 quer, 148 x 210 mm"
-
- #: ../src/common/paper.cpp:115
- msgid "A5 sheet, 148 x 210 mm"
--msgstr "A4 Blatt, 148 x 210 mm"
-+msgstr "A5 Blatt, 148 x 210 mm"
-
- #: ../src/common/paper.cpp:171
--#, fuzzy
- msgid "A6 105 x 148 mm"
--msgstr "10 x 14 Zoll"
-+msgstr "A6 105 x 148 mm"
-
- #: ../src/common/paper.cpp:184
--#, fuzzy
- msgid "A6 Rotated 148 x 105 mm"
--msgstr "A4 Blatt, 148 x 210 mm"
-+msgstr "A6 gedreht, 148 x 105 mm"
-
- #: ../src/generic/fontdlgg.cpp:87
- msgid "ABCDEFGabcdefg12345"
-@@ -666,7 +652,7 @@
-
- #: ../src/html/helpfrm.cpp:444
- msgid "Add current page to bookmarks"
--msgstr "Aktuelle HTLM-Seite den Lesezeichen hinzuf�gen"
-+msgstr "Aktuelle Seite den Lesezeichen hinzuf�gen"
-
- #: ../src/generic/colrdlgg.cpp:299
- msgid "Add to custom colours"
-@@ -740,13 +726,12 @@
- msgstr "Eigenschaften"
-
- #: ../src/common/paper.cpp:144
--#, fuzzy
- msgid "B4 (ISO) 250 x 353 mm"
--msgstr "B4 Blatt, 250 x 354 mm"
-+msgstr "B4 (ISO), 250 x 353 mm"
-
- #: ../src/common/paper.cpp:180
- msgid "B4 (JIS) Rotated 364 x 257 mm"
--msgstr ""
-+msgstr "B4 (JIS) gedreht, 364 x 257 mm"
-
- #: ../src/common/paper.cpp:134
- msgid "B4 Envelope, 250 x 353 mm"
-@@ -758,16 +743,15 @@
-
- #: ../src/common/paper.cpp:165
- msgid "B5 (ISO) Extra 201 x 276 mm"
--msgstr ""
-+msgstr "B5 (ISO) extra, 201 x 276 mm"
-
- #: ../src/common/paper.cpp:181
- msgid "B5 (JIS) Rotated 257 x 182 mm"
--msgstr ""
-+msgstr "B5 (JIS) gedreht, 257 x 182 mm"
-
- #: ../src/common/paper.cpp:162
--#, fuzzy
- msgid "B5 (JIS) Transverse 182 x 257 mm"
--msgstr "B5 Blatt, 182 x 257 mm"
-+msgstr "B5 (JIS) quer, 182 x 257 mm"
-
- #: ../src/common/paper.cpp:135
- msgid "B5 Envelope, 176 x 250 mm"
-@@ -779,11 +763,11 @@
-
- #: ../src/common/paper.cpp:189
- msgid "B6 (JIS) 128 x 182 mm"
--msgstr ""
-+msgstr "B6 (JIS), 128 y 182 mm"
-
- #: ../src/common/paper.cpp:190
- msgid "B6 (JIS) Rotated 182 x 128 mm"
--msgstr ""
-+msgstr "B6 (JIS) gedreht, 182 x 128 mm"
-
- #: ../src/common/paper.cpp:136
- msgid "B6 Envelope, 176 x 125 mm"
-@@ -795,7 +779,7 @@
-
- #: ../src/common/imagbmp.cpp:94
- msgid "BMP: Couldn't save invalid image."
--msgstr "BMP: Konnte ung�ltige Format nicht sichern."
-+msgstr "BMP: Konnte ung�ltiges Image nicht sichern."
-
- #: ../src/common/imagbmp.cpp:298
- msgid "BMP: Couldn't write RGB color map."
-@@ -1148,7 +1132,7 @@
- #: ../src/html/helpdata.cpp:312
- #, c-format
- msgid "Cannot open contents file: %s"
--msgstr "Kann den Inhalt der Datei %s nicht �ffnen!"
-+msgstr "Kann den Inhaltsdatei %s nicht �ffnen!"
-
- #: ../src/xrc/xmlres.cpp:421
- #, c-format
-@@ -1198,9 +1182,8 @@
- msgstr "Kann 'Thread' nicht starten : Fehler beim 'TLS' schreiben"
-
- #: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174
--#, fuzzy
- msgid "Cannot wait for thread termination."
--msgstr "Kann nicht auf Threadende warten"
-+msgstr "Kann nicht auf Beendigung des Threads warten"
-
- #: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082
- msgid "Cant create the thread event queue"
-@@ -1293,7 +1276,7 @@
-
- #: ../src/html/htmlwin.cpp:386
- msgid "Connecting..."
--msgstr "Verbinde..."
-+msgstr "Verbinde ..."
-
- #: ../src/html/helpfrm.cpp:476
- msgid "Contents"
-@@ -1325,9 +1308,9 @@
-
- #: ../contrib/src/deprecated/resource.cpp:1830
- #: ../contrib/src/deprecated/resource.cpp:1960
--#, fuzzy, c-format
-+#, c-format
- msgid "Could not find resource include file %s."
--msgstr "Konnte Datei %s nicht finden."
-+msgstr "Konnte 'resource include'-Datei %s nicht finden."
-
- #: ../src/generic/tabg.cpp:1048
- msgid "Could not find tab for id"
-@@ -1344,6 +1327,8 @@
- "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
- " or provide #define (see manual for caveats)"
- msgstr ""
-+"Konnte Kontroll-Klasse oder ID '%s' nicht aufl�sen. Benutzen Sie statt dessen\n"
-+"einen Integer (nicht Null) oder #define (siehe Handbuch f�r Widerspr�che)"
-
- #: ../contrib/src/deprecated/resource.cpp:1278
- #, c-format
-@@ -1351,6 +1336,8 @@
- "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
- "or provide #define (see manual for caveats)"
- msgstr ""
-+"Konnte Men�-ID '%s' nicht aufl�sen. Benutzen Sie statt dessen\n"
-+"einen Integer (nicht Null) oder #define (siehe Handbuch f�r Widerspr�che)"
-
- #: ../src/common/prntbase.cpp:1272
- msgid "Could not start document preview."
-@@ -1497,16 +1484,15 @@
- #: ../src/generic/dbgrptg.cpp:295
- #, c-format
- msgid "Debug report \"%s\""
--msgstr ""
-+msgstr "Fehlerbericht \"%s\""
-
- #: ../src/common/debugrpt.cpp:203
--#, fuzzy
- msgid "Debug report couldn't be created."
--msgstr "Verzeichnis '%s' konnte nicht angelegt werden."
-+msgstr "Fehlerbericht konnte nicht erstellt werden."
-
- #: ../src/common/debugrpt.cpp:539
- msgid "Debug report generation has failed."
--msgstr ""
-+msgstr "Erstellung des Fehlerberichts fehlgeschlagen."
-
- #: ../src/generic/fontdlgg.cpp:227
- msgid "Decorative"
-@@ -1517,9 +1503,8 @@
- msgstr "Standard Kodierung"
-
- #: ../src/generic/prntdlgg.cpp:506
--#, fuzzy
- msgid "Default printer"
--msgstr "Standard Kodierung"
-+msgstr "Standard-Drucker"
-
- #: ../contrib/src/gizmos/editlbox.cpp:160
- msgid "Delete item"
-@@ -1532,7 +1517,7 @@
-
- #: ../src/generic/dirctrlg.cpp:656
- msgid "Desktop"
--msgstr ""
-+msgstr "Desktop"
-
- #: ../src/msw/dialup.cpp:395
- msgid ""
-@@ -1548,9 +1533,8 @@
- msgstr "Wussten Sie schon..."
-
- #: ../src/motif/filedlg.cpp:225
--#, fuzzy
- msgid "Directories"
--msgstr "Dekorativ"
-+msgstr "Verzeichnisse"
-
- #: ../src/common/filefn.cpp:1177
- #, c-format
-@@ -1593,7 +1577,7 @@
- msgstr ""
- "Wollen Sie den Befehl zum %s von Dateien mit der Erweiterung \"%s\" "
- "�ndern ?\n"
--"Aktueller Wert ist;\n"
-+"Aktueller Wert ist \n"
- "%s,\n"
- "Neuer Wert ist\n"
- "%s %1"
-@@ -1605,7 +1589,7 @@
-
- #: ../src/common/sizer.cpp:1839
- msgid "Don't Save"
--msgstr ""
-+msgstr "Nicht speichern"
-
- #: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211
- msgid "Done"
-@@ -1617,7 +1601,7 @@
-
- #: ../src/common/paper.cpp:183
- msgid "Double Japanese Postcard Rotated 148 x 200 mm"
--msgstr ""
-+msgstr "Doppelte japanische Postkarte, gedreht, 148 x 200 mm"
-
- #: ../src/common/xtixml.cpp:271
- #, c-format
-@@ -1646,25 +1630,24 @@
- msgstr "Geben Sie eine Zahl zwischen %d und %d ein:"
-
- #: ../src/generic/dbgrptg.cpp:169
--#, fuzzy, c-format
-+#, c-format
- msgid "Enter command to open file \"%s\":"
--msgstr "Kann Datei '%s' nicht �ffnen"
-+msgstr "Befehl eingeben zum �ffnen der Datei '%s':"
-
- #: ../src/generic/helpext.cpp:443
- msgid "Entries found"
- msgstr "Eintr�ge gefunden"
-
- #: ../src/common/paper.cpp:149
--#, fuzzy
- msgid "Envelope Invite 220 x 220 mm"
--msgstr "DL Umschlag, 110 x 220 mm"
-+msgstr "Umschlag Einladung, 220 x 220 mm"
-
- #: ../src/common/config.cpp:384
--#, fuzzy, c-format
-+#, c-format
- msgid ""
- "Environment variables expansion failed: missing '%c' at position %u in '%s'."
- msgstr ""
--"Einstzen der Umgebungsvariablen schlug fehl. Es fehlt '%c' an Position %d in "
-+"Einsetzen der Umgebungsvariablen schlug fehl. Es fehlt '%c' an Position %d in "
- "'%s'."
-
- #: ../src/generic/dirctrlg.cpp:689 ../src/generic/dirctrlg.cpp:707
-@@ -1711,11 +1694,11 @@
-
- #: ../src/generic/progdlgg.cpp:202
- msgid "Estimated time : "
--msgstr "Gesch�tzte Zeit :"
-+msgstr "Gesch�tzte Zeit: "
-
- #: ../src/generic/dbgrptg.cpp:229
- msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||"
--msgstr ""
-+msgstr "Ausf�hrbare Dateien (*.exe)|*.exe|Alle Dateien (*.*)|*.*||"
-
- #: ../src/msw/utilsexc.cpp:753
- #, c-format
-@@ -1734,29 +1717,28 @@
- #: ../contrib/src/deprecated/resource.cpp:1869
- #: ../contrib/src/deprecated/resource.cpp:1999
- #: ../contrib/src/deprecated/resource.cpp:3091
--#, fuzzy
- msgid "Expected '*' while parsing resource."
--msgstr "Erwarte '*' w�hrend der Suche in einer Ressource."
-+msgstr "Erwarte '*' beim Einlesen einer Ressource."
-
- #: ../contrib/src/deprecated/resource.cpp:1886
- #: ../contrib/src/deprecated/resource.cpp:2015
- #: ../contrib/src/deprecated/resource.cpp:3108
--#, fuzzy
- msgid "Expected '=' while parsing resource."
--msgstr "Erwarte '=' w�hrend der Suche in einer Ressource."
-+msgstr "Erwarte '=' beim Einlesen einer Ressource."
-
- #: ../contrib/src/deprecated/resource.cpp:1855
- #: ../contrib/src/deprecated/resource.cpp:1985
- #: ../contrib/src/deprecated/resource.cpp:3077
--#, fuzzy
- msgid "Expected 'char' while parsing resource."
--msgstr "Erwarte 'char' w�hrend der Suche in einer Ressource."
-+msgstr "Erwarte 'char' beim Einlesen einer Ressource."
-
- #: ../src/msw/registry.cpp:1140
- #, c-format
- msgid ""
- "Exporting registry key: file \"%s\" already exists and won't be overwritten."
- msgstr ""
-+"Exportieren von Registrierschl�ssel: Datei '%s' besteht bereits und"
-+"wird nicht �berschrieben."
-
- #: ../src/common/fmapbase.cpp:143
- msgid "Extended Unix Codepage for Japanese (EUC-JP)"
-@@ -1786,9 +1768,9 @@
- msgstr "�nderung des Video-Modus gescheitert"
-
- #: ../src/common/debugrpt.cpp:237
--#, fuzzy, c-format
-+#, c-format
- msgid "Failed to clean up debug report directory \"%s\""
--msgstr "Das Verzeichnis %s/.gnome konnte nicht erzeugt werden."
-+msgstr "Fehlerbericht-Verzeichnis '%s' konnte nicht geleert werden."
-
- #: ../src/common/filename.cpp:191
- msgid "Failed to close file handle"
-@@ -1830,7 +1812,7 @@
- #: ../src/msw/registry.cpp:613
- #, c-format
- msgid "Failed to copy the registry subkey '%s' to '%s'."
--msgstr "Kopieren des Registry-Schl�ssels von '%s' in '%s' gescheitert"
-+msgstr "Kopieren des Registry-Unterschl�ssels von '%s' in '%s' gescheitert"
-
- #: ../src/msw/dde.cpp:989
- msgid "Failed to create DDE string"
-@@ -1855,16 +1837,16 @@
- #: ../src/msw/dde.cpp:447
- #, c-format
- msgid "Failed to create connection to server '%s' on topic '%s'"
--msgstr "Aufbau der Verbindung zur Server '%s' 'on topic' '%s' gescheitert"
-+msgstr "Aufbau der Verbindung zur Server '%s' bez�glich '%s' gescheitert"
-
- #: ../src/msw/cursor.cpp:218
- msgid "Failed to create cursor."
- msgstr "Cursor konnte nicht erzeugt werden"
-
- #: ../src/common/debugrpt.cpp:202
--#, fuzzy, c-format
-+#, c-format
- msgid "Failed to create directory \"%s\""
--msgstr "Das Verzeichnis %s/.gnome konnte nicht erzeugt werden."
-+msgstr "Das Verzeichnis '%s' konnte nicht erzeugt werden."
-
- #: ../src/unix/mimetype.cpp:370
- #, c-format
-@@ -1911,7 +1893,7 @@
-
- #: ../src/msw/dde.cpp:650
- msgid "Failed to establish an advise loop with DDE server"
--msgstr "Aufbau einer 'advise Schleife\" mit dem DDE Server gescheitert"
-+msgstr "Aufbau einer 'advise Schleife' mit dem DDE Server gescheitert"
-
- #: ../src/msw/dialup.cpp:658
- #, c-format
-@@ -1925,7 +1907,7 @@
-
- #: ../src/common/debugrpt.cpp:666
- msgid "Failed to execute curl, please install it in PATH."
--msgstr ""
-+msgstr "Konnte curl nicht ausf�hren, installieren Sie es bitte in PATH."
-
- #: ../contrib/src/deprecated/resource.cpp:2489
- #, c-format
-@@ -1933,6 +1915,8 @@
- "Failed to find XBM resource %s.\n"
- "Forgot to use wxResourceLoadBitmapData?"
- msgstr ""
-+"Konnte XBM-Ressource %s nicht finden.\n"
-+"Vielleicht haben Sie vergessen, 'wxResourceLoadBitmapData' zu benutzen?"
-
- #: ../contrib/src/deprecated/resource.cpp:2643
- #, c-format
-@@ -1940,6 +1924,8 @@
- "Failed to find XBM resource %s.\n"
- "Forgot to use wxResourceLoadIconData?"
- msgstr ""
-+"Konnte XBM-Ressource %s nicht finden.\n"
-+"Vielleicht haben Sie vergessen, 'wxResourceLoadIconData' zu benutzen?"
-
- #: ../contrib/src/deprecated/resource.cpp:2504
- #, c-format
-@@ -1947,6 +1933,8 @@
- "Failed to find XPM resource %s.\n"
- "Forgot to use wxResourceLoadBitmapData?"
- msgstr ""
-+"Konnte XPM-Ressource %s nicht finden.\n"
-+"Vielleicht haben Sie vergessen, 'wxResourceLoadBitmapData' zu benutzen?"
-
- #: ../src/msw/dialup.cpp:718
- #, c-format
-@@ -2005,9 +1993,9 @@
- msgstr "Konnte das Bild %d aus der Datei '%s' nicht laden."
-
- #: ../src/msw/enhmeta.cpp:84
--#, fuzzy, c-format
-+#, c-format
- msgid "Failed to load metafile from file \"%s\"."
--msgstr "Konnte das Bild %d aus der Datei '%s' nicht laden."
-+msgstr "Konnte Metadatei aus der Datei '%s' nicht laden."
-
- #: ../src/msw/volume.cpp:312
- msgid "Failed to load mpr.dll."
-@@ -2050,7 +2038,7 @@
-
- #: ../src/common/filename.cpp:788
- msgid "Failed to open temporary file."
--msgstr "Konnte vor�bergehende Datei nicht �ffnen."
-+msgstr "Konnte tempor�re Datei nicht �ffnen."
-
- #: ../src/msw/clipbrd.cpp:99
- msgid "Failed to open the clipboard."
-@@ -2088,14 +2076,14 @@
- "Versuch gescheitert, an die Kodierung f�r den Zeichensatz '%s' zu erinnern."
-
- #: ../src/common/debugrpt.cpp:220
--#, fuzzy, c-format
-+#, c-format
- msgid "Failed to remove debug report file \"%s\""
--msgstr "Konnte Sperr-Datei '%s' nicht l�schen."
-+msgstr "Konnte Fehlerbericht-Datei '%s' nicht l�schen."
-
- #: ../src/unix/snglinst.cpp:327
- #, c-format
- msgid "Failed to remove lock file '%s'"
--msgstr "Konnte Sperr-Datei '%s' nicht l�schen."
-+msgstr "Konnte Sperr-Datei '%s' nicht l�schen."
-
- #: ../src/unix/snglinst.cpp:293
- #, c-format
-@@ -2105,12 +2093,12 @@
- #: ../src/msw/registry.cpp:464
- #, c-format
- msgid "Failed to rename registry value '%s' to '%s'."
--msgstr "Umbenennen des Registrieungswertes '%s' in '%s' gescheitert"
-+msgstr "Umbenennen des Registrierungswertes '%s' in '%s' gescheitert"
-
- #: ../src/msw/registry.cpp:568
- #, c-format
- msgid "Failed to rename the registry key '%s' to '%s'."
--msgstr "Umbenennen des Registrieungsschl�ssels von '%s' in '%s' gescheitert"
-+msgstr "Umbenennen des Registrierungsschl�ssels von '%s' in '%s' gescheitert"
-
- #: ../src/msw/clipbrd.cpp:503
- msgid "Failed to retrieve data from the clipboard."
-@@ -2174,7 +2162,7 @@
-
- #: ../src/msw/dde.cpp:669
- msgid "Failed to terminate the advise loop with DDE server"
--msgstr "Versuch gescheitert, die 'advise Schleife mit DDE-Server zu beenden."
-+msgstr "Versuch gescheitert, die 'advise Schleife' mit DDE-Server zu beenden."
-
- #: ../src/msw/dialup.cpp:955
- #, c-format
-@@ -2183,13 +2171,14 @@
-
- #: ../src/common/filename.cpp:1933
- #, c-format
-+# see man touch
- msgid "Failed to touch the file '%s'"
--msgstr "Konnte die Datei '%s' nicht 'ber�hren'"
-+msgstr "Konnte die Datei '%s' nicht erzeugen"
-
- #: ../src/unix/snglinst.cpp:333
- #, c-format
- msgid "Failed to unlock lock file '%s'"
--msgstr "Konnte die Sperrung von Datei '%s' nicht aufheben"
-+msgstr "Konnte die Sperrung von Sperr-Datei '%s' nicht aufheben"
-
- #: ../src/msw/dde.cpp:318
- #, c-format
-@@ -2201,9 +2190,9 @@
- msgstr "Kann Benutzer-Konfigurations-Datei nicht aktualisieren."
-
- #: ../src/common/debugrpt.cpp:679
--#, fuzzy, c-format
-+#, c-format
- msgid "Failed to upload the debug report (error code %d)."
--msgstr "Konnte keinen Standard Finden/Ersetzen-Dialog erstellen (Fehler %d)"
-+msgstr "Konnte Fehlerbericht nicht hochladen (Fehlercode %d)."
-
- #: ../src/unix/snglinst.cpp:173
- #, c-format
-@@ -2239,7 +2228,7 @@
- "Do you want to replace it?"
- msgstr ""
- "Datei '%s' existiert bereits.\n"
--"M�chten Sie sie wirklich �berschreiben?"
-+"M�chten Sie sie wirklich ersetzen?"
-
- #: ../src/common/textcmn.cpp:215
- msgid "File couldn't be loaded."
-@@ -2254,9 +2243,8 @@
- msgstr "Dateiname bereits vorhanden"
-
- #: ../src/motif/filedlg.cpp:226
--#, fuzzy
- msgid "Files"
--msgstr "Datei"
-+msgstr "Dateien"
-
- #: ../src/common/filefn.cpp:1746
- #, c-format
-@@ -2264,9 +2252,8 @@
- msgstr "Dateien (%s)"
-
- #: ../src/motif/filedlg.cpp:224
--#, fuzzy
- msgid "Filter"
--msgstr "Datei"
-+msgstr "Filter"
-
- #: ../src/html/helpfrm.cpp:491
- msgid "Find"
-@@ -2286,11 +2273,11 @@
-
- #: ../src/html/helpfrm.cpp:1220
- msgid "Font size:"
--msgstr "Font Gr��e:"
-+msgstr "Schrift-Gr��e:"
-
- #: ../src/unix/utilsunx.cpp:545
- msgid "Fork failed"
--msgstr "'Fork' gescheitert"
-+msgstr "Aufspaltung des Prozesses gescheitert"
-
- #: ../src/common/xtixml.cpp:235
- msgid "Forward hrefs are not supported"
-@@ -2336,9 +2323,8 @@
- msgstr "GTK+ Thema"
-
- #: ../src/common/prntbase.cpp:228
--#, fuzzy
- msgid "Generic PostScript"
--msgstr "PostScript-Datei"
-+msgstr "PostScript generisch"
-
- #: ../src/common/paper.cpp:142
- msgid "German Legal Fanfold, 8 1/2 x 13 in"
-@@ -2378,7 +2364,7 @@
-
- #: ../src/generic/filedlgg.cpp:981
- msgid "Go to parent directory"
--msgstr "Gehe zum 'Parent'-Verzeichnis"
-+msgstr "Gehe zum �bergeordneten Verzeichnis"
-
- #: ../src/common/prntbase.cpp:851
- msgid "Goto Page"
-@@ -2390,7 +2376,7 @@
-
- #: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
- msgid "Gzip not supported by this version of zlib"
--msgstr "Gzip wird nicht f�r diese zlib Version unterst�tzt"
-+msgstr "Gzip wird nicht von dieser zlib Version unterst�tzt"
-
- #: ../src/html/helpfrm.cpp:1574
- msgid "HTML Help Project (*.hhp)|*.hhp|"
-@@ -2443,9 +2429,8 @@
- msgstr "Start"
-
- #: ../src/generic/dirctrlg.cpp:654
--#, fuzzy
- msgid "Home directory"
--msgstr "Verzeichnis anlegen"
-+msgstr "Home-Verzeichnis"
-
- #: ../include/wx/filefn.h:145
- msgid "I64"
-@@ -2492,15 +2477,17 @@
-
- #: ../contrib/src/deprecated/resource.cpp:2673
- #: ../contrib/src/deprecated/resource.cpp:2684
--#, fuzzy, c-format
-+#, c-format
- msgid "Icon resource specification %s not found."
--msgstr "XRC Resource '%s' (Klasse '%s') nicht gefunden !"
-+msgstr "Icon-Ressource-Spezifikation %s nicht gefunden !"
-
- #: ../src/generic/dbgrptg.cpp:344
- msgid ""
- "If you have any additional information pertaining to this bug\n"
- "report, please enter it here and it will be joined to it:"
- msgstr ""
-+"Wenn Sie zus�tzliche Informationen zu diesem Fehlerbericht\n"
-+"haben, geben Sie sie hier ein und sie werden hinzugef�gt:"
-
- #: ../src/generic/dbgrptg.cpp:310
- msgid ""
-@@ -2509,15 +2496,18 @@
- "but be warned that it may hinder improving the program, so if\n"
- "at all possible please do continue with the report generation.\n"
- msgstr ""
-+"Wenn Sie den Fehlerbericht komplett verwerfen m�chten, dr�cken Sie 'Cancel',\n"
-+"aber seien Sie gewarnt: dies verhindert vielleicht die Verbesserung des\n"
-+"Programms, also setzen Sie das Erstellen des Fehlerberichts nach M�glichkeit fort.\n"
-
- #: ../src/msw/registry.cpp:1304
- #, c-format
- msgid "Ignoring value \"%s\" of the key \"%s\"."
--msgstr ""
-+msgstr "Ignoriere Wert \"%s\" vom Schl�ssel \"%s\"."
-
- #: ../contrib/src/deprecated/resource.cpp:271
- msgid "Ill-formed resource file syntax."
--msgstr "Verformter Quelldatei syntax."
-+msgstr "Ung�ltige Syntax der Quelldatei."
-
- #: ../src/common/xtistrm.cpp:260
- msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
-@@ -2589,7 +2579,7 @@
-
- #: ../src/common/init.cpp:232
- msgid "Initialization failed in post init, aborting."
--msgstr ""
-+msgstr "Initialisierung w�hrend 'post init' fehlgeschlagen, Abbruch."
-
- #: ../src/common/xtistrm.cpp:704
- msgid "Internal error, illegal wxCustomTypeInfo"
-@@ -2607,7 +2597,7 @@
- #: ../src/common/appcmn.cpp:249
- #, c-format
- msgid "Invalid display mode specification '%s'."
--msgstr "Ung�ltige Angabe '%s' des Displays."
-+msgstr "Ung�ltige Angabe '%s' des Displaymodes."
-
- #: ../src/x11/app.cpp:128
- #, c-format
-@@ -2650,55 +2640,55 @@
-
- #: ../src/common/paper.cpp:170
- msgid "Japanese Double Postcard 200 x 148 mm"
--msgstr ""
-+msgstr "Japanische Doppel-Postkarte, 200 x 148 mm"
-
- #: ../src/common/paper.cpp:174
- msgid "Japanese Envelope Chou #3"
--msgstr ""
-+msgstr "Japanischer Umschlag Chou #3"
-
- #: ../src/common/paper.cpp:187
- msgid "Japanese Envelope Chou #3 Rotated"
--msgstr ""
-+msgstr "Japanischer Umschlag Chou #3 gedreht"
-
- #: ../src/common/paper.cpp:175
- msgid "Japanese Envelope Chou #4"
--msgstr ""
-+msgstr "Japanischer Umschlag Chou #4"
-
- #: ../src/common/paper.cpp:188
- msgid "Japanese Envelope Chou #4 Rotated"
--msgstr ""
-+msgstr "Japanischer Umschlag Chou #4 gedreht"
-
- #: ../src/common/paper.cpp:172
- msgid "Japanese Envelope Kaku #2"
--msgstr ""
-+msgstr "Japanischer Umschlag Chou #4"
-
- #: ../src/common/paper.cpp:185
- msgid "Japanese Envelope Kaku #2 Rotated"
--msgstr ""
-+msgstr "Japanischer Umschlag Kaku #2 gedreht"
-
- #: ../src/common/paper.cpp:173
- msgid "Japanese Envelope Kaku #3"
--msgstr ""
-+msgstr "Japanischer Umschlag Kaku #3"
-
- #: ../src/common/paper.cpp:186
- msgid "Japanese Envelope Kaku #3 Rotated"
--msgstr ""
-+msgstr "Japanischer Umschlag Kaku #3 gedreht"
-
- #: ../src/common/paper.cpp:192
- msgid "Japanese Envelope You #4"
--msgstr ""
-+msgstr "Japanischer Umschlag You #4"
-
- #: ../src/common/paper.cpp:193
- msgid "Japanese Envelope You #4 Rotated"
--msgstr ""
-+msgstr "Japanischer Umschlag You #4 gedreht"
-
- #: ../src/common/paper.cpp:145
- msgid "Japanese Postcard 100 x 148 mm"
--msgstr ""
-+msgstr "Japanische Postkarte 100 x 148 mm"
-
- #: ../src/common/paper.cpp:182
- msgid "Japanese Postcard Rotated 148 x 100 mm"
--msgstr ""
-+msgstr "Japanische Postkarte gedreht 148 x 100 mm"
-
- #: ../src/common/stockitem.cpp:128
- msgid "Justified"
-@@ -2725,41 +2715,36 @@
- msgstr "Linker Rand (mm):"
-
- #: ../src/common/paper.cpp:151
--#, fuzzy
- msgid "Legal Extra 9 1/2 x 15 in"
--msgstr "Legal, 8 1/2 x 14 Zoll"
-+msgstr "Legal extra, 9 1/2 x 15 Zoll"
-
- #: ../src/common/paper.cpp:103
- msgid "Legal, 8 1/2 x 14 in"
- msgstr "Legal, 8 1/2 x 14 Zoll"
-
- #: ../src/common/paper.cpp:150
--#, fuzzy
- msgid "Letter Extra 9 1/2 x 12 in"
--msgstr "Letter, 8 1/2 x 11 Zoll"
-+msgstr "Letter extra, 9 1/2 x 12 Zoll"
-
- #: ../src/common/paper.cpp:156
- msgid "Letter Extra Transverse 9.275 x 12 in"
--msgstr ""
-+msgstr "Letter extra quer, 9,275 x 12 Zoll"
-
- #: ../src/common/paper.cpp:159
--#, fuzzy
- msgid "Letter Plus 8 1/2 x 12.69 in"
--msgstr "Letter, 8 1/2 x 11 Zoll"
-+msgstr "Letter plus, 8 1/2 x 12,69 Zoll"
-
- #: ../src/common/paper.cpp:176
--#, fuzzy
- msgid "Letter Rotated 11 x 8 1/2 in"
--msgstr "Letter, 8 1/2 x 11 Zoll"
-+msgstr "Letter gedreht, 11 x 8 1/2 Zoll"
-
- #: ../src/common/paper.cpp:108
- msgid "Letter Small, 8 1/2 x 11 in"
- msgstr "Letter Small, 8 1/2 x 11 Zoll"
-
- #: ../src/common/paper.cpp:154
--#, fuzzy
- msgid "Letter Transverse 8 1/2 x 11 in"
--msgstr "Letter, 8 1/2 x 11 Zoll"
-+msgstr "Letter quer, 8 1/2 x 11 Zoll"
-
- #: ../src/common/paper.cpp:102
- msgid "Letter, 8 1/2 x 11 in"
-@@ -2833,7 +2818,7 @@
- #: ../src/common/fs_mem.cpp:176
- #, c-format
- msgid "Memory VFS already contains file '%s'!"
--msgstr "VFS-Speicher beinhaltet bereits der Datei '%s'!"
-+msgstr "VFS-Speicher beinhaltet bereits die Datei '%s'!"
-
- #: ../src/msw/frame.cpp:374
- msgid "Menu"
-@@ -2868,11 +2853,11 @@
- #: ../src/common/module.cpp:77
- #, c-format
- msgid "Module \"%s\" initialization failed"
--msgstr ""
-+msgstr "Initialisierung des Moduls '%s' fehlgeschlagen"
-
- #: ../src/common/paper.cpp:138
- msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
--msgstr "Monarch Envelope, 3 7/8 x 7 1/2 Zoll"
-+msgstr "Monarch Umschlag, 3 7/8 x 7 1/2 Zoll"
-
- #: ../contrib/src/gizmos/editlbox.cpp:162
- msgid "Move down"
-@@ -2880,7 +2865,7 @@
-
- #: ../contrib/src/gizmos/editlbox.cpp:161
- msgid "Move up"
--msgstr "Nach oben"
-+msgstr "Aufw�rts verschieben"
-
- #: ../src/generic/filedlgg.cpp:431
- msgid "Name"
-@@ -3000,7 +2985,7 @@
-
- #: ../src/html/helpfrm.cpp:1218
- msgid "Normal font:"
--msgstr "Normal Font:"
-+msgstr "Normale Schrift:"
-
- #: ../src/common/paper.cpp:122
- msgid "Note, 8 1/2 x 11 in"
-@@ -3021,12 +3006,12 @@
-
- #: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579
- msgid "Open HTML document"
--msgstr "�ffne HTLM Dokument"
-+msgstr "�ffne HTML-Dokument"
-
- #: ../src/generic/dbgrptg.cpp:158
--#, fuzzy, c-format
-+#, c-format
- msgid "Open file \"%s\""
--msgstr "Datei �ffnen"
-+msgstr "Datei '%s' �ffnen"
-
- #: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
- #: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:772
-@@ -3036,17 +3021,17 @@
- #: ../src/common/cmdline.cpp:702
- #, c-format
- msgid "Option '%s' requires a value, '=' expected."
--msgstr "Option '%s' erwartet einen Wert, '=' erwartet."
-+msgstr "Option '%s' ben�tigt einen Wert, '=' erwartet."
-
- #: ../src/common/cmdline.cpp:722
- #, c-format
- msgid "Option '%s' requires a value."
--msgstr "Option '%s' erwartet einen Wert."
-+msgstr "Option '%s' ben�tigt einen Wert."
-
- #: ../src/common/cmdline.cpp:784
- #, c-format
- msgid "Option '%s': '%s' cannot be converted to a date."
--msgstr "Option '%s': '%s' kann nicht in eine Datum umgesetzt werden."
-+msgstr "Option '%s': '%s' kann nicht in ein Datum umgesetzt werden."
-
- #: ../src/generic/dirdlgg.cpp:116 ../src/generic/prntdlgg.cpp:614
- msgid "Options"
-@@ -3095,127 +3080,107 @@
-
- #: ../src/common/paper.cpp:194
- msgid "PRC 16K 146 x 215 mm"
--msgstr ""
-+msgstr "PRC 16K, 146 x 215 mm"
-
- #: ../src/common/paper.cpp:207
- msgid "PRC 16K Rotated"
--msgstr ""
-+msgstr "PRC 16K gedreht"
-
- #: ../src/common/paper.cpp:195
- msgid "PRC 32K 97 x 151 mm"
--msgstr ""
-+msgstr "PRC 32K, 97 x 151 mm"
-
- #: ../src/common/paper.cpp:208
- msgid "PRC 32K Rotated"
--msgstr ""
-+msgstr "PRC 32K gedreht"
-
- #: ../src/common/paper.cpp:196
- msgid "PRC 32K(Big) 97 x 151 mm"
--msgstr ""
-+msgstr "PRC 32K(Big), 97 x 151 mm"
-
- #: ../src/common/paper.cpp:209
- msgid "PRC 32K(Big) Rotated"
--msgstr ""
-+msgstr "PRC 32K(Big) gedreht"
-
- #: ../src/common/paper.cpp:197
--#, fuzzy
- msgid "PRC Envelope #1 102 x 165 mm"
--msgstr "C6 Umschlag, 114 x 162 mm"
-+msgstr "PRC Umschlag #1, 102 x 165 mm"
-
- #: ../src/common/paper.cpp:210
--#, fuzzy
- msgid "PRC Envelope #1 Rotated 165 x 102 mm"
--msgstr "C6 Umschlag, 114 x 162 mm"
-+msgstr "PRC Umschlag #1 gedreht, 165 x 102 mm"
-
- #: ../src/common/paper.cpp:206
--#, fuzzy
- msgid "PRC Envelope #10 324 x 458 mm"
--msgstr "C3 Umschlag, 324 x 458 mm"
-+msgstr "PRC Umschlag #10, 324 x 458 mm"
-
- #: ../src/common/paper.cpp:219
--#, fuzzy
- msgid "PRC Envelope #10 Rotated 458 x 324 m"
--msgstr "C4 Umschlag, 229 x 324 mm"
-+msgstr "PRC Umschlag #10 gedreht, 458 x 324 m"
-
- #: ../src/common/paper.cpp:198
--#, fuzzy
- msgid "PRC Envelope #2 102 x 176 mm"
--msgstr "C6 Umschlag, 114 x 162 mm"
-+msgstr "PRC Umschlag #2, 102 x 176 mm"
-
- #: ../src/common/paper.cpp:211
--#, fuzzy
- msgid "PRC Envelope #2 Rotated 176 x 102 mm"
--msgstr "B6 Umschlag, 176 x 125 mm"
-+msgstr "PRC Umschlag #2 gedreht, 176 x 102 mm"
-
- #: ../src/common/paper.cpp:199
--#, fuzzy
- msgid "PRC Envelope #3 125 x 176 mm"
--msgstr "C6 Umschlag, 114 x 162 mm"
-+msgstr "PRC Umschlag #3, 125 x 176 mm"
-
- #: ../src/common/paper.cpp:212
--#, fuzzy
- msgid "PRC Envelope #3 Rotated 176 x 125 mm"
--msgstr "B6 Umschlag, 176 x 125 mm"
-+msgstr "PRC Umschlag #3 gedreht, 176 x 125 mm"
-
- #: ../src/common/paper.cpp:200
--#, fuzzy
- msgid "PRC Envelope #4 110 x 208 mm"
--msgstr "DL Umschlag, 110 x 220 mm"
-+msgstr "PRC Umschlag #4, 110 x 208 mm"
-
- #: ../src/common/paper.cpp:213
--#, fuzzy
- msgid "PRC Envelope #4 Rotated 208 x 110 mm"
--msgstr "C6 Umschlag, 114 x 162 mm"
-+msgstr "PRC Umschlag #4 gedreht, 208 x 110 mm"
-
- #: ../src/common/paper.cpp:201
--#, fuzzy
- msgid "PRC Envelope #5 110 x 220 mm"
--msgstr "DL Umschlag, 110 x 220 mm"
-+msgstr "PRC Umschlag #5, 110 x 220 mm"
-
- #: ../src/common/paper.cpp:214
--#, fuzzy
- msgid "PRC Envelope #5 Rotated 220 x 110 mm"
--msgstr "C4 Umschlag, 229 x 324 mm"
-+msgstr "PRC Umschlag #5 gedreht, 220 x 110 mm"
-
- #: ../src/common/paper.cpp:202
--#, fuzzy
- msgid "PRC Envelope #6 120 x 230 mm"
--msgstr "C5 Umschlag, 162 x 229 mm"
-+msgstr "PRC Umschlag #6, 120 x 230 mm"
-
- #: ../src/common/paper.cpp:215
--#, fuzzy
- msgid "PRC Envelope #6 Rotated 230 x 120 mm"
--msgstr "C5 Umschlag, 162 x 229 mm"
-+msgstr "PRC Umschlag #6 gedreht, 230 x 120 mm"
-
- #: ../src/common/paper.cpp:203
--#, fuzzy
- msgid "PRC Envelope #7 160 x 230 mm"
--msgstr "B5 Umschlag, 176 x 250 mm"
-+msgstr "PRC Umschlag #7, 160 x 230 mm"
-
- #: ../src/common/paper.cpp:216
--#, fuzzy
- msgid "PRC Envelope #7 Rotated 230 x 160 mm"
--msgstr "C6 Umschlag, 114 x 162 mm"
-+msgstr "PRC Umschlag #7 gedreht, 230 x 160 mm"
-
- #: ../src/common/paper.cpp:204
--#, fuzzy
- msgid "PRC Envelope #8 120 x 309 mm"
--msgstr "C5 Umschlag, 162 x 229 mm"
-+msgstr "PRC Umschlag #8, 120 x 309 mm"
-
- #: ../src/common/paper.cpp:217
--#, fuzzy
- msgid "PRC Envelope #8 Rotated 309 x 120 mm"
--msgstr "C4 Umschlag, 229 x 324 mm"
-+msgstr "PRC Umschlag #8 gedreht, 309 x 120 mm"
-
- #: ../src/common/paper.cpp:205
--#, fuzzy
- msgid "PRC Envelope #9 229 x 324 mm"
--msgstr "C4 Umschlag, 229 x 324 mm"
-+msgstr "PRC Umschlag #9, 229 x 324 mm"
-
- #: ../src/common/paper.cpp:218
--#, fuzzy
- msgid "PRC Envelope #9 Rotated 324 x 229 mm"
--msgstr "C5 Umschlag, 162 x 229 mm"
-+msgstr "PRC Umschlag #9 gedreht, 324 x 229 mm"
-
- #: ../src/common/prntbase.cpp:1294
- #, c-format
-@@ -3232,7 +3197,6 @@
- msgstr "Seiten-Einstellungen"
-
- #: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:540
--#, fuzzy
- msgid "Page setup"
- msgstr "Seiten-Einstellungen"
-
-@@ -3260,7 +3224,7 @@
-
- #: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
- msgid "Passing an unkown object to GetObject"
--msgstr "Ein unbekanntes Objekt wurde an GetObject �bergeben\""
-+msgstr "Ein unbekanntes Objekt wurde an GetObject �bergeben"
-
- #: ../src/generic/filedlgg.cpp:437
- msgid "Permissions"
-@@ -3272,7 +3236,7 @@
-
- #: ../src/gtk/fontdlg.cpp:81
- msgid "Please choose a valid font."
--msgstr "Bitte w�hlen Sie einen g�ltigen Font."
-+msgstr "Bitte w�hlen Sie eine g�ltige Schriftart."
-
- #: ../src/generic/filedlgg.cpp:1325
- msgid "Please choose an existing file."
-@@ -3295,7 +3259,7 @@
- msgstr ""
- "Bitte installieren Sie eine neuere Version von comctl32.dll\n"
- "(mindestens Version 4.70 wird ben�tigt, aber Sie haben nur\n"
--"Version %d.%02d)."
-+"Version %d.%02d), oder dieses Programm wird nicht korrekt funktionieren."
-
- #: ../src/common/prntbase.cpp:313
- msgid "Please wait while printing\n"
-@@ -3348,9 +3312,8 @@
- msgstr "Druck&vorschau"
-
- #: ../src/gtk/gnome/gprint.cpp:785
--#, fuzzy
- msgid "Print preview"
--msgstr "Druck&vorschau"
-+msgstr "Druckvorschau"
-
- #: ../src/generic/prntdlgg.cpp:626
- msgid "Print spooling"
-@@ -3365,9 +3328,8 @@
- msgstr "In Datei drucken"
-
- #: ../src/generic/prntdlgg.cpp:489
--#, fuzzy
- msgid "Printer"
--msgstr "Drucken"
-+msgstr "Drucker"
-
- #: ../src/generic/prntdlgg.cpp:629
- msgid "Printer command:"
-@@ -3383,12 +3345,11 @@
-
- #: ../src/generic/prntdlgg.cpp:915
- msgid "Printer..."
--msgstr "Drucker..."
-+msgstr "Drucker ..."
-
- #: ../src/generic/prntdlgg.cpp:190
--#, fuzzy
- msgid "Printer:"
--msgstr "Drucker..."
-+msgstr "Drucker:"
-
- #: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531
- msgid "Printing "
-@@ -3401,17 +3362,19 @@
- #: ../src/generic/printps.cpp:208
- #, c-format
- msgid "Printing page %d..."
--msgstr "Drucke Seite %d..."
-+msgstr "Drucke Seite %d ..."
-
- #: ../src/generic/printps.cpp:168
- msgid "Printing..."
--msgstr "Drucke..."
-+msgstr "Drucke ..."
-
- #: ../src/common/debugrpt.cpp:546
- #, c-format
- msgid ""
- "Processing debug report has failed, leaving the files in \"%s\" directory."
- msgstr ""
-+"Verarbeitung des Fehlerberichts fehlgeschlagen, lasse die Dateien im "
-+"'%s'-Verzeichnis."
-
- #: ../src/common/log.cpp:466
- msgid "Program aborted."
-@@ -3431,9 +3394,8 @@
- msgstr "Lesefehler in Datei '%s'"
-
- #: ../src/common/prntbase.cpp:242
--#, fuzzy
- msgid "Ready"
--msgstr "&Wiederholen"
-+msgstr "Fertig"
-
- #: ../src/xrc/xmlres.cpp:643
- #, c-format
-@@ -3485,7 +3447,7 @@
-
- #: ../src/html/helpfrm.cpp:445
- msgid "Remove current page from bookmarks"
--msgstr "Aktuelle HTLM-Seite als Lesezeichen entfernen"
-+msgstr "Aktuelle Seite als Lesezeichen entfernen"
-
- #: ../src/common/rendcmn.cpp:196
- #, c-format
-@@ -3512,7 +3474,7 @@
-
- #: ../src/common/stockitem.cpp:144
- msgid "Revert to Saved"
--msgstr ""
-+msgstr "Zur�ck zu Gespeichert"
-
- #: ../src/generic/prntdlgg.cpp:891
- msgid "Right margin (mm):"
-@@ -3523,9 +3485,8 @@
- msgstr "Roman"
-
- #: ../src/common/sizer.cpp:1838
--#, fuzzy
- msgid "Save"
--msgstr "&Sichern"
-+msgstr "Sichern"
-
- #: ../src/common/fldlgcmn.cpp:259
- #, c-format
-@@ -3534,7 +3495,7 @@
-
- #: ../src/common/stockitem.cpp:146
- msgid "Save &As..."
--msgstr "&Speichern unter..."
-+msgstr "&Speichern unter ..."
-
- #: ../src/common/docview.cpp:305
- msgid "Save as"
-@@ -3572,7 +3533,7 @@
-
- #: ../src/html/helpfrm.cpp:868
- msgid "Searching..."
--msgstr "Suchen..."
-+msgstr "Suchen ..."
-
- #: ../src/generic/dirctrlg.cpp:592
- msgid "Sections"
-@@ -3586,7 +3547,8 @@
- #: ../src/common/ffile.cpp:212
- #, c-format
- msgid "Seek error on file '%s' (large files not supported by stdio)"
--msgstr ""
-+msgstr "Suchfehler in Datei '%s' (grosse Dateien werden von stdio "
-+"nicht unterst�tzt)"
-
- #: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068
- msgid "Select &All"
-@@ -3598,16 +3560,15 @@
-
- #: ../src/common/docview.cpp:1776
- msgid "Select a document view"
--msgstr "Dokument-Anzeige ('View') w�hlen"
-+msgstr "Dokumenten-Ansicht w�hlen"
-
- #: ../src/common/docview.cpp:1579
- msgid "Select a file"
- msgstr "Datei w�hlen"
-
- #: ../src/motif/filedlg.cpp:226
--#, fuzzy
- msgid "Selection"
--msgstr "Abschnitte"
-+msgstr "Auswahl"
-
- #: ../src/common/cmdline.cpp:739
- #, c-format
-@@ -3620,7 +3581,7 @@
-
- #: ../src/generic/prntdlgg.cpp:182
- msgid "Setup..."
--msgstr "Einstellungen..."
-+msgstr "Einstellungen ..."
-
- #: ../src/msw/dialup.cpp:567
- msgid "Several active dialup connections found, choosing one randomly."
-@@ -3656,9 +3617,8 @@
-
- #: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
- #: ../src/generic/progdlgg.cpp:598
--#, fuzzy
- msgid "Skip"
--msgstr "Script"
-+msgstr "�berspringen"
-
- #: ../src/generic/fontdlgg.cpp:234
- msgid "Slant"
-@@ -3702,9 +3662,8 @@
- msgstr "Statement, 5 1/2 x 8 1/2 Zoll"
-
- #: ../src/generic/prntdlgg.cpp:198
--#, fuzzy
- msgid "Status:"
--msgstr "Status: "
-+msgstr "Status:"
-
- #: ../src/generic/logg.cpp:622
- msgid "Status: "
-@@ -3734,11 +3693,11 @@
-
- #: ../src/common/paper.cpp:157
- msgid "SuperA/SuperA/A4 227 x 356 mm"
--msgstr ""
-+msgstr "SuperA/SuperA/A4, 227 x 356 mm"
-
- #: ../src/common/paper.cpp:158
- msgid "SuperB/SuperB/A3 305 x 487 mm"
--msgstr ""
-+msgstr "SuperB/SuperB/A3, 305 x 487 mm"
-
- #: ../src/generic/fontdlgg.cpp:230
- msgid "Swiss"
-@@ -3746,11 +3705,11 @@
-
- #: ../src/common/imagtiff.cpp:165
- msgid "TIFF library error."
--msgstr ""
-+msgstr "TIFF-Bibliothek-Fehler."
-
- #: ../src/common/imagtiff.cpp:149
- msgid "TIFF library warning."
--msgstr ""
-+msgstr "TIFF-Bibliothek-Warnung."
-
- #: ../src/common/imagtiff.cpp:248 ../src/common/imagtiff.cpp:259
- #: ../src/common/imagtiff.cpp:399
-@@ -3774,9 +3733,8 @@
- msgstr "TIFF: Schreibfehler beim Sichern."
-
- #: ../src/common/paper.cpp:152
--#, fuzzy
- msgid "Tabloid Extra 11.69 x 18 in"
--msgstr "Tabloid, 11 x 17 Zoll"
-+msgstr "Tabloid extra, 11,69 x 18 Zoll"
-
- #: ../src/common/paper.cpp:109
- msgid "Tabloid, 11 x 17 in"
-@@ -3859,7 +3817,7 @@
-
- #: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290
- msgid "The font style."
--msgstr "Die Schriftschitt."
-+msgstr "Der Schriftstil."
-
- #: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301
- msgid "The font weight."
-@@ -3876,6 +3834,9 @@
- "private information,\n"
- "please uncheck them and they will be removed from the report.\n"
- msgstr ""
-+"Der Fehlerbericht enth�lt die unten angegebenen Dateien. Falls diese "
-+"pers�nliche Informationen enth�lt,\n"
-+"w�hlen Sie sie ab und sie werden aus dem Fehlerbericht gel�scht.\n"
-
- #: ../src/common/cmdline.cpp:883
- #, c-format
-@@ -3933,7 +3894,7 @@
- "local storage"
- msgstr ""
- "Thread-Modul-Initialisierung gescheitert: Index konnte nicht im lokalen "
--"Speicherbereich des Thread allokiert werden"
-+"Speicherbereich des Threads zugewiesen werden"
-
- #: ../src/unix/threadpsx.cpp:1108
- msgid "Thread priority setting is ignored."
-@@ -4031,9 +3992,8 @@
- #: ../contrib/src/deprecated/resource.cpp:3084
- #: ../contrib/src/deprecated/resource.cpp:3101
- #: ../contrib/src/deprecated/resource.cpp:3115
--#, fuzzy
- msgid "Unexpected end of file while parsing resource."
--msgstr "Erwarte '=' w�hrend der Suche in einer Ressource."
-+msgstr "Unerwartetes Dateiende beim Einlesen der Ressource."
-
- #: ../src/common/cmdline.cpp:826
- #, c-format
-@@ -4083,7 +4043,7 @@
-
- #: ../src/unix/dlunix.cpp:275
- msgid "Unknown dynamic library error"
--msgstr ""
-+msgstr "Unbekannter Fehler mit dynamischer Bibliothek"
-
- #: ../src/common/fmapbase.cpp:695
- #, c-format
-@@ -4112,7 +4072,7 @@
- #: ../src/common/xtixml.cpp:324
- #, c-format
- msgid "Unkown Property %s"
--msgstr "Unbekannte Eigenschaften %s"
-+msgstr "Unbekannte Eigenschaft %s"
-
- #: ../src/common/mimecmn.cpp:163
- #, c-format
-@@ -4125,9 +4085,9 @@
- msgstr "Ungenanntes Kommando"
-
- #: ../contrib/src/deprecated/resource.cpp:2367
--#, fuzzy, c-format
-+#, c-format
- msgid "Unrecognized style %s while parsing resource."
--msgstr "Erwarte '*' w�hrend der Suche in einer Ressource."
-+msgstr "Unerwarter Stil beim Einlesen der Ressource."
-
- #: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64
- #: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445
-@@ -4217,32 +4177,28 @@
- #: ../src/msw/utils.cpp:1112
- #, c-format
- msgid "Windows 2000 (build %lu"
--msgstr ""
-+msgstr "Windows 2000 (Build %lu)"
-
- #: ../src/msw/utils.cpp:1077
--#, fuzzy
- msgid "Windows 95"
--msgstr "Windows 9%c"
-+msgstr "Windows 95"
-
- #: ../src/msw/utils.cpp:1073
--#, fuzzy
- msgid "Windows 95 OSR2"
--msgstr "Windows 9%c"
-+msgstr "Windows 95 ORS2"
-
- #: ../src/msw/utils.cpp:1088
--#, fuzzy
- msgid "Windows 98"
--msgstr "Windows 9%c"
-+msgstr "Windows 98"
-
- #: ../src/msw/utils.cpp:1084
--#, fuzzy
- msgid "Windows 98 SE"
--msgstr "Windows 9%c"
-+msgstr "Windows 98 SE"
-
- #: ../src/msw/utils.cpp:1095
--#, fuzzy, c-format
-+#, c-format
- msgid "Windows 9x (%d.%d)"
--msgstr "Windows 9%c"
-+msgstr "Windows 9x (%d.%d)"
-
- #: ../src/common/fmapbase.cpp:132
- msgid "Windows Arabic (CP 1256)"
-@@ -4285,24 +4241,22 @@
- msgstr "Windows Koreanisch (CP 949)"
-
- #: ../src/msw/utils.cpp:1092
--#, fuzzy
- msgid "Windows ME"
--msgstr "Windows 9%c"
-+msgstr "Windows ME"
-
- #: ../src/msw/utils.cpp:1127
- #, c-format
- msgid "Windows NT %lu.%lu (build %lu"
--msgstr ""
-+msgstr "Windows NT %lu.%lu (Build %lu)"
-
- #: ../src/msw/utils.cpp:1120
- #, c-format
- msgid "Windows Server 2003 (build %lu"
--msgstr ""
-+msgstr "Windows Server 2003 (Build %lu)"
-
- #: ../src/common/fmapbase.cpp:121
--#, fuzzy
- msgid "Windows Thai (CP 874)"
--msgstr "Windows Baltisch (CP 1257)"
-+msgstr "Windows Thai (CP 874)"
-
- #: ../src/common/fmapbase.cpp:130
- msgid "Windows Turkish (CP 1254)"
-@@ -4315,7 +4269,7 @@
- #: ../src/msw/utils.cpp:1116
- #, c-format
- msgid "Windows XP (build %lu"
--msgstr ""
-+msgstr "Windows XP (Build %lu)"
-
- #: ../src/common/fmapbase.cpp:134
- msgid "Windows/DOS OEM (CP 437)"
-@@ -4392,8 +4346,8 @@
- "or an invalid instance identifier\n"
- "was passed to a DDEML function."
- msgstr ""
--"Eine DDEML-Funktion wurde aufgerufen, ohne vorher die Deinitialisierungs- "
--"Funktion aufzurufen,\n"
-+"Eine DDEML-Funktion wurde aufgerufen, ohne vorher die Funktion "
-+"'DdeInitialize' aufzurufen,\n"
- "oder ein ung�ltiger 'instance identifier'\n"
- "wurde an eine DDEML-Funktion �bergeben."
-
-@@ -4476,7 +4430,7 @@
-
- #: ../src/msw/dde.cpp:1084
- msgid "an internal error has occurred in the DDEML."
--msgstr "Ein interne Fehler ist im DDMEL aufgetreten."
-+msgstr "Ein interner Fehler ist im DDEML aufgetreten."
-
- #: ../src/msw/dde.cpp:1090
- msgid ""
-@@ -4616,14 +4570,12 @@
- "werden"
-
- #: ../src/common/zipstrm.cpp:436
--#, fuzzy
- msgid "can't re-initialize zlib deflate stream"
--msgstr "Kann das Entkomprimieren der zlib-Daten nicht initialisieren"
-+msgstr "zlib-deflate-Stream kann nicht reinitialisiert werden"
-
- #: ../src/common/zipstrm.cpp:461
--#, fuzzy
- msgid "can't re-initialize zlib inflate stream"
--msgstr "Kann das komprimieren der zlib-Daten nicht initialisieren"
-+msgstr "zlib-inflate-Stream kann nicht reinitialisiert werden"
-
- #: ../src/common/file.cpp:310
- #, c-format
-@@ -4698,7 +4650,7 @@
-
- #: ../src/common/debugrpt.cpp:524
- msgid "dump of the process state (binary)"
--msgstr ""
-+msgstr "Abfrage von Prozess-Status (bin�r)"
-
- #: ../src/common/datetime.cpp:3882
- msgid "eighteenth"
-@@ -4727,27 +4679,26 @@
- msgstr "Fehler im Datenformat"
-
- #: ../src/msdos/utilsdos.cpp:407
--#, fuzzy, c-format
-+#, c-format
- msgid "error opening '%s'"
--msgstr "Fehler beim �ffnen der Datei"
-+msgstr "Fehler beim �ffnen der Datei '%s'"
-
- #: ../src/html/chm.cpp:332
- msgid "error opening file"
- msgstr "Fehler beim �ffnen der Datei"
-
- #: ../src/common/zipstrm.cpp:1442
--#, fuzzy
- msgid "error reading zip central directory"
--msgstr "Fehler beim Anlegen des Verzeichnisses"
-+msgstr "Fehler beim Lesen des 'zip-central'-Verzeichnisses"
-
- #: ../src/common/zipstrm.cpp:1520
- msgid "error reading zip local header"
--msgstr ""
-+msgstr "Fehler beim Lesen des 'zip-local'-Headers"
-
- #: ../src/common/zipstrm.cpp:2236
- #, c-format
- msgid "error writing zip entry '%s': bad crc or length"
--msgstr ""
-+msgstr "Fehler beim Schreiben des zip-Eintrags '%s': crc oder L�nge falsch"
-
- #: ../src/msw/dialup.cpp:881
- msgid "establish"
-@@ -4829,9 +4780,8 @@
- msgstr "ung�ltiger 'message box'-R�ckgabewert."
-
- #: ../src/common/zipstrm.cpp:1306
--#, fuzzy
- msgid "invalid zip file"
--msgstr "Ung�ltige Sperr-Datei '%s'."
-+msgstr "Ung�ltige zip-Datei"
-
- #: ../src/common/fontcmn.cpp:586 ../src/common/fontcmn.cpp:650
- msgid "italic"
-@@ -4897,7 +4847,7 @@
-
- #: ../src/common/debugrpt.cpp:500
- msgid "process context description"
--msgstr ""
-+msgstr "Prozess-Kontext Beschreibung"
-
- #: ../src/html/chm.cpp:334
- msgid "read error"
-@@ -4910,12 +4860,12 @@
- #: ../src/common/zipstrm.cpp:1743
- #, c-format
- msgid "reading zip stream (entry %s): bad crc"
--msgstr ""
-+msgstr "Lese zip-Stream (Eintrag %s): crc falsch"
-
- #: ../src/common/zipstrm.cpp:1740
- #, c-format
- msgid "reading zip stream (entry %s): bad length"
--msgstr ""
-+msgstr "Lese zip-Stream (Eintrag %s): L�nge falsch"
-
- #: ../src/msw/dde.cpp:1078
- msgid "reentrancy problem."
-@@ -4963,7 +4913,7 @@
-
- #: ../src/common/zipstrm.cpp:1646
- msgid "stored file length not in Zip header"
--msgstr ""
-+msgstr "gespeicherte Dateil�nge nicht im zip-Header"
-
- #: ../src/common/cmdline.cpp:1086
- msgid "str"
-@@ -5061,11 +5011,11 @@
-
- #: ../src/common/zipstrm.cpp:1660 ../src/common/zipstrm.cpp:2030
- msgid "unsupported Zip compression method"
--msgstr ""
-+msgstr "Nicht unterst�tze zip-Kompressionsmethode"
-
- #: ../src/common/zipstrm.cpp:1142
- msgid "unsupported zip archive"
--msgstr ""
-+msgstr "Nicht unterst�tztes zip-Archiv"
-
- #: ../src/common/intl.cpp:1115
- #, c-format
-diff -ur wxWidgets-2.6.3/Makefile.in wxWidgets-2.6.3.3/Makefile.in
---- wxWidgets-2.6.3/Makefile.in 2006-03-16 09:45:29.000000000 -0500
-+++ wxWidgets-2.6.3.3/Makefile.in 2006-05-23 14:13:44.000000000 -0400
-@@ -1496,6 +1496,14 @@
- @COND_TOOLKIT_X11@BASE_MACOSX_HDR = $(COND_TOOLKIT_X11_BASE_MACOSX_HDR)
- @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_MACOSX_HDR)
- @COND_PLATFORM_MSDOS_1@BASE_PLATFORM_HDR = wx/msdos/mimetype.h
-+COND_PLATFORM_OS2_1_BASE_PLATFORM_HDR = \
-+ wx/os2/apptbase.h \
-+ wx/os2/apptrait.h \
-+ wx/os2/mimetype.h \
-+ wx/os2/private.h \
-+ wx/os2/stdpaths.h \
-+ wx/os2/wxrsc.h
-+@COND_PLATFORM_OS2_1@BASE_PLATFORM_HDR = $(COND_PLATFORM_OS2_1_BASE_PLATFORM_HDR)
- COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \
- wx/unix/apptbase.h \
- wx/unix/apptrait.h \
-@@ -3139,6 +3147,7 @@
- monodll_stattext.o \
- monodll_statusbr.o \
- monodll_textctrl.o \
-+ monodll_tglbtn.o \
- monodll_theme.o \
- monodll_toolbar.o \
- monodll_topluniv.o \
-@@ -4609,6 +4618,7 @@
- monolib_stattext.o \
- monolib_statusbr.o \
- monolib_textctrl.o \
-+ monolib_tglbtn.o \
- monolib_theme.o \
- monolib_toolbar.o \
- monolib_topluniv.o \
-@@ -6317,6 +6327,7 @@
- coredll_stattext.o \
- coredll_statusbr.o \
- coredll_textctrl.o \
-+ coredll_tglbtn.o \
- coredll_theme.o \
- coredll_toolbar.o \
- coredll_topluniv.o \
-@@ -7515,6 +7526,7 @@
- corelib_stattext.o \
- corelib_statusbr.o \
- corelib_textctrl.o \
-+ corelib_tglbtn.o \
- corelib_theme.o \
- corelib_toolbar.o \
- corelib_topluniv.o \
-@@ -13245,6 +13257,9 @@
- @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(MONODLL_ODEP)
- @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
-
-+@COND_USE_GUI_1_WXUNIV_1@monodll_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(MONODLL_ODEP)
-+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
-+
- @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONODLL_ODEP)
- @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
-
-@@ -16716,6 +16731,9 @@
- @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(MONOLIB_ODEP)
- @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
-
-+@COND_USE_GUI_1_WXUNIV_1@monolib_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(MONOLIB_ODEP)
-+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
-+
- @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(MONOLIB_ODEP)
- @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
-
-@@ -20616,6 +20634,9 @@
- @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(COREDLL_ODEP)
- @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
-
-+@COND_USE_GUI_1_WXUNIV_1@coredll_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(COREDLL_ODEP)
-+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
-+
- @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(COREDLL_ODEP)
- @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
-
-@@ -23127,6 +23148,9 @@
- @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_tglbtn.o: $(srcdir)/src/os2/tglbtn.cpp $(CORELIB_ODEP)
- @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/tglbtn.cpp
-
-+@COND_USE_GUI_1_WXUNIV_1@corelib_tglbtn.o: $(srcdir)/src/univ/tglbtn.cpp $(CORELIB_ODEP)
-+@COND_USE_GUI_1_WXUNIV_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/univ/tglbtn.cpp
-+
- @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_menuitem.o: $(srcdir)/src/motif/menuitem.cpp $(CORELIB_ODEP)
- @COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/menuitem.cpp
-
-@@ -25612,6 +25636,11 @@
- rm -rf $(DISTDIR)/wxPython/contrib/iewin
- find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
-
-+ @# copy the bakefiles goop that make install doesn't handle robustly
-+ mkdir -p $(DISTDIR)/build/bakefiles/wxpresets/presets
-+ cp $(WXDIR)/build/bakefiles/wxpresets/presets/*.bkl \
-+ $(DISTDIR)/build/bakefiles/wxpresets/presets
-+
- rm -rf $(DEBIAN_SOURCE_DIR)
- mv $(DISTDIR) $(DEBIAN_SOURCE_DIR)
-
-diff -ur wxWidgets-2.6.3/samples/controls/controls.cpp wxWidgets-2.6.3.3/samples/controls/controls.cpp
---- wxWidgets-2.6.3/samples/controls/controls.cpp 2005-08-17 09:13:42.000000000 -0400
-+++ wxWidgets-2.6.3.3/samples/controls/controls.cpp 2006-06-18 07:52:25.000000000 -0400
-@@ -3,7 +3,7 @@
- // Purpose: Controls wxWidgets sample
- // Author: Robert Roebling
- // Modified by:
--// RCS-ID: $Id: controls.cpp,v 1.233 2005/08/17 13:13:42 VZ Exp $
-+// RCS-ID: $Id: controls.cpp,v 1.233.2.1 2006/06/18 11:52:25 SN Exp $
- // Copyright: (c) Robert Roebling, Julian Smart
- // Licence: wxWindows license
- /////////////////////////////////////////////////////////////////////////////
-@@ -1370,15 +1370,17 @@
-
- void MyPanel::OnComboTextChanged(wxCommandEvent& event)
- {
-- wxLogMessage(wxT("EVT_TEXT for the combobox: \"%s\" (event) or \"%s\" (control)."),
-- event.GetString().c_str(),
-- m_combo->GetValue().c_str());
-+ if (m_combo)
-+ wxLogMessage(wxT("EVT_TEXT for the combobox: \"%s\" (event) or \"%s\" (control)."),
-+ event.GetString().c_str(),
-+ m_combo->GetValue().c_str());
- }
-
- void MyPanel::OnComboTextEnter(wxCommandEvent& WXUNUSED(event))
- {
-- wxLogMessage(_T("Enter pressed in the combobox: value is '%s'."),
-- m_combo->GetValue().c_str());
-+ if (m_combo)
-+ wxLogMessage(_T("Enter pressed in the combobox: value is '%s'."),
-+ m_combo->GetValue().c_str());
- }
-
- void MyPanel::OnComboButtons( wxCommandEvent &event )
-diff -ur wxWidgets-2.6.3/samples/listctrl/listtest.cpp wxWidgets-2.6.3.3/samples/listctrl/listtest.cpp
---- wxWidgets-2.6.3/samples/listctrl/listtest.cpp 2006-03-18 11:57:18.000000000 -0500
-+++ wxWidgets-2.6.3.3/samples/listctrl/listtest.cpp 2006-04-02 11:51:15.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by:
- // Created: 04/01/98
--// RCS-ID: $Id: listtest.cpp,v 1.83.2.4 2006/03/18 16:57:18 VZ Exp $
-+// RCS-ID: $Id: listtest.cpp,v 1.83.2.5 2006/04/02 15:51:15 JS Exp $
- // Copyright: (c) Julian Smart
- // Licence: wxWindows license
- /////////////////////////////////////////////////////////////////////////////
-@@ -1053,10 +1053,10 @@
- SetItemData(tmp, i);
-
- buf.Printf(_T("Col 1, item %d"), i);
-- SetItem(i, 1, buf);
-+ SetItem(tmp, 1, buf);
-
- buf.Printf(_T("Item %d in column 2"), i);
-- SetItem(i, 2, buf);
-+ SetItem(tmp, 2, buf);
- }
-
- #if USE_CONTEXT_MENU
-diff -ur wxWidgets-2.6.3/setup.h.in wxWidgets-2.6.3.3/setup.h.in
---- wxWidgets-2.6.3/setup.h.in 2006-01-18 05:24:54.000000000 -0500
-+++ wxWidgets-2.6.3.3/setup.h.in 2006-04-19 10:36:46.000000000 -0400
-@@ -156,6 +156,8 @@
-
- #define WXWIN_COMPATIBILITY_2_4 0
-
-+#define WX_USE_RESERVED_VIRTUALS 0
-+
- #define wxDIALOG_UNIT_COMPATIBILITY 0
-
-
-diff -ur wxWidgets-2.6.3/src/common/dobjcmn.cpp wxWidgets-2.6.3.3/src/common/dobjcmn.cpp
---- wxWidgets-2.6.3/src/common/dobjcmn.cpp 2006-03-24 18:51:30.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/common/dobjcmn.cpp 2006-03-30 04:52:54.000000000 -0500
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin, Robert Roebling
- // Modified by:
- // Created: 19.10.99
--// RCS-ID: $Id: dobjcmn.cpp,v 1.35.2.1 2006/03/24 23:51:30 RD Exp $
-+// RCS-ID: $Id: dobjcmn.cpp,v 1.35.2.2 2006/03/30 09:52:54 RR Exp $
- // Copyright: (c) wxWidgets Team
- // Licence: wxWindows licence
- ///////////////////////////////////////////////////////////////////////////////
-@@ -253,11 +253,15 @@
-
- bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
- {
-+ if ( !buf )
-+ return false;
-+
- wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
- if ( !buffer )
- return false;
-
-- strcpy( (char*) buf, buffer );
-+ memcpy( (char*) buf, buffer, GetDataSize(format) );
-+ // strcpy( (char*) buf, buffer );
-
- return true;
- }
-diff -ur wxWidgets-2.6.3/src/common/event.cpp wxWidgets-2.6.3.3/src/common/event.cpp
---- wxWidgets-2.6.3/src/common/event.cpp 2005-06-29 20:52:05.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/common/event.cpp 2006-05-29 13:34:47.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by:
- // Created: 01/02/97
--// RCS-ID: $Id: event.cpp,v 1.166 2005/06/30 00:52:05 MW Exp $
-+// RCS-ID: $Id: event.cpp,v 1.166.2.1 2006/05/29 17:34:47 MW Exp $
- // Copyright: (c) Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -1154,7 +1154,7 @@
-
- wxENTER_CRIT_SECT( Lock() );
-
-- if ( !--n )
-+ if ( --n == 0 )
- break;
- }
-
-diff -ur wxWidgets-2.6.3/src/common/filefn.cpp wxWidgets-2.6.3.3/src/common/filefn.cpp
---- wxWidgets-2.6.3/src/common/filefn.cpp 2006-02-27 10:16:37.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/common/filefn.cpp 2006-06-15 17:42:21.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by:
- // Created: 29/01/98
--// RCS-ID: $Id: filefn.cpp,v 1.249.2.5 2006/02/27 15:16:37 VZ Exp $
-+// RCS-ID: $Id: filefn.cpp,v 1.249.2.6 2006/06/15 21:42:21 MW Exp $
- // Copyright: (c) 1998 Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -304,16 +304,19 @@
-
- return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
- #else // !__WIN32__
-+ #ifndef S_ISREG
-+ #define S_ISREG(mode) ((mode) & S_IFREG)
-+ #endif
- wxStructStat st;
- #ifndef wxNEED_WX_UNISTD_H
-- return (wxStat( filename.fn_str() , &st) == 0 && (st.st_mode & S_IFREG))
-+ return (wxStat( filename.fn_str() , &st) == 0 && S_ISREG(st.st_mode))
- #ifdef __OS2__
- || (errno == EACCES) // if access is denied something with that name
- // exists and is opened in exclusive mode.
- #endif
- ;
- #else
-- return wxStat( filename , &st) == 0 && (st.st_mode & S_IFREG);
-+ return wxStat( filename , &st) == 0 && S_ISREG(st.st_mode);
- #endif
- #endif // __WIN32__/!__WIN32__
- }
-diff -ur wxWidgets-2.6.3/src/common/gifdecod.cpp wxWidgets-2.6.3.3/src/common/gifdecod.cpp
---- wxWidgets-2.6.3/src/common/gifdecod.cpp 2006-01-23 02:18:36.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/common/gifdecod.cpp 2006-04-01 20:21:53.000000000 -0500
-@@ -3,7 +3,7 @@
- // Purpose: wxGIFDecoder, GIF reader for wxImage and wxAnimation
- // Author: Guillermo Rodriguez Garcia <guille@iies.es>
- // Version: 3.04
--// RCS-ID: $Id: gifdecod.cpp,v 1.37.2.1 2006/01/23 07:18:36 vell Exp $
-+// RCS-ID: $Id: gifdecod.cpp,v 1.37.2.2 2006/04/02 01:21:53 VZ Exp $
- // Copyright: (c) Guillermo Rodriguez Garcia
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -474,6 +474,25 @@
- /* make new entry in alphabet (only if NOT just cleared) */
- if (lastcode != -1)
- {
-+ // Normally, after the alphabet is full and can't grow any
-+ // further (ab_free == 4096), encoder should (must?) emit CLEAR
-+ // to reset it. This checks whether we really got it, otherwise
-+ // the GIF is damaged.
-+ if (ab_free > ab_max)
-+ {
-+ delete[] ab_prefix;
-+ delete[] ab_tail;
-+ delete[] stack;
-+ return wxGIF_INVFORMAT;
-+ }
-+
-+ // This assert seems unnecessary since the condition above
-+ // eliminates the only case in which it went false. But I really
-+ // don't like being forced to ask "Who in .text could have
-+ // written there?!" And I wouldn't have been forced to ask if
-+ // this line had already been here.
-+ wxASSERT(ab_free < allocSize);
-+
- ab_prefix[ab_free] = lastcode;
- ab_tail[ab_free] = code;
- ab_free++;
-diff -ur wxWidgets-2.6.3/src/common/imagjpeg.cpp wxWidgets-2.6.3.3/src/common/imagjpeg.cpp
---- wxWidgets-2.6.3/src/common/imagjpeg.cpp 2005-03-04 14:23:28.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/common/imagjpeg.cpp 2006-04-01 20:27:36.000000000 -0500
-@@ -2,7 +2,7 @@
- // Name: imagjpeg.cpp
- // Purpose: wxImage JPEG handler
- // Author: Vaclav Slavik
--// RCS-ID: $Id: imagjpeg.cpp,v 1.47 2005/03/04 19:23:28 ABX Exp $
-+// RCS-ID: $Id: imagjpeg.cpp,v 1.47.2.1 2006/04/02 01:27:36 VZ Exp $
- // Copyright: (c) Vaclav Slavik
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -167,12 +167,22 @@
-
- /* Always display the message. */
- /* We could postpone this until after returning, if we chose. */
-- if (cinfo->err->output_message) (*cinfo->err->output_message) (cinfo);
-+ (*cinfo->err->output_message) (cinfo);
-
- /* Return control to the setjmp point */
- longjmp(myerr->setjmp_buffer, 1);
- }
-
-+/*
-+ * This will replace the standard output_message method when the user
-+ * wants us to be silent (verbose==false). We must have such method instead of
-+ * simply using NULL for cinfo->err->output_message because it's called
-+ * unconditionally from within libjpeg when there's "garbage input".
-+ */
-+CPP_METHODDEF(void) wx_ignore_message (j_common_ptr WXUNUSED(cinfo))
-+{
-+}
-+
- void wx_jpeg_io_src( j_decompress_ptr cinfo, wxInputStream& infile )
- {
- wx_src_ptr src;
-@@ -214,7 +224,8 @@
- cinfo.err = jpeg_std_error( &jerr.pub );
- jerr.pub.error_exit = wx_error_exit;
-
-- if (!verbose) cinfo.err->output_message=NULL;
-+ if (!verbose)
-+ cinfo.err->output_message = wx_ignore_message;
-
- /* Establish the setjmp return context for wx_error_exit to use. */
- if (setjmp(jerr.setjmp_buffer)) {
-@@ -327,7 +338,8 @@
- cinfo.err = jpeg_std_error(&jerr.pub);
- jerr.pub.error_exit = wx_error_exit;
-
-- if (!verbose) cinfo.err->output_message=NULL;
-+ if (!verbose)
-+ cinfo.err->output_message = wx_ignore_message;
-
- /* Establish the setjmp return context for wx_error_exit to use. */
- if (setjmp(jerr.setjmp_buffer))
-diff -ur wxWidgets-2.6.3/src/common/imagtiff.cpp wxWidgets-2.6.3.3/src/common/imagtiff.cpp
---- wxWidgets-2.6.3/src/common/imagtiff.cpp 2005-10-18 10:33:30.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/common/imagtiff.cpp 2006-06-27 17:47:27.000000000 -0400
-@@ -2,7 +2,7 @@
- // Name: imagtiff.cpp
- // Purpose: wxImage TIFF handler
- // Author: Robert Roebling
--// RCS-ID: $Id: imagtiff.cpp,v 1.37.2.1 2005/10/18 14:33:30 MW Exp $
-+// RCS-ID: $Id: imagtiff.cpp,v 1.37.2.2 2006/06/27 21:47:27 VZ Exp $
- // Copyright: (c) Robert Roebling
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -374,7 +374,7 @@
-
- int compression = image->GetOptionInt(wxIMAGE_OPTION_COMPRESSION);
- if ( !compression )
-- compression=COMPRESSION_LZW;
-+ compression=COMPRESSION_NONE;
-
- TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, spp);
- TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, bpp);
-diff -ur wxWidgets-2.6.3/src/common/init.cpp wxWidgets-2.6.3.3/src/common/init.cpp
---- wxWidgets-2.6.3/src/common/init.cpp 2005-06-13 08:19:20.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/common/init.cpp 2006-06-06 07:01:29.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin
- // Modified by:
- // Created: 04.10.99
--// RCS-ID: $Id: init.cpp,v 1.58 2005/06/13 12:19:20 ABX Exp $
-+// RCS-ID: $Id: init.cpp,v 1.58.2.2 2006/06/06 11:01:29 JS Exp $
- // Copyright: (c) Vadim Zeitlin
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -37,6 +37,9 @@
- #include "wx/ptr_scpd.h"
- #include "wx/module.h"
- #include "wx/except.h"
-+#if wxUSE_FONTMAP
-+#include "wx/fontmap.h"
-+#endif
-
- #if defined(__WXMSW__) && defined(__WXDEBUG__)
- #include "wx/msw/msvcrt.h"
-@@ -448,6 +451,13 @@
- {
- ConvertArgsToUnicode(argc, argv);
-
-+#if wxUSE_FONTMAP
-+ // If we created a font mapper during the above call,
-+ // it will only be the base class, so delete it to allow
-+ // app traits to create mapper.
-+ delete (wxFontMapperBase*) wxFontMapperBase::Set(NULL);
-+#endif
-+
- return wxEntry(argc, gs_initData.argv);
- }
-
-@@ -474,7 +484,7 @@
- {
- wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
-
-- if ( !--gs_initData.nInitCount )
-+ if ( --gs_initData.nInitCount == 0 )
- {
- wxEntryCleanup();
- }
-diff -ur wxWidgets-2.6.3/src/common/mimecmn.cpp wxWidgets-2.6.3.3/src/common/mimecmn.cpp
---- wxWidgets-2.6.3/src/common/mimecmn.cpp 2005-07-21 12:19:40.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/common/mimecmn.cpp 2006-06-19 03:16:37.000000000 -0400
-@@ -5,7 +5,7 @@
- // Modified by:
- // Chris Elliott (biol75@york.ac.uk) 5 Dec 00: write support for Win32
- // Created: 23.09.98
--// RCS-ID: $Id: mimecmn.cpp,v 1.40 2005/07/21 16:19:40 ABX Exp $
-+// RCS-ID: $Id: mimecmn.cpp,v 1.40.2.2 2006/06/19 07:16:37 VZ Exp $
- // Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
- // Licence: wxWindows licence (part of wxExtra library)
- /////////////////////////////////////////////////////////////////////////////
-@@ -494,6 +494,8 @@
-
- bool wxMimeTypesManager::Unassociate(wxFileType *ft)
- {
-+ EnsureImpl();
-+
- #if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
- return m_impl->Unassociate(ft);
- #else
-diff -ur wxWidgets-2.6.3/src/common/object.cpp wxWidgets-2.6.3.3/src/common/object.cpp
---- wxWidgets-2.6.3/src/common/object.cpp 2005-09-17 16:58:55.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/common/object.cpp 2006-05-29 13:34:48.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by: Ron Lee
- // Created: 04/01/98
--// RCS-ID: $Id: object.cpp,v 1.95 2005/09/17 20:58:55 VZ Exp $
-+// RCS-ID: $Id: object.cpp,v 1.95.2.1 2006/05/29 17:34:48 MW Exp $
- // Copyright: (c) 1998 Julian Smart
- // (c) 2001 Ron Lee <ron@debian.org>
- // Licence: wxWindows licence
-@@ -323,7 +323,7 @@
- {
- wxASSERT_MSG( m_refData->m_count > 0, _T("invalid ref data count") );
-
-- if ( !--m_refData->m_count )
-+ if ( --m_refData->m_count == 0 )
- delete m_refData;
- m_refData = NULL;
- }
-diff -ur wxWidgets-2.6.3/src/common/prntbase.cpp wxWidgets-2.6.3.3/src/common/prntbase.cpp
---- wxWidgets-2.6.3/src/common/prntbase.cpp 2005-07-28 18:20:03.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/common/prntbase.cpp 2006-06-28 08:56:05.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by:
- // Created: 04/01/98
--// RCS-ID: $Id: prntbase.cpp,v 1.89 2005/07/28 22:20:03 VZ Exp $
-+// RCS-ID: $Id: prntbase.cpp,v 1.89.2.1 2006/06/28 12:56:05 JS Exp $
- // Copyright: (c) Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -1483,6 +1483,11 @@
- m_pimpl->SetZoom( percent );
- }
-
-+int wxPrintPreview::GetZoom() const
-+{
-+ return m_pimpl->GetZoom();
-+}
-+
- wxPrintDialogData& wxPrintPreview::GetPrintDialogData()
- {
- return m_pimpl->GetPrintDialogData();
-diff -ur wxWidgets-2.6.3/src/common/socket.cpp wxWidgets-2.6.3.3/src/common/socket.cpp
---- wxWidgets-2.6.3/src/common/socket.cpp 2006-02-16 03:53:35.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/common/socket.cpp 2006-05-29 13:34:48.000000000 -0400
-@@ -5,7 +5,7 @@
- // Created: April 1997
- // Copyright: (C) 1999-1997, Guilhem Lavaux
- // (C) 2000-1999, Guillermo Rodriguez Garcia
--// RCS_ID: $Id: socket.cpp,v 1.133.2.2 2006/02/16 08:53:35 JS Exp $
-+// RCS_ID: $Id: socket.cpp,v 1.133.2.5 2006/05/29 17:34:48 MW Exp $
- // License: see wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-
-@@ -163,7 +163,7 @@
- {
- // we should be initialized
- wxASSERT_MSG( m_countInit, _T("extra call to Shutdown()") );
-- if ( !--m_countInit )
-+ if ( --m_countInit == 0 )
- {
- GSocket_Cleanup();
- }
-@@ -331,11 +331,9 @@
-
- // Return now in one of the following cases:
- // - the socket is invalid,
-- // - we got all the data,
-- // - we got *some* data and we are not using wxSOCKET_WAITALL.
-+ // - we got all the data
- if ( !m_socket ||
-- !nbytes ||
-- ((total != 0) && !(m_flags & wxSOCKET_WAITALL)) )
-+ !nbytes )
- return total;
-
- // Possible combinations (they are checked in this order)
-@@ -698,7 +696,7 @@
- else
- timeout = m_timeout * 1000;
-
-- bool has_event_loop = wxTheApp ? (wxTheApp->GetTraits() ? true : false) : false;
-+ bool has_event_loop = wxTheApp->GetTraits() ? (wxTheApp->GetTraits()->GetSocketGUIFunctionsTable() ? true : false) : false;
-
- // Wait in an active polling loop.
- //
-diff -ur wxWidgets-2.6.3/src/common/strconv.cpp wxWidgets-2.6.3.3/src/common/strconv.cpp
---- wxWidgets-2.6.3/src/common/strconv.cpp 2006-01-18 11:32:46.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/common/strconv.cpp 2006-04-21 22:14:00.000000000 -0400
-@@ -5,7 +5,7 @@
- // Ryan Norton, Fredrik Roubert (UTF7)
- // Modified by:
- // Created: 29/01/98
--// RCS-ID: $Id: strconv.cpp,v 1.160.2.2 2006/01/18 16:32:46 JS Exp $
-+// RCS-ID: $Id: strconv.cpp,v 1.160.2.3 2006/04/22 02:14:00 VZ Exp $
- // Copyright: (c) 1999 Ove Kaaven, Robert Roebling, Vaclav Slavik
- // (c) 2000-2003 Vadim Zeitlin
- // (c) 2004 Ryan Norton, Fredrik Roubert
-@@ -1637,14 +1637,27 @@
- // wouldn't work if reading an incomplete MB char didn't result in an
- // error
- //
-- // note however that using MB_ERR_INVALID_CHARS with CP_UTF7 results in
-- // an error (tested under Windows Server 2003) and apparently it is
-- // done on purpose, i.e. the function accepts any input in this case
-- // and although I'd prefer to return error on ill-formed output, our
-- // own wxMBConvUTF7 doesn't detect errors (e.g. lone "+" which is
-- // explicitly ill-formed according to RFC 2152) neither so we don't
-- // even have any fallback here...
-- int flags = m_CodePage == CP_UTF7 ? 0 : MB_ERR_INVALID_CHARS;
-+ // Moreover, MB_ERR_INVALID_CHARS is only supported on Win 2K SP4 or
-+ // Win XP or newer and it is not supported for UTF-[78] so we always
-+ // use our own conversions in this case. See
-+ // http://blogs.msdn.com/michkap/archive/2005/04/19/409566.aspx
-+ // http://msdn.microsoft.com/library/en-us/intl/unicode_17si.asp
-+ if ( m_CodePage == CP_UTF8 )
-+ {
-+ return wxConvUTF8.MB2WC(buf, psz, n);
-+ }
-+
-+ if ( m_CodePage == CP_UTF7 )
-+ {
-+ return wxConvUTF7.MB2WC(buf, psz, n);
-+ }
-+
-+ int flags = 0;
-+ if ( (m_CodePage < 50000 && m_CodePage != CP_SYMBOL) &&
-+ IsAtLeastWin2kSP4() )
-+ {
-+ flags = MB_ERR_INVALID_CHARS;
-+ }
-
- const size_t len = ::MultiByteToWideChar
- (
-@@ -1656,10 +1669,41 @@
- buf ? n : 0 // size of output buffer
- );
-
-+ if ( !len )
-+ {
-+ // function totally failed
-+ return (size_t)-1;
-+ }
-+
-+ // if we were really converting and didn't use MB_ERR_INVALID_CHARS,
-+ // check if we succeeded, by doing a double trip:
-+ if ( !flags && buf )
-+ {
-+ const size_t mbLen = strlen(psz);
-+ wxCharBuffer mbBuf(mbLen);
-+ if ( ::WideCharToMultiByte
-+ (
-+ m_CodePage,
-+ 0,
-+ buf,
-+ -1,
-+ mbBuf.data(),
-+ mbLen + 1, // size in bytes, not length
-+ NULL,
-+ NULL
-+ ) == 0 ||
-+ strcmp(mbBuf, psz) != 0 )
-+ {
-+ // we didn't obtain the same thing we started from, hence
-+ // the conversion was lossy and we consider that it failed
-+ return (size_t)-1;
-+ }
-+ }
-+
- // note that it returns count of written chars for buf != NULL and size
- // of the needed buffer for buf == NULL so in either case the length of
- // the string (which never includes the terminating NUL) is one less
-- return len ? len - 1 : (size_t)-1;
-+ return len - 1;
- }
-
- size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const
-@@ -1774,6 +1818,33 @@
- return s_isWin98Or2k == 1;
- }
-
-+ static bool IsAtLeastWin2kSP4()
-+ {
-+#ifdef __WXWINCE__
-+ return false;
-+#else
-+ static int s_isAtLeastWin2kSP4 = -1;
-+
-+ if ( s_isAtLeastWin2kSP4 == -1 )
-+ {
-+ OSVERSIONINFOEX ver;
-+
-+ memset(&ver, 0, sizeof(ver));
-+ ver.dwOSVersionInfoSize = sizeof(ver);
-+ GetVersionEx((OSVERSIONINFO*)&ver);
-+
-+ s_isAtLeastWin2kSP4 =
-+ ((ver.dwMajorVersion > 5) || // Vista+
-+ (ver.dwMajorVersion == 5 && ver.dwMinorVersion > 0) || // XP/2003
-+ (ver.dwMajorVersion == 5 && ver.dwMinorVersion == 0 &&
-+ ver.wServicePackMajor >= 4)) // 2000 SP4+
-+ ? 1 : 0;
-+ }
-+
-+ return s_isAtLeastWin2kSP4 == 1;
-+#endif
-+ }
-+
- long m_CodePage;
- };
-
-diff -ur wxWidgets-2.6.3/src/common/string.cpp wxWidgets-2.6.3.3/src/common/string.cpp
---- wxWidgets-2.6.3/src/common/string.cpp 2005-11-30 08:30:08.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/common/string.cpp 2006-07-06 06:30:37.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin, Ryan Norton
- // Modified by:
- // Created: 29/01/98
--// RCS-ID: $Id: string.cpp,v 1.258.2.1 2005/11/30 13:30:08 VZ Exp $
-+// RCS-ID: $Id: string.cpp,v 1.258.2.4 2006/07/06 10:30:37 ABX Exp $
- // Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
- // (c) 2004 Ryan Norton <wxprojects@comcast.net>
- // Licence: wxWindows licence
-@@ -1642,38 +1642,37 @@
- // trims spaces (in the sense of isspace) from left or right side
- wxString& wxString::Trim(bool bFromRight)
- {
-- // first check if we're going to modify the string at all
-- if ( !empty() &&
-- (
-- (bFromRight && wxSafeIsspace(GetChar(Len() - 1))) ||
-- (!bFromRight && wxSafeIsspace(GetChar(0u)))
-+ // first check if we're going to modify the string at all
-+ if ( !empty() &&
-+ (
-+ (bFromRight && wxSafeIsspace(GetChar(length() - 1))) ||
-+ (!bFromRight && wxSafeIsspace(GetChar(0u)))
-+ )
- )
-- )
-- {
-- if ( bFromRight )
-- {
-- // find last non-space character
-- iterator psz = begin() + length() - 1;
-- while ( wxSafeIsspace(*psz) && (psz >= begin()) )
-- psz--;
--
-- // truncate at trailing space start
-- *++psz = wxT('\0');
-- erase(psz, end());
-- }
-- else
- {
-- // find first non-space character
-- iterator psz = begin();
-- while ( wxSafeIsspace(*psz) )
-- psz++;
-+ if ( bFromRight )
-+ {
-+ // find last non-space character
-+ reverse_iterator psz = rbegin();
-+ while ( (psz != rend()) && wxSafeIsspace(*psz) )
-+ psz++;
-
-- // fix up data and length
-- erase(begin(), psz);
-+ // truncate at trailing space start
-+ erase(psz.base(), end());
-+ }
-+ else
-+ {
-+ // find first non-space character
-+ iterator psz = begin();
-+ while ( (psz != end()) && wxSafeIsspace(*psz) )
-+ psz++;
-+
-+ // fix up data and length
-+ erase(begin(), psz);
-+ }
- }
-- }
-
-- return *this;
-+ return *this;
- }
-
- // adds nCount characters chPad to the string from either side
-diff -ur wxWidgets-2.6.3/src/common/url.cpp wxWidgets-2.6.3.3/src/common/url.cpp
---- wxWidgets-2.6.3/src/common/url.cpp 2005-07-28 17:52:50.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/common/url.cpp 2006-06-11 14:52:42.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Guilhem Lavaux
- // Modified by:
- // Created: 20/07/1997
--// RCS-ID: $Id: url.cpp,v 1.54 2005/07/28 21:52:50 VZ Exp $
-+// RCS-ID: $Id: url.cpp,v 1.54.2.1 2006/06/11 18:52:42 KH Exp $
- // Copyright: (c) 1997, 1998 Guilhem Lavaux
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -185,7 +185,9 @@
- #if wxUSE_PROTOCOL_HTTP
- if (!m_useProxy)
- #endif // wxUSE_PROTOCOL_HTTP
-- delete m_protocol;
-+ if (m_protocol)
-+ // Need to safely delete the socket (pending events)
-+ m_protocol->Destroy();
- }
-
- wxURL::~wxURL()
-diff -ur wxWidgets-2.6.3/src/common/utilscmn.cpp wxWidgets-2.6.3.3/src/common/utilscmn.cpp
---- wxWidgets-2.6.3/src/common/utilscmn.cpp 2005-10-06 09:29:33.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/common/utilscmn.cpp 2006-06-25 20:01:03.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by:
- // Created: 29/01/98
--// RCS-ID: $Id: utilscmn.cpp,v 1.145.2.1 2005/10/06 13:29:33 VZ Exp $
-+// RCS-ID: $Id: utilscmn.cpp,v 1.145.2.4 2006/06/26 00:01:03 VZ Exp $
- // Copyright: (c) 1998 Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -93,6 +93,13 @@
- #include "wx/msw/wince/time.h"
- #endif
-
-+#ifdef __WXMAC__
-+#include "wx/mac/private.h"
-+#ifndef __DARWIN__
-+#include "InternetConfig.h"
-+#endif
-+#endif
-+
- #if !defined(__MWERKS__) && !defined(__WXWINCE__)
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -100,6 +107,8 @@
-
- #if defined(__WXMSW__)
- #include "wx/msw/private.h"
-+ #include "wx/msw/registry.h"
-+ #include <shellapi.h> // needed for SHELLEXECUTEINFO
- #endif
-
- #if wxUSE_BASE
-@@ -531,189 +540,99 @@
- // Launch default browser
- // ----------------------------------------------------------------------------
-
--bool wxLaunchDefaultBrowser(const wxString& url)
-+bool wxLaunchDefaultBrowser(const wxString& urlOrig)
- {
-- bool success = true;
--
-- wxString finalurl = url;
--
-- //if it isn't a full url, try appending http:// to it
-- if(wxURI(url).IsReference())
-- finalurl = wxString(wxT("http://")) + url;
--
--#if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
--
-- wxString command;
-+ // set the scheme of url to http if it does not have one
-+ wxString url(urlOrig);
-+ if ( !wxURI(url).HasScheme() )
-+ url.Prepend(wxT("http://"));
-
-- // ShellExecute() always opens in the same window,
-- // so do it manually for new window (from Mahogany)
-- wxRegKey key(wxRegKey::HKCR, url.BeforeFirst(':') + wxT("\\shell\\open"));
-- if ( key.Exists() )
-+#if defined(__WXMSW__)
-+ WinStruct<SHELLEXECUTEINFO> sei;
-+ sei.lpFile = url.c_str();
-+ sei.lpVerb = _T("open");
-+ sei.nShow = SW_SHOWNORMAL;
-+
-+ ::ShellExecuteEx(&sei);
-+
-+ const int nResult = (int) sei.hInstApp;
-+
-+ // Firefox returns file not found for some reason, so make an exception
-+ // for it
-+ if ( nResult > 32 || nResult == SE_ERR_FNF )
- {
-- wxRegKey keyDDE(key, wxT("DDEExec"));
-- if ( keyDDE.Exists() )
-- {
-- wxRegKey keyTopic(keyDDE, wxT("topic"));
-- wxString ddeTopic = keyTopic.QueryDefaultValue();
--
-- // we only know the syntax of WWW_OpenURL DDE request
-- if ( ddeTopic == wxT("WWW_OpenURL") )
-- {
-- wxString ddeCmd = keyDDE.QueryDefaultValue();
--
-- // this is a bit naive but should work as -1 can't appear
-- // elsewhere in the DDE topic, normally
-- if ( ddeCmd.Replace(wxT("-1"), wxT("0"),
-- false /* only first occurence */) == 1 )
-- {
-- // and also replace the parameters
-- if ( ddeCmd.Replace(wxT("%1"), url, false) == 1 )
-- {
-- // magic incantation understood by wxMSW
-- command << wxT("WX_DDE#")
-- << wxRegKey(key, wxT("command")).QueryDefaultValue() << wxT('#')
-- << wxRegKey(keyDDE, wxT("application")).QueryDefaultValue()
-- << wxT('#') << ddeTopic << wxT('#')
-- << ddeCmd;
-- }
-- }
-- }
-- }
-- }
--
-- //Try wxExecute - if it doesn't work or the regkey stuff
-- //above failed, fallback to opening the file in the same
-- //browser window
-- if ( command.empty() || !wxExecute(command) )
-- {
-- int nResult; //HINSTANCE error code
--
--#if !defined(__WXWINCE__)
-- // CYGWIN and MINGW may have problems - so load ShellExecute
-- // dynamically
-- typedef HINSTANCE (WINAPI *LPShellExecute)(HWND hwnd, const wxChar* lpOperation,
-- const wxChar* lpFile,
-- const wxChar* lpParameters,
-- const wxChar* lpDirectory,
-- INT nShowCmd);
--
-- HINSTANCE hShellDll = ::LoadLibrary(wxT("shell32.dll"));
-- if(hShellDll == NULL)
-- return false;
--
-- LPShellExecute lpShellExecute =
-- (LPShellExecute) ::GetProcAddress(hShellDll,
-- wxString::Format(wxT("ShellExecute%s"),
--
--#if wxUSE_UNICODE
-- wxT("W")
--#else
-- wxT("A")
--#endif
--#ifdef __WXWINCE__
-- )
--#else
-- ).mb_str(wxConvLocal)
--#endif
-- );
-- if(lpShellExecute == NULL)
-- return false;
--
-- // Windows sometimes doesn't open the browser correctly when using mime
-- // types, so do ShellExecute - i.e. start <url> (from James Carroll)
-- nResult = (int) (*lpShellExecute)(NULL, NULL, finalurl.c_str(),
-- NULL, wxT(""), SW_SHOWNORMAL);
-- // Unload Shell32.dll
-- ::FreeLibrary(hShellDll);
--#else
-- //Windows CE does not have normal ShellExecute - but it has
-- //ShellExecuteEx all the way back to version 1.0
--
--
-- //Set up the SHELLEXECUTEINFO structure to pass to ShellExecuteEx
-- SHELLEXECUTEINFO sei;
-- sei.cbSize = sizeof(SHELLEXECUTEINFO);
-- sei.dwHotKey = 0;
-- sei.fMask = 0;
-- sei.hIcon = NULL;
-- sei.hInstApp = NULL;
-- sei.hkeyClass = NULL;
-- // Not in WinCE
--#if 0
-- sei.hMonitor = NULL;
--#endif
-- sei.hProcess = NULL;
-- sei.hwnd = NULL;
-- sei.lpClass = NULL;
-- sei.lpDirectory = NULL;
-- sei.lpFile = finalurl.c_str();
-- sei.lpIDList = NULL;
-- sei.lpParameters = NULL;
-- sei.lpVerb = TEXT("open");
-- sei.nShow = SW_SHOWNORMAL;
--
-- //Call ShellExecuteEx
-- ShellExecuteEx(&sei);
--
-- //Get error code
-- nResult = (int) sei.hInstApp;
--#endif
--
-- // Hack for Firefox (returns file not found for some reason)
-- // from Angelo Mandato's wxHyperlinksCtrl
-- // HINSTANCE_ERROR == 32 (HINSTANCE_ERROR does not exist on Windows CE)
-- if (nResult <= 32 && nResult != SE_ERR_FNF)
-- return false;
--
- #ifdef __WXDEBUG__
- // Log something if SE_ERR_FNF happens
-- if(nResult == SE_ERR_FNF)
-- wxLogDebug(wxT("Got SE_ERR_FNF from ShellExecute - maybe FireFox"));
-+ if ( nResult == SE_ERR_FNF )
-+ wxLogDebug(wxT("SE_ERR_FNF from ShellExecute -- maybe FireFox?"));
-+#endif // __WXDEBUG__
-+ return true;
-+ }
-+#elif defined(__WXMAC__)
-+ OSStatus err;
-+ ICInstance inst;
-+ SInt32 startSel;
-+ SInt32 endSel;
-+
-+ err = ICStart(&inst, 'STKA'); // put your app creator code here
-+ if (err == noErr)
-+ {
-+#if !TARGET_CARBON
-+ err = ICFindConfigFile(inst, 0, NULL);
- #endif
-+ if (err == noErr)
-+ {
-+ ConstStr255Param hint = 0;
-+ startSel = 0;
-+ endSel = url.Length();
-+ err = ICLaunchURL(inst, hint, url.fn_str(), endSel, &startSel, &endSel);
-+ if (err != noErr)
-+ wxLogDebug(wxT("ICLaunchURL error %d"), (int) err);
-+ }
-+ ICStop(inst);
-+ return true;
- }
--
--#elif wxUSE_MIMETYPE
--
-- // Non-windows way
-- wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension (_T("html"));
-- if (!ft)
-+ else
- {
-- wxLogError(_T("No default application can open .html extension"));
-+ wxLogDebug(wxT("ICStart error %d"), (int) err);
- return false;
- }
--
-- wxString mt;
-- ft->GetMimeType(&mt);
--
-+#elif wxUSE_MIMETYPE
-+ // Non-windows way
-+ bool ok = false;
- wxString cmd;
-- bool ok = ft->GetOpenCommand (&cmd, wxFileType::MessageParameters(finalurl));
-- delete ft;
-
-- if (ok)
-+ wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("html"));
-+ if ( ft )
- {
-- if ( !wxExecute(cmd) )
-- {
-- wxLogError(_T("Failed to launch application for wxLaunchDefaultBrowser"));
-- return false;
-- }
-+ wxString mt;
-+ ft->GetMimeType(&mt);
-+
-+ ok = ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(url));
-+ delete ft;
- }
-- else
-+
-+ if ( !ok || cmd.empty() )
- {
- // fallback to checking for the BROWSER environment variable
- cmd = wxGetenv(wxT("BROWSER"));
-- if ( cmd.empty() || !wxExecute(cmd + wxT(" ") + finalurl) )
-- return false;
-+ if ( !cmd.empty() )
-+ cmd << _T(' ') << url;
- }
-
-+ ok = ( !cmd.empty() && wxExecute(cmd) );
-+ if (ok)
-+ return ok;
-
--#else // !wxUSE_MIMETYPE && !(WXMSW && wxUSE_NATIVE_CONFIG)
-+ // no file type for HTML extension
-+ wxLogError(_T("No default application configured for HTML files."));
-
-- success = false;
-+#endif // !wxUSE_MIMETYPE && !__WXMSW__
-
--#endif
-+ wxLogSysError(_T("Failed to open URL \"%s\" in default browser."),
-+ url.c_str());
-
-- //success - hopefully
-- return success;
-+ return false;
- }
-
- // ----------------------------------------------------------------------------
-diff -ur wxWidgets-2.6.3/src/common/wincmn.cpp wxWidgets-2.6.3.3/src/common/wincmn.cpp
---- wxWidgets-2.6.3/src/common/wincmn.cpp 2006-03-04 15:52:21.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/common/wincmn.cpp 2006-05-29 13:34:49.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart, Vadim Zeitlin
- // Modified by:
- // Created: 13/07/98
--// RCS-ID: $Id: wincmn.cpp,v 1.237.2.5 2006/03/04 20:52:21 ABX Exp $
-+// RCS-ID: $Id: wincmn.cpp,v 1.237.2.7 2006/05/29 17:34:49 MW Exp $
- // Copyright: (c) wxWidgets team
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -217,8 +217,10 @@
- // VZ: this one shouldn't exist...
- m_isBeingDeleted = false;
-
-+#if WX_USE_RESERVED_VIRTUALS
- // Reserved for future use
- m_windowReserved = NULL;
-+#endif
- }
-
- // common part of window creation process
-@@ -1830,7 +1832,7 @@
- // If there is a sizer, use it instead of the constraints
- if ( GetSizer() )
- {
-- int w, h;
-+ int w = 0, h = 0;
- GetVirtualSize(&w, &h);
- GetSizer()->SetDimension( 0, 0, w, h );
- }
-diff -ur wxWidgets-2.6.3/src/generic/calctrl.cpp wxWidgets-2.6.3.3/src/generic/calctrl.cpp
---- wxWidgets-2.6.3/src/generic/calctrl.cpp 2006-01-18 05:38:54.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/generic/calctrl.cpp 2006-06-14 07:41:42.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin
- // Modified by:
- // Created: 29.12.99
--// RCS-ID: $Id: calctrl.cpp,v 1.70.2.3 2006/01/18 10:38:54 JS Exp $
-+// RCS-ID: $Id: calctrl.cpp,v 1.70.2.4 2006/06/14 11:41:42 JS Exp $
- // Copyright: (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
- // Licence: wxWindows licence
- ///////////////////////////////////////////////////////////////////////////////
-@@ -788,16 +788,27 @@
- wxSize sizeCombo = m_comboMonth->GetSize();
- wxSize sizeStatic = m_staticMonth->GetSize();
- wxSize sizeSpin = m_spinYear->GetSize();
-- int dy = (sizeCombo.y - sizeStatic.y) / 2;
-+
-+ // wxMSW sometimes reports the wrong combo height,
-+ // so on this platform we'll use the spin control
-+ // height instead.
-+#ifdef __WXMSW__
-+ int maxHeight = sizeSpin.y;
-+ int requiredSpinHeight = -1;
-+#else
-+ int maxHeight = sizeCombo.y;
-+ int requiredSpinHeight = sizeCombo.y;
-+#endif
-+ int dy = (maxHeight - sizeStatic.y) / 2;
- m_comboMonth->Move(x, y);
-- m_staticMonth->SetSize(x, y + dy, sizeCombo.x, sizeStatic.y);
-+ m_staticMonth->SetSize(x, y + dy, sizeCombo.x, -1, sizeStatic.y);
-
- int xDiff = sizeCombo.x + HORZ_MARGIN;
-
-- m_spinYear->SetSize(x + xDiff, y, width - xDiff, sizeCombo.y);
-+ m_spinYear->SetSize(x + xDiff, y, width - xDiff, requiredSpinHeight);
- m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y);
-
-- yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN;
-+ yDiff = wxMax(sizeSpin.y, maxHeight) + VERT_MARGIN;
- }
- else // no controls on the top
- {
-diff -ur wxWidgets-2.6.3/src/generic/dirctrlg.cpp wxWidgets-2.6.3.3/src/generic/dirctrlg.cpp
---- wxWidgets-2.6.3/src/generic/dirctrlg.cpp 2006-03-05 15:50:25.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/generic/dirctrlg.cpp 2006-06-27 03:55:15.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Harm van der Heijden, Robert Roebling, Julian Smart
- // Modified by:
- // Created: 12/12/98
--// RCS-ID: $Id: dirctrlg.cpp,v 1.129.2.5 2006/03/05 20:50:25 VZ Exp $
-+// RCS-ID: $Id: dirctrlg.cpp,v 1.129.2.6 2006/06/27 07:55:15 JS Exp $
- // Copyright: (c) Harm van der Heijden, Robert Roebling and Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -121,13 +121,8 @@
- path.Printf(wxT("%c:\\"), driveBuffer[i]);
- name.Printf(wxT("%c:"), driveBuffer[i]);
-
--#if !defined(__WXWINCE__)
-- wxChar pname[52];
-- if (GetVolumeInformation( path.c_str(), pname, 52, NULL, NULL, NULL, NULL, 0 ))
-- {
-- name << _T(' ') << pname;
-- }
--#endif // __WXWINCE__
-+ // Do not use GetVolumeInformation to further decorate the
-+ // name, since it can cause severe delays on network drives.
-
- int imageId;
- int driveType = ::GetDriveType(path);
-diff -ur wxWidgets-2.6.3/src/generic/dragimgg.cpp wxWidgets-2.6.3.3/src/generic/dragimgg.cpp
---- wxWidgets-2.6.3/src/generic/dragimgg.cpp 2006-01-21 11:46:38.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/generic/dragimgg.cpp 2006-05-29 13:34:52.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by:
- // Created: 29/2/2000
--// RCS-ID: $Id: dragimgg.cpp,v 1.17.2.1 2006/01/21 16:46:38 JS Exp $
-+// RCS-ID: $Id: dragimgg.cpp,v 1.17.2.2 2006/05/29 17:34:52 MW Exp $
- // Copyright: (c) Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -128,7 +128,7 @@
- {
- wxFont font(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-
-- long w, h;
-+ long w = 0, h = 0;
- wxScreenDC dc;
- dc.SetFont(font);
- dc.GetTextExtent(str, & w, & h);
-diff -ur wxWidgets-2.6.3/src/generic/filedlgg.cpp wxWidgets-2.6.3.3/src/generic/filedlgg.cpp
---- wxWidgets-2.6.3/src/generic/filedlgg.cpp 2006-03-06 05:44:48.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/generic/filedlgg.cpp 2006-05-23 06:33:47.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Robert Roebling
- // Modified by:
- // Created: 12/12/98
--// RCS-ID: $Id: filedlgg.cpp,v 1.143.2.2 2006/03/06 10:44:48 JS Exp $
-+// RCS-ID: $Id: filedlgg.cpp,v 1.143.2.3 2006/05/23 10:33:47 JS Exp $
- // Copyright: (c) Robert Roebling
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -1307,13 +1307,21 @@
- // No double-click on most WinCE devices, so do action immediately.
- HandleAction( filename );
- #else
-- if (filename == wxT("..")) return;
-+ if (filename == wxT(".."))
-+ {
-+ inSelected = false;
-+ return;
-+ }
-
- wxString dir = m_list->GetDir();
- if (!IsTopMostDir(dir))
- dir += wxFILE_SEP_PATH;
- dir += filename;
-- if (wxDirExists(dir)) return;
-+ if (wxDirExists(dir))
-+ {
-+ inSelected = false;
-+ return;
-+ }
-
- ignoreChanges = true;
- m_text->SetValue( filename );
-diff -ur wxWidgets-2.6.3/src/generic/fontdlgg.cpp wxWidgets-2.6.3.3/src/generic/fontdlgg.cpp
---- wxWidgets-2.6.3/src/generic/fontdlgg.cpp 2006-03-02 07:57:19.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/generic/fontdlgg.cpp 2006-05-29 13:34:52.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by:
- // Created: 04/01/98
--// RCS-ID: $Id: fontdlgg.cpp,v 1.51.2.2 2006/03/02 12:57:19 JS Exp $
-+// RCS-ID: $Id: fontdlgg.cpp,v 1.51.2.3 2006/05/29 17:34:52 MW Exp $
- // Copyright: (c) Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -84,7 +84,7 @@
- {
- dc.SetFont(font);
- // Calculate vertical centre
-- long w, h;
-+ long w = 0, h = 0;
- dc.GetTextExtent( wxT("X"), &w, &h);
- dc.SetTextForeground(GetForegroundColour());
- dc.SetClippingRegion(2, 2, size.x-4, size.y-4);
-diff -ur wxWidgets-2.6.3/src/generic/grid.cpp wxWidgets-2.6.3.3/src/generic/grid.cpp
---- wxWidgets-2.6.3/src/generic/grid.cpp 2006-03-07 09:50:50.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/generic/grid.cpp 2006-07-08 12:34:29.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Michael Bedward (based on code by Julian Smart, Robin Dunn)
- // Modified by: Robin Dunn, Vadim Zeitlin
- // Created: 1/08/1999
--// RCS-ID: $Id: grid.cpp,v 1.345.2.3 2006/03/07 14:50:50 JS Exp $
-+// RCS-ID: $Id: grid.cpp,v 1.345.2.5 2006/07/08 16:34:29 RD Exp $
- // Copyright: (c) Michael Bedward (mbedward@ozemail.com.au)
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -6200,6 +6200,32 @@
- claimed = GetEventHandler()->ProcessEvent(gridEvt);
- vetoed = !gridEvt.IsAllowed();
- }
-+ else if ( type == wxEVT_GRID_LABEL_LEFT_CLICK ||
-+ type == wxEVT_GRID_LABEL_LEFT_DCLICK ||
-+ type == wxEVT_GRID_LABEL_RIGHT_CLICK ||
-+ type == wxEVT_GRID_LABEL_RIGHT_DCLICK )
-+ {
-+ wxPoint pos = mouseEv.GetPosition();
-+
-+ if ( mouseEv.GetEventObject() == GetGridRowLabelWindow() )
-+ pos.y += GetColLabelSize();
-+ if ( mouseEv.GetEventObject() == GetGridColLabelWindow() )
-+ pos.x += GetRowLabelSize();
-+
-+ wxGridEvent gridEvt( GetId(),
-+ type,
-+ this,
-+ row, col,
-+ pos.x,
-+ pos.y,
-+ false,
-+ mouseEv.ControlDown(),
-+ mouseEv.ShiftDown(),
-+ mouseEv.AltDown(),
-+ mouseEv.MetaDown() );
-+ claimed = GetEventHandler()->ProcessEvent(gridEvt);
-+ vetoed = !gridEvt.IsAllowed();
-+ }
- else
- {
- wxGridEvent gridEvt( GetId(),
-@@ -7455,8 +7481,8 @@
- int vertAlign,
- int textOrientation )
- {
-- long textWidth, textHeight;
-- long lineWidth, lineHeight;
-+ long textWidth = 0, textHeight = 0;
-+ long lineWidth = 0, lineHeight = 0;
- int nLines;
-
- dc.SetClippingRegion( rect );
-@@ -7583,7 +7609,7 @@
- {
- long w = 0;
- long h = 0;
-- long lineW, lineH;
-+ long lineW = 0, lineH = 0;
-
- size_t i;
- for ( i = 0; i < lines.GetCount(); i++ )
-diff -ur wxWidgets-2.6.3/src/generic/listctrl.cpp wxWidgets-2.6.3.3/src/generic/listctrl.cpp
---- wxWidgets-2.6.3/src/generic/listctrl.cpp 2006-03-10 16:37:20.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/generic/listctrl.cpp 2006-04-02 09:39:01.000000000 -0400
-@@ -3,7 +3,7 @@
- // Purpose: generic implementation of wxListCtrl
- // Author: Robert Roebling
- // Vadim Zeitlin (virtual list control support)
--// Id: $Id: listctrl.cpp,v 1.378.2.7 2006/03/10 21:37:20 RD Exp $
-+// Id: $Id: listctrl.cpp,v 1.378.2.9 2006/04/02 13:39:01 VZ Exp $
- // Copyright: (c) 1998 Robert Roebling
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -2914,6 +2914,7 @@
-
- void wxListMainWindow::OnMouse( wxMouseEvent &event )
- {
-+
- #ifdef __WXMAC__
- // On wxMac we can't depend on the EVT_KILL_FOCUS event to properly
- // shutdown the edit control when the mouse is clicked elsewhere on the
-@@ -2937,7 +2938,15 @@
- }
-
- if ( !HasCurrent() || IsEmpty() )
-+ {
-+ if (event.RightDown())
-+ {
-+ SendNotify( (size_t)-1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
-+ // Allow generation of context menu event
-+ event.Skip();
-+ }
- return;
-+ }
-
- if (m_dirty)
- return;
-@@ -3005,11 +3014,17 @@
- m_dragCount = 0;
- }
-
-- if ( !hitResult )
-+ if ( !hitResult )
- {
-- // outside of any item
-- return;
-- }
-+ if (event.RightDown())
-+ {
-+ SendNotify( (size_t) -1, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, event.GetPosition() );
-+ // Allow generation of context menu event
-+ event.Skip();
-+ }
-+
-+ return;
-+ }
-
- bool forceClick = false;
- if (event.ButtonDClick())
-@@ -3319,6 +3334,10 @@
-
- case WXK_PRIOR:
- {
-+ // avoid floating point exception
-+ if (m_linesPerPage == 0)
-+ m_linesPerPage = 1;
-+
- int steps = InReportView() ? m_linesPerPage - 1 : m_current % m_linesPerPage;
-
- int index = m_current - steps;
-@@ -3331,6 +3350,10 @@
-
- case WXK_NEXT:
- {
-+ // avoid floating point exception
-+ if (m_linesPerPage == 0)
-+ m_linesPerPage = 1;
-+
- int steps = InReportView()
- ? m_linesPerPage - 1
- : m_linesPerPage - (m_current % m_linesPerPage) - 1;
-@@ -4667,7 +4690,13 @@
-
- void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
- {
-- // update our idea of which lines are shown when we redraw the window the
-+ int cw, ch, vw, vh;
-+ GetVirtualSize(&vw, &vh);
-+ GetClientSize(&cw, &ch);
-+ if (event.GetOrientation() == wxVERTICAL && ch >= vh)
-+ return;
-+
-+ // update our idea of which lines are shown when we redraw the window the
- // next time
- ResetVisibleLinesRange();
-
-@@ -5575,12 +5604,12 @@
- #if wxABI_VERSION >= 20603
- void wxGenericListCtrl::DoClientToScreen( int *x, int *y ) const
- {
-- return m_mainWin->DoClientToScreen(x, y);
-+ m_mainWin->DoClientToScreen(x, y);
- }
-
- void wxGenericListCtrl::DoScreenToClient( int *x, int *y ) const
- {
-- return m_mainWin->DoScreenToClient(x, y);
-+ m_mainWin->DoScreenToClient(x, y);
- }
- #endif // 2.6.3
-
-diff -ur wxWidgets-2.6.3/src/generic/notebook.cpp wxWidgets-2.6.3.3/src/generic/notebook.cpp
---- wxWidgets-2.6.3/src/generic/notebook.cpp 2005-09-17 17:00:47.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/generic/notebook.cpp 2006-05-29 16:37:07.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by:
- // Created: 17/09/98
--// RCS-ID: $Id: notebook.cpp,v 1.36 2005/09/17 21:00:47 VZ Exp $
-+// RCS-ID: $Id: notebook.cpp,v 1.36.2.1 2006/05/29 20:37:07 MW Exp $
- // Copyright: (c) Julian Smart
- // Licence: wxWindows licence
- ///////////////////////////////////////////////////////////////////////////////
-@@ -76,6 +76,12 @@
- // Private class
- // ============================================================================
-
-+WX_DECLARE_HASH_MAP(int, wxNotebookPage*, wxIntegerHash, wxIntegerEqual,
-+ wxIntToNotebookPageHashMap);
-+
-+WX_DECLARE_HASH_MAP(wxNotebookPage*, int, wxPointerHash, wxPointerEqual,
-+ wxNotebookPageToIntHashMap);
-+
- // This reuses wxTabView to draw the tabs.
- class WXDLLEXPORT wxNotebookTabView: public wxTabView
- {
-@@ -89,10 +95,24 @@
- // Allows vetoing
- virtual bool OnTabPreActivate(int activateId, int deactivateId);
-
-+ // map integer ids used by wxTabView to wxNotebookPage pointers
-+ int GetId(wxNotebookPage *page);
-+ wxNotebookPage *GetPage(int id) { return m_idToPage[id]; }
-+
- protected:
-- wxNotebook* m_notebook;
-+ wxNotebook* m_notebook;
-+
-+private:
-+ wxIntToNotebookPageHashMap m_idToPage;
-+ wxNotebookPageToIntHashMap m_pageToId;
-+ int m_nextid;
- };
-
-+static int GetPageId(wxTabView *tabview, wxNotebookPage *page)
-+{
-+ return wx_static_cast(wxNotebookTabView*, tabview)->GetId(page);
-+}
-+
- // ----------------------------------------------------------------------------
- // wxNotebook construction
- // ----------------------------------------------------------------------------
-@@ -167,7 +187,7 @@
-
- wxNotebookPage* pPage = GetPage(nPage);
-
-- m_tabView->SetTabSelection((int) (long) pPage);
-+ m_tabView->SetTabSelection(GetPageId(m_tabView, pPage));
-
- // TODO
- return 0;
-@@ -192,7 +212,7 @@
- wxNotebookPage* page = GetPage(nPage);
- if (page)
- {
-- m_tabView->SetTabText((int) (long) page, strText);
-+ m_tabView->SetTabText(GetPageId(m_tabView, page), strText);
- Refresh();
- return true;
- }
-@@ -206,7 +226,7 @@
-
- wxNotebookPage* page = ((wxNotebook*)this)->GetPage(nPage);
- if (page)
-- return m_tabView->GetTabText((int) (long) page);
-+ return m_tabView->GetTabText(GetPageId(m_tabView, page));
- else
- return wxEmptyString;
- }
-@@ -262,7 +282,7 @@
-
- wxNotebookPage* pPage = GetPage(nPage);
-
-- m_tabView->RemoveTab((int) (long) pPage);
-+ m_tabView->RemoveTab(GetPageId(m_tabView, pPage));
-
- m_pages.Remove(pPage);
- delete pPage;
-@@ -276,7 +296,7 @@
- {
- m_nSelection = -1;
-
-- m_tabView->SetTabSelection((int) (long) GetPage(0), false);
-+ m_tabView->SetTabSelection(GetPageId(m_tabView, GetPage(0)), false);
-
- if (m_nSelection != 0)
- ChangePage(-1, 0);
-@@ -311,7 +331,7 @@
-
- wxNotebookPage* pPage = GetPage(nPage);
-
-- m_tabView->RemoveTab((int) (long) pPage);
-+ m_tabView->RemoveTab(GetPageId(m_tabView, pPage));
-
- m_pages.Remove(pPage);
-
-@@ -390,7 +410,7 @@
- wxASSERT( pPage != NULL );
- wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), false );
-
-- m_tabView->AddTab((int) (long) pPage, strText);
-+ m_tabView->AddTab(GetPageId(m_tabView, pPage), strText);
-
- if (!bSelect)
- pPage->Show(false);
-@@ -402,7 +422,7 @@
- {
- // This will cause ChangePage to be called, via OnSelPage
-
-- m_tabView->SetTabSelection((int) (long) pPage, true);
-+ m_tabView->SetTabSelection(GetPageId(m_tabView, pPage), true);
- }
-
- // some page must be selected: either this one or the first one if there is
-@@ -656,7 +676,8 @@
-
- IMPLEMENT_CLASS(wxNotebookTabView, wxTabView)
-
--wxNotebookTabView::wxNotebookTabView(wxNotebook *notebook, long style): wxTabView(style)
-+wxNotebookTabView::wxNotebookTabView(wxNotebook *notebook, long style)
-+ : wxTabView(style), m_nextid(1)
- {
- m_notebook = notebook;
-
-@@ -669,6 +690,19 @@
- {
- }
-
-+int wxNotebookTabView::GetId(wxNotebookPage *page)
-+{
-+ int& id = m_pageToId[page];
-+
-+ if (!id)
-+ {
-+ id = m_nextid++;
-+ m_idToPage[id] = page;
-+ }
-+
-+ return id;
-+}
-+
- // Called when a tab is activated
- void wxNotebookTabView::OnTabActivate(int activateId, int deactivateId)
- {
-@@ -679,8 +713,8 @@
-
- // Translate from wxTabView's ids (which aren't position-dependent)
- // to wxNotebook's (which are).
-- wxNotebookPage* pActive = (wxNotebookPage*) activateId;
-- wxNotebookPage* pDeactive = (wxNotebookPage*) deactivateId;
-+ wxNotebookPage* pActive = GetPage(activateId);
-+ wxNotebookPage* pDeactive = GetPage(deactivateId);
-
- int activatePos = m_notebook->FindPagePosition(pActive);
- int deactivatePos = m_notebook->FindPagePosition(pDeactive);
-@@ -702,8 +736,8 @@
-
- // Translate from wxTabView's ids (which aren't position-dependent)
- // to wxNotebook's (which are).
-- wxNotebookPage* pActive = (wxNotebookPage*) activateId;
-- wxNotebookPage* pDeactive = (wxNotebookPage*) deactivateId;
-+ wxNotebookPage* pActive = GetPage(activateId);
-+ wxNotebookPage* pDeactive = GetPage(deactivateId);
-
- int activatePos = m_notebook->FindPagePosition(pActive);
- int deactivatePos = m_notebook->FindPagePosition(pDeactive);
-diff -ur wxWidgets-2.6.3/src/generic/progdlgg.cpp wxWidgets-2.6.3.3/src/generic/progdlgg.cpp
---- wxWidgets-2.6.3/src/generic/progdlgg.cpp 2005-04-07 10:52:22.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/generic/progdlgg.cpp 2006-05-29 13:34:54.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Karsten Ball�der
- // Modified by:
- // Created: 09.05.1999
--// RCS-ID: $Id: progdlgg.cpp,v 1.93 2005/04/07 14:52:22 ABX Exp $
-+// RCS-ID: $Id: progdlgg.cpp,v 1.93.2.1 2006/05/29 17:34:54 MW Exp $
- // Copyright: (c) Karsten Ball�der
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -145,7 +145,7 @@
-
- wxClientDC dc(this);
- dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-- long widthText;
-+ long widthText = 0;
- dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
-
- wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-diff -ur wxWidgets-2.6.3/src/generic/sashwin.cpp wxWidgets-2.6.3.3/src/generic/sashwin.cpp
---- wxWidgets-2.6.3/src/generic/sashwin.cpp 2004-12-14 15:41:53.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/generic/sashwin.cpp 2006-05-29 13:34:55.000000000 -0400
-@@ -6,7 +6,7 @@
- // Author: Julian Smart
- // Modified by:
- // Created: 01/02/97
--// RCS-ID: $Id: sashwin.cpp,v 1.46 2004/12/14 20:41:53 ABX Exp $
-+// RCS-ID: $Id: sashwin.cpp,v 1.46.2.1 2006/05/29 17:34:55 MW Exp $
- // Copyright: (c) Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -98,7 +98,7 @@
-
- void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
- {
-- wxCoord x, y;
-+ wxCoord x = 0, y = 0;
- event.GetPosition(&x, &y);
-
- wxSashEdgePosition sashHit = SashHitTest(x, y);
-diff -ur wxWidgets-2.6.3/src/generic/scrlwing.cpp wxWidgets-2.6.3.3/src/generic/scrlwing.cpp
---- wxWidgets-2.6.3/src/generic/scrlwing.cpp 2006-03-13 10:10:38.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/generic/scrlwing.cpp 2006-06-09 10:04:57.000000000 -0400
-@@ -5,7 +5,7 @@
- // Modified by: Vadim Zeitlin on 31.08.00: wxScrollHelper allows to implement.
- // Ron Lee on 10.4.02: virtual size / auto scrollbars et al.
- // Created: 01/02/97
--// RCS-ID: $Id: scrlwing.cpp,v 1.69.2.1 2006/03/13 15:10:38 JS Exp $
-+// RCS-ID: $Id: scrlwing.cpp,v 1.69.2.3 2006/06/09 14:04:57 JS Exp $
- // Copyright: (c) wxWidgets team
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -882,7 +882,7 @@
- if (((x_pos == -1) || (x_pos == m_xScrollPosition)) &&
- ((y_pos == -1) || (y_pos == m_yScrollPosition))) return;
-
-- int w, h;
-+ int w = 0, h = 0;
- GetTargetSize(&w, &h);
-
- if ((x_pos != -1) && (m_xScrollPixelsPerLine))
-@@ -1278,7 +1278,7 @@
- // If we're the scroll target, take into account the
- // virtual size and scrolled position of the window.
-
-- int x, y, w, h;
-+ int x = 0, y = 0, w = 0, h = 0;
- CalcScrolledPosition(0,0, &x,&y);
- GetVirtualSize(&w, &h);
- GetSizer()->SetDimension(x, y, w, h);
-@@ -1319,6 +1319,7 @@
- {
- wxSize best;
-
-+ bool addClientSizeDiff = true;
- if ( GetSizer() )
- {
- wxSize b = GetSizer()->GetMinSize();
-@@ -1333,7 +1334,14 @@
- if ( GetMinSize().IsFullySpecified() )
- minSize = GetMinSize();
- else
-+ {
- minSize = GetSize();
-+
-+ // If we're using the overall size, we don't want to then
-+ // add to it, or we'll successively grow the window over
-+ // multiple layouts.
-+ addClientSizeDiff = false;
-+ }
-
- if (ppuX > 0)
- b.x = minSize.x;
-@@ -1345,9 +1353,12 @@
- return wxWindow::DoGetBestSize();
-
- // Add any difference between size and client size
-- wxSize diff = GetSize() - GetClientSize();
-- best.x += wxMax(0, diff.x);
-- best.y += wxMax(0, diff.y);
-+ if (addClientSizeDiff)
-+ {
-+ wxSize diff = GetSize() - GetClientSize();
-+ best.x += wxMax(0, diff.x);
-+ best.y += wxMax(0, diff.y);
-+ }
-
- return best;
- }
-diff -ur wxWidgets-2.6.3/src/generic/statusbr.cpp wxWidgets-2.6.3.3/src/generic/statusbr.cpp
---- wxWidgets-2.6.3/src/generic/statusbr.cpp 2005-06-07 15:01:45.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/generic/statusbr.cpp 2006-05-29 13:34:55.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Julian Smart
- // Modified by:
- // Created: 01/02/97
--// RCS-ID: $Id: statusbr.cpp,v 1.68 2005/06/07 19:01:45 ABX Exp $
-+// RCS-ID: $Id: statusbr.cpp,v 1.68.2.1 2006/05/29 17:34:55 MW Exp $
- // Copyright: (c) Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -237,7 +237,7 @@
-
- wxString text(GetStatusText(i));
-
-- long x, y;
-+ long x = 0, y = 0;
-
- dc.GetTextExtent(text, &x, &y);
-
-diff -ur wxWidgets-2.6.3/src/generic/treectlg.cpp wxWidgets-2.6.3.3/src/generic/treectlg.cpp
---- wxWidgets-2.6.3/src/generic/treectlg.cpp 2006-02-27 16:49:48.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/generic/treectlg.cpp 2006-05-29 13:34:56.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Robert Roebling
- // Created: 01/02/97
- // Modified: 22/10/98 - almost total rewrite, simpler interface (VZ)
--// Id: $Id: treectlg.cpp,v 1.173.2.4 2006/02/27 21:49:48 RR Exp $
-+// Id: $Id: treectlg.cpp,v 1.173.2.5 2006/05/29 17:34:56 MW Exp $
- // Copyright: (c) 1998 Robert Roebling and Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -3557,7 +3557,7 @@
- {
- wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen tree control?") );
-
-- if ( !--m_freezeCount )
-+ if ( --m_freezeCount == 0 )
- {
- Refresh();
- }
-diff -ur wxWidgets-2.6.3/src/generic/vlbox.cpp wxWidgets-2.6.3.3/src/generic/vlbox.cpp
---- wxWidgets-2.6.3/src/generic/vlbox.cpp 2006-01-18 04:50:37.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/generic/vlbox.cpp 2006-04-14 11:24:13.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin
- // Modified by:
- // Created: 31.05.03
--// RCS-ID: $Id: vlbox.cpp,v 1.22.2.1 2006/01/18 09:50:37 JS Exp $
-+// RCS-ID: $Id: vlbox.cpp,v 1.22.2.2 2006/04/14 15:24:13 VZ Exp $
- // Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
- // License: wxWindows license
- ///////////////////////////////////////////////////////////////////////////////
-@@ -378,8 +378,8 @@
- // the update rectangle
- wxRect rectUpdate = GetUpdateClientRect();
-
-- // Fill it with background colour
-- dc.SetBrush(GetBackgroundColour());
-+ // fill it with background colour
-+ dc.SetBackground(GetBackgroundColour());
- dc.Clear();
-
- // the bounding rectangle of the current line
-diff -ur wxWidgets-2.6.3/src/gtk/clipbrd.cpp wxWidgets-2.6.3.3/src/gtk/clipbrd.cpp
---- wxWidgets-2.6.3/src/gtk/clipbrd.cpp 2006-03-24 18:51:29.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/gtk/clipbrd.cpp 2006-04-15 05:57:41.000000000 -0400
-@@ -2,7 +2,7 @@
- // Name: gtk/clipbrd.cpp
- // Purpose:
- // Author: Robert Roebling
--// Id: $Id: clipbrd.cpp,v 1.60.2.3 2006/03/24 23:51:29 RD Exp $
-+// Id: $Id: clipbrd.cpp,v 1.60.2.5 2006/04/15 09:57:41 SN Exp $
- // Copyright: (c) 1998 Robert Roebling
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -265,7 +265,7 @@
- // It shall return the time which was used to set the data.
- if (selection_data->target == g_timestampAtom)
- {
-- uint timestamp = GPOINTER_TO_UINT (signal_data);
-+ guint timestamp = GPOINTER_TO_UINT (signal_data);
- gtk_selection_data_set(selection_data,
- GDK_SELECTION_TYPE_INTEGER,
- 32,
-@@ -493,17 +493,22 @@
- }
-
- delete[] array;
--
-+
-+#ifdef __WXGTK20__
- gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
- "selection_get",
- GTK_SIGNAL_FUNC(selection_handler),
- GUINT_TO_POINTER(
--#ifdef __WXGTK20__
- gtk_get_current_event_time()
-+ ) );
- #else
-+ gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
-+ "selection_get",
-+ GTK_SIGNAL_FUNC(selection_handler),
-+ GUINT_TO_POINTER(
- gdk_event_get_time(gtk_get_current_event())
-+ ) );
- #endif
-- ) );
-
- #if wxUSE_THREADS
- /* disable GUI threads */
-diff -ur wxWidgets-2.6.3/src/gtk/colour.cpp wxWidgets-2.6.3.3/src/gtk/colour.cpp
---- wxWidgets-2.6.3/src/gtk/colour.cpp 2005-07-22 14:01:45.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/gtk/colour.cpp 2006-06-15 15:35:34.000000000 -0400
-@@ -2,7 +2,7 @@
- // Name: colour.cpp
- // Purpose:
- // Author: Robert Roebling
--// Id: $Id: colour.cpp,v 1.49 2005/07/22 18:01:45 ABX Exp $
-+// Id: $Id: colour.cpp,v 1.49.2.1 2006/06/15 19:35:34 PC Exp $
- // Copyright: (c) 1998 Robert Roebling
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -154,9 +154,9 @@
- wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
- {
- m_refData = new wxColourRefData();
-- M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
-- M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
-- M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
-+ M_COLDATA->m_color.red = (((unsigned short)red) << SHIFT) + red;
-+ M_COLDATA->m_color.green = (((unsigned short)green) << SHIFT) + green;
-+ M_COLDATA->m_color.blue = (((unsigned short)blue) << SHIFT) + blue;
- M_COLDATA->m_color.pixel = 0;
- }
-
-@@ -234,9 +234,9 @@
- {
- AllocExclusive();
-
-- M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
-- M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
-- M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
-+ M_COLDATA->m_color.red = (((unsigned short)red) << SHIFT) + red;
-+ M_COLDATA->m_color.green = (((unsigned short)green) << SHIFT) + green;
-+ M_COLDATA->m_color.blue = (((unsigned short)blue) << SHIFT) + blue;
- M_COLDATA->m_color.pixel = 0;
-
- M_COLDATA->m_colormap = (GdkColormap*) NULL;
-diff -ur wxWidgets-2.6.3/src/gtk/combobox.cpp wxWidgets-2.6.3.3/src/gtk/combobox.cpp
---- wxWidgets-2.6.3/src/gtk/combobox.cpp 2006-03-17 11:00:51.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/gtk/combobox.cpp 2006-06-26 08:32:42.000000000 -0400
-@@ -2,7 +2,7 @@
- // Name: combobox.cpp
- // Purpose:
- // Author: Robert Roebling
--// Id: $Id: combobox.cpp,v 1.131.2.2 2006/03/17 16:00:51 RR Exp $
-+// Id: $Id: combobox.cpp,v 1.131.2.3 2006/06/26 12:32:42 VZ Exp $
- // Copyright: (c) 1998 Robert Roebling
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -80,11 +80,15 @@
- // when the popup is hidden, throw a SELECTED event only if the combobox
- // selection changed.
- int curSelection = combo->GetCurrentSelection();
--
-- // reset the selection flag to value meaning that it is hidden
-+
-+ const bool hasChanged = curSelection != g_SelectionBeforePopup;
-+
-+ // reset the selection flag to value meaning that it is hidden and do it
-+ // now, before generating the events, so that GetSelection() returns the
-+ // new value from the event handler
- g_SelectionBeforePopup = wxID_NONE;
--
-- if (g_SelectionBeforePopup != curSelection)
-+
-+ if ( hasChanged )
- {
- wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
- event.SetInt( curSelection );
-diff -ur wxWidgets-2.6.3/src/gtk/dcclient.cpp wxWidgets-2.6.3.3/src/gtk/dcclient.cpp
---- wxWidgets-2.6.3/src/gtk/dcclient.cpp 2005-08-17 17:40:44.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/gtk/dcclient.cpp 2006-05-24 22:40:41.000000000 -0400
-@@ -2,7 +2,7 @@
- // Name: gtk/dcclient.cpp
- // Purpose:
- // Author: Robert Roebling
--// RCS-ID: $Id: dcclient.cpp,v 1.204 2005/08/17 21:40:44 MR Exp $
-+// RCS-ID: $Id: dcclient.cpp,v 1.204.2.1 2006/05/25 02:40:41 PC Exp $
- // Copyright: (c) 1998 Robert Roebling, Chris Breeze
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -1610,15 +1610,16 @@
-
- void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y, double angle )
- {
-- if (angle == 0.0)
-- {
-- DrawText(text, x, y);
-+ if (!m_window || text.empty())
- return;
-- }
-
- wxCHECK_RET( Ok(), wxT("invalid window dc") );
-
-- if (!m_window) return;
-+ if (wxIsNullDouble(angle))
-+ {
-+ DrawText(text, x, y);
-+ return;
-+ }
-
- wxCoord w;
- wxCoord h;
-diff -ur wxWidgets-2.6.3/src/gtk/filedlg.cpp wxWidgets-2.6.3.3/src/gtk/filedlg.cpp
---- wxWidgets-2.6.3/src/gtk/filedlg.cpp 2005-11-14 18:02:03.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/gtk/filedlg.cpp 2006-05-18 22:39:24.000000000 -0400
-@@ -2,7 +2,7 @@
- // Name: gtk/filedlg.cpp
- // Purpose: native implementation of wxFileDialog
- // Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp
--// Id: $Id: filedlg.cpp,v 1.67.2.1 2005/11/14 23:02:03 RR Exp $
-+// Id: $Id: filedlg.cpp,v 1.67.2.3 2006/05/19 02:39:24 MR Exp $
- // Copyright: (c) 1998 Robert Roebling, 2004 Zbigniew Zagorski, 2005 Mart Raudsepp
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -181,6 +181,8 @@
- ok_btn_stock, GTK_RESPONSE_ACCEPT,
- NULL);
-
-+ gtk_dialog_set_default_response(GTK_DIALOG(m_widget), GTK_RESPONSE_ACCEPT);
-+
- if ( style & wxMULTIPLE )
- gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(m_widget), true);
-
-@@ -206,7 +208,7 @@
- wxConvFileName->cWX2MB(defaultFileName));
-
- #if GTK_CHECK_VERSION(2,7,3)
-- if (!gtk_check_version(2,7,3))
-+ if ((style & wxOVERWRITE_PROMPT) && !gtk_check_version(2,7,3))
- gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(m_widget), TRUE);
- #endif
- }
-diff -ur wxWidgets-2.6.3/src/gtk/scrolwin.cpp wxWidgets-2.6.3.3/src/gtk/scrolwin.cpp
---- wxWidgets-2.6.3/src/gtk/scrolwin.cpp 2005-11-02 10:57:38.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/gtk/scrolwin.cpp 2006-06-10 15:52:49.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Robert Roebling
- // Modified by: Ron Lee
- // Created: 01/02/97
--// RCS-ID: $Id: scrolwin.cpp,v 1.44.2.1 2005/11/02 15:57:38 JS Exp $
-+// RCS-ID: $Id: scrolwin.cpp,v 1.44.2.5 2006/06/10 19:52:49 PC Exp $
- // Copyright: (c) Robert Roebling
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -58,8 +58,8 @@
- // data
- //-----------------------------------------------------------------------------
-
--extern bool g_blockEventsOnDrag;
- extern bool g_blockEventsOnScroll;
-+extern bool g_mouseButtonDown;
-
- //-----------------------------------------------------------------------------
- // idle system
-@@ -69,68 +69,63 @@
- extern bool g_isIdle;
-
- //-----------------------------------------------------------------------------
--// "value_changed" from m_vAdjust
-+// "value_changed" from m_[hv]Adjust
- //-----------------------------------------------------------------------------
-
- extern "C" {
--static void gtk_scrolled_window_vscroll_callback( GtkAdjustment *adjust,
-+static void gtk_scrolled_window_scroll_callback( GtkAdjustment *adjust,
- SCROLLBAR_CBACK_ARG
- wxScrolledWindow *win )
- {
- if (g_isIdle)
- wxapp_install_idle_handler();
-
-- if (g_blockEventsOnDrag) return;
--
-- if (!win->m_hasVMT) return;
--
-- win->GtkVScroll( adjust->value,
-- GET_SCROLL_TYPE(GTK_SCROLLED_WINDOW(win->m_widget)->vscrollbar) );
-+ win->HandleScrollEvent(adjust);
- }
- }
-
- //-----------------------------------------------------------------------------
--// "value_changed" from m_hAdjust
-+// "button_press_event" from scrollbar
- //-----------------------------------------------------------------------------
-
- extern "C" {
--static void gtk_scrolled_window_hscroll_callback( GtkAdjustment *adjust,
-- SCROLLBAR_CBACK_ARG
-- wxScrolledWindow *win )
-+static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
-+ GdkEventButton *gdk_event,
-+ wxWindowGTK *win)
- {
- if (g_isIdle)
- wxapp_install_idle_handler();
-
-- if (g_blockEventsOnDrag) return;
-- if (!win->m_hasVMT) return;
-+ g_blockEventsOnScroll = TRUE;
-+ g_mouseButtonDown = true;
-
-- win->GtkHScroll( adjust->value,
-- GET_SCROLL_TYPE(GTK_SCROLLED_WINDOW(win->m_widget)->hscrollbar) );
-+ return FALSE;
- }
- }
-
-+#ifdef __WXGTK20__
- //-----------------------------------------------------------------------------
--// "button_press_event" from scrollbar
-+// "event_after" from scrollbar
- //-----------------------------------------------------------------------------
-
- extern "C" {
--static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
-- GdkEventButton *gdk_event,
-- wxWindowGTK *win)
-+static void
-+gtk_scrollbar_event_after(GtkRange* range, GdkEvent* event, wxWindow* win)
- {
-- if (g_isIdle)
-- wxapp_install_idle_handler();
--
-- g_blockEventsOnScroll = TRUE;
--
-- // FIXME: there is no slider field any more, what was meant here?
--#ifndef __WXGTK20__
-- win->m_isScrolling = (gdk_event->window == widget->slider);
--#endif
-+ if (event->type == GDK_BUTTON_RELEASE)
-+ {
-+ g_signal_handlers_block_by_func(range, (void*)gtk_scrollbar_event_after, win);
-
-- return FALSE;
-+ GtkAdjustment* adj = range->adjustment;
-+ wxASSERT(adj == win->m_hAdjust || adj == win->m_vAdjust);
-+ const int orient = adj == win->m_hAdjust ? wxHORIZONTAL : wxVERTICAL;
-+ wxScrollWinEvent event(wxEVT_SCROLLWIN_THUMBRELEASE, win->GetScrollPos(orient), orient);
-+ event.SetEventObject(win);
-+ win->GetEventHandler()->ProcessEvent(event);
-+ }
- }
- }
-+#endif // __WXGTK20__
-
- //-----------------------------------------------------------------------------
- // "button_release_event" from scrollbar
-@@ -141,38 +136,24 @@
- GdkEventButton *WXUNUSED(gdk_event),
- wxWindowGTK *win)
- {
--// don't test here as we can release the mouse while being over
--// a different window than the slider
--//
--// if (gdk_event->window != widget->slider) return FALSE;
--
- g_blockEventsOnScroll = FALSE;
-+ g_mouseButtonDown = false;
-
- if (win->m_isScrolling)
- {
-- wxEventType command = wxEVT_SCROLLWIN_THUMBRELEASE;
-- int value = -1;
-- int dir = -1;
--
-- GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget);
-- if (widget == GTK_RANGE(scrolledWindow->hscrollbar))
-- {
-- value = (int)(win->m_hAdjust->value+0.5);
-- dir = wxHORIZONTAL;
-- }
-- if (widget == GTK_RANGE(scrolledWindow->vscrollbar))
-- {
-- value = (int)(win->m_vAdjust->value+0.5);
-- dir = wxVERTICAL;
-- }
--
-- wxScrollWinEvent event( command, value, dir );
-- event.SetEventObject( win );
-- win->GetEventHandler()->ProcessEvent( event );
-+ win->m_isScrolling = false;
-+#ifdef __WXGTK20__
-+ g_signal_handlers_unblock_by_func(widget, (void*)gtk_scrollbar_event_after, win);
-+#else
-+ GtkAdjustment* adj = widget->adjustment;
-+ wxASSERT(adj == win->m_hAdjust || adj == win->m_vAdjust);
-+ const int orient = adj == win->m_hAdjust ? wxHORIZONTAL : wxVERTICAL;
-+ wxScrollWinEvent event(wxEVT_SCROLLWIN_THUMBRELEASE, win->GetScrollPos(orient), orient);
-+ event.SetEventObject(win);
-+ win->GetEventHandler()->ProcessEvent(event);
-+#endif
- }
-
-- win->m_isScrolling = FALSE;
--
- return FALSE;
- }
- }
-@@ -282,17 +263,19 @@
- m_vAdjust->value = 0.0;
- m_vAdjust->step_increment = 1.0;
- m_vAdjust->page_increment = 2.0;
-- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
-+ gtk_adjustment_changed(m_vAdjust);
- m_hAdjust->lower = 0.0;
- m_hAdjust->upper = 1.0;
- m_hAdjust->value = 0.0;
- m_hAdjust->step_increment = 1.0;
- m_hAdjust->page_increment = 2.0;
-- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
-+ gtk_adjustment_changed(m_hAdjust);
-
- // Handlers for new scrollbar values
-- GtkVConnectEvent();
-- GtkHConnectEvent();
-+ gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
-+ (GtkSignalFunc) gtk_scrolled_window_scroll_callback, (gpointer) this );
-+ gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed",
-+ (GtkSignalFunc) gtk_scrolled_window_scroll_callback, (gpointer) this );
-
- // these handlers block mouse events to any window during scrolling such as
- // motion events and prevent GTK and wxWidgets from fighting over where the
-@@ -310,6 +293,16 @@
- gtk_signal_connect( GTK_OBJECT(scrolledWindow->hscrollbar), "button_release_event",
- (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this );
-
-+#ifdef __WXGTK20__
-+ gulong handler_id;
-+ handler_id = g_signal_connect(
-+ scrolledWindow->vscrollbar, "event_after", G_CALLBACK(gtk_scrollbar_event_after), this);
-+ g_signal_handler_block(scrolledWindow->vscrollbar, handler_id);
-+ handler_id = g_signal_connect(
-+ scrolledWindow->hscrollbar, "event_after", G_CALLBACK(gtk_scrollbar_event_after), this);
-+ g_signal_handler_block(scrolledWindow->hscrollbar, handler_id);
-+#endif
-+
- gtk_widget_show( m_wxwindow );
-
- if (m_parent)
-@@ -358,6 +351,7 @@
- {
- wxSize best;
-
-+ bool addClientSizeDiff = true;
- if ( GetSizer() )
- {
- wxSize b = GetSizer()->GetMinSize();
-@@ -372,7 +366,14 @@
- if ( GetMinSize().IsFullySpecified() )
- minSize = GetMinSize();
- else
-+ {
- minSize = GetSize();
-+
-+ // If we're using the overall size, we don't want to then
-+ // add to it, or we'll successively grow the window over
-+ // multiple layouts.
-+ addClientSizeDiff = false;
-+ }
-
- if (ppuX > 0)
- b.x = minSize.x;
-@@ -383,10 +384,13 @@
- else
- return wxWindow::DoGetBestSize();
-
-- // Add any difference between size and client size
-- wxSize diff = GetSize() - GetClientSize();
-- best.x += wxMax(0, diff.x);
-- best.y += wxMax(0, diff.y);
-+ if (addClientSizeDiff)
-+ {
-+ // Add any difference between size and client size
-+ wxSize diff = GetSize() - GetClientSize();
-+ best.x += wxMax(0, diff.x);
-+ best.y += wxMax(0, diff.y);
-+ }
-
- return best;
- }
-@@ -420,6 +424,14 @@
- m_targetWindow->SetVirtualSize( w ? w : wxDefaultCoord,
- h ? h : wxDefaultCoord);
-
-+ // If the target is not the same as the window with the scrollbars,
-+ // then we need to update the scrollbars here, since they won't have
-+ // been updated by SetVirtualSize().
-+ if (m_targetWindow != this)
-+ {
-+ AdjustScrollbars();
-+ }
-+
- if (!noRefresh)
- {
- int new_x = m_xScrollPixelsPerLine * m_xScrollPosition;
-@@ -437,73 +449,40 @@
- m_targetWindow->GetClientSize( &w, &h );
- m_targetWindow->GetVirtualSize( &vw, &vh );
-
-- if (m_xScrollPixelsPerLine == 0)
-- {
-- m_hAdjust->upper = 1.0;
-- m_hAdjust->page_increment = 1.0;
-- m_hAdjust->page_size = 1.0;
-- }
-- else
-- {
-- m_hAdjust->upper = (vw+m_xScrollPixelsPerLine-1) / m_xScrollPixelsPerLine;
-- m_hAdjust->page_size = w / m_xScrollPixelsPerLine;
-- m_hAdjust->page_increment = w / m_xScrollPixelsPerLine;
--
-- // Special case. When client and virtual size are very close but
-- // the client is big enough, kill scrollbar.
--
-- if ((m_hAdjust->page_size < m_hAdjust->upper) && (w >= vw))
-- m_hAdjust->page_size += 1.0;
--
-- // If the scrollbar hits the right side, move the window
-- // right to keep it from over extending.
--
-- if ((m_hAdjust->value != 0.0) && (m_hAdjust->value + m_hAdjust->page_size > m_hAdjust->upper))
-- {
-- m_hAdjust->value = m_hAdjust->upper - m_hAdjust->page_size;
-- if (m_hAdjust->value < 0.0)
-- m_hAdjust->value = 0.0;
--
-- if (GetChildren().GetCount() == 0)
-- m_xScrollPosition = (int)m_hAdjust->value; // This is enough without child windows
-- else
-- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" ); // Actually scroll window
-- }
-- }
--
-- if (m_yScrollPixelsPerLine == 0)
-- {
-- m_vAdjust->upper = 1.0;
-- m_vAdjust->page_increment = 1.0;
-- m_vAdjust->page_size = 1.0;
-- }
-- else
-- {
-- m_vAdjust->upper = (vh+m_yScrollPixelsPerLine-1) / m_yScrollPixelsPerLine;
-- m_vAdjust->page_size = h / m_yScrollPixelsPerLine;
-- m_vAdjust->page_increment = h / m_yScrollPixelsPerLine;
--
-- if ((m_vAdjust->page_size < m_vAdjust->upper) && (h >= vh))
-- m_vAdjust->page_size += 1.0;
--
-- if ((m_vAdjust->value != 0.0) && (m_vAdjust->value + m_vAdjust->page_size > m_vAdjust->upper))
-- {
-- m_vAdjust->value = m_vAdjust->upper - m_vAdjust->page_size;
-- if (m_vAdjust->value < 0.0)
-- m_vAdjust->value = 0.0;
--
-- if (GetChildren().GetCount() == 0)
-- m_yScrollPosition = (int)m_vAdjust->value;
-- else
-- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
-- }
-- }
--
-- m_xScrollLinesPerPage = (int)(m_hAdjust->page_increment + 0.5);
-- m_yScrollLinesPerPage = (int)(m_vAdjust->page_increment + 0.5);
-+ DoAdjustScrollbars(m_hAdjust, m_xScrollPixelsPerLine, w, vw, &m_xScrollLinesPerPage);
-+ DoAdjustScrollbars(m_vAdjust, m_yScrollPixelsPerLine, h, vh, &m_yScrollLinesPerPage);
-+}
-
-- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
-- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
-+void wxScrolledWindow::DoAdjustScrollbars(GtkAdjustment* adj,
-+ int pixelsPerLine,
-+ int winSize,
-+ int virtSize,
-+ int *linesPerPage)
-+{
-+ int upper = 1;
-+ int page_size = 1;
-+ if (pixelsPerLine > 0 && winSize < virtSize)
-+ {
-+ upper = (virtSize + pixelsPerLine - 1) / pixelsPerLine;
-+ page_size = winSize / pixelsPerLine;
-+ }
-+
-+ *linesPerPage = page_size;
-+
-+ adj->step_increment = 1;
-+ adj->page_increment =
-+ adj->page_size = page_size;
-+ adj->lower = 0;
-+ adj->upper = upper;
-+
-+ const double value = adj->value;
-+ if (adj->value > adj->upper - adj->page_size)
-+ adj->value = adj->upper - adj->page_size;
-+ if (adj->value < 0)
-+ adj->value = 0;
-+ if (!wxIsSameDouble(value, adj->value))
-+ gtk_adjustment_value_changed(adj);
-+ gtk_adjustment_changed(adj);
- }
-
-
-@@ -580,33 +559,17 @@
-
- if (orient == wxHORIZONTAL)
- {
-- int newPos = m_xScrollPosition + nScrollInc;
-- SetScrollPos(wxHORIZONTAL, newPos, TRUE );
-- }
-- else
-- {
-- int newPos = m_yScrollPosition + nScrollInc;
-- SetScrollPos(wxVERTICAL, newPos, TRUE );
-- }
--
-- if (orient == wxHORIZONTAL)
-- {
- m_xScrollPosition += nScrollInc;
-- }
-- else
-- {
-- m_yScrollPosition += nScrollInc;
-- }
--
-- if (orient == wxHORIZONTAL)
-- {
-- if (m_xScrollingEnabled)
-+ SetScrollPos(wxHORIZONTAL, m_xScrollPosition);
-+ if (m_xScrollingEnabled)
- m_targetWindow->ScrollWindow(-m_xScrollPixelsPerLine * nScrollInc, 0, (const wxRect *) NULL);
-- else
-+ else
- m_targetWindow->Refresh();
- }
- else
- {
-+ m_yScrollPosition += nScrollInc;
-+ SetScrollPos(wxVERTICAL, m_yScrollPosition);
- if (m_yScrollingEnabled)
- m_targetWindow->ScrollWindow(0, -m_yScrollPixelsPerLine * nScrollInc, (const wxRect *) NULL);
- else
-@@ -618,86 +581,24 @@
- {
- wxASSERT_MSG( m_targetWindow != 0, _T("No target window") );
-
-- if (((x_pos == -1) || (x_pos == m_xScrollPosition)) &&
-- ((y_pos == -1) || (y_pos == m_yScrollPosition))) return;
--
-- if ((x_pos != -1) && (m_xScrollPixelsPerLine))
-- {
-- int max = (int)(m_hAdjust->upper - m_hAdjust->page_size + 0.5);
-- if (max < 0) max = 0;
-- if (x_pos > max) x_pos = max;
-- if (x_pos < 0) x_pos = 0;
--
-- int old_x = m_xScrollPosition;
-- m_xScrollPosition = x_pos;
-- m_hAdjust->value = x_pos;
--
-- m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
--
-- // Just update the scrollbar, don't send any wxWidgets event
-- GtkHDisconnectEvent();
-- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
-- GtkHConnectEvent();
-- }
--
-- if ((y_pos != -1) && (m_yScrollPixelsPerLine))
-- {
-- int max = (int)(m_vAdjust->upper - m_vAdjust->page_size + 0.5);
-- if (max < 0) max = 0;
-- if (y_pos > max) y_pos = max;
-- if (y_pos < 0) y_pos = 0;
--
-- int old_y = m_yScrollPosition;
-- m_yScrollPosition = y_pos;
-- m_vAdjust->value = y_pos;
--
-- m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
--
-- // Just update the scrollbar, don't send any wxWidgets event
-- GtkVDisconnectEvent();
-- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
-- GtkVConnectEvent();
-- }
--}
--
--// TODO: [VH]Scroll functions should be combined
--
--void wxScrolledWindow::GtkVScroll( float value, unsigned int scroll_type )
--{
-- wxASSERT_MSG( m_targetWindow != 0, _T("No target window") );
--
-- if (m_yScrollPixelsPerLine == 0)
-- return;
--
-- int y_pos = (int)(value+0.5);
--
-- if (y_pos == m_yScrollPosition)
-- return;
--
-- wxEventType command = GtkScrollWinTypeToWx(scroll_type);
--
-- wxScrollWinEvent event( command, y_pos, wxVERTICAL );
-- event.SetEventObject( this );
-- GetEventHandler()->ProcessEvent( event );
-+ DoScroll(wxHORIZONTAL, x_pos, &m_xScrollPosition, m_xScrollPixelsPerLine);
-+ DoScroll(wxVERTICAL, y_pos, &m_yScrollPosition, m_yScrollPixelsPerLine);
- }
-
--void wxScrolledWindow::GtkHScroll( float value, unsigned int scroll_type )
-+void wxScrolledWindow::DoScroll(int orient, int pos, int* posOld, int pixelsPerLine)
- {
-- wxASSERT_MSG( m_targetWindow != 0, _T("No target window") );
--
-- if (m_xScrollPixelsPerLine == 0)
-- return;
--
-- int x_pos = (int)(value+0.5);
--
-- if (x_pos == m_xScrollPosition)
-- return;
-+ if (pos != -1 && pos != *posOld && pixelsPerLine > 0)
-+ {
-+ SetScrollPos(orient, pos);
-+ pos = GetScrollPos(orient);
-
-- wxEventType command = GtkScrollWinTypeToWx(scroll_type);
-+ const int diff = (*posOld - pos) * pixelsPerLine;
-+ m_targetWindow->ScrollWindow(
-+ orient == wxHORIZONTAL ? diff : 0,
-+ orient == wxHORIZONTAL ? 0 : diff);
-
-- wxScrollWinEvent event( command, x_pos, wxHORIZONTAL );
-- event.SetEventObject( this );
-- GetEventHandler()->ProcessEvent( event );
-+ *posOld = pos;
-+ }
- }
-
- void wxScrolledWindow::EnableScrolling (bool x_scroll, bool y_scroll)
-@@ -824,74 +725,7 @@
-
- void wxScrolledWindow::SetScrollPos( int orient, int pos, bool refresh )
- {
-- wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
--
-- wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
--
-- if (orient == wxHORIZONTAL)
-- {
-- int max = (int)(m_hAdjust->upper - m_hAdjust->page_size + 0.5);
-- if (max < 0) max = 0;
--
-- if (pos > max) pos = 0;
-- if (pos < 0) pos = 0;
--
-- if (pos == (int)(m_hAdjust->value+0.5)) return;
-- m_hAdjust->value = pos;
-- }
-- else
-- {
-- int max = (int)(m_vAdjust->upper - m_vAdjust->page_size + 0.5);
-- if (max < 0) max = 0;
--
-- if (pos > max) pos = 0;
-- if (pos < 0) pos = 0;
--
-- if (pos == (int)(m_vAdjust->value+0.5)) return;
-- m_vAdjust->value = pos;
-- }
--
-- if (m_wxwindow->window)
-- {
-- if (orient == wxHORIZONTAL)
-- {
-- // Just update the scrollbar, don't send any wxWidgets event
-- GtkHDisconnectEvent();
-- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
-- GtkHConnectEvent();
-- }
-- else
-- {
-- // Just update the scrollbar, don't send any wxWidgets event
-- GtkVDisconnectEvent();
-- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
-- GtkVConnectEvent();
-- }
-- }
--}
--
--void wxScrolledWindow::GtkVConnectEvent()
--{
-- gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
-- (GtkSignalFunc) gtk_scrolled_window_vscroll_callback, (gpointer) this );
--}
--
--void wxScrolledWindow::GtkHConnectEvent()
--{
-- gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed",
-- (GtkSignalFunc) gtk_scrolled_window_hscroll_callback, (gpointer) this );
--}
--
--void wxScrolledWindow::GtkHDisconnectEvent()
--{
-- gtk_signal_disconnect_by_func( GTK_OBJECT(m_hAdjust),
-- (GtkSignalFunc) gtk_scrolled_window_hscroll_callback, (gpointer) this );
--}
--
--void wxScrolledWindow::GtkVDisconnectEvent()
--{
-- gtk_signal_disconnect_by_func( GTK_OBJECT(m_vAdjust),
-- (GtkSignalFunc) gtk_scrolled_window_vscroll_callback, (gpointer) this );
-+ wxPanel::SetScrollPos(orient, pos, refresh);
- }
-
- bool wxScrolledWindow::Layout()
-diff -ur wxWidgets-2.6.3/src/gtk/textctrl.cpp wxWidgets-2.6.3.3/src/gtk/textctrl.cpp
---- wxWidgets-2.6.3/src/gtk/textctrl.cpp 2005-08-08 04:53:44.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/gtk/textctrl.cpp 2006-07-14 00:21:47.000000000 -0400
-@@ -2,7 +2,7 @@
- // Name: textctrl.cpp
- // Purpose:
- // Author: Robert Roebling
--// Id: $Id: textctrl.cpp,v 1.217 2005/08/08 08:53:44 MR Exp $
-+// Id: $Id: textctrl.cpp,v 1.217.2.3 2006/07/14 04:21:47 MR Exp $
- // Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -96,6 +96,19 @@
- NULL );
- gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
- g_free (font_string);
-+
-+ if (attr.GetFont().GetUnderlined())
-+ {
-+ g_snprintf(buf, sizeof(buf), "WXFONTUNDERLINE");
-+ tag = gtk_text_tag_table_lookup( gtk_text_buffer_get_tag_table( text_buffer ),
-+ buf );
-+ if (!tag)
-+ tag = gtk_text_buffer_create_tag( text_buffer, buf,
-+ "underline-set", TRUE,
-+ "underline", PANGO_UNDERLINE_SINGLE,
-+ NULL );
-+ gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
-+ }
- }
-
- if (attr.HasTextColour())
-@@ -1158,12 +1171,16 @@
- {
- #ifdef __WXGTK20__
- GtkTextIter iter;
-- gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos);
-- if (gtk_text_iter_is_end(&iter))
-+
-+ if (pos > GetLastPosition())
- return false;
-
-- *y = gtk_text_iter_get_line(&iter);
-- *x = gtk_text_iter_get_line_offset(&iter);
-+ gtk_text_buffer_get_iter_at_offset(m_buffer, &iter, pos);
-+
-+ if ( y )
-+ *y = gtk_text_iter_get_line(&iter);
-+ if ( x )
-+ *x = gtk_text_iter_get_line_offset(&iter);
- #else
- wxString text = GetValue();
-
-@@ -1191,8 +1208,10 @@
- {
- if ( pos <= GTK_ENTRY(m_text)->text_length )
- {
-- *y = 0;
-- *x = pos;
-+ if ( y )
-+ *y = 0;
-+ if ( x )
-+ *x = pos;
- }
- else
- {
-diff -ur wxWidgets-2.6.3/src/gtk/window.cpp wxWidgets-2.6.3.3/src/gtk/window.cpp
---- wxWidgets-2.6.3/src/gtk/window.cpp 2006-03-18 16:58:19.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/gtk/window.cpp 2006-06-13 14:52:28.000000000 -0400
-@@ -2,7 +2,7 @@
- // Name: gtk/window.cpp
- // Purpose:
- // Author: Robert Roebling
--// Id: $Id: window.cpp,v 1.548.2.13 2006/03/18 21:58:19 VZ Exp $
-+// Id: $Id: window.cpp,v 1.548.2.20 2006/06/13 18:52:28 RD Exp $
- // Copyright: (c) 1998 Robert Roebling, Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -248,6 +248,9 @@
-
- extern bool g_mainThreadLocked;
-
-+bool g_mouseButtonDown;
-+bool gs_blockValueChanged;
-+
- //-----------------------------------------------------------------------------
- // debug
- //-----------------------------------------------------------------------------
-@@ -710,6 +713,18 @@
- // "key_press_event" from any window
- //-----------------------------------------------------------------------------
-
-+// These are used when transforming Ctrl-alpha to ascii values 1-26
-+inline bool wxIsLowerChar(int code)
-+{
-+ return (code >= 'a' && code <= 'z' );
-+}
-+
-+inline bool wxIsUpperChar(int code)
-+{
-+ return (code >= 'A' && code <= 'Z' );
-+}
-+
-+
- // set WXTRACE to this to see the key event codes on the console
- #define TRACE_KEYS _T("keyevent")
-
-@@ -1014,9 +1029,6 @@
- event.m_scanCode = gdk_event->keyval;
- event.m_rawCode = (wxUint32) gdk_event->keyval;
- event.m_rawFlags = 0;
--#if wxUSE_UNICODE
-- event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval);
--#endif
- wxGetMousePosition( &x, &y );
- win->ScreenToClient( &x, &y );
- event.m_x = x;
-@@ -1324,13 +1336,17 @@
-
- // To conform to the docs we need to translate Ctrl-alpha
- // characters to values in the range 1-26.
-- if (event.ControlDown() && key_code >= 'a' && key_code <= 'z' )
-+ if ( event.ControlDown() &&
-+ ( wxIsLowerChar(key_code) || wxIsUpperChar(key_code) ))
- {
-- event.m_keyCode = key_code - 'a' + 1;
-+ if ( wxIsLowerChar(key_code) )
-+ event.m_keyCode = key_code - 'a' + 1;
-+ if ( wxIsUpperChar(key_code) )
-+ event.m_keyCode = key_code - 'A' + 1;
- #if wxUSE_UNICODE
- event.m_uniChar = event.m_keyCode;
- #endif
-- }
-+ }
-
- // Implement OnCharHook by checking ancesteror top level windows
- wxWindow *parent = win;
-@@ -1470,8 +1486,14 @@
-
- // To conform to the docs we need to translate Ctrl-alpha
- // characters to values in the range 1-26.
-- if (event.ControlDown() && *pstr >= 'a' && *pstr <= 'z' )
-+ if ( event.ControlDown() &&
-+ ( wxIsLowerChar(*pstr) || wxIsUpperChar(*pstr) ))
- {
-+ if ( wxIsLowerChar(*pstr) )
-+ event.m_keyCode = *pstr - 'a' + 1;
-+ if ( wxIsUpperChar(*pstr) )
-+ event.m_keyCode = *pstr - 'A' + 1;
-+
- event.m_keyCode = *pstr - 'a' + 1;
- #if wxUSE_UNICODE
- event.m_uniChar = event.m_keyCode;
-@@ -1831,6 +1853,10 @@
- if ( !g_captureWindow )
- win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
-
-+ // reset the event object and id in case win changed.
-+ event.SetEventObject( win );
-+ event.SetId( win->GetId() );
-+
- gs_timeLastClick = gdk_event->time;
-
- #ifndef __WXGTK20__
-@@ -1926,6 +1952,10 @@
- if ( !g_captureWindow )
- win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
-
-+ // reset the event object and id in case win changed.
-+ event.SetEventObject( win );
-+ event.SetId( win->GetId() );
-+
- if (win->GetEventHandler()->ProcessEvent( event ))
- {
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_release_event" );
-@@ -2000,6 +2030,10 @@
- else // no capture
- {
- win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
-+
-+ // reset the event object and id in case win changed.
-+ event.SetEventObject( win );
-+ event.SetId( win->GetId() );
- }
-
- if ( !g_captureWindow )
-@@ -2344,11 +2378,11 @@
- }
-
- //-----------------------------------------------------------------------------
--// "value_changed" from m_vAdjust
-+// "value_changed" from m_[hv]Adjust
- //-----------------------------------------------------------------------------
-
- extern "C" {
--static void gtk_window_vscroll_callback( GtkAdjustment *adjust,
-+static void gtk_window_scroll_callback( GtkAdjustment *adjust,
- SCROLLBAR_CBACK_ARG
- wxWindowGTK *win )
- {
-@@ -2357,88 +2391,54 @@
- if (g_isIdle)
- wxapp_install_idle_handler();
-
-- if (g_blockEventsOnDrag) return;
--
-- if (!win->m_hasVMT) return;
--
-- float diff = adjust->value - win->m_oldVerticalPos;
-- if (fabs(diff) < 0.2) return;
--
-- win->m_oldVerticalPos = adjust->value;
--
--#ifndef __WXGTK20__
-- GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW(win->m_widget);
--#endif
-- wxEventType command = GtkScrollWinTypeToWx(GET_SCROLL_TYPE(sw->vscrollbar));
--
-- int value = (int)(adjust->value+0.5);
--
-- wxScrollWinEvent event( command, value, wxVERTICAL );
-- event.SetEventObject( win );
-- win->GetEventHandler()->ProcessEvent( event );
-+ win->HandleScrollEvent(adjust);
- }
- }
-
- //-----------------------------------------------------------------------------
--// "value_changed" from m_hAdjust
-+// "button_press_event" from scrollbar
- //-----------------------------------------------------------------------------
-
- extern "C" {
--static void gtk_window_hscroll_callback( GtkAdjustment *adjust,
-- SCROLLBAR_CBACK_ARG
-- wxWindowGTK *win )
-+static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
-+ GdkEventButton *gdk_event,
-+ wxWindowGTK *win)
- {
- DEBUG_MAIN_THREAD
-
- if (g_isIdle)
- wxapp_install_idle_handler();
-
-- if (g_blockEventsOnDrag) return;
-- if (!win->m_hasVMT) return;
--
-- float diff = adjust->value - win->m_oldHorizontalPos;
-- if (fabs(diff) < 0.2) return;
--
--#ifndef __WXGTK20__
-- GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW(win->m_widget);
--#endif
-- wxEventType command = GtkScrollWinTypeToWx(GET_SCROLL_TYPE(sw->hscrollbar));
--
-- win->m_oldHorizontalPos = adjust->value;
--
-- int value = (int)(adjust->value+0.5);
-+ g_blockEventsOnScroll = true;
-+ g_mouseButtonDown = true;
-
-- wxScrollWinEvent event( command, value, wxHORIZONTAL );
-- event.SetEventObject( win );
-- win->GetEventHandler()->ProcessEvent( event );
-+ return FALSE;
- }
- }
-
-+#ifdef __WXGTK20__
- //-----------------------------------------------------------------------------
--// "button_press_event" from scrollbar
-+// "event_after" from scrollbar
- //-----------------------------------------------------------------------------
-
- extern "C" {
--static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
-- GdkEventButton *gdk_event,
-- wxWindowGTK *win)
-+static void
-+gtk_scrollbar_event_after(GtkRange* range, GdkEvent* event, wxWindow* win)
- {
-- DEBUG_MAIN_THREAD
--
-- if (g_isIdle)
-- wxapp_install_idle_handler();
--
--
-- g_blockEventsOnScroll = true;
--
-- // FIXME: there is no 'slider' field in GTK+ 2.0 any more
--#ifndef __WXGTK20__
-- win->m_isScrolling = (gdk_event->window == widget->slider);
--#endif
-+ if (event->type == GDK_BUTTON_RELEASE)
-+ {
-+ g_signal_handlers_block_by_func(range, (void*)gtk_scrollbar_event_after, win);
-
-- return FALSE;
-+ GtkAdjustment* adj = range->adjustment;
-+ wxASSERT(adj == win->m_hAdjust || adj == win->m_vAdjust);
-+ const int orient = adj == win->m_hAdjust ? wxHORIZONTAL : wxVERTICAL;
-+ wxScrollWinEvent event(wxEVT_SCROLLWIN_THUMBRELEASE, win->GetScrollPos(orient), orient);
-+ event.SetEventObject(win);
-+ win->GetEventHandler()->ProcessEvent(event);
-+ }
- }
- }
-+#endif // __WXGTK20__
-
- //-----------------------------------------------------------------------------
- // "button_release_event" from scrollbar
-@@ -2451,38 +2451,24 @@
- {
- DEBUG_MAIN_THREAD
-
--// don't test here as we can release the mouse while being over
--// a different window than the slider
--//
--// if (gdk_event->window != widget->slider) return FALSE;
--
- g_blockEventsOnScroll = false;
-+ g_mouseButtonDown = false;
-
- if (win->m_isScrolling)
- {
-- wxEventType command = wxEVT_SCROLLWIN_THUMBRELEASE;
-- int value = -1;
-- int dir = -1;
--
-- GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget);
-- if (widget == GTK_RANGE(scrolledWindow->hscrollbar))
-- {
-- value = (int)(win->m_hAdjust->value+0.5);
-- dir = wxHORIZONTAL;
-- }
-- if (widget == GTK_RANGE(scrolledWindow->vscrollbar))
-- {
-- value = (int)(win->m_vAdjust->value+0.5);
-- dir = wxVERTICAL;
-- }
--
-- wxScrollWinEvent event( command, value, dir );
-- event.SetEventObject( win );
-- win->GetEventHandler()->ProcessEvent( event );
-+ win->m_isScrolling = false;
-+#ifdef __WXGTK20__
-+ g_signal_handlers_unblock_by_func(widget, (void*)gtk_scrollbar_event_after, win);
-+#else
-+ GtkAdjustment* adj = widget->adjustment;
-+ wxASSERT(adj == win->m_hAdjust || adj == win->m_vAdjust);
-+ const int orient = adj == win->m_hAdjust ? wxHORIZONTAL : wxVERTICAL;
-+ wxScrollWinEvent event(wxEVT_SCROLLWIN_THUMBRELEASE, win->GetScrollPos(orient), orient);
-+ event.SetEventObject(win);
-+ win->GetEventHandler()->ProcessEvent(event);
-+#endif
- }
-
-- win->m_isScrolling = false;
--
- return FALSE;
- }
- }
-@@ -2544,8 +2530,6 @@
- if (g_isIdle)
- wxapp_install_idle_handler();
-
-- if (!win->m_hasScrolling) return;
--
- int client_width = 0;
- int client_height = 0;
- win->GetClientSize( &client_width, &client_height );
-@@ -2904,14 +2888,14 @@
- m_vAdjust->step_increment = 1.0;
- m_vAdjust->page_increment = 1.0;
- m_vAdjust->page_size = 5.0;
-- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
-+ gtk_adjustment_changed(m_vAdjust);
- m_hAdjust->lower = 0.0;
- m_hAdjust->upper = 1.0;
- m_hAdjust->value = 0.0;
- m_hAdjust->step_increment = 1.0;
- m_hAdjust->page_increment = 1.0;
- m_hAdjust->page_size = 5.0;
-- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
-+ gtk_adjustment_changed(m_hAdjust);
-
- // these handlers block mouse events to any window during scrolling such as
- // motion events and prevent GTK and wxWidgets from fighting over where the
-@@ -2929,14 +2913,24 @@
- gtk_signal_connect( GTK_OBJECT(scrolledWindow->hscrollbar), "button_release_event",
- (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this );
-
-+#ifdef __WXGTK20__
-+ gulong handler_id;
-+ handler_id = g_signal_connect(
-+ scrolledWindow->vscrollbar, "event_after", G_CALLBACK(gtk_scrollbar_event_after), this);
-+ g_signal_handler_block(scrolledWindow->vscrollbar, handler_id);
-+ handler_id = g_signal_connect(
-+ scrolledWindow->hscrollbar, "event_after", G_CALLBACK(gtk_scrollbar_event_after), this);
-+ g_signal_handler_block(scrolledWindow->hscrollbar, handler_id);
-+#endif
-+
- // these handlers get notified when screen updates are required either when
- // scrolling or when the window size (and therefore scrollbar configuration)
- // has changed
-
- gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed",
-- (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this );
-+ (GtkSignalFunc) gtk_window_scroll_callback, (gpointer) this );
- gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
-- (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
-+ (GtkSignalFunc) gtk_window_scroll_callback, (gpointer) this );
-
- gtk_widget_show( m_wxwindow );
-
-@@ -4745,118 +4739,97 @@
- return false;
- }
-
--void wxWindowGTK::SetScrollbar( int orient, int pos, int thumbVisible,
-- int range, bool refresh )
-+static inline bool IsScrollIncrement(double increment, double x)
- {
-- wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-+ wxASSERT(increment > 0);
-+ const double tolerance = 1.0 / 1024;
-+ return fabs(increment - fabs(x)) < tolerance;
-+}
-
-- wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
-+void wxWindowGTK::HandleScrollEvent(GtkAdjustment* adj)
-+{
-+ wxASSERT(adj == m_hAdjust || adj == m_vAdjust);
-+ float* oldPos = adj == m_hAdjust ? &m_oldHorizontalPos : &m_oldVerticalPos;
-+ const double posPrev = *oldPos;
-+ *oldPos = float(adj->value);
-+ const int pos = int(adj->value + 0.5);
-
-- m_hasScrolling = true;
-+ if (g_blockEventsOnDrag || !m_hasVMT || pos == int(posPrev + 0.5))
-+ return;
-
-- if (orient == wxHORIZONTAL)
-+ wxEventType eventType = wxEVT_SCROLLWIN_THUMBTRACK;
-+ if (!m_isScrolling)
- {
-- float fpos = (float)pos;
-- float frange = (float)range;
-- float fthumb = (float)thumbVisible;
-- if (fpos > frange-fthumb) fpos = frange-fthumb;
-- if (fpos < 0.0) fpos = 0.0;
-+ // Difference from last change event
-+ const double diff = adj->value - posPrev;
-+ const bool isDown = diff > 0;
-
-- if ((fabs(frange-m_hAdjust->upper) < 0.2) &&
-- (fabs(fthumb-m_hAdjust->page_size) < 0.2))
-+ if (IsScrollIncrement(adj->step_increment, diff))
- {
-- SetScrollPos( orient, pos, refresh );
-- return;
-+ eventType = isDown ? wxEVT_SCROLLWIN_LINEDOWN : wxEVT_SCROLLWIN_LINEUP;
- }
--
-- m_oldHorizontalPos = fpos;
--
-- m_hAdjust->lower = 0.0;
-- m_hAdjust->upper = frange;
-- m_hAdjust->value = fpos;
-- m_hAdjust->step_increment = 1.0;
-- m_hAdjust->page_increment = (float)(wxMax(fthumb,0));
-- m_hAdjust->page_size = fthumb;
-- }
-- else
-- {
-- float fpos = (float)pos;
-- float frange = (float)range;
-- float fthumb = (float)thumbVisible;
-- if (fpos > frange-fthumb) fpos = frange-fthumb;
-- if (fpos < 0.0) fpos = 0.0;
--
-- if ((fabs(frange-m_vAdjust->upper) < 0.2) &&
-- (fabs(fthumb-m_vAdjust->page_size) < 0.2))
-+ else if (IsScrollIncrement(adj->page_increment, diff))
- {
-- SetScrollPos( orient, pos, refresh );
-- return;
-+ eventType = isDown ? wxEVT_SCROLLWIN_PAGEDOWN : wxEVT_SCROLLWIN_PAGEUP;
-+ }
-+ else if (g_mouseButtonDown)
-+ {
-+ // Assume track event
-+ m_isScrolling = true;
- }
--
-- m_oldVerticalPos = fpos;
--
-- m_vAdjust->lower = 0.0;
-- m_vAdjust->upper = frange;
-- m_vAdjust->value = fpos;
-- m_vAdjust->step_increment = 1.0;
-- m_vAdjust->page_increment = (float)(wxMax(fthumb,0));
-- m_vAdjust->page_size = fthumb;
- }
--
-- if (orient == wxHORIZONTAL)
-- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
-- else
-- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
-+ const int orient = adj == m_hAdjust ? wxHORIZONTAL : wxVERTICAL;
-+ wxScrollWinEvent event(eventType, pos, orient);
-+ event.SetEventObject(this);
-+ gs_blockValueChanged = true;
-+ GetEventHandler()->ProcessEvent(event);
-+ gs_blockValueChanged = false;
- }
-
--void wxWindowGTK::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
-+void wxWindowGTK::SetScrollbar( int orient, int pos, int thumbVisible,
-+ int range, bool refresh )
- {
- wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
- wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
-
-- if (orient == wxHORIZONTAL)
-- {
-- float fpos = (float)pos;
-- if (fpos > m_hAdjust->upper - m_hAdjust->page_size) fpos = m_hAdjust->upper - m_hAdjust->page_size;
-- if (fpos < 0.0) fpos = 0.0;
-- m_oldHorizontalPos = fpos;
-+ m_hasScrolling = true;
-
-- if (fabs(fpos-m_hAdjust->value) < 0.2) return;
-- m_hAdjust->value = fpos;
-- }
-- else
-- {
-- float fpos = (float)pos;
-- if (fpos > m_vAdjust->upper - m_vAdjust->page_size) fpos = m_vAdjust->upper - m_vAdjust->page_size;
-- if (fpos < 0.0) fpos = 0.0;
-- m_oldVerticalPos = fpos;
-+ if (pos > range - thumbVisible)
-+ pos = range - thumbVisible;
-+ if (pos < 0)
-+ pos = 0;
-+ GtkAdjustment* adj = orient == wxHORIZONTAL ? m_hAdjust : m_vAdjust;
-+ adj->step_increment = 1;
-+ adj->page_increment =
-+ adj->page_size = thumbVisible;
-+ adj->upper = range;
-+ SetScrollPos(orient, pos);
-+ gtk_adjustment_changed(adj);
-+}
-
-- if (fabs(fpos-m_vAdjust->value) < 0.2) return;
-- m_vAdjust->value = fpos;
-- }
-+void wxWindowGTK::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
-+{
-+ wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
-- if (m_wxwindow->window)
-- {
-- if (orient == wxHORIZONTAL)
-- {
-- gtk_signal_disconnect_by_func( GTK_OBJECT(m_hAdjust),
-- (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this );
-+ wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
-
-- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
-+ if (GetScrollPos(orient) != pos)
-+ {
-+ GtkAdjustment* adj = orient == wxHORIZONTAL ? m_hAdjust : m_vAdjust;
-+ const int max = int(adj->upper - adj->page_size);
-+ if (pos > max)
-+ pos = max;
-+ if (pos < 0)
-+ pos = 0;
-+ float* oldPos = orient == wxHORIZONTAL ? &m_oldHorizontalPos : &m_oldVerticalPos;
-+ *oldPos = pos;
-+ adj->value = pos;
-
-- gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed",
-- (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this );
-- }
-- else
-+ // If a "value_changed" signal emission is not already in progress
-+ if (!gs_blockValueChanged)
- {
-- gtk_signal_disconnect_by_func( GTK_OBJECT(m_vAdjust),
-- (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
--
-- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
--
-- gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
-- (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
-+ gtk_adjustment_value_changed(adj);
- }
- }
- }
-diff -ur wxWidgets-2.6.3/src/mac/corefoundation/cfstring.cpp wxWidgets-2.6.3.3/src/mac/corefoundation/cfstring.cpp
---- wxWidgets-2.6.3/src/mac/corefoundation/cfstring.cpp 2005-06-08 19:31:13.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/mac/corefoundation/cfstring.cpp 2006-06-11 02:32:45.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Stefan Csomor
- // Modified by:
- // Created: 2004-10-29 (from code in src/mac/carbon/utils.cpp)
--// RCS-ID: $Id: cfstring.cpp,v 1.4 2005/06/08 23:31:13 SC Exp $
-+// RCS-ID: $Id: cfstring.cpp,v 1.4.2.1 2006/06/11 06:32:45 SC Exp $
- // Copyright: (c) Stefan Csomor
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -666,6 +666,9 @@
-
- wxString wxMacCFStringHolder::AsString(wxFontEncoding encoding)
- {
-+ if ( m_cfs == NULL )
-+ return wxEmptyString ;
-+
- Size cflen = CFStringGetLength( m_cfs ) ;
- size_t noChars ;
- wxChar* buf = NULL ;
-diff -ur wxWidgets-2.6.3/src/mac/corefoundation/utilsexc_cf.cpp wxWidgets-2.6.3.3/src/mac/corefoundation/utilsexc_cf.cpp
---- wxWidgets-2.6.3/src/mac/corefoundation/utilsexc_cf.cpp 2005-04-22 11:19:11.000000000 -0400
-+++ wxWidgets-2.6.3.3/src/mac/corefoundation/utilsexc_cf.cpp 2006-06-08 05:09:59.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: David Elliott, Ryan Norton (wxMacExecute)
- // Modified by: Stefan Csomor (added necessary wxT for unicode builds)
- // Created: 2004-11-04
--// RCS-ID: $Id: utilsexc_cf.cpp,v 1.7 2005/04/22 15:19:11 RN Exp $
-+// RCS-ID: $Id: utilsexc_cf.cpp,v 1.7.2.1 2006/06/08 09:09:59 JS Exp $
- // Copyright: (c) David Elliott, Ryan Norton
- // Licence: wxWindows licence
- // Notes: This code comes from src/mac/carbon/utilsexc.cpp,1.11
-@@ -18,8 +18,104 @@
- #include "wx/unix/execute.h"
- #include "wx/stdpaths.h"
- #include "wx/apptrait.h"
-+#include "wx/process.h"
-
-+// Use polling instead of Mach ports, which doesn't work on Intel
-+// due to task_for_pid security issues.
-
-+// What's a better test for Intel vs PPC?
-+#ifdef WORDS_BIGENDIAN
-+#define USE_POLLING 0
-+#else
-+#define USE_POLLING 1
-+#endif
-+
-+#if USE_POLLING
-+
-+class wxProcessTerminationEventHandler: public wxEvtHandler
-+{
-+ public:
-+ wxProcessTerminationEventHandler(wxEndProcessData* data)
-+ {
-+ m_data = data;
-+ Connect(-1, wxEVT_END_PROCESS, wxProcessEventHandler(wxProcessTerminationEventHandler::OnTerminate));
-+ }
-+
-+ void OnTerminate(wxProcessEvent& event)
-+ {
-+ Disconnect(-1, wxEVT_END_PROCESS, wxProcessEventHandler(wxProcessTerminationEventHandler::OnTerminate));
-+ wxHandleProcessTermination(m_data);
-+ delete this;
-+ }
-+
-+ wxEndProcessData* m_data;
-+};
-+
-+class wxProcessTerminationThread: public wxThread
-+{
-+ public:
-+ wxProcessTerminationThread(wxEndProcessData* data, wxProcessTerminationEventHandler* handler): wxThread(wxTHREAD_DETACHED)
-+ {
-+ m_data = data;
-+ m_handler = handler;
-+ }
-+
-+ virtual void* Entry();
-+
-+ wxProcessTerminationEventHandler* m_handler;
-+ wxEndProcessData* m_data;
-+};
-+
-+// The problem with this is that we may be examining the
-+// process e.g. in OnIdle at the point this cleans up the process,
-+// so we need to delay until it's safe.
-+
-+void* wxProcessTerminationThread::Entry()
-+{
-+ while (true)
-+ {
-+ usleep(100);
-+ int status = 0;
-+ int rc = waitpid(abs(m_data->pid), & status, WNOHANG);
-+ if (rc != 0)
-+ {
-+ if ((rc != -1) && WIFEXITED(status))
-+ m_data->exitcode = WEXITSTATUS(status);
-+ else
-+ m_data->exitcode = -1;
-+
-+ wxProcessEvent event;
-+ wxPostEvent(m_handler, event);
-+
-+ break;
-+ }
-+ }
-+
-+ return NULL;
-+}
-+
-+int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
-+{
-+ if (pid < 1)
-+ return -1;
-+
-+ wxProcessTerminationEventHandler* handler = new wxProcessTerminationEventHandler(proc_data);
-+ wxProcessTerminationThread* thread = new wxProcessTerminationThread(proc_data, handler);
-+
-+ if (thread->Create() != wxTHREAD_NO_ERROR)
-+ {
-+ wxLogDebug(wxT("Could not create termination detection thread."));
-+ delete thread;
-+ delete handler;
-+ return -1;
-+ }
-+
-+ thread->Run();
-+
-+ return 0;
-+}
-+
-+#else
-
- #include <CoreFoundation/CFMachPort.h>
- #include <sys/wait.h>
-@@ -113,6 +209,9 @@
- return 0;
- }
-
-+#endif
-+ // USE_POLLING
-+
- // NOTE: This doens't really belong here but this was a handy file to
- // put it in because it's already compiled for wxCocoa and wxMac GUI lib.
- static wxStandardPathsCF gs_stdPaths;
-diff -ur wxWidgets-2.6.3/src/unix/fontutil.cpp wxWidgets-2.6.3.3/src/unix/fontutil.cpp
---- wxWidgets-2.6.3/src/unix/fontutil.cpp 2006-02-12 19:24:55.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/unix/fontutil.cpp 2006-04-18 18:59:06.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin
- // Modified by:
- // Created: 05.11.99
--// RCS-ID: $Id: fontutil.cpp,v 1.62.2.1 2006/02/13 00:24:55 VZ Exp $
-+// RCS-ID: $Id: fontutil.cpp,v 1.62.2.2 2006/04/18 22:59:06 VZ Exp $
- // Copyright: (c) Vadim Zeitlin
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -337,8 +337,9 @@
- info->encoding = wxFONTENCODING_SYSTEM;
- return true;
-
-+ case wxFONTENCODING_ISO8859_1:
- case wxFONTENCODING_UTF8:
-- info->encoding = wxFONTENCODING_UTF8;
-+ info->encoding = encoding;
- return true;
-
- default:
-diff -ur wxWidgets-2.6.3/src/unix/mimetype.cpp wxWidgets-2.6.3.3/src/unix/mimetype.cpp
---- wxWidgets-2.6.3/src/unix/mimetype.cpp 2006-03-17 10:05:03.000000000 -0500
-+++ wxWidgets-2.6.3.3/src/unix/mimetype.cpp 2006-06-18 17:38:11.000000000 -0400
-@@ -4,7 +4,7 @@
- // Author: Vadim Zeitlin
- // Modified by:
- // Created: 23.09.98
--// RCS-ID: $Id: mimetype.cpp,v 1.53.2.3 2006/03/17 15:05:03 RR Exp $
-+// RCS-ID: $Id: mimetype.cpp,v 1.53.2.4 2006/06/18 21:38:11 VZ Exp $
- // Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
- // Licence: wxWindows licence (part of wxExtra library)
- /////////////////////////////////////////////////////////////////////////////
-@@ -395,7 +395,7 @@
-
- wxLogTrace(TRACE_MIME, wxT("--- Reading from Gnome file %s '%s' ---"),
- filename.c_str(), pc);
--
-+
- // trim trailing space and tab
- while ((*pc == wxT(' ')) || (*pc == wxT('\t')))
- pc++;
-@@ -406,18 +406,18 @@
- {
- wxString left_of_equal = sTmp.Left( equal_pos );
- const wxChar *right_of_equal = pc;
-- right_of_equal += equal_pos+1;
--
-+ right_of_equal += equal_pos+1;
-+
- if (left_of_equal == wxT("icon_filename"))
- {
- // GNOME 2:
- curIconFile = right_of_equal;
--
-+
- wxFileName newFile( curIconFile );
- if (newFile.IsRelative() || newFile.FileExists())
- {
- size_t nDirs = search_dirs.GetCount();
--
-+
- for (size_t nDir = 0; nDir < nDirs; nDir++)
- {
- newFile.SetPath( search_dirs[nDir] );
-@@ -2641,6 +2641,8 @@
-
- bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
- {
-+ InitIfNeeded();
-+
- wxArrayString sMimeTypes;
- ft->GetMimeTypes (sMimeTypes);
-
-diff -ur wxWidgets-2.6.3/utils/helpview/src/helpview.cpp wxWidgets-2.6.3.3/utils/helpview/src/helpview.cpp
---- wxWidgets-2.6.3/utils/helpview/src/helpview.cpp 2005-05-30 05:24:08.000000000 -0400
-+++ wxWidgets-2.6.3.3/utils/helpview/src/helpview.cpp 2006-03-30 06:35:12.000000000 -0500
-@@ -5,7 +5,7 @@
- // Author: Vaclav Slavik, Julian Smart
- // Modified by:
- // Created: 2002-07-09
--// RCS-ID: $Id: helpview.cpp,v 1.14 2005/05/30 09:24:08 ABX Exp $
-+// RCS-ID: $Id: helpview.cpp,v 1.14.2.1 2006/03/30 11:35:12 JS Exp $
- // Copyright: (c) 2002 Vaclav Slavik, Julian Smart and others
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -63,7 +63,7 @@
-
- #ifdef __WXMAC__
- wxApp::s_macAboutMenuItemId = wxID_ABOUT;
-- wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
-+ wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
- #endif
-
- int istyle = wxHF_DEFAULT_STYLE;
-diff -ur wxWidgets-2.6.3/utils/tex2rtf/src/tex2rtf.cpp wxWidgets-2.6.3.3/utils/tex2rtf/src/tex2rtf.cpp
---- wxWidgets-2.6.3/utils/tex2rtf/src/tex2rtf.cpp 2006-01-23 10:09:03.000000000 -0500
-+++ wxWidgets-2.6.3.3/utils/tex2rtf/src/tex2rtf.cpp 2006-06-13 06:36:42.000000000 -0400
-@@ -5,7 +5,7 @@
- // Modified by: Wlodzimiez ABX Skiba 2003/2004 Unicode support
- // Ron Lee
- // Created: 7.9.93
--// RCS-ID: $Id: tex2rtf.cpp,v 1.53.2.1 2006/01/23 15:09:03 ABX Exp $
-+// RCS-ID: $Id: tex2rtf.cpp,v 1.53.2.2 2006/06/13 10:36:42 ABX Exp $
- // Copyright: (c) Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -186,6 +186,8 @@
- }
- }
-
-+ TexPathList.Add(::wxGetCwd());
-+
- #ifdef NO_GUI
- if (InputFile.empty() || OutputFile.empty())
- {
-diff -ur wxWidgets-2.6.3/utils/tex2rtf/src/texutils.cpp wxWidgets-2.6.3.3/utils/tex2rtf/src/texutils.cpp
---- wxWidgets-2.6.3/utils/tex2rtf/src/texutils.cpp 2006-01-26 22:08:36.000000000 -0500
-+++ wxWidgets-2.6.3.3/utils/tex2rtf/src/texutils.cpp 2006-06-13 06:34:58.000000000 -0400
-@@ -5,7 +5,7 @@
- // Modified by: Wlodzimiez ABX Skiba 2003/2004 Unicode support
- // Ron Lee
- // Created: 7.9.93
--// RCS-ID: $Id: texutils.cpp,v 1.32.2.2 2006/01/27 03:08:36 MW Exp $
-+// RCS-ID: $Id: texutils.cpp,v 1.32.2.3 2006/06/13 10:34:58 ABX Exp $
- // Copyright: (c) Julian Smart
- // Licence: wxWindows licence
- /////////////////////////////////////////////////////////////////////////////
-@@ -1204,6 +1204,7 @@
- up.MakeUpper();
-
- if (up.IsSameAs(_T("YES")) ||
-+ up.IsSameAs(_T("TRUE")) ||
- up.IsSameAs(_T("ON")) ||
- up.IsSameAs(_T("OK")) |
- up.IsSameAs(_T("1")))
-diff -ur wxWidgets-2.6.3/version-script.in wxWidgets-2.6.3.3/version-script.in
---- wxWidgets-2.6.3/version-script.in 2006-03-18 09:25:50.000000000 -0500
-+++ wxWidgets-2.6.3.3/version-script.in 2006-07-06 06:40:39.000000000 -0400
-@@ -1,11 +1,21 @@
- #
--# $Id: version-script.in,v 1.23.2.5 2006/03/18 14:25:50 RR Exp $
-+# $Id: version-script.in,v 1.23.2.7 2006/07/06 10:40:39 ABX Exp $
- #
-
- # Note: Remove all of the tags below except for the last one when creating
- # new development branch.
-
-
-+# public symbols added in release 2.6.4 (please keep in alphabetical order):
-+
-+@WX_VERSION_TAG@.4 {
-+ global:
-+ *wxString*const_reverse_iterator*;
-+ *wxString*rbegin*;
-+ *wxString*rend*;
-+ *wxString*reverse_iterator*;
-+};
-+
- # public symbols added in release 2.6.3 (please keep in alphabetical order):
-
- @WX_VERSION_TAG@.3 {
diff --git a/wxGTK-2.8.0.1-cvs.patch b/wxGTK-2.8.0.1-cvs.patch
new file mode 100644
index 0000000..ca3c61a
--- /dev/null
+++ b/wxGTK-2.8.0.1-cvs.patch
@@ -0,0 +1,5248 @@
+# Generated with `cvs diff -u -R -N -r WX_2_8_0 -r wxPy_2_8_0_1`, and then
+# trimmed for non-platform-relevant changes
+
+Index: wxWidgets/Makefile.in
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/Makefile.in,v
+retrieving revision 1.669
+retrieving revision 1.670
+diff -u -r1.669 -r1.670
+--- wxWidgets/Makefile.in 2006/12/04 01:14:25 1.669
++++ wxWidgets/Makefile.in 2006/12/11 06:19:27 1.670
+@@ -2157,6 +2157,7 @@
+ wx/mac/sound.h \
+ wx/mac/spinbutt.h \
+ wx/mac/spinctrl.h \
++ wx/mac/srchctrl.h \
+ wx/mac/statbmp.h \
+ wx/mac/statbox.h \
+ wx/mac/statline.h \
+@@ -2230,6 +2231,9 @@
+ wx/mac/carbon/printdlg.h \
+ wx/mac/carbon/printmac.h \
+ wx/mac/carbon/private.h \
++ wx/mac/carbon/private/mactext.h \
++ wx/mac/carbon/private/overlay.h \
++ wx/mac/carbon/private/print.h \
+ wx/mac/carbon/radiobox.h \
+ wx/mac/carbon/radiobut.h \
+ wx/mac/carbon/region.h \
+@@ -2237,6 +2241,7 @@
+ wx/mac/carbon/slider.h \
+ wx/mac/carbon/spinbutt.h \
+ wx/mac/carbon/spinctrl.h \
++ wx/mac/carbon/srchctrl.h \
+ wx/mac/carbon/statbmp.h \
+ wx/mac/carbon/statbox.h \
+ wx/mac/carbon/statline.h \
+@@ -2871,6 +2876,7 @@
+ wx/generic/scrolwin.h \
+ wx/generic/spinctlg.h \
+ wx/generic/splitter.h \
++ wx/generic/srchctlg.h \
+ wx/generic/textdlgg.h \
+ wx/generic/timer.h \
+ wx/generic/treectlg.h \
+@@ -2988,6 +2994,7 @@
+ wx/spinbutt.h \
+ wx/spinctrl.h \
+ wx/splitter.h \
++ wx/srchctrl.h \
+ wx/statline.h \
+ wx/tab.h \
+ wx/tabctrl.h \
+@@ -3497,6 +3504,7 @@
+ monodll_rgncmn.o \
+ monodll_settcmn.o \
+ monodll_sizer.o \
++ monodll_srchcmn.o \
+ monodll_statbar.o \
+ monodll_stockitem.o \
+ monodll_tbarbase.o \
+@@ -3532,6 +3540,7 @@
+ monodll_selstore.o \
+ monodll_spinctlg.o \
+ monodll_splitter.o \
++ monodll_srchctlg.o \
+ monodll_textdlgg.o \
+ monodll_tipwin.o \
+ monodll_toolbkg.o \
+@@ -3670,6 +3679,7 @@
+ monodll_rgncmn.o \
+ monodll_settcmn.o \
+ monodll_sizer.o \
++ monodll_srchcmn.o \
+ monodll_statbar.o \
+ monodll_stockitem.o \
+ monodll_tbarbase.o \
+@@ -3705,6 +3715,7 @@
+ monodll_selstore.o \
+ monodll_spinctlg.o \
+ monodll_splitter.o \
++ monodll_srchctlg.o \
+ monodll_textdlgg.o \
+ monodll_tipwin.o \
+ monodll_toolbkg.o \
+@@ -4263,6 +4274,7 @@
+ monodll_slider.o \
+ monodll_spinbutt.o \
+ monodll_spinctrl.o \
++ monodll_srchctrl.o \
+ monodll_statbmp.o \
+ monodll_statbox.o \
+ monodll_statbrma.o \
+@@ -5271,6 +5283,7 @@
+ monolib_rgncmn.o \
+ monolib_settcmn.o \
+ monolib_sizer.o \
++ monolib_srchcmn.o \
+ monolib_statbar.o \
+ monolib_stockitem.o \
+ monolib_tbarbase.o \
+@@ -5306,6 +5319,7 @@
+ monolib_selstore.o \
+ monolib_spinctlg.o \
+ monolib_splitter.o \
++ monolib_srchctlg.o \
+ monolib_textdlgg.o \
+ monolib_tipwin.o \
+ monolib_toolbkg.o \
+@@ -5444,6 +5458,7 @@
+ monolib_rgncmn.o \
+ monolib_settcmn.o \
+ monolib_sizer.o \
++ monolib_srchcmn.o \
+ monolib_statbar.o \
+ monolib_stockitem.o \
+ monolib_tbarbase.o \
+@@ -5479,6 +5494,7 @@
+ monolib_selstore.o \
+ monolib_spinctlg.o \
+ monolib_splitter.o \
++ monolib_srchctlg.o \
+ monolib_textdlgg.o \
+ monolib_tipwin.o \
+ monolib_toolbkg.o \
+@@ -6038,6 +6054,7 @@
+ monolib_slider.o \
+ monolib_spinbutt.o \
+ monolib_spinctrl.o \
++ monolib_srchctrl.o \
+ monolib_statbmp.o \
+ monolib_statbox.o \
+ monolib_statbrma.o \
+@@ -7275,6 +7292,7 @@
+ coredll_rgncmn.o \
+ coredll_settcmn.o \
+ coredll_sizer.o \
++ coredll_srchcmn.o \
+ coredll_statbar.o \
+ coredll_stockitem.o \
+ coredll_tbarbase.o \
+@@ -7310,6 +7328,7 @@
+ coredll_selstore.o \
+ coredll_spinctlg.o \
+ coredll_splitter.o \
++ coredll_srchctlg.o \
+ coredll_textdlgg.o \
+ coredll_tipwin.o \
+ coredll_toolbkg.o \
+@@ -7448,6 +7467,7 @@
+ coredll_rgncmn.o \
+ coredll_settcmn.o \
+ coredll_sizer.o \
++ coredll_srchcmn.o \
+ coredll_statbar.o \
+ coredll_stockitem.o \
+ coredll_tbarbase.o \
+@@ -7483,6 +7503,7 @@
+ coredll_selstore.o \
+ coredll_spinctlg.o \
+ coredll_splitter.o \
++ coredll_srchctlg.o \
+ coredll_textdlgg.o \
+ coredll_tipwin.o \
+ coredll_toolbkg.o \
+@@ -8042,6 +8063,7 @@
+ coredll_slider.o \
+ coredll_spinbutt.o \
+ coredll_spinctrl.o \
++ coredll_srchctrl.o \
+ coredll_statbmp.o \
+ coredll_statbox.o \
+ coredll_statbrma.o \
+@@ -8723,6 +8745,7 @@
+ corelib_rgncmn.o \
+ corelib_settcmn.o \
+ corelib_sizer.o \
++ corelib_srchcmn.o \
+ corelib_statbar.o \
+ corelib_stockitem.o \
+ corelib_tbarbase.o \
+@@ -8758,6 +8781,7 @@
+ corelib_selstore.o \
+ corelib_spinctlg.o \
+ corelib_splitter.o \
++ corelib_srchctlg.o \
+ corelib_textdlgg.o \
+ corelib_tipwin.o \
+ corelib_toolbkg.o \
+@@ -8896,6 +8920,7 @@
+ corelib_rgncmn.o \
+ corelib_settcmn.o \
+ corelib_sizer.o \
++ corelib_srchcmn.o \
+ corelib_statbar.o \
+ corelib_stockitem.o \
+ corelib_tbarbase.o \
+@@ -8931,6 +8956,7 @@
+ corelib_selstore.o \
+ corelib_spinctlg.o \
+ corelib_splitter.o \
++ corelib_srchctlg.o \
+ corelib_textdlgg.o \
+ corelib_tipwin.o \
+ corelib_toolbkg.o \
+@@ -9490,6 +9516,7 @@
+ corelib_slider.o \
+ corelib_spinbutt.o \
+ corelib_spinctrl.o \
++ corelib_srchctrl.o \
+ corelib_statbmp.o \
+ corelib_statbox.o \
+ corelib_statbrma.o \
+@@ -12852,6 +12879,9 @@
+ monodll_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
+
++monodll_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(MONODLL_ODEP)
++ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
++
+ monodll_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
+
+@@ -16224,6 +16254,9 @@
+ @COND_USE_GUI_1@monodll_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONODLL_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
+
++@COND_USE_GUI_1@monodll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONODLL_ODEP)
++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
++
+ @COND_USE_GUI_1@monodll_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONODLL_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
+
+@@ -16329,6 +16362,9 @@
+ @COND_USE_GUI_1@monodll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONODLL_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
+
++@COND_USE_GUI_1@monodll_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(MONODLL_ODEP)
++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
++
+ @COND_USE_GUI_1@monodll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONODLL_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
+
+@@ -16959,6 +16995,9 @@
+ monolib_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
+
++monolib_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(MONOLIB_ODEP)
++ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
++
+ monolib_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
+
+@@ -20331,6 +20370,9 @@
+ @COND_USE_GUI_1@monolib_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONOLIB_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
+
++@COND_USE_GUI_1@monolib_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONOLIB_ODEP)
++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
++
+ @COND_USE_GUI_1@monolib_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONOLIB_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
+
+@@ -20436,6 +20478,9 @@
+ @COND_USE_GUI_1@monolib_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONOLIB_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
+
++@COND_USE_GUI_1@monolib_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(MONOLIB_ODEP)
++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
++
+ @COND_USE_GUI_1@monolib_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONOLIB_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
+
+@@ -22065,6 +22110,9 @@
+ coredll_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
+
++coredll_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(COREDLL_ODEP)
++ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
++
+ coredll_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(COREDLL_ODEP)
+ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
+
+@@ -24783,6 +24831,9 @@
+ @COND_USE_GUI_1@coredll_sizer.o: $(srcdir)/src/common/sizer.cpp $(COREDLL_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
+
++@COND_USE_GUI_1@coredll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(COREDLL_ODEP)
++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
++
+ @COND_USE_GUI_1@coredll_statbar.o: $(srcdir)/src/common/statbar.cpp $(COREDLL_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
+
+@@ -24888,6 +24939,9 @@
+ @COND_USE_GUI_1@coredll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(COREDLL_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
+
++@COND_USE_GUI_1@coredll_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(COREDLL_ODEP)
++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
++
+ @COND_USE_GUI_1@coredll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(COREDLL_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
+
+@@ -25008,6 +25062,9 @@
+ corelib_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
+
++corelib_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(CORELIB_ODEP)
++ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
++
+ corelib_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(CORELIB_ODEP)
+ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
+
+@@ -27726,6 +27783,9 @@
+ @COND_USE_GUI_1@corelib_sizer.o: $(srcdir)/src/common/sizer.cpp $(CORELIB_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
+
++@COND_USE_GUI_1@corelib_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(CORELIB_ODEP)
++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
++
+ @COND_USE_GUI_1@corelib_statbar.o: $(srcdir)/src/common/statbar.cpp $(CORELIB_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
+
+@@ -27830,6 +27890,9 @@
+
+ @COND_USE_GUI_1@corelib_splitter.o: $(srcdir)/src/generic/splitter.cpp $(CORELIB_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
++
++@COND_USE_GUI_1@corelib_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(CORELIB_ODEP)
++@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
+
+ @COND_USE_GUI_1@corelib_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(CORELIB_ODEP)
+ @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
+Index: wxWidgets/configure.in
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/configure.in,v
+retrieving revision 1.1226
+retrieving revision 1.1228
+diff -u -r1.1226 -r1.1228
+--- wxWidgets/configure.in 2006/12/09 23:43:54 1.1226
++++ wxWidgets/configure.in 2006/12/12 01:52:43 1.1228
+@@ -1,5 +1,5 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_REVISION($Id: configure.in,v 1.1226 2006/12/09 23:43:54 MW Exp $)dnl
++AC_REVISION($Id: configure.in,v 1.1228 2006/12/12 01:52:43 RD Exp $)dnl
+
+ AC_PREREQ(2.58)
+
+@@ -10,7 +10,7 @@
+ dnl
+ dnl This script is under the wxWidgets licence.
+ dnl
+-dnl Version: $Id: configure.in,v 1.1226 2006/12/09 23:43:54 MW Exp $
++dnl Version: $Id: configure.in,v 1.1228 2006/12/12 01:52:43 RD Exp $
+ dnl ---------------------------------------------------------------------------
+
+ dnl ---------------------------------------------------------------------------
+@@ -35,7 +35,7 @@
+ wx_major_version_number=2
+ wx_minor_version_number=8
+ wx_release_number=0
+-wx_subrelease_number=0
++wx_subrelease_number=1
+
+ WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
+ WX_VERSION=$WX_RELEASE.$wx_release_number
+@@ -552,6 +552,7 @@
+ DEFAULT_wxUSE_RADIOBTN=no
+ DEFAULT_wxUSE_SASH=no
+ DEFAULT_wxUSE_SCROLLBAR=no
++ DEFAULT_wxUSE_SEARCHCTRL=no
+ DEFAULT_wxUSE_SLIDER=no
+ DEFAULT_wxUSE_SPINBTN=no
+ DEFAULT_wxUSE_SPINCTRL=no
+@@ -775,6 +776,7 @@
+ DEFAULT_wxUSE_RADIOBTN=yes
+ DEFAULT_wxUSE_SASH=yes
+ DEFAULT_wxUSE_SCROLLBAR=yes
++ DEFAULT_wxUSE_SEARCHCTRL=yes
+ DEFAULT_wxUSE_SLIDER=yes
+ DEFAULT_wxUSE_SPINBTN=yes
+ DEFAULT_wxUSE_SPINCTRL=yes
+@@ -1107,6 +1109,7 @@
+ DEFAULT_wxUSE_RADIOBTN=yes
+ DEFAULT_wxUSE_SASH=yes
+ DEFAULT_wxUSE_SCROLLBAR=yes
++ DEFAULT_wxUSE_SEARCHCTRL=yes
+ DEFAULT_wxUSE_SLIDER=yes
+ DEFAULT_wxUSE_SPINBTN=yes
+ DEFAULT_wxUSE_SPINCTRL=yes
+@@ -1159,6 +1162,7 @@
+ DEFAULT_wxUSE_RADIOBTN=no
+ DEFAULT_wxUSE_SASH=no
+ DEFAULT_wxUSE_SCROLLBAR=no
++ DEFAULT_wxUSE_SEARCHCTRL=no
+ DEFAULT_wxUSE_SLIDER=no
+ DEFAULT_wxUSE_SPINBTN=no
+ DEFAULT_wxUSE_SPINCTRL=no
+@@ -1214,6 +1218,7 @@
+ WX_ARG_ENABLE(radiobtn, [ --enable-radiobtn use wxRadioButton class], wxUSE_RADIOBTN)
+ WX_ARG_ENABLE(sash, [ --enable-sash use wxSashWindow class], wxUSE_SASH)
+ WX_ARG_ENABLE(scrollbar, [ --enable-scrollbar use wxScrollBar class and scrollable windows], wxUSE_SCROLLBAR)
++WX_ARG_ENABLE(searchctrl, [ --enable-searchctrl use wxSearchCtrl class], wxUSE_SEARCHCTRL)
+ WX_ARG_ENABLE(slider, [ --enable-slider use wxSlider class], wxUSE_SLIDER)
+ WX_ARG_ENABLE(spinbtn, [ --enable-spinbtn use wxSpinButton class], wxUSE_SPINBTN)
+ WX_ARG_ENABLE(spinctrl, [ --enable-spinctrl use wxSpinCtrl class], wxUSE_SPINCTRL)
+@@ -6880,6 +6885,11 @@
+ AC_DEFINE(wxUSE_SCROLLBAR)
+ USES_CONTROLS=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
++fi
++
++if test "$wxUSE_SEARCHCTRL" = "yes"; then
++ AC_DEFINE(wxUSE_SEARCHCTRL)
++ USES_CONTROLS=1
+ fi
+
+ if test "$wxUSE_SLIDER" = "yes"; then
+Index: wxWidgets/setup.h.in
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/setup.h.in,v
+retrieving revision 1.247
+retrieving revision 1.248
+diff -u -r1.247 -r1.248
+--- wxWidgets/setup.h.in 2006/12/03 21:59:40 1.247
++++ wxWidgets/setup.h.in 2006/12/11 06:19:16 1.248
+@@ -332,6 +332,7 @@
+ #define wxUSE_RADIOBOX 0
+ #define wxUSE_RADIOBTN 0
+ #define wxUSE_SCROLLBAR 0
++#define wxUSE_SEARCHCTRL 0
+ #define wxUSE_SLIDER 0
+ #define wxUSE_SPINBTN 0
+ #define wxUSE_SPINCTRL 0
+Index: wxWidgets/build/bakefiles/files.bkl
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/build/bakefiles/files.bkl,v
+retrieving revision 1.412
+retrieving revision 1.413
+diff -u -r1.412 -r1.413
+--- wxWidgets/build/bakefiles/files.bkl 2006/12/04 01:14:19 1.412
++++ wxWidgets/build/bakefiles/files.bkl 2006/12/11 06:19:13 1.413
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!-- $Id: files.bkl,v 1.412 2006/12/04 01:14:19 VZ Exp $ -->
++<!-- $Id: files.bkl,v 1.413 2006/12/11 06:19:13 RD Exp $ -->
+ <makefile>
+
+ <!--
+@@ -638,6 +638,7 @@
+ src/common/rgncmn.cpp
+ src/common/settcmn.cpp
+ src/common/sizer.cpp
++ src/common/srchcmn.cpp
+ src/common/statbar.cpp
+ src/common/stockitem.cpp
+ src/common/tbarbase.cpp
+@@ -673,6 +674,7 @@
+ src/generic/selstore.cpp
+ src/generic/spinctlg.cpp
+ src/generic/splitter.cpp
++ src/generic/srchctlg.cpp
+ src/generic/textdlgg.cpp
+ src/generic/tipwin.cpp
+ src/generic/toolbkg.cpp
+@@ -736,6 +738,7 @@
+ wx/generic/scrolwin.h
+ wx/generic/spinctlg.h
+ wx/generic/splitter.h
++ wx/generic/srchctlg.h
+ wx/generic/textdlgg.h
+ wx/generic/timer.h
+ wx/generic/treectlg.h
+@@ -854,6 +857,7 @@
+ wx/spinbutt.h
+ wx/spinctrl.h
+ wx/splitter.h
++ wx/srchctrl.h
+ wx/statline.h
+ wx/tab.h
+ wx/tabctrl.h
+@@ -2135,6 +2139,7 @@
+ src/mac/carbon/slider.cpp
+ src/mac/carbon/spinbutt.cpp
+ src/mac/carbon/spinctrl.cpp
++ src/mac/carbon/srchctrl.cpp
+ src/mac/carbon/statbmp.cpp
+ src/mac/carbon/statbox.cpp
+ src/mac/carbon/statbrma.cpp
+@@ -2227,6 +2232,7 @@
+ wx/mac/sound.h
+ wx/mac/spinbutt.h
+ wx/mac/spinctrl.h
++ wx/mac/srchctrl.h
+ wx/mac/statbmp.h
+ wx/mac/statbox.h
+ wx/mac/statline.h
+@@ -2303,6 +2309,9 @@
+ wx/mac/carbon/printdlg.h
+ wx/mac/carbon/printmac.h
+ wx/mac/carbon/private.h
++ wx/mac/carbon/private/mactext.h
++ wx/mac/carbon/private/overlay.h
++ wx/mac/carbon/private/print.h
+ wx/mac/carbon/radiobox.h
+ wx/mac/carbon/radiobut.h
+ wx/mac/carbon/region.h
+@@ -2310,6 +2319,7 @@
+ wx/mac/carbon/slider.h
+ wx/mac/carbon/spinbutt.h
+ wx/mac/carbon/spinctrl.h
++ wx/mac/carbon/srchctrl.h
+ wx/mac/carbon/statbmp.h
+ wx/mac/carbon/statbox.h
+ wx/mac/carbon/statline.h
+Index: wxWidgets/demos/dbbrowse/makefile.gtk
+===================================================================
+RCS file: makefile.gtk
+diff -N makefile.gtk
+--- /dev/null Thu Dec 14 21:45:38 2006
++++ wxWidgets/demos/dbbrowse/makefile.gtk Thu Dec 14 21:45:38 2006
+@@ -0,0 +1,15 @@
++
++# Top dir of wxWindows
++top_builddir = /gtm/bart/wxGTK
++
++PROGRAM=dbbrowser_gtk
++
++
++OBJECTS= dbbrowse.o doc.o pgmctrl.o tabpgwin.o\
++ browsedb.o dbtree.o dbgrid.o dlguser.o
++
++
++
++
++include $(top_builddir)/src/makeprog.env
++
+Index: wxWidgets/docs/changes.txt
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/docs/changes.txt,v
+retrieving revision 1.984
+retrieving revision 1.985
+diff -u -r1.984 -r1.985
+--- wxWidgets/docs/changes.txt 2006/12/09 16:20:26 1.984
++++ wxWidgets/docs/changes.txt 2006/12/11 13:48:56 1.985
+@@ -84,7 +84,7 @@
+ - Further functionality including wxAnimationCtrl (moved from contrib/src/anim
+ and enhanced), wxSimpleHtmlListBox, wxHyperlinkCtrl, wxColourPickerCtrl,
+ wxDirPickerCtrl, wxFilePickerCtrl, wxFontPickerCtrl, wxCollapsiblePane,
+- wxAboutBox, wxTreebook, tar streams.
++ wxSearchCtrl, wxAboutBox, wxTreebook, tar streams.
+
+
+ 2.8.0
+@@ -92,6 +92,7 @@
+
+ All:
+
++- Added wxSearchCtrl (Vince Harron)
+ - wxCSConv("UTF-16/32") now behaves correctly, i.e. same as wxMBConvUTF16/32
+ - wxArrayString::Alloc() now works as reserve() and doesn't clear array contents
+ - Fixed long standing bug in wxFileConfig groups renaming (Antti Koivisto).
+Index: wxWidgets/include/wx/setup_inc.h
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/include/wx/setup_inc.h,v
+retrieving revision 1.58
+retrieving revision 1.59
+diff -u -r1.58 -r1.59
+--- wxWidgets/include/wx/setup_inc.h 2006/11/09 00:49:10 1.58
++++ wxWidgets/include/wx/setup_inc.h 2006/12/11 06:19:02 1.59
+@@ -4,7 +4,7 @@
+ // Author: Vadim Zeitlin
+ // Modified by:
+ // Created:
+-// RCS-ID: $Id: setup_inc.h,v 1.58 2006/11/09 00:49:10 VZ Exp $
++// RCS-ID: $Id: setup_inc.h,v 1.59 2006/12/11 06:19:02 RD Exp $
+ // Copyright: (c) Vadim Zeitlin
+ // Licence: wxWindows licence
+ ///////////////////////////////////////////////////////////////////////////////
+@@ -634,6 +634,7 @@
+ #define wxUSE_RADIOBOX 1 // wxRadioBox
+ #define wxUSE_RADIOBTN 1 // wxRadioButton
+ #define wxUSE_SCROLLBAR 1 // wxScrollBar
++#define wxUSE_SEARCHCTRL 1 // wxSearchCtrl
+ #define wxUSE_SLIDER 1 // wxSlider
+ #define wxUSE_SPINBTN 1 // wxSpinButton
+ #define wxUSE_SPINCTRL 1 // wxSpinCtrl
+Index: wxWidgets/include/wx/srchctrl.h
+===================================================================
+RCS file: srchctrl.h
+diff -N srchctrl.h
+--- /dev/null Thu Dec 14 21:45:56 2006
++++ wxWidgets/include/wx/srchctrl.h Thu Dec 14 21:46:07 2006
+@@ -0,0 +1,89 @@
++/////////////////////////////////////////////////////////////////////////////
++// Name: srchctrl.h
++// Purpose: wxSearchCtrlBase class
++// Author: Vince Harron
++// Created: 2006-02-18
++// RCS-ID: $Id: srchctrl.h,v 1.5 2006/12/11 20:32:00 KO Exp $
++// Copyright: (c) Vince Harron
++// Licence: wxWindows licence
++/////////////////////////////////////////////////////////////////////////////
++
++#ifndef _WX_SEARCHCTRL_H_BASE_
++#define _WX_SEARCHCTRL_H_BASE_
++
++#include "wx/defs.h"
++
++#if wxUSE_SEARCHCTRL
++
++#include "wx/textctrl.h"
++
++#if !defined(__WXUNIVERSAL__) && defined(__WXMAC__) && defined(__WXMAC_OSX__) \
++ && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
++ // search control was introduced in Mac OS X 10.3 Panther
++ #define wxUSE_NATIVE_SEARCH_CONTROL 1
++
++ #define wxSearchCtrlBaseBaseClass wxTextCtrl
++#else
++ // no native version, use the generic one
++ #define wxUSE_NATIVE_SEARCH_CONTROL 0
++
++ #define wxSearchCtrlBaseBaseClass wxTextCtrlBase
++#endif
++
++// ----------------------------------------------------------------------------
++// constants
++// ----------------------------------------------------------------------------
++
++extern WXDLLEXPORT_DATA(const wxChar) wxSearchCtrlNameStr[];
++
++BEGIN_DECLARE_EVENT_TYPES()
++ DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, 1119)
++ DECLARE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, 1120)
++END_DECLARE_EVENT_TYPES()
++
++// ----------------------------------------------------------------------------
++// a search ctrl is a text control with a search button and a cancel button
++// it is based on the MacOSX 10.3 control HISearchFieldCreate
++// ----------------------------------------------------------------------------
++
++class WXDLLEXPORT wxSearchCtrlBase : public wxSearchCtrlBaseBaseClass
++{
++public:
++ wxSearchCtrlBase() { }
++ virtual ~wxSearchCtrlBase() { }
++
++ // search control
++ virtual void SetMenu(wxMenu *menu) = 0;
++ virtual wxMenu *GetMenu() = 0;
++
++ // get/set options
++ virtual void ShowSearchButton( bool show ) = 0;
++ virtual bool IsSearchButtonVisible() const = 0;
++
++ virtual void ShowCancelButton( bool show ) = 0;
++ virtual bool IsCancelButtonVisible() const = 0;
++};
++
++
++// include the platform-dependent class implementation
++#if wxUSE_NATIVE_SEARCH_CONTROL
++ #if defined(__WXMAC__)
++ #include "wx/mac/srchctrl.h"
++ #endif
++#else
++ #include "wx/generic/srchctlg.h"
++#endif
++
++// ----------------------------------------------------------------------------
++// macros for handling search events
++// ----------------------------------------------------------------------------
++
++#define EVT_SEARCHCTRL_CANCEL_BTN(id, fn) \
++ wx__DECLARE_EVT1(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN, id, wxCommandEventHandler(fn))
++
++#define EVT_SEARCHCTRL_SEARCH_BTN(id, fn) \
++ wx__DECLARE_EVT1(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN, id, wxCommandEventHandler(fn))
++
++#endif // wxUSE_SEARCHCTRL
++
++#endif // _WX_SEARCHCTRL_H_BASE_
+Index: wxWidgets/include/wx/version.h
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/include/wx/version.h,v
+retrieving revision 1.82
+retrieving revision 1.83
+diff -u -r1.82 -r1.83
+--- wxWidgets/include/wx/version.h 2006/11/10 02:27:47 1.82
++++ wxWidgets/include/wx/version.h 2006/12/12 01:52:41 1.83
+@@ -4,7 +4,7 @@
+ * Author: Julian Smart
+ * Modified by: Ryan Norton (Converted to C)
+ * Created: 29/01/98
+- * RCS-ID: $Id: version.h,v 1.82 2006/11/10 02:27:47 RD Exp $
++ * RCS-ID: $Id: version.h,v 1.83 2006/12/12 01:52:41 RD Exp $
+ * Copyright: (c) 1998 Julian Smart
+ * Licence: wxWindows licence
+ */
+@@ -29,7 +29,7 @@
+ #define wxMAJOR_VERSION 2
+ #define wxMINOR_VERSION 8
+ #define wxRELEASE_NUMBER 0
+-#define wxSUBRELEASE_NUMBER 0
++#define wxSUBRELEASE_NUMBER 1
+ #define wxVERSION_STRING _T("wxWidgets 2.8.0")
+
+ /* nothing to update below this line when updating the version */
+Index: wxWidgets/include/wx/generic/srchctlg.h
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/include/wx/generic/srchctlg.h,v
+retrieving revision 1.2
+retrieving revision 1.5
+diff -u -r1.2 -r1.5
+--- wxWidgets/include/wx/generic/srchctlg.h 2006/12/11 07:48:02 1.2
++++ wxWidgets/include/wx/generic/srchctlg.h 2006/12/12 00:53:52 1.5
+@@ -2,9 +2,8 @@
+ // Name: wx/generic/srchctlg.h
+ // Purpose: generic wxSearchCtrl class
+ // Author: Vince Harron
+-// Modified by:
+ // Created: 2006-02-19
+-// RCS-ID:
++// RCS-ID: $Id: srchctlg.h,v 1.5 2006/12/12 00:53:52 RD Exp $
+ // Copyright: Vince Harron
+ // Licence: wxWindows licence
+ /////////////////////////////////////////////////////////////////////////////
+@@ -14,37 +13,11 @@
+
+ #if wxUSE_SEARCHCTRL
+
+-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+- #pragma interface "srchctlg.h"
+-#endif
+-
+ #include "wx/bitmap.h"
+
+-// ----------------------------------------------------------------------------
+-
+ class WXDLLEXPORT wxSearchButton;
+ class WXDLLEXPORT wxSearchTextCtrl;
+
+-class WXDLLEXPORT wxSearchCtrlBase : public wxTextCtrlBase
+-{
+-public:
+- wxSearchCtrlBase() {}
+- virtual ~wxSearchCtrlBase() {}
+-
+- // search control
+- virtual void SetMenu( wxMenu* menu ) = 0;
+- virtual wxMenu* GetMenu() = 0;
+-
+-
+- // get/set options
+- virtual void SetSearchButtonVisible( bool show ) = 0;
+- virtual bool GetSearchButtonVisible() const = 0;
+-
+- virtual void SetCancelButtonVisible( bool show ) = 0;
+- virtual bool GetCancelButtonVisible() const = 0;
+-protected:
+-};
+-
+ // ----------------------------------------------------------------------------
+ // wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton
+ // ----------------------------------------------------------------------------
+@@ -64,7 +37,7 @@
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString& name = wxSearchCtrlNameStr);
+
+- ~wxSearchCtrl();
++ virtual ~wxSearchCtrl();
+
+ bool Create(wxWindow *parent, wxWindowID id,
+ const wxString& value = wxEmptyString,
+@@ -78,14 +51,14 @@
+ // --------------------------
+ virtual void SetMenu( wxMenu* menu );
+ virtual wxMenu* GetMenu();
+-
++
+ // get/set search options
+ // ----------------------
+- virtual void SetSearchButtonVisible( bool show );
+- virtual bool GetSearchButtonVisible() const;
++ virtual void ShowSearchButton( bool show );
++ virtual bool IsSearchButtonVisible() const;
+
+- virtual void SetCancelButtonVisible( bool show );
+- virtual bool GetCancelButtonVisible() const;
++ virtual void ShowCancelButton( bool show );
++ virtual bool IsCancelButtonVisible() const;
+
+ // accessors
+ // ---------
+@@ -239,7 +212,8 @@
+ virtual void OnSearchButton( wxCommandEvent& event );
+
+ void OnSetFocus( wxFocusEvent& event );
+-
++ void OnSize( wxSizeEvent& event );
++
+ private:
+ friend class wxSearchButton;
+
+Index: wxWidgets/samples/minimal/minimal.cpp
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/samples/minimal/minimal.cpp,v
+retrieving revision 1.74
+retrieving revision 1.76
+diff -u -r1.74 -r1.76
+--- wxWidgets/samples/minimal/minimal.cpp 2006/11/04 21:58:47 1.74
++++ wxWidgets/samples/minimal/minimal.cpp 2006/12/11 09:33:34 1.76
+@@ -4,7 +4,7 @@
+ // Author: Julian Smart
+ // Modified by:
+ // Created: 04/01/98
+-// RCS-ID: $Id: minimal.cpp,v 1.74 2006/11/04 21:58:47 VZ Exp $
++// RCS-ID: $Id: minimal.cpp,v 1.76 2006/12/11 09:33:34 CE Exp $
+ // Copyright: (c) Julian Smart
+ // Licence: wxWindows licence
+ /////////////////////////////////////////////////////////////////////////////
+@@ -16,10 +16,10 @@
+ // ----------------------------------------------------------------------------
+ // headers
+ // ----------------------------------------------------------------------------
+-
++
+ // For compilers that support precompilation, includes "wx/wx.h".
+ #include "wx/wxprec.h"
+-
++
+ #ifdef __BORLANDC__
+ #pragma hdrstop
+ #endif
+Index: wxWidgets/samples/tab/Makefile.in
+===================================================================
+RCS file: Makefile.in
+diff -N Makefile.in
+--- /dev/null Thu Dec 14 21:47:16 2006
++++ wxWidgets/samples/tab/Makefile.in Thu Dec 14 21:47:23 2006
+@@ -0,0 +1,173 @@
++# =========================================================================
++# This makefile was generated by
++# Bakefile 0.1.6 (http://bakefile.sourceforge.net)
++# Do not modify, all changes will be overwritten!
++# =========================================================================
++
++
++@MAKE_SET@
++
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++INSTALL = @INSTALL@
++EXEEXT = @EXEEXT@
++RESCOMP = @RESCOMP@
++SETFILE = @SETFILE@
++NM = @NM@
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++top_builddir = @top_builddir@
++LDFLAGS_GUI = @LDFLAGS_GUI@
++CXX = @CXX@
++CXXFLAGS = @CXXFLAGS@
++CPPFLAGS = @CPPFLAGS@
++LDFLAGS = @LDFLAGS@
++WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
++TOOLKIT = @TOOLKIT@
++TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
++TOOLKIT_VERSION = @TOOLKIT_VERSION@
++TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
++EXTRALIBS = @EXTRALIBS@
++EXTRALIBS_GUI = @EXTRALIBS_GUI@
++HOST_SUFFIX = @HOST_SUFFIX@
++SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
++SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
++
++### Variables: ###
++
++DESTDIR =
++WX_RELEASE = 2.5
++WX_VERSION = $(WX_RELEASE).4
++LIBDIRNAME = $(top_builddir)lib
++TAB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
++ $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
++TAB_OBJECTS = \
++ $(__tab_os2_lib_res) \
++ tab_tab.o \
++ $(__tab___win32rc)
++
++### Conditionally set variables: ###
++
++@COND_DEPS_TRACKING_0@CXXC = $(CXX)
++@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
++@COND_USE_GUI_0@PORTNAME = base
++@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
++@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
++@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
++@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
++@COND_UNICODE_1@WXUNICODEFLAG = u
++@COND_WXUNIV_1@WXUNIVNAME = univ
++@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
++@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
++@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
++@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
++@COND_PLATFORM_MAC_1@__tab___mac_setfilecmd = $(SETFILE) -a C tab$(EXEEXT)
++@COND_PLATFORM_MAC_1@__tab___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
++@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
++@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
++@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
++@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
++@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
++@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
++COND_PLATFORM_OS2_1___tab___os2_emxbindcmd = $(NM) tab$(EXEEXT) | if grep -q \
++ pmwin.763 ; then emxbind -ep tab$(EXEEXT) ; fi
++@COND_PLATFORM_OS2_1@__tab___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___tab___os2_emxbindcmd)
++@COND_PLATFORM_OS2_1@__tab_os2_lib_res = \
++@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
++@COND_PLATFORM_MACOSX_1@__tab_bundle___depname = tab_bundle
++@COND_TOOLKIT_COCOA@____tab_BUNDLE_TGT_REF_DEP = tab.app/Contents/PkgInfo
++@COND_TOOLKIT_MAC@____tab_BUNDLE_TGT_REF_DEP = tab.app/Contents/PkgInfo
++COND_MONOLITHIC_0___WXLIB_CORE_p = \
++ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
++@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
++COND_MONOLITHIC_0___WXLIB_BASE_p = \
++ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
++@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
++@COND_PLATFORM_WIN32_1@__tab___win32rc = tab_tab_rc.o
++COND_MONOLITHIC_1___WXLIB_MONO_p = \
++ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
++@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
++@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
++@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
++@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
++@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
++@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
++@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
++@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
++@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
++@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
++@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
++@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
++@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
++@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
++COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
++ -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
++@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
++@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
++@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
++COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
++ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
++ $(srcdir)/../../samples -i $(top_srcdir)/include -o tab$(EXEEXT) Carbon.r \
++ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.r sample.r
++@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
++
++### Targets: ###
++
++all: tab$(EXEEXT) $(__tab_bundle___depname)
++
++install: all
++
++uninstall:
++
++install-strip: install
++
++clean:
++ rm -rf ./.deps ./.pch
++ rm -f ./*.o
++ rm -f tab$(EXEEXT)
++ rm -rf tab.app
++
++distclean: clean
++ rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
++
++tab$(EXEEXT): $(TAB_OBJECTS) $(__tab___win32rc)
++ $(CXX) -o $@ $(TAB_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
++ $(__tab___mac_rezcmd)
++ $(__tab___mac_setfilecmd)
++ $(__tab___os2_emxbindcmd)
++ $(SAMPLES_RPATH_POSTLINK)
++
++tab.app/Contents/PkgInfo: tab$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
++ mkdir -p tab.app/Contents
++ mkdir -p tab.app/Contents/MacOS
++ mkdir -p tab.app/Contents/Resources
++
++
++ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
++ -e "s/EXECUTABLE/tab/" \
++ -e "s/VERSION/$(WX_VERSION)/" \
++ $(top_srcdir)/src/mac/carbon/Info.plist.in >tab.app/Contents/Info.plist
++
++
++ echo -n "APPL????" >tab.app/Contents/PkgInfo
++
++
++ ln -f tab$(EXEEXT) tab.app/Contents/MacOS/tab
++
++
++ cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc tab.app/Contents/Resources/tab.rsrc
++ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns tab.app/Contents/Resources/wxmac.icns
++
++@COND_PLATFORM_MACOSX_1@tab_bundle: $(____tab_BUNDLE_TGT_REF_DEP)
++
++tab_tab.o: $(srcdir)/tab.cpp
++ $(CXXC) -c -o $@ $(TAB_CXXFLAGS) $(srcdir)/tab.cpp
++
++tab_tab_rc.o: $(srcdir)/tab.rc
++ $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
++
++
++# Include dependency info, if present:
++@IF_GNU_MAKE@-include .deps/*.d
++
++.PHONY: all install uninstall clean distclean tab_bundle
+Index: wxWidgets/samples/widgets/Makefile.in
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/samples/widgets/Makefile.in,v
+retrieving revision 1.65
+retrieving revision 1.66
+diff -u -r1.65 -r1.66
+--- wxWidgets/samples/widgets/Makefile.in 2006/11/10 02:19:10 1.65
++++ wxWidgets/samples/widgets/Makefile.in 2006/12/11 06:18:31 1.66
+@@ -66,6 +66,7 @@
+ widgets_notebook.o \
+ widgets_odcombobox.o \
+ widgets_radiobox.o \
++ widgets_searchctrl.o \
+ widgets_slider.o \
+ widgets_spinbtn.o \
+ widgets_static.o \
+@@ -261,6 +262,9 @@
+
+ widgets_radiobox.o: $(srcdir)/radiobox.cpp
+ $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/radiobox.cpp
++
++widgets_searchctrl.o: $(srcdir)/searchctrl.cpp
++ $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/searchctrl.cpp
+
+ widgets_slider.o: $(srcdir)/slider.cpp
+ $(CXXC) -c -o $@ $(WIDGETS_CXXFLAGS) $(srcdir)/slider.cpp
+Index: wxWidgets/samples/widgets/datepick.cpp
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/samples/widgets/datepick.cpp,v
+retrieving revision 1.9
+retrieving revision 1.10
+diff -u -r1.9 -r1.10
+--- wxWidgets/samples/widgets/datepick.cpp 2006/12/10 13:46:12 1.9
++++ wxWidgets/samples/widgets/datepick.cpp 2006/12/11 13:30:27 1.10
+@@ -4,7 +4,7 @@
+ // Purpose: Part of the widgets sample showing date picker
+ // Author: Dimitri Schoolwerth, Vadim Zeitlin
+ // Created: 27 Sep 2003
+-// Id: $Id: datepick.cpp,v 1.9 2006/12/10 13:46:12 VZ Exp $
++// Id: $Id: datepick.cpp,v 1.10 2006/12/11 13:30:27 VZ Exp $
+ // Copyright: (c) 2003 wxWindows team
+ // License: wxWindows license
+ /////////////////////////////////////////////////////////////////////////////
+@@ -223,7 +223,9 @@
+
+ void DatePickerWidgetsPage::OnButtonSet(wxCommandEvent& WXUNUSED(event))
+ {
+- long day, month, year;
++ long day = 0,
++ month = 0,
++ year = 0;
+ if ( m_day->GetValue().ToLong(&day) &&
+ m_month->GetValue().ToLong(&month) &&
+ m_year->GetValue().ToLong(&year) )
+Index: wxWidgets/samples/widgets/makefile.bcc
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/samples/widgets/makefile.bcc,v
+retrieving revision 1.38
+retrieving revision 1.39
+diff -u -r1.38 -r1.39
+--- wxWidgets/samples/widgets/makefile.bcc 2006/11/10 02:19:10 1.38
++++ wxWidgets/samples/widgets/makefile.bcc 2006/12/11 06:18:30 1.39
+@@ -50,6 +50,7 @@
+ $(OBJS)\widgets_notebook.obj \
+ $(OBJS)\widgets_odcombobox.obj \
+ $(OBJS)\widgets_radiobox.obj \
++ $(OBJS)\widgets_searchctrl.obj \
+ $(OBJS)\widgets_slider.obj \
+ $(OBJS)\widgets_spinbtn.obj \
+ $(OBJS)\widgets_static.obj \
+@@ -305,6 +306,9 @@
+ $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
+ $(OBJS)\widgets_radiobox.obj: .\radiobox.cpp
++ $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
++
++$(OBJS)\widgets_searchctrl.obj: .\searchctrl.cpp
+ $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
+ $(OBJS)\widgets_slider.obj: .\slider.cpp
+Index: wxWidgets/samples/widgets/makefile.gcc
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/samples/widgets/makefile.gcc,v
+retrieving revision 1.37
+retrieving revision 1.38
+diff -u -r1.37 -r1.38
+--- wxWidgets/samples/widgets/makefile.gcc 2006/11/10 02:19:10 1.37
++++ wxWidgets/samples/widgets/makefile.gcc 2006/12/11 06:18:30 1.38
+@@ -43,6 +43,7 @@
+ $(OBJS)\widgets_notebook.o \
+ $(OBJS)\widgets_odcombobox.o \
+ $(OBJS)\widgets_radiobox.o \
++ $(OBJS)\widgets_searchctrl.o \
+ $(OBJS)\widgets_slider.o \
+ $(OBJS)\widgets_spinbtn.o \
+ $(OBJS)\widgets_static.o \
+@@ -298,6 +299,9 @@
+ $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+ $(OBJS)\widgets_radiobox.o: ./radiobox.cpp
++ $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
++
++$(OBJS)\widgets_searchctrl.o: ./searchctrl.cpp
+ $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+ $(OBJS)\widgets_slider.o: ./slider.cpp
+Index: wxWidgets/samples/widgets/makefile.unx
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/samples/widgets/makefile.unx,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- wxWidgets/samples/widgets/makefile.unx 2006/11/10 02:19:10 1.4
++++ wxWidgets/samples/widgets/makefile.unx 2006/12/11 06:18:30 1.5
+@@ -55,6 +55,7 @@
+ widgets_notebook.o \
+ widgets_odcombobox.o \
+ widgets_radiobox.o \
++ widgets_searchctrl.o \
+ widgets_slider.o \
+ widgets_spinbtn.o \
+ widgets_static.o \
+@@ -128,6 +129,9 @@
+ $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+ widgets_radiobox.o: ./radiobox.cpp
++ $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
++
++widgets_searchctrl.o: ./searchctrl.cpp
+ $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $(CPPDEPS) $<
+
+ widgets_slider.o: ./slider.cpp
+Index: wxWidgets/samples/widgets/makefile.vc
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/samples/widgets/makefile.vc,v
+retrieving revision 1.43
+retrieving revision 1.44
+diff -u -r1.43 -r1.44
+--- wxWidgets/samples/widgets/makefile.vc 2006/11/10 02:19:09 1.43
++++ wxWidgets/samples/widgets/makefile.vc 2006/12/11 06:18:30 1.44
+@@ -43,6 +43,7 @@
+ $(OBJS)\widgets_notebook.obj \
+ $(OBJS)\widgets_odcombobox.obj \
+ $(OBJS)\widgets_radiobox.obj \
++ $(OBJS)\widgets_searchctrl.obj \
+ $(OBJS)\widgets_slider.obj \
+ $(OBJS)\widgets_spinbtn.obj \
+ $(OBJS)\widgets_static.obj \
+@@ -380,6 +381,9 @@
+ $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+ $(OBJS)\widgets_radiobox.obj: .\radiobox.cpp
++ $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
++
++$(OBJS)\widgets_searchctrl.obj: .\searchctrl.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) $**
+
+ $(OBJS)\widgets_slider.obj: .\slider.cpp
+Index: wxWidgets/samples/widgets/makefile.wat
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/samples/widgets/makefile.wat,v
+retrieving revision 1.37
+retrieving revision 1.38
+diff -u -r1.37 -r1.38
+--- wxWidgets/samples/widgets/makefile.wat 2006/11/10 02:19:09 1.37
++++ wxWidgets/samples/widgets/makefile.wat 2006/12/11 06:18:29 1.38
+@@ -254,6 +254,7 @@
+ $(OBJS)\widgets_notebook.obj &
+ $(OBJS)\widgets_odcombobox.obj &
+ $(OBJS)\widgets_radiobox.obj &
++ $(OBJS)\widgets_searchctrl.obj &
+ $(OBJS)\widgets_slider.obj &
+ $(OBJS)\widgets_spinbtn.obj &
+ $(OBJS)\widgets_static.obj &
+@@ -336,6 +337,9 @@
+ $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+ $(OBJS)\widgets_radiobox.obj : .AUTODEPEND .\radiobox.cpp
++ $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
++
++$(OBJS)\widgets_searchctrl.obj : .AUTODEPEND .\searchctrl.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $<
+
+ $(OBJS)\widgets_slider.obj : .AUTODEPEND .\slider.cpp
+Index: wxWidgets/samples/widgets/searchctrl.cpp
+===================================================================
+RCS file: searchctrl.cpp
+diff -N searchctrl.cpp
+--- /dev/null Thu Dec 14 21:47:28 2006
++++ wxWidgets/samples/widgets/searchctrl.cpp Thu Dec 14 21:47:29 2006
+@@ -0,0 +1,225 @@
++/////////////////////////////////////////////////////////////////////////////
++// Program: wxWidgets Widgets Sample
++// Name: searchctrl.cpp
++// Purpose: Shows wxSearchCtrl
++// Author: Robin Dunn
++// Created: 9-Dec-2006
++// Id: $Id: searchctrl.cpp,v 1.4 2006/12/11 13:48:18 VZ Exp $
++// Copyright: (c) 2006
++// License: wxWindows license
++/////////////////////////////////////////////////////////////////////////////
++
++// ============================================================================
++// declarations
++// ============================================================================
++
++// ----------------------------------------------------------------------------
++// headers
++// ----------------------------------------------------------------------------
++
++// for compilers that support precompilation, includes "wx/wx.h".
++#include "wx/wxprec.h"
++
++#ifdef __BORLANDC__
++ #pragma hdrstop
++#endif
++
++#if wxUSE_SEARCHCTRL
++
++// for all others, include the necessary headers
++#ifndef WX_PRECOMP
++ #include "wx/app.h"
++ #include "wx/log.h"
++ #include "wx/radiobox.h"
++ #include "wx/statbox.h"
++#endif
++
++#include "wx/artprov.h"
++#include "wx/sizer.h"
++#include "wx/stattext.h"
++#include "wx/checkbox.h"
++#include "wx/menu.h"
++
++#include "wx/srchctrl.h"
++
++#include "widgets.h"
++
++#include "icons/text.xpm"
++
++// ----------------------------------------------------------------------------
++// constants
++// ----------------------------------------------------------------------------
++
++// control ids
++enum
++{
++ ID_SEARCH_CB = wxID_HIGHEST,
++ ID_CANCEL_CB,
++ ID_MENU_CB,
++
++ ID_SEARCHMENU
++};
++
++
++// ----------------------------------------------------------------------------
++// ColourPickerWidgetsPage
++// ----------------------------------------------------------------------------
++
++class SearchCtrlWidgetsPage : public WidgetsPage
++{
++public:
++ SearchCtrlWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
++ virtual ~SearchCtrlWidgetsPage(){};
++
++ virtual wxControl *GetWidget() const { return m_srchCtrl; }
++ virtual void RecreateWidget() { CreateControl(); }
++
++ // lazy creation of the content
++ virtual void CreateContent();
++
++protected:
++
++ void OnToggleSearchButton(wxCommandEvent&);
++ void OnToggleCancelButton(wxCommandEvent&);
++ void OnToggleSearchMenu(wxCommandEvent&);
++
++ wxMenu* CreateTestMenu();
++
++ // (re)create the control
++ void CreateControl();
++
++ // reset the control parameters
++ void Reset();
++
++
++ wxSearchCtrl* m_srchCtrl;
++ wxCheckBox* m_searchBtnCheck;
++ wxCheckBox* m_cancelBtnCheck;
++ wxCheckBox* m_menuBtnCheck;
++
++private:
++ DECLARE_EVENT_TABLE()
++ DECLARE_WIDGETS_PAGE(SearchCtrlWidgetsPage)
++};
++
++// ----------------------------------------------------------------------------
++// event tables
++// ----------------------------------------------------------------------------
++
++BEGIN_EVENT_TABLE(SearchCtrlWidgetsPage, WidgetsPage)
++ EVT_CHECKBOX(ID_SEARCH_CB, SearchCtrlWidgetsPage::OnToggleSearchButton)
++ EVT_CHECKBOX(ID_CANCEL_CB, SearchCtrlWidgetsPage::OnToggleCancelButton)
++ EVT_CHECKBOX(ID_MENU_CB, SearchCtrlWidgetsPage::OnToggleSearchMenu)
++END_EVENT_TABLE()
++
++// ============================================================================
++// implementation
++// ============================================================================
++
++#if defined(__WXMAC__)
++ #define FAMILY_CTRLS NATIVE_CTRLS
++#else
++ #define FAMILY_CTRLS GENERIC_CTRLS
++#endif
++
++IMPLEMENT_WIDGETS_PAGE(SearchCtrlWidgetsPage, _T("SearchCtrl"),
++ FAMILY_CTRLS | EDITABLE_CTRLS | ALL_CTRLS);
++
++SearchCtrlWidgetsPage::SearchCtrlWidgetsPage(WidgetsBookCtrl *book,
++ wxImageList *imaglist)
++ : WidgetsPage(book, imaglist, text_xpm)
++{
++}
++
++void SearchCtrlWidgetsPage::CreateContent()
++{
++ m_srchCtrl = NULL;
++
++ Reset();
++ CreateControl();
++
++
++ wxSizer* box = new wxStaticBoxSizer(
++ new wxStaticBox(this, -1, wxT("Options")),
++ wxVERTICAL);
++
++ m_searchBtnCheck = new wxCheckBox(this, ID_SEARCH_CB, wxT("Search button"));
++ m_cancelBtnCheck = new wxCheckBox(this, ID_CANCEL_CB, wxT("Cancel button"));
++ m_menuBtnCheck = new wxCheckBox(this, ID_MENU_CB, wxT("Search menu"));
++
++ m_searchBtnCheck->SetValue(true);
++
++ box->Add(m_searchBtnCheck, 0, wxALL, 5);
++ box->Add(m_cancelBtnCheck, 0, wxALL, 5);
++ box->Add(m_menuBtnCheck, 0, wxALL, 5);
++
++ wxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
++ sizer->Add(box, 0, wxALL|wxEXPAND, 15);
++ sizer->Add(m_srchCtrl, 0, wxALL|wxALIGN_CENTER, 15);
++
++ SetSizer(sizer);
++}
++
++void SearchCtrlWidgetsPage::CreateControl()
++{
++ if (m_srchCtrl)
++ m_srchCtrl->Destroy();
++
++ int style = 0;
++
++ m_srchCtrl = new wxSearchCtrl(this, -1, wxEmptyString, wxDefaultPosition,
++ wxSize(150, -1), style);
++}
++
++void SearchCtrlWidgetsPage::Reset()
++{
++}
++
++
++wxMenu* SearchCtrlWidgetsPage::CreateTestMenu()
++{
++ wxMenu* menu = new wxMenu;
++ const int SEARCH_MENU_SIZE = 5;
++ wxMenuItem* menuItem = menu->Append(wxID_ANY, _T("Recent Searches"), wxT(""), wxITEM_NORMAL);
++ menuItem->Enable(false);
++ for ( int i = 0; i < SEARCH_MENU_SIZE; i++ )
++ {
++ wxString itemText = wxString::Format(wxT("item %i"),i);
++ wxString tipText = wxString::Format(wxT("tip %i"),i);
++ menu->Append(ID_SEARCHMENU+i, itemText, tipText, wxITEM_NORMAL);
++ }
++// target->Connect(
++// ID_SEARCHMENU,
++// ID_SEARCHMENU+SEARCH_MENU_SIZE,
++// wxEVT_COMMAND_MENU_SELECTED,
++// wxCommandEventHandler(MySearchCtrl::OnSearchMenu)
++// );
++ return menu;
++}
++
++
++// ----------------------------------------------------------------------------
++// event handlers
++// ----------------------------------------------------------------------------
++
++void SearchCtrlWidgetsPage::OnToggleSearchButton(wxCommandEvent&)
++{
++ m_srchCtrl->ShowSearchButton( m_searchBtnCheck->GetValue() );
++}
++
++void SearchCtrlWidgetsPage::OnToggleCancelButton(wxCommandEvent&)
++{
++ m_srchCtrl->ShowCancelButton( m_cancelBtnCheck->GetValue() );
++
++}
++
++void SearchCtrlWidgetsPage::OnToggleSearchMenu(wxCommandEvent&)
++{
++ if ( m_menuBtnCheck->GetValue() )
++ m_srchCtrl->SetMenu( CreateTestMenu() );
++ else
++ m_srchCtrl->SetMenu(NULL);
++}
++
++
++#endif // wxUSE_SEARCHCTRL
+Index: wxWidgets/samples/widgets/widgets.bkl
+===================================================================
+RCS file: /pack/cvsroots/wxwidgets/wxWidgets/samples/widgets/widgets.bkl,v
+retrieving revision 1.14
+retrieving revision 1.16
+diff -u -r1.14 -r1.16
+--- wxWidgets/samples/widgets/widgets.bkl 2006/10/05 10:20:22 1.14
++++ wxWidgets/samples/widgets/widgets.bkl 2006/12/11 13:31:53 1.16
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!-- $Id: widgets.bkl,v 1.14 2006/10/05 10:20:22 ABX Exp $ -->
++<!-- $Id: widgets.bkl,v 1.16 2006/12/11 13:31:53 VZ Exp $ -->
+ <makefile>
+
+ <include file="../../build/bakefiles/common_samples.bkl"/>
+@@ -22,6 +22,7 @@
+ notebook.cpp
+ odcombobox.cpp
+ radiobox.cpp
++ searchctrl.cpp
+ slider.cpp
+ spinbtn.cpp
+ static.cpp
+Index: wxWidgets/src/common/srchcmn.cpp
+===================================================================
+RCS file: srchcmn.cpp
+diff -N srchcmn.cpp
+--- /dev/null Thu Dec 14 21:47:38 2006
++++ wxWidgets/src/common/srchcmn.cpp Thu Dec 14 21:47:38 2006
+@@ -0,0 +1,42 @@
++/////////////////////////////////////////////////////////////////////////////
++// Name: src/common/srchcmn.cpp
++// Purpose: common (to all ports) bits of wxSearchCtrl
++// Author: Robin Dunn
++// Modified by:
++// Created: 19-Dec-2006
++// RCS-ID: $Id: srchcmn.cpp,v 1.2 2006/12/11 20:32:03 KO Exp $
++// Copyright: (c) wxWidgets team
++// Licence: wxWindows licence
++/////////////////////////////////////////////////////////////////////////////
++
++// ============================================================================
++// declarations
++// ============================================================================
++
++// ----------------------------------------------------------------------------
++// headers
++// ----------------------------------------------------------------------------
++
++// For compilers that support precompilation, includes "wx.h".
++#include "wx/wxprec.h"
++
++#ifdef __BORLANDC__
++ #pragma hdrstop
++#endif
++
++#if wxUSE_SEARCHCTRL
++
++#include "wx/srchctrl.h"
++
++#ifndef WX_PRECOMP
++#endif
++
++// ----------------------------------------------------------------------------
++
++const wxChar wxSearchCtrlNameStr[] = wxT("searchCtrl");
++
++DEFINE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN)
++DEFINE_EVENT_TYPE(wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN)
++
++
++#endif // wxUSE_SEARCHCTRL
+Index: wxWidgets/src/generic/srchctlg.cpp
+===================================================================
+RCS file: srchctlg.cpp
+diff -N srchctlg.cpp
+--- /dev/null Thu Dec 14 21:47:42 2006
++++ wxWidgets/src/generic/srchctlg.cpp Thu Dec 14 21:47:44 2006
+@@ -0,0 +1,1079 @@
++///////////////////////////////////////////////////////////////////////////////
++// Name: src/generic/srchctlg.cpp
++// Purpose: implements wxSearchCtrl as a composite control
++// Author: Vince Harron
++// Created: 2006-02-19
++// RCS-ID: $Id: srchctlg.cpp,v 1.10 2006/12/12 00:53:47 RD Exp $
++// Copyright: Vince Harron
++// License: wxWindows licence
++///////////////////////////////////////////////////////////////////////////////
++
++// For compilers that support precompilation, includes "wx.h".
++#include "wx/wxprec.h"
++
++#ifdef __BORLANDC__
++ #pragma hdrstop
++#endif
++
++#if wxUSE_SEARCHCTRL
++
++#include "wx/srchctrl.h"
++
++#ifndef WX_PRECOMP
++ #include "wx/button.h"
++ #include "wx/dcclient.h"
++ #include "wx/menu.h"
++ #include "wx/dcmemory.h"
++#endif //WX_PRECOMP
++
++#if !wxUSE_NATIVE_SEARCH_CONTROL
++
++#include "wx/image.h"
++
++#define WXMAX(a,b) ((a)>(b)?(a):(b))
++
++// ----------------------------------------------------------------------------
++// constants
++// ----------------------------------------------------------------------------
++
++// the margin between the text control and the search/cancel buttons
++static const wxCoord MARGIN = 2;
++
++// border around all controls to compensate for wxSIMPLE_BORDER
++#if defined(__WXMSW__)
++static const wxCoord BORDER = 0;
++static const wxCoord ICON_MARGIN = 2;
++static const wxCoord ICON_OFFSET = 2;
++#else
++static const wxCoord BORDER = 2;
++static const wxCoord ICON_MARGIN = 0;
++static const wxCoord ICON_OFFSET = 0;
++#endif
++
++// ----------------------------------------------------------------------------
++// wxSearchTextCtrl: text control used by search control
++// ----------------------------------------------------------------------------
++
++class wxSearchTextCtrl : public wxTextCtrl
++{
++public:
++ wxSearchTextCtrl(wxSearchCtrl *search, const wxString& value, int style)
++ : wxTextCtrl(search, wxID_ANY, value, wxDefaultPosition, wxDefaultSize,
++ style | wxNO_BORDER)
++ {
++ m_search = search;
++
++ // remove the default minsize, the searchctrl will have one instead
++ SetSizeHints(wxDefaultCoord,wxDefaultCoord);
++ }
++
++protected:
++ void OnText(wxCommandEvent& eventText)
++ {
++ wxCommandEvent event(eventText);
++ event.SetEventObject(m_search);
++ event.SetId(m_search->GetId());
++
++ m_search->GetEventHandler()->ProcessEvent(event);
++ }
++
++ void OnTextUrl(wxTextUrlEvent& eventText)
++ {
++ // copy constructor is disabled for some reason?
++ //wxTextUrlEvent event(eventText);
++ wxTextUrlEvent event(
++ m_search->GetId(),
++ eventText.GetMouseEvent(),
++ eventText.GetURLStart(),
++ eventText.GetURLEnd()
++ );
++ event.SetEventObject(m_search);
++
++ m_search->GetEventHandler()->ProcessEvent(event);
++ }
++
++private:
++ wxSearchCtrl* m_search;
++
++ DECLARE_EVENT_TABLE()
++};
++
++BEGIN_EVENT_TABLE(wxSearchTextCtrl, wxTextCtrl)
++ EVT_TEXT(wxID_ANY, wxSearchTextCtrl::OnText)
++ EVT_TEXT_ENTER(wxID_ANY, wxSearchTextCtrl::OnText)
++ EVT_TEXT_URL(wxID_ANY, wxSearchTextCtrl::OnTextUrl)
++ EVT_TEXT_MAXLEN(wxID_ANY, wxSearchTextCtrl::OnText)
++END_EVENT_TABLE()
++
++// ----------------------------------------------------------------------------
++// wxSearchButton: search button used by search control
++// ----------------------------------------------------------------------------
++
++class wxSearchButton : public wxControl
++{
++public:
++ wxSearchButton(wxSearchCtrl *search, int eventType, const wxBitmap& bmp)
++ : wxControl(search, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER),
++ m_search(search),
++ m_eventType(eventType),
++ m_bmp(bmp)
++ { }
++
++ void SetBitmapLabel(const wxBitmap& label) { m_bmp = label; }
++
++
++protected:
++ wxSize DoGetBestSize() const
++ {
++ return wxSize(m_bmp.GetWidth(), m_bmp.GetHeight());
++ }
++
++ void OnLeftUp(wxMouseEvent&)
++ {
++ wxCommandEvent event(m_eventType, m_search->GetId());
++ event.SetEventObject(m_search);
++
++ GetEventHandler()->ProcessEvent(event);
++
++ m_search->SetFocus();
++
++ if ( m_eventType == wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN )
++ {
++ // this happens automatically, just like on Mac OS X
++ m_search->PopupSearchMenu();
++ }
++ }
++
++ void OnPaint(wxPaintEvent&)
++ {
++ wxPaintDC dc(this);
++ dc.DrawBitmap(m_bmp, 0,0, true);
++ }
++
++
++private:
++ wxSearchCtrl *m_search;
++ wxEventType m_eventType;
++ wxBitmap m_bmp;
++
++ DECLARE_EVENT_TABLE()
++};
++
++BEGIN_EVENT_TABLE(wxSearchButton, wxControl)
++ EVT_LEFT_UP(wxSearchButton::OnLeftUp)
++ EVT_PAINT(wxSearchButton::OnPaint)
++END_EVENT_TABLE()
++
++BEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
++ EVT_SEARCHCTRL_SEARCH_BTN(wxID_ANY, wxSearchCtrl::OnSearchButton)
++ EVT_SET_FOCUS(wxSearchCtrl::OnSetFocus)
++ EVT_SIZE(wxSearchCtrl::OnSize)
++END_EVENT_TABLE()
++
++IMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxSearchCtrlBase)
++
++// ============================================================================
++// implementation
++// ============================================================================
++
++// ----------------------------------------------------------------------------
++// wxSearchCtrl creation
++// ----------------------------------------------------------------------------
++
++// creation
++// --------
++
++wxSearchCtrl::wxSearchCtrl()
++{
++ Init();
++}
++
++wxSearchCtrl::wxSearchCtrl(wxWindow *parent, wxWindowID id,
++ const wxString& value,
++ const wxPoint& pos,
++ const wxSize& size,
++ long style,
++ const wxValidator& validator,
++ const wxString& name)
++{
++ Init();
++
++ Create(parent, id, value, pos, size, style, validator, name);
++}
++
++void wxSearchCtrl::Init()
++{
++ m_text = 0;
++ m_searchButton = 0;
++ m_cancelButton = 0;
++ m_menu = 0;
++
++ m_searchButtonVisible = true;
++ m_cancelButtonVisible = false;
++
++ m_searchMenuBitmapUser = false;
++ m_searchBitmapUser = false;
++ m_cancelBitmapUser = false;
++}
++
++bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
++ const wxString& value,
++ const wxPoint& pos,
++ const wxSize& size,
++ long style,
++ const wxValidator& validator,
++ const wxString& name)
++{
++ if ( !wxTextCtrlBase::Create(parent, id, pos, size, wxSIMPLE_BORDER | style, validator, name) )
++ {
++ return false;
++ }
++
++ m_text = new wxSearchTextCtrl(this, value, style & ~wxBORDER_MASK);
++
++ wxSize sizeText = m_text->GetBestSize();
++
++ m_searchButton = new wxSearchButton(this,wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN,m_searchBitmap);
++ m_cancelButton = new wxSearchButton(this,wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN,m_cancelBitmap);
++
++ SetForegroundColour( m_text->GetForegroundColour() );
++ m_searchButton->SetForegroundColour( m_text->GetForegroundColour() );
++ m_cancelButton->SetForegroundColour( m_text->GetForegroundColour() );
++
++ SetBackgroundColour( m_text->GetBackgroundColour() );
++ m_searchButton->SetBackgroundColour( m_text->GetBackgroundColour() );
++ m_cancelButton->SetBackgroundColour( m_text->GetBackgroundColour() );
++
++ RecalcBitmaps();
++
++ SetInitialSize(size);
++ Move(pos);
++ return true;
++}
++
++wxSearchCtrl::~wxSearchCtrl()
++{
++ delete m_text;
++ delete m_searchButton;
++ delete m_cancelButton;
++ delete m_menu;
++}
++
++
++// search control specific interfaces
++void wxSearchCtrl::SetMenu( wxMenu* menu )
++{
++ if ( menu == m_menu )
++ {
++ // no change
++ return;
++ }
++ bool hadMenu = (m_menu != NULL);
++ delete m_menu;
++ m_menu = menu;
++
++ if ( m_menu && !hadMenu )
++ {
++ m_searchButton->SetBitmapLabel(m_searchMenuBitmap);
++ m_searchButton->Refresh();
++ if ( !m_searchButtonVisible )
++ {
++ // adding the menu will force the search button to be visible
++ wxRect rect = GetRect();
++ LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());
++ }
++ }
++ else if ( !m_menu && hadMenu )
++ {
++ m_searchButton->SetBitmapLabel(m_searchBitmap);
++ if ( m_searchButtonVisible )
++ {
++ m_searchButton->Refresh();
++ }
++ else
++ {
++ wxRect rect = GetRect();
++ LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());
++ }
++ }
++}
++
++wxMenu* wxSearchCtrl::GetMenu()
++{
++ return m_menu;
++}
++
++void wxSearchCtrl::ShowSearchButton( bool show )
++{
++ if ( m_searchButtonVisible == show )
++ {
++ // no change
++ return;
++ }
++ m_searchButtonVisible = show;
++ if ( m_searchButtonVisible )
++ {
++ RecalcBitmaps();
++ }
++
++ wxRect rect = GetRect();
++ LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());
++}
++
++bool wxSearchCtrl::IsSearchButtonVisible() const
++{
++ return m_searchButtonVisible;
++}
++
++
++void wxSearchCtrl::ShowCancelButton( bool show )
++{
++ if ( m_cancelButtonVisible == show )
++ {
++ // no change
++ return;
++ }
++ m_cancelButtonVisible = show;
++
++ wxRect rect = GetRect();
++ LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());
++}
++
++bool wxSearchCtrl::IsCancelButtonVisible() const
++{
++ return m_cancelButtonVisible;
++}
++
++
++// ----------------------------------------------------------------------------
++// geometry
++// ----------------------------------------------------------------------------
++
++wxSize wxSearchCtrl::DoGetBestSize() const
++{
++ wxSize sizeText = m_text->GetBestSize();
++ wxSize sizeSearch(0,0);
++ wxSize sizeCancel(0,0);
++ int searchMargin = 0;
++ int cancelMargin = 0;
++ if ( m_searchButtonVisible || m_menu )
++ {
++ sizeSearch = m_searchButton->GetBestSize();
++ searchMargin = MARGIN;
++ }
++ if ( m_cancelButtonVisible )
++ {
++ sizeCancel = m_cancelButton->GetBestSize();
++ cancelMargin = MARGIN;
++ }
++
++ int horizontalBorder = 1 + ( sizeText.y - sizeText.y * 14 / 21 ) / 2;
++
++ // buttons are square and equal to the height of the text control
++ int height = sizeText.y;
++ return wxSize(sizeSearch.x + searchMargin + sizeText.x + cancelMargin + sizeCancel.x + 2*horizontalBorder,
++ height + 2*BORDER);
++}
++
++void wxSearchCtrl::DoMoveWindow(int x, int y, int width, int height)
++{
++ wxSearchCtrlBase::DoMoveWindow(x, y, width, height);
++
++ LayoutControls(0, 0, width, height);
++}
++
++void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
++{
++ if ( !m_text )
++ return;
++
++ wxSize sizeText = m_text->GetBestSize();
++ // make room for the search menu & clear button
++ int horizontalBorder = 1 + ( sizeText.y - sizeText.y * 14 / 21 ) / 2;
++ x += horizontalBorder;
++ y += BORDER;
++ width -= horizontalBorder*2;
++ height -= BORDER*2;
++
++ wxSize sizeSearch(0,0);
++ wxSize sizeCancel(0,0);
++ int searchMargin = 0;
++ int cancelMargin = 0;
++ if ( m_searchButtonVisible || m_menu )
++ {
++ sizeSearch = m_searchButton->GetBestSize();
++ searchMargin = MARGIN;
++ }
++ if ( m_cancelButtonVisible )
++ {
++ sizeCancel = m_cancelButton->GetBestSize();
++ cancelMargin = MARGIN;
++ }
++ m_searchButton->Show( m_searchButtonVisible || m_menu );
++ m_cancelButton->Show( m_cancelButtonVisible );
++
++ if ( sizeSearch.x + sizeCancel.x > width )
++ {
++ sizeSearch.x = width/2;
++ sizeCancel.x = width/2;
++ searchMargin = 0;
++ cancelMargin = 0;
++ }
++ wxCoord textWidth = width - sizeSearch.x - sizeCancel.x - searchMargin - cancelMargin;
++
++ // position the subcontrols inside the client area
++
++ m_searchButton->SetSize(x, y + ICON_OFFSET, sizeSearch.x, height);
++ m_text->SetSize(x + sizeSearch.x + searchMargin, y + ICON_OFFSET, textWidth, height);
++ m_cancelButton->SetSize(x + sizeSearch.x + searchMargin + textWidth + cancelMargin,
++ y + ICON_OFFSET, sizeCancel.x, height);
++}
++
++
++// accessors
++// ---------
++
++wxString wxSearchCtrl::GetValue() const
++{
++ return m_text->GetValue();
++}
++void wxSearchCtrl::SetValue(const wxString& value)
++{
++ m_text->SetValue(value);
++}
++
++wxString wxSearchCtrl::GetRange(long from, long to) const
++{
++ return m_text->GetRange(from, to);
++}
++
++int wxSearchCtrl::GetLineLength(long lineNo) const
++{
++ return m_text->GetLineLength(lineNo);
++}
++wxString wxSearchCtrl::GetLineText(long lineNo) const
++{
++ return m_text->GetLineText(lineNo);
++}
++int wxSearchCtrl::GetNumberOfLines() const
++{
++ return m_text->GetNumberOfLines();
++}
++
++bool wxSearchCtrl::IsModified() const
++{
++ return m_text->IsModified();
++}
++bool wxSearchCtrl::IsEditable() const
++{
++ return m_text->IsEditable();
++}
++
++// more readable flag testing methods
++bool wxSearchCtrl::IsSingleLine() const
++{
++ return m_text->IsSingleLine();
++}
++bool wxSearchCtrl::IsMultiLine() const
++{
++ return m_text->IsMultiLine();
++}
++
++// If the return values from and to are the same, there is no selection.
++void wxSearchCtrl::GetSelection(long* from, long* to) const
++{
++ m_text->GetSelection(from, to);
++}
++
++wxString wxSearchCtrl::GetStringSelection() const
++{
++ return m_text->GetStringSelection();
++}
++
++// operations
++// ----------
++
++// editing
++void wxSearchCtrl::Clear()
++{
++ m_text->Clear();
++}
++void wxSearchCtrl::Replace(long from, long to, const wxString& value)
++{
++ m_text->Replace(from, to, value);
++}
++void wxSearchCtrl::Remove(long from, long to)
++{
++ m_text->Remove(from, to);
++}
++
++// load/save the controls contents from/to the file
++bool wxSearchCtrl::LoadFile(const wxString& file)
++{
++ return m_text->LoadFile(file);
++}
++bool wxSearchCtrl::SaveFile(const wxString& file)
++{
++ return m_text->SaveFile(file);
++}
++
++// sets/clears the dirty flag
++void wxSearchCtrl::MarkDirty()
++{
++ m_text->MarkDirty();
++}
++void wxSearchCtrl::DiscardEdits()
++{
++ m_text->DiscardEdits();
++}
++
++// set the max number of characters which may be entered in a single line
++// text control
++void wxSearchCtrl::SetMaxLength(unsigned long len)
++{
++ m_text->SetMaxLength(len);
++}
++
++// writing text inserts it at the current position, appending always
++// inserts it at the end
++void wxSearchCtrl::WriteText(const wxString& text)
++{
++ m_text->WriteText(text);
++}
++void wxSearchCtrl::AppendText(const wxString& text)
++{
++ m_text->AppendText(text);
++}
++
++// insert the character which would have resulted from this key event,
++// return true if anything has been inserted
++bool wxSearchCtrl::EmulateKeyPress(const wxKeyEvent& event)
++{
++ return m_text->EmulateKeyPress(event);
++}
++
++// text control under some platforms supports the text styles: these
++// methods allow to apply the given text style to the given selection or to
++// set/get the style which will be used for all appended text
++bool wxSearchCtrl::SetStyle(long start, long end, const wxTextAttr& style)
++{
++ return m_text->SetStyle(start, end, style);
++}
++bool wxSearchCtrl::GetStyle(long position, wxTextAttr& style)
++{
++ return m_text->GetStyle(position, style);
++}
++bool wxSearchCtrl::SetDefaultStyle(const wxTextAttr& style)
++{
++ return m_text->SetDefaultStyle(style);
++}
++const wxTextAttr& wxSearchCtrl::GetDefaultStyle() const
++{
++ return m_text->GetDefaultStyle();
++}
++
++// translate between the position (which is just an index in the text ctrl
++// considering all its contents as a single strings) and (x, y) coordinates
++// which represent column and line.
++long wxSearchCtrl::XYToPosition(long x, long y) const
++{
++ return m_text->XYToPosition(x, y);
++}
++bool wxSearchCtrl::PositionToXY(long pos, long *x, long *y) const
++{
++ return m_text->PositionToXY(pos, x, y);
++}
++
++void wxSearchCtrl::ShowPosition(long pos)
++{
++ m_text->ShowPosition(pos);
++}
++
++// find the character at position given in pixels
++//
++// NB: pt is in device coords (not adjusted for the client area origin nor
++// scrolling)
++wxTextCtrlHitTestResult wxSearchCtrl::HitTest(const wxPoint& pt, long *pos) const
++{
++ return m_text->HitTest(pt, pos);
++}
++wxTextCtrlHitTestResult wxSearchCtrl::HitTest(const wxPoint& pt,
++ wxTextCoord *col,
++ wxTextCoord *row) const
++{
++ return m_text->HitTest(pt, col, row);
++}
++
++// Clipboard operations
++void wxSearchCtrl::Copy()
++{
++ m_text->Copy();
++}
++void wxSearchCtrl::Cut()
++{
++ m_text->Cut();
++}
++void wxSearchCtrl::Paste()
++{
++ m_text->Paste();
++}
++
++bool wxSearchCtrl::CanCopy() const
++{
++ return m_text->CanCopy();
++}
++bool wxSearchCtrl::CanCut() const
++{
++ return m_text->CanCut();
++}
++bool wxSearchCtrl::CanPaste() const
++{
++ return m_text->CanPaste();
++}
++
++// Undo/redo
++void wxSearchCtrl::Undo()
++{
++ m_text->Undo();
++}
++void wxSearchCtrl::Redo()
++{
++ m_text->Redo();
++}
++
++bool wxSearchCtrl::CanUndo() const
++{
++ return m_text->CanUndo();
++}
++bool wxSearchCtrl::CanRedo() const
++{
++ return m_text->CanRedo();
++}
++
++// Insertion point
++void wxSearchCtrl::SetInsertionPoint(long pos)
++{
++ m_text->SetInsertionPoint(pos);
++}
++void wxSearchCtrl::SetInsertionPointEnd()
++{
++ m_text->SetInsertionPointEnd();
++}
++long wxSearchCtrl::GetInsertionPoint() const
++{
++ return m_text->GetInsertionPoint();
++}
++wxTextPos wxSearchCtrl::GetLastPosition() const
++{
++ return m_text->GetLastPosition();
++}
++
++void wxSearchCtrl::SetSelection(long from, long to)
++{
++ m_text->SetSelection(from, to);
++}
++void wxSearchCtrl::SelectAll()
++{
++ m_text->SelectAll();
++}
++
++void wxSearchCtrl::SetEditable(bool editable)
++{
++ m_text->SetEditable(editable);
++}
++
++bool wxSearchCtrl::SetFont(const wxFont& font)
++{
++ bool result = wxSearchCtrlBase::SetFont(font);
++ if ( result && m_text )
++ {
++ result = m_text->SetFont(font);
++ }
++ RecalcBitmaps();
++ return result;
++}
++
++// search control generic only
++void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap )
++{
++ m_searchBitmap = bitmap;
++ m_searchBitmapUser = bitmap.Ok();
++ if ( m_searchBitmapUser )
++ {
++ if ( m_searchButton && !m_menu )
++ {
++ m_searchButton->SetBitmapLabel( m_searchBitmap );
++ }
++ }
++ else
++ {
++ // the user bitmap was just cleared, generate one
++ RecalcBitmaps();
++ }
++}
++
++void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap )
++{
++ m_searchMenuBitmap = bitmap;
++ m_searchMenuBitmapUser = bitmap.Ok();
++ if ( m_searchMenuBitmapUser )
++ {
++ if ( m_searchButton && m_menu )
++ {
++ m_searchButton->SetBitmapLabel( m_searchMenuBitmap );
++ }
++ }
++ else
++ {
++ // the user bitmap was just cleared, generate one
++ RecalcBitmaps();
++ }
++}
++
++void wxSearchCtrl::SetCancelBitmap( const wxBitmap& bitmap )
++{
++ m_cancelBitmap = bitmap;
++ m_cancelBitmapUser = bitmap.Ok();
++ if ( m_cancelBitmapUser )
++ {
++ if ( m_cancelButton )
++ {
++ m_cancelButton->SetBitmapLabel( m_cancelBitmap );
++ }
++ }
++ else
++ {
++ // the user bitmap was just cleared, generate one
++ RecalcBitmaps();
++ }
++}
++
++#if 0
++
++// override streambuf method
++#if wxHAS_TEXT_WINDOW_STREAM
++int overflow(int i);
++#endif // wxHAS_TEXT_WINDOW_STREAM
++
++// stream-like insertion operators: these are always available, whether we
++// were, or not, compiled with streambuf support
++wxTextCtrl& operator<<(const wxString& s);
++wxTextCtrl& operator<<(int i);
++wxTextCtrl& operator<<(long i);
++wxTextCtrl& operator<<(float f);
++wxTextCtrl& operator<<(double d);
++wxTextCtrl& operator<<(const wxChar c);
++#endif
++
++void wxSearchCtrl::DoSetValue(const wxString& value, int flags)
++{
++ m_text->ChangeValue( value );
++ if ( flags & SetValue_SendEvent )
++ SendTextUpdatedEvent();
++}
++
++// do the window-specific processing after processing the update event
++void wxSearchCtrl::DoUpdateWindowUI(wxUpdateUIEvent& event)
++{
++ wxSearchCtrlBase::DoUpdateWindowUI(event);
++}
++
++bool wxSearchCtrl::ShouldInheritColours() const
++{
++ return true;
++}
++
++// icons are rendered at 3-8 times larger than necessary and downscaled for
++// antialiasing
++static int GetMultiplier()
++{
++#ifdef __WXWINCE__
++ // speed up bitmap generation by using a small bitmap
++ return 3;
++#else
++ int depth = ::wxDisplayDepth();
++
++ if ( depth >= 24 )
++ {
++ return 8;
++ }
++ return 6;
++#endif
++}
++
++wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop )
++{
++ wxColour bg = GetBackgroundColour();
++ wxColour fg = GetForegroundColour();
++
++ //===============================================================================
++ // begin drawing code
++ //===============================================================================
++ // image stats
++
++ // force width:height ratio
++ if ( 14*x > y*20 )
++ {
++ // x is too big
++ x = y*20/14;
++ }
++ else
++ {
++ // y is too big
++ y = x*14/20;
++ }
++
++ // glass 11x11, top left corner
++ // handle (9,9)-(13,13)
++ // drop (13,16)-(19,6)-(16,9)
++
++ int multiplier = GetMultiplier();
++ int penWidth = multiplier * 2;
++
++ penWidth = penWidth * x / 20;
++
++ wxBitmap bitmap( multiplier*x, multiplier*y );
++ wxMemoryDC mem;
++ mem.SelectObject(bitmap);
++
++ // clear background
++ mem.SetBrush( wxBrush(bg) );
++ mem.SetPen( wxPen(bg) );
++ mem.DrawRectangle(0,0,bitmap.GetWidth(),bitmap.GetHeight());
++
++ // draw drop glass
++ mem.SetBrush( wxBrush(fg) );
++ mem.SetPen( wxPen(fg) );
++ int glassBase = 5 * x / 20;
++ int glassFactor = 2*glassBase + 1;
++ int radius = multiplier*glassFactor/2;
++ mem.DrawCircle(radius,radius,radius);
++ mem.SetBrush( wxBrush(bg) );
++ mem.SetPen( wxPen(bg) );
++ mem.DrawCircle(radius,radius,radius-penWidth);
++
++ // draw handle
++ int lineStart = radius + (radius-penWidth/2) * 707 / 1000; // 707 / 1000 = 0.707 = 1/sqrt(2);
++
++ mem.SetPen( wxPen(fg) );
++ mem.SetBrush( wxBrush(fg) );
++ int handleCornerShift = penWidth * 707 / 1000 / 2; // 707 / 1000 = 0.707 = 1/sqrt(2);
++ handleCornerShift = WXMAX( handleCornerShift, 1 );
++ int handleBase = 4 * x / 20;
++ int handleLength = 2*handleBase+1;
++ wxPoint handlePolygon[] =
++ {
++ wxPoint(-handleCornerShift,+handleCornerShift),
++ wxPoint(+handleCornerShift,-handleCornerShift),
++ wxPoint(multiplier*handleLength/2+handleCornerShift,multiplier*handleLength/2-handleCornerShift),
++ wxPoint(multiplier*handleLength/2-handleCornerShift,multiplier*handleLength/2+handleCornerShift),
++ };
++ mem.DrawPolygon(WXSIZEOF(handlePolygon),handlePolygon,lineStart,lineStart);
++
++ // draw drop triangle
++ int triangleX = 13 * x / 20;
++ int triangleY = 5 * x / 20;
++ int triangleBase = 3 * x / 20;
++ int triangleFactor = triangleBase*2+1;
++ if ( renderDrop )
++ {
++ wxPoint dropPolygon[] =
++ {
++ wxPoint(multiplier*0,multiplier*0), // triangle left
++ wxPoint(multiplier*triangleFactor-1,multiplier*0), // triangle right
++ wxPoint(multiplier*triangleFactor/2,multiplier*triangleFactor/2), // triangle bottom
++ };
++ mem.DrawPolygon(WXSIZEOF(dropPolygon),dropPolygon,multiplier*triangleX,multiplier*triangleY);
++ }
++
++ //===============================================================================
++ // end drawing code
++ //===============================================================================
++
++ if ( multiplier != 1 )
++ {
++ wxImage image = bitmap.ConvertToImage();
++ image.Rescale(x,y);
++ bitmap = wxBitmap( image );
++ }
++
++ return bitmap;
++}
++
++wxBitmap wxSearchCtrl::RenderCancelBitmap( int x, int y )
++{
++ wxColour bg = GetBackgroundColour();
++ wxColour fg = GetForegroundColour();
++
++ //===============================================================================
++ // begin drawing code
++ //===============================================================================
++ // image stats
++
++ // total size 14x14
++ // force 1:1 ratio
++ if ( x > y )
++ {
++ // x is too big
++ x = y;
++ }
++ else
++ {
++ // y is too big
++ y = x;
++ }
++
++ // 14x14 circle
++ // cross line starts (4,4)-(10,10)
++ // drop (13,16)-(19,6)-(16,9)
++
++ int multiplier = GetMultiplier();
++
++ int penWidth = multiplier * x / 14;
++
++ wxBitmap bitmap( multiplier*x, multiplier*y );
++ wxMemoryDC mem;
++ mem.SelectObject(bitmap);
++
++ // clear background
++ mem.SetBrush( wxBrush(bg) );
++ mem.SetPen( wxPen(bg) );
++ mem.DrawRectangle(0,0,bitmap.GetWidth(),bitmap.GetHeight());
++
++ // draw drop glass
++ mem.SetBrush( wxBrush(fg) );
++ mem.SetPen( wxPen(fg) );
++ int radius = multiplier*x/2;
++ mem.DrawCircle(radius,radius,radius);
++
++ // draw cross
++ int lineStartBase = 4 * x / 14;
++ int lineLength = x - 2*lineStartBase;
++
++ mem.SetPen( wxPen(bg) );
++ mem.SetBrush( wxBrush(bg) );
++ int handleCornerShift = penWidth/2;
++ handleCornerShift = WXMAX( handleCornerShift, 1 );
++ wxPoint handlePolygon[] =
++ {
++ wxPoint(-handleCornerShift,+handleCornerShift),
++ wxPoint(+handleCornerShift,-handleCornerShift),
++ wxPoint(multiplier*lineLength+handleCornerShift,multiplier*lineLength-handleCornerShift),
++ wxPoint(multiplier*lineLength-handleCornerShift,multiplier*lineLength+handleCornerShift),
++ };
++ mem.DrawPolygon(WXSIZEOF(handlePolygon),handlePolygon,multiplier*lineStartBase,multiplier*lineStartBase);
++ wxPoint handlePolygon2[] =
++ {
++ wxPoint(+handleCornerShift,+handleCornerShift),
++ wxPoint(-handleCornerShift,-handleCornerShift),
++ wxPoint(multiplier*lineLength-handleCornerShift,-multiplier*lineLength-handleCornerShift),
++ wxPoint(multiplier*lineLength+handleCornerShift,-multiplier*lineLength+handleCornerShift),
++ };
++ mem.DrawPolygon(WXSIZEOF(handlePolygon2),handlePolygon2,multiplier*lineStartBase,multiplier*(x-lineStartBase));
++
++ //===============================================================================
++ // end drawing code
++ //===============================================================================
++
++ if ( multiplier != 1 )
++ {
++ wxImage image = bitmap.ConvertToImage();
++ image.Rescale(x,y);
++ bitmap = wxBitmap( image );
++ }
++
++ return bitmap;
++}
++
++void wxSearchCtrl::RecalcBitmaps()
++{
++ if ( !m_text )
++ {
++ return;
++ }
++ wxSize sizeText = m_text->GetBestSize();
++
++ int bitmapHeight = sizeText.y - 2 * ICON_MARGIN;
++ int bitmapWidth = sizeText.y * 20 / 14;
++
++ if ( !m_searchBitmapUser )
++ {
++ if (
++ !m_searchBitmap.Ok() ||
++ m_searchBitmap.GetHeight() != bitmapHeight ||
++ m_searchBitmap.GetWidth() != bitmapWidth
++ )
++ {
++ m_searchBitmap = RenderSearchBitmap(bitmapWidth,bitmapHeight,false);
++ if ( !m_menu )
++ {
++ m_searchButton->SetBitmapLabel(m_searchBitmap);
++ }
++ }
++ // else this bitmap was set by user, don't alter
++ }
++
++ if ( !m_searchMenuBitmapUser )
++ {
++ if (
++ !m_searchMenuBitmap.Ok() ||
++ m_searchMenuBitmap.GetHeight() != bitmapHeight ||
++ m_searchMenuBitmap.GetWidth() != bitmapWidth
++ )
++ {
++ m_searchMenuBitmap = RenderSearchBitmap(bitmapWidth,bitmapHeight,true);
++ if ( m_menu )
++ {
++ m_searchButton->SetBitmapLabel(m_searchMenuBitmap);
++ }
++ }
++ // else this bitmap was set by user, don't alter
++ }
++
++ if ( !m_cancelBitmapUser )
++ {
++ if (
++ !m_cancelBitmap.Ok() ||
++ m_cancelBitmap.GetHeight() != bitmapHeight ||
++ m_cancelBitmap.GetWidth() != bitmapHeight
++ )
++ {
++ m_cancelBitmap = RenderCancelBitmap(bitmapHeight-BORDER,bitmapHeight-BORDER); // square
++ m_cancelButton->SetBitmapLabel(m_cancelBitmap);
++ }
++ // else this bitmap was set by user, don't alter
++ }
++}
++
++void wxSearchCtrl::OnSearchButton( wxCommandEvent& event )
++{
++ event.Skip();
++}
++
++void wxSearchCtrl::OnSetFocus( wxFocusEvent& /*event*/ )
++{
++ if ( m_text )
++ {
++ m_text->SetFocus();
++ }
++}
++
++void wxSearchCtrl::OnSize( wxSizeEvent& event )
++{
++ int width, height;
++ GetSize(&width, &height);
++ LayoutControls(0, 0, width, height);
++}
++
++void wxSearchCtrl::PopupSearchMenu()
++{
++ if ( m_menu )
++ {
++ wxSize size = GetSize();
++ PopupMenu( m_menu, 0, size.y );
++ }
++}
++
++#endif // !wxUSE_NATIVE_SEARCH_CONTROL
++
++#endif // wxUSE_SEARCHCTRL
+Index: wxWidgets/src/html/htmlfilter.cpp
+===================================================================
+RCS file: htmlfilter.cpp
+diff -N htmlfilter.cpp
+--- /dev/null Thu Dec 14 21:47:46 2006
++++ wxWidgets/src/html/htmlfilter.cpp Thu Dec 14 21:47:50 2006
+@@ -0,0 +1,172 @@
++/////////////////////////////////////////////////////////////////////////////
++// Name: filter.cpp
++// Purpose: wxHtmlFilter - input filter for translating into HTML format
++// Author: Vaclav Slavik
++// Copyright: (c) 1999 Vaclav Slavik
++// Licence: wxWindows Licence
++/////////////////////////////////////////////////////////////////////////////
++
++
++#ifdef __GNUG__
++#pragma implementation "htmlfilter.h"
++#endif
++
++#include "wx/wxprec.h"
++
++#if wxUSE_HTML
++
++#ifdef __BORDLANDC__
++#pragma hdrstop
++#endif
++
++#ifndef WXPRECOMP
++#endif
++
++#include "wx/html/htmlfilter.h"
++#include "wx/html/htmlwin.h"
++
++
++/*
++
++There is code for several default filters:
++
++*/
++
++IMPLEMENT_ABSTRACT_CLASS(wxHtmlFilter, wxObject)
++
++//--------------------------------------------------------------------------------
++// wxHtmlFilterPlainText
++// filter for text/plain or uknown
++//--------------------------------------------------------------------------------
++
++IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterPlainText, wxHtmlFilter)
++
++bool wxHtmlFilterPlainText::CanRead(const wxFSFile& WXUNUSED(file)) const
++{
++ return TRUE;
++}
++
++
++
++wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const
++{
++ wxInputStream *s = file.GetStream();
++ char *src;
++ wxString doc, doc2;
++
++ if (s == NULL) return wxEmptyString;
++ src = new char[s -> GetSize()+1];
++ src[s -> GetSize()] = 0;
++ s -> Read(src, s -> GetSize());
++ doc = src;
++ delete [] src;
++
++ doc.Replace(_T("<"), _T("<"), TRUE);
++ doc.Replace(_T(">"), _T(">"), TRUE);
++ doc2 = _T("<HTML><BODY><PRE>\n") + doc + _T("\n</PRE></BODY></HTML>");
++ return doc2;
++}
++
++
++
++
++
++//--------------------------------------------------------------------------------
++// wxHtmlFilterImage
++// filter for image/*
++//--------------------------------------------------------------------------------
++
++class wxHtmlFilterImage : public wxHtmlFilter
++{
++ DECLARE_DYNAMIC_CLASS(wxHtmlFilterImage)
++
++ public:
++ virtual bool CanRead(const wxFSFile& file) const;
++ virtual wxString ReadFile(const wxFSFile& file) const;
++};
++
++IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterImage, wxHtmlFilter)
++
++
++
++bool wxHtmlFilterImage::CanRead(const wxFSFile& file) const
++{
++ return (file.GetMimeType().Left(6) == "image/");
++}
++
++
++
++wxString wxHtmlFilterImage::ReadFile(const wxFSFile& file) const
++{
++ return ("<HTML><BODY><IMG SRC=\"" + file.GetLocation() + "\"></BODY></HTML>");
++}
++
++
++
++
++//--------------------------------------------------------------------------------
++// wxHtmlFilterPlainText
++// filter for text/plain or uknown
++//--------------------------------------------------------------------------------
++
++class wxHtmlFilterHTML : public wxHtmlFilter
++{
++ DECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML)
++
++ public:
++ virtual bool CanRead(const wxFSFile& file) const;
++ virtual wxString ReadFile(const wxFSFile& file) const;
++};
++
++
++IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterHTML, wxHtmlFilter)
++
++bool wxHtmlFilterHTML::CanRead(const wxFSFile& file) const
++{
++// return (file.GetMimeType() == "text/html");
++// This is true in most case but some page can return:
++// "text/html; char-encoding=...."
++// So we use Find instead
++ return (file.GetMimeType().Find(_T("text/html")) == 0);
++}
++
++
++
++wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
++{
++ wxInputStream *s = file.GetStream();
++ char *src;
++ wxString doc;
++
++ if (s == NULL) return wxEmptyString;
++ src = new char[s -> GetSize() + 1];
++ src[s -> GetSize()] = 0;
++ s -> Read(src, s -> GetSize());
++ doc = src;
++ delete[] src;
++
++ return doc;
++}
++
++
++
++
++///// Module:
++
++class wxHtmlFilterModule : public wxModule
++{
++ DECLARE_DYNAMIC_CLASS(wxHtmlFilterModule)
++
++ public:
++ virtual bool OnInit()
++ {
++ wxHtmlWindow::AddFilter(new wxHtmlFilterHTML);
++ wxHtmlWindow::AddFilter(new wxHtmlFilterImage);
++ return TRUE;
++ }
++ virtual void OnExit() {}
++};
++
++IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterModule, wxModule)
++
++#endif
+Index: wxWidgets/src/html/htmlhelp.cpp
+===================================================================
+RCS file: htmlhelp.cpp
+diff -N htmlhelp.cpp
+--- /dev/null Thu Dec 14 21:47:46 2006
++++ wxWidgets/src/html/htmlhelp.cpp Thu Dec 14 21:47:50 2006
+@@ -0,0 +1,839 @@
++// Name: htmlhelp.cpp
++// Purpose: Help controller
++// Author: Vaclav Slavik
++// Copyright: (c) 1999 Vaclav Slavik
++// Licence: wxWindows Licence
++/////////////////////////////////////////////////////////////////////////////
++
++#error This file should not be compiled! Update your build system! \
++(configure users, rerun configure to get a new Makefile) \
++Instead of htmlhelp[_io], use helpdata, helpfrm and helpctrl. This \
++file is only left to point out the problem and will be removed r.s.n.
++
++#ifdef __GNUG__
++#pragma implementation "htmlhelp.h"
++#endif
++
++#include "wx/wxprec.h"
++
++#if wxUSE_HTML
++
++#ifdef __BORDLANDC__
++#pragma hdrstop
++#endif
++
++#ifndef WXPRECOMP
++#endif
++
++#include <wx/notebook.h>
++#include <wx/imaglist.h>
++#include <wx/treectrl.h>
++#include <wx/tokenzr.h>
++#include <wx/wfstream.h>
++#include <wx/html/htmlwin.h>
++#include <wx/html/htmlhelp.h>
++#include <wx/busyinfo.h>
++
++#if !((wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7)))
++#include <wx/progdlg.h>
++#endif
++
++
++// Bitmaps:
++
++#ifndef __WXMSW__
++ // XPM hack: make the arrays const
++ #define static static const
++
++ #include "bitmaps/panel.xpm"
++ #include "bitmaps/back.xpm"
++ #include "bitmaps/forward.xpm"
++ #include "bitmaps/book.xpm"
++ #include "bitmaps/folder.xpm"
++ #include "bitmaps/page.xpm"
++
++ #undef static
++#endif
++
++#include "search.h"
++
++
++
++
++#include <wx/arrimpl.cpp>
++WX_DEFINE_OBJARRAY(HtmlBookRecArray)
++
++
++
++
++
++
++
++
++
++//-----------------------------------------------------------------------------
++// wxHtmlHelpController
++//-----------------------------------------------------------------------------
++
++
++IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxEvtHandler)
++
++
++wxHtmlHelpController::wxHtmlHelpController() : wxEvtHandler()
++{
++ m_Frame = NULL;
++ m_Config = NULL;
++ m_ConfigRoot = wxEmptyString;
++ m_TitleFormat = _("Help : %s");
++ m_TempPath = wxEmptyString;
++
++ m_Cfg.x = m_Cfg.y = 0;
++ m_Cfg.w = 700; m_Cfg.h = 480;
++ m_Cfg.sashpos = 240;
++ m_Cfg.navig_on = TRUE;
++
++ m_ContentsImageList = new wxImageList(12, 12);
++ m_ContentsImageList -> Add(wxICON(book));
++ m_ContentsImageList -> Add(wxICON(folder));
++ m_ContentsImageList -> Add(wxICON(page));
++
++ m_Contents = NULL;
++ m_ContentsCnt = 0;
++ m_Index = NULL;
++ m_IndexCnt = 0;
++
++ m_IndexBox = NULL;
++ m_ContentsBox = NULL;
++ m_SearchList = NULL;
++ m_SearchText = NULL;
++ m_SearchButton = NULL;
++ m_HtmlWin = NULL;
++ m_Splitter = NULL;
++ m_NavigPan = NULL;
++}
++
++
++
++wxHtmlHelpController::~wxHtmlHelpController()
++{
++ int i;
++
++ m_BookRecords.Empty();
++ delete m_ContentsImageList;
++ if (m_Contents) {
++ for (i = 0; i < m_ContentsCnt; i++) {
++ delete[] m_Contents[i].m_Page;
++ delete[] m_Contents[i].m_Name;
++ }
++ free(m_Contents);
++ }
++ if (m_Index) {
++ for (i = 0; i < m_IndexCnt; i++) {
++ delete[] m_Index[i].m_Page;
++ delete[] m_Index[i].m_Name;
++ }
++ free(m_Index);
++ }
++}
++
++
++
++void wxHtmlHelpController::SetTempDir(const wxString& path)
++{
++ if (path == wxEmptyString) m_TempPath = path;
++ else {
++ if (wxIsAbsolutePath(path)) m_TempPath = path;
++ else m_TempPath = wxGetCwd() + "/" + path;
++
++ if (m_TempPath[m_TempPath.Length() - 1] != '/')
++ m_TempPath << "/";
++ }
++}
++
++
++
++
++// Reads one line, stores it into buf and returns pointer to new line or NULL.
++static char* ReadLine(char *line, char *buf)
++{
++ char *writeptr = buf, *readptr = line;
++
++ while (*readptr != 0 && *readptr != '\r' && *readptr != '\n') *(writeptr++) = *(readptr++);
++ *writeptr = 0;
++ while (*readptr == '\r' || *readptr == '\n') readptr++;
++ if (*readptr == 0) return NULL;
++ else return readptr;
++}
++
++
++static wxString SafeFileName(const wxString& s)
++{
++ wxString res = s;
++ res.Replace(_T(":"), _T("_"), TRUE);
++ res.Replace(_T(" "), _T("_"), TRUE);
++ res.Replace(_T("/"), _T("_"), TRUE);
++ res.Replace(_T("\\"), _T("_"), TRUE);
++ res.Replace(_T("#"), _T("_"), TRUE);
++ res.Replace(_T("."), _T("_"), TRUE);
++ return res;
++}
++
++
++static int IndexCompareFunc(const void *a, const void *b)
++{
++ return strcmp(((HtmlContentsItem*)a) -> m_Name, ((HtmlContentsItem*)b) -> m_Name);
++}
++
++
++
++bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
++{
++ wxFSFile *fi;
++ wxFileSystem fsys;
++ wxInputStream *s;
++ HtmlBookRecord *bookr;
++ wxString bookFull;
++
++ int sz;
++ char *buff, *lineptr;
++ char linebuf[300];
++
++ wxString title = _("noname"),
++ safetitle,
++ start = wxEmptyString,
++ contents = wxEmptyString, index = wxEmptyString;
++
++ if (wxIsAbsolutePath(book)) bookFull = book;
++ else bookFull = wxGetCwd() + "/" + book;
++
++ fi = fsys.OpenFile(bookFull);
++ if (fi == NULL) return FALSE;
++ fsys.ChangePathTo(bookFull);
++ s = fi -> GetStream();
++ sz = s -> GetSize();
++ buff = new char[sz+1];
++ buff[sz] = 0;
++ s -> Read(buff, sz);
++ lineptr = buff;
++ delete fi;
++
++ while ((lineptr = ReadLine(lineptr, linebuf)) != NULL) {
++ if (strstr(linebuf, "Title=") == linebuf)
++ title = linebuf + strlen("Title=");
++ if (strstr(linebuf, "Default topic=") == linebuf)
++ start = linebuf + strlen("Default topic=");
++ if (strstr(linebuf, "Index file=") == linebuf)
++ index = linebuf + strlen("Index file=");
++ if (strstr(linebuf, "Contents file=") == linebuf)
++ contents = linebuf + strlen("Contents file=");
++ }
++ delete[] buff;
++
++ bookr = new HtmlBookRecord(fsys.GetPath(), title, start);
++
++ if (m_ContentsCnt % HTML_REALLOC_STEP == 0)
++ m_Contents = (HtmlContentsItem*) realloc(m_Contents, (m_ContentsCnt + HTML_REALLOC_STEP) * sizeof(HtmlContentsItem));
++ m_Contents[m_ContentsCnt].m_Level = 0;
++ m_Contents[m_ContentsCnt].m_ID = 0;
++ m_Contents[m_ContentsCnt].m_Page = new char[start.Length() + 1];
++ strcpy(m_Contents[m_ContentsCnt].m_Page, start.c_str());
++ m_Contents[m_ContentsCnt].m_Name = new char [title.Length() + 1];
++ strcpy(m_Contents[m_ContentsCnt].m_Name, title.c_str());
++ m_Contents[m_ContentsCnt].m_Book = bookr;
++ m_ContentsCnt++;
++
++ // Try to find cached binary versions:
++ safetitle = SafeFileName(title);
++ fi = fsys.OpenFile(safetitle + ".cached");
++ if (fi == NULL) fi = fsys.OpenFile(m_TempPath + safetitle + ".cached");
++ if ((fi == NULL) || (m_TempPath == wxEmptyString)) {
++ LoadMSProject(bookr, fsys, index, contents, show_wait_msg);
++ if (m_TempPath != wxEmptyString) {
++ wxFileOutputStream *outs = new wxFileOutputStream(m_TempPath + safetitle + ".cached");
++ SaveCachedBook(bookr, outs);
++ delete outs;
++ }
++ }
++ else {
++ LoadCachedBook(bookr, fi -> GetStream());
++ delete fi;
++ }
++
++ m_BookRecords.Add(bookr);
++ if (m_IndexCnt > 0)
++ qsort(m_Index, m_IndexCnt, sizeof(HtmlContentsItem), IndexCompareFunc);
++
++ return TRUE;
++}
++
++
++
++
++void wxHtmlHelpController::Display(const wxString& x)
++{
++ int cnt;
++ int i;
++ wxFileSystem fsys;
++ wxFSFile *f;
++
++ CreateHelpWindow();
++
++ /* 1. try to open given file: */
++
++ cnt = m_BookRecords.GetCount();
++ for (i = 0; i < cnt; i++) {
++ f = fsys.OpenFile(m_BookRecords[i].GetBasePath() + x);
++ if (f) {
++ m_HtmlWin -> LoadPage(m_BookRecords[i].GetBasePath() + x);
++ delete f;
++ return;
++ }
++ }
++
++
++ /* 2. try to find a book: */
++
++ for (i = 0; i < cnt; i++) {
++ if (m_BookRecords[i].GetTitle() == x) {
++ m_HtmlWin -> LoadPage(m_BookRecords[i].GetBasePath() + m_BookRecords[i].GetStart());
++ return;
++ }
++ }
++
++ /* 3. try to find in contents: */
++
++ cnt = m_ContentsCnt;
++ for (i = 0; i < cnt; i++) {
++ if (strcmp(m_Contents[i].m_Name, x) == 0) {
++ m_HtmlWin -> LoadPage(m_Contents[i].m_Book -> GetBasePath() + m_Contents[i].m_Page);
++ return;
++ }
++ }
++
++
++ /* 4. try to find in index: */
++
++ cnt = m_IndexCnt;
++ for (i = 0; i < cnt; i++) {
++ if (strcmp(m_Index[i].m_Name, x) == 0) {
++ m_HtmlWin -> LoadPage(m_Index[i].m_Book -> GetBasePath() + m_Index[i].m_Page);
++ return;
++ }
++ }
++
++
++ /* 5. if everything failed, search the documents: */
++
++ KeywordSearch(x);
++}
++
++
++
++void wxHtmlHelpController::Display(const int id)
++{
++ CreateHelpWindow();
++
++ for (int i = 0; i < m_ContentsCnt; i++) {
++ if (m_Contents[i].m_ID == id) {
++ m_HtmlWin -> LoadPage(m_Contents[i].m_Book -> GetBasePath() + m_Contents[i].m_Page);
++ return;
++ }
++ }
++}
++
++
++
++void wxHtmlHelpController::DisplayContents()
++{
++ CreateHelpWindow();
++ m_Frame -> Raise();
++ if (!m_Splitter -> IsSplit()) {
++ m_NavigPan -> Show(TRUE);
++ m_HtmlWin -> Show(TRUE);
++ m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
++ }
++ m_NavigPan -> SetSelection(0);
++}
++
++
++
++void wxHtmlHelpController::DisplayIndex()
++{
++ CreateHelpWindow();
++ m_Frame -> Raise();
++ if (!m_Splitter -> IsSplit()) {
++ m_NavigPan -> Show(TRUE);
++ m_HtmlWin -> Show(TRUE);
++ m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
++ }
++ m_NavigPan -> SetSelection(1);
++}
++
++
++
++
++#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7))
++
++class MyProgressDlg : public wxDialog
++{
++ public:
++ bool m_Canceled;
++
++ MyProgressDlg(wxWindow *parent) : wxDialog(parent, -1,
++ _("Searching..."),
++ wxPoint(0, 0),
++#ifdef __WXGTK__
++ wxSize(300, 110)
++#else
++ wxSize(300, 130)
++#endif
++ )
++ {m_Canceled = FALSE;}
++ void OnCancel(wxCommandEvent& event) {m_Canceled = TRUE;}
++ DECLARE_EVENT_TABLE()
++};
++BEGIN_EVENT_TABLE(MyProgressDlg, wxDialog)
++ EVT_BUTTON(wxID_CANCEL, MyProgressDlg::OnCancel)
++END_EVENT_TABLE()
++
++#endif
++
++
++bool wxHtmlHelpController::KeywordSearch(const wxString& keyword)
++{
++ int foundcnt = 0;
++ CreateHelpWindow();
++ // if these are not set, we can't continue
++ if (! (m_SearchList && m_HtmlWin))
++ return FALSE;
++ m_Frame -> Raise();
++ if (m_Splitter && m_NavigPan && m_SearchButton) {
++ if (!m_Splitter -> IsSplit()) {
++ m_NavigPan -> Show(TRUE);
++ m_HtmlWin -> Show(TRUE);
++ m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
++ }
++ m_NavigPan -> SetSelection(2);
++ m_SearchList -> Clear();
++ m_SearchText -> SetValue(keyword);
++ m_SearchButton -> Enable(FALSE);
++ }
++ {
++ int cnt = m_ContentsCnt;
++ wxSearchEngine engine;
++ wxFileSystem fsys;
++ wxFSFile *file;
++ wxString lastpage = wxEmptyString;
++ wxString foundstr;
++
++#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7))
++ MyProgressDlg progress(m_Frame);
++
++ wxStaticText *prompt = new wxStaticText(&progress, -1, "", wxPoint(20, 50), wxSize(260, 25), wxALIGN_CENTER);
++ wxGauge *gauge = new wxGauge(&progress, -1, cnt, wxPoint(20, 20), wxSize(260, 25));
++ wxButton *btn = new wxButton(&progress, wxID_CANCEL, _("Cancel"), wxPoint(110, 70), wxSize(80, 25));
++ btn = btn; /* fool compiler :-) */
++ prompt -> SetLabel(_("No matching page found yet"));
++
++ progress.Centre(wxBOTH);
++ progress.Show(TRUE);
++#else
++ wxProgressDialog progress(_("Searching..."), _("No matching page found yet"), cnt, m_Frame, wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_AUTO_HIDE);
++#endif
++
++ engine.LookFor(keyword);
++
++ for (int i = 0; i < cnt; i++) {
++#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7))
++ gauge -> SetValue(i);
++ if (progress.m_Canceled) break;
++#else
++ if (progress.Update(i) == FALSE) break;
++#endif
++ wxYield();
++
++ file = fsys.OpenFile(m_Contents[i].m_Book -> GetBasePath() + m_Contents[i].m_Page);
++ if (file) {
++ if (lastpage != file -> GetLocation()) {
++ lastpage = file -> GetLocation();
++ if (engine.Scan(file -> GetStream())) {
++ foundstr.Printf(_("Found %i matches"), ++foundcnt);
++#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7))
++ prompt -> SetLabel(foundstr);
++#else
++ progress.Update(i, foundstr);
++#endif
++ wxYield();
++ m_SearchList -> Append(m_Contents[i].m_Name, (char*)(m_Contents + i));
++ }
++ }
++ delete file;
++ }
++ }
++
++#if (wxVERSION_NUMBER < 2100) || ((wxVERSION_NUMBER == 2100) && (wxBETA_NUMBER < 7))
++ progress.Close(TRUE);
++#endif
++ }
++ if (m_SearchButton)
++ m_SearchButton -> Enable(TRUE);
++ if (m_SearchText) {
++ m_SearchText -> SetSelection(0, keyword.Length());
++ m_SearchText -> SetFocus();
++ }
++ if (foundcnt) {
++ HtmlContentsItem *it = (HtmlContentsItem*) m_SearchList -> GetClientData(0);
++ if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
++ }
++ return (foundcnt > 0);
++}
++
++
++
++
++
++
++void wxHtmlHelpController::CreateHelpWindow()
++{
++ wxBusyCursor cur;
++ wxString oldpath;
++ wxStatusBar *sbar;
++
++ if (m_Frame) {
++ m_Frame -> Raise();
++ m_Frame -> Show(TRUE);
++ return;
++ }
++
++#if wxUSE_BUSYINFO
++ wxBusyInfo busyinfo(_("Preparing help window..."));
++#endif
++
++ if (m_Config) ReadCustomization(m_Config, m_ConfigRoot);
++
++ m_Frame = new wxFrame(NULL, -1, "", wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h));
++ m_Frame -> PushEventHandler(this);
++ sbar = m_Frame -> CreateStatusBar();
++
++ {
++ wxToolBar *toolBar;
++ toolBar = m_Frame -> CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT | wxTB_DOCKABLE);
++ toolBar -> SetMargins(2, 2);
++ wxBitmap* toolBarBitmaps[3];
++
++#ifdef __WXMSW__
++ toolBarBitmaps[0] = new wxBitmap("panel");
++ toolBarBitmaps[1] = new wxBitmap("back");
++ toolBarBitmaps[2] = new wxBitmap("forward");
++ int width = 24;
++#else
++ toolBarBitmaps[0] = new wxBitmap(panel_xpm);
++ toolBarBitmaps[1] = new wxBitmap(back_xpm);
++ toolBarBitmaps[2] = new wxBitmap(forward_xpm);
++ int width = 16;
++#endif
++
++ int currentX = 5;
++
++ toolBar -> AddTool(wxID_HTML_PANEL, *(toolBarBitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _("Show/hide navigation panel"));
++ currentX += width + 5;
++ toolBar -> AddSeparator();
++ toolBar -> AddTool(wxID_HTML_BACK, *(toolBarBitmaps[1]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _("Go back to the previous HTML page"));
++ currentX += width + 5;
++ toolBar -> AddTool(wxID_HTML_FORWARD, *(toolBarBitmaps[2]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _("Go forward to the next HTML page"));
++ currentX += width + 5;
++
++ toolBar -> Realize();
++
++ // Can delete the bitmaps since they're reference counted
++ for (int i = 0; i < 3; i++) delete toolBarBitmaps[i];
++ }
++
++
++ {
++ m_Splitter = new wxSplitterWindow(m_Frame);
++
++ m_HtmlWin = new wxHtmlWindow(m_Splitter);
++ m_HtmlWin -> SetRelatedFrame(m_Frame, m_TitleFormat);
++ m_HtmlWin -> SetRelatedStatusBar(0);
++ if (m_Config) m_HtmlWin -> ReadCustomization(m_Config, m_ConfigRoot);
++
++ m_NavigPan = new wxNotebook(m_Splitter, wxID_HTML_NOTEBOOK, wxDefaultPosition, wxDefaultSize);
++ {
++ m_ContentsBox = new wxTreeCtrl(m_NavigPan, wxID_HTML_TREECTRL, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS | wxSUNKEN_BORDER);
++ m_ContentsBox -> SetImageList(m_ContentsImageList);
++ m_NavigPan -> AddPage(m_ContentsBox, _("Contents"));
++ }
++
++ {
++ wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_INDEXPAGE);
++ wxLayoutConstraints *b1 = new wxLayoutConstraints;
++ b1 -> top.SameAs (dummy, wxTop, 0);
++ b1 -> left.SameAs (dummy, wxLeft, 0);
++ b1 -> width.PercentOf (dummy, wxWidth, 100);
++ b1 -> bottom.SameAs (dummy, wxBottom, 0);
++ m_IndexBox = new wxListBox(dummy, wxID_HTML_INDEXLIST, wxDefaultPosition, wxDefaultSize, 0);
++ m_IndexBox -> SetConstraints(b1);
++ dummy -> SetAutoLayout(TRUE);
++ m_NavigPan -> AddPage(dummy, _("Index"));
++ }
++
++ {
++ wxWindow *dummy = new wxPanel(m_NavigPan, wxID_HTML_SEARCHPAGE);
++
++ wxLayoutConstraints *b1 = new wxLayoutConstraints;
++ m_SearchText = new wxTextCtrl(dummy, wxID_HTML_SEARCHTEXT);
++ b1 -> top.SameAs (dummy, wxTop, 0);
++ b1 -> left.SameAs (dummy, wxLeft, 0);
++ b1 -> right.SameAs (dummy, wxRight, 0);
++ b1 -> height.AsIs();
++ m_SearchText -> SetConstraints(b1);
++
++ wxLayoutConstraints *b2 = new wxLayoutConstraints;
++ m_SearchButton = new wxButton(dummy, wxID_HTML_SEARCHBUTTON, _("Search!"));
++ b2 -> top.Below (m_SearchText, 10);
++ b2 -> right.SameAs (dummy, wxRight, 10);
++ b2 -> width.AsIs();
++ b2 -> height.AsIs();
++ m_SearchButton -> SetConstraints(b2);
++
++ wxLayoutConstraints *b3 = new wxLayoutConstraints;
++ m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0);
++ b3 -> top.Below (m_SearchButton, 10);
++ b3 -> left.SameAs (dummy, wxLeft, 0);
++ b3 -> right.SameAs (dummy, wxRight, 0);
++ b3 -> bottom.SameAs (dummy, wxBottom, 0);
++ m_SearchList -> SetConstraints(b3);
++
++ dummy -> SetAutoLayout(TRUE);
++ dummy -> Layout();
++ m_NavigPan -> AddPage(dummy, _("Search"));
++ }
++
++ RefreshLists();
++ m_NavigPan -> Show(TRUE);
++ m_HtmlWin -> Show(TRUE);
++ m_Splitter -> SetMinimumPaneSize(20);
++ m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
++ if (!m_Cfg.navig_on) m_Splitter -> Unsplit(m_NavigPan);
++ wxYield();
++ }
++
++ m_Frame -> Show(TRUE);
++ wxYield();
++}
++
++
++
++#define MAX_ROOTS 64
++
++void wxHtmlHelpController::CreateContents()
++{
++ HtmlContentsItem *it;
++ wxTreeItemId roots[MAX_ROOTS];
++ bool imaged[MAX_ROOTS];
++ int count = m_ContentsCnt;
++
++ m_ContentsBox -> DeleteAllItems();
++ roots[0] = m_ContentsBox -> AddRoot(_("(Help)"));
++ imaged[0] = TRUE;
++
++ for (int i = 0; i < count; i++) {
++ it = m_Contents + i;
++ roots[it -> m_Level + 1] = m_ContentsBox -> AppendItem(roots[it -> m_Level], it -> m_Name, IMG_Page, -1, new wxHtmlHelpTreeItemData(it));
++ if (it -> m_Level == 0) {
++ m_ContentsBox -> SetItemBold(roots[1], TRUE);
++ m_ContentsBox -> SetItemImage(roots[1], IMG_Book);
++ m_ContentsBox -> SetItemSelectedImage(roots[1], IMG_Book);
++ imaged[1] = TRUE;
++ }
++ else imaged[it -> m_Level + 1] = FALSE;
++
++ if (!imaged[it -> m_Level]) {
++ m_ContentsBox -> SetItemImage(roots[it -> m_Level], IMG_Folder);
++ m_ContentsBox -> SetItemSelectedImage(roots[it -> m_Level], IMG_Folder);
++ imaged[it -> m_Level] = TRUE;
++ }
++ }
++
++ m_ContentsBox -> Expand(roots[0]);
++}
++
++
++
++
++void wxHtmlHelpController::CreateIndex()
++{
++ m_IndexBox -> Clear();
++
++ for (int i = 0; i < m_IndexCnt; i++)
++ m_IndexBox -> Append(m_Index[i].m_Name, (char*)(m_Index + i));
++}
++
++
++
++void wxHtmlHelpController::RefreshLists()
++{
++ if (m_Frame) {
++ CreateContents();
++ CreateIndex();
++ m_SearchList -> Clear();
++ }
++}
++
++
++
++
++
++
++
++void wxHtmlHelpController::ReadCustomization(wxConfigBase *cfg, wxString path)
++{
++ wxString oldpath;
++ wxString tmp;
++
++ if (path != wxEmptyString) {
++ oldpath = cfg -> GetPath();
++ cfg -> SetPath(path);
++ }
++
++ m_Cfg.navig_on = cfg -> Read("hcNavigPanel", m_Cfg.navig_on) != 0;
++ m_Cfg.sashpos = cfg -> Read("hcSashPos", m_Cfg.sashpos);
++ m_Cfg.x = cfg -> Read("hcX", m_Cfg.x);
++ m_Cfg.y = cfg -> Read("hcY", m_Cfg.y);
++ m_Cfg.w = cfg -> Read("hcW", m_Cfg.w);
++ m_Cfg.h = cfg -> Read("hcH", m_Cfg.h);
++
++ if (path != wxEmptyString)
++ cfg -> SetPath(oldpath);
++}
++
++
++
++void wxHtmlHelpController::WriteCustomization(wxConfigBase *cfg, wxString path)
++{
++ wxString oldpath;
++ wxString tmp;
++
++ if (path != wxEmptyString) {
++ oldpath = cfg -> GetPath();
++ cfg -> SetPath(path);
++ }
++
++ cfg -> Write("hcNavigPanel", m_Cfg.navig_on);
++ cfg -> Write("hcSashPos", (long)m_Cfg.sashpos);
++ cfg -> Write("hcX", (long)m_Cfg.x);
++ cfg -> Write("hcY", (long)m_Cfg.y);
++ cfg -> Write("hcW", (long)m_Cfg.w);
++ cfg -> Write("hcH", (long)m_Cfg.h);
++
++ if (path != wxEmptyString)
++ cfg -> SetPath(oldpath);
++}
++
++
++
++
++
++/*
++EVENT HANDLING :
++*/
++
++
++void wxHtmlHelpController::OnToolbar(wxCommandEvent& event)
++{
++ switch (event.GetId()) {
++ case wxID_HTML_BACK :
++ m_HtmlWin -> HistoryBack();
++ break;
++ case wxID_HTML_FORWARD :
++ m_HtmlWin -> HistoryForward();
++ break;
++ case wxID_HTML_PANEL :
++ if (m_Splitter -> IsSplit()) {
++ m_Cfg.sashpos = m_Splitter -> GetSashPosition();
++ m_Splitter -> Unsplit(m_NavigPan);
++ }
++ else {
++ m_NavigPan -> Show(TRUE);
++ m_HtmlWin -> Show(TRUE);
++ m_Splitter -> SplitVertically(m_NavigPan, m_HtmlWin, m_Cfg.sashpos);
++ }
++ break;
++ }
++}
++
++
++
++void wxHtmlHelpController::OnContentsSel(wxTreeEvent& event)
++{
++ wxHtmlHelpTreeItemData *pg;
++
++ pg = (wxHtmlHelpTreeItemData*) m_ContentsBox -> GetItemData(event.GetItem());
++ if (pg) m_HtmlWin -> LoadPage(pg -> GetPage());
++}
++
++
++
++void wxHtmlHelpController::OnIndexSel(wxCommandEvent& event)
++{
++ HtmlContentsItem *it = (HtmlContentsItem*) m_IndexBox -> GetClientData(m_IndexBox -> GetSelection());
++ if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
++}
++
++
++
++void wxHtmlHelpController::OnSearchSel(wxCommandEvent& event)
++{
++ HtmlContentsItem *it = (HtmlContentsItem*) m_SearchList -> GetClientData(m_SearchList -> GetSelection());
++ if (it) m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
++}
++
++
++
++void wxHtmlHelpController::OnCloseWindow(wxCloseEvent& event)
++{
++ int a, b;
++
++ m_Cfg.navig_on = m_Splitter -> IsSplit();
++ if (m_Cfg.navig_on)
++ m_Cfg.sashpos = m_Splitter -> GetSashPosition();
++ m_Frame -> GetPosition(&a, &b);
++ m_Cfg.x = a, m_Cfg.y = b;
++ m_Frame -> GetSize(&a, &b);
++ m_Cfg.w = a, m_Cfg.h = b;
++
++ if (m_Config) {
++ WriteCustomization(m_Config, m_ConfigRoot);
++ m_HtmlWin -> WriteCustomization(m_Config, m_ConfigRoot);
++ }
++ m_Frame = NULL;
++
++ event.Skip();
++}
++
++
++
++void wxHtmlHelpController::OnSearch(wxCommandEvent& event)
++{
++ wxString sr = m_SearchText -> GetLineText(0);
++
++ if (sr != wxEmptyString) KeywordSearch(sr);
++}
++
++
++
++BEGIN_EVENT_TABLE(wxHtmlHelpController, wxEvtHandler)
++ EVT_TOOL_RANGE(wxID_HTML_PANEL, wxID_HTML_FORWARD, wxHtmlHelpController::OnToolbar)
++ EVT_TREE_SEL_CHANGED(wxID_HTML_TREECTRL, wxHtmlHelpController::OnContentsSel)
++ EVT_LISTBOX(wxID_HTML_INDEXLIST, wxHtmlHelpController::OnIndexSel)
++ EVT_LISTBOX(wxID_HTML_SEARCHLIST, wxHtmlHelpController::OnSearchSel)
++ EVT_CLOSE(wxHtmlHelpController::OnCloseWindow)
++ EVT_BUTTON(wxID_HTML_SEARCHBUTTON, wxHtmlHelpController::OnSearch)
++ EVT_TEXT_ENTER(wxID_HTML_SEARCHTEXT, wxHtmlHelpController::OnSearch)
++END_EVENT_TABLE()
++
++
++
++#endif
++
+Index: wxWidgets/src/html/search.cpp
+===================================================================
+RCS file: search.cpp
+diff -N search.cpp
+--- /dev/null Thu Dec 14 21:47:46 2006
++++ wxWidgets/src/html/search.cpp Thu Dec 14 21:47:51 2006
+@@ -0,0 +1,72 @@
++/////////////////////////////////////////////////////////////////////////////
++// Name: search.cpp
++// Purpose: search engine
++// Author: Vaclav Slavik
++// RCS-ID: $Id: search.cpp,v 1.9 2001/07/05 18:48:48 VZ Exp $
++// Copyright: (c) 1999 Vaclav Slavik
++// Licence: wxWindows Licence
++/////////////////////////////////////////////////////////////////////////////
++
++
++
++#ifdef __GNUG__
++#pragma implementation
++#endif
++
++#include "wx/wxprec.h"
++
++#include "wx/defs.h"
++#if wxUSE_HTML
++
++#ifdef __BORDLANDC__
++#pragma hdrstop
++#endif
++
++#ifndef WXPRECOMP
++#endif
++
++#include "wx/html/helpdata.h"
++
++
++//--------------------------------------------------------------------------------
++// wxSearchEngine
++//--------------------------------------------------------------------------------
++
++void wxSearchEngine::LookFor(const wxString& keyword)
++{
++ if (m_Keyword) delete[] m_Keyword;
++ m_Keyword = new wxChar[keyword.Length() + 1];
++ wxStrcpy(m_Keyword, keyword.c_str());
++ for (int i = wxStrlen(m_Keyword) - 1; i >= 0; i--)
++ if ((m_Keyword[i] >= wxT('A')) && (m_Keyword[i] <= wxT('Z')))
++ m_Keyword[i] += wxT('a') - wxT('A');
++}
++
++
++
++bool wxSearchEngine::Scan(wxInputStream *stream)
++{
++ wxASSERT_MSG(m_Keyword != NULL, _("wxSearchEngine::LookFor must be called before scanning!"));
++
++ int i, j;
++ int lng = stream ->GetSize();
++ int wrd = wxStrlen(m_Keyword);
++ bool found = FALSE;
++ char *buf = new char[lng + 1];
++ stream -> Read(buf, lng);
++ buf[lng] = 0;
++
++ for (i = 0; i < lng; i++)
++ if ((buf[i] >= 'A') && (buf[i] <= 'Z')) buf[i] += 'a' - 'A';
++
++ for (i = 0; i < lng - wrd; i++) {
++ j = 0;
++ while ((j < wrd) && (buf[i + j] == m_Keyword[j])) j++;
++ if (j == wrd) {found = TRUE; break;}
++ }
++
++ delete[] buf;
++ return found;
++}
++
++#endif
+Index: wxWidgets/src/unix/net.cpp
+===================================================================
+RCS file: net.cpp
+diff -N net.cpp
+--- /dev/null Thu Dec 14 21:48:09 2006
++++ wxWidgets/src/unix/net.cpp Thu Dec 14 21:48:13 2006
+@@ -0,0 +1,422 @@
++// -*- c++ -*- ///////////////////////////////////////////////////////////////
++// Name: unix/net.cpp
++// Purpose: Network related wxWindows classes and functions
++// Author: Karsten Ball�der
++// Modified by:
++// Created: 03.10.99
++// RCS-ID: $Id: net.cpp,v 1.3 1999/10/03 17:26:45 KB Exp $
++// Copyright: (c) Karsten Ball�der
++// Licence: wxWindows licence
++/////////////////////////////////////////////////////////////////////////////
++
++#include "wx/setup.h"
++
++#if wxUSE_DIALUP_MANAGER
++
++#ifndef WX_PRECOMP
++# include "wx/defs.h"
++#endif // !PCH
++
++#include "wx/string.h"
++#include "wx/event.h"
++#include "wx/net.h"
++#include "wx/timer.h"
++#include "wx/filefn.h"
++#include "wx/utils.h"
++#include "wx/log.h"
++#include "wx/file.h"
++
++#include <stdlib.h>
++#include <signal.h>
++#include <fcntl.h>
++#include <unistd.h>
++#define __STRICT_ANSI__
++#include <sys/socket.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <netdb.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++
++// ----------------------------------------------------------------------------
++// A class which groups functions dealing with connecting to the network from a
++// workstation using dial-up access to the net. There is at most one instance
++// of this class in the program accessed via GetDialUpManager().
++// ----------------------------------------------------------------------------
++
++/* TODO
++ *
++ * 1. more configurability for Unix: i.e. how to initiate the connection, how
++ * to check for online status, &c.
++ * 2. add a "long Dial(long connectionId = -1)" function which asks the user
++ * about which connection to dial (this may be done using native dialogs
++ * under NT, need generic dialogs for all others) and returns the identifier
++ * of the selected connection (it's opaque to the application) - it may be
++ * reused later to dial the same connection later (or use strings instead of
++ * longs may be?)
++ * 3. add an async version of dialing functions which notify the caller about
++ * the progress (or may be even start another thread to monitor it)
++ * 4. the static creation/accessor functions are not MT-safe - but is this
++ * really crucial? I think we may suppose they're always called from the
++ * main thread?
++ */
++
++class WXDLLEXPORT wxDialUpManagerImpl : public wxDialUpManager
++{
++public:
++ wxDialUpManagerImpl()
++ {
++ m_IsOnline = -1; // unknown
++ m_timer = NULL;
++ m_CanUseIfconfig = -1; // unknown
++ m_BeaconHost = WXDIALUP_MANAGER_DEFAULT_BEACONHOST;
++ m_BeaconPort = 80;
++ }
++
++ /** Could the dialup manager be initialized correctly? If this function
++ returns FALSE, no other functions will work neither, so it's a good idea
++ to call this function and check its result before calling any other
++ wxDialUpManager methods.
++ */
++ virtual bool IsOk() const
++ { return TRUE; }
++
++ /** The simplest way to initiate a dial up: this function dials the given
++ ISP (exact meaning of the parameter depends on the platform), returns
++ TRUE on success or FALSE on failure and logs the appropriate error
++ message in the latter case.
++ @param nameOfISP optional paramater for dial program
++ @param username unused
++ @param password unused
++ */
++ virtual bool Dial(const wxString& nameOfISP,
++ const wxString& WXUNUSED(username),
++ const wxString& WXUNUSED(password));
++
++ /// Hang up the currently active dial up connection.
++ virtual bool HangUp();
++
++ // returns TRUE if the computer is connected to the network: under Windows,
++ // this just means that a RAS connection exists, under Unix we check that
++ // the "well-known host" (as specified by SetWellKnownHost) is reachable
++ virtual bool IsOnline() const
++ {
++ if( (! m_timer) // we are not polling, so test now:
++ || m_IsOnline == -1
++ )
++ CheckStatus();
++ return m_IsOnline != 0;
++ }
++
++ // sometimes the built-in logic for determining the online status may fail,
++ // so, in general, the user should be allowed to override it. This function
++ // allows to forcefully set the online status - whatever our internal
++ // algorithm may think about it.
++ virtual void SetOnlineStatus(bool isOnline = TRUE)
++ { m_IsOnline = isOnline; }
++
++ // set misc wxDialUpManager options
++ // --------------------------------
++
++ // enable automatical checks for the connection status and sending of
++ // wxEVT_DIALUP_CONNECTED/wxEVT_DIALUP_DISCONNECTED events. The interval
++ // parameter is only for Unix where we do the check manually: under
++ // Windows, the notification about the change of connection status is
++ // instantenous.
++ //
++ // Returns FALSE if couldn't set up automatic check for online status.
++ virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds);
++
++ // disable automatic check for connection status change - notice that the
++ // wxEVT_DIALUP_XXX events won't be sent any more neither.
++ virtual void DisableAutoCheckOnlineStatus();
++
++ // under Unix, the value of well-known host is used to check whether we're
++ // connected to the internet. It's unused under Windows, but this function
++ // is always safe to call. The default value is www.yahoo.com.
++ virtual void SetWellKnownHost(const wxString& hostname,
++ int portno = 80);
++ /** Sets the commands to start up the network and to hang up
++ again. Used by the Unix implementations only.
++ */
++ virtual void SetConnectCommand(const wxString &command, const wxString &hupcmd)
++ { m_ConnectCommand = command; m_HangUpCommand = hupcmd; }
++
++private:
++ /// -1: don�t know, 0 = no, 1 = yes
++ int m_IsOnline;
++
++ /// Can we use ifconfig to list active devices?
++ int m_CanUseIfconfig;
++ /// The path to ifconfig
++ wxString m_IfconfigPath;
++
++ /// beacon host:
++ wxString m_BeaconHost;
++ /// beacon host portnumber for connect:
++ int m_BeaconPort;
++
++ /// command to connect to network
++ wxString m_ConnectCommand;
++ /// command to hang up
++ wxString m_HangUpCommand;
++ /// name of ISP
++ wxString m_ISPname;
++ /// a timer for regular testing
++ class AutoCheckTimer *m_timer;
++
++ friend class AutoCheckTimer;
++ /// determine status
++ void CheckStatus(void) const;
++
++ /// real status check
++ void CheckStatusInternal(void);
++};
++
++
++class AutoCheckTimer : public wxTimer
++{
++public:
++ AutoCheckTimer(wxDialUpManagerImpl *dupman)
++ {
++ m_dupman = dupman;
++ m_started = FALSE;
++ }
++
++ virtual bool Start( int millisecs = -1 )
++ { m_started = TRUE; return wxTimer::Start(millisecs, FALSE); }
++
++ virtual void Notify()
++ { wxLogTrace("Checking dial up network status."); m_dupman->CheckStatus(); }
++
++ virtual void Stop()
++ { if ( m_started ) wxTimer::Stop(); }
++public:
++ bool m_started;
++ wxDialUpManagerImpl *m_dupman;
++};
++
++bool
++wxDialUpManagerImpl::Dial(const wxString &isp,
++ const wxString & WXUNUSED(username),
++ const wxString & WXUNUSED(password))
++{
++ if(m_IsOnline == 1)
++ return FALSE;
++ m_IsOnline = -1;
++ m_ISPname = isp;
++ wxString cmd;
++ if(m_ConnectCommand.Find("%s"))
++ cmd.Printf(m_ConnectCommand,m_ISPname.c_str());
++ else
++ cmd = m_ConnectCommand;
++ return wxExecute(cmd, /* sync */ TRUE) == 0;
++}
++
++bool
++wxDialUpManagerImpl::HangUp(void)
++{
++ if(m_IsOnline == 0)
++ return FALSE;
++ m_IsOnline = -1;
++ wxString cmd;
++ if(m_HangUpCommand.Find("%s"))
++ cmd.Printf(m_HangUpCommand,m_ISPname.c_str());
++ else
++ cmd = m_HangUpCommand;
++ return wxExecute(cmd, /* sync */ TRUE) == 0;
++}
++
++
++bool
++wxDialUpManagerImpl::EnableAutoCheckOnlineStatus(size_t nSeconds)
++{
++ wxASSERT(m_timer == NULL);
++ m_timer = new AutoCheckTimer(this);
++ bool rc = m_timer->Start(nSeconds*1000);
++ if(! rc)
++ {
++ delete m_timer;
++ m_timer = NULL;
++ }
++ return rc;
++}
++
++void
++wxDialUpManagerImpl::DisableAutoCheckOnlineStatus()
++{
++ wxASSERT(m_timer != NULL);
++ m_timer->Stop();
++ delete m_timer;
++ m_timer = NULL;
++}
++
++
++void
++wxDialUpManagerImpl::SetWellKnownHost(const wxString& hostname, int portno)
++{
++ /// does hostname contain a port number?
++ wxString port = hostname.After(':');
++ if(port.Length())
++ {
++ m_BeaconHost = hostname.Before(':');
++ m_BeaconPort = atoi(port);
++ }
++ else
++ {
++ m_BeaconHost = hostname;
++ m_BeaconPort = portno;
++ }
++}
++
++
++void
++wxDialUpManagerImpl::CheckStatus(void) const
++{
++ // This function calls the CheckStatusInternal() helper function
++ // which is OS - specific and then sends the events.
++
++ int oldIsOnline = m_IsOnline;
++ ( /* non-const */ (wxDialUpManagerImpl *)this)->CheckStatusInternal();
++
++ // now send the events as appropriate:
++ if(m_IsOnline != oldIsOnline)
++ {
++ if(m_IsOnline)
++ ; // send ev
++ else
++ ; // send ev
++ }
++}
++
++/*
++ We have three methods that we can use:
++
++ 1. test via /sbin/ifconfig and grep for "sl", "ppp", "pl"
++ --> should be fast enough for regular polling
++ 2. test if we can reach the well known beacon host
++ --> too slow for polling
++ 3. check /proc/net/dev on linux??
++ This method should be preferred, if possible. Need to do more
++ testing.
++
++*/
++
++void
++wxDialUpManagerImpl::CheckStatusInternal(void)
++{
++ m_IsOnline = -1;
++
++ // First time check for ifconfig location. We only use the variant
++ // which does not take arguments, a la GNU.
++ if(m_CanUseIfconfig == -1) // unknown
++ {
++ if(wxFileExists("/sbin/ifconfig"))
++ m_IfconfigPath = "/sbin/ifconfig";
++ else if(wxFileExists("/usr/sbin/ifconfig"))
++ m_IfconfigPath = "/usr/sbin/ifconfig";
++ }
++
++ wxLogNull ln; // suppress all error messages
++ // Let�s try the ifconfig method first, should be fastest:
++ if(m_CanUseIfconfig != 0) // unknown or yes
++ {
++ wxASSERT(m_IfconfigPath.length());
++
++ wxString tmpfile = wxGetTempFileName("_wxdialuptest");
++ wxString cmd = "/bin/sh -c \'";
++ cmd << m_IfconfigPath << " >" << tmpfile << '\'';
++ /* I tried to add an option to wxExecute() to not close stdout,
++ so we could let ifconfig write directly to the tmpfile, but
++ this does not work. That should be faster, as it doesn�t call
++ the shell first. I have no idea why. :-( (KB) */
++#if 0
++ // temporarily redirect stdout/stderr:
++ int
++ new_stdout = dup(STDOUT_FILENO),
++ new_stderr = dup(STDERR_FILENO);
++ close(STDOUT_FILENO);
++ close(STDERR_FILENO);
++
++ int
++ // new stdout:
++ output_fd = open(tmpfile, O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR),
++ // new stderr:
++ null_fd = open("/dev/null", O_CREAT, S_IRUSR|S_IWUSR);
++ // verify well behaved unix behaviour:
++ wxASSERT(output_fd == STDOUT_FILENO);
++ wxASSERT(null_fd == STDERR_FILENO);
++ int rc = wxExecute(m_IfconfigPath,TRUE /* sync */,NULL ,wxEXECUTE_DONT_CLOSE_FDS);
++ close(null_fd); close(output_fd);
++ // restore old stdout, stderr:
++ int test;
++ test = dup(new_stdout); close(new_stdout); wxASSERT(test == STDOUT_FILENO);
++ test = dup(new_stderr); close(new_stderr); wxASSERT(test == STDERR_FILENO);
++ if(rc == 0)
++#endif
++ if(wxExecute(cmd,TRUE /* sync */) == 0)
++ {
++ m_CanUseIfconfig = 1;
++ wxFile file;
++ if( file.Open(tmpfile) )
++ {
++ char *output = new char [file.Length()+1];
++ output[file.Length()] = '\0';
++ if(file.Read(output,file.Length()) == file.Length())
++ {
++ if(strstr(output,"ppp") // ppp
++ || strstr(output,"sl") // slip
++ || strstr(output,"pl") // plip
++ )
++ m_IsOnline = 1;
++ else
++ m_IsOnline = 0;
++ }
++ file.Close();
++ delete [] output;
++ }
++ // else m_IsOnline remains -1 as we don't know for sure
++ }
++ else // could not run ifconfig correctly
++ m_CanUseIfconfig = 0; // don�t try again
++ (void) wxRemoveFile(tmpfile);
++ if(m_IsOnline != -1) // we are done
++ return;
++ }
++
++ // second method: try to connect to well known host:
++ // This can be used under Win 9x, too!
++ struct hostent *hp;
++ struct sockaddr_in serv_addr;
++ int sockfd;
++
++ m_IsOnline = 0; // assume false
++ if((hp = gethostbyname(m_BeaconHost)) == NULL)
++ return; // no DNS no net
++
++ serv_addr.sin_family = hp->h_addrtype;
++ memcpy(&serv_addr.sin_addr,hp->h_addr, hp->h_length);
++ serv_addr.sin_port = htons(m_BeaconPort);
++ if( ( sockfd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0)
++ {
++ // sys_error("cannot create socket for gw");
++ return;
++ }
++ if( connect(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
++ {
++ //sys_error("cannot connect to server");
++ return;
++ }
++ //connected!
++ close(sockfd);
++}
++
++
++/* static */
++wxDialUpManager *
++wxDialUpManager::wxDialUpManager::Create(void)
++{
++ return new wxDialUpManagerImpl;
++}
++
++#endif // wxUSE_DIALUP_MANAGER
+Index: wxWidgets/utils/wxprop/src/prop.cpp
+===================================================================
+RCS file: prop.cpp
+diff -N prop.cpp
+--- /dev/null Thu Dec 14 21:48:56 2006
++++ wxWidgets/utils/wxprop/src/prop.cpp Thu Dec 14 21:48:57 2006
+@@ -0,0 +1,1119 @@
++/////////////////////////////////////////////////////////////////////////////
++// Name: prop.cpp
++// Purpose: Propert sheet classes implementation
++// Author: Julian Smart
++// Modified by:
++// Created: 04/01/98
++// RCS-ID: $Id: prop.cpp,v 1.11 1999/06/28 21:39:49 VZ Exp $
++// Copyright: (c) Julian Smart
++// Licence: wxWindows license
++/////////////////////////////////////////////////////////////////////////////
++
++#ifdef __GNUG__
++#pragma implementation "prop.h"
++#endif
++
++// For compilers that support precompilation, includes "wx/wx.h".
++#include "wx/wxprec.h"
++
++#ifdef __BORLANDC__
++#pragma hdrstop
++#endif
++
++#ifndef WX_PRECOMP
++#include "wx/wx.h"
++#endif
++
++#include <ctype.h>
++#include <stdlib.h>
++#include <math.h>
++#include <string.h>
++
++#if wxUSE_IOSTREAMH
++#if defined(__WXMSW__) && !defined(__GNUWIN32__)
++#include <strstrea.h>
++#else
++#include <strstream.h>
++#endif
++#else
++#include <strstream>
++#endif
++
++#include "wx/window.h"
++#include "wx/utils.h"
++#include "wx/list.h"
++#include "prop.h"
++
++IMPLEMENT_DYNAMIC_CLASS(wxPropertyValue, wxObject)
++
++wxPropertyValue::wxPropertyValue(void)
++{
++ m_type = wxPropertyValueNull;
++ m_next = NULL;
++ m_last = NULL;
++ m_value.first = NULL;
++ m_clientData = NULL;
++ m_modifiedFlag = FALSE;
++}
++
++wxPropertyValue::wxPropertyValue(const wxPropertyValue& copyFrom)
++{
++ m_modifiedFlag = FALSE;
++ Copy((wxPropertyValue& )copyFrom);
++}
++
++wxPropertyValue::wxPropertyValue(const char *val)
++{
++ m_modifiedFlag = FALSE;
++ m_type = wxPropertyValueString;
++
++ m_value.string = copystring(val);
++ m_clientData = NULL;
++ m_next = NULL;
++ m_last = NULL;
++}
++
++wxPropertyValue::wxPropertyValue(const wxString& val)
++{
++ m_modifiedFlag = FALSE;
++ m_type = wxPropertyValueString;
++
++ m_value.string = copystring((const char *)val);
++ m_clientData = NULL;
++ m_next = NULL;
++ m_last = NULL;
++}
++
++wxPropertyValue::wxPropertyValue(long the_integer)
++{
++ m_modifiedFlag = FALSE;
++ m_type = wxPropertyValueInteger;
++ m_value.integer = the_integer;
++ m_clientData = NULL;
++ m_next = NULL;
++}
++
++wxPropertyValue::wxPropertyValue(bool val)
++{
++ m_modifiedFlag = FALSE;
++ m_type = wxPropertyValuebool;
++ m_value.integer = val;
++ m_clientData = NULL;
++ m_next = NULL;
++}
++
++wxPropertyValue::wxPropertyValue(float the_real)
++{
++ m_modifiedFlag = FALSE;
++ m_type = wxPropertyValueReal;
++ m_value.real = the_real;
++ m_clientData = NULL;
++ m_next = NULL;
++}
++
++wxPropertyValue::wxPropertyValue(double the_real)
++{
++ m_modifiedFlag = FALSE;
++ m_type = wxPropertyValueReal;
++ m_value.real = (float)the_real;
++ m_clientData = NULL;
++ m_next = NULL;
++}
++
++// Pointer versions: we have a pointer to the real C++ value.
++wxPropertyValue::wxPropertyValue(char **val)
++{
++ m_modifiedFlag = FALSE;
++ m_type = wxPropertyValueStringPtr;
++
++ m_value.stringPtr = val;
++ m_clientData = NULL;
++ m_next = NULL;
++ m_last = NULL;
++}
++
++wxPropertyValue::wxPropertyValue(long *val)
++{
++ m_modifiedFlag = FALSE;
++ m_type = wxPropertyValueIntegerPtr;
++ m_value.integerPtr = val;
++ m_clientData = NULL;
++ m_next = NULL;
++}
++
++wxPropertyValue::wxPropertyValue(bool *val)
++{
++ m_modifiedFlag = FALSE;
++ m_type = wxPropertyValueboolPtr;
++ m_value.boolPtr = val;
++ m_clientData = NULL;
++ m_next = NULL;
++}
++
++wxPropertyValue::wxPropertyValue(float *val)
++{
++ m_modifiedFlag = FALSE;
++ m_type = wxPropertyValueRealPtr;
++ m_value.realPtr = val;
++ m_clientData = NULL;
++ m_next = NULL;
++}
++
++wxPropertyValue::wxPropertyValue(wxList *the_list)
++{
++ m_modifiedFlag = FALSE;
++ m_type = wxPropertyValueList;
++ m_clientData = NULL;
++ m_last = NULL;
++ m_value.first = NULL;
++
++ wxNode *node = the_list->First();
++ while (node)
++ {
++ wxPropertyValue *expr = (wxPropertyValue *)node->Data();
++ Append(expr);
++ node = node->Next();
++ }
++
++ delete the_list;
++}
++
++wxPropertyValue::wxPropertyValue(wxStringList *the_list)
++{
++ m_modifiedFlag = FALSE;
++ m_type = wxPropertyValueList;
++ m_clientData = NULL;
++ m_last = NULL;
++ m_value.first = NULL;
++
++ wxNode *node = the_list->First();
++ while (node)
++ {
++ char *s = (char *)node->Data();
++ Append(new wxPropertyValue(s));
++ node = node->Next();
++ }
++ delete the_list;
++}
++
++wxPropertyValue::~wxPropertyValue(void)
++{
++ switch (m_type)
++ {
++ case wxPropertyValueInteger:
++ case wxPropertyValuebool:
++ case wxPropertyValueReal:
++ {
++ break;
++ }
++ case wxPropertyValueString:
++ {
++ delete[] m_value.string;
++ break;
++ }
++ case wxPropertyValueList:
++ {
++ wxPropertyValue *expr = m_value.first;
++ while (expr)
++ {
++ wxPropertyValue *expr1 = expr->m_next;
++
++ delete expr;
++ expr = expr1;
++ }
++ break;
++ }
++ default:
++ case wxPropertyValueNull: break;
++ }
++}
++
++void wxPropertyValue::Append(wxPropertyValue *expr)
++{
++ m_modifiedFlag = TRUE;
++ if (!m_value.first)
++ m_value.first = expr;
++
++ if (m_last)
++ m_last->m_next = expr;
++ m_last = expr;
++}
++
++void wxPropertyValue::Insert(wxPropertyValue *expr)
++{
++ m_modifiedFlag = TRUE;
++ expr->m_next = m_value.first;
++ m_value.first = expr;
++
++ if (!m_last)
++ m_last = expr;
++}
++
++// Delete from list
++void wxPropertyValue::Delete(wxPropertyValue *node)
++{
++ wxPropertyValue *expr = GetFirst();
++
++ wxPropertyValue *previous = NULL;
++ while (expr && (expr != node))
++ {
++ previous = expr;
++ expr = expr->GetNext();
++ }
++
++ if (expr)
++ {
++ if (previous)
++ previous->m_next = expr->m_next;
++
++ // If node was the first in the list,
++ // make the list point to the NEXT one.
++ if (GetFirst() == expr)
++ {
++ m_value.first = expr->m_next;
++ }
++
++ // If node was the last in the list,
++ // make the list 'last' pointer point to the PREVIOUS one.
++ if (GetLast() == expr)
++ {
++ if (previous)
++ m_last = previous;
++ else
++ m_last = NULL;
++ }
++ m_modifiedFlag = TRUE;
++ delete expr;
++ }
++
++}
++
++void wxPropertyValue::ClearList(void)
++{
++ wxPropertyValue *val = GetFirst();
++ if (val)
++ m_modifiedFlag = TRUE;
++
++ while (val)
++ {
++ wxPropertyValue *next = val->GetNext();
++ delete val;
++ val = next;
++ }
++ m_value.first = NULL;
++ m_last = NULL;
++}
++
++wxPropertyValue *wxPropertyValue::NewCopy(void) const
++{
++ switch (m_type)
++ {
++ case wxPropertyValueInteger:
++ return new wxPropertyValue(m_value.integer);
++ case wxPropertyValuebool:
++ return new wxPropertyValue((bool) (m_value.integer != 0));
++ case wxPropertyValueReal:
++ return new wxPropertyValue(m_value.real);
++ case wxPropertyValueString:
++ return new wxPropertyValue(m_value.string);
++ case wxPropertyValueList:
++ {
++ wxPropertyValue *expr = m_value.first;
++ wxPropertyValue *new_list = new wxPropertyValue;
++ new_list->SetType(wxPropertyValueList);
++ while (expr)
++ {
++ wxPropertyValue *expr2 = expr->NewCopy();
++ new_list->Append(expr2);
++ expr = expr->m_next;
++ }
++ return new_list;
++ }
++ case wxPropertyValueIntegerPtr:
++ return new wxPropertyValue(m_value.integerPtr);
++ case wxPropertyValueRealPtr:
++ return new wxPropertyValue(m_value.realPtr);
++ case wxPropertyValueboolPtr:
++ return new wxPropertyValue(m_value.boolPtr);
++ case wxPropertyValueStringPtr:
++ return new wxPropertyValue(m_value.stringPtr);
++
++ case wxPropertyValueNull:
++#ifdef __X__
++ cerr << "Should never get here!\n";
++#endif
++ break;
++ }
++ return NULL;
++}
++
++void wxPropertyValue::Copy(wxPropertyValue& copyFrom)
++{
++ m_type = copyFrom.Type();
++
++ switch (m_type)
++ {
++ case wxPropertyValueInteger:
++ (*this) = copyFrom.IntegerValue();
++ return ;
++
++ case wxPropertyValueReal:
++ (*this) = copyFrom.RealValue();
++ return ;
++
++ case wxPropertyValueString:
++ (*this) = wxString(copyFrom.StringValue());
++ return ;
++
++ case wxPropertyValuebool:
++ (*this) = copyFrom.BoolValue();
++ return ;
++
++ // Pointers
++ case wxPropertyValueboolPtr:
++ (*this) = copyFrom.BoolValuePtr();
++ return ;
++ case wxPropertyValueRealPtr:
++ (*this) = copyFrom.RealValuePtr();
++ return ;
++ case wxPropertyValueIntegerPtr:
++ (*this) = copyFrom.IntegerValuePtr();
++ return ;
++ case wxPropertyValueStringPtr:
++ {
++ char** s = copyFrom.StringValuePtr();
++ (*this) = s != 0;
++ return ;
++ }
++
++ case wxPropertyValueList:
++ {
++ m_value.first = NULL;
++ m_next = NULL;
++ m_last = NULL;
++ wxPropertyValue *expr = copyFrom.m_value.first;
++ while (expr)
++ {
++ wxPropertyValue *expr2 = expr->NewCopy();
++ Append(expr2);
++ expr = expr->m_next;
++ }
++ return;
++ }
++ case wxPropertyValueNull:
++#ifdef __X__
++ cerr << "Should never get here!\n";
++#endif
++ break;
++ }
++}
++
++// Return nth argument of a clause (starting from 1)
++wxPropertyValue *wxPropertyValue::Arg(wxPropertyValueType type, int arg) const
++{
++ wxPropertyValue *expr = m_value.first;
++ for (int i = 1; i < arg; i++)
++ if (expr)
++ expr = expr->m_next;
++
++ if (expr && (expr->m_type == type))
++ return expr;
++ else
++ return NULL;
++}
++
++// Return nth argument of a list expression (starting from zero)
++wxPropertyValue *wxPropertyValue::Nth(int arg) const
++{
++ if (m_type != wxPropertyValueList)
++ return NULL;
++
++ wxPropertyValue *expr = m_value.first;
++ for (int i = 0; i < arg; i++)
++ if (expr)
++ expr = expr->m_next;
++ else return NULL;
++
++ if (expr)
++ return expr;
++ else
++ return NULL;
++}
++
++ // Returns the number of elements in a list expression
++int wxPropertyValue::Number(void) const
++{
++ if (m_type != wxPropertyValueList)
++ return 0;
++
++ int i = 0;
++ wxPropertyValue *expr = m_value.first;
++ while (expr)
++ {
++ expr = expr->m_next;
++ i ++;
++ }
++ return i;
++}
++
++void wxPropertyValue::WritePropertyClause(ostream& stream) // Write this expression as a top-level clause
++{
++ if (m_type != wxPropertyValueList)
++ return;
++
++ wxPropertyValue *node = m_value.first;
++ if (node)
++ {
++ node->WritePropertyType(stream);
++ stream << "(";
++ node = node->m_next;
++ bool first = TRUE;
++ while (node)
++ {
++ if (!first)
++ stream << " ";
++ node->WritePropertyType(stream);
++ node = node->m_next;
++ if (node) stream << ",\n";
++ first = FALSE;
++ }
++ stream << ").\n\n";
++ }
++}
++
++void wxPropertyValue::WritePropertyType(ostream& stream) // Write as any other subexpression
++{
++ switch (m_type)
++ {
++ case wxPropertyValueInteger:
++ {
++ stream << m_value.integer;
++ break;
++ }
++ case wxPropertyValueIntegerPtr:
++ {
++ stream << *m_value.integerPtr;
++ break;
++ }
++ case wxPropertyValuebool:
++ {
++ if (m_value.integer)
++ stream << "True";
++ else
++ stream << "False";
++ break;
++ }
++ case wxPropertyValueboolPtr:
++ {
++ if (*m_value.integerPtr)
++ stream << "True";
++ else
++ stream << "False";
++ break;
++ }
++ case wxPropertyValueReal:
++ {
++ float f = m_value.real;
++ sprintf(wxBuffer, "%.6g", (double)f);
++ stream << wxBuffer;
++ break;
++ }
++ case wxPropertyValueRealPtr:
++ {
++ float f = *m_value.realPtr;
++/* Now the parser can cope with this.
++ // Prevent printing in 'e' notation. Any better way?
++ if (fabs(f) < 0.00001)
++ f = 0.0;
++*/
++ sprintf(wxBuffer, "%.6g", f);
++ stream << wxBuffer;
++ break;
++ }
++ case wxPropertyValueString:
++ {
++// stream << "\"";
++ int i;
++ int len = strlen(m_value.string);
++ for (i = 0; i < len; i++)
++ {
++ char ch = m_value.string[i];
++// if (ch == '"' || ch == '\\')
++// stream << "\\";
++ stream << ch;
++ }
++
++// stream << "\"";
++ break;
++ }
++ case wxPropertyValueStringPtr:
++ {
++ int i;
++ int len = strlen(*(m_value.stringPtr));
++ for (i = 0; i < len; i++)
++ {
++ char ch = *(m_value.stringPtr)[i];
++
++ }
++ break;
++ }
++ case wxPropertyValueList:
++ {
++ if (!m_value.first)
++ stream << "[]";
++ else
++ {
++ wxPropertyValue *expr = m_value.first;
++
++ stream << "[";
++ while (expr)
++ {
++ expr->WritePropertyType(stream);
++ expr = expr->m_next;
++ if (expr) stream << ", ";
++ }
++ stream << "]";
++ }
++ break;
++ }
++ case wxPropertyValueNull: break;
++ }
++}
++
++wxString wxPropertyValue::GetStringRepresentation(void)
++{
++ char buf[500];
++ buf[0] = 0;
++
++ ostrstream str((char *)buf, (int)500, ios::out);
++ WritePropertyType(str);
++ str << '\0';
++ str.flush();
++
++ wxString theString(buf);
++ return theString;
++}
++
++void wxPropertyValue::operator=(const wxPropertyValue& val)
++{
++ m_modifiedFlag = TRUE;
++ Copy((wxPropertyValue&)val);
++}
++
++// void wxPropertyValue::operator=(const char *val)
++void wxPropertyValue::operator=(const wxString& val1)
++{
++ const char *val = (const char *)val1;
++
++ m_modifiedFlag = TRUE;
++ if (m_type == wxPropertyValueNull)
++ m_type = wxPropertyValueString;
++
++ if (m_type == wxPropertyValueString)
++ {
++ if (val)
++ m_value.string = copystring(val);
++ else
++ m_value.string = NULL;
++ }
++ else if (m_type == wxPropertyValueStringPtr)
++ {
++ if (*m_value.stringPtr)
++ delete[] *m_value.stringPtr;
++ if (val)
++ *m_value.stringPtr = copystring(val);
++ else
++ *m_value.stringPtr = NULL;
++ }
++
++ m_clientData = NULL;
++ m_next = NULL;
++ m_last = NULL;
++
++}
++
++void wxPropertyValue::operator=(const long val)
++{
++ m_modifiedFlag = TRUE;
++ if (m_type == wxPropertyValueNull)
++ m_type = wxPropertyValueInteger;
++
++ if (m_type == wxPropertyValueInteger)
++ m_value.integer = val;
++ else if (m_type == wxPropertyValueIntegerPtr)
++ *m_value.integerPtr = val;
++ else if (m_type == wxPropertyValueReal)
++ m_value.real = (float)val;
++ else if (m_type == wxPropertyValueRealPtr)
++ *m_value.realPtr = (float)val;
++
++ m_clientData = NULL;
++ m_next = NULL;
++}
++
++void wxPropertyValue::operator=(const bool val)
++{
++ m_modifiedFlag = TRUE;
++ if (m_type == wxPropertyValueNull)
++ m_type = wxPropertyValuebool;
++
++ if (m_type == wxPropertyValuebool)
++ m_value.integer = (long)val;
++ else if (m_type == wxPropertyValueboolPtr)
++ *m_value.boolPtr = val;
++
++ m_clientData = NULL;
++ m_next = NULL;
++}
++
++void wxPropertyValue::operator=(const float val)
++{
++ m_modifiedFlag = TRUE;
++ if (m_type == wxPropertyValueNull)
++ m_type = wxPropertyValueReal;
++
++ if (m_type == wxPropertyValueInteger)
++ m_value.integer = (long)val;
++ else if (m_type == wxPropertyValueIntegerPtr)
++ *m_value.integerPtr = (long)val;
++ else if (m_type == wxPropertyValueReal)
++ m_value.real = val;
++ else if (m_type == wxPropertyValueRealPtr)
++ *m_value.realPtr = val;
++
++ m_clientData = NULL;
++ m_next = NULL;
++}
++
++void wxPropertyValue::operator=(const char **val)
++{
++ m_modifiedFlag = TRUE;
++ m_type = wxPropertyValueStringPtr;
++
++ if (val)
++ m_value.stringPtr = (char **)val;
++ else
++ m_value.stringPtr = NULL;
++ m_clientData = NULL;
++ m_next = NULL;
++ m_last = NULL;
++
++}
++
++void wxPropertyValue::operator=(const long *val)
++{
++ m_modifiedFlag = TRUE;
++ m_type = wxPropertyValueIntegerPtr;
++ m_value.integerPtr = (long *)val;
++ m_clientData = NULL;
++ m_next = NULL;
++}
++
++void wxPropertyValue::operator=(const bool *val)
++{
++ m_modifiedFlag = TRUE;
++ m_type = wxPropertyValueboolPtr;
++ m_value.boolPtr = (bool *)val;
++ m_clientData = NULL;
++ m_next = NULL;
++}
++
++void wxPropertyValue::operator=(const float *val)
++{
++ m_modifiedFlag = TRUE;
++ m_type = wxPropertyValueRealPtr;
++ m_value.realPtr = (float *)val;
++ m_clientData = NULL;
++ m_next = NULL;
++}
++
++long wxPropertyValue::IntegerValue(void) const
++ {
++ if (m_type == wxPropertyValueInteger)
++ return m_value.integer;
++ else if (m_type == wxPropertyValueReal)
++ return (long)m_value.real;
++ else if (m_type == wxPropertyValueIntegerPtr)
++ return *m_value.integerPtr;
++ else if (m_type == wxPropertyValueRealPtr)
++ return (long)(*m_value.realPtr);
++ else return 0;
++ }
++
++long *wxPropertyValue::IntegerValuePtr(void) const
++{
++ return m_value.integerPtr;
++}
++
++float wxPropertyValue::RealValue(void) const {
++ if (m_type == wxPropertyValueReal)
++ return m_value.real;
++ else if (m_type == wxPropertyValueRealPtr)
++ return *m_value.realPtr;
++ else if (m_type == wxPropertyValueInteger)
++ return (float)m_value.integer;
++ else if (m_type == wxPropertyValueIntegerPtr)
++ return (float)*(m_value.integerPtr);
++ else return 0.0;
++ }
++
++float *wxPropertyValue::RealValuePtr(void) const
++{
++ return m_value.realPtr;
++}
++
++bool wxPropertyValue::BoolValue(void) const {
++ if (m_type == wxPropertyValueReal)
++ return (m_value.real != 0.0);
++ if (m_type == wxPropertyValueRealPtr)
++ return (*(m_value.realPtr) != 0.0);
++ else if (m_type == wxPropertyValueInteger)
++ return (m_value.integer != 0);
++ else if (m_type == wxPropertyValueIntegerPtr)
++ return (*(m_value.integerPtr) != 0);
++ else if (m_type == wxPropertyValuebool)
++ return (m_value.integer != 0);
++ else if (m_type == wxPropertyValueboolPtr)
++ return (*(m_value.boolPtr) != 0);
++ else return FALSE;
++ }
++
++bool *wxPropertyValue::BoolValuePtr(void) const
++{
++ return m_value.boolPtr;
++}
++
++char *wxPropertyValue::StringValue(void) const {
++ if (m_type == wxPropertyValueString)
++ return m_value.string;
++ else if (m_type == wxPropertyValueStringPtr)
++ return *(m_value.stringPtr);
++ else return NULL;
++ }
++
++char **wxPropertyValue::StringValuePtr(void) const
++{
++ return m_value.stringPtr;
++}
++
++/*
++ * A property (name plus value)
++ */
++
++IMPLEMENT_DYNAMIC_CLASS(wxProperty, wxObject)
++
++wxProperty::wxProperty(void)
++{
++ m_propertyRole = (char *)NULL;
++ m_propertyValidator = NULL;
++ m_propertyWindow = NULL;
++ m_enabled = TRUE;
++}
++
++wxProperty::wxProperty(wxProperty& copyFrom)
++{
++ m_value = copyFrom.GetValue();
++ m_name = copyFrom.GetName();
++ m_propertyRole = copyFrom.GetRole();
++ m_propertyValidator = copyFrom.GetValidator();
++ m_enabled = copyFrom.IsEnabled();
++ m_propertyWindow = NULL;
++}
++
++wxProperty::wxProperty(wxString nm, wxString role, wxPropertyValidator *ed):m_name(nm), m_propertyRole(role)
++{
++ m_propertyValidator = ed;
++ m_propertyWindow = NULL;
++ m_enabled = TRUE;
++}
++
++wxProperty::wxProperty(wxString nm, const wxPropertyValue& val, wxString role, wxPropertyValidator *ed):
++ m_name(nm), m_value(val), m_propertyRole(role)
++{
++ m_propertyValidator = ed;
++ m_propertyWindow = NULL;
++ m_enabled = TRUE;
++}
++
++wxProperty::~wxProperty(void)
++{
++ if (m_propertyValidator)
++ delete m_propertyValidator;
++}
++
++wxPropertyValue& wxProperty::GetValue(void) const
++{
++ return (wxPropertyValue&) m_value;
++}
++
++wxPropertyValidator *wxProperty::GetValidator(void) const
++{
++ return m_propertyValidator;
++}
++
++wxString& wxProperty::GetName(void) const
++{
++ return (wxString&) m_name;
++}
++
++wxString& wxProperty::GetRole(void) const
++{
++ return (wxString&) m_propertyRole;
++}
++
++void wxProperty::SetValue(const wxPropertyValue& val)
++{
++ m_value = val;
++}
++
++void wxProperty::SetValidator(wxPropertyValidator *ed)
++{
++ m_propertyValidator = ed;
++}
++
++void wxProperty::SetRole(wxString& role)
++{
++ m_propertyRole = role;
++}
++
++void wxProperty::SetName(wxString& nm)
++{
++ m_name = nm;
++}
++
++void wxProperty::operator=(const wxPropertyValue& val)
++{
++ m_value = val;
++}
++
++/*
++ * Base property view class
++ */
++
++IMPLEMENT_DYNAMIC_CLASS(wxPropertyView, wxEvtHandler)
++
++wxPropertyView::wxPropertyView(long flags)
++{
++ m_buttonFlags = flags;
++ m_propertySheet = NULL;
++ m_currentValidator = NULL;
++ m_currentProperty = NULL;
++}
++
++wxPropertyView::~wxPropertyView(void)
++{
++}
++
++void wxPropertyView::AddRegistry(wxPropertyValidatorRegistry *registry)
++{
++ m_validatorRegistryList.Append(registry);
++}
++
++wxPropertyValidator *wxPropertyView::FindPropertyValidator(wxProperty *property)
++{
++ if (property->GetValidator())
++ return property->GetValidator();
++
++ wxNode *node = m_validatorRegistryList.First();
++ while (node)
++ {
++ wxPropertyValidatorRegistry *registry = (wxPropertyValidatorRegistry *)node->Data();
++ wxPropertyValidator *validator = registry->GetValidator(property->GetRole());
++ if (validator)
++ return validator;
++ node = node->Next();
++ }
++ return NULL;
++/*
++ if (!wxDefaultPropertyValidator)
++ wxDefaultPropertyValidator = new wxPropertyListValidator;
++ return wxDefaultPropertyValidator;
++*/
++}
++
++/*
++ * Property sheet
++ */
++
++IMPLEMENT_DYNAMIC_CLASS(wxPropertySheet, wxObject)
++
++wxPropertySheet::wxPropertySheet(void):m_properties(wxKEY_STRING)
++{
++}
++
++wxPropertySheet::~wxPropertySheet(void)
++{
++ Clear();
++}
++
++bool wxPropertySheet::Save( ostream& WXUNUSED(str) )
++{
++ return FALSE;
++}
++
++bool wxPropertySheet::Load( ostream& WXUNUSED(str) )
++{
++ return FALSE;
++}
++
++void wxPropertySheet::UpdateAllViews( wxPropertyView *WXUNUSED(thisView) )
++{
++}
++
++// Add a property
++void wxPropertySheet::AddProperty(wxProperty *property)
++{
++ m_properties.Append((const char*) property->GetName(), property);
++}
++
++// Get property by name
++wxProperty *wxPropertySheet::GetProperty(wxString name)
++{
++ wxNode *node = m_properties.Find((const char*) name);
++ if (!node)
++ return NULL;
++ else
++ return (wxProperty *)node->Data();
++}
++
++// Clear all properties
++void wxPropertySheet::Clear(void)
++{
++ wxNode *node = m_properties.First();
++ while (node)
++ {
++ wxProperty *prop = (wxProperty *)node->Data();
++ wxNode *next = node->Next();
++ delete prop;
++ delete node;
++ node = next;
++ }
++}
++
++// Sets/clears the modified flag for each property value
++void wxPropertySheet::SetAllModified(bool flag)
++{
++ wxNode *node = m_properties.First();
++ while (node)
++ {
++ wxProperty *prop = (wxProperty *)node->Data();
++ prop->GetValue().SetModified(flag);
++ node = node->Next();
++ }
++}
++
++/*
++ * Property validator registry
++ *
++ */
++
++IMPLEMENT_DYNAMIC_CLASS(wxPropertyValidatorRegistry, wxHashTable)
++
++wxPropertyValidatorRegistry::wxPropertyValidatorRegistry(void):wxHashTable(wxKEY_STRING)
++{
++}
++
++wxPropertyValidatorRegistry::~wxPropertyValidatorRegistry(void)
++{
++ ClearRegistry();
++}
++
++void wxPropertyValidatorRegistry::RegisterValidator(const wxString& typeName, wxPropertyValidator *validator)
++{
++ Put((const char*) typeName, validator);
++}
++
++wxPropertyValidator *wxPropertyValidatorRegistry::GetValidator(const wxString& typeName)
++{
++ return (wxPropertyValidator *)Get((const char*) typeName);
++}
++
++void wxPropertyValidatorRegistry::ClearRegistry(void)
++{
++ BeginFind();
++ wxNode *node;
++ while (node = Next())
++ {
++ delete (wxPropertyValidator *)node->Data();
++ }
++}
++
++ /*
++ * Property validator
++ */
++
++
++IMPLEMENT_ABSTRACT_CLASS(wxPropertyValidator, wxEvtHandler)
++
++wxPropertyValidator::wxPropertyValidator(long flags)
++{
++ m_validatorFlags = flags;
++ m_validatorProperty = NULL;
++}
++
++wxPropertyValidator::~wxPropertyValidator(void)
++{}
++
++bool wxPropertyValidator::StringToFloat (char *s, float *number) {
++ double num;
++ bool ok = StringToDouble (s, &num);
++ *number = (float) num;
++ return ok;
++}
++
++bool wxPropertyValidator::StringToDouble (char *s, double *number) {
++ bool ok = TRUE;
++ char *value_ptr;
++ *number = strtod (s, &value_ptr);
++ if (value_ptr) {
++ int len = strlen (value_ptr);
++ for (int i = 0; i < len; i++) {
++ ok = (isspace (value_ptr[i]) != 0);
++ if (!ok) return FALSE;
++ }
++ }
++ return ok;
++}
++
++bool wxPropertyValidator::StringToInt (char *s, int *number) {
++ long num;
++ bool ok = StringToLong (s, &num);
++ *number = (int) num;
++ return ok;
++}
++
++bool wxPropertyValidator::StringToLong (char *s, long *number) {
++ bool ok = TRUE;
++ char *value_ptr;
++ *number = strtol (s, &value_ptr, 10);
++ if (value_ptr) {
++ int len = strlen (value_ptr);
++ for (int i = 0; i < len; i++) {
++ ok = (isspace (value_ptr[i]) != 0);
++ if (!ok) return FALSE;
++ }
++ }
++ return ok;
++}
++
++char *wxPropertyValidator::FloatToString (float number) {
++ static char buf[20];
++ sprintf (buf, "%.6g", number);
++ return buf;
++}
++
++char *wxPropertyValidator::DoubleToString (double number) {
++ static char buf[20];
++ sprintf (buf, "%.6g", number);
++ return buf;
++}
++
++char *wxPropertyValidator::IntToString (int number) {
++ return ::IntToString (number);
++}
++
++char *wxPropertyValidator::LongToString (long number) {
++ return ::LongToString (number);
++ }
++
++
diff --git a/wxGTK.spec b/wxGTK.spec
index 9375967..1007894 100644
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -5,8 +5,8 @@
%define withodbc 0
Name: wxGTK
-Version: 2.6.3
-Release: 2.6.3.2.3%{?dist}
+Version: 2.8.0
+Release: 2.8.0.1.1%{?dist}
Summary: GTK2 port of the wxWidgets GUI library
# The wxWindows licence is the LGPL with a specific exemption allowing
# distribution of derived binaries under any terms. (This will eventually
@@ -15,13 +15,15 @@ License: wxWidgets Library Licence
Group: System Environment/Libraries
URL: http://www.wxwidgets.org/
Source0: http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
-Patch0: wxGTK-2.6.3.2-cvs.patch
+Patch0: wxGTK-2.8.0.1-cvs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel, zlib-devel >= 1.1.4
BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel
BuildRequires: expat-devel, SDL-devel, libgnomeprintui22-devel
BuildRequires: libGL-devel, libGLU-devel
+BuildRequires: gstreamer-devel >= 0.10
+BuildRequires: autoconf
%if %{withodbc}
BuildRequires: unixODBC-devel
%endif
@@ -89,19 +91,22 @@ ODBC (a SQL database connectivity API) add-on for the wxWidgets library.
%prep
%setup -q
-%patch0 -p1 -b .2.6.3.2
+%patch0 -p1 -b .2.8.0.1
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
%build
+
+# must do this to regenerate ./configure after the 2.8.0.1 patch.
+autoconf
+
export GDK_USE_XFT=1
# --disable-optimise prevents our $RPM_OPT_FLAGS being overridden
# (see OPTIMISE in configure).
%configure \
--x-libraries=%{x11libdir} \
- --with-gtk=2 \
--with-opengl \
%if %{withodbc}
--with-odbc \
@@ -112,14 +117,25 @@ export GDK_USE_XFT=1
--enable-soname \
--disable-optimise \
--enable-debug_info \
+ --enable-intl \
--enable-unicode \
- --enable-compat22
+ --enable-no_deps \
+ --disable-rpath \
+ --enable-geometry \
+ --enable-graphics_ctx \
+ --enable-sound \
+ --enable-mediactrl \
+ --enable-display \
+ --enable-compat24
make %{?_smp_mflags}
make %{?_smp_mflags} -C contrib/src/stc
make %{?_smp_mflags} -C contrib/src/ogl
make %{?_smp_mflags} -C contrib/src/gizmos
-make %{?_smp_mflags} -C contrib/src/animate
+make %{?_smp_mflags} -C contrib/src/svg
+
+# Why isn't this this part of the main build? Need to investigate.
+make %{?_smp_mflags} -C locale allmo
%install
rm -rf $RPM_BUILD_ROOT
@@ -129,12 +145,13 @@ rm -rf $RPM_BUILD_ROOT
%makeinstall -C contrib/src/stc
%makeinstall -C contrib/src/ogl
%makeinstall -C contrib/src/gizmos
-%makeinstall -C contrib/src/animate
+%makeinstall -C contrib/src/svg
+
# this ends up being a symlink into the buildroot directly --
# not what we want!
rm $RPM_BUILD_ROOT%{_bindir}/wx-config
-ln -s %{_libdir}/wx/config/gtk2-unicode-release-2.6 $RPM_BUILD_ROOT%{_bindir}/wx-config
+ln -s %{_libdir}/wx/config/gtk2-unicode-release-2.8 $RPM_BUILD_ROOT%{_bindir}/wx-config
%find_lang wxstd
%find_lang wxmsw
@@ -153,27 +170,29 @@ rm -rf $RPM_BUILD_ROOT
%files -f wxstd.lang
%defattr(-,root,root,-)
-%doc CHANGES*.txt COPYING.LIB LICENCE.txt README*.txt
+%doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt
+%doc docs/licendoc.txt docs/preamble.txt docs/readme.txt
%{_libdir}/libwx_baseu-*.so.*
%{_libdir}/libwx_baseu_net-*.so.*
%{_libdir}/libwx_baseu_xml-*.so.*
%{_libdir}/libwx_gtk2u_adv-*.so.*
-%{_libdir}/libwx_gtk2u_animate-*.so.*
+%{_libdir}/libwx_gtk2u_aui-*.so.*
%{_libdir}/libwx_gtk2u_core-*.so.*
%{_libdir}/libwx_gtk2u_gizmos-*.so.*
%{_libdir}/libwx_gtk2u_gizmos_xrc*.so.*
%{_libdir}/libwx_gtk2u_html-*.so.*
-%{_libdir}/libwx_gtk2u_media-*.so.*
%{_libdir}/libwx_gtk2u_ogl-*.so.*
-%{_libdir}/libwx_gtk2u_xrc-*.so.*
-%{_libdir}/libwx_gtk2u_stc-*.so.*
%{_libdir}/libwx_gtk2u_qa-*.so.*
+%{_libdir}/libwx_gtk2u_richtext-*.so.*
+%{_libdir}/libwx_gtk2u_stc-*.so.*
+%{_libdir}/libwx_gtk2u_svg-*.so.*
+%{_libdir}/libwx_gtk2u_xrc-*.so.*
%files devel
%defattr(-,root,root,-)
%{_bindir}/wx-config
%{_bindir}/wxrc*
-%{_includedir}/wx-2.6
+%{_includedir}/wx-2.8
%{_libdir}/libwx_*.so
%dir %{_libdir}/wx
%dir %{_libdir}/wx/include
@@ -194,6 +213,27 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Dec 14 2006 Matthew Miller <mattdm@mattdm.org> - 2.8.0-2.8.0.1.1
+- patch to 2.8.0.1 wxPython subrelease (following upstream wxPython)
+ from wxWidgets CVS
+
+* Thu Dec 14 2006 Matthew Miller <mattdm@mattdm.org> - 2.8.0-2.8.0.0.1
+- update to 2.8.0 release
+- gtk2 is now the default (and gtk1.2 gone -- about time!)
+- compatibility with wxWidgets 2.2 is now gone; add flag to build 2.4 with
+ compatibility, though (now off by default)
+- added "--enable-no_deps" for faster builds
+- added "--enable-intl", because that seems like a good idea
+- added disable-rpath, enable-geometry, enable-graphics_ctx, enable-sound,
+ enable-mediactrl, and enable-display to better match upstream wxPython
+ package.
+- buildrequires: gstreamer-devel
+- "animate" contributed module no longer exists.
+- enable the svg contributed module
+- build the .mo files explicitly -- not sure why that's not happening
+ automatically.
+- minor -- location of doc files in src tarball has changed
+
* Mon Aug 28 2006 Matthew Miller <mattdm@mattdm.org> - 2.6.3-2.6.3.2.3
- bump release for FC6 rebuild