diff --git a/locale/sl.po b/locale/sl.po
index 8f65469f11..246cfe82a2 100644
--- a/locale/sl.po
+++ b/locale/sl.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWidgets 2.6.0\n"
+"Project-Id-Version: wxWidgets 2.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-21 17:37+0200\n"
-"PO-Revision-Date: 2005-04-15 00:58+0100\n"
+"POT-Creation-Date: 2004-10-13 04:17+0930\n"
+"PO-Revision-Date: 2005-08-29 09:29+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: LUGOS <lugos@lugos.si>\n"
 "MIME-Version: 1.0\n"
@@ -11,8 +11,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-Country: SLOVENIA\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
-"%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 
 #: ../src/common/debugrpt.cpp:569
@@ -54,23 +53,23 @@ msgstr "Predogled"
 
 #: ../src/common/paper.cpp:124
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
-msgstr "kuverta #10, 4 1/8 x 9 1/2 in"
+msgstr "kuverta #10, 4 1/8 x 9 1/2 in."
 
 #: ../src/common/paper.cpp:125
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
-msgstr "kuverta #11, 4 1/2 x 10 3/8 in"
+msgstr "kuverta #11, 4 1/2 x 10 3/8 in."
 
 #: ../src/common/paper.cpp:126
 msgid "#12 Envelope, 4 3/4 x 11 in"
-msgstr "kuverta #12, 4 3/4 x 11 in"
+msgstr "kuverta #12, 4 3/4 x 11 in."
 
 #: ../src/common/paper.cpp:127
 msgid "#14 Envelope, 5 x 11 1/2 in"
-msgstr "kuverta #14, 5 x 11 1/2 in"
+msgstr "kuverta #14, 5 x 11 1/2 in."
 
 #: ../src/common/paper.cpp:123
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
-msgstr "kuverta #9, 3 7/8 x 8 7/8 in"
+msgstr "kuverta #9, 3 7/8 x 8 7/8 in."
 
 #: ../contrib/src/deprecated/resource.cpp:1808
 #: ../contrib/src/deprecated/resource.cpp:1938
@@ -83,8 +82,10 @@ msgstr "#define %s mora biti tipa integer."
 # html/helpfrm.cpp:719
 # html/helpfrm.cpp:1277
 # html/helpfrm.cpp:1304
-#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
-#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
+#: ../src/html/helpfrm.cpp:1042
+#: ../src/html/helpfrm.cpp:1044
+#: ../src/html/helpfrm.cpp:1703
+#: ../src/html/helpfrm.cpp:1736
 #, c-format
 msgid "%i of %i"
 msgstr "%i od %i"
@@ -147,7 +148,8 @@ msgstr "%s ni specifikacija vira ikone."
 msgid "%s: ill-formed resource file syntax."
 msgstr "%s: slabo oblikovana skladnja datoteke vira."
 
-#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359
+#: ../src/html/helpfrm.cpp:357
+#: ../src/html/helpfrm.cpp:359
 msgid "&About..."
 msgstr "&O programu ..."
 
@@ -185,8 +187,10 @@ msgstr "&Krepko"
 # generic/proplist.cpp:523
 # generic/wizard.cpp:192
 # html/helpfrm.cpp:910
-#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363
-#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:422
+#: ../src/common/stockitem.cpp:110
+#: ../src/generic/fontdlgg.cpp:363
+#: ../src/generic/fontdlgg.cpp:382
+#: ../src/generic/wizard.cpp:422
 msgid "&Cancel"
 msgstr "&Prekliči"
 
@@ -202,12 +206,15 @@ msgstr "&Po
 
 # generic/logg.cpp:477
 # generic/tipdlg.cpp:170
-#: ../src/common/prntbase.cpp:875 ../src/common/stockitem.cpp:112
-#: ../src/generic/logg.cpp:509 ../src/html/helpfrm.cpp:354
+#: ../src/common/prntbase.cpp:875
+#: ../src/common/stockitem.cpp:112
+#: ../src/generic/logg.cpp:509
+#: ../src/html/helpfrm.cpp:354
 msgid "&Close"
 msgstr "&Zapri"
 
-#: ../src/common/stockitem.cpp:113 ../src/mac/carbon/textctrl.cpp:1074
+#: ../src/common/stockitem.cpp:113
+#: ../src/mac/carbon/textctrl.cpp:1074
 #: ../src/msw/textctrl.cpp:2064
 msgid "&Copy"
 msgstr "&Kopiraj"
@@ -216,7 +223,8 @@ msgstr "&Kopiraj"
 msgid "&Debug report preview:"
 msgstr "&Predogled poročila o razhroščevanju:"
 
-#: ../src/common/stockitem.cpp:115 ../src/mac/carbon/textctrl.cpp:1076
+#: ../src/common/stockitem.cpp:115
+#: ../src/mac/carbon/textctrl.cpp:1076
 #: ../src/msw/textctrl.cpp:2066
 msgid "&Delete"
 msgstr "&Zbriši"
@@ -264,8 +272,10 @@ msgstr "&Pojdi na ..."
 # generic/proplist.cpp:528
 # html/helpfrm.cpp:208
 # msw/mdi.cpp:1283
-#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:418
-#: ../src/generic/wizard.cpp:425 ../src/html/helpfrm.cpp:362
+#: ../src/common/stockitem.cpp:122
+#: ../src/generic/wizard.cpp:418
+#: ../src/generic/wizard.cpp:425
+#: ../src/html/helpfrm.cpp:362
 msgid "&Help"
 msgstr "&Pomoč"
 
@@ -299,13 +309,15 @@ msgid "&New"
 msgstr "&Nov"
 
 # msw/mdi.cpp:188
-#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:188
+#: ../src/generic/mdig.cpp:118
+#: ../src/msw/mdi.cpp:188
 msgid "&Next"
 msgstr "&Naslednji"
 
 # generic/wizard.cpp:189
 # generic/wizard.cpp:286
-#: ../src/generic/wizard.cpp:421 ../src/generic/wizard.cpp:636
+#: ../src/generic/wizard.cpp:421
+#: ../src/generic/wizard.cpp:636
 msgid "&Next >"
 msgstr "&Naslednji >"
 
@@ -333,7 +345,8 @@ msgstr "&Opombe:"
 # generic/prntdlgg.cpp:467
 # generic/proplist.cpp:511
 # html/helpfrm.cpp:909
-#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368
+#: ../src/common/stockitem.cpp:133
+#: ../src/generic/fontdlgg.cpp:368
 #: ../src/generic/fontdlgg.cpp:375
 msgid "&OK"
 msgstr "&V redu"
@@ -351,7 +364,8 @@ msgid "&Open..."
 msgstr "&Odpri ..."
 
 # common/cmdline.cpp:912
-#: ../src/common/stockitem.cpp:135 ../src/mac/carbon/textctrl.cpp:1075
+#: ../src/common/stockitem.cpp:135
+#: ../src/mac/carbon/textctrl.cpp:1075
 #: ../src/msw/textctrl.cpp:2065
 msgid "&Paste"
 msgstr "&Prilepi"
@@ -366,7 +380,8 @@ msgid "&Preferences"
 msgstr "&Možnosti"
 
 # html/helpfrm.cpp:512
-#: ../src/generic/mdig.cpp:119 ../src/msw/mdi.cpp:189
+#: ../src/generic/mdig.cpp:119
+#: ../src/msw/mdi.cpp:189
 msgid "&Previous"
 msgstr "&Prejšnji"
 
@@ -392,15 +407,18 @@ msgstr "&Izhod"
 
 # common/docview.cpp:1945
 # common/docview.cpp:1956
-#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299
-#: ../src/common/stockitem.cpp:141 ../src/mac/carbon/textctrl.cpp:1071
+#: ../src/common/cmdproc.cpp:292
+#: ../src/common/cmdproc.cpp:299
+#: ../src/common/stockitem.cpp:141
+#: ../src/mac/carbon/textctrl.cpp:1071
 #: ../src/msw/textctrl.cpp:2061
 msgid "&Redo"
 msgstr "&Ponovi"
 
 # common/docview.cpp:1939
 # common/docview.cpp:1966
-#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308
+#: ../src/common/cmdproc.cpp:288
+#: ../src/common/cmdproc.cpp:308
 msgid "&Redo "
 msgstr "&Ponovi "
 
@@ -446,13 +464,16 @@ msgid "&Style:"
 msgstr "&Slog:"
 
 # generic/fontdlgg.cpp:242
-#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337
+#: ../src/common/stockitem.cpp:149
+#: ../src/generic/fontdlgg.cpp:337
 msgid "&Underline"
 msgstr "&Podčrtaj"
 
 # common/docview.cpp:1951
-#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150
-#: ../src/mac/carbon/textctrl.cpp:1070 ../src/msw/textctrl.cpp:2060
+#: ../src/common/cmdproc.cpp:270
+#: ../src/common/stockitem.cpp:150
+#: ../src/mac/carbon/textctrl.cpp:1070
+#: ../src/msw/textctrl.cpp:2060
 msgid "&Undo"
 msgstr "&Razveljavi"
 
@@ -477,8 +498,11 @@ msgstr "&Debelina:"
 # msw/mdi.cpp:1287
 # msw/mdi.cpp:1294
 # msw/window.cpp:2286
-#: ../src/generic/mdig.cpp:298 ../src/generic/mdig.cpp:314
-#: ../src/generic/mdig.cpp:318 ../src/msw/mdi.cpp:1410 ../src/msw/mdi.cpp:1417
+#: ../src/generic/mdig.cpp:298
+#: ../src/generic/mdig.cpp:314
+#: ../src/generic/mdig.cpp:318
+#: ../src/msw/mdi.cpp:1410
+#: ../src/msw/mdi.cpp:1417
 #: ../src/msw/mdi.cpp:1447
 msgid "&Window"
 msgstr "&Okno"
@@ -491,13 +515,15 @@ msgstr "&Da"
 
 # common/config.cpp:396
 # msw/regconf.cpp:264
-#: ../src/common/config.cpp:433 ../src/msw/regconf.cpp:258
+#: ../src/common/config.cpp:433
+#: ../src/msw/regconf.cpp:258
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' ima dodaten '..', ignorirano."
 
 # common/valtext.cpp:140
-#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162
+#: ../src/common/valtext.cpp:132
+#: ../src/common/valtext.cpp:162
 #: ../src/common/valtext.cpp:168
 #, c-format
 msgid "'%s' is invalid"
@@ -552,7 +578,8 @@ msgstr "(Pomo
 # html/helpfrm.cpp:276
 # html/helpfrm.cpp:783
 # html/helpfrm.cpp:1330
-#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114
+#: ../src/html/helpfrm.cpp:431
+#: ../src/html/helpfrm.cpp:1114
 #: ../src/html/helpfrm.cpp:1764
 msgid "(bookmarks)"
 msgstr "(zaznamki)"
@@ -582,20 +609,21 @@ msgstr ""
 
 # generic/dirdlgg.cpp:264
 # generic/filedlgg.cpp:713
-#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:740
+#: ../src/generic/dirctrlg.cpp:683
+#: ../src/generic/filedlgg.cpp:740
 msgid "."
 msgstr "."
 
 # generic/dirdlgg.cpp:265
 # generic/filedlgg.cpp:714
-#: ../src/generic/dirctrlg.cpp:684 ../src/generic/filedlgg.cpp:741
+#: ../src/generic/dirctrlg.cpp:684
+#: ../src/generic/filedlgg.cpp:741
 msgid ".."
 msgstr ".."
 
 #: ../src/common/paper.cpp:147
-#, fuzzy
 msgid "10 x 11 in"
-msgstr "10 x 14 in."
+msgstr "10 x 11 in."
 
 #: ../src/common/paper.cpp:120
 msgid "10 x 14 in"
@@ -606,23 +634,20 @@ msgid "11 x 17 in"
 msgstr "11 x 17 in."
 
 #: ../src/common/paper.cpp:191
-#, fuzzy
 msgid "12 x 11 in"
-msgstr "10 x 14 in."
+msgstr "12 x 11 in."
 
 #: ../src/common/paper.cpp:148
-#, fuzzy
 msgid "15 x 11 in"
-msgstr "10 x 14 in."
+msgstr "15 x 11 in."
 
 #: ../src/common/paper.cpp:139
 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
 msgstr "kuverta 6 3/4, 3 5/8 x 6 1/2 in."
 
 #: ../src/common/paper.cpp:146
-#, fuzzy
 msgid "9 x 11 in"
-msgstr "11 x 17 in."
+msgstr "9 x 11 in."
 
 # html/htmprint.cpp:272
 #: ../src/html/htmprint.cpp:309
@@ -649,17 +674,20 @@ msgid "<<"
 msgstr "<<"
 
 # generic/filedlgg.cpp:356
-#: ../src/generic/filedlgg.cpp:259 ../src/generic/filedlgg.cpp:282
+#: ../src/generic/filedlgg.cpp:259
+#: ../src/generic/filedlgg.cpp:282
 msgid "<DIR>"
 msgstr "<IMENIK>"
 
 # generic/filedlgg.cpp:356
-#: ../src/generic/filedlgg.cpp:263 ../src/generic/filedlgg.cpp:286
+#: ../src/generic/filedlgg.cpp:263
+#: ../src/generic/filedlgg.cpp:286
 msgid "<DRIVE>"
 msgstr "<POGON>"
 
 # generic/filedlgg.cpp:357
-#: ../src/generic/filedlgg.cpp:261 ../src/generic/filedlgg.cpp:284
+#: ../src/generic/filedlgg.cpp:261
+#: ../src/generic/filedlgg.cpp:284
 msgid "<LINK>"
 msgstr "<POVEZAVA>"
 
@@ -697,29 +725,25 @@ msgstr "Neprazno zbirko morajo tvoriti vozli 'elementov'"
 
 #: ../src/common/paper.cpp:166
 msgid "A2 420 x 594 mm"
-msgstr ""
+msgstr "A2, 420 x 594 mm"
 
 #: ../src/common/paper.cpp:163
-#, fuzzy
 msgid "A3 Extra 322 x 445 mm"
-msgstr "kuverta C3, 324 x 458 mm"
+msgstr "kuverta A3 Extra, 322 x 445 mm"
 
 #: ../src/common/paper.cpp:168
-#, fuzzy
 msgid "A3 Extra Transverse 322 x 445 mm"
-msgstr "kuverta C3, 324 x 458 mm"
+msgstr "kuverta A3 Extra prečno, 322 x 445 mm"
 
 # generic/dcpsg.cpp:2547
 #: ../src/common/paper.cpp:177
-#, fuzzy
 msgid "A3 Rotated 420 x 297 mm"
-msgstr "A4, 210 x 297 mm"
+msgstr "A3 rotirano, 420 x 297 mm"
 
 # generic/dcpsg.cpp:2547
 #: ../src/common/paper.cpp:167
-#, fuzzy
 msgid "A3 Transverse 297 x 420 mm"
-msgstr "A3, 297 x 420 mm"
+msgstr "A3 prečno, 297 x 420 mm"
 
 # generic/dcpsg.cpp:2547
 #: ../src/common/paper.cpp:113
@@ -728,25 +752,22 @@ msgstr "A3, 297 x 420 mm"
 
 #: ../src/common/paper.cpp:153
 msgid "A4 Extra 9.27 x 12.69 in"
-msgstr ""
+msgstr "A4 Extra, 9.27 x 12.69 in."
 
 # generic/dcpsg.cpp:2547
 #: ../src/common/paper.cpp:160
-#, fuzzy
 msgid "A4 Plus 210 x 330 mm"
-msgstr "A4, 210 x 297 mm"
+msgstr "A4 Plus, 210 x 330 mm"
 
 # generic/dcpsg.cpp:2547
 #: ../src/common/paper.cpp:178
-#, fuzzy
 msgid "A4 Rotated 297 x 210 mm"
-msgstr "A3, 297 x 420 mm"
+msgstr "A4 rotirano, 297 x 210 mm"
 
 # generic/dcpsg.cpp:2547
 #: ../src/common/paper.cpp:155
-#, fuzzy
 msgid "A4 Transverse 210 x 297 mm"
-msgstr "A4, 210 x 297 mm"
+msgstr "A4 prečno, 210 x 297 mm"
 
 # generic/dcpsg.cpp:2547
 #: ../src/common/paper.cpp:104
@@ -760,19 +781,17 @@ msgstr "A4-mali, 210 x 297 mm"
 
 # generic/dcpsg.cpp:2547
 #: ../src/common/paper.cpp:164
-#, fuzzy
 msgid "A5 Extra 174 x 235 mm"
-msgstr "A5, 148 x 210 mm"
+msgstr "A5 Extra, 174 x 235 mm"
 
 #: ../src/common/paper.cpp:179
 msgid "A5 Rotated 210 x 148 mm"
-msgstr ""
+msgstr "A5 rotirano, 210 x 148 mm"
 
 # generic/dcpsg.cpp:2547
 #: ../src/common/paper.cpp:161
-#, fuzzy
 msgid "A5 Transverse 148 x 210 mm"
-msgstr "A5, 148 x 210 mm"
+msgstr "A5 prečno, 148 x 210 mm"
 
 # generic/dcpsg.cpp:2547
 #: ../src/common/paper.cpp:115
@@ -780,15 +799,13 @@ msgid "A5 sheet, 148 x 210 mm"
 msgstr "A5, 148 x 210 mm"
 
 #: ../src/common/paper.cpp:171
-#, fuzzy
 msgid "A6 105 x 148 mm"
-msgstr "10 x 14 in."
+msgstr "A6, 105 x 148 mm"
 
 # generic/dcpsg.cpp:2547
 #: ../src/common/paper.cpp:184
-#, fuzzy
 msgid "A6 Rotated 148 x 105 mm"
-msgstr "A5, 148 x 210 mm"
+msgstr "A6 rotirano, 148 x 105 mm"
 
 # generic/fontdlgg.cpp:325
 #: ../src/generic/fontdlgg.cpp:87
@@ -874,9 +891,7 @@ msgstr "Klicanje ponudnika spletnih storitev je v teku."
 #: ../src/generic/logg.cpp:1163
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
-msgstr ""
-"Želite dopisati dnevnik v datoteko '%s' (izbira [Ne] povzroči prepis "
-"datoteke)?"
+msgstr "Želite dopisati dnevnik v datoteko '%s' (izbira [Ne] povzroči prepis datoteke)?"
 
 #: ../src/common/fmapbase.cpp:109
 msgid "Arabic (ISO-8859-6)"
@@ -892,13 +907,12 @@ msgstr "Atributi"
 
 # generic/dcpsg.cpp:2547
 #: ../src/common/paper.cpp:144
-#, fuzzy
 msgid "B4 (ISO) 250 x 353 mm"
-msgstr "B4, 250 x 354 mm"
+msgstr "B4 (ISO), 250 x 354 mm"
 
 #: ../src/common/paper.cpp:180
 msgid "B4 (JIS) Rotated 364 x 257 mm"
-msgstr ""
+msgstr "B4 (JIS) rotirano, 364 x 257 mm"
 
 #: ../src/common/paper.cpp:134
 msgid "B4 Envelope, 250 x 353 mm"
@@ -911,17 +925,16 @@ msgstr "B4, 250 x 354 mm"
 
 #: ../src/common/paper.cpp:165
 msgid "B5 (ISO) Extra 201 x 276 mm"
-msgstr ""
+msgstr "B5 (ISO) Extra, 201 x 276 mm"
 
 #: ../src/common/paper.cpp:181
 msgid "B5 (JIS) Rotated 257 x 182 mm"
-msgstr ""
+msgstr "B5 (JIS) rotirano, 257 x 182 mm"
 
 # generic/dcpsg.cpp:2547
 #: ../src/common/paper.cpp:162
-#, fuzzy
 msgid "B5 (JIS) Transverse 182 x 257 mm"
-msgstr "B5, 182 x 257 mm"
+msgstr "B5 (JIS) prečno, 182 x 257 mm"
 
 #: ../src/common/paper.cpp:135
 msgid "B5 Envelope, 176 x 250 mm"
@@ -934,11 +947,11 @@ msgstr "B5, 182 x 257 mm"
 
 #: ../src/common/paper.cpp:189
 msgid "B6 (JIS) 128 x 182 mm"
-msgstr ""
+msgstr "B6 (JIS), 128 x 182 mm"
 
 #: ../src/common/paper.cpp:190
 msgid "B6 (JIS) Rotated 182 x 128 mm"
-msgstr ""
+msgstr "B6 (JIS) rotirano, 182 x 128 mm"
 
 #: ../src/common/paper.cpp:136
 msgid "B6 Envelope, 176 x 125 mm"
@@ -946,7 +959,8 @@ msgstr "kuverta B6, 176 x 125 mm"
 
 # common/imagbmp.cpp:266
 # common/imagbmp.cpp:278
-#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493
+#: ../src/common/imagbmp.cpp:477
+#: ../src/common/imagbmp.cpp:493
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: pomnilnika ni mogoče alocirati."
 
@@ -1036,7 +1050,8 @@ msgstr "kuverta C6, 114 x 162 mm"
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "kuverta C65, 114 x 229 mm"
 
-#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856
+#: ../src/html/chm.cpp:797
+#: ../src/html/chm.cpp:856
 msgid "CHM handler currently supports only local files!"
 msgstr "Upravljalec CHM trenutno podpira le lokalne datoteke!"
 
@@ -1058,7 +1073,8 @@ msgstr "O
 
 # common/filefn.cpp:1287
 # msw/dir.cpp:294
-#: ../src/msw/dir.cpp:205 ../src/unix/dir.cpp:232
+#: ../src/msw/dir.cpp:205
+#: ../src/unix/dir.cpp:232
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "Oštevilčenje datotek v imeniku '%s' ni možno."
@@ -1074,7 +1090,8 @@ msgid "Can not resume thread %lu"
 msgstr "Niti %lu ni mogoče nadaljevati."
 
 # msw/thread.cpp:552
-#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:827
+#: ../src/mac/classic/thread.cpp:491
+#: ../src/msw/thread.cpp:827
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "Niti %x ni mogoče nadaljevati"
@@ -1090,7 +1107,8 @@ msgid "Can not suspend thread %lu"
 msgstr "Niti %lu ni mogoče začasno ustaviti."
 
 # msw/thread.cpp:537
-#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:812
+#: ../src/mac/classic/thread.cpp:464
+#: ../src/msw/thread.cpp:812
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "Niti %x ni mogoče začasno ustaviti."
@@ -1109,8 +1127,7 @@ msgstr "Nemogo
 #: ../src/common/image.cpp:1939
 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
-msgstr ""
-"Formata slike v datoteki '%s' ni mogoče preveriti: datoteka ne obstaja."
+msgstr "Formata slike v datoteki '%s' ni mogoče preveriti: datoteka ne obstaja."
 
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -1143,8 +1160,10 @@ msgstr "Registrskega klju
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # msw/thread.cpp:519
-#: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100
-#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594
+#: ../src/mac/carbon/mpthread.cpp:911
+#: ../src/mac/carbon/thread.cpp:1100
+#: ../src/mac/classic/thread.cpp:439
+#: ../src/msw/thread.cpp:594
 #: ../src/os2/thread.cpp:486
 msgid "Can't create thread"
 msgstr "Niti ni mogoče ustvariti."
@@ -1174,7 +1193,8 @@ msgstr "Klju
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # msw/iniconf.cpp:476
-#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:458
+#: ../src/msw/iniconf.cpp:444
+#: ../src/os2/iniconf.cpp:458
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "Datoteke INI '%s' ni mogoče izbrisati."
@@ -1235,7 +1255,8 @@ msgstr "Ni mogo
 
 # common/image.cpp:653
 # common/image.cpp:673
-#: ../src/common/image.cpp:1367 ../src/common/image.cpp:1387
+#: ../src/common/image.cpp:1367
+#: ../src/common/image.cpp:1387
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
 msgstr "Slike iz datoteke '%s' ni mogoče naložiti: datoteka ne obstaja"
@@ -1272,7 +1293,8 @@ msgstr "Vrednosti '%s' ni mogo
 # 
 # msw/registry.cpp:774
 # msw/registry.cpp:813
-#: ../src/msw/registry.cpp:795 ../src/msw/registry.cpp:825
+#: ../src/msw/registry.cpp:795
+#: ../src/msw/registry.cpp:825
 #: ../src/msw/registry.cpp:885
 #, c-format
 msgid "Can't read value of key '%s'"
@@ -1287,12 +1309,14 @@ msgstr "Slike ni mogo
 
 # generic/logg.cpp:535
 # generic/logg.cpp:932
-#: ../src/generic/logg.cpp:569 ../src/generic/logg.cpp:1020
+#: ../src/generic/logg.cpp:569
+#: ../src/generic/logg.cpp:1020
 msgid "Can't save log contents to file."
 msgstr "Vsebine dnevnika ni mogoče shraniti v datoteko."
 
 # msw/thread.cpp:485
-#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:469
+#: ../src/msw/thread.cpp:550
+#: ../src/os2/thread.cpp:469
 msgid "Can't set thread priority"
 msgstr "Prioritet niti ni bilo mogoče nastaviti."
 
@@ -1302,7 +1326,8 @@ msgstr "Prioritet niti ni bilo mogo
 # 
 # msw/registry.cpp:799
 # msw/registry.cpp:923
-#: ../src/msw/registry.cpp:812 ../src/msw/registry.cpp:854
+#: ../src/msw/registry.cpp:812
+#: ../src/msw/registry.cpp:854
 #: ../src/msw/registry.cpp:975
 #, c-format
 msgid "Can't set value of '%s'"
@@ -1325,14 +1350,18 @@ msgstr "Pisanje v upadalni tok ni mo
 # generic/proplist.cpp:523
 # generic/wizard.cpp:192
 # html/helpfrm.cpp:910
-#: ../src/generic/choicdgg.cpp:291 ../src/generic/dirdlgg.cpp:114
-#: ../src/generic/numdlgg.cpp:136 ../src/generic/textdlgg.cpp:120
-#: ../src/gtk/fontdlg.cpp:155 ../src/motif/msgdlg.cpp:204
+#: ../src/generic/choicdgg.cpp:291
+#: ../src/generic/dirdlgg.cpp:114
+#: ../src/generic/numdlgg.cpp:136
+#: ../src/generic/textdlgg.cpp:120
+#: ../src/gtk/fontdlg.cpp:155
+#: ../src/motif/msgdlg.cpp:204
 #: ../contrib/src/deprecated/proplist.cpp:518
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../src/xrc/xmlres.cpp:1188 ../src/xrc/xmlres.cpp:1236
+#: ../src/xrc/xmlres.cpp:1188
+#: ../src/xrc/xmlres.cpp:1236
 msgid "Cannot convert dialog units: dialog unknown."
 msgstr "Enot pogovornih oken ni mogoče pretvoriti: pogovorno okno neznano."
 
@@ -1476,7 +1505,8 @@ msgid "Cannot print empty page."
 msgstr "Prazne strani ni mogoče natisniti."
 
 # html/helpdata.cpp:353
-#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
+#: ../src/msw/volume.cpp:160
+#: ../src/msw/volume.cpp:491
 #, c-format
 msgid "Cannot read typename from '%s'!"
 msgstr "Imena tipa ni mogoče prebrati iz '%s'!"
@@ -1490,7 +1520,8 @@ msgid "Cannot start thread: error writing TLS"
 msgstr "Niti ni možno zagnati: napaka pri pisanju TLS"
 
 # msw/thread.cpp:871
-#: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174
+#: ../src/mac/carbon/mpthread.cpp:977
+#: ../src/mac/carbon/thread.cpp:1174
 msgid "Cannot wait for thread termination."
 msgstr "Na ustavitev niti ni mogoče počakati."
 
@@ -1499,7 +1530,8 @@ msgstr "Na ustavitev niti ni mogo
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # msw/thread.cpp:519
-#: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082
+#: ../src/mac/carbon/mpthread.cpp:893
+#: ../src/mac/carbon/thread.cpp:1082
 msgid "Cant create the thread event queue"
 msgstr "Čakalne vrste nitnih dogodkov ni mogoče ustvariti"
 
@@ -1526,7 +1558,8 @@ msgstr "srednjeevropsko (ISO-8859-2)"
 msgid "Choose ISP to dial"
 msgstr "Izberite ponudnika spletnih storitev, ki ga želite poklicati."
 
-#: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45
+#: ../src/generic/colrdlgg.cpp:151
+#: ../src/gtk/colordlg.cpp:45
 #: ../src/palmos/colordlg.cpp:79
 msgid "Choose colour"
 msgstr "Izberite barvo"
@@ -1547,20 +1580,25 @@ msgstr "&Zapri "
 msgid "Clear the log contents"
 msgstr "Izprazni vsebino dnevnika"
 
-#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384
+#: ../src/generic/fontdlgg.cpp:365
+#: ../src/generic/fontdlgg.cpp:384
 msgid "Click to cancel the font selection."
 msgstr "Kliknite za preklic izbire pisave."
 
-#: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372
-#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379
+#: ../src/generic/fontdlgg.cpp:370
+#: ../src/generic/fontdlgg.cpp:372
+#: ../src/generic/fontdlgg.cpp:377
+#: ../src/generic/fontdlgg.cpp:379
 msgid "Click to confirm the font selection."
 msgstr "Kliknite za potrditev izbire pisave."
 
 # common/prntbase.cpp:359
 # generic/progdlgg.cpp:307
 # generic/proplist.cpp:518
-#: ../src/generic/dbgrptg.cpp:92 ../src/generic/progdlgg.cpp:629
-#: ../src/generic/progdlgg.cpp:634 ../contrib/src/deprecated/proplist.cpp:513
+#: ../src/generic/dbgrptg.cpp:92
+#: ../src/generic/progdlgg.cpp:629
+#: ../src/generic/progdlgg.cpp:634
+#: ../contrib/src/deprecated/proplist.cpp:513
 msgid "Close"
 msgstr "Zapri "
 
@@ -1596,7 +1634,8 @@ msgid "Config entry name cannot start with '%c'."
 msgstr "Vstopno konfiguracijsko ime se ne more začeti s '%c'."
 
 # generic/filedlgg.cpp:1077
-#: ../src/generic/filedlgg.cpp:1318 ../src/gtk/filedlg.cpp:67
+#: ../src/generic/filedlgg.cpp:1318
+#: ../src/gtk/filedlg.cpp:67
 msgid "Confirm"
 msgstr "Potrdi"
 
@@ -1672,8 +1711,7 @@ msgid ""
 "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
 " or provide #define (see manual for caveats)"
 msgstr ""
-"Razrešitev nadzornega razreda ali id '%s' ni uspela. Namesto tega uporabite "
-"(ne-ničelno) celo število\n"
+"Razrešitev nadzornega razreda ali id '%s' ni uspela. Namesto tega uporabite (ne-ničelno) celo število\n"
 " ali priskrbite #define (oglejte si priročnik za opombe)."
 
 #: ../contrib/src/deprecated/resource.cpp:1278
@@ -1682,8 +1720,7 @@ msgid ""
 "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
 "or provide #define (see manual for caveats)"
 msgstr ""
-"Menijskega id '%s' ni mogoče razrešiti. Namesto tega uporabite (ne-ničelno) "
-"celo število\n"
+"Menijskega id '%s' ni mogoče razrešiti. Namesto tega uporabite (ne-ničelno) celo število\n"
 "ali preskrbite #define (oglejte si priročnik za opozorila)."
 
 # common/prntbase.cpp:711
@@ -1693,7 +1730,8 @@ msgstr "Predogleda dokumenta ni mogo
 
 # generic/printps.cpp:209
 # msw/printwin.cpp:252
-#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:763
+#: ../src/generic/printps.cpp:185
+#: ../src/gtk/gnome/gprint.cpp:763
 #: ../src/msw/printwin.cpp:235
 msgid "Could not start printing."
 msgstr "Tiskanja ni mogoče pognati."
@@ -1705,8 +1743,10 @@ msgstr "Podatkov ni mogo
 
 # common/imagbmp.cpp:266
 # common/imagbmp.cpp:278
-#: ../src/mac/carbon/mpthread.cpp:227 ../src/mac/carbon/mpthread.cpp:306
-#: ../src/mac/carbon/thread.cpp:414 ../src/mac/carbon/thread.cpp:495
+#: ../src/mac/carbon/mpthread.cpp:227
+#: ../src/mac/carbon/mpthread.cpp:306
+#: ../src/mac/carbon/thread.cpp:414
+#: ../src/mac/carbon/thread.cpp:495
 msgid "Could not unlock mutex"
 msgstr "Mutexa ni mogoče odkleniti."
 
@@ -1721,20 +1761,24 @@ msgstr "Zaklopa mutexa ne morem pridobiti."
 # msw/imaglist.cpp:152
 # msw/imaglist.cpp:174
 # msw/imaglist.cpp:187
-#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
-#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176
+#: ../src/msw/dragimag.cpp:166
+#: ../src/msw/dragimag.cpp:206
+#: ../src/msw/imaglist.cpp:158
+#: ../src/msw/imaglist.cpp:176
 #: ../src/msw/imaglist.cpp:188
 msgid "Couldn't add an image to the image list."
 msgstr "Na seznam slik ni mogoče dodati slike."
 
 # msw/timer.cpp:96
-#: ../src/msw/timer.cpp:106 ../src/os2/timer.cpp:155
+#: ../src/msw/timer.cpp:106
+#: ../src/os2/timer.cpp:155
 msgid "Couldn't create a timer"
 msgstr "Časovnika ni mogoče ustvariti"
 
 # common/imagbmp.cpp:266
 # common/imagbmp.cpp:278
-#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166
+#: ../src/mgl/cursor.cpp:135
+#: ../src/mgl/cursor.cpp:166
 msgid "Couldn't create cursor."
 msgstr "Kazalke ni mogoče ustvariti."
 
@@ -1745,16 +1789,15 @@ msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "Simbola '%s' v dinamični knjižnici ni mogoče najti."
 
 # msw/thread.cpp:578
-#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:853
+#: ../src/mac/classic/thread.cpp:521
+#: ../src/msw/thread.cpp:853
 msgid "Couldn't get the current thread pointer"
 msgstr "Trenutnega kazalca niti ni mogoče dobiti"
 
 # common/imagpng.cpp:251
 #: ../src/common/imagpng.cpp:596
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
-msgstr ""
-"Slike PNG ni mogoče naložiti - datoteka je pokvarjena ali pa primanjkuje "
-"spomina."
+msgstr "Slike PNG ni mogoče naložiti - datoteka je pokvarjena ali pa primanjkuje spomina."
 
 # common/filefn.cpp:1287
 # msw/dir.cpp:294
@@ -1788,20 +1831,21 @@ msgid "Couldn't retrieve information about list control item %d."
 msgstr "Podatkov o kontrolnem elementu seznama %d ni mogoče pridobiti."
 
 # common/imagbmp.cpp:62
-#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651
+#: ../src/common/imagpng.cpp:642
+#: ../src/common/imagpng.cpp:651
 #: ../src/common/imagpng.cpp:659
 msgid "Couldn't save PNG image."
 msgstr "Slike PNG ni mogoče shraniti."
 
 # msw/thread.cpp:958
-#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611
+#: ../src/mac/classic/thread.cpp:779
+#: ../src/msw/thread.cpp:611
 msgid "Couldn't terminate thread"
 msgstr "Niti ni mogoče končati."
 
 #: ../src/common/xtistrm.cpp:161
 msgid "Create Parameter not found in declared RTTI Parameters"
-msgstr ""
-"V prijavljenih spremenljivkah RTTI ustvarjenega parametra ni mogoče najti."
+msgstr "V prijavljenih spremenljivkah RTTI ustvarjenega parametra ni mogoče najti."
 
 # generic/dirdlgg.cpp:572
 #: ../src/generic/dirdlgg.cpp:307
@@ -1809,11 +1853,13 @@ msgid "Create directory"
 msgstr "Ustvari imenik"
 
 # generic/filedlgg.cpp:883
-#: ../src/generic/dirdlgg.cpp:140 ../src/generic/filedlgg.cpp:999
+#: ../src/generic/dirdlgg.cpp:140
+#: ../src/generic/filedlgg.cpp:999
 msgid "Create new directory"
 msgstr "Ustvari nov imenik"
 
-#: ../src/common/stockitem.cpp:114 ../src/mac/carbon/textctrl.cpp:1073
+#: ../src/common/stockitem.cpp:114
+#: ../src/mac/carbon/textctrl.cpp:1073
 #: ../src/msw/textctrl.cpp:2063
 msgid "Cu&t"
 msgstr "&Izreži"
@@ -1913,12 +1959,8 @@ msgstr "Namizje"
 
 # msw/dialup.cpp:354
 #: ../src/msw/dialup.cpp:395
-msgid ""
-"Dial up functions are unavailable because the remote access service (RAS) is "
-"not installed on this machine. Please install it."
-msgstr ""
-"Funkcije klicne povezave niso na voljo, ker storitev oddaljenega dostopa "
-"(RAS) na tem računalniku ni nameščena. Prosimo namestite jo."
+msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."
+msgstr "Funkcije klicne povezave niso na voljo, ker storitev oddaljenega dostopa (RAS) na tem računalniku ni nameščena. Prosimo namestite jo."
 
 # generic/tipdlg.cpp:177
 #: ../src/generic/tipdlg.cpp:246
@@ -1927,9 +1969,8 @@ msgstr "Ali ste vedeli, da ..."
 
 # generic/fontdlgg.cpp:207
 #: ../src/motif/filedlg.cpp:225
-#, fuzzy
 msgid "Directories"
-msgstr "Okrasno"
+msgstr "Imeniki"
 
 # common/filefn.cpp:1086
 #: ../src/common/filefn.cpp:1177
@@ -1955,12 +1996,8 @@ msgstr "Imenik ne obstaja."
 
 # html/helpfrm.cpp:366
 #: ../src/html/helpfrm.cpp:503
-msgid ""
-"Display all index items that contain given substring. Search is case "
-"insensitive."
-msgstr ""
-"Pokaži vse indeksirane predmete, ki vsebujejo podtekst. Iskanje je "
-"občutljivo na velikost črk"
+msgid "Display all index items that contain given substring. Search is case insensitive."
+msgstr "Pokaži vse indeksirane predmete, ki vsebujejo podtekst. Iskanje je občutljivo na velikost črk"
 
 # html/helpfrm.cpp:535
 #: ../src/html/helpfrm.cpp:685
@@ -1969,8 +2006,7 @@ msgstr "Poka
 
 #: ../src/msw/mimetype.cpp:671
 msgid ""
-"Do you want to overwrite the command used to %s files with extension \"%s"
-"\" ?\n"
+"Do you want to overwrite the command used to %s files with extension \"%s\" ?\n"
 "Current value is \n"
 "%s, \n"
 "New value is \n"
@@ -1993,7 +2029,8 @@ msgid "Don't Save"
 msgstr "Ne shrani"
 
 # html/htmlwin.cpp:216
-#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211
+#: ../src/html/htmlwin.cpp:451
+#: ../src/msw/frame.cpp:211
 msgid "Done"
 msgstr "Končano"
 
@@ -2004,7 +2041,7 @@ msgstr "Kon
 
 #: ../src/common/paper.cpp:183
 msgid "Double Japanese Postcard Rotated 148 x 200 mm"
-msgstr ""
+msgstr "dvojna japonska razglednica, rotirano, 148 x 200 mm"
 
 #: ../src/common/xtixml.cpp:271
 #, c-format
@@ -2047,17 +2084,14 @@ msgid "Entries found"
 msgstr "Najdeni vnosi"
 
 #: ../src/common/paper.cpp:149
-#, fuzzy
 msgid "Envelope Invite 220 x 220 mm"
-msgstr "kuverta DL, 110 x 220 mm"
+msgstr "kuverta Invite, 220 x 220 mm"
 
 # common/config.cpp:349
 #: ../src/common/config.cpp:384
 #, c-format
-msgid ""
-"Environment variables expansion failed: missing '%c' at position %u in '%s'."
-msgstr ""
-"Razširitev okoljske spremenjivke ni uspela: manjka '%c' na mestu %u v '%s'."
+msgid "Environment variables expansion failed: missing '%c' at position %u in '%s'."
+msgstr "Razširitev okoljske spremenjivke ni uspela: manjka '%c' na mestu %u v '%s'."
 
 # generic/dirdlgg.cpp:268
 # generic/dirdlgg.cpp:286
@@ -2070,17 +2104,24 @@ msgstr ""
 # generic/filedlgg.cpp:1043
 # generic/filedlgg.cpp:1092
 # generic/helpxlp.cpp:241
-#: ../src/generic/dirctrlg.cpp:689 ../src/generic/dirctrlg.cpp:707
-#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
-#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:744
-#: ../src/generic/filedlgg.cpp:758 ../src/generic/filedlgg.cpp:772
-#: ../src/generic/filedlgg.cpp:1269 ../src/generic/filedlgg.cpp:1295
-#: ../src/generic/filedlgg.cpp:1325 ../src/gtk/fontdlg.cpp:81
+#: ../src/generic/dirctrlg.cpp:689
+#: ../src/generic/dirctrlg.cpp:707
+#: ../src/generic/dirctrlg.cpp:718
+#: ../src/generic/dirdlgg.cpp:342
+#: ../src/generic/filedlgg.cpp:632
+#: ../src/generic/filedlgg.cpp:744
+#: ../src/generic/filedlgg.cpp:758
+#: ../src/generic/filedlgg.cpp:772
+#: ../src/generic/filedlgg.cpp:1269
+#: ../src/generic/filedlgg.cpp:1295
+#: ../src/generic/filedlgg.cpp:1325
+#: ../src/gtk/fontdlg.cpp:81
 msgid "Error"
 msgstr "Napaka"
 
 # common/log.cpp:362
-#: ../src/msdos/utilsdos.cpp:213 ../src/unix/utilsunx.cpp:1090
+#: ../src/msdos/utilsdos.cpp:213
+#: ../src/unix/utilsunx.cpp:1090
 #: ../src/unix/utilsunx.cpp:1098
 msgid "Error "
 msgstr "Napaka"
@@ -2104,7 +2145,8 @@ msgstr "Napaka pri branju konfiguracijskih mo
 msgid "Error saving user configuration data."
 msgstr "Napaka pri shranjevanju podatkov nastavitev uporabnika."
 
-#: ../src/mac/carbon/mpthread.cpp:482 ../src/mac/carbon/thread.cpp:672
+#: ../src/mac/carbon/mpthread.cpp:482
+#: ../src/mac/carbon/thread.cpp:672
 msgid "Error while waiting on semaphore"
 msgstr "Napaka pri čakanju na semafor"
 
@@ -2161,10 +2203,8 @@ msgstr "Pri
 
 #: ../src/msw/registry.cpp:1140
 #, c-format
-msgid ""
-"Exporting registry key: file \"%s\" already exists and won't be overwritten."
-msgstr ""
-"Izvoz registrskega ključa: datoteka \"%s\" že obstaja in ne bo prepisana."
+msgid "Exporting registry key: file \"%s\" already exists and won't be overwritten."
+msgstr "Izvoz registrskega ključa: datoteka \"%s\" že obstaja in ne bo prepisana."
 
 #: ../src/common/fmapbase.cpp:143
 msgid "Extended Unix Codepage for Japanese (EUC-JP)"
@@ -2345,9 +2385,7 @@ msgstr "Klju
 #: ../src/msw/fdrepdlg.cpp:474
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
-msgstr ""
-"Standardnega najdi/zamenjaj pogovornega okna ni bilo uspešno ustvarjeno "
-"(koda napake %d)"
+msgstr "Standardnega najdi/zamenjaj pogovornega okna ni bilo uspešno ustvarjeno (koda napake %d)"
 
 # html/winpars.cpp:364
 #: ../src/html/winpars.cpp:549
@@ -2356,7 +2394,8 @@ msgid "Failed to display HTML document in %s encoding"
 msgstr "Dokumenta HTML, kodiranega v %s, ni mogoče prikazati."
 
 # msw/clipbrd.cpp:134
-#: ../src/mac/carbon/clipbrd.cpp:194 ../src/mac/classic/clipbrd.cpp:185
+#: ../src/mac/carbon/clipbrd.cpp:194
+#: ../src/mac/classic/clipbrd.cpp:185
 #: ../src/msw/clipbrd.cpp:131
 msgid "Failed to empty the clipboard."
 msgstr "Izpraznitev odložišča ni uspela."
@@ -2382,7 +2421,8 @@ msgid "Failed to establish dialup connection: %s"
 msgstr "Klicna povezava ni bila uspešno vzpostavljena: %s"
 
 # common/ffile.cpp:182
-#: ../src/unix/utilsunx.cpp:508 ../src/unix/utilsunx.cpp:524
+#: ../src/unix/utilsunx.cpp:508
+#: ../src/unix/utilsunx.cpp:524
 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "'%s' ni mogoče izvesti\n"
@@ -2425,7 +2465,8 @@ msgid "Failed to get ISP names: %s"
 msgstr "Neuspešno pridobivanje imen ISP: %s"
 
 # generic/dirdlgg.cpp:550
-#: ../src/mac/carbon/clipbrd.cpp:143 ../src/mac/classic/clipbrd.cpp:134
+#: ../src/mac/carbon/clipbrd.cpp:143
+#: ../src/mac/classic/clipbrd.cpp:134
 msgid "Failed to get clipboard data."
 msgstr "Pridobivanje podatkov z odložišča ni uspelo."
 
@@ -2463,12 +2504,8 @@ msgid "Failed to inspect the lock file '%s'"
 msgstr "Zaklenjene datoteke '%s' ni mogoče pregledati."
 
 #: ../src/unix/threadpsx.cpp:897
-msgid ""
-"Failed to join a thread, potential memory leak detected - please restart the "
-"program"
-msgstr ""
-"Pridružitev k niti ni uspela, odkrita možna izguba spomina - prosimo ponovno "
-"zaženite program"
+msgid "Failed to join a thread, potential memory leak detected - please restart the program"
+msgstr "Pridružitev k niti ni uspela, odkrita možna izguba spomina - prosimo ponovno zaženite program"
 
 #: ../src/msw/utils.cpp:703
 #, c-format
@@ -2687,7 +2724,8 @@ msgid "Failed to set temporary file permissions"
 msgstr "Neuspešno nastavljanje pravic za trenutno datoteko"
 
 # generic/dirdlgg.cpp:550
-#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256
+#: ../src/unix/threadpsx.cpp:1245
+#: ../src/unix/threadpsx.cpp:1256
 #, c-format
 msgid "Failed to set thread priority %d."
 msgstr "Prioritete niti %d ni bilo mogoče nastaviti."
@@ -2699,7 +2737,8 @@ msgid "Failed to store image '%s' to memory VFS!"
 msgstr "Slike '%s' ni mogoče shraniti v spominski VFS!"
 
 # generic/dirdlgg.cpp:550
-#: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465
+#: ../src/mac/carbon/mpthread.cpp:1273
+#: ../src/mac/carbon/thread.cpp:1465
 #: ../src/unix/threadpsx.cpp:1429
 msgid "Failed to terminate a thread."
 msgstr "Niti ni mogoče prekiniti."
@@ -2771,7 +2810,8 @@ msgid "File %s does not exist."
 msgstr "Datoteka %s ne obstaja."
 
 # generic/filedlgg.cpp:1074
-#: ../src/generic/filedlgg.cpp:1316 ../src/gtk/filedlg.cpp:64
+#: ../src/generic/filedlgg.cpp:1316
+#: ../src/gtk/filedlg.cpp:64
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "Datoteka %s že obstaja, jo resnično želite prepisati?"
@@ -2794,21 +2834,22 @@ msgstr "Datoteke ni mogo
 # common/docview.cpp:296
 # common/docview.cpp:332
 # common/docview.cpp:1388
-#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:1596
+#: ../src/common/docview.cpp:571
+#: ../src/common/docview.cpp:1596
 msgid "File error"
 msgstr "Datotečna napaka"
 
 # generic/dirdlgg.cpp:286
 # generic/filedlgg.cpp:731
-#: ../src/generic/dirctrlg.cpp:707 ../src/generic/filedlgg.cpp:758
+#: ../src/generic/dirctrlg.cpp:707
+#: ../src/generic/filedlgg.cpp:758
 msgid "File name exists already."
 msgstr "Ime datoteke že obstaja."
 
 # generic/filedlgg.cpp:534
 #: ../src/motif/filedlg.cpp:226
-#, fuzzy
 msgid "Files"
-msgstr "Datoteka"
+msgstr "Datoteke"
 
 # generic/filedlgg.cpp:825
 #: ../src/common/filefn.cpp:1746
@@ -2818,9 +2859,8 @@ msgstr "Datoteke (%s)"
 
 # generic/filedlgg.cpp:534
 #: ../src/motif/filedlg.cpp:224
-#, fuzzy
 msgid "Filter"
-msgstr "Datoteka"
+msgstr "Končnica"
 
 # html/helpfrm.cpp:340
 #: ../src/html/helpfrm.cpp:491
@@ -2940,7 +2980,8 @@ msgid "Go one level up in document hierarchy"
 msgstr "Pojdi nivo višje v hierarhiji dokumenta"
 
 # generic/filedlgg.cpp:875
-#: ../src/generic/dirdlgg.cpp:145 ../src/generic/filedlgg.cpp:989
+#: ../src/generic/dirdlgg.cpp:145
+#: ../src/generic/filedlgg.cpp:989
 msgid "Go to home directory"
 msgstr "Pojdi na domači imenik"
 
@@ -2957,7 +2998,8 @@ msgstr "Pojdi na stran"
 msgid "Greek (ISO-8859-7)"
 msgstr "grško (ISO-8859-7)"
 
-#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
+#: ../src/common/zstream.cpp:72
+#: ../src/common/zstream.cpp:209
 msgid "Gzip not supported by this version of zlib"
 msgstr "Ta različica zlib ne podpira Gzip"
 
@@ -2983,7 +3025,8 @@ msgstr "hebrejsko (ISO-8859-8)"
 # generic/proplist.cpp:528
 # html/helpfrm.cpp:208
 # msw/mdi.cpp:1283
-#: ../src/html/helpfrm.cpp:337 ../contrib/src/deprecated/proplist.cpp:523
+#: ../src/html/helpfrm.cpp:337
+#: ../contrib/src/deprecated/proplist.cpp:523
 msgid "Help"
 msgstr "Pomoč"
 
@@ -2994,7 +3037,8 @@ msgstr "Mo
 
 # generic/helphtml.cpp:319
 # generic/helphtml.cpp:320
-#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443
+#: ../src/generic/helpext.cpp:442
+#: ../src/generic/helpext.cpp:443
 msgid "Help Index"
 msgstr "Indeks pomoči"
 
@@ -3038,9 +3082,12 @@ msgstr "I64"
 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: napaka pri branju maske DIB."
 
-#: ../src/common/imagbmp.cpp:1048 ../src/common/imagbmp.cpp:1107
-#: ../src/common/imagbmp.cpp:1116 ../src/common/imagbmp.cpp:1127
-#: ../src/common/imagbmp.cpp:1171 ../src/common/imagbmp.cpp:1181
+#: ../src/common/imagbmp.cpp:1048
+#: ../src/common/imagbmp.cpp:1107
+#: ../src/common/imagbmp.cpp:1116
+#: ../src/common/imagbmp.cpp:1127
+#: ../src/common/imagbmp.cpp:1171
+#: ../src/common/imagbmp.cpp:1181
 #: ../src/common/imagbmp.cpp:1190
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: napaka pri pisanju v datoteko slike!"
@@ -3091,13 +3138,11 @@ msgstr ""
 
 #: ../src/generic/dbgrptg.cpp:310
 msgid ""
-"If you wish to suppress this debug report completely, please choose the "
-"\"Cancel\" button,\n"
+"If you wish to suppress this debug report completely, please choose the \"Cancel\" button,\n"
 "but be warned that it may hinder improving the program, so if\n"
 "at all possible please do continue with the report generation.\n"
 msgstr ""
-"Če želite popolnoma preprečiti to poročilo o razhroščevanju, prosimo "
-"izberite gumb \"Razveljavi\",\n"
+"Če želite popolnoma preprečiti to poročilo o razhroščevanju, prosimo izberite gumb \"Razveljavi\",\n"
 "vendar vedite, da to lahko onemogoča izboljšanje programa, tako da če je\n"
 "le mogoče, prosimo nadaljujte s tvorbo poročila.\n"
 
@@ -3124,7 +3169,8 @@ msgstr "Neveljavno 
 
 # generic/dirdlgg.cpp:268
 # generic/filedlgg.cpp:717
-#: ../src/generic/dirctrlg.cpp:689 ../src/generic/filedlgg.cpp:744
+#: ../src/generic/dirctrlg.cpp:689
+#: ../src/generic/filedlgg.cpp:744
 msgid "Illegal directory name."
 msgstr "Napačno ime imenika"
 
@@ -3144,13 +3190,8 @@ msgstr "Datoteka slike ni vrste %d."
 
 # msw/textctrl.cpp:219
 #: ../src/msw/textctrl.cpp:361
-msgid ""
-"Impossible to create a rich edit control, using simple text control instead. "
-"Please reinstall riched32.dll"
-msgstr ""
-"Kontrolnika za bogato urejanje ni mogoče ustvariti, namesto tega bo "
-"uporabljen kontrolnik za enostavno urejanje besedila. Prosimo ponovno "
-"namestite riched32.dll"
+msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"
+msgstr "Kontrolnika za bogato urejanje ni mogoče ustvariti, namesto tega bo uporabljen kontrolnik za enostavno urejanje besedila. Prosimo ponovno namestite riched32.dll"
 
 #: ../src/unix/utilsunx.cpp:428
 msgid "Impossible to get child process input"
@@ -3188,7 +3229,7 @@ msgstr "indijsko (ISO-8859-12)"
 
 #: ../src/common/init.cpp:232
 msgid "Initialization failed in post init, aborting."
-msgstr ""
+msgstr "Inicializacija ni uspela v po-inicializaciji, sledi prekinitev."
 
 #: ../src/common/xtistrm.cpp:704
 msgid "Internal error, illegal wxCustomTypeInfo"
@@ -3222,7 +3263,8 @@ msgstr "Neveljavna specifikacija geometrije '%s'"
 msgid "Invalid lock file '%s'."
 msgstr "Datoteka '%s' ni veljavna datoteka zaklopa."
 
-#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380
+#: ../src/common/xtistrm.cpp:365
+#: ../src/common/xtistrm.cpp:380
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr "V GetObjectClassInfo podan neveljaven ali ničelni predmetni ID."
 
@@ -3256,55 +3298,55 @@ msgstr "JPEG: slike ni bilo mogo
 
 #: ../src/common/paper.cpp:170
 msgid "Japanese Double Postcard 200 x 148 mm"
-msgstr ""
+msgstr "japonska dvojna razglednica, 200 x 148 mm"
 
 #: ../src/common/paper.cpp:174
 msgid "Japanese Envelope Chou #3"
-msgstr ""
+msgstr "japonska kuverta Čou #3"
 
 #: ../src/common/paper.cpp:187
 msgid "Japanese Envelope Chou #3 Rotated"
-msgstr ""
+msgstr "japonska kuverta Čou #3 rotirano"
 
 #: ../src/common/paper.cpp:175
 msgid "Japanese Envelope Chou #4"
-msgstr ""
+msgstr "japonska kuverta Čou #4"
 
 #: ../src/common/paper.cpp:188
 msgid "Japanese Envelope Chou #4 Rotated"
-msgstr ""
+msgstr "japonska kuverta Čou #4 rotirano"
 
 #: ../src/common/paper.cpp:172
 msgid "Japanese Envelope Kaku #2"
-msgstr ""
+msgstr "japonska kuverta Kaku #2"
 
 #: ../src/common/paper.cpp:185
 msgid "Japanese Envelope Kaku #2 Rotated"
-msgstr ""
+msgstr "japonska kuverta Kaku #2 rotirano"
 
 #: ../src/common/paper.cpp:173
 msgid "Japanese Envelope Kaku #3"
-msgstr ""
+msgstr "japonska kuverta Kaku #3"
 
 #: ../src/common/paper.cpp:186
 msgid "Japanese Envelope Kaku #3 Rotated"
-msgstr ""
+msgstr "japonska kuverta Kaku #3 rotirano"
 
 #: ../src/common/paper.cpp:192
 msgid "Japanese Envelope You #4"
-msgstr ""
+msgstr "japonska kuverta Ju #4"
 
 #: ../src/common/paper.cpp:193
 msgid "Japanese Envelope You #4 Rotated"
-msgstr ""
+msgstr "japonska kuverta Ju #4 rotirano"
 
 #: ../src/common/paper.cpp:145
 msgid "Japanese Postcard 100 x 148 mm"
-msgstr ""
+msgstr "japonska razglednica, 100 x 148 mm"
 
 #: ../src/common/paper.cpp:182
 msgid "Japanese Postcard Rotated 148 x 100 mm"
-msgstr ""
+msgstr "japonska razglednica rotirano, 148 x 100 mm"
 
 #: ../src/common/stockitem.cpp:128
 msgid "Justified"
@@ -3321,7 +3363,8 @@ msgstr "KOI8-U"
 # generic/dcpsg.cpp:2262
 # generic/prntdlgg.cpp:441
 # generic/prntdlgg.cpp:637
-#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867
+#: ../src/generic/prntdlgg.cpp:609
+#: ../src/generic/prntdlgg.cpp:867
 msgid "Landscape"
 msgstr "Pokrajina"
 
@@ -3335,41 +3378,36 @@ msgid "Left margin (mm):"
 msgstr "Levi rob"
 
 #: ../src/common/paper.cpp:151
-#, fuzzy
 msgid "Legal Extra 9 1/2 x 15 in"
-msgstr "Legal, 8 1/2 x 14 in"
+msgstr "Legal Extra, 9 1/2 x 15 in"
 
 #: ../src/common/paper.cpp:103
 msgid "Legal, 8 1/2 x 14 in"
 msgstr "Legal, 8 1/2 x 14 in"
 
 #: ../src/common/paper.cpp:150
-#, fuzzy
 msgid "Letter Extra 9 1/2 x 12 in"
-msgstr "Letter, 8 1/2 x 11 in"
+msgstr "Letter Extra, 9 1/2 x 12 in."
 
 #: ../src/common/paper.cpp:156
 msgid "Letter Extra Transverse 9.275 x 12 in"
-msgstr ""
+msgstr "Letter Extra prečno, 9,275 x 12 in."
 
 #: ../src/common/paper.cpp:159
-#, fuzzy
 msgid "Letter Plus 8 1/2 x 12.69 in"
-msgstr "Letter, 8 1/2 x 11 in"
+msgstr "Letter Plus, 8 1/2 x 12,69 in."
 
 #: ../src/common/paper.cpp:176
-#, fuzzy
 msgid "Letter Rotated 11 x 8 1/2 in"
-msgstr "Letter, 8 1/2 x 11 in"
+msgstr "Letter rotirano, 11 x 8 1/2 in."
 
 #: ../src/common/paper.cpp:108
 msgid "Letter Small, 8 1/2 x 11 in"
 msgstr "Letter Small, 8 1/2 x 11 in"
 
 #: ../src/common/paper.cpp:154
-#, fuzzy
 msgid "Letter Transverse 8 1/2 x 11 in"
-msgstr "Letter, 8 1/2 x 11 in"
+msgstr "Letter prečno, 8 1/2 x 11 in."
 
 #: ../src/common/paper.cpp:102
 msgid "Letter, 8 1/2 x 11 in"
@@ -3416,7 +3454,8 @@ msgstr "Zaklenjena datoteka '%s' ima nepravilna dovoljenja."
 msgid "Log saved to the file '%s'."
 msgstr "Dnevnik je bil shranjen v datoteko '%s'"
 
-#: ../include/wx/xti.h:501 ../include/wx/xti.h:505
+#: ../include/wx/xti.h:501
+#: ../include/wx/xti.h:505
 msgid "Long Conversions not supported"
 msgstr "Dolge pretvorbe niso podprte"
 
@@ -3429,12 +3468,8 @@ msgid "MP Thread Support is not available on this System"
 msgstr "Na tem sistemu podpora nitim MP ni na voljo."
 
 #: ../src/msw/helpchm.cpp:60
-msgid ""
-"MS HTML Help functions are unavailable because the MS HTML Help library is "
-"not installed on this machine. Please install it."
-msgstr ""
-"Funkcije MS HTML Help niso na voljo, ker knjižnica MS HTML Help ni nameščena "
-"na tem računalniku. Prosimo namestite jo."
+msgid "MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it."
+msgstr "Funkcije MS HTML Help niso na voljo, ker knjižnica MS HTML Help ni nameščena na tem računalniku. Prosimo namestite jo."
 
 #: ../src/univ/themes/win32.cpp:4929
 msgid "Ma&ximize"
@@ -3490,7 +3525,7 @@ msgstr "Spremenjeno"
 #: ../src/common/module.cpp:77
 #, c-format
 msgid "Module \"%s\" initialization failed"
-msgstr ""
+msgstr "Inicializacija modula \"%s\" ni uspela"
 
 #: ../src/common/paper.cpp:138
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
@@ -3519,8 +3554,10 @@ msgid "New item"
 msgstr "Nov element"
 
 # generic/filedlgg.cpp:610
-#: ../src/generic/dirdlgg.cpp:316 ../src/generic/dirdlgg.cpp:326
-#: ../src/generic/filedlgg.cpp:608 ../src/generic/filedlgg.cpp:617
+#: ../src/generic/dirdlgg.cpp:316
+#: ../src/generic/dirdlgg.cpp:326
+#: ../src/generic/filedlgg.cpp:608
+#: ../src/generic/filedlgg.cpp:617
 msgid "NewName"
 msgstr "NovoIme"
 
@@ -3536,8 +3573,10 @@ msgstr "Naslednja stran"
 
 # common/dlgcmn.cpp:111
 # common/dlgcmn.cpp:121
-#: ../src/mac/carbon/msgdlg.cpp:58 ../src/mac/carbon/msgdlg.cpp:143
-#: ../src/mac/classic/msgdlg.cpp:56 ../src/mac/classic/msgdlg.cpp:140
+#: ../src/mac/carbon/msgdlg.cpp:58
+#: ../src/mac/carbon/msgdlg.cpp:143
+#: ../src/mac/classic/msgdlg.cpp:56
+#: ../src/mac/classic/msgdlg.cpp:140
 #: ../src/motif/msgdlg.cpp:204
 msgid "No"
 msgstr "Ne"
@@ -3562,8 +3601,7 @@ msgstr "Vnosa ni mogo
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
 "but an alternative encoding '%s' is available.\n"
-"Do you want to use this encoding (otherwise you will have to choose another "
-"one)?"
+"Do you want to use this encoding (otherwise you will have to choose another one)?"
 msgstr ""
 "Nobena pisava za prikaz besedila, kodiranega v '%s', ne obstaja,\n"
 "na voljo pa je drugaćno kodiranje '%s'.\n"
@@ -3587,13 +3625,15 @@ msgid "No handler found for XML node '%s', class '%s'!"
 msgstr "Za vozel XML '%s', razred '%s' ni mogoče najti nobenega upravljalca!"
 
 # common/image.cpp:758
-#: ../src/common/image.cpp:1505 ../src/common/image.cpp:1548
+#: ../src/common/image.cpp:1505
+#: ../src/common/image.cpp:1548
 msgid "No handler found for image type."
 msgstr "Upravljalca za vrsto slike ni mogoče najti."
 
 # common/image.cpp:766
 # common/image.cpp:800
-#: ../src/common/image.cpp:1513 ../src/common/image.cpp:1556
+#: ../src/common/image.cpp:1513
+#: ../src/common/image.cpp:1556
 #: ../src/common/image.cpp:1589
 #, c-format
 msgid "No image handler for type %d defined."
@@ -3601,7 +3641,8 @@ msgstr "Ta vrsto %d ni dolo
 
 # common/image.cpp:784
 # common/image.cpp:816
-#: ../src/common/image.cpp:1574 ../src/common/image.cpp:1604
+#: ../src/common/image.cpp:1574
+#: ../src/common/image.cpp:1604
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "Ta vrsto %s ni določen noben upravljalec slik."
@@ -3616,7 +3657,8 @@ msgstr "Ujemajo
 msgid "No sound"
 msgstr "Brez zvoka"
 
-#: ../src/common/image.cpp:1200 ../src/common/image.cpp:1239
+#: ../src/common/image.cpp:1200
+#: ../src/common/image.cpp:1239
 msgid "No unused colour in image being masked."
 msgstr "Nobena neuporabljena barva v sliki ni maskirana."
 
@@ -3630,7 +3672,8 @@ msgstr "nordijsko (ISO-8859-10)"
 
 # generic/fontdlgg.cpp:212
 # generic/fontdlgg.cpp:215
-#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235
+#: ../src/generic/fontdlgg.cpp:232
+#: ../src/generic/fontdlgg.cpp:235
 msgid "Normal"
 msgstr "Običajno"
 
@@ -3656,7 +3699,8 @@ msgstr "Note, 8 1/2 x 11 in"
 # generic/prntdlgg.cpp:467
 # generic/proplist.cpp:511
 # html/helpfrm.cpp:909
-#: ../src/gtk/fontdlg.cpp:147 ../src/msw/dialog.cpp:194
+#: ../src/gtk/fontdlg.cpp:147
+#: ../src/msw/dialog.cpp:194
 #: ../contrib/src/deprecated/proplist.cpp:506
 msgid "OK"
 msgstr "V redu"
@@ -3665,13 +3709,15 @@ msgstr "V redu"
 msgid "Objects must have an id attribute"
 msgstr "Objekti morajo imeti atribut id"
 
-#: ../src/common/docview.cpp:1269 ../src/common/docview.cpp:1619
+#: ../src/common/docview.cpp:1269
+#: ../src/common/docview.cpp:1619
 msgid "Open File"
 msgstr "Odpri datoteko"
 
 # html/helpfrm.cpp:523
 # html/helpfrm.cpp:1183
-#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579
+#: ../src/html/helpfrm.cpp:673
+#: ../src/html/helpfrm.cpp:1579
 msgid "Open HTML document"
 msgstr "Odpri dokument HTML"
 
@@ -3684,8 +3730,10 @@ msgstr "Odpri datoteko \"%s\""
 # generic/dirdlgg.cpp:605
 # generic/filedlgg.cpp:625
 # generic/filedlgg.cpp:744
-#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
-#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:772
+#: ../src/generic/dirctrlg.cpp:718
+#: ../src/generic/dirdlgg.cpp:342
+#: ../src/generic/filedlgg.cpp:632
+#: ../src/generic/filedlgg.cpp:772
 msgid "Operation not permitted."
 msgstr "Operacija ni dovoljena."
 
@@ -3708,19 +3756,22 @@ msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "Opcije '%s':'%s' ne morem pretvoriti v datum"
 
 # generic/prntdlgg.cpp:447
-#: ../src/generic/dirdlgg.cpp:116 ../src/generic/prntdlgg.cpp:614
+#: ../src/generic/dirdlgg.cpp:116
+#: ../src/generic/prntdlgg.cpp:614
 msgid "Options"
 msgstr "Možnosti"
 
 # generic/prntdlgg.cpp:443
 # generic/prntdlgg.cpp:638
-#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868
+#: ../src/generic/prntdlgg.cpp:611
+#: ../src/generic/prntdlgg.cpp:868
 msgid "Orientation"
 msgstr "Orientacija"
 
 # common/imagpcx.cpp:448
 # common/imagpcx.cpp:471
-#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485
+#: ../src/common/imagpcx.cpp:462
+#: ../src/common/imagpcx.cpp:485
 msgid "PCX: couldn't allocate memory"
 msgstr "PCX: spomina ni mogoče alocirati."
 
@@ -3741,7 +3792,8 @@ msgstr "PCX: to ni datoteka PCX."
 
 # common/imagpcx.cpp:450
 # common/imagpcx.cpp:472
-#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486
+#: ../src/common/imagpcx.cpp:464
+#: ../src/common/imagpcx.cpp:486
 msgid "PCX: unknown error !!!"
 msgstr "PCX: neznana napaka!"
 
@@ -3761,134 +3813,115 @@ msgid "PNM: File format is not recognized."
 msgstr "PNM: datotečni zapis ni prepoznan."
 
 # common/imagpnm.cpp:112
-#: ../src/common/imagpnm.cpp:108 ../src/common/imagpnm.cpp:125
+#: ../src/common/imagpnm.cpp:108
+#: ../src/common/imagpnm.cpp:125
 #: ../src/common/imagpnm.cpp:142
 msgid "PNM: File seems truncated."
 msgstr "PNM: datoteka se zdi okrnjena."
 
 #: ../src/common/paper.cpp:194
 msgid "PRC 16K 146 x 215 mm"
-msgstr ""
+msgstr "PRC 16K, 146 x 215 mm"
 
 #: ../src/common/paper.cpp:207
 msgid "PRC 16K Rotated"
-msgstr ""
+msgstr "PRC 16K, rotirano"
 
 #: ../src/common/paper.cpp:195
 msgid "PRC 32K 97 x 151 mm"
-msgstr ""
+msgstr "PRC 32K, 97 x 151 mm"
 
 #: ../src/common/paper.cpp:208
 msgid "PRC 32K Rotated"
-msgstr ""
+msgstr "PRC 32K totirano"
 
 #: ../src/common/paper.cpp:196
 msgid "PRC 32K(Big) 97 x 151 mm"
-msgstr ""
+msgstr "PRC 32K(velik), 97 x 151 mm"
 
 #: ../src/common/paper.cpp:209
 msgid "PRC 32K(Big) Rotated"
-msgstr ""
+msgstr "PRC 32K(velik) rotirano"
 
 #: ../src/common/paper.cpp:197
-#, fuzzy
 msgid "PRC Envelope #1 102 x 165 mm"
-msgstr "kuverta C6, 114 x 162 mm"
+msgstr "kuverta PRC #1, 102 x 165 mm"
 
 #: ../src/common/paper.cpp:210
-#, fuzzy
 msgid "PRC Envelope #1 Rotated 165 x 102 mm"
-msgstr "kuverta C6, 114 x 162 mm"
+msgstr "kuverta PRC #1 rotirano, 165 x 102 mm"
 
 #: ../src/common/paper.cpp:206
-#, fuzzy
 msgid "PRC Envelope #10 324 x 458 mm"
-msgstr "kuverta C3, 324 x 458 mm"
+msgstr "kuverta PRC #10, 324 x 458 mm"
 
 #: ../src/common/paper.cpp:219
-#, fuzzy
 msgid "PRC Envelope #10 Rotated 458 x 324 m"
-msgstr "kuverta C4, 229 x 324 mm"
+msgstr "kuverta PRC #10 rotirano, 458 x 324 mm"
 
 #: ../src/common/paper.cpp:198
-#, fuzzy
 msgid "PRC Envelope #2 102 x 176 mm"
-msgstr "kuverta C6, 114 x 162 mm"
+msgstr "kuverta PRC #2, 102 x 176 mm"
 
 #: ../src/common/paper.cpp:211
-#, fuzzy
 msgid "PRC Envelope #2 Rotated 176 x 102 mm"
-msgstr "kuverta B6, 176 x 125 mm"
+msgstr "kuverta PRC #2 rotirano, 176 x 102 mm"
 
 #: ../src/common/paper.cpp:199
-#, fuzzy
 msgid "PRC Envelope #3 125 x 176 mm"
-msgstr "kuverta C6, 114 x 162 mm"
+msgstr "kuverta PRC #3, 125 x 176 mm"
 
 #: ../src/common/paper.cpp:212
-#, fuzzy
 msgid "PRC Envelope #3 Rotated 176 x 125 mm"
-msgstr "kuverta B6, 176 x 125 mm"
+msgstr "kuverta PRC #3 rotirano, 176 x 125 mm"
 
 #: ../src/common/paper.cpp:200
-#, fuzzy
 msgid "PRC Envelope #4 110 x 208 mm"
-msgstr "kuverta DL, 110 x 220 mm"
+msgstr "kuverta PRC #4, 110 x 208 mm"
 
 #: ../src/common/paper.cpp:213
-#, fuzzy
 msgid "PRC Envelope #4 Rotated 208 x 110 mm"
-msgstr "kuverta C6, 114 x 162 mm"
+msgstr "kuverta PRC #4 rotirano, 208 x 110 mm"
 
 #: ../src/common/paper.cpp:201
-#, fuzzy
 msgid "PRC Envelope #5 110 x 220 mm"
-msgstr "kuverta DL, 110 x 220 mm"
+msgstr "kuverta PRC #5, 110 x 220 mm"
 
 #: ../src/common/paper.cpp:214
-#, fuzzy
 msgid "PRC Envelope #5 Rotated 220 x 110 mm"
-msgstr "kuverta C4, 229 x 324 mm"
+msgstr "kuverta PRC #5 rotirano, 220 x 110 mm"
 
 #: ../src/common/paper.cpp:202
-#, fuzzy
 msgid "PRC Envelope #6 120 x 230 mm"
-msgstr "kuverta C5, 162 x 229 mm"
+msgstr "kuverta PRC #6, 120 x 230 mm"
 
 #: ../src/common/paper.cpp:215
-#, fuzzy
 msgid "PRC Envelope #6 Rotated 230 x 120 mm"
-msgstr "kuverta C5, 162 x 229 mm"
+msgstr "kuverta PRC #6 rotirano, 230 x 120 mm"
 
 #: ../src/common/paper.cpp:203
-#, fuzzy
 msgid "PRC Envelope #7 160 x 230 mm"
-msgstr "kuverta B5, 176 x 250 mm"
+msgstr "kuverta PRC #7, 160 x 230 mm"
 
 #: ../src/common/paper.cpp:216
-#, fuzzy
 msgid "PRC Envelope #7 Rotated 230 x 160 mm"
-msgstr "kuverta C6, 114 x 162 mm"
+msgstr "kuverta PRC #7 rotirano, 230 x 160 mm"
 
 #: ../src/common/paper.cpp:204
-#, fuzzy
 msgid "PRC Envelope #8 120 x 309 mm"
-msgstr "kuverta C5, 162 x 229 mm"
+msgstr "kuverta PRC #8, 120 x 309 mm"
 
 #: ../src/common/paper.cpp:217
-#, fuzzy
 msgid "PRC Envelope #8 Rotated 309 x 120 mm"
-msgstr "kuverta C4, 229 x 324 mm"
+msgstr "kuverta PRC #8 rotirana, 309 x 120 mm"
 
 #: ../src/common/paper.cpp:205
-#, fuzzy
 msgid "PRC Envelope #9 229 x 324 mm"
-msgstr "kuverta C4, 229 x 324 mm"
+msgstr "kuverta PRC #9, 229 x 324 mm"
 
 #: ../src/common/paper.cpp:218
-#, fuzzy
 msgid "PRC Envelope #9 Rotated 324 x 229 mm"
-msgstr "kuverta C5, 162 x 229 mm"
+msgstr "kuverta PRC #9 rotirano, 324 x 229 mm"
 
 # common/prntbase.cpp:731
 #: ../src/common/prntbase.cpp:1294
@@ -3908,7 +3941,8 @@ msgid "Page Setup"
 msgstr "Nastavitev strani"
 
 # generic/prntdlgg.cpp:604
-#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:540
+#: ../src/common/prntbase.cpp:451
+#: ../src/gtk/gnome/gprint.cpp:540
 msgid "Page setup"
 msgstr "Nastavitev strani"
 
@@ -3920,7 +3954,8 @@ msgstr "Strani"
 # generic/prntdlgg.cpp:555
 # generic/prntdlgg.cpp:626
 # generic/prntdlgg.cpp:808
-#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854
+#: ../src/generic/prntdlgg.cpp:800
+#: ../src/generic/prntdlgg.cpp:854
 #: ../src/generic/prntdlgg.cpp:1056
 msgid "Paper Size"
 msgstr "Velikost papirja"
@@ -3928,7 +3963,8 @@ msgstr "Velikost papirja"
 # generic/prntdlgg.cpp:433
 # generic/prntdlgg.cpp:615
 # generic/prntdlgg.cpp:804
-#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841
+#: ../src/generic/prntdlgg.cpp:598
+#: ../src/generic/prntdlgg.cpp:841
 #: ../src/generic/prntdlgg.cpp:1051
 msgid "Paper size"
 msgstr "Velikost papirja"
@@ -3941,7 +3977,8 @@ msgstr "Podajanje 
 msgid "Passing a already registered object to SetObjectName"
 msgstr "Podajanje že registriranega objekta k SetObjectName"
 
-#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
+#: ../src/common/xtistrm.cpp:436
+#: ../src/common/xtistrm.cpp:656
 msgid "Passing an unkown object to GetObject"
 msgstr "Podajanje neznanega objekta k GetObject"
 
@@ -3972,8 +4009,7 @@ msgstr "Prosimo izberite stran za prikaz:"
 # msw/dialup.cpp:768
 #: ../src/msw/dialup.cpp:787
 msgid "Please choose which ISP do you want to connect to"
-msgstr ""
-"Prosimo izberite ponudnika spletnih storitev, s katerim se želite povezati."
+msgstr "Prosimo izberite ponudnika spletnih storitev, s katerim se želite povezati."
 
 #: ../src/msw/listctrl.cpp:444
 #, c-format
@@ -3993,7 +4029,8 @@ msgstr "Prosimo po
 # generic/dcpsg.cpp:2261
 # generic/prntdlgg.cpp:440
 # generic/prntdlgg.cpp:636
-#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866
+#: ../src/generic/prntdlgg.cpp:608
+#: ../src/generic/prntdlgg.cpp:866
 msgid "Portrait"
 msgstr "Portet"
 
@@ -4003,7 +4040,8 @@ msgid "PostScript file"
 msgstr "PostScript datoteka"
 
 # html/helpfrm.cpp:903
-#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235
+#: ../src/generic/fontdlgg.cpp:348
+#: ../src/html/helpfrm.cpp:1235
 msgid "Preview:"
 msgstr "Predogled:"
 
@@ -4014,8 +4052,10 @@ msgstr "Prej
 
 # generic/prntdlgg.cpp:113
 # generic/prntdlgg.cpp:127
-#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138
-#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:395
+#: ../src/common/prntbase.cpp:393
+#: ../src/generic/prntdlgg.cpp:138
+#: ../src/generic/prntdlgg.cpp:151
+#: ../src/gtk/gnome/gprint.cpp:395
 #: ../src/gtk/gnome/gprint.cpp:407
 msgid "Print"
 msgstr "Tiskanje"
@@ -4027,7 +4067,8 @@ msgstr "Predogled tiskanja"
 
 # common/prntbase.cpp:687
 # common/prntbase.cpp:711
-#: ../src/common/prntbase.cpp:1246 ../src/common/prntbase.cpp:1272
+#: ../src/common/prntbase.cpp:1246
+#: ../src/common/prntbase.cpp:1272
 msgid "Print Preview Failure"
 msgstr "Napaka pri predogledu tiskanja"
 
@@ -4106,7 +4147,8 @@ msgstr "Tiskalnik:"
 
 # common/prntbase.cpp:106
 # common/prntbase.cpp:148
-#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531
+#: ../src/common/prntbase.cpp:310
+#: ../src/common/prntbase.cpp:531
 msgid "Printing "
 msgstr "Tiskanje poteka"
 
@@ -4128,11 +4170,8 @@ msgstr "Tiskanje ..."
 
 #: ../src/common/debugrpt.cpp:546
 #, c-format
-msgid ""
-"Processing debug report has failed, leaving the files in \"%s\" directory."
-msgstr ""
-"Obdelava poročila o razhroščevanju ni uspela, datoteke so ostale v imeniku "
-"\"%s\"."
+msgid "Processing debug report has failed, leaving the files in \"%s\" directory."
+msgstr "Obdelava poročila o razhroščevanju ni uspela, datoteke so ostale v imeniku \"%s\"."
 
 # common/log.cpp:356
 #: ../src/common/log.cpp:466
@@ -4151,7 +4190,8 @@ msgstr "Vpra
 
 # common/ffile.cpp:133
 # common/ffile.cpp:154
-#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144
+#: ../src/common/ffile.cpp:125
+#: ../src/common/ffile.cpp:144
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "Napaka pri branju datoteke '%s'"
@@ -4221,9 +4261,7 @@ msgstr "Odstrani trenutno stran iz zaznamkov"
 #: ../src/common/rendcmn.cpp:196
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
-msgstr ""
-"Prikazovalnik \"%s\" je nezdružljive različice %d.%d in ga ni mogoče "
-"naložiti."
+msgstr "Prikazovalnik \"%s\" je nezdružljive različice %d.%d in ga ni mogoče naložiti."
 
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -4302,17 +4340,15 @@ msgstr "Skript"
 # generic/helpwxht.cpp:161
 # html/helpfrm.cpp:414
 # html/helpfrm.cpp:434
-#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551
+#: ../src/html/helpfrm.cpp:536
+#: ../src/html/helpfrm.cpp:551
 msgid "Search"
 msgstr "Iskanje"
 
 # html/helpfrm.cpp:416
 #: ../src/html/helpfrm.cpp:538
-msgid ""
-"Search contents of help book(s) for all occurences of the text you typed "
-"above"
-msgstr ""
-"Iskanje v knjigah s pomočjo za vse pojavitve zgoraj natipkanega besedila"
+msgid "Search contents of help book(s) for all occurences of the text you typed above"
+msgstr "Iskanje v knjigah s pomočjo za vse pojavitve zgoraj natipkanega besedila"
 
 # generic/dirdlgg.cpp:572
 #: ../src/generic/fdrepdlg.cpp:166
@@ -4354,7 +4390,8 @@ msgstr "Najdi napako na datoteki '%s' (velike datoteke niso podprte v stdio)"
 
 # common/docview.cpp:1371
 # common/docview.cpp:1422
-#: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068
+#: ../src/mac/carbon/textctrl.cpp:1078
+#: ../src/msw/textctrl.cpp:2068
 msgid "Select &All"
 msgstr "Izberi &vse"
 
@@ -4376,9 +4413,8 @@ msgstr "Izberi datoteko"
 
 # generic/dirdlgg.cpp:191
 #: ../src/motif/filedlg.cpp:226
-#, fuzzy
 msgid "Selection"
-msgstr "Razdelki"
+msgstr "Izbira"
 
 # common/cmdline.cpp:627
 #: ../src/common/cmdline.cpp:739
@@ -4398,8 +4434,7 @@ msgstr "Nastavitve ..."
 # msw/dialup.cpp:539
 #: ../src/msw/dialup.cpp:567
 msgid "Several active dialup connections found, choosing one randomly."
-msgstr ""
-"Najdenih je več aktivnih klicnih povezav, izbrana bo naključna med njimi."
+msgstr "Najdenih je več aktivnih klicnih povezav, izbrana bo naključna med njimi."
 
 # html/helpfrm.cpp:331
 #: ../src/html/helpfrm.cpp:493
@@ -4412,7 +4447,8 @@ msgid "Show all items in index"
 msgstr "Pokaži vse predmete v indeksu"
 
 # generic/filedlgg.cpp:913
-#: ../src/generic/dirdlgg.cpp:112 ../src/generic/dirdlgg.cpp:175
+#: ../src/generic/dirdlgg.cpp:112
+#: ../src/generic/dirdlgg.cpp:175
 msgid "Show hidden directories"
 msgstr "Pokaži skrite imenike"
 
@@ -4426,7 +4462,8 @@ msgstr "Poka
 msgid "Show/hide navigation panel"
 msgstr "Pokaži/skrij navigacijski pano"
 
-#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355
+#: ../src/generic/fontdlgg.cpp:353
+#: ../src/generic/fontdlgg.cpp:355
 msgid "Shows the font preview."
 msgstr "Prikaže predogled pisave."
 
@@ -4435,7 +4472,8 @@ msgstr "Prika
 msgid "Size"
 msgstr "Velikost"
 
-#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
+#: ../src/generic/progdlgg.cpp:222
+#: ../src/generic/progdlgg.cpp:240
 #: ../src/generic/progdlgg.cpp:598
 msgid "Skip"
 msgstr "Preskoči"
@@ -4453,7 +4491,8 @@ msgstr "Oprostite, te datoteke ni mo
 # common/docview.cpp:342
 # common/docview.cpp:354
 # common/docview.cpp:1390
-#: ../src/common/docview.cpp:617 ../src/common/docview.cpp:1598
+#: ../src/common/docview.cpp:617
+#: ../src/common/docview.cpp:1598
 msgid "Sorry, could not open this file."
 msgstr "Oprostite, te datoteke ni moč odpreti."
 
@@ -4474,7 +4513,8 @@ msgstr "Oprostite, za predogled tiskanja mora biti name
 # common/docview.cpp:342
 # common/docview.cpp:354
 # common/docview.cpp:1390
-#: ../src/common/docview.cpp:1268 ../src/common/docview.cpp:1618
+#: ../src/common/docview.cpp:1268
+#: ../src/common/docview.cpp:1618
 msgid "Sorry, the format for this file is unknown."
 msgstr "Oprostite, ta zapis datoteke je neznan."
 
@@ -4505,29 +4545,29 @@ msgstr "Stanje:"
 msgid "Streaming delegates for not already streamed objects not yet supported"
 msgstr "Pretočni predstavniki za še ne pretočene predmete še niso podprti."
 
-#: ../src/msw/colour.cpp:38 ../src/palmos/colour.cpp:38
+#: ../src/msw/colour.cpp:38
+#: ../src/palmos/colour.cpp:38
 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "Niz v barvo: nepravilna specifikacija barve: %s"
 
-#: ../include/wx/xti.h:428 ../include/wx/xti.h:432
+#: ../include/wx/xti.h:428
+#: ../include/wx/xti.h:432
 msgid "String conversions not supported"
 msgstr "Pretvorbe nizov niso podprte"
 
 #: ../src/xrc/xmlres.cpp:750
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
-msgstr ""
-"Podrazreda '%s' ni moč najti za vir '%s', brez razdelitve na podrazrede "
-"(subclassing)!"
+msgstr "Podrazreda '%s' ni moč najti za vir '%s', brez razdelitve na podrazrede (subclassing)!"
 
 #: ../src/common/paper.cpp:157
 msgid "SuperA/SuperA/A4 227 x 356 mm"
-msgstr ""
+msgstr "SuperA/SuperA/A4, 227 x 356 mm"
 
 #: ../src/common/paper.cpp:158
 msgid "SuperB/SuperB/A3 305 x 487 mm"
-msgstr ""
+msgstr "SuperB/SuperB/A3, 305 x 487 mm"
 
 # generic/fontdlgg.cpp:210
 #: ../src/generic/fontdlgg.cpp:230
@@ -4536,16 +4576,17 @@ msgstr "neserifna"
 
 #: ../src/common/imagtiff.cpp:165
 msgid "TIFF library error."
-msgstr ""
+msgstr "Napaka knjižnice TIFF."
 
 #: ../src/common/imagtiff.cpp:149
 msgid "TIFF library warning."
-msgstr ""
+msgstr "Opozorilo knjižnice TIFF."
 
 # common/imagtiff.cpp:192
 # common/imagtiff.cpp:203
 # common/imagtiff.cpp:314
-#: ../src/common/imagtiff.cpp:248 ../src/common/imagtiff.cpp:259
+#: ../src/common/imagtiff.cpp:248
+#: ../src/common/imagtiff.cpp:259
 #: ../src/common/imagtiff.cpp:399
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: spomina ni mogoče alocirati."
@@ -4571,9 +4612,8 @@ msgid "TIFF: Error writing image."
 msgstr "TIFF: napaka pri zapisovanju slike."
 
 #: ../src/common/paper.cpp:152
-#, fuzzy
 msgid "Tabloid Extra 11.69 x 18 in"
-msgstr "tabloid, 11 x 17 in"
+msgstr "tabloid Extra, 11,69 x 18 in."
 
 #: ../src/common/paper.cpp:109
 msgid "Tabloid, 11 x 17 in"
@@ -4649,24 +4689,29 @@ msgstr ""
 "Datoteka '%s' ne obstaja in je ni mogoče odpreti.\n"
 "Izbisana je bila iz seznama zadnjih uporabljenih datotek."
 
-#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318
+#: ../src/generic/fontdlgg.cpp:316
+#: ../src/generic/fontdlgg.cpp:318
 msgid "The font colour."
 msgstr "Barva pisave."
 
-#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279
+#: ../src/generic/fontdlgg.cpp:277
+#: ../src/generic/fontdlgg.cpp:279
 msgid "The font family."
 msgstr "Družina pisave."
 
 # html/helpfrm.cpp:899
-#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
+#: ../src/generic/fontdlgg.cpp:328
+#: ../src/generic/fontdlgg.cpp:330
 msgid "The font point size."
 msgstr "Velikost pisave."
 
-#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290
+#: ../src/generic/fontdlgg.cpp:288
+#: ../src/generic/fontdlgg.cpp:290
 msgid "The font style."
 msgstr "Slog pisave."
 
-#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301
+#: ../src/generic/fontdlgg.cpp:299
+#: ../src/generic/fontdlgg.cpp:301
 msgid "The font weight."
 msgstr "Odebeljenost pisave."
 
@@ -4677,12 +4722,10 @@ msgstr "Pot '%s' vsebuje preve
 
 #: ../src/generic/dbgrptg.cpp:308
 msgid ""
-"The report contains the files listed below. If any of these files contain "
-"private information,\n"
+"The report contains the files listed below. If any of these files contain private information,\n"
 "please uncheck them and they will be removed from the report.\n"
 msgstr ""
-"Poročilo vsebuje datoteke, navedene spodaj. Če katere od teh datotek "
-"vsebujejo zasebne podatke,\n"
+"Poročilo vsebuje datoteke, navedene spodaj. Če katere od teh datotek vsebujejo zasebne podatke,\n"
 "jih prosimo odznačite in odstranjene bodo iz poročila.\n"
 
 # common/cmdline.cpp:761
@@ -4704,37 +4747,21 @@ msgstr "Vrednost opcije '%s' mora biti podana."
 
 #: ../src/msw/dialup.cpp:455
 #, c-format
-msgid ""
-"The version of remote access service (RAS) installed on this machine is "
-"tooold, please upgrade (the following required function is missing: %s)."
-msgstr ""
-"Različica storitve oddaljenega dostopa (RAS), nameščena na tem računalniku, "
-"je zastarela, prosimo nadgradite jo (manjka naslednja zahtevana funkcija: %"
-"s)."
+msgid "The version of remote access service (RAS) installed on this machine is tooold, please upgrade (the following required function is missing: %s)."
+msgstr "Različica storitve oddaljenega dostopa (RAS), nameščena na tem računalniku, je zastarela, prosimo nadgradite jo (manjka naslednja zahtevana funkcija: %s)."
 
 #: ../src/html/htmprint.cpp:601
-msgid ""
-"There was a problem during page setup: you may need to set a default printer."
-msgstr ""
-"Med pripravo strani je prišlo do težave: morda morate nastaviti privzeti "
-"tiskalnik."
+msgid "There was a problem during page setup: you may need to set a default printer."
+msgstr "Med pripravo strani je prišlo do težave: morda morate nastaviti privzeti tiskalnik."
 
 #: ../src/msw/datectrl.cpp:109
-msgid ""
-"This system doesn't support date picker control, please upgrade your version "
-"of comctl32.dll"
-msgstr ""
-"Ta sistem ne podpira kontrolnika za izbor datuma, prosimo nadgradite svojo "
-"različico comctl32.dll"
+msgid "This system doesn't support date picker control, please upgrade your version of comctl32.dll"
+msgstr "Ta sistem ne podpira kontrolnika za izbor datuma, prosimo nadgradite svojo različico comctl32.dll"
 
 # msw/thread.cpp:1083
 #: ../src/msw/thread.cpp:1206
-msgid ""
-"Thread module initialization failed: can not store value in thread local "
-"storage"
-msgstr ""
-"Inicializacija modula niti ni uspela: vrednosti ni mogoče shraniti v lokalni "
-"shrambi niti"
+msgid "Thread module initialization failed: can not store value in thread local storage"
+msgstr "Inicializacija modula niti ni uspela: vrednosti ni mogoče shraniti v lokalni shrambi niti"
 
 #: ../src/unix/threadpsx.cpp:1603
 msgid "Thread module initialization failed: failed to create thread key"
@@ -4742,12 +4769,8 @@ msgstr "Inicializacija modula niti ni uspela: klju
 
 # msw/thread.cpp:1071
 #: ../src/msw/thread.cpp:1194
-msgid ""
-"Thread module initialization failed: impossible to allocate index in thread "
-"local storage"
-msgstr ""
-"Inicializacija modula niti ni uspela: indeksa ni mogoče alocirati v lokalni "
-"shrambi niti"
+msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
+msgstr "Inicializacija modula niti ni uspela: indeksa ni mogoče alocirati v lokalni shrambi niti"
 
 #: ../src/unix/threadpsx.cpp:1108
 msgid "Thread priority setting is ignored."
@@ -4765,11 +4788,10 @@ msgstr "Razporedi &navpi
 
 #: ../src/common/ftp.cpp:635
 msgid "Timeout while waiting for FTP server to connect, try passive mode."
-msgstr ""
-"Časovna prekoračitev pri čakanju na strežnik FTP za povezavo, poskusite "
-"pasiven način."
+msgstr "Časovna prekoračitev pri čakanju na strežnik FTP za povezavo, poskusite pasiven način."
 
-#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141
+#: ../src/msw/timer.cpp:116
+#: ../src/os2/timer.cpp:141
 msgid "Timer creation failed."
 msgstr "Ustvarjanje časovnika (timer) ni uspelo."
 
@@ -4801,11 +4823,11 @@ msgstr "Zgornji rob (mm):"
 #: ../src/common/fs_mem.cpp:205
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
-msgstr ""
-"Poskus odstanitve datoteke '%s' iz spominskega VFS, vendar ni naložena!"
+msgstr "Poskus odstanitve datoteke '%s' iz spominskega VFS, vendar ni naložena!"
 
 # common/sckaddr.cpp:107
-#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250
+#: ../src/common/sckaddr.cpp:146
+#: ../src/common/sckaddr.cpp:250
 msgid "Trying to solve a NULL hostname: giving up"
 msgstr "Poskus razreševanja imena strežnika NULL: opuščanje"
 
@@ -4817,7 +4839,8 @@ msgstr "tur
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351
+#: ../src/common/xtistrm.cpp:281
+#: ../src/common/xtixml.cpp:351
 #: ../src/common/xtixml.cpp:498
 msgid "Type must have enum - long conversion"
 msgstr "Tip mora imeti pretvorbo enum - long"
@@ -4926,7 +4949,8 @@ msgid "Unknown long option '%s'"
 msgstr "Nepoznana dolga opcija '%s'"
 
 # common/cmdline.cpp:518
-#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629
+#: ../src/common/cmdline.cpp:608
+#: ../src/common/cmdline.cpp:629
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "Nepoznana opcija '%s'"
@@ -4950,7 +4974,8 @@ msgstr "Neujemajo
 # common/docview.cpp:1923
 # common/docview.cpp:1938
 # common/docview.cpp:1965
-#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287
+#: ../src/common/cmdproc.cpp:261
+#: ../src/common/cmdproc.cpp:287
 #: ../src/common/cmdproc.cpp:307
 msgid "Unnamed command"
 msgstr "Neimenovan ukaz"
@@ -4962,8 +4987,10 @@ msgstr "Neprepoznan slog %s med raz
 
 # msw/clipbrd.cpp:268
 # msw/clipbrd.cpp:369
-#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445
+#: ../src/mac/carbon/clipbrd.cpp:68
+#: ../src/mac/classic/clipbrd.cpp:64
+#: ../src/msw/clipbrd.cpp:273
+#: ../src/msw/clipbrd.cpp:445
 msgid "Unsupported clipboard format."
 msgstr "Nepodprta oblika zapisa za odložišče."
 
@@ -5034,7 +5061,8 @@ msgstr "zahodnoevropsko (ISO-8859-1)"
 msgid "Western European with Euro (ISO-8859-15)"
 msgstr "zahodnoevropsko z Evrom (ISO-8859-15)"
 
-#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341
+#: ../src/generic/fontdlgg.cpp:339
+#: ../src/generic/fontdlgg.cpp:341
 msgid "Whether the font is underlined."
 msgstr "Če je pisava podčrtana ali ne."
 
@@ -5144,9 +5172,8 @@ msgid "Windows Server 2003 (build %lu"
 msgstr "Windows Server 2003 (izdaja %lu"
 
 #: ../src/common/fmapbase.cpp:121
-#, fuzzy
 msgid "Windows Thai (CP 874)"
-msgstr "Windows - balstko (CP 1257)"
+msgstr "Windows - tajsko (CP 874)"
 
 #: ../src/common/fmapbase.cpp:130
 msgid "Windows Turkish (CP 1254)"
@@ -5180,7 +5207,8 @@ msgstr "Napaka raz
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: napačno oblikovani podatki točk!"
 
-#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721
+#: ../src/common/xpmdecod.cpp:712
+#: ../src/common/xpmdecod.cpp:721
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr "XPM: napačno oblikovana definicija barve '%s'!"
@@ -5190,7 +5218,8 @@ msgstr "XPM: napa
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "Vira XRC '%s' (razred '%s') ni moč najti!"
 
-#: ../src/xrc/xmlres.cpp:1080 ../src/xrc/xmlres.cpp:1092
+#: ../src/xrc/xmlres.cpp:1080
+#: ../src/xrc/xmlres.cpp:1092
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "XRC-vir: iz '%s' ni mogoče ustvariti bitne slike."
@@ -5202,8 +5231,10 @@ msgstr "Vir XRC: nepravilna barvna specifikacija '%s' za lastnost '%s'."
 
 # common/dlgcmn.cpp:109
 # common/dlgcmn.cpp:116
-#: ../src/mac/carbon/msgdlg.cpp:59 ../src/mac/carbon/msgdlg.cpp:142
-#: ../src/mac/classic/msgdlg.cpp:57 ../src/mac/classic/msgdlg.cpp:139
+#: ../src/mac/carbon/msgdlg.cpp:59
+#: ../src/mac/carbon/msgdlg.cpp:142
+#: ../src/mac/classic/msgdlg.cpp:57
+#: ../src/mac/classic/msgdlg.cpp:139
 #: ../src/motif/msgdlg.cpp:204
 msgid "Yes"
 msgstr "Da"
@@ -5238,8 +5269,7 @@ msgstr "aplikacija DDEML je ustvarila podalj
 # msw/dde.cpp:985
 #: ../src/msw/dde.cpp:1048
 msgid ""
-"a DDEML function was called without first calling the DdeInitialize "
-"function,\n"
+"a DDEML function was called without first calling the DdeInitialize function,\n"
 "or an invalid instance identifier\n"
 "was passed to a DDEML function."
 msgstr ""
@@ -5380,7 +5410,7 @@ msgstr "krepko"
 
 #: ../src/os2/iniconf.cpp:451
 msgid "buffer is too small for Windows directory."
-msgstr ""
+msgstr "medpomnilnik je za imenik Windows premajhen"
 
 # common/ffile.cpp:101
 #: ../src/common/ffile.cpp:91
@@ -5429,14 +5459,14 @@ msgstr "ni mogo
 #: ../src/common/file.cpp:457
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
-msgstr ""
-"ni mogoče ugotoviti, ali je bil konec datoteke na deskriptorju %d dosežen"
+msgstr "ni mogoče ugotoviti, ali je bil konec datoteke na deskriptorju %d dosežen"
 
 # common/ffile.cpp:182
-#: ../src/msdos/utilsdos.cpp:307 ../src/msdos/utilsdos.cpp:466
-#, fuzzy, c-format
+#: ../src/msdos/utilsdos.cpp:307
+#: ../src/msdos/utilsdos.cpp:466
+#, c-format
 msgid "can't execute '%s'"
-msgstr "'%s' ni mogoče izvesti\n"
+msgstr "'%s' ni mogoče izvesti"
 
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -5456,8 +5486,7 @@ msgstr "ni mogo
 # msw/utils.cpp:376
 #: ../src/msw/utils.cpp:380
 msgid "can't find user's HOME, using current directory."
-msgstr ""
-"uporabnikovega imenika HOME ni mogoče najti, v uporabi je trenuten imenik."
+msgstr "uporabnikovega imenika HOME ni mogoče najti, v uporabi je trenuten imenik."
 
 # common/file.cpp:319
 #: ../src/common/file.cpp:341
@@ -5466,7 +5495,8 @@ msgid "can't flush file descriptor %d"
 msgstr "ni mogoče izprazniti deskriptorja %d"
 
 # common/file.cpp:373
-#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202
+#: ../src/common/file.cpp:399
+#: ../src/msw/wince/filefnwce.cpp:202
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "ni mogoče najti iskalne pozicije v datotečnem deskriptorju %d"
@@ -5478,7 +5508,8 @@ msgstr "ni mogo
 
 # common/ffile.cpp:85
 # common/file.cpp:243
-#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271
+#: ../src/common/ffile.cpp:75
+#: ../src/common/file.cpp:271
 #, c-format
 msgid "can't open file '%s'"
 msgstr "ni mogoče odpreti datoteke '%s'"
@@ -5502,8 +5533,7 @@ msgstr "ni mogo
 
 #: ../src/common/dynlib.cpp:253
 msgid "can't query for GUI plugins name in console applications"
-msgstr ""
-"Povpraševanje po imenu vtičnikov GUI v aplikacijah ukazne vrstice ni možno."
+msgstr "Povpraševanje po imenu vtičnikov GUI v aplikacijah ukazne vrstice ni možno."
 
 # html/helpfrm.cpp:1174
 #: ../src/common/zipstrm.cpp:436
@@ -5544,7 +5574,8 @@ msgid "can't remove temporary file '%s'"
 msgstr "ni mogoče odstraniti začasne datoteke '%s'"
 
 # common/file.cpp:359
-#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189
+#: ../src/common/file.cpp:385
+#: ../src/msw/wince/filefnwce.cpp:189
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "ni mogoče iskati na datotečnem deskriptorju %d"
@@ -5602,7 +5633,8 @@ msgstr "datum"
 msgid "decompression error"
 msgstr "napaka pri razširjanju"
 
-#: ../src/common/fmapbase.cpp:705 ../src/common/fmapbase.cpp:737
+#: ../src/common/fmapbase.cpp:705
+#: ../src/common/fmapbase.cpp:737
 msgid "default"
 msgstr "privzeto"
 
@@ -5646,9 +5678,9 @@ msgstr "napaka v zapisu podatkov"
 # common/ffile.cpp:133
 # common/ffile.cpp:154
 #: ../src/msdos/utilsdos.cpp:407
-#, fuzzy, c-format
+#, c-format
 msgid "error opening '%s'"
-msgstr "napaka pri odpiranju datoteke"
+msgstr "napaka pri odpiranju datoteke '%s'"
 
 # common/ffile.cpp:133
 # common/ffile.cpp:154
@@ -5765,7 +5797,8 @@ msgid "invalid zip file"
 msgstr "neveljavna datoteka zip"
 
 # generic/fontdlgg.cpp:213
-#: ../src/common/fontcmn.cpp:586 ../src/common/fontcmn.cpp:650
+#: ../src/common/fontcmn.cpp:586
+#: ../src/common/fontcmn.cpp:650
 msgid "italic"
 msgstr "ležeče"
 
@@ -5942,7 +5975,8 @@ msgstr "tretji"
 msgid "thirteenth"
 msgstr "trinajsti"
 
-#: ../src/common/imagtiff.cpp:145 ../src/common/imagtiff.cpp:161
+#: ../src/common/imagtiff.cpp:145
+#: ../src/common/imagtiff.cpp:161
 #, c-format
 msgid "tiff module: %s"
 msgstr "modul tiff: %s"
@@ -5991,7 +6025,8 @@ msgid "unknown class %s"
 msgstr "neznani razred %s"
 
 # generic/progdlgg.cpp:241
-#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:163
+#: ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr "neznana napaka"
 
@@ -6007,7 +6042,8 @@ msgid "unknown line terminator"
 msgstr "neznana oznaka za konec vrstice"
 
 # common/file.cpp:342
-#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170
+#: ../src/common/file.cpp:367
+#: ../src/msw/wince/filefnwce.cpp:170
 msgid "unknown seek origin"
 msgstr "nepoznana smer iskanja"
 
@@ -6028,7 +6064,8 @@ msgstr "neimenovana"
 msgid "unnamed%d"
 msgstr "neimenovana%d"
 
-#: ../src/common/zipstrm.cpp:1660 ../src/common/zipstrm.cpp:2030
+#: ../src/common/zipstrm.cpp:1660
+#: ../src/common/zipstrm.cpp:2030
 msgid "unsupported Zip compression method"
 msgstr "nepodprta metoda stiskanja Zip"
 
@@ -6062,13 +6099,16 @@ msgstr "wxGetTimeOfDay ni uspela."
 
 # common/socket.cpp:347
 # common/socket.cpp:401
-#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469
-#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506
+#: ../src/common/socket.cpp:415
+#: ../src/common/socket.cpp:469
+#: ../src/mac/carbon/cfsocket.cpp:452
+#: ../src/mac/carbon/cfsocket.cpp:506
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: nepravilen podpis v ReadMsg."
 
 # common/socket.cpp:921
-#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006
+#: ../src/common/socket.cpp:966
+#: ../src/mac/carbon/cfsocket.cpp:1006
 msgid "wxSocket: unknown event!."
 msgstr "wxSocket: neznan dogodek!"
 
@@ -6088,7 +6128,8 @@ msgid "yesterday"
 msgstr "včeraj"
 
 # common/log.cpp:242
-#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
+#: ../src/common/zstream.cpp:165
+#: ../src/common/zstream.cpp:315
 #, c-format
 msgid "zlib error %d"
 msgstr "napaka zlib %d"
@@ -6097,18 +6138,3 @@ msgstr "napaka zlib %d"
 msgid "|<<"
 msgstr "|<<"
 
-# msw/statbr95.cpp:149
-#~ msgid ""
-#~ "Failed to get stack backtrace:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Zasledovanja kopice ni mogoče pridobiti:\n"
-#~ "%s"
-
-# common/imagpnm.cpp:72
-#~ msgid "Loading Grey Ascii PNM image is not yet implemented."
-#~ msgstr "Nalaganje slike Grey Ascii PNM še ni podprto."
-
-# common/imagpnm.cpp:75
-#~ msgid "Loading Grey Raw PNM image is not yet implemented."
-#~ msgstr "Nalaganje slike Grey Raw PNM še ni podprto."