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: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $)dnl
+AC_REVISION($Id: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $)dnl
 
 dnl ---------------------------------------------------------------------------
 dnl
@@ -8,7 +8,7 @@
 dnl
 dnl This script is under the wxWidgets licence.
 dnl
-dnl Version: $Id: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $
+dnl Version: $Id: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $
+ * $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $
+ * $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $
+*  RCS-ID:      $Id: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $
+// RCS-ID:      $Id: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $
+// RCS-ID:      $Id: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $
+// RCS-ID:      $Id: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $
+// RCS-ID:      $Id: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $
+// RCS_ID:     $Id: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $
+// Id:          $Id: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $
+// Id:          $Id: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $
+// Id:          $Id: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* "$Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* "$Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $
+$Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $" */
+/* "$Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $ */
+/* $Header: /home/fedora/jkeating/pkgs/rpms/wxGTK/FC-6/wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm Exp $
+// RCS-ID:      $Id: wxGTK-2.6.3.2-cvs.patch,v 1.1 2006/04/13 19:11:46 mattdm 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;