diff --git a/locale/af.po b/locale/af.po
index 66239bd010..42e73011d6 100644
--- a/locale/af.po
+++ b/locale/af.po
@@ -1,7 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWindows-2.5.1\n"
-"POT-Creation-Date: 2002-12-12 11:59+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-02-04 18:56+0100\n"
 "PO-Revision-Date: 2004-02-24 16:39+0200\n"
 "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
 "Language-Team: wxWindows translators <wx-translators@wxwindows.org>\n"
@@ -42,10 +43,8 @@ msgstr "Koevert nr.14, 5 x 11 1/2 duim"
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "Koevert nr.9, 3 7/8 x 8 7/8 duim"
 
-#: ../src/html/helpfrm.cpp:867
-#: ../src/html/helpfrm.cpp:868
-#: ../src/html/helpfrm.cpp:1505
-#: ../src/html/helpfrm.cpp:1535
+#: ../src/html/helpfrm.cpp:867 ../src/html/helpfrm.cpp:868
+#: ../src/html/helpfrm.cpp:1505 ../src/html/helpfrm.cpp:1535
 #, c-format
 msgid "%i of %i"
 msgstr "%i van %i"
@@ -88,8 +87,7 @@ msgstr "&Aangaande..."
 msgid "&Arrange Icons"
 msgstr "R&angskik ikone"
 
-#: ../src/generic/fdrepdlg.cpp:164
-#: ../src/generic/wizard.cpp:401
+#: ../src/generic/fdrepdlg.cpp:164 ../src/generic/wizard.cpp:401
 msgid "&Cancel"
 msgstr "&Kanselleer"
 
@@ -97,10 +95,8 @@ msgstr "&Kanselleer"
 msgid "&Cascade"
 msgstr "&Trapsgewys"
 
-#: ../src/common/prntbase.cpp:439
-#: ../src/generic/logg.cpp:502
-#: ../src/generic/tipdlg.cpp:213
-#: ../src/html/helpfrm.cpp:271
+#: ../src/common/prntbase.cpp:439 ../src/generic/logg.cpp:502
+#: ../src/generic/tipdlg.cpp:213 ../src/html/helpfrm.cpp:271
 msgid "&Close"
 msgstr "Maak &toe"
 
@@ -140,13 +136,11 @@ msgstr "&Boekstawing"
 msgid "&Move"
 msgstr "&Verskuif"
 
-#: ../src/generic/mdig.cpp:117
-#: ../src/msw/mdi.cpp:192
+#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:192
 msgid "&Next"
 msgstr "&Volgende"
 
-#: ../src/generic/wizard.cpp:400
-#: ../src/generic/wizard.cpp:582
+#: ../src/generic/wizard.cpp:400 ../src/generic/wizard.cpp:582
 msgid "&Next >"
 msgstr "&Volgende >"
 
@@ -162,8 +156,7 @@ msgstr "&Open..."
 msgid "&Paste"
 msgstr "&Plak"
 
-#: ../src/generic/mdig.cpp:118
-#: ../src/msw/mdi.cpp:193
+#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:193
 msgid "&Previous"
 msgstr "Vo&rige"
 
@@ -171,14 +164,12 @@ msgstr "Vo&rige"
 msgid "&Print..."
 msgstr "&Druk..."
 
-#: ../src/common/cmdproc.cpp:285
-#: ../src/common/cmdproc.cpp:292
+#: ../src/common/cmdproc.cpp:285 ../src/common/cmdproc.cpp:292
 #: ../src/msw/textctrl.cpp:2048
 msgid "&Redo"
 msgstr "He&rdoen"
 
-#: ../src/common/cmdproc.cpp:281
-#: ../src/common/cmdproc.cpp:301
+#: ../src/common/cmdproc.cpp:281 ../src/common/cmdproc.cpp:301
 msgid "&Redo "
 msgstr "He&rdoen "
 
@@ -190,8 +181,7 @@ msgstr "Vervang"
 msgid "&Restore"
 msgstr "He&rstel"
 
-#: ../src/generic/logg.cpp:498
-#: ../src/generic/logg.cpp:827
+#: ../src/generic/logg.cpp:498 ../src/generic/logg.cpp:827
 msgid "&Save..."
 msgstr "&Stoor..."
 
@@ -203,8 +193,7 @@ msgstr "&Wys wenke as program begin"
 msgid "&Size"
 msgstr "&Formaat"
 
-#: ../src/common/cmdproc.cpp:263
-#: ../src/msw/textctrl.cpp:2047
+#: ../src/common/cmdproc.cpp:263 ../src/msw/textctrl.cpp:2047
 msgid "&Undo"
 msgstr "He&rstel"
 
@@ -212,23 +201,18 @@ msgstr "He&rstel"
 msgid "&Undo "
 msgstr "He&rstel "
 
-#: ../src/generic/mdig.cpp:297
-#: ../src/generic/mdig.cpp:313
-#: ../src/generic/mdig.cpp:317
-#: ../src/msw/mdi.cpp:1333
-#: ../src/msw/mdi.cpp:1340
+#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
+#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1333 ../src/msw/mdi.cpp:1340
 #: ../src/msw/mdi.cpp:1370
 msgid "&Window"
 msgstr "&Venster"
 
-#: ../src/common/config.cpp:414
-#: ../src/msw/regconf.cpp:265
+#: ../src/common/config.cpp:414 ../src/msw/regconf.cpp:265
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' het ekstra '..', ge�gnoreer"
 
-#: ../src/common/valtext.cpp:136
-#: ../src/common/valtext.cpp:166
+#: ../src/common/valtext.cpp:136 ../src/common/valtext.cpp:166
 #: ../src/common/valtext.cpp:172
 #, c-format
 msgid "'%s' is invalid"
@@ -273,19 +257,16 @@ msgstr "'%s' mag alleen alfa-numerieke tekens bevat."
 msgid "(Help)"
 msgstr "(Help)"
 
-#: ../src/html/helpfrm.cpp:345
-#: ../src/html/helpfrm.cpp:935
+#: ../src/html/helpfrm.cpp:345 ../src/html/helpfrm.cpp:935
 #: ../src/html/helpfrm.cpp:1563
 msgid "(bookmarks)"
 msgstr "(favorieten)"
 
-#: ../src/generic/dirctrlg.cpp:677
-#: ../src/generic/filedlgg.cpp:707
+#: ../src/generic/dirctrlg.cpp:677 ../src/generic/filedlgg.cpp:707
 msgid "."
 msgstr "."
 
-#: ../src/generic/dirctrlg.cpp:678
-#: ../src/generic/filedlgg.cpp:708
+#: ../src/generic/dirctrlg.cpp:678 ../src/generic/filedlgg.cpp:708
 msgid ".."
 msgstr ".."
 
@@ -325,18 +306,15 @@ msgstr "< &Terug"
 msgid "<<"
 msgstr "<<"
 
-#: ../src/generic/filedlgg.cpp:248
-#: ../src/generic/filedlgg.cpp:271
+#: ../src/generic/filedlgg.cpp:248 ../src/generic/filedlgg.cpp:271
 msgid "<DIR>"
 msgstr "<DIR>"
 
-#: ../src/generic/filedlgg.cpp:252
-#: ../src/generic/filedlgg.cpp:275
+#: ../src/generic/filedlgg.cpp:252 ../src/generic/filedlgg.cpp:275
 msgid "<DRIVE>"
 msgstr "<Aandrywer>"
 
-#: ../src/generic/filedlgg.cpp:250
-#: ../src/generic/filedlgg.cpp:273
+#: ../src/generic/filedlgg.cpp:250 ../src/generic/filedlgg.cpp:273
 msgid "<LINK>"
 msgstr "<LINK>"
 
@@ -431,7 +409,8 @@ msgstr "Alle l
 
 #: ../src/common/xtistrm.cpp:383
 msgid "Already Registered Object passed to SetObjectClassInfo"
-msgstr "Die objek wat aangestuur is vir SetObjectClassInfo is alreeds geregistreer"
+msgstr ""
+"Die objek wat aangestuur is vir SetObjectClassInfo is alreeds geregistreer"
 
 #: ../src/unix/dialup.cpp:362
 msgid "Already dialling ISP."
@@ -470,8 +449,7 @@ msgstr "B5, 182, 257 mm"
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 Koevert, 176 x 125 mm"
 
-#: ../src/common/imagbmp.cpp:470
-#: ../src/common/imagbmp.cpp:486
+#: ../src/common/imagbmp.cpp:470 ../src/common/imagbmp.cpp:486
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: kon geen geheue toeken nie."
 
@@ -547,8 +525,7 @@ msgstr "C6 Koevert, 114 x 162 mm"
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 Koevert, 114 x 229 mm"
 
-#: ../src/html/chm.cpp:783
-#: ../src/html/chm.cpp:842
+#: ../src/html/chm.cpp:783 ../src/html/chm.cpp:842
 msgid "CHM handler currently supports only local files!"
 msgstr "CHM-hanteerder ondersteun tans slegs plaaslike l�ers!"
 
@@ -561,8 +538,7 @@ msgstr "Kan nie wedersydse slot skep nie."
 msgid "Can not enumerate files '%s'"
 msgstr "Kan l�ers in gids '%s' nie opsom nie"
 
-#: ../src/msw/dir.cpp:300
-#: ../src/unix/dir.cpp:232
+#: ../src/msw/dir.cpp:300 ../src/unix/dir.cpp:232
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "Kan l�ers in gids '%s' nie opsom nie"
@@ -572,8 +548,7 @@ msgstr "Kan l
 msgid "Can not resume thread %lu"
 msgstr "Kan nie uitvoerdraad %lu laat voortgaan nie"
 
-#: ../src/mac/thread.cpp:477
-#: ../src/msw/thread.cpp:821
+#: ../src/mac/thread.cpp:477 ../src/msw/thread.cpp:821
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "Kan uitvoerdraad %x nie laat voortgaan nie"
@@ -587,8 +562,7 @@ msgstr "Kan uitvoerdraad nie laat begin nie: fout met skryf van TLS."
 msgid "Can not suspend thread %lu"
 msgstr "Kan nie uitvoerdraad %lu tydelik ophef nie"
 
-#: ../src/mac/thread.cpp:453
-#: ../src/msw/thread.cpp:806
+#: ../src/mac/thread.cpp:453 ../src/msw/thread.cpp:806
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "Kan uitvoerdraad %x nie opskort nie"
@@ -618,15 +592,16 @@ msgstr "Kan geen waardes van nie-ondersteunde tipe %d kopieer nie."
 
 #: ../src/msw/listctrl.cpp:413
 msgid "Can't create list control window, check that comctl32.dll is installed."
-msgstr "Kan geen list-control venster skep nie, sorg dat comctl32.dll ge�nstalleer is."
+msgstr ""
+"Kan geen list-control venster skep nie, sorg dat comctl32.dll ge�nstalleer "
+"is."
 
 #: ../src/msw/registry.cpp:428
 #, c-format
 msgid "Can't create registry key '%s'"
 msgstr "Kan registersleutel '%s' nie skep nie"
 
-#: ../src/mac/thread.cpp:430
-#: ../src/msw/thread.cpp:593
+#: ../src/mac/thread.cpp:430 ../src/msw/thread.cpp:593
 #: ../src/os2/thread.cpp:491
 msgid "Can't create thread"
 msgstr "Kan uitvoerdraad nie skep nie"
@@ -641,8 +616,7 @@ msgstr "Kan venster van klas '%s' nie skep nie"
 msgid "Can't delete key '%s'"
 msgstr "Kan sleutel '%s' nie verwyder nie"
 
-#: ../src/msw/iniconf.cpp:444
-#: ../src/os2/iniconf.cpp:448
+#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "Kan INI-l�er '%s' nie uitvee nie"
@@ -685,8 +659,7 @@ msgstr "Kan nie zlib-afblaasstroom inisialiseer nie."
 msgid "Can't initialize zlib inflate stream."
 msgstr "Kan nie zlib-opblaasstroom inisialiseer nie."
 
-#: ../src/common/image.cpp:1028
-#: ../src/common/image.cpp:1048
+#: ../src/common/image.cpp:1028 ../src/common/image.cpp:1048
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
 msgstr "Kan geen beeld laai uit l�er '%s': l�er bestaan nie."
@@ -703,15 +676,15 @@ msgstr "kan nie lees van opblaasstroom lees nie %s\n"
 
 #: ../src/common/zstream.cpp:121
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
-msgstr "Kan nie opblaasstroom lees nie: onverwagte EOF in onderliggende stroom."
+msgstr ""
+"Kan nie opblaasstroom lees nie: onverwagte EOF in onderliggende stroom."
 
 #: ../src/msw/registry.cpp:930
 #, c-format
 msgid "Can't read value of '%s'"
 msgstr "Kan waarde van '%s' nie lees nie"
 
-#: ../src/msw/registry.cpp:808
-#: ../src/msw/registry.cpp:842
+#: ../src/msw/registry.cpp:808 ../src/msw/registry.cpp:842
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr "Kan waarde van sleutel '%s' nie lees nie"
@@ -721,18 +694,15 @@ msgstr "Kan waarde van sleutel '%s' nie lees nie"
 msgid "Can't save image to file '%s': unknown extension."
 msgstr "Kan beeld nie stoor na l�er '%s': Onbekende uitgang."
 
-#: ../src/generic/logg.cpp:562
-#: ../src/generic/logg.cpp:994
+#: ../src/generic/logg.cpp:562 ../src/generic/logg.cpp:994
 msgid "Can't save log contents to file."
 msgstr "Boekstawing kan nie in l�er gestoor word nie."
 
-#: ../src/msw/thread.cpp:549
-#: ../src/os2/thread.cpp:473
+#: ../src/msw/thread.cpp:549 ../src/os2/thread.cpp:473
 msgid "Can't set thread priority"
 msgstr "Kan thread-prioriteit nie instellen"
 
-#: ../src/msw/registry.cpp:829
-#: ../src/msw/registry.cpp:954
+#: ../src/msw/registry.cpp:829 ../src/msw/registry.cpp:954
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr "Kan waarde van '%s' nie verstel nie"
@@ -742,22 +712,16 @@ msgstr "Kan waarde van '%s' nie verstel nie"
 msgid "Can't write to deflate stream: %s\n"
 msgstr "Kan nie skryf na afblaasstroom nie: %s\n"
 
-#: ../src/common/dlgcmn.cpp:240
-#: ../src/generic/dirdlgg.cpp:155
-#: ../src/generic/filedlgg.cpp:977
-#: ../src/generic/filedlgg.cpp:996
-#: ../src/generic/fontdlgg.cpp:255
-#: ../src/generic/prntdlgg.cpp:455
-#: ../src/generic/progdlgg.cpp:211
-#: ../src/gtk/filedlg.cpp:168
-#: ../src/gtk/fontdlg.cpp:147
-#: ../src/html/helpfrm.cpp:1066
+#: ../src/common/dlgcmn.cpp:240 ../src/generic/dirdlgg.cpp:155
+#: ../src/generic/filedlgg.cpp:977 ../src/generic/filedlgg.cpp:996
+#: ../src/generic/fontdlgg.cpp:255 ../src/generic/prntdlgg.cpp:455
+#: ../src/generic/progdlgg.cpp:211 ../src/gtk/filedlg.cpp:168
+#: ../src/gtk/fontdlg.cpp:147 ../src/html/helpfrm.cpp:1066
 #: ../src/motif/msgdlg.cpp:182
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../contrib/src/xrc/xmlres.cpp:987
-#: ../contrib/src/xrc/xmlres.cpp:1028
+#: ../contrib/src/xrc/xmlres.cpp:987 ../contrib/src/xrc/xmlres.cpp:1028
 msgid "Cannot convert dialog units: dialog unknown."
 msgstr "Dialoogeenhede kan nie omgeskakel word nie: dialoog is onbekend."
 
@@ -788,7 +752,8 @@ msgstr "Kan stoorplek van adresboekl
 #: ../src/unix/threadpsx.cpp:1100
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
-msgstr "Kan nie die omvang van prioriteite bepaal vir skeduleringsbeleid %d nie."
+msgstr ""
+"Kan nie die omvang van prioriteite bepaal vir skeduleringsbeleid %d nie."
 
 #: ../src/unix/utilsunx.cpp:724
 msgid "Cannot get the hostname"
@@ -802,8 +767,7 @@ msgstr "Kan die amptelike masjiennaam nie vasstel nie."
 msgid "Cannot hang up - no active dialup connection."
 msgstr "Kan nie neersit nie - geen aktiewe inbelverbinding"
 
-#: ../src/msw/app.cpp:290
-#: ../src/msw/app.cpp:293
+#: ../src/msw/app.cpp:290 ../src/msw/app.cpp:293
 msgid "Cannot initialize OLE"
 msgstr "Kan OLE nie inisialiseer nie"
 
@@ -878,8 +842,7 @@ msgstr "Kan dimensie van '%s' nie ontleed nie."
 msgid "Cannot print empty page."
 msgstr "Kan nie le� bladsy druk nie."
 
-#: ../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 nie die tipenaam van '%s' lees nie!"
@@ -949,8 +912,7 @@ msgstr "Rekenaar"
 msgid "Config entry name cannot start with '%c'."
 msgstr "Naam van konfigurasie-inskrywing mag nie begin met '%c' nie."
 
-#: ../src/generic/filedlgg.cpp:1214
-#: ../src/gtk/filedlg.cpp:74
+#: ../src/generic/filedlgg.cpp:1214 ../src/gtk/filedlg.cpp:74
 msgid "Confirm"
 msgstr "Bevestig"
 
@@ -1008,8 +970,7 @@ msgstr "Kon nie l
 msgid "Could not start document preview."
 msgstr "Kon drukvoorskou nie begin nie."
 
-#: ../src/generic/printps.cpp:221
-#: ../src/msw/printwin.cpp:245
+#: ../src/generic/printps.cpp:221 ../src/msw/printwin.cpp:245
 msgid "Could not start printing."
 msgstr "Kon nie begin met drukwerk nie."
 
@@ -1021,21 +982,17 @@ msgstr "Kon data nie na venster oordra nie"
 msgid "Couldn't acquire a mutex lock"
 msgstr "Kon nie 'n wedersydse slot bekom nie"
 
-#: ../src/msw/dragimag.cpp:166
-#: ../src/msw/dragimag.cpp:206
-#: ../src/msw/imaglist.cpp:156
-#: ../src/msw/imaglist.cpp:174
+#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
+#: ../src/msw/imaglist.cpp:156 ../src/msw/imaglist.cpp:174
 #: ../src/msw/imaglist.cpp:186
 msgid "Couldn't add an image to the image list."
 msgstr "Kon geen beeld by die lys voeg nie."
 
-#: ../src/msw/timer.cpp:101
-#: ../src/os2/timer.cpp:118
+#: ../src/msw/timer.cpp:101 ../src/os2/timer.cpp:118
 msgid "Couldn't create a timer"
 msgstr "Kon nie 'n tydhouer skep nie"
 
-#: ../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 "Kon nie 'n wyser skep nie"
 
@@ -1044,8 +1001,7 @@ msgstr "Kon nie 'n wyser skep nie"
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "Kon nie simbool %s vind in 'n dinamiese biblioteek nie"
 
-#: ../src/mac/thread.cpp:507
-#: ../src/msw/thread.cpp:847
+#: ../src/mac/thread.cpp:507 ../src/msw/thread.cpp:847
 msgid "Couldn't get the current thread pointer"
 msgstr "Kon nie wyser na die huidige uitvoerdraad verkry nie"
 
@@ -1077,14 +1033,12 @@ msgstr "Kon nie 'n wedersydse slot beskikbaar stel nie"
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "Kon geen inligting oor lys-item %d kry nie."
 
-#: ../src/common/imagpng.cpp:647
-#: ../src/common/imagpng.cpp:658
+#: ../src/common/imagpng.cpp:647 ../src/common/imagpng.cpp:658
 #: ../src/common/imagpng.cpp:666
 msgid "Couldn't save PNG image."
 msgstr "Kon PNG-beeld nie stoor nie."
 
-#: ../src/mac/thread.cpp:756
-#: ../src/msw/thread.cpp:610
+#: ../src/mac/thread.cpp:756 ../src/msw/thread.cpp:610
 msgid "Couldn't terminate thread"
 msgstr "Kon uitvoerdraad nie be�indig nie"
 
@@ -1096,8 +1050,7 @@ msgstr "Create-parameter nie gevind in die verklaarde RTTI parameters nie"
 msgid "Create directory"
 msgstr "Maak gids"
 
-#: ../src/generic/dirdlgg.cpp:105
-#: ../src/generic/filedlgg.cpp:931
+#: ../src/generic/dirdlgg.cpp:105 ../src/generic/filedlgg.cpp:931
 msgid "Create new directory"
 msgstr "Maak nuwe gids"
 
@@ -1163,8 +1116,12 @@ msgid "Deleted stale lock file '%s'."
 msgstr "Verouderde slot-l�er '%s' is verwyder."
 
 #: ../src/msw/dialup.cpp:346
-msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."
-msgstr "Inbel-funksies is nie beskikbaar nie omdat die afstandtoegangsdiens (RAS) nie op hierdie masjien ge�nstalleer is nie. Installeer dit asb."
+msgid ""
+"Dial up functions are unavailable because the remote access service (RAS) is "
+"not installed on this machine. Please install it."
+msgstr ""
+"Inbel-funksies is nie beskikbaar nie omdat die afstandtoegangsdiens (RAS) "
+"nie op hierdie masjien ge�nstalleer is nie. Installeer dit asb."
 
 #: ../src/generic/tipdlg.cpp:220
 msgid "Did you know..."
@@ -1189,8 +1146,11 @@ msgid "Directory doesn't exist."
 msgstr "Gids bestaan nie."
 
 #: ../src/html/helpfrm.cpp:409
-msgid "Display all index items that contain given substring. Search is case insensitive."
-msgstr "Wys alle indeks-items wat die gegewe substring bevat. (Nie kassensitief nie.)"
+msgid ""
+"Display all index items that contain given substring. Search is case "
+"insensitive."
+msgstr ""
+"Wys alle indeks-items wat die gegewe substring bevat. (Nie kassensitief nie.)"
 
 #: ../src/html/helpfrm.cpp:583
 msgid "Display options dialog"
@@ -1198,13 +1158,15 @@ msgstr "Wys opsies-dialoog"
 
 #: ../src/msw/mimetype.cpp:672
 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"
 "%s %1"
 msgstr ""
-"Wil jy die '%s'-bevel wat gebruik word vir l�ers met uitgang \"%s\" verander?\n"
+"Wil jy die '%s'-bevel wat gebruik word vir l�ers met uitgang \"%s\" "
+"verander?\n"
 "Huidige waarde is \n"
 "%s, \n"
 "Nuwe waarde is \n"
@@ -1255,27 +1217,23 @@ msgstr "Inskrywings gevind"
 
 #: ../src/common/config.cpp:366
 #, c-format
-msgid "Environment variables expansion failed: missing '%c' at position %d in '%s'."
-msgstr "Uitbreiding van omgewingsveranderlikes het misluk: ontbrekende '%c' op posisie %d in '%s'."
+msgid ""
+"Environment variables expansion failed: missing '%c' at position %d in '%s'."
+msgstr ""
+"Uitbreiding van omgewingsveranderlikes het misluk: ontbrekende '%c' op "
+"posisie %d in '%s'."
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:711
-#: ../src/generic/filedlgg.cpp:725
-#: ../src/generic/filedlgg.cpp:739
-#: ../src/generic/filedlgg.cpp:1166
-#: ../src/generic/filedlgg.cpp:1191
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/dirctrlg.cpp:701
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:711
+#: ../src/generic/filedlgg.cpp:725 ../src/generic/filedlgg.cpp:739
+#: ../src/generic/filedlgg.cpp:1166 ../src/generic/filedlgg.cpp:1191
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 #: ../src/gtk/fontdlg.cpp:76
 msgid "Error"
 msgstr "Fout"
 
-#: ../src/unix/utilsunx.cpp:1030
-#: ../src/unix/utilsunx.cpp:1038
+#: ../src/unix/utilsunx.cpp:1030 ../src/unix/utilsunx.cpp:1038
 msgid "Error "
 msgstr "Fout "
 
@@ -1403,7 +1361,8 @@ msgstr "'n Anonieme pyp kon nie geskep word nie"
 #: ../src/msw/dde.cpp:468
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
-msgstr "'n Verbinding met bediener '%s' vir onderwerp '%s' kon nie gemaak word nie"
+msgstr ""
+"'n Verbinding met bediener '%s' vir onderwerp '%s' kon nie gemaak word nie"
 
 #: ../src/msw/cursor.cpp:197
 msgid "Failed to create cursor."
@@ -1436,15 +1395,15 @@ msgstr "Die registersleutel vir '%s'-l
 #: ../src/msw/fdrepdlg.cpp:480
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
-msgstr "Die standaard soek/vervang-dialoog kon nie geskep word nie (foutkode %d)"
+msgstr ""
+"Die standaard soek/vervang-dialoog kon nie geskep word nie (foutkode %d)"
 
 #: ../src/html/winpars.cpp:495
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "Weergee van HTML-document in %s-kodering het misluk"
 
-#: ../src/mac/clipbrd.cpp:185
-#: ../src/msw/clipbrd.cpp:134
+#: ../src/mac/clipbrd.cpp:185 ../src/msw/clipbrd.cpp:134
 msgid "Failed to empty the clipboard."
 msgstr "Skoonmaak van knipbord het misluk."
 
@@ -1461,8 +1420,7 @@ msgstr "Opstelling van advies-lus met die DDE-server het misluk"
 msgid "Failed to establish dialup connection: %s"
 msgstr "'n Inbelverbinding kon nie gemaak word nie: %s"
 
-#: ../src/unix/utilsunx.cpp:459
-#: ../src/unix/utilsunx.cpp:475
+#: ../src/unix/utilsunx.cpp:459 ../src/unix/utilsunx.cpp:475
 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "Uitvoering van '%s' het misluk\n"
@@ -1505,8 +1463,12 @@ msgid "Failed to initialize OpenGL"
 msgstr "Inisialisering van OpenGL het misluk."
 
 #: ../src/unix/threadpsx.cpp:896
-msgid "Failed to join a thread, potential memory leak detected - please restart the program"
-msgstr "Aansluiting by 'n uitvoerdraad het misluk, moontlik 'n geheuelekkasie te�gekom - herbegin die programma asb."
+msgid ""
+"Failed to join a thread, potential memory leak detected - please restart the "
+"program"
+msgstr ""
+"Aansluiting by 'n uitvoerdraad het misluk, moontlik 'n geheuelekkasie "
+"te�gekom - herbegin die programma asb."
 
 #: ../src/msw/utils.cpp:723
 #, c-format
@@ -1650,8 +1612,7 @@ msgstr "Opstelling van knipborddata het misluk."
 msgid "Failed to set temporary file permissions"
 msgstr "Opstelling van magtigings van tydelyke l�er het misluk"
 
-#: ../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 "Opstelling van prioriteit van thread %d het misluk."
@@ -1711,8 +1672,7 @@ msgstr "L
 msgid "File %s does not exist."
 msgstr "L�er %s bestaan nie."
 
-#: ../src/generic/filedlgg.cpp:1212
-#: ../src/gtk/filedlg.cpp:71
+#: ../src/generic/filedlgg.cpp:1212 ../src/gtk/filedlg.cpp:71
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "L�er '%s' bestaan al. Moet dit oorskryf word?"
@@ -1730,19 +1690,16 @@ msgstr ""
 msgid "File couldn't be loaded."
 msgstr "L�er kon nie gelaai word nie."
 
-#: ../src/common/docview.cpp:316
-#: ../src/common/docview.cpp:357
+#: ../src/common/docview.cpp:316 ../src/common/docview.cpp:357
 #: ../src/common/docview.cpp:1502
 msgid "File error"
 msgstr "L�erfout"
 
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/filedlgg.cpp:725
+#: ../src/generic/dirctrlg.cpp:701 ../src/generic/filedlgg.cpp:725
 msgid "File name exists already."
 msgstr "L�ernaam bestaan al."
 
-#: ../src/common/fldlgcmn.cpp:62
-#: ../src/msw/filedlg.cpp:250
+#: ../src/common/fldlgcmn.cpp:62 ../src/msw/filedlg.cpp:250
 #, c-format
 msgid "Files (%s)|%s"
 msgstr "L�ers (%s)|%s"
@@ -1848,8 +1805,7 @@ msgstr "Gaan vorentoe"
 msgid "Go one level up in document hierarchy"
 msgstr "Gaan een vlak ho�r in dokument-hi�rargie"
 
-#: ../src/generic/dirdlgg.cpp:110
-#: ../src/generic/filedlgg.cpp:921
+#: ../src/generic/dirdlgg.cpp:110 ../src/generic/filedlgg.cpp:921
 msgid "Go to home directory"
 msgstr "Gaan na tuisgids"
 
@@ -1882,10 +1838,8 @@ msgstr "HTML-l
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreeus (ISO-8859-8)"
 
-#: ../src/common/dlgcmn.cpp:236
-#: ../src/generic/mdig.cpp:310
-#: ../src/html/helpfrm.cpp:254
-#: ../src/html/helpfrm.cpp:277
+#: ../src/common/dlgcmn.cpp:236 ../src/generic/mdig.cpp:310
+#: ../src/html/helpfrm.cpp:254 ../src/html/helpfrm.cpp:277
 #: ../src/msw/mdi.cpp:1329
 msgid "Help"
 msgstr "Hulp"
@@ -1894,8 +1848,7 @@ msgstr "Hulp"
 msgid "Help Browser Options"
 msgstr "Hulpblaaier opsies"
 
-#: ../src/generic/helpext.cpp:441
-#: ../src/generic/helpext.cpp:442
+#: ../src/generic/helpext.cpp:441 ../src/generic/helpext.cpp:442
 msgid "Help Index"
 msgstr "Hulpindeks"
 
@@ -1916,12 +1869,9 @@ msgstr "Hulp: %s"
 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: Fout by inlees van masker DIB."
 
-#: ../src/common/imagbmp.cpp:1042
-#: ../src/common/imagbmp.cpp:1101
-#: ../src/common/imagbmp.cpp:1110
-#: ../src/common/imagbmp.cpp:1121
-#: ../src/common/imagbmp.cpp:1165
-#: ../src/common/imagbmp.cpp:1175
+#: ../src/common/imagbmp.cpp:1042 ../src/common/imagbmp.cpp:1101
+#: ../src/common/imagbmp.cpp:1110 ../src/common/imagbmp.cpp:1121
+#: ../src/common/imagbmp.cpp:1165 ../src/common/imagbmp.cpp:1175
 #: ../src/common/imagbmp.cpp:1184
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: Fout tydens wegskryf van die beeld!"
@@ -1966,8 +1916,7 @@ msgstr "Ongeldige aantal parameters vir ConstructObject-metode"
 msgid "Illegal Parameter Count for Create Method"
 msgstr "Ongeldige aantal parameters vir Createt-metode"
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/filedlgg.cpp:711
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:711
 msgid "Illegal directory name."
 msgstr "Ongeldige gidsnaam."
 
@@ -1985,8 +1934,12 @@ msgid "Image file is not of type %d."
 msgstr "Beeldl�er is nie van die tipe %d."
 
 #: ../src/msw/textctrl.cpp:303
-msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"
-msgstr "Onmoontlik om Rich Edit beheerelement te skep, gewone teks word gebruik. Installeer riched32.dll asb. weer."
+msgid ""
+"Impossible to create a rich edit control, using simple text control instead. "
+"Please reinstall riched32.dll"
+msgstr ""
+"Onmoontlik om Rich Edit beheerelement te skep, gewone teks word gebruik. "
+"Installeer riched32.dll asb. weer."
 
 #: ../src/unix/utilsunx.cpp:379
 msgid "Impossible to get child process input"
@@ -2043,8 +1996,7 @@ msgstr "Ongeldige geometrie-spesifikasie '%s'"
 msgid "Invalid lock file '%s'."
 msgstr "Ongeldig slotl�er '%s'."
 
-#: ../src/common/xtistrm.cpp:363
-#: ../src/common/xtistrm.cpp:378
+#: ../src/common/xtistrm.cpp:363 ../src/common/xtistrm.cpp:378
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr "Ongeldige- of Null-objek ID is aangestuur vir GetObjectClassInfo"
 
@@ -2077,8 +2029,7 @@ msgstr "JPEG: kon beeld nie stoor nie."
 msgid "KOI8-R"
 msgstr "KOI8-R"
 
-#: ../src/generic/prntdlgg.cpp:428
-#: ../src/generic/prntdlgg.cpp:638
+#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:638
 msgid "Landscape"
 msgstr "Dwars"
 
@@ -2121,19 +2072,20 @@ msgstr "Besig met inlaai: "
 
 #: ../src/common/imagpnm.cpp:72
 msgid "Loading Grey Ascii PNM image is not yet implemented."
-msgstr "Laaiing van Ascii PNM-beeld met grysvlakke is nog nie ge�mplementeer nie."
+msgstr ""
+"Laaiing van Ascii PNM-beeld met grysvlakke is nog nie ge�mplementeer nie."
 
 #: ../src/common/imagpnm.cpp:75
 msgid "Loading Grey Raw PNM image is not yet implemented."
-msgstr "Laaiing van Raw PNM-beeld met grysvlakke is nog nie ge�mplementeer nie."
+msgstr ""
+"Laaiing van Raw PNM-beeld met grysvlakke is nog nie ge�mplementeer nie."
 
 #: ../src/generic/logg.cpp:565
 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr "Boekstawing geskryf na l�er '%s'."
 
-#: ../include/wx/xti.h:469
-#: ../include/wx/xti.h:473
+#: ../include/wx/xti.h:469 ../include/wx/xti.h:473
 msgid "Long Conversions not supported"
 msgstr "'long'-omskakelings word nie ondersteun nie"
 
@@ -2142,8 +2094,12 @@ msgid "MDI child"
 msgstr "MDI-subvenster"
 
 #: ../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 Help funksies wees nie beskikbaar omdat die MS HTML Help biblioteek nie op hierdie machine is ge�nstalleerd. Installeer het asb."
+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 Help funksies wees nie beskikbaar omdat die MS HTML Help biblioteek "
+"nie op hierdie machine is ge�nstalleerd. Installeer het asb."
 
 #: ../src/univ/themes/win32.cpp:4678
 msgid "Ma&ximize"
@@ -2213,10 +2169,8 @@ msgstr "Naam"
 msgid "New item"
 msgstr "Nuwe item"
 
-#: ../src/generic/dirdlgg.cpp:274
-#: ../src/generic/dirdlgg.cpp:284
-#: ../src/generic/filedlgg.cpp:587
-#: ../src/generic/filedlgg.cpp:596
+#: ../src/generic/dirdlgg.cpp:274 ../src/generic/dirdlgg.cpp:284
+#: ../src/generic/filedlgg.cpp:587 ../src/generic/filedlgg.cpp:596
 msgid "NewName"
 msgstr "Nuwe gids"
 
@@ -2224,10 +2178,8 @@ msgstr "Nuwe gids"
 msgid "Next page"
 msgstr "Volgende bladsy"
 
-#: ../src/common/dlgcmn.cpp:213
-#: ../src/mac/msgdlg.cpp:56
-#: ../src/mac/msgdlg.cpp:140
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:213 ../src/mac/msgdlg.cpp:56
+#: ../src/mac/msgdlg.cpp:140 ../src/motif/msgdlg.cpp:182
 msgid "No"
 msgstr "Nee"
 
@@ -2244,7 +2196,8 @@ msgstr "Geen inskrywings gevind."
 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 ""
 "Geen lettertipe is gevind om die teks in enkodering '%s' te wys nie,\n"
 "maar 'n alternatiewe enkodering '%s' is beskikbaar.\n"
@@ -2266,20 +2219,17 @@ msgstr ""
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr "Geen hanteerder is gevind vir XML-node '%s', klas '%s' nie!"
 
-#: ../src/common/image.cpp:1162
-#: ../src/common/image.cpp:1205
+#: ../src/common/image.cpp:1162 ../src/common/image.cpp:1205
 msgid "No handler found for image type."
 msgstr "Geen hanteerder is gevind vir beeldtipe."
 
-#: ../src/common/image.cpp:1170
-#: ../src/common/image.cpp:1213
+#: ../src/common/image.cpp:1170 ../src/common/image.cpp:1213
 #: ../src/common/image.cpp:1247
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "Geen beeldhanteerder is vir die tipe %d gedefinieer nie."
 
-#: ../src/common/image.cpp:1231
-#: ../src/common/image.cpp:1263
+#: ../src/common/image.cpp:1231 ../src/common/image.cpp:1263
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "Geen beeldhanteerder is vir die tipe %s gedefinieer nie."
@@ -2296,8 +2246,7 @@ msgstr "Geen klank"
 msgid "Nordic (ISO-8859-10)"
 msgstr "Noors (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:227
-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/generic/fontdlgg.cpp:227 ../src/generic/fontdlgg.cpp:230
 msgid "Normal"
 msgstr "Normaal"
 
@@ -2313,16 +2262,11 @@ msgstr "Normale lettertipe: "
 msgid "Note, 8 1/2 x 11 in"
 msgstr "Nota, 8 1/2 x 11 duim"
 
-#: ../src/common/dlgcmn.cpp:219
-#: ../src/generic/dirdlgg.cpp:153
-#: ../src/generic/filedlgg.cpp:976
-#: ../src/generic/filedlgg.cpp:987
-#: ../src/generic/fontdlgg.cpp:254
-#: ../src/generic/logg.cpp:748
-#: ../src/generic/prntdlgg.cpp:454
-#: ../src/gtk/filedlg.cpp:162
-#: ../src/gtk/fontdlg.cpp:139
-#: ../src/html/helpfrm.cpp:1064
+#: ../src/common/dlgcmn.cpp:219 ../src/generic/dirdlgg.cpp:153
+#: ../src/generic/filedlgg.cpp:976 ../src/generic/filedlgg.cpp:987
+#: ../src/generic/fontdlgg.cpp:254 ../src/generic/logg.cpp:748
+#: ../src/generic/prntdlgg.cpp:454 ../src/gtk/filedlg.cpp:162
+#: ../src/gtk/fontdlg.cpp:139 ../src/html/helpfrm.cpp:1064
 msgid "OK"
 msgstr "OK"
 
@@ -2330,20 +2274,16 @@ msgstr "OK"
 msgid "Objects must have an id attribute"
 msgstr "Objekte moet elkeen 'n id-attribuut h�"
 
-#: ../src/common/docview.cpp:1197
-#: ../src/common/docview.cpp:1525
+#: ../src/common/docview.cpp:1197 ../src/common/docview.cpp:1525
 msgid "Open File"
 msgstr "Open L�er"
 
-#: ../src/html/helpfrm.cpp:571
-#: ../src/html/helpfrm.cpp:1404
+#: ../src/html/helpfrm.cpp:571 ../src/html/helpfrm.cpp:1404
 msgid "Open HTML document"
 msgstr "Maak HTML-dokument oop"
 
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:739
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:739
 msgid "Operation not permitted."
 msgstr "Bewerking nie toelaatbaar."
 
@@ -2366,13 +2306,11 @@ msgstr "Opsie '%s': '%s' kan nie na 'n datum omgeskakel word nie."
 msgid "Options"
 msgstr "Opstellings"
 
-#: ../src/generic/prntdlgg.cpp:430
-#: ../src/generic/prntdlgg.cpp:639
+#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:639
 msgid "Orientation"
 msgstr "Ori�ntasie"
 
-#: ../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: kon geen geheue reserveer"
 
@@ -2388,8 +2326,7 @@ msgstr "PCX: ongeldige beeld"
 msgid "PCX: this is not a PCX file."
 msgstr "PCX: dit is nie 'n PCX-l�er nie."
 
-#: ../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: onbekende fout!"
 
@@ -2427,14 +2364,12 @@ msgstr "Bladsy-opstelling"
 msgid "Pages"
 msgstr "Bladsye"
 
-#: ../src/generic/prntdlgg.cpp:545
-#: ../src/generic/prntdlgg.cpp:625
+#: ../src/generic/prntdlgg.cpp:545 ../src/generic/prntdlgg.cpp:625
 #: ../src/generic/prntdlgg.cpp:818
 msgid "Paper Size"
 msgstr "Papierformaat"
 
-#: ../src/generic/prntdlgg.cpp:420
-#: ../src/generic/prntdlgg.cpp:612
+#: ../src/generic/prntdlgg.cpp:420 ../src/generic/prntdlgg.cpp:612
 #: ../src/generic/prntdlgg.cpp:813
 msgid "Paper size"
 msgstr "Papierformaat"
@@ -2447,8 +2382,7 @@ msgstr "'n Reedsgeregistreerde objek word aangestuur vir SetObject"
 msgid "Passing a already registered object to SetObjectName"
 msgstr "'n Reedsgeregistreerde objek word aangestuur vir SetObjectName"
 
-#: ../src/common/xtistrm.cpp:434
-#: ../src/common/xtistrm.cpp:654
+#: ../src/common/xtistrm.cpp:434 ../src/common/xtistrm.cpp:654
 msgid "Passing an unkown object to GetObject"
 msgstr "'n Onbekende objek word aangestuur vir GetObject"
 
@@ -2464,8 +2398,7 @@ msgstr "Opstel van pyp het misluk"
 msgid "Please choose a valid font."
 msgstr "Kies asb. 'n geldige lettertipe."
 
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 msgid "Please choose an existing file."
 msgstr "Kies asb. 'n bestaande l�er."
 
@@ -2488,8 +2421,7 @@ msgstr ""
 msgid "Please wait while printing\n"
 msgstr "Wag asb. 'n bietjie. Besig met drukwerk\n"
 
-#: ../src/generic/prntdlgg.cpp:427
-#: ../src/generic/prntdlgg.cpp:637
+#: ../src/generic/prntdlgg.cpp:427 ../src/generic/prntdlgg.cpp:637
 msgid "Portrait"
 msgstr "Regop"
 
@@ -2505,8 +2437,7 @@ msgstr "Drukvoorskou:"
 msgid "Previous page"
 msgstr "Vorige bladsy"
 
-#: ../src/generic/prntdlgg.cpp:107
-#: ../src/generic/prntdlgg.cpp:121
+#: ../src/generic/prntdlgg.cpp:107 ../src/generic/prntdlgg.cpp:121
 msgid "Print"
 msgstr "Druk"
 
@@ -2514,8 +2445,7 @@ msgstr "Druk"
 msgid "Print Preview"
 msgstr "Drukvoorskou"
 
-#: ../src/common/prntbase.cpp:784
-#: ../src/common/prntbase.cpp:810
+#: ../src/common/prntbase.cpp:784 ../src/common/prntbase.cpp:810
 msgid "Print Preview Failure"
 msgstr "Drukvoorskou het misluk"
 
@@ -2559,8 +2489,7 @@ msgstr "Drukker-opsies:"
 msgid "Printer..."
 msgstr "Drukker..."
 
-#: ../src/common/prntbase.cpp:109
-#: ../src/common/prntbase.cpp:154
+#: ../src/common/prntbase.cpp:109 ../src/common/prntbase.cpp:154
 msgid "Printing "
 msgstr "Besig met drukwerk"
 
@@ -2589,8 +2518,7 @@ msgstr "Kwarto, 215 x 275 mm"
 msgid "Question"
 msgstr "Vraag"
 
-#: ../src/common/ffile.cpp:111
-#: ../src/common/ffile.cpp:132
+#: ../src/common/ffile.cpp:111 ../src/common/ffile.cpp:132
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "Leesfout by l�er '%s'"
@@ -2641,7 +2569,8 @@ msgstr "Verwyder huidige bladsy uit gunstelinge"
 #: ../src/common/rendcmn.cpp:193
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
-msgstr "Renderer \"%s\" het onversoenbare weergawe %d.%d en kon nie gelaai word nie."
+msgstr ""
+"Renderer \"%s\" het onversoenbare weergawe %d.%d en kon nie gelaai word nie."
 
 #: ../src/generic/fdrepdlg.cpp:171
 msgid "Replace &all"
@@ -2680,14 +2609,17 @@ msgstr "Stoor boekstawing-inhoud na l
 msgid "Script"
 msgstr "Skrif-letter"
 
-#: ../src/html/helpfrm.cpp:443
-#: ../src/html/helpfrm.cpp:458
+#: ../src/html/helpfrm.cpp:443 ../src/html/helpfrm.cpp:458
 msgid "Search"
 msgstr "Soek"
 
 #: ../src/html/helpfrm.cpp:445
-msgid "Search contents of help book(s) for all occurences of the text you typed above"
-msgstr "Soek in inhoudsopgawe van hulpl�er(s) vir alle plekke waar die teks wat jy hierbo getik het, voorkom."
+msgid ""
+"Search contents of help book(s) for all occurences of the text you typed "
+"above"
+msgstr ""
+"Soek in inhoudsopgawe van hulpl�er(s) vir alle plekke waar die teks wat jy "
+"hierbo getik het, voorkom."
 
 #: ../src/generic/fdrepdlg.cpp:152
 msgid "Search direction"
@@ -2749,7 +2681,8 @@ msgstr "Opstellings..."
 
 #: ../src/msw/dialup.cpp:518
 msgid "Several active dialup connections found, choosing one randomly."
-msgstr "Meer as een aktiewe inbelverbindings gevind, willekeurige keuse is gemaak."
+msgstr ""
+"Meer as een aktiewe inbelverbindings gevind, willekeurige keuse is gemaak."
 
 #: ../src/html/helpfrm.cpp:399
 msgid "Show all"
@@ -2763,8 +2696,7 @@ msgstr "Wys alle items in die indeks"
 msgid "Show hidden directories"
 msgstr "Wys verborge gidse"
 
-#: ../src/generic/filedlgg.cpp:971
-#: ../src/generic/filedlgg.cpp:993
+#: ../src/generic/filedlgg.cpp:971 ../src/generic/filedlgg.cpp:993
 msgid "Show hidden files"
 msgstr "Wys verborge l�ers"
 
@@ -2784,8 +2716,7 @@ msgstr "Skuins"
 msgid "Sorry, could not open this file for saving."
 msgstr "Jammer, hierdie l�er kon nie gestoor word nie."
 
-#: ../src/common/docview.cpp:367
-#: ../src/common/docview.cpp:380
+#: ../src/common/docview.cpp:367 ../src/common/docview.cpp:380
 #: ../src/common/docview.cpp:1504
 msgid "Sorry, could not open this file."
 msgstr "Jammer, hierdie l�er kon nie oopgemaak word nie."
@@ -2800,10 +2731,10 @@ msgstr "Jammer, onvoldoende geheue vir drukvoorskou."
 
 #: ../src/common/docview.cpp:959
 msgid "Sorry, print preview needs a printer to be installed."
-msgstr "Jammer, 'n drukker moet ge�nstalleer wees om 'n drukvoorskou te kan doen."
+msgstr ""
+"Jammer, 'n drukker moet ge�nstalleer wees om 'n drukvoorskou te kan doen."
 
-#: ../src/common/docview.cpp:1196
-#: ../src/common/docview.cpp:1524
+#: ../src/common/docview.cpp:1196 ../src/common/docview.cpp:1524
 msgid "Sorry, the format for this file is unknown."
 msgstr "Jammer, die l�er het 'n onbekende formaat."
 
@@ -2833,8 +2764,7 @@ msgstr ""
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "String-na-kleur : Verkeerde kleurspesifikasie : %s"
 
-#: ../include/wx/xti.h:396
-#: ../include/wx/xti.h:400
+#: ../include/wx/xti.h:396 ../include/wx/xti.h:400
 msgid "String conversions not supported"
 msgstr "String-omskakelings word nie ondersteun nie"
 
@@ -2847,8 +2777,7 @@ msgstr "Subclass '%s' nie gevind voor bron '%s', zal nie subclasseren!"
 msgid "Swiss"
 msgstr "Swiss"
 
-#: ../src/common/imagtiff.cpp:232
-#: ../src/common/imagtiff.cpp:243
+#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
 #: ../src/common/imagtiff.cpp:354
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: kon nie geheue reserveer nie."
@@ -2953,24 +2882,41 @@ msgstr "Die waarde voor die opsie '%s' moet gespesifiseer word."
 
 #: ../src/msw/dialup.cpp:406
 #, 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 "Die weergawe van die inbelprogrammatuur (RAS) op hierdie masjien is te oud (die volgende benodigde funksie ontbreek: %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 ""
+"Die weergawe van die inbelprogrammatuur (RAS) op hierdie masjien is te oud "
+"(die volgende benodigde funksie ontbreek: %s)."
 
 #: ../src/html/htmprint.cpp:580
-msgid "There was a problem during page setup: you may need to set a default printer."
-msgstr "Daar was 'n probleem tydens bladsy-opstelling: Jy moet dalk 'n standaarddrukker opstel."
+msgid ""
+"There was a problem during page setup: you may need to set a default printer."
+msgstr ""
+"Daar was 'n probleem tydens bladsy-opstelling: Jy moet dalk 'n "
+"standaarddrukker opstel."
 
 #: ../src/msw/thread.cpp:1197
-msgid "Thread module initialization failed: can not store value in thread local storage"
-msgstr "Inisialisasie van uitvoerdraadmodule het misluk: kan geen waarde in lokale uitvoerdraad-geheueruimte stoor nie."
+msgid ""
+"Thread module initialization failed: can not store value in thread local "
+"storage"
+msgstr ""
+"Inisialisasie van uitvoerdraadmodule het misluk: kan geen waarde in lokale "
+"uitvoerdraad-geheueruimte stoor nie."
 
 #: ../src/unix/threadpsx.cpp:1600
 msgid "Thread module initialization failed: failed to create thread key"
-msgstr "Inisialisasie van uitvoerdraadmodule het misluk: 'n uitvoerdraad-sleutel kon nie geskep word nie"
+msgstr ""
+"Inisialisasie van uitvoerdraadmodule het misluk: 'n uitvoerdraad-sleutel kon "
+"nie geskep word nie"
 
 #: ../src/msw/thread.cpp:1185
-msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
-msgstr "Inisialisasie van uitvoerdraadmodule het misluk: onmoontlik om 'n indeks te reserveer in lokale uitvoerdraad-geheueruimte."
+msgid ""
+"Thread module initialization failed: impossible to allocate index in thread "
+"local storage"
+msgstr ""
+"Inisialisasie van uitvoerdraadmodule het misluk: onmoontlik om 'n indeks te "
+"reserveer in lokale uitvoerdraad-geheueruimte."
 
 #: ../src/unix/threadpsx.cpp:1108
 msgid "Thread priority setting is ignored."
@@ -3011,10 +2957,10 @@ msgstr "Boonste kantlyn (mm):"
 #: ../src/common/fs_mem.cpp:205
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
-msgstr "Poging om l�er '%s' uit geheue VFS te verwyder, maar dit is nie gelaai nie!"
+msgstr ""
+"Poging om l�er '%s' uit geheue VFS te verwyder, maar dit is nie gelaai nie!"
 
-#: ../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 "Poging om 'n le� masjiennaam te vind: besig om op te gee"
 
@@ -3026,8 +2972,7 @@ msgstr "Turks (ISO-8859-9)"
 msgid "Type"
 msgstr "Tipe"
 
-#: ../src/common/xtistrm.cpp:279
-#: ../src/common/xtixml.cpp:351
+#: ../src/common/xtistrm.cpp:279 ../src/common/xtixml.cpp:351
 #: ../src/common/xtixml.cpp:498
 msgid "Type must have enum - long conversion"
 msgstr "Tipe moet 'n enum - long omskakeling bevat."
@@ -3110,8 +3055,7 @@ msgstr "Onbekende veld in l
 msgid "Unknown long option '%s'"
 msgstr "Onbekende lang-opsie '%s'"
 
-#: ../src/common/cmdline.cpp:582
-#: ../src/common/cmdline.cpp:603
+#: ../src/common/cmdline.cpp:582 ../src/common/cmdline.cpp:603
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "Onbekende opsie '%s'"
@@ -3130,14 +3074,12 @@ msgstr "Onbekende eienskap %s"
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "On-afgeslote '{' in mime-tipe %s inskrywing."
 
-#: ../src/common/cmdproc.cpp:254
-#: ../src/common/cmdproc.cpp:280
+#: ../src/common/cmdproc.cpp:254 ../src/common/cmdproc.cpp:280
 #: ../src/common/cmdproc.cpp:300
 msgid "Unnamed command"
 msgstr "Naamlose bevel"
 
-#: ../src/mac/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:273
+#: ../src/mac/clipbrd.cpp:64 ../src/msw/clipbrd.cpp:273
 #: ../src/msw/clipbrd.cpp:445
 msgid "Unsupported clipboard format."
 msgstr "Nie-ondersteunde knipbord-formaat."
@@ -3194,7 +3136,8 @@ msgstr "Waarskuwing: "
 
 #: ../src/html/htmlpars.cpp:390
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
-msgstr "Waarskuwing: poging om HTML-merkerhanteerder van le� stapel te verwyder."
+msgstr ""
+"Waarskuwing: poging om HTML-merkerhanteerder van le� stapel te verwyder."
 
 #: ../src/common/fmapbase.cpp:102
 msgid "Western European (ISO-8859-1)"
@@ -3295,8 +3238,7 @@ msgstr "XML-ontledingsfout: '%s' in lyn %d"
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: Misvormde pixel data!"
 
-#: ../src/common/xpmdecod.cpp:712
-#: ../src/common/xpmdecod.cpp:722
+#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:722
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr "XPM: Misvormde kleurdefinisie '%s'!"
@@ -3306,8 +3248,7 @@ msgstr "XPM: Misvormde kleurdefinisie '%s'!"
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "XRC-hulpbron '%s' (klas '%s') nie gevind nie!"
 
-#: ../contrib/src/xrc/xmlres.cpp:885
-#: ../contrib/src/xrc/xmlres.cpp:897
+#: ../contrib/src/xrc/xmlres.cpp:885 ../contrib/src/xrc/xmlres.cpp:897
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "XRC-hulpbron: Kan nie 'n bitmap maak van '%s' nie."
@@ -3317,10 +3258,8 @@ msgstr "XRC-hulpbron: Kan nie 'n bitmap maak van '%s' nie."
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr "XRC-hulpbron: Ongeldige kleurspesifikasie '%s' vir eienskap '%s'."
 
-#: ../src/common/dlgcmn.cpp:208
-#: ../src/mac/msgdlg.cpp:57
-#: ../src/mac/msgdlg.cpp:139
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:208 ../src/mac/msgdlg.cpp:57
+#: ../src/mac/msgdlg.cpp:139 ../src/motif/msgdlg.cpp:182
 msgid "Yes"
 msgstr "Ja"
 
@@ -3328,8 +3267,7 @@ msgstr "Ja"
 msgid "You cannot add a new directory to this section."
 msgstr "Jy kan nie 'n nuwe gids by hierdie seksie voeg nie."
 
-#: ../src/common/fs_zip.cpp:88
-#: ../src/common/fs_zip.cpp:138
+#: ../src/common/fs_zip.cpp:88 ../src/common/fs_zip.cpp:138
 msgid "ZIP handler currently supports only local files!"
 msgstr "ZIP-hanteerder ondersteun tans slegs plaaslike l�ers!"
 
@@ -3339,11 +3277,13 @@ msgstr "[LEEG]"
 
 #: ../src/msw/dde.cpp:1075
 msgid "a DDEML application has created a prolonged race condition."
-msgstr "'n DDEML-toepassing het deur 'n wedrentoestand geheuegebrek veroorsaak."
+msgstr ""
+"'n DDEML-toepassing het deur 'n wedrentoestand geheuegebrek veroorsaak."
 
 #: ../src/msw/dde.cpp:1063
 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 ""
@@ -3380,7 +3320,8 @@ msgstr "'n versoek vir 'n sinkrone 'poke'-transaksie se tyd is verstreke."
 
 #: ../src/msw/dde.cpp:1102
 msgid "a request to end an advise transaction has timed out."
-msgstr "'n versoek vir be�indiging van 'n advies-transaksie se tyd is verstreke."
+msgstr ""
+"'n versoek vir be�indiging van 'n advies-transaksie se tyd is verstreke."
 
 #: ../src/msw/dde.cpp:1096
 msgid ""
@@ -3498,8 +3439,7 @@ msgstr "kan gebruiker se tuisgids nie vind nie, gebruik dus huidige gids."
 msgid "can't flush file descriptor %d"
 msgstr "kan l�eretiket %d nie leegmaak nie"
 
-#: ../src/common/file.cpp:535
-#: ../src/common/file.cpp:543
+#: ../src/common/file.cpp:535 ../src/common/file.cpp:543
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "kan nie soekposisie verkry by l�eretiket %d nie"
@@ -3508,8 +3448,7 @@ msgstr "kan nie soekposisie verkry by l
 msgid "can't load any font, aborting"
 msgstr "kan geen lettertipe laai nie, besig om te laat vaar"
 
-#: ../src/common/ffile.cpp:63
-#: ../src/common/file.cpp:352
+#: ../src/common/ffile.cpp:63 ../src/common/file.cpp:352
 #, c-format
 msgid "can't open file '%s'"
 msgstr "kan l�er '%s' nie oopmaak nie"
@@ -3547,8 +3486,7 @@ msgstr "kan l
 msgid "can't remove temporary file '%s'"
 msgstr "kan tydelike l�er '%s' nie uitvee nie"
 
-#: ../src/common/file.cpp:492
-#: ../src/common/file.cpp:518
+#: ../src/common/file.cpp:492 ../src/common/file.cpp:518
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "kan nie 'n soekbewerking doen op l�eretiket %d nie"
@@ -3712,8 +3650,7 @@ msgstr "ongeldige eof() teruggee-waarde."
 msgid "invalid message box return value"
 msgstr "ongeldige teruggee-waarde van boodskapvenster"
 
-#: ../src/common/fontcmn.cpp:473
-#: ../src/common/fontcmn.cpp:537
+#: ../src/common/fontcmn.cpp:473 ../src/common/fontcmn.cpp:537
 msgid "italic"
 msgstr "kursief"
 
@@ -3859,8 +3796,7 @@ msgstr "derde"
 msgid "thirteenth"
 msgstr "dertiende"
 
-#: ../src/common/imagtiff.cpp:143
-#: ../src/common/imagtiff.cpp:151
+#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
 #, c-format
 msgid "tiff module: %s"
 msgstr "tiff-module: %s"
@@ -3903,8 +3839,7 @@ msgstr "onbekend"
 msgid "unknown class %s"
 msgstr "onbekende klas %s"
 
-#: ../src/common/regex.cpp:151
-#: ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:151 ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr "onbekende fout"
 
@@ -3917,8 +3852,7 @@ msgstr "onbekende fout (foutnommer %08x)."
 msgid "unknown line terminator"
 msgstr "onbekende re�ltermineerder"
 
-#: ../src/common/file.cpp:474
-#: ../src/common/file.cpp:501
+#: ../src/common/file.cpp:474 ../src/common/file.cpp:501
 msgid "unknown seek origin"
 msgstr "onbekende beginpunt vir soektog"
 
@@ -3957,8 +3891,7 @@ msgstr "besig om te skryf"
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay het misluk."
 
-#: ../src/common/socket.cpp:395
-#: ../src/common/socket.cpp:449
+#: ../src/common/socket.cpp:395 ../src/common/socket.cpp:449
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: ongeldige handtekening in ReadMsg."
 
@@ -3979,8 +3912,7 @@ msgstr "wxWindows kon vertoonskerm nie oopmaak nie. Gaan dus uit."
 msgid "yesterday"
 msgstr "gister"
 
-#: ../src/common/zstream.cpp:141
-#: ../src/common/zstream.cpp:275
+#: ../src/common/zstream.cpp:141 ../src/common/zstream.cpp:275
 #, c-format
 msgid "zlib error %d"
 msgstr "zlib fout %d"
@@ -3988,4 +3920,3 @@ msgstr "zlib fout %d"
 #: ../src/common/prntbase.cpp:450
 msgid "|<<"
 msgstr "|<<"
-
diff --git a/locale/cs.po b/locale/cs.po
index 3a068be163..c6cc2ebb82 100644
--- a/locale/cs.po
+++ b/locale/cs.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWindows-2.5.1\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-04 18:56+0100\n"
 "PO-Revision-Date: 2004-05-06 02:22+0100\n"
 "Last-Translator: Herbert Breunung <herbert_breunung@web.de>\n"
@@ -42,10 +43,8 @@ msgstr "Ob
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "Ob�lka �. 9, 3 7/8 x 8 7/8 palce"
 
-#: ../src/html/helpfrm.cpp:867
-#: ../src/html/helpfrm.cpp:868
-#: ../src/html/helpfrm.cpp:1505
-#: ../src/html/helpfrm.cpp:1535
+#: ../src/html/helpfrm.cpp:867 ../src/html/helpfrm.cpp:868
+#: ../src/html/helpfrm.cpp:1505 ../src/html/helpfrm.cpp:1535
 #, c-format
 msgid "%i of %i"
 msgstr "%i z %i"
@@ -88,8 +87,7 @@ msgstr ""
 msgid "&Arrange Icons"
 msgstr "Uspo��dat ikony"
 
-#: ../src/generic/fdrepdlg.cpp:164
-#: ../src/generic/wizard.cpp:401
+#: ../src/generic/fdrepdlg.cpp:164 ../src/generic/wizard.cpp:401
 msgid "&Cancel"
 msgstr "&Zru�it"
 
@@ -97,10 +95,8 @@ msgstr "&Zru
 msgid "&Cascade"
 msgstr "Kask�dov�"
 
-#: ../src/common/prntbase.cpp:439
-#: ../src/generic/logg.cpp:502
-#: ../src/generic/tipdlg.cpp:213
-#: ../src/html/helpfrm.cpp:271
+#: ../src/common/prntbase.cpp:439 ../src/generic/logg.cpp:502
+#: ../src/generic/tipdlg.cpp:213 ../src/html/helpfrm.cpp:271
 msgid "&Close"
 msgstr "&Zav��t"
 
@@ -140,13 +136,11 @@ msgstr "&Log"
 msgid "&Move"
 msgstr "&P�esunout"
 
-#: ../src/generic/mdig.cpp:117
-#: ../src/msw/mdi.cpp:192
+#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:192
 msgid "&Next"
 msgstr "&Dal��"
 
-#: ../src/generic/wizard.cpp:400
-#: ../src/generic/wizard.cpp:582
+#: ../src/generic/wizard.cpp:400 ../src/generic/wizard.cpp:582
 msgid "&Next >"
 msgstr "&Dal�� >"
 
@@ -163,8 +157,7 @@ msgstr "&Ulo
 msgid "&Paste"
 msgstr "&Vlo�it"
 
-#: ../src/generic/mdig.cpp:118
-#: ../src/msw/mdi.cpp:193
+#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:193
 msgid "&Previous"
 msgstr "&P�edchoz�"
 
@@ -173,14 +166,12 @@ msgstr "&P
 msgid "&Print..."
 msgstr "Tisknout..."
 
-#: ../src/common/cmdproc.cpp:285
-#: ../src/common/cmdproc.cpp:292
+#: ../src/common/cmdproc.cpp:285 ../src/common/cmdproc.cpp:292
 #: ../src/msw/textctrl.cpp:2048
 msgid "&Redo"
 msgstr "&Zopakovat"
 
-#: ../src/common/cmdproc.cpp:281
-#: ../src/common/cmdproc.cpp:301
+#: ../src/common/cmdproc.cpp:281 ../src/common/cmdproc.cpp:301
 msgid "&Redo "
 msgstr "&Zopakovat "
 
@@ -192,8 +183,7 @@ msgstr "&Nahradit"
 msgid "&Restore"
 msgstr "&Obnovit"
 
-#: ../src/generic/logg.cpp:498
-#: ../src/generic/logg.cpp:827
+#: ../src/generic/logg.cpp:498 ../src/generic/logg.cpp:827
 msgid "&Save..."
 msgstr "&Ulo�it..."
 
@@ -205,8 +195,7 @@ msgstr "&Zobrazit tipy p
 msgid "&Size"
 msgstr "&Velikost"
 
-#: ../src/common/cmdproc.cpp:263
-#: ../src/msw/textctrl.cpp:2047
+#: ../src/common/cmdproc.cpp:263 ../src/msw/textctrl.cpp:2047
 msgid "&Undo"
 msgstr "&Vr�tit"
 
@@ -214,23 +203,18 @@ msgstr "&Vr
 msgid "&Undo "
 msgstr "&Vr�tit "
 
-#: ../src/generic/mdig.cpp:297
-#: ../src/generic/mdig.cpp:313
-#: ../src/generic/mdig.cpp:317
-#: ../src/msw/mdi.cpp:1333
-#: ../src/msw/mdi.cpp:1340
+#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
+#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1333 ../src/msw/mdi.cpp:1340
 #: ../src/msw/mdi.cpp:1370
 msgid "&Window"
 msgstr "&Okno"
 
-#: ../src/common/config.cpp:414
-#: ../src/msw/regconf.cpp:265
+#: ../src/common/config.cpp:414 ../src/msw/regconf.cpp:265
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' obsahuje p�ebyte�n� '..', ignoruji."
 
-#: ../src/common/valtext.cpp:136
-#: ../src/common/valtext.cpp:166
+#: ../src/common/valtext.cpp:136 ../src/common/valtext.cpp:166
 #: ../src/common/valtext.cpp:172
 #, c-format
 msgid "'%s' is invalid"
@@ -275,19 +259,16 @@ msgstr "'%s' m
 msgid "(Help)"
 msgstr "(N�pov�da)"
 
-#: ../src/html/helpfrm.cpp:345
-#: ../src/html/helpfrm.cpp:935
+#: ../src/html/helpfrm.cpp:345 ../src/html/helpfrm.cpp:935
 #: ../src/html/helpfrm.cpp:1563
 msgid "(bookmarks)"
 msgstr "(z�lo�ky)"
 
-#: ../src/generic/dirctrlg.cpp:677
-#: ../src/generic/filedlgg.cpp:707
+#: ../src/generic/dirctrlg.cpp:677 ../src/generic/filedlgg.cpp:707
 msgid "."
 msgstr "."
 
-#: ../src/generic/dirctrlg.cpp:678
-#: ../src/generic/filedlgg.cpp:708
+#: ../src/generic/dirctrlg.cpp:678 ../src/generic/filedlgg.cpp:708
 msgid ".."
 msgstr ".."
 
@@ -327,19 +308,16 @@ msgstr "< &Zp
 msgid "<<"
 msgstr "<<"
 
-#: ../src/generic/filedlgg.cpp:248
-#: ../src/generic/filedlgg.cpp:271
+#: ../src/generic/filedlgg.cpp:248 ../src/generic/filedlgg.cpp:271
 msgid "<DIR>"
 msgstr "<ADR>"
 
-#: ../src/generic/filedlgg.cpp:252
-#: ../src/generic/filedlgg.cpp:275
+#: ../src/generic/filedlgg.cpp:252 ../src/generic/filedlgg.cpp:275
 #, fuzzy
 msgid "<DRIVE>"
 msgstr "<ADR>"
 
-#: ../src/generic/filedlgg.cpp:250
-#: ../src/generic/filedlgg.cpp:273
+#: ../src/generic/filedlgg.cpp:250 ../src/generic/filedlgg.cpp:273
 msgid "<LINK>"
 msgstr "<LINK>"
 
@@ -475,8 +453,7 @@ msgstr "str
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "Ob�lka B6, 176 x 125 mm"
 
-#: ../src/common/imagbmp.cpp:470
-#: ../src/common/imagbmp.cpp:486
+#: ../src/common/imagbmp.cpp:470 ../src/common/imagbmp.cpp:486
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: Nemohu alokovat pam�."
 
@@ -552,8 +529,7 @@ msgstr "Ob
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "Ob�lka C65, 114 x 229 mm"
 
-#: ../src/html/chm.cpp:783
-#: ../src/html/chm.cpp:842
+#: ../src/html/chm.cpp:783 ../src/html/chm.cpp:842
 #, fuzzy
 msgid "CHM handler currently supports only local files!"
 msgstr "ZIP soubory lze otev��t jenom z disku!"
@@ -568,8 +544,7 @@ msgstr "Nemohu vytvo
 msgid "Can not enumerate files '%s'"
 msgstr "Nemohu zjistit soubory odpov�daj�c� masce '%s'"
 
-#: ../src/msw/dir.cpp:300
-#: ../src/unix/dir.cpp:232
+#: ../src/msw/dir.cpp:300 ../src/unix/dir.cpp:232
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "Nemohu zjistit soubory v adres��i '%s'"
@@ -579,8 +554,7 @@ msgstr "Nemohu zjistit soubory v adres
 msgid "Can not resume thread %lu"
 msgstr "Nemohu obnovit vl�kno %x"
 
-#: ../src/mac/thread.cpp:477
-#: ../src/msw/thread.cpp:821
+#: ../src/mac/thread.cpp:477 ../src/msw/thread.cpp:821
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "Nemohu obnovit vl�kno %x"
@@ -594,8 +568,7 @@ msgstr "Nemohu spustit vl
 msgid "Can not suspend thread %lu"
 msgstr "Nemohu pozastavit vl�kno %x"
 
-#: ../src/mac/thread.cpp:453
-#: ../src/msw/thread.cpp:806
+#: ../src/mac/thread.cpp:453 ../src/msw/thread.cpp:806
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "Nemohu pozastavit vl�kno %x"
@@ -625,15 +598,16 @@ msgstr "Nemohu kop
 
 #: ../src/msw/listctrl.cpp:413
 msgid "Can't create list control window, check that comctl32.dll is installed."
-msgstr "Nemohu vytvo�it ovl�dac� prvek list, zkontrolujte, jestli m�te nainstalovanou comctl32.dll."
+msgstr ""
+"Nemohu vytvo�it ovl�dac� prvek list, zkontrolujte, jestli m�te "
+"nainstalovanou comctl32.dll."
 
 #: ../src/msw/registry.cpp:428
 #, c-format
 msgid "Can't create registry key '%s'"
 msgstr "Nemohu vytvo�it registrov� kl�� '%s'"
 
-#: ../src/mac/thread.cpp:430
-#: ../src/msw/thread.cpp:593
+#: ../src/mac/thread.cpp:430 ../src/msw/thread.cpp:593
 #: ../src/os2/thread.cpp:491
 msgid "Can't create thread"
 msgstr "Nemohu vytvo�it vl�kno"
@@ -648,8 +622,7 @@ msgstr "Nelze vytvo
 msgid "Can't delete key '%s'"
 msgstr "Nemohu smazat kl�� '%s'"
 
-#: ../src/msw/iniconf.cpp:444
-#: ../src/os2/iniconf.cpp:448
+#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "Nemohu smazat INI soubor '%s'"
@@ -694,8 +667,7 @@ msgstr "Nemohu inicializovat obrazovku."
 msgid "Can't initialize zlib inflate stream."
 msgstr "Nemohu inicializovat obrazovku."
 
-#: ../src/common/image.cpp:1028
-#: ../src/common/image.cpp:1048
+#: ../src/common/image.cpp:1028 ../src/common/image.cpp:1048
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
 msgstr "Nemohu na��st obr�zek ze souboru '%s': soubor neexistuje."
@@ -719,8 +691,7 @@ msgstr ""
 msgid "Can't read value of '%s'"
 msgstr "Nemohu p�e��st hodnotu '%s'"
 
-#: ../src/msw/registry.cpp:808
-#: ../src/msw/registry.cpp:842
+#: ../src/msw/registry.cpp:808 ../src/msw/registry.cpp:842
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr "Nemohu na��st hodnotu kl��e '%s'"
@@ -730,18 +701,15 @@ msgstr "Nemohu na
 msgid "Can't save image to file '%s': unknown extension."
 msgstr "Nemohu ulo�it do souboru '%s': nezn�m� p��pona."
 
-#: ../src/generic/logg.cpp:562
-#: ../src/generic/logg.cpp:994
+#: ../src/generic/logg.cpp:562 ../src/generic/logg.cpp:994
 msgid "Can't save log contents to file."
 msgstr "Nemohu ulo�it obsah logu do souboru."
 
-#: ../src/msw/thread.cpp:549
-#: ../src/os2/thread.cpp:473
+#: ../src/msw/thread.cpp:549 ../src/os2/thread.cpp:473
 msgid "Can't set thread priority"
 msgstr "Nemohu nastavit prioritu vl�kna"
 
-#: ../src/msw/registry.cpp:829
-#: ../src/msw/registry.cpp:954
+#: ../src/msw/registry.cpp:829 ../src/msw/registry.cpp:954
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr "Nemohu nastavit hodnotu '%s'"
@@ -751,22 +719,16 @@ msgstr "Nemohu nastavit hodnotu '%s'"
 msgid "Can't write to deflate stream: %s\n"
 msgstr "nemohu zapisovat do deskriptoru %d"
 
-#: ../src/common/dlgcmn.cpp:240
-#: ../src/generic/dirdlgg.cpp:155
-#: ../src/generic/filedlgg.cpp:977
-#: ../src/generic/filedlgg.cpp:996
-#: ../src/generic/fontdlgg.cpp:255
-#: ../src/generic/prntdlgg.cpp:455
-#: ../src/generic/progdlgg.cpp:211
-#: ../src/gtk/filedlg.cpp:168
-#: ../src/gtk/fontdlg.cpp:147
-#: ../src/html/helpfrm.cpp:1066
+#: ../src/common/dlgcmn.cpp:240 ../src/generic/dirdlgg.cpp:155
+#: ../src/generic/filedlgg.cpp:977 ../src/generic/filedlgg.cpp:996
+#: ../src/generic/fontdlgg.cpp:255 ../src/generic/prntdlgg.cpp:455
+#: ../src/generic/progdlgg.cpp:211 ../src/gtk/filedlg.cpp:168
+#: ../src/gtk/fontdlg.cpp:147 ../src/html/helpfrm.cpp:1066
 #: ../src/motif/msgdlg.cpp:182
 msgid "Cancel"
 msgstr "Storno"
 
-#: ../contrib/src/xrc/xmlres.cpp:987
-#: ../contrib/src/xrc/xmlres.cpp:1028
+#: ../contrib/src/xrc/xmlres.cpp:987 ../contrib/src/xrc/xmlres.cpp:1028
 msgid "Cannot convert dialog units: dialog unknown."
 msgstr "Nemohu p�ev�st dialogov� jednotky: dialog nen� zn�m."
 
@@ -811,8 +773,7 @@ msgstr "Nemohu zjistit ofici
 msgid "Cannot hang up - no active dialup connection."
 msgstr "Nemohu zav�sit - ��dn� aktivn� vyt��en� p�ipojen�."
 
-#: ../src/msw/app.cpp:290
-#: ../src/msw/app.cpp:293
+#: ../src/msw/app.cpp:290 ../src/msw/app.cpp:293
 msgid "Cannot initialize OLE"
 msgstr "Nemohu inicializovat OLE"
 
@@ -887,8 +848,7 @@ msgstr "Nemohu ze '%s' z
 msgid "Cannot print empty page."
 msgstr "Nemohu tisknout pr�zdnou str�nku."
 
-#: ../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 "Nemohu p�e��st typ z '%s'!"
@@ -958,8 +918,7 @@ msgstr "Po
 msgid "Config entry name cannot start with '%c'."
 msgstr "Polo�ka konfigurace nem��e za��nat na '%c'"
 
-#: ../src/generic/filedlgg.cpp:1214
-#: ../src/gtk/filedlg.cpp:74
+#: ../src/generic/filedlgg.cpp:1214 ../src/gtk/filedlg.cpp:74
 msgid "Confirm"
 msgstr "Potvrdit"
 
@@ -1017,8 +976,7 @@ msgstr "Soubor '%s' nelze otev
 msgid "Could not start document preview."
 msgstr "Nemohu zobrazit n�hled dokumentu."
 
-#: ../src/generic/printps.cpp:221
-#: ../src/msw/printwin.cpp:245
+#: ../src/generic/printps.cpp:221 ../src/msw/printwin.cpp:245
 msgid "Could not start printing."
 msgstr "Nemohu zah�jit tisk."
 
@@ -1031,21 +989,17 @@ msgstr "Nemohu p
 msgid "Couldn't acquire a mutex lock"
 msgstr "Nemohu vytvo�it �asova�"
 
-#: ../src/msw/dragimag.cpp:166
-#: ../src/msw/dragimag.cpp:206
-#: ../src/msw/imaglist.cpp:156
-#: ../src/msw/imaglist.cpp:174
+#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
+#: ../src/msw/imaglist.cpp:156 ../src/msw/imaglist.cpp:174
 #: ../src/msw/imaglist.cpp:186
 msgid "Couldn't add an image to the image list."
 msgstr "Nemohu p�idat obr�zek do seznamu."
 
-#: ../src/msw/timer.cpp:101
-#: ../src/os2/timer.cpp:118
+#: ../src/msw/timer.cpp:101 ../src/os2/timer.cpp:118
 msgid "Couldn't create a timer"
 msgstr "Nemohu vytvo�it �asova�"
 
-#: ../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 "Nemohu vytvo�it kurzor."
 
@@ -1054,14 +1008,15 @@ msgstr "Nemohu vytvo
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "Nemohu v dynamick� knihovn� nal�zt symbol '%s'"
 
-#: ../src/mac/thread.cpp:507
-#: ../src/msw/thread.cpp:847
+#: ../src/mac/thread.cpp:507 ../src/msw/thread.cpp:847
 msgid "Couldn't get the current thread pointer"
 msgstr "Nemohu z�skat ukazatel na aktu�ln� vl�kno"
 
 #: ../src/common/imagpng.cpp:607
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
-msgstr "Nemohu na��st PNG obr�zek - bu� je po�kozen� soubor nebo je nedostatek pam�ti."
+msgstr ""
+"Nemohu na��st PNG obr�zek - bu� je po�kozen� soubor nebo je nedostatek "
+"pam�ti."
 
 #: ../src/unix/sound.cpp:412
 #, fuzzy, c-format
@@ -1088,14 +1043,12 @@ msgstr "Nemohu vytvo
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "Nemohu z�skat informace o polo�ce %d v seznamu."
 
-#: ../src/common/imagpng.cpp:647
-#: ../src/common/imagpng.cpp:658
+#: ../src/common/imagpng.cpp:647 ../src/common/imagpng.cpp:658
 #: ../src/common/imagpng.cpp:666
 msgid "Couldn't save PNG image."
 msgstr "Nemohu ulo�it PNG obr�zek."
 
-#: ../src/mac/thread.cpp:756
-#: ../src/msw/thread.cpp:610
+#: ../src/mac/thread.cpp:756 ../src/msw/thread.cpp:610
 msgid "Couldn't terminate thread"
 msgstr "Nemohu p�eru�it vl�kno"
 
@@ -1107,8 +1060,7 @@ msgstr ""
 msgid "Create directory"
 msgstr "Vytv��en� adres��e"
 
-#: ../src/generic/dirdlgg.cpp:105
-#: ../src/generic/filedlgg.cpp:931
+#: ../src/generic/dirdlgg.cpp:105 ../src/generic/filedlgg.cpp:931
 msgid "Create new directory"
 msgstr "Vytvo�it nov� adres��"
 
@@ -1175,8 +1127,12 @@ msgid "Deleted stale lock file '%s'."
 msgstr "Smaz�n star� z�mkov� soubor '%s'."
 
 #: ../src/msw/dialup.cpp:346
-msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."
-msgstr "Vyt��en� p�ipojen� nen� dostupn�, proto�e Remote Access Service (RAS) nen� nainstalov�n. Pros�m, nainstalujte ho."
+msgid ""
+"Dial up functions are unavailable because the remote access service (RAS) is "
+"not installed on this machine. Please install it."
+msgstr ""
+"Vyt��en� p�ipojen� nen� dostupn�, proto�e Remote Access Service (RAS) nen� "
+"nainstalov�n. Pros�m, nainstalujte ho."
 
 #: ../src/generic/tipdlg.cpp:220
 msgid "Did you know..."
@@ -1202,8 +1158,12 @@ msgid "Directory doesn't exist."
 msgstr "Adres�� neexistuje"
 
 #: ../src/html/helpfrm.cpp:409
-msgid "Display all index items that contain given substring. Search is case insensitive."
-msgstr "Zobraz� v�echny polo�ky rejst��ku, kter� obsahuj� dan� pod�et�zec. Nerozli�uje velk� a mal� p�smena."
+msgid ""
+"Display all index items that contain given substring. Search is case "
+"insensitive."
+msgstr ""
+"Zobraz� v�echny polo�ky rejst��ku, kter� obsahuj� dan� pod�et�zec. "
+"Nerozli�uje velk� a mal� p�smena."
 
 #: ../src/html/helpfrm.cpp:583
 msgid "Display options dialog"
@@ -1211,7 +1171,8 @@ msgstr "Zobraz
 
 #: ../src/msw/mimetype.cpp:672
 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"
@@ -1268,27 +1229,22 @@ msgstr "Nalezen
 
 #: ../src/common/config.cpp:366
 #, c-format
-msgid "Environment variables expansion failed: missing '%c' at position %d in '%s'."
-msgstr "Chyba b�hem expanze prom�nn�ch prost�ed�: chyb� '%c' na pozici %d v '%s'."
+msgid ""
+"Environment variables expansion failed: missing '%c' at position %d in '%s'."
+msgstr ""
+"Chyba b�hem expanze prom�nn�ch prost�ed�: chyb� '%c' na pozici %d v '%s'."
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:711
-#: ../src/generic/filedlgg.cpp:725
-#: ../src/generic/filedlgg.cpp:739
-#: ../src/generic/filedlgg.cpp:1166
-#: ../src/generic/filedlgg.cpp:1191
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/dirctrlg.cpp:701
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:711
+#: ../src/generic/filedlgg.cpp:725 ../src/generic/filedlgg.cpp:739
+#: ../src/generic/filedlgg.cpp:1166 ../src/generic/filedlgg.cpp:1191
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 #: ../src/gtk/fontdlg.cpp:76
 msgid "Error"
 msgstr "Chyba"
 
-#: ../src/unix/utilsunx.cpp:1030
-#: ../src/unix/utilsunx.cpp:1038
+#: ../src/unix/utilsunx.cpp:1030 ../src/unix/utilsunx.cpp:1038
 msgid "Error "
 msgstr "Chyba"
 
@@ -1459,8 +1415,7 @@ msgstr "Nemohu vytvo
 msgid "Failed to display HTML document in %s encoding"
 msgstr "Nelze zobrati HTML dokument v k�dov�n� %s"
 
-#: ../src/mac/clipbrd.cpp:185
-#: ../src/msw/clipbrd.cpp:134
+#: ../src/mac/clipbrd.cpp:185 ../src/msw/clipbrd.cpp:134
 msgid "Failed to empty the clipboard."
 msgstr "Nemohu vypr�zdnit shcr�nku."
 
@@ -1478,8 +1433,7 @@ msgstr "Nelze nav
 msgid "Failed to establish dialup connection: %s"
 msgstr "Nepoda�ilo se nav�zat vyt��en� spojen�: %s"
 
-#: ../src/unix/utilsunx.cpp:459
-#: ../src/unix/utilsunx.cpp:475
+#: ../src/unix/utilsunx.cpp:459 ../src/unix/utilsunx.cpp:475
 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "Nepoda�ilo se spustit '%s'\n"
@@ -1522,8 +1476,12 @@ msgid "Failed to initialize OpenGL"
 msgstr "Nemohu inicializovat OpenGL"
 
 #: ../src/unix/threadpsx.cpp:896
-msgid "Failed to join a thread, potential memory leak detected - please restart the program"
-msgstr "Nemohu p�ipojit vl�kno, zji�t�na mo�n� chybn� alokace pam�ti - restartujte pros�m program"
+msgid ""
+"Failed to join a thread, potential memory leak detected - please restart the "
+"program"
+msgstr ""
+"Nemohu p�ipojit vl�kno, zji�t�na mo�n� chybn� alokace pam�ti - restartujte "
+"pros�m program"
 
 #: ../src/msw/utils.cpp:723
 #, c-format
@@ -1667,8 +1625,7 @@ msgstr "Nemohu ulo
 msgid "Failed to set temporary file permissions"
 msgstr "Nelze nastavit p��stupov� pr�va k do�asn�mu souboru"
 
-#: ../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 "Nemohu nastavit prioritu vl�kna %d."
@@ -1728,8 +1685,7 @@ msgstr "Soubor"
 msgid "File %s does not exist."
 msgstr "Soubor %s neexistuje."
 
-#: ../src/generic/filedlgg.cpp:1212
-#: ../src/gtk/filedlg.cpp:71
+#: ../src/generic/filedlgg.cpp:1212 ../src/gtk/filedlg.cpp:71
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "Soubor '%s' existuje, opravdu ho chcete p�epsat?"
@@ -1747,19 +1703,16 @@ msgstr ""
 msgid "File couldn't be loaded."
 msgstr "Soubor nelze na��st."
 
-#: ../src/common/docview.cpp:316
-#: ../src/common/docview.cpp:357
+#: ../src/common/docview.cpp:316 ../src/common/docview.cpp:357
 #: ../src/common/docview.cpp:1502
 msgid "File error"
 msgstr "Chyba souboru"
 
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/filedlgg.cpp:725
+#: ../src/generic/dirctrlg.cpp:701 ../src/generic/filedlgg.cpp:725
 msgid "File name exists already."
 msgstr "Soubor tohoto jm�na ji� existuje."
 
-#: ../src/common/fldlgcmn.cpp:62
-#: ../src/msw/filedlg.cpp:250
+#: ../src/common/fldlgcmn.cpp:62 ../src/msw/filedlg.cpp:250
 #, c-format
 msgid "Files (%s)|%s"
 msgstr "Soubory (%s)|%s"
@@ -1865,8 +1818,7 @@ msgstr "Jdi dop
 msgid "Go one level up in document hierarchy"
 msgstr "Jdi o �rove� v��"
 
-#: ../src/generic/dirdlgg.cpp:110
-#: ../src/generic/filedlgg.cpp:921
+#: ../src/generic/dirdlgg.cpp:110 ../src/generic/filedlgg.cpp:921
 msgid "Go to home directory"
 msgstr "J�t do domovsk�ho adres��e"
 
@@ -1899,10 +1851,8 @@ msgstr ""
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrejsk� (ISO-8859-8)"
 
-#: ../src/common/dlgcmn.cpp:236
-#: ../src/generic/mdig.cpp:310
-#: ../src/html/helpfrm.cpp:254
-#: ../src/html/helpfrm.cpp:277
+#: ../src/common/dlgcmn.cpp:236 ../src/generic/mdig.cpp:310
+#: ../src/html/helpfrm.cpp:254 ../src/html/helpfrm.cpp:277
 #: ../src/msw/mdi.cpp:1329
 msgid "Help"
 msgstr "N�pov�da"
@@ -1911,8 +1861,7 @@ msgstr "N
 msgid "Help Browser Options"
 msgstr "Nastaven� prohl��e�e n�pov�dy"
 
-#: ../src/generic/helpext.cpp:441
-#: ../src/generic/helpext.cpp:442
+#: ../src/generic/helpext.cpp:441 ../src/generic/helpext.cpp:442
 msgid "Help Index"
 msgstr "Index n�pov�dy"
 
@@ -1933,12 +1882,9 @@ msgstr "N
 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: Chyba p�i na��t�n� DIB masky."
 
-#: ../src/common/imagbmp.cpp:1042
-#: ../src/common/imagbmp.cpp:1101
-#: ../src/common/imagbmp.cpp:1110
-#: ../src/common/imagbmp.cpp:1121
-#: ../src/common/imagbmp.cpp:1165
-#: ../src/common/imagbmp.cpp:1175
+#: ../src/common/imagbmp.cpp:1042 ../src/common/imagbmp.cpp:1101
+#: ../src/common/imagbmp.cpp:1110 ../src/common/imagbmp.cpp:1121
+#: ../src/common/imagbmp.cpp:1165 ../src/common/imagbmp.cpp:1175
 #: ../src/common/imagbmp.cpp:1184
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: Chyba p�i ukl�d�n� obr�zku!"
@@ -1983,8 +1929,7 @@ msgstr ""
 msgid "Illegal Parameter Count for Create Method"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/filedlgg.cpp:711
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:711
 msgid "Illegal directory name."
 msgstr "Nedovolen� jm�no adres��e."
 
@@ -2002,8 +1947,12 @@ msgid "Image file is not of type %d."
 msgstr "Obr�zek nen� typu %d."
 
 #: ../src/msw/textctrl.cpp:303
-msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"
-msgstr "Nen� mo�n� vytvo�it rich edit prvek, pou�iji oby�ejn�. P�einstalujte pros�m riched32.dll."
+msgid ""
+"Impossible to create a rich edit control, using simple text control instead. "
+"Please reinstall riched32.dll"
+msgstr ""
+"Nen� mo�n� vytvo�it rich edit prvek, pou�iji oby�ejn�. P�einstalujte pros�m "
+"riched32.dll."
 
 #: ../src/unix/utilsunx.cpp:379
 msgid "Impossible to get child process input"
@@ -2060,8 +2009,7 @@ msgstr "
 msgid "Invalid lock file '%s'."
 msgstr "Chybn� zamykac� soubor '%s'."
 
-#: ../src/common/xtistrm.cpp:363
-#: ../src/common/xtistrm.cpp:378
+#: ../src/common/xtistrm.cpp:363 ../src/common/xtistrm.cpp:378
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr ""
 
@@ -2094,8 +2042,7 @@ msgstr "JPEG: Nemohu ulo
 msgid "KOI8-R"
 msgstr "KOI8-R"
 
-#: ../src/generic/prntdlgg.cpp:428
-#: ../src/generic/prntdlgg.cpp:638
+#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:638
 msgid "Landscape"
 msgstr "Na ���ku"
 
@@ -2149,8 +2096,7 @@ msgstr "Na
 msgid "Log saved to the file '%s'."
 msgstr "Log ulo�en do souboru '%s'."
 
-#: ../include/wx/xti.h:469
-#: ../include/wx/xti.h:473
+#: ../include/wx/xti.h:469 ../include/wx/xti.h:473
 msgid "Long Conversions not supported"
 msgstr ""
 
@@ -2159,8 +2105,12 @@ msgid "MDI child"
 msgstr "MDI syn"
 
 #: ../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 "Funk�nost MS HTML Helpu nen� dostupn�, proto�e chyb� p��slu�n� komponenta. Pros�m nainstalujte ji."
+msgid ""
+"MS HTML Help functions are unavailable because the MS HTML Help library is "
+"not installed on this machine. Please install it."
+msgstr ""
+"Funk�nost MS HTML Helpu nen� dostupn�, proto�e chyb� p��slu�n� komponenta. "
+"Pros�m nainstalujte ji."
 
 #: ../src/univ/themes/win32.cpp:4678
 msgid "Ma&ximize"
@@ -2231,10 +2181,8 @@ msgstr "Jm
 msgid "New item"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:274
-#: ../src/generic/dirdlgg.cpp:284
-#: ../src/generic/filedlgg.cpp:587
-#: ../src/generic/filedlgg.cpp:596
+#: ../src/generic/dirdlgg.cpp:274 ../src/generic/dirdlgg.cpp:284
+#: ../src/generic/filedlgg.cpp:587 ../src/generic/filedlgg.cpp:596
 msgid "NewName"
 msgstr "NoveJmeno"
 
@@ -2242,10 +2190,8 @@ msgstr "NoveJmeno"
 msgid "Next page"
 msgstr "N�sleduj�c� str�nka"
 
-#: ../src/common/dlgcmn.cpp:213
-#: ../src/mac/msgdlg.cpp:56
-#: ../src/mac/msgdlg.cpp:140
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:213 ../src/mac/msgdlg.cpp:56
+#: ../src/mac/msgdlg.cpp:140 ../src/motif/msgdlg.cpp:182
 msgid "No"
 msgstr "Ne"
 
@@ -2262,7 +2208,8 @@ msgstr "Nenalezeny 
 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 ""
 "Nenalezen ��dn� font pou�iteln� k zobrazen� textu v k�dov�n� '%s',\n"
 "ale je k dispozici alternativn� k�dov�n� '%s'.\n"
@@ -2284,20 +2231,17 @@ msgstr ""
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr "Nenalezen ��dn� ovlada� pro XML uzel '%s' t��dy '%s'!"
 
-#: ../src/common/image.cpp:1162
-#: ../src/common/image.cpp:1205
+#: ../src/common/image.cpp:1162 ../src/common/image.cpp:1205
 msgid "No handler found for image type."
 msgstr "Nenalezen ��dn� ovlada� pro tento typ obr�zk�."
 
-#: ../src/common/image.cpp:1170
-#: ../src/common/image.cpp:1213
+#: ../src/common/image.cpp:1170 ../src/common/image.cpp:1213
 #: ../src/common/image.cpp:1247
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "��dn� ovlada� pro typ obr�zk� %d."
 
-#: ../src/common/image.cpp:1231
-#: ../src/common/image.cpp:1263
+#: ../src/common/image.cpp:1231 ../src/common/image.cpp:1263
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "��dn� ovlada� pro typ obr�zk� %s."
@@ -2314,8 +2258,7 @@ msgstr "
 msgid "Nordic (ISO-8859-10)"
 msgstr "Seversk� (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:227
-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/generic/fontdlgg.cpp:227 ../src/generic/fontdlgg.cpp:230
 msgid "Normal"
 msgstr "Norm�ln�"
 
@@ -2331,16 +2274,11 @@ msgstr "Norm
 msgid "Note, 8 1/2 x 11 in"
 msgstr "Note, 8 1/2 x 11 palc�"
 
-#: ../src/common/dlgcmn.cpp:219
-#: ../src/generic/dirdlgg.cpp:153
-#: ../src/generic/filedlgg.cpp:976
-#: ../src/generic/filedlgg.cpp:987
-#: ../src/generic/fontdlgg.cpp:254
-#: ../src/generic/logg.cpp:748
-#: ../src/generic/prntdlgg.cpp:454
-#: ../src/gtk/filedlg.cpp:162
-#: ../src/gtk/fontdlg.cpp:139
-#: ../src/html/helpfrm.cpp:1064
+#: ../src/common/dlgcmn.cpp:219 ../src/generic/dirdlgg.cpp:153
+#: ../src/generic/filedlgg.cpp:976 ../src/generic/filedlgg.cpp:987
+#: ../src/generic/fontdlgg.cpp:254 ../src/generic/logg.cpp:748
+#: ../src/generic/prntdlgg.cpp:454 ../src/gtk/filedlg.cpp:162
+#: ../src/gtk/fontdlg.cpp:139 ../src/html/helpfrm.cpp:1064
 msgid "OK"
 msgstr "OK"
 
@@ -2348,20 +2286,16 @@ msgstr "OK"
 msgid "Objects must have an id attribute"
 msgstr ""
 
-#: ../src/common/docview.cpp:1197
-#: ../src/common/docview.cpp:1525
+#: ../src/common/docview.cpp:1197 ../src/common/docview.cpp:1525
 msgid "Open File"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:571
-#: ../src/html/helpfrm.cpp:1404
+#: ../src/html/helpfrm.cpp:571 ../src/html/helpfrm.cpp:1404
 msgid "Open HTML document"
 msgstr "Otev�i HTML dokument"
 
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:739
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:739
 msgid "Operation not permitted."
 msgstr "Zak�zan� operace."
 
@@ -2384,13 +2318,11 @@ msgstr "Volba '%s': '%s' neud
 msgid "Options"
 msgstr "Nastaven�"
 
-#: ../src/generic/prntdlgg.cpp:430
-#: ../src/generic/prntdlgg.cpp:639
+#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:639
 msgid "Orientation"
 msgstr "Orientace"
 
-#: ../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: Nemohu alokovat pam�."
 
@@ -2406,8 +2338,7 @@ msgstr "PCX: po
 msgid "PCX: this is not a PCX file."
 msgstr "PCX: tento soubor nen� 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: nezn�m� chyba !!!"
 
@@ -2445,14 +2376,12 @@ msgstr "Nastaven
 msgid "Pages"
 msgstr "Strany"
 
-#: ../src/generic/prntdlgg.cpp:545
-#: ../src/generic/prntdlgg.cpp:625
+#: ../src/generic/prntdlgg.cpp:545 ../src/generic/prntdlgg.cpp:625
 #: ../src/generic/prntdlgg.cpp:818
 msgid "Paper Size"
 msgstr "Velikost pap�ru"
 
-#: ../src/generic/prntdlgg.cpp:420
-#: ../src/generic/prntdlgg.cpp:612
+#: ../src/generic/prntdlgg.cpp:420 ../src/generic/prntdlgg.cpp:612
 #: ../src/generic/prntdlgg.cpp:813
 msgid "Paper size"
 msgstr "Velikost pap�ru"
@@ -2465,8 +2394,7 @@ msgstr ""
 msgid "Passing a already registered object to SetObjectName"
 msgstr ""
 
-#: ../src/common/xtistrm.cpp:434
-#: ../src/common/xtistrm.cpp:654
+#: ../src/common/xtistrm.cpp:434 ../src/common/xtistrm.cpp:654
 msgid "Passing an unkown object to GetObject"
 msgstr ""
 
@@ -2482,8 +2410,7 @@ msgstr "Nelze vytvo
 msgid "Please choose a valid font."
 msgstr "Pros�m vyberte korektn� font."
 
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 msgid "Please choose an existing file."
 msgstr "Vyberte pros�m existuj�c� soubor."
 
@@ -2506,8 +2433,7 @@ msgstr ""
 msgid "Please wait while printing\n"
 msgstr "Vy�kejte pros�m, a� skon�� tisk\n"
 
-#: ../src/generic/prntdlgg.cpp:427
-#: ../src/generic/prntdlgg.cpp:637
+#: ../src/generic/prntdlgg.cpp:427 ../src/generic/prntdlgg.cpp:637
 msgid "Portrait"
 msgstr "Na v��ku"
 
@@ -2523,8 +2449,7 @@ msgstr "N
 msgid "Previous page"
 msgstr "P�edchoz� str�nka"
 
-#: ../src/generic/prntdlgg.cpp:107
-#: ../src/generic/prntdlgg.cpp:121
+#: ../src/generic/prntdlgg.cpp:107 ../src/generic/prntdlgg.cpp:121
 msgid "Print"
 msgstr "Vytisknout"
 
@@ -2532,8 +2457,7 @@ msgstr "Vytisknout"
 msgid "Print Preview"
 msgstr "N�hled tisku"
 
-#: ../src/common/prntbase.cpp:784
-#: ../src/common/prntbase.cpp:810
+#: ../src/common/prntbase.cpp:784 ../src/common/prntbase.cpp:810
 msgid "Print Preview Failure"
 msgstr "Chyba b�hem vytv��en� n�hledu."
 
@@ -2577,8 +2501,7 @@ msgstr "Nastaven
 msgid "Printer..."
 msgstr "Tisk�rna..."
 
-#: ../src/common/prntbase.cpp:109
-#: ../src/common/prntbase.cpp:154
+#: ../src/common/prntbase.cpp:109 ../src/common/prntbase.cpp:154
 msgid "Printing "
 msgstr "Tisknu "
 
@@ -2607,8 +2530,7 @@ msgstr "Quarto, 215 x 275 mm"
 msgid "Question"
 msgstr "Ot�zka"
 
-#: ../src/common/ffile.cpp:111
-#: ../src/common/ffile.cpp:132
+#: ../src/common/ffile.cpp:111 ../src/common/ffile.cpp:132
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "Chyba p�i �ten� ze souboru '%s'"
@@ -2698,14 +2620,17 @@ msgstr "Ulo
 msgid "Script"
 msgstr "Psac�"
 
-#: ../src/html/helpfrm.cpp:443
-#: ../src/html/helpfrm.cpp:458
+#: ../src/html/helpfrm.cpp:443 ../src/html/helpfrm.cpp:458
 msgid "Search"
 msgstr "Hledat"
 
 #: ../src/html/helpfrm.cpp:445
-msgid "Search contents of help book(s) for all occurences of the text you typed above"
-msgstr "Prohled� obsah knih(y) s n�pov�dou a vyp��e v�echny v�skyty textu, kter� jste zadal"
+msgid ""
+"Search contents of help book(s) for all occurences of the text you typed "
+"above"
+msgstr ""
+"Prohled� obsah knih(y) s n�pov�dou a vyp��e v�echny v�skyty textu, kter� "
+"jste zadal"
 
 #: ../src/generic/fdrepdlg.cpp:152
 msgid "Search direction"
@@ -2767,7 +2692,8 @@ msgstr "Nastaven
 
 #: ../src/msw/dialup.cpp:518
 msgid "Several active dialup connections found, choosing one randomly."
-msgstr "Nalezeno n�kolik aktivn�ch vyt��en�ch p�ipojen�, vyb�r�m jedno n�hodn�."
+msgstr ""
+"Nalezeno n�kolik aktivn�ch vyt��en�ch p�ipojen�, vyb�r�m jedno n�hodn�."
 
 #: ../src/html/helpfrm.cpp:399
 msgid "Show all"
@@ -2781,8 +2707,7 @@ msgstr "Zobraz
 msgid "Show hidden directories"
 msgstr "Uk�zat skryt� adres��e"
 
-#: ../src/generic/filedlgg.cpp:971
-#: ../src/generic/filedlgg.cpp:993
+#: ../src/generic/filedlgg.cpp:971 ../src/generic/filedlgg.cpp:993
 msgid "Show hidden files"
 msgstr "Uk�zat skryt� soubory"
 
@@ -2802,8 +2727,7 @@ msgstr "Sklon
 msgid "Sorry, could not open this file for saving."
 msgstr "Tento soubor nelze otev��t pro z�pis."
 
-#: ../src/common/docview.cpp:367
-#: ../src/common/docview.cpp:380
+#: ../src/common/docview.cpp:367 ../src/common/docview.cpp:380
 #: ../src/common/docview.cpp:1504
 msgid "Sorry, could not open this file."
 msgstr "Tento soubor nelze otev��t."
@@ -2820,8 +2744,7 @@ msgstr "Nedostatek pam
 msgid "Sorry, print preview needs a printer to be installed."
 msgstr ""
 
-#: ../src/common/docview.cpp:1196
-#: ../src/common/docview.cpp:1524
+#: ../src/common/docview.cpp:1196 ../src/common/docview.cpp:1524
 #, fuzzy
 msgid "Sorry, the format for this file is unknown."
 msgstr "Tento soubor nelze otev��t."
@@ -2852,8 +2775,7 @@ msgstr ""
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "XRC zdroje: chybn� popis barvy '%s' u vlastnosti '%s'."
 
-#: ../include/wx/xti.h:396
-#: ../include/wx/xti.h:400
+#: ../include/wx/xti.h:396 ../include/wx/xti.h:400
 msgid "String conversions not supported"
 msgstr ""
 
@@ -2866,8 +2788,7 @@ msgstr "Podt
 msgid "Swiss"
 msgstr "Bezpatkov�"
 
-#: ../src/common/imagtiff.cpp:232
-#: ../src/common/imagtiff.cpp:243
+#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
 #: ../src/common/imagtiff.cpp:354
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: Nemohu alokovat pam�."
@@ -2972,24 +2893,37 @@ msgstr "Mus
 
 #: ../src/msw/dialup.cpp:406
 #, 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 "Verze Remote Access Service (RAS) na tomto po��ta�i je p��li� star�, pros�m upgradujte (chyb� tato funkce: %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 ""
+"Verze Remote Access Service (RAS) na tomto po��ta�i je p��li� star�, pros�m "
+"upgradujte (chyb� tato funkce: %s)."
 
 #: ../src/html/htmprint.cpp:580
-msgid "There was a problem during page setup: you may need to set a default printer."
+msgid ""
+"There was a problem during page setup: you may need to set a default printer."
 msgstr "P�i nastavov�n� str�nky nastala chyba: nastavte v�choz� tisk�rnu."
 
 #: ../src/msw/thread.cpp:1197
-msgid "Thread module initialization failed: can not store value in thread local storage"
-msgstr "Modul s vl�kny se nepoda�ilo iniciovat: nemohu ukl�dat hodnoty v 'local storage'"
+msgid ""
+"Thread module initialization failed: can not store value in thread local "
+"storage"
+msgstr ""
+"Modul s vl�kny se nepoda�ilo iniciovat: nemohu ukl�dat hodnoty v 'local "
+"storage'"
 
 #: ../src/unix/threadpsx.cpp:1600
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "Selhala inicializace modulu s vl�kny: nelze vytvo�it kl��"
 
 #: ../src/msw/thread.cpp:1185
-msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
-msgstr "Modul s vl�kny se nepoda�ilo iniciovat: nemohu alokovat index v 'local storage'"
+msgid ""
+"Thread module initialization failed: impossible to allocate index in thread "
+"local storage"
+msgstr ""
+"Modul s vl�kny se nepoda�ilo iniciovat: nemohu alokovat index v 'local "
+"storage'"
 
 #: ../src/unix/threadpsx.cpp:1108
 msgid "Thread priority setting is ignored."
@@ -3033,8 +2967,7 @@ msgstr "Horn
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr "Soubor '%s' nelze odebrat z pam�ov�ho VFS, proto�e nebyl na�ten!"
 
-#: ../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 "Sna��m se zjistit NULLov� jm�no po��ta�e: vzd�v�m to"
 
@@ -3047,8 +2980,7 @@ msgstr "Tursk
 msgid "Type"
 msgstr "Neproporcion�ln�"
 
-#: ../src/common/xtistrm.cpp:279
-#: ../src/common/xtixml.cpp:351
+#: ../src/common/xtistrm.cpp:279 ../src/common/xtixml.cpp:351
 #: ../src/common/xtixml.cpp:498
 msgid "Type must have enum - long conversion"
 msgstr ""
@@ -3137,8 +3069,7 @@ msgstr "Nezn
 msgid "Unknown long option '%s'"
 msgstr "Nezn�m� 'dlouh�' volba '%s'"
 
-#: ../src/common/cmdline.cpp:582
-#: ../src/common/cmdline.cpp:603
+#: ../src/common/cmdline.cpp:582 ../src/common/cmdline.cpp:603
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "Nezn�m� volba '%s'"
@@ -3157,14 +3088,12 @@ msgstr "Nezn
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "P�ebyte�n� '{' v popisu mime typu %s."
 
-#: ../src/common/cmdproc.cpp:254
-#: ../src/common/cmdproc.cpp:280
+#: ../src/common/cmdproc.cpp:254 ../src/common/cmdproc.cpp:280
 #: ../src/common/cmdproc.cpp:300
 msgid "Unnamed command"
 msgstr "Nepojmenovan� p��kaz"
 
-#: ../src/mac/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:273
+#: ../src/mac/clipbrd.cpp:64 ../src/msw/clipbrd.cpp:273
 #: ../src/msw/clipbrd.cpp:445
 msgid "Unsupported clipboard format."
 msgstr "Nepodporovan� form�t obsahu schr�nky."
@@ -3323,8 +3252,7 @@ msgstr "Chyba p
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: �patn� pixelov� data!"
 
-#: ../src/common/xpmdecod.cpp:712
-#: ../src/common/xpmdecod.cpp:722
+#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:722
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr "XPM: �patn� definice barvy '%s'!"
@@ -3334,8 +3262,7 @@ msgstr "XPM: 
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "XRC zdroj '%s' (t��da '%s') nenalezen!"
 
-#: ../contrib/src/xrc/xmlres.cpp:885
-#: ../contrib/src/xrc/xmlres.cpp:897
+#: ../contrib/src/xrc/xmlres.cpp:885 ../contrib/src/xrc/xmlres.cpp:897
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "XRC zdroje: nemohu vytvo�it bitmapu z '%s'."
@@ -3345,10 +3272,8 @@ msgstr "XRC zdroje: nemohu vytvo
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr "XRC zdroje: chybn� popis barvy '%s' u vlastnosti '%s'."
 
-#: ../src/common/dlgcmn.cpp:208
-#: ../src/mac/msgdlg.cpp:57
-#: ../src/mac/msgdlg.cpp:139
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:208 ../src/mac/msgdlg.cpp:57
+#: ../src/mac/msgdlg.cpp:139 ../src/motif/msgdlg.cpp:182
 msgid "Yes"
 msgstr "Ano"
 
@@ -3356,8 +3281,7 @@ msgstr "Ano"
 msgid "You cannot add a new directory to this section."
 msgstr "Nem��ete p�idat nov� adres�� do t�to sekce."
 
-#: ../src/common/fs_zip.cpp:88
-#: ../src/common/fs_zip.cpp:138
+#: ../src/common/fs_zip.cpp:88 ../src/common/fs_zip.cpp:138
 msgid "ZIP handler currently supports only local files!"
 msgstr "ZIP soubory lze otev��t jenom z disku!"
 
@@ -3371,7 +3295,8 @@ msgstr "DDEML aplikace zp
 
 #: ../src/msw/dde.cpp:1063
 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 ""
@@ -3528,8 +3453,7 @@ msgstr "nemohu naj
 msgid "can't flush file descriptor %d"
 msgstr "nemohu vypr�zdnit (flush) deskriptor %d"
 
-#: ../src/common/file.cpp:535
-#: ../src/common/file.cpp:543
+#: ../src/common/file.cpp:535 ../src/common/file.cpp:543
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "nemohu zjistit pozici v deskriptoru %d"
@@ -3538,8 +3462,7 @@ msgstr "nemohu zjistit pozici v deskriptoru %d"
 msgid "can't load any font, aborting"
 msgstr "nemohu na��st ��dn� font, kon��m"
 
-#: ../src/common/ffile.cpp:63
-#: ../src/common/file.cpp:352
+#: ../src/common/ffile.cpp:63 ../src/common/file.cpp:352
 #, c-format
 msgid "can't open file '%s'"
 msgstr "nemohu otev��t soubor '%s'"
@@ -3577,8 +3500,7 @@ msgstr "nemohu odstranit soubor '%s'"
 msgid "can't remove temporary file '%s'"
 msgstr "nemohu odstranit do�asn� soubor '%s'"
 
-#: ../src/common/file.cpp:492
-#: ../src/common/file.cpp:518
+#: ../src/common/file.cpp:492 ../src/common/file.cpp:518
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "nemohu seekovat v deskriptoru %d"
@@ -3743,8 +3665,7 @@ msgstr "
 msgid "invalid message box return value"
 msgstr "�patn� n�vratov� hodnota message boxu"
 
-#: ../src/common/fontcmn.cpp:473
-#: ../src/common/fontcmn.cpp:537
+#: ../src/common/fontcmn.cpp:473 ../src/common/fontcmn.cpp:537
 msgid "italic"
 msgstr "kurz�va"
 
@@ -3892,8 +3813,7 @@ msgstr "t
 msgid "thirteenth"
 msgstr "t�in�ct�ho"
 
-#: ../src/common/imagtiff.cpp:143
-#: ../src/common/imagtiff.cpp:151
+#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
 #, c-format
 msgid "tiff module: %s"
 msgstr ""
@@ -3938,8 +3858,7 @@ msgstr "nezn
 msgid "unknown class %s"
 msgstr "nezn�m� t�ida %s"
 
-#: ../src/common/regex.cpp:151
-#: ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:151 ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr "nezn�m� chyba"
 
@@ -3952,8 +3871,7 @@ msgstr "nezn
 msgid "unknown line terminator"
 msgstr "nezn�m� konec ��dku"
 
-#: ../src/common/file.cpp:474
-#: ../src/common/file.cpp:501
+#: ../src/common/file.cpp:474 ../src/common/file.cpp:501
 msgid "unknown seek origin"
 msgstr "nezn�m� po��tek pro nastaven� pozice"
 
@@ -3993,8 +3911,7 @@ msgstr "z
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay selhalo."
 
-#: ../src/common/socket.cpp:395
-#: ../src/common/socket.cpp:449
+#: ../src/common/socket.cpp:395 ../src/common/socket.cpp:449
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: chybn� signatura v ReadMsg."
 
@@ -4015,8 +3932,7 @@ msgstr "wxWindows nemohou otev
 msgid "yesterday"
 msgstr "v�era"
 
-#: ../src/common/zstream.cpp:141
-#: ../src/common/zstream.cpp:275
+#: ../src/common/zstream.cpp:141 ../src/common/zstream.cpp:275
 #, c-format
 msgid "zlib error %d"
 msgstr "zlib chyba %d"
@@ -4024,4 +3940,3 @@ msgstr "zlib chyba %d"
 #: ../src/common/prntbase.cpp:450
 msgid "|<<"
 msgstr "|<<"
-
diff --git a/locale/de.po b/locale/de.po
index 028abaff2c..bcbd2fa462 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWindows-2.5.1\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-04 18:56+0100\n"
 "PO-Revision-Date: 2004-05-06 01:41+0100\n"
 "Last-Translator: Herbert Breunung <herbert_breunung@web.de>\n"
@@ -42,10 +43,8 @@ msgstr "#14 Umschlag, 5 x 11 1/2 Zoll"
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "#9 Umschlag, 3 7/8 x 8 7/8 Zoll"
 
-#: ../src/html/helpfrm.cpp:867
-#: ../src/html/helpfrm.cpp:868
-#: ../src/html/helpfrm.cpp:1505
-#: ../src/html/helpfrm.cpp:1535
+#: ../src/html/helpfrm.cpp:867 ../src/html/helpfrm.cpp:868
+#: ../src/html/helpfrm.cpp:1505 ../src/html/helpfrm.cpp:1535
 #, c-format
 msgid "%i of %i"
 msgstr "%i von %i"
@@ -88,8 +87,7 @@ msgstr "
 msgid "&Arrange Icons"
 msgstr "Icons anordnen"
 
-#: ../src/generic/fdrepdlg.cpp:164
-#: ../src/generic/wizard.cpp:401
+#: ../src/generic/fdrepdlg.cpp:164 ../src/generic/wizard.cpp:401
 msgid "&Cancel"
 msgstr "Ab&bruch"
 
@@ -97,10 +95,8 @@ msgstr "Ab&bruch"
 msgid "&Cascade"
 msgstr "Kaskadieren"
 
-#: ../src/common/prntbase.cpp:439
-#: ../src/generic/logg.cpp:502
-#: ../src/generic/tipdlg.cpp:213
-#: ../src/html/helpfrm.cpp:271
+#: ../src/common/prntbase.cpp:439 ../src/generic/logg.cpp:502
+#: ../src/generic/tipdlg.cpp:213 ../src/html/helpfrm.cpp:271
 msgid "&Close"
 msgstr "&Schlie�en"
 
@@ -140,13 +136,11 @@ msgstr "&Log"
 msgid "&Move"
 msgstr "&Bewegen"
 
-#: ../src/generic/mdig.cpp:117
-#: ../src/msw/mdi.cpp:192
+#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:192
 msgid "&Next"
 msgstr "&Weiter"
 
-#: ../src/generic/wizard.cpp:400
-#: ../src/generic/wizard.cpp:582
+#: ../src/generic/wizard.cpp:400 ../src/generic/wizard.cpp:582
 msgid "&Next >"
 msgstr "&Weiter >"
 
@@ -162,8 +156,7 @@ msgstr "
 msgid "&Paste"
 msgstr "Einf�gen"
 
-#: ../src/generic/mdig.cpp:118
-#: ../src/msw/mdi.cpp:193
+#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:193
 msgid "&Previous"
 msgstr "Zur�ck"
 
@@ -171,14 +164,12 @@ msgstr "Zur
 msgid "&Print..."
 msgstr "Drucken..."
 
-#: ../src/common/cmdproc.cpp:285
-#: ../src/common/cmdproc.cpp:292
+#: ../src/common/cmdproc.cpp:285 ../src/common/cmdproc.cpp:292
 #: ../src/msw/textctrl.cpp:2048
 msgid "&Redo"
 msgstr "&Wiederholen"
 
-#: ../src/common/cmdproc.cpp:281
-#: ../src/common/cmdproc.cpp:301
+#: ../src/common/cmdproc.cpp:281 ../src/common/cmdproc.cpp:301
 msgid "&Redo "
 msgstr "&Wiederholen "
 
@@ -190,8 +181,7 @@ msgstr "&Ersetzen"
 msgid "&Restore"
 msgstr "&Wiederherstellen"
 
-#: ../src/generic/logg.cpp:498
-#: ../src/generic/logg.cpp:827
+#: ../src/generic/logg.cpp:498 ../src/generic/logg.cpp:827
 msgid "&Save..."
 msgstr "&Sichern..."
 
@@ -203,8 +193,7 @@ msgstr "&Tipps beim Programmstart zeigen"
 msgid "&Size"
 msgstr "&Gr��e"
 
-#: ../src/common/cmdproc.cpp:263
-#: ../src/msw/textctrl.cpp:2047
+#: ../src/common/cmdproc.cpp:263 ../src/msw/textctrl.cpp:2047
 msgid "&Undo"
 msgstr "&R�ckg�ngig"
 
@@ -212,23 +201,18 @@ msgstr "&R
 msgid "&Undo "
 msgstr "&R�ckg�ngig "
 
-#: ../src/generic/mdig.cpp:297
-#: ../src/generic/mdig.cpp:313
-#: ../src/generic/mdig.cpp:317
-#: ../src/msw/mdi.cpp:1333
-#: ../src/msw/mdi.cpp:1340
+#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
+#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1333 ../src/msw/mdi.cpp:1340
 #: ../src/msw/mdi.cpp:1370
 msgid "&Window"
 msgstr "&Fenster"
 
-#: ../src/common/config.cpp:414
-#: ../src/msw/regconf.cpp:265
+#: ../src/common/config.cpp:414 ../src/msw/regconf.cpp:265
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' hat extra '..', ignoriert."
 
-#: ../src/common/valtext.cpp:136
-#: ../src/common/valtext.cpp:166
+#: ../src/common/valtext.cpp:136 ../src/common/valtext.cpp:166
 #: ../src/common/valtext.cpp:172
 #, c-format
 msgid "'%s' is invalid"
@@ -273,19 +257,16 @@ msgstr "'%s' sollte nur alphanumerische Zeichen enthalten."
 msgid "(Help)"
 msgstr "(Hilfe)"
 
-#: ../src/html/helpfrm.cpp:345
-#: ../src/html/helpfrm.cpp:935
+#: ../src/html/helpfrm.cpp:345 ../src/html/helpfrm.cpp:935
 #: ../src/html/helpfrm.cpp:1563
 msgid "(bookmarks)"
 msgstr "(Lesezeichen)"
 
-#: ../src/generic/dirctrlg.cpp:677
-#: ../src/generic/filedlgg.cpp:707
+#: ../src/generic/dirctrlg.cpp:677 ../src/generic/filedlgg.cpp:707
 msgid "."
 msgstr "."
 
-#: ../src/generic/dirctrlg.cpp:678
-#: ../src/generic/filedlgg.cpp:708
+#: ../src/generic/dirctrlg.cpp:678 ../src/generic/filedlgg.cpp:708
 msgid ".."
 msgstr ".."
 
@@ -325,18 +306,15 @@ msgstr "< &Zur
 msgid "<<"
 msgstr "<<"
 
-#: ../src/generic/filedlgg.cpp:248
-#: ../src/generic/filedlgg.cpp:271
+#: ../src/generic/filedlgg.cpp:248 ../src/generic/filedlgg.cpp:271
 msgid "<DIR>"
 msgstr "<VERZEICHNIS>"
 
-#: ../src/generic/filedlgg.cpp:252
-#: ../src/generic/filedlgg.cpp:275
+#: ../src/generic/filedlgg.cpp:252 ../src/generic/filedlgg.cpp:275
 msgid "<DRIVE>"
 msgstr "<LAUFWERK>"
 
-#: ../src/generic/filedlgg.cpp:250
-#: ../src/generic/filedlgg.cpp:273
+#: ../src/generic/filedlgg.cpp:250 ../src/generic/filedlgg.cpp:273
 msgid "<LINK>"
 msgstr "<LINK>"
 
@@ -470,8 +448,7 @@ msgstr "B5 Blatt, 182 x 257 mm"
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 Umschlag, 176 x 125 mm"
 
-#: ../src/common/imagbmp.cpp:470
-#: ../src/common/imagbmp.cpp:486
+#: ../src/common/imagbmp.cpp:470 ../src/common/imagbmp.cpp:486
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: Speicheranforderung gescheitert."
 
@@ -547,8 +524,7 @@ msgstr "C6 Umschlag, 114 x 162 mm"
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 Umschlag, 114 x 229 mm"
 
-#: ../src/html/chm.cpp:783
-#: ../src/html/chm.cpp:842
+#: ../src/html/chm.cpp:783 ../src/html/chm.cpp:842
 msgid "CHM handler currently supports only local files!"
 msgstr "CHM Handler unterst�tzt derzeit nur lokale Dateien."
 
@@ -561,8 +537,7 @@ msgstr "Kann Mutex nicht anlegen."
 msgid "Can not enumerate files '%s'"
 msgstr "Kann Dateien '%s' nicht auflisten"
 
-#: ../src/msw/dir.cpp:300
-#: ../src/unix/dir.cpp:232
+#: ../src/msw/dir.cpp:300 ../src/unix/dir.cpp:232
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "Kann Dateien in Verzeichnis '%s' nicht auflisten"
@@ -572,8 +547,7 @@ msgstr "Kann Dateien in Verzeichnis '%s' nicht auflisten"
 msgid "Can not resume thread %lu"
 msgstr "Kann Thread %lu nicht fortsetzen."
 
-#: ../src/mac/thread.cpp:477
-#: ../src/msw/thread.cpp:821
+#: ../src/mac/thread.cpp:477 ../src/msw/thread.cpp:821
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "Kann Thread %x nicht fortsetzen."
@@ -587,8 +561,7 @@ msgstr "Kann Thread nicht starten: Fehler beim Schreiben der 'TLS'."
 msgid "Can not suspend thread %lu"
 msgstr "Kann Thread %lu nicht anhalten."
 
-#: ../src/mac/thread.cpp:453
-#: ../src/msw/thread.cpp:806
+#: ../src/mac/thread.cpp:453 ../src/msw/thread.cpp:806
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "Kann Thread %x nicht anhalten."
@@ -604,7 +577,8 @@ msgstr "Kann nicht r
 #: ../src/common/image.cpp:1441
 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
-msgstr "Kann Bildformat nicht �berpr�fen bei Datei '%s': Datei nicht vorhanden."
+msgstr ""
+"Kann Bildformat nicht �berpr�fen bei Datei '%s': Datei nicht vorhanden."
 
 #: ../src/msw/registry.cpp:447
 #, c-format
@@ -618,15 +592,16 @@ msgstr "Kann Inhalte des nicht unterst
 
 #: ../src/msw/listctrl.cpp:413
 msgid "Can't create list control window, check that comctl32.dll is installed."
-msgstr "Kann ListCtrl-Fenster nicht erstellen, bitte �berpr�fen ob 'comctl32.dll' installiert ist."
+msgstr ""
+"Kann ListCtrl-Fenster nicht erstellen, bitte �berpr�fen ob 'comctl32.dll' "
+"installiert ist."
 
 #: ../src/msw/registry.cpp:428
 #, c-format
 msgid "Can't create registry key '%s'"
 msgstr "Kann Registrierungs-Schl�ssel '%s' nicht anlegen."
 
-#: ../src/mac/thread.cpp:430
-#: ../src/msw/thread.cpp:593
+#: ../src/mac/thread.cpp:430 ../src/msw/thread.cpp:593
 #: ../src/os2/thread.cpp:491
 msgid "Can't create thread"
 msgstr "Kann Thread nicht erzeugen"
@@ -641,8 +616,7 @@ msgstr "Kann kein Fenster der Klasse '%s' anlegen."
 msgid "Can't delete key '%s'"
 msgstr "Kann Schl�ssel '%s' nicht l�schen"
 
-#: ../src/msw/iniconf.cpp:444
-#: ../src/os2/iniconf.cpp:448
+#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "Kann INI-Datei '%s' nicht l�schen"
@@ -685,8 +659,7 @@ msgstr "Kann das Entkomprimieren der zlib-Daten nicht initialisieren"
 msgid "Can't initialize zlib inflate stream."
 msgstr "Kann das komprimieren der zlib-Daten nicht initialisieren"
 
-#: ../src/common/image.cpp:1028
-#: ../src/common/image.cpp:1048
+#: ../src/common/image.cpp:1028 ../src/common/image.cpp:1048
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
 msgstr "Kann Bild aus Datei '%s' nicht laden : Datei ist nicht vorhanden."
@@ -703,15 +676,16 @@ msgstr "Kann nicht vom entkomprimierten Strom lesen:%s\n"
 
 #: ../src/common/zstream.cpp:121
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
-msgstr "Kann den Entkomprimier-Strom nicht lesen: Unerwartetes EOF im zugrunde liegenden Strom."
+msgstr ""
+"Kann den Entkomprimier-Strom nicht lesen: Unerwartetes EOF im zugrunde "
+"liegenden Strom."
 
 #: ../src/msw/registry.cpp:930
 #, c-format
 msgid "Can't read value of '%s'"
 msgstr "Kann Wert von '%s' nicht lesen"
 
-#: ../src/msw/registry.cpp:808
-#: ../src/msw/registry.cpp:842
+#: ../src/msw/registry.cpp:808 ../src/msw/registry.cpp:842
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr "Kann Wert von Eintrag '%s' nicht lesen"
@@ -721,18 +695,15 @@ msgstr "Kann Wert von Eintrag '%s' nicht lesen"
 msgid "Can't save image to file '%s': unknown extension."
 msgstr "Kann Bild nicht aus Datei '%s' laden: Unbekannte Dateiendung."
 
-#: ../src/generic/logg.cpp:562
-#: ../src/generic/logg.cpp:994
+#: ../src/generic/logg.cpp:562 ../src/generic/logg.cpp:994
 msgid "Can't save log contents to file."
 msgstr "Kann Logtexte nicht in Datei sichern."
 
-#: ../src/msw/thread.cpp:549
-#: ../src/os2/thread.cpp:473
+#: ../src/msw/thread.cpp:549 ../src/os2/thread.cpp:473
 msgid "Can't set thread priority"
 msgstr "Kann Thread-Priorit�t nicht setzen"
 
-#: ../src/msw/registry.cpp:829
-#: ../src/msw/registry.cpp:954
+#: ../src/msw/registry.cpp:829 ../src/msw/registry.cpp:954
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr "Kann Wert von '%s' nicht setzen"
@@ -742,22 +713,16 @@ msgstr "Kann Wert von '%s' nicht setzen"
 msgid "Can't write to deflate stream: %s\n"
 msgstr "Kann nicht vom komprimierten Strom lesen: %s\n"
 
-#: ../src/common/dlgcmn.cpp:240
-#: ../src/generic/dirdlgg.cpp:155
-#: ../src/generic/filedlgg.cpp:977
-#: ../src/generic/filedlgg.cpp:996
-#: ../src/generic/fontdlgg.cpp:255
-#: ../src/generic/prntdlgg.cpp:455
-#: ../src/generic/progdlgg.cpp:211
-#: ../src/gtk/filedlg.cpp:168
-#: ../src/gtk/fontdlg.cpp:147
-#: ../src/html/helpfrm.cpp:1066
+#: ../src/common/dlgcmn.cpp:240 ../src/generic/dirdlgg.cpp:155
+#: ../src/generic/filedlgg.cpp:977 ../src/generic/filedlgg.cpp:996
+#: ../src/generic/fontdlgg.cpp:255 ../src/generic/prntdlgg.cpp:455
+#: ../src/generic/progdlgg.cpp:211 ../src/gtk/filedlg.cpp:168
+#: ../src/gtk/fontdlg.cpp:147 ../src/html/helpfrm.cpp:1066
 #: ../src/motif/msgdlg.cpp:182
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: ../contrib/src/xrc/xmlres.cpp:987
-#: ../contrib/src/xrc/xmlres.cpp:1028
+#: ../contrib/src/xrc/xmlres.cpp:987 ../contrib/src/xrc/xmlres.cpp:1028
 msgid "Cannot convert dialog units: dialog unknown."
 msgstr "Kann Dialog-Einheiten nicht konvertieren: Dialog unbekannt."
 
@@ -802,8 +767,7 @@ msgstr "Kann den offiziellen Hostnamen nicht bekommen"
 msgid "Cannot hang up - no active dialup connection."
 msgstr "Kann nicht auflegen - keine aktive DF�-Verbindung vorhanden."
 
-#: ../src/msw/app.cpp:290
-#: ../src/msw/app.cpp:293
+#: ../src/msw/app.cpp:290 ../src/msw/app.cpp:293
 msgid "Cannot initialize OLE"
 msgstr "Kann OLE nicht initialisieren"
 
@@ -878,8 +842,7 @@ msgstr "Kann die Dimensionen nicht aus '%s' lesen."
 msgid "Cannot print empty page."
 msgstr "Leere Seite kann nicht gedruckt werden."
 
-#: ../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 "Kann die Typnamen nicht aus '%s' lesen !"
@@ -948,10 +911,10 @@ msgstr "Computer"
 #: ../src/common/fileconf.cpp:934
 #, c-format
 msgid "Config entry name cannot start with '%c'."
-msgstr "Die Bezeichnung des Konfigurations-Eintrags kann nicht mit %c beginnen."
+msgstr ""
+"Die Bezeichnung des Konfigurations-Eintrags kann nicht mit %c beginnen."
 
-#: ../src/generic/filedlgg.cpp:1214
-#: ../src/gtk/filedlg.cpp:74
+#: ../src/generic/filedlgg.cpp:1214 ../src/gtk/filedlg.cpp:74
 msgid "Confirm"
 msgstr "Best�tigen"
 
@@ -1009,8 +972,7 @@ msgstr "Konnte Datei %s nicht finden."
 msgid "Could not start document preview."
 msgstr "Kann Druckvorschau nicht starten."
 
-#: ../src/generic/printps.cpp:221
-#: ../src/msw/printwin.cpp:245
+#: ../src/generic/printps.cpp:221 ../src/msw/printwin.cpp:245
 msgid "Could not start printing."
 msgstr "Kann Ausdruck nicht beginnen."
 
@@ -1022,21 +984,17 @@ msgstr "Kann Daten nicht ins Fenster 
 msgid "Couldn't acquire a mutex lock"
 msgstr "Konnte Mutex-Sperre nicht bekommen"
 
-#: ../src/msw/dragimag.cpp:166
-#: ../src/msw/dragimag.cpp:206
-#: ../src/msw/imaglist.cpp:156
-#: ../src/msw/imaglist.cpp:174
+#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
+#: ../src/msw/imaglist.cpp:156 ../src/msw/imaglist.cpp:174
 #: ../src/msw/imaglist.cpp:186
 msgid "Couldn't add an image to the image list."
 msgstr "Kann Bild nicht zur Liste hinzuf�gen."
 
-#: ../src/msw/timer.cpp:101
-#: ../src/os2/timer.cpp:118
+#: ../src/msw/timer.cpp:101 ../src/os2/timer.cpp:118
 msgid "Couldn't create a timer"
 msgstr "Kann keinen Timer anlegen."
 
-#: ../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 "Konnte Cursor nicht erzeugen."
 
@@ -1045,14 +1003,15 @@ msgstr "Konnte Cursor nicht erzeugen."
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "Kann Symbol '%s' in der dynamischen Bibliothek nicht finden"
 
-#: ../src/mac/thread.cpp:507
-#: ../src/msw/thread.cpp:847
+#: ../src/mac/thread.cpp:507 ../src/msw/thread.cpp:847
 msgid "Couldn't get the current thread pointer"
 msgstr "Kann den aktuellen Threadzeiger nicht bekommen."
 
 #: ../src/common/imagpng.cpp:607
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
-msgstr "Konnte PNG-Bild nicht laden - Datei ist besch�digt oder der Speicher reicht nicht aus."
+msgstr ""
+"Konnte PNG-Bild nicht laden - Datei ist besch�digt oder der Speicher reicht "
+"nicht aus."
 
 #: ../src/unix/sound.cpp:412
 #, c-format
@@ -1079,14 +1038,12 @@ msgstr "Konnte einen Mutex nicht freigeben."
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "Kann keine Informationen �ber das ListControl Element %d bekommen."
 
-#: ../src/common/imagpng.cpp:647
-#: ../src/common/imagpng.cpp:658
+#: ../src/common/imagpng.cpp:647 ../src/common/imagpng.cpp:658
 #: ../src/common/imagpng.cpp:666
 msgid "Couldn't save PNG image."
 msgstr "Konnte PNG-Bild nicht speichern."
 
-#: ../src/mac/thread.cpp:756
-#: ../src/msw/thread.cpp:610
+#: ../src/mac/thread.cpp:756 ../src/msw/thread.cpp:610
 msgid "Couldn't terminate thread"
 msgstr "Kann Thread nicht beenden"
 
@@ -1098,8 +1055,7 @@ msgstr "Create Parameter nicht in den deklarierten RTTI-Parametern gefunden"
 msgid "Create directory"
 msgstr "Verzeichnis anlegen"
 
-#: ../src/generic/dirdlgg.cpp:105
-#: ../src/generic/filedlgg.cpp:931
+#: ../src/generic/dirdlgg.cpp:105 ../src/generic/filedlgg.cpp:931
 msgid "Create new directory"
 msgstr "Neues Verzeichnis anlegen"
 
@@ -1165,8 +1121,13 @@ msgid "Deleted stale lock file '%s'."
 msgstr "Ungenutzte Sperr-Datei '%s' wurde gel�scht."
 
 #: ../src/msw/dialup.cpp:346
-msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."
-msgstr "DF�-Verbindungs-Funktionen stehen nicht zur Verf�gung, da der RAS-Dienst (Remote Access Service) auf dieser Maschine nicht installiert ist. Bitte installieren."
+msgid ""
+"Dial up functions are unavailable because the remote access service (RAS) is "
+"not installed on this machine. Please install it."
+msgstr ""
+"DF�-Verbindungs-Funktionen stehen nicht zur Verf�gung, da der RAS-Dienst "
+"(Remote Access Service) auf dieser Maschine nicht installiert ist. Bitte "
+"installieren."
 
 #: ../src/generic/tipdlg.cpp:220
 msgid "Did you know..."
@@ -1191,8 +1152,12 @@ msgid "Directory doesn't exist."
 msgstr "Verzeichnis existiert nicht"
 
 #: ../src/html/helpfrm.cpp:409
-msgid "Display all index items that contain given substring. Search is case insensitive."
-msgstr "Zeige alle Indexelemente an, die den gegebenen Suchbegriff enthalten. Gro�-/Kleinschreibung wird nicht beachtet."
+msgid ""
+"Display all index items that contain given substring. Search is case "
+"insensitive."
+msgstr ""
+"Zeige alle Indexelemente an, die den gegebenen Suchbegriff enthalten. Gro�-/"
+"Kleinschreibung wird nicht beachtet."
 
 #: ../src/html/helpfrm.cpp:583
 msgid "Display options dialog"
@@ -1200,13 +1165,15 @@ msgstr "Einstellungen-Dialog anzeigen"
 
 #: ../src/msw/mimetype.cpp:672
 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"
 "%s %1"
 msgstr ""
-"Wollen Sie den Befehl zum %s von Dateien mit der Erweiterung \"%s\" �ndern ?\n"
+"Wollen Sie den Befehl zum %s von Dateien mit der Erweiterung \"%s\" "
+"�ndern ?\n"
 "Aktueller Wert ist;\n"
 "%s,\n"
 "Neuer Wert ist\n"
@@ -1257,27 +1224,23 @@ msgstr "Eintr
 
 #: ../src/common/config.cpp:366
 #, c-format
-msgid "Environment variables expansion failed: missing '%c' at position %d in '%s'."
-msgstr "Einstzen der Umgebungsvariablen schlug fehl. Es fehlt '%c' an Position %d in '%s'."
+msgid ""
+"Environment variables expansion failed: missing '%c' at position %d in '%s'."
+msgstr ""
+"Einstzen der Umgebungsvariablen schlug fehl. Es fehlt '%c' an Position %d in "
+"'%s'."
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:711
-#: ../src/generic/filedlgg.cpp:725
-#: ../src/generic/filedlgg.cpp:739
-#: ../src/generic/filedlgg.cpp:1166
-#: ../src/generic/filedlgg.cpp:1191
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/dirctrlg.cpp:701
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:711
+#: ../src/generic/filedlgg.cpp:725 ../src/generic/filedlgg.cpp:739
+#: ../src/generic/filedlgg.cpp:1166 ../src/generic/filedlgg.cpp:1191
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 #: ../src/gtk/fontdlg.cpp:76
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/unix/utilsunx.cpp:1030
-#: ../src/unix/utilsunx.cpp:1038
+#: ../src/unix/utilsunx.cpp:1030 ../src/unix/utilsunx.cpp:1038
 msgid "Error "
 msgstr "Fehler "
 
@@ -1375,7 +1338,8 @@ msgstr "Kopieren von Registrierungs-Wert '%s' gescheitert"
 #: ../src/msw/registry.cpp:632
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
-msgstr "Kopieren des Inhalts des Registrierungs-Schl�ssels '%s' nach '%s' gescheitert"
+msgstr ""
+"Kopieren des Inhalts des Registrierungs-Schl�ssels '%s' nach '%s' gescheitert"
 
 #: ../src/common/filefn.cpp:1192
 #, c-format
@@ -1445,8 +1409,7 @@ msgstr "Konnte keinen Standard Finden/Ersetzen-Dialog erstellen (Fehler %d)"
 msgid "Failed to display HTML document in %s encoding"
 msgstr "Konnte HTML-Dokument nicht in der Kodierung %s anzeigen"
 
-#: ../src/mac/clipbrd.cpp:185
-#: ../src/msw/clipbrd.cpp:134
+#: ../src/mac/clipbrd.cpp:185 ../src/msw/clipbrd.cpp:134
 msgid "Failed to empty the clipboard."
 msgstr "Konnte Zwischenablage nicht leeren."
 
@@ -1463,8 +1426,7 @@ msgstr "Aufbau einer 'advise Schleife\" mit dem DDE Server gescheitert"
 msgid "Failed to establish dialup connection: %s"
 msgstr "Aufbau der DF�-Verbindung gescheitert : %s"
 
-#: ../src/unix/utilsunx.cpp:459
-#: ../src/unix/utilsunx.cpp:475
+#: ../src/unix/utilsunx.cpp:459 ../src/unix/utilsunx.cpp:475
 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "Kann '%s' nicht ausf�hren\n"
@@ -1507,8 +1469,12 @@ msgid "Failed to initialize OpenGL"
 msgstr "Konnte OpenGL nicht initialisieren"
 
 #: ../src/unix/threadpsx.cpp:896
-msgid "Failed to join a thread, potential memory leak detected - please restart the program"
-msgstr "Thread-Verbindung gescheitert. Dies ist ein m�gliches Speicherleck - Bitte Programm neu starten"
+msgid ""
+"Failed to join a thread, potential memory leak detected - please restart the "
+"program"
+msgstr ""
+"Thread-Verbindung gescheitert. Dies ist ein m�gliches Speicherleck - Bitte "
+"Programm neu starten"
 
 #: ../src/msw/utils.cpp:723
 #, c-format
@@ -1591,7 +1557,8 @@ msgstr "Versuch, DDE-Server '%s' zu registrieren, gescheitert"
 #: ../src/common/fontmap.cpp:230
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
-msgstr "Versuch gescheitert, an die Kodierung f�r den Zeichensatz '%s' zu erinnern."
+msgstr ""
+"Versuch gescheitert, an die Kodierung f�r den Zeichensatz '%s' zu erinnern."
 
 #: ../src/unix/snglinst.cpp:296
 #, c-format
@@ -1628,7 +1595,8 @@ msgstr "Versuch, den Inhalt der RAS-Fehlernachricht zu holen, gescheitert"
 
 #: ../src/msw/clipbrd.cpp:750
 msgid "Failed to retrieve the supported clipboard formats"
-msgstr "Konnte die von der Zwischenablage unterst�tzten Formate nicht ermitteln"
+msgstr ""
+"Konnte die von der Zwischenablage unterst�tzten Formate nicht ermitteln"
 
 #: ../src/msw/dib.cpp:264
 #, c-format
@@ -1652,8 +1620,7 @@ msgstr "Konnte Dateien nicht in die Zwischenablage kopieren."
 msgid "Failed to set temporary file permissions"
 msgstr "Konnte die Zugriffsrechte der vor�bergehenden Datei nicht setzen"
 
-#: ../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 "Versuch gescheitert, die Thread-Priorit�t %d zu setzten."
@@ -1713,8 +1680,7 @@ msgstr "Datei"
 msgid "File %s does not exist."
 msgstr "Datei '%s' existiert nicht."
 
-#: ../src/generic/filedlgg.cpp:1212
-#: ../src/gtk/filedlg.cpp:71
+#: ../src/generic/filedlgg.cpp:1212 ../src/gtk/filedlg.cpp:71
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "Datei '%s' existiert bereits, m�chten Sie sie wirklich �berschreiben?"
@@ -1732,19 +1698,16 @@ msgstr ""
 msgid "File couldn't be loaded."
 msgstr "Datei konnte nicht geladen werden."
 
-#: ../src/common/docview.cpp:316
-#: ../src/common/docview.cpp:357
+#: ../src/common/docview.cpp:316 ../src/common/docview.cpp:357
 #: ../src/common/docview.cpp:1502
 msgid "File error"
 msgstr "Dateifehler"
 
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/filedlgg.cpp:725
+#: ../src/generic/dirctrlg.cpp:701 ../src/generic/filedlgg.cpp:725
 msgid "File name exists already."
 msgstr "Dateiname bereits vorhanden"
 
-#: ../src/common/fldlgcmn.cpp:62
-#: ../src/msw/filedlg.cpp:250
+#: ../src/common/fldlgcmn.cpp:62 ../src/msw/filedlg.cpp:250
 #, c-format
 msgid "Files (%s)|%s"
 msgstr "Dateien (%s)|%s"
@@ -1850,8 +1813,7 @@ msgstr "N
 msgid "Go one level up in document hierarchy"
 msgstr "In die n�chste Dokumentebene gehen"
 
-#: ../src/generic/dirdlgg.cpp:110
-#: ../src/generic/filedlgg.cpp:921
+#: ../src/generic/dirdlgg.cpp:110 ../src/generic/filedlgg.cpp:921
 msgid "Go to home directory"
 msgstr "Gehe zum Home-Verzeichnis"
 
@@ -1884,10 +1846,8 @@ msgstr "HTML Dateien (*.html;*.htm)|*.html;*.htm|"
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebr�isch (ISO-8859-8)"
 
-#: ../src/common/dlgcmn.cpp:236
-#: ../src/generic/mdig.cpp:310
-#: ../src/html/helpfrm.cpp:254
-#: ../src/html/helpfrm.cpp:277
+#: ../src/common/dlgcmn.cpp:236 ../src/generic/mdig.cpp:310
+#: ../src/html/helpfrm.cpp:254 ../src/html/helpfrm.cpp:277
 #: ../src/msw/mdi.cpp:1329
 msgid "Help"
 msgstr "Hilfe"
@@ -1896,8 +1856,7 @@ msgstr "Hilfe"
 msgid "Help Browser Options"
 msgstr "Hilfe zu den Browser-Einstellungen"
 
-#: ../src/generic/helpext.cpp:441
-#: ../src/generic/helpext.cpp:442
+#: ../src/generic/helpext.cpp:441 ../src/generic/helpext.cpp:442
 msgid "Help Index"
 msgstr "Hilfeindex"
 
@@ -1918,12 +1877,9 @@ msgstr "Hilfe: %s"
 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: Fehler beim Lesen der DIB Maske."
 
-#: ../src/common/imagbmp.cpp:1042
-#: ../src/common/imagbmp.cpp:1101
-#: ../src/common/imagbmp.cpp:1110
-#: ../src/common/imagbmp.cpp:1121
-#: ../src/common/imagbmp.cpp:1165
-#: ../src/common/imagbmp.cpp:1175
+#: ../src/common/imagbmp.cpp:1042 ../src/common/imagbmp.cpp:1101
+#: ../src/common/imagbmp.cpp:1110 ../src/common/imagbmp.cpp:1121
+#: ../src/common/imagbmp.cpp:1165 ../src/common/imagbmp.cpp:1175
 #: ../src/common/imagbmp.cpp:1184
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: Schreibfehler beim Sichern."
@@ -1968,8 +1924,7 @@ msgstr "Ung
 msgid "Illegal Parameter Count for Create Method"
 msgstr "Ung�ltige Anzahl Parameter f�r Create-Methode"
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/filedlgg.cpp:711
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:711
 msgid "Illegal directory name."
 msgstr "Ung�ltiger Verzeichnisname"
 
@@ -1987,8 +1942,12 @@ msgid "Image file is not of type %d."
 msgstr "Bild hat nicht den Bildtyp %d."
 
 #: ../src/msw/textctrl.cpp:303
-msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"
-msgstr "Versuch eine 'rich edit control' zu erstellen gescheitert, verwende stattdessen ein einfaches Text-Control. Bitte 'riched32.dll' neu installieren"
+msgid ""
+"Impossible to create a rich edit control, using simple text control instead. "
+"Please reinstall riched32.dll"
+msgstr ""
+"Versuch eine 'rich edit control' zu erstellen gescheitert, verwende "
+"stattdessen ein einfaches Text-Control. Bitte 'riched32.dll' neu installieren"
 
 #: ../src/unix/utilsunx.cpp:379
 msgid "Impossible to get child process input"
@@ -2045,8 +2004,7 @@ msgstr "Ung
 msgid "Invalid lock file '%s'."
 msgstr "Ung�ltige Sperr-Datei '%s'."
 
-#: ../src/common/xtistrm.cpp:363
-#: ../src/common/xtistrm.cpp:378
+#: ../src/common/xtistrm.cpp:363 ../src/common/xtistrm.cpp:378
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr "Ung�ltige oder Null Objekt-ID an GetObjectClassInfo �bergeben"
 
@@ -2079,8 +2037,7 @@ msgstr "JPEG: Konnte Bild nicht sichern."
 msgid "KOI8-R"
 msgstr "KOI8-R"
 
-#: ../src/generic/prntdlgg.cpp:428
-#: ../src/generic/prntdlgg.cpp:638
+#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:638
 msgid "Landscape"
 msgstr "Querformat"
 
@@ -2127,15 +2084,15 @@ msgstr "Das Laden von S/W Ascii PNM'-Bilddateien wird noch nicht unterst
 
 #: ../src/common/imagpnm.cpp:75
 msgid "Loading Grey Raw PNM image is not yet implemented."
-msgstr "Das Laden von \"S/W Ascii PNM'-Bilddateien wird noch nicht unterst�tzt."
+msgstr ""
+"Das Laden von \"S/W Ascii PNM'-Bilddateien wird noch nicht unterst�tzt."
 
 #: ../src/generic/logg.cpp:565
 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr "Logtext in Datei '%s' gesichert."
 
-#: ../include/wx/xti.h:469
-#: ../include/wx/xti.h:473
+#: ../include/wx/xti.h:469 ../include/wx/xti.h:473
 msgid "Long Conversions not supported"
 msgstr "Umwandlung in long wird nicht unterst�tzt"
 
@@ -2144,8 +2101,12 @@ msgid "MDI child"
 msgstr "MDI child"
 
 #: ../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 "Die MS HTML-Hilfe funktioniert nicht, da die MS-HTML-Hilfe-Bibliothek nicht installiert ist. Bitte installieren Sie sie."
+msgid ""
+"MS HTML Help functions are unavailable because the MS HTML Help library is "
+"not installed on this machine. Please install it."
+msgstr ""
+"Die MS HTML-Hilfe funktioniert nicht, da die MS-HTML-Hilfe-Bibliothek nicht "
+"installiert ist. Bitte installieren Sie sie."
 
 #: ../src/univ/themes/win32.cpp:4678
 msgid "Ma&ximize"
@@ -2215,10 +2176,8 @@ msgstr "Name"
 msgid "New item"
 msgstr "Neues &Element"
 
-#: ../src/generic/dirdlgg.cpp:274
-#: ../src/generic/dirdlgg.cpp:284
-#: ../src/generic/filedlgg.cpp:587
-#: ../src/generic/filedlgg.cpp:596
+#: ../src/generic/dirdlgg.cpp:274 ../src/generic/dirdlgg.cpp:284
+#: ../src/generic/filedlgg.cpp:587 ../src/generic/filedlgg.cpp:596
 msgid "NewName"
 msgstr "NeuerName"
 
@@ -2226,10 +2185,8 @@ msgstr "NeuerName"
 msgid "Next page"
 msgstr "N�chste HTLM Seite zeigen"
 
-#: ../src/common/dlgcmn.cpp:213
-#: ../src/mac/msgdlg.cpp:56
-#: ../src/mac/msgdlg.cpp:140
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:213 ../src/mac/msgdlg.cpp:56
+#: ../src/mac/msgdlg.cpp:140 ../src/motif/msgdlg.cpp:182
 msgid "No"
 msgstr "Nein"
 
@@ -2246,7 +2203,8 @@ msgstr "Keine Eintr
 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 ""
 "Kein Font f�r die Kodierung '%s' gefunden,\n"
 "es ist aber eine Alternative '%s' verf�gbar.\n"
@@ -2269,20 +2227,17 @@ msgstr ""
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr "XML-Knoten '%s', Klasse '%s' kann nicht bearbeitet werden !\""
 
-#: ../src/common/image.cpp:1162
-#: ../src/common/image.cpp:1205
+#: ../src/common/image.cpp:1162 ../src/common/image.cpp:1205
 msgid "No handler found for image type."
 msgstr "Dieses Bild-Format wird nicht unterst�tzt"
 
-#: ../src/common/image.cpp:1170
-#: ../src/common/image.cpp:1213
+#: ../src/common/image.cpp:1170 ../src/common/image.cpp:1213
 #: ../src/common/image.cpp:1247
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "Bild-Format %d wurde nicht definiert."
 
-#: ../src/common/image.cpp:1231
-#: ../src/common/image.cpp:1263
+#: ../src/common/image.cpp:1231 ../src/common/image.cpp:1263
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "Bild-Format %s wurde nicht definiert."
@@ -2299,8 +2254,7 @@ msgstr "Kein Ton"
 msgid "Nordic (ISO-8859-10)"
 msgstr "Nordisch (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:227
-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/generic/fontdlgg.cpp:227 ../src/generic/fontdlgg.cpp:230
 msgid "Normal"
 msgstr "Normal"
 
@@ -2316,16 +2270,11 @@ msgstr "Normal Font:"
 msgid "Note, 8 1/2 x 11 in"
 msgstr "Note, 8 1/2 x 11 Zoll"
 
-#: ../src/common/dlgcmn.cpp:219
-#: ../src/generic/dirdlgg.cpp:153
-#: ../src/generic/filedlgg.cpp:976
-#: ../src/generic/filedlgg.cpp:987
-#: ../src/generic/fontdlgg.cpp:254
-#: ../src/generic/logg.cpp:748
-#: ../src/generic/prntdlgg.cpp:454
-#: ../src/gtk/filedlg.cpp:162
-#: ../src/gtk/fontdlg.cpp:139
-#: ../src/html/helpfrm.cpp:1064
+#: ../src/common/dlgcmn.cpp:219 ../src/generic/dirdlgg.cpp:153
+#: ../src/generic/filedlgg.cpp:976 ../src/generic/filedlgg.cpp:987
+#: ../src/generic/fontdlgg.cpp:254 ../src/generic/logg.cpp:748
+#: ../src/generic/prntdlgg.cpp:454 ../src/gtk/filedlg.cpp:162
+#: ../src/gtk/fontdlg.cpp:139 ../src/html/helpfrm.cpp:1064
 msgid "OK"
 msgstr "OK"
 
@@ -2333,20 +2282,16 @@ msgstr "OK"
 msgid "Objects must have an id attribute"
 msgstr "Objekte m�ssen ein ID-Attribut haben."
 
-#: ../src/common/docview.cpp:1197
-#: ../src/common/docview.cpp:1525
+#: ../src/common/docview.cpp:1197 ../src/common/docview.cpp:1525
 msgid "Open File"
 msgstr "Datei �ffnen"
 
-#: ../src/html/helpfrm.cpp:571
-#: ../src/html/helpfrm.cpp:1404
+#: ../src/html/helpfrm.cpp:571 ../src/html/helpfrm.cpp:1404
 msgid "Open HTML document"
 msgstr "�ffne HTLM Dokument"
 
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:739
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:739
 msgid "Operation not permitted."
 msgstr "Ausf�hrung nicht erlaubt"
 
@@ -2369,13 +2314,11 @@ msgstr "Option '%s': '%s' kann nicht in eine Datum umgesetzt werden."
 msgid "Options"
 msgstr "Einstellungen"
 
-#: ../src/generic/prntdlgg.cpp:430
-#: ../src/generic/prntdlgg.cpp:639
+#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:639
 msgid "Orientation"
 msgstr "Orientierung"
 
-#: ../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: Speicheranforderung gescheitert"
 
@@ -2391,8 +2334,7 @@ msgstr "PCX: ung
 msgid "PCX: this is not a PCX file."
 msgstr "PCX: dies ist keine PCX Datei."
 
-#: ../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: unbekannter Fehler !!!"
 
@@ -2430,14 +2372,12 @@ msgstr "Seiten-Einstellungen"
 msgid "Pages"
 msgstr "Seiten"
 
-#: ../src/generic/prntdlgg.cpp:545
-#: ../src/generic/prntdlgg.cpp:625
+#: ../src/generic/prntdlgg.cpp:545 ../src/generic/prntdlgg.cpp:625
 #: ../src/generic/prntdlgg.cpp:818
 msgid "Paper Size"
 msgstr "Papierformat"
 
-#: ../src/generic/prntdlgg.cpp:420
-#: ../src/generic/prntdlgg.cpp:612
+#: ../src/generic/prntdlgg.cpp:420 ../src/generic/prntdlgg.cpp:612
 #: ../src/generic/prntdlgg.cpp:813
 msgid "Paper size"
 msgstr "Papierformat"
@@ -2450,8 +2390,7 @@ msgstr "Ein bereits registriertes Objekt wurde an SetObject 
 msgid "Passing a already registered object to SetObjectName"
 msgstr "Ein bereits registriertes Objekt wurde an SetObjectname �bergeben"
 
-#: ../src/common/xtistrm.cpp:434
-#: ../src/common/xtistrm.cpp:654
+#: ../src/common/xtistrm.cpp:434 ../src/common/xtistrm.cpp:654
 msgid "Passing an unkown object to GetObject"
 msgstr "Ein unbekanntes Objekt wurde an GetObject �bergeben\""
 
@@ -2467,8 +2406,7 @@ msgstr "Konnte keine Pipe anlegen"
 msgid "Please choose a valid font."
 msgstr "Bitte w�hlen Sie einen g�ltigen Font."
 
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 msgid "Please choose an existing file."
 msgstr "Bitte w�hlen Sie eine bestehende Datei."
 
@@ -2491,8 +2429,7 @@ msgstr ""
 msgid "Please wait while printing\n"
 msgstr "Bitte warten Sie w�hrend des Druckens\n"
 
-#: ../src/generic/prntdlgg.cpp:427
-#: ../src/generic/prntdlgg.cpp:637
+#: ../src/generic/prntdlgg.cpp:427 ../src/generic/prntdlgg.cpp:637
 msgid "Portrait"
 msgstr "Hochformat"
 
@@ -2508,8 +2445,7 @@ msgstr "Vorschau:"
 msgid "Previous page"
 msgstr "Vorherige HTLM-Seite zeigen"
 
-#: ../src/generic/prntdlgg.cpp:107
-#: ../src/generic/prntdlgg.cpp:121
+#: ../src/generic/prntdlgg.cpp:107 ../src/generic/prntdlgg.cpp:121
 msgid "Print"
 msgstr "Drucken"
 
@@ -2517,8 +2453,7 @@ msgstr "Drucken"
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: ../src/common/prntbase.cpp:784
-#: ../src/common/prntbase.cpp:810
+#: ../src/common/prntbase.cpp:784 ../src/common/prntbase.cpp:810
 msgid "Print Preview Failure"
 msgstr "Fehler bei der Druckvorschau"
 
@@ -2562,8 +2497,7 @@ msgstr "Drucker-Einstellungen:"
 msgid "Printer..."
 msgstr "Drucker..."
 
-#: ../src/common/prntbase.cpp:109
-#: ../src/common/prntbase.cpp:154
+#: ../src/common/prntbase.cpp:109 ../src/common/prntbase.cpp:154
 msgid "Printing "
 msgstr "Drucken von "
 
@@ -2592,8 +2526,7 @@ msgstr "Quarto, 215 x 275 mm"
 msgid "Question"
 msgstr "Frage"
 
-#: ../src/common/ffile.cpp:111
-#: ../src/common/ffile.cpp:132
+#: ../src/common/ffile.cpp:111 ../src/common/ffile.cpp:132
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "Lesefehler in Datei '%s'"
@@ -2611,7 +2544,8 @@ msgstr "Registrierungs-Schl
 #: ../src/msw/registry.cpp:530
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
-msgstr "Registriersschl�ssel '%s' existiert nicht, Umbenennung daher nicht m�glich."
+msgstr ""
+"Registriersschl�ssel '%s' existiert nicht, Umbenennung daher nicht m�glich."
 
 #: ../src/msw/registry.cpp:657
 #, c-format
@@ -2644,7 +2578,9 @@ msgstr "Aktuelle HTLM-Seite als Lesezeichen entfernen"
 #: ../src/common/rendcmn.cpp:193
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
-msgstr "Renderer \"%s\" hat eine ung�ltige Version %d.%d und kann nicht geladen werden."
+msgstr ""
+"Renderer \"%s\" hat eine ung�ltige Version %d.%d und kann nicht geladen "
+"werden."
 
 #: ../src/generic/fdrepdlg.cpp:171
 msgid "Replace &all"
@@ -2683,13 +2619,14 @@ msgstr "Logtexte in Datei sichern"
 msgid "Script"
 msgstr "Script"
 
-#: ../src/html/helpfrm.cpp:443
-#: ../src/html/helpfrm.cpp:458
+#: ../src/html/helpfrm.cpp:443 ../src/html/helpfrm.cpp:458
 msgid "Search"
 msgstr "Suchen"
 
 #: ../src/html/helpfrm.cpp:445
-msgid "Search contents of help book(s) for all occurences of the text you typed above"
+msgid ""
+"Search contents of help book(s) for all occurences of the text you typed "
+"above"
 msgstr "Alle Hilfeb�cher nach eingegebenem Begriff durchsuchen."
 
 #: ../src/generic/fdrepdlg.cpp:152
@@ -2766,8 +2703,7 @@ msgstr "Alle Themen im Index anzeigen"
 msgid "Show hidden directories"
 msgstr "Versteckte Verzeichnisse anzeigen"
 
-#: ../src/generic/filedlgg.cpp:971
-#: ../src/generic/filedlgg.cpp:993
+#: ../src/generic/filedlgg.cpp:971 ../src/generic/filedlgg.cpp:993
 msgid "Show hidden files"
 msgstr "Versteckte Dateien anzeigen"
 
@@ -2787,8 +2723,7 @@ msgstr "Geneigt"
 msgid "Sorry, could not open this file for saving."
 msgstr "Bedauere, diese Datei konnte zur Sicherung nicht ge�ffnet werden."
 
-#: ../src/common/docview.cpp:367
-#: ../src/common/docview.cpp:380
+#: ../src/common/docview.cpp:367 ../src/common/docview.cpp:380
 #: ../src/common/docview.cpp:1504
 msgid "Sorry, could not open this file."
 msgstr "Bedauere, diese Datei konnte nicht ge�ffnet werden."
@@ -2805,8 +2740,7 @@ msgstr "Nicht genug Speicher f
 msgid "Sorry, print preview needs a printer to be installed."
 msgstr "Tut mir leid: Die Druck-Vorschau ben�tigt einen installierten Drucker"
 
-#: ../src/common/docview.cpp:1196
-#: ../src/common/docview.cpp:1524
+#: ../src/common/docview.cpp:1196 ../src/common/docview.cpp:1524
 msgid "Sorry, the format for this file is unknown."
 msgstr "Bedauere, das Format dieser Datei ist unbekannt."
 
@@ -2829,29 +2763,31 @@ msgstr "Status: "
 
 #: ../src/common/xtistrm.cpp:251
 msgid "Streaming delegates for not already streamed objects not yet supported"
-msgstr "Streaming delegates sind noch nicht unterst�tzt, wenn es sich nicht bereits um streaming objects handelt"
+msgstr ""
+"Streaming delegates sind noch nicht unterst�tzt, wenn es sich nicht bereits "
+"um streaming objects handelt"
 
 #: ../src/msw/colour.cpp:38
 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "StringTo Colour: Falsche Farb-Angabe '%s'"
 
-#: ../include/wx/xti.h:396
-#: ../include/wx/xti.h:400
+#: ../include/wx/xti.h:396 ../include/wx/xti.h:400
 msgid "String conversions not supported"
 msgstr "Umwandlung in String wird nicht unterst�tzt"
 
 #: ../contrib/src/xrc/xmlres.cpp:676
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
-msgstr "Unterklasse '%s' f�r Resource '%s' nicht gefunden, keine Unterklasse erstellt !"
+msgstr ""
+"Unterklasse '%s' f�r Resource '%s' nicht gefunden, keine Unterklasse "
+"erstellt !"
 
 #: ../src/generic/fontdlgg.cpp:225
 msgid "Swiss"
 msgstr "Swiss"
 
-#: ../src/common/imagtiff.cpp:232
-#: ../src/common/imagtiff.cpp:243
+#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
 #: ../src/common/imagtiff.cpp:354
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: Speicheranforderung gescheitert."
@@ -2956,26 +2892,41 @@ msgstr "Der Wert f
 
 #: ../src/msw/dialup.cpp:406
 #, 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 "Der installierte RAS-Dienst Version ist zu alt, bitte auf den neusten Stand bringen (folgende Funktion fehlt: %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 ""
+"Der installierte RAS-Dienst Version ist zu alt, bitte auf den neusten Stand "
+"bringen (folgende Funktion fehlt: %s)."
 
 #: ../src/html/htmprint.cpp:580
-msgid "There was a problem during page setup: you may need to set a default printer."
+msgid ""
+"There was a problem during page setup: you may need to set a default printer."
 msgstr ""
 "Es gab ein Problem bei der Seiteneinrichtung: eventuell m�ssen Sie einen\n"
 "Standarddrucker einrichten."
 
 #: ../src/msw/thread.cpp:1197
-msgid "Thread module initialization failed: can not store value in thread local storage"
-msgstr "Thread-Modul-Initialisierung gescheitert: Kann den Wert nicht im lokalen Speicherbereich des Thread gespeichert werden"
+msgid ""
+"Thread module initialization failed: can not store value in thread local "
+"storage"
+msgstr ""
+"Thread-Modul-Initialisierung gescheitert: Kann den Wert nicht im lokalen "
+"Speicherbereich des Thread gespeichert werden"
 
 #: ../src/unix/threadpsx.cpp:1600
 msgid "Thread module initialization failed: failed to create thread key"
-msgstr "Thread-Modul-Initialisierung gescheitert: Thread-Schl�ssel konnte nicht erstellt werden"
+msgstr ""
+"Thread-Modul-Initialisierung gescheitert: Thread-Schl�ssel konnte nicht "
+"erstellt werden"
 
 #: ../src/msw/thread.cpp:1185
-msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
-msgstr "Thread-Modul-Initialisierung gescheitert: Index konnte nicht im lokalen Speicherbereich des Thread allokiert werden"
+msgid ""
+"Thread module initialization failed: impossible to allocate index in thread "
+"local storage"
+msgstr ""
+"Thread-Modul-Initialisierung gescheitert: Index konnte nicht im lokalen "
+"Speicherbereich des Thread allokiert werden"
 
 #: ../src/unix/threadpsx.cpp:1108
 msgid "Thread priority setting is ignored."
@@ -3007,7 +2958,8 @@ msgstr "Bis:"
 
 #: ../src/common/imagpng.cpp:304
 msgid "Too many colours in PNG, the image may be slightly blurred."
-msgstr "Zu viele Farben in PNG; das Bild wird vielleicht verschmiert angezeigt."
+msgstr ""
+"Zu viele Farben in PNG; das Bild wird vielleicht verschmiert angezeigt."
 
 #: ../src/generic/prntdlgg.cpp:651
 msgid "Top margin (mm):"
@@ -3016,10 +2968,11 @@ msgstr "Oberer Rand (mm):"
 #: ../src/common/fs_mem.cpp:205
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
-msgstr "Beim Versuch, die Datei '%s' aus dem VFS-Speicher zu entfernen, wurde festgestellt, da� sie gar nicht geladen war!"
+msgstr ""
+"Beim Versuch, die Datei '%s' aus dem VFS-Speicher zu entfernen, wurde "
+"festgestellt, da� sie gar nicht geladen war!"
 
-#: ../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 "Beim Versuch, einen  NULL-Hostnamen aufzul�sen, gebe ich auf"
 
@@ -3031,8 +2984,7 @@ msgstr "T
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/common/xtistrm.cpp:279
-#: ../src/common/xtixml.cpp:351
+#: ../src/common/xtistrm.cpp:279 ../src/common/xtixml.cpp:351
 #: ../src/common/xtixml.cpp:498
 msgid "Type must have enum - long conversion"
 msgstr "Typ muss eine enum-long Umwandlung haben"
@@ -3115,8 +3067,7 @@ msgstr "Unbekanntes Feld in Datei %s, Zeile %d: '%s'."
 msgid "Unknown long option '%s'"
 msgstr "Unbekannte 'long'-Option '%s'"
 
-#: ../src/common/cmdline.cpp:582
-#: ../src/common/cmdline.cpp:603
+#: ../src/common/cmdline.cpp:582 ../src/common/cmdline.cpp:603
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "Unbekannte Option '%s'"
@@ -3135,14 +3086,12 @@ msgstr "Unbekannte Eigenschaften %s"
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "Unzutreffendes '{'-Zeichen in einem Eintrag des MIME-Typs %s."
 
-#: ../src/common/cmdproc.cpp:254
-#: ../src/common/cmdproc.cpp:280
+#: ../src/common/cmdproc.cpp:254 ../src/common/cmdproc.cpp:280
 #: ../src/common/cmdproc.cpp:300
 msgid "Unnamed command"
 msgstr "Ungenanntes Kommando"
 
-#: ../src/mac/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:273
+#: ../src/mac/clipbrd.cpp:64 ../src/msw/clipbrd.cpp:273
 #: ../src/msw/clipbrd.cpp:445
 msgid "Unsupported clipboard format."
 msgstr "Nicht unterst�tztes Format in der Zwischenablage."
@@ -3199,7 +3148,9 @@ msgstr "Warnung: "
 
 #: ../src/html/htmlpars.cpp:390
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
-msgstr "Warnung: Es wurde versucht, einen 'HTML-Tag-Handler' von einem leeren Stack zu entfernen."
+msgstr ""
+"Warnung: Es wurde versucht, einen 'HTML-Tag-Handler' von einem leeren Stack "
+"zu entfernen."
 
 #: ../src/common/fmapbase.cpp:102
 msgid "Western European (ISO-8859-1)"
@@ -3300,8 +3251,7 @@ msgstr "Fehler beim Lesen des XML: '%s' in Zeile %d"
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: Pixel-Daten in falscher Form !"
 
-#: ../src/common/xpmdecod.cpp:712
-#: ../src/common/xpmdecod.cpp:722
+#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:722
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr "XPM: Farbdefinition in falscher Form '%s'!"
@@ -3311,8 +3261,7 @@ msgstr "XPM: Farbdefinition in falscher Form '%s'!"
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "XRC Resource '%s' (Klasse '%s') nicht gefunden !"
 
-#: ../contrib/src/xrc/xmlres.cpp:885
-#: ../contrib/src/xrc/xmlres.cpp:897
+#: ../contrib/src/xrc/xmlres.cpp:885 ../contrib/src/xrc/xmlres.cpp:897
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "XRC Resource: Kann aus '%s' keine Bitmap erstellen."
@@ -3322,10 +3271,8 @@ msgstr "XRC Resource: Kann aus '%s' keine Bitmap erstellen."
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr "XRC Resource: Falsche Farb-Angabe '%s' f�r Eigenschaft '%s'."
 
-#: ../src/common/dlgcmn.cpp:208
-#: ../src/mac/msgdlg.cpp:57
-#: ../src/mac/msgdlg.cpp:139
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:208 ../src/mac/msgdlg.cpp:57
+#: ../src/mac/msgdlg.cpp:139 ../src/motif/msgdlg.cpp:182
 msgid "Yes"
 msgstr "Ja"
 
@@ -3333,8 +3280,7 @@ msgstr "Ja"
 msgid "You cannot add a new directory to this section."
 msgstr "Sie k�nnen hier kein neues Verzeichnis anlegen."
 
-#: ../src/common/fs_zip.cpp:88
-#: ../src/common/fs_zip.cpp:138
+#: ../src/common/fs_zip.cpp:88 ../src/common/fs_zip.cpp:138
 msgid "ZIP handler currently supports only local files!"
 msgstr "ZIP Handler unterst�tzt derzeit nur lokale Dateien."
 
@@ -3348,17 +3294,20 @@ msgstr "Eine DDEML-Anwendung hat eine 'prolonged race condition' ausgeloest."
 
 #: ../src/msw/dde.cpp:1063
 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 ""
-"Eine DDEML-Funktion wurde aufgerufen, ohne vorher die Deinitialisierungs- Funktion aufzurufen,\n"
+"Eine DDEML-Funktion wurde aufgerufen, ohne vorher die Deinitialisierungs- "
+"Funktion aufzurufen,\n"
 "oder ein ung�ltiger 'instance identifier'\n"
 "wurde an eine DDEML-Funktion �bergeben."
 
 #: ../src/msw/dde.cpp:1081
 msgid "a client's attempt to establish a conversation has failed."
-msgstr "Der Versuch eines Clients, eine Verbindung herzustellen, ist gescheitert."
+msgstr ""
+"Der Versuch eines Clients, eine Verbindung herzustellen, ist gescheitert."
 
 #: ../src/msw/dde.cpp:1078
 msgid "a memory allocation failed."
@@ -3370,23 +3319,33 @@ msgstr "Ein Parameter wurde von DDEML nicht verifiziert."
 
 #: ../src/msw/dde.cpp:1054
 msgid "a request for a synchronous advise transaction has timed out."
-msgstr "Eine Anfrage f�r eine 'synchronous advise transaction' ist gescheitert (time-out)"
+msgstr ""
+"Eine Anfrage f�r eine 'synchronous advise transaction' ist gescheitert (time-"
+"out)"
 
 #: ../src/msw/dde.cpp:1060
 msgid "a request for a synchronous data transaction has timed out."
-msgstr "Eine Anfrage f�r eine 'synchronous data transaction' ist gescheitert (time-out)"
+msgstr ""
+"Eine Anfrage f�r eine 'synchronous data transaction' ist gescheitert (time-"
+"out)"
 
 #: ../src/msw/dde.cpp:1069
 msgid "a request for a synchronous execute transaction has timed out."
-msgstr "Eine Anfrage f�r eine 'synchronous execute transaction' ist gescheitert (time-out)"
+msgstr ""
+"Eine Anfrage f�r eine 'synchronous execute transaction' ist gescheitert "
+"(time-out)"
 
 #: ../src/msw/dde.cpp:1087
 msgid "a request for a synchronous poke transaction has timed out."
-msgstr "Eine Anfrage f�r eine 'synchronous poke transaction' ist gescheitert (time-out)"
+msgstr ""
+"Eine Anfrage f�r eine 'synchronous poke transaction' ist gescheitert (time-"
+"out)"
 
 #: ../src/msw/dde.cpp:1102
 msgid "a request to end an advise transaction has timed out."
-msgstr "Eine Anfrage, eine 'advise transaction' zu beenden ist, gescheitert (time-out)"
+msgstr ""
+"Eine Anfrage, eine 'advise transaction' zu beenden ist, gescheitert (time-"
+"out)"
 
 #: ../src/msw/dde.cpp:1096
 msgid ""
@@ -3432,8 +3391,10 @@ msgid ""
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
 "the transaction identifier for that callback is no longer valid."
 msgstr ""
-"Eine ung�ltige Transaktions-Identifizierung wurde an eine DDEML-Funktion �bergeben.\n"
-"Sobald die Anwendung aus einem 'XTYP_XACT_COMPLETE'-Callback zur�ckgekehrt ist,\n"
+"Eine ung�ltige Transaktions-Identifizierung wurde an eine DDEML-Funktion "
+"�bergeben.\n"
+"Sobald die Anwendung aus einem 'XTYP_XACT_COMPLETE'-Callback zur�ckgekehrt "
+"ist,\n"
 "ist die Transaktions-Identifizierung f�r dieses Callback nicht mehr g�ltig."
 
 #: ../src/common/fileconf.cpp:1815
@@ -3505,8 +3466,7 @@ msgstr "Kann Benutzerverzeichnis nicht finden, verwende aktuelles Verzeichnis."
 msgid "can't flush file descriptor %d"
 msgstr "Kann auf die Dateibeschreibung '%d' nicht entladen"
 
-#: ../src/common/file.cpp:535
-#: ../src/common/file.cpp:543
+#: ../src/common/file.cpp:535 ../src/common/file.cpp:543
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "Kann auf die Dateibeschreibung %d nicht positionieren"
@@ -3515,8 +3475,7 @@ msgstr "Kann auf die Dateibeschreibung %d nicht positionieren"
 msgid "can't load any font, aborting"
 msgstr "Kann keine Fonts mehr laden, Abbruch"
 
-#: ../src/common/ffile.cpp:63
-#: ../src/common/file.cpp:352
+#: ../src/common/ffile.cpp:63 ../src/common/file.cpp:352
 #, c-format
 msgid "can't open file '%s'"
 msgstr "Kann Datei '%s' nicht �ffnen"
@@ -3537,7 +3496,9 @@ msgstr "Kann Benutzer-Konfigurations-Datei nicht 
 
 #: ../src/common/dynlib.cpp:445
 msgid "can't query for GUI plugins name in console applications"
-msgstr "In einer Konsolen-Anwendung kann nicht nach den GUI-Plugin-Namen gefragt werden"
+msgstr ""
+"In einer Konsolen-Anwendung kann nicht nach den GUI-Plugin-Namen gefragt "
+"werden"
 
 #: ../src/common/file.cpp:404
 #, c-format
@@ -3554,8 +3515,7 @@ msgstr "Kann Datei '%s' nicht l
 msgid "can't remove temporary file '%s'"
 msgstr "Kann Tempor�rdatei '%s' nicht l�schen"
 
-#: ../src/common/file.cpp:492
-#: ../src/common/file.cpp:518
+#: ../src/common/file.cpp:492 ../src/common/file.cpp:518
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "Kann auf die Dateibeschreibung '%d' nicht suchen"
@@ -3672,7 +3632,8 @@ msgstr "Datei '%s', Zeile %d: Eintrag '%s' taucht erstmals in Zeile %d auf."
 #: ../src/common/fileconf.cpp:700
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
-msgstr "Datei '%s', Zeile %d: Wert f�r nicht-�nderbaren Eintrag '%s' ignoriert."
+msgstr ""
+"Datei '%s', Zeile %d: Wert f�r nicht-�nderbaren Eintrag '%s' ignoriert."
 
 #: ../src/common/fileconf.cpp:622
 #, c-format
@@ -3719,8 +3680,7 @@ msgstr "ung
 msgid "invalid message box return value"
 msgstr "ung�ltiger 'message box'-R�ckgabewert."
 
-#: ../src/common/fontcmn.cpp:473
-#: ../src/common/fontcmn.cpp:537
+#: ../src/common/fontcmn.cpp:473 ../src/common/fontcmn.cpp:537
 msgid "italic"
 msgstr "kursiv"
 
@@ -3866,8 +3826,7 @@ msgstr "dritte"
 msgid "thirteenth"
 msgstr "dreizehnte"
 
-#: ../src/common/imagtiff.cpp:143
-#: ../src/common/imagtiff.cpp:151
+#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
 #, c-format
 msgid "tiff module: %s"
 msgstr "Tiff-Modul: %s"
@@ -3910,8 +3869,7 @@ msgstr "unbekannt"
 msgid "unknown class %s"
 msgstr "Unbekannte Klasse %s"
 
-#: ../src/common/regex.cpp:151
-#: ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:151 ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr "unbekannter Fehler"
 
@@ -3924,8 +3882,7 @@ msgstr "unbekannter Fehler (Fehlercode %08x)."
 msgid "unknown line terminator"
 msgstr "Unbekanntes Zeilenende"
 
-#: ../src/common/file.cpp:474
-#: ../src/common/file.cpp:501
+#: ../src/common/file.cpp:474 ../src/common/file.cpp:501
 msgid "unknown seek origin"
 msgstr "Unbekannte Suchposition"
 
@@ -3964,8 +3921,7 @@ msgstr "Schreiben"
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay gescheitert."
 
-#: ../src/common/socket.cpp:395
-#: ../src/common/socket.cpp:449
+#: ../src/common/socket.cpp:395 ../src/common/socket.cpp:449
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: ung�ltige Signatur in ReadMsg."
 
@@ -3986,8 +3942,7 @@ msgstr "wxWindows konnte Display nicht 
 msgid "yesterday"
 msgstr "Gestern"
 
-#: ../src/common/zstream.cpp:141
-#: ../src/common/zstream.cpp:275
+#: ../src/common/zstream.cpp:141 ../src/common/zstream.cpp:275
 #, c-format
 msgid "zlib error %d"
 msgstr " zlib-Fehler %d"
@@ -3995,4 +3950,3 @@ msgstr " zlib-Fehler %d"
 #: ../src/common/prntbase.cpp:450
 msgid "|<<"
 msgstr "|<<"
-
diff --git a/locale/el.po b/locale/el.po
index d0b21f0622..bbdb58615c 100644
--- a/locale/el.po
+++ b/locale/el.po
@@ -532,7 +532,7 @@ msgstr "
 
 #: ../src/os2/thread.cpp:121
 msgid "Can not create mutex."
-msgstr "��� ����� ������ � ���������� ��� mutex." 
+msgstr "��� ����� ������ � ���������� ��� mutex."
 
 #: ../src/common/filefn.cpp:1462
 #, c-format
@@ -686,7 +686,8 @@ msgstr "
 
 #: ../src/common/zstream.cpp:121
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
-msgstr "������� � �������� ��� ���� inflate: ��������� EOF ���� ���������� ���."
+msgstr ""
+"������� � �������� ��� ���� inflate: ��������� EOF ���� ���������� ���."
 
 #: ../src/msw/registry.cpp:930
 #, c-format
@@ -2631,7 +2632,8 @@ msgstr "
 #: ../src/common/rendcmn.cpp:193
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
-msgstr "� Renderer \"%s\" ����� �� �������� ������ %d.%d ��� ��� ������ �� ��������."
+msgstr ""
+"� Renderer \"%s\" ����� �� �������� ������ %d.%d ��� ��� ������ �� ��������."
 
 #: ../src/generic/fdrepdlg.cpp:171
 msgid "Replace &all"
@@ -2793,7 +2795,8 @@ msgstr "
 
 #: ../src/common/docview.cpp:959
 msgid "Sorry, print preview needs a printer to be installed."
-msgstr "��������, � ������������� ��������� ���������� ���� ������������� ��������."
+msgstr ""
+"��������, � ������������� ��������� ���������� ���� ������������� ��������."
 
 #: ../src/common/docview.cpp:1196 ../src/common/docview.cpp:1524
 msgid "Sorry, the format for this file is unknown."
@@ -2818,7 +2821,8 @@ msgstr "
 
 #: ../src/common/xtistrm.cpp:251
 msgid "Streaming delegates for not already streamed objects not yet supported"
-msgstr "�� ������������� ���� ��� �� ����������� ����������� ��� �������������� �����"
+msgstr ""
+"�� ������������� ���� ��� �� ����������� ����������� ��� �������������� �����"
 
 #: ../src/msw/colour.cpp:38
 #, c-format
@@ -3655,7 +3659,7 @@ msgstr "
 
 #: ../src/html/chm.cpp:344
 msgid "error in data format"
-msgstr "������ ��� ����� ��� ���������" 
+msgstr "������ ��� ����� ��� ���������"
 
 #: ../src/html/chm.cpp:332
 msgid "error opening file"
diff --git a/locale/hi.po b/locale/hi.po
index d89ad84f02..4a7a43610f 100644
--- a/locale/hi.po
+++ b/locale/hi.po
@@ -424,7 +424,8 @@ msgstr "आईएसपी को पहिले से डायल किय
 #: ../src/generic/logg.cpp:1118
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
-msgstr "लॉग को '%s' फ़ाइल के अंत में जोड़ें ([नहीं] का चयन करने से इस पर मिटाकर लिख दिया जायेगा)?"
+msgstr ""
+"लॉग को '%s' फ़ाइल के अंत में जोड़ें ([नहीं] का चयन करने से इस पर मिटाकर लिख दिया जायेगा)?"
 
 #: ../src/common/fmapbase.cpp:107
 msgid "Arabic (ISO-8859-6)"
@@ -597,7 +598,9 @@ msgstr "%d असमर्थित प्रकार के मूल्यो
 
 #: ../src/msw/listctrl.cpp:413
 msgid "Can't create list control window, check that comctl32.dll is installed."
-msgstr "सूची नियंत्रण खिड़की का निर्माण नहीं किया जा सकता है, जाँच करें कि comctl32.dll संसाधित है।"
+msgstr ""
+"सूची नियंत्रण खिड़की का निर्माण नहीं किया जा सकता है, जाँच करें कि comctl32.dll संसाधित "
+"है।"
 
 #: ../src/msw/registry.cpp:428
 #, c-format
@@ -1008,7 +1011,9 @@ msgstr "वर्तमान थ्रेड सूचक को प्रा
 
 #: ../src/common/imagpng.cpp:607
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
-msgstr "एक पीएनजी आकॄति को लोड नहीं किया जा सका - या तो फ़ाइल निकृष्ट है या फ़िर आवश्यक स्मॄति का अभाव है।"
+msgstr ""
+"एक पीएनजी आकॄति को लोड नहीं किया जा सका - या तो फ़ाइल निकृष्ट है या फ़िर आवश्यक स्मॄति "
+"का अभाव है।"
 
 #: ../src/unix/sound.cpp:412
 #, c-format
@@ -1121,8 +1126,8 @@ 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:220
 msgid "Did you know..."
@@ -1151,8 +1156,7 @@ msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr ""
-"सभी इंडेक्स आयट्मों को दिखाएँ जिनमें दी गयी उपश्रेणी शामिल हो।"
-"खोज छोटा-बड़ा संवेदी है।"
+"सभी इंडेक्स आयट्मों को दिखाएँ जिनमें दी गयी उपश्रेणी शामिल हो।खोज छोटा-बड़ा संवेदी है।"
 
 #: ../src/html/helpfrm.cpp:583
 msgid "Display options dialog"
@@ -1167,8 +1171,8 @@ msgid ""
 "New value is \n"
 "%s %1"
 msgstr ""
-"%s फ़ाइलों, जो कि \"%s उपनामों वाली है, के लिए उपयोग में लाये जाने वाले इस निर्देश को बदल कर लिखना चाहते है"
-"\" ?\n"
+"%s फ़ाइलों, जो कि \"%s उपनामों वाली है, के लिए उपयोग में लाये जाने वाले इस निर्देश को "
+"बदल कर लिखना चाहते है\" ?\n"
 "वर्तमान वैल्यू निम्न है \n"
 "%s, \n"
 "नयी वैल्यू निम्न है \n"
@@ -1219,7 +1223,8 @@ msgstr "प्रविष्टियां मिली"
 
 #: ../src/common/config.cpp:366
 #, c-format
-msgid "Environment variables expansion failed: missing '%c' at position %d in '%s'."
+msgid ""
+"Environment variables expansion failed: missing '%c' at position %d in '%s'."
 msgstr "वातावरण चरों का विस्तार असफ़ल रहा: '%c' विलुप्त %d स्थान पर '%s' में।"
 
 #: ../src/generic/dirctrlg.cpp:683 ../src/generic/dirctrlg.cpp:701
@@ -1464,8 +1469,8 @@ msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
 msgstr ""
-"एक थ्रेड में शामिल होने में असफ़ल, अत्याधिक स्मॄति रिसाव पाया गया -"
-"कॄपया इस कार्यक्रम को पुनः आरम्भ करें"
+"एक थ्रेड में शामिल होने में असफ़ल, अत्याधिक स्मॄति रिसाव पाया गया -कॄपया इस कार्यक्रम को "
+"पुनः आरम्भ करें"
 
 #: ../src/msw/utils.cpp:723
 #, c-format
@@ -1935,8 +1940,8 @@ msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"
 msgstr ""
-"एक रिच ऐडीट कन्ट्रोल का निर्माण असम्भव है, इसके बज़ाय सामान्य पाठ कन्ट्रोल का उपयोग किया जा रहा है। "
-"कृपया riched32.dll को पुनः संसाधित करें"
+"एक रिच ऐडीट कन्ट्रोल का निर्माण असम्भव है, इसके बज़ाय सामान्य पाठ कन्ट्रोल का उपयोग "
+"किया जा रहा है। कृपया riched32.dll को पुनः संसाधित करें"
 
 #: ../src/unix/utilsunx.cpp:379
 msgid "Impossible to get child process input"
@@ -1979,9 +1984,9 @@ msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
 msgstr "अवैध एक्सआरसी स्रोत-साधन '%s': रूट नोड 'resource' नहीं रखता है।"
 
 #: ../src/common/appcmn.cpp:239
-#, c-format
-msgid "Invalid display mode । '%s'."
-msgstr "अवैध अवलोकन विधा । '%s' ।"
+#, fuzzy, c-format
+msgid "Invalid display mode specification '%s'."
+msgstr "अवैध जयामिति विशिष्टतायें '%s'"
 
 #: ../src/x11/app.cpp:128
 #, c-format
@@ -2093,8 +2098,8 @@ 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:4678
 msgid "Ma&ximize"
@@ -2196,8 +2201,7 @@ msgid ""
 msgstr ""
 "'%s' एन्कोडिंग में पाठ को दिखाने के लिए कोई फ़ॉन्ट नहीं मिला,\n"
 "परन्तु एक वैकल्पिक एन्कोडिंग '%s' उपलब्ध है।\n"
-"क्या आप इस एन्कोडिंग को उपयोग करना चाहते है (अन्यथा आपको"
-"एक अन्य का चयन करना पड़ेगा)?"
+"क्या आप इस एन्कोडिंग को उपयोग करना चाहते है (अन्यथा आपकोएक अन्य का चयन करना पड़ेगा)?"
 
 #: ../src/common/fontmap.cpp:406
 #, c-format
@@ -2613,8 +2617,8 @@ msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"
 msgstr ""
-"सहायक पुस्तक(पुस्तकों) के विषयवस्तु में आपके द्वारा बताया हुआ उपरोक्त पाठ  "
-"जितनी बार आया हो खोजें "
+"सहायक पुस्तक(पुस्तकों) के विषयवस्तु में आपके द्वारा बताया हुआ उपरोक्त पाठ  जितनी बार आया "
+"हो खोजें "
 
 #: ../src/generic/fdrepdlg.cpp:152
 msgid "Search direction"
@@ -2750,7 +2754,8 @@ msgstr "अवस्था:"
 
 #: ../src/common/xtistrm.cpp:251
 msgid "Streaming delegates for not already streamed objects not yet supported"
-msgstr "स्ट्रीमिंग डेलीगेटों को पहिले से धाराप्रवाहित ऑबजेक्टों के लिए अभी समर्थन प्राप्त नहीं है"
+msgstr ""
+"स्ट्रीमिंग डेलीगेटों को पहिले से धाराप्रवाहित ऑबजेक्टों के लिए अभी समर्थन प्राप्त नहीं है"
 
 #: ../src/msw/colour.cpp:38
 #, c-format
@@ -2764,7 +2769,8 @@ msgstr "श्रेणीयों का रूपांतरण समर्
 #: ../contrib/src/xrc/xmlres.cpp:676
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
-msgstr "'%s' उपवर्ग '%s' स्रोत संसाधन के लिए नहीं मिला, उपवर्गीकरण नहीं किया जा रहा है!"
+msgstr ""
+"'%s' उपवर्ग '%s' स्रोत संसाधन के लिए नहीं मिला, उपवर्गीकरण नहीं किया जा रहा है!"
 
 #: ../src/generic/fontdlgg.cpp:225
 msgid "Swiss"
@@ -2879,18 +2885,22 @@ msgid ""
 "The version of remote access service (RAS) installed on this machine is "
 "tooold, please upgrade (the following required function is missing: %s)."
 msgstr ""
-"इस मशीन पर संसाधित सुदूर पहुँच सेवा (आरऐएस) का यह संस्मरण अति प्राचीन है, कृपया इसे अपग्रेड करें"
-"(निम्न आवश्यक चलन विलुप्त है:  %s)।"
+"इस मशीन पर संसाधित सुदूर पहुँच सेवा (आरऐएस) का यह संस्मरण अति प्राचीन है, कृपया इसे "
+"अपग्रेड करें(निम्न आवश्यक चलन विलुप्त है:  %s)।"
 
 #: ../src/html/htmprint.cpp:580
-msgid "There was a problem during page setup: you may need to set a default printer."
-msgstr "पॄष्ट स्थापना के दौरान एक समस्या थी: आपको एक डिफ़ाल्ट प्रिंटर को स्थापित करने की आवश्यकता है।"
+msgid ""
+"There was a problem during page setup: you may need to set a default printer."
+msgstr ""
+"पॄष्ट स्थापना के दौरान एक समस्या थी: आपको एक डिफ़ाल्ट प्रिंटर को स्थापित करने की "
+"आवश्यकता है।"
 
 #: ../src/msw/thread.cpp:1197
 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
-msgstr "थ्रेड माड्यूल आरम्भीकरण असफ़ल रहा: स्थानीय थ्रेड में मूल्य को सुरक्षित नहीं किया जा सका "
+msgstr ""
+"थ्रेड माड्यूल आरम्भीकरण असफ़ल रहा: स्थानीय थ्रेड में मूल्य को सुरक्षित नहीं किया जा सका "
 
 #: ../src/unix/threadpsx.cpp:1600
 msgid "Thread module initialization failed: failed to create thread key"
@@ -2900,9 +2910,7 @@ msgstr "थ्रेड माड्यूल आरम्भीकरण अस
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
-msgstr ""
-"थ्रेड माड्यूल आरम्भीकरण असफ़ल रहा: स्थानीय थ्रेड भंडार में इंडेक्स का "
-"आवंटन असम्भव"
+msgstr "थ्रेड माड्यूल आरम्भीकरण असफ़ल रहा: स्थानीय थ्रेड भंडार में इंडेक्स का आवंटन असम्भव"
 
 #: ../src/unix/threadpsx.cpp:1108
 msgid "Thread priority setting is ignored."
@@ -2943,7 +2951,8 @@ msgstr "ऊपरी हाशिया (मिलीमीटर):"
 #: ../src/common/fs_mem.cpp:205
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
-msgstr "वीएफ़एस स्मॄति से  '%s' फ़ाइल को हटाने का प्रयास किया जा रहा है, परन्तु यह लोड नहीं है!"
+msgstr ""
+"वीएफ़एस स्मॄति से  '%s' फ़ाइल को हटाने का प्रयास किया जा रहा है, परन्तु यह लोड नहीं है!"
 
 #: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250
 msgid "Trying to solve a NULL hostname: giving up"
@@ -3270,10 +3279,8 @@ msgid ""
 "or an invalid instance identifier\n"
 "was passed to a DDEML function."
 msgstr ""
-"एक डीडीईएमएल संक्रिया को बिना डीडीईआरम्भीकरण संक्रिया को पुकारे हुए"
-"पुकारा गया है,\n"
-"या फ़िर एक डीडीईएमएल संक्रिया को एक अवैध दॄष्टांत आइडेन्टीफ़ायर"
-"दिया गया है।"
+"एक डीडीईएमएल संक्रिया को बिना डीडीईआरम्भीकरण संक्रिया को पुकारे हुएपुकारा गया है,\n"
+"या फ़िर एक डीडीईएमएल संक्रिया को एक अवैध दॄष्टांत आइडेन्टीफ़ायरदिया गया है।"
 
 #: ../src/msw/dde.cpp:1081
 msgid "a client's attempt to establish a conversation has failed."
@@ -3305,7 +3312,8 @@ msgstr "एक तुल्यकालिक पोक कार्यसंप
 
 #: ../src/msw/dde.cpp:1102
 msgid "a request to end an advise transaction has timed out."
-msgstr "एक परामर्श कार्यसंपादन को समाप्त करने हेतु एक निवेदन की समय-सीमा समाप्त हो चुकी है।"
+msgstr ""
+"एक परामर्श कार्यसंपादन को समाप्त करने हेतु एक निवेदन की समय-सीमा समाप्त हो चुकी है।"
 
 #: ../src/msw/dde.cpp:1096
 msgid ""
@@ -3417,7 +3425,8 @@ msgstr "%d फ़ाइल विवरणकर्ता पर फ़ाइल क
 
 #: ../src/msw/utils.cpp:371
 msgid "can't find user's HOME, using current directory."
-msgstr "वर्तमान निर्देशिका का उपयोग करके, उपयोगकर्ता के गॄह (HOME) को पाया नहीं जा सकता है।"
+msgstr ""
+"वर्तमान निर्देशिका का उपयोग करके, उपयोगकर्ता के गॄह (HOME) को पाया नहीं जा सकता है।"
 
 #: ../src/common/file.cpp:450
 #, c-format
@@ -3906,3 +3915,5 @@ msgstr "ज़ेडलिब त्रुटि  %d"
 msgid "|<<"
 msgstr "।<<"
 
+#~ msgid "Invalid display mode । '%s'."
+#~ msgstr "अवैध अवलोकन विधा । '%s' ।"
diff --git a/locale/hu.po b/locale/hu.po
index 3560e28801..43aa1e082e 100644
--- a/locale/hu.po
+++ b/locale/hu.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWindows 2.5.2\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-04 18:56+0100\n"
 "PO-Revision-Date: 2004-03-10 15:11+0100\n"
 "Last-Translator: Vegh Janos <J.Vegh@atomki.hu>\n"
@@ -42,10 +43,8 @@ msgstr "#14 Borit
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "#10 Borit�k, 3 7/8 x 8 7/8 h�velyk"
 
-#: ../src/html/helpfrm.cpp:867
-#: ../src/html/helpfrm.cpp:868
-#: ../src/html/helpfrm.cpp:1505
-#: ../src/html/helpfrm.cpp:1535
+#: ../src/html/helpfrm.cpp:867 ../src/html/helpfrm.cpp:868
+#: ../src/html/helpfrm.cpp:1505 ../src/html/helpfrm.cpp:1535
 #, c-format
 msgid "%i of %i"
 msgstr "%i. (�ssz %i)"
@@ -88,8 +87,7 @@ msgstr "&N
 msgid "&Arrange Icons"
 msgstr "Ikonok &elrendez�se"
 
-#: ../src/generic/fdrepdlg.cpp:164
-#: ../src/generic/wizard.cpp:401
+#: ../src/generic/fdrepdlg.cpp:164 ../src/generic/wizard.cpp:401
 msgid "&Cancel"
 msgstr "&M�gsem"
 
@@ -97,10 +95,8 @@ msgstr "&M
 msgid "&Cascade"
 msgstr "&Zuhatag"
 
-#: ../src/common/prntbase.cpp:439
-#: ../src/generic/logg.cpp:502
-#: ../src/generic/tipdlg.cpp:213
-#: ../src/html/helpfrm.cpp:271
+#: ../src/common/prntbase.cpp:439 ../src/generic/logg.cpp:502
+#: ../src/generic/tipdlg.cpp:213 ../src/html/helpfrm.cpp:271
 msgid "&Close"
 msgstr "&Bez�r"
 
@@ -140,13 +136,11 @@ msgstr "&Napl
 msgid "&Move"
 msgstr "&�thelyez�s"
 
-#: ../src/generic/mdig.cpp:117
-#: ../src/msw/mdi.cpp:192
+#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:192
 msgid "&Next"
 msgstr "&K�vetkez� "
 
-#: ../src/generic/wizard.cpp:400
-#: ../src/generic/wizard.cpp:582
+#: ../src/generic/wizard.cpp:400 ../src/generic/wizard.cpp:582
 msgid "&Next >"
 msgstr "&K�vetkez� >"
 
@@ -162,8 +156,7 @@ msgstr "&Megnyit
 msgid "&Paste"
 msgstr "&Beilleszt�s"
 
-#: ../src/generic/mdig.cpp:118
-#: ../src/msw/mdi.cpp:193
+#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:193
 msgid "&Previous"
 msgstr "&El�z�"
 
@@ -171,14 +164,12 @@ msgstr "&El
 msgid "&Print..."
 msgstr "&Nyomtat�s..."
 
-#: ../src/common/cmdproc.cpp:285
-#: ../src/common/cmdproc.cpp:292
+#: ../src/common/cmdproc.cpp:285 ../src/common/cmdproc.cpp:292
 #: ../src/msw/textctrl.cpp:2048
 msgid "&Redo"
 msgstr "&�jra"
 
-#: ../src/common/cmdproc.cpp:281
-#: ../src/common/cmdproc.cpp:301
+#: ../src/common/cmdproc.cpp:281 ../src/common/cmdproc.cpp:301
 msgid "&Redo "
 msgstr "&�jra"
 
@@ -190,8 +181,7 @@ msgstr "&Helyettes
 msgid "&Restore"
 msgstr "&Helyre�ll�t�s"
 
-#: ../src/generic/logg.cpp:498
-#: ../src/generic/logg.cpp:827
+#: ../src/generic/logg.cpp:498 ../src/generic/logg.cpp:827
 msgid "&Save..."
 msgstr "&Ment�s..."
 
@@ -203,8 +193,7 @@ msgstr "&Mutass 
 msgid "&Size"
 msgstr "&M�ret"
 
-#: ../src/common/cmdproc.cpp:263
-#: ../src/msw/textctrl.cpp:2047
+#: ../src/common/cmdproc.cpp:263 ../src/msw/textctrl.cpp:2047
 msgid "&Undo"
 msgstr "&Visszavon�s"
 
@@ -212,23 +201,18 @@ msgstr "&Visszavon
 msgid "&Undo "
 msgstr "&Visszavon�s"
 
-#: ../src/generic/mdig.cpp:297
-#: ../src/generic/mdig.cpp:313
-#: ../src/generic/mdig.cpp:317
-#: ../src/msw/mdi.cpp:1333
-#: ../src/msw/mdi.cpp:1340
+#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
+#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1333 ../src/msw/mdi.cpp:1340
 #: ../src/msw/mdi.cpp:1370
 msgid "&Window"
 msgstr "&Ablak"
 
-#: ../src/common/config.cpp:414
-#: ../src/msw/regconf.cpp:265
+#: ../src/common/config.cpp:414 ../src/msw/regconf.cpp:265
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' ut�n felesleges '..'-t tal�ltam, elhanyagoltam."
 
-#: ../src/common/valtext.cpp:136
-#: ../src/common/valtext.cpp:166
+#: ../src/common/valtext.cpp:136 ../src/common/valtext.cpp:166
 #: ../src/common/valtext.cpp:172
 #, c-format
 msgid "'%s' is invalid"
@@ -273,19 +257,16 @@ msgstr "'%s' csak bet
 msgid "(Help)"
 msgstr "(S�g�)"
 
-#: ../src/html/helpfrm.cpp:345
-#: ../src/html/helpfrm.cpp:935
+#: ../src/html/helpfrm.cpp:345 ../src/html/helpfrm.cpp:935
 #: ../src/html/helpfrm.cpp:1563
 msgid "(bookmarks)"
 msgstr "(k�nyvjelz�k)"
 
-#: ../src/generic/dirctrlg.cpp:677
-#: ../src/generic/filedlgg.cpp:707
+#: ../src/generic/dirctrlg.cpp:677 ../src/generic/filedlgg.cpp:707
 msgid "."
 msgstr "."
 
-#: ../src/generic/dirctrlg.cpp:678
-#: ../src/generic/filedlgg.cpp:708
+#: ../src/generic/dirctrlg.cpp:678 ../src/generic/filedlgg.cpp:708
 msgid ".."
 msgstr ".."
 
@@ -325,18 +306,15 @@ msgstr "< &Vissza"
 msgid "<<"
 msgstr "<<"
 
-#: ../src/generic/filedlgg.cpp:248
-#: ../src/generic/filedlgg.cpp:271
+#: ../src/generic/filedlgg.cpp:248 ../src/generic/filedlgg.cpp:271
 msgid "<DIR>"
 msgstr "<DIR>"
 
-#: ../src/generic/filedlgg.cpp:252
-#: ../src/generic/filedlgg.cpp:275
+#: ../src/generic/filedlgg.cpp:252 ../src/generic/filedlgg.cpp:275
 msgid "<DRIVE>"
 msgstr "<MEGHAJT�>"
 
-#: ../src/generic/filedlgg.cpp:250
-#: ../src/generic/filedlgg.cpp:273
+#: ../src/generic/filedlgg.cpp:250 ../src/generic/filedlgg.cpp:273
 msgid "<LINK>"
 msgstr "<LINK>"
 
@@ -440,7 +418,8 @@ msgstr "M
 #: ../src/generic/logg.cpp:1118
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
-msgstr "A napl�t  a(z) '%s' file v�g�hez �rjam? (Ha [Nem]-et v�laszt, fel�l�rom!)"
+msgstr ""
+"A napl�t  a(z) '%s' file v�g�hez �rjam? (Ha [Nem]-et v�laszt, fel�l�rom!)"
 
 #: ../src/common/fmapbase.cpp:107
 msgid "Arabic (ISO-8859-6)"
@@ -470,8 +449,7 @@ msgstr "B5 lap, 182 x 257 millim
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 Borit�k, 176 x 125 mm"
 
-#: ../src/common/imagbmp.cpp:470
-#: ../src/common/imagbmp.cpp:486
+#: ../src/common/imagbmp.cpp:470 ../src/common/imagbmp.cpp:486
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: Nem siker�lt mem�ri�t foglalni."
 
@@ -547,8 +525,7 @@ msgstr "C6 Bor
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 Bor�t�k, 114 x 229 mm"
 
-#: ../src/html/chm.cpp:783
-#: ../src/html/chm.cpp:842
+#: ../src/html/chm.cpp:783 ../src/html/chm.cpp:842
 msgid "CHM handler currently supports only local files!"
 msgstr "A CHM kezel� jelenleg csak helyi f�jlokat t�mogat!"
 
@@ -561,8 +538,7 @@ msgstr "Nem tudom l
 msgid "Can not enumerate files '%s'"
 msgstr "Nem tudom megsz�molni a(z) '%s'  f�jlokat"
 
-#: ../src/msw/dir.cpp:300
-#: ../src/unix/dir.cpp:232
+#: ../src/msw/dir.cpp:300 ../src/unix/dir.cpp:232
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "Nem tudom megsz�molni a(z) '%s' k�nyvt�rban a f�jlokat"
@@ -572,8 +548,7 @@ msgstr "Nem tudom megsz
 msgid "Can not resume thread %lu"
 msgstr "Nem tudom folytatni a(z) %lu sz�lat"
 
-#: ../src/mac/thread.cpp:477
-#: ../src/msw/thread.cpp:821
+#: ../src/mac/thread.cpp:477 ../src/msw/thread.cpp:821
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "Nem tudom folytatni a(z) %x sz�lat"
@@ -587,8 +562,7 @@ msgstr "Nem tudom elind
 msgid "Can not suspend thread %lu"
 msgstr "Nem tudom felf�ggeszteni a(z) %lu sz�lat"
 
-#: ../src/mac/thread.cpp:453
-#: ../src/msw/thread.cpp:806
+#: ../src/mac/thread.cpp:453 ../src/msw/thread.cpp:806
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "Nem tudom felf�ggeszteni a(z) %x sz�lat"
@@ -604,7 +578,8 @@ msgstr "Nem lehet &Visszavonni"
 #: ../src/common/image.cpp:1441
 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
-msgstr "Nem tudom megvizsg�lni a(z) '%s' k�p f�jl form�tum�t: nincs ilyen f�jl."
+msgstr ""
+"Nem tudom megvizsg�lni a(z) '%s' k�p f�jl form�tum�t: nincs ilyen f�jl."
 
 #: ../src/msw/registry.cpp:447
 #, c-format
@@ -618,15 +593,16 @@ msgstr "Nem tudom a nem t
 
 #: ../src/msw/listctrl.cpp:413
 msgid "Can't create list control window, check that comctl32.dll is installed."
-msgstr "Nem tudom l�trehozni a lista vez�rl� ablakot, ellen�rizze, hogy a comctl32.dll install�lva van-e."
+msgstr ""
+"Nem tudom l�trehozni a lista vez�rl� ablakot, ellen�rizze, hogy a comctl32."
+"dll install�lva van-e."
 
 #: ../src/msw/registry.cpp:428
 #, c-format
 msgid "Can't create registry key '%s'"
 msgstr "Nem tudom l�trehozni a '%s' registry kulcsot"
 
-#: ../src/mac/thread.cpp:430
-#: ../src/msw/thread.cpp:593
+#: ../src/mac/thread.cpp:430 ../src/msw/thread.cpp:593
 #: ../src/os2/thread.cpp:491
 msgid "Can't create thread"
 msgstr "Nem tudom l�trehozni a sz�lat"
@@ -641,8 +617,7 @@ msgstr "Nem tudom l
 msgid "Can't delete key '%s'"
 msgstr "Nem tudom t�r�lni a(z) '%s' kulcsot"
 
-#: ../src/msw/iniconf.cpp:444
-#: ../src/os2/iniconf.cpp:448
+#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "Nem tudom t�r�lni a '%s' INI f�jt"
@@ -685,8 +660,7 @@ msgstr "Nem tudom elind
 msgid "Can't initialize zlib inflate stream."
 msgstr "Nem tudom elind�tani a zlib folyam kifejt�s�t."
 
-#: ../src/common/image.cpp:1028
-#: ../src/common/image.cpp:1048
+#: ../src/common/image.cpp:1028 ../src/common/image.cpp:1048
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
 msgstr "Nem tudom bet�lteni a k�pet a(z) '%s' f�jlb�l: nincs ilyen f�jl."
@@ -710,8 +684,7 @@ msgstr "Nem tudom olvasni a folyamot, nem v
 msgid "Can't read value of '%s'"
 msgstr "Nem tudom olvasni a(z) '%s' �rt�k�t"
 
-#: ../src/msw/registry.cpp:808
-#: ../src/msw/registry.cpp:842
+#: ../src/msw/registry.cpp:808 ../src/msw/registry.cpp:842
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr "Nem tudom olvasni a(z) '%s' kulcs �rt�k�t"
@@ -719,20 +692,18 @@ msgstr "Nem tudom olvasni a(z) '%s' kulcs 
 #: ../src/common/image.cpp:1070
 #, c-format
 msgid "Can't save image to file '%s': unknown extension."
-msgstr "Nem tudom elmenteni a k�pet a(z) '%s' f�jlba: nincs ilyen kiterjeszt�s."
+msgstr ""
+"Nem tudom elmenteni a k�pet a(z) '%s' f�jlba: nincs ilyen kiterjeszt�s."
 
-#: ../src/generic/logg.cpp:562
-#: ../src/generic/logg.cpp:994
+#: ../src/generic/logg.cpp:562 ../src/generic/logg.cpp:994
 msgid "Can't save log contents to file."
 msgstr "Nem tudom a napl� tartalm�t f�jlba menteni."
 
-#: ../src/msw/thread.cpp:549
-#: ../src/os2/thread.cpp:473
+#: ../src/msw/thread.cpp:549 ../src/os2/thread.cpp:473
 msgid "Can't set thread priority"
 msgstr "Nem tudom a sz�l priorit�s�t be�ll�tani"
 
-#: ../src/msw/registry.cpp:829
-#: ../src/msw/registry.cpp:954
+#: ../src/msw/registry.cpp:829 ../src/msw/registry.cpp:954
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr "Nem tudom a(z) '%s' �rt�ket be�ll�tani"
@@ -742,22 +713,16 @@ msgstr "Nem tudom a(z) '%s' 
 msgid "Can't write to deflate stream: %s\n"
 msgstr "Nem tudok �rni a(z) %s t�m�r�tett folyamba\n"
 
-#: ../src/common/dlgcmn.cpp:240
-#: ../src/generic/dirdlgg.cpp:155
-#: ../src/generic/filedlgg.cpp:977
-#: ../src/generic/filedlgg.cpp:996
-#: ../src/generic/fontdlgg.cpp:255
-#: ../src/generic/prntdlgg.cpp:455
-#: ../src/generic/progdlgg.cpp:211
-#: ../src/gtk/filedlg.cpp:168
-#: ../src/gtk/fontdlg.cpp:147
-#: ../src/html/helpfrm.cpp:1066
+#: ../src/common/dlgcmn.cpp:240 ../src/generic/dirdlgg.cpp:155
+#: ../src/generic/filedlgg.cpp:977 ../src/generic/filedlgg.cpp:996
+#: ../src/generic/fontdlgg.cpp:255 ../src/generic/prntdlgg.cpp:455
+#: ../src/generic/progdlgg.cpp:211 ../src/gtk/filedlg.cpp:168
+#: ../src/gtk/fontdlg.cpp:147 ../src/html/helpfrm.cpp:1066
 #: ../src/motif/msgdlg.cpp:182
 msgid "Cancel"
 msgstr "M�gsem"
 
-#: ../contrib/src/xrc/xmlres.cpp:987
-#: ../contrib/src/xrc/xmlres.cpp:1028
+#: ../contrib/src/xrc/xmlres.cpp:987 ../contrib/src/xrc/xmlres.cpp:1028
 msgid "Cannot convert dialog units: dialog unknown."
 msgstr "Nem tudom �talak�tani a dial�gus egys�geit; ismeretlen dial�gus."
 
@@ -802,8 +767,7 @@ msgstr "Nem ismerem a gazdag
 msgid "Cannot hang up - no active dialup connection."
 msgstr "Nem tudom letenni - nincs akt�v telefonkapcsolat."
 
-#: ../src/msw/app.cpp:290
-#: ../src/msw/app.cpp:293
+#: ../src/msw/app.cpp:290 ../src/msw/app.cpp:293
 msgid "Cannot initialize OLE"
 msgstr "Nem tudom inicializ�lni az OLEt"
 
@@ -878,8 +842,7 @@ msgstr "Nem tudom 
 msgid "Cannot print empty page."
 msgstr "Nem tudok �res oldalt nyomtatni."
 
-#: ../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 "Nem tudom elolvasni '%s' t�pus�nak nev�t."
@@ -949,8 +912,7 @@ msgstr "Sz
 msgid "Config entry name cannot start with '%c'."
 msgstr "Konfigur�ci�s bejegyz�s nem kezd�dhet '%c'-vel."
 
-#: ../src/generic/filedlgg.cpp:1214
-#: ../src/gtk/filedlg.cpp:74
+#: ../src/generic/filedlgg.cpp:1214 ../src/gtk/filedlg.cpp:74
 msgid "Confirm"
 msgstr "Meger�s�t�s"
 
@@ -1008,8 +970,7 @@ msgstr "Nem tudtam megtal
 msgid "Could not start document preview."
 msgstr "Nem tudom a dokument megtekint�s�t kezdem�nyezni."
 
-#: ../src/generic/printps.cpp:221
-#: ../src/msw/printwin.cpp:245
+#: ../src/generic/printps.cpp:221 ../src/msw/printwin.cpp:245
 msgid "Could not start printing."
 msgstr "Nem tudom elind�tani a nyomtat�st."
 
@@ -1021,21 +982,17 @@ msgstr "Nem tudtam adatot 
 msgid "Couldn't acquire a mutex lock"
 msgstr "Nem tudtam mutex z�rat l�trehozni"
 
-#: ../src/msw/dragimag.cpp:166
-#: ../src/msw/dragimag.cpp:206
-#: ../src/msw/imaglist.cpp:156
-#: ../src/msw/imaglist.cpp:174
+#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
+#: ../src/msw/imaglist.cpp:156 ../src/msw/imaglist.cpp:174
 #: ../src/msw/imaglist.cpp:186
 msgid "Couldn't add an image to the image list."
 msgstr "Nem tudok egy k�pet a k�pek list�j�hoz hozz�adni."
 
-#: ../src/msw/timer.cpp:101
-#: ../src/os2/timer.cpp:118
+#: ../src/msw/timer.cpp:101 ../src/os2/timer.cpp:118
 msgid "Couldn't create a timer"
 msgstr "Nem tudtam id�z�t�t l�trehozni"
 
-#: ../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 "Nem tudtam l�trehozni a k�perny� pozici� mutat�t."
 
@@ -1044,14 +1001,14 @@ msgstr "Nem tudtam l
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "Nem tal�lom a(z) '%s' szimb�lumot a dinamikus k�nyvt�rban"
 
-#: ../src/mac/thread.cpp:507
-#: ../src/msw/thread.cpp:847
+#: ../src/mac/thread.cpp:507 ../src/msw/thread.cpp:847
 msgid "Couldn't get the current thread pointer"
 msgstr "Nem kaptam meg a mutat�t a jelenlegi sz�lhoz"
 
 #: ../src/common/imagpng.cpp:607
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
-msgstr "Nem tudtam bet�lteni a PNG k�pet - hib�s a f�jl vagy nincs el�g mem�ria."
+msgstr ""
+"Nem tudtam bet�lteni a PNG k�pet - hib�s a f�jl vagy nincs el�g mem�ria."
 
 #: ../src/unix/sound.cpp:412
 #, c-format
@@ -1077,14 +1034,12 @@ msgstr "Nem tudtam elengedni a mutex-et"
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "Nem kaptam inform�ci�t a lista vez�rl� %d elem�r�l."
 
-#: ../src/common/imagpng.cpp:647
-#: ../src/common/imagpng.cpp:658
+#: ../src/common/imagpng.cpp:647 ../src/common/imagpng.cpp:658
 #: ../src/common/imagpng.cpp:666
 msgid "Couldn't save PNG image."
 msgstr "Nem tudtam elmenteni a PNG k�pet."
 
-#: ../src/mac/thread.cpp:756
-#: ../src/msw/thread.cpp:610
+#: ../src/mac/thread.cpp:756 ../src/msw/thread.cpp:610
 msgid "Couldn't terminate thread"
 msgstr "Nem tudtam befejezni a sz�lat"
 
@@ -1096,8 +1051,7 @@ msgstr "Nem tal
 msgid "Create directory"
 msgstr "Hozzon l�tre k�nyvt�rat"
 
-#: ../src/generic/dirdlgg.cpp:105
-#: ../src/generic/filedlgg.cpp:931
+#: ../src/generic/dirdlgg.cpp:105 ../src/generic/filedlgg.cpp:931
 msgid "Create new directory"
 msgstr "Hozzon l�tre egy �j k�nyvt�rat"
 
@@ -1163,8 +1117,12 @@ msgid "Deleted stale lock file '%s'."
 msgstr "A r�gi '%s' lakat f�jt t�r�ltem."
 
 #: ../src/msw/dialup.cpp:346
-msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."
-msgstr "A t�rcs�z� funkci�k nem haszn�lhat�k, mert a t�voli el�r�s szolg�ltat�s (RAS) nincs install�lva ezen a g�pen. K�rem install�lja."
+msgid ""
+"Dial up functions are unavailable because the remote access service (RAS) is "
+"not installed on this machine. Please install it."
+msgstr ""
+"A t�rcs�z� funkci�k nem haszn�lhat�k, mert a t�voli el�r�s szolg�ltat�s "
+"(RAS) nincs install�lva ezen a g�pen. K�rem install�lja."
 
 #: ../src/generic/tipdlg.cpp:220
 msgid "Did you know..."
@@ -1189,8 +1147,12 @@ msgid "Directory doesn't exist."
 msgstr "A k�nyvt�r nem l�tezik."
 
 #: ../src/html/helpfrm.cpp:409
-msgid "Display all index items that contain given substring. Search is case insensitive."
-msgstr "�rja ki az �sszes index bejegyz�st, ami tartalmazza az adott bejegyz�st. A keres�s kis/nagy bet�re nem �rz�keny."
+msgid ""
+"Display all index items that contain given substring. Search is case "
+"insensitive."
+msgstr ""
+"�rja ki az �sszes index bejegyz�st, ami tartalmazza az adott bejegyz�st. A "
+"keres�s kis/nagy bet�re nem �rz�keny."
 
 #: ../src/html/helpfrm.cpp:583
 msgid "Display options dialog"
@@ -1198,13 +1160,15 @@ msgstr "K
 
 #: ../src/msw/mimetype.cpp:672
 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"
 "%s %1"
 msgstr ""
-"Akarja, hogy �t�rjam a f�jlokn�l haszn�lt % parancsot (csak \"%s\" kiterjeszt�s eset�n)?\n"
+"Akarja, hogy �t�rjam a f�jlokn�l haszn�lt % parancsot (csak \"%s\" "
+"kiterjeszt�s eset�n)?\n"
 "A jelenlegi �rt�k \n"
 "%s, \n"
 "Az �j �rt�k \n"
@@ -1255,27 +1219,23 @@ msgstr "A tal
 
 #: ../src/common/config.cpp:366
 #, c-format
-msgid "Environment variables expansion failed: missing '%c' at position %d in '%s'."
-msgstr "A k�rnyezeti v�ltoz�k kifejt�se nem siker�lt: hi�nyzik '%c' a(z) %d helyen '%s'-b�l."
+msgid ""
+"Environment variables expansion failed: missing '%c' at position %d in '%s'."
+msgstr ""
+"A k�rnyezeti v�ltoz�k kifejt�se nem siker�lt: hi�nyzik '%c' a(z) %d helyen '%"
+"s'-b�l."
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:711
-#: ../src/generic/filedlgg.cpp:725
-#: ../src/generic/filedlgg.cpp:739
-#: ../src/generic/filedlgg.cpp:1166
-#: ../src/generic/filedlgg.cpp:1191
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/dirctrlg.cpp:701
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:711
+#: ../src/generic/filedlgg.cpp:725 ../src/generic/filedlgg.cpp:739
+#: ../src/generic/filedlgg.cpp:1166 ../src/generic/filedlgg.cpp:1191
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 #: ../src/gtk/fontdlg.cpp:76
 msgid "Error"
 msgstr "Hiba"
 
-#: ../src/unix/utilsunx.cpp:1030
-#: ../src/unix/utilsunx.cpp:1038
+#: ../src/unix/utilsunx.cpp:1030 ../src/unix/utilsunx.cpp:1038
 msgid "Error "
 msgstr "Hiba"
 
@@ -1359,11 +1319,14 @@ msgstr "Nem siker
 
 #: ../src/msw/dialup.cpp:780
 msgid "Failed to connect: missing username/password."
-msgstr "Nem siker�lt l�trehozni a kapcsolatot: hi�nyzik a felhaszn�l�i n�v vagy a jelsz�."
+msgstr ""
+"Nem siker�lt l�trehozni a kapcsolatot: hi�nyzik a felhaszn�l�i n�v vagy a "
+"jelsz�."
 
 #: ../src/msw/dialup.cpp:726
 msgid "Failed to connect: no ISP to dial."
-msgstr "Nem siker�lt l�trehozni a kapcsolatot: nincs t�rcs�zhat� szolg�ltat� (ISP)."
+msgstr ""
+"Nem siker�lt l�trehozni a kapcsolatot: nincs t�rcs�zhat� szolg�ltat� (ISP)."
 
 #: ../src/msw/registry.cpp:623
 #, c-format
@@ -1373,7 +1336,8 @@ msgstr "Nem siker
 #: ../src/msw/registry.cpp:632
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
-msgstr "Nem siker�lt lem�solni a(z) '%s' registry kulcs tartalm�t a(z) '%s'-be."
+msgstr ""
+"Nem siker�lt lem�solni a(z) '%s' registry kulcs tartalm�t a(z) '%s'-be."
 
 #: ../src/common/filefn.cpp:1192
 #, c-format
@@ -1403,7 +1367,8 @@ msgstr "Nem siker
 #: ../src/msw/dde.cpp:468
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
-msgstr "Nem siker�lt kapcsolatot l�trehozni a '%s' kiszolg�l�val a '%s' t�m�ban"
+msgstr ""
+"Nem siker�lt kapcsolatot l�trehozni a '%s' kiszolg�l�val a '%s' t�m�ban"
 
 #: ../src/msw/cursor.cpp:197
 msgid "Failed to create cursor."
@@ -1421,9 +1386,11 @@ msgstr "Nem tudtam l
 
 #: ../src/generic/dirdlgg.cpp:203
 #, c-format
-msgid "Failed to create directory '%s'\n"
+msgid ""
+"Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
-msgstr "Nem siker�lt l�trehozni a '%s' k�nyvt�rat.\n"
+msgstr ""
+"Nem siker�lt l�trehozni a '%s' k�nyvt�rat.\n"
 "(Rendelkezik a sz�ks�ges jogosults�ggal?)"
 
 #: ../src/msw/mimetype.cpp:196
@@ -1434,15 +1401,16 @@ msgstr "Nem tudtam l
 #: ../src/msw/fdrepdlg.cpp:480
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
-msgstr "Nem siker�lt l�trehozni a keres�s-helyettes�t�s p�rbesz�d ablakot (hibak�d : %d) "
+msgstr ""
+"Nem siker�lt l�trehozni a keres�s-helyettes�t�s p�rbesz�d ablakot (hibak�d : "
+"%d) "
 
 #: ../src/html/winpars.cpp:495
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "Nem siker�lt a HTML dokumentumot %s k�dol�ssal megjelen�teni"
 
-#: ../src/mac/clipbrd.cpp:185
-#: ../src/msw/clipbrd.cpp:134
+#: ../src/mac/clipbrd.cpp:185 ../src/msw/clipbrd.cpp:134
 msgid "Failed to empty the clipboard."
 msgstr "Nem siker�lt ki�r�teni a v�g�lapot."
 
@@ -1459,8 +1427,7 @@ msgstr "Nem siker
 msgid "Failed to establish dialup connection: %s"
 msgstr "Nem siker�lt l�trehozni a telefonos kapcsolatot: %s"
 
-#: ../src/unix/utilsunx.cpp:459
-#: ../src/unix/utilsunx.cpp:475
+#: ../src/unix/utilsunx.cpp:459 ../src/unix/utilsunx.cpp:475
 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "Nem siker�lt v�grehajtani '%s'-t\n"
@@ -1503,8 +1470,12 @@ msgid "Failed to initialize OpenGL"
 msgstr "Nem tudom elind�tani az OpenGLt."
 
 #: ../src/unix/threadpsx.cpp:896
-msgid "Failed to join a thread, potential memory leak detected - please restart the program"
-msgstr "Nem tudtam a sz�lhoz csatlakozni, val�sz�n�leg mem�ria lyukat tal�ltam - k�rem ind�tsa �jra a programot"
+msgid ""
+"Failed to join a thread, potential memory leak detected - please restart the "
+"program"
+msgstr ""
+"Nem tudtam a sz�lhoz csatlakozni, val�sz�n�leg mem�ria lyukat tal�ltam - "
+"k�rem ind�tsa �jra a programot"
 
 #: ../src/msw/utils.cpp:723
 #, c-format
@@ -1648,8 +1619,7 @@ msgstr "Nem tudtam a v
 msgid "Failed to set temporary file permissions"
 msgstr "Nem tudtam az �tmeneti f�jl enged�lyeit be�ll�tani."
 
-#: ../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 "Nem tudtam a(z) %d sz�l priorit�st be�ll�tani."
@@ -1709,15 +1679,15 @@ msgstr "F
 msgid "File %s does not exist."
 msgstr "A(z) '%s' file nem l�tezik."
 
-#: ../src/generic/filedlgg.cpp:1212
-#: ../src/gtk/filedlg.cpp:71
+#: ../src/generic/filedlgg.cpp:1212 ../src/gtk/filedlg.cpp:71
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "A(z) '%s file m�r l�tezik, val�ban  fel�l akarja �rni?"
 
 #: ../src/os2/filedlg.cpp:302
 #, c-format
-msgid "File '%s' already exists.\n"
+msgid ""
+"File '%s' already exists.\n"
 "Do you want to replace it?"
 msgstr "A(z) '%s file m�r l�tezik. Akarja fel�l�rni?"
 
@@ -1725,19 +1695,16 @@ msgstr "A(z) '%s file m
 msgid "File couldn't be loaded."
 msgstr "A f�jlt nem tudtam bet�lteni."
 
-#: ../src/common/docview.cpp:316
-#: ../src/common/docview.cpp:357
+#: ../src/common/docview.cpp:316 ../src/common/docview.cpp:357
 #: ../src/common/docview.cpp:1502
 msgid "File error"
 msgstr "F�jl hiba"
 
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/filedlgg.cpp:725
+#: ../src/generic/dirctrlg.cpp:701 ../src/generic/filedlgg.cpp:725
 msgid "File name exists already."
 msgstr "M�r van ilyen nev� f�jl."
 
-#: ../src/common/fldlgcmn.cpp:62
-#: ../src/msw/filedlg.cpp:250
+#: ../src/common/fldlgcmn.cpp:62 ../src/msw/filedlg.cpp:250
 #, c-format
 msgid "Files (%s)|%s"
 msgstr "F�jlok (%s)|%s"
@@ -1843,8 +1810,7 @@ msgstr "Menj el
 msgid "Go one level up in document hierarchy"
 msgstr "Menj a dokumentum hierarchia eggyel magasabb szintj�re"
 
-#: ../src/generic/dirdlgg.cpp:110
-#: ../src/generic/filedlgg.cpp:921
+#: ../src/generic/dirdlgg.cpp:110 ../src/generic/filedlgg.cpp:921
 msgid "Go to home directory"
 msgstr "Menj a saj�t (hon) k�nyvt�rba"
 
@@ -1877,10 +1843,8 @@ msgstr "HTML f
 msgid "Hebrew (ISO-8859-8)"
 msgstr "H�ber (ISO-8859-8)"
 
-#: ../src/common/dlgcmn.cpp:236
-#: ../src/generic/mdig.cpp:310
-#: ../src/html/helpfrm.cpp:254
-#: ../src/html/helpfrm.cpp:277
+#: ../src/common/dlgcmn.cpp:236 ../src/generic/mdig.cpp:310
+#: ../src/html/helpfrm.cpp:254 ../src/html/helpfrm.cpp:277
 #: ../src/msw/mdi.cpp:1329
 msgid "Help"
 msgstr "S�g�"
@@ -1889,8 +1853,7 @@ msgstr "S
 msgid "Help Browser Options"
 msgstr "S�g� B�ng�sz� be�ll�t�sok"
 
-#: ../src/generic/helpext.cpp:441
-#: ../src/generic/helpext.cpp:442
+#: ../src/generic/helpext.cpp:441 ../src/generic/helpext.cpp:442
 msgid "Help Index"
 msgstr "S�g� tartalomjegyz�k"
 
@@ -1911,12 +1874,9 @@ msgstr "S
 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: Hiba a DIB maszk olvas�sakor."
 
-#: ../src/common/imagbmp.cpp:1042
-#: ../src/common/imagbmp.cpp:1101
-#: ../src/common/imagbmp.cpp:1110
-#: ../src/common/imagbmp.cpp:1121
-#: ../src/common/imagbmp.cpp:1165
-#: ../src/common/imagbmp.cpp:1175
+#: ../src/common/imagbmp.cpp:1042 ../src/common/imagbmp.cpp:1101
+#: ../src/common/imagbmp.cpp:1110 ../src/common/imagbmp.cpp:1121
+#: ../src/common/imagbmp.cpp:1165 ../src/common/imagbmp.cpp:1175
 #: ../src/common/imagbmp.cpp:1184
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: Hiba a k�p �r�sakor!"
@@ -1961,8 +1921,7 @@ msgstr "A ConstructObject m
 msgid "Illegal Parameter Count for Create Method"
 msgstr "A Create m�dszer hib�s param�ter sz�mot kapott"
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/filedlgg.cpp:711
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:711
 msgid "Illegal directory name."
 msgstr "Hib�s k�nyvt�r n�v."
 
@@ -1980,8 +1939,12 @@ msgid "Image file is not of type %d."
 msgstr "A k�p nem %d t�pus�."
 
 #: ../src/msw/textctrl.cpp:303
-msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"
-msgstr "Nem tudok form�zott sz�vegkontrollt k�sz�teni, egyszer� sz�vegkontrollt haszn�lok helyette. K�rem install�lja �jra a riched32.dll f�jlt"
+msgid ""
+"Impossible to create a rich edit control, using simple text control instead. "
+"Please reinstall riched32.dll"
+msgstr ""
+"Nem tudok form�zott sz�vegkontrollt k�sz�teni, egyszer� sz�vegkontrollt "
+"haszn�lok helyette. K�rem install�lja �jra a riched32.dll f�jlt"
 
 #: ../src/unix/utilsunx.cpp:379
 msgid "Impossible to get child process input"
@@ -2038,8 +2001,7 @@ msgstr "Hib
 msgid "Invalid lock file '%s'."
 msgstr "Hib�s a(z) '%s' lakat f�jl."
 
-#: ../src/common/xtistrm.cpp:363
-#: ../src/common/xtistrm.cpp:378
+#: ../src/common/xtistrm.cpp:363 ../src/common/xtistrm.cpp:378
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr "�rv�nytelen vagy Null Object ID-t kapott GetObjectClassInfo"
 
@@ -2072,8 +2034,7 @@ msgstr "JPEG: Nem tudtam elmenteni a k
 msgid "KOI8-R"
 msgstr "KOI8-R"
 
-#: ../src/generic/prntdlgg.cpp:428
-#: ../src/generic/prntdlgg.cpp:638
+#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:638
 msgid "Landscape"
 msgstr "T�jk�p"
 
@@ -2127,8 +2088,7 @@ msgstr "A sz
 msgid "Log saved to the file '%s'."
 msgstr "A napl�t a(z) '%s' f�jl-ba mentettem."
 
-#: ../include/wx/xti.h:469
-#: ../include/wx/xti.h:473
+#: ../include/wx/xti.h:469 ../include/wx/xti.h:473
 msgid "Long Conversions not supported"
 msgstr "A hossz� �talak�t�sokat nem t�mogatom"
 
@@ -2137,8 +2097,12 @@ msgid "MDI child"
 msgstr "MDI gyermek"
 
 #: ../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 "A MS HTML funkci�k nem haszn�lhat�k, mert a MS HTML Help k�nyvt�r nincs install�lva ezen a g�pen. K�rem install�lja."
+msgid ""
+"MS HTML Help functions are unavailable because the MS HTML Help library is "
+"not installed on this machine. Please install it."
+msgstr ""
+"A MS HTML funkci�k nem haszn�lhat�k, mert a MS HTML Help k�nyvt�r nincs "
+"install�lva ezen a g�pen. K�rem install�lja."
 
 #: ../src/univ/themes/win32.cpp:4678
 msgid "Ma&ximize"
@@ -2208,10 +2172,8 @@ msgstr "N
 msgid "New item"
 msgstr "�j bejegyz�s"
 
-#: ../src/generic/dirdlgg.cpp:274
-#: ../src/generic/dirdlgg.cpp:284
-#: ../src/generic/filedlgg.cpp:587
-#: ../src/generic/filedlgg.cpp:596
+#: ../src/generic/dirdlgg.cpp:274 ../src/generic/dirdlgg.cpp:284
+#: ../src/generic/filedlgg.cpp:587 ../src/generic/filedlgg.cpp:596
 msgid "NewName"
 msgstr "�jN�v"
 
@@ -2219,10 +2181,8 @@ msgstr "
 msgid "Next page"
 msgstr "K�vetkez� oldal"
 
-#: ../src/common/dlgcmn.cpp:213
-#: ../src/mac/msgdlg.cpp:56
-#: ../src/mac/msgdlg.cpp:140
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:213 ../src/mac/msgdlg.cpp:56
+#: ../src/mac/msgdlg.cpp:140 ../src/motif/msgdlg.cpp:182
 msgid "No"
 msgstr "Nem"
 
@@ -2239,7 +2199,8 @@ msgstr "Nem tal
 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 ""
 "Nem tal�ltam jelk�szletet a(z) '%s' k�dol�shoz,\n"
 "de a vagylagos '%s' k�dol�s el�rhet�.\n"
@@ -2261,20 +2222,17 @@ msgstr ""
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr "A '%s', class '%s' XML csom�ponthoz nem tal�ltam meghajt�t!"
 
-#: ../src/common/image.cpp:1162
-#: ../src/common/image.cpp:1205
+#: ../src/common/image.cpp:1162 ../src/common/image.cpp:1205
 msgid "No handler found for image type."
 msgstr "Ilyen t�pus� k�phez nem tal�ltam kezel�t."
 
-#: ../src/common/image.cpp:1170
-#: ../src/common/image.cpp:1213
+#: ../src/common/image.cpp:1170 ../src/common/image.cpp:1213
 #: ../src/common/image.cpp:1247
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "%d  t�pus� k�phez nincs kezel� meghat�rozva."
 
-#: ../src/common/image.cpp:1231
-#: ../src/common/image.cpp:1263
+#: ../src/common/image.cpp:1231 ../src/common/image.cpp:1263
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "%s  t�pus� k�phez nincs kezel� meghat�rozva."
@@ -2291,8 +2249,7 @@ msgstr "Nincs hang"
 msgid "Nordic (ISO-8859-10)"
 msgstr "�szaki (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:227
-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/generic/fontdlgg.cpp:227 ../src/generic/fontdlgg.cpp:230
 msgid "Normal"
 msgstr "Norm�l"
 
@@ -2308,16 +2265,11 @@ msgstr "Norm
 msgid "Note, 8 1/2 x 11 in"
 msgstr "Feljegyz�s, 8 1/2 x 11 h�velyk"
 
-#: ../src/common/dlgcmn.cpp:219
-#: ../src/generic/dirdlgg.cpp:153
-#: ../src/generic/filedlgg.cpp:976
-#: ../src/generic/filedlgg.cpp:987
-#: ../src/generic/fontdlgg.cpp:254
-#: ../src/generic/logg.cpp:748
-#: ../src/generic/prntdlgg.cpp:454
-#: ../src/gtk/filedlg.cpp:162
-#: ../src/gtk/fontdlg.cpp:139
-#: ../src/html/helpfrm.cpp:1064
+#: ../src/common/dlgcmn.cpp:219 ../src/generic/dirdlgg.cpp:153
+#: ../src/generic/filedlgg.cpp:976 ../src/generic/filedlgg.cpp:987
+#: ../src/generic/fontdlgg.cpp:254 ../src/generic/logg.cpp:748
+#: ../src/generic/prntdlgg.cpp:454 ../src/gtk/filedlg.cpp:162
+#: ../src/gtk/fontdlg.cpp:139 ../src/html/helpfrm.cpp:1064
 msgid "OK"
 msgstr "Igen"
 
@@ -2325,20 +2277,16 @@ msgstr "Igen"
 msgid "Objects must have an id attribute"
 msgstr "Az objektumoknak id jellemz�vel is rendelkezni�k kell"
 
-#: ../src/common/docview.cpp:1197
-#: ../src/common/docview.cpp:1525
+#: ../src/common/docview.cpp:1197 ../src/common/docview.cpp:1525
 msgid "Open File"
 msgstr "F�jl megnyit�s"
 
-#: ../src/html/helpfrm.cpp:571
-#: ../src/html/helpfrm.cpp:1404
+#: ../src/html/helpfrm.cpp:571 ../src/html/helpfrm.cpp:1404
 msgid "Open HTML document"
 msgstr "Nyisd meg a HTML dokumentumot"
 
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:739
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:739
 msgid "Operation not permitted."
 msgstr "Ez a m�velet nincs megengedve."
 
@@ -2361,13 +2309,11 @@ msgstr "A(z) '%s' be
 msgid "Options"
 msgstr "Lehet�s�gek"
 
-#: ../src/generic/prntdlgg.cpp:430
-#: ../src/generic/prntdlgg.cpp:639
+#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:639
 msgid "Orientation"
 msgstr "Ir�nyults�g"
 
-#: ../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: nem tudtam mem�ri�t foglalni"
 
@@ -2383,8 +2329,7 @@ msgstr "PCX: 
 msgid "PCX: this is not a PCX file."
 msgstr "PCX: ez nem PCX f�jl."
 
-#: ../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: ismeretlen hiba !!!"
 
@@ -2422,14 +2367,12 @@ msgstr "Oldal be
 msgid "Pages"
 msgstr "Oldalak"
 
-#: ../src/generic/prntdlgg.cpp:545
-#: ../src/generic/prntdlgg.cpp:625
+#: ../src/generic/prntdlgg.cpp:545 ../src/generic/prntdlgg.cpp:625
 #: ../src/generic/prntdlgg.cpp:818
 msgid "Paper Size"
 msgstr "Pap�r m�ret"
 
-#: ../src/generic/prntdlgg.cpp:420
-#: ../src/generic/prntdlgg.cpp:612
+#: ../src/generic/prntdlgg.cpp:420 ../src/generic/prntdlgg.cpp:612
 #: ../src/generic/prntdlgg.cpp:813
 msgid "Paper size"
 msgstr "Pap�r m�ret"
@@ -2442,8 +2385,7 @@ msgstr "SetObject m
 msgid "Passing a already registered object to SetObjectName"
 msgstr "SetObjectName m�r regisztr�lt objektumot kapott"
 
-#: ../src/common/xtistrm.cpp:434
-#: ../src/common/xtistrm.cpp:654
+#: ../src/common/xtistrm.cpp:434 ../src/common/xtistrm.cpp:654
 msgid "Passing an unkown object to GetObject"
 msgstr "GetObject ismeretlen objektumot kapott"
 
@@ -2459,8 +2401,7 @@ msgstr "A cs
 msgid "Please choose a valid font."
 msgstr "K�rem v�lasszon egy �rv�nyes jelk�szletet."
 
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 msgid "Please choose an existing file."
 msgstr "K�rem v�lasszon egy l�tez� f�jlt."
 
@@ -2483,8 +2424,7 @@ msgstr ""
 msgid "Please wait while printing\n"
 msgstr "K�rem v�rjon am�g nyomtatok\n"
 
-#: ../src/generic/prntdlgg.cpp:427
-#: ../src/generic/prntdlgg.cpp:637
+#: ../src/generic/prntdlgg.cpp:427 ../src/generic/prntdlgg.cpp:637
 msgid "Portrait"
 msgstr "�ll�"
 
@@ -2500,8 +2440,7 @@ msgstr "El
 msgid "Previous page"
 msgstr "El�z� oldal"
 
-#: ../src/generic/prntdlgg.cpp:107
-#: ../src/generic/prntdlgg.cpp:121
+#: ../src/generic/prntdlgg.cpp:107 ../src/generic/prntdlgg.cpp:121
 msgid "Print"
 msgstr "Nyomtat�s"
 
@@ -2509,8 +2448,7 @@ msgstr "Nyomtat
 msgid "Print Preview"
 msgstr "Nyomtat�si k�p"
 
-#: ../src/common/prntbase.cpp:784
-#: ../src/common/prntbase.cpp:810
+#: ../src/common/prntbase.cpp:784 ../src/common/prntbase.cpp:810
 msgid "Print Preview Failure"
 msgstr "Nyomtat�si k�p hiba"
 
@@ -2554,8 +2492,7 @@ msgstr "Nyomtat
 msgid "Printer..."
 msgstr "Nyomtat�..."
 
-#: ../src/common/prntbase.cpp:109
-#: ../src/common/prntbase.cpp:154
+#: ../src/common/prntbase.cpp:109 ../src/common/prntbase.cpp:154
 msgid "Printing "
 msgstr "Nyomtat�s"
 
@@ -2584,8 +2521,7 @@ msgstr "Quarto, 215 x 275 mm"
 msgid "Question"
 msgstr "K�rd�s"
 
-#: ../src/common/ffile.cpp:111
-#: ../src/common/ffile.cpp:132
+#: ../src/common/ffile.cpp:111 ../src/common/ffile.cpp:132
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "Olvas�si hiba a(z) '%s' f�jlban"
@@ -2675,14 +2611,17 @@ msgstr "Mentsd a napl
 msgid "Script"
 msgstr "Script"
 
-#: ../src/html/helpfrm.cpp:443
-#: ../src/html/helpfrm.cpp:458
+#: ../src/html/helpfrm.cpp:443 ../src/html/helpfrm.cpp:458
 msgid "Search"
 msgstr "Keres�s"
 
 #: ../src/html/helpfrm.cpp:445
-msgid "Search contents of help book(s) for all occurences of the text you typed above"
-msgstr "Keresd meg a fentebb be�rt sz�veg valamennyi el�fordul�s�t a s�g� k�nyv(ek)ben"
+msgid ""
+"Search contents of help book(s) for all occurences of the text you typed "
+"above"
+msgstr ""
+"Keresd meg a fentebb be�rt sz�veg valamennyi el�fordul�s�t a s�g� k�nyv(ek)"
+"ben"
 
 #: ../src/generic/fdrepdlg.cpp:152
 msgid "Search direction"
@@ -2744,7 +2683,9 @@ msgstr "Be
 
 #: ../src/msw/dialup.cpp:518
 msgid "Several active dialup connections found, choosing one randomly."
-msgstr "T�bb akt�v telefonkapcsolatot tal�ltam, az egyiket v�letlenszer�en kiv�lasztom."
+msgstr ""
+"T�bb akt�v telefonkapcsolatot tal�ltam, az egyiket v�letlenszer�en "
+"kiv�lasztom."
 
 #: ../src/html/helpfrm.cpp:399
 msgid "Show all"
@@ -2758,8 +2699,7 @@ msgstr "Mutasd meg a tartalom mutat
 msgid "Show hidden directories"
 msgstr "Mutasd meg a rejtett k�nyvt�rokat"
 
-#: ../src/generic/filedlgg.cpp:971
-#: ../src/generic/filedlgg.cpp:993
+#: ../src/generic/filedlgg.cpp:971 ../src/generic/filedlgg.cpp:993
 msgid "Show hidden files"
 msgstr "Mutasd meg a rejtett f�jlokat"
 
@@ -2779,8 +2719,7 @@ msgstr "Ferde"
 msgid "Sorry, could not open this file for saving."
 msgstr "Sajn�lom, nem tudtam megnyitni a f�jlt ment�sre."
 
-#: ../src/common/docview.cpp:367
-#: ../src/common/docview.cpp:380
+#: ../src/common/docview.cpp:367 ../src/common/docview.cpp:380
 #: ../src/common/docview.cpp:1504
 msgid "Sorry, could not open this file."
 msgstr "Sajn�lom, nem tudtam megnyitni ezt a f�jlt."
@@ -2797,8 +2736,7 @@ msgstr "Sajn
 msgid "Sorry, print preview needs a printer to be installed."
 msgstr "Sajn�lom, a nyomtat�si el�k�phez �ll�tson be egy nyomtat�t."
 
-#: ../src/common/docview.cpp:1196
-#: ../src/common/docview.cpp:1524
+#: ../src/common/docview.cpp:1196 ../src/common/docview.cpp:1524
 msgid "Sorry, the format for this file is unknown."
 msgstr "Sajn�lom, ezt a f�jl form�tumot nem ismerem."
 
@@ -2828,22 +2766,21 @@ msgstr ""
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "Sz�veget sz�nn�: Helytelen sz�n meghat�roz�s '%s'"
 
-#: ../include/wx/xti.h:396
-#: ../include/wx/xti.h:400
+#: ../include/wx/xti.h:396 ../include/wx/xti.h:400
 msgid "String conversions not supported"
 msgstr "Sz�veg �talak�t�st nem t�mogatok"
 
 #: ../contrib/src/xrc/xmlres.cpp:676
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
-msgstr "A(z) '%s' aloszt�lyt nem tal�ltama(z) '%s' er�forr�shoz, nem tudom haszn�lni!"
+msgstr ""
+"A(z) '%s' aloszt�lyt nem tal�ltama(z) '%s' er�forr�shoz, nem tudom haszn�lni!"
 
 #: ../src/generic/fontdlgg.cpp:225
 msgid "Swiss"
 msgstr "Sv�jci"
 
-#: ../src/common/imagtiff.cpp:232
-#: ../src/common/imagtiff.cpp:243
+#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
 #: ../src/common/imagtiff.cpp:354
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: Nem tudtam mem�ri�t foglalni."
@@ -2902,23 +2839,29 @@ msgstr "A(z) '%d' v
 
 #: ../src/generic/dirdlgg.cpp:188
 #, c-format
-msgid "The directory '%s' does not exist\n"
+msgid ""
+"The directory '%s' does not exist\n"
 "Create it now?"
-msgstr "A '%s' k�nyvt�r nem l�tezik.\n"
+msgstr ""
+"A '%s' k�nyvt�r nem l�tezik.\n"
 "L�trehozzam most?"
 
 #: ../src/common/docview.cpp:1859
 #, c-format
-msgid "The file '%s' couldn't be opened.\n"
+msgid ""
+"The file '%s' couldn't be opened.\n"
 "It has been removed from the most recently used files list."
-msgstr "A(z) '%s' f�jlt nem siker�lt megyitni.\n"
+msgstr ""
+"A(z) '%s' f�jlt nem siker�lt megyitni.\n"
 "A legut�bb haszn�lt f�jlok list�j�r�l is el van t�vol�tva."
 
 #: ../src/common/docview.cpp:1869
 #, c-format
-msgid "The file '%s' doesn't exist and couldn't be opened.\n"
+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 "A(z) '%s' f�jl nem l�tezik �s nem nyithat� meg.\n"
+msgstr ""
+"A(z) '%s' f�jl nem l�tezik �s nem nyithat� meg.\n"
 "A legut�bb haszn�lt f�jlok list�j�r�l is el van t�vol�tva."
 
 #: ../src/common/filename.cpp:931
@@ -2942,24 +2885,41 @@ msgstr "A(z) '%s' be
 
 #: ../src/msw/dialup.cpp:406
 #, 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 "Az ezen a g�pre install�lt t�voli hozz�f�r�si lehet�s�g  (RAS) t�l r�gi, k�rem friss�tsen (A(z) %s sz�ks�ges funkci� hi�nyzik)."
+msgid ""
+"The version of remote access service (RAS) installed on this machine is "
+"tooold, please upgrade (the following required function is missing: %s)."
+msgstr ""
+"Az ezen a g�pre install�lt t�voli hozz�f�r�si lehet�s�g  (RAS) t�l r�gi, "
+"k�rem friss�tsen (A(z) %s sz�ks�ges funkci� hi�nyzik)."
 
 #: ../src/html/htmprint.cpp:580
-msgid "There was a problem during page setup: you may need to set a default printer."
-msgstr "Az oldal be�ll�t�sakor hiba t�rt�nt: lehet hogy az alap�rtelmezett nyomtat�t kellene be�ll�tania."
+msgid ""
+"There was a problem during page setup: you may need to set a default printer."
+msgstr ""
+"Az oldal be�ll�t�sakor hiba t�rt�nt: lehet hogy az alap�rtelmezett nyomtat�t "
+"kellene be�ll�tania."
 
 #: ../src/msw/thread.cpp:1197
-msgid "Thread module initialization failed: can not store value in thread local storage"
-msgstr "A sz�l modul inicializ�l�sa nem siker�lt: nem tudok �rt�ket t�rolni a sz�l helyi t�rol�j�ba"
+msgid ""
+"Thread module initialization failed: can not store value in thread local "
+"storage"
+msgstr ""
+"A sz�l modul inicializ�l�sa nem siker�lt: nem tudok �rt�ket t�rolni a sz�l "
+"helyi t�rol�j�ba"
 
 #: ../src/unix/threadpsx.cpp:1600
 msgid "Thread module initialization failed: failed to create thread key"
-msgstr "A sz�l modul inicializ�l�sa nem siker�lt: nem siker�lt a sz�lhoz kulcsot k�sz�teni"
+msgstr ""
+"A sz�l modul inicializ�l�sa nem siker�lt: nem siker�lt a sz�lhoz kulcsot "
+"k�sz�teni"
 
 #: ../src/msw/thread.cpp:1185
-msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
-msgstr "A sz�l modul inicializ�l�sa nem siker�lt: nem lehet indexet foglalni a sz�l helyi t�rol�j�ban"
+msgid ""
+"Thread module initialization failed: impossible to allocate index in thread "
+"local storage"
+msgstr ""
+"A sz�l modul inicializ�l�sa nem siker�lt: nem lehet indexet foglalni a sz�l "
+"helyi t�rol�j�ban"
 
 #: ../src/unix/threadpsx.cpp:1108
 msgid "Thread priority setting is ignored."
@@ -3000,10 +2960,10 @@ msgstr "Fels
 #: ../src/common/fs_mem.cpp:205
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
-msgstr "Megpr�b�ltam elt�vol�tani a(z) '%s' f�jlt a VFS t�rol�b�l, de nincs bet�ltve!"
+msgstr ""
+"Megpr�b�ltam elt�vol�tani a(z) '%s' f�jlt a VFS t�rol�b�l, de nincs bet�ltve!"
 
-#: ../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 "Megpr�b�ltam feloldani a NULL gazdag�p nevet: feladom"
 
@@ -3015,8 +2975,7 @@ msgstr "T
 msgid "Type"
 msgstr "T�pus"
 
-#: ../src/common/xtistrm.cpp:279
-#: ../src/common/xtixml.cpp:351
+#: ../src/common/xtistrm.cpp:279 ../src/common/xtixml.cpp:351
 #: ../src/common/xtixml.cpp:498
 msgid "Type must have enum - long conversion"
 msgstr "A t�pust enum-r�l long-ra kell alak�tani"
@@ -3099,8 +3058,7 @@ msgstr "A(z) %s f
 msgid "Unknown long option '%s'"
 msgstr "Ismeretlen hossz� opci� '%s'"
 
-#: ../src/common/cmdline.cpp:582
-#: ../src/common/cmdline.cpp:603
+#: ../src/common/cmdline.cpp:582 ../src/common/cmdline.cpp:603
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "Ismeretlen opci� '%s'"
@@ -3119,14 +3077,12 @@ msgstr "Ismeretlen tulajdons
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "P�ratlan '{' a(z) %s mime t�pus egyik elem�ben."
 
-#: ../src/common/cmdproc.cpp:254
-#: ../src/common/cmdproc.cpp:280
+#: ../src/common/cmdproc.cpp:254 ../src/common/cmdproc.cpp:280
 #: ../src/common/cmdproc.cpp:300
 msgid "Unnamed command"
 msgstr "N�v n�lk�li parancs"
 
-#: ../src/mac/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:273
+#: ../src/mac/clipbrd.cpp:64 ../src/msw/clipbrd.cpp:273
 #: ../src/msw/clipbrd.cpp:445
 msgid "Unsupported clipboard format."
 msgstr "Nem t�mogatott v�g�lap form�tum."
@@ -3183,7 +3139,9 @@ msgstr "Figyelmeztet
 
 #: ../src/html/htmlpars.cpp:390
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
-msgstr "Figyeleztet�s: �res veremt�rol�b�l pr�b�l elt�vol�tani HTML kifejez�s kezel�t."
+msgstr ""
+"Figyeleztet�s: �res veremt�rol�b�l pr�b�l elt�vol�tani HTML kifejez�s "
+"kezel�t."
 
 #: ../src/common/fmapbase.cpp:102
 msgid "Western European (ISO-8859-1)"
@@ -3284,8 +3242,7 @@ msgstr "XML 
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: Hi�nyos pixel adat!"
 
-#: ../src/common/xpmdecod.cpp:712
-#: ../src/common/xpmdecod.cpp:722
+#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:722
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr "XPM: hi�nyos sz�n meghat�roz�s '%s'!"
@@ -3295,8 +3252,7 @@ msgstr "XPM: hi
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "Nem tal�lom a(z) '%s'  XRC er�forr�st ('%s' oszt�ly)."
 
-#: ../contrib/src/xrc/xmlres.cpp:885
-#: ../contrib/src/xrc/xmlres.cpp:897
+#: ../contrib/src/xrc/xmlres.cpp:885 ../contrib/src/xrc/xmlres.cpp:897
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "XRC er�forr�s: Nem tudom l�trehozni a(z) '%s'-b�l a bitt�rk�pet."
@@ -3306,10 +3262,8 @@ msgstr "XRC er
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr "XRC er�forr�s: Helytelen sz�n meghat�roz�s '%s' a '%s' tulajdons�gn�l."
 
-#: ../src/common/dlgcmn.cpp:208
-#: ../src/mac/msgdlg.cpp:57
-#: ../src/mac/msgdlg.cpp:139
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:208 ../src/mac/msgdlg.cpp:57
+#: ../src/mac/msgdlg.cpp:139 ../src/motif/msgdlg.cpp:182
 msgid "Yes"
 msgstr "Igen"
 
@@ -3317,8 +3271,7 @@ msgstr "Igen"
 msgid "You cannot add a new directory to this section."
 msgstr "Nem tud k�nyvt�rat hozz�adni ehhez a szakaszhoz."
 
-#: ../src/common/fs_zip.cpp:88
-#: ../src/common/fs_zip.cpp:138
+#: ../src/common/fs_zip.cpp:88 ../src/common/fs_zip.cpp:138
 msgid "ZIP handler currently supports only local files!"
 msgstr "A ZIP kezel� jelenleg csak helyi f�jlokat t�mogat!"
 
@@ -3332,11 +3285,13 @@ msgstr "a DDEML alkalmaz
 
 #: ../src/msw/dde.cpp:1063
 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 ""
-"egy DDEML f�ggv�nyt h�vott an�lk�l, hogy el�sz�r a  DdeInitialize f�ggv�nyt h�vta volna,\n"
+"egy DDEML f�ggv�nyt h�vott an�lk�l, hogy el�sz�r a  DdeInitialize f�ggv�nyt "
+"h�vta volna,\n"
 "vagy �rv�nytelen instance azonos�t�t \n"
 "adott �t a DDEML f�ggv�nynek."
 
@@ -3370,7 +3325,8 @@ msgstr "a szinkron adatlerak
 
 #: ../src/msw/dde.cpp:1102
 msgid "a request to end an advise transaction has timed out."
-msgstr "a  tan�cskoz�si tranzakci� befejez�s�nek k�r�se nem fejez�d�tt be id�re."
+msgstr ""
+"a  tan�cskoz�si tranzakci� befejez�s�nek k�r�se nem fejez�d�tt be id�re."
 
 #: ../src/msw/dde.cpp:1096
 msgid ""
@@ -3423,7 +3379,9 @@ msgstr ""
 #: ../src/common/fileconf.cpp:1815
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
-msgstr "elhanyagoltam a v�ltoztathatatlan '%s' kulcs megv�ltoztat�s�ra tett k�s�rlet�t."
+msgstr ""
+"elhanyagoltam a v�ltoztathatatlan '%s' kulcs megv�ltoztat�s�ra tett "
+"k�s�rlet�t."
 
 #: ../src/html/chm.cpp:330
 msgid "bad arguments to library function"
@@ -3473,24 +3431,28 @@ msgstr "nem tudom t
 #: ../src/common/file.cpp:631
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
-msgstr "nem tudom meghat�rozni, hogy a f�jl v�g�t �rt�k-e el a(z) %d le�r�val megadott f�jlban"
+msgstr ""
+"nem tudom meghat�rozni, hogy a f�jl v�g�t �rt�k-e el a(z) %d le�r�val "
+"megadott f�jlban"
 
 #: ../src/common/file.cpp:585
 #, c-format
 msgid "can't find length of file on file descriptor %d"
-msgstr "nem tudom meghat�rozni a f�jl hossz�t a(z) %d le�r�val megadott f�jlban"
+msgstr ""
+"nem tudom meghat�rozni a f�jl hossz�t a(z) %d le�r�val megadott f�jlban"
 
 #: ../src/msw/utils.cpp:371
 msgid "can't find user's HOME, using current directory."
-msgstr "nem tudom meghat�rozni a felhaszn�l� saj�t k�nyvt�r�t, a jelenlegit haszn�lom tov�bb."
+msgstr ""
+"nem tudom meghat�rozni a felhaszn�l� saj�t k�nyvt�r�t, a jelenlegit "
+"haszn�lom tov�bb."
 
 #: ../src/common/file.cpp:450
 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr "nem tudom ki�r�teni a(z) %d le�r�val megadott f�jl puffer�t"
 
-#: ../src/common/file.cpp:535
-#: ../src/common/file.cpp:543
+#: ../src/common/file.cpp:535 ../src/common/file.cpp:543
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "nem tal�lom a keres�si poz�ci�t a(z) %d le�r�val megadott f�jlban"
@@ -3499,8 +3461,7 @@ msgstr "nem tal
 msgid "can't load any font, aborting"
 msgstr "egyetlen jelk�szletet sem tudok bet�lteni, kil�pek"
 
-#: ../src/common/ffile.cpp:63
-#: ../src/common/file.cpp:352
+#: ../src/common/ffile.cpp:63 ../src/common/file.cpp:352
 #, c-format
 msgid "can't open file '%s'"
 msgstr "nem tudom megnyitni a(z) '%s' f�jlt"
@@ -3538,8 +3499,7 @@ msgstr "nem tudom elt
 msgid "can't remove temporary file '%s'"
 msgstr "nem tudom elt�vol�tani a(z) '%s' �tmeneti f�jlt"
 
-#: ../src/common/file.cpp:492
-#: ../src/common/file.cpp:518
+#: ../src/common/file.cpp:492 ../src/common/file.cpp:518
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "nem tudok keresni a(z) %d le�r�val megadott f�jlban"
@@ -3651,12 +3611,14 @@ msgstr "'%s' f
 #: ../src/common/fileconf.cpp:710
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
-msgstr "'%s' f�jl, %d. sor: a(z) '%s' kulcsot el�sz�r a(z) %d sorban tal�ltam meg."
+msgstr ""
+"'%s' f�jl, %d. sor: a(z) '%s' kulcsot el�sz�r a(z) %d sorban tal�ltam meg."
 
 #: ../src/common/fileconf.cpp:700
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
-msgstr "file '%s', line %d: a v�ltoztathatatlan '%s' kulcs �j �rt�k�t elhanyagoltam."
+msgstr ""
+"file '%s', line %d: a v�ltoztathatatlan '%s' kulcs �j �rt�k�t elhanyagoltam."
 
 #: ../src/common/fileconf.cpp:622
 #, c-format
@@ -3703,8 +3665,7 @@ msgstr "
 msgid "invalid message box return value"
 msgstr "�rv�nytelen �zenet ablak visszat�r�si �rt�k"
 
-#: ../src/common/fontcmn.cpp:473
-#: ../src/common/fontcmn.cpp:537
+#: ../src/common/fontcmn.cpp:473 ../src/common/fontcmn.cpp:537
 msgid "italic"
 msgstr "d�lt"
 
@@ -3850,8 +3811,7 @@ msgstr "harmadik"
 msgid "thirteenth"
 msgstr "tizenharmadik"
 
-#: ../src/common/imagtiff.cpp:143
-#: ../src/common/imagtiff.cpp:151
+#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
 #, c-format
 msgid "tiff module: %s"
 msgstr "tiff modul: %s"
@@ -3894,8 +3854,7 @@ msgstr "ismeretlen"
 msgid "unknown class %s"
 msgstr "ismeretlen oszt�ly: %s"
 
-#: ../src/common/regex.cpp:151
-#: ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:151 ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr "ismeretlen hiba"
 
@@ -3908,8 +3867,7 @@ msgstr "ismeretlen hiba (hiba k
 msgid "unknown line terminator"
 msgstr "ismeretlen sorhat�rol�"
 
-#: ../src/common/file.cpp:474
-#: ../src/common/file.cpp:501
+#: ../src/common/file.cpp:474 ../src/common/file.cpp:501
 msgid "unknown seek origin"
 msgstr "ismeretlen keres�si kezd�pont"
 
@@ -3948,8 +3906,7 @@ msgstr "ki
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay hib�t eredm�nyezett."
 
-#: ../src/common/socket.cpp:395
-#: ../src/common/socket.cpp:449
+#: ../src/common/socket.cpp:395 ../src/common/socket.cpp:449
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: �rv�nytelen al��r�s  ReadMsg-ben."
 
@@ -3970,8 +3927,7 @@ msgstr "A wxWindows nem tudott k
 msgid "yesterday"
 msgstr "tegnap"
 
-#: ../src/common/zstream.cpp:141
-#: ../src/common/zstream.cpp:275
+#: ../src/common/zstream.cpp:141 ../src/common/zstream.cpp:275
 #, c-format
 msgid "zlib error %d"
 msgstr "zlib hiba %d"
@@ -3979,4 +3935,3 @@ msgstr "zlib hiba %d"
 #: ../src/common/prntbase.cpp:450
 msgid "|<<"
 msgstr "|<<"
-
diff --git a/locale/it.po b/locale/it.po
index 5c7342ec0b..66844bf964 100644
--- a/locale/it.po
+++ b/locale/it.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWindows-2.5.1\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-04 18:56+0100\n"
 "PO-Revision-Date: 2004-05-03 23:09+0100\n"
 "Last-Translator: Marco Cavallini <wx@koansoftware.com>\n"
@@ -42,10 +43,8 @@ msgstr "Busta #14, 5 x 11 1/2 in"
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "Busta #9, 3 7/8 x 8 7/8 in"
 
-#: ../src/html/helpfrm.cpp:867
-#: ../src/html/helpfrm.cpp:868
-#: ../src/html/helpfrm.cpp:1505
-#: ../src/html/helpfrm.cpp:1535
+#: ../src/html/helpfrm.cpp:867 ../src/html/helpfrm.cpp:868
+#: ../src/html/helpfrm.cpp:1505 ../src/html/helpfrm.cpp:1535
 #, c-format
 msgid "%i of %i"
 msgstr "%i di %i"
@@ -88,8 +87,7 @@ msgstr "&Informazioni su..."
 msgid "&Arrange Icons"
 msgstr "&Disponi icone"
 
-#: ../src/generic/fdrepdlg.cpp:164
-#: ../src/generic/wizard.cpp:401
+#: ../src/generic/fdrepdlg.cpp:164 ../src/generic/wizard.cpp:401
 msgid "&Cancel"
 msgstr "&Annulla"
 
@@ -97,10 +95,8 @@ msgstr "&Annulla"
 msgid "&Cascade"
 msgstr "&Sovrapponi finestre"
 
-#: ../src/common/prntbase.cpp:439
-#: ../src/generic/logg.cpp:502
-#: ../src/generic/tipdlg.cpp:213
-#: ../src/html/helpfrm.cpp:271
+#: ../src/common/prntbase.cpp:439 ../src/generic/logg.cpp:502
+#: ../src/generic/tipdlg.cpp:213 ../src/html/helpfrm.cpp:271
 msgid "&Close"
 msgstr "&Chiudi"
 
@@ -140,13 +136,11 @@ msgstr "&Registro"
 msgid "&Move"
 msgstr "&Sposta"
 
-#: ../src/generic/mdig.cpp:117
-#: ../src/msw/mdi.cpp:192
+#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:192
 msgid "&Next"
 msgstr "&Successivo"
 
-#: ../src/generic/wizard.cpp:400
-#: ../src/generic/wizard.cpp:582
+#: ../src/generic/wizard.cpp:400 ../src/generic/wizard.cpp:582
 msgid "&Next >"
 msgstr "&Successivo >"
 
@@ -162,8 +156,7 @@ msgstr "&Apri..."
 msgid "&Paste"
 msgstr "Incoll&a"
 
-#: ../src/generic/mdig.cpp:118
-#: ../src/msw/mdi.cpp:193
+#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:193
 msgid "&Previous"
 msgstr "&Precedente"
 
@@ -171,14 +164,12 @@ msgstr "&Precedente"
 msgid "&Print..."
 msgstr "&Stampa..."
 
-#: ../src/common/cmdproc.cpp:285
-#: ../src/common/cmdproc.cpp:292
+#: ../src/common/cmdproc.cpp:285 ../src/common/cmdproc.cpp:292
 #: ../src/msw/textctrl.cpp:2048
 msgid "&Redo"
 msgstr "&Ripeti"
 
-#: ../src/common/cmdproc.cpp:281
-#: ../src/common/cmdproc.cpp:301
+#: ../src/common/cmdproc.cpp:281 ../src/common/cmdproc.cpp:301
 msgid "&Redo "
 msgstr "&Ripeti "
 
@@ -190,8 +181,7 @@ msgstr "&Sostituisci"
 msgid "&Restore"
 msgstr "&Ripristina"
 
-#: ../src/generic/logg.cpp:498
-#: ../src/generic/logg.cpp:827
+#: ../src/generic/logg.cpp:498 ../src/generic/logg.cpp:827
 msgid "&Save..."
 msgstr "&Salva..."
 
@@ -203,8 +193,7 @@ msgstr "&Mostra suggerimenti all'avvio"
 msgid "&Size"
 msgstr "&Ridimensiona"
 
-#: ../src/common/cmdproc.cpp:263
-#: ../src/msw/textctrl.cpp:2047
+#: ../src/common/cmdproc.cpp:263 ../src/msw/textctrl.cpp:2047
 msgid "&Undo"
 msgstr "&Annulla"
 
@@ -212,23 +201,18 @@ msgstr "&Annulla"
 msgid "&Undo "
 msgstr "&Annulla "
 
-#: ../src/generic/mdig.cpp:297
-#: ../src/generic/mdig.cpp:313
-#: ../src/generic/mdig.cpp:317
-#: ../src/msw/mdi.cpp:1333
-#: ../src/msw/mdi.cpp:1340
+#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
+#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1333 ../src/msw/mdi.cpp:1340
 #: ../src/msw/mdi.cpp:1370
 msgid "&Window"
 msgstr "&Finestra"
 
-#: ../src/common/config.cpp:414
-#: ../src/msw/regconf.cpp:265
+#: ../src/common/config.cpp:414 ../src/msw/regconf.cpp:265
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' ha troppi '..', ignorati."
 
-#: ../src/common/valtext.cpp:136
-#: ../src/common/valtext.cpp:166
+#: ../src/common/valtext.cpp:136 ../src/common/valtext.cpp:166
 #: ../src/common/valtext.cpp:172
 #, c-format
 msgid "'%s' is invalid"
@@ -273,19 +257,16 @@ msgstr "'%s' deve contenere unicamente caratteri alfabetici o numerici."
 msgid "(Help)"
 msgstr "(Aiuto)"
 
-#: ../src/html/helpfrm.cpp:345
-#: ../src/html/helpfrm.cpp:935
+#: ../src/html/helpfrm.cpp:345 ../src/html/helpfrm.cpp:935
 #: ../src/html/helpfrm.cpp:1563
 msgid "(bookmarks)"
 msgstr "(segnalibri)"
 
-#: ../src/generic/dirctrlg.cpp:677
-#: ../src/generic/filedlgg.cpp:707
+#: ../src/generic/dirctrlg.cpp:677 ../src/generic/filedlgg.cpp:707
 msgid "."
 msgstr "."
 
-#: ../src/generic/dirctrlg.cpp:678
-#: ../src/generic/filedlgg.cpp:708
+#: ../src/generic/dirctrlg.cpp:678 ../src/generic/filedlgg.cpp:708
 msgid ".."
 msgstr ".."
 
@@ -325,18 +306,15 @@ msgstr "< &Precedente"
 msgid "<<"
 msgstr "<<"
 
-#: ../src/generic/filedlgg.cpp:248
-#: ../src/generic/filedlgg.cpp:271
+#: ../src/generic/filedlgg.cpp:248 ../src/generic/filedlgg.cpp:271
 msgid "<DIR>"
 msgstr "<DIR>"
 
-#: ../src/generic/filedlgg.cpp:252
-#: ../src/generic/filedlgg.cpp:275
+#: ../src/generic/filedlgg.cpp:252 ../src/generic/filedlgg.cpp:275
 msgid "<DRIVE>"
 msgstr "<DRIVE>"
 
-#: ../src/generic/filedlgg.cpp:250
-#: ../src/generic/filedlgg.cpp:273
+#: ../src/generic/filedlgg.cpp:250 ../src/generic/filedlgg.cpp:273
 msgid "<LINK>"
 msgstr "<LINK>"
 
@@ -470,8 +448,7 @@ msgstr "Foglio B5, 182 x 257 millimeter"
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "Busta B6, 176 x 125 mm"
 
-#: ../src/common/imagbmp.cpp:470
-#: ../src/common/imagbmp.cpp:486
+#: ../src/common/imagbmp.cpp:470 ../src/common/imagbmp.cpp:486
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: Impossibile allocare la memoria."
 
@@ -547,8 +524,7 @@ msgstr "Busta C6, 114 x 162 mm"
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "Busta C65, 114 x 229 mm"
 
-#: ../src/html/chm.cpp:783
-#: ../src/html/chm.cpp:842
+#: ../src/html/chm.cpp:783 ../src/html/chm.cpp:842
 msgid "CHM handler currently supports only local files!"
 msgstr "Il gestore di file CHM supporta unicamente file locali!"
 
@@ -561,8 +537,7 @@ msgstr "Impossibile creare mutex"
 msgid "Can not enumerate files '%s'"
 msgstr "Impossibile elencare i file '%s'"
 
-#: ../src/msw/dir.cpp:300
-#: ../src/unix/dir.cpp:232
+#: ../src/msw/dir.cpp:300 ../src/unix/dir.cpp:232
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "Impossibile elencare i file nella cartella '%s'"
@@ -572,8 +547,7 @@ msgstr "Impossibile elencare i file nella cartella '%s'"
 msgid "Can not resume thread %lu"
 msgstr "Impossibile riprendere il thread %lu"
 
-#: ../src/mac/thread.cpp:477
-#: ../src/msw/thread.cpp:821
+#: ../src/mac/thread.cpp:477 ../src/msw/thread.cpp:821
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "Impossibile riprendere il thread %x"
@@ -587,8 +561,7 @@ msgstr "Impossibile avviare il thread: errore nella scrittura del TLS."
 msgid "Can not suspend thread %lu"
 msgstr "Impossibile sospendere il thread %lu"
 
-#: ../src/mac/thread.cpp:453
-#: ../src/msw/thread.cpp:806
+#: ../src/mac/thread.cpp:453 ../src/msw/thread.cpp:806
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "Impossibile sospendere il thread %x"
@@ -604,7 +577,8 @@ msgstr "&Annulla impossibile "
 #: ../src/common/image.cpp:1441
 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
-msgstr "Impossibile verificare il formato del file immagine '%s': file non esistente."
+msgstr ""
+"Impossibile verificare il formato del file immagine '%s': file non esistente."
 
 #: ../src/msw/registry.cpp:447
 #, c-format
@@ -618,15 +592,15 @@ msgstr "Impossibile copiare valori del tipo non supportato %d."
 
 #: ../src/msw/listctrl.cpp:413
 msgid "Can't create list control window, check that comctl32.dll is installed."
-msgstr "Impossibile creare list control, controllare che comctl32.dll sia installata."
+msgstr ""
+"Impossibile creare list control, controllare che comctl32.dll sia installata."
 
 #: ../src/msw/registry.cpp:428
 #, c-format
 msgid "Can't create registry key '%s'"
 msgstr "Impossibile creare la chiave '%s' del registro di sistema"
 
-#: ../src/mac/thread.cpp:430
-#: ../src/msw/thread.cpp:593
+#: ../src/mac/thread.cpp:430 ../src/msw/thread.cpp:593
 #: ../src/os2/thread.cpp:491
 msgid "Can't create thread"
 msgstr "Impossibile creare il thread"
@@ -641,8 +615,7 @@ msgstr "impossibile creare una finestra di classe '%s'"
 msgid "Can't delete key '%s'"
 msgstr "Impossibile eliminare la chiave '%s'"
 
-#: ../src/msw/iniconf.cpp:444
-#: ../src/os2/iniconf.cpp:448
+#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "Impossibile eliminare il file INI '%s'"
@@ -675,7 +648,8 @@ msgstr "Impossibile determinare la posizione corrente del file '%s'"
 #: ../src/msw/registry.cpp:359
 #, c-format
 msgid "Can't get info about registry key '%s'"
-msgstr "Impossibile ottenere informazioni sulla chiave '%s' del registro di sistema"
+msgstr ""
+"Impossibile ottenere informazioni sulla chiave '%s' del registro di sistema"
 
 #: ../src/common/zstream.cpp:197
 msgid "Can't initialize zlib deflate stream."
@@ -685,8 +659,7 @@ msgstr "Impossibile inizializzare il flusso zlib di decompressione."
 msgid "Can't initialize zlib inflate stream."
 msgstr "Impossibile inizializzare il flusso di compressione zlib."
 
-#: ../src/common/image.cpp:1028
-#: ../src/common/image.cpp:1048
+#: ../src/common/image.cpp:1028 ../src/common/image.cpp:1048
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
 msgstr "Impossibile caricare l'immagine dal file '%s': file non esistente."
@@ -698,24 +671,21 @@ msgstr "Impossibile aprire la chiave '%s' del registro di sistema"
 
 #: ../src/common/zstream.cpp:142
 #, c-format
-msgid ""
-"Can't read from inflate stream: %s\n"
-""
-msgstr ""
-"Impossibile leggere dal flusso di decompressione: %s\n"
-""
+msgid "Can't read from inflate stream: %s\n"
+msgstr "Impossibile leggere dal flusso di decompressione: %s\n"
 
 #: ../src/common/zstream.cpp:121
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
-msgstr "Impossibile leggere il flusso di decompressione: fine del file inattesa nel flusso di ingresso."
+msgstr ""
+"Impossibile leggere il flusso di decompressione: fine del file inattesa nel "
+"flusso di ingresso."
 
 #: ../src/msw/registry.cpp:930
 #, c-format
 msgid "Can't read value of '%s'"
 msgstr "Impossibile leggere il valore di '%s'"
 
-#: ../src/msw/registry.cpp:808
-#: ../src/msw/registry.cpp:842
+#: ../src/msw/registry.cpp:808 ../src/msw/registry.cpp:842
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr "Impossibile leggere il valore della chiave '%s'"
@@ -725,49 +695,38 @@ msgstr "Impossibile leggere il valore della chiave '%s'"
 msgid "Can't save image to file '%s': unknown extension."
 msgstr "Impossibile salvare l'immagine nel file '%s': estensione sconosciuta."
 
-#: ../src/generic/logg.cpp:562
-#: ../src/generic/logg.cpp:994
+#: ../src/generic/logg.cpp:562 ../src/generic/logg.cpp:994
 msgid "Can't save log contents to file."
 msgstr "Impossibile salvare il contenuto del registro su file."
 
-#: ../src/msw/thread.cpp:549
-#: ../src/os2/thread.cpp:473
+#: ../src/msw/thread.cpp:549 ../src/os2/thread.cpp:473
 msgid "Can't set thread priority"
 msgstr "Impossibile impostare la priorit� del thread"
 
-#: ../src/msw/registry.cpp:829
-#: ../src/msw/registry.cpp:954
+#: ../src/msw/registry.cpp:829 ../src/msw/registry.cpp:954
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr "Impossibile impostare il valore di '%s'"
 
 #: ../src/common/zstream.cpp:276
 #, c-format
-msgid ""
-"Can't write to deflate stream: %s\n"
-""
-msgstr ""
-"Impossibile scrivere new flusso di compressione: %s\n"
-""
+msgid "Can't write to deflate stream: %s\n"
+msgstr "Impossibile scrivere new flusso di compressione: %s\n"
 
-#: ../src/common/dlgcmn.cpp:240
-#: ../src/generic/dirdlgg.cpp:155
-#: ../src/generic/filedlgg.cpp:977
-#: ../src/generic/filedlgg.cpp:996
-#: ../src/generic/fontdlgg.cpp:255
-#: ../src/generic/prntdlgg.cpp:455
-#: ../src/generic/progdlgg.cpp:211
-#: ../src/gtk/filedlg.cpp:168
-#: ../src/gtk/fontdlg.cpp:147
-#: ../src/html/helpfrm.cpp:1066
+#: ../src/common/dlgcmn.cpp:240 ../src/generic/dirdlgg.cpp:155
+#: ../src/generic/filedlgg.cpp:977 ../src/generic/filedlgg.cpp:996
+#: ../src/generic/fontdlgg.cpp:255 ../src/generic/prntdlgg.cpp:455
+#: ../src/generic/progdlgg.cpp:211 ../src/gtk/filedlg.cpp:168
+#: ../src/gtk/fontdlg.cpp:147 ../src/html/helpfrm.cpp:1066
 #: ../src/motif/msgdlg.cpp:182
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../contrib/src/xrc/xmlres.cpp:987
-#: ../contrib/src/xrc/xmlres.cpp:1028
+#: ../contrib/src/xrc/xmlres.cpp:987 ../contrib/src/xrc/xmlres.cpp:1028
 msgid "Cannot convert dialog units: dialog unknown."
-msgstr "Impossibile convertire le unit� di misura del riquadro di dialogo: riguadro di dialogo sconosciuto."
+msgstr ""
+"Impossibile convertire le unit� di misura del riquadro di dialogo: riguadro "
+"di dialogo sconosciuto."
 
 #: ../src/common/strconv.cpp:1567
 #, c-format
@@ -796,7 +755,9 @@ msgstr "Impossibile trovare il file degli indirizzi"
 #: ../src/unix/threadpsx.cpp:1100
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
-msgstr "Impossibile ottenere un intervallo di priorit� per la strategia di scheduling %d."
+msgstr ""
+"Impossibile ottenere un intervallo di priorit� per la strategia di "
+"scheduling %d."
 
 #: ../src/unix/utilsunx.cpp:724
 msgid "Cannot get the hostname"
@@ -810,8 +771,7 @@ msgstr "Impossibile ottenere il nome ufficiale dell'host"
 msgid "Cannot hang up - no active dialup connection."
 msgstr "Impossibile disconnettersi - nessuna connessione attiva."
 
-#: ../src/msw/app.cpp:290
-#: ../src/msw/app.cpp:293
+#: ../src/msw/app.cpp:290 ../src/msw/app.cpp:293
 msgid "Cannot initialize OLE"
 msgstr "Impossibile inizializzare OLE"
 
@@ -886,8 +846,7 @@ msgstr "Formato scorretto nella specifica di dimensione '%s'."
 msgid "Cannot print empty page."
 msgstr "Impossibile stampare una pagina vuota."
 
-#: ../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 "Impossibile leggere l'identificatore di tipo da '%s'!"
@@ -957,8 +916,7 @@ msgstr "Computer"
 msgid "Config entry name cannot start with '%c'."
 msgstr "Il nome di una voce di configurazione non pu� iniziare con '%c'."
 
-#: ../src/generic/filedlgg.cpp:1214
-#: ../src/gtk/filedlg.cpp:74
+#: ../src/generic/filedlgg.cpp:1214 ../src/gtk/filedlg.cpp:74
 msgid "Confirm"
 msgstr "Conferma"
 
@@ -1016,8 +974,7 @@ msgstr "Impossibile trovare il file '%s'."
 msgid "Could not start document preview."
 msgstr "Impossibile mostrare l'anteprima del documento."
 
-#: ../src/generic/printps.cpp:221
-#: ../src/msw/printwin.cpp:245
+#: ../src/generic/printps.cpp:221 ../src/msw/printwin.cpp:245
 msgid "Could not start printing."
 msgstr "Impossibile avviare la stampa."
 
@@ -1029,21 +986,17 @@ msgstr "Impossibile trasferire i dati verso la finestra"
 msgid "Couldn't acquire a mutex lock"
 msgstr "Impossibile acquisire il lock del mutex"
 
-#: ../src/msw/dragimag.cpp:166
-#: ../src/msw/dragimag.cpp:206
-#: ../src/msw/imaglist.cpp:156
-#: ../src/msw/imaglist.cpp:174
+#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
+#: ../src/msw/imaglist.cpp:156 ../src/msw/imaglist.cpp:174
 #: ../src/msw/imaglist.cpp:186
 msgid "Couldn't add an image to the image list."
 msgstr "Impossibile aggiungere un'immagine alla lista."
 
-#: ../src/msw/timer.cpp:101
-#: ../src/os2/timer.cpp:118
+#: ../src/msw/timer.cpp:101 ../src/os2/timer.cpp:118
 msgid "Couldn't create a timer"
 msgstr "Impossibile creare un 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 "Impossibile creare un cursore."
 
@@ -1052,14 +1005,15 @@ msgstr "Impossibile creare un cursore."
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "Impossibile trovare il simbolo '%s' nella libreria dinamica"
 
-#: ../src/mac/thread.cpp:507
-#: ../src/msw/thread.cpp:847
+#: ../src/mac/thread.cpp:507 ../src/msw/thread.cpp:847
 msgid "Couldn't get the current thread pointer"
 msgstr "Impossibile ottenere un puntatore al thread corrente"
 
 #: ../src/common/imagpng.cpp:607
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
-msgstr "Impossibile caricare un'immagine PNG - file danneggiato o memoria insufficiente."
+msgstr ""
+"Impossibile caricare un'immagine PNG - file danneggiato o memoria "
+"insufficiente."
 
 #: ../src/unix/sound.cpp:412
 #, c-format
@@ -1085,14 +1039,12 @@ msgstr "Impossibile rilasciare un mutex"
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "Impossibile ottenere informazioni sull'elemento %d del list control."
 
-#: ../src/common/imagpng.cpp:647
-#: ../src/common/imagpng.cpp:658
+#: ../src/common/imagpng.cpp:647 ../src/common/imagpng.cpp:658
 #: ../src/common/imagpng.cpp:666
 msgid "Couldn't save PNG image."
 msgstr "Impossibile salvare l'immagine PNG."
 
-#: ../src/mac/thread.cpp:756
-#: ../src/msw/thread.cpp:610
+#: ../src/mac/thread.cpp:756 ../src/msw/thread.cpp:610
 msgid "Couldn't terminate thread"
 msgstr "Impossibile terminare il thread"
 
@@ -1104,8 +1056,7 @@ msgstr "Create Parameter non trovato in declared RTTI Parameters"
 msgid "Create directory"
 msgstr "Crea cartella"
 
-#: ../src/generic/dirdlgg.cpp:105
-#: ../src/generic/filedlgg.cpp:931
+#: ../src/generic/dirdlgg.cpp:105 ../src/generic/filedlgg.cpp:931
 msgid "Create new directory"
 msgstr "Crea una nuova cartella"
 
@@ -1131,7 +1082,8 @@ msgstr "Richiesta DDE (poke) fallita"
 
 #: ../src/common/imagbmp.cpp:914
 msgid "DIB Header: Encoding doesn't match bitdepth."
-msgstr "Intestazione DIB: La codifica non corrisponde al numero di bit per pixel."
+msgstr ""
+"Intestazione DIB: La codifica non corrisponde al numero di bit per pixel."
 
 #: ../src/common/imagbmp.cpp:876
 msgid "DIB Header: Image height > 32767 pixels for file."
@@ -1139,7 +1091,8 @@ msgstr "Intestazione DIB: L'altezza dell'immagine nel file 
 
 #: ../src/common/imagbmp.cpp:870
 msgid "DIB Header: Image width > 32767 pixels for file."
-msgstr "Intestazione DIB: La larghezza dell'immagine nel file � > di 32767 pixel."
+msgstr ""
+"Intestazione DIB: La larghezza dell'immagine nel file � > di 32767 pixel."
 
 #: ../src/common/imagbmp.cpp:890
 msgid "DIB Header: Unknown bitdepth in file."
@@ -1171,8 +1124,13 @@ msgid "Deleted stale lock file '%s'."
 msgstr "Eliminato file di lock obsoleto '%s'"
 
 #: ../src/msw/dialup.cpp:346
-msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."
-msgstr "Funzionalit� di composizione telefonica non disponibili perch� il servizio di Accesso Remoto (RAS) non � installato su questo computer. Si prega di installarlo."
+msgid ""
+"Dial up functions are unavailable because the remote access service (RAS) is "
+"not installed on this machine. Please install it."
+msgstr ""
+"Funzionalit� di composizione telefonica non disponibili perch� il servizio "
+"di Accesso Remoto (RAS) non � installato su questo computer. Si prega di "
+"installarlo."
 
 #: ../src/generic/tipdlg.cpp:220
 msgid "Did you know..."
@@ -1197,8 +1155,12 @@ msgid "Directory doesn't exist."
 msgstr "Cartella non esistente."
 
 #: ../src/html/helpfrm.cpp:409
-msgid "Display all index items that contain given substring. Search is case insensitive."
-msgstr "Visualizza tutte le voci dell'indice contenenti un dato testo. La ricerca non distingue maiuscole e minuscole."
+msgid ""
+"Display all index items that contain given substring. Search is case "
+"insensitive."
+msgstr ""
+"Visualizza tutte le voci dell'indice contenenti un dato testo. La ricerca "
+"non distingue maiuscole e minuscole."
 
 #: ../src/html/helpfrm.cpp:583
 msgid "Display options dialog"
@@ -1206,13 +1168,15 @@ msgstr "Mostra riquadro di dialogo per le opzioni"
 
 #: ../src/msw/mimetype.cpp:672
 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"
 "%s %1"
 msgstr ""
-"Si desidera modificare il comando utilizzato per %s i file con estensione \"%s\"?\n"
+"Si desidera modificare il comando utilizzato per %s i file con estensione \"%"
+"s\"?\n"
 "Il valore corrente � \n"
 "%s, \n"
 "Il nuovo valore � \n"
@@ -1263,27 +1227,23 @@ msgstr "Trovati"
 
 #: ../src/common/config.cpp:366
 #, c-format
-msgid "Environment variables expansion failed: missing '%c' at position %d in '%s'."
-msgstr "Espansione delle variabili di ambienete fallita: carattere '%c' non trovato alla posizione %d in '%s'."
+msgid ""
+"Environment variables expansion failed: missing '%c' at position %d in '%s'."
+msgstr ""
+"Espansione delle variabili di ambienete fallita: carattere '%c' non trovato "
+"alla posizione %d in '%s'."
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:711
-#: ../src/generic/filedlgg.cpp:725
-#: ../src/generic/filedlgg.cpp:739
-#: ../src/generic/filedlgg.cpp:1166
-#: ../src/generic/filedlgg.cpp:1191
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/dirctrlg.cpp:701
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:711
+#: ../src/generic/filedlgg.cpp:725 ../src/generic/filedlgg.cpp:739
+#: ../src/generic/filedlgg.cpp:1166 ../src/generic/filedlgg.cpp:1191
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 #: ../src/gtk/fontdlg.cpp:76
 msgid "Error"
 msgstr "Errore"
 
-#: ../src/unix/utilsunx.cpp:1030
-#: ../src/unix/utilsunx.cpp:1038
+#: ../src/unix/utilsunx.cpp:1030 ../src/unix/utilsunx.cpp:1038
 msgid "Error "
 msgstr "Errore "
 
@@ -1381,7 +1341,9 @@ msgstr "Impossibile copiare il valore '%s' del registro di sistema"
 #: ../src/msw/registry.cpp:632
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
-msgstr "Impossibile copiare il contenuto della chiave '%s' del registro di sistema in '%s'."
+msgstr ""
+"Impossibile copiare il contenuto della chiave '%s' del registro di sistema "
+"in '%s'."
 
 #: ../src/common/filefn.cpp:1192
 #, c-format
@@ -1444,15 +1406,16 @@ msgstr "Impossibile creare la voce del registro di sistema per i file '%s'."
 #: ../src/msw/fdrepdlg.cpp:480
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
-msgstr "Impossibile creare riquadro di ricerca/sostituzione standard (codice di errore %d)"
+msgstr ""
+"Impossibile creare riquadro di ricerca/sostituzione standard (codice di "
+"errore %d)"
 
 #: ../src/html/winpars.cpp:495
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "Impossibile mostrare la pagina HTML con la codifica %s"
 
-#: ../src/mac/clipbrd.cpp:185
-#: ../src/msw/clipbrd.cpp:134
+#: ../src/mac/clipbrd.cpp:185 ../src/msw/clipbrd.cpp:134
 msgid "Failed to empty the clipboard."
 msgstr "Impossibile eliminare il contenuto degli appunti."
 
@@ -1469,15 +1432,10 @@ msgstr "Impossibile stabilire un ciclo advise con il server DDE"
 msgid "Failed to establish dialup connection: %s"
 msgstr "Impossibile connettersi: %s"
 
-#: ../src/unix/utilsunx.cpp:459
-#: ../src/unix/utilsunx.cpp:475
+#: ../src/unix/utilsunx.cpp:459 ../src/unix/utilsunx.cpp:475
 #, c-format
-msgid ""
-"Failed to execute '%s'\n"
-""
-msgstr ""
-"Impossibile eseguire '%s'\n"
-""
+msgid "Failed to execute '%s'\n"
+msgstr "Impossibile eseguire '%s'\n"
 
 #: ../src/msw/dialup.cpp:678
 #, c-format
@@ -1506,7 +1464,9 @@ msgstr "Impossibile determinare la cartella di lavoro"
 
 #: ../src/univ/theme.cpp:122
 msgid "Failed to initialize GUI: no built-in themes found."
-msgstr "Impossibile inizializzare l'interfaccia grafica (GUI): temi predefiniti non trovati."
+msgstr ""
+"Impossibile inizializzare l'interfaccia grafica (GUI): temi predefiniti non "
+"trovati."
 
 #: ../src/msw/helpchm.cpp:69
 msgid "Failed to initialize MS HTML Help."
@@ -1517,8 +1477,12 @@ msgid "Failed to initialize OpenGL"
 msgstr "Impossibile inizializzare OpenGL"
 
 #: ../src/unix/threadpsx.cpp:896
-msgid "Failed to join a thread, potential memory leak detected - please restart the program"
-msgstr "Impossibile esegure la join su di un thread, possibile memoria persa (leak) - per favore lanciare nuovamente il programma"
+msgid ""
+"Failed to join a thread, potential memory leak detected - please restart the "
+"program"
+msgstr ""
+"Impossibile esegure la join su di un thread, possibile memoria persa (leak) "
+"- per favore lanciare nuovamente il programma"
 
 #: ../src/msw/utils.cpp:723
 #, c-format
@@ -1552,7 +1516,9 @@ msgstr "Impossibile bloccare il file di lock '%s'"
 #: ../src/common/regex.cpp:263
 #, c-format
 msgid "Failed to match '%s' in regular expression: %s"
-msgstr "Impossibile mettere in corrispondenza '%s' nell'espressione regolare ( regular expression ): %s"
+msgstr ""
+"Impossibile mettere in corrispondenza '%s' nell'espressione regolare "
+"( regular expression ): %s"
 
 #: ../src/common/filename.cpp:1848
 #, c-format
@@ -1634,7 +1600,8 @@ msgstr "Impossibile ottenere le date del file '%s'"
 
 #: ../src/msw/dialup.cpp:442
 msgid "Failed to retrieve text of RAS error message"
-msgstr "Impossibile ottenere il testo del messaggio di errore di Accesso Remoto (RAS)"
+msgstr ""
+"Impossibile ottenere il testo del messaggio di errore di Accesso Remoto (RAS)"
 
 #: ../src/msw/clipbrd.cpp:750
 msgid "Failed to retrieve the supported clipboard formats"
@@ -1662,8 +1629,7 @@ msgstr "Impossibile scrivere i dati degli appunti."
 msgid "Failed to set temporary file permissions"
 msgstr "Impossibile impostare i permessi del file temporaneo."
 
-#: ../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 "Impossibile assegnare la priorit� %d al thread."
@@ -1723,8 +1689,7 @@ msgstr "File"
 msgid "File %s does not exist."
 msgstr "Il file %s non esiste."
 
-#: ../src/generic/filedlgg.cpp:1212
-#: ../src/gtk/filedlg.cpp:71
+#: ../src/generic/filedlgg.cpp:1212 ../src/gtk/filedlg.cpp:71
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "File '%s' esistente, si desidera sovrascriverlo?"
@@ -1742,19 +1707,16 @@ msgstr ""
 msgid "File couldn't be loaded."
 msgstr "Impossibile caricare il file."
 
-#: ../src/common/docview.cpp:316
-#: ../src/common/docview.cpp:357
+#: ../src/common/docview.cpp:316 ../src/common/docview.cpp:357
 #: ../src/common/docview.cpp:1502
 msgid "File error"
 msgstr "Errore di file"
 
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/filedlgg.cpp:725
+#: ../src/generic/dirctrlg.cpp:701 ../src/generic/filedlgg.cpp:725
 msgid "File name exists already."
 msgstr "Nome di file esistente."
 
-#: ../src/common/fldlgcmn.cpp:62
-#: ../src/msw/filedlg.cpp:250
+#: ../src/common/fldlgcmn.cpp:62 ../src/msw/filedlg.cpp:250
 #, c-format
 msgid "Files (%s)|%s"
 msgstr "File (%s)|%s"
@@ -1860,8 +1822,7 @@ msgstr "Avanti"
 msgid "Go one level up in document hierarchy"
 msgstr "Livello superiore nella gerarchia di documenti"
 
-#: ../src/generic/dirdlgg.cpp:110
-#: ../src/generic/filedlgg.cpp:921
+#: ../src/generic/dirdlgg.cpp:110 ../src/generic/filedlgg.cpp:921
 msgid "Go to home directory"
 msgstr "Vai alla Home directory"
 
@@ -1894,10 +1855,8 @@ msgstr "File HTML (*.html;*.htm)|*.html;*.htm|"
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Ebraico (ISO-8859-8)"
 
-#: ../src/common/dlgcmn.cpp:236
-#: ../src/generic/mdig.cpp:310
-#: ../src/html/helpfrm.cpp:254
-#: ../src/html/helpfrm.cpp:277
+#: ../src/common/dlgcmn.cpp:236 ../src/generic/mdig.cpp:310
+#: ../src/html/helpfrm.cpp:254 ../src/html/helpfrm.cpp:277
 #: ../src/msw/mdi.cpp:1329
 msgid "Help"
 msgstr "Aiuto"
@@ -1906,8 +1865,7 @@ msgstr "Aiuto"
 msgid "Help Browser Options"
 msgstr "Opzioni del browser della Guida"
 
-#: ../src/generic/helpext.cpp:441
-#: ../src/generic/helpext.cpp:442
+#: ../src/generic/helpext.cpp:441 ../src/generic/helpext.cpp:442
 msgid "Help Index"
 msgstr "Indice"
 
@@ -1928,12 +1886,9 @@ msgstr "Aiuto: %s"
 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: Errore durante la lettura della maschera DIB."
 
-#: ../src/common/imagbmp.cpp:1042
-#: ../src/common/imagbmp.cpp:1101
-#: ../src/common/imagbmp.cpp:1110
-#: ../src/common/imagbmp.cpp:1121
-#: ../src/common/imagbmp.cpp:1165
-#: ../src/common/imagbmp.cpp:1175
+#: ../src/common/imagbmp.cpp:1042 ../src/common/imagbmp.cpp:1101
+#: ../src/common/imagbmp.cpp:1110 ../src/common/imagbmp.cpp:1121
+#: ../src/common/imagbmp.cpp:1165 ../src/common/imagbmp.cpp:1175
 #: ../src/common/imagbmp.cpp:1184
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: Errore durante la scrittura dell'immagine."
@@ -1978,8 +1933,7 @@ msgstr "Parameter Count per ConstructObject non consentito"
 msgid "Illegal Parameter Count for Create Method"
 msgstr "Parameter Count per Create Method non consentito"
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/filedlgg.cpp:711
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:711
 msgid "Illegal directory name."
 msgstr "Nome di cartella non valido."
 
@@ -1997,8 +1951,12 @@ msgid "Image file is not of type %d."
 msgstr "Il file immagine non � di tipo %d."
 
 #: ../src/msw/textctrl.cpp:303
-msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"
-msgstr "Impossibile creare un controllo rich edit, impiegato un controllo di tipo testo semplice. Per favore reinstallare riched32.dll"
+msgid ""
+"Impossible to create a rich edit control, using simple text control instead. "
+"Please reinstall riched32.dll"
+msgstr ""
+"Impossibile creare un controllo rich edit, impiegato un controllo di tipo "
+"testo semplice. Per favore reinstallare riched32.dll"
 
 #: ../src/unix/utilsunx.cpp:379
 msgid "Impossible to get child process input"
@@ -2055,8 +2013,7 @@ msgstr "Specifica della posizione e/o dimensioni '%s' non valida."
 msgid "Invalid lock file '%s'."
 msgstr "File di blocco '%s' non valido."
 
-#: ../src/common/xtistrm.cpp:363
-#: ../src/common/xtistrm.cpp:378
+#: ../src/common/xtistrm.cpp:363 ../src/common/xtistrm.cpp:378
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr "ID Oggetto Invalid o Null passato a GetObjectClassInfo"
 
@@ -2089,8 +2046,7 @@ msgstr "JPEG: Impossibile salvare l'immagine."
 msgid "KOI8-R"
 msgstr "KOI8-R"
 
-#: ../src/generic/prntdlgg.cpp:428
-#: ../src/generic/prntdlgg.cpp:638
+#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:638
 msgid "Landscape"
 msgstr "Orizzontale"
 
@@ -2120,7 +2076,8 @@ msgstr "Leggero"
 
 #: ../src/html/chm.cpp:806
 msgid "Link contained '//', converted to absolute link."
-msgstr "Il collegamnto conteneva '//', � stato convertito a un collegamento assoluto."
+msgstr ""
+"Il collegamnto conteneva '//', � stato convertito a un collegamento assoluto."
 
 #: ../src/common/fldlgcmn.cpp:274
 #, c-format
@@ -2133,19 +2090,21 @@ msgstr "Caricamento : "
 
 #: ../src/common/imagpnm.cpp:72
 msgid "Loading Grey Ascii PNM image is not yet implemented."
-msgstr "Caricamento di un'immagine PNM Ascii a toni di grigio non ancora implementato."
+msgstr ""
+"Caricamento di un'immagine PNM Ascii a toni di grigio non ancora "
+"implementato."
 
 #: ../src/common/imagpnm.cpp:75
 msgid "Loading Grey Raw PNM image is not yet implemented."
-msgstr "Caricamento di un'immagine PNM Raw a toni di grigio non ancora implementato."
+msgstr ""
+"Caricamento di un'immagine PNM Raw a toni di grigio non ancora implementato."
 
 #: ../src/generic/logg.cpp:565
 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr "Registro salvato nel file '%s'."
 
-#: ../include/wx/xti.h:469
-#: ../include/wx/xti.h:473
+#: ../include/wx/xti.h:469 ../include/wx/xti.h:473
 msgid "Long Conversions not supported"
 msgstr "Long conversion non supportata"
 
@@ -2154,8 +2113,12 @@ msgid "MDI child"
 msgstr "Figlio MDI"
 
 #: ../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 "Funzionalit� MS HTML Help non disponibili perch� la relativa libreria non � installata su questo computer. Si prega di installarla."
+msgid ""
+"MS HTML Help functions are unavailable because the MS HTML Help library is "
+"not installed on this machine. Please install it."
+msgstr ""
+"Funzionalit� MS HTML Help non disponibili perch� la relativa libreria non � "
+"installata su questo computer. Si prega di installarla."
 
 #: ../src/univ/themes/win32.cpp:4678
 msgid "Ma&ximize"
@@ -2225,10 +2188,8 @@ msgstr "Nome"
 msgid "New item"
 msgstr "Nuova elemento"
 
-#: ../src/generic/dirdlgg.cpp:274
-#: ../src/generic/dirdlgg.cpp:284
-#: ../src/generic/filedlgg.cpp:587
-#: ../src/generic/filedlgg.cpp:596
+#: ../src/generic/dirdlgg.cpp:274 ../src/generic/dirdlgg.cpp:284
+#: ../src/generic/filedlgg.cpp:587 ../src/generic/filedlgg.cpp:596
 msgid "NewName"
 msgstr "NuovoNome"
 
@@ -2236,10 +2197,8 @@ msgstr "NuovoNome"
 msgid "Next page"
 msgstr "Pagina successiva"
 
-#: ../src/common/dlgcmn.cpp:213
-#: ../src/mac/msgdlg.cpp:56
-#: ../src/mac/msgdlg.cpp:140
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:213 ../src/mac/msgdlg.cpp:56
+#: ../src/mac/msgdlg.cpp:140 ../src/motif/msgdlg.cpp:182
 msgid "No"
 msgstr "No"
 
@@ -2256,11 +2215,13 @@ msgstr "Voci non trovate."
 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 ""
 "Impossibile trovare un tipo di carattere per la codifica '%s',\n"
 "ma � disponibile la codifica alternativa '%s'.\n"
-"Si desidera utilizzare tale codifica (altrimenti sar� necessario sceglierne una differente)?"
+"Si desidera utilizzare tale codifica (altrimenti sar� necessario sceglierne "
+"una differente)?"
 
 #: ../src/common/fontmap.cpp:406
 #, c-format
@@ -2278,20 +2239,17 @@ msgstr ""
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr "Impossibile trovare l'handler per il nodo XML '%s', classe '%s'!"
 
-#: ../src/common/image.cpp:1162
-#: ../src/common/image.cpp:1205
+#: ../src/common/image.cpp:1162 ../src/common/image.cpp:1205
 msgid "No handler found for image type."
 msgstr "Funzionalit� non disponibili per questo formato di immagine."
 
-#: ../src/common/image.cpp:1170
-#: ../src/common/image.cpp:1213
+#: ../src/common/image.cpp:1170 ../src/common/image.cpp:1213
 #: ../src/common/image.cpp:1247
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "Funzionalit� non disponibili per il formato di immagine %d."
 
-#: ../src/common/image.cpp:1231
-#: ../src/common/image.cpp:1263
+#: ../src/common/image.cpp:1231 ../src/common/image.cpp:1263
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "Funzionalit� non disponibili per il formato di immagine %s."
@@ -2308,8 +2266,7 @@ msgstr "Nessun suono"
 msgid "Nordic (ISO-8859-10)"
 msgstr "Nordico (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:227
-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/generic/fontdlgg.cpp:227 ../src/generic/fontdlgg.cpp:230
 msgid "Normal"
 msgstr "Normale"
 
@@ -2325,16 +2282,11 @@ msgstr "Carattere normale:"
 msgid "Note, 8 1/2 x 11 in"
 msgstr "Nota, 8 1/2 x 11 in"
 
-#: ../src/common/dlgcmn.cpp:219
-#: ../src/generic/dirdlgg.cpp:153
-#: ../src/generic/filedlgg.cpp:976
-#: ../src/generic/filedlgg.cpp:987
-#: ../src/generic/fontdlgg.cpp:254
-#: ../src/generic/logg.cpp:748
-#: ../src/generic/prntdlgg.cpp:454
-#: ../src/gtk/filedlg.cpp:162
-#: ../src/gtk/fontdlg.cpp:139
-#: ../src/html/helpfrm.cpp:1064
+#: ../src/common/dlgcmn.cpp:219 ../src/generic/dirdlgg.cpp:153
+#: ../src/generic/filedlgg.cpp:976 ../src/generic/filedlgg.cpp:987
+#: ../src/generic/fontdlgg.cpp:254 ../src/generic/logg.cpp:748
+#: ../src/generic/prntdlgg.cpp:454 ../src/gtk/filedlg.cpp:162
+#: ../src/gtk/fontdlg.cpp:139 ../src/html/helpfrm.cpp:1064
 msgid "OK"
 msgstr "OK"
 
@@ -2342,20 +2294,16 @@ msgstr "OK"
 msgid "Objects must have an id attribute"
 msgstr "L'oggetto deve avere un ID ed un attributo"
 
-#: ../src/common/docview.cpp:1197
-#: ../src/common/docview.cpp:1525
+#: ../src/common/docview.cpp:1197 ../src/common/docview.cpp:1525
 msgid "Open File"
 msgstr "Apri file"
 
-#: ../src/html/helpfrm.cpp:571
-#: ../src/html/helpfrm.cpp:1404
+#: ../src/html/helpfrm.cpp:571 ../src/html/helpfrm.cpp:1404
 msgid "Open HTML document"
 msgstr "Apri un documento HTML"
 
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:739
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:739
 msgid "Operation not permitted."
 msgstr "Operazione non permessa."
 
@@ -2378,13 +2326,11 @@ msgstr "Opzione '%s': impossibile convertire '%s' in una data."
 msgid "Options"
 msgstr "Opzioni"
 
-#: ../src/generic/prntdlgg.cpp:430
-#: ../src/generic/prntdlgg.cpp:639
+#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:639
 msgid "Orientation"
 msgstr "Orientamento"
 
-#: ../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: Impossibile allocare la memoria."
 
@@ -2400,8 +2346,7 @@ msgstr "PCX: Immagine non valida."
 msgid "PCX: this is not a PCX file."
 msgstr "PCX: questo non � un file 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: errore sconosciuto!!!"
 
@@ -2439,14 +2384,12 @@ msgstr "Impostazioni della pagina"
 msgid "Pages"
 msgstr "Pagine"
 
-#: ../src/generic/prntdlgg.cpp:545
-#: ../src/generic/prntdlgg.cpp:625
+#: ../src/generic/prntdlgg.cpp:545 ../src/generic/prntdlgg.cpp:625
 #: ../src/generic/prntdlgg.cpp:818
 msgid "Paper Size"
 msgstr "Dimensione del foglio"
 
-#: ../src/generic/prntdlgg.cpp:420
-#: ../src/generic/prntdlgg.cpp:612
+#: ../src/generic/prntdlgg.cpp:420 ../src/generic/prntdlgg.cpp:612
 #: ../src/generic/prntdlgg.cpp:813
 msgid "Paper size"
 msgstr "Dimensione del foglio"
@@ -2459,8 +2402,7 @@ msgstr "Passato un oggetto gi
 msgid "Passing a already registered object to SetObjectName"
 msgstr "Passato un oggetto gi� registrato a SetObjectName"
 
-#: ../src/common/xtistrm.cpp:434
-#: ../src/common/xtistrm.cpp:654
+#: ../src/common/xtistrm.cpp:434 ../src/common/xtistrm.cpp:654
 msgid "Passing an unkown object to GetObject"
 msgstr "Passato un oggetto sconosciuto a GetObject"
 
@@ -2476,8 +2418,7 @@ msgstr "Creazione della pipe fallita"
 msgid "Please choose a valid font."
 msgstr "Per favore scegliere un carattere valido."
 
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 msgid "Please choose an existing file."
 msgstr "Per favore scegliere un file esistente."
 
@@ -2497,15 +2438,10 @@ msgstr ""
 "oppure il programma non funzioner� correttamente"
 
 #: ../src/common/prntbase.cpp:112
-msgid ""
-"Please wait while printing\n"
-""
-msgstr ""
-"Stampa in corso\n"
-""
+msgid "Please wait while printing\n"
+msgstr "Stampa in corso\n"
 
-#: ../src/generic/prntdlgg.cpp:427
-#: ../src/generic/prntdlgg.cpp:637
+#: ../src/generic/prntdlgg.cpp:427 ../src/generic/prntdlgg.cpp:637
 msgid "Portrait"
 msgstr "Verticale"
 
@@ -2521,8 +2457,7 @@ msgstr "Anteprima:"
 msgid "Previous page"
 msgstr "Pagina precedente"
 
-#: ../src/generic/prntdlgg.cpp:107
-#: ../src/generic/prntdlgg.cpp:121
+#: ../src/generic/prntdlgg.cpp:107 ../src/generic/prntdlgg.cpp:121
 msgid "Print"
 msgstr "Stampa"
 
@@ -2530,8 +2465,7 @@ msgstr "Stampa"
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
-#: ../src/common/prntbase.cpp:784
-#: ../src/common/prntbase.cpp:810
+#: ../src/common/prntbase.cpp:784 ../src/common/prntbase.cpp:810
 msgid "Print Preview Failure"
 msgstr "Errore durante l'anteprima di stampa"
 
@@ -2575,8 +2509,7 @@ msgstr "Opzioni stampante:"
 msgid "Printer..."
 msgstr "Stampante..."
 
-#: ../src/common/prntbase.cpp:109
-#: ../src/common/prntbase.cpp:154
+#: ../src/common/prntbase.cpp:109 ../src/common/prntbase.cpp:154
 msgid "Printing "
 msgstr "Stampa in corso"
 
@@ -2605,8 +2538,7 @@ msgstr "Quarto, 215 x 275 mm"
 msgid "Question"
 msgstr "Domanda"
 
-#: ../src/common/ffile.cpp:111
-#: ../src/common/ffile.cpp:132
+#: ../src/common/ffile.cpp:111 ../src/common/ffile.cpp:132
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "Errore di lettura nel file '%s'"
@@ -2624,7 +2556,8 @@ msgstr "Chiave '%s' del registro di sistema gi
 #: ../src/msw/registry.cpp:530
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
-msgstr "Chiave '%s' del registro di sistema non esistente, impossibile rinominarla."
+msgstr ""
+"Chiave '%s' del registro di sistema non esistente, impossibile rinominarla."
 
 #: ../src/msw/registry.cpp:657
 #, c-format
@@ -2633,7 +2566,8 @@ msgid ""
 "deleting it will leave your system in unusable state:\n"
 "operation aborted."
 msgstr ""
-"Chiave '%s' del registro di sistema necessaria per un corretto funzionamento del sistema, la cancellazione renderebbe\n"
+"Chiave '%s' del registro di sistema necessaria per un corretto funzionamento "
+"del sistema, la cancellazione renderebbe\n"
 "il sistema inutilizzabile:\n"
 "operazione abbandonata."
 
@@ -2657,7 +2591,9 @@ msgstr "Rimuovi la pagina corrente dai segnalibri"
 #: ../src/common/rendcmn.cpp:193
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
-msgstr "Il renderer \"%s\" ha versione %d.%d che non � compatibile, quindi non � stato caricato."
+msgstr ""
+"Il renderer \"%s\" ha versione %d.%d che non � compatibile, quindi non � "
+"stato caricato."
 
 #: ../src/generic/fdrepdlg.cpp:171
 msgid "Replace &all"
@@ -2696,14 +2632,16 @@ msgstr "Salva il registro su file"
 msgid "Script"
 msgstr "Script"
 
-#: ../src/html/helpfrm.cpp:443
-#: ../src/html/helpfrm.cpp:458
+#: ../src/html/helpfrm.cpp:443 ../src/html/helpfrm.cpp:458
 msgid "Search"
 msgstr "Cerca"
 
 #: ../src/html/helpfrm.cpp:445
-msgid "Search contents of help book(s) for all occurences of the text you typed above"
-msgstr "Cerca nel sommario del/dei libro/i di aiuto il testo immesso qu� sopra."
+msgid ""
+"Search contents of help book(s) for all occurences of the text you typed "
+"above"
+msgstr ""
+"Cerca nel sommario del/dei libro/i di aiuto il testo immesso qu� sopra."
 
 #: ../src/generic/fdrepdlg.cpp:152
 msgid "Search direction"
@@ -2779,8 +2717,7 @@ msgstr "Visualizza tutti le voci dell'indice"
 msgid "Show hidden directories"
 msgstr "Visualizza le cartelle nascoste"
 
-#: ../src/generic/filedlgg.cpp:971
-#: ../src/generic/filedlgg.cpp:993
+#: ../src/generic/filedlgg.cpp:971 ../src/generic/filedlgg.cpp:993
 msgid "Show hidden files"
 msgstr "Visualizza i file nascosti"
 
@@ -2800,8 +2737,7 @@ msgstr "Slant"
 msgid "Sorry, could not open this file for saving."
 msgstr "Spiacente, impossibile aprire il file per salvare."
 
-#: ../src/common/docview.cpp:367
-#: ../src/common/docview.cpp:380
+#: ../src/common/docview.cpp:367 ../src/common/docview.cpp:380
 #: ../src/common/docview.cpp:1504
 msgid "Sorry, could not open this file."
 msgstr "Spiacente, impossibile aprire il file."
@@ -2818,8 +2754,7 @@ msgstr "Spiacente, memoria insufficente per la creazione di un'anteprima."
 msgid "Sorry, print preview needs a printer to be installed."
 msgstr "Spiacente, l'anteprima di stampa richiede una stampante installata."
 
-#: ../src/common/docview.cpp:1196
-#: ../src/common/docview.cpp:1524
+#: ../src/common/docview.cpp:1196 ../src/common/docview.cpp:1524
 msgid "Sorry, the format for this file is unknown."
 msgstr "Spiacente, formato del file sconosciuto."
 
@@ -2849,22 +2784,21 @@ msgstr "Streaming con oggetti non stream non ancora supportato"
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "Specifica di colore '%s' non valida"
 
-#: ../include/wx/xti.h:396
-#: ../include/wx/xti.h:400
+#: ../include/wx/xti.h:396 ../include/wx/xti.h:400
 msgid "String conversions not supported"
 msgstr "Conversione a stringa non supportata"
 
 #: ../contrib/src/xrc/xmlres.cpp:676
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
-msgstr "Sottoclasse '%s' non trovata per la risorsa '%s', subclassing non eseguito!"
+msgstr ""
+"Sottoclasse '%s' non trovata per la risorsa '%s', subclassing non eseguito!"
 
 #: ../src/generic/fontdlgg.cpp:225
 msgid "Swiss"
 msgstr "Svizzero"
 
-#: ../src/common/imagtiff.cpp:232
-#: ../src/common/imagtiff.cpp:243
+#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
 #: ../src/common/imagtiff.cpp:354
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: Impossibile allocare la memoria."
@@ -2969,24 +2903,41 @@ msgstr "L'opzione '%s' richiede un parametro."
 
 #: ../src/msw/dialup.cpp:406
 #, 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 "La versione del servizio di Accesso Remoto (RAS) installata � troppo vecchia. Si prega di aggiornarla (la funzione %s � assente)."
+msgid ""
+"The version of remote access service (RAS) installed on this machine is "
+"tooold, please upgrade (the following required function is missing: %s)."
+msgstr ""
+"La versione del servizio di Accesso Remoto (RAS) installata � troppo "
+"vecchia. Si prega di aggiornarla (la funzione %s � assente)."
 
 #: ../src/html/htmprint.cpp:580
-msgid "There was a problem during page setup: you may need to set a default printer."
-msgstr "Si � verificato un problema: potrebbe essere necessario impostare una stampante predefinita."
+msgid ""
+"There was a problem during page setup: you may need to set a default printer."
+msgstr ""
+"Si � verificato un problema: potrebbe essere necessario impostare una "
+"stampante predefinita."
 
 #: ../src/msw/thread.cpp:1197
-msgid "Thread module initialization failed: can not store value in thread local storage"
-msgstr "Inizializzazione del modulo dei thread fallita: impossibile memorizzare un valore nella memoria locale del thread"
+msgid ""
+"Thread module initialization failed: can not store value in thread local "
+"storage"
+msgstr ""
+"Inizializzazione del modulo dei thread fallita: impossibile memorizzare un "
+"valore nella memoria locale del thread"
 
 #: ../src/unix/threadpsx.cpp:1600
 msgid "Thread module initialization failed: failed to create thread key"
-msgstr "Inizializzazione del modulo dei thread fallita: errore nella creazione della chiave dei thread"
+msgstr ""
+"Inizializzazione del modulo dei thread fallita: errore nella creazione della "
+"chiave dei thread"
 
 #: ../src/msw/thread.cpp:1185
-msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
-msgstr "Inizializzazione del modulo dei thread fallita: impossibile allocare l'indice nella memoria locale del thread"
+msgid ""
+"Thread module initialization failed: impossible to allocate index in thread "
+"local storage"
+msgstr ""
+"Inizializzazione del modulo dei thread fallita: impossibile allocare "
+"l'indice nella memoria locale del thread"
 
 #: ../src/unix/threadpsx.cpp:1108
 msgid "Thread priority setting is ignored."
@@ -3027,10 +2978,11 @@ msgstr "Margine superiore (mm):"
 #: ../src/common/fs_mem.cpp:205
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
-msgstr "Tentata la rimozione del file '%s' dalla memoria VFS, ma il file non � caricato!"
+msgstr ""
+"Tentata la rimozione del file '%s' dalla memoria VFS, ma il file non � "
+"caricato!"
 
-#: ../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 "Abbandonata la tentata risoluzione di un nome di host NULL"
 
@@ -3042,8 +2994,7 @@ msgstr "Turco (ISO-8859-9)"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../src/common/xtistrm.cpp:279
-#: ../src/common/xtixml.cpp:351
+#: ../src/common/xtistrm.cpp:279 ../src/common/xtixml.cpp:351
 #: ../src/common/xtixml.cpp:498
 msgid "Type must have enum - long conversion"
 msgstr "Tipo deve avere enumeratore - convertito a long"
@@ -3126,8 +3077,7 @@ msgstr "Campo sconosciuto nel file %s, riga %d: '%s'."
 msgid "Unknown long option '%s'"
 msgstr "Opzione lunga '%s' sconosciuta"
 
-#: ../src/common/cmdline.cpp:582
-#: ../src/common/cmdline.cpp:603
+#: ../src/common/cmdline.cpp:582 ../src/common/cmdline.cpp:603
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "Opzione '%s' sconosciuta"
@@ -3146,14 +3096,12 @@ msgstr "Propriet
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "'{' spaiata in una voce per il tipo MIME %s."
 
-#: ../src/common/cmdproc.cpp:254
-#: ../src/common/cmdproc.cpp:280
+#: ../src/common/cmdproc.cpp:254 ../src/common/cmdproc.cpp:280
 #: ../src/common/cmdproc.cpp:300
 msgid "Unnamed command"
 msgstr "Comando privo di nome"
 
-#: ../src/mac/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:273
+#: ../src/mac/clipbrd.cpp:64 ../src/msw/clipbrd.cpp:273
 #: ../src/msw/clipbrd.cpp:445
 msgid "Unsupported clipboard format."
 msgstr "Formato degli appunti non supportato."
@@ -3210,7 +3158,8 @@ msgstr "Avviso:"
 
 #: ../src/html/htmlpars.cpp:390
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
-msgstr "Avviso: tentata la rimozione di un handler di tag HTML da uno stack vuoto."
+msgstr ""
+"Avviso: tentata la rimozione di un handler di tag HTML da uno stack vuoto."
 
 #: ../src/common/fmapbase.cpp:102
 msgid "Western European (ISO-8859-1)"
@@ -3311,8 +3260,7 @@ msgstr "Errore durante il parsing XML: '%s' alla riga '%d'"
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: Dati dei pixel malformati"
 
-#: ../src/common/xpmdecod.cpp:712
-#: ../src/common/xpmdecod.cpp:722
+#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:722
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr "XPM: Definizione di colore '%s' malformata!"
@@ -3322,8 +3270,7 @@ msgstr "XPM: Definizione di colore '%s' malformata!"
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "Risorsa XRC '%s' (classe '%s') non trovata!"
 
-#: ../contrib/src/xrc/xmlres.cpp:885
-#: ../contrib/src/xrc/xmlres.cpp:897
+#: ../contrib/src/xrc/xmlres.cpp:885 ../contrib/src/xrc/xmlres.cpp:897
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "Risorsa XRC: Impossibile creare una bitmap a partire da '%s'."
@@ -3333,10 +3280,8 @@ msgstr "Risorsa XRC: Impossibile creare una bitmap a partire da '%s'."
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr "Risorsa XRC: Specifica di colore '%s' errata per la propriet� '%s'.'"
 
-#: ../src/common/dlgcmn.cpp:208
-#: ../src/mac/msgdlg.cpp:57
-#: ../src/mac/msgdlg.cpp:139
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:208 ../src/mac/msgdlg.cpp:57
+#: ../src/mac/msgdlg.cpp:139 ../src/motif/msgdlg.cpp:182
 msgid "Yes"
 msgstr "Si"
 
@@ -3344,8 +3289,7 @@ msgstr "Si"
 msgid "You cannot add a new directory to this section."
 msgstr "Impossibile aggiungere una nuova cartella a questa sezione."
 
-#: ../src/common/fs_zip.cpp:88
-#: ../src/common/fs_zip.cpp:138
+#: ../src/common/fs_zip.cpp:88 ../src/common/fs_zip.cpp:138
 msgid "ZIP handler currently supports only local files!"
 msgstr "Il gestore di file ZIP supporta unicamente file locali!"
 
@@ -3359,11 +3303,13 @@ msgstr "un'applicazione DDEML ha creato una 'race condition' prolungata."
 
 #: ../src/msw/dde.cpp:1063
 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 ""
-"una funzione DDEML � stata richiamata senza prima richiamare DdeInitialize, oppure � stato passato ad una funzione DDEML\n"
+"una funzione DDEML � stata richiamata senza prima richiamare DdeInitialize, "
+"oppure � stato passato ad una funzione DDEML\n"
 "un identificatore di istanza non valido."
 
 #: ../src/msw/dde.cpp:1081
@@ -3380,23 +3326,29 @@ msgstr "un parametro ha fallito la validazione da parte del DDEML."
 
 #: ../src/msw/dde.cpp:1054
 msgid "a request for a synchronous advise transaction has timed out."
-msgstr "una richiesta di transazione sincrona (advise) ha superato il tempo massimo."
+msgstr ""
+"una richiesta di transazione sincrona (advise) ha superato il tempo massimo."
 
 #: ../src/msw/dde.cpp:1060
 msgid "a request for a synchronous data transaction has timed out."
-msgstr "una richiesta di transazione sincrona (data) ha superato il tempo massimo."
+msgstr ""
+"una richiesta di transazione sincrona (data) ha superato il tempo massimo."
 
 #: ../src/msw/dde.cpp:1069
 msgid "a request for a synchronous execute transaction has timed out."
-msgstr "una richiesta di transazione sincrona (execute) ha superato il tempo massimo."
+msgstr ""
+"una richiesta di transazione sincrona (execute) ha superato il tempo massimo."
 
 #: ../src/msw/dde.cpp:1087
 msgid "a request for a synchronous poke transaction has timed out."
-msgstr "una richiesta di transazione sincrona (poke) ha superato il tempo massimo."
+msgstr ""
+"una richiesta di transazione sincrona (poke) ha superato il tempo massimo."
 
 #: ../src/msw/dde.cpp:1102
 msgid "a request to end an advise transaction has timed out."
-msgstr "una richiesta di terminazione di transazione (advise) ha superato il tempo massimo."
+msgstr ""
+"una richiesta di terminazione di transazione (advise) ha superato il tempo "
+"massimo."
 
 #: ../src/msw/dde.cpp:1096
 msgid ""
@@ -3442,7 +3394,8 @@ msgid ""
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
 "the transaction identifier for that callback is no longer valid."
 msgstr ""
-"� stato fornito un identificatore di transazione non valido ad una funzione DDEML.\n"
+"� stato fornito un identificatore di transazione non valido ad una funzione "
+"DDEML.\n"
 "Una volta che l'applicazione � uscita da una callback XTYP_XACT_COMPLETE,\n"
 "l'identificatore di transazione per questa callback non � pi� valido."
 
@@ -3499,7 +3452,9 @@ msgstr "impossibile eliminare il file di configurazione utente '%s'"
 #: ../src/common/file.cpp:631
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
-msgstr "impossibile determinare se il descrittore di file %d ha raggiunto la fine del file"
+msgstr ""
+"impossibile determinare se il descrittore di file %d ha raggiunto la fine "
+"del file"
 
 #: ../src/common/file.cpp:585
 #, c-format
@@ -3508,25 +3463,26 @@ msgstr "impossibile determinare la dimensione del file del descritore %d"
 
 #: ../src/msw/utils.cpp:371
 msgid "can't find user's HOME, using current directory."
-msgstr "impossibile trovare la HOME dell'utente, viene impiegata la cartella corrente."
+msgstr ""
+"impossibile trovare la HOME dell'utente, viene impiegata la cartella "
+"corrente."
 
 #: ../src/common/file.cpp:450
 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr "impossibile forzare la scrittura su disco del descrittore di file %d"
 
-#: ../src/common/file.cpp:535
-#: ../src/common/file.cpp:543
+#: ../src/common/file.cpp:535 ../src/common/file.cpp:543
 #, c-format
 msgid "can't get seek position on file descriptor %d"
-msgstr "impossibile determinare la posizione corrente del descrittore di file %d"
+msgstr ""
+"impossibile determinare la posizione corrente del descrittore di file %d"
 
 #: ../src/common/fontmap.cpp:305
 msgid "can't load any font, aborting"
 msgstr "impossibile caricare un qualunque tipo di carattere, abbandono"
 
-#: ../src/common/ffile.cpp:63
-#: ../src/common/file.cpp:352
+#: ../src/common/ffile.cpp:63 ../src/common/file.cpp:352
 #, c-format
 msgid "can't open file '%s'"
 msgstr "impossibile aprire il file '%s'"
@@ -3564,8 +3520,7 @@ msgstr "impossibile eliminare il file '%s'"
 msgid "can't remove temporary file '%s'"
 msgstr "impossibile eliminare il file temporaneo '%s'"
 
-#: ../src/common/file.cpp:492
-#: ../src/common/file.cpp:518
+#: ../src/common/file.cpp:492 ../src/common/file.cpp:518
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "impossibile eseguire una seek sul descrittore di file %d"
@@ -3682,7 +3637,8 @@ msgstr "file '%s', riga %d: la chiave '%s' 
 #: ../src/common/fileconf.cpp:700
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
-msgstr "file '%s', riga %d: valore per la chiave non configurabile '%s' ignorato."
+msgstr ""
+"file '%s', riga %d: valore per la chiave non configurabile '%s' ignorato."
 
 #: ../src/common/fileconf.cpp:622
 #, c-format
@@ -3729,8 +3685,7 @@ msgstr "valore di ritorno di eof() non valido."
 msgid "invalid message box return value"
 msgstr "il riquadro di dialogo ha ritornato un valore non valido"
 
-#: ../src/common/fontcmn.cpp:473
-#: ../src/common/fontcmn.cpp:537
+#: ../src/common/fontcmn.cpp:473 ../src/common/fontcmn.cpp:537
 msgid "italic"
 msgstr "corsivo"
 
@@ -3866,7 +3821,8 @@ msgstr "dieci"
 
 #: ../src/msw/dde.cpp:1057
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
-msgstr "la risposta alla transazione ha causato l'impostazione del bit DDE_FBUSY."
+msgstr ""
+"la risposta alla transazione ha causato l'impostazione del bit DDE_FBUSY."
 
 #: ../src/common/datetime.cpp:3468
 msgid "third"
@@ -3876,8 +3832,7 @@ msgstr "tre"
 msgid "thirteenth"
 msgstr "tredici"
 
-#: ../src/common/imagtiff.cpp:143
-#: ../src/common/imagtiff.cpp:151
+#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
 #, c-format
 msgid "tiff module: %s"
 msgstr "modulo tiff: %s"
@@ -3920,8 +3875,7 @@ msgstr "sconosciuto"
 msgid "unknown class %s"
 msgstr "classe %s sconosciuta"
 
-#: ../src/common/regex.cpp:151
-#: ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:151 ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr "errore sconosciuto"
 
@@ -3934,8 +3888,7 @@ msgstr "errore sconosciuto (codice %08x)."
 msgid "unknown line terminator"
 msgstr "carattere di fine riga sconosciuto"
 
-#: ../src/common/file.cpp:474
-#: ../src/common/file.cpp:501
+#: ../src/common/file.cpp:474 ../src/common/file.cpp:501
 msgid "unknown seek origin"
 msgstr "origine della seek sconosciuta"
 
@@ -3974,8 +3927,7 @@ msgstr "scrittura"
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay fallita."
 
-#: ../src/common/socket.cpp:395
-#: ../src/common/socket.cpp:449
+#: ../src/common/socket.cpp:395 ../src/common/socket.cpp:449
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: signature non valida in ReadMsg."
 
@@ -3996,8 +3948,7 @@ msgstr "wxWindows non pu
 msgid "yesterday"
 msgstr "ieri"
 
-#: ../src/common/zstream.cpp:141
-#: ../src/common/zstream.cpp:275
+#: ../src/common/zstream.cpp:141 ../src/common/zstream.cpp:275
 #, c-format
 msgid "zlib error %d"
 msgstr "errore zlib %d"
@@ -4005,4 +3956,3 @@ msgstr "errore zlib %d"
 #: ../src/common/prntbase.cpp:450
 msgid "|<<"
 msgstr "|<<"
-
diff --git a/locale/pl.po b/locale/pl.po
index d1d88b7446..95d0b28e68 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -5,6 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWindows-2.5.1\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-04 18:56+0100\n"
 "PO-Revision-Date: 2004-05-06 18:28+0100\n"
 "Last-Translator: W�odzimierz ABX Skiba <abx@abx.art.pl>\n"
@@ -46,10 +47,8 @@ msgstr "Koperta #14, 5 x 11 1/2 cali"
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "Koperta #9, 3 7/8 x 8 7/8 cali"
 
-#: ../src/html/helpfrm.cpp:867
-#: ../src/html/helpfrm.cpp:868
-#: ../src/html/helpfrm.cpp:1505
-#: ../src/html/helpfrm.cpp:1535
+#: ../src/html/helpfrm.cpp:867 ../src/html/helpfrm.cpp:868
+#: ../src/html/helpfrm.cpp:1505 ../src/html/helpfrm.cpp:1535
 #, c-format
 msgid "%i of %i"
 msgstr "%i z %i"
@@ -92,8 +91,7 @@ msgstr ""
 msgid "&Arrange Icons"
 msgstr "&Rozmie�� ikony"
 
-#: ../src/generic/fdrepdlg.cpp:164
-#: ../src/generic/wizard.cpp:401
+#: ../src/generic/fdrepdlg.cpp:164 ../src/generic/wizard.cpp:401
 msgid "&Cancel"
 msgstr "&Anuluj"
 
@@ -101,10 +99,8 @@ msgstr "&Anuluj"
 msgid "&Cascade"
 msgstr "&Kaskada"
 
-#: ../src/common/prntbase.cpp:439
-#: ../src/generic/logg.cpp:502
-#: ../src/generic/tipdlg.cpp:213
-#: ../src/html/helpfrm.cpp:271
+#: ../src/common/prntbase.cpp:439 ../src/generic/logg.cpp:502
+#: ../src/generic/tipdlg.cpp:213 ../src/html/helpfrm.cpp:271
 msgid "&Close"
 msgstr "Zam&knij"
 
@@ -144,13 +140,11 @@ msgstr "&Dziennik"
 msgid "&Move"
 msgstr "Prz&enie�"
 
-#: ../src/generic/mdig.cpp:117
-#: ../src/msw/mdi.cpp:192
+#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:192
 msgid "&Next"
 msgstr "&Nast�pne"
 
-#: ../src/generic/wizard.cpp:400
-#: ../src/generic/wizard.cpp:582
+#: ../src/generic/wizard.cpp:400 ../src/generic/wizard.cpp:582
 msgid "&Next >"
 msgstr "&Dalej >"
 
@@ -166,8 +160,7 @@ msgstr "&Otw
 msgid "&Paste"
 msgstr "Wkl&ej"
 
-#: ../src/generic/mdig.cpp:118
-#: ../src/msw/mdi.cpp:193
+#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:193
 msgid "&Previous"
 msgstr "&Poprzednie"
 
@@ -175,14 +168,12 @@ msgstr "&Poprzednie"
 msgid "&Print..."
 msgstr "&Drukuj..."
 
-#: ../src/common/cmdproc.cpp:285
-#: ../src/common/cmdproc.cpp:292
+#: ../src/common/cmdproc.cpp:285 ../src/common/cmdproc.cpp:292
 #: ../src/msw/textctrl.cpp:2048
 msgid "&Redo"
 msgstr "&Pon�w"
 
-#: ../src/common/cmdproc.cpp:281
-#: ../src/common/cmdproc.cpp:301
+#: ../src/common/cmdproc.cpp:281 ../src/common/cmdproc.cpp:301
 msgid "&Redo "
 msgstr "&Pon�w "
 
@@ -194,8 +185,7 @@ msgstr "&Zast
 msgid "&Restore"
 msgstr "&Przywr��"
 
-#: ../src/generic/logg.cpp:498
-#: ../src/generic/logg.cpp:827
+#: ../src/generic/logg.cpp:498 ../src/generic/logg.cpp:827
 msgid "&Save..."
 msgstr "&Zapisz..."
 
@@ -207,8 +197,7 @@ msgstr "&Pokazuj porady przy uruchamianiu"
 msgid "&Size"
 msgstr "&Rozmiar"
 
-#: ../src/common/cmdproc.cpp:263
-#: ../src/msw/textctrl.cpp:2047
+#: ../src/common/cmdproc.cpp:263 ../src/msw/textctrl.cpp:2047
 msgid "&Undo"
 msgstr "&Cofnij"
 
@@ -216,23 +205,18 @@ msgstr "&Cofnij"
 msgid "&Undo "
 msgstr "&Cofnij "
 
-#: ../src/generic/mdig.cpp:297
-#: ../src/generic/mdig.cpp:313
-#: ../src/generic/mdig.cpp:317
-#: ../src/msw/mdi.cpp:1333
-#: ../src/msw/mdi.cpp:1340
+#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
+#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1333 ../src/msw/mdi.cpp:1340
 #: ../src/msw/mdi.cpp:1370
 msgid "&Window"
 msgstr "&Okno"
 
-#: ../src/common/config.cpp:414
-#: ../src/msw/regconf.cpp:265
+#: ../src/common/config.cpp:414 ../src/msw/regconf.cpp:265
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' ma nadmiarowe '..', zignorowane."
 
-#: ../src/common/valtext.cpp:136
-#: ../src/common/valtext.cpp:166
+#: ../src/common/valtext.cpp:136 ../src/common/valtext.cpp:166
 #: ../src/common/valtext.cpp:172
 #, c-format
 msgid "'%s' is invalid"
@@ -277,19 +261,16 @@ msgstr "'%s' powinien zawiera
 msgid "(Help)"
 msgstr "(Pomoc)"
 
-#: ../src/html/helpfrm.cpp:345
-#: ../src/html/helpfrm.cpp:935
+#: ../src/html/helpfrm.cpp:345 ../src/html/helpfrm.cpp:935
 #: ../src/html/helpfrm.cpp:1563
 msgid "(bookmarks)"
 msgstr "(zak�adki)"
 
-#: ../src/generic/dirctrlg.cpp:677
-#: ../src/generic/filedlgg.cpp:707
+#: ../src/generic/dirctrlg.cpp:677 ../src/generic/filedlgg.cpp:707
 msgid "."
 msgstr "."
 
-#: ../src/generic/dirctrlg.cpp:678
-#: ../src/generic/filedlgg.cpp:708
+#: ../src/generic/dirctrlg.cpp:678 ../src/generic/filedlgg.cpp:708
 msgid ".."
 msgstr ".."
 
@@ -329,18 +310,15 @@ msgstr "< &Wstecz"
 msgid "<<"
 msgstr "<<"
 
-#: ../src/generic/filedlgg.cpp:248
-#: ../src/generic/filedlgg.cpp:271
+#: ../src/generic/filedlgg.cpp:248 ../src/generic/filedlgg.cpp:271
 msgid "<DIR>"
 msgstr "<KATALOG>"
 
-#: ../src/generic/filedlgg.cpp:252
-#: ../src/generic/filedlgg.cpp:275
+#: ../src/generic/filedlgg.cpp:252 ../src/generic/filedlgg.cpp:275
 msgid "<DRIVE>"
 msgstr "<NAP�D>"
 
-#: ../src/generic/filedlgg.cpp:250
-#: ../src/generic/filedlgg.cpp:273
+#: ../src/generic/filedlgg.cpp:250 ../src/generic/filedlgg.cpp:273
 msgid "<LINK>"
 msgstr "<��CZE>"
 
@@ -474,8 +452,7 @@ msgstr "Arkusz B5, 182 x 257 mm"
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "Koperta B6, 176 x 125 mm"
 
-#: ../src/common/imagbmp.cpp:470
-#: ../src/common/imagbmp.cpp:486
+#: ../src/common/imagbmp.cpp:470 ../src/common/imagbmp.cpp:486
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: Nie mo�na przydzieli� pami�ci."
 
@@ -551,8 +528,7 @@ msgstr "Koperta C6, 114 x 162 mm"
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "Koperta C65, 114 x 229 mm"
 
-#: ../src/html/chm.cpp:783
-#: ../src/html/chm.cpp:842
+#: ../src/html/chm.cpp:783 ../src/html/chm.cpp:842
 msgid "CHM handler currently supports only local files!"
 msgstr "Obs�uga CHM obecnie wspiera tylko pliki lokalne!"
 
@@ -565,8 +541,7 @@ msgstr "Nie mo
 msgid "Can not enumerate files '%s'"
 msgstr "Nie mo�na wyliczy� plik�w '%s'"
 
-#: ../src/msw/dir.cpp:300
-#: ../src/unix/dir.cpp:232
+#: ../src/msw/dir.cpp:300 ../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'"
@@ -576,8 +551,7 @@ msgstr "Nie mo
 msgid "Can not resume thread %lu"
 msgstr "Nie mo�na wznowi� w�tku %lu"
 
-#: ../src/mac/thread.cpp:477
-#: ../src/msw/thread.cpp:821
+#: ../src/mac/thread.cpp:477 ../src/msw/thread.cpp:821
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "Nie mo�na wznowi� w�tku %x"
@@ -591,8 +565,7 @@ msgstr "Nie mo
 msgid "Can not suspend thread %lu"
 msgstr "Nie mo�na zawiesi� w�tku %lu"
 
-#: ../src/mac/thread.cpp:453
-#: ../src/msw/thread.cpp:806
+#: ../src/mac/thread.cpp:453 ../src/msw/thread.cpp:806
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "Nie mo�na zawiesi� w�tku %x"
@@ -622,15 +595,16 @@ msgstr "Nie mo
 
 #: ../src/msw/listctrl.cpp:413
 msgid "Can't create list control window, check that comctl32.dll is installed."
-msgstr "Nie mo�na utworzy� okna listy kontrolnej, sprawd� czy comctl32.dll jest zainstalowany."
+msgstr ""
+"Nie mo�na utworzy� okna listy kontrolnej, sprawd� czy comctl32.dll jest "
+"zainstalowany."
 
 #: ../src/msw/registry.cpp:428
 #, c-format
 msgid "Can't create registry key '%s'"
 msgstr "Nie mo�na utworzy� klucza rejestru '%s'"
 
-#: ../src/mac/thread.cpp:430
-#: ../src/msw/thread.cpp:593
+#: ../src/mac/thread.cpp:430 ../src/msw/thread.cpp:593
 #: ../src/os2/thread.cpp:491
 msgid "Can't create thread"
 msgstr "Nie mo�na utworzy� w�tku"
@@ -645,8 +619,7 @@ msgstr "Nie mo
 msgid "Can't delete key '%s'"
 msgstr "Nie mo�na usun�� klucza '%s'"
 
-#: ../src/msw/iniconf.cpp:444
-#: ../src/os2/iniconf.cpp:448
+#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "Nie mo�na usun�� pliku INI '%s'"
@@ -689,8 +662,7 @@ msgstr "Nie mo
 msgid "Can't initialize zlib inflate stream."
 msgstr "Nie mo�na zainicjowa� strumienia dekompresji biblioteki zlib."
 
-#: ../src/common/image.cpp:1028
-#: ../src/common/image.cpp:1048
+#: ../src/common/image.cpp:1028 ../src/common/image.cpp:1048
 #, 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."
@@ -714,8 +686,7 @@ msgstr ""
 msgid "Can't read value of '%s'"
 msgstr "Nie mo�na odczyta� warto�ci '%s'"
 
-#: ../src/msw/registry.cpp:808
-#: ../src/msw/registry.cpp:842
+#: ../src/msw/registry.cpp:808 ../src/msw/registry.cpp:842
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr "Nie mo�na odczyta� warto�ci klucza '%s'"
@@ -725,19 +696,16 @@ msgstr "Nie mo
 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:562
-#: ../src/generic/logg.cpp:994
+#: ../src/generic/logg.cpp:562 ../src/generic/logg.cpp:994
 msgid "Can't save log contents to file."
 msgstr "Nie mo�na zapisa� zawarto�ci dziennika w pliku."
 
 # ustali�?
-#: ../src/msw/thread.cpp:549
-#: ../src/os2/thread.cpp:473
+#: ../src/msw/thread.cpp:549 ../src/os2/thread.cpp:473
 msgid "Can't set thread priority"
 msgstr "Nie mo�na zmieni� priorytetu w�tku"
 
-#: ../src/msw/registry.cpp:829
-#: ../src/msw/registry.cpp:954
+#: ../src/msw/registry.cpp:829 ../src/msw/registry.cpp:954
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr "Nie mo�na nada� warto�ci '%s'"
@@ -747,25 +715,20 @@ msgstr "Nie mo
 msgid "Can't write to deflate stream: %s\n"
 msgstr "Nie mo�na zapisywa� do kompresowanego strumienia: %s\n"
 
-#: ../src/common/dlgcmn.cpp:240
-#: ../src/generic/dirdlgg.cpp:155
-#: ../src/generic/filedlgg.cpp:977
-#: ../src/generic/filedlgg.cpp:996
-#: ../src/generic/fontdlgg.cpp:255
-#: ../src/generic/prntdlgg.cpp:455
-#: ../src/generic/progdlgg.cpp:211
-#: ../src/gtk/filedlg.cpp:168
-#: ../src/gtk/fontdlg.cpp:147
-#: ../src/html/helpfrm.cpp:1066
+#: ../src/common/dlgcmn.cpp:240 ../src/generic/dirdlgg.cpp:155
+#: ../src/generic/filedlgg.cpp:977 ../src/generic/filedlgg.cpp:996
+#: ../src/generic/fontdlgg.cpp:255 ../src/generic/prntdlgg.cpp:455
+#: ../src/generic/progdlgg.cpp:211 ../src/gtk/filedlg.cpp:168
+#: ../src/gtk/fontdlg.cpp:147 ../src/html/helpfrm.cpp:1066
 #: ../src/motif/msgdlg.cpp:182
 msgid "Cancel"
 msgstr "Zrezygnuj"
 
 # units --> ?
-#: ../contrib/src/xrc/xmlres.cpp:987
-#: ../contrib/src/xrc/xmlres.cpp:1028
+#: ../contrib/src/xrc/xmlres.cpp:987 ../contrib/src/xrc/xmlres.cpp:1028
 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:1567
 #, c-format
@@ -808,8 +771,7 @@ msgstr "Nie mo
 msgid "Cannot hang up - no active dialup connection."
 msgstr "Nie mo�na roz��czy� - brak aktywnego po��czenia dialup."
 
-#: ../src/msw/app.cpp:290
-#: ../src/msw/app.cpp:293
+#: ../src/msw/app.cpp:290 ../src/msw/app.cpp:293
 msgid "Cannot initialize OLE"
 msgstr "Nie mo�na zainicjowa� OLE"
 
@@ -884,8 +846,7 @@ msgstr "Nie mo
 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'!"
@@ -955,8 +916,7 @@ msgstr "Komputer"
 msgid "Config entry name cannot start with '%c'."
 msgstr "Nazwa pozycji konfiguracji nie mo�e zaczyna� si� od '%c'."
 
-#: ../src/generic/filedlgg.cpp:1214
-#: ../src/gtk/filedlg.cpp:74
+#: ../src/generic/filedlgg.cpp:1214 ../src/gtk/filedlg.cpp:74
 msgid "Confirm"
 msgstr "Potwierd�"
 
@@ -1014,8 +974,7 @@ msgstr "Nie odnaleziono pliku '%s'."
 msgid "Could not start document preview."
 msgstr "Nie mo�na wystartowa� podgl�du dokumentu."
 
-#: ../src/generic/printps.cpp:221
-#: ../src/msw/printwin.cpp:245
+#: ../src/generic/printps.cpp:221 ../src/msw/printwin.cpp:245
 msgid "Could not start printing."
 msgstr "Nie mo�na rozpocz�� drukowania."
 
@@ -1028,21 +987,17 @@ msgstr "Nie mo
 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:156
-#: ../src/msw/imaglist.cpp:174
+#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
+#: ../src/msw/imaglist.cpp:156 ../src/msw/imaglist.cpp:174
 #: ../src/msw/imaglist.cpp:186
 msgid "Couldn't add an image to the image list."
 msgstr "Nie mo�na doda� obrazu do listy obraz�w."
 
-#: ../src/msw/timer.cpp:101
-#: ../src/os2/timer.cpp:118
+#: ../src/msw/timer.cpp:101 ../src/os2/timer.cpp:118
 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."
 
@@ -1052,14 +1007,14 @@ msgstr "Nie mo
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "Nie mo�na znale�� symbolu '%s' w bibliotece"
 
-#: ../src/mac/thread.cpp:507
-#: ../src/msw/thread.cpp:847
+#: ../src/mac/thread.cpp:507 ../src/msw/thread.cpp:847
 msgid "Couldn't get the current thread pointer"
 msgstr "Nie mo�na pobra� wska�nika aktualnego w�tku"
 
 #: ../src/common/imagpng.cpp:607
 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:412
 #, c-format
@@ -1085,14 +1040,12 @@ msgstr "Muteks nie m
 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:647
-#: ../src/common/imagpng.cpp:658
+#: ../src/common/imagpng.cpp:647 ../src/common/imagpng.cpp:658
 #: ../src/common/imagpng.cpp:666
 msgid "Couldn't save PNG image."
 msgstr "Nie mo�na zapisa� obrazu PNG."
 
-#: ../src/mac/thread.cpp:756
-#: ../src/msw/thread.cpp:610
+#: ../src/mac/thread.cpp:756 ../src/msw/thread.cpp:610
 msgid "Couldn't terminate thread"
 msgstr "Nie mo�na zako�czy� w�tku"
 
@@ -1104,8 +1057,7 @@ msgstr ""
 msgid "Create directory"
 msgstr "Tworzenie katalogu"
 
-#: ../src/generic/dirdlgg.cpp:105
-#: ../src/generic/filedlgg.cpp:931
+#: ../src/generic/dirdlgg.cpp:105 ../src/generic/filedlgg.cpp:931
 msgid "Create new directory"
 msgstr "Utw�rz nowy katalog"
 
@@ -1172,8 +1124,12 @@ msgid "Deleted stale lock file '%s'."
 msgstr "Nieaktualny plik blokuj�cy '%s' zosta� usuni�ty."
 
 #: ../src/msw/dialup.cpp:346
-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:220
 msgid "Did you know..."
@@ -1198,8 +1154,12 @@ msgid "Directory doesn't exist."
 msgstr "Katalog nie istnieje."
 
 #: ../src/html/helpfrm.cpp:409
-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:583
 msgid "Display options dialog"
@@ -1207,7 +1167,8 @@ msgstr "Wy
 
 #: ../src/msw/mimetype.cpp:672
 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"
@@ -1265,27 +1226,23 @@ msgstr "Znalezione pozycje"
 # rozszerzenie?
 #: ../src/common/config.cpp:366
 #, c-format
-msgid "Environment variables expansion failed: missing '%c' at position %d in '%s'."
-msgstr "Rozszerzenie zmiennych �rodowiskowych nie powiod�o si�: zabrak�o '%c' na pozycji '%d' w '%s'."
+msgid ""
+"Environment variables expansion failed: missing '%c' at position %d in '%s'."
+msgstr ""
+"Rozszerzenie zmiennych �rodowiskowych nie powiod�o si�: zabrak�o '%c' na "
+"pozycji '%d' w '%s'."
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:711
-#: ../src/generic/filedlgg.cpp:725
-#: ../src/generic/filedlgg.cpp:739
-#: ../src/generic/filedlgg.cpp:1166
-#: ../src/generic/filedlgg.cpp:1191
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/dirctrlg.cpp:701
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:711
+#: ../src/generic/filedlgg.cpp:725 ../src/generic/filedlgg.cpp:739
+#: ../src/generic/filedlgg.cpp:1166 ../src/generic/filedlgg.cpp:1191
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 #: ../src/gtk/fontdlg.cpp:76
 msgid "Error"
 msgstr "B��d"
 
-#: ../src/unix/utilsunx.cpp:1030
-#: ../src/unix/utilsunx.cpp:1038
+#: ../src/unix/utilsunx.cpp:1030 ../src/unix/utilsunx.cpp:1038
 msgid "Error "
 msgstr "B��d "
 
@@ -1449,15 +1406,16 @@ msgstr "Nie uda
 #: ../src/msw/fdrepdlg.cpp:480
 #, 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:495
 #, 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/clipbrd.cpp:185
-#: ../src/msw/clipbrd.cpp:134
+#: ../src/mac/clipbrd.cpp:185 ../src/msw/clipbrd.cpp:134
 msgid "Failed to empty the clipboard."
 msgstr "Nie uda�o si� opr�ni� schowka."
 
@@ -1468,15 +1426,15 @@ msgstr "Nie uda
 # to moja swobodna interpretacja
 #: ../src/msw/dde.cpp:668
 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:618
 #, c-format
 msgid "Failed to establish dialup connection: %s"
 msgstr "Nie uda�o si� nawi�za� po��czenia dialup: %s"
 
-#: ../src/unix/utilsunx.cpp:459
-#: ../src/unix/utilsunx.cpp:475
+#: ../src/unix/utilsunx.cpp:459 ../src/unix/utilsunx.cpp:475
 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "Nie uda�o si� wykona� '%s'\n"
@@ -1521,8 +1479,12 @@ msgstr "Nie uda
 # po��czy�?
 # wyciek?
 #: ../src/unix/threadpsx.cpp:896
-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:723
 #, c-format
@@ -1669,8 +1631,7 @@ msgstr "Nie uda
 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."
@@ -1686,7 +1647,8 @@ msgstr "Nie uda
 
 #: ../src/msw/dde.cpp:687
 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:913
 #, c-format
@@ -1731,8 +1693,7 @@ msgstr "Plik"
 msgid "File %s does not exist."
 msgstr "Plik %s nie istnieje."
 
-#: ../src/generic/filedlgg.cpp:1212
-#: ../src/gtk/filedlg.cpp:71
+#: ../src/generic/filedlgg.cpp:1212 ../src/gtk/filedlg.cpp:71
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "Plik '%s' ju� istnieje, naprawd� chcesz go zast�pi�?"
@@ -1750,19 +1711,16 @@ msgstr ""
 msgid "File couldn't be loaded."
 msgstr "Plik nie mo�e by� wczytany."
 
-#: ../src/common/docview.cpp:316
-#: ../src/common/docview.cpp:357
+#: ../src/common/docview.cpp:316 ../src/common/docview.cpp:357
 #: ../src/common/docview.cpp:1502
 msgid "File error"
 msgstr "B��d plikowy"
 
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/filedlgg.cpp:725
+#: ../src/generic/dirctrlg.cpp:701 ../src/generic/filedlgg.cpp:725
 msgid "File name exists already."
 msgstr "Plik o tej nazwie ju� istnieje."
 
-#: ../src/common/fldlgcmn.cpp:62
-#: ../src/msw/filedlg.cpp:250
+#: ../src/common/fldlgcmn.cpp:62 ../src/msw/filedlg.cpp:250
 #, c-format
 msgid "Files (%s)|%s"
 msgstr "Pliki (%s)|%s"
@@ -1870,8 +1828,7 @@ msgstr "Id
 msgid "Go one level up in document hierarchy"
 msgstr "Id� poziom wy�ej w hierarchi dokumentu"
 
-#: ../src/generic/dirdlgg.cpp:110
-#: ../src/generic/filedlgg.cpp:921
+#: ../src/generic/dirdlgg.cpp:110 ../src/generic/filedlgg.cpp:921
 msgid "Go to home directory"
 msgstr "Id� do katalogu domowego"
 
@@ -1905,10 +1862,8 @@ msgstr ""
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrajski (ISO-8859-8)"
 
-#: ../src/common/dlgcmn.cpp:236
-#: ../src/generic/mdig.cpp:310
-#: ../src/html/helpfrm.cpp:254
-#: ../src/html/helpfrm.cpp:277
+#: ../src/common/dlgcmn.cpp:236 ../src/generic/mdig.cpp:310
+#: ../src/html/helpfrm.cpp:254 ../src/html/helpfrm.cpp:277
 #: ../src/msw/mdi.cpp:1329
 msgid "Help"
 msgstr "Pomoc"
@@ -1917,8 +1872,7 @@ msgstr "Pomoc"
 msgid "Help Browser Options"
 msgstr "Opcje przegl�darki pomocy"
 
-#: ../src/generic/helpext.cpp:441
-#: ../src/generic/helpext.cpp:442
+#: ../src/generic/helpext.cpp:441 ../src/generic/helpext.cpp:442
 msgid "Help Index"
 msgstr "Spis tre�ci"
 
@@ -1940,12 +1894,9 @@ msgstr "Pomoc: %s"
 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: B��d odczytu maski DIB."
 
-#: ../src/common/imagbmp.cpp:1042
-#: ../src/common/imagbmp.cpp:1101
-#: ../src/common/imagbmp.cpp:1110
-#: ../src/common/imagbmp.cpp:1121
-#: ../src/common/imagbmp.cpp:1165
-#: ../src/common/imagbmp.cpp:1175
+#: ../src/common/imagbmp.cpp:1042 ../src/common/imagbmp.cpp:1101
+#: ../src/common/imagbmp.cpp:1110 ../src/common/imagbmp.cpp:1121
+#: ../src/common/imagbmp.cpp:1165 ../src/common/imagbmp.cpp:1175
 #: ../src/common/imagbmp.cpp:1184
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: B��d przy zapisie do pliku."
@@ -1992,8 +1943,7 @@ msgstr ""
 msgid "Illegal Parameter Count for Create Method"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/filedlgg.cpp:711
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:711
 msgid "Illegal directory name."
 msgstr "Niedozwolona nazwa katalogu."
 
@@ -2011,8 +1961,12 @@ msgid "Image file is not of type %d."
 msgstr "Nie jest to obraz typu %d."
 
 #: ../src/msw/textctrl.cpp:303
-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:379
 msgid "Impossible to get child process input"
@@ -2073,8 +2027,7 @@ msgstr "Niedozwolona specyfikacja \"geometry\" '%s'."
 msgid "Invalid lock file '%s'."
 msgstr "Nieprawid�owy plik blokuj�cy '%s'."
 
-#: ../src/common/xtistrm.cpp:363
-#: ../src/common/xtistrm.cpp:378
+#: ../src/common/xtistrm.cpp:363 ../src/common/xtistrm.cpp:378
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr ""
 
@@ -2107,8 +2060,7 @@ msgstr "JPEG: Nie mo
 msgid "KOI8-R"
 msgstr "KOI8-R"
 
-#: ../src/generic/prntdlgg.cpp:428
-#: ../src/generic/prntdlgg.cpp:638
+#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:638
 msgid "Landscape"
 msgstr "Pejza�"
 
@@ -2162,8 +2114,7 @@ msgstr "
 msgid "Log saved to the file '%s'."
 msgstr "Log zosta� zapisany do pliku '%s'."
 
-#: ../include/wx/xti.h:469
-#: ../include/wx/xti.h:473
+#: ../include/wx/xti.h:469 ../include/wx/xti.h:473
 msgid "Long Conversions not supported"
 msgstr ""
 
@@ -2172,8 +2123,12 @@ msgid "MDI child"
 msgstr "potomek MDI"
 
 #: ../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:4678
 msgid "Ma&ximize"
@@ -2245,10 +2200,8 @@ msgid "New item"
 msgstr "Nowa pozycja"
 
 # To jest maska do tworzenia nazw typu NowaNaz1 itd
-#: ../src/generic/dirdlgg.cpp:274
-#: ../src/generic/dirdlgg.cpp:284
-#: ../src/generic/filedlgg.cpp:587
-#: ../src/generic/filedlgg.cpp:596
+#: ../src/generic/dirdlgg.cpp:274 ../src/generic/dirdlgg.cpp:284
+#: ../src/generic/filedlgg.cpp:587 ../src/generic/filedlgg.cpp:596
 msgid "NewName"
 msgstr "NowaNaz"
 
@@ -2256,10 +2209,8 @@ msgstr "NowaNaz"
 msgid "Next page"
 msgstr "Nast�pna strona"
 
-#: ../src/common/dlgcmn.cpp:213
-#: ../src/mac/msgdlg.cpp:56
-#: ../src/mac/msgdlg.cpp:140
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:213 ../src/mac/msgdlg.cpp:56
+#: ../src/mac/msgdlg.cpp:140 ../src/motif/msgdlg.cpp:182
 msgid "No"
 msgstr "Nie"
 
@@ -2276,7 +2227,8 @@ msgstr "Nie znaleziono pozycji."
 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"
@@ -2298,20 +2250,17 @@ msgstr ""
 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:1162
-#: ../src/common/image.cpp:1205
+#: ../src/common/image.cpp:1162 ../src/common/image.cpp:1205
 msgid "No handler found for image type."
 msgstr "Brak procedury obs�ugi grafiki."
 
-#: ../src/common/image.cpp:1170
-#: ../src/common/image.cpp:1213
+#: ../src/common/image.cpp:1170 ../src/common/image.cpp:1213
 #: ../src/common/image.cpp:1247
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "Brak procedury obs�ugi obraz�w typu %d."
 
-#: ../src/common/image.cpp:1231
-#: ../src/common/image.cpp:1263
+#: ../src/common/image.cpp:1231 ../src/common/image.cpp:1263
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "Brak procedury obs�ugi obraz�w typu %s."
@@ -2328,8 +2277,7 @@ msgstr "Brak d
 msgid "Nordic (ISO-8859-10)"
 msgstr "Nordycki (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:227
-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/generic/fontdlgg.cpp:227 ../src/generic/fontdlgg.cpp:230
 msgid "Normal"
 msgstr "Normalny"
 
@@ -2345,16 +2293,11 @@ msgstr "Normalna czcionka:"
 msgid "Note, 8 1/2 x 11 in"
 msgstr "Note, 8 1/2 x 11 in"
 
-#: ../src/common/dlgcmn.cpp:219
-#: ../src/generic/dirdlgg.cpp:153
-#: ../src/generic/filedlgg.cpp:976
-#: ../src/generic/filedlgg.cpp:987
-#: ../src/generic/fontdlgg.cpp:254
-#: ../src/generic/logg.cpp:748
-#: ../src/generic/prntdlgg.cpp:454
-#: ../src/gtk/filedlg.cpp:162
-#: ../src/gtk/fontdlg.cpp:139
-#: ../src/html/helpfrm.cpp:1064
+#: ../src/common/dlgcmn.cpp:219 ../src/generic/dirdlgg.cpp:153
+#: ../src/generic/filedlgg.cpp:976 ../src/generic/filedlgg.cpp:987
+#: ../src/generic/fontdlgg.cpp:254 ../src/generic/logg.cpp:748
+#: ../src/generic/prntdlgg.cpp:454 ../src/gtk/filedlg.cpp:162
+#: ../src/gtk/fontdlg.cpp:139 ../src/html/helpfrm.cpp:1064
 msgid "OK"
 msgstr "OK"
 
@@ -2362,20 +2305,16 @@ msgstr "OK"
 msgid "Objects must have an id attribute"
 msgstr ""
 
-#: ../src/common/docview.cpp:1197
-#: ../src/common/docview.cpp:1525
+#: ../src/common/docview.cpp:1197 ../src/common/docview.cpp:1525
 msgid "Open File"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:571
-#: ../src/html/helpfrm.cpp:1404
+#: ../src/html/helpfrm.cpp:571 ../src/html/helpfrm.cpp:1404
 msgid "Open HTML document"
 msgstr "Otw�rz dokument HTML"
 
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:739
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:739
 msgid "Operation not permitted."
 msgstr "Operacja nie jest dozwolona."
 
@@ -2398,13 +2337,11 @@ msgstr "Opcja '%s': nie mo
 msgid "Options"
 msgstr "Opcje"
 
-#: ../src/generic/prntdlgg.cpp:430
-#: ../src/generic/prntdlgg.cpp:639
+#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:639
 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."
 
@@ -2420,8 +2357,7 @@ msgstr "PCX: nieprawid
 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 !!!"
 
@@ -2459,14 +2395,12 @@ msgstr "Ustawienia strony"
 msgid "Pages"
 msgstr "Strony"
 
-#: ../src/generic/prntdlgg.cpp:545
-#: ../src/generic/prntdlgg.cpp:625
+#: ../src/generic/prntdlgg.cpp:545 ../src/generic/prntdlgg.cpp:625
 #: ../src/generic/prntdlgg.cpp:818
 msgid "Paper Size"
 msgstr "Rozmiar papieru"
 
-#: ../src/generic/prntdlgg.cpp:420
-#: ../src/generic/prntdlgg.cpp:612
+#: ../src/generic/prntdlgg.cpp:420 ../src/generic/prntdlgg.cpp:612
 #: ../src/generic/prntdlgg.cpp:813
 msgid "Paper size"
 msgstr "Rozmiar papieru"
@@ -2479,8 +2413,7 @@ msgstr ""
 msgid "Passing a already registered object to SetObjectName"
 msgstr ""
 
-#: ../src/common/xtistrm.cpp:434
-#: ../src/common/xtistrm.cpp:654
+#: ../src/common/xtistrm.cpp:434 ../src/common/xtistrm.cpp:654
 msgid "Passing an unkown object to GetObject"
 msgstr ""
 
@@ -2497,8 +2430,7 @@ msgstr "Nie uda
 msgid "Please choose a valid font."
 msgstr "Prosz� wybra� poprawn� czcionk�."
 
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 msgid "Please choose an existing file."
 msgstr "Prosz� wybra� istniej�cy plik."
 
@@ -2521,8 +2453,7 @@ msgstr ""
 msgid "Please wait while printing\n"
 msgstr "Prosz� czeka�, trwa drukowanie\n"
 
-#: ../src/generic/prntdlgg.cpp:427
-#: ../src/generic/prntdlgg.cpp:637
+#: ../src/generic/prntdlgg.cpp:427 ../src/generic/prntdlgg.cpp:637
 msgid "Portrait"
 msgstr "Portret"
 
@@ -2538,8 +2469,7 @@ msgstr "Podgl
 msgid "Previous page"
 msgstr "Poprzednia strona"
 
-#: ../src/generic/prntdlgg.cpp:107
-#: ../src/generic/prntdlgg.cpp:121
+#: ../src/generic/prntdlgg.cpp:107 ../src/generic/prntdlgg.cpp:121
 msgid "Print"
 msgstr "Drukuj"
 
@@ -2547,8 +2477,7 @@ msgstr "Drukuj"
 msgid "Print Preview"
 msgstr "Podgl�d wydruku"
 
-#: ../src/common/prntbase.cpp:784
-#: ../src/common/prntbase.cpp:810
+#: ../src/common/prntbase.cpp:784 ../src/common/prntbase.cpp:810
 msgid "Print Preview Failure"
 msgstr "Awaria podgl�du wydruku"
 
@@ -2592,8 +2521,7 @@ msgstr "Opcje drukarki:"
 msgid "Printer..."
 msgstr "Drukarka..."
 
-#: ../src/common/prntbase.cpp:109
-#: ../src/common/prntbase.cpp:154
+#: ../src/common/prntbase.cpp:109 ../src/common/prntbase.cpp:154
 msgid "Printing "
 msgstr "Drukowanie "
 
@@ -2622,8 +2550,7 @@ msgstr "Quarto, 215 x 275 mm"
 msgid "Question"
 msgstr "Pytanie"
 
-#: ../src/common/ffile.cpp:111
-#: ../src/common/ffile.cpp:132
+#: ../src/common/ffile.cpp:111 ../src/common/ffile.cpp:132
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "B��d odczytu pliku '%s'"
@@ -2713,14 +2640,17 @@ msgstr "Zapisz zawarto
 msgid "Script"
 msgstr "Script"
 
-#: ../src/html/helpfrm.cpp:443
-#: ../src/html/helpfrm.cpp:458
+#: ../src/html/helpfrm.cpp:443 ../src/html/helpfrm.cpp:458
 msgid "Search"
 msgstr "Szukaj"
 
 #: ../src/html/helpfrm.cpp:445
-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:152
 msgid "Search direction"
@@ -2798,8 +2728,7 @@ msgstr "Poka
 msgid "Show hidden directories"
 msgstr "Poka� ukryte katalogi"
 
-#: ../src/generic/filedlgg.cpp:971
-#: ../src/generic/filedlgg.cpp:993
+#: ../src/generic/filedlgg.cpp:971 ../src/generic/filedlgg.cpp:993
 msgid "Show hidden files"
 msgstr "Pokazuj pliki ukryte"
 
@@ -2819,8 +2748,7 @@ msgstr "Pochylony"
 msgid "Sorry, could not open this file for saving."
 msgstr "Niestety nie mo�na otworzy� tego pliku do zapisu."
 
-#: ../src/common/docview.cpp:367
-#: ../src/common/docview.cpp:380
+#: ../src/common/docview.cpp:367 ../src/common/docview.cpp:380
 #: ../src/common/docview.cpp:1504
 msgid "Sorry, could not open this file."
 msgstr "Niestety nie mo�na otworzy� tego pliku."
@@ -2837,8 +2765,7 @@ msgstr "Niestety za ma
 msgid "Sorry, print preview needs a printer to be installed."
 msgstr "Niestety, podgl�d wydruku wymaga zainstalowania drukarki."
 
-#: ../src/common/docview.cpp:1196
-#: ../src/common/docview.cpp:1524
+#: ../src/common/docview.cpp:1196 ../src/common/docview.cpp:1524
 msgid "Sorry, the format for this file is unknown."
 msgstr "Niestety, nieznany format pliku."
 
@@ -2868,8 +2795,7 @@ msgstr ""
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "Nieprawid�owa specyfikacja koloru : %s"
 
-#: ../include/wx/xti.h:396
-#: ../include/wx/xti.h:400
+#: ../include/wx/xti.h:396 ../include/wx/xti.h:400
 msgid "String conversions not supported"
 msgstr ""
 
@@ -2882,8 +2808,7 @@ msgstr "Nie znaleziono podklasy '%s' dla zasobu '%s', bez podklas!"
 msgid "Swiss"
 msgstr "Swiss"
 
-#: ../src/common/imagtiff.cpp:232
-#: ../src/common/imagtiff.cpp:243
+#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
 #: ../src/common/imagtiff.cpp:354
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: Nie mo�na przydzieli� pami�ci."
@@ -2988,24 +2913,41 @@ msgstr "Warto
 
 #: ../src/msw/dialup.cpp:406
 #, 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:580
-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/thread.cpp:1197
-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:1600
 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:1185
-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."
@@ -3048,8 +2990,7 @@ msgstr "G
 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"
 
@@ -3061,8 +3002,7 @@ msgstr "Turecki (ISO-8859-9)"
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/common/xtistrm.cpp:279
-#: ../src/common/xtixml.cpp:351
+#: ../src/common/xtistrm.cpp:279 ../src/common/xtixml.cpp:351
 #: ../src/common/xtixml.cpp:498
 msgid "Type must have enum - long conversion"
 msgstr ""
@@ -3145,8 +3085,7 @@ msgstr "Nieznane pole w pliku %s, linia %d: '%s'."
 msgid "Unknown long option '%s'"
 msgstr "Nieznana d�uga opcja '%s'"
 
-#: ../src/common/cmdline.cpp:582
-#: ../src/common/cmdline.cpp:603
+#: ../src/common/cmdline.cpp:582 ../src/common/cmdline.cpp:603
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "Nieznana opcja '%s'"
@@ -3166,14 +3105,12 @@ msgstr "Nieznana w
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "Nieodpowiedni '{' in w pozycji dla typu mime %s."
 
-#: ../src/common/cmdproc.cpp:254
-#: ../src/common/cmdproc.cpp:280
+#: ../src/common/cmdproc.cpp:254 ../src/common/cmdproc.cpp:280
 #: ../src/common/cmdproc.cpp:300
 msgid "Unnamed command"
 msgstr "Polecenie bez nazwy"
 
-#: ../src/mac/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:273
+#: ../src/mac/clipbrd.cpp:64 ../src/msw/clipbrd.cpp:273
 #: ../src/msw/clipbrd.cpp:445
 msgid "Unsupported clipboard format."
 msgstr "Nieobs�ugiwany format schowka."
@@ -3231,7 +3168,9 @@ msgstr "Ostrze
 
 #: ../src/html/htmlpars.cpp:390
 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:102
 msgid "Western European (ISO-8859-1)"
@@ -3332,8 +3271,7 @@ msgstr "B
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: Zniekszta�cone dane obrazu!"
 
-#: ../src/common/xpmdecod.cpp:712
-#: ../src/common/xpmdecod.cpp:722
+#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:722
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr "XPM: niepoprawna definicja koloru '%s'!"
@@ -3343,8 +3281,7 @@ msgstr "XPM: niepoprawna definicja koloru '%s'!"
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "Nie znaleziono zasobu XRC '%s' (klasa '%s')!"
 
-#: ../contrib/src/xrc/xmlres.cpp:885
-#: ../contrib/src/xrc/xmlres.cpp:897
+#: ../contrib/src/xrc/xmlres.cpp:885 ../contrib/src/xrc/xmlres.cpp:897
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "Zasoby XRC: Nie mo�na utworzy� mapy bitowej z '%s'."
@@ -3352,12 +3289,11 @@ msgstr "Zasoby XRC: Nie mo
 #: ../contrib/src/xrc/xmlres.cpp:845
 #, 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/common/dlgcmn.cpp:208
-#: ../src/mac/msgdlg.cpp:57
-#: ../src/mac/msgdlg.cpp:139
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:208 ../src/mac/msgdlg.cpp:57
+#: ../src/mac/msgdlg.cpp:139 ../src/motif/msgdlg.cpp:182
 msgid "Yes"
 msgstr "Tak"
 
@@ -3365,8 +3301,7 @@ msgstr "Tak"
 msgid "You cannot add a new directory to this section."
 msgstr "Nie mo�esz doda� nowego katalogu do tej sekcji."
 
-#: ../src/common/fs_zip.cpp:88
-#: ../src/common/fs_zip.cpp:138
+#: ../src/common/fs_zip.cpp:88 ../src/common/fs_zip.cpp:138
 msgid "ZIP handler currently supports only local files!"
 msgstr "Obs�ugiwane s� tylko lokalne pliki ZIP!"
 
@@ -3381,11 +3316,13 @@ msgstr "Aplikacja DDEML utworzy
 # instance -->
 #: ../src/msw/dde.cpp:1063
 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."
 
@@ -3403,19 +3340,23 @@ msgstr "parametr nie przeszed
 
 #: ../src/msw/dde.cpp:1054
 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:1060
 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:1069
 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:1087
 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:1102
 msgid "a request to end an advise transaction has timed out."
@@ -3539,8 +3480,7 @@ msgstr "nie mo
 msgid "can't flush file descriptor %d"
 msgstr "nie mo�na opr�ni� deskryptora pliku %d"
 
-#: ../src/common/file.cpp:535
-#: ../src/common/file.cpp:543
+#: ../src/common/file.cpp:535 ../src/common/file.cpp:543
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "nie mo�na odczyta� bie��cej pozycji w deskryptorze pliku %d"
@@ -3549,8 +3489,7 @@ msgstr "nie mo
 msgid "can't load any font, aborting"
 msgstr "nie mo�na za�adowa� �adnej czcionki, program ko�czy prac�"
 
-#: ../src/common/ffile.cpp:63
-#: ../src/common/file.cpp:352
+#: ../src/common/ffile.cpp:63 ../src/common/file.cpp:352
 #, c-format
 msgid "can't open file '%s'"
 msgstr "nie mo�na otworzy� pliku '%s'"
@@ -3589,8 +3528,7 @@ msgstr "nie mo
 msgid "can't remove temporary file '%s'"
 msgstr "nie mo�na usun�� tymczasowego pliku '%s'"
 
-#: ../src/common/file.cpp:492
-#: ../src/common/file.cpp:518
+#: ../src/common/file.cpp:492 ../src/common/file.cpp:518
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "nie mo�na ustawi� pozycji w deskryptorze pliku %d"
@@ -3760,8 +3698,7 @@ msgstr "b
 msgid "invalid message box return value"
 msgstr "warto�� zwr�cona przez okno komunikatu jest nieprawid�owa"
 
-#: ../src/common/fontcmn.cpp:473
-#: ../src/common/fontcmn.cpp:537
+#: ../src/common/fontcmn.cpp:473 ../src/common/fontcmn.cpp:537
 msgid "italic"
 msgstr "kursywa"
 
@@ -3909,8 +3846,7 @@ msgstr "trzeci"
 msgid "thirteenth"
 msgstr "trzynasty"
 
-#: ../src/common/imagtiff.cpp:143
-#: ../src/common/imagtiff.cpp:151
+#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
 #, c-format
 msgid "tiff module: %s"
 msgstr "modu� tiff: %s"
@@ -3953,8 +3889,7 @@ msgstr "nieznany"
 msgid "unknown class %s"
 msgstr "nieznana klasa %s"
 
-#: ../src/common/regex.cpp:151
-#: ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:151 ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr "nieznany b��d"
 
@@ -3967,8 +3902,7 @@ msgstr "nieznany b
 msgid "unknown line terminator"
 msgstr "nieznany znacznik ko�ca linii"
 
-#: ../src/common/file.cpp:474
-#: ../src/common/file.cpp:501
+#: ../src/common/file.cpp:474 ../src/common/file.cpp:501
 msgid "unknown seek origin"
 msgstr "nieznany odno�nik pozycjonowania"
 
@@ -4007,8 +3941,7 @@ msgstr "zapisu"
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay zwr�ci�o b��d."
 
-#: ../src/common/socket.cpp:395
-#: ../src/common/socket.cpp:449
+#: ../src/common/socket.cpp:395 ../src/common/socket.cpp:449
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: b��dna sygnatura w ReadMsg."
 
@@ -4029,8 +3962,7 @@ msgstr "Nie mo
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: ../src/common/zstream.cpp:141
-#: ../src/common/zstream.cpp:275
+#: ../src/common/zstream.cpp:141 ../src/common/zstream.cpp:275
 #, c-format
 msgid "zlib error %d"
 msgstr "b��d biblioteki zlib %d"
@@ -4038,4 +3970,3 @@ msgstr "b
 #: ../src/common/prntbase.cpp:450
 msgid "|<<"
 msgstr "|<<"
-
diff --git a/locale/ru.po b/locale/ru.po
index cf30cf9ae6..37e4937530 100644
--- a/locale/ru.po
+++ b/locale/ru.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWindows-2.5.1\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-04 18:56+0100\n"
 "PO-Revision-Date: 2004-05-06 09:55+0100\n"
 "Last-Translator: W?odzimierz ABX Skiba <abx@abx.art.pl>\n"
@@ -42,10 +43,8 @@ msgstr "#14 Envelope, 5 x 11 1/2 
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "#9 Envelope, 3 7/8 x 8 7/8 ����"
 
-#: ../src/html/helpfrm.cpp:867
-#: ../src/html/helpfrm.cpp:868
-#: ../src/html/helpfrm.cpp:1505
-#: ../src/html/helpfrm.cpp:1535
+#: ../src/html/helpfrm.cpp:867 ../src/html/helpfrm.cpp:868
+#: ../src/html/helpfrm.cpp:1505 ../src/html/helpfrm.cpp:1535
 #, c-format
 msgid "%i of %i"
 msgstr "%i �� %i"
@@ -88,8 +87,7 @@ msgstr ""
 msgid "&Arrange Icons"
 msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:164
-#: ../src/generic/wizard.cpp:401
+#: ../src/generic/fdrepdlg.cpp:164 ../src/generic/wizard.cpp:401
 msgid "&Cancel"
 msgstr "&������"
 
@@ -97,10 +95,8 @@ msgstr "&
 msgid "&Cascade"
 msgstr ""
 
-#: ../src/common/prntbase.cpp:439
-#: ../src/generic/logg.cpp:502
-#: ../src/generic/tipdlg.cpp:213
-#: ../src/html/helpfrm.cpp:271
+#: ../src/common/prntbase.cpp:439 ../src/generic/logg.cpp:502
+#: ../src/generic/tipdlg.cpp:213 ../src/html/helpfrm.cpp:271
 msgid "&Close"
 msgstr "&�������"
 
@@ -141,13 +137,11 @@ msgstr "&
 msgid "&Move"
 msgstr ""
 
-#: ../src/generic/mdig.cpp:117
-#: ../src/msw/mdi.cpp:192
+#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:192
 msgid "&Next"
 msgstr "&���������"
 
-#: ../src/generic/wizard.cpp:400
-#: ../src/generic/wizard.cpp:582
+#: ../src/generic/wizard.cpp:400 ../src/generic/wizard.cpp:582
 msgid "&Next >"
 msgstr "&��������� >"
 
@@ -165,8 +159,7 @@ msgstr "&
 msgid "&Paste"
 msgstr "����"
 
-#: ../src/generic/mdig.cpp:118
-#: ../src/msw/mdi.cpp:193
+#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:193
 #, fuzzy
 msgid "&Previous"
 msgstr "���������� ��������"
@@ -176,14 +169,12 @@ msgstr "
 msgid "&Print..."
 msgstr "������..."
 
-#: ../src/common/cmdproc.cpp:285
-#: ../src/common/cmdproc.cpp:292
+#: ../src/common/cmdproc.cpp:285 ../src/common/cmdproc.cpp:292
 #: ../src/msw/textctrl.cpp:2048
 msgid "&Redo"
 msgstr "&������������"
 
-#: ../src/common/cmdproc.cpp:281
-#: ../src/common/cmdproc.cpp:301
+#: ../src/common/cmdproc.cpp:281 ../src/common/cmdproc.cpp:301
 msgid "&Redo "
 msgstr "&������������ "
 
@@ -195,8 +186,7 @@ msgstr "&
 msgid "&Restore"
 msgstr "&������������"
 
-#: ../src/generic/logg.cpp:498
-#: ../src/generic/logg.cpp:827
+#: ../src/generic/logg.cpp:498 ../src/generic/logg.cpp:827
 msgid "&Save..."
 msgstr "&���������..."
 
@@ -208,8 +198,7 @@ msgstr "&
 msgid "&Size"
 msgstr "&������"
 
-#: ../src/common/cmdproc.cpp:263
-#: ../src/msw/textctrl.cpp:2047
+#: ../src/common/cmdproc.cpp:263 ../src/msw/textctrl.cpp:2047
 msgid "&Undo"
 msgstr "�&�������"
 
@@ -217,23 +206,18 @@ msgstr "
 msgid "&Undo "
 msgstr "�&������� "
 
-#: ../src/generic/mdig.cpp:297
-#: ../src/generic/mdig.cpp:313
-#: ../src/generic/mdig.cpp:317
-#: ../src/msw/mdi.cpp:1333
-#: ../src/msw/mdi.cpp:1340
+#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
+#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1333 ../src/msw/mdi.cpp:1340
 #: ../src/msw/mdi.cpp:1370
 msgid "&Window"
 msgstr "&����"
 
-#: ../src/common/config.cpp:414
-#: ../src/msw/regconf.cpp:265
+#: ../src/common/config.cpp:414 ../src/msw/regconf.cpp:265
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' �������� ������ '..', ���������������."
 
-#: ../src/common/valtext.cpp:136
-#: ../src/common/valtext.cpp:166
+#: ../src/common/valtext.cpp:136 ../src/common/valtext.cpp:166
 #: ../src/common/valtext.cpp:172
 #, c-format
 msgid "'%s' is invalid"
@@ -278,19 +262,16 @@ msgstr "'%s' 
 msgid "(Help)"
 msgstr "(������)"
 
-#: ../src/html/helpfrm.cpp:345
-#: ../src/html/helpfrm.cpp:935
+#: ../src/html/helpfrm.cpp:345 ../src/html/helpfrm.cpp:935
 #: ../src/html/helpfrm.cpp:1563
 msgid "(bookmarks)"
 msgstr "(��������)"
 
-#: ../src/generic/dirctrlg.cpp:677
-#: ../src/generic/filedlgg.cpp:707
+#: ../src/generic/dirctrlg.cpp:677 ../src/generic/filedlgg.cpp:707
 msgid "."
 msgstr "."
 
-#: ../src/generic/dirctrlg.cpp:678
-#: ../src/generic/filedlgg.cpp:708
+#: ../src/generic/dirctrlg.cpp:678 ../src/generic/filedlgg.cpp:708
 msgid ".."
 msgstr ".."
 
@@ -330,19 +311,16 @@ msgstr "< &
 msgid "<<"
 msgstr "<<"
 
-#: ../src/generic/filedlgg.cpp:248
-#: ../src/generic/filedlgg.cpp:271
+#: ../src/generic/filedlgg.cpp:248 ../src/generic/filedlgg.cpp:271
 msgid "<DIR>"
 msgstr "<DIR>"
 
-#: ../src/generic/filedlgg.cpp:252
-#: ../src/generic/filedlgg.cpp:275
+#: ../src/generic/filedlgg.cpp:252 ../src/generic/filedlgg.cpp:275
 #, fuzzy
 msgid "<DRIVE>"
 msgstr "<DIR>"
 
-#: ../src/generic/filedlgg.cpp:250
-#: ../src/generic/filedlgg.cpp:273
+#: ../src/generic/filedlgg.cpp:250 ../src/generic/filedlgg.cpp:273
 msgid "<LINK>"
 msgstr "<LINK>"
 
@@ -478,8 +456,7 @@ msgstr "
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 Envelope, 176 x 125 ��"
 
-#: ../src/common/imagbmp.cpp:470
-#: ../src/common/imagbmp.cpp:486
+#: ../src/common/imagbmp.cpp:470 ../src/common/imagbmp.cpp:486
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: ���������� ������������ ������."
 
@@ -558,8 +535,7 @@ msgstr "C6 Envelope, 114 x 162 
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 Envelope, 114 x 229 ��"
 
-#: ../src/html/chm.cpp:783
-#: ../src/html/chm.cpp:842
+#: ../src/html/chm.cpp:783 ../src/html/chm.cpp:842
 msgid "CHM handler currently supports only local files!"
 msgstr ""
 
@@ -573,8 +549,7 @@ msgstr "
 msgid "Can not enumerate files '%s'"
 msgstr "�� ���� ���������� ����� � �������� '%s'"
 
-#: ../src/msw/dir.cpp:300
-#: ../src/unix/dir.cpp:232
+#: ../src/msw/dir.cpp:300 ../src/unix/dir.cpp:232
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "�� ���� ���������� ����� � �������� '%s'"
@@ -584,8 +559,7 @@ msgstr "
 msgid "Can not resume thread %lu"
 msgstr "���������� ����������� ���� %lu"
 
-#: ../src/mac/thread.cpp:477
-#: ../src/msw/thread.cpp:821
+#: ../src/mac/thread.cpp:477 ../src/msw/thread.cpp:821
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "���������� ����������� ���� %x"
@@ -599,8 +573,7 @@ msgstr "
 msgid "Can not suspend thread %lu"
 msgstr "���������� ���������� ���� %lu"
 
-#: ../src/mac/thread.cpp:453
-#: ../src/msw/thread.cpp:806
+#: ../src/mac/thread.cpp:453 ../src/msw/thread.cpp:806
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "���������� ���������� ���� %x"
@@ -637,8 +610,7 @@ msgstr "
 msgid "Can't create registry key '%s'"
 msgstr "���������� ������� ���� registry '%s'"
 
-#: ../src/mac/thread.cpp:430
-#: ../src/msw/thread.cpp:593
+#: ../src/mac/thread.cpp:430 ../src/msw/thread.cpp:593
 #: ../src/os2/thread.cpp:491
 msgid "Can't create thread"
 msgstr "���������� ������� ����"
@@ -653,8 +625,7 @@ msgstr "
 msgid "Can't delete key '%s'"
 msgstr "���������� ������� ���� '%s'"
 
-#: ../src/msw/iniconf.cpp:444
-#: ../src/os2/iniconf.cpp:448
+#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "���������� ������� INI-���� '%s'"
@@ -699,8 +670,7 @@ msgstr "
 msgid "Can't initialize zlib inflate stream."
 msgstr "���������� ������������������� OLE"
 
-#: ../src/common/image.cpp:1028
-#: ../src/common/image.cpp:1048
+#: ../src/common/image.cpp:1028 ../src/common/image.cpp:1048
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
 msgstr "�� ���� ��������� ����������� �� ����� '%s': ���� �� ����������."
@@ -724,8 +694,7 @@ msgstr ""
 msgid "Can't read value of '%s'"
 msgstr "���������� ��������� �������� '%s'"
 
-#: ../src/msw/registry.cpp:808
-#: ../src/msw/registry.cpp:842
+#: ../src/msw/registry.cpp:808 ../src/msw/registry.cpp:842
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr "���������� ��������� �������� ����� '%s'"
@@ -735,18 +704,15 @@ msgstr "
 msgid "Can't save image to file '%s': unknown extension."
 msgstr "���������� ��������� ����������� � ���� '%s': ����������� ����������."
 
-#: ../src/generic/logg.cpp:562
-#: ../src/generic/logg.cpp:994
+#: ../src/generic/logg.cpp:562 ../src/generic/logg.cpp:994
 msgid "Can't save log contents to file."
 msgstr "�� ���� ��������� ���������� ������� � ����."
 
-#: ../src/msw/thread.cpp:549
-#: ../src/os2/thread.cpp:473
+#: ../src/msw/thread.cpp:549 ../src/os2/thread.cpp:473
 msgid "Can't set thread priority"
 msgstr "���������� ���������� ��������� ����"
 
-#: ../src/msw/registry.cpp:829
-#: ../src/msw/registry.cpp:954
+#: ../src/msw/registry.cpp:829 ../src/msw/registry.cpp:954
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr "���������� ���������� �������� '%s'"
@@ -756,22 +722,16 @@ msgstr "
 msgid "Can't write to deflate stream: %s\n"
 msgstr "���������� �������� � ���� � ������������ %d"
 
-#: ../src/common/dlgcmn.cpp:240
-#: ../src/generic/dirdlgg.cpp:155
-#: ../src/generic/filedlgg.cpp:977
-#: ../src/generic/filedlgg.cpp:996
-#: ../src/generic/fontdlgg.cpp:255
-#: ../src/generic/prntdlgg.cpp:455
-#: ../src/generic/progdlgg.cpp:211
-#: ../src/gtk/filedlg.cpp:168
-#: ../src/gtk/fontdlg.cpp:147
-#: ../src/html/helpfrm.cpp:1066
+#: ../src/common/dlgcmn.cpp:240 ../src/generic/dirdlgg.cpp:155
+#: ../src/generic/filedlgg.cpp:977 ../src/generic/filedlgg.cpp:996
+#: ../src/generic/fontdlgg.cpp:255 ../src/generic/prntdlgg.cpp:455
+#: ../src/generic/progdlgg.cpp:211 ../src/gtk/filedlg.cpp:168
+#: ../src/gtk/fontdlg.cpp:147 ../src/html/helpfrm.cpp:1066
 #: ../src/motif/msgdlg.cpp:182
 msgid "Cancel"
 msgstr "������"
 
-#: ../contrib/src/xrc/xmlres.cpp:987
-#: ../contrib/src/xrc/xmlres.cpp:1028
+#: ../contrib/src/xrc/xmlres.cpp:987 ../contrib/src/xrc/xmlres.cpp:1028
 msgid "Cannot convert dialog units: dialog unknown."
 msgstr ""
 
@@ -816,8 +776,7 @@ msgstr "
 msgid "Cannot hang up - no active dialup connection."
 msgstr "���������� �������� ������ - ��� �������������."
 
-#: ../src/msw/app.cpp:290
-#: ../src/msw/app.cpp:293
+#: ../src/msw/app.cpp:290 ../src/msw/app.cpp:293
 msgid "Cannot initialize OLE"
 msgstr "���������� ������������������� OLE"
 
@@ -894,8 +853,7 @@ msgstr "
 msgid "Cannot print empty page."
 msgstr "���������� ���������� ������ ��������."
 
-#: ../src/msw/volume.cpp:160
-#: ../src/msw/volume.cpp:491
+#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
 #, fuzzy, c-format
 msgid "Cannot read typename from '%s'!"
 msgstr "���������� ������� ���� ����������: %s"
@@ -968,8 +926,7 @@ msgstr "
 msgid "Config entry name cannot start with '%c'."
 msgstr "��� ���� � ����� ������������ �� ����� ���������� � '%c'."
 
-#: ../src/generic/filedlgg.cpp:1214
-#: ../src/gtk/filedlg.cpp:74
+#: ../src/generic/filedlgg.cpp:1214 ../src/gtk/filedlg.cpp:74
 msgid "Confirm"
 msgstr "�����������"
 
@@ -1027,8 +984,7 @@ msgstr "
 msgid "Could not start document preview."
 msgstr "���������� ������ ����-������ ���������."
 
-#: ../src/generic/printps.cpp:221
-#: ../src/msw/printwin.cpp:245
+#: ../src/generic/printps.cpp:221 ../src/msw/printwin.cpp:245
 msgid "Could not start printing."
 msgstr "���������� ������ ������."
 
@@ -1040,21 +996,17 @@ msgstr "
 msgid "Couldn't acquire a mutex lock"
 msgstr "���������� �������� �������"
 
-#: ../src/msw/dragimag.cpp:166
-#: ../src/msw/dragimag.cpp:206
-#: ../src/msw/imaglist.cpp:156
-#: ../src/msw/imaglist.cpp:174
+#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
+#: ../src/msw/imaglist.cpp:156 ../src/msw/imaglist.cpp:174
 #: ../src/msw/imaglist.cpp:186
 msgid "Couldn't add an image to the image list."
 msgstr "���������� �������� ����������� � ������ �����������."
 
-#: ../src/msw/timer.cpp:101
-#: ../src/os2/timer.cpp:118
+#: ../src/msw/timer.cpp:101 ../src/os2/timer.cpp:118
 msgid "Couldn't create a timer"
 msgstr "���������� ������� ������"
 
-#: ../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 "���������� ������� ������"
 
@@ -1063,14 +1015,15 @@ msgstr "
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "���������� ����� ������ '%s' � ������������ ����������"
 
-#: ../src/mac/thread.cpp:507
-#: ../src/msw/thread.cpp:847
+#: ../src/mac/thread.cpp:507 ../src/msw/thread.cpp:847
 msgid "Couldn't get the current thread pointer"
 msgstr "���������� �������� ��������� �� ������� ����"
 
 #: ../src/common/imagpng.cpp:607
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
-msgstr "���������� ��������� ����������� PNG - �������� ���� ��������� ��� ������������ ������."
+msgstr ""
+"���������� ��������� ����������� PNG - �������� ���� ��������� ��� "
+"������������ ������."
 
 #: ../src/unix/sound.cpp:412
 #, fuzzy, c-format
@@ -1096,14 +1049,12 @@ msgstr "
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "���������� ������� ���������� �� �������� ������ %d."
 
-#: ../src/common/imagpng.cpp:647
-#: ../src/common/imagpng.cpp:658
+#: ../src/common/imagpng.cpp:647 ../src/common/imagpng.cpp:658
 #: ../src/common/imagpng.cpp:666
 msgid "Couldn't save PNG image."
 msgstr "���������� ��������� ����������� PNG."
 
-#: ../src/mac/thread.cpp:756
-#: ../src/msw/thread.cpp:610
+#: ../src/mac/thread.cpp:756 ../src/msw/thread.cpp:610
 msgid "Couldn't terminate thread"
 msgstr "�� ������� ��������� ����"
 
@@ -1115,8 +1066,7 @@ msgstr ""
 msgid "Create directory"
 msgstr "������� �������"
 
-#: ../src/generic/dirdlgg.cpp:105
-#: ../src/generic/filedlgg.cpp:931
+#: ../src/generic/dirdlgg.cpp:105 ../src/generic/filedlgg.cpp:931
 msgid "Create new directory"
 msgstr "������� ����� �������"
 
@@ -1189,8 +1139,12 @@ msgid "Deleted stale lock file '%s'."
 msgstr "���������� ������� INI-���� '%s'"
 
 #: ../src/msw/dialup.cpp:346
-msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."
-msgstr "������ ���������� ������������� (RAS) �� ���������� �� ���� ������. ���������� ���������� ���."
+msgid ""
+"Dial up functions are unavailable because the remote access service (RAS) is "
+"not installed on this machine. Please install it."
+msgstr ""
+"������ ���������� ������������� (RAS) �� ���������� �� ���� ������. "
+"���������� ���������� ���."
 
 #: ../src/generic/tipdlg.cpp:220
 msgid "Did you know..."
@@ -1216,7 +1170,9 @@ msgid "Directory doesn't exist."
 msgstr "������� �� ����������"
 
 #: ../src/html/helpfrm.cpp:409
-msgid "Display all index items that contain given substring. Search is case insensitive."
+msgid ""
+"Display all index items that contain given substring. Search is case "
+"insensitive."
 msgstr ""
 "������� ��� ������ ������� ���������� ������ ���������. ����� ��� ����� \n"
 "��������."
@@ -1227,7 +1183,8 @@ msgstr "
 
 #: ../src/msw/mimetype.cpp:672
 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"
@@ -1280,27 +1237,22 @@ msgstr "
 
 #: ../src/common/config.cpp:366
 #, c-format
-msgid "Environment variables expansion failed: missing '%c' at position %d in '%s'."
-msgstr "������ ��������� ���������� ���������: ����������� '%c' � ������� %d � '%s'."
+msgid ""
+"Environment variables expansion failed: missing '%c' at position %d in '%s'."
+msgstr ""
+"������ ��������� ���������� ���������: ����������� '%c' � ������� %d � '%s'."
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:711
-#: ../src/generic/filedlgg.cpp:725
-#: ../src/generic/filedlgg.cpp:739
-#: ../src/generic/filedlgg.cpp:1166
-#: ../src/generic/filedlgg.cpp:1191
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/dirctrlg.cpp:701
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:711
+#: ../src/generic/filedlgg.cpp:725 ../src/generic/filedlgg.cpp:739
+#: ../src/generic/filedlgg.cpp:1166 ../src/generic/filedlgg.cpp:1191
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 #: ../src/gtk/fontdlg.cpp:76
 msgid "Error"
 msgstr "������"
 
-#: ../src/unix/utilsunx.cpp:1030
-#: ../src/unix/utilsunx.cpp:1038
+#: ../src/unix/utilsunx.cpp:1030 ../src/unix/utilsunx.cpp:1038
 msgid "Error "
 msgstr "������ "
 
@@ -1475,8 +1427,7 @@ msgstr ""
 msgid "Failed to display HTML document in %s encoding"
 msgstr "�� ������� ������� �������� HTML � ��������� %s"
 
-#: ../src/mac/clipbrd.cpp:185
-#: ../src/msw/clipbrd.cpp:134
+#: ../src/mac/clipbrd.cpp:185 ../src/msw/clipbrd.cpp:134
 msgid "Failed to empty the clipboard."
 msgstr "�� ������� �������� clipboard."
 
@@ -1494,8 +1445,7 @@ msgstr "
 msgid "Failed to establish dialup connection: %s"
 msgstr "���������� �����������: %s"
 
-#: ../src/unix/utilsunx.cpp:459
-#: ../src/unix/utilsunx.cpp:475
+#: ../src/unix/utilsunx.cpp:459 ../src/unix/utilsunx.cpp:475
 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "�� ������� ��������� '%s'\n"
@@ -1539,9 +1489,12 @@ msgid "Failed to initialize OpenGL"
 msgstr "���������� ������������������� OpenGL"
 
 #: ../src/unix/threadpsx.cpp:896
-msgid "Failed to join a thread, potential memory leak detected - please restart the program"
+msgid ""
+"Failed to join a thread, potential memory leak detected - please restart the "
+"program"
 msgstr ""
-"�� ������� ����������� � �����, �������� ������ ������ - ���������� ������������� \n"
+"�� ������� ����������� � �����, �������� ������ ������ - ���������� "
+"������������� \n"
 "���������"
 
 #: ../src/msw/utils.cpp:723
@@ -1689,8 +1642,7 @@ msgstr "
 msgid "Failed to set temporary file permissions"
 msgstr "������ ������ ������ ����� '%s'."
 
-#: ../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 "�� ������� ���������� ��������� ���� %d."
@@ -1750,8 +1702,7 @@ msgstr ""
 msgid "File %s does not exist."
 msgstr "���� %s �� ����������."
 
-#: ../src/generic/filedlgg.cpp:1212
-#: ../src/gtk/filedlg.cpp:71
+#: ../src/generic/filedlgg.cpp:1212 ../src/gtk/filedlg.cpp:71
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "���� '%s' ��� ����������, �� ������������� ������ ��� ����������?"
@@ -1769,19 +1720,16 @@ msgstr ""
 msgid "File couldn't be loaded."
 msgstr "���� �� ����� ���� ��������."
 
-#: ../src/common/docview.cpp:316
-#: ../src/common/docview.cpp:357
+#: ../src/common/docview.cpp:316 ../src/common/docview.cpp:357
 #: ../src/common/docview.cpp:1502
 msgid "File error"
 msgstr "������ �����"
 
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/filedlgg.cpp:725
+#: ../src/generic/dirctrlg.cpp:701 ../src/generic/filedlgg.cpp:725
 msgid "File name exists already."
 msgstr "��� ����� ��� ����������."
 
-#: ../src/common/fldlgcmn.cpp:62
-#: ../src/msw/filedlg.cpp:250
+#: ../src/common/fldlgcmn.cpp:62 ../src/msw/filedlg.cpp:250
 #, c-format
 msgid "Files (%s)|%s"
 msgstr "����� (%s)|%s"
@@ -1888,8 +1836,7 @@ msgstr "
 msgid "Go one level up in document hierarchy"
 msgstr "���� �� ���� ������� ����� � �������� ���������"
 
-#: ../src/generic/dirdlgg.cpp:110
-#: ../src/generic/filedlgg.cpp:921
+#: ../src/generic/dirdlgg.cpp:110 ../src/generic/filedlgg.cpp:921
 msgid "Go to home directory"
 msgstr "� �������� ����������"
 
@@ -1922,10 +1869,8 @@ msgstr ""
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrew (ISO-8859-8)"
 
-#: ../src/common/dlgcmn.cpp:236
-#: ../src/generic/mdig.cpp:310
-#: ../src/html/helpfrm.cpp:254
-#: ../src/html/helpfrm.cpp:277
+#: ../src/common/dlgcmn.cpp:236 ../src/generic/mdig.cpp:310
+#: ../src/html/helpfrm.cpp:254 ../src/html/helpfrm.cpp:277
 #: ../src/msw/mdi.cpp:1329
 msgid "Help"
 msgstr "������"
@@ -1934,8 +1879,7 @@ msgstr "
 msgid "Help Browser Options"
 msgstr "����� ��������� ������"
 
-#: ../src/generic/helpext.cpp:441
-#: ../src/generic/helpext.cpp:442
+#: ../src/generic/helpext.cpp:441 ../src/generic/helpext.cpp:442
 msgid "Help Index"
 msgstr "������ ������"
 
@@ -1957,12 +1901,9 @@ msgstr "
 msgid "ICO: Error in reading mask DIB."
 msgstr "TIFF: ������ ������ �����������."
 
-#: ../src/common/imagbmp.cpp:1042
-#: ../src/common/imagbmp.cpp:1101
-#: ../src/common/imagbmp.cpp:1110
-#: ../src/common/imagbmp.cpp:1121
-#: ../src/common/imagbmp.cpp:1165
-#: ../src/common/imagbmp.cpp:1175
+#: ../src/common/imagbmp.cpp:1042 ../src/common/imagbmp.cpp:1101
+#: ../src/common/imagbmp.cpp:1110 ../src/common/imagbmp.cpp:1121
+#: ../src/common/imagbmp.cpp:1165 ../src/common/imagbmp.cpp:1175
 #: ../src/common/imagbmp.cpp:1184
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: ������ ������ ����� �����������!"
@@ -2010,8 +1951,7 @@ msgstr ""
 msgid "Illegal Parameter Count for Create Method"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/filedlgg.cpp:711
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:711
 msgid "Illegal directory name."
 msgstr "������������ ��� ����������."
 
@@ -2029,7 +1969,9 @@ msgid "Image file is not of type %d."
 msgstr ""
 
 #: ../src/msw/textctrl.cpp:303
-msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"
+msgid ""
+"Impossible to create a rich edit control, using simple text control instead. "
+"Please reinstall riched32.dll"
 msgstr ""
 
 #: ../src/unix/utilsunx.cpp:379
@@ -2088,8 +2030,7 @@ msgstr "
 msgid "Invalid lock file '%s'."
 msgstr "���������� ������� ���� '%s'"
 
-#: ../src/common/xtistrm.cpp:363
-#: ../src/common/xtistrm.cpp:378
+#: ../src/common/xtistrm.cpp:363 ../src/common/xtistrm.cpp:378
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr ""
 
@@ -2122,8 +2063,7 @@ msgstr "JPEG: 
 msgid "KOI8-R"
 msgstr "KOI8-R"
 
-#: ../src/generic/prntdlgg.cpp:428
-#: ../src/generic/prntdlgg.cpp:638
+#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:638
 msgid "Landscape"
 msgstr "������"
 
@@ -2177,8 +2117,7 @@ msgstr "
 msgid "Log saved to the file '%s'."
 msgstr "������ ������� � ���� '%s'."
 
-#: ../include/wx/xti.h:469
-#: ../include/wx/xti.h:473
+#: ../include/wx/xti.h:469 ../include/wx/xti.h:473
 msgid "Long Conversions not supported"
 msgstr ""
 
@@ -2188,8 +2127,12 @@ msgstr "
 
 #: ../src/msw/helpchm.cpp:60
 #, fuzzy
-msgid "MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it."
-msgstr "������ ���������� ������������� (RAS) �� ���������� �� ���� ������.���������� ���������� ���."
+msgid ""
+"MS HTML Help functions are unavailable because the MS HTML Help library is "
+"not installed on this machine. Please install it."
+msgstr ""
+"������ ���������� ������������� (RAS) �� ���������� �� ���� ������."
+"���������� ���������� ���."
 
 #: ../src/univ/themes/win32.cpp:4678
 msgid "Ma&ximize"
@@ -2259,10 +2202,8 @@ msgstr "
 msgid "New item"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:274
-#: ../src/generic/dirdlgg.cpp:284
-#: ../src/generic/filedlgg.cpp:587
-#: ../src/generic/filedlgg.cpp:596
+#: ../src/generic/dirdlgg.cpp:274 ../src/generic/dirdlgg.cpp:284
+#: ../src/generic/filedlgg.cpp:587 ../src/generic/filedlgg.cpp:596
 msgid "NewName"
 msgstr "NewName"
 
@@ -2270,10 +2211,8 @@ msgstr "NewName"
 msgid "Next page"
 msgstr "��������� �������"
 
-#: ../src/common/dlgcmn.cpp:213
-#: ../src/mac/msgdlg.cpp:56
-#: ../src/mac/msgdlg.cpp:140
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:213 ../src/mac/msgdlg.cpp:56
+#: ../src/mac/msgdlg.cpp:140 ../src/motif/msgdlg.cpp:182
 msgid "No"
 msgstr "���"
 
@@ -2290,7 +2229,8 @@ msgstr "
 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 ""
 "�� ������ ����� ��� ����������� ������ � ��������� '%s'.\n"
 "������ ������� ����� ��� ������������� � ����\n"
@@ -2311,20 +2251,17 @@ msgstr ""
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr ""
 
-#: ../src/common/image.cpp:1162
-#: ../src/common/image.cpp:1205
+#: ../src/common/image.cpp:1162 ../src/common/image.cpp:1205
 msgid "No handler found for image type."
 msgstr "�� ������ �� ���� ���������� ��� �����������."
 
-#: ../src/common/image.cpp:1170
-#: ../src/common/image.cpp:1213
+#: ../src/common/image.cpp:1170 ../src/common/image.cpp:1213
 #: ../src/common/image.cpp:1247
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "�� ��������� �� ���� ���������� ��� ����������� ���� %d."
 
-#: ../src/common/image.cpp:1231
-#: ../src/common/image.cpp:1263
+#: ../src/common/image.cpp:1231 ../src/common/image.cpp:1263
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "�� ��������� �� ���� ���������� ��� ����������� ���� %s."
@@ -2342,8 +2279,7 @@ msgstr "
 msgid "Nordic (ISO-8859-10)"
 msgstr "Nordic (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:227
-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/generic/fontdlgg.cpp:227 ../src/generic/fontdlgg.cpp:230
 msgid "Normal"
 msgstr "Normal"
 
@@ -2359,16 +2295,11 @@ msgstr "
 msgid "Note, 8 1/2 x 11 in"
 msgstr "Note, 8 1/2 x 11 ����"
 
-#: ../src/common/dlgcmn.cpp:219
-#: ../src/generic/dirdlgg.cpp:153
-#: ../src/generic/filedlgg.cpp:976
-#: ../src/generic/filedlgg.cpp:987
-#: ../src/generic/fontdlgg.cpp:254
-#: ../src/generic/logg.cpp:748
-#: ../src/generic/prntdlgg.cpp:454
-#: ../src/gtk/filedlg.cpp:162
-#: ../src/gtk/fontdlg.cpp:139
-#: ../src/html/helpfrm.cpp:1064
+#: ../src/common/dlgcmn.cpp:219 ../src/generic/dirdlgg.cpp:153
+#: ../src/generic/filedlgg.cpp:976 ../src/generic/filedlgg.cpp:987
+#: ../src/generic/fontdlgg.cpp:254 ../src/generic/logg.cpp:748
+#: ../src/generic/prntdlgg.cpp:454 ../src/gtk/filedlg.cpp:162
+#: ../src/gtk/fontdlg.cpp:139 ../src/html/helpfrm.cpp:1064
 msgid "OK"
 msgstr "OK"
 
@@ -2376,20 +2307,16 @@ msgstr "OK"
 msgid "Objects must have an id attribute"
 msgstr ""
 
-#: ../src/common/docview.cpp:1197
-#: ../src/common/docview.cpp:1525
+#: ../src/common/docview.cpp:1197 ../src/common/docview.cpp:1525
 msgid "Open File"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:571
-#: ../src/html/helpfrm.cpp:1404
+#: ../src/html/helpfrm.cpp:571 ../src/html/helpfrm.cpp:1404
 msgid "Open HTML document"
 msgstr "������� �������� HTML"
 
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:739
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:739
 msgid "Operation not permitted."
 msgstr "�������� �� ���������."
 
@@ -2412,13 +2339,11 @@ msgstr "
 msgid "Options"
 msgstr "�����"
 
-#: ../src/generic/prntdlgg.cpp:430
-#: ../src/generic/prntdlgg.cpp:639
+#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:639
 msgid "Orientation"
 msgstr "����������"
 
-#: ../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: �� ���� ������������ ������"
 
@@ -2434,8 +2359,7 @@ msgstr "PCX: 
 msgid "PCX: this is not a PCX file."
 msgstr "PCX: ��� �� ���� 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: ����������� ������ !!!"
 
@@ -2473,14 +2397,12 @@ msgstr "
 msgid "Pages"
 msgstr "��������"
 
-#: ../src/generic/prntdlgg.cpp:545
-#: ../src/generic/prntdlgg.cpp:625
+#: ../src/generic/prntdlgg.cpp:545 ../src/generic/prntdlgg.cpp:625
 #: ../src/generic/prntdlgg.cpp:818
 msgid "Paper Size"
 msgstr "������ ������"
 
-#: ../src/generic/prntdlgg.cpp:420
-#: ../src/generic/prntdlgg.cpp:612
+#: ../src/generic/prntdlgg.cpp:420 ../src/generic/prntdlgg.cpp:612
 #: ../src/generic/prntdlgg.cpp:813
 msgid "Paper size"
 msgstr "������ ������"
@@ -2493,8 +2415,7 @@ msgstr ""
 msgid "Passing a already registered object to SetObjectName"
 msgstr ""
 
-#: ../src/common/xtistrm.cpp:434
-#: ../src/common/xtistrm.cpp:654
+#: ../src/common/xtistrm.cpp:434 ../src/common/xtistrm.cpp:654
 msgid "Passing an unkown object to GetObject"
 msgstr ""
 
@@ -2510,8 +2431,7 @@ msgstr "
 msgid "Please choose a valid font."
 msgstr "���������� �������� ���������� �����."
 
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 msgid "Please choose an existing file."
 msgstr "������ ����� ������� ������������ ����."
 
@@ -2531,8 +2451,7 @@ msgstr ""
 msgid "Please wait while printing\n"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:427
-#: ../src/generic/prntdlgg.cpp:637
+#: ../src/generic/prntdlgg.cpp:427 ../src/generic/prntdlgg.cpp:637
 msgid "Portrait"
 msgstr "�������"
 
@@ -2548,8 +2467,7 @@ msgstr "
 msgid "Previous page"
 msgstr "���������� ��������"
 
-#: ../src/generic/prntdlgg.cpp:107
-#: ../src/generic/prntdlgg.cpp:121
+#: ../src/generic/prntdlgg.cpp:107 ../src/generic/prntdlgg.cpp:121
 msgid "Print"
 msgstr "������"
 
@@ -2557,8 +2475,7 @@ msgstr "
 msgid "Print Preview"
 msgstr "����-������ ������"
 
-#: ../src/common/prntbase.cpp:784
-#: ../src/common/prntbase.cpp:810
+#: ../src/common/prntbase.cpp:784 ../src/common/prntbase.cpp:810
 msgid "Print Preview Failure"
 msgstr "������ ����-������� ������"
 
@@ -2602,8 +2519,7 @@ msgstr "
 msgid "Printer..."
 msgstr "�������..."
 
-#: ../src/common/prntbase.cpp:109
-#: ../src/common/prntbase.cpp:154
+#: ../src/common/prntbase.cpp:109 ../src/common/prntbase.cpp:154
 msgid "Printing "
 msgstr "������"
 
@@ -2632,8 +2548,7 @@ msgstr "Quarto, 215 x 275 
 msgid "Question"
 msgstr "������"
 
-#: ../src/common/ffile.cpp:111
-#: ../src/common/ffile.cpp:132
+#: ../src/common/ffile.cpp:111 ../src/common/ffile.cpp:132
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "������ ������ ����� '%s'"
@@ -2723,13 +2638,14 @@ msgstr "
 msgid "Script"
 msgstr "������"
 
-#: ../src/html/helpfrm.cpp:443
-#: ../src/html/helpfrm.cpp:458
+#: ../src/html/helpfrm.cpp:443 ../src/html/helpfrm.cpp:458
 msgid "Search"
 msgstr "�����"
 
 #: ../src/html/helpfrm.cpp:445
-msgid "Search contents of help book(s) for all occurences of the text you typed above"
+msgid ""
+"Search contents of help book(s) for all occurences of the text you typed "
+"above"
 msgstr ""
 "����� � ���������� ���� ������ ���� ���������� ���������� ���� \n"
 "������"
@@ -2810,8 +2726,7 @@ msgstr "
 msgid "Show hidden directories"
 msgstr "�������� ������� ��������"
 
-#: ../src/generic/filedlgg.cpp:971
-#: ../src/generic/filedlgg.cpp:993
+#: ../src/generic/filedlgg.cpp:971 ../src/generic/filedlgg.cpp:993
 msgid "Show hidden files"
 msgstr "�������� ������� �����"
 
@@ -2831,8 +2746,7 @@ msgstr "
 msgid "Sorry, could not open this file for saving."
 msgstr "���� ���� �� ����� ���� ������ ��� ����������."
 
-#: ../src/common/docview.cpp:367
-#: ../src/common/docview.cpp:380
+#: ../src/common/docview.cpp:367 ../src/common/docview.cpp:380
 #: ../src/common/docview.cpp:1504
 msgid "Sorry, could not open this file."
 msgstr "���� ���� �� ����� ���� ������."
@@ -2849,8 +2763,7 @@ msgstr "
 msgid "Sorry, print preview needs a printer to be installed."
 msgstr ""
 
-#: ../src/common/docview.cpp:1196
-#: ../src/common/docview.cpp:1524
+#: ../src/common/docview.cpp:1196 ../src/common/docview.cpp:1524
 #, fuzzy
 msgid "Sorry, the format for this file is unknown."
 msgstr "���� ���� �� ����� ���� ������."
@@ -2881,8 +2794,7 @@ msgstr ""
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr ""
 
-#: ../include/wx/xti.h:396
-#: ../include/wx/xti.h:400
+#: ../include/wx/xti.h:396 ../include/wx/xti.h:400
 msgid "String conversions not supported"
 msgstr ""
 
@@ -2895,8 +2807,7 @@ msgstr ""
 msgid "Swiss"
 msgstr "Swiss"
 
-#: ../src/common/imagtiff.cpp:232
-#: ../src/common/imagtiff.cpp:243
+#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
 #: ../src/common/imagtiff.cpp:354
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: ���������� ������������ ������."
@@ -3001,24 +2912,37 @@ msgstr "
 
 #: ../src/msw/dialup.cpp:406
 #, 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 "������ ���������� ������������� (RAS) ������������� �� ���� ������ ������������ ����� (������� %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 ""
+"������ ���������� ������������� (RAS) ������������� �� ���� ������ "
+"������������ ����� (������� %s �� �������)."
 
 #: ../src/html/htmprint.cpp:580
-msgid "There was a problem during page setup: you may need to set a default printer."
+msgid ""
+"There was a problem during page setup: you may need to set a default printer."
 msgstr ""
 
 #: ../src/msw/thread.cpp:1197
-msgid "Thread module initialization failed: can not store value in thread local storage"
-msgstr "������ ������������� ������ �����: ���������� ��������� �������� � ��������� ������������ ����"
+msgid ""
+"Thread module initialization failed: can not store value in thread local "
+"storage"
+msgstr ""
+"������ ������������� ������ �����: ���������� ��������� �������� � ��������� "
+"������������ ����"
 
 #: ../src/unix/threadpsx.cpp:1600
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "������ ������������� ������ �����: �� ������� ������� ���� ����"
 
 #: ../src/msw/thread.cpp:1185
-msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
-msgstr "������ ������������� ������ �����: ���������� �������� ������ � ��������� ������������ ���� "
+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."
@@ -3062,8 +2986,7 @@ msgstr "
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr "������� �������� ����� '%s' �� ������ ������ VFS, �� �� �� ��������!"
 
-#: ../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 "������� ���������� ��� ����� NULL: ��������"
 
@@ -3076,8 +2999,7 @@ msgstr "Turkish (ISO-8859-9)"
 msgid "Type"
 msgstr "��������"
 
-#: ../src/common/xtistrm.cpp:279
-#: ../src/common/xtixml.cpp:351
+#: ../src/common/xtistrm.cpp:279 ../src/common/xtixml.cpp:351
 #: ../src/common/xtixml.cpp:498
 msgid "Type must have enum - long conversion"
 msgstr ""
@@ -3160,8 +3082,7 @@ msgstr "
 msgid "Unknown long option '%s'"
 msgstr "����������� ������� ����� '%s'"
 
-#: ../src/common/cmdline.cpp:582
-#: ../src/common/cmdline.cpp:603
+#: ../src/common/cmdline.cpp:582 ../src/common/cmdline.cpp:603
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "����������� ����� '%s'"
@@ -3180,14 +3101,12 @@ msgstr "
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "���������� ������ '{' � ������ ��� mime type %s."
 
-#: ../src/common/cmdproc.cpp:254
-#: ../src/common/cmdproc.cpp:280
+#: ../src/common/cmdproc.cpp:254 ../src/common/cmdproc.cpp:280
 #: ../src/common/cmdproc.cpp:300
 msgid "Unnamed command"
 msgstr "����������� �������"
 
-#: ../src/mac/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:273
+#: ../src/mac/clipbrd.cpp:64 ../src/msw/clipbrd.cpp:273
 #: ../src/msw/clipbrd.cpp:445
 msgid "Unsupported clipboard format."
 msgstr "���������������� ������ clipboard."
@@ -3353,8 +3272,7 @@ msgstr ""
 msgid "XPM: Malformed pixel data!"
 msgstr ""
 
-#: ../src/common/xpmdecod.cpp:712
-#: ../src/common/xpmdecod.cpp:722
+#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:722
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr ""
@@ -3364,8 +3282,7 @@ msgstr ""
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "�� ������� ������������ ������� ������ %s."
 
-#: ../contrib/src/xrc/xmlres.cpp:885
-#: ../contrib/src/xrc/xmlres.cpp:897
+#: ../contrib/src/xrc/xmlres.cpp:885 ../contrib/src/xrc/xmlres.cpp:897
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr ""
@@ -3375,10 +3292,8 @@ msgstr ""
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:208
-#: ../src/mac/msgdlg.cpp:57
-#: ../src/mac/msgdlg.cpp:139
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:208 ../src/mac/msgdlg.cpp:57
+#: ../src/mac/msgdlg.cpp:139 ../src/motif/msgdlg.cpp:182
 msgid "Yes"
 msgstr "��"
 
@@ -3386,8 +3301,7 @@ msgstr "
 msgid "You cannot add a new directory to this section."
 msgstr "�� �� ������ �������� ����� ������� � ��� ������."
 
-#: ../src/common/fs_zip.cpp:88
-#: ../src/common/fs_zip.cpp:138
+#: ../src/common/fs_zip.cpp:88 ../src/common/fs_zip.cpp:138
 msgid "ZIP handler currently supports only local files!"
 msgstr ""
 
@@ -3397,16 +3311,19 @@ msgstr "[
 
 #: ../src/msw/dde.cpp:1075
 msgid "a DDEML application has created a prolonged race condition."
-msgstr "������������ (a DDEML application has created a prolonged race condition)"
+msgstr ""
+"������������ (a DDEML application has created a prolonged race condition)"
 
 #: ../src/msw/dde.cpp:1063
 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 ""
 "������������\n"
-"(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)"
 
@@ -3544,15 +3461,15 @@ msgstr "
 
 #: ../src/msw/utils.cpp:371
 msgid "can't find user's HOME, using current directory."
-msgstr "���������� ���������� HOME ������������, ����� ����������� ������� �������."
+msgstr ""
+"���������� ���������� HOME ������������, ����� ����������� ������� �������."
 
 #: ../src/common/file.cpp:450
 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr "���������� ����� ���� � ������������ %d"
 
-#: ../src/common/file.cpp:535
-#: ../src/common/file.cpp:543
+#: ../src/common/file.cpp:535 ../src/common/file.cpp:543
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "���������� �������� ������� ������� ����� � ������������ %d"
@@ -3561,8 +3478,7 @@ msgstr "
 msgid "can't load any font, aborting"
 msgstr "���������� ��������� �� ���� �����, �������"
 
-#: ../src/common/ffile.cpp:63
-#: ../src/common/file.cpp:352
+#: ../src/common/ffile.cpp:63 ../src/common/file.cpp:352
 #, c-format
 msgid "can't open file '%s'"
 msgstr "���������� ������� ���� '%s'"
@@ -3600,8 +3516,7 @@ msgstr "
 msgid "can't remove temporary file '%s'"
 msgstr "������ �������� ���������� ����� '%s'"
 
-#: ../src/common/file.cpp:492
-#: ../src/common/file.cpp:518
+#: ../src/common/file.cpp:492 ../src/common/file.cpp:518
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "���������� ������������� �� ����� � ������������ %d"
@@ -3769,8 +3684,7 @@ msgstr "
 msgid "invalid message box return value"
 msgstr "������������ �������� �������� �� ���� ���������"
 
-#: ../src/common/fontcmn.cpp:473
-#: ../src/common/fontcmn.cpp:537
+#: ../src/common/fontcmn.cpp:473 ../src/common/fontcmn.cpp:537
 #, fuzzy
 msgid "italic"
 msgstr "������"
@@ -3923,8 +3837,7 @@ msgstr "
 msgid "thirteenth"
 msgstr "�����������"
 
-#: ../src/common/imagtiff.cpp:143
-#: ../src/common/imagtiff.cpp:151
+#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
 #, c-format
 msgid "tiff module: %s"
 msgstr ""
@@ -3969,8 +3882,7 @@ msgstr "
 msgid "unknown class %s"
 msgstr ": ����������� ����� ��������"
 
-#: ../src/common/regex.cpp:151
-#: ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:151 ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr "����������� ������"
 
@@ -3984,8 +3896,7 @@ msgstr "
 msgid "unknown line terminator"
 msgstr "����������� ������ ������"
 
-#: ../src/common/file.cpp:474
-#: ../src/common/file.cpp:501
+#: ../src/common/file.cpp:474 ../src/common/file.cpp:501
 msgid "unknown seek origin"
 msgstr "����������� ������ ������"
 
@@ -4026,8 +3937,7 @@ msgstr "
 msgid "wxGetTimeOfDay failed."
 msgstr "������ wxGetTimeOfDay."
 
-#: ../src/common/socket.cpp:395
-#: ../src/common/socket.cpp:449
+#: ../src/common/socket.cpp:395 ../src/common/socket.cpp:449
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: ���������������� ������� � ReadMsg."
 
@@ -4048,8 +3958,7 @@ msgstr "wxWindows 
 msgid "yesterday"
 msgstr "�����"
 
-#: ../src/common/zstream.cpp:141
-#: ../src/common/zstream.cpp:275
+#: ../src/common/zstream.cpp:141 ../src/common/zstream.cpp:275
 #, fuzzy, c-format
 msgid "zlib error %d"
 msgstr " (������ %ld: %s)"
@@ -4057,4 +3966,3 @@ msgstr " (
 #: ../src/common/prntbase.cpp:450
 msgid "|<<"
 msgstr "|<<"
-
diff --git a/locale/sv.po b/locale/sv.po
index 18c421b436..775f85042d 100644
--- a/locale/sv.po
+++ b/locale/sv.po
@@ -1,6 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWindows-2.5.1\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-02-04 18:56+0100\n"
 "PO-Revision-Date: 2004-02-21 21:19+0100\n"
 "Last-Translator: Jonas Rydberg <jor@mindless.com>\n"
@@ -42,10 +43,8 @@ msgstr "#14 kuvert, 5 x 11 1/2 tum"
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "#9 kuvert, 3 7/8 x 8 7/8 tum"
 
-#: ../src/html/helpfrm.cpp:867
-#: ../src/html/helpfrm.cpp:868
-#: ../src/html/helpfrm.cpp:1505
-#: ../src/html/helpfrm.cpp:1535
+#: ../src/html/helpfrm.cpp:867 ../src/html/helpfrm.cpp:868
+#: ../src/html/helpfrm.cpp:1505 ../src/html/helpfrm.cpp:1535
 #, c-format
 msgid "%i of %i"
 msgstr "%i av %i"
@@ -88,8 +87,7 @@ msgstr "&Om..."
 msgid "&Arrange Icons"
 msgstr "Ordna &ikoner"
 
-#: ../src/generic/fdrepdlg.cpp:164
-#: ../src/generic/wizard.cpp:401
+#: ../src/generic/fdrepdlg.cpp:164 ../src/generic/wizard.cpp:401
 msgid "&Cancel"
 msgstr "&Avbryt"
 
@@ -97,10 +95,8 @@ msgstr "&Avbryt"
 msgid "&Cascade"
 msgstr "�ver&lappande"
 
-#: ../src/common/prntbase.cpp:439
-#: ../src/generic/logg.cpp:502
-#: ../src/generic/tipdlg.cpp:213
-#: ../src/html/helpfrm.cpp:271
+#: ../src/common/prntbase.cpp:439 ../src/generic/logg.cpp:502
+#: ../src/generic/tipdlg.cpp:213 ../src/html/helpfrm.cpp:271
 msgid "&Close"
 msgstr "&St�ng"
 
@@ -140,13 +136,11 @@ msgstr "&Logga"
 msgid "&Move"
 msgstr "&Flytta"
 
-#: ../src/generic/mdig.cpp:117
-#: ../src/msw/mdi.cpp:192
+#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:192
 msgid "&Next"
 msgstr "&N�sta"
 
-#: ../src/generic/wizard.cpp:400
-#: ../src/generic/wizard.cpp:582
+#: ../src/generic/wizard.cpp:400 ../src/generic/wizard.cpp:582
 msgid "&Next >"
 msgstr "&N�sta >"
 
@@ -162,8 +156,7 @@ msgstr "&
 msgid "&Paste"
 msgstr "K&listra in"
 
-#: ../src/generic/mdig.cpp:118
-#: ../src/msw/mdi.cpp:193
+#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:193
 msgid "&Previous"
 msgstr "&F�reg�ende"
 
@@ -171,14 +164,12 @@ msgstr "&F
 msgid "&Print..."
 msgstr "Skriv &ut..."
 
-#: ../src/common/cmdproc.cpp:285
-#: ../src/common/cmdproc.cpp:292
+#: ../src/common/cmdproc.cpp:285 ../src/common/cmdproc.cpp:292
 #: ../src/msw/textctrl.cpp:2048
 msgid "&Redo"
 msgstr "&Upprepa"
 
-#: ../src/common/cmdproc.cpp:281
-#: ../src/common/cmdproc.cpp:301
+#: ../src/common/cmdproc.cpp:281 ../src/common/cmdproc.cpp:301
 msgid "&Redo "
 msgstr "&Upprepa "
 
@@ -190,8 +181,7 @@ msgstr "&Ers
 msgid "&Restore"
 msgstr "&�terst�ll"
 
-#: ../src/generic/logg.cpp:498
-#: ../src/generic/logg.cpp:827
+#: ../src/generic/logg.cpp:498 ../src/generic/logg.cpp:827
 msgid "&Save..."
 msgstr "&Spara..."
 
@@ -203,8 +193,7 @@ msgstr "&Visa tips vid start"
 msgid "&Size"
 msgstr "&Storlek"
 
-#: ../src/common/cmdproc.cpp:263
-#: ../src/msw/textctrl.cpp:2047
+#: ../src/common/cmdproc.cpp:263 ../src/msw/textctrl.cpp:2047
 msgid "&Undo"
 msgstr "&�ngra"
 
@@ -212,23 +201,18 @@ msgstr "&
 msgid "&Undo "
 msgstr "&�ngra "
 
-#: ../src/generic/mdig.cpp:297
-#: ../src/generic/mdig.cpp:313
-#: ../src/generic/mdig.cpp:317
-#: ../src/msw/mdi.cpp:1333
-#: ../src/msw/mdi.cpp:1340
+#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
+#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1333 ../src/msw/mdi.cpp:1340
 #: ../src/msw/mdi.cpp:1370
 msgid "&Window"
 msgstr "&F�nster"
 
-#: ../src/common/config.cpp:414
-#: ../src/msw/regconf.cpp:265
+#: ../src/common/config.cpp:414 ../src/msw/regconf.cpp:265
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "\"%s\" har extra \"..\", ignoreras."
 
-#: ../src/common/valtext.cpp:136
-#: ../src/common/valtext.cpp:166
+#: ../src/common/valtext.cpp:136 ../src/common/valtext.cpp:166
 #: ../src/common/valtext.cpp:172
 #, c-format
 msgid "'%s' is invalid"
@@ -273,19 +257,16 @@ msgstr "\"%s\" f
 msgid "(Help)"
 msgstr "(Hj�lp)"
 
-#: ../src/html/helpfrm.cpp:345
-#: ../src/html/helpfrm.cpp:935
+#: ../src/html/helpfrm.cpp:345 ../src/html/helpfrm.cpp:935
 #: ../src/html/helpfrm.cpp:1563
 msgid "(bookmarks)"
 msgstr "(bokm�rken)"
 
-#: ../src/generic/dirctrlg.cpp:677
-#: ../src/generic/filedlgg.cpp:707
+#: ../src/generic/dirctrlg.cpp:677 ../src/generic/filedlgg.cpp:707
 msgid "."
 msgstr "."
 
-#: ../src/generic/dirctrlg.cpp:678
-#: ../src/generic/filedlgg.cpp:708
+#: ../src/generic/dirctrlg.cpp:678 ../src/generic/filedlgg.cpp:708
 msgid ".."
 msgstr ".."
 
@@ -325,18 +306,15 @@ msgstr "< &Bak
 msgid "<<"
 msgstr "<<"
 
-#: ../src/generic/filedlgg.cpp:248
-#: ../src/generic/filedlgg.cpp:271
+#: ../src/generic/filedlgg.cpp:248 ../src/generic/filedlgg.cpp:271
 msgid "<DIR>"
 msgstr "<KAT>"
 
-#: ../src/generic/filedlgg.cpp:252
-#: ../src/generic/filedlgg.cpp:275
+#: ../src/generic/filedlgg.cpp:252 ../src/generic/filedlgg.cpp:275
 msgid "<DRIVE>"
 msgstr "<ENHET>"
 
-#: ../src/generic/filedlgg.cpp:250
-#: ../src/generic/filedlgg.cpp:273
+#: ../src/generic/filedlgg.cpp:250 ../src/generic/filedlgg.cpp:273
 msgid "<LINK>"
 msgstr "<L�NK>"
 
@@ -470,8 +448,7 @@ msgstr "B5 ark, 182 x 257 millimeter"
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 kuvert, 176 x 125 mm"
 
-#: ../src/common/imagbmp.cpp:470
-#: ../src/common/imagbmp.cpp:486
+#: ../src/common/imagbmp.cpp:470 ../src/common/imagbmp.cpp:486
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: Kunde inte allokera minne."
 
@@ -547,8 +524,7 @@ msgstr "C6 kuvert, 114 x 162 mm"
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 kuvert, 114 x 229 mm"
 
-#: ../src/html/chm.cpp:783
-#: ../src/html/chm.cpp:842
+#: ../src/html/chm.cpp:783 ../src/html/chm.cpp:842
 msgid "CHM handler currently supports only local files!"
 msgstr "CHM-hanteraren st�der f�r n�rvarande endast lokala filer!"
 
@@ -561,8 +537,7 @@ msgstr "Kan inte skapa mutex."
 msgid "Can not enumerate files '%s'"
 msgstr "Kan inte r�kna upp filerna \"%s\""
 
-#: ../src/msw/dir.cpp:300
-#: ../src/unix/dir.cpp:232
+#: ../src/msw/dir.cpp:300 ../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\""
@@ -572,8 +547,7 @@ msgstr "Kan inte r
 msgid "Can not resume thread %lu"
 msgstr "Kan inte forts�tta tr�den %lu"
 
-#: ../src/mac/thread.cpp:477
-#: ../src/msw/thread.cpp:821
+#: ../src/mac/thread.cpp:477 ../src/msw/thread.cpp:821
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "Kan inte forts�tta tr�den %x"
@@ -587,8 +561,7 @@ msgstr "Kan inte starta tr
 msgid "Can not suspend thread %lu"
 msgstr "Kan inte h�lla inne tr�d %lu"
 
-#: ../src/mac/thread.cpp:453
-#: ../src/msw/thread.cpp:806
+#: ../src/mac/thread.cpp:453 ../src/msw/thread.cpp:806
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "Kan inte h�lla inne tr�d %x"
@@ -618,15 +591,16 @@ msgstr "Kan inte kopiera v
 
 #: ../src/msw/listctrl.cpp:413
 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."
+msgstr ""
+"Kan inte skapa listkontrollf�nster, kontrollera att comctl32.dll �r "
+"installerad."
 
 #: ../src/msw/registry.cpp:428
 #, c-format
 msgid "Can't create registry key '%s'"
 msgstr "Kan inte skapa registernyckel \"%s\""
 
-#: ../src/mac/thread.cpp:430
-#: ../src/msw/thread.cpp:593
+#: ../src/mac/thread.cpp:430 ../src/msw/thread.cpp:593
 #: ../src/os2/thread.cpp:491
 msgid "Can't create thread"
 msgstr "Kan inte skapa tr�d"
@@ -641,8 +615,7 @@ msgstr "Kan inte skapa f
 msgid "Can't delete key '%s'"
 msgstr "Kan inte ta bort nyckel \"%s\""
 
-#: ../src/msw/iniconf.cpp:444
-#: ../src/os2/iniconf.cpp:448
+#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "Kan inte ta bort INI-filen \"%s\""
@@ -685,8 +658,7 @@ msgstr "Kan inte initialisera zlib deflate-str
 msgid "Can't initialize zlib inflate stream."
 msgstr "Kan inte initialisera zlib inflate-str�m."
 
-#: ../src/common/image.cpp:1028
-#: ../src/common/image.cpp:1048
+#: ../src/common/image.cpp:1028 ../src/common/image.cpp:1048
 #, 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."
@@ -710,8 +682,7 @@ msgstr "Kan inte l
 msgid "Can't read value of '%s'"
 msgstr "Kan inte l�sa v�rdet av \"%s\""
 
-#: ../src/msw/registry.cpp:808
-#: ../src/msw/registry.cpp:842
+#: ../src/msw/registry.cpp:808 ../src/msw/registry.cpp:842
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr "Kan inte l�sa v�rdet av nyckel \"%s\""
@@ -721,18 +692,15 @@ msgstr "Kan inte l
 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:562
-#: ../src/generic/logg.cpp:994
+#: ../src/generic/logg.cpp:562 ../src/generic/logg.cpp:994
 msgid "Can't save log contents to file."
 msgstr "Kan inte spara logginneh�llet till fil."
 
-#: ../src/msw/thread.cpp:549
-#: ../src/os2/thread.cpp:473
+#: ../src/msw/thread.cpp:549 ../src/os2/thread.cpp:473
 msgid "Can't set thread priority"
 msgstr "Kan inte s�tta tr�dprioritet"
 
-#: ../src/msw/registry.cpp:829
-#: ../src/msw/registry.cpp:954
+#: ../src/msw/registry.cpp:829 ../src/msw/registry.cpp:954
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr "Kan inte s�tta v�rdet p� \"%s\""
@@ -742,22 +710,16 @@ msgstr "Kan inte s
 msgid "Can't write to deflate stream: %s\n"
 msgstr "Kan inte skriva till deflate-str�m: %s\n"
 
-#: ../src/common/dlgcmn.cpp:240
-#: ../src/generic/dirdlgg.cpp:155
-#: ../src/generic/filedlgg.cpp:977
-#: ../src/generic/filedlgg.cpp:996
-#: ../src/generic/fontdlgg.cpp:255
-#: ../src/generic/prntdlgg.cpp:455
-#: ../src/generic/progdlgg.cpp:211
-#: ../src/gtk/filedlg.cpp:168
-#: ../src/gtk/fontdlg.cpp:147
-#: ../src/html/helpfrm.cpp:1066
+#: ../src/common/dlgcmn.cpp:240 ../src/generic/dirdlgg.cpp:155
+#: ../src/generic/filedlgg.cpp:977 ../src/generic/filedlgg.cpp:996
+#: ../src/generic/fontdlgg.cpp:255 ../src/generic/prntdlgg.cpp:455
+#: ../src/generic/progdlgg.cpp:211 ../src/gtk/filedlg.cpp:168
+#: ../src/gtk/fontdlg.cpp:147 ../src/html/helpfrm.cpp:1066
 #: ../src/motif/msgdlg.cpp:182
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../contrib/src/xrc/xmlres.cpp:987
-#: ../contrib/src/xrc/xmlres.cpp:1028
+#: ../contrib/src/xrc/xmlres.cpp:987 ../contrib/src/xrc/xmlres.cpp:1028
 msgid "Cannot convert dialog units: dialog unknown."
 msgstr "Kan inte konvertera dialogenheter: ok�nd dialog."
 
@@ -802,8 +764,7 @@ msgstr "Kan inte h
 msgid "Cannot hang up - no active dialup connection."
 msgstr "Kan inte l�gga p� - ingen aktiv uppringningsanslutning."
 
-#: ../src/msw/app.cpp:290
-#: ../src/msw/app.cpp:293
+#: ../src/msw/app.cpp:290 ../src/msw/app.cpp:293
 msgid "Cannot initialize OLE"
 msgstr "Kan inte initialisera OLE"
 
@@ -878,8 +839,7 @@ msgstr "Kan inte tolka dimension fr
 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\"!"
@@ -949,8 +909,7 @@ msgstr "Dator"
 msgid "Config entry name cannot start with '%c'."
 msgstr "Konfigurationspost kan inte starta med \"%c\"."
 
-#: ../src/generic/filedlgg.cpp:1214
-#: ../src/gtk/filedlg.cpp:74
+#: ../src/generic/filedlgg.cpp:1214 ../src/gtk/filedlg.cpp:74
 msgid "Confirm"
 msgstr "Bekr�fta"
 
@@ -1008,8 +967,7 @@ msgstr "Kunde inte hitta fil \"%s\"."
 msgid "Could not start document preview."
 msgstr "Kunde inte b�rja f�rhandsgranska dokumentet."
 
-#: ../src/generic/printps.cpp:221
-#: ../src/msw/printwin.cpp:245
+#: ../src/generic/printps.cpp:221 ../src/msw/printwin.cpp:245
 msgid "Could not start printing."
 msgstr "Kunde inte b�rja skriva ut."
 
@@ -1021,21 +979,17 @@ msgstr "Kunde inte f
 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:156
-#: ../src/msw/imaglist.cpp:174
+#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
+#: ../src/msw/imaglist.cpp:156 ../src/msw/imaglist.cpp:174
 #: ../src/msw/imaglist.cpp:186
 msgid "Couldn't add an image to the image list."
 msgstr "Kunde inte l�gga till en bild till bildlistan."
 
-#: ../src/msw/timer.cpp:101
-#: ../src/os2/timer.cpp:118
+#: ../src/msw/timer.cpp:101 ../src/os2/timer.cpp:118
 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."
 
@@ -1044,8 +998,7 @@ msgstr "Kunde inte skapa mark
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "Kunde inte hitta symbolen \"%s\" i ett dynamiskt bibliotek"
 
-#: ../src/mac/thread.cpp:507
-#: ../src/msw/thread.cpp:847
+#: ../src/mac/thread.cpp:507 ../src/msw/thread.cpp:847
 msgid "Couldn't get the current thread pointer"
 msgstr "Kunde inte h�mta den aktuella tr�dpekaren"
 
@@ -1077,14 +1030,12 @@ msgstr "Kunde inte sl
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "Kunde inte h�mta information om listkontrollpost %d."
 
-#: ../src/common/imagpng.cpp:647
-#: ../src/common/imagpng.cpp:658
+#: ../src/common/imagpng.cpp:647 ../src/common/imagpng.cpp:658
 #: ../src/common/imagpng.cpp:666
 msgid "Couldn't save PNG image."
 msgstr "Kunde inte spara PNG-bild."
 
-#: ../src/mac/thread.cpp:756
-#: ../src/msw/thread.cpp:610
+#: ../src/mac/thread.cpp:756 ../src/msw/thread.cpp:610
 msgid "Couldn't terminate thread"
 msgstr "Kunde inte avsluta tr�d"
 
@@ -1096,8 +1047,7 @@ msgstr "Skapa-parameter hittades inte i deklarerade RTTI-parametrar"
 msgid "Create directory"
 msgstr "Skapa katalog"
 
-#: ../src/generic/dirdlgg.cpp:105
-#: ../src/generic/filedlgg.cpp:931
+#: ../src/generic/dirdlgg.cpp:105 ../src/generic/filedlgg.cpp:931
 msgid "Create new directory"
 msgstr "Skapa ny katalog"
 
@@ -1163,8 +1113,13 @@ msgid "Deleted stale lock file '%s'."
 msgstr "Tog bort f�rlegad l�sfil \"%s\"."
 
 #: ../src/msw/dialup.cpp:346
-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:220
 msgid "Did you know..."
@@ -1189,8 +1144,12 @@ msgid "Directory doesn't exist."
 msgstr "Katalogen finns inte"
 
 #: ../src/html/helpfrm.cpp:409
-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:583
 msgid "Display options dialog"
@@ -1198,7 +1157,8 @@ msgstr "Visa alternativdialog"
 
 #: ../src/msw/mimetype.cpp:672
 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"
@@ -1255,27 +1215,22 @@ msgstr "Poster funna"
 
 #: ../src/common/config.cpp:366
 #, c-format
-msgid "Environment variables expansion failed: missing '%c' at position %d in '%s'."
-msgstr "Milj�variabelexpansion misslyckades: \"%c\" saknas p� position %d i \"%s\"."
+msgid ""
+"Environment variables expansion failed: missing '%c' at position %d in '%s'."
+msgstr ""
+"Milj�variabelexpansion misslyckades: \"%c\" saknas p� position %d i \"%s\"."
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:711
-#: ../src/generic/filedlgg.cpp:725
-#: ../src/generic/filedlgg.cpp:739
-#: ../src/generic/filedlgg.cpp:1166
-#: ../src/generic/filedlgg.cpp:1191
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/dirctrlg.cpp:701
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:711
+#: ../src/generic/filedlgg.cpp:725 ../src/generic/filedlgg.cpp:739
+#: ../src/generic/filedlgg.cpp:1166 ../src/generic/filedlgg.cpp:1191
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 #: ../src/gtk/fontdlg.cpp:76
 msgid "Error"
 msgstr "Fel"
 
-#: ../src/unix/utilsunx.cpp:1030
-#: ../src/unix/utilsunx.cpp:1038
+#: ../src/unix/utilsunx.cpp:1030 ../src/unix/utilsunx.cpp:1038
 msgid "Error "
 msgstr "Fel "
 
@@ -1421,9 +1376,11 @@ msgstr "Kunde inte skapa katalog %s/mime-info."
 
 #: ../src/generic/dirdlgg.cpp:203
 #, c-format
-msgid "Failed to create directory '%s'\n"
+msgid ""
+"Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
-msgstr "Kunde inte skapa katalog\"%s\"\n"
+msgstr ""
+"Kunde inte skapa katalog\"%s\"\n"
 "(Har du de n�dv�ndiga r�ttigheterna?)"
 
 #: ../src/msw/mimetype.cpp:196
@@ -1441,8 +1398,7 @@ msgstr "Kunde inte skapa standard s
 msgid "Failed to display HTML document in %s encoding"
 msgstr "Kunde inte visa HTML-dokument i %s-kodning"
 
-#: ../src/mac/clipbrd.cpp:185
-#: ../src/msw/clipbrd.cpp:134
+#: ../src/mac/clipbrd.cpp:185 ../src/msw/clipbrd.cpp:134
 msgid "Failed to empty the clipboard."
 msgstr "Kunde inte t�mma urklippsbordet."
 
@@ -1459,8 +1415,7 @@ msgstr "Kunde inte starta en meddelandeloop med DDE-server"
 msgid "Failed to establish dialup connection: %s"
 msgstr "Kunde inte etablera uppringningsanslutning: %s"
 
-#: ../src/unix/utilsunx.cpp:459
-#: ../src/unix/utilsunx.cpp:475
+#: ../src/unix/utilsunx.cpp:459 ../src/unix/utilsunx.cpp:475
 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "Kunde inte utf�ra \"%s\"\n"
@@ -1503,8 +1458,12 @@ msgid "Failed to initialize OpenGL"
 msgstr "Kunde inte initialisera OpenGL"
 
 #: ../src/unix/threadpsx.cpp:896
-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:723
 #, c-format
@@ -1648,8 +1607,7 @@ msgstr "Kunde inte s
 msgid "Failed to set temporary file permissions"
 msgstr "Kunde inte s�tta tempor�ra filr�ttigheter"
 
-#: ../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."
@@ -1709,36 +1667,34 @@ msgstr "Fil"
 msgid "File %s does not exist."
 msgstr "Filen %s finns inte."
 
-#: ../src/generic/filedlgg.cpp:1212
-#: ../src/gtk/filedlg.cpp:71
+#: ../src/generic/filedlgg.cpp:1212 ../src/gtk/filedlg.cpp:71
 #, 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?"
 
 #: ../src/os2/filedlg.cpp:302
 #, c-format
-msgid "File '%s' already exists.\n"
+msgid ""
+"File '%s' already exists.\n"
 "Do you want to replace it?"
-msgstr "Filen \"%s\" finns redan\n"
+msgstr ""
+"Filen \"%s\" finns redan\n"
 "Vill du ers�tta den?"
 
 #: ../src/common/textcmn.cpp:224
 msgid "File couldn't be loaded."
 msgstr "Filen kunde inte laddas."
 
-#: ../src/common/docview.cpp:316
-#: ../src/common/docview.cpp:357
+#: ../src/common/docview.cpp:316 ../src/common/docview.cpp:357
 #: ../src/common/docview.cpp:1502
 msgid "File error"
 msgstr "Filfel"
 
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/filedlgg.cpp:725
+#: ../src/generic/dirctrlg.cpp:701 ../src/generic/filedlgg.cpp:725
 msgid "File name exists already."
 msgstr "Filnamnet finns redan."
 
-#: ../src/common/fldlgcmn.cpp:62
-#: ../src/msw/filedlg.cpp:250
+#: ../src/common/fldlgcmn.cpp:62 ../src/msw/filedlg.cpp:250
 #, c-format
 msgid "Files (%s)|%s"
 msgstr "Filer (%s)|%s"
@@ -1844,8 +1800,7 @@ msgstr "G
 msgid "Go one level up in document hierarchy"
 msgstr "G� upp en niv� i dokumenthierarki"
 
-#: ../src/generic/dirdlgg.cpp:110
-#: ../src/generic/filedlgg.cpp:921
+#: ../src/generic/dirdlgg.cpp:110 ../src/generic/filedlgg.cpp:921
 msgid "Go to home directory"
 msgstr "G� till hemkatalog"
 
@@ -1878,10 +1833,8 @@ msgstr "HTML-filer (*.html;*.htm)|*.html;*.htm|"
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebreiska (ISO-8859-8)"
 
-#: ../src/common/dlgcmn.cpp:236
-#: ../src/generic/mdig.cpp:310
-#: ../src/html/helpfrm.cpp:254
-#: ../src/html/helpfrm.cpp:277
+#: ../src/common/dlgcmn.cpp:236 ../src/generic/mdig.cpp:310
+#: ../src/html/helpfrm.cpp:254 ../src/html/helpfrm.cpp:277
 #: ../src/msw/mdi.cpp:1329
 msgid "Help"
 msgstr "Hj�lp"
@@ -1890,8 +1843,7 @@ msgstr "Hj
 msgid "Help Browser Options"
 msgstr "Hj�lpbl�ddraralternativ"
 
-#: ../src/generic/helpext.cpp:441
-#: ../src/generic/helpext.cpp:442
+#: ../src/generic/helpext.cpp:441 ../src/generic/helpext.cpp:442
 msgid "Help Index"
 msgstr "Hj�lpindex"
 
@@ -1912,12 +1864,9 @@ msgstr "Hj
 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: Fel vid l�sning av mask DIB."
 
-#: ../src/common/imagbmp.cpp:1042
-#: ../src/common/imagbmp.cpp:1101
-#: ../src/common/imagbmp.cpp:1110
-#: ../src/common/imagbmp.cpp:1121
-#: ../src/common/imagbmp.cpp:1165
-#: ../src/common/imagbmp.cpp:1175
+#: ../src/common/imagbmp.cpp:1042 ../src/common/imagbmp.cpp:1101
+#: ../src/common/imagbmp.cpp:1110 ../src/common/imagbmp.cpp:1121
+#: ../src/common/imagbmp.cpp:1165 ../src/common/imagbmp.cpp:1175
 #: ../src/common/imagbmp.cpp:1184
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: Fel vid skrivning av bildfilen!"
@@ -1962,8 +1911,7 @@ msgstr "Otill
 msgid "Illegal Parameter Count for Create Method"
 msgstr "Otill�tet antal parametrar f�r Create-metod"
 
-#: ../src/generic/dirctrlg.cpp:683
-#: ../src/generic/filedlgg.cpp:711
+#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:711
 msgid "Illegal directory name."
 msgstr "Ogiltigt katalognamn."
 
@@ -1981,8 +1929,12 @@ msgid "Image file is not of type %d."
 msgstr "Bildfilen �r inte av typen %d."
 
 #: ../src/msw/textctrl.cpp:303
-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:379
 msgid "Impossible to get child process input"
@@ -2039,8 +1991,7 @@ msgstr "Ogiltig geometrispecifikation \"%s\""
 msgid "Invalid lock file '%s'."
 msgstr "Ogiltig l�sfil \"%s\"."
 
-#: ../src/common/xtistrm.cpp:363
-#: ../src/common/xtistrm.cpp:378
+#: ../src/common/xtistrm.cpp:363 ../src/common/xtistrm.cpp:378
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr "Ogiltigt eller null objektid skickat till GetObjectClassInfo"
 
@@ -2073,8 +2024,7 @@ msgstr "JPEG: Kunde inte spara bild."
 msgid "KOI8-R"
 msgstr "KOI8-R"
 
-#: ../src/generic/prntdlgg.cpp:428
-#: ../src/generic/prntdlgg.cpp:638
+#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:638
 msgid "Landscape"
 msgstr "Liggande"
 
@@ -2128,8 +2078,7 @@ msgstr "Att ladda Grey Raw PNM bilder 
 msgid "Log saved to the file '%s'."
 msgstr "Logg sparad till filen \"%s\"."
 
-#: ../include/wx/xti.h:469
-#: ../include/wx/xti.h:473
+#: ../include/wx/xti.h:469 ../include/wx/xti.h:473
 msgid "Long Conversions not supported"
 msgstr "Konvertering till long st�ds inte"
 
@@ -2138,8 +2087,13 @@ msgid "MDI child"
 msgstr "MDI-barn"
 
 #: ../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:4678
 msgid "Ma&ximize"
@@ -2209,10 +2163,8 @@ msgstr "Namn"
 msgid "New item"
 msgstr "Nytt element"
 
-#: ../src/generic/dirdlgg.cpp:274
-#: ../src/generic/dirdlgg.cpp:284
-#: ../src/generic/filedlgg.cpp:587
-#: ../src/generic/filedlgg.cpp:596
+#: ../src/generic/dirdlgg.cpp:274 ../src/generic/dirdlgg.cpp:284
+#: ../src/generic/filedlgg.cpp:587 ../src/generic/filedlgg.cpp:596
 msgid "NewName"
 msgstr "Nytt namn"
 
@@ -2220,10 +2172,8 @@ msgstr "Nytt namn"
 msgid "Next page"
 msgstr "N�sta sida"
 
-#: ../src/common/dlgcmn.cpp:213
-#: ../src/mac/msgdlg.cpp:56
-#: ../src/mac/msgdlg.cpp:140
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:213 ../src/mac/msgdlg.cpp:56
+#: ../src/mac/msgdlg.cpp:140 ../src/motif/msgdlg.cpp:182
 msgid "No"
 msgstr "Nej"
 
@@ -2240,7 +2190,8 @@ msgstr "Inga poster funna."
 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"
@@ -2262,20 +2213,17 @@ msgstr ""
 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:1162
-#: ../src/common/image.cpp:1205
+#: ../src/common/image.cpp:1162 ../src/common/image.cpp:1205
 msgid "No handler found for image type."
 msgstr "Ingen hanterare hittades f�r bildtyp."
 
-#: ../src/common/image.cpp:1170
-#: ../src/common/image.cpp:1213
+#: ../src/common/image.cpp:1170 ../src/common/image.cpp:1213
 #: ../src/common/image.cpp:1247
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "Ingen bildhanterare f�r typ %d �r definierad."
 
-#: ../src/common/image.cpp:1231
-#: ../src/common/image.cpp:1263
+#: ../src/common/image.cpp:1231 ../src/common/image.cpp:1263
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "Ingen bildhanterare f�r typ %s �r definierad."
@@ -2292,8 +2240,7 @@ msgstr "Inget ljud"
 msgid "Nordic (ISO-8859-10)"
 msgstr "Nordiska spr�k (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:227
-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/generic/fontdlgg.cpp:227 ../src/generic/fontdlgg.cpp:230
 msgid "Normal"
 msgstr "Normal"
 
@@ -2309,16 +2256,11 @@ msgstr "Normalt typsnitt:"
 msgid "Note, 8 1/2 x 11 in"
 msgstr "Note, 8 1/2 x 11 tum"
 
-#: ../src/common/dlgcmn.cpp:219
-#: ../src/generic/dirdlgg.cpp:153
-#: ../src/generic/filedlgg.cpp:976
-#: ../src/generic/filedlgg.cpp:987
-#: ../src/generic/fontdlgg.cpp:254
-#: ../src/generic/logg.cpp:748
-#: ../src/generic/prntdlgg.cpp:454
-#: ../src/gtk/filedlg.cpp:162
-#: ../src/gtk/fontdlg.cpp:139
-#: ../src/html/helpfrm.cpp:1064
+#: ../src/common/dlgcmn.cpp:219 ../src/generic/dirdlgg.cpp:153
+#: ../src/generic/filedlgg.cpp:976 ../src/generic/filedlgg.cpp:987
+#: ../src/generic/fontdlgg.cpp:254 ../src/generic/logg.cpp:748
+#: ../src/generic/prntdlgg.cpp:454 ../src/gtk/filedlg.cpp:162
+#: ../src/gtk/fontdlg.cpp:139 ../src/html/helpfrm.cpp:1064
 msgid "OK"
 msgstr "OK"
 
@@ -2326,20 +2268,16 @@ msgstr "OK"
 msgid "Objects must have an id attribute"
 msgstr "Objekt m�ste ha ett id-attribut"
 
-#: ../src/common/docview.cpp:1197
-#: ../src/common/docview.cpp:1525
+#: ../src/common/docview.cpp:1197 ../src/common/docview.cpp:1525
 msgid "Open File"
 msgstr "�ppna fil"
 
-#: ../src/html/helpfrm.cpp:571
-#: ../src/html/helpfrm.cpp:1404
+#: ../src/html/helpfrm.cpp:571 ../src/html/helpfrm.cpp:1404
 msgid "Open HTML document"
 msgstr "�ppna HTML-dokument"
 
-#: ../src/generic/dirctrlg.cpp:712
-#: ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611
-#: ../src/generic/filedlgg.cpp:739
+#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
+#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:739
 msgid "Operation not permitted."
 msgstr "Operation ej till�ten."
 
@@ -2362,13 +2300,11 @@ msgstr "Flagga \"%s\": \"%s\" kan inte konverteras till ett datum."
 msgid "Options"
 msgstr "Alternativ"
 
-#: ../src/generic/prntdlgg.cpp:430
-#: ../src/generic/prntdlgg.cpp:639
+#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:639
 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"
 
@@ -2384,8 +2320,7 @@ msgstr "PCX: Ogiltig bild"
 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 !!!"
 
@@ -2423,14 +2358,12 @@ msgstr "Sidinst
 msgid "Pages"
 msgstr "Sidor"
 
-#: ../src/generic/prntdlgg.cpp:545
-#: ../src/generic/prntdlgg.cpp:625
+#: ../src/generic/prntdlgg.cpp:545 ../src/generic/prntdlgg.cpp:625
 #: ../src/generic/prntdlgg.cpp:818
 msgid "Paper Size"
 msgstr "Pappersstorlek"
 
-#: ../src/generic/prntdlgg.cpp:420
-#: ../src/generic/prntdlgg.cpp:612
+#: ../src/generic/prntdlgg.cpp:420 ../src/generic/prntdlgg.cpp:612
 #: ../src/generic/prntdlgg.cpp:813
 msgid "Paper size"
 msgstr "Pappersstorlek"
@@ -2443,8 +2376,7 @@ msgstr "Skickade ett redan registrerat objekt till SetObject"
 msgid "Passing a already registered object to SetObjectName"
 msgstr "Skickade ett redan registrerat objekt till SetObjectName"
 
-#: ../src/common/xtistrm.cpp:434
-#: ../src/common/xtistrm.cpp:654
+#: ../src/common/xtistrm.cpp:434 ../src/common/xtistrm.cpp:654
 msgid "Passing an unkown object to GetObject"
 msgstr "Skickade ett ok�nt objekt till GetObject"
 
@@ -2460,8 +2392,7 @@ msgstr "Kunde inte skapa r
 msgid "Please choose a valid font."
 msgstr "V�lj ett giltigt typsnitt."
 
-#: ../src/generic/filedlgg.cpp:1221
-#: ../src/gtk/filedlg.cpp:82
+#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
 msgid "Please choose an existing file."
 msgstr "V�lj en existerande fil."
 
@@ -2484,8 +2415,7 @@ msgstr ""
 msgid "Please wait while printing\n"
 msgstr "V�nta p� utskrift\n"
 
-#: ../src/generic/prntdlgg.cpp:427
-#: ../src/generic/prntdlgg.cpp:637
+#: ../src/generic/prntdlgg.cpp:427 ../src/generic/prntdlgg.cpp:637
 msgid "Portrait"
 msgstr "St�ende"
 
@@ -2501,8 +2431,7 @@ msgstr "F
 msgid "Previous page"
 msgstr "F�reg�ende sida"
 
-#: ../src/generic/prntdlgg.cpp:107
-#: ../src/generic/prntdlgg.cpp:121
+#: ../src/generic/prntdlgg.cpp:107 ../src/generic/prntdlgg.cpp:121
 msgid "Print"
 msgstr "Skriv ut"
 
@@ -2510,8 +2439,7 @@ msgstr "Skriv ut"
 msgid "Print Preview"
 msgstr "F�rhandsgranska utskrift"
 
-#: ../src/common/prntbase.cpp:784
-#: ../src/common/prntbase.cpp:810
+#: ../src/common/prntbase.cpp:784 ../src/common/prntbase.cpp:810
 msgid "Print Preview Failure"
 msgstr "F�rhandsgranskning av utskrift misslyckades"
 
@@ -2555,8 +2483,7 @@ msgstr "Skrivaralternativ:"
 msgid "Printer..."
 msgstr "Skrivare..."
 
-#: ../src/common/prntbase.cpp:109
-#: ../src/common/prntbase.cpp:154
+#: ../src/common/prntbase.cpp:109 ../src/common/prntbase.cpp:154
 msgid "Printing "
 msgstr "Skriver ut"
 
@@ -2585,8 +2512,7 @@ msgstr "Quarto, 215 x 275 mm"
 msgid "Question"
 msgstr "Fr�ga"
 
-#: ../src/common/ffile.cpp:111
-#: ../src/common/ffile.cpp:132
+#: ../src/common/ffile.cpp:111 ../src/common/ffile.cpp:132
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "L�sfel p� fil \"%s\""
@@ -2637,7 +2563,8 @@ msgstr "Ta bort aktuell sida fr
 #: ../src/common/rendcmn.cpp:193
 #, 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/generic/fdrepdlg.cpp:171
 msgid "Replace &all"
@@ -2676,14 +2603,17 @@ msgstr "Spara logginneh
 msgid "Script"
 msgstr "Skrivstil"
 
-#: ../src/html/helpfrm.cpp:443
-#: ../src/html/helpfrm.cpp:458
+#: ../src/html/helpfrm.cpp:443 ../src/html/helpfrm.cpp:458
 msgid "Search"
 msgstr "S�k"
 
 #: ../src/html/helpfrm.cpp:445
-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:152
 msgid "Search direction"
@@ -2759,8 +2689,7 @@ msgstr "Visa alla poster i index"
 msgid "Show hidden directories"
 msgstr "Visa dolda kataloger"
 
-#: ../src/generic/filedlgg.cpp:971
-#: ../src/generic/filedlgg.cpp:993
+#: ../src/generic/filedlgg.cpp:971 ../src/generic/filedlgg.cpp:993
 msgid "Show hidden files"
 msgstr "Visa dolda filer"
 
@@ -2780,8 +2709,7 @@ msgstr "Lutande"
 msgid "Sorry, could not open this file for saving."
 msgstr "Kunde inte �ppna denna fil f�r att spara."
 
-#: ../src/common/docview.cpp:367
-#: ../src/common/docview.cpp:380
+#: ../src/common/docview.cpp:367 ../src/common/docview.cpp:380
 #: ../src/common/docview.cpp:1504
 msgid "Sorry, could not open this file."
 msgstr "Kunde inte �ppna denna fil."
@@ -2798,8 +2726,7 @@ msgstr "Inte tillr
 msgid "Sorry, print preview needs a printer to be installed."
 msgstr "F�rhandsgranskning kr�ver en installerad skrivare."
 
-#: ../src/common/docview.cpp:1196
-#: ../src/common/docview.cpp:1524
+#: ../src/common/docview.cpp:1196 ../src/common/docview.cpp:1524
 msgid "Sorry, the format for this file is unknown."
 msgstr "Filformatet f�r denna fil �r ok�nt."
 
@@ -2829,8 +2756,7 @@ msgstr "Str
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "Str�ng till f�rg: Felaktig f�rgspecifikation: %s"
 
-#: ../include/wx/xti.h:396
-#: ../include/wx/xti.h:400
+#: ../include/wx/xti.h:396 ../include/wx/xti.h:400
 msgid "String conversions not supported"
 msgstr "Str�ngomvandlingar st�ds inte"
 
@@ -2843,8 +2769,7 @@ msgstr "Subklass \"%s\" hittades inte f
 msgid "Swiss"
 msgstr "Swiss"
 
-#: ../src/common/imagtiff.cpp:232
-#: ../src/common/imagtiff.cpp:243
+#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
 #: ../src/common/imagtiff.cpp:354
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: Kunde inte allokera minne."
@@ -2903,23 +2828,29 @@ msgstr "Urklippsformatet \"%d\" finns inte."
 
 #: ../src/generic/dirdlgg.cpp:188
 #, c-format
-msgid "The directory '%s' does not exist\n"
+msgid ""
+"The directory '%s' does not exist\n"
 "Create it now?"
-msgstr "Katalogen \"%s\" finns inte\n"
+msgstr ""
+"Katalogen \"%s\" finns inte\n"
 "Skapa den nu?"
 
 #: ../src/common/docview.cpp:1859
 #, c-format
-msgid "The file '%s' couldn't be opened.\n"
+msgid ""
+"The file '%s' couldn't be opened.\n"
 "It has been removed from the most recently used files list."
-msgstr "Filen \"%s\" kunde inte �ppnas.\n"
+msgstr ""
+"Filen \"%s\" kunde inte �ppnas.\n"
 "Den har tagits bort fr�n senast anv�nda filer-listan."
 
 #: ../src/common/docview.cpp:1869
 #, c-format
-msgid "The file '%s' doesn't exist and couldn't be opened.\n"
+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 "Filen \"%s\" finns inte och kunde inte �ppnas.\n"
+msgstr ""
+"Filen \"%s\" finns inte och kunde inte �ppnas.\n"
 "Den har tagits bort fr�n senast anv�nda filer-listan."
 
 #: ../src/common/filename.cpp:931
@@ -2943,24 +2874,39 @@ msgstr "V
 
 #: ../src/msw/dialup.cpp:406
 #, 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:580
-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/thread.cpp:1197
-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:1600
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "Tr�dmodulinitialisering misslyckades: Kunde inte skapa tr�dnyckel"
 
 #: ../src/msw/thread.cpp:1185
-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."
@@ -3003,8 +2949,7 @@ msgstr "
 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"
 
@@ -3016,8 +2961,7 @@ msgstr "Turkiska (ISO-8859-9)"
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/common/xtistrm.cpp:279
-#: ../src/common/xtixml.cpp:351
+#: ../src/common/xtistrm.cpp:279 ../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"
@@ -3100,8 +3044,7 @@ msgstr "Ok
 msgid "Unknown long option '%s'"
 msgstr "Ok�nd l�ng flagga \"%s\""
 
-#: ../src/common/cmdline.cpp:582
-#: ../src/common/cmdline.cpp:603
+#: ../src/common/cmdline.cpp:582 ../src/common/cmdline.cpp:603
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "Ok�nd flagga \"%s\""
@@ -3120,14 +3063,12 @@ msgstr "Ok
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "Omatchad \"{\" i en post f�r mime-typ %s."
 
-#: ../src/common/cmdproc.cpp:254
-#: ../src/common/cmdproc.cpp:280
+#: ../src/common/cmdproc.cpp:254 ../src/common/cmdproc.cpp:280
 #: ../src/common/cmdproc.cpp:300
 msgid "Unnamed command"
 msgstr "Namnl�st kommando"
 
-#: ../src/mac/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:273
+#: ../src/mac/clipbrd.cpp:64 ../src/msw/clipbrd.cpp:273
 #: ../src/msw/clipbrd.cpp:445
 msgid "Unsupported clipboard format."
 msgstr "Urklippsformatet st�ds inte."
@@ -3285,8 +3226,7 @@ msgstr "XML tolkningsfel: \"%s\" p
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: Felaktigt pixeldata!"
 
-#: ../src/common/xpmdecod.cpp:712
-#: ../src/common/xpmdecod.cpp:722
+#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:722
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr "XPM: Felaktig f�rgdefinition \"%s\"!"
@@ -3296,8 +3236,7 @@ msgstr "XPM: Felaktig f
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "XRC-resurs \"%s\" (klass \"%s\") hittades inte!"
 
-#: ../contrib/src/xrc/xmlres.cpp:885
-#: ../contrib/src/xrc/xmlres.cpp:897
+#: ../contrib/src/xrc/xmlres.cpp:885 ../contrib/src/xrc/xmlres.cpp:897
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "XRC-resurs: Kan inte skapa bild fr�n \"%s\"."
@@ -3307,10 +3246,8 @@ msgstr "XRC-resurs: Kan inte skapa bild fr
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr "XRC-resurs: Felaktig f�rgspecifikation \"%s\" f�r egenskap \"%s\"."
 
-#: ../src/common/dlgcmn.cpp:208
-#: ../src/mac/msgdlg.cpp:57
-#: ../src/mac/msgdlg.cpp:139
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:208 ../src/mac/msgdlg.cpp:57
+#: ../src/mac/msgdlg.cpp:139 ../src/motif/msgdlg.cpp:182
 msgid "Yes"
 msgstr "Ja"
 
@@ -3318,8 +3255,7 @@ msgstr "Ja"
 msgid "You cannot add a new directory to this section."
 msgstr "Du kan inte l�gga till en ny katalog till denna sektion"
 
-#: ../src/common/fs_zip.cpp:88
-#: ../src/common/fs_zip.cpp:138
+#: ../src/common/fs_zip.cpp:88 ../src/common/fs_zip.cpp:138
 msgid "ZIP handler currently supports only local files!"
 msgstr "ZIP-hanteraren st�der f�r n�rvarande endast lokala filer!"
 
@@ -3333,7 +3269,8 @@ msgstr "en DDEML-applikation har skapat ett l
 
 #: ../src/msw/dde.cpp:1063
 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 ""
@@ -3355,7 +3292,8 @@ msgstr "en parameter kunde inte bekr
 
 #: ../src/msw/dde.cpp:1054
 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:1060
 msgid "a request for a synchronous data transaction has timed out."
@@ -3363,7 +3301,8 @@ msgstr "tiden f
 
 #: ../src/msw/dde.cpp:1069
 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:1087
 msgid "a request for a synchronous poke transaction has timed out."
@@ -3371,7 +3310,8 @@ msgstr "tiden f
 
 #: ../src/msw/dde.cpp:1102
 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:1096
 msgid ""
@@ -3490,8 +3430,7 @@ msgstr "kan inte hitta anv
 msgid "can't flush file descriptor %d"
 msgstr "kan inte spola filidentifierare %d"
 
-#: ../src/common/file.cpp:535
-#: ../src/common/file.cpp:543
+#: ../src/common/file.cpp:535 ../src/common/file.cpp:543
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "kan inte hitta s�kposition p� filidentifierare %d"
@@ -3500,8 +3439,7 @@ msgstr "kan inte hitta s
 msgid "can't load any font, aborting"
 msgstr "kan inte ladda n�got typsnitt, avbryter"
 
-#: ../src/common/ffile.cpp:63
-#: ../src/common/file.cpp:352
+#: ../src/common/ffile.cpp:63 ../src/common/file.cpp:352
 #, c-format
 msgid "can't open file '%s'"
 msgstr "kan inte �ppna fil \"%s\""
@@ -3539,8 +3477,7 @@ msgstr "kan inte ta bort fil \"%s\""
 msgid "can't remove temporary file '%s'"
 msgstr "kan inte ta bort tempor�r fil \"%s\""
 
-#: ../src/common/file.cpp:492
-#: ../src/common/file.cpp:518
+#: ../src/common/file.cpp:492 ../src/common/file.cpp:518
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "kan inte s�ka p� filidentifierare %d"
@@ -3704,8 +3641,7 @@ msgstr "ogiltigt eof() returv
 msgid "invalid message box return value"
 msgstr "ogilitigt returv�rde f�r meddelandedialog"
 
-#: ../src/common/fontcmn.cpp:473
-#: ../src/common/fontcmn.cpp:537
+#: ../src/common/fontcmn.cpp:473 ../src/common/fontcmn.cpp:537
 msgid "italic"
 msgstr "kursiv"
 
@@ -3851,8 +3787,7 @@ msgstr "tredje"
 msgid "thirteenth"
 msgstr "trettonde"
 
-#: ../src/common/imagtiff.cpp:143
-#: ../src/common/imagtiff.cpp:151
+#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
 #, c-format
 msgid "tiff module: %s"
 msgstr "tiffmodul: %s"
@@ -3895,8 +3830,7 @@ msgstr "ok
 msgid "unknown class %s"
 msgstr "ok�nd klass %s"
 
-#: ../src/common/regex.cpp:151
-#: ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:151 ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr "ok�nt fel"
 
@@ -3909,8 +3843,7 @@ msgstr "ok
 msgid "unknown line terminator"
 msgstr "ok�nt radavslut"
 
-#: ../src/common/file.cpp:474
-#: ../src/common/file.cpp:501
+#: ../src/common/file.cpp:474 ../src/common/file.cpp:501
 msgid "unknown seek origin"
 msgstr "ok�nd s�kstart"
 
@@ -3949,8 +3882,7 @@ msgstr "skriver"
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay misslyckades."
 
-#: ../src/common/socket.cpp:395
-#: ../src/common/socket.cpp:449
+#: ../src/common/socket.cpp:395 ../src/common/socket.cpp:449
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: Ogiltig signatur i ReadMsg."
 
@@ -3971,8 +3903,7 @@ msgstr "wxWindows kunde inte 
 msgid "yesterday"
 msgstr "ig�r"
 
-#: ../src/common/zstream.cpp:141
-#: ../src/common/zstream.cpp:275
+#: ../src/common/zstream.cpp:141 ../src/common/zstream.cpp:275
 #, c-format
 msgid "zlib error %d"
 msgstr "zlib-fel %d"
@@ -3980,4 +3911,3 @@ msgstr "zlib-fel %d"
 #: ../src/common/prntbase.cpp:450
 msgid "|<<"
 msgstr "|<<"
-