Fix comparisons of char and wchar_t with wxUniChar[Ref].

[wxWidgets.git] / locale / nb.po

diff --git a/locale/nb.po b/locale/nb.po
index 9e055138c3e76638bccbf3e7897b189febadb64d..314478c60a71bbba05ae86a1f92445d553473e9b 100644 (file)
--- a/locale/nb.po
+++ b/locale/nb.po
@@ -1,62 +1,65 @@
 #
-# Translation of wxWidgets to Norwegian Bokmål.
+# Translation of wxWidgets to Norwegian Bokmål.
 # Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2004-2005
 #
-#: ../src/stc/scintilla/src/ScintillaBase.cxx:424
-#: ../src/stc/scintilla/src/ScintillaBase.cxx:429
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWidgets-2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-24 09:31+0200\n"
+"POT-Creation-Date: 2012-02-18 18:11+0100\n"
 "PO-Revision-Date: 2005-04-14 00:30+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/common/debugrpt.cpp:578
+#: ../src/common/debugrpt.cpp:582
 msgid ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"
 msgstr ""
 "\n"
-"Send denne rapporten til vedlikeholderen av programmet. På forhånd takk.\n"
+"Send denne rapporten til vedlikeholderen av programmet. På forhånd takk.\n"
 
-#: ../src/richtext/richtextstyledlg.cpp:202
-#: ../src/richtext/richtextstyledlg.cpp:214 ../src/palmos/utils.cpp:265
+#: ../src/richtext/richtextstyledlg.cpp:214
+#: ../src/richtext/richtextstyledlg.cpp:226
 msgid " "
 msgstr "  "
 
-#: ../src/generic/dbgrptg.cpp:322
+#: ../src/generic/dbgrptg.cpp:323
 msgid "              Thank you and we're sorry for the inconvenience!\n"
 msgstr "              Takk skal du ha og vi beklager bryet!\n"
 
-#: ../src/common/log.cpp:411
+#: ../src/common/log.cpp:428
 #, c-format
 msgid " (error %ld: %s)"
 msgstr "(feil %ld: %s)"
 
-#: ../src/common/docview.cpp:1464
+#: ../src/common/imagtiff.cpp:76
+#, fuzzy, c-format
+msgid " (in module \"%s\")"
+msgstr "TIFF-modul: %s"
+
+#: ../src/common/docview.cpp:1605
 msgid " - "
 msgstr " - "
 
-#: ../src/richtext/richtextprint.cpp:549 ../src/html/htmprint.cpp:579
+#: ../src/richtext/richtextprint.cpp:582 ../src/html/htmprint.cpp:705
 msgid " Preview"
-msgstr "Forhåndsvisning"
+msgstr "Forhåndsvisning"
 
-#: ../src/common/fontcmn.cpp:620
+#: ../src/common/fontcmn.cpp:812
 #, fuzzy
 msgid " bold"
 msgstr "fet"
 
-#: ../src/common/fontcmn.cpp:636
+#: ../src/common/fontcmn.cpp:828
 #, fuzzy
 msgid " italic"
 msgstr "kursiv"
 
-#: ../src/common/fontcmn.cpp:616
+#: ../src/common/fontcmn.cpp:808
 #, fuzzy
 msgid " light"
 msgstr "lett"
@@ -81,395 +84,507 @@ msgstr "#14 konvolutt, 5 x 11 1/2 tommer"
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "#9 konvolutt, 3 7/8 x 8 7/8 tommer"
 
-#: ../src/common/filename.cpp:2368
-#, c-format
-msgid "%.*f GB"
-msgstr ""
-
-#: ../src/common/filename.cpp:2366
-#, c-format
-msgid "%.*f MB"
-msgstr ""
-
-#: ../src/common/filename.cpp:2370
-#, c-format
-msgid "%.*f TB"
-msgstr ""
-
-#: ../src/common/filename.cpp:2364
-#, c-format
-msgid "%.*f kB"
-msgstr ""
+#: ../src/html/helpwnd.cpp:1044
+#, fuzzy, c-format
+msgid "%d of %lu"
+msgstr "%i av %i"
 
-#: ../src/html/helpwnd.cpp:1047 ../src/html/helpwnd.cpp:1049
-#: ../src/html/helpwnd.cpp:1681 ../src/html/helpwnd.cpp:1719
+#: ../src/html/helpwnd.cpp:1687 ../src/html/helpwnd.cpp:1725
 #, c-format
 msgid "%i of %i"
 msgstr "%i av %i"
 
-#: ../src/generic/filectrlg.cpp:314
+#: ../src/generic/filectrlg.cpp:309
 #, fuzzy, c-format
 msgid "%ld byte"
 msgid_plural "%ld bytes"
 msgstr[0] "%ld byte"
 msgstr[1] "%ld byte"
 
-#: ../src/gtk/print.cpp:677
-#, c-format
-msgid "%s"
-msgstr ""
+#: ../src/html/helpwnd.cpp:1046
+#, fuzzy, c-format
+msgid "%lu of %lu"
+msgstr "%i av %i"
 
-#: ../src/common/cmdline.cpp:922
+#: ../src/common/cmdline.cpp:1043
 #, c-format
 msgid "%s (or %s)"
 msgstr "%s (eller %s)"
 
-#: ../src/common/filename.cpp:2362
-#, c-format
-msgid "%s B"
-msgstr ""
-
-#: ../src/generic/logg.cpp:285
+#: ../src/generic/logg.cpp:235
 #, c-format
 msgid "%s Error"
 msgstr "%s Feil"
 
-#: ../src/generic/logg.cpp:293
+#: ../src/generic/logg.cpp:247
 #, c-format
 msgid "%s Information"
 msgstr "%s Informasjon"
 
-#: ../src/generic/logg.cpp:289
+#: ../src/generic/logg.cpp:239
 #, c-format
 msgid "%s Warning"
 msgstr "%s Advarsel"
 
-#: ../src/common/tarstrm.cpp:1311
+#: ../src/common/tarstrm.cpp:1320
 #, c-format
 msgid "%s did not fit the tar header for entry '%s'"
 msgstr ""
 
-#: ../src/common/fldlgcmn.cpp:96
+#: ../src/common/fldlgcmn.cpp:107
 #, c-format
 msgid "%s files (%s)|%s"
 msgstr "%s filer (%s)|%s"
 
-#: ../src/common/msgout.cpp:209
-#, c-format
-msgid "%s message"
-msgstr "%s melding"
-
-#: ../src/common/stockitem.cpp:110 ../src/html/helpfrm.cpp:130
-#: ../src/html/helpfrm.cpp:132
-msgid "&About..."
+#: ../src/common/stockitem.cpp:140 ../src/html/helpfrm.cpp:143
+#: ../src/html/helpfrm.cpp:145
+msgid "&About"
 msgstr "%Om"
 
-#: ../src/common/stockitem.cpp:160
+#: ../src/common/stockitem.cpp:208
 msgid "&Actual Size"
-msgstr "&Faktisk størrelse"
+msgstr "&Faktisk størrelse"
 
-#: ../src/richtext/richtextindentspage.cpp:296
+#: ../src/richtext/richtextindentspage.cpp:287
 msgid "&After a paragraph:"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:318
-#: ../src/richtext/richtextindentspage.cpp:138
+#: ../src/richtext/richtextindentspage.cpp:141
+#: ../src/richtext/richtextliststylepage.cpp:320
 #, fuzzy
 msgid "&Alignment"
 msgstr "Venstrejustering"
 
-#: ../src/common/stockitem.cpp:112
+#: ../src/common/stockitem.cpp:142
 msgid "&Apply"
 msgstr "&Bruk"
 
-#: ../src/richtext/richtextstyledlg.cpp:237
+#: ../src/richtext/richtextstyledlg.cpp:255
 #, fuzzy
 msgid "&Apply Style"
 msgstr "&Bruk"
 
-#: ../src/msw/mdi.cpp:171
+#: ../src/msw/mdi.cpp:168
 msgid "&Arrange Icons"
 msgstr "&Still opp ikoner"
 
-#: ../src/common/stockitem.cpp:124
+#: ../src/common/stockitem.cpp:196
+msgid "&Ascending"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:143
 msgid "&Back"
 msgstr "&Tilbake"
 
-#: ../src/richtext/richtextstylepage.cpp:112
+#: ../src/richtext/richtextstylepage.cpp:114
 msgid "&Based on:"
 msgstr ""
 
-#: ../src/richtext/richtextindentspage.cpp:284
+#: ../src/richtext/richtextindentspage.cpp:278
 msgid "&Before a paragraph:"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:113
+#: ../src/richtext/richtextfontpage.cpp:238
+#, fuzzy
+msgid "&Bg colour:"
+msgstr "&Farge"
+
+#: ../src/common/stockitem.cpp:144
 msgid "&Bold"
 msgstr "&Fet"
 
-#: ../src/richtext/richtextliststylepage.cpp:209
-#: ../src/richtext/richtextbulletspage.cpp:157
+#: ../src/common/stockitem.cpp:145
+msgid "&Bottom"
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:359
+#: ../src/richtext/richtextborderspage.cpp:503
+#: ../src/richtext/richtextmarginspage.cpp:260
+#: ../src/richtext/richtextmarginspage.cpp:374
+msgid "&Bottom:"
+msgstr ""
+
+#: ../include/wx/richtext/richtextbuffer.h:3408
+#, fuzzy
+msgid "&Box"
+msgstr "&Fet"
+
+#: ../src/richtext/richtextliststylepage.cpp:211
+#: ../src/richtext/richtextbulletspage.cpp:160
 msgid "&Bullet style:"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:114 ../src/generic/fontdlgg.cpp:472
-#: ../src/generic/fontdlgg.cpp:491 ../src/generic/wizard.cpp:458
-#: ../src/mac/carbon/fontdlg.cpp:564
+#: ../src/common/stockitem.cpp:147
+msgid "&CD-Rom"
+msgstr ""
+
+#: ../src/generic/wizard.cpp:432 ../src/generic/fontdlgg.cpp:471
+#: ../src/generic/fontdlgg.cpp:490 ../src/osx/carbon/fontdlg.cpp:586
+#: ../src/common/stockitem.cpp:146
 msgid "&Cancel"
 msgstr "&Avbryt"
 
-#: ../src/msw/mdi.cpp:167
+#: ../src/msw/mdi.cpp:164
 msgid "&Cascade"
 msgstr "&Kaskade"
 
-#: ../src/richtext/richtextsymboldlg.cpp:432
+#: ../include/wx/richtext/richtextbuffer.h:4870
+#, fuzzy
+msgid "&Cell"
+msgstr "&Avbryt"
+
+#: ../src/richtext/richtextsymboldlg.cpp:436
 msgid "&Character code:"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:115
+#: ../src/common/stockitem.cpp:148
 msgid "&Clear"
 msgstr "&Fjern"
 
-#: ../src/common/prntbase.cpp:1115 ../src/common/stockitem.cpp:116
-#: ../src/html/helpfrm.cpp:127 ../src/generic/logg.cpp:539
+#: ../src/generic/logg.cpp:524 ../src/common/stockitem.cpp:149
+#: ../src/common/prntbase.cpp:1545 ../src/univ/themes/win32.cpp:3759
+#: ../src/html/helpfrm.cpp:140
 msgid "&Close"
 msgstr "&Lukk"
 
-#: ../src/richtext/richtextfontpage.cpp:213
+#: ../src/common/stockitem.cpp:194
+#, fuzzy
+msgid "&Color"
+msgstr "&Farge"
+
+#: ../src/richtext/richtextfontpage.cpp:225
 #, fuzzy
 msgid "&Colour:"
 msgstr "&Farge"
 
-#: ../src/common/stockitem.cpp:117 ../src/richtext/richtextctrl.cpp:2596
-#: ../src/msw/textctrl.cpp:2152 ../src/mac/carbon/textctrl.cpp:1065
+#: ../src/common/stockitem.cpp:150
+#, fuzzy
+msgid "&Convert"
+msgstr "Innhold"
+
+#: ../src/richtext/richtextctrl.cpp:326 ../src/osx/textctrl_osx.cpp:584
+#: ../src/common/stockitem.cpp:151 ../src/msw/textctrl.cpp:2223
 msgid "&Copy"
 msgstr "&Kopier"
 
-#: ../src/generic/hyperlinkg.cpp:150
+#: ../src/generic/hyperlinkg.cpp:157
 #, fuzzy
 msgid "&Copy URL"
 msgstr "&Kopier"
 
-#: ../src/generic/dbgrptg.cpp:330
+#: ../src/common/headerctrlcmn.cpp:329
+#, fuzzy
+msgid "&Customize..."
+msgstr "skriftstørrelse"
+
+#: ../src/generic/dbgrptg.cpp:331
 msgid "&Debug report preview:"
-msgstr "&Forhåndsvisning av feilsøkingsrapport"
+msgstr "&Forhåndsvisning av feilsøkingsrapport"
 
-#: ../src/common/stockitem.cpp:119 ../src/richtext/richtextctrl.cpp:2598
-#: ../src/richtext/richtexttabspage.cpp:142 ../src/msw/textctrl.cpp:2154
-#: ../src/mac/carbon/textctrl.cpp:1067
+#: ../src/richtext/richtexttabspage.cpp:143
+#: ../src/richtext/richtextctrl.cpp:328 ../src/osx/textctrl_osx.cpp:586
+#: ../src/common/stockitem.cpp:153 ../src/msw/textctrl.cpp:2225
 msgid "&Delete"
 msgstr "&Slett"
 
-#: ../src/richtext/richtextstyledlg.cpp:255
+#: ../src/richtext/richtextstyledlg.cpp:273
 #, fuzzy
 msgid "&Delete Style..."
 msgstr "Slett element"
 
-#: ../src/generic/logg.cpp:750
+#: ../src/common/stockitem.cpp:197
+msgid "&Descending"
+msgstr ""
+
+#: ../src/generic/logg.cpp:696
 msgid "&Details"
 msgstr "&detaljer"
 
-#: ../src/common/stockitem.cpp:125
+#: ../src/common/stockitem.cpp:154
 msgid "&Down"
 msgstr "&ned"
 
-#: ../src/common/stockitem.cpp:120
+#: ../src/common/stockitem.cpp:155
 msgid "&Edit"
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:249
+#: ../src/richtext/richtextstyledlg.cpp:267
 #, fuzzy
 msgid "&Edit Style..."
 msgstr "Redigere element"
 
-#: ../src/common/stockitem.cpp:122 ../src/html/helpfrm.cpp:134
+#: ../src/common/stockitem.cpp:156
+msgid "&Execute"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:158 ../src/html/helpfrm.cpp:147
 msgid "&File"
 msgstr "&Fil"
 
-#: ../src/common/stockitem.cpp:121
+#: ../src/common/stockitem.cpp:159
 msgid "&Find"
 msgstr "&Finn"
 
-#: ../src/generic/wizard.cpp:660
+#: ../src/generic/wizard.cpp:626
 msgid "&Finish"
-msgstr "&Fullfør"
+msgstr "&Fullfør"
+
+#: ../src/common/stockitem.cpp:160
+#, fuzzy
+msgid "&First"
+msgstr "først"
 
-#: ../src/generic/fontdlgg.cpp:373
+#: ../src/richtext/richtextsizepage.cpp:196
+msgid "&Floating mode:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:161
+#, fuzzy
+msgid "&Floppy"
+msgstr "&Kopier"
+
+#: ../src/common/stockitem.cpp:195
+#, fuzzy
+msgid "&Font"
+msgstr "&Skriftfamilie:"
+
+#: ../src/generic/fontdlgg.cpp:372
 msgid "&Font family:"
 msgstr "&Skriftfamilie:"
 
-#: ../src/richtext/richtextliststylepage.cpp:193
+#: ../src/richtext/richtextliststylepage.cpp:195
 msgid "&Font for Level..."
 msgstr ""
 
-#: ../src/richtext/richtextsymboldlg.cpp:393
-#: ../src/richtext/richtextfontpage.cpp:134
+#: ../src/richtext/richtextfontpage.cpp:144
+#: ../src/richtext/richtextsymboldlg.cpp:397
 #, fuzzy
 msgid "&Font:"
 msgstr "&Skriftfamilie:"
 
-#: ../src/common/stockitem.cpp:126
+#: ../src/common/stockitem.cpp:162
 msgid "&Forward"
 msgstr "&Fremover"
 
-#: ../src/richtext/richtextsymboldlg.cpp:444
+#: ../src/richtext/richtextsymboldlg.cpp:448
 #, fuzzy
 msgid "&From:"
 msgstr "Fra:"
 
-#: ../src/common/prntbase.cpp:1161
-msgid "&Goto..."
-msgstr "&Gå til"
+#: ../src/common/stockitem.cpp:163
+msgid "&Harddisk"
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:255
+#, fuzzy
+msgid "&Height:"
+msgstr "&Vekt:"
 
-#: ../src/common/stockitem.cpp:128 ../src/html/helpfrm.cpp:135
-#: ../src/generic/wizard.cpp:454 ../src/generic/wizard.cpp:461
-#: ../src/mac/carbon/menu.cpp:772
+#: ../src/generic/wizard.cpp:435 ../src/richtext/richtextstyledlg.cpp:307
+#: ../src/richtext/richtextsymboldlg.cpp:476 ../src/osx/menu_osx.cpp:685
+#: ../src/common/stockitem.cpp:164 ../src/html/helpfrm.cpp:148
 msgid "&Help"
 msgstr "&Hjelp"
 
-#: ../src/common/stockitem.cpp:129
+#: ../include/wx/richmsgdlg.h:31
+#, fuzzy
+msgid "&Hide details"
+msgstr "&detaljer"
+
+#: ../src/common/stockitem.cpp:165
 msgid "&Home"
 msgstr "&Hjem"
 
-#: ../src/richtext/richtextliststylepage.cpp:371
-#: ../src/richtext/richtextindentspage.cpp:194
+#: ../src/richtext/richtextindentspage.cpp:197
+#: ../src/richtext/richtextliststylepage.cpp:373
 msgid "&Indentation (tenths of a mm)"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:355
-#: ../src/richtext/richtextindentspage.cpp:177
+#: ../src/richtext/richtextindentspage.cpp:180
+#: ../src/richtext/richtextliststylepage.cpp:357
 #, fuzzy
 msgid "&Indeterminate"
 msgstr "&Strek under"
 
-#: ../src/common/stockitem.cpp:131
+#: ../src/common/stockitem.cpp:167
 msgid "&Index"
 msgstr "&Indeks"
 
-#: ../src/common/stockitem.cpp:132
+#: ../src/common/stockitem.cpp:168
+#, fuzzy
+msgid "&Info"
+msgstr "&Angre"
+
+#: ../src/common/stockitem.cpp:169
 msgid "&Italic"
 msgstr "&Kursiv"
 
-#: ../src/richtext/richtextliststylepage.cpp:341
-#: ../src/richtext/richtextindentspage.cpp:163
+#: ../src/common/stockitem.cpp:170
+msgid "&Jump to"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:166
+#: ../src/richtext/richtextliststylepage.cpp:343
 #, fuzzy
 msgid "&Justified"
 msgstr "Justert"
 
-#: ../src/richtext/richtextliststylepage.cpp:327
-#: ../src/richtext/richtextindentspage.cpp:149
+#: ../src/common/stockitem.cpp:175
+#, fuzzy
+msgid "&Last"
+msgstr "&Lim inn"
+
+#: ../src/richtext/richtextindentspage.cpp:152
+#: ../src/richtext/richtextliststylepage.cpp:329
 msgid "&Left"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:380
-#: ../src/richtext/richtextindentspage.cpp:205
+#: ../src/richtext/richtextindentspage.cpp:208
+#: ../src/richtext/richtextborderspage.cpp:269
+#: ../src/richtext/richtextborderspage.cpp:413
+#: ../src/richtext/richtextliststylepage.cpp:382
+#: ../src/richtext/richtextmarginspage.cpp:187
+#: ../src/richtext/richtextmarginspage.cpp:301
 msgid "&Left:"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:182
+#: ../src/richtext/richtextliststylepage.cpp:184
 msgid "&List level:"
 msgstr ""
 
-#: ../src/generic/logg.cpp:540
+#: ../src/generic/logg.cpp:525
 msgid "&Log"
 msgstr "&Logg"
 
-#: ../src/univ/themes/win32.cpp:3734
+#: ../src/univ/themes/win32.cpp:3751
 msgid "&Move"
 msgstr "&Flytt"
 
-#: ../src/common/stockitem.cpp:137 ../src/richtext/richtexttabspage.cpp:136
+#: ../src/richtext/richtextsizepage.cpp:477
+msgid "&Move the object to:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:176
+#, fuzzy
+msgid "&Network"
+msgstr "&Ny"
+
+#: ../src/richtext/richtexttabspage.cpp:137 ../src/common/stockitem.cpp:177
 msgid "&New"
 msgstr "&Ny"
 
-#: ../src/aui/tabmdi.cpp:108 ../src/generic/mdig.cpp:118
-#: ../src/msw/mdi.cpp:172
+#: ../src/aui/tabmdi.cpp:108 ../src/generic/mdig.cpp:101
+#: ../src/msw/mdi.cpp:169
 msgid "&Next"
 msgstr "&Neste"
 
-#: ../src/generic/wizard.cpp:457 ../src/generic/wizard.cpp:658
+#: ../src/generic/wizard.cpp:431 ../src/generic/wizard.cpp:626
 msgid "&Next >"
 msgstr "&Neste >"
 
-#: ../src/generic/tipdlg.cpp:274
+#: ../src/richtext/richtextsizepage.cpp:486
+msgid "&Next Paragraph"
+msgstr ""
+
+#: ../src/generic/tipdlg.cpp:277
 msgid "&Next Tip"
 msgstr "&Neste tips"
 
-#: ../src/richtext/richtextstylepage.cpp:122
+#: ../src/richtext/richtextstylepage.cpp:124
 #, fuzzy
 msgid "&Next style:"
 msgstr "&Neste >"
 
-#: ../src/common/stockitem.cpp:138
+#: ../src/common/stockitem.cpp:178 ../src/msw/msgdlg.cpp:476
 msgid "&No"
 msgstr "&Nei"
 
-#: ../src/generic/dbgrptg.cpp:352
+#: ../src/generic/dbgrptg.cpp:353
 msgid "&Notes:"
 msgstr "&Notater:"
 
-#: ../src/richtext/richtextbulletspage.cpp:262
+#: ../src/richtext/richtextbulletspage.cpp:265
 msgid "&Number:"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:139 ../src/generic/fontdlgg.cpp:477
-#: ../src/generic/fontdlgg.cpp:484 ../src/mac/carbon/fontdlg.cpp:570
+#: ../src/generic/fontdlgg.cpp:476 ../src/generic/fontdlgg.cpp:483
+#: ../src/osx/carbon/fontdlg.cpp:592 ../src/common/stockitem.cpp:179
 msgid "&OK"
 msgstr "&OK"
 
-#: ../src/common/stockitem.cpp:140 ../src/html/helpfrm.cpp:125
+#: ../src/generic/dbgrptg.cpp:339 ../src/common/stockitem.cpp:180
+#: ../src/html/helpfrm.cpp:138
 msgid "&Open..."
-msgstr "&Åpne..."
+msgstr "&Åpne..."
 
-#: ../src/richtext/richtextindentspage.cpp:241
+#: ../src/richtext/richtextindentspage.cpp:235
 msgid "&Outline level:"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:141 ../src/richtext/richtextctrl.cpp:2597
-#: ../src/msw/textctrl.cpp:2153 ../src/mac/carbon/textctrl.cpp:1066
+#: ../src/richtext/richtextindentspage.cpp:318
+msgid "&Page Break"
+msgstr ""
+
+#: ../src/richtext/richtextctrl.cpp:327 ../src/osx/textctrl_osx.cpp:585
+#: ../src/common/stockitem.cpp:181 ../src/msw/textctrl.cpp:2224
 msgid "&Paste"
 msgstr "&Lim inn"
 
-#: ../src/generic/fontdlgg.cpp:424
+#: ../include/wx/richtext/richtextbuffer.h:4051
+msgid "&Picture"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:423
 msgid "&Point size:"
-msgstr "&Punktstørrelse"
+msgstr "&Punktstørrelse"
 
-#: ../src/richtext/richtexttabspage.cpp:113
+#: ../src/richtext/richtexttabspage.cpp:115
 msgid "&Position (tenths of a mm):"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:142
+#: ../src/common/stockitem.cpp:182
 msgid "&Preferences"
 msgstr "&Innstillinger"
 
-#: ../src/aui/tabmdi.cpp:109 ../src/generic/mdig.cpp:119
-#: ../src/msw/mdi.cpp:173
+#: ../src/common/stockitem.cpp:183
+#, fuzzy
+msgid "&Preview..."
+msgstr "Forhåndsvisning"
+
+#: ../src/aui/tabmdi.cpp:109 ../src/generic/mdig.cpp:102
+#: ../src/msw/mdi.cpp:170
 msgid "&Previous"
 msgstr "&Forrige"
 
-#: ../src/common/prntbase.cpp:1120 ../src/common/stockitem.cpp:143
+#: ../src/richtext/richtextsizepage.cpp:480
+#, fuzzy
+msgid "&Previous Paragraph"
+msgstr "Forrige side"
+
+#: ../src/common/stockitem.cpp:184
 msgid "&Print..."
 msgstr "&Skriv ut..."
 
-#: ../src/common/stockitem.cpp:145
+#: ../src/richtext/richtextctrl.cpp:332 ../src/richtext/richtextctrl.cpp:4730
+#: ../src/common/stockitem.cpp:185
 msgid "&Properties"
 msgstr "&Egenskaper"
 
-#: ../src/common/stockitem.cpp:146
+#: ../src/common/stockitem.cpp:157
 msgid "&Quit"
 msgstr "&Slutt"
 
-#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:295
-#: ../src/common/stockitem.cpp:147 ../src/richtext/richtextctrl.cpp:2593
-#: ../src/msw/textctrl.cpp:2149 ../src/mac/carbon/textctrl.cpp:1062
+#: ../src/richtext/richtextctrl.cpp:323 ../src/osx/textctrl_osx.cpp:581
+#: ../src/common/stockitem.cpp:186 ../src/common/cmdproc.cpp:294
+#: ../src/common/cmdproc.cpp:301 ../src/msw/textctrl.cpp:2220
 msgid "&Redo"
 msgstr "&Gjenta"
 
-#: ../src/common/cmdproc.cpp:284 ../src/common/cmdproc.cpp:304
+#: ../src/common/cmdproc.cpp:290 ../src/common/cmdproc.cpp:310
 msgid "&Redo "
 msgstr "&Gjenta"
 
-#: ../src/richtext/richtextstyledlg.cpp:243
+#: ../src/richtext/richtextstyledlg.cpp:261
 msgid "&Rename Style..."
 msgstr ""
 
@@ -477,230 +592,350 @@ msgstr ""
 msgid "&Replace"
 msgstr "&Erstatt"
 
-#: ../src/richtext/richtextstyledlg.cpp:273
+#: ../src/richtext/richtextstyledlg.cpp:291
 msgid "&Restart numbering"
 msgstr ""
 
-#: ../src/univ/themes/win32.cpp:3733
+#: ../src/univ/themes/win32.cpp:3750
 msgid "&Restore"
 msgstr "&Gjenopprett"
 
-#: ../src/richtext/richtextliststylepage.cpp:334
-#: ../src/richtext/richtextindentspage.cpp:156
+#: ../src/richtext/richtextindentspage.cpp:159
+#: ../src/richtext/richtextliststylepage.cpp:336
 #, fuzzy
 msgid "&Right"
 msgstr "Lett"
 
-#: ../src/richtext/richtextliststylepage.cpp:402
-#: ../src/richtext/richtextindentspage.cpp:229
+#: ../src/richtext/richtextindentspage.cpp:226
+#: ../src/richtext/richtextborderspage.cpp:299
+#: ../src/richtext/richtextborderspage.cpp:443
+#: ../src/richtext/richtextliststylepage.cpp:400
+#: ../src/richtext/richtextmarginspage.cpp:212
+#: ../src/richtext/richtextmarginspage.cpp:326
 #, fuzzy
 msgid "&Right:"
 msgstr "&Vekt:"
 
-#: ../src/common/stockitem.cpp:151
+#: ../src/common/stockitem.cpp:191
 msgid "&Save"
 msgstr "&Lagre"
 
-#: ../src/generic/logg.cpp:535
-msgid "&Save..."
-msgstr "&Lagre..."
+#: ../src/common/stockitem.cpp:192
+#, fuzzy
+msgid "&Save as"
+msgstr "Lagre Som"
+
+#: ../include/wx/richmsgdlg.h:30
+#, fuzzy
+msgid "&See details"
+msgstr "&detaljer"
 
-#: ../src/generic/tipdlg.cpp:268
+#: ../src/generic/tipdlg.cpp:271
 msgid "&Show tips at startup"
 msgstr "&Vis tips ved oppstart"
 
-#: ../src/univ/themes/win32.cpp:3736
+#: ../src/univ/themes/win32.cpp:3753
 msgid "&Size"
-msgstr "&Størrelse"
+msgstr "&Størrelse"
 
-#: ../src/richtext/richtextfontpage.cpp:152
+#: ../src/richtext/richtextfontpage.cpp:162
 #, fuzzy
 msgid "&Size:"
-msgstr "&Størrelse"
+msgstr "&Størrelse"
 
-#: ../src/generic/progdlgg.cpp:246
+#: ../src/generic/progdlgg.cpp:283
 #, fuzzy
 msgid "&Skip"
 msgstr "Hopp over"
 
-#: ../src/richtext/richtextliststylepage.cpp:422
-#: ../src/richtext/richtextindentspage.cpp:272
+#: ../src/richtext/richtextindentspage.cpp:267
+#: ../src/richtext/richtextliststylepage.cpp:418
 msgid "&Spacing (tenths of a mm)"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:154
+#: ../src/common/stockitem.cpp:198
+msgid "&Spell Check"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:199
 msgid "&Stop"
 msgstr "&Stopp"
 
-#: ../src/richtext/richtextfontpage.cpp:225
+#: ../src/richtext/richtextfontpage.cpp:251 ../src/common/stockitem.cpp:200
 msgid "&Strikethrough"
 msgstr ""
 
-#: ../src/richtext/richtextstylepage.cpp:103 ../src/generic/fontdlgg.cpp:384
+#: ../src/generic/fontdlgg.cpp:383 ../src/richtext/richtextstylepage.cpp:105
 msgid "&Style:"
 msgstr "&Stil:"
 
-#: ../src/richtext/richtextstyledlg.cpp:190
+#: ../src/richtext/richtextstyledlg.cpp:202
 #, fuzzy
 msgid "&Styles:"
 msgstr "&Stil:"
 
-#: ../src/richtext/richtextsymboldlg.cpp:406
+#: ../src/richtext/richtextsymboldlg.cpp:410
 msgid "&Subset:"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:267
-#: ../src/richtext/richtextbulletspage.cpp:217
+#: ../src/richtext/richtextliststylepage.cpp:269
+#: ../src/richtext/richtextbulletspage.cpp:223
 #, fuzzy
 msgid "&Symbol:"
 msgstr "&Stil:"
 
-#: ../src/common/stockitem.cpp:156 ../src/generic/fontdlgg.cpp:446
+#: ../include/wx/richtext/richtextbuffer.h:4952
+msgid "&Table"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:201
+#, fuzzy
+msgid "&Top"
+msgstr "&Kopier"
+
+#: ../src/richtext/richtextborderspage.cpp:329
+#: ../src/richtext/richtextborderspage.cpp:473
+#: ../src/richtext/richtextmarginspage.cpp:235
+#: ../src/richtext/richtextmarginspage.cpp:349
+#, fuzzy
+msgid "&Top:"
+msgstr "Til:"
+
+#: ../src/generic/fontdlgg.cpp:445 ../src/common/stockitem.cpp:203
 msgid "&Underline"
 msgstr "&Strek under"
 
-#: ../src/richtext/richtextfontpage.cpp:200
+#: ../src/richtext/richtextfontpage.cpp:210
 #, fuzzy
 msgid "&Underlining:"
 msgstr "&Strek under"
 
-#: ../src/common/cmdproc.cpp:266 ../src/common/stockitem.cpp:157
-#: ../src/richtext/richtextctrl.cpp:2592 ../src/msw/textctrl.cpp:2148
-#: ../src/mac/carbon/textctrl.cpp:1061
+#: ../src/richtext/richtextctrl.cpp:322 ../src/osx/textctrl_osx.cpp:580
+#: ../src/common/stockitem.cpp:204 ../src/common/cmdproc.cpp:272
+#: ../src/msw/textctrl.cpp:2219
 msgid "&Undo"
 msgstr "&Angre"
 
-#: ../src/common/cmdproc.cpp:260
+#: ../src/common/cmdproc.cpp:266
 msgid "&Undo "
 msgstr "&Angre"
 
-#: ../src/common/stockitem.cpp:158
+#: ../src/common/stockitem.cpp:205
 msgid "&Unindent"
 msgstr "&Fjern innrykk"
 
-#: ../src/common/stockitem.cpp:127
+#: ../src/common/stockitem.cpp:206
 msgid "&Up"
 msgstr "&Opp"
 
-#: ../src/generic/fontdlgg.cpp:395
+#: ../src/richtext/richtextsizepage.cpp:408
+#, fuzzy
+msgid "&Vertical alignment:"
+msgstr "Venstrejustering"
+
+#: ../src/generic/dbgrptg.cpp:337
+#, fuzzy
+msgid "&View..."
+msgstr "&Åpne..."
+
+#: ../src/generic/fontdlgg.cpp:394
 msgid "&Weight:"
 msgstr "&Vekt:"
 
+#: ../src/richtext/richtextsizepage.cpp:228
+#, fuzzy
+msgid "&Width:"
+msgstr "&Vekt:"
+
 #: ../src/aui/tabmdi.cpp:301 ../src/aui/tabmdi.cpp:317
-#: ../src/aui/tabmdi.cpp:319 ../src/generic/mdig.cpp:298
-#: ../src/generic/mdig.cpp:314 ../src/generic/mdig.cpp:318
-#: ../src/msw/mdi.cpp:1429 ../src/msw/mdi.cpp:1437 ../src/msw/mdi.cpp:1467
+#: ../src/aui/tabmdi.cpp:319 ../src/generic/mdig.cpp:295
+#: ../src/generic/mdig.cpp:311 ../src/generic/mdig.cpp:315
+#: ../src/msw/mdi.cpp:70
 msgid "&Window"
 msgstr "&Vindu"
 
-#: ../src/common/stockitem.cpp:159
+#: ../src/common/stockitem.cpp:207 ../src/msw/msgdlg.cpp:476
 msgid "&Yes"
 msgstr "&Ja"
 
-#: ../src/common/config.cpp:482 ../src/msw/regconf.cpp:259
+#: ../src/common/fontcmn.cpp:845
+msgid "'"
+msgstr ""
+
+#: ../src/common/config.cpp:524 ../src/msw/regconf.cpp:259
 #, c-format
 msgid "'%s' has extra '..', ignored."
-msgstr "«%s» har ekstra «..», ignorert."
+msgstr "«%s» har ekstra «..», ignorert."
 
-#: ../src/common/valtext.cpp:147 ../src/common/valtext.cpp:177
-#: ../src/common/valtext.cpp:183
+#: ../src/common/valtext.cpp:250 ../src/common/valtext.cpp:252
+#: ../src/common/valtext.cpp:254 ../src/common/valtext.cpp:256
 #, c-format
 msgid "'%s' is invalid"
-msgstr "«%s» er ugyldig"
+msgstr "«%s» er ugyldig"
 
-#: ../src/common/cmdline.cpp:820 ../src/common/cmdline.cpp:838
+#: ../src/common/cmdline.cpp:941 ../src/common/cmdline.cpp:959
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
-msgstr "«%s» er ikke en gyldig numerisk verdi for valg «%s»."
+msgstr "«%s» er ikke en gyldig numerisk verdi for valg «%s»."
 
-#: ../src/common/intl.cpp:1283
+#: ../src/common/translation.cpp:930
 #, c-format
 msgid "'%s' is not a valid message catalog."
-msgstr "«%s» er ikke en gyldig meldingskatalog."
+msgstr "«%s» er ikke en gyldig meldingskatalog."
 
 #: ../src/common/textbuf.cpp:245
 #, c-format
 msgid "'%s' is probably a binary buffer."
-msgstr "«%s» er sannsynligvis en binær buffer."
+msgstr "«%s» er sannsynligvis en binær buffer."
 
-#: ../src/common/valtext.cpp:172
+#: ../src/common/valtext.cpp:248
 #, c-format
 msgid "'%s' should be numeric."
-msgstr "«%s» skal være numerisk."
+msgstr "«%s» skal være numerisk."
 
-#: ../src/common/valtext.cpp:154
+#: ../src/common/valtext.cpp:240
 #, c-format
 msgid "'%s' should only contain ASCII characters."
-msgstr "«%s» må kun inneholde ASCII-tegn."
+msgstr "«%s» må kun inneholde ASCII-tegn."
 
-#: ../src/common/valtext.cpp:160
+#: ../src/common/valtext.cpp:242
 #, c-format
 msgid "'%s' should only contain alphabetic characters."
-msgstr "«%s» må kun inneholde bokstaver."
+msgstr "«%s» må kun inneholde bokstaver."
 
-#: ../src/common/valtext.cpp:166
+#: ../src/common/valtext.cpp:244
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
-msgstr "«%s» må kun inneholde bokstaver eller tall."
+msgstr "«%s» må kun inneholde bokstaver eller tall."
 
-#: ../src/richtext/richtextliststylepage.cpp:228
-#: ../src/richtext/richtextbulletspage.cpp:177
+#: ../src/common/valtext.cpp:246
+#, fuzzy, c-format
+msgid "'%s' should only contain digits."
+msgstr "«%s» må kun inneholde ASCII-tegn."
+
+#: ../src/richtext/richtextliststylepage.cpp:230
+#: ../src/richtext/richtextbulletspage.cpp:180
 msgid "(*)"
 msgstr ""
 
-#: ../src/html/htmlhelp.cpp:638 ../src/html/helpwnd.cpp:982
+#: ../src/html/helpwnd.cpp:979
 msgid "(Help)"
 msgstr "(Hjelp)"
 
-#: ../src/richtext/richtextliststylepage.cpp:483
-#: ../src/richtext/richtextbulletspage.cpp:281
+#: ../src/richtext/richtextliststylepage.cpp:482
+#: ../src/richtext/richtextbulletspage.cpp:287
 msgid "(None)"
 msgstr ""
 
-#: ../src/richtext/richtextsymboldlg.cpp:493
+#: ../src/richtext/richtextsymboldlg.cpp:501
 #, fuzzy
 msgid "(Normal text)"
 msgstr "Normal skrift:"
 
-#: ../src/html/helpwnd.cpp:412 ../src/html/helpwnd.cpp:1118
-#: ../src/html/helpwnd.cpp:1746
+#: ../src/html/helpwnd.cpp:424 ../src/html/helpwnd.cpp:1116
+#: ../src/html/helpwnd.cpp:1752
 msgid "(bookmarks)"
 msgstr "(bokmerker)"
 
-#: ../src/richtext/richtextformatdlg.cpp:630
+#: ../src/richtext/richtextindentspage.cpp:239
+#: ../src/richtext/richtextindentspage.cpp:250
+#: ../src/richtext/richtextindentspage.cpp:251
+#: ../src/richtext/richtextindentspage.cpp:299
+#: ../src/richtext/richtextindentspage.cpp:311
+#: ../src/richtext/richtextindentspage.cpp:312
+#: ../src/richtext/richtextformatdlg.cpp:824
+#: ../src/richtext/richtextfontpage.cpp:291
+#: ../src/richtext/richtextfontpage.cpp:295
+#: ../src/richtext/richtextfontpage.cpp:299
+#: ../src/richtext/richtextliststylepage.cpp:449
+#: ../src/richtext/richtextliststylepage.cpp:461
+#: ../src/richtext/richtextliststylepage.cpp:462
 #, fuzzy
 msgid "(none)"
 msgstr "ikke navn"
 
-#: ../src/richtext/richtextliststylepage.cpp:494
-#: ../src/richtext/richtextbulletspage.cpp:292
+#: ../src/richtext/richtextliststylepage.cpp:493
+#: ../src/richtext/richtextbulletspage.cpp:298
 msgid "*"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:235
-#: ../src/richtext/richtextbulletspage.cpp:184
+#: ../src/richtext/richtextliststylepage.cpp:237
+#: ../src/richtext/richtextbulletspage.cpp:187
 msgid "*)"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:497
-#: ../src/richtext/richtextbulletspage.cpp:295
+#: ../src/richtext/richtextliststylepage.cpp:496
+#: ../src/richtext/richtextbulletspage.cpp:301
 msgid "+"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:495
-#: ../src/richtext/richtextbulletspage.cpp:293
+#: ../src/msw/utils.cpp:1332
+msgid ", 64-bit edition"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:494
+#: ../src/richtext/richtextbulletspage.cpp:299
 msgid "-"
 msgstr ""
 
-#: ../src/richtext/richtextindentspage.cpp:246
+#: ../src/generic/filepickerg.cpp:67
+#, fuzzy
+msgid "..."
+msgstr ".."
+
+#: ../src/richtext/richtextindentspage.cpp:240
 msgid "1"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:460
-#: ../src/richtext/richtextindentspage.cpp:315
+#: ../src/richtext/richtextindentspage.cpp:301
+#: ../src/richtext/richtextliststylepage.cpp:451
+msgid "1.1"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:302
+#: ../src/richtext/richtextliststylepage.cpp:452
+msgid "1.2"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:303
+#: ../src/richtext/richtextliststylepage.cpp:453
+msgid "1.3"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:304
+#: ../src/richtext/richtextliststylepage.cpp:454
+msgid "1.4"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:305
+#: ../src/richtext/richtextliststylepage.cpp:455
 msgid "1.5"
 msgstr ""
 
+#: ../src/richtext/richtextindentspage.cpp:306
+#: ../src/richtext/richtextliststylepage.cpp:456
+msgid "1.6"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:307
+#: ../src/richtext/richtextliststylepage.cpp:457
+msgid "1.7"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:308
+#: ../src/richtext/richtextliststylepage.cpp:458
+msgid "1.8"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:309
+#: ../src/richtext/richtextliststylepage.cpp:459
+msgid "1.9"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:249
+msgid "10"
+msgstr ""
+
 #: ../src/common/paper.cpp:142
 #, fuzzy
 msgid "10 x 11 in"
@@ -724,25 +959,25 @@ msgstr "10 x 14 tommer"
 msgid "15 x 11 in"
 msgstr "10 x 14 tommer"
 
-#: ../src/richtext/richtextliststylepage.cpp:461
-#: ../src/richtext/richtextindentspage.cpp:247
-#: ../src/richtext/richtextindentspage.cpp:316
+#: ../src/richtext/richtextindentspage.cpp:241
+#: ../src/richtext/richtextindentspage.cpp:310
+#: ../src/richtext/richtextliststylepage.cpp:460
 msgid "2"
 msgstr ""
 
-#: ../src/richtext/richtextindentspage.cpp:248
+#: ../src/richtext/richtextindentspage.cpp:242
 msgid "3"
 msgstr ""
 
-#: ../src/richtext/richtextindentspage.cpp:249
+#: ../src/richtext/richtextindentspage.cpp:243
 msgid "4"
 msgstr ""
 
-#: ../src/richtext/richtextindentspage.cpp:250
+#: ../src/richtext/richtextindentspage.cpp:244
 msgid "5"
 msgstr ""
 
-#: ../src/richtext/richtextindentspage.cpp:251
+#: ../src/richtext/richtextindentspage.cpp:245
 msgid "6"
 msgstr ""
 
@@ -750,15 +985,15 @@ msgstr ""
 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
 msgstr "6 3/4 konvolutt, 3 5/8 x 6 1/2 tommer"
 
-#: ../src/richtext/richtextindentspage.cpp:252
+#: ../src/richtext/richtextindentspage.cpp:246
 msgid "7"
 msgstr ""
 
-#: ../src/richtext/richtextindentspage.cpp:253
+#: ../src/richtext/richtextindentspage.cpp:247
 msgid "8"
 msgstr ""
 
-#: ../src/richtext/richtextindentspage.cpp:254
+#: ../src/richtext/richtextindentspage.cpp:248
 msgid "9"
 msgstr ""
 
@@ -767,128 +1002,126 @@ msgstr ""
 msgid "9 x 11 in"
 msgstr "11 x 17 tommer"
 
-#: ../src/html/htmprint.cpp:303
+#: ../src/html/htmprint.cpp:432
 msgid ": file does not exist!"
 msgstr ": filen eksisterer ikke!"
 
-#: ../src/common/fontmap.cpp:197
+#: ../src/common/fontmap.cpp:198
 msgid ": unknown charset"
 msgstr ": ukjent tegnsett"
 
-#: ../src/common/fontmap.cpp:411
+#: ../src/common/fontmap.cpp:412
 msgid ": unknown encoding"
 msgstr ": ukjent koding"
 
-#: ../src/generic/wizard.cpp:463
+#: ../src/generic/wizard.cpp:437
 msgid "< &Back"
 msgstr "< &Tilbake"
 
-#: ../src/common/prntbase.cpp:1143
-msgid "<<"
-msgstr "<<"
-
-#: ../src/mac/carbon/fontdlg.cpp:584 ../src/mac/carbon/fontdlg.cpp:791
-#: ../src/mac/carbon/fontdlg.cpp:811
+#: ../src/osx/carbon/fontdlg.cpp:606 ../src/osx/carbon/fontdlg.cpp:813
+#: ../src/osx/carbon/fontdlg.cpp:833
 #, fuzzy
 msgid "<Any Decorative>"
 msgstr "Dekorativ"
 
-#: ../src/mac/carbon/fontdlg.cpp:585 ../src/mac/carbon/fontdlg.cpp:793
-#: ../src/mac/carbon/fontdlg.cpp:813
+#: ../src/osx/carbon/fontdlg.cpp:607 ../src/osx/carbon/fontdlg.cpp:815
+#: ../src/osx/carbon/fontdlg.cpp:835
 #, fuzzy
 msgid "<Any Modern>"
 msgstr "Moderne"
 
-#: ../src/mac/carbon/fontdlg.cpp:583 ../src/mac/carbon/fontdlg.cpp:789
-#: ../src/mac/carbon/fontdlg.cpp:809
+#: ../src/osx/carbon/fontdlg.cpp:605 ../src/osx/carbon/fontdlg.cpp:811
+#: ../src/osx/carbon/fontdlg.cpp:831
 #, fuzzy
 msgid "<Any Roman>"
 msgstr "Roman"
 
-#: ../src/mac/carbon/fontdlg.cpp:586 ../src/mac/carbon/fontdlg.cpp:795
-#: ../src/mac/carbon/fontdlg.cpp:815
+#: ../src/osx/carbon/fontdlg.cpp:608 ../src/osx/carbon/fontdlg.cpp:817
+#: ../src/osx/carbon/fontdlg.cpp:837
 #, fuzzy
 msgid "<Any Script>"
 msgstr "Skript"
 
-#: ../src/mac/carbon/fontdlg.cpp:587 ../src/mac/carbon/fontdlg.cpp:800
-#: ../src/mac/carbon/fontdlg.cpp:819
+#: ../src/osx/carbon/fontdlg.cpp:609 ../src/osx/carbon/fontdlg.cpp:822
+#: ../src/osx/carbon/fontdlg.cpp:841
 #, fuzzy
 msgid "<Any Swiss>"
 msgstr "Swiss"
 
-#: ../src/mac/carbon/fontdlg.cpp:588 ../src/mac/carbon/fontdlg.cpp:797
-#: ../src/mac/carbon/fontdlg.cpp:817
+#: ../src/osx/carbon/fontdlg.cpp:610 ../src/osx/carbon/fontdlg.cpp:819
+#: ../src/osx/carbon/fontdlg.cpp:839
 #, fuzzy
 msgid "<Any Teletype>"
 msgstr "Teletype"
 
-#: ../src/mac/carbon/fontdlg.cpp:582
+#: ../src/osx/carbon/fontdlg.cpp:604
 msgid "<Any>"
 msgstr ""
 
-#: ../src/generic/filectrlg.cpp:285 ../src/generic/filectrlg.cpp:308
+#: ../src/generic/filectrlg.cpp:280 ../src/generic/filectrlg.cpp:303
 msgid "<DIR>"
 msgstr "<MAPPE>"
 
-#: ../src/generic/filectrlg.cpp:289 ../src/generic/filectrlg.cpp:312
+#: ../src/generic/filectrlg.cpp:284 ../src/generic/filectrlg.cpp:307
 msgid "<DRIVE>"
 msgstr "<LAGERENHET>"
 
-#: ../src/generic/filectrlg.cpp:287 ../src/generic/filectrlg.cpp:310
+#: ../src/generic/filectrlg.cpp:282 ../src/generic/filectrlg.cpp:305
 msgid "<LINK>"
 msgstr "<LENKE>"
 
-#: ../src/html/helpwnd.cpp:1274
+#: ../src/html/helpwnd.cpp:1276
 msgid "<b><i>Bold italic face.</i></b><br>"
 msgstr "<b><i>Fet kursiv skrift.</i></b><br>"
 
-#: ../src/html/helpwnd.cpp:1278
+#: ../src/html/helpwnd.cpp:1280
 msgid "<b><i>bold italic <u>underlined</u></i></b><br>"
 msgstr "<b><i>fet kursiv <u>understreket</u></i></b><br>"
 
-#: ../src/html/helpwnd.cpp:1273
+#: ../src/html/helpwnd.cpp:1275
 msgid "<b>Bold face.</b> "
 msgstr "<b>Fet skrift.</b> "
 
-#: ../src/html/helpwnd.cpp:1272
+#: ../src/html/helpwnd.cpp:1274
 msgid "<i>Italic face.</i> "
 msgstr "<i>Kursiv skrift.</i> "
 
-#: ../src/richtext/richtextliststylepage.cpp:496
-#: ../src/richtext/richtextbulletspage.cpp:294
+#: ../src/richtext/richtextliststylepage.cpp:495
+#: ../src/richtext/richtextbulletspage.cpp:300
 #, fuzzy
 msgid ">"
 msgstr ">>"
 
-#: ../src/common/prntbase.cpp:1149
-msgid ">>"
-msgstr ">>"
-
-#: ../src/common/prntbase.cpp:1155
-msgid ">>|"
-msgstr ">>|"
-
-#: ../src/generic/dbgrptg.cpp:314
+#: ../src/generic/dbgrptg.cpp:315
 msgid "A debug report has been generated in the directory\n"
-msgstr "En feilsøkingsrapport har generert i mappen\n"
+msgstr "En feilsøkingsrapport har generert i mappen\n"
 
-#: ../src/common/debugrpt.cpp:565
+#: ../src/common/debugrpt.cpp:569
 #, fuzzy
 msgid "A debug report has been generated. It can be found in"
-msgstr "En feilsøkingsrapport har generert i mappen\n"
+msgstr "En feilsøkingsrapport har generert i mappen\n"
 
-#: ../src/common/xtixml.cpp:406
+#: ../src/common/xtixml.cpp:419
 msgid "A non empty collection must consist of 'element' nodes"
-msgstr "En ikke-tom mengde må bestå av «element»-noder"
+msgstr "En ikke-tom mengde må bestå av «element»-noder"
 
-#: ../src/richtext/richtextliststylepage.cpp:303
 #: ../src/richtext/richtextliststylepage.cpp:305
-#: ../src/richtext/richtextbulletspage.cpp:255
-#: ../src/richtext/richtextbulletspage.cpp:257
+#: ../src/richtext/richtextliststylepage.cpp:307
+#: ../src/richtext/richtextbulletspage.cpp:258
+#: ../src/richtext/richtextbulletspage.cpp:260
 msgid "A standard bullet name."
 msgstr ""
 
+#: ../src/common/paper.cpp:219
+#, fuzzy
+msgid "A0 sheet, 841 x 1189 mm"
+msgstr "A4-ark, 210 x 297 mm"
+
+#: ../src/common/paper.cpp:220
+#, fuzzy
+msgid "A1 sheet, 594 x 841 mm"
+msgstr "A3-ark, 297 x 420 mm"
+
 #: ../src/common/paper.cpp:161
 msgid "A2 420 x 594 mm"
 msgstr ""
@@ -942,7 +1175,7 @@ msgstr "A4-ark, 210 x 297 mm"
 
 #: ../src/common/paper.cpp:109
 msgid "A4 small sheet, 210 x 297 mm"
-msgstr "A4-ark (små), 210 x 297 mm "
+msgstr "A4-ark (små), 210 x 297 mm "
 
 #: ../src/common/paper.cpp:159
 #, fuzzy
@@ -972,140 +1205,176 @@ msgstr "10 x 14 tommer"
 msgid "A6 Rotated 148 x 105 mm"
 msgstr "A5-ark, 148 x 210 mm"
 
-#: ../src/richtext/richtextformatdlg.cpp:426 ../src/generic/fontdlgg.cpp:85
-#: ../src/mac/carbon/fontdlg.cpp:315
+#: ../src/generic/fontdlgg.cpp:84 ../src/richtext/richtextformatdlg.cpp:521
+#: ../src/osx/carbon/fontdlg.cpp:337
 msgid "ABCDEFGabcdefg12345"
 msgstr "ABCDEFGabcdefg12345"
 
-#: ../src/common/accelcmn.cpp:75
+#: ../src/common/accelcmn.cpp:77
 msgid "ADD"
 msgstr ""
 
-#: ../src/common/ftp.cpp:382 ../src/richtext/richtextsymboldlg.cpp:451
-#: ../src/richtext/richtextsymboldlg.cpp:453
-#: ../src/richtext/richtextsymboldlg.cpp:454
+#: ../src/richtext/richtextsymboldlg.cpp:455 ../src/common/ftp.cpp:408
 msgid "ASCII"
 msgstr "ASCII"
 
-#: ../src/generic/aboutdlgg.cpp:106
+#: ../src/osx/menu_osx.cpp:537 ../src/common/stockitem.cpp:140
 #, fuzzy
-msgid "About "
+msgid "About"
 msgstr "%Om"
 
-#: ../src/msw/aboutdlg.cpp:65
+#: ../src/generic/aboutdlgg.cpp:141 ../src/msw/aboutdlg.cpp:65
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "%Om"
 
-#: ../src/common/stockitem.cpp:111
+#: ../src/common/stockitem.cpp:208
+#, fuzzy
+msgid "Actual Size"
+msgstr "&Faktisk størrelse"
+
+#: ../src/common/stockitem.cpp:141
 msgid "Add"
 msgstr "Legg till"
 
-#: ../src/html/helpwnd.cpp:425
+#: ../src/html/helpwnd.cpp:437
 msgid "Add current page to bookmarks"
 msgstr "Legg til gjeldende side til bokmerkene"
 
-#: ../src/generic/colrdlgg.cpp:289
+#: ../src/generic/colrdlgg.cpp:290
 msgid "Add to custom colours"
 msgstr "Legg til selvvalgte farge"
 
-#: ../src/mac/carbon/dataview.cpp:220
-msgid "Added item is invalid."
-msgstr ""
+#: ../include/wx/xtiprop.h:260
+msgid "AddToPropertyCollection called on a generic accessor"
+msgstr "AddToPropertyCollection kalt på generisk aksessor"
+
+#: ../include/wx/xtiprop.h:198
+msgid "AddToPropertyCollection called w/o valid adder"
+msgstr "AddToPropertyCollection kalt uten gyldig tillegger"
 
-#: ../src/html/helpctrl.cpp:139
+#: ../src/html/helpctrl.cpp:148
 #, c-format
 msgid "Adding book %s"
 msgstr "Legger til bok %s"
 
-#: ../src/richtext/richtextliststylepage.cpp:442
+#: ../src/osx/carbon/dataview.cpp:1934
+msgid "Adding flavor TEXT failed"
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:1955
+msgid "Adding flavor utxt failed"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:436
 msgid "After a paragraph:"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:135
+#: ../src/common/stockitem.cpp:173
 msgid "Align Left"
 msgstr "Venstrejustering"
 
-#: ../src/common/stockitem.cpp:136
+#: ../src/common/stockitem.cpp:174
 msgid "Align Right"
-msgstr "Høyrejustering"
+msgstr "Høyrejustering"
+
+#: ../src/richtext/richtextsizepage.cpp:396
+#, fuzzy
+msgid "Alignment"
+msgstr "Venstrejustering"
 
 #: ../src/generic/prntdlgg.cpp:221
 msgid "All"
 msgstr "Alle"
 
-#: ../src/common/fldlgcmn.cpp:79 ../src/generic/filectrlg.cpp:1198
+#: ../src/generic/filectrlg.cpp:1195 ../src/common/fldlgcmn.cpp:90
 #, c-format
 msgid "All files (%s)|%s"
 msgstr "Alle filer (%s)|%s"
 
-#: ../include/wx/defs.h:2582
+#: ../include/wx/defs.h:2769
 msgid "All files (*)|*"
 msgstr "Alle filer (*)|*"
 
-#: ../src/html/helpwnd.cpp:1556
-msgid "All files (*.*)|*"
-msgstr "Alle filer (*.*)|*"
-
-#: ../include/wx/defs.h:2579
+#: ../include/wx/defs.h:2766
 msgid "All files (*.*)|*.*"
 msgstr "Alle filer (*.*)|*.*"
 
-#: ../src/richtext/richtextstyles.cpp:838
+#: ../src/richtext/richtextstyles.cpp:1032
 msgid "All styles"
 msgstr ""
 
-#: ../src/common/xtistrm.cpp:381
+#: ../src/propgrid/manager.cpp:1495
+msgid "Alphabetic Mode"
+msgstr ""
+
+#: ../src/common/xtistrm.cpp:430
 msgid "Already Registered Object passed to SetObjectClassInfo"
 msgstr "Allerede registrert objekt sendt til SetObjectClassInfo"
 
-#: ../src/unix/dialup.cpp:356
+#: ../src/unix/dialup.cpp:355
 msgid "Already dialling ISP."
 msgstr "Ringer allerede ISP."
 
-#: ../src/common/accelcmn.cpp:294
-msgid "Alt-"
+#: ../src/common/accelcmn.cpp:311 ../src/univ/themes/win32.cpp:3759
+msgid "Alt+"
 msgstr ""
 
-#: ../src/common/debugrpt.cpp:568
+#: ../src/common/debugrpt.cpp:572
 #, fuzzy
 msgid "And includes the following files:\n"
-msgstr "*** Og den inkluderer følgende filer:\n"
+msgstr "*** Og den inkluderer følgende filer:\n"
 
-#: ../src/generic/animateg.cpp:164
+#: ../src/generic/animateg.cpp:163
 #, fuzzy, c-format
 msgid "Animation file is not of type %ld."
 msgstr "Bildefil er ikke av type %d."
 
-#: ../src/generic/logg.cpp:1087
+#: ../src/generic/logg.cpp:1036
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
-msgstr "Tilføy logg til fil «%s» (velger du [Nei] overskrives filen)?"
+msgstr "Tilføy logg til fil «%s» (velger du [Nei] overskrives filen)?"
 
-#: ../src/richtext/richtextliststylepage.cpp:484
-#: ../src/richtext/richtextbulletspage.cpp:282
+#: ../src/osx/menu_osx.cpp:556 ../src/osx/menu_osx.cpp:564
+#, fuzzy
+msgid "Application"
+msgstr "Seksjoner"
+
+#: ../src/common/stockitem.cpp:142
+#, fuzzy
+msgid "Apply"
+msgstr "&Bruk"
+
+#: ../src/richtext/richtextliststylepage.cpp:483
+#: ../src/richtext/richtextbulletspage.cpp:288
 msgid "Arabic"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:113
+#: ../src/common/fmapbase.cpp:152
 msgid "Arabic (ISO-8859-6)"
 msgstr "Arabisk (ISO-8859-6)"
 
-#: ../src/html/chm.cpp:564
-msgid "Archive doesnt contain #SYSTEM file"
-msgstr "Arkivet ineholder ikke #SYSTEM fil"
+#: ../src/msw/ole/automtn.cpp:643
+#, fuzzy, c-format
+msgid "Argument %u not found."
+msgstr "katalogfil for domene «%s» ikke funnet."
 
-#: ../src/generic/aboutdlgg.cpp:150
+#: ../src/generic/aboutdlgg.cpp:185
 msgid "Artists"
 msgstr ""
 
-#: ../src/generic/filectrlg.cpp:467
+#: ../src/common/stockitem.cpp:196
+#, fuzzy
+msgid "Ascending"
+msgstr "leser"
+
+#: ../src/generic/filectrlg.cpp:462
 msgid "Attributes"
 msgstr "Atributter"
 
-#: ../src/richtext/richtextliststylepage.cpp:293
-#: ../src/richtext/richtextbulletspage.cpp:243
-#: ../src/richtext/richtextbulletspage.cpp:245
+#: ../src/richtext/richtextliststylepage.cpp:295
+#: ../src/richtext/richtextbulletspage.cpp:246
+#: ../src/richtext/richtextbulletspage.cpp:248
 msgid "Available fonts."
 msgstr ""
 
@@ -1159,92 +1428,126 @@ msgstr ""
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6-konvolutt, 176 x 125 mm"
 
-#: ../src/common/accelcmn.cpp:48
+#: ../src/common/accelcmn.cpp:50
 msgid "BACK"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:154
-msgid "BIG5"
-msgstr ""
-
-#: ../src/common/imagbmp.cpp:499 ../src/common/imagbmp.cpp:515
+#: ../src/common/imagbmp.cpp:524 ../src/common/imagbmp.cpp:554
+#: ../src/common/imagbmp.cpp:569
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: Klarte ikke reservere minne."
 
-#: ../src/common/imagbmp.cpp:86
+#: ../src/common/imagbmp.cpp:98
 msgid "BMP: Couldn't save invalid image."
 msgstr "BMP: Klarte ikke lagre ugyldig bilde."
 
-#: ../src/common/imagbmp.cpp:320
+#: ../src/common/imagbmp.cpp:339
 msgid "BMP: Couldn't write RGB color map."
 msgstr "BMP: Klarte ikke skrive RGB-fargekart."
 
-#: ../src/common/imagbmp.cpp:453
+#: ../src/common/imagbmp.cpp:474
 msgid "BMP: Couldn't write data."
 msgstr "BMP: Klarte ikke skrive data."
 
-#: ../src/common/imagbmp.cpp:225
+#: ../src/common/imagbmp.cpp:240
 msgid "BMP: Couldn't write the file (Bitmap) header."
 msgstr "BMP: Klarte ikke skrive filhodet (Bitmap)."
 
-#: ../src/common/imagbmp.cpp:246
+#: ../src/common/imagbmp.cpp:263
 msgid "BMP: Couldn't write the file (BitmapInfo) header."
 msgstr "BMP: Klarte ikke skrive filehodet (BitmapInfo)."
 
-#: ../src/common/imagbmp.cpp:120
+#: ../src/common/imagbmp.cpp:134
 msgid "BMP: wxImage doesn't have own wxPalette."
 msgstr "BMP: wxImage har ikke egen wxPalette."
 
-#: ../src/mac/carbon/fontdlg.cpp:382
+#: ../src/common/stockitem.cpp:143
+#, fuzzy
+msgid "Back"
+msgstr "&Tilbake"
+
+#: ../src/richtext/richtextbackgroundpage.cpp:119
+#: ../src/richtext/richtextformatdlg.cpp:369
+msgid "Background"
+msgstr ""
+
+#: ../src/richtext/richtextbackgroundpage.cpp:131
+msgid "Background &colour:"
+msgstr ""
+
+#: ../src/osx/carbon/fontdlg.cpp:404
 msgid "Background colour"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:120
+#: ../src/common/fmapbase.cpp:159
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: ../src/common/fmapbase.cpp:111
+#: ../src/common/fmapbase.cpp:150
 msgid "Baltic (old) (ISO-8859-4)"
 msgstr "Baltisk (gammel) (ISO-8859-4)"
 
-#: ../src/richtext/richtextliststylepage.cpp:431
+#: ../src/richtext/richtextliststylepage.cpp:427
 msgid "Before a paragraph:"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:491
-#: ../src/richtext/richtextbulletspage.cpp:289
+#: ../src/richtext/richtextliststylepage.cpp:490
+#: ../src/richtext/richtextbulletspage.cpp:295
 msgid "Bitmap"
 msgstr ""
 
-#: ../src/mac/carbon/dataview.cpp:575
+#: ../src/osx/carbon/dataview.cpp:2397
 msgid "Bitmap renderer cannot render value; value type: "
 msgstr ""
 
-#: ../src/richtext/richtextfontpage.cpp:269
-#: ../src/richtext/richtextfontpage.cpp:331
-#: ../src/richtext/richtextfontpage.cpp:577 ../src/generic/fontdlgg.cpp:335
-#: ../src/mac/carbon/fontdlg.cpp:516
+#: ../src/generic/fontdlgg.cpp:334 ../src/richtext/richtextfontpage.cpp:297
+#: ../src/osx/carbon/fontdlg.cpp:538 ../src/common/stockitem.cpp:144
 msgid "Bold"
 msgstr "Fet"
 
-#: ../src/generic/prntdlgg.cpp:898
+#: ../src/richtext/richtextborderspage.cpp:256
+#: ../src/richtext/richtextborderspage.cpp:389
+#, fuzzy
+msgid "Border"
+msgstr "Moderne"
+
+#: ../src/richtext/richtextformatdlg.cpp:363
+#, fuzzy
+msgid "Borders"
+msgstr "Moderne"
+
+#: ../src/richtext/richtextsizepage.cpp:418 ../src/common/stockitem.cpp:145
+msgid "Bottom"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:899
 msgid "Bottom margin (mm):"
 msgstr "Marg nede (mm):"
 
+#: ../src/richtext/richtextbuffer.cpp:8194
+#, fuzzy
+msgid "Box Properties"
+msgstr "&Egenskaper"
+
+#: ../src/richtext/richtextstyles.cpp:1036
+#, fuzzy
+msgid "Box styles"
+msgstr "&Neste >"
+
 #: ../src/common/filepickercmn.cpp:44 ../src/common/filepickercmn.cpp:45
 msgid "Browse"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:244
-#: ../src/richtext/richtextbulletspage.cpp:193
+#: ../src/richtext/richtextliststylepage.cpp:246
+#: ../src/richtext/richtextbulletspage.cpp:196
 msgid "Bullet &Alignment:"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:308
+#: ../src/richtext/richtextliststylepage.cpp:310
 msgid "Bullet style"
 msgstr ""
 
-#: ../src/richtext/richtextformatdlg.cpp:293
+#: ../src/richtext/richtextformatdlg.cpp:337
 msgid "Bullets"
 msgstr ""
 
@@ -1252,11 +1555,11 @@ msgstr ""
 msgid "C sheet, 17 x 22 in"
 msgstr "C-ark, 17 x 22 tommer"
 
-#: ../src/generic/logg.cpp:537
+#: ../src/generic/logg.cpp:522
 msgid "C&lear"
 msgstr "&Nullstill"
 
-#: ../src/generic/fontdlgg.cpp:408
+#: ../src/generic/fontdlgg.cpp:407
 msgid "C&olour:"
 msgstr "&Farge"
 
@@ -1280,497 +1583,500 @@ msgstr "C6-konvoluttm 114 x 162 mm"
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65-konvolutt, 114 x 229 mm"
 
-#: ../src/common/accelcmn.cpp:65
+#: ../src/common/accelcmn.cpp:67
 msgid "CANCEL"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:69
+#: ../src/common/accelcmn.cpp:71
 msgid "CAPITAL"
 msgstr ""
 
-#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:854
+#: ../src/common/stockitem.cpp:147
+msgid "CD-Rom"
+msgstr ""
+
+#: ../src/html/chm.cpp:818 ../src/html/chm.cpp:877
 msgid "CHM handler currently supports only local files!"
-msgstr "CHM-behandleren støtter for øyeblikket bare lokale filer!"
+msgstr "CHM-behandleren støtter for øyeblikket bare lokale filer!"
 
-#: ../src/common/accelcmn.cpp:66
+#: ../src/common/accelcmn.cpp:68
 msgid "CLEAR"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:110
+#: ../src/common/accelcmn.cpp:112
 msgid "COMMAND"
 msgstr ""
 
-#: ../src/richtext/richtextfontpage.cpp:232
+#: ../src/richtext/richtextfontpage.cpp:258
 msgid "Ca&pitals"
 msgstr ""
 
-#: ../src/os2/thread.cpp:117
-msgid "Cannot create mutex."
-msgstr "Klarte ikke opprette mutex."
-
-#: ../src/common/filefn.cpp:1421
-#, c-format
-msgid "Cannot enumerate files '%s'"
-msgstr "Klarte ikke telle opp filer «%s»"
-
-#: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204
-#, c-format
-msgid "Cannot enumerate files in directory '%s'"
-msgstr "Klarte ikke telle opp filer i mappen «%s»"
-
-#: ../src/os2/thread.cpp:526
-#, c-format
-msgid "Cannot resume thread %lu"
-msgstr "Klarte ikke gjenoppta tråden %lu"
-
-#: ../src/msw/thread.cpp:873
-#, c-format
-msgid "Cannot resume thread %x"
-msgstr "Klarte ikke gjenoppta tråden %x"
-
-#: ../src/msw/thread.cpp:526
-msgid "Cannot start thread: error writing TLS."
-msgstr "Klarte ikke starte tråden: feil ved skriving til TLS."
-
-#: ../src/os2/thread.cpp:512
-#, c-format
-msgid "Cannot suspend thread %lu"
-msgstr "Klarte ikke innstille tråden %lu"
-
-#: ../src/msw/thread.cpp:858
-#, c-format
-msgid "Cannot suspend thread %x"
-msgstr "Klarte ikke innstille tråden %x"
-
-#: ../src/msw/thread.cpp:781
-msgid "Cannot wait for thread termination"
-msgstr "Klarte ikke vente på trådens avslutning"
-
-#: ../src/common/cmdproc.cpp:262
+#: ../src/common/cmdproc.cpp:268
 msgid "Can't &Undo "
 msgstr "Klarte ikke &angre"
 
-#: ../src/common/image.cpp:2648
-#, c-format
-msgid "Can't check image format of file '%s': file does not exist."
-msgstr "Klarte ikke sjekke bildeformat for filen «%s»: filen eksisterer ikke."
+#: ../src/common/image.cpp:2487
+msgid "Can't automatically determine the image format for non-seekable input."
+msgstr ""
 
-#: ../src/msw/registry.cpp:451
+#: ../src/msw/registry.cpp:506
 #, c-format
 msgid "Can't close registry key '%s'"
-msgstr "Klarte ikke lukke registernøkkel «%s»"
+msgstr "Klarte ikke lukke registernøkkel «%s»"
 
-#: ../src/msw/registry.cpp:529
+#: ../src/msw/registry.cpp:584
 #, c-format
 msgid "Can't copy values of unsupported type %d."
-msgstr "Klarte ikke kopiere verdier av ikke-støttet type %d."
+msgstr "Klarte ikke kopiere verdier av ikke-støttet type %d."
 
-#: ../src/msw/registry.cpp:432
+#: ../src/msw/registry.cpp:487
 #, c-format
 msgid "Can't create registry key '%s'"
-msgstr "Klarte ikke opprette registernøkkel «%s»"
+msgstr "Klarte ikke opprette registernøkkel «%s»"
 
-#: ../src/os2/thread.cpp:493 ../src/msw/thread.cpp:652
-#: ../src/mac/carbon/mpthread.cpp:906
+#: ../src/msw/thread.cpp:696 ../src/os2/thread.cpp:495
 msgid "Can't create thread"
-msgstr "Klarte ikke opprette tråd"
+msgstr "Klarte ikke opprette tråd"
 
-#: ../src/msw/window.cpp:3717
+#: ../src/msw/window.cpp:3772
 #, c-format
 msgid "Can't create window of class %s"
 msgstr "Klarte ikke opprette vindu av klasse %s"
 
-#: ../src/msw/registry.cpp:705
+#: ../src/msw/registry.cpp:777
 #, c-format
 msgid "Can't delete key '%s'"
-msgstr "Klarte ikke slette nøkkel «%s»"
+msgstr "Klarte ikke slette nøkkel «%s»"
 
-#: ../src/os2/iniconf.cpp:466 ../src/msw/iniconf.cpp:453
+#: ../src/msw/iniconf.cpp:459 ../src/os2/iniconf.cpp:472
 #, c-format
 msgid "Can't delete the INI file '%s'"
-msgstr "Klarte ikke slette INI-filen «%s»"
+msgstr "Klarte ikke slette INI-filen «%s»"
 
-#: ../src/msw/registry.cpp:733
+#: ../src/msw/registry.cpp:805
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
-msgstr "Klarte ikke slette verdien «%s» fra nøkkelen «%s»"
+msgstr "Klarte ikke slette verdien «%s» fra nøkkelen «%s»"
 
-#: ../src/msw/registry.cpp:1090
+#: ../src/msw/registry.cpp:1162
 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
-msgstr "Klarte ikke telle opp undernøkler av nøkkel «%s»"
+msgstr "Klarte ikke telle opp undernøkler av nøkkel «%s»"
 
-#: ../src/msw/registry.cpp:1045
+#: ../src/msw/registry.cpp:1117
 #, c-format
 msgid "Can't enumerate values of key '%s'"
-msgstr "Klarte ikke telle opp verdier for nøkkel «%s»"
+msgstr "Klarte ikke telle opp verdier for nøkkel «%s»"
 
-#: ../src/msw/registry.cpp:1308
+#: ../src/msw/registry.cpp:1380
 #, c-format
 msgid "Can't export value of unsupported type %d."
-msgstr "Klarte ikke eksportere verdi av ikke-støttet type %d."
+msgstr "Klarte ikke eksportere verdi av ikke-støttet type %d."
 
-#: ../src/common/ffile.cpp:247
+#: ../src/common/ffile.cpp:235
 #, c-format
 msgid "Can't find current position in file '%s'"
-msgstr "Klarte ikke finne gjeldende posisjon i filen «%s»"
+msgstr "Klarte ikke finne gjeldende posisjon i filen «%s»"
 
-#: ../src/msw/registry.cpp:360
+#: ../src/msw/registry.cpp:417
 #, c-format
 msgid "Can't get info about registry key '%s'"
-msgstr "Klarte ikke finne informasjon om registernøkkel «%s»"
+msgstr "Klarte ikke finne informasjon om registernøkkel «%s»"
 
-#: ../src/common/zstream.cpp:318
+#: ../src/common/zstream.cpp:339
 msgid "Can't initialize zlib deflate stream."
-msgstr "Klarte ikke klargjøre zlib-strøm for nedpakking."
+msgstr "Klarte ikke klargjøre zlib-strøm for nedpakking."
 
-#: ../src/common/zstream.cpp:169
+#: ../src/common/zstream.cpp:178
 msgid "Can't initialize zlib inflate stream."
-msgstr "Klarte ikke klargjøre zlib-strøm for utpakking."
+msgstr "Klarte ikke klargjøre zlib-strøm for utpakking."
+
+#: ../src/msw/fswatcher.cpp:429
+#, c-format
+msgid "Can't monitor non-existent directory \"%s\" for changes."
+msgstr ""
 
-#: ../src/common/image.cpp:2029 ../src/common/image.cpp:2051
+#: ../src/common/fswatchercmn.cpp:93
 #, c-format
-msgid "Can't load image from file '%s': file does not exist."
-msgstr "Klarte ikke lese bilde fra filen «%s»: filen eksisterer ikke."
+msgid "Can't monitor non-existent path \"%s\" for changes."
+msgstr ""
 
-#: ../src/msw/registry.cpp:396
+#: ../src/msw/registry.cpp:453
 #, c-format
 msgid "Can't open registry key '%s'"
-msgstr "Kan ikke åpne registernøkkel «%s»"
+msgstr "Kan ikke åpne registernøkkel «%s»"
 
-#: ../src/common/zstream.cpp:234
+#: ../src/common/zstream.cpp:245
 #, c-format
 msgid "Can't read from inflate stream: %s"
-msgstr "Klarte ikke lese fra utpakkingsstrøm: %s"
+msgstr "Klarte ikke lese fra utpakkingsstrøm: %s"
 
-#: ../src/common/zstream.cpp:227
+#: ../src/common/zstream.cpp:237
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
-msgstr "Klarte ikke lese utpakkingsstrøm: uventet EOF i underliggende strøm."
+msgstr "Klarte ikke lese utpakkingsstrøm: uventet EOF i underliggende strøm."
 
-#: ../src/msw/registry.cpp:977
+#: ../src/msw/registry.cpp:1049
 #, c-format
 msgid "Can't read value of '%s'"
-msgstr "Klarte ikke lese verdien til «%s»"
+msgstr "Klarte ikke lese verdien til «%s»"
 
-#: ../src/msw/registry.cpp:806 ../src/msw/registry.cpp:838
-#: ../src/msw/registry.cpp:900
+#: ../src/msw/registry.cpp:878 ../src/msw/registry.cpp:910
+#: ../src/msw/registry.cpp:972
 #, c-format
 msgid "Can't read value of key '%s'"
-msgstr "Klarte ikke lese verdien av nøkkel «%s»"
+msgstr "Klarte ikke lese verdien av nøkkel «%s»"
 
-#: ../src/common/image.cpp:2072
+#: ../src/common/image.cpp:2284
 #, c-format
 msgid "Can't save image to file '%s': unknown extension."
-msgstr "Klarte ikke lagre bilde til filen «%s»: Ukjent filtype"
+msgstr "Klarte ikke lagre bilde til filen «%s»: Ukjent filtype"
 
-#: ../src/generic/logg.cpp:599 ../src/generic/logg.cpp:1049
+#: ../src/generic/logg.cpp:583 ../src/generic/logg.cpp:998
 msgid "Can't save log contents to file."
 msgstr "Klarte ikke lagre logginnholdet til fil."
 
-#: ../src/os2/thread.cpp:476 ../src/msw/thread.cpp:608
+#: ../src/msw/thread.cpp:652 ../src/os2/thread.cpp:478
 msgid "Can't set thread priority"
-msgstr "Klarte ikke sette trådprioritet"
+msgstr "Klarte ikke sette trådprioritet"
 
-#: ../src/msw/registry.cpp:824 ../src/msw/registry.cpp:868
-#: ../src/msw/registry.cpp:994
+#: ../src/msw/registry.cpp:896 ../src/msw/registry.cpp:940
+#: ../src/msw/registry.cpp:1066
 #, c-format
 msgid "Can't set value of '%s'"
-msgstr "Klarte ikke sette verdien for «%s»"
+msgstr "Klarte ikke sette verdien for «%s»"
+
+#: ../src/unix/utilsunx.cpp:372
+#, fuzzy
+msgid "Can't write to child process's stdin"
+msgstr "Klarte ikke drepe prosess %d"
 
-#: ../src/common/zstream.cpp:402
+#: ../src/common/zstream.cpp:420
 #, c-format
 msgid "Can't write to deflate stream: %s"
-msgstr "Klarte ikke skrive til nedpakkingsstrøm: %s"
+msgstr "Klarte ikke skrive til nedpakkingsstrøm: %s"
 
-#: ../src/richtext/richtextstyledlg.cpp:289 ../src/gtk1/fontdlg.cpp:145
-#: ../src/html/htmlhelp.cpp:434 ../src/generic/dirdlgg.cpp:108
-#: ../src/motif/msgdlg.cpp:194 ../src/mac/carbon/msgdlg.cpp:38
+#: ../src/generic/dirdlgg.cpp:108 ../src/richtext/richtextstyledlg.cpp:304
+#: ../src/common/stockitem.cpp:146 ../src/msw/msgdlg.cpp:489
+#: ../src/msw/progdlg.cpp:674 ../src/gtk1/fontdlg.cpp:145
+#: ../src/motif/msgdlg.cpp:194
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../src/xrc/xmlres.cpp:1297 ../src/xrc/xmlres.cpp:1345
-msgid "Cannot convert dialog units: dialog unknown."
-msgstr "Klarte ikke konvertere dialogenheter: ukjent dialog."
-
-#: ../src/common/strconv.cpp:2975
-#, c-format
-msgid "Cannot convert from the charset '%s'!"
-msgstr "Klarte ikke convertere fra tegnsettet «%s»!"
+#: ../src/os2/thread.cpp:117
+msgid "Cannot create mutex."
+msgstr "Klarte ikke opprette mutex."
 
-#: ../src/mac/carbon/dataview.cpp:1056 ../src/mac/carbon/dataview.cpp:1176
+#: ../src/osx/carbon/dataview.cpp:896
 msgid "Cannot create new column's ID. Probably max. number of columns reached."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:545
+#: ../src/common/filefn.cpp:1333
 #, c-format
-msgid "Cannot find active dialup connection: %s"
-msgstr "Klarte ikke finne aktiv oppringingsforbindelse: %s"
+msgid "Cannot enumerate files '%s'"
+msgstr "Klarte ikke telle opp filer «%s»"
 
-#: ../src/xrc/xmlres.cpp:371
+#: ../src/msw/dir.cpp:211
 #, c-format
-msgid "Cannot find container for unknown control '%s'."
-msgstr "Klarte ikke finne beholder for ukjent kontroll «%s»."
+msgid "Cannot enumerate files in directory '%s'"
+msgstr "Klarte ikke telle opp filer i mappen «%s»"
 
-#: ../src/xrc/xmlres.cpp:1380
+#: ../src/msw/dialup.cpp:543
 #, c-format
-msgid "Cannot find font node '%s'."
-msgstr "Klarte ikke finne fontnode «%s»."
+msgid "Cannot find active dialup connection: %s"
+msgstr "Klarte ikke finne aktiv oppringingsforbindelse: %s"
 
-#: ../src/msw/dialup.cpp:856
+#: ../src/msw/dialup.cpp:850
 msgid "Cannot find the location of address book file"
 msgstr "Klarte ikke plasseringen til adressebokfilen"
 
-#: ../src/unix/threadpsx.cpp:1192
+#: ../src/msw/ole/automtn.cpp:554
+#, fuzzy, c-format
+msgid "Cannot get an active instance of \"%s\""
+msgstr "Klarte ikke finne aktiv oppringingsforbindelse: %s"
+
+#: ../src/unix/threadpsx.cpp:1208
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
-msgstr "Klarte ikke finne prioritetsområde for planleggingspolitikk %d."
+msgstr "Klarte ikke finne prioritetsområde for planleggingspolitikk %d."
 
-#: ../src/unix/utilsunx.cpp:842
+#: ../src/unix/utilsunx.cpp:898
 msgid "Cannot get the hostname"
 msgstr "Klarte ikke finne tjenernavn"
 
-#: ../src/unix/utilsunx.cpp:878
+#: ../src/unix/utilsunx.cpp:934
 msgid "Cannot get the official hostname"
 msgstr "Klarte ikke finne det offisielle tjenernavnet"
 
-#: ../src/msw/dialup.cpp:953
+#: ../src/msw/dialup.cpp:951
 msgid "Cannot hang up - no active dialup connection."
-msgstr "Klarte ikke legge på - ingen aktiv oppringingsforbindelse."
+msgstr "Klarte ikke legge på - ingen aktiv oppringingsforbindelse."
 
-#: ../include/wx/msw/ole/oleutils.h:46
+#: ../include/wx/msw/ole/oleutils.h:53
 msgid "Cannot initialize OLE"
 msgstr "Klarte ikke initialisere OLE"
 
-#: ../src/mgl/app.cpp:279
-msgid "Cannot initialize SciTech MGL!"
-msgstr "Klarte ikke initialisere SciTech MGL!"
-
-#: ../src/mgl/window.cpp:547
-msgid "Cannot initialize display."
-msgstr "Klarte ikke initialisere skjerm."
+#: ../src/common/socket.cpp:844
+#, fuzzy
+msgid "Cannot initialize sockets"
+msgstr "Klarte ikke initialisere OLE"
 
-#: ../src/msw/volume.cpp:614
+#: ../src/msw/volume.cpp:619
 #, c-format
 msgid "Cannot load icon from '%s'."
-msgstr "Klarte ikke laste ikon fra «%s»."
+msgstr "Klarte ikke laste ikon fra «%s»."
 
-#: ../src/xrc/xmlres.cpp:504
+#: ../src/xrc/xmlres.cpp:362
+#, fuzzy, c-format
+msgid "Cannot load resources from '%s'."
+msgstr "Klarte ikke laste ressurs fra filen «%s»."
+
+#: ../src/xrc/xmlres.cpp:745
 #, c-format
 msgid "Cannot load resources from file '%s'."
-msgstr "Klarte ikke laste ressurs fra filen «%s»."
+msgstr "Klarte ikke laste ressurs fra filen «%s»."
 
 #: ../src/html/htmlfilt.cpp:138
 #, c-format
 msgid "Cannot open HTML document: %s"
-msgstr "Klarte ikke åpne HTML-dokument: %s"
+msgstr "Klarte ikke åpne HTML-dokument: %s"
 
-#: ../src/html/helpdata.cpp:658
+#: ../src/html/helpdata.cpp:651
 #, c-format
 msgid "Cannot open HTML help book: %s"
-msgstr "Klarte ikke åpne HTML-hjelpebok: %s"
+msgstr "Klarte ikke åpne HTML-hjelpebok: %s"
 
 #: ../src/html/helpdata.cpp:298
 #, c-format
 msgid "Cannot open contents file: %s"
-msgstr "Klarte ikke åpne innholdsfil: %s"
-
-#: ../src/xrc/xmlres.cpp:469
-#, c-format
-msgid "Cannot open file '%s'."
-msgstr "Klarte ikke åpne filen «%s»."
+msgstr "Klarte ikke åpne innholdsfil: %s"
 
 #: ../src/generic/dcpsg.cpp:1719
 msgid "Cannot open file for PostScript printing!"
-msgstr "Klarte ikke åpne fil for PostScript-utskrift!"
+msgstr "Klarte ikke åpne fil for PostScript-utskrift!"
 
 #: ../src/html/helpdata.cpp:312
 #, c-format
 msgid "Cannot open index file: %s"
-msgstr "Klarte ikke åpne indeksfile: %s"
+msgstr "Klarte ikke åpne indeksfile: %s"
 
-#: ../src/common/intl.cpp:1337
-#, c-format
-msgid "Cannot parse Plural-Forms:'%s'"
-msgstr "Klarte ikke tolke flertallsformer: «%s»"
-
-#: ../src/xrc/xmlres.cpp:1281
-#, c-format
-msgid "Cannot parse coordinates from '%s'."
-msgstr "Klarte ikke tolke koordinater fra «%s»."
-
-#: ../src/xrc/xmlres.cpp:1329
-#, c-format
-msgid "Cannot parse dimension from '%s'."
-msgstr "Klarte ikke tolke dimensjoner fra «%s»."
+#: ../src/xrc/xmlres.cpp:727
+#, fuzzy, c-format
+msgid "Cannot open resources file '%s'."
+msgstr "Klarte ikke laste ressurs fra filen «%s»."
 
-#: ../src/html/helpwnd.cpp:1540
+#: ../src/html/helpwnd.cpp:1543
 msgid "Cannot print empty page."
 msgstr "Klarte ikke skrive ut tom side."
 
-#: ../src/msw/volume.cpp:504
+#: ../src/msw/volume.cpp:508
 #, c-format
 msgid "Cannot read typename from '%s'!"
-msgstr "Klarte ikke lese typenavn fra «%s»!"
+msgstr "Klarte ikke lese typenavn fra «%s»!"
+
+#: ../src/os2/thread.cpp:528
+#, c-format
+msgid "Cannot resume thread %lu"
+msgstr "Klarte ikke gjenoppta tråden %lu"
+
+#: ../src/msw/thread.cpp:922
+#, c-format
+msgid "Cannot resume thread %x"
+msgstr "Klarte ikke gjenoppta tråden %x"
 
-#: ../src/unix/threadpsx.cpp:1173
+#: ../src/unix/threadpsx.cpp:1189
 msgid "Cannot retrieve thread scheduling policy."
-msgstr "Klarte ikke hente trådplanleggingspolitikk."
+msgstr "Klarte ikke hente trådplanleggingspolitikk."
 
-#: ../src/common/intl.cpp:1907
+#: ../src/common/intl.cpp:545
 #, c-format
 msgid "Cannot set locale to language \"%s\"."
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:797
-msgid "Cannot start thread: error writing TLS"
-msgstr "Klarte ikke starte tråd: feil ved skriving til TLS"
+#: ../src/unix/threadpsx.cpp:818 ../src/msw/thread.cpp:570
+msgid "Cannot start thread: error writing TLS."
+msgstr "Klarte ikke starte tråden: feil ved skriving til TLS."
+
+#: ../src/os2/thread.cpp:514
+#, c-format
+msgid "Cannot suspend thread %lu"
+msgstr "Klarte ikke innstille tråden %lu"
 
-#: ../src/mac/carbon/mpthread.cpp:972
-msgid "Cannot wait for thread termination."
-msgstr "Kan ikke vente på trådens avslutning."
+#: ../src/msw/thread.cpp:907
+#, c-format
+msgid "Cannot suspend thread %x"
+msgstr "Klarte ikke innstille tråden %x"
 
-#: ../src/mac/carbon/mpthread.cpp:888
-msgid "Cant create the thread event queue"
-msgstr "Klarte ikke opprette køen for trådhendelser"
+#: ../src/msw/thread.cpp:830
+msgid "Cannot wait for thread termination"
+msgstr "Klarte ikke vente på trådens avslutning"
 
-#: ../src/html/helpwnd.cpp:532
+#: ../src/html/helpwnd.cpp:544
 msgid "Case sensitive"
-msgstr "Skill mellom små og store bokstaver"
+msgstr "Skill mellom små og store bokstaver"
+
+#: ../src/propgrid/manager.cpp:1494
+msgid "Categorized Mode"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:8267
+#, fuzzy
+msgid "Cell Properties"
+msgstr "&Egenskaper"
 
-#: ../src/common/fmapbase.cpp:121
+#: ../src/common/fmapbase.cpp:160
 msgid "Celtic (ISO-8859-14)"
 msgstr "Keltisk (ISO-8859-14)"
 
-#: ../src/richtext/richtextliststylepage.cpp:348
-#: ../src/richtext/richtextindentspage.cpp:170
+#: ../src/richtext/richtextindentspage.cpp:173
+#: ../src/richtext/richtextliststylepage.cpp:350
 #, fuzzy
 msgid "Cen&tred"
 msgstr "Sentrert"
 
-#: ../src/common/stockitem.cpp:133
+#: ../src/common/stockitem.cpp:171
 msgid "Centered"
 msgstr "Sentrert"
 
-#: ../src/common/fmapbase.cpp:109
+#: ../src/common/fmapbase.cpp:148
 msgid "Central European (ISO-8859-2)"
 msgstr "Sentraleuropeisk (ISO-8859-2)"
 
-#: ../src/richtext/richtextliststylepage.cpp:249
-#: ../src/richtext/richtextbulletspage.cpp:198
+#: ../src/richtext/richtextliststylepage.cpp:251
+#: ../src/richtext/richtextbulletspage.cpp:201
 #, fuzzy
 msgid "Centre"
 msgstr "Sentrert"
 
-#: ../src/richtext/richtextliststylepage.cpp:350
+#: ../src/richtext/richtextindentspage.cpp:175
+#: ../src/richtext/richtextindentspage.cpp:177
 #: ../src/richtext/richtextliststylepage.cpp:352
-#: ../src/richtext/richtextindentspage.cpp:172
-#: ../src/richtext/richtextindentspage.cpp:174
+#: ../src/richtext/richtextliststylepage.cpp:354
 #, fuzzy
 msgid "Centre text."
 msgstr "Klarte ikke opprette mutex."
 
-#: ../src/richtext/richtextliststylepage.cpp:279
-#: ../src/richtext/richtextbulletspage.cpp:230
+#: ../src/richtext/richtextsizepage.cpp:417
+#, fuzzy
+msgid "Centred"
+msgstr "Sentrert"
+
+#: ../src/richtext/richtextliststylepage.cpp:281
+#: ../src/richtext/richtextbulletspage.cpp:233
 #, fuzzy
 msgid "Ch&oose..."
-msgstr "&Gå til"
+msgstr "&Gå til"
 
-#: ../src/richtext/richtextbuffer.cpp:2685
+#: ../src/richtext/richtextbuffer.cpp:3925
 msgid "Change List Style"
 msgstr ""
 
-#: ../src/richtext/richtextbuffer.cpp:1721
-msgid "Change Style"
+#: ../src/richtext/richtextbuffer.cpp:3289
+msgid "Change Object Style"
 msgstr ""
 
-#: ../src/mac/carbon/dataview.cpp:251
-msgid "Changed item is invalid."
+#: ../src/richtext/richtextbuffer.cpp:3555
+#, fuzzy
+msgid "Change Properties"
+msgstr "&Egenskaper"
+
+#: ../src/richtext/richtextbuffer.cpp:3116
+msgid "Change Style"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:378
+#: ../src/common/fileconf.cpp:373
 #, c-format
 msgid "Changes won't be saved to avoid overwriting the existing file \"%s\""
 msgstr ""
 
-#: ../src/richtext/richtextstyles.cpp:840
+#: ../src/richtext/richtextstyles.cpp:1034
 msgid "Character styles"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:223
 #: ../src/richtext/richtextliststylepage.cpp:225
-#: ../src/richtext/richtextbulletspage.cpp:172
-#: ../src/richtext/richtextbulletspage.cpp:174
+#: ../src/richtext/richtextliststylepage.cpp:227
+#: ../src/richtext/richtextbulletspage.cpp:175
+#: ../src/richtext/richtextbulletspage.cpp:177
 msgid "Check to add a period after the bullet."
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:237
 #: ../src/richtext/richtextliststylepage.cpp:239
-#: ../src/richtext/richtextbulletspage.cpp:186
-#: ../src/richtext/richtextbulletspage.cpp:188
+#: ../src/richtext/richtextliststylepage.cpp:241
+#: ../src/richtext/richtextbulletspage.cpp:189
+#: ../src/richtext/richtextbulletspage.cpp:191
 msgid "Check to add a right parenthesis."
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:230
 #: ../src/richtext/richtextliststylepage.cpp:232
-#: ../src/richtext/richtextbulletspage.cpp:179
-#: ../src/richtext/richtextbulletspage.cpp:181
+#: ../src/richtext/richtextliststylepage.cpp:234
+#: ../src/richtext/richtextbulletspage.cpp:182
+#: ../src/richtext/richtextbulletspage.cpp:184
 msgid "Check to enclose the bullet in parentheses."
 msgstr ""
 
-#: ../src/mac/carbon/fontdlg.cpp:518 ../src/mac/carbon/fontdlg.cpp:520
+#: ../src/osx/carbon/fontdlg.cpp:540 ../src/osx/carbon/fontdlg.cpp:542
 #, fuzzy
 msgid "Check to make the font bold."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/mac/carbon/fontdlg.cpp:525 ../src/mac/carbon/fontdlg.cpp:527
+#: ../src/osx/carbon/fontdlg.cpp:547 ../src/osx/carbon/fontdlg.cpp:549
 #, fuzzy
 msgid "Check to make the font italic."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/mac/carbon/fontdlg.cpp:534 ../src/mac/carbon/fontdlg.cpp:536
+#: ../src/osx/carbon/fontdlg.cpp:556 ../src/osx/carbon/fontdlg.cpp:558
 #, fuzzy
 msgid "Check to make the font underlined."
 msgstr "Om skriften er understreket."
 
-#: ../src/richtext/richtextstyledlg.cpp:275
-#: ../src/richtext/richtextstyledlg.cpp:277
+#: ../src/richtext/richtextstyledlg.cpp:293
+#: ../src/richtext/richtextstyledlg.cpp:295
 msgid "Check to restart numbering."
 msgstr ""
 
-#: ../src/richtext/richtextfontpage.cpp:227
-#: ../src/richtext/richtextfontpage.cpp:229
+#: ../src/richtext/richtextfontpage.cpp:253
+#: ../src/richtext/richtextfontpage.cpp:255
 #, fuzzy
 msgid "Check to show a line through the text."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtextfontpage.cpp:234
-#: ../src/richtext/richtextfontpage.cpp:236
+#: ../src/richtext/richtextfontpage.cpp:260
+#: ../src/richtext/richtextfontpage.cpp:262
 #, fuzzy
 msgid "Check to show the text in capitals."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtextfontpage.cpp:248
-#: ../src/richtext/richtextfontpage.cpp:250
+#: ../src/richtext/richtextfontpage.cpp:274
+#: ../src/richtext/richtextfontpage.cpp:276
 #, fuzzy
 msgid "Check to show the text in subscript."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtextfontpage.cpp:241
-#: ../src/richtext/richtextfontpage.cpp:243
+#: ../src/richtext/richtextfontpage.cpp:267
+#: ../src/richtext/richtextfontpage.cpp:269
 #, fuzzy
 msgid "Check to show the text in superscript."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/msw/dialup.cpp:791
+#: ../src/msw/dialup.cpp:785
 msgid "Choose ISP to dial"
 msgstr "Velg ISP for oppringing"
 
-#: ../src/gtk/colordlg.cpp:52 ../src/generic/colrdlgg.cpp:144
-#: ../src/palmos/colordlg.cpp:74
+#: ../src/propgrid/props.cpp:1644
+#, fuzzy
+msgid "Choose a directory:"
+msgstr "Opprett mappe"
+
+#: ../src/propgrid/props.cpp:1703
+#, fuzzy
+msgid "Choose a file"
+msgstr "Velg skrift"
+
+#: ../src/generic/colrdlgg.cpp:145 ../src/gtk/colordlg.cpp:60
 msgid "Choose colour"
 msgstr "Velg farge"
 
-#: ../src/gtk/fontdlg.cpp:99 ../src/gtk1/fontdlg.cpp:126
+#: ../src/generic/fontpickerg.cpp:51 ../src/gtk/fontdlg.cpp:99
+#: ../src/gtk1/fontdlg.cpp:126
 msgid "Choose font"
 msgstr "Velg skrift"
 
@@ -1779,511 +2085,537 @@ msgstr "Velg skrift"
 msgid "Circular dependency involving module \"%s\" detected."
 msgstr ""
 
-#: ../src/aui/tabmdi.cpp:105 ../src/generic/mdig.cpp:115
+#: ../src/aui/tabmdi.cpp:105 ../src/generic/mdig.cpp:98
 msgid "Cl&ose"
 msgstr "&Lukk"
 
-#: ../src/generic/logg.cpp:537
+#: ../src/msw/ole/automtn.cpp:655
+#, fuzzy
+msgid "Class not registered."
+msgstr "Klarte ikke opprette tråd"
+
+#: ../src/common/stockitem.cpp:148
+#, fuzzy
+msgid "Clear"
+msgstr "&Fjern"
+
+#: ../src/generic/logg.cpp:522
 msgid "Clear the log contents"
-msgstr "Tøm loggen for innhold"
+msgstr "Tøm loggen for innhold"
 
-#: ../src/richtext/richtextstyledlg.cpp:238
-#: ../src/richtext/richtextstyledlg.cpp:240
+#: ../src/richtext/richtextstyledlg.cpp:256
+#: ../src/richtext/richtextstyledlg.cpp:258
 #, fuzzy
 msgid "Click to apply the selected style."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtextliststylepage.cpp:280
 #: ../src/richtext/richtextliststylepage.cpp:282
-#: ../src/richtext/richtextbulletspage.cpp:231
-#: ../src/richtext/richtextbulletspage.cpp:233
+#: ../src/richtext/richtextliststylepage.cpp:284
+#: ../src/richtext/richtextbulletspage.cpp:234
+#: ../src/richtext/richtextbulletspage.cpp:236
 msgid "Click to browse for a symbol."
 msgstr ""
 
-#: ../src/mac/carbon/fontdlg.cpp:565 ../src/mac/carbon/fontdlg.cpp:567
+#: ../src/osx/carbon/fontdlg.cpp:587 ../src/osx/carbon/fontdlg.cpp:589
 #, fuzzy
 msgid "Click to cancel changes to the font."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/generic/fontdlgg.cpp:474 ../src/generic/fontdlgg.cpp:493
+#: ../src/generic/fontdlgg.cpp:473 ../src/generic/fontdlgg.cpp:492
 msgid "Click to cancel the font selection."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtextstyledlg.cpp:290
-#: ../src/richtext/richtextstyledlg.cpp:292
+#: ../src/osx/carbon/fontdlg.cpp:568 ../src/osx/carbon/fontdlg.cpp:570
 #, fuzzy
-msgid "Click to cancel this window."
-msgstr "Lukk dette vinduet"
+msgid "Click to change the font colour."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/mac/carbon/fontdlg.cpp:546 ../src/mac/carbon/fontdlg.cpp:548
+#: ../src/richtext/richtextfontpage.cpp:243
+#: ../src/richtext/richtextfontpage.cpp:245
 #, fuzzy
-msgid "Click to change the font colour."
-msgstr "Klikk for å avbryte skriftvalg."
+msgid "Click to change the text background colour."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtextfontpage.cpp:217
-#: ../src/richtext/richtextfontpage.cpp:219
+#: ../src/richtext/richtextfontpage.cpp:230
+#: ../src/richtext/richtextfontpage.cpp:232
 #, fuzzy
 msgid "Click to change the text colour."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtextliststylepage.cpp:194
 #: ../src/richtext/richtextliststylepage.cpp:196
+#: ../src/richtext/richtextliststylepage.cpp:198
 #, fuzzy
 msgid "Click to choose the font for this level."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtextstyledlg.cpp:265
-#: ../src/richtext/richtextstyledlg.cpp:267
+#: ../src/richtext/richtextstyledlg.cpp:283
+#: ../src/richtext/richtextstyledlg.cpp:285
 #, fuzzy
 msgid "Click to close this window."
 msgstr "Lukk dette vinduet"
 
-#: ../src/mac/carbon/fontdlg.cpp:572 ../src/mac/carbon/fontdlg.cpp:574
+#: ../src/osx/carbon/fontdlg.cpp:594 ../src/osx/carbon/fontdlg.cpp:596
 #, fuzzy
 msgid "Click to confirm changes to the font."
-msgstr "Klikk for å bekrefte skriftvalg"
+msgstr "Klikk for å bekrefte skriftvalg"
 
-#: ../src/generic/fontdlgg.cpp:479 ../src/generic/fontdlgg.cpp:481
-#: ../src/generic/fontdlgg.cpp:486 ../src/generic/fontdlgg.cpp:488
+#: ../src/generic/fontdlgg.cpp:478 ../src/generic/fontdlgg.cpp:480
+#: ../src/generic/fontdlgg.cpp:485 ../src/generic/fontdlgg.cpp:487
 msgid "Click to confirm the font selection."
-msgstr "Klikk for å bekrefte skriftvalg"
+msgstr "Klikk for å bekrefte skriftvalg"
 
-#: ../src/richtext/richtextstyledlg.cpp:284
-#: ../src/richtext/richtextstyledlg.cpp:286
+#: ../src/richtext/richtextstyledlg.cpp:248
+#: ../src/richtext/richtextstyledlg.cpp:250
 #, fuzzy
-msgid "Click to confirm your selection."
-msgstr "Klikk for å bekrefte skriftvalg"
+msgid "Click to create a new box style."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtextstyledlg.cpp:218
-#: ../src/richtext/richtextstyledlg.cpp:220
+#: ../src/richtext/richtextstyledlg.cpp:230
+#: ../src/richtext/richtextstyledlg.cpp:232
 msgid "Click to create a new character style."
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:230
-#: ../src/richtext/richtextstyledlg.cpp:232
+#: ../src/richtext/richtextstyledlg.cpp:242
+#: ../src/richtext/richtextstyledlg.cpp:244
 #, fuzzy
 msgid "Click to create a new list style."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtextstyledlg.cpp:224
-#: ../src/richtext/richtextstyledlg.cpp:226
+#: ../src/richtext/richtextstyledlg.cpp:236
+#: ../src/richtext/richtextstyledlg.cpp:238
 msgid "Click to create a new paragraph style."
 msgstr ""
 
-#: ../src/richtext/richtexttabspage.cpp:137
-#: ../src/richtext/richtexttabspage.cpp:139
+#: ../src/richtext/richtexttabspage.cpp:138
+#: ../src/richtext/richtexttabspage.cpp:140
 #, fuzzy
 msgid "Click to create a new tab position."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtexttabspage.cpp:149
-#: ../src/richtext/richtexttabspage.cpp:151
+#: ../src/richtext/richtexttabspage.cpp:150
+#: ../src/richtext/richtexttabspage.cpp:152
 #, fuzzy
 msgid "Click to delete all tab positions."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtextstyledlg.cpp:256
-#: ../src/richtext/richtextstyledlg.cpp:258
+#: ../src/richtext/richtextstyledlg.cpp:274
+#: ../src/richtext/richtextstyledlg.cpp:276
 #, fuzzy
 msgid "Click to delete the selected style."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtexttabspage.cpp:143
-#: ../src/richtext/richtexttabspage.cpp:145
+#: ../src/richtext/richtexttabspage.cpp:144
+#: ../src/richtext/richtexttabspage.cpp:146
 #, fuzzy
 msgid "Click to delete the selected tab position."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtextstyledlg.cpp:250
-#: ../src/richtext/richtextstyledlg.cpp:252
+#: ../src/richtext/richtextstyledlg.cpp:268
+#: ../src/richtext/richtextstyledlg.cpp:270
 #, fuzzy
 msgid "Click to edit the selected style."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtextstyledlg.cpp:244
-#: ../src/richtext/richtextstyledlg.cpp:246
+#: ../src/richtext/richtextstyledlg.cpp:262
+#: ../src/richtext/richtextstyledlg.cpp:264
 #, fuzzy
 msgid "Click to rename the selected style."
-msgstr "Klikk for å avbryte skriftvalg."
+msgstr "Klikk for å avbryte skriftvalg."
 
-#: ../src/richtext/richtextstyledlg.cpp:263
-#: ../src/richtext/richtextsymboldlg.cpp:474 ../src/html/helpdlg.cpp:91
-#: ../src/generic/dbgrptg.cpp:93 ../src/generic/progdlgg.cpp:642
-#: ../src/generic/progdlgg.cpp:647
+#: ../src/generic/dbgrptg.cpp:94 ../src/generic/progdlgg.cpp:805
+#: ../src/generic/progdlgg.cpp:810 ../src/richtext/richtextstyledlg.cpp:281
+#: ../src/richtext/richtextsymboldlg.cpp:473 ../src/common/stockitem.cpp:149
+#: ../src/msw/progdlg.cpp:171 ../src/msw/progdlg.cpp:680
+#: ../src/html/helpdlg.cpp:91
 msgid "Close"
 msgstr "Lukk"
 
-#: ../src/univ/themes/win32.cpp:3742
-msgid "Close\tAlt-F4"
-msgstr "Lukk\tAlt-F4"
-
-#: ../src/aui/tabmdi.cpp:106 ../src/generic/mdig.cpp:116
+#: ../src/aui/tabmdi.cpp:106 ../src/generic/mdig.cpp:99
 msgid "Close All"
 msgstr "Lukk alle"
 
-#: ../src/common/stockitem.cpp:211
+#: ../src/common/stockitem.cpp:267
 msgid "Close current document"
 msgstr ""
 
-#: ../src/generic/logg.cpp:539
+#: ../src/generic/logg.cpp:524
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
-#: ../src/richtext/richtextformatdlg.cpp:524
+#: ../src/common/stockitem.cpp:194
+#, fuzzy
+msgid "Color"
+msgstr "&Farge"
+
+#: ../src/richtext/richtextformatdlg.cpp:718
 #, fuzzy
 msgid "Colour"
 msgstr "&Farge"
 
-#: ../src/msw/colordlg.cpp:155
+#: ../src/msw/colordlg.cpp:154
 #, fuzzy, c-format
 msgid "Colour selection dialog failed with error %0lx."
-msgstr "Utførelse av kommandoen «%s» feilet med feil: %ul"
+msgstr "Utførelse av kommandoen «%s» feilet med feil: %ul"
 
-#: ../src/mac/carbon/fontdlg.cpp:542
+#: ../src/osx/carbon/fontdlg.cpp:564
 #, fuzzy
 msgid "Colour:"
 msgstr "&Farge"
 
-#: ../src/mac/carbon/dataview.cpp:1064 ../src/mac/carbon/dataview.cpp:1184
+#: ../src/osx/carbon/dataview.cpp:901
 #, fuzzy
 msgid "Column could not be added."
 msgstr "Klarte ikke laste filen."
 
-#: ../src/mac/carbon/dataview.cpp:1063 ../src/mac/carbon/dataview.cpp:1183
+#: ../src/osx/carbon/dataview.cpp:900
 msgid "Column description could not be initialized."
 msgstr ""
 
-#: ../src/mac/carbon/dataview.cpp:1050 ../src/mac/carbon/dataview.cpp:1170
-msgid "Column does not have a renderer."
-msgstr ""
-
-#: ../src/mac/carbon/databrow.cpp:883 ../src/mac/carbon/databrow.cpp:904
+#: ../src/osx/carbon/dataview.cpp:1539 ../src/osx/carbon/dataview.cpp:1560
 #, fuzzy
 msgid "Column index not found."
-msgstr "katalogfil for domene «%s» ikke funnet."
-
-#: ../src/mac/carbon/dataview.cpp:1049 ../src/mac/carbon/dataview.cpp:1169
-msgid "Column pointer must not be NULL."
-msgstr ""
+msgstr "katalogfil for domene «%s» ikke funnet."
 
-#: ../src/mac/carbon/databrow.cpp:959
+#: ../src/osx/carbon/dataview.cpp:1615
 msgid "Column width could not be determined"
 msgstr ""
 
-#: ../src/mac/carbon/dataview.cpp:1067 ../src/mac/carbon/dataview.cpp:1187
+#: ../src/osx/carbon/dataview.cpp:902
 msgid "Column width could not be set."
 msgstr ""
 
-#: ../src/mac/carbon/dataview.cpp:1053 ../src/mac/carbon/dataview.cpp:1173
-msgid "Column's model column has no equivalent in the associated model."
-msgstr ""
-
-#: ../src/common/init.cpp:189
+#: ../src/common/init.cpp:185
 #, c-format
 msgid ""
 "Command line argument %d couldn't be converted to Unicode and will be "
 "ignored."
 msgstr ""
 
-#: ../src/html/helpwnd.cpp:1554
+#: ../src/msw/fontdlg.cpp:117
+#, fuzzy, c-format
+msgid "Common dialog failed with error code %0lx."
+msgstr "Utførelse av kommandoen «%s» feilet med feil: %ul"
+
+#: ../src/gtk/window.cpp:4136
+msgid ""
+"Compositing not supported by this system, please enable it in your Window "
+"Manager."
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:1560
 msgid "Compressed HTML Help file (*.chm)|*.chm|"
 msgstr "Komprimert HTML-hjelpfil (*.chm)|*.chm|"
 
-#: ../src/generic/dirctrlg.cpp:591
+#: ../src/generic/dirctrlg.cpp:536
 msgid "Computer"
 msgstr "Datamaskin"
 
-#: ../src/common/fileconf.cpp:959
+#: ../src/common/fileconf.cpp:966
 #, c-format
 msgid "Config entry name cannot start with '%c'."
-msgstr "Konfigurasjonsoppføring kan ikke starte med «%c»."
+msgstr "Konfigurasjonsoppføring kan ikke starte med «%c»."
 
-#: ../src/gtk/filedlg.cpp:55
+#: ../src/gtk/filedlg.cpp:56
 msgid "Confirm"
 msgstr "Bekreft"
 
-#: ../src/msw/mimetype.cpp:706
+#: ../src/msw/mimetype.cpp:715
 msgid "Confirm registry update"
 msgstr "Bekretft registeroppdatering"
 
-#: ../src/html/htmlwin.cpp:517
+#: ../src/html/htmlwin.cpp:540
 msgid "Connecting..."
 msgstr "Kobler til..."
 
-#: ../src/html/htmlhelp.cpp:565 ../src/html/helpwnd.cpp:468
+#: ../src/html/helpwnd.cpp:480
 msgid "Contents"
 msgstr "Innhold"
 
-#: ../src/mac/carbon/dataview.cpp:377
-msgid "Control is wrongly initialized."
-msgstr ""
-
-#: ../src/common/strconv.cpp:2003
+#: ../src/common/strconv.cpp:2263
 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
-msgstr "Klarte ikke konvertere til tegnsett «%s»."
+msgstr "Klarte ikke konvertere til tegnsett «%s»."
+
+#: ../src/common/stockitem.cpp:150
+#, fuzzy
+msgid "Convert"
+msgstr "Innhold"
 
-#: ../src/html/htmlwin.cpp:941
+#: ../src/html/htmlwin.cpp:1053
 #, c-format
 msgid "Copied to clipboard:\"%s\""
-msgstr "Kopiert til utklippstavle: «%s»"
+msgstr "Kopiert til utklippstavle: «%s»"
 
-#: ../src/generic/prntdlgg.cpp:254
+#: ../src/generic/prntdlgg.cpp:253
 msgid "Copies:"
 msgstr "Kopier;"
 
-#: ../src/stc/scintilla/src/ScintillaBase.cxx:426
+#: ../src/common/stockitem.cpp:151 ../src/stc/stc_i18n.cpp:19
 #, fuzzy
 msgid "Copy"
 msgstr "&Kopier"
 
-#: ../src/common/stockitem.cpp:203
+#: ../src/common/stockitem.cpp:259
 #, fuzzy
 msgid "Copy selection"
 msgstr "Seksjoner"
 
-#: ../src/mac/carbon/dataview.cpp:1061 ../src/mac/carbon/dataview.cpp:1181
-msgid "Could not add column to internal structures."
-msgstr ""
-
-#: ../src/html/chm.cpp:703
+#: ../src/html/chm.cpp:721
 #, c-format
 msgid "Could not create temporary file '%s'"
-msgstr "Klarte ikke opprette midlertidig fil «%s»"
+msgstr "Klarte ikke opprette midlertidig fil «%s»"
 
-#: ../src/mac/carbon/databrow.cpp:628 ../src/mac/carbon/databrow.cpp:1011
+#: ../src/osx/carbon/dataview.cpp:1286 ../src/osx/carbon/dataview.cpp:1673
 #, fuzzy
 msgid "Could not determine column index."
-msgstr "Klarte ikke starte dokumentforhåndsvisning."
+msgstr "Klarte ikke starte dokumentforhåndsvisning."
 
-#: ../src/mac/carbon/dataview.cpp:1145
+#: ../src/osx/carbon/dataview.cpp:877
 msgid "Could not determine column's position"
 msgstr ""
 
-#: ../src/mac/carbon/dataview.cpp:1253
+#: ../src/osx/carbon/dataview.cpp:844
+#, fuzzy
+msgid "Could not determine number of columns."
+msgstr "Klarte ikke finne ressursfil «%s»."
+
+#: ../src/osx/carbon/dataview.cpp:976
 #, fuzzy
 msgid "Could not determine number of items"
-msgstr "Klarte ikke finne ressursfil «%s»."
+msgstr "Klarte ikke finne ressursfil «%s»."
 
 #: ../src/html/chm.cpp:274
 #, c-format
 msgid "Could not extract %s into %s: %s"
 msgstr "Klarte trekke ut %s inni %s: %s"
 
-#: ../src/generic/tabg.cpp:1051
+#: ../src/generic/tabg.cpp:1049
 msgid "Could not find tab for id"
 msgstr "Klarte ikke finne tab for id"
 
-#: ../src/mac/carbon/dataview.cpp:739 ../src/mac/carbon/dataview.cpp:776
-#: ../src/mac/carbon/dataview.cpp:814 ../src/mac/carbon/dataview.cpp:837
-#: ../src/mac/carbon/dataview.cpp:948
+#: ../src/osx/carbon/dataview.cpp:2557 ../src/osx/carbon/dataview.cpp:2592
+#: ../src/osx/carbon/dataview.cpp:2616 ../src/osx/carbon/dataview.cpp:2637
+#: ../src/osx/carbon/dataview.cpp:2774
 #, fuzzy
 msgid "Could not get header description."
 msgstr "Klarte ikke starte utskrift."
 
-#: ../src/mac/carbon/dataview.cpp:1335 ../src/mac/carbon/dataview.cpp:1395
+#: ../src/osx/carbon/dataview.cpp:1170 ../src/osx/carbon/dataview.cpp:1196
 #, fuzzy
 msgid "Could not get items."
-msgstr "Klarte ikke finne fil «%s»."
+msgstr "Klarte ikke finne fil «%s»."
 
-#: ../src/mac/carbon/dataview.cpp:861 ../src/mac/carbon/dataview.cpp:891
+#: ../src/osx/carbon/dataview.cpp:2660 ../src/osx/carbon/dataview.cpp:2725
 #, fuzzy
 msgid "Could not get property flags."
-msgstr "Klarte ikke opprette midlertidig fil «%s»"
+msgstr "Klarte ikke opprette midlertidig fil «%s»"
 
-#: ../src/mac/carbon/databrow.cpp:504
+#: ../src/osx/carbon/dataview.cpp:727
 #, fuzzy
 msgid "Could not get selected items."
-msgstr "Klarte ikke finne fil «%s»."
+msgstr "Klarte ikke finne fil «%s»."
 
 #: ../src/html/chm.cpp:445
 #, c-format
 msgid "Could not locate file '%s'."
-msgstr "Klarte ikke finne fil «%s»."
+msgstr "Klarte ikke finne fil «%s»."
 
-#: ../src/mac/carbon/dataview.cpp:1090
+#: ../src/osx/carbon/dataview.cpp:846
 #, fuzzy
 msgid "Could not remove column."
 msgstr "Klarte ikke opprette peker."
 
-#: ../src/mac/carbon/databrow.cpp:425
+#: ../src/osx/carbon/dataview.cpp:643
 #, fuzzy
 msgid "Could not retrieve number of items"
-msgstr "Klarte ikke opprette midlertidig fil «%s»"
+msgstr "Klarte ikke opprette midlertidig fil «%s»"
 
-#: ../src/mac/carbon/dataview.cpp:755
+#: ../src/osx/carbon/dataview.cpp:2573
 #, fuzzy
 msgid "Could not set alignment."
 msgstr "Klarte ikke starte utskrift."
 
-#: ../src/mac/carbon/dataview.cpp:969
+#: ../src/osx/carbon/dataview.cpp:2804
 #, fuzzy
 msgid "Could not set column width."
-msgstr "Klarte ikke starte dokumentforhåndsvisning."
+msgstr "Klarte ikke starte dokumentforhåndsvisning."
+
+#: ../src/common/filefn.cpp:1568
+#, fuzzy
+msgid "Could not set current working directory"
+msgstr "Klarte ikke finne gjeldende mappe"
 
-#: ../src/mac/carbon/dataview.cpp:950
+#: ../src/osx/carbon/dataview.cpp:2776
 #, fuzzy
 msgid "Could not set header description."
 msgstr "Klarte ikke starte utskrift."
 
-#: ../src/mac/carbon/dataview.cpp:785
+#: ../src/osx/carbon/dataview.cpp:2597
 #, fuzzy
 msgid "Could not set icon."
 msgstr "Klarte ikke starte utskrift."
 
-#: ../src/mac/carbon/dataview.cpp:816
+#: ../src/osx/carbon/dataview.cpp:2618
 #, fuzzy
 msgid "Could not set maximum width."
 msgstr "Klarte ikke starte utskrift."
 
-#: ../src/mac/carbon/dataview.cpp:839
+#: ../src/osx/carbon/dataview.cpp:2639
 #, fuzzy
 msgid "Could not set minimum width."
 msgstr "Klarte ikke starte utskrift."
 
-#: ../src/mac/carbon/dataview.cpp:866 ../src/mac/carbon/dataview.cpp:896
+#: ../src/osx/carbon/dataview.cpp:2665 ../src/osx/carbon/dataview.cpp:2730
 #, fuzzy
 msgid "Could not set property flags."
 msgstr "Klarte ikke starte utskrift."
 
-#: ../src/common/prntbase.cpp:1547
+#: ../src/common/prntbase.cpp:1953
 msgid "Could not start document preview."
-msgstr "Klarte ikke starte dokumentforhåndsvisning."
+msgstr "Klarte ikke starte dokumentforhåndsvisning."
 
-#: ../src/gtk/gnome/gprint.cpp:925 ../src/gtk/print.cpp:1042
-#: ../src/generic/printps.cpp:181 ../src/msw/printwin.cpp:233
+#: ../src/generic/printps.cpp:179 ../src/msw/printwin.cpp:206
+#: ../src/gtk/print.cpp:1068 ../src/gtk/gnome/gprint.cpp:916
 msgid "Could not start printing."
 msgstr "Klarte ikke starte utskrift."
 
-#: ../src/common/wincmn.cpp:1621
+#: ../src/common/wincmn.cpp:1973
 msgid "Could not transfer data to window"
-msgstr "Klarte ikke overføre data til vindu"
+msgstr "Klarte ikke overføre data til vindu"
 
-#: ../src/mac/carbon/mpthread.cpp:222 ../src/mac/carbon/mpthread.cpp:301
-msgid "Could not unlock mutex"
-msgstr "Klarte ikke åpne mutex"
-
-#: ../src/os2/thread.cpp:159
+#: ../src/os2/thread.cpp:161
 msgid "Couldn't acquire a mutex lock"
-msgstr "Klarte ikke sette mutex-lås"
+msgstr "Klarte ikke sette mutex-lås"
 
-#: ../src/msw/dragimag.cpp:156 ../src/msw/dragimag.cpp:195
-#: ../src/msw/imaglist.cpp:149 ../src/msw/imaglist.cpp:167
-#: ../src/msw/imaglist.cpp:179
+#: ../src/msw/imaglist.cpp:167 ../src/msw/imaglist.cpp:198
+#: ../src/msw/imaglist.cpp:210 ../src/msw/dragimag.cpp:194
+#: ../src/msw/dragimag.cpp:233
 msgid "Couldn't add an image to the image list."
 msgstr "Klarte ikke legge til et bilde i bildelisten."
 
-#: ../src/os2/timer.cpp:114 ../src/msw/timer.cpp:83
+#: ../src/msw/timer.cpp:135 ../src/os2/timer.cpp:114
 msgid "Couldn't create a timer"
 msgstr "Klarte ikke opprette en timer"
 
-#: ../src/mgl/cursor.cpp:132 ../src/mgl/cursor.cpp:163
-msgid "Couldn't create cursor."
-msgstr "Klarte ikke opprette peker."
-
-#: ../src/mac/carbon/overlay.cpp:125
+#: ../src/osx/carbon/overlay.cpp:123
 #, fuzzy
 msgid "Couldn't create the overlay window"
 msgstr "Klarte ikke opprette en timer"
 
+#: ../src/common/translation.cpp:1853
+#, fuzzy
+msgid "Couldn't enumerate translations"
+msgstr "Klarte ikke avslutte tråden."
+
 #: ../src/common/dynlib.cpp:157
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
-msgstr "Klarte ikke finne symbol «%s» i et dynamisk bibliotek"
+msgstr "Klarte ikke finne symbol «%s» i et dynamisk bibliotek"
 
-#: ../src/gtk/print.cpp:2055
+#: ../src/gtk/print.cpp:2005
 msgid "Couldn't get hatch style from wxBrush."
 msgstr ""
 
-#: ../src/msw/thread.cpp:899
+#: ../src/msw/thread.cpp:948
 msgid "Couldn't get the current thread pointer"
-msgstr "Klarte ikke finne gjeldende trådpeker"
+msgstr "Klarte ikke finne gjeldende trådpeker"
 
-#: ../src/mac/carbon/overlay.cpp:132
+#: ../src/osx/carbon/overlay.cpp:130
 #, fuzzy
 msgid "Couldn't init the context on the overlay window"
-msgstr "Klarte ikke finne gjeldende trådpeker"
+msgstr "Klarte ikke finne gjeldende trådpeker"
 
-#: ../src/common/imagpng.cpp:615
+#: ../src/common/imaggif.cpp:264
+#, fuzzy
+msgid "Couldn't initialize GIF hash table."
+msgstr "Klarte ikke klargjøre zlib-strøm for nedpakking."
+
+#: ../src/common/imagpng.cpp:658
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr ""
-"Klarte ikke laste PNG-bilde - filen er ødelagt er det er for lite minne."
+"Klarte ikke laste PNG-bilde - filen er ødelagt er det er for lite minne."
 
 #: ../src/unix/sound.cpp:471
 #, c-format
 msgid "Couldn't load sound data from '%s'."
-msgstr "Klarte ikke laste lyddata fra «%s»."
+msgstr "Klarte ikke laste lyddata fra «%s»."
 
-#: ../src/unix/sound_sdl.cpp:228
+#: ../src/unix/sound_sdl.cpp:226
 #, c-format
 msgid "Couldn't open audio: %s"
-msgstr "Klarte ikke åpne lyd: %s"
+msgstr "Klarte ikke åpne lyd: %s"
 
 #: ../src/msw/ole/dataobj.cpp:145
 #, c-format
 msgid "Couldn't register clipboard format '%s'."
-msgstr "Klarte ikke registrere utklippstavleformat «%s»."
+msgstr "Klarte ikke registrere utklippstavleformat «%s»."
 
-#: ../src/os2/thread.cpp:176
+#: ../src/os2/thread.cpp:178
 msgid "Couldn't release a mutex"
-msgstr "Klarte ikke slippe løs en mutex"
+msgstr "Klarte ikke slippe løs en mutex"
 
-#: ../src/msw/listctrl.cpp:802
+#: ../src/msw/listctrl.cpp:757
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "Klarte ikke hente informasjon om listekontrolelement %d."
 
-#: ../src/common/imagpng.cpp:664 ../src/common/imagpng.cpp:673
-#: ../src/common/imagpng.cpp:681
+#: ../src/common/imagpng.cpp:747 ../src/common/imagpng.cpp:758
+#: ../src/common/imagpng.cpp:768
 msgid "Couldn't save PNG image."
 msgstr "Klarte ikke lagre PNG-bilde."
 
-#: ../src/msw/thread.cpp:669
+#: ../src/msw/thread.cpp:715
 msgid "Couldn't terminate thread"
-msgstr "Klarte ikke avslutte tråden."
+msgstr "Klarte ikke avslutte tråden."
 
-#: ../src/common/xtistrm.cpp:157
-msgid "Create Parameter not found in declared RTTI Parameters"
+#: ../src/common/xtistrm.cpp:171
+#, fuzzy, c-format
+msgid "Create Parameter %s not found in declared RTTI Parameters"
 msgstr "Create Parameter ble ikke funnet blant deklarerte RTTI parametere"
 
 #: ../src/generic/dirdlgg.cpp:318
 msgid "Create directory"
 msgstr "Opprett mappe"
 
-#: ../src/generic/dirdlgg.cpp:132 ../src/generic/filedlgg.cpp:230
+#: ../src/generic/filedlgg.cpp:228 ../src/generic/dirdlgg.cpp:132
 msgid "Create new directory"
 msgstr "Opprett ny mappe"
 
-#: ../src/common/accelcmn.cpp:296
+#: ../src/common/accelcmn.cpp:313
 #, fuzzy
-msgid "Ctrl-"
+msgid "Ctrl+"
 msgstr "ctrl"
 
-#: ../src/common/stockitem.cpp:118 ../src/richtext/richtextctrl.cpp:2595
-#: ../src/msw/textctrl.cpp:2151 ../src/mac/carbon/textctrl.cpp:1064
+#: ../src/richtext/richtextctrl.cpp:325 ../src/osx/textctrl_osx.cpp:583
+#: ../src/common/stockitem.cpp:152 ../src/msw/textctrl.cpp:2222
 msgid "Cu&t"
 msgstr "Ku&tt"
 
-#: ../src/generic/filectrlg.cpp:951
+#: ../src/generic/filectrlg.cpp:946
 msgid "Current directory:"
 msgstr "Gjeldende mappe:"
 
-#: ../src/gtk/print.cpp:756
+#: ../src/gtk/print.cpp:755
 #, fuzzy
 msgid "Custom size"
-msgstr "skriftstørrelse"
+msgstr "skriftstørrelse"
 
-#: ../src/stc/scintilla/src/ScintillaBase.cxx:425
+#: ../src/common/headerctrlcmn.cpp:61
 #, fuzzy
-msgid "Cut"
+msgid "Customize Columns"
+msgstr "skriftstørrelse"
+
+#: ../src/common/stockitem.cpp:152 ../src/stc/stc_i18n.cpp:18
+#, fuzzy
+msgid "Cut"
 msgstr "Ku&tt"
 
-#: ../src/common/stockitem.cpp:204
+#: ../src/common/stockitem.cpp:260
 #, fuzzy
 msgid "Cut selection"
 msgstr "Seksjoner"
 
-#: ../src/common/fmapbase.cpp:112
+#: ../src/common/fmapbase.cpp:151
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kyrillisk (ISO-8859-5)"
 
@@ -2291,43 +2623,43 @@ msgstr "Kyrillisk (ISO-8859-5)"
 msgid "D sheet, 22 x 34 in"
 msgstr "D-ark, 22 x 34 tommer"
 
-#: ../src/msw/dde.cpp:706
+#: ../src/msw/dde.cpp:709
 msgid "DDE poke request failed"
-msgstr "DDE-«snuse» forespørsel feilet"
+msgstr "DDE-«snuse» forespørsel feilet"
 
-#: ../src/common/accelcmn.cpp:78
+#: ../src/common/accelcmn.cpp:80
 msgid "DECIMAL"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:46
+#: ../src/common/accelcmn.cpp:48
 msgid "DEL"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:47
+#: ../src/common/accelcmn.cpp:49
 msgid "DELETE"
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:944
+#: ../src/common/imagbmp.cpp:1045
 msgid "DIB Header: Encoding doesn't match bitdepth."
 msgstr "DIB-hode: Koding stemmer ikke med bitdybde."
 
-#: ../src/common/imagbmp.cpp:905
+#: ../src/common/imagbmp.cpp:1000
 msgid "DIB Header: Image height > 32767 pixels for file."
-msgstr "DIB-hode: Bildehøyde > 32767 piksler for filen."
+msgstr "DIB-hode: Bildehøyde > 32767 piksler for filen."
 
-#: ../src/common/imagbmp.cpp:899
+#: ../src/common/imagbmp.cpp:992
 msgid "DIB Header: Image width > 32767 pixels for file."
 msgstr "DIB-hode: Bildebredde > 32767 piksler for filen."
 
-#: ../src/common/imagbmp.cpp:919
+#: ../src/common/imagbmp.cpp:1016
 msgid "DIB Header: Unknown bitdepth in file."
 msgstr "DIB-hode: Ukjent bitdybde i filen."
 
-#: ../src/common/imagbmp.cpp:929
+#: ../src/common/imagbmp.cpp:1028
 msgid "DIB Header: Unknown encoding in file."
 msgstr "DIB-hode: Ukjent koding i filen."
 
-#: ../src/common/accelcmn.cpp:79
+#: ../src/common/accelcmn.cpp:81
 #, fuzzy
 msgid "DIVIDE"
 msgstr "<LAGERENHET>"
@@ -2336,79 +2668,84 @@ msgstr "<LAGERENHET>"
 msgid "DL Envelope, 110 x 220 mm"
 msgstr "DL-konvolutt, 11 x 220 mm"
 
-#: ../src/common/accelcmn.cpp:58
+#: ../src/common/accelcmn.cpp:60
 msgid "DOWN"
 msgstr ""
 
-#: ../src/mac/carbon/dataview.cpp:345
-msgid "Data view control is not correctly initialized"
+#: ../src/richtext/richtextborderspage.cpp:545
+msgid "Dashed"
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:1922
+msgid "Data object has invalid data format"
 msgstr ""
 
-#: ../src/mac/carbon/dataview.cpp:694
+#: ../src/osx/carbon/dataview.cpp:2492
 msgid "Date renderer cannot render value; value type: "
 msgstr ""
 
-#: ../src/generic/dbgrptg.cpp:296
+#: ../src/generic/dbgrptg.cpp:297
 #, c-format
 msgid "Debug report \"%s\""
-msgstr "Feilsøkingsrapport «%s»"
+msgstr "Feilsøkingsrapport «%s»"
 
 #: ../src/common/debugrpt.cpp:209
 msgid "Debug report couldn't be created."
-msgstr "Feilsøkingsrapport kunne ikke opprettes."
+msgstr "Feilsøkingsrapport kunne ikke opprettes."
 
-#: ../src/common/debugrpt.cpp:545
+#: ../src/common/debugrpt.cpp:549
 msgid "Debug report generation has failed."
-msgstr "Generering av feilsøkingsrapport feilet."
+msgstr "Generering av feilsøkingsrapport feilet."
 
-#: ../src/generic/fontdlgg.cpp:325
+#: ../src/generic/fontdlgg.cpp:324
 msgid "Decorative"
 msgstr "Dekorativ"
 
-#: ../src/common/fmapbase.cpp:661
+#: ../src/common/fmapbase.cpp:783
 msgid "Default encoding"
 msgstr "Standardkoding"
 
-#: ../src/dfb/fontmgr.cpp:184
+#: ../src/dfb/fontmgr.cpp:181
 #, fuzzy
 msgid "Default font"
 msgstr "Standard skriver"
 
-#: ../src/generic/prntdlgg.cpp:515
+#: ../src/generic/prntdlgg.cpp:516
 msgid "Default printer"
 msgstr "Standard skriver"
 
-#: ../src/richtext/richtextbuffer.cpp:5343
-#: ../src/stc/scintilla/src/ScintillaBase.cxx:428
+#: ../src/richtext/richtextbuffer.cpp:7145 ../src/common/stockitem.cpp:153
+#: ../src/stc/stc_i18n.cpp:21
 #, fuzzy
 msgid "Delete"
 msgstr "&Slett"
 
-#: ../src/richtext/richtexttabspage.cpp:148
+#: ../src/richtext/richtexttabspage.cpp:149
 #, fuzzy
 msgid "Delete A&ll"
 msgstr "Velg &alle"
 
-#: ../src/richtext/richtextstyledlg.cpp:734
+#: ../src/richtext/richtextstyledlg.cpp:783
 #, fuzzy
 msgid "Delete Style"
 msgstr "Slett element"
 
-#: ../src/richtext/richtextctrl.cpp:639 ../src/richtext/richtextctrl.cpp:687
+#: ../src/richtext/richtextctrl.cpp:1126 ../src/richtext/richtextctrl.cpp:1266
+#: ../src/richtext/richtextctrl.cpp:1340
 #, fuzzy
 msgid "Delete Text"
 msgstr "Slett element"
 
-#: ../src/generic/editlbox.cpp:274
+#: ../src/generic/editlbox.cpp:275
 msgid "Delete item"
 msgstr "Slett element"
 
-#: ../src/common/stockitem.cpp:205
+#: ../src/common/stockitem.cpp:261
 #, fuzzy
 msgid "Delete selection"
 msgstr "Seksjoner"
 
-#: ../src/richtext/richtextstyledlg.cpp:734
+#: ../src/richtext/richtextstyledlg.cpp:783
 #, fuzzy, c-format
 msgid "Delete style %s?"
 msgstr "Slett element"
@@ -2416,14 +2753,19 @@ msgstr "Slett element"
 #: ../src/unix/snglinst.cpp:296
 #, c-format
 msgid "Deleted stale lock file '%s'."
-msgstr "Slettet forslitt låsefil «%s»."
+msgstr "Slettet forslitt låsefil «%s»."
 
 #: ../src/common/module.cpp:125
 #, c-format
 msgid "Dependency \"%s\" of module \"%s\" doesn't exist."
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:660
+#: ../src/common/stockitem.cpp:197
+#, fuzzy
+msgid "Descending"
+msgstr "Standardkoding"
+
+#: ../src/generic/dirctrlg.cpp:618
 msgid "Desktop"
 msgstr "Skrivebord"
 
@@ -2431,19 +2773,19 @@ msgstr "Skrivebord"
 msgid "Developed by "
 msgstr ""
 
-#: ../src/generic/aboutdlgg.cpp:142
+#: ../src/generic/aboutdlgg.cpp:177
 msgid "Developers"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:396
+#: ../src/msw/dialup.cpp:394
 msgid ""
 "Dial up functions are unavailable because the remote access service (RAS) is "
 "not installed on this machine. Please install it."
 msgstr ""
 "Oppringingsfunskjonene er utilgjengelig fordi Remote Access Service (RAS) "
-"ikke er installert på denne maskinene."
+"ikke er installert på denne maskinene."
 
-#: ../src/generic/tipdlg.cpp:228
+#: ../src/generic/tipdlg.cpp:231
 msgid "Did you know..."
 msgstr "Visste du at..."
 
@@ -2452,46 +2794,50 @@ msgstr "Visste du at..."
 msgid "DirectFB error %d occured."
 msgstr ""
 
-#: ../src/motif/filedlg.cpp:219
+#: ../src/motif/filedlg.cpp:218
 #, fuzzy
 msgid "Directories"
 msgstr "Dekorativ"
 
-#: ../src/common/filefn.cpp:1290
+#: ../src/common/filefn.cpp:1248
 #, c-format
 msgid "Directory '%s' couldn't be created"
-msgstr "Mappe «%s» kunne ikke opprettes"
+msgstr "Mappe «%s» kunne ikke opprettes"
 
-#: ../src/mgl/dirmgl.cpp:211
-#, c-format
-msgid "Directory '%s' doesn't exist!"
-msgstr "Mappen «%s» eksisterer ikke!"
+#: ../src/common/filefn.cpp:1268
+#, fuzzy, c-format
+msgid "Directory '%s' couldn't be deleted"
+msgstr "Mappe «%s» kunne ikke opprettes"
 
 #: ../src/generic/dirdlgg.cpp:234
 msgid "Directory does not exist"
 msgstr "Mappen eksisterer ikke"
 
-#: ../src/generic/filectrlg.cpp:1405
+#: ../src/generic/filectrlg.cpp:1402
 msgid "Directory doesn't exist."
 msgstr "Mappen eksisterer ikke."
 
-#: ../src/html/helpwnd.cpp:498
+#: ../src/common/docview.cpp:457
+msgid "Discard changes and reload the last saved version?"
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:510
 msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr ""
-"Vis alle indekselementer som inneholder den oppgitte delstrengen. Søket er "
+"Vis alle indekselementer som inneholder den oppgitte delstrengen. Søket er "
 "uavhengig av liten eller stor bokstav."
 
-#: ../src/html/helpwnd.cpp:695
+#: ../src/html/helpwnd.cpp:690
 msgid "Display options dialog"
 msgstr "Vis innstillingsvindu"
 
-#: ../src/html/helpwnd.cpp:325
+#: ../src/html/helpwnd.cpp:329
 msgid "Displays help as you browse the books on the left."
 msgstr ""
 
-#: ../src/msw/mimetype.cpp:699
+#: ../src/msw/mimetype.cpp:708
 msgid ""
 "Do you want to overwrite the command used to %s files with extension \"%s"
 "\" ?\n"
@@ -2500,255 +2846,339 @@ msgid ""
 "New value is \n"
 "%s %1"
 msgstr ""
-"Vil du overskrive kommandoen brukt for å %s filer av type «%s»?\n"
+"Vil du overskrive kommandoen brukt for å %s filer av type «%s»?\n"
 "Gjeldende verdi er \n"
 "%s, \n"
 "Ny verdi er \n"
 "%s %1"
 
-#: ../src/common/docview.cpp:481
-#, c-format
-msgid "Do you want to save changes to document %s?"
-msgstr "Vil du lagre endringer til document «%s»?"
+#: ../src/common/docview.cpp:533
+#, fuzzy, c-format
+msgid "Do you want to save changes to %s?"
+msgstr "Vil du lagre endringer til document «%s»?"
 
 #: ../src/generic/aboutdlgg.cpp:74
 msgid "Documentation by "
 msgstr ""
 
-#: ../src/generic/aboutdlgg.cpp:146
+#: ../src/generic/aboutdlgg.cpp:181
 msgid "Documentation writers"
 msgstr ""
 
-#: ../src/common/sizer.cpp:2428
+#: ../src/common/sizer.cpp:2579
 msgid "Don't Save"
 msgstr "Ikke lagre"
 
-#: ../src/html/htmlwin.cpp:583 ../src/msw/frame.cpp:195
+#: ../src/msw/frame.cpp:129 ../src/html/htmlwin.cpp:607
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../src/generic/progdlgg.cpp:408
+#: ../src/generic/progdlgg.cpp:482 ../src/msw/progdlg.cpp:408
 msgid "Done."
 msgstr "ferdig."
 
+#: ../src/richtext/richtextborderspage.cpp:544
+#, fuzzy
+msgid "Dotted"
+msgstr "Ferdig"
+
+#: ../src/richtext/richtextborderspage.cpp:546
+#, fuzzy
+msgid "Double"
+msgstr "Ferdig"
+
 #: ../src/common/paper.cpp:178
 msgid "Double Japanese Postcard Rotated 148 x 200 mm"
 msgstr ""
 
-#: ../src/common/xtixml.cpp:268
+#: ../src/common/xtixml.cpp:274
 #, c-format
 msgid "Doubly used id : %d"
 msgstr "Dobbel bruker-ID: %d"
 
-#: ../src/generic/fdrepdlg.cpp:153
+#: ../src/generic/fdrepdlg.cpp:153 ../src/common/stockitem.cpp:154
 msgid "Down"
 msgstr "Ned"
 
+#: ../src/richtext/richtextctrl.cpp:787
+msgid "Drag"
+msgstr ""
+
 #: ../src/common/paper.cpp:102
 msgid "E sheet, 34 x 44 in"
 msgstr "E-ark, 34 x 44 tommer"
 
-#: ../src/common/accelcmn.cpp:60
+#: ../src/common/accelcmn.cpp:62
 msgid "END"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:51
+#: ../src/common/accelcmn.cpp:53
 msgid "ENTER"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:63
+#: ../src/unix/fswatcher_inotify.cpp:335
+#, fuzzy
+msgid "EOF while reading from inotify descriptor"
+msgstr "klarte ikke lese fra fildeskriptor %d"
+
+#: ../src/common/accelcmn.cpp:65
 msgid "ESC"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:64
+#: ../src/common/accelcmn.cpp:66
 msgid "ESCAPE"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:72
+#: ../src/common/accelcmn.cpp:74
 msgid "EXECUTE"
 msgstr ""
 
-#: ../src/generic/editlbox.cpp:272
+#: ../src/common/stockitem.cpp:155
+#, fuzzy
+msgid "Edit"
+msgstr "Redigere element"
+
+#: ../src/generic/editlbox.cpp:273
 msgid "Edit item"
 msgstr "Redigere element"
 
-#: ../src/generic/progdlgg.cpp:198
+#: ../src/richtext/richtextsizepage.cpp:257
+#: ../src/richtext/richtextsizepage.cpp:259
+#: ../src/richtext/richtextsizepage.cpp:365
+#: ../src/richtext/richtextsizepage.cpp:367
+msgid "Enable the height value."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:338
+#: ../src/richtext/richtextsizepage.cpp:340
+#, fuzzy
+msgid "Enable the maximum width value."
+msgstr "Klarte ikke starte utskrift."
+
+#: ../src/richtext/richtextsizepage.cpp:311
+#: ../src/richtext/richtextsizepage.cpp:313
+msgid "Enable the minimum height value."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:284
+#: ../src/richtext/richtextsizepage.cpp:286
+#, fuzzy
+msgid "Enable the minimum width value."
+msgstr "Klarte ikke starte utskrift."
+
+#: ../src/richtext/richtextsizepage.cpp:230
+#: ../src/richtext/richtextsizepage.cpp:232
+msgid "Enable the width value."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:410
+#: ../src/richtext/richtextsizepage.cpp:412
+#, fuzzy
+msgid "Enable vertical alignment."
+msgstr "Klarte ikke starte utskrift."
+
+#: ../src/richtext/richtextsizepage.cpp:452
+#: ../src/richtext/richtextsizepage.cpp:454
+msgid "Enable vertical offset."
+msgstr ""
+
+#: ../src/richtext/richtextbackgroundpage.cpp:133
+#: ../src/richtext/richtextbackgroundpage.cpp:135
+msgid "Enables a background colour."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:935
 #, fuzzy
-msgid "Elapsed time:"
-msgstr "Forløpt tid :"
+msgid "Enter a box style name"
+msgstr "Skriftstil"
 
-#: ../src/richtext/richtextstyledlg.cpp:568
+#: ../src/richtext/richtextstyledlg.cpp:607
 msgid "Enter a character style name"
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:770
+#: ../src/richtext/richtextstyledlg.cpp:821
 msgid "Enter a list style name"
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:843
+#: ../src/richtext/richtextstyledlg.cpp:894
 #, fuzzy
 msgid "Enter a new style name"
 msgstr "Skriftstil"
 
-#: ../src/common/prntbase.cpp:1086
-#, c-format
-msgid "Enter a page number between %d and %d:"
-msgstr "Oppgi et sidetall mellom %d og %d:"
-
-#: ../src/richtext/richtextstyledlg.cpp:616
+#: ../src/richtext/richtextstyledlg.cpp:655
 msgid "Enter a paragraph style name"
 msgstr ""
 
-#: ../src/generic/dbgrptg.cpp:170
+#: ../src/generic/dbgrptg.cpp:171
 #, c-format
 msgid "Enter command to open file \"%s\":"
-msgstr "Skriv inn kommando for å åpne fil «%s»:"
+msgstr "Skriv inn kommando for å åpne fil «%s»:"
 
-#: ../src/generic/helpext.cpp:465
+#: ../src/generic/helpext.cpp:464
 msgid "Entries found"
-msgstr "Oppføringer funnet"
+msgstr "Oppføringer funnet"
 
 #: ../src/common/paper.cpp:144
 #, fuzzy
 msgid "Envelope Invite 220 x 220 mm"
 msgstr "DL-konvolutt, 11 x 220 mm"
 
-#: ../src/common/config.cpp:433
+#: ../src/common/config.cpp:474
 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %u in '%s'."
-msgstr "Utvidelse av miljøvariabel feilet: manglende «%c» i posisjon %u i «%s»."
-
-#: ../src/gtk/filedlg.cpp:67 ../src/gtk1/fontdlg.cpp:75
-#: ../src/generic/filectrlg.cpp:676 ../src/generic/filectrlg.cpp:790
-#: ../src/generic/filectrlg.cpp:804 ../src/generic/filectrlg.cpp:820
-#: ../src/generic/filectrlg.cpp:1374 ../src/generic/filectrlg.cpp:1405
-#: ../src/generic/dirdlgg.cpp:353 ../src/generic/dirctrlg.cpp:703
-#: ../src/generic/dirctrlg.cpp:721 ../src/generic/dirctrlg.cpp:732
+msgstr "Utvidelse av miljøvariabel feilet: manglende «%c» i posisjon %u i «%s»."
+
+#: ../src/generic/dirctrlg.cpp:662 ../src/generic/dirctrlg.cpp:680
+#: ../src/generic/dirctrlg.cpp:691 ../src/generic/dirdlgg.cpp:353
+#: ../src/generic/filectrlg.cpp:671 ../src/generic/filectrlg.cpp:785
+#: ../src/generic/filectrlg.cpp:799 ../src/generic/filectrlg.cpp:815
+#: ../src/generic/filectrlg.cpp:1371 ../src/generic/filectrlg.cpp:1402
+#: ../src/gtk/filedlg.cpp:69 ../src/gtk1/fontdlg.cpp:75
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/unix/epolldispatcher.cpp:101
+#: ../src/unix/epolldispatcher.cpp:104
 #, fuzzy
 msgid "Error closing epoll descriptor"
 msgstr "Feil ved opprettelse av mappe"
 
+#: ../src/unix/fswatcher_kqueue.cpp:115
+#, fuzzy
+msgid "Error closing kqueue instance"
+msgstr "Feil ved opprettelse av mappe"
+
 #: ../src/generic/dirdlgg.cpp:252
 msgid "Error creating directory"
 msgstr "Feil ved opprettelse av mappe"
 
-#: ../src/common/imagbmp.cpp:953
+#: ../src/common/imagbmp.cpp:1056
 #, fuzzy
 msgid "Error in reading image DIB."
 msgstr "Feil ved lesing av bilde DIB."
 
-#: ../src/common/fileconf.cpp:459
+#: ../src/propgrid/propgrid.cpp:6563
+#, c-format
+msgid "Error in resource: %s"
+msgstr ""
+
+#: ../src/common/fileconf.cpp:454
 msgid "Error reading config options."
 msgstr "Feil ved lesing av konfigurasjonsvalg."
 
-#: ../src/common/fileconf.cpp:1058
+#: ../src/common/fileconf.cpp:1065
 msgid "Error saving user configuration data."
 msgstr "Feil ved lagring av brukerkonfigurasjonsdata."
 
-#: ../src/gtk/print.cpp:677
+#: ../src/gtk/print.cpp:669
 #, fuzzy
 msgid "Error while printing: "
-msgstr "Feil under venting på semafor"
+msgstr "Feil under venting på semafor"
 
-#: ../src/mac/carbon/mpthread.cpp:477
-msgid "Error while waiting on semaphore"
-msgstr "Feil under venting på semafor"
-
-#: ../src/common/log.cpp:709
+#: ../src/common/log.cpp:226
 msgid "Error: "
 msgstr "Feil:"
 
-#: ../src/common/fmapbase.cpp:110
+#: ../src/common/fmapbase.cpp:149
 msgid "Esperanto (ISO-8859-3)"
 msgstr "Esperanto (ISO-8859-3)"
 
-#: ../src/generic/progdlgg.cpp:206
+#: ../src/unix/fswatcher_inotify.cpp:415
+msgid "Event queue overflowed"
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:231
 #, fuzzy
-msgid "Estimated time:"
-msgstr "Anslått tid :"
+msgid "Executable files (*.exe)|*.exe|"
+msgstr "Kjørbare filer (*.exe)|*.exe|Alle filer (*.*)|*.*||"
 
-#: ../src/generic/dbgrptg.cpp:230
-msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||"
-msgstr "Kjørbare filer (*.exe)|*.exe|Alle filer (*.*)|*.*||"
+#: ../src/common/stockitem.cpp:156
+msgid "Execute"
+msgstr ""
 
-#: ../src/msw/utilsexc.cpp:838
+#: ../src/msw/utilsexc.cpp:904
 #, c-format
 msgid "Execution of command '%s' failed"
-msgstr "Utførelse av kommandoen «%s» feilet"
+msgstr "Utførelse av kommandoen «%s» feilet"
 
-#: ../src/os2/utilsexc.cpp:163
+#: ../src/os2/utilsexc.cpp:164
 #, c-format
 msgid "Execution of command '%s' failed with error: %ul"
-msgstr "Utførelse av kommandoen «%s» feilet med feil: %ul"
+msgstr "Utførelse av kommandoen «%s» feilet med feil: %ul"
 
 #: ../src/common/paper.cpp:107
 msgid "Executive, 7 1/4 x 10 1/2 in"
 msgstr "Executive, 7 1/4 x 10 1/2 tommer"
 
-#: ../src/msw/registry.cpp:1159
+#: ../src/msw/registry.cpp:1231
 #, c-format
 msgid ""
 "Exporting registry key: file \"%s\" already exists and won't be overwritten."
 msgstr ""
-"Eksporterer registernøkkel: file «%s» eksisterer allerede og kan ikke "
+"Eksporterer registernøkkel: file «%s» eksisterer allerede og kan ikke "
 "overskrives"
 
-#: ../src/common/fmapbase.cpp:152
+#: ../src/common/fmapbase.cpp:192
 msgid "Extended Unix Codepage for Japanese (EUC-JP)"
 msgstr "Utvidet Unix tegntabell for japansk (EUC-JP)"
 
-#: ../src/html/chm.cpp:710
+#: ../src/html/chm.cpp:728
 #, c-format
 msgid "Extraction of '%s' into '%s' failed."
-msgstr "Utpakking av «%s» inni «%s» feilet."
+msgstr "Utpakking av «%s» inni «%s» feilet."
 
-#: ../src/common/accelcmn.cpp:231 ../src/common/accelcmn.cpp:303
+#: ../src/common/accelcmn.cpp:239 ../src/common/accelcmn.cpp:324
 msgid "F"
 msgstr ""
 
+#: ../src/propgrid/advprops.cpp:641
+#, fuzzy
+msgid "Face Name"
+msgstr "NyttNavn"
+
 #: ../src/unix/snglinst.cpp:270
 msgid "Failed to access lock file."
-msgstr "Klarte ikke få fatt i låsefil."
+msgstr "Klarte ikke få fatt i låsefil."
 
-#: ../src/unix/epolldispatcher.cpp:114
+#: ../src/unix/epolldispatcher.cpp:117
 #, fuzzy, c-format
 msgid "Failed to add descriptor %d to epoll descriptor %d"
 msgstr "klarte ikke skrive til deskriptor %d"
 
-#: ../src/common/glcmn.cpp:82
+#: ../src/msw/dib.cpp:551
+#, fuzzy, c-format
+msgid "Failed to allocate %luKb of memory for bitmap data."
+msgstr "Klarte ikke reservere %lu Kb minne for bitmap data."
+
+#: ../src/common/glcmn.cpp:88
 #, fuzzy
 msgid "Failed to allocate colour for OpenGL"
 msgstr "Klarte ikke opprette peker."
 
-#: ../src/msw/dib.cpp:567
-#, c-format
-msgid "Failed to allocated %luKb of memory for bitmap data."
-msgstr "Klarte ikke reservere %lu Kb minne for bitmap data."
-
-#: ../src/unix/displayx11.cpp:234
+#: ../src/unix/displayx11.cpp:289
 msgid "Failed to change video mode"
 msgstr "Klarte ikke skifte videomodus"
 
+#: ../src/common/image.cpp:2943
+#, fuzzy, c-format
+msgid "Failed to check format of image file \"%s\"."
+msgstr "Klarte ikke lagre bitmap-bilde til filen «%s». "
+
 #: ../src/common/debugrpt.cpp:243
 #, c-format
 msgid "Failed to clean up debug report directory \"%s\""
-msgstr "Klarte ikke rydde opp i feilsøkingsrapportmappe «%s»"
+msgstr "Klarte ikke rydde opp i feilsøkingsrapportmappe «%s»"
 
-#: ../src/common/filename.cpp:196
+#: ../src/common/filename.cpp:222
 msgid "Failed to close file handle"
 msgstr "Klarte ikke lukke filreferanse"
 
 #: ../src/unix/snglinst.cpp:335
 #, c-format
 msgid "Failed to close lock file '%s'"
-msgstr "Klarte ikke lukke låsefil «%s»"
+msgstr "Klarte ikke lukke låsefil «%s»"
 
-#: ../src/msw/clipbrd.cpp:113
+#: ../src/msw/clipbrd.cpp:115
 msgid "Failed to close the clipboard."
 msgstr "Klarte ikke lukke utklippstavlen."
 
@@ -2757,77 +3187,78 @@ msgstr "Klarte ikke lukke utklippstavlen."
 msgid "Failed to close the display \"%s\""
 msgstr "Klarte ikke lukke utklippstavlen."
 
-#: ../src/gtk/utilsgtk.cpp:293
-#, fuzzy, c-format
-msgid "Failed to connect to session manager: %s"
-msgstr "Klarte ikke %s oppringingsforbindelse: %s"
-
-#: ../src/msw/dialup.cpp:825
+#: ../src/msw/dialup.cpp:819
 msgid "Failed to connect: missing username/password."
 msgstr "Klarte ikke opprette forbindelse: manglende brukernavn/passord."
 
-#: ../src/msw/dialup.cpp:771
+#: ../src/msw/dialup.cpp:765
 msgid "Failed to connect: no ISP to dial."
-msgstr "Klarte ikke opprette forbindelse: ingen ISP å ringe til."
+msgstr "Klarte ikke opprette forbindelse: ingen ISP å ringe til."
 
-#: ../src/common/textfile.cpp:177
+#: ../src/common/textfile.cpp:201
 #, fuzzy, c-format
 msgid "Failed to convert file \"%s\" to Unicode."
 msgstr "Klarte ikke lukke filreferanse"
 
-#: ../src/msw/registry.cpp:637
+#: ../src/generic/logg.cpp:978
+#, fuzzy
+msgid "Failed to copy dialog contents to the clipboard."
+msgstr "Klarte ikke åpne utklippstavle."
+
+#: ../src/msw/registry.cpp:692
 #, c-format
 msgid "Failed to copy registry value '%s'"
-msgstr "Klarte ikke kopiere registerverdir «%s»."
+msgstr "Klarte ikke kopiere registerverdir «%s»."
 
-#: ../src/msw/registry.cpp:646
+#: ../src/msw/registry.cpp:701
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
-msgstr "Klarte ikke kopiere innholdet av registernøkkel «%s» til «%s»."
+msgstr "Klarte ikke kopiere innholdet av registernøkkel «%s» til «%s»."
 
-#: ../src/common/filefn.cpp:1095
+#: ../src/common/filefn.cpp:1055
 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
-msgstr "Klarte ikke kopiere file «%s» til «%s»."
+msgstr "Klarte ikke kopiere file «%s» til «%s»."
 
-#: ../src/msw/registry.cpp:624
+#: ../src/msw/registry.cpp:679
 #, c-format
 msgid "Failed to copy the registry subkey '%s' to '%s'."
-msgstr "Klarte ikke kopiere registerundernøkkel «%s» til «%s»."
+msgstr "Klarte ikke kopiere registerundernøkkel «%s» til «%s»."
 
-#: ../src/msw/dde.cpp:1071
+#: ../src/msw/dde.cpp:1074
 msgid "Failed to create DDE string"
 msgstr "Klarte ikke opprette DDE-streng"
 
-#: ../src/msw/mdi.cpp:470
+#: ../src/msw/mdi.cpp:569
 msgid "Failed to create MDI parent frame."
 msgstr "Klarte ikke opprette MDI foreldreramme."
 
-#: ../src/msw/statusbar.cpp:115
-msgid "Failed to create a status bar."
-msgstr "Klarte ikke opprette statusbar."
-
-#: ../src/common/filename.cpp:859
+#: ../src/common/filename.cpp:1032
 msgid "Failed to create a temporary file name"
 msgstr "Klarte ikke opprette et midlertidig filnavn"
 
-#: ../src/msw/utilsexc.cpp:272
+#: ../src/msw/utilsexc.cpp:271
 msgid "Failed to create an anonymous pipe"
-msgstr "Klarte ikke opprette et anonym rør"
+msgstr "Klarte ikke opprette et anonym rør"
+
+#: ../src/msw/ole/automtn.cpp:514
+#, fuzzy, c-format
+msgid "Failed to create an instance of \"%s\""
+msgstr "Klarte ikke opprette mappe «%s»"
 
-#: ../src/msw/dde.cpp:444
+#: ../src/msw/dde.cpp:443
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
-msgstr "Klarte ikke opprette forbindelse til tjener «%s» med budskap «%s»"
+msgstr "Klarte ikke opprette forbindelse til tjener «%s» med budskap «%s»"
 
-#: ../src/msw/cursor.cpp:214
+#: ../src/msw/cursor.cpp:213
 msgid "Failed to create cursor."
 msgstr "Klarte ikke opprette peker."
 
 #: ../src/common/debugrpt.cpp:208
 #, c-format
 msgid "Failed to create directory \"%s\""
-msgstr "Klarte ikke opprette mappe «%s»"
+msgstr "Klarte ikke opprette mappe «%s»"
 
 #: ../src/generic/dirdlgg.cpp:250
 #, c-format
@@ -2835,79 +3266,89 @@ msgid ""
 "Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
 msgstr ""
-"Klarte ikke opprette mappen «%s»\n"
+"Klarte ikke opprette mappen «%s»\n"
 "(Har du tilgangsrettighet?)"
 
-#: ../src/unix/epolldispatcher.cpp:82
+#: ../src/unix/epolldispatcher.cpp:85
 #, fuzzy
 msgid "Failed to create epoll descriptor"
 msgstr "Klarte ikke opprette peker."
 
-#: ../src/msw/mimetype.cpp:190
+#: ../src/msw/mimetype.cpp:199
 #, c-format
 msgid "Failed to create registry entry for '%s' files."
-msgstr "Klarte ikke opprette registeroppføring for «%s»-filer."
+msgstr "Klarte ikke opprette registeroppføring for «%s»-filer."
 
 #: ../src/msw/fdrepdlg.cpp:443
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 msgstr "Klarte ikke opprette standard finn/erstattvindu (feilkode %d)"
 
-#: ../src/unix/evtloopunix.cpp:52
+#: ../src/unix/evtloopunix.cpp:87
 #, fuzzy
 msgid "Failed to create wake up pipe used by event loop."
 msgstr "Klarte ikke opprette statusbar."
 
-#: ../src/html/winpars.cpp:704
+#: ../src/html/winpars.cpp:733
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "Klarte ikke vise HTML-dokument med %s koding"
 
-#: ../src/msw/clipbrd.cpp:125
+#: ../src/msw/clipbrd.cpp:127
 msgid "Failed to empty the clipboard."
-msgstr "Klarte ikke tømme utklippstavlen."
+msgstr "Klarte ikke tømme utklippstavlen."
 
-#: ../src/unix/displayx11.cpp:211
+#: ../src/unix/displayx11.cpp:266
 msgid "Failed to enumerate video modes"
 msgstr "Klarte ikke telle opp videomoder"
 
-#: ../src/msw/dde.cpp:725
+#: ../src/msw/dde.cpp:728
 msgid "Failed to establish an advise loop with DDE server"
-msgstr "Klarte ikke opprette en rådgivningsløkke med DDE-tjeneren"
+msgstr "Klarte ikke opprette en rådgivningsløkke med DDE-tjeneren"
 
-#: ../src/msw/dialup.cpp:657 ../src/msw/dialup.cpp:889
+#: ../src/msw/dialup.cpp:651 ../src/msw/dialup.cpp:886
 #, c-format
 msgid "Failed to establish dialup connection: %s"
 msgstr "Klarte ikke opprette oppringingsforbindelse: %s"
 
-#: ../src/unix/utilsunx.cpp:549 ../src/unix/utilsunx.cpp:563
+#: ../src/unix/utilsunx.cpp:548 ../src/unix/utilsunx.cpp:562
 #, c-format
 msgid "Failed to execute '%s'\n"
-msgstr "Klarte ikke utføre «%s»\n"
+msgstr "Klarte ikke utføre «%s»\n"
 
-#: ../src/common/debugrpt.cpp:672
+#: ../src/common/debugrpt.cpp:700
 msgid "Failed to execute curl, please install it in PATH."
-msgstr "Klarte ikke kjøre curl, installere den i stien (PATH)."
+msgstr "Klarte ikke kjøre curl, installere den i stien (PATH)."
+
+#: ../src/msw/ole/automtn.cpp:497
+#, fuzzy, c-format
+msgid "Failed to find CLSID of \"%s\""
+msgstr "Klarte ikke åpne «%s» for «%s»"
 
-#: ../src/common/regex.cpp:433 ../src/common/regex.cpp:481
+#: ../src/common/regex.cpp:435 ../src/common/regex.cpp:483
 #, fuzzy, c-format
 msgid "Failed to find match for regular expression: %s"
-msgstr "Fant ingen treff for «%s» i regulært uttrykk: %s"
+msgstr "Fant ingen treff for «%s» i regulært uttrykk: %s"
 
-#: ../src/msw/dialup.cpp:723
+#: ../src/msw/dialup.cpp:717
 #, c-format
 msgid "Failed to get ISP names: %s"
-msgstr "Klarte ikke få ISP navn: %s"
+msgstr "Klarte ikke få ISP navn: %s"
+
+#: ../src/msw/ole/automtn.cpp:566
+#, fuzzy, c-format
+msgid "Failed to get OLE automation interface for \"%s\""
+msgstr "Klarte ikke opprette mappe «%s»"
 
-#: ../src/msw/clipbrd.cpp:743
+#: ../src/msw/clipbrd.cpp:745
 msgid "Failed to get data from the clipboard"
 msgstr "Klarte ikke hente data fra utklippstavlen."
 
-#: ../src/common/stopwatch.cpp:219
+#: ../src/common/time.cpp:263
 msgid "Failed to get the local system time"
 msgstr "Klarte ikke finne lokal systemtid"
 
-#: ../src/common/filefn.cpp:1544
+#: ../src/common/filefn.cpp:1452
 msgid "Failed to get the working directory"
 msgstr "Klarte ikke finne gjeldende mappe"
 
@@ -2919,16 +3360,16 @@ msgstr "Klarte ikke initialere GUI: ingen innebygde tema funnet."
 msgid "Failed to initialize MS HTML Help."
 msgstr "Klarte ikke initialisere MS HTML hjelp."
 
-#: ../src/msw/glcanvas.cpp:662
+#: ../src/msw/glcanvas.cpp:893
 msgid "Failed to initialize OpenGL"
 msgstr "Klarte ikke initialisere OpenGL"
 
-#: ../src/msw/dialup.cpp:886
+#: ../src/msw/dialup.cpp:881
 #, fuzzy, c-format
 msgid "Failed to initiate dialup connection: %s"
 msgstr "Klarte ikke avslutte oppringingskoblingen: %s"
 
-#: ../src/gtk/textctrl.cpp:1027
+#: ../src/gtk/textctrl.cpp:1100
 #, fuzzy
 msgid "Failed to insert text in the control."
 msgstr "Klarte ikke finne gjeldende mappe"
@@ -2936,425 +3377,527 @@ msgstr "Klarte ikke finne gjeldende mappe"
 #: ../src/unix/snglinst.cpp:242
 #, c-format
 msgid "Failed to inspect the lock file '%s'"
-msgstr "Klarte ikke inspisere låsefilen «%s»"
+msgstr "Klarte ikke inspisere låsefilen «%s»"
 
-#: ../src/unix/appunix.cpp:89
+#: ../src/unix/appunix.cpp:90
 #, fuzzy
 msgid "Failed to install signal handler"
 msgstr "Klarte ikke lukke filreferanse"
 
-#: ../src/unix/threadpsx.cpp:979
+#: ../src/unix/threadpsx.cpp:1010
 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
 msgstr ""
-"Klarte ikke bli med en tråd, potensiell minnelekkasje oppdaget - start "
-"programmet på nytt"
+"Klarte ikke bli med en tråd, potensiell minnelekkasje oppdaget - start "
+"programmet på nytt"
 
-#: ../src/msw/utils.cpp:735
+#: ../src/msw/utils.cpp:747
 #, c-format
 msgid "Failed to kill process %d"
 msgstr "Klarte ikke drepe prosess %d"
 
-#: ../src/common/iconbndl.cpp:127
-#, c-format
-msgid "Failed to load image %d from file '%s'."
-msgstr "Klarte ikke laste bilde %d fra filen «%s»."
+#: ../src/common/iconbndl.cpp:183
+#, fuzzy, c-format
+msgid "Failed to load image %%d from file '%s'."
+msgstr "Klarte ikke laste bilde %d fra filen «%s»."
+
+#: ../src/common/iconbndl.cpp:191
+#, fuzzy, c-format
+msgid "Failed to load image %d from stream."
+msgstr "Klarte ikke laste bilde %d fra filen «%s»."
+
+#: ../src/common/image.cpp:2251 ../src/common/image.cpp:2270
+#, fuzzy, c-format
+msgid "Failed to load image from file \"%s\"."
+msgstr "Klarte ikke laste bilde %d fra filen «%s»."
 
-#: ../src/msw/enhmeta.cpp:97
+#: ../src/msw/enhmeta.cpp:98
 #, c-format
 msgid "Failed to load metafile from file \"%s\"."
-msgstr "Klarte ikke laste metafil fra filen «%s»."
+msgstr "Klarte ikke laste metafil fra filen «%s»."
 
-#: ../src/msw/volume.cpp:324
+#: ../src/msw/volume.cpp:328
 msgid "Failed to load mpr.dll."
 msgstr "Klarte ikke laste mpr.dll."
 
+#: ../src/msw/utils.cpp:1128
+#, fuzzy, c-format
+msgid "Failed to load resource \"%s\"."
+msgstr "Klarte ikke laste metafil fra filen «%s»."
+
 #: ../src/common/dynlib.cpp:105
 #, c-format
 msgid "Failed to load shared library '%s'"
-msgstr "Klarte ikke laste delt bibliotek «%s»"
+msgstr "Klarte ikke laste delt bibliotek «%s»"
+
+#: ../src/msw/utils.cpp:1135
+#, fuzzy, c-format
+msgid "Failed to lock resource \"%s\"."
+msgstr "Klarte ikke låse låsefilen «%s»"
 
 #: ../src/unix/snglinst.cpp:199
 #, c-format
 msgid "Failed to lock the lock file '%s'"
-msgstr "Klarte ikke låse låsefilen «%s»"
+msgstr "Klarte ikke låse låsefilen «%s»"
 
-#: ../src/unix/epolldispatcher.cpp:134
+#: ../src/unix/epolldispatcher.cpp:137
 #, c-format
 msgid "Failed to modify descriptor %d in epoll descriptor %d"
 msgstr ""
 
-#: ../src/common/filename.cpp:2206
+#: ../src/common/filename.cpp:2582
 #, c-format
 msgid "Failed to modify file times for '%s'"
-msgstr "Klarte ikke endre filtid for «%s»"
+msgstr "Klarte ikke endre filtid for «%s»"
 
-#: ../src/common/selectdispatcher.cpp:234
+#: ../src/common/selectdispatcher.cpp:253
 msgid "Failed to monitor I/O channels"
 msgstr ""
 
-#: ../src/common/filename.cpp:182
+#: ../src/common/filename.cpp:205
 #, fuzzy, c-format
 msgid "Failed to open '%s' for reading"
-msgstr "Klarte ikke åpne «%s» for «%s»"
+msgstr "Klarte ikke åpne «%s» for «%s»"
 
-#: ../src/common/filename.cpp:185
+#: ../src/common/filename.cpp:210
 #, fuzzy, c-format
 msgid "Failed to open '%s' for writing"
-msgstr "Klarte ikke åpne «%s» for «%s»"
+msgstr "Klarte ikke åpne «%s» for «%s»"
 
 #: ../src/html/chm.cpp:142
 #, c-format
 msgid "Failed to open CHM archive '%s'."
-msgstr "Klarte ikke åpne CHM arkiv «%s»."
+msgstr "Klarte ikke åpne CHM arkiv «%s»."
 
-#: ../src/common/utilscmn.cpp:1150
+#: ../src/common/utilscmn.cpp:1132
 #, fuzzy, c-format
 msgid "Failed to open URL \"%s\" in default browser."
-msgstr "Klarte ikke åpne «%s» for «%s»"
+msgstr "Klarte ikke åpne «%s» for «%s»"
+
+#: ../include/wx/msw/private/fswatcher.h:93
+#, fuzzy, c-format
+msgid "Failed to open directory \"%s\" for monitoring."
+msgstr "Klarte ikke åpne «%s» for «%s»"
 
 #: ../src/x11/utils.cpp:226
 #, fuzzy, c-format
 msgid "Failed to open display \"%s\"."
-msgstr "Klarte ikke åpne «%s» for «%s»"
+msgstr "Klarte ikke åpne «%s» for «%s»"
 
-#: ../src/common/filename.cpp:894
+#: ../src/common/filename.cpp:1067
 msgid "Failed to open temporary file."
-msgstr "Klarte ikke åpne midlertidig fil."
+msgstr "Klarte ikke åpne midlertidig fil."
 
-#: ../src/msw/clipbrd.cpp:93
+#: ../src/msw/clipbrd.cpp:94
 msgid "Failed to open the clipboard."
-msgstr "Klarte ikke åpne utklippstavle."
+msgstr "Klarte ikke åpne utklippstavle."
+
+#: ../src/common/translation.cpp:1014
+#, fuzzy, c-format
+msgid "Failed to parse Plural-Forms: '%s'"
+msgstr "Klarte ikke tolke flertallsformer: «%s»"
 
-#: ../src/msw/clipbrd.cpp:643
+#: ../src/msw/clipbrd.cpp:645
 msgid "Failed to put data on the clipboard"
-msgstr "Klarte ikke putte data på utklippstavlen."
+msgstr "Klarte ikke putte data på utklippstavlen."
 
 #: ../src/unix/snglinst.cpp:279
 msgid "Failed to read PID from lock file."
-msgstr "Klarte ikke lses PID fra låsefil."
+msgstr "Klarte ikke lses PID fra låsefil."
 
-#: ../src/common/fileconf.cpp:470
+#: ../src/common/fileconf.cpp:465
 #, fuzzy
 msgid "Failed to read config options."
 msgstr "Feil ved lesing av konfigurasjonsvalg."
 
-#: ../src/unix/evtloopunix.cpp:104
+#: ../src/common/docview.cpp:680
+#, fuzzy, c-format
+msgid "Failed to read document from the file \"%s\"."
+msgstr "Klarte ikke laste metafil fra filen «%s»."
+
+#: ../src/dfb/evtloop.cpp:99
+#, fuzzy
+msgid "Failed to read event from DirectFB pipe"
+msgstr "Klarte ikke lses PID fra låsefil."
+
+#: ../src/unix/evtloopunix.cpp:136
 #, fuzzy
 msgid "Failed to read from wake-up pipe"
-msgstr "Klarte ikke lses PID fra låsefil."
+msgstr "Klarte ikke lses PID fra låsefil."
 
-#: ../src/unix/utilsunx.cpp:635
+#: ../src/unix/utilsunx.cpp:608
 msgid "Failed to redirect child process input/output"
 msgstr "Klarte ikke videresende underprosessen inndata/utdata"
 
-#: ../src/msw/utilsexc.cpp:724
+#: ../src/msw/utilsexc.cpp:733
 msgid "Failed to redirect the child process IO"
 msgstr "Klarte ikke videresende underporsess IO"
 
 #: ../src/msw/dde.cpp:294
 #, c-format
 msgid "Failed to register DDE server '%s'"
-msgstr "Klarte ikke registrere DDE-tjener «%s»"
-
-#: ../src/msw/glcanvas.cpp:270
-msgid "Failed to register OpenGL window class."
-msgstr "Klarte ikke registrere OpenGL vindusklasse."
+msgstr "Klarte ikke registrere DDE-tjener «%s»"
 
-#: ../src/common/fontmap.cpp:243
+#: ../src/common/fontmap.cpp:244
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
-msgstr "Klarte ikke huske kodingen for tegnsettet «%s»."
+msgstr "Klarte ikke huske kodingen for tegnsettet «%s»."
 
 #: ../src/common/debugrpt.cpp:226
 #, c-format
 msgid "Failed to remove debug report file \"%s\""
-msgstr "Klarte ikke slette feilsøkingsrapportfil «%s»"
+msgstr "Klarte ikke slette feilsøkingsrapportfil «%s»"
 
 #: ../src/unix/snglinst.cpp:323
 #, c-format
 msgid "Failed to remove lock file '%s'"
-msgstr "Klarte ikke slette låsefil «%s»"
+msgstr "Klarte ikke slette låsefil «%s»"
 
 #: ../src/unix/snglinst.cpp:289
 #, c-format
 msgid "Failed to remove stale lock file '%s'."
-msgstr "Klarte ikke slette forslitt låsefil «%s»."
+msgstr "Klarte ikke slette forslitt låsefil «%s»."
 
-#: ../src/msw/registry.cpp:474
+#: ../src/msw/registry.cpp:529
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
-msgstr "Klarte ikke endre navn på registerverdi «%s» til «%s»."
+msgstr "Klarte ikke endre navn på registerverdi «%s» til «%s»."
 
-#: ../src/common/filefn.cpp:1208
+#: ../src/common/filefn.cpp:1165
 #, c-format
 msgid ""
 "Failed to rename the file '%s' to '%s' because the destination file already "
 "exists."
 msgstr ""
 
-#: ../src/msw/registry.cpp:579
+#: ../src/msw/registry.cpp:634
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
-msgstr "Klarte ikke endre navn på registernøkkel «%s» til «%s»."
+msgstr "Klarte ikke endre navn på registernøkkel «%s» til «%s»."
 
-#: ../src/msw/clipbrd.cpp:497
+#: ../src/msw/clipbrd.cpp:499
 msgid "Failed to retrieve data from the clipboard."
 msgstr "Klarte ikke hente data fra utklippstavlen."
 
-#: ../src/common/filename.cpp:2300
+#: ../src/common/filename.cpp:2676
 #, c-format
 msgid "Failed to retrieve file times for '%s'"
-msgstr "Klart ikke hente filtid for «%s»"
+msgstr "Klart ikke hente filtid for «%s»"
 
-#: ../src/msw/dialup.cpp:490
+#: ../src/msw/dialup.cpp:488
 msgid "Failed to retrieve text of RAS error message"
 msgstr "Klarte ikke hente tekst fra RAS feilmelding"
 
-#: ../src/msw/clipbrd.cpp:780
+#: ../src/msw/clipbrd.cpp:782
 msgid "Failed to retrieve the supported clipboard formats"
-msgstr "Klarte ikke hente støttede utklippstavleformat"
+msgstr "Klarte ikke hente støttede utklippstavleformat"
+
+#: ../src/common/docview.cpp:651
+#, fuzzy, c-format
+msgid "Failed to save document to the file \"%s\"."
+msgstr "Klarte ikke lagre bitmap-bilde til filen «%s». "
 
-#: ../src/msw/dib.cpp:345
+#: ../src/msw/dib.cpp:329
 #, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."
-msgstr "Klarte ikke lagre bitmap-bilde til filen «%s». "
+msgstr "Klarte ikke lagre bitmap-bilde til filen «%s». "
 
-#: ../src/msw/dde.cpp:766
+#: ../src/msw/dde.cpp:769
 msgid "Failed to send DDE advise notification"
-msgstr "Klarte ikke send DDE-rådgivningsmelding"
+msgstr "Klarte ikke send DDE-rådgivningsmelding"
 
-#: ../src/common/ftp.cpp:381
+#: ../src/common/ftp.cpp:407
 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
-msgstr "Klarte ikke sette FTP-overføringsmodus til %s."
+msgstr "Klarte ikke sette FTP-overføringsmodus til %s."
 
-#: ../src/msw/clipbrd.cpp:373
+#: ../src/msw/clipbrd.cpp:375
 msgid "Failed to set clipboard data."
 msgstr "Klarte ikke sette utklippstavledata."
 
 #: ../src/unix/snglinst.cpp:182
 #, c-format
 msgid "Failed to set permissions on lock file '%s'"
-msgstr "Klarte ikke sette rettigheter på låsefile «%s»"
+msgstr "Klarte ikke sette rettigheter på låsefile «%s»"
 
-#: ../src/common/file.cpp:509
+#: ../src/common/file.cpp:549
 msgid "Failed to set temporary file permissions"
 msgstr "Klarte ikke sette rettigheter for midlertidige filer"
 
-#: ../src/gtk/textctrl.cpp:969
+#: ../src/gtk/textctrl.cpp:1041
 #, fuzzy
 msgid "Failed to set text in the text control."
 msgstr "Klarte ikke finne gjeldende mappe"
 
-#: ../src/unix/threadpsx.cpp:1317 ../src/unix/threadpsx.cpp:1327
+#: ../src/unix/threadpsx.cpp:1333 ../src/unix/threadpsx.cpp:1343
 #, c-format
 msgid "Failed to set thread priority %d."
-msgstr "Klarte ikke sette trådprioritet %d"
+msgstr "Klarte ikke sette trådprioritet %d"
+
+#: ../src/unix/utilsunx.cpp:729
+msgid "Failed to set up non-blocking pipe, the program might hang."
+msgstr ""
 
-#: ../src/common/fs_mem.cpp:256
+#: ../src/common/fs_mem.cpp:262
 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
-msgstr "Klarte ikke lagre bilde «%s» til minne VFS!"
+msgstr "Klarte ikke lagre bilde «%s» til minne VFS!"
+
+#: ../src/dfb/evtloop.cpp:171
+msgid "Failed to switch DirectFB pipe to non-blocking mode"
+msgstr ""
 
-#: ../src/unix/evtloopunix.cpp:61
+#: ../src/unix/evtloopunix.cpp:93
 msgid "Failed to switch wake up pipe to non-blocking mode"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:1500 ../src/mac/carbon/mpthread.cpp:1268
+#: ../src/unix/threadpsx.cpp:1525
 msgid "Failed to terminate a thread."
-msgstr "Klarte ikke avslutte en tråd."
+msgstr "Klarte ikke avslutte en tråd."
 
-#: ../src/msw/dde.cpp:744
+#: ../src/msw/dde.cpp:747
 msgid "Failed to terminate the advise loop with DDE server"
-msgstr "Klarte ikke avslutte rådgivningsløkka med DDE-tjeneren"
+msgstr "Klarte ikke avslutte rådgivningsløkka med DDE-tjeneren"
 
-#: ../src/msw/dialup.cpp:963
+#: ../src/msw/dialup.cpp:961
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 msgstr "Klarte ikke avslutte oppringingskoblingen: %s"
 
-#: ../src/common/filename.cpp:2221
+#: ../src/common/filename.cpp:2597
 #, c-format
 msgid "Failed to touch the file '%s'"
-msgstr "Klarte ikke rør filen «%s»"
+msgstr "Klarte ikke rør filen «%s»"
 
 #: ../src/unix/snglinst.cpp:329
 #, c-format
 msgid "Failed to unlock lock file '%s'"
-msgstr "Klarte ikke låse opp låsefilen «%s»"
+msgstr "Klarte ikke låse opp låsefilen «%s»"
 
 #: ../src/msw/dde.cpp:315
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
-msgstr "Klarte ikke avregistrere DDE-tjener «%s»"
+msgstr "Klarte ikke avregistrere DDE-tjener «%s»"
 
-#: ../src/unix/epolldispatcher.cpp:153
+#: ../src/unix/epolldispatcher.cpp:156
 #, fuzzy, c-format
 msgid "Failed to unregister descriptor %d from epoll descriptor %d"
 msgstr "Klarte ikke hente data fra utklippstavlen."
 
-#: ../src/common/fileconf.cpp:1031
+#: ../src/common/fileconf.cpp:1038
 msgid "Failed to update user configuration file."
 msgstr "Klarte ikke oppdatere bruker konfigurasjonsfil."
 
-#: ../src/common/debugrpt.cpp:685
+#: ../src/common/debugrpt.cpp:713
 #, c-format
 msgid "Failed to upload the debug report (error code %d)."
-msgstr "Klarte ikke laste opp feilsøkingsrapporten (feilkode %d)"
+msgstr "Klarte ikke laste opp feilsøkingsrapporten (feilkode %d)"
 
 #: ../src/unix/snglinst.cpp:169
 #, c-format
 msgid "Failed to write to lock file '%s'"
-msgstr "Klarte ikke skrive til låsefil «%s»"
+msgstr "Klarte ikke skrive til låsefil «%s»"
 
-#: ../src/generic/logg.cpp:424
-msgid "Fatal error"
-msgstr "Kritisk feil"
+#: ../src/propgrid/propgrid.cpp:173
+#, fuzzy
+msgid "False"
+msgstr "Fil"
 
-#: ../src/common/log.cpp:698
-msgid "Fatal error: "
-msgstr "Kritisk feil:"
+#: ../src/propgrid/advprops.cpp:659
+#, fuzzy
+msgid "Family"
+msgstr "&Skriftfamilie:"
 
-#: ../src/msw/wince/filedlgwce.cpp:119
+#: ../src/common/stockitem.cpp:158 ../src/msw/wince/filedlgwce.cpp:119
 msgid "File"
 msgstr "Fil"
 
-#: ../src/mgl/bitmap.cpp:409
-#, c-format
-msgid "File %s does not exist."
-msgstr "Filen «%s» eksisterer ikke."
+#: ../src/common/docview.cpp:668
+#, fuzzy, c-format
+msgid "File \"%s\" could not be opened for reading."
+msgstr "Klarte ikke åpne «%s» for «%s»"
+
+#: ../src/common/docview.cpp:645
+#, fuzzy, c-format
+msgid "File \"%s\" could not be opened for writing."
+msgstr "Klarte ikke åpne «%s» for «%s»"
 
-#: ../src/gtk/filedlg.cpp:52
+#: ../src/gtk/filedlg.cpp:53
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
-msgstr "Filen «%s» eksisterer allerede. Vil du virkelig overskrive filen?"
+msgstr "Filen «%s» eksisterer allerede. Vil du virkelig overskrive filen?"
 
-#: ../src/os2/filedlg.cpp:307
+#: ../src/os2/filedlg.cpp:308
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Do you want to replace it?"
-msgstr "Filen «%s» eksisterer allerede. Vil du virkelig bytte den ut?"
+msgstr "Filen «%s» eksisterer allerede. Vil du virkelig bytte den ut?"
+
+#: ../src/common/filefn.cpp:1204
+#, fuzzy, c-format
+msgid "File '%s' couldn't be removed"
+msgstr "Mappe «%s» kunne ikke opprettes"
+
+#: ../src/common/filefn.cpp:1184
+#, fuzzy, c-format
+msgid "File '%s' couldn't be renamed '%s'"
+msgstr "Mappe «%s» kunne ikke opprettes"
 
-#: ../src/common/textcmn.cpp:724 ../src/richtext/richtextctrl.cpp:1901
+#: ../src/richtext/richtextctrl.cpp:2665 ../src/common/textcmn.cpp:870
 msgid "File couldn't be loaded."
 msgstr "Klarte ikke laste filen."
 
-#: ../src/common/docview.cpp:587 ../src/common/docview.cpp:1641
+#: ../src/msw/filedlg.cpp:429
+#, fuzzy, c-format
+msgid "File dialog failed with error code %0lx."
+msgstr "Utførelse av kommandoen «%s» feilet med feil: %ul"
+
+#: ../src/common/docview.cpp:1752
 msgid "File error"
 msgstr "Filfeil"
 
-#: ../src/generic/filectrlg.cpp:804 ../src/generic/dirctrlg.cpp:721
+#: ../src/generic/dirctrlg.cpp:680 ../src/generic/filectrlg.cpp:799
 msgid "File name exists already."
 msgstr "Filnavn eksisterer allerede."
 
-#: ../src/motif/filedlg.cpp:220
+#: ../src/unix/fswatcher_inotify.cpp:413
+msgid "File system containing watched object was unmounted"
+msgstr ""
+
+#: ../src/motif/filedlg.cpp:219
 #, fuzzy
 msgid "Files"
 msgstr "Fil"
 
-#: ../src/common/filefn.cpp:1835
+#: ../src/common/filefn.cpp:1756
 #, c-format
 msgid "Files (%s)"
 msgstr "Filer (%s)"
 
-#: ../src/motif/filedlg.cpp:218
+#: ../src/motif/filedlg.cpp:217
 #, fuzzy
 msgid "Filter"
 msgstr "Fil"
 
-#: ../src/html/helpwnd.cpp:486
+#: ../src/common/stockitem.cpp:159 ../src/html/helpwnd.cpp:498
 msgid "Find"
 msgstr "Finn"
 
-#: ../src/html/helpwnd.cpp:1217
+#: ../src/common/stockitem.cpp:160
+#, fuzzy
+msgid "First"
+msgstr "først"
+
+#: ../src/common/prntbase.cpp:1493
+#, fuzzy
+msgid "First page"
+msgstr "Neste side"
+
+#: ../src/html/helpwnd.cpp:1216
 msgid "Fixed font:"
 msgstr "Fast skrift:"
 
-#: ../src/html/helpwnd.cpp:1277
+#: ../src/html/helpwnd.cpp:1279
 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
-msgstr "Fast størrelse skrift.<br> <b>fet</b> <i>kursiv</i>"
+msgstr "Fast størrelse skrift.<br> <b>fet</b> <i>kursiv</i>"
+
+#: ../src/richtext/richtextsizepage.cpp:181
+msgid "Floating"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:161
+#, fuzzy
+msgid "Floppy"
+msgstr "&Kopier"
 
 #: ../src/common/paper.cpp:113
 msgid "Folio, 8 1/2 x 13 in"
 msgstr "Folio, 8 1/2 x 13 tommer"
 
-#: ../src/richtext/richtextformatdlg.cpp:275 ../src/mac/carbon/fontdlg.cpp:449
+#: ../src/richtext/richtextformatdlg.cpp:319 ../src/osx/carbon/fontdlg.cpp:471
+#: ../src/common/stockitem.cpp:195
 msgid "Font"
 msgstr ""
 
-#: ../src/richtext/richtextfontpage.cpp:187
+#: ../src/richtext/richtextfontpage.cpp:197
 #, fuzzy
 msgid "Font &weight:"
 msgstr "Skriftvekt"
 
-#: ../src/html/helpwnd.cpp:1218
+#: ../src/html/helpwnd.cpp:1217
 msgid "Font size:"
-msgstr "Skriftstørrelse:"
+msgstr "Skriftstørrelse:"
 
-#: ../src/richtext/richtextfontpage.cpp:174
+#: ../src/richtext/richtextfontpage.cpp:184
 #, fuzzy
 msgid "Font st&yle:"
-msgstr "Skriftstørrelse:"
+msgstr "Skriftstørrelse:"
 
-#: ../src/mac/carbon/fontdlg.cpp:491
+#: ../src/osx/carbon/fontdlg.cpp:513
 #, fuzzy
 msgid "Font:"
-msgstr "Skriftstørrelse:"
+msgstr "Skriftstørrelse:"
 
-#: ../src/dfb/fontmgr.cpp:202
+#: ../src/dfb/fontmgr.cpp:199
 #, c-format
 msgid "Fonts index file %s disappeared while loading fonts."
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:582
+#: ../src/unix/utilsunx.cpp:581
 msgid "Fork failed"
 msgstr "Forgrening feilet"
 
-#: ../src/common/xtixml.cpp:232
+#: ../src/common/stockitem.cpp:162
+#, fuzzy
+msgid "Forward"
+msgstr "&Fremover"
+
+#: ../src/common/xtixml.cpp:236
 msgid "Forward hrefs are not supported"
-msgstr "Fremover HREF-er er ikke støttet"
+msgstr "Fremover HREF-er er ikke støttet"
 
-#: ../src/html/htmlhelp.cpp:460 ../src/html/helpwnd.cpp:893
+#: ../src/html/helpwnd.cpp:890
 #, c-format
 msgid "Found %i matches"
 msgstr "Fant %i treff"
 
-#: ../src/generic/prntdlgg.cpp:245
+#: ../src/generic/prntdlgg.cpp:244
 msgid "From:"
 msgstr "Fra:"
 
-#: ../src/common/fmapbase.cpp:156
-msgid "GB-2312"
-msgstr ""
-
-#: ../src/common/imaggif.cpp:80
+#: ../src/common/imaggif.cpp:161
 msgid "GIF: Invalid gif index."
 msgstr "GIF: Ugyldig GIF-indeks"
 
-#: ../src/common/imaggif.cpp:70
+#: ../src/common/imaggif.cpp:151
 msgid "GIF: data stream seems to be truncated."
-msgstr "GIF:Datastrømmen ser ut til å være trunkert."
+msgstr "GIF:Datastrømmen ser ut til å være trunkert."
 
-#: ../src/common/imaggif.cpp:54
+#: ../src/common/imaggif.cpp:135
 msgid "GIF: error in GIF image format."
 msgstr "GIF: Feil i GIF-bildeformat."
 
-#: ../src/common/imaggif.cpp:57
+#: ../src/common/imaggif.cpp:138
 msgid "GIF: not enough memory."
 msgstr "GIF: Ikke nok minne."
 
-#: ../src/common/imaggif.cpp:60
+#: ../src/common/imaggif.cpp:141
 msgid "GIF: unknown error!!!"
 msgstr "GIF: Ukjent feil!"
 
+#: ../src/gtk/window.cpp:4119
+msgid ""
+"GTK+ installed on this machine is too old to support screen compositing, "
+"please install GTK+ 2.12 or later."
+msgstr ""
+
 #: ../src/univ/themes/gtk.cpp:528
 msgid "GTK+ theme"
 msgstr "GTK+ tema"
 
-#: ../src/common/prntbase.cpp:242
+#: ../src/common/prntbase.cpp:244
 msgid "Generic PostScript"
 msgstr "Generisk PostScript"
 
@@ -3366,243 +3909,269 @@ msgstr "Tysk juridisk papir, 8 1/2 x 13 tommer"
 msgid "German Std Fanfold, 8 1/2 x 12 in"
 msgstr "Tysk vanlig papir, 8 1/2 x 12 tommer"
 
-#: ../src/html/helpwnd.cpp:661
-msgid "Go back"
-msgstr "Gå tilbake"
+#: ../include/wx/xtiprop.h:189
+msgid "GetProperty called w/o valid getter"
+msgstr "GetProperty kalt uten gyldig henter"
 
-#: ../src/html/htmlhelp.cpp:541
-msgid "Go back to the previous HTML page"
-msgstr ""
+#: ../include/wx/xtiprop.h:267
+msgid "GetPropertyCollection called on a generic accessor"
+msgstr "GetPropertyCollection kalt med generisk aksessor"
 
-#: ../src/html/helpwnd.cpp:664
-msgid "Go forward"
-msgstr "Gå frem"
+#: ../include/wx/xtiprop.h:207
+msgid "GetPropertyCollection called w/o valid collection getter"
+msgstr "GetPropertyCollection kalt uten gyldig mengdehenter"
 
-#: ../src/html/htmlhelp.cpp:543
-msgid "Go forward to the next HTML page"
-msgstr ""
+#: ../src/html/helpwnd.cpp:671
+msgid "Go back"
+msgstr "Gå tilbake"
 
-#: ../src/html/helpwnd.cpp:669
+#: ../src/html/helpwnd.cpp:672
+msgid "Go forward"
+msgstr "Gå frem"
+
+#: ../src/html/helpwnd.cpp:674
 msgid "Go one level up in document hierarchy"
-msgstr "Gå et nivå opp i dokumenthierarkiet"
+msgstr "Gå et nivå opp i dokumenthierarkiet"
 
-#: ../src/generic/dirdlgg.cpp:137 ../src/generic/filedlgg.cpp:225
+#: ../src/generic/filedlgg.cpp:223 ../src/generic/dirdlgg.cpp:137
 msgid "Go to home directory"
-msgstr "Gå til hjemmemappe"
+msgstr "Gå til hjemmemappe"
 
-#: ../src/generic/filedlgg.cpp:221
+#: ../src/generic/filedlgg.cpp:219
 msgid "Go to parent directory"
-msgstr "Gå til foreldremappe"
-
-#: ../src/common/prntbase.cpp:1091
-msgid "Goto Page"
-msgstr "Gå til side"
+msgstr "Gå til foreldremappe"
 
 #: ../src/generic/aboutdlgg.cpp:77
 msgid "Graphics art by "
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:114
+#: ../src/common/fmapbase.cpp:153
 msgid "Greek (ISO-8859-7)"
 msgstr "Gresk (ISO-8859-7)"
 
-#: ../src/common/zstream.cpp:142 ../src/common/zstream.cpp:290
+#: ../src/richtext/richtextborderspage.cpp:547
+msgid "Groove"
+msgstr ""
+
+#: ../src/common/zstream.cpp:151 ../src/common/zstream.cpp:311
 msgid "Gzip not supported by this version of zlib"
-msgstr "Gzip er ikke støttet av denne versjonen av zlib"
+msgstr "Gzip er ikke støttet av denne versjonen av zlib"
 
-#: ../src/common/accelcmn.cpp:74
+#: ../src/common/accelcmn.cpp:76
 msgid "HELP"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:59
+#: ../src/common/accelcmn.cpp:61
 msgid "HOME"
 msgstr ""
 
-#: ../src/html/helpwnd.cpp:1552
+#: ../src/html/helpwnd.cpp:1558
 msgid "HTML Help Project (*.hhp)|*.hhp|"
 msgstr "HTML hjelpprosjekt (*.hhp)|*.hhp|"
 
-#: ../src/html/htmlwin.cpp:630
+#: ../src/html/htmlwin.cpp:655
 #, c-format
 msgid "HTML anchor %s does not exist."
 msgstr "HTML-anker %s finnes ikke."
 
-#: ../src/html/helpwnd.cpp:1550
+#: ../src/html/helpwnd.cpp:1556
 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr "HTML-filer  (*.html;*.htm)|*.html;*.htm|"
 
-#: ../src/html/htmprint.cpp:379
-msgid ""
-"HTML pagination algorithm generated more than the allowed maximum number of "
-"pages and it can't continue any longer!"
+#: ../src/common/stockitem.cpp:163
+msgid "Harddisk"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:115
+#: ../src/common/fmapbase.cpp:154
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebraisk (ISO-8859-8)"
 
-#: ../src/html/helpdlg.cpp:67 ../src/html/helpfrm.cpp:104
+#: ../src/osx/button_osx.cpp:40 ../src/common/stockitem.cpp:164
+#: ../src/html/helpdlg.cpp:67 ../src/html/helpfrm.cpp:117
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../src/html/htmlhelp.cpp:87
-#, fuzzy, c-format
-msgid "Help : %s"
-msgstr "Hjelp: %s"
-
-#: ../src/html/helpwnd.cpp:1211
+#: ../src/html/helpwnd.cpp:1210
 msgid "Help Browser Options"
 msgstr "Innstillinger for hjelpleser"
 
-#: ../src/generic/helpext.cpp:460 ../src/generic/helpext.cpp:461
+#: ../src/generic/helpext.cpp:459 ../src/generic/helpext.cpp:460
 msgid "Help Index"
 msgstr "Indeks for hjelp"
 
-#: ../src/html/helpwnd.cpp:1538
+#: ../src/html/helpwnd.cpp:1540
 msgid "Help Printing"
 msgstr "Skriv ut hjelp"
 
-#: ../src/html/helpwnd.cpp:820
+#: ../src/html/helpwnd.cpp:815
 msgid "Help Topics"
 msgstr "Emner for hjelp"
 
-#: ../src/html/helpwnd.cpp:1551
+#: ../src/html/helpwnd.cpp:1557
 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
-msgstr "Hjelpebøker (*.htb)|*.htb|Hjelpebøker (*.zip)|*.zip|"
+msgstr "Hjelpebøker (*.htb)|*.htb|Hjelpebøker (*.zip)|*.zip|"
 
-#: ../src/generic/helpext.cpp:273
+#: ../src/generic/helpext.cpp:272
 #, c-format
 msgid "Help directory \"%s\" not found."
 msgstr ""
 
-#: ../src/generic/helpext.cpp:281
+#: ../src/generic/helpext.cpp:280
 #, fuzzy, c-format
 msgid "Help file \"%s\" not found."
-msgstr "katalogfil for domene «%s» ikke funnet."
+msgstr "katalogfil for domene «%s» ikke funnet."
 
-#: ../src/html/helpctrl.cpp:51
+#: ../src/html/helpctrl.cpp:53
 #, c-format
 msgid "Help: %s"
 msgstr "Hjelp: %s"
 
-#: ../src/generic/dirdlgg.cpp:99
+#: ../src/osx/menu_osx.cpp:556
+#, fuzzy, c-format
+msgid "Hide %s"
+msgstr "Hjelp: %s"
+
+#: ../src/osx/menu_osx.cpp:558
+msgid "Hide Others"
+msgstr ""
+
+#: ../src/generic/infobar.cpp:139
+msgid "Hide this notification message."
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:99 ../src/common/stockitem.cpp:165
 msgid "Home"
 msgstr "Hjem"
 
-#: ../src/generic/dirctrlg.cpp:658
+#: ../src/generic/dirctrlg.cpp:616
 msgid "Home directory"
 msgstr "Hjemmemappe"
 
-#: ../include/wx/filefn.h:146
-msgid "I64"
-msgstr "I64"
+#: ../src/richtext/richtextsizepage.cpp:205
+#: ../src/richtext/richtextsizepage.cpp:207
+msgid "How the object will float relative to the text."
+msgstr ""
 
-#: ../src/common/imagbmp.cpp:966
+#: ../src/common/imagbmp.cpp:1071
 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: Feil ved maskelesing DIB."
 
-#: ../src/common/imagbmp.cpp:1076 ../src/common/imagbmp.cpp:1135
-#: ../src/common/imagbmp.cpp:1144 ../src/common/imagbmp.cpp:1155
-#: ../src/common/imagbmp.cpp:1199 ../src/common/imagbmp.cpp:1209
-#: ../src/common/imagbmp.cpp:1218
+#: ../src/common/imagbmp.cpp:1187 ../src/common/imagbmp.cpp:1248
+#: ../src/common/imagbmp.cpp:1259 ../src/common/imagbmp.cpp:1272
+#: ../src/common/imagbmp.cpp:1318 ../src/common/imagbmp.cpp:1330
+#: ../src/common/imagbmp.cpp:1341
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: Feil ved skriving av bildefil!"
 
-#: ../src/common/imagbmp.cpp:1044
+#: ../src/common/imagbmp.cpp:1151
 msgid "ICO: Image too tall for an icon."
-msgstr "ICO: Bilde er for høyt for et ikon."
+msgstr "ICO: Bilde er for høyt for et ikon."
 
-#: ../src/common/imagbmp.cpp:1050
+#: ../src/common/imagbmp.cpp:1159
 msgid "ICO: Image too wide for an icon."
 msgstr "ICO: Bilde er for bredt for et ikon."
 
-#: ../src/common/imagbmp.cpp:1283
+#: ../src/common/imagbmp.cpp:1416
 msgid "ICO: Invalid icon index."
 msgstr "ICO: Ugyldig ikonindeks"
 
-#: ../src/common/imagiff.cpp:758
+#: ../src/common/imagiff.cpp:760
 msgid "IFF: data stream seems to be truncated."
-msgstr "IFF: Datastrøm ser ut til å være trunkert."
+msgstr "IFF: Datastrøm ser ut til å være trunkert."
 
-#: ../src/common/imagiff.cpp:742
+#: ../src/common/imagiff.cpp:744
 msgid "IFF: error in IFF image format."
 msgstr "IFF: Feil i IFF-bildeformat."
 
-#: ../src/common/imagiff.cpp:745
+#: ../src/common/imagiff.cpp:747
 msgid "IFF: not enough memory."
 msgstr "IFF: Ikke nok minne."
 
-#: ../src/common/imagiff.cpp:748
+#: ../src/common/imagiff.cpp:750
 msgid "IFF: unknown error!!!"
 msgstr "IFF: Ukjent feil!"
 
-#: ../src/common/accelcmn.cpp:49
+#: ../src/common/accelcmn.cpp:51
 msgid "INS"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:50
+#: ../src/common/accelcmn.cpp:52
 msgid "INSERT"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:157
+#: ../src/common/fmapbase.cpp:194
 msgid "ISO-2022-JP"
 msgstr ""
 
-#: ../src/mac/carbon/dataview.cpp:609
+#: ../src/osx/carbon/dataview.cpp:2421
 msgid "Icon & text renderer cannot render value; value type: "
 msgstr ""
 
-#: ../src/generic/dbgrptg.cpp:354
+#: ../src/html/htmprint.cpp:283
+msgid ""
+"If possible, try changing the layout parameters to make the printout more "
+"narrow."
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:355
 msgid ""
 "If you have any additional information pertaining to this bug\n"
 "report, please enter it here and it will be joined to it:"
 msgstr ""
-"Hvis du har mer informasjon som hører til denne feilrapporten,\n"
+"Hvis du har mer informasjon som hører til denne feilrapporten,\n"
 "skriv det inn her og det vil bli lagt til:"
 
-#: ../src/generic/dbgrptg.cpp:320
+#: ../src/generic/dbgrptg.cpp:321
 msgid ""
 "If you wish to suppress this debug report completely, please choose the "
 "\"Cancel\" button,\n"
 "but be warned that it may hinder improving the program, so if\n"
 "at all possible please do continue with the report generation.\n"
 msgstr ""
-"Hvis du vil stanse denne feilsøkingsrapporten, velg «Avbryt»-knappen.\n"
-"Vær klar over at det kan hindre forbedring av programmet så\n"
+"Hvis du vil stanse denne feilsøkingsrapporten, velg «Avbryt»-knappen.\n"
+"Vær klar over at det kan hindre forbedring av programmet så\n"
 "det er best hvis du fortsetter genereringen av rapporten.\n"
 
-#: ../src/msw/registry.cpp:1324
+#: ../src/msw/registry.cpp:1396
 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."
-msgstr "Ignorerer verdi «%s» for nøkkel «%s»"
+msgstr "Ignorerer verdi «%s» for nøkkel «%s»"
 
-#: ../src/common/xtistrm.cpp:256
+#: ../src/common/xtistrm.cpp:300
 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
 msgstr "Ulovlig objektklasse (Ikke-wxEvtHandler) som hendelseskilde"
 
-#: ../src/generic/filectrlg.cpp:790 ../src/generic/dirctrlg.cpp:703
+#: ../src/common/xti.cpp:514
+msgid "Illegal Parameter Count for ConstructObject Method"
+msgstr "Ugyldig antall parametre for ConstructObject-metode"
+
+#: ../src/common/xti.cpp:502
+msgid "Illegal Parameter Count for Create Method"
+msgstr "Ugyldig antall parametre for Create-metode"
+
+#: ../src/generic/dirctrlg.cpp:662 ../src/generic/filectrlg.cpp:785
 msgid "Illegal directory name."
 msgstr "Ugyldig mappenavn."
 
-#: ../src/generic/filectrlg.cpp:1373
+#: ../src/generic/filectrlg.cpp:1370
 msgid "Illegal file specification."
 msgstr "Ugyldig filspesifikasjon."
 
-#: ../src/common/image.cpp:1841
+#: ../src/common/image.cpp:2054
 msgid "Image and mask have different sizes."
-msgstr "Bilde og maske har forskjellig størrelse."
+msgstr "Bilde og maske har forskjellig størrelse."
 
-#: ../src/common/image.cpp:2195 ../src/common/image.cpp:2240
+#: ../src/common/image.cpp:2410
 #, fuzzy, c-format
-msgid "Image file is not of type %ld."
+msgid "Image file is not of type %d."
 msgstr "Bildefil er ikke av type %d."
 
-#: ../src/common/image.cpp:2264
+#: ../src/common/image.cpp:2540
 #, fuzzy, c-format
-msgid "Image file is not of type %s."
+msgid "Image is not of type %s."
 msgstr "Bildefil er ikke av type %d."
 
-#: ../src/msw/textctrl.cpp:464
+#: ../src/msw/textctrl.cpp:399
 msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"
@@ -3610,116 +4179,143 @@ msgstr ""
 "Klarte ikke opprette rik redigeringskontroll, bruker enkel tekstkontroll i "
 "steden. Gjeninstaller riched32.dll."
 
-#: ../src/unix/utilsunx.cpp:314
+#: ../src/unix/utilsunx.cpp:322
 msgid "Impossible to get child process input"
-msgstr "Klarte ikke få tak i inndata for underprosess"
+msgstr "Klarte ikke få tak i inndata for underprosess"
 
-#: ../src/common/filefn.cpp:1114
+#: ../src/common/filefn.cpp:1071
 #, c-format
 msgid "Impossible to get permissions for file '%s'"
-msgstr "Klarte ikke få tak i rettigheter for filen «%s»"
+msgstr "Klarte ikke få tak i rettigheter for filen «%s»"
 
-#: ../src/common/filefn.cpp:1128
+#: ../src/common/filefn.cpp:1085
 #, c-format
 msgid "Impossible to overwrite the file '%s'"
-msgstr "Klarte ikke overskrive filen «%s»"
+msgstr "Klarte ikke overskrive filen «%s»"
 
-#: ../src/common/filefn.cpp:1182
+#: ../src/common/filefn.cpp:1139
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
-msgstr "Klarte ikke sette rettigheter for filen «%s»"
+msgstr "Klarte ikke sette rettigheter for filen «%s»"
+
+#: ../src/common/gifdecod.cpp:819
+#, c-format
+msgid "Incorrect GIF frame size (%u, %d) for the frame #%u"
+msgstr ""
+
+#: ../src/msw/ole/automtn.cpp:606
+msgid "Incorrect number of arguments."
+msgstr ""
 
-#: ../src/common/stockitem.cpp:130
+#: ../src/common/stockitem.cpp:166
 msgid "Indent"
 msgstr "Innrykk"
 
-#: ../src/richtext/richtextformatdlg.cpp:281
+#: ../src/richtext/richtextformatdlg.cpp:325
 msgid "Indents && Spacing"
 msgstr ""
 
-#: ../src/html/htmlhelp.cpp:578 ../src/html/helpwnd.cpp:511
+#: ../src/common/stockitem.cpp:167 ../src/html/helpwnd.cpp:523
 msgid "Index"
 msgstr "Indeks"
 
-#: ../src/common/fmapbase.cpp:119
+#: ../src/common/fmapbase.cpp:158
 msgid "Indian (ISO-8859-12)"
 msgstr "Indisk (ISO-8859-12)"
 
-#: ../src/common/init.cpp:248
+#: ../src/common/stockitem.cpp:168
+msgid "Info"
+msgstr ""
+
+#: ../src/common/init.cpp:261
 msgid "Initialization failed in post init, aborting."
 msgstr ""
 
-#: ../src/richtext/richtextsymboldlg.cpp:470
+#: ../src/richtext/richtextsymboldlg.cpp:469
 #, fuzzy
 msgid "Insert"
 msgstr "Innrykk"
 
-#: ../src/richtext/richtextbuffer.cpp:5244
-#: ../src/richtext/richtextbuffer.cpp:6024
+#: ../src/richtext/richtextbuffer.cpp:6985
+#: ../src/richtext/richtextbuffer.cpp:7840
 msgid "Insert Image"
 msgstr ""
 
-#: ../src/richtext/richtextbuffer.cpp:5105
-#: ../src/richtext/richtextbuffer.cpp:5139
-#: ../src/richtext/richtextbuffer.cpp:5177
-#: ../src/richtext/richtextctrl.cpp:600 ../src/richtext/richtextctrl.cpp:867
+#: ../src/richtext/richtextbuffer.cpp:7029
+#, fuzzy
+msgid "Insert Object"
+msgstr "Innrykk"
+
+#: ../src/richtext/richtextctrl.cpp:1219 ../src/richtext/richtextctrl.cpp:1471
+#: ../src/richtext/richtextbuffer.cpp:6832
+#: ../src/richtext/richtextbuffer.cpp:6859
+#: ../src/richtext/richtextbuffer.cpp:6903
 msgid "Insert Text"
 msgstr ""
 
-#: ../src/common/xtistrm.cpp:700
-msgid "Internal error, illegal wxCustomTypeInfo"
-msgstr "Intern feil, ugyldig wxCustomTypeInfo"
+#: ../src/richtext/richtextindentspage.cpp:320
+#: ../src/richtext/richtextindentspage.cpp:322
+msgid "Inserts a page break before the paragraph."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:549
+#, fuzzy
+msgid "Inset"
+msgstr "Innrykk"
 
-#: ../src/gtk/app.cpp:484
+#: ../src/gtk/app.cpp:428
 #, c-format
 msgid "Invalid GTK+ command line option, use \"%s --help\""
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:280
+#: ../src/common/imagtiff.cpp:315
 msgid "Invalid TIFF image index."
 msgstr "Ugyldig TIFF bildeindeks."
 
-#: ../src/xrc/xmlres.cpp:511
-#, c-format
-msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
-msgstr "Ugyldig XRC-ressurs «%s»: har ikke rotnode «resource»."
-
-#: ../src/mac/carbon/databrow.cpp:1112
+#: ../src/osx/carbon/dataview.cpp:1783 ../src/osx/carbon/dataview.cpp:1878
 msgid "Invalid data view item"
 msgstr ""
 
-#: ../src/common/appcmn.cpp:254
+#: ../src/common/appcmn.cpp:246
 #, c-format
 msgid "Invalid display mode specification '%s'."
-msgstr "Ugyldig spesifikasjon «%s» for skjermmodus."
+msgstr "Ugyldig spesifikasjon «%s» for skjermmodus."
 
-#: ../src/x11/app.cpp:124
+#: ../src/x11/app.cpp:122
 #, c-format
 msgid "Invalid geometry specification '%s'"
-msgstr "Ugyldig geometrispesifikasjon «%s»."
+msgstr "Ugyldig geometrispesifikasjon «%s»."
 
 #: ../src/unix/snglinst.cpp:307
 #, c-format
 msgid "Invalid lock file '%s'."
-msgstr "Ugyldig låsefil «%s»."
+msgstr "Ugyldig låsefil «%s»."
+
+#: ../src/common/translation.cpp:955
+#, fuzzy
+msgid "Invalid message catalog."
+msgstr "«%s» er ikke en gyldig meldingskatalog."
 
-#: ../src/common/xtistrm.cpp:361 ../src/common/xtistrm.cpp:376
+#: ../src/common/xtistrm.cpp:410 ../src/common/xtistrm.cpp:425
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr "Ugyldig eller nullobjekt-ID sendt til GetObjectClassInfo"
 
-#: ../src/common/xtistrm.cpp:391
+#: ../src/common/xtistrm.cpp:440
 msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
 msgstr "Ugyldig eller nullobjekt-ID sendt til HasObjectClassInfo"
 
-#: ../src/common/regex.cpp:312
+#: ../src/common/regex.cpp:314
 #, c-format
 msgid "Invalid regular expression '%s': %s"
-msgstr "Ugyldig regulært uttrykk «%s»: %s"
+msgstr "Ugyldig regulært uttrykk «%s»: %s"
+
+#: ../src/common/config.cpp:227
+#, c-format
+msgid "Invalid value %ld for a boolean key \"%s\" in config file."
+msgstr ""
 
-#: ../src/richtext/richtextfontpage.cpp:266
-#: ../src/richtext/richtextfontpage.cpp:318
-#: ../src/richtext/richtextfontpage.cpp:566 ../src/generic/fontdlgg.cpp:331
-#: ../src/mac/carbon/fontdlg.cpp:523
+#: ../src/generic/fontdlgg.cpp:330 ../src/richtext/richtextfontpage.cpp:293
+#: ../src/osx/carbon/fontdlg.cpp:545 ../src/common/stockitem.cpp:169
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -3727,11 +4323,11 @@ msgstr "Kursiv"
 msgid "Italy Envelope, 110 x 230 mm"
 msgstr "Italia-konvolutt, 110 x 230 mm"
 
-#: ../src/common/imagjpeg.cpp:251
+#: ../src/common/imagjpeg.cpp:256
 msgid "JPEG: Couldn't load - file is probably corrupted."
-msgstr "JPEG: Klarte ikke laste filen - sannsynligvis ødelagt."
+msgstr "JPEG: Klarte ikke laste filen - sannsynligvis ødelagt."
 
-#: ../src/common/imagjpeg.cpp:410
+#: ../src/common/imagjpeg.cpp:435
 msgid "JPEG: Couldn't save image."
 msgstr "JPEG: Klarte ikke lagre bilde."
 
@@ -3787,159 +4383,181 @@ msgstr ""
 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:134
+#: ../src/common/stockitem.cpp:170
+msgid "Jump to"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:172
 msgid "Justified"
 msgstr "Justert"
 
-#: ../src/richtext/richtextliststylepage.cpp:343
+#: ../src/richtext/richtextindentspage.cpp:168
+#: ../src/richtext/richtextindentspage.cpp:170
 #: ../src/richtext/richtextliststylepage.cpp:345
-#: ../src/richtext/richtextindentspage.cpp:165
-#: ../src/richtext/richtextindentspage.cpp:167
+#: ../src/richtext/richtextliststylepage.cpp:347
 msgid "Justify text left and right."
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:123
+#: ../src/common/fmapbase.cpp:162
 msgid "KOI8-R"
 msgstr "KOI8-R"
 
-#: ../src/common/fmapbase.cpp:124
+#: ../src/common/fmapbase.cpp:163
 msgid "KOI8-U"
 msgstr "KOI8-U"
 
-#: ../src/common/accelcmn.cpp:247 ../src/common/accelcmn.cpp:305
+#: ../src/common/accelcmn.cpp:255 ../src/common/accelcmn.cpp:326
 msgid "KP_"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:102
+#: ../src/common/accelcmn.cpp:104
 msgid "KP_ADD"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:97
+#: ../src/common/accelcmn.cpp:99
 msgid "KP_BEGIN"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:105
+#: ../src/common/accelcmn.cpp:107
 msgid "KP_DECIMAL"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:99
+#: ../src/common/accelcmn.cpp:101
 msgid "KP_DELETE"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:106
+#: ../src/common/accelcmn.cpp:108
 msgid "KP_DIVIDE"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:91
+#: ../src/common/accelcmn.cpp:93
 msgid "KP_DOWN"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:96
+#: ../src/common/accelcmn.cpp:98
 msgid "KP_END"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:86
+#: ../src/common/accelcmn.cpp:88
 msgid "KP_ENTER"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:100
+#: ../src/common/accelcmn.cpp:102
 msgid "KP_EQUAL"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:87
+#: ../src/common/accelcmn.cpp:89
 msgid "KP_HOME"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:98
+#: ../src/common/accelcmn.cpp:100
 msgid "KP_INSERT"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:88
+#: ../src/common/accelcmn.cpp:90
 msgid "KP_LEFT"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:101
+#: ../src/common/accelcmn.cpp:103
 msgid "KP_MULTIPLY"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:94
+#: ../src/common/accelcmn.cpp:96
 msgid "KP_NEXT"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:95
+#: ../src/common/accelcmn.cpp:97
 msgid "KP_PAGEDOWN"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:93
+#: ../src/common/accelcmn.cpp:95
 msgid "KP_PAGEUP"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:92
+#: ../src/common/accelcmn.cpp:94
 msgid "KP_PRIOR"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:90
+#: ../src/common/accelcmn.cpp:92
 msgid "KP_RIGHT"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:103
+#: ../src/common/accelcmn.cpp:105
 msgid "KP_SEPARATOR"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:84
+#: ../src/common/accelcmn.cpp:86
 msgid "KP_SPACE"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:104
+#: ../src/common/accelcmn.cpp:106
 msgid "KP_SUBTRACT"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:85
+#: ../src/common/accelcmn.cpp:87
 msgid "KP_TAB"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:89
+#: ../src/common/accelcmn.cpp:91
 msgid "KP_UP"
 msgstr ""
 
-#: ../src/richtext/richtextindentspage.cpp:307
+#: ../src/richtext/richtextindentspage.cpp:295
 msgid "L&ine spacing:"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:55
+#: ../src/common/accelcmn.cpp:57
 msgid "LEFT"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:618 ../src/generic/prntdlgg.cpp:873
+#: ../src/generic/prntdlgg.cpp:619 ../src/generic/prntdlgg.cpp:874
 msgid "Landscape"
 msgstr "Landskap"
 
+#: ../src/common/stockitem.cpp:175
+#, fuzzy
+msgid "Last"
+msgstr "&Lim inn"
+
+#: ../src/common/prntbase.cpp:1517
+#, fuzzy
+msgid "Last page"
+msgstr "Neste side"
+
+#: ../src/common/log.cpp:312
+#, c-format
+msgid "Last repeated message (\"%s\", %lu time) wasn't output"
+msgid_plural "Last repeated message (\"%s\", %lu times) wasn't output"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../src/common/paper.cpp:105
 msgid "Ledger, 17 x 11 in"
 msgstr "Ledger, 17 x 11 in"
 
-#: ../src/richtext/richtextliststylepage.cpp:248
-#: ../src/richtext/richtextliststylepage.cpp:251
-#: ../src/richtext/richtextliststylepage.cpp:252
-#: ../src/richtext/richtextbulletspage.cpp:197
+#: ../src/richtext/richtextliststylepage.cpp:250
+#: ../src/richtext/richtextliststylepage.cpp:253
+#: ../src/richtext/richtextliststylepage.cpp:254
 #: ../src/richtext/richtextbulletspage.cpp:200
-#: ../src/richtext/richtextbulletspage.cpp:201
+#: ../src/richtext/richtextbulletspage.cpp:203
+#: ../src/richtext/richtextbulletspage.cpp:204
+#: ../src/richtext/richtextsizepage.cpp:201
 msgid "Left"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:391
 #: ../src/richtext/richtextindentspage.cpp:217
+#: ../src/richtext/richtextliststylepage.cpp:391
 msgid "Left (&first line):"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:885
+#: ../src/generic/prntdlgg.cpp:886
 msgid "Left margin (mm):"
 msgstr "Venstremarg (mm):"
 
-#: ../src/richtext/richtextliststylepage.cpp:329
+#: ../src/richtext/richtextindentspage.cpp:154
+#: ../src/richtext/richtextindentspage.cpp:156
 #: ../src/richtext/richtextliststylepage.cpp:331
-#: ../src/richtext/richtextindentspage.cpp:151
-#: ../src/richtext/richtextindentspage.cpp:153
+#: ../src/richtext/richtextliststylepage.cpp:333
 msgid "Left-align text."
 msgstr ""
 
@@ -3984,85 +4602,85 @@ msgstr "Letter, 8 1/2 x 11 tommer"
 msgid "Letter, 8 1/2 x 11 in"
 msgstr "Letter, 8 1/2 x 11 tommer"
 
-#: ../src/generic/aboutdlgg.cpp:139
+#: ../src/generic/aboutdlgg.cpp:174
 msgid "License"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:334
+#: ../src/generic/fontdlgg.cpp:333
 msgid "Light"
 msgstr "Lett"
 
-#: ../src/generic/helpext.cpp:300
+#: ../src/generic/helpext.cpp:299
 #, c-format
 msgid "Line %lu of map file \"%s\" has invalid syntax, skipped."
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:453
+#: ../src/richtext/richtextliststylepage.cpp:445
 msgid "Line spacing:"
 msgstr ""
 
-#: ../src/html/chm.cpp:820
+#: ../src/html/chm.cpp:841
 msgid "Link contained '//', converted to absolute link."
-msgstr "Lenke inneholdt «//», konvertert til absolutt lenke."
+msgstr "Lenke inneholdt «//», konvertert til absolutt lenke."
 
-#: ../src/richtext/richtextformatdlg.cpp:300
+#: ../src/richtext/richtextformatdlg.cpp:344
 msgid "List Style"
 msgstr ""
 
-#: ../src/richtext/richtextstyles.cpp:841
+#: ../src/richtext/richtextstyles.cpp:1035
 msgid "List styles"
 msgstr ""
 
-#: ../src/richtext/richtextfontpage.cpp:163
-#: ../src/richtext/richtextfontpage.cpp:165
+#: ../src/richtext/richtextfontpage.cpp:173
+#: ../src/richtext/richtextfontpage.cpp:175
 msgid "Lists font sizes in points."
 msgstr ""
 
-#: ../src/richtext/richtextfontpage.cpp:144
-#: ../src/richtext/richtextfontpage.cpp:146
+#: ../src/richtext/richtextfontpage.cpp:154
+#: ../src/richtext/richtextfontpage.cpp:156
 #, fuzzy
 msgid "Lists the available fonts."
 msgstr "Tips er ikke tilgjengelig, beklager!"
 
-#: ../src/common/fldlgcmn.cpp:282
+#: ../src/common/fldlgcmn.cpp:326
 #, c-format
 msgid "Load %s file"
 msgstr "Laster %s fil"
 
-#: ../src/html/htmlwin.cpp:548
+#: ../src/html/htmlwin.cpp:571
 msgid "Loading : "
 msgstr "Laster:"
 
 #: ../src/unix/snglinst.cpp:247
 #, c-format
 msgid "Lock file '%s' has incorrect owner."
-msgstr "Låsefil «%s» har feil eier."
+msgstr "Låsefil «%s» har feil eier."
 
 #: ../src/unix/snglinst.cpp:252
 #, c-format
 msgid "Lock file '%s' has incorrect permissions."
-msgstr "Låsefeil «%s» har feil rettigheter."
+msgstr "Låsefeil «%s» har feil rettigheter."
 
-#: ../src/generic/logg.cpp:602
+#: ../src/generic/logg.cpp:586
 #, c-format
 msgid "Log saved to the file '%s'."
-msgstr "Logg lagret til filen «%s»."
+msgstr "Logg lagret til filen «%s»."
 
-#: ../src/richtext/richtextliststylepage.cpp:486
-#: ../src/richtext/richtextbulletspage.cpp:284
+#: ../src/richtext/richtextliststylepage.cpp:485
+#: ../src/richtext/richtextbulletspage.cpp:290
 msgid "Lower case letters"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:488
-#: ../src/richtext/richtextbulletspage.cpp:286
+#: ../src/richtext/richtextliststylepage.cpp:487
+#: ../src/richtext/richtextbulletspage.cpp:292
 msgid "Lower case roman numerals"
 msgstr ""
 
-#: ../src/gtk/mdi.cpp:413 ../src/gtk1/mdi.cpp:462
+#: ../src/gtk/mdi.cpp:431 ../src/gtk1/mdi.cpp:432
 msgid "MDI child"
 msgstr "MDI-barn"
 
-#: ../src/common/accelcmn.cpp:67
+#: ../src/common/accelcmn.cpp:69
 msgid "MENU"
 msgstr ""
 
@@ -4072,48 +4690,244 @@ msgid ""
 "not installed on this machine. Please install it."
 msgstr ""
 "MS HTML hjelpefunksjoner er utilgjengelig fordi MS HTML hjelpebiblioteket "
-"ikke er installert på denne maskinen."
+"ikke er installert på denne maskinen."
 
-#: ../src/univ/themes/win32.cpp:3740
+#: ../src/univ/themes/win32.cpp:3757
 msgid "Ma&ximize"
 msgstr "Ma&ksimer"
 
+#: ../src/common/fmapbase.cpp:200
+msgid "MacArabic"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:219
+msgid "MacArmenian"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:208
+msgid "MacBengali"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:214
+msgid "MacBurmese"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:233
+msgid "MacCeltic"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:224
+msgid "MacCentralEurRoman"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:220
+msgid "MacChineseSimp"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:198
+msgid "MacChineseTrad"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:230
+msgid "MacCroatian"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:203
+msgid "MacCyrillic"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:204
+msgid "MacDevanagari"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:228
+msgid "MacDingbats"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:223
+msgid "MacEthiopic"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:226
+msgid "MacExtArabic"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:234
+msgid "MacGaelic"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:218
+msgid "MacGeorgian"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:202
+msgid "MacGreek"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:206
+msgid "MacGujarati"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:205
+msgid "MacGurmukhi"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:201
+msgid "MacHebrew"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:231
+msgid "MacIcelandic"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:197
+msgid "MacJapanese"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:211
+msgid "MacKannada"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:235
+msgid "MacKeyboardGlyphs"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:215
+msgid "MacKhmer"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:199
+msgid "MacKorean"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:217
+msgid "MacLaotian"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:212
+msgid "MacMalayalam"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:222
+msgid "MacMongolian"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:207
+msgid "MacOriya"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:196
+#, fuzzy
+msgid "MacRoman"
+msgstr "Roman"
+
+#: ../src/common/fmapbase.cpp:232
+#, fuzzy
+msgid "MacRomanian"
+msgstr "Roman"
+
+#: ../src/common/fmapbase.cpp:213
+#, fuzzy
+msgid "MacSinhalese"
+msgstr "Skill mellom store og små bokstaver"
+
+#: ../src/common/fmapbase.cpp:227
+#, fuzzy
+msgid "MacSymbol"
+msgstr "&Stil:"
+
+#: ../src/common/fmapbase.cpp:209
+msgid "MacTamil"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:210
+msgid "MacTelugu"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:216
+msgid "MacThai"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:221
+msgid "MacTibetan"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:229
+msgid "MacTurkish"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:225
+msgid "MacVietnamese"
+msgstr ""
+
+#: ../src/propgrid/advprops.cpp:2025
+#, fuzzy
+msgid "Make a selection:"
+msgstr "Seksjoner"
+
+#: ../src/richtext/richtextformatdlg.cpp:357
+#: ../src/richtext/richtextmarginspage.cpp:172
+msgid "Margins"
+msgstr ""
+
 #: ../src/generic/fdrepdlg.cpp:148
 msgid "Match case"
-msgstr "Skill mellom store og små bokstaver"
+msgstr "Skill mellom store og små bokstaver"
+
+#: ../src/richtext/richtextsizepage.cpp:363
+#, fuzzy
+msgid "Max height:"
+msgstr "&Vekt:"
+
+#: ../src/richtext/richtextsizepage.cpp:336
+#, fuzzy
+msgid "Max width:"
+msgstr "Erstatt med:"
 
-#: ../src/common/fs_mem.cpp:168
+#: ../src/common/fs_mem.cpp:176
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
-msgstr "Minne VFS inneholder allerede filen «%s»!"
+msgstr "Minne VFS inneholder allerede filen «%s»!"
 
-#: ../src/msw/frame.cpp:415
+#: ../src/msw/frame.cpp:354
 msgid "Menu"
 msgstr "Meny"
 
+#: ../src/common/msgout.cpp:125
+#, fuzzy
+msgid "Message"
+msgstr "%s melding"
+
 #: ../src/univ/themes/metal.cpp:169
 msgid "Metal theme"
 msgstr "Metaltema"
 
-#: ../src/univ/themes/win32.cpp:3738
+#: ../src/msw/ole/automtn.cpp:623
+msgid "Method or property not found."
+msgstr ""
+
+#: ../src/univ/themes/win32.cpp:3755
 msgid "Mi&nimize"
 msgstr "Mi&nimer"
 
-#: ../src/mgl/app.cpp:163
-#, c-format
-msgid "Mode %ix%i-%i not available."
-msgstr "Modus %ix%i-%i ikke tilgjengelig."
-
-#: ../src/mac/carbon/dataview.cpp:1412
+#: ../src/richtext/richtextsizepage.cpp:309
 #, fuzzy
-msgid "Model pointer not initialized."
-msgstr "Klarte ikke initialisere skjerm."
+msgid "Min height:"
+msgstr "Skriftvekt"
 
-#: ../src/generic/fontdlgg.cpp:326
+#: ../src/richtext/richtextsizepage.cpp:282
+msgid "Min width:"
+msgstr ""
+
+#: ../src/msw/ole/automtn.cpp:639
+msgid "Missing a required parameter."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:325
 msgid "Modern"
 msgstr "Moderne"
 
-#: ../src/generic/filectrlg.cpp:461
+#: ../src/generic/filectrlg.cpp:456
 msgid "Modified"
 msgstr "Modifisert"
 
@@ -4126,42 +4940,76 @@ msgstr ""
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
 msgstr "Monark-konvolutt, 3 7/8 x 7 1/2 tommer"
 
-#: ../src/generic/editlbox.cpp:276
+#: ../src/msw/fswatcher.cpp:144
+msgid "Monitoring individual files for changes is not supported currently."
+msgstr ""
+
+#: ../src/generic/editlbox.cpp:277
 msgid "Move down"
 msgstr "Flytt ned"
 
-#: ../src/generic/editlbox.cpp:275
+#: ../src/generic/editlbox.cpp:276
 msgid "Move up"
 msgstr "Flytt opp"
 
-#: ../src/common/accelcmn.cpp:80
+#: ../src/richtext/richtextsizepage.cpp:487
+#: ../src/richtext/richtextsizepage.cpp:489
+msgid "Moves the object to the next paragraph."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:481
+#: ../src/richtext/richtextsizepage.cpp:483
+msgid "Moves the object to the previous paragraph."
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:8265
+msgid "Multiple Cell Properties"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:82
 msgid "NUM_LOCK"
 msgstr ""
 
-#: ../src/generic/filectrlg.cpp:458
+#: ../src/generic/filectrlg.cpp:453
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/richtext/richtextstyledlg.cpp:217
-msgid "New &Character Style..."
+#: ../src/common/stockitem.cpp:176
+msgid "Network"
 msgstr ""
 
+#: ../src/common/stockitem.cpp:177
+#, fuzzy
+msgid "New"
+msgstr "&Ny"
+
+#: ../src/richtext/richtextstyledlg.cpp:247
+#, fuzzy
+msgid "New &Box Style..."
+msgstr "Nytt element"
+
 #: ../src/richtext/richtextstyledlg.cpp:229
+msgid "New &Character Style..."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:241
 msgid "New &List Style..."
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:223
+#: ../src/richtext/richtextstyledlg.cpp:235
 msgid "New &Paragraph Style..."
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:568
-#: ../src/richtext/richtextstyledlg.cpp:573
-#: ../src/richtext/richtextstyledlg.cpp:616
-#: ../src/richtext/richtextstyledlg.cpp:621
-#: ../src/richtext/richtextstyledlg.cpp:770
-#: ../src/richtext/richtextstyledlg.cpp:775
-#: ../src/richtext/richtextstyledlg.cpp:843
-#: ../src/richtext/richtextstyledlg.cpp:851
+#: ../src/richtext/richtextstyledlg.cpp:607
+#: ../src/richtext/richtextstyledlg.cpp:612
+#: ../src/richtext/richtextstyledlg.cpp:655
+#: ../src/richtext/richtextstyledlg.cpp:660
+#: ../src/richtext/richtextstyledlg.cpp:821
+#: ../src/richtext/richtextstyledlg.cpp:826
+#: ../src/richtext/richtextstyledlg.cpp:894
+#: ../src/richtext/richtextstyledlg.cpp:902
+#: ../src/richtext/richtextstyledlg.cpp:935
+#: ../src/richtext/richtextstyledlg.cpp:940
 #, fuzzy
 msgid "New Style"
 msgstr "Nytt element"
@@ -4170,58 +5018,58 @@ msgstr "Nytt element"
 msgid "New directory"
 msgstr "Ny mappe"
 
-#: ../src/generic/editlbox.cpp:273
+#: ../src/generic/editlbox.cpp:274
 msgid "New item"
 msgstr "Nytt element"
 
-#: ../src/generic/filectrlg.cpp:652 ../src/generic/filectrlg.cpp:661
 #: ../src/generic/dirdlgg.cpp:327 ../src/generic/dirdlgg.cpp:337
+#: ../src/generic/filectrlg.cpp:647 ../src/generic/filectrlg.cpp:656
 msgid "NewName"
 msgstr "NyttNavn"
 
-#: ../src/generic/tipdlg.cpp:303
+#: ../src/generic/tipdlg.cpp:306
 msgid "Next"
 msgstr "Neste"
 
-#: ../src/html/helpwnd.cpp:675
+#: ../src/common/prntbase.cpp:1512 ../src/html/helpwnd.cpp:676
 msgid "Next page"
 msgstr "Neste side"
 
-#: ../src/motif/msgdlg.cpp:194 ../src/mac/carbon/msgdlg.cpp:36
+#: ../src/common/stockitem.cpp:178 ../src/motif/msgdlg.cpp:194
 msgid "No"
 msgstr "Nei"
 
-#: ../src/generic/animateg.cpp:152
+#: ../src/generic/animateg.cpp:151
 #, fuzzy, c-format
 msgid "No animation handler for type %ld defined."
 msgstr "Ingen bildebehandler for type %d definert."
 
-#: ../src/dfb/bitmap.cpp:540 ../src/dfb/bitmap.cpp:574
+#: ../src/dfb/bitmap.cpp:643 ../src/dfb/bitmap.cpp:677
 #, fuzzy, c-format
 msgid "No bitmap handler for type %d defined."
 msgstr "Ingen bildebehandler for type %d definert."
 
-#: ../src/mac/carbon/databrow.cpp:1116
+#: ../src/osx/carbon/dataview.cpp:1785
 msgid "No column existing."
 msgstr ""
 
-#: ../src/mac/carbon/databrow.cpp:1013
-msgid "No column for the specified column index existing."
+#: ../src/osx/carbon/dataview.cpp:1675
+msgid "No column for the specified column existing."
 msgstr ""
 
-#: ../src/mac/carbon/databrow.cpp:768
+#: ../src/osx/carbon/dataview.cpp:1424
 msgid "No column for the specified column position existing."
 msgstr ""
 
-#: ../src/common/utilscmn.cpp:1146
+#: ../src/common/utilscmn.cpp:1046
 msgid "No default application configured for HTML files."
 msgstr ""
 
-#: ../src/generic/helpext.cpp:451
+#: ../src/generic/helpext.cpp:450
 msgid "No entries found."
-msgstr "Ingen oppføringer funnet."
+msgstr "Ingen oppføringer funnet."
 
-#: ../src/common/fontmap.cpp:419
+#: ../src/common/fontmap.cpp:420
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
@@ -4229,64 +5077,50 @@ msgid ""
 "Do you want to use this encoding (otherwise you will have to choose another "
 "one)?"
 msgstr ""
-"Ingen skrift for visning i koding «%s» funnet,\n"
-"men en alternativ koding «%s» er tilgjengelig.\n"
-"Vil du bruke denne koding (hvis ikke må du velge en annen)?"
+"Ingen skrift for visning i koding «%s» funnet,\n"
+"men en alternativ koding «%s» er tilgjengelig.\n"
+"Vil du bruke denne koding (hvis ikke må du velge en annen)?"
 
-#: ../src/common/fontmap.cpp:424
+#: ../src/common/fontmap.cpp:425
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found.\n"
 "Would you like to select a font to be used for this encoding\n"
 "(otherwise the text in this encoding will not be shown correctly)?"
 msgstr ""
-"Ingen skrift for visning i koding «%s» funnet.\n"
+"Ingen skrift for visning i koding «%s» funnet.\n"
 "Vil du velge en annen skrift for denne kodingen\n"
 "(hvis ikke vil teksten i denne kodingen bli vist feil)?"
 
-#: ../src/xrc/xmlres.cpp:739
-#, c-format
-msgid "No handler found for XML node '%s', class '%s'!"
-msgstr "Ingen behandler funnet for XML-node «%s», klasse «%s»!"
-
-#: ../src/generic/animateg.cpp:144
+#: ../src/generic/animateg.cpp:143
 #, fuzzy
 msgid "No handler found for animation type."
 msgstr "Ingen behandler funnet for bildetype."
 
-#: ../src/common/image.cpp:2177 ../src/common/image.cpp:2224
+#: ../src/common/image.cpp:2392
 msgid "No handler found for image type."
 msgstr "Ingen behandler funnet for bildetype."
 
-#: ../src/common/image.cpp:2278
+#: ../src/common/image.cpp:2400 ../src/common/image.cpp:2511
+#: ../src/common/image.cpp:2564
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "Ingen bildebehandler for type %d definert."
 
-#: ../src/common/image.cpp:2185 ../src/common/image.cpp:2233
-#, fuzzy, c-format
-msgid "No image handler for type %ld defined."
-msgstr "Ingen bildebehandler for type %d definert."
-
-#: ../src/common/image.cpp:2257 ../src/common/image.cpp:2293
+#: ../src/common/image.cpp:2534 ../src/common/image.cpp:2578
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "Ingen bildebehandler for type %s definert."
 
-#: ../src/html/htmlhelp.cpp:436 ../src/html/htmlhelp.cpp:441
-#: ../src/html/helpwnd.cpp:876
+#: ../src/html/helpwnd.cpp:873
 msgid "No matching page found yet"
 msgstr "Ingen sider med treff funnet enda"
 
-#: ../src/mac/carbon/dataview.cpp:1051 ../src/mac/carbon/dataview.cpp:1171
-msgid "No model associated with control."
-msgstr ""
-
-#: ../src/mac/carbon/databrow.cpp:1015 ../src/mac/carbon/databrow.cpp:1118
+#: ../src/osx/carbon/dataview.cpp:1677 ../src/osx/carbon/dataview.cpp:1787
 msgid "No renderer or invalid renderer type specified for custom data column."
 msgstr ""
 
-#: ../src/mac/carbon/databrow.cpp:769
+#: ../src/osx/carbon/dataview.cpp:1425
 msgid "No renderer specified for column."
 msgstr ""
 
@@ -4294,39 +5128,54 @@ msgstr ""
 msgid "No sound"
 msgstr "Ingen lyd"
 
-#: ../src/common/image.cpp:1849 ../src/common/image.cpp:1890
+#: ../src/common/image.cpp:2062 ../src/common/image.cpp:2103
 msgid "No unused colour in image being masked."
 msgstr "Ingen ubrukte farger i bilde blir masket."
 
-#: ../src/common/image.cpp:2742
+#: ../src/common/image.cpp:3040
 msgid "No unused colour in image."
 msgstr "Ingen ubrukte farger i bildet."
 
-#: ../src/generic/helpext.cpp:308
+#: ../src/generic/helpext.cpp:307
 #, c-format
 msgid "No valid mappings found in the file \"%s\"."
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:117
+#: ../src/richtext/richtextborderspage.cpp:542
+#: ../src/richtext/richtextsizepage.cpp:200
+#: ../src/richtext/richtextsizepage.cpp:203
+#: ../src/richtext/richtextsizepage.cpp:204
+#, fuzzy
+msgid "None"
+msgstr "Ferdig"
+
+#: ../src/common/fmapbase.cpp:156
 msgid "Nordic (ISO-8859-10)"
 msgstr "Nordisk (ISO-8859-10)"
 
-#: ../src/richtext/richtextindentspage.cpp:245
-#: ../src/richtext/richtextindentspage.cpp:255
-#: ../src/richtext/richtextindentspage.cpp:256 ../src/generic/fontdlgg.cpp:330
-#: ../src/generic/fontdlgg.cpp:333
+#: ../src/generic/fontdlgg.cpp:329 ../src/generic/fontdlgg.cpp:332
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/html/helpwnd.cpp:1271
+#: ../src/html/helpwnd.cpp:1273
 msgid "Normal face<br>and <u>underlined</u>. "
 msgstr "Normal skrift<br>og <u>understreket</u>."
 
-#: ../src/html/helpwnd.cpp:1216
+#: ../src/html/helpwnd.cpp:1215
 msgid "Normal font:"
 msgstr "Normal skrift:"
 
-#: ../src/richtext/richtextfontpage.cpp:271
+#: ../src/propgrid/props.cpp:888
+#, fuzzy, c-format
+msgid "Not %s"
+msgstr "%Om"
+
+#: ../include/wx/filename.h:558 ../include/wx/filename.h:563
+#, fuzzy
+msgid "Not available"
+msgstr "Ingen XBM-fasilitet tilgjengelig!"
+
+#: ../src/richtext/richtextfontpage.cpp:300
 #, fuzzy
 msgid "Not underlined"
 msgstr "understreket"
@@ -4335,132 +5184,169 @@ msgstr "understreket"
 msgid "Note, 8 1/2 x 11 in"
 msgstr "Notat, 8 1/2 x 11 tommer"
 
-#: ../src/generic/notifmsgg.cpp:101
+#: ../src/generic/notifmsgg.cpp:105
 #, fuzzy
 msgid "Notice"
 msgstr "&Notater:"
 
-#: ../src/richtext/richtextliststylepage.cpp:489
-#: ../src/richtext/richtextbulletspage.cpp:287
+#: ../src/osx/carbon/dataview.cpp:903
+#, fuzzy
+msgid "Number of columns could not be determined."
+msgstr "Klarte ikke laste filen."
+
+#: ../src/richtext/richtextliststylepage.cpp:488
+#: ../src/richtext/richtextbulletspage.cpp:293
 msgid "Numbered outline"
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:282 ../src/gtk1/fontdlg.cpp:139
-#: ../src/msw/dialog.cpp:180 ../src/mac/carbon/msgdlg.cpp:37
+#: ../src/richtext/richtextstyledlg.cpp:301 ../src/common/stockitem.cpp:179
+#: ../src/msw/msgdlg.cpp:489 ../src/msw/msgdlg.cpp:777
+#: ../src/msw/dialog.cpp:120 ../src/gtk1/fontdlg.cpp:139
 msgid "OK"
 msgstr "OK"
 
-#: ../src/common/xtixml.cpp:260
+#: ../src/msw/ole/automtn.cpp:663
+#, c-format
+msgid "OLE Automation error in %s: %s"
+msgstr ""
+
+#: ../include/wx/richtext/richtextimagedlg.h:39
+#, fuzzy
+msgid "Object Properties"
+msgstr "&Egenskaper"
+
+#: ../src/msw/ole/automtn.cpp:631
+msgid "Object implementation does not support named arguments."
+msgstr ""
+
+#: ../src/common/xtixml.cpp:265
 msgid "Objects must have an id attribute"
-msgstr "Objekter må ha en ID attributt"
+msgstr "Objekter må ha en ID attributt"
 
-#: ../src/common/docview.cpp:1298 ../src/common/docview.cpp:1624
-#: ../src/common/docview.cpp:1664
+#: ../src/common/docview.cpp:1736 ../src/common/docview.cpp:1778
 msgid "Open File"
-msgstr "Åpne Fil"
+msgstr "Åpne Fil"
 
-#: ../src/html/helpwnd.cpp:683 ../src/html/helpwnd.cpp:1557
+#: ../src/html/helpwnd.cpp:682 ../src/html/helpwnd.cpp:1563
 msgid "Open HTML document"
-msgstr "Åpne HTML-dokument"
+msgstr "Åpne HTML-dokument"
 
-#: ../src/generic/dbgrptg.cpp:159
+#: ../src/generic/dbgrptg.cpp:160
 #, c-format
 msgid "Open file \"%s\""
-msgstr "Åpne fil «%s»"
+msgstr "Åpne fil «%s»"
+
+#: ../src/common/stockitem.cpp:180
+#, fuzzy
+msgid "Open..."
+msgstr "&Åpne..."
 
-#: ../src/mac/carbon/glcanvas.cpp:48
+#: ../src/osx/carbon/glcanvas.cpp:49
 #, c-format
 msgid "OpenGL function \"%s\" failed: %s (error %d)"
 msgstr ""
 
-#: ../src/generic/filectrlg.cpp:676 ../src/generic/filectrlg.cpp:820
-#: ../src/generic/dirdlgg.cpp:353 ../src/generic/dirctrlg.cpp:732
+#: ../src/generic/dirctrlg.cpp:691 ../src/generic/dirdlgg.cpp:353
+#: ../src/generic/filectrlg.cpp:671 ../src/generic/filectrlg.cpp:815
 msgid "Operation not permitted."
 msgstr "Operasjon ikke tillatt."
 
-#: ../src/common/cmdline.cpp:771
+#: ../src/common/cmdline.cpp:728
+#, fuzzy, c-format
+msgid "Option '%s' can't be negated"
+msgstr "Mappe «%s» kunne ikke opprettes"
+
+#: ../src/common/cmdline.cpp:892
 #, c-format
 msgid "Option '%s' requires a value."
-msgstr "Opsjon «%s» må ha en verdi."
+msgstr "Opsjon «%s» må ha en verdi."
 
-#: ../src/common/cmdline.cpp:854
+#: ../src/common/cmdline.cpp:975
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
-msgstr "Opsjon «%s»: «%s» kan ikke konverteres til en dato."
+msgstr "Opsjon «%s»: «%s» kan ikke konverteres til en dato."
 
-#: ../src/generic/prntdlgg.cpp:623 ../src/generic/dirdlgg.cpp:188
+#: ../src/generic/dirdlgg.cpp:188 ../src/generic/prntdlgg.cpp:624
 msgid "Options"
 msgstr "Opsjoner"
 
-#: ../src/generic/prntdlgg.cpp:620 ../src/generic/prntdlgg.cpp:874
+#: ../src/generic/prntdlgg.cpp:621 ../src/generic/prntdlgg.cpp:875
 msgid "Orientation"
 msgstr "Orientering"
 
-#: ../src/common/windowid.cpp:215
+#: ../src/common/windowid.cpp:260
 msgid "Out of window IDs.  Recommend shutting down application."
 msgstr ""
 
-#: ../src/mac/carbon/dataview.cpp:376
-#, fuzzy
-msgid "Owner not initialized."
-msgstr "Klarte ikke initialisere skjerm."
+#: ../src/richtext/richtextborderspage.cpp:400
+#: ../src/richtext/richtextborderspage.cpp:533
+msgid "Outline"
+msgstr ""
 
-#: ../src/common/accelcmn.cpp:83
+#: ../src/richtext/richtextborderspage.cpp:550
+msgid "Outset"
+msgstr ""
+
+#: ../src/msw/ole/automtn.cpp:627
+msgid "Overflow while coercing argument values."
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:85
 msgid "PAGEDOWN"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:82
+#: ../src/common/accelcmn.cpp:84
 msgid "PAGEUP"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:68
+#: ../src/common/accelcmn.cpp:70
 msgid "PAUSE"
 msgstr ""
 
-#: ../src/common/imagpcx.cpp:456 ../src/common/imagpcx.cpp:479
+#: ../src/common/imagpcx.cpp:458 ../src/common/imagpcx.cpp:481
 msgid "PCX: couldn't allocate memory"
 msgstr "PCX: Klarte ikke reservere minne"
 
-#: ../src/common/imagpcx.cpp:455
+#: ../src/common/imagpcx.cpp:457
 msgid "PCX: image format unsupported"
-msgstr "PCX: Bildeformat ikke støttet"
+msgstr "PCX: Bildeformat ikke støttet"
 
-#: ../src/common/imagpcx.cpp:478
+#: ../src/common/imagpcx.cpp:480
 msgid "PCX: invalid image"
 msgstr "PCX: Ugyldig bilde"
 
-#: ../src/common/imagpcx.cpp:442
+#: ../src/common/imagpcx.cpp:443
 msgid "PCX: this is not a PCX file."
 msgstr "PCX: Dette er ikke en PCX-fil"
 
-#: ../src/common/imagpcx.cpp:458 ../src/common/imagpcx.cpp:480
+#: ../src/common/imagpcx.cpp:460 ../src/common/imagpcx.cpp:482
 msgid "PCX: unknown error !!!"
 msgstr "PCX: Ukjent feil!"
 
-#: ../src/common/imagpcx.cpp:457
+#: ../src/common/imagpcx.cpp:459
 msgid "PCX: version number too low"
 msgstr "PCX: Versjonsnummer er for lavt"
 
-#: ../src/common/accelcmn.cpp:54
+#: ../src/common/accelcmn.cpp:56
 msgid "PGDN"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:53
+#: ../src/common/accelcmn.cpp:55
 msgid "PGUP"
 msgstr ""
 
-#: ../src/common/imagpnm.cpp:88
+#: ../src/common/imagpnm.cpp:92
 msgid "PNM: Couldn't allocate memory."
 msgstr "PNM: Klarte ikke reservere minne."
 
-#: ../src/common/imagpnm.cpp:72
+#: ../src/common/imagpnm.cpp:74
 msgid "PNM: File format is not recognized."
 msgstr "PNM: Filformat ikke gjenkjent"
 
-#: ../src/common/imagpnm.cpp:106 ../src/common/imagpnm.cpp:125
-#: ../src/common/imagpnm.cpp:144
+#: ../src/common/imagpnm.cpp:113 ../src/common/imagpnm.cpp:135
+#: ../src/common/imagpnm.cpp:157
 msgid "PNM: File seems truncated."
-msgstr "PNM: Filen ser ut til å være trunkert."
+msgstr "PNM: Filen ser ut til å være trunkert."
 
 #: ../src/common/paper.cpp:189
 msgid "PRC 16K 146 x 215 mm"
@@ -4586,25 +5472,31 @@ msgstr "C4-konvolutt, 229 x 324 mm"
 msgid "PRC Envelope #9 Rotated 324 x 229 mm"
 msgstr "C5-konvolutt, 162 x 229 mm"
 
-#: ../src/common/accelcmn.cpp:71
+#: ../src/common/accelcmn.cpp:73
 msgid "PRINT"
 msgstr ""
 
-#: ../src/common/prntbase.cpp:1569
+#: ../src/richtext/richtextmarginspage.cpp:286
+#, fuzzy
+msgid "Padding"
+msgstr "leser"
+
+#: ../src/common/prntbase.cpp:2012
 #, c-format
 msgid "Page %d"
 msgstr "Side %d"
 
-#: ../src/common/prntbase.cpp:1567
+#: ../src/common/prntbase.cpp:2010
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: ../src/generic/prntdlgg.cpp:833
+#: ../src/gtk/print.cpp:770
 msgid "Page Setup"
 msgstr "Sideoppsett"
 
-#: ../src/common/prntbase.cpp:465 ../src/gtk/gnome/gprint.cpp:706
+#: ../src/generic/prntdlgg.cpp:834 ../src/common/prntbase.cpp:480
+#: ../src/gtk/gnome/gprint.cpp:706
 msgid "Page setup"
 msgstr "Sideoppsett"
 
@@ -4612,78 +5504,70 @@ msgstr "Sideoppsett"
 msgid "Pages"
 msgstr "Sider"
 
-#: ../src/generic/prntdlgg.cpp:806 ../src/generic/prntdlgg.cpp:860
-#: ../src/generic/prntdlgg.cpp:1062
-msgid "Paper Size"
-msgstr "Papirstørrelse"
-
-#: ../src/generic/prntdlgg.cpp:607 ../src/generic/prntdlgg.cpp:847
-#: ../src/generic/prntdlgg.cpp:1057
+#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:807
+#: ../src/generic/prntdlgg.cpp:848 ../src/generic/prntdlgg.cpp:861
+#: ../src/generic/prntdlgg.cpp:1058 ../src/generic/prntdlgg.cpp:1063
 msgid "Paper size"
-msgstr "Papirstørrelse"
+msgstr "Papirstørrelse"
 
-#: ../src/richtext/richtextstyles.cpp:839
+#: ../src/richtext/richtextstyles.cpp:1033
 msgid "Paragraph styles"
 msgstr ""
 
-#: ../src/mac/carbon/dataview.cpp:375
-#, fuzzy
-msgid "Passed item is invalid."
-msgstr "«%s» er ugyldig"
-
-#: ../src/common/xtistrm.cpp:421
+#: ../src/common/xtistrm.cpp:470
 msgid "Passing a already registered object to SetObject"
 msgstr "Allerede registrert objekt sendt til SetObject"
 
-#: ../src/common/xtistrm.cpp:639
-msgid "Passing a already registered object to SetObjectName"
-msgstr "Allerede registrert objekt sendt til SetObjectName"
-
-#: ../src/common/xtistrm.cpp:432 ../src/common/xtistrm.cpp:652
+#: ../src/common/xtistrm.cpp:481
 msgid "Passing an unkown object to GetObject"
 msgstr "Ukjent objekt sendt til GetObject"
 
-#: ../src/richtext/richtextctrl.cpp:2234
-#: ../src/stc/scintilla/src/ScintillaBase.cxx:427
+#: ../src/richtext/richtextctrl.cpp:3075 ../src/common/stockitem.cpp:181
+#: ../src/stc/stc_i18n.cpp:20
 #, fuzzy
 msgid "Paste"
 msgstr "&Lim inn"
 
-#: ../src/common/stockitem.cpp:207
+#: ../src/common/stockitem.cpp:263
 #, fuzzy
 msgid "Paste selection"
 msgstr "Seksjoner"
 
-#: ../src/richtext/richtextliststylepage.cpp:221
-#: ../src/richtext/richtextbulletspage.cpp:170
+#: ../src/richtext/richtextliststylepage.cpp:223
+#: ../src/richtext/richtextbulletspage.cpp:173
 msgid "Peri&od"
 msgstr ""
 
-#: ../src/generic/filectrlg.cpp:464
+#: ../src/generic/filectrlg.cpp:459
 msgid "Permissions"
 msgstr "Rettigheter"
 
+#: ../src/richtext/richtextbuffer.cpp:10251
+#, fuzzy
+msgid "Picture Properties"
+msgstr "&Egenskaper"
+
 #: ../include/wx/unix/pipe.h:47
 msgid "Pipe creation failed"
-msgstr "Røropprettelse feilet"
+msgstr "Røropprettelse feilet"
 
 #: ../src/gtk1/fontdlg.cpp:75
 msgid "Please choose a valid font."
 msgstr "Velg en gyldig skrift."
 
-#: ../src/gtk/filedlg.cpp:66
+#: ../src/gtk/filedlg.cpp:68
 msgid "Please choose an existing file."
 msgstr "Velg en eksisterende fil."
 
-#: ../src/html/helpwnd.cpp:819
+#: ../src/html/helpwnd.cpp:814
 msgid "Please choose the page to display:"
 msgstr "Velg siden som skal vises:"
 
-#: ../src/msw/dialup.cpp:792
+#: ../src/msw/dialup.cpp:786
 msgid "Please choose which ISP do you want to connect to"
 msgstr "Velg hvilken ISP du vil koble til"
 
-#: ../src/msw/listctrl.cpp:434
+#: ../src/msw/listctrl.cpp:373
 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
@@ -4691,87 +5575,118 @@ msgid ""
 "or this program won't operate correctly."
 msgstr ""
 "Installer en nyere versjon av comctl32.dll\n"
-"(minst versjon 4.70 er påkrevd, men du har %d.%02d)\n"
-"eller så kommer ikke dette programmet til å virke."
+"(minst versjon 4.70 er påkrevd, men du har %d.%02d)\n"
+"eller så kommer ikke dette programmet til å virke."
 
-#: ../src/common/prntbase.cpp:327
+#: ../src/common/headerctrlcmn.cpp:60
+msgid "Please select the columns to show and define their order:"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:329
 msgid "Please wait while printing\n"
-msgstr "Vent mens utskriften pågår\n"
+msgstr "Vent mens utskriften pågår\n"
+
+#: ../src/propgrid/advprops.cpp:632
+#, fuzzy
+msgid "Point Size"
+msgstr "&Punktstørrelse"
 
-#: ../src/mac/carbon/databrow.cpp:621 ../src/mac/carbon/databrow.cpp:671
-#: ../src/mac/carbon/databrow.cpp:765 ../src/mac/carbon/databrow.cpp:788
-#: ../src/mac/carbon/databrow.cpp:805 ../src/mac/carbon/databrow.cpp:822
-#: ../src/mac/carbon/databrow.cpp:1009 ../src/mac/carbon/databrow.cpp:1114
+#: ../src/osx/carbon/dataview.cpp:1279 ../src/osx/carbon/dataview.cpp:1330
+#: ../src/osx/carbon/dataview.cpp:1421 ../src/osx/carbon/dataview.cpp:1444
+#: ../src/osx/carbon/dataview.cpp:1461 ../src/osx/carbon/dataview.cpp:1478
+#: ../src/osx/carbon/dataview.cpp:1671 ../src/osx/carbon/dataview.cpp:1780
+#: ../src/osx/carbon/dataview.cpp:1822 ../src/osx/carbon/dataview.cpp:1875
+#: ../src/osx/carbon/dataview.cpp:1998
 msgid "Pointer to data view control not set correctly."
 msgstr ""
 
-#: ../src/mac/carbon/databrow.cpp:622 ../src/mac/carbon/databrow.cpp:680
-#: ../src/mac/carbon/databrow.cpp:766 ../src/mac/carbon/databrow.cpp:823
-#: ../src/mac/carbon/databrow.cpp:1010
+#: ../src/osx/carbon/dataview.cpp:1280 ../src/osx/carbon/dataview.cpp:1339
+#: ../src/osx/carbon/dataview.cpp:1422 ../src/osx/carbon/dataview.cpp:1479
+#: ../src/osx/carbon/dataview.cpp:1672 ../src/osx/carbon/dataview.cpp:1781
+#: ../src/osx/carbon/dataview.cpp:1823 ../src/osx/carbon/dataview.cpp:1876
+#: ../src/osx/carbon/dataview.cpp:1999
 msgid "Pointer to model not set correctly."
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:617 ../src/generic/prntdlgg.cpp:872
+#: ../src/generic/prntdlgg.cpp:618 ../src/generic/prntdlgg.cpp:873
 msgid "Portrait"
 msgstr "Portrett"
 
-#: ../src/generic/prntdlgg.cpp:305
+#: ../src/richtext/richtextsizepage.cpp:432
+#, fuzzy
+msgid "Position"
+msgstr "Spørsmål"
+
+#: ../src/generic/prntdlgg.cpp:304
 msgid "PostScript file"
 msgstr "PostScript-fil"
 
-#: ../src/html/htmlhelp.cpp:509
-msgid "Preparing help window..."
-msgstr ""
+#: ../src/common/stockitem.cpp:182
+#, fuzzy
+msgid "Preferences"
+msgstr "&Innstillinger"
+
+#: ../src/osx/menu_osx.cpp:550
+#, fuzzy
+msgid "Preferences..."
+msgstr "&Innstillinger"
 
-#: ../src/html/helpwnd.cpp:1233 ../src/generic/fontdlgg.cpp:457
-#: ../src/mac/carbon/fontdlg.cpp:552
+#: ../src/common/stockitem.cpp:183
+#, fuzzy
+msgid "Preview..."
+msgstr "Forhåndsvisning"
+
+#: ../src/generic/fontdlgg.cpp:456 ../src/osx/carbon/fontdlg.cpp:574
+#: ../src/html/helpwnd.cpp:1232
 msgid "Preview:"
-msgstr "Forhåndsvisning:"
+msgstr "Forhåndsvisning:"
 
-#: ../src/html/helpwnd.cpp:672
+#: ../src/common/prntbase.cpp:1498 ../src/html/helpwnd.cpp:675
 msgid "Previous page"
 msgstr "Forrige side"
 
-#: ../src/common/prntbase.cpp:407 ../src/gtk/gnome/gprint.cpp:537
-#: ../src/gtk/gnome/gprint.cpp:549 ../src/gtk/print.cpp:598
-#: ../src/gtk/print.cpp:611 ../src/generic/prntdlgg.cpp:149
-#: ../src/generic/prntdlgg.cpp:163
+#: ../src/generic/prntdlgg.cpp:149 ../src/generic/prntdlgg.cpp:163
+#: ../src/common/prntbase.cpp:422 ../src/common/prntbase.cpp:1486
+#: ../src/gtk/print.cpp:589 ../src/gtk/print.cpp:602
+#: ../src/gtk/gnome/gprint.cpp:537 ../src/gtk/gnome/gprint.cpp:549
 msgid "Print"
 msgstr "Utskrift"
 
-#: ../src/common/docview.cpp:1061
+#: ../include/wx/prntbase.h:394 ../src/common/docview.cpp:1244
 msgid "Print Preview"
-msgstr "Forhåndsvisning av utskrift"
+msgstr "Forhåndsvisning av utskrift"
 
-#: ../src/common/prntbase.cpp:1521 ../src/common/prntbase.cpp:1547
+#: ../src/common/prntbase.cpp:1953 ../src/common/prntbase.cpp:1995
+#: ../src/common/prntbase.cpp:2003
 msgid "Print Preview Failure"
-msgstr "Feil ved forhåndsvisning av utskrift"
+msgstr "Feil ved forhåndsvisning av utskrift"
 
 #: ../src/generic/prntdlgg.cpp:230
 msgid "Print Range"
-msgstr "Utskriftsområde"
+msgstr "Utskriftsområde"
 
-#: ../src/generic/prntdlgg.cpp:454
+#: ../src/generic/prntdlgg.cpp:455
 msgid "Print Setup"
 msgstr "Oppsett av utskrift"
 
-#: ../src/generic/prntdlgg.cpp:626
+#: ../src/generic/prntdlgg.cpp:627
 msgid "Print in colour"
 msgstr "Utskrift med farger"
 
-#: ../src/common/stockitem.cpp:144
-msgid "Print previe&w"
-msgstr "&Forhåndsvisning av utskrift"
-
-#: ../src/gtk/gnome/gprint.cpp:947
+#: ../src/gtk/gnome/gprint.cpp:938
 msgid "Print preview"
-msgstr "&Forhåndsvisning av utskrift"
+msgstr "&Forhåndsvisning av utskrift"
+
+#: ../src/common/docview.cpp:1238
+#, fuzzy
+msgid "Print preview creation failed."
+msgstr "Røropprettelse feilet"
 
-#: ../src/generic/prntdlgg.cpp:635
+#: ../src/generic/prntdlgg.cpp:636
 msgid "Print spooling"
-msgstr "Utskriftskø"
+msgstr "Utskriftskø"
 
-#: ../src/html/helpwnd.cpp:689
+#: ../src/html/helpwnd.cpp:686
 msgid "Print this page"
 msgstr "Skriv ut denne siden"
 
@@ -4779,11 +5694,16 @@ msgstr "Skriv ut denne siden"
 msgid "Print to File"
 msgstr "Skriv til fil"
 
-#: ../src/generic/prntdlgg.cpp:498
+#: ../src/common/stockitem.cpp:184
+#, fuzzy
+msgid "Print..."
+msgstr "&Skriv ut..."
+
+#: ../src/generic/prntdlgg.cpp:499
 msgid "Printer"
 msgstr "Skriver"
 
-#: ../src/generic/prntdlgg.cpp:638
+#: ../src/generic/prntdlgg.cpp:639
 msgid "Printer command:"
 msgstr "Skriverkommando:"
 
@@ -4791,11 +5711,11 @@ msgstr "Skriverkommando:"
 msgid "Printer options"
 msgstr "Skriveropsjoner"
 
-#: ../src/generic/prntdlgg.cpp:650
+#: ../src/generic/prntdlgg.cpp:651
 msgid "Printer options:"
 msgstr "Skriveropsjoner:"
 
-#: ../src/generic/prntdlgg.cpp:921
+#: ../src/generic/prntdlgg.cpp:922
 msgid "Printer..."
 msgstr "Skriver..."
 
@@ -4803,153 +5723,180 @@ msgstr "Skriver..."
 msgid "Printer:"
 msgstr "Skriver:"
 
-#: ../src/common/prntbase.cpp:324 ../src/common/prntbase.cpp:545
+#: ../include/wx/richtext/richtextprint.h:164 ../src/html/htmprint.cpp:278
+#, fuzzy
+msgid "Printing"
+msgstr "Skriver ut"
+
+#: ../src/common/prntbase.cpp:326 ../src/common/prntbase.cpp:561
 msgid "Printing "
 msgstr "Skriver ut"
 
-#: ../src/common/prntbase.cpp:341
+#: ../src/common/prntbase.cpp:343
 msgid "Printing Error"
 msgstr "Feil ved utskrift"
 
-#: ../src/generic/printps.cpp:204
+#: ../src/generic/printps.cpp:202
 #, c-format
 msgid "Printing page %d..."
 msgstr "Skriver ut side %d..."
 
-#: ../src/generic/printps.cpp:164
+#: ../src/generic/printps.cpp:162
 msgid "Printing..."
 msgstr "Skriver ut..."
 
-#: ../src/common/debugrpt.cpp:552
+#: ../include/wx/richtext/richtextprint.h:110 ../include/wx/prntbase.h:262
+#: ../src/common/docview.cpp:2047
+#, fuzzy
+msgid "Printout"
+msgstr "Utskrift"
+
+#: ../src/common/debugrpt.cpp:556
 #, c-format
 msgid ""
 "Processing debug report has failed, leaving the files in \"%s\" directory."
 msgstr ""
-"Behandling av feilsøkingsrapporten feilet, etterlater filene i mappen «%s»."
-
-#: ../src/common/log.cpp:699
-msgid "Program aborted."
-msgstr "Program avbrutt."
+"Behandling av feilsøkingsrapporten feilet, etterlater filene i mappen «%s»."
 
-#: ../src/mac/carbon/dataview.cpp:670
+#: ../src/osx/carbon/dataview.cpp:2473
 msgid "Progress renderer cannot render value type; value type: "
 msgstr ""
 
+#: ../src/common/stockitem.cpp:185
+#, fuzzy
+msgid "Properties"
+msgstr "&Egenskaper"
+
+#: ../src/propgrid/manager.cpp:238
+#, fuzzy
+msgid "Property"
+msgstr "&Egenskaper"
+
+#: ../src/propgrid/propgrid.cpp:3145 ../src/propgrid/propgrid.cpp:3277
+#, fuzzy
+msgid "Property Error"
+msgstr "Feil ved utskrift"
+
 #: ../src/common/paper.cpp:114
 msgid "Quarto, 215 x 275 mm"
 msgstr "Quarto, 215 x 275 mm"
 
-#: ../src/generic/logg.cpp:1089
+#: ../src/generic/logg.cpp:1038
 msgid "Question"
-msgstr "Spørsmål"
+msgstr "Spørsmål"
 
-#: ../src/common/stockitem.cpp:208
+#: ../src/common/stockitem.cpp:157
+#, fuzzy
+msgid "Quit"
+msgstr "&Slutt"
+
+#: ../src/osx/menu_osx.cpp:564
+#, fuzzy, c-format
+msgid "Quit %s"
+msgstr "&Slutt"
+
+#: ../src/common/stockitem.cpp:264
 #, fuzzy
 msgid "Quit this program"
 msgstr "Skriv ut denne siden"
 
-#: ../src/common/accelcmn.cpp:52
+#: ../src/common/accelcmn.cpp:54
 msgid "RETURN"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:56
+#: ../src/common/accelcmn.cpp:58
 msgid "RIGHT"
 msgstr ""
 
-#: ../src/common/ffile.cpp:126 ../src/common/ffile.cpp:145
+#: ../src/common/accelcmn.cpp:318
+#, fuzzy
+msgid "RawCtrl+"
+msgstr "ctrl"
+
+#: ../src/common/ffile.cpp:114 ../src/common/ffile.cpp:133
 #, c-format
 msgid "Read error on file '%s'"
-msgstr "Lesefeil i fil «%s»"
+msgstr "Lesefeil i fil «%s»"
 
-#: ../src/common/prntbase.cpp:256
+#: ../src/common/prntbase.cpp:258
 msgid "Ready"
 msgstr "Klar"
 
-#: ../src/stc/scintilla/src/ScintillaBase.cxx:423
+#: ../src/common/stockitem.cpp:186 ../src/stc/stc_i18n.cpp:17
 #, fuzzy
 msgid "Redo"
 msgstr "&Gjenta"
 
-#: ../src/common/stockitem.cpp:209
+#: ../src/common/stockitem.cpp:265
 msgid "Redo last action"
 msgstr ""
 
-#: ../src/xrc/xmlres.cpp:710
-#, c-format
-msgid "Referenced object node with ref=\"%s\" not found!"
-msgstr "Referert objektnode med ref=\"%s\" ikke funnet!"
-
-#: ../src/common/stockitem.cpp:148
+#: ../src/common/stockitem.cpp:187
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: ../src/msw/registry.cpp:571
+#: ../src/msw/registry.cpp:626
 #, c-format
 msgid "Registry key '%s' already exists."
-msgstr "Registernøkkel «%s» eksisterer allerede."
+msgstr "Registernøkkel «%s» eksisterer allerede."
 
-#: ../src/msw/registry.cpp:540
+#: ../src/msw/registry.cpp:595
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
-msgstr "Registernøkkel «%s» eksisterer ikke, kan ikke endre navn."
+msgstr "Registernøkkel «%s» eksisterer ikke, kan ikke endre navn."
 
-#: ../src/msw/registry.cpp:672
+#: ../src/msw/registry.cpp:727
 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"
 "deleting it will leave your system in unusable state:\n"
 "operation aborted."
 msgstr ""
-"Registernøkkel «%s» trengs for normal systemoperasjon,\n"
+"Registernøkkel «%s» trengs for normal systemoperasjon,\n"
 "sletting vil etterlate system i en ubrukbar tilstand:\n"
 "operasjon avbrutt."
 
-#: ../src/msw/registry.cpp:466
+#: ../src/msw/registry.cpp:521
 #, c-format
 msgid "Registry value '%s' already exists."
-msgstr "Registerverdi «%s» eksisterer allerede."
+msgstr "Registerverdi «%s» eksisterer allerede."
 
-#: ../src/richtext/richtextfontpage.cpp:265
-#: ../src/richtext/richtextfontpage.cpp:268
+#: ../src/richtext/richtextfontpage.cpp:292
+#: ../src/richtext/richtextfontpage.cpp:296
 msgid "Regular"
 msgstr ""
 
-#: ../src/generic/helpext.cpp:464
+#: ../src/generic/helpext.cpp:463
 msgid "Relevant entries:"
-msgstr "Relevante oppføringer:"
+msgstr "Relevante oppføringer:"
 
-#: ../src/generic/progdlgg.cpp:214
-#, fuzzy
-msgid "Remaining time:"
-msgstr "Gjenstående tid :"
-
-#: ../src/common/stockitem.cpp:149
+#: ../src/common/stockitem.cpp:188
 msgid "Remove"
 msgstr "Slett"
 
-#: ../src/html/helpwnd.cpp:426
+#: ../src/html/helpwnd.cpp:438
 msgid "Remove current page from bookmarks"
 msgstr "Slett gjeldende side fra bokmerker"
 
 #: ../src/common/rendcmn.cpp:195
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
-msgstr "Utfører «%s» har ikke-kompatibel versjon %d.%d og ble ikke lastet."
+msgstr "Utfører «%s» har ikke-kompatibel versjon %d.%d og ble ikke lastet."
 
-#: ../src/mac/carbon/databrow.cpp:775
+#: ../src/osx/carbon/dataview.cpp:1431
 #, fuzzy
 msgid "Rendering failed."
 msgstr "Tidtager opprettelese feilet."
 
-#: ../src/richtext/richtextbuffer.cpp:2847
+#: ../src/richtext/richtextbuffer.cpp:4091
 msgid "Renumber List"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:123
+#: ../src/common/stockitem.cpp:189
 msgid "Rep&lace"
 msgstr "Er&statt"
 
-#: ../src/richtext/richtextctrl.cpp:2375
+#: ../src/richtext/richtextctrl.cpp:3234 ../src/common/stockitem.cpp:189
 #, fuzzy
 msgid "Replace"
 msgstr "&Erstatt"
@@ -4958,7 +5905,7 @@ msgstr "&Erstatt"
 msgid "Replace &all"
 msgstr "Erstatt &alle"
 
-#: ../src/common/stockitem.cpp:206
+#: ../src/common/stockitem.cpp:262
 #, fuzzy
 msgid "Replace selection"
 msgstr "Erstatt &alle"
@@ -4967,212 +5914,232 @@ msgstr "Erstatt &alle"
 msgid "Replace with:"
 msgstr "Erstatt med:"
 
-#: ../src/xrc/xmlres.cpp:530
-msgid "Resource files must have same version number!"
-msgstr "Ressursfiler må ha samme versjonsnummer!"
+#: ../src/common/valtext.cpp:162
+msgid "Required information entry is empty."
+msgstr ""
 
-#: ../src/common/stockitem.cpp:150
+#: ../src/common/translation.cpp:1804
+#, fuzzy, c-format
+msgid "Resource '%s' is not a valid message catalog."
+msgstr "«%s» er ikke en gyldig meldingskatalog."
+
+#: ../src/common/stockitem.cpp:190
 msgid "Revert to Saved"
-msgstr "Gå tilbake til lagret versjon"
+msgstr "Gå tilbake til lagret versjon"
 
-#: ../src/richtext/richtextliststylepage.cpp:250
-#: ../src/richtext/richtextbulletspage.cpp:199
+#: ../src/richtext/richtextborderspage.cpp:548
+#, fuzzy
+msgid "Ridge"
+msgstr "Lett"
+
+#: ../src/richtext/richtextliststylepage.cpp:252
+#: ../src/richtext/richtextbulletspage.cpp:202
+#: ../src/richtext/richtextsizepage.cpp:202
 #, fuzzy
 msgid "Right"
 msgstr "Lett"
 
-#: ../src/generic/prntdlgg.cpp:897
+#: ../src/generic/prntdlgg.cpp:898
 msgid "Right margin (mm):"
-msgstr "Høyremarg (mm):"
+msgstr "Høyremarg (mm):"
 
-#: ../src/richtext/richtextliststylepage.cpp:336
+#: ../src/richtext/richtextindentspage.cpp:161
+#: ../src/richtext/richtextindentspage.cpp:163
 #: ../src/richtext/richtextliststylepage.cpp:338
-#: ../src/richtext/richtextindentspage.cpp:158
-#: ../src/richtext/richtextindentspage.cpp:160
+#: ../src/richtext/richtextliststylepage.cpp:340
 msgid "Right-align text."
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:324
+#: ../src/generic/fontdlgg.cpp:323
 msgid "Roman"
 msgstr "Roman"
 
-#: ../src/richtext/richtextliststylepage.cpp:298
-#: ../src/richtext/richtextbulletspage.cpp:250
+#: ../src/richtext/richtextliststylepage.cpp:300
+#: ../src/richtext/richtextbulletspage.cpp:253
 msgid "S&tandard bullet name:"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:81
+#: ../src/common/accelcmn.cpp:83
 msgid "SCROLL_LOCK"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:70
+#: ../src/common/accelcmn.cpp:72
 msgid "SELECT"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:76
+#: ../src/common/accelcmn.cpp:78
 msgid "SEPARATOR"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:155
-msgid "SHIFT-JIS"
-msgstr ""
-
-#: ../src/common/accelcmn.cpp:73
+#: ../src/common/accelcmn.cpp:75
 msgid "SNAPSHOT"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:61
+#: ../src/common/accelcmn.cpp:63
 msgid "SPACE"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:250 ../src/common/accelcmn.cpp:307
+#: ../src/common/accelcmn.cpp:258 ../src/common/accelcmn.cpp:328
 msgid "SPECIAL"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:77
+#: ../src/common/accelcmn.cpp:79
 msgid "SUBTRACT"
 msgstr ""
 
-#: ../src/common/sizer.cpp:2426
+#: ../src/common/stockitem.cpp:191 ../src/common/sizer.cpp:2577
 msgid "Save"
 msgstr "&Lagre"
 
-#: ../src/common/fldlgcmn.cpp:284
+#: ../src/common/fldlgcmn.cpp:328
 #, c-format
 msgid "Save %s file"
 msgstr "Lagre %s fil"
 
-#: ../src/common/stockitem.cpp:152
+#: ../src/generic/logg.cpp:520
 msgid "Save &As..."
 msgstr "Lagre &som..."
 
-#: ../src/common/docview.cpp:305
+#: ../src/common/docview.cpp:362
 msgid "Save As"
 msgstr "Lagre Som"
 
-#: ../src/common/stockitem.cpp:212
+#: ../src/common/stockitem.cpp:192
+#, fuzzy
+msgid "Save as"
+msgstr "Lagre Som"
+
+#: ../src/common/stockitem.cpp:268
 #, fuzzy
 msgid "Save current document"
 msgstr "Velg en dokumentvisning"
 
-#: ../src/common/stockitem.cpp:213
+#: ../src/common/stockitem.cpp:269
 msgid "Save current document with a different filename"
 msgstr ""
 
-#: ../src/generic/logg.cpp:535
+#: ../src/generic/logg.cpp:520
 msgid "Save log contents to file"
 msgstr "Lagre logginnhold til fil"
 
-#: ../src/generic/fontdlgg.cpp:327
+#: ../src/generic/fontdlgg.cpp:326
 msgid "Script"
 msgstr "Skript"
 
-#: ../src/html/htmlhelp.cpp:610 ../src/html/helpwnd.cpp:534
-#: ../src/html/helpwnd.cpp:549 ../src/generic/srchctlg.cpp:362
+#: ../src/generic/srchctlg.cpp:68 ../src/html/helpwnd.cpp:546
+#: ../src/html/helpwnd.cpp:561
 msgid "Search"
-msgstr "Søk"
+msgstr "Søk"
 
-#: ../src/html/helpwnd.cpp:536
+#: ../src/html/helpwnd.cpp:548
+#, fuzzy
 msgid ""
-"Search contents of help book(s) for all occurences of the text you typed "
+"Search contents of help book(s) for all occurrences of the text you typed "
 "above"
-msgstr "Søk innholdet av alle hjelpebøker etter teksten du skrev ovenfor"
+msgstr "Søk innholdet av alle hjelpebøker etter teksten du skrev ovenfor"
 
 #: ../src/generic/fdrepdlg.cpp:161
 msgid "Search direction"
-msgstr "Søkeretning"
+msgstr "Søkeretning"
 
 #: ../src/generic/fdrepdlg.cpp:113
 msgid "Search for:"
-msgstr "Søk etter:"
+msgstr "Søk etter:"
 
-#: ../src/html/helpwnd.cpp:1065
+#: ../src/html/helpwnd.cpp:1062
 msgid "Search in all books"
-msgstr "Søk i alle bøker"
+msgstr "Søk i alle bøker"
 
-#: ../src/html/htmlhelp.cpp:593
-#, fuzzy
-msgid "Search!"
-msgstr "Søk"
-
-#: ../src/html/htmlhelp.cpp:383 ../src/html/htmlhelp.cpp:441
-#: ../src/html/helpwnd.cpp:875
+#: ../src/html/helpwnd.cpp:872
 msgid "Searching..."
-msgstr "Søker..."
+msgstr "Søker..."
 
-#: ../src/generic/dirctrlg.cpp:593
+#: ../src/generic/dirctrlg.cpp:538
 msgid "Sections"
 msgstr "Seksjoner"
 
-#: ../src/common/ffile.cpp:231
+#: ../src/common/ffile.cpp:219
 #, c-format
 msgid "Seek error on file '%s'"
-msgstr "Søkefeil i filen «%s»"
+msgstr "Søkefeil i filen «%s»"
 
-#: ../src/common/ffile.cpp:221
+#: ../src/common/ffile.cpp:209
 #, c-format
 msgid "Seek error on file '%s' (large files not supported by stdio)"
-msgstr "Søker etter feil i fil «%s» (store filer ikke støttet av stdio)"
+msgstr "Søker etter feil i fil «%s» (store filer ikke støttet av stdio)"
 
-#: ../src/common/stockitem.cpp:153 ../src/richtext/richtextctrl.cpp:2600
-#: ../src/msw/textctrl.cpp:2156 ../src/mac/carbon/textctrl.cpp:1069
+#: ../src/richtext/richtextctrl.cpp:330 ../src/osx/textctrl_osx.cpp:588
+#: ../src/common/stockitem.cpp:193 ../src/msw/textctrl.cpp:2227
 msgid "Select &All"
 msgstr "Velg &alle"
 
-#: ../src/stc/scintilla/src/ScintillaBase.cxx:430
+#: ../src/common/stockitem.cpp:193 ../src/stc/stc_i18n.cpp:22
 #, fuzzy
 msgid "Select All"
 msgstr "Velg &alle"
 
-#: ../src/common/docview.cpp:1744
+#: ../src/common/docview.cpp:1858
 msgid "Select a document template"
 msgstr "Velg en dokumentmal"
 
-#: ../src/common/docview.cpp:1821
+#: ../src/common/docview.cpp:1932
 msgid "Select a document view"
 msgstr "Velg en dokumentvisning"
 
-#: ../src/richtext/richtextfontpage.cpp:192
-#: ../src/richtext/richtextfontpage.cpp:194
+#: ../src/richtext/richtextfontpage.cpp:202
+#: ../src/richtext/richtextfontpage.cpp:204
 msgid "Select regular or bold."
 msgstr ""
 
-#: ../src/richtext/richtextfontpage.cpp:179
-#: ../src/richtext/richtextfontpage.cpp:181
+#: ../src/richtext/richtextfontpage.cpp:189
+#: ../src/richtext/richtextfontpage.cpp:191
 msgid "Select regular or italic style."
 msgstr ""
 
-#: ../src/richtext/richtextfontpage.cpp:205
-#: ../src/richtext/richtextfontpage.cpp:207
+#: ../src/richtext/richtextfontpage.cpp:215
+#: ../src/richtext/richtextfontpage.cpp:217
 msgid "Select underlining or no underlining."
 msgstr ""
 
-#: ../src/motif/filedlg.cpp:220
+#: ../src/motif/filedlg.cpp:219
 #, fuzzy
 msgid "Selection"
 msgstr "Seksjoner"
 
-#: ../src/richtext/richtextliststylepage.cpp:186
 #: ../src/richtext/richtextliststylepage.cpp:188
+#: ../src/richtext/richtextliststylepage.cpp:190
 msgid "Selects the list level to edit."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:790
+#: ../src/common/cmdline.cpp:911
 #, c-format
 msgid "Separator expected after the option '%s'."
-msgstr "Seperator forventet etter opsjonen «%s»."
+msgstr "Seperator forventet etter opsjonen «%s»."
+
+#: ../src/richtext/richtextbuffer.cpp:9221
+#, fuzzy
+msgid "Set Cell Style"
+msgstr "Slett element"
+
+#: ../include/wx/xtiprop.h:180
+msgid "SetProperty called w/o valid setter"
+msgstr "SetProperty kalt uten gyldig setter"
+
+#: ../src/common/filename.cpp:2533
+msgid "Setting directory access times is not supported under this OS version"
+msgstr ""
 
 #: ../src/generic/prntdlgg.cpp:194
 msgid "Setup..."
 msgstr "Sett opp..."
 
-#: ../src/msw/dialup.cpp:566
+#: ../src/msw/dialup.cpp:564
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "Flere aktive oppringingsforbindelser funnet, velger en tilfeldig."
 
-#: ../src/common/accelcmn.cpp:298
+#: ../src/common/accelcmn.cpp:315
 #, fuzzy
-msgid "Shift-"
+msgid "Shift+"
 msgstr "shift"
 
 #: ../src/generic/dirdlgg.cpp:171
@@ -5180,20 +6147,25 @@ msgstr "shift"
 msgid "Show &hidden directories"
 msgstr "Vis skjulte mapper"
 
-#: ../src/generic/filectrlg.cpp:998
+#: ../src/generic/filectrlg.cpp:993
 #, fuzzy
 msgid "Show &hidden files"
 msgstr "Vis skjulte filer"
 
-#: ../src/common/stockitem.cpp:202
+#: ../src/osx/menu_osx.cpp:559
+#, fuzzy
+msgid "Show All"
+msgstr "Vis alle"
+
+#: ../src/common/stockitem.cpp:258
 msgid "Show about dialog"
 msgstr ""
 
-#: ../src/html/helpwnd.cpp:488
+#: ../src/html/helpwnd.cpp:500
 msgid "Show all"
 msgstr "Vis alle"
 
-#: ../src/html/helpwnd.cpp:499
+#: ../src/html/helpwnd.cpp:511
 msgid "Show all items in index"
 msgstr "Vis alle elementer i indeksen"
 
@@ -5201,117 +6173,113 @@ msgstr "Vis alle elementer i indeksen"
 msgid "Show hidden directories"
 msgstr "Vis skjulte mapper"
 
-#: ../src/html/htmlhelp.cpp:538 ../src/html/helpwnd.cpp:656
+#: ../src/html/helpwnd.cpp:669
 msgid "Show/hide navigation panel"
 msgstr "Vis/skjul navigasjonspanel"
 
-#: ../src/richtext/richtextsymboldlg.cpp:414
-#: ../src/richtext/richtextsymboldlg.cpp:416
+#: ../src/richtext/richtextsymboldlg.cpp:418
+#: ../src/richtext/richtextsymboldlg.cpp:420
 msgid "Shows a Unicode subset."
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:474
-#: ../src/richtext/richtextliststylepage.cpp:476
-#: ../src/richtext/richtextbulletspage.cpp:274
-#: ../src/richtext/richtextbulletspage.cpp:276
+#: ../src/richtext/richtextliststylepage.cpp:473
+#: ../src/richtext/richtextliststylepage.cpp:475
+#: ../src/richtext/richtextbulletspage.cpp:277
+#: ../src/richtext/richtextbulletspage.cpp:279
 msgid "Shows a preview of the bullet settings."
 msgstr ""
 
-#: ../src/richtext/richtextfontpage.cpp:256
-#: ../src/richtext/richtextfontpage.cpp:258
+#: ../src/richtext/richtextfontpage.cpp:282
+#: ../src/richtext/richtextfontpage.cpp:284
 msgid "Shows a preview of the font settings."
 msgstr ""
 
-#: ../src/mac/carbon/fontdlg.cpp:556 ../src/mac/carbon/fontdlg.cpp:558
+#: ../src/osx/carbon/fontdlg.cpp:578 ../src/osx/carbon/fontdlg.cpp:580
 msgid "Shows a preview of the font."
 msgstr ""
 
-#: ../src/richtext/richtextindentspage.cpp:327
-#: ../src/richtext/richtextindentspage.cpp:329
+#: ../src/richtext/richtextindentspage.cpp:328
+#: ../src/richtext/richtextindentspage.cpp:330
 msgid "Shows a preview of the paragraph settings."
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:462 ../src/generic/fontdlgg.cpp:464
+#: ../src/generic/fontdlgg.cpp:461 ../src/generic/fontdlgg.cpp:463
 msgid "Shows the font preview."
-msgstr "Viser skriftforhåndsvisning."
+msgstr "Viser skriftforhåndsvisning."
 
-#: ../src/univ/themes/mono.cpp:509
+#: ../src/univ/themes/mono.cpp:517
 msgid "Simple monochrome theme"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:459
-#: ../src/richtext/richtextliststylepage.cpp:462
-#: ../src/richtext/richtextliststylepage.cpp:463
-#: ../src/richtext/richtextindentspage.cpp:314
-#: ../src/richtext/richtextindentspage.cpp:317
-#: ../src/richtext/richtextindentspage.cpp:318
+#: ../src/richtext/richtextindentspage.cpp:300
+#: ../src/richtext/richtextliststylepage.cpp:450
 msgid "Single"
 msgstr ""
 
-#: ../src/generic/filectrlg.cpp:459
+#: ../src/generic/filectrlg.cpp:454 ../src/richtext/richtextformatdlg.cpp:351
+#: ../src/richtext/richtextsizepage.cpp:213
 msgid "Size"
-msgstr "Størrelse"
+msgstr "Størrelse"
 
-#: ../src/mac/carbon/fontdlg.cpp:501
+#: ../src/osx/carbon/fontdlg.cpp:523
 #, fuzzy
 msgid "Size:"
-msgstr "Størrelse"
+msgstr "Størrelse"
 
-#: ../src/generic/progdlgg.cpp:226 ../src/generic/progdlgg.cpp:611
+#: ../src/generic/progdlgg.cpp:263 ../src/generic/progdlgg.cpp:774
+#: ../src/msw/progdlg.cpp:802
 msgid "Skip"
 msgstr "Hopp over"
 
-#: ../src/generic/fontdlgg.cpp:332
+#: ../src/generic/fontdlgg.cpp:331
 msgid "Slant"
-msgstr "Skrå"
+msgstr "Skrå"
 
-#: ../src/common/docview.cpp:597
-msgid "Sorry, could not open this file for saving."
-msgstr "Klarte ikke åpne denne filen for lagring."
+#: ../src/richtext/richtextborderspage.cpp:543
+#, fuzzy
+msgid "Solid"
+msgstr "Fet"
 
-#: ../src/common/docview.cpp:633 ../src/common/docview.cpp:1643
+#: ../src/common/docview.cpp:1754
 msgid "Sorry, could not open this file."
-msgstr "Klarte ikke åpne denne filen."
+msgstr "Klarte ikke åpne denne filen."
 
-#: ../src/common/docview.cpp:604
-msgid "Sorry, could not save this file."
-msgstr "Klarte ikke lagre denne filen."
-
-#: ../src/common/prntbase.cpp:1521
+#: ../src/common/prntbase.cpp:1995 ../src/common/prntbase.cpp:2003
 msgid "Sorry, not enough memory to create a preview."
-msgstr "Ikke nok minne til å lage en forhåndsvisning."
-
-#: ../src/common/docview.cpp:1057
-msgid "Sorry, print preview needs a printer to be installed."
-msgstr "Forhåndsvisning av utskrift krever at en skriver er installert."
+msgstr "Ikke nok minne til å lage en forhåndsvisning."
 
-#: ../src/richtext/richtextstyledlg.cpp:573
-#: ../src/richtext/richtextstyledlg.cpp:621
-#: ../src/richtext/richtextstyledlg.cpp:775
-#: ../src/richtext/richtextstyledlg.cpp:851
+#: ../src/richtext/richtextstyledlg.cpp:612
+#: ../src/richtext/richtextstyledlg.cpp:660
+#: ../src/richtext/richtextstyledlg.cpp:826
+#: ../src/richtext/richtextstyledlg.cpp:902
+#: ../src/richtext/richtextstyledlg.cpp:940
 msgid "Sorry, that name is taken. Please choose another."
 msgstr ""
 
-#: ../src/common/docview.cpp:1297 ../src/common/docview.cpp:1663
+#: ../src/common/docview.cpp:1777
 msgid "Sorry, the format for this file is unknown."
 msgstr "Formatet for denne filen er ukjent."
 
 #: ../src/unix/sound.cpp:493
 msgid "Sound data are in unsupported format."
-msgstr "Format for lyddata er ikke støttet."
+msgstr "Format for lyddata er ikke støttet."
 
 #: ../src/unix/sound.cpp:478
 #, c-format
 msgid "Sound file '%s' is in unsupported format."
-msgstr "Formatet på lydfilen «%s» er ikke støttet."
+msgstr "Formatet på lydfilen «%s» er ikke støttet."
 
-#: ../src/richtext/richtextliststylepage.cpp:469
+#: ../src/richtext/richtextliststylepage.cpp:468
 #, fuzzy
 msgid "Spacing"
-msgstr "Søker..."
+msgstr "Søker..."
 
-#: ../src/richtext/richtextliststylepage.cpp:492
-#: ../src/richtext/richtextbulletspage.cpp:290
+#: ../src/common/stockitem.cpp:198
+msgid "Spell Check"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:491
+#: ../src/richtext/richtextbulletspage.cpp:296
 msgid "Standard"
 msgstr ""
 
@@ -5323,44 +6291,40 @@ msgstr "Statement, 5 1/2 x 8 1/2 tommer"
 msgid "Status:"
 msgstr "Status: "
 
-#: ../src/generic/logg.cpp:652
-msgid "Status: "
-msgstr "Status: "
+#: ../src/common/stockitem.cpp:199
+#, fuzzy
+msgid "Stop"
+msgstr "&Stopp"
 
-#: ../src/common/xtistrm.cpp:249
-msgid "Streaming delegates for not already streamed objects not yet supported"
-msgstr "Dataflyt-delegater for ikke allerede flytende objekter er ikke støttet"
+#: ../src/common/stockitem.cpp:200
+msgid "Strikethrough"
+msgstr ""
 
-#: ../src/msw/colour.cpp:35
+#: ../src/common/colourcmn.cpp:46
 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "Tekst til farge : Ugyldig fargespesifikasjon : %s"
 
-#: ../src/richtext/richtextformatdlg.cpp:269
+#: ../src/richtext/richtextformatdlg.cpp:313 ../src/propgrid/advprops.cpp:648
 #, fuzzy
 msgid "Style"
 msgstr "&Stil:"
 
-#: ../include/wx/richtext/richtextstyledlg.h:45
+#: ../include/wx/richtext/richtextstyledlg.h:48
 msgid "Style Organiser"
 msgstr ""
 
-#: ../src/mac/carbon/fontdlg.cpp:510
+#: ../src/osx/carbon/fontdlg.cpp:532
 #, fuzzy
 msgid "Style:"
 msgstr "&Stil:"
 
-#: ../src/xrc/xmlres.cpp:813
-#, c-format
-msgid "Subclass '%s' not found for resource '%s', not subclassing!"
-msgstr "Underklasse «%s» ikke funnet i ressurs «%s», ikke subclassing!"
-
-#: ../src/richtext/richtextfontpage.cpp:246
+#: ../src/richtext/richtextfontpage.cpp:272
 #, fuzzy
 msgid "Subscrip&t"
 msgstr "Skript"
 
-#: ../src/richtext/richtextfontpage.cpp:239
+#: ../src/richtext/richtextfontpage.cpp:265
 #, fuzzy
 msgid "Supe&rscript"
 msgstr "Skript"
@@ -5373,58 +6337,55 @@ msgstr ""
 msgid "SuperB/SuperB/A3 305 x 487 mm"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:328
+#: ../src/generic/fontdlgg.cpp:327
 msgid "Swiss"
 msgstr "Swiss"
 
-#: ../src/richtext/richtextliststylepage.cpp:490
-#: ../src/richtext/richtextbulletspage.cpp:288
+#: ../src/richtext/richtextliststylepage.cpp:489
+#: ../src/richtext/richtextbulletspage.cpp:294
 msgid "Symbol"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:287
-#: ../src/richtext/richtextbulletspage.cpp:238
+#: ../src/richtext/richtextliststylepage.cpp:289
+#: ../src/richtext/richtextbulletspage.cpp:241
 #, fuzzy
 msgid "Symbol &font:"
 msgstr "Normal skrift:"
 
-#: ../include/wx/richtext/richtextsymboldlg.h:46
-msgid "Symbols"
-msgstr ""
-
-#: ../src/common/accelcmn.cpp:62
+#: ../src/common/accelcmn.cpp:64
 msgid "TAB"
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:93
-msgid "TIFF library error."
-msgstr ""
-
-#: ../src/common/imagtiff.cpp:77
-msgid "TIFF library warning."
-msgstr ""
-
-#: ../src/common/imagtiff.cpp:309 ../src/common/imagtiff.cpp:320
-#: ../src/common/imagtiff.cpp:519
+#: ../src/common/imagtiff.cpp:373 ../src/common/imagtiff.cpp:386
+#: ../src/common/imagtiff.cpp:745
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: Klarte ikke reservere minne."
 
-#: ../src/common/imagtiff.cpp:272
+#: ../src/common/imagtiff.cpp:305
 msgid "TIFF: Error loading image."
 msgstr "TIFF: Feil ved bildelasting."
 
-#: ../src/common/imagtiff.cpp:334
+#: ../src/common/imagtiff.cpp:472
 msgid "TIFF: Error reading image."
 msgstr "TIFF: Feil ved bildelesing."
 
-#: ../src/common/imagtiff.cpp:439
+#: ../src/common/imagtiff.cpp:612
 msgid "TIFF: Error saving image."
 msgstr "TIFF: Feil ved lagring av bilde."
 
-#: ../src/common/imagtiff.cpp:565
+#: ../src/common/imagtiff.cpp:850
 msgid "TIFF: Error writing image."
 msgstr "TIFF: Feil ved skriving av bilde."
 
+#: ../src/common/imagtiff.cpp:359
+msgid "TIFF: Image size is abnormally big."
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:9362
+#, fuzzy
+msgid "Table Properties"
+msgstr "&Egenskaper"
+
 #: ../src/common/paper.cpp:147
 #, fuzzy
 msgid "Tabloid Extra 11.69 x 18 in"
@@ -5434,80 +6395,98 @@ msgstr "Tabloid, 11 x 17 tommer"
 msgid "Tabloid, 11 x 17 in"
 msgstr "Tabloid, 11 x 17 tommer"
 
-#: ../src/richtext/richtextformatdlg.cpp:287
+#: ../src/richtext/richtextformatdlg.cpp:331
 msgid "Tabs"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:329
+#: ../src/generic/fontdlgg.cpp:328
 msgid "Teletype"
 msgstr "Teletype"
 
-#: ../src/common/docview.cpp:1745
+#: ../src/common/docview.cpp:1859
 msgid "Templates"
 msgstr "Maler"
 
-#: ../src/mac/carbon/dataview.cpp:531
+#: ../src/osx/carbon/dataview.cpp:2374
 msgid "Text renderer cannot render value; value type: "
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:118
+#: ../src/common/fmapbase.cpp:157
 msgid "Thai (ISO-8859-11)"
 msgstr "Thai (ISO-8859-11)"
 
-#: ../src/common/ftp.cpp:706
+#: ../src/common/ftp.cpp:623
 msgid "The FTP server doesn't support passive mode."
-msgstr "FTP-tjeneren støtter ikke passiv modus."
+msgstr "FTP-tjeneren støtter ikke passiv modus."
 
-#: ../src/common/ftp.cpp:694
+#: ../src/common/ftp.cpp:609
 msgid "The FTP server doesn't support the PORT command."
-msgstr "FTP-tjeneren støtter ikke PORT-kommandoen."
+msgstr "FTP-tjeneren støtter ikke PORT-kommandoen."
 
-#: ../src/richtext/richtextliststylepage.cpp:214
 #: ../src/richtext/richtextliststylepage.cpp:216
-#: ../src/richtext/richtextbulletspage.cpp:162
-#: ../src/richtext/richtextbulletspage.cpp:164
+#: ../src/richtext/richtextliststylepage.cpp:218
+#: ../src/richtext/richtextbulletspage.cpp:165
+#: ../src/richtext/richtextbulletspage.cpp:167
 msgid "The available bullet styles."
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:194
-#: ../src/richtext/richtextstyledlg.cpp:196
+#: ../src/richtext/richtextstyledlg.cpp:206
+#: ../src/richtext/richtextstyledlg.cpp:208
 #, fuzzy
 msgid "The available styles."
 msgstr "Skriftstil"
 
-#: ../src/richtext/richtextliststylepage.cpp:253
+#: ../src/richtext/richtextbackgroundpage.cpp:139
+#: ../src/richtext/richtextbackgroundpage.cpp:141
+#, fuzzy
+msgid "The background colour."
+msgstr "Skriftfarge"
+
+#: ../src/richtext/richtextmarginspage.cpp:268
+#: ../src/richtext/richtextmarginspage.cpp:270
+#, fuzzy
+msgid "The bottom margin size."
+msgstr "Skriftpunktstørrelse"
+
+#: ../src/richtext/richtextmarginspage.cpp:382
+#: ../src/richtext/richtextmarginspage.cpp:384
+#, fuzzy
+msgid "The bottom padding size."
+msgstr "Skriftpunktstørrelse"
+
 #: ../src/richtext/richtextliststylepage.cpp:255
-#: ../src/richtext/richtextliststylepage.cpp:274
+#: ../src/richtext/richtextliststylepage.cpp:257
 #: ../src/richtext/richtextliststylepage.cpp:276
-#: ../src/richtext/richtextbulletspage.cpp:202
-#: ../src/richtext/richtextbulletspage.cpp:204
-#: ../src/richtext/richtextbulletspage.cpp:225
-#: ../src/richtext/richtextbulletspage.cpp:227
+#: ../src/richtext/richtextliststylepage.cpp:278
+#: ../src/richtext/richtextbulletspage.cpp:205
+#: ../src/richtext/richtextbulletspage.cpp:207
+#: ../src/richtext/richtextbulletspage.cpp:228
+#: ../src/richtext/richtextbulletspage.cpp:230
 msgid "The bullet character."
 msgstr ""
 
-#: ../src/richtext/richtextsymboldlg.cpp:436
-#: ../src/richtext/richtextsymboldlg.cpp:438
+#: ../src/richtext/richtextsymboldlg.cpp:440
+#: ../src/richtext/richtextsymboldlg.cpp:442
 msgid "The character code."
 msgstr ""
 
-#: ../src/common/fontmap.cpp:201
+#: ../src/common/fontmap.cpp:202
 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
 "another charset to replace it with or choose\n"
 "[Cancel] if it cannot be replaced"
 msgstr ""
-"Tegnsettet «%s» er ukjent. Velg et annet tegnsett\n"
+"Tegnsettet «%s» er ukjent. Velg et annet tegnsett\n"
 "eller velg [Avbryt] hvis det ikke kan byttes ut."
 
 #: ../src/msw/ole/dataobj.cpp:162
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
-msgstr "Utklippstavleformatet «%d» finnes ikke."
+msgstr "Utklippstavleformatet «%d» finnes ikke."
 
-#: ../src/richtext/richtextstylepage.cpp:127
 #: ../src/richtext/richtextstylepage.cpp:129
+#: ../src/richtext/richtextstylepage.cpp:131
 msgid "The default style for the next paragraph."
 msgstr ""
 
@@ -5517,118 +6496,174 @@ msgid ""
 "The directory '%s' does not exist\n"
 "Create it now?"
 msgstr ""
-"Mappen «%s» finnes ikke.\n"
-"Opprett den nå?"
+"Mappen «%s» finnes ikke.\n"
+"Opprett den nå?"
 
-#: ../src/common/docview.cpp:2012
+#: ../src/html/htmprint.cpp:272
 #, c-format
 msgid ""
-"The file '%s' couldn't be opened.\n"
-"It has been removed from the most recently used files list."
+"The document \"%s\" doesn't fit on the page horizontally and will be "
+"truncated if printed.\n"
+"\n"
+"Would you like to proceed with printing it nevertheless?"
 msgstr ""
-"Klarte ikke åpne filen «%s».\n"
-"Den er fjernet fra listen over nylig brukte filer."
 
-#: ../src/common/docview.cpp:2022
+#: ../src/common/docview.cpp:1178
 #, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
 "It has been removed from the most recently used files list."
 msgstr ""
-"Filen «%s» eksisterer ikke og kunne ikke åpnes.\n"
+"Filen «%s» eksisterer ikke og kunne ikke åpnes.\n"
 "Den er fjernet fra listen over nylig brukte filer."
 
+#: ../src/richtext/richtextindentspage.cpp:221
+#: ../src/richtext/richtextindentspage.cpp:223
+#: ../src/richtext/richtextliststylepage.cpp:395
 #: ../src/richtext/richtextliststylepage.cpp:397
-#: ../src/richtext/richtextliststylepage.cpp:399
-#: ../src/richtext/richtextindentspage.cpp:224
-#: ../src/richtext/richtextindentspage.cpp:226
 #, fuzzy
 msgid "The first line indent."
-msgstr "Skriftpunktstørrelse"
+msgstr "Skriftpunktstørrelse"
 
-#: ../src/gtk/utilsgtk.cpp:508
+#: ../src/gtk/utilsgtk.cpp:475
 msgid "The following standard GTK+ options are also supported:\n"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:416 ../src/generic/fontdlgg.cpp:418
+#: ../src/generic/fontdlgg.cpp:415 ../src/generic/fontdlgg.cpp:417
 msgid "The font colour."
 msgstr "Skriftfarge"
 
-#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379
+#: ../src/generic/fontdlgg.cpp:376 ../src/generic/fontdlgg.cpp:378
 msgid "The font family."
 msgstr "Skriftfamilie"
 
-#: ../src/richtext/richtextsymboldlg.cpp:398
-#: ../src/richtext/richtextsymboldlg.cpp:400
+#: ../src/richtext/richtextsymboldlg.cpp:402
+#: ../src/richtext/richtextsymboldlg.cpp:404
 msgid "The font from which to take the symbol."
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:429 ../src/generic/fontdlgg.cpp:431
-#: ../src/generic/fontdlgg.cpp:436 ../src/generic/fontdlgg.cpp:438
+#: ../src/generic/fontdlgg.cpp:428 ../src/generic/fontdlgg.cpp:430
+#: ../src/generic/fontdlgg.cpp:435 ../src/generic/fontdlgg.cpp:437
 msgid "The font point size."
-msgstr "Skriftpunktstørrelse"
+msgstr "Skriftpunktstørrelse"
 
-#: ../src/mac/carbon/fontdlg.cpp:505 ../src/mac/carbon/fontdlg.cpp:507
+#: ../src/osx/carbon/fontdlg.cpp:527 ../src/osx/carbon/fontdlg.cpp:529
 #, fuzzy
 msgid "The font size in points."
-msgstr "Skriftpunktstørrelse"
+msgstr "Skriftpunktstørrelse"
 
-#: ../src/generic/fontdlgg.cpp:388 ../src/generic/fontdlgg.cpp:390
+#: ../src/generic/fontdlgg.cpp:387 ../src/generic/fontdlgg.cpp:389
 msgid "The font style."
 msgstr "Skriftstil"
 
-#: ../src/generic/fontdlgg.cpp:399 ../src/generic/fontdlgg.cpp:401
+#: ../src/generic/fontdlgg.cpp:398 ../src/generic/fontdlgg.cpp:400
 msgid "The font weight."
 msgstr "Skriftvekt"
 
-#: ../src/richtext/richtextliststylepage.cpp:386
-#: ../src/richtext/richtextliststylepage.cpp:388
+#: ../src/common/docview.cpp:1439
+#, fuzzy, c-format
+msgid "The format of file '%s' couldn't be determined."
+msgstr "Mappe «%s» kunne ikke opprettes"
+
 #: ../src/richtext/richtextindentspage.cpp:212
 #: ../src/richtext/richtextindentspage.cpp:214
+#: ../src/richtext/richtextliststylepage.cpp:386
+#: ../src/richtext/richtextliststylepage.cpp:388
 #, fuzzy
 msgid "The left indent."
 msgstr "Skriftvekt"
 
-#: ../src/richtext/richtextliststylepage.cpp:464
-#: ../src/richtext/richtextliststylepage.cpp:466
-#: ../src/richtext/richtextindentspage.cpp:319
-#: ../src/richtext/richtextindentspage.cpp:321
+#: ../src/richtext/richtextmarginspage.cpp:195
+#: ../src/richtext/richtextmarginspage.cpp:197
+#, fuzzy
+msgid "The left margin size."
+msgstr "Skriftpunktstørrelse"
+
+#: ../src/richtext/richtextmarginspage.cpp:309
+#: ../src/richtext/richtextmarginspage.cpp:311
+#, fuzzy
+msgid "The left padding size."
+msgstr "Skriftpunktstørrelse"
+
+#: ../src/richtext/richtextindentspage.cpp:313
+#: ../src/richtext/richtextindentspage.cpp:315
+#: ../src/richtext/richtextliststylepage.cpp:463
+#: ../src/richtext/richtextliststylepage.cpp:465
 msgid "The line spacing."
 msgstr ""
 
-#: ../src/richtext/richtextbulletspage.cpp:266
-#: ../src/richtext/richtextbulletspage.cpp:268
+#: ../src/richtext/richtextbulletspage.cpp:269
+#: ../src/richtext/richtextbulletspage.cpp:271
 msgid "The list item number."
 msgstr ""
 
-#: ../src/richtext/richtextindentspage.cpp:257
-#: ../src/richtext/richtextindentspage.cpp:259
+#: ../src/msw/ole/automtn.cpp:635
+msgid "The locale ID is unknown."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:266
+#: ../src/richtext/richtextsizepage.cpp:268
 #, fuzzy
-msgid "The outline level."
-msgstr "Viser skriftforhåndsvisning."
+msgid "The object height."
+msgstr "Skriftvekt"
 
-#: ../src/common/filename.cpp:1254
-#, c-format
-msgid "The path '%s' contains too many \"..\"!"
-msgstr "Stien «%s» inneholder for mange \"..\"!"
+#: ../src/richtext/richtextsizepage.cpp:374
+#: ../src/richtext/richtextsizepage.cpp:376
+#, fuzzy
+msgid "The object maximum height."
+msgstr "Skriftvekt"
+
+#: ../src/richtext/richtextsizepage.cpp:347
+#: ../src/richtext/richtextsizepage.cpp:349
+#, fuzzy
+msgid "The object maximum width."
+msgstr "Skriftvekt"
+
+#: ../src/richtext/richtextsizepage.cpp:293
+#: ../src/richtext/richtextsizepage.cpp:295
+#, fuzzy
+msgid "The object minimum width."
+msgstr "Skriftvekt"
+
+#: ../src/richtext/richtextsizepage.cpp:320
+#: ../src/richtext/richtextsizepage.cpp:322
+#, fuzzy
+msgid "The object minmum height."
+msgstr "Skriftvekt"
+
+#: ../src/richtext/richtextsizepage.cpp:239
+#: ../src/richtext/richtextsizepage.cpp:241
+#, fuzzy
+msgid "The object width."
+msgstr "Skriftvekt"
 
-#: ../src/common/log.cpp:501
+#: ../src/richtext/richtextindentspage.cpp:252
+#: ../src/richtext/richtextindentspage.cpp:254
+#, fuzzy
+msgid "The outline level."
+msgstr "Viser skriftforhåndsvisning."
+
+#: ../src/common/log.cpp:284
 #, c-format
-msgid "The previous message repeated once."
+msgid "The previous message repeated %lu time."
 msgid_plural "The previous message repeated %lu times."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/gtk/print.cpp:891 ../src/gtk/print.cpp:1079
+#: ../src/common/log.cpp:277
+msgid "The previous message repeated once."
+msgstr ""
+
+#: ../src/gtk/print.cpp:922 ../src/gtk/print.cpp:1105
 msgid "The print dialog returned an error."
 msgstr ""
 
-#: ../src/richtext/richtextsymboldlg.cpp:455
-#: ../src/richtext/richtextsymboldlg.cpp:457
+#: ../src/richtext/richtextsymboldlg.cpp:459
+#: ../src/richtext/richtextsymboldlg.cpp:461
 msgid "The range to show."
 msgstr ""
 
-#: ../src/generic/dbgrptg.cpp:318
+#: ../src/generic/dbgrptg.cpp:319
 msgid ""
 "The report contains the files listed below. If any of these files contain "
 "private information,\n"
@@ -5636,169 +6671,230 @@ msgid ""
 msgstr ""
 "Rapporten inneholder filene listet nedenfor. Hvis noen av disse filene "
 "inneholder privat informasjon,\n"
-"så fjerner du bare markeringen foran dem og de vil bli fjernet fra "
+"så fjerner du bare markeringen foran dem og de vil bli fjernet fra "
 "rapporten.\n"
 
-#: ../src/common/cmdline.cpp:955
+#: ../src/common/cmdline.cpp:1076
 #, c-format
 msgid "The required parameter '%s' was not specified."
-msgstr "Den nødvendige parameteren «%s» var ikke oppgitt."
+msgstr "Den nødvendige parameteren «%s» var ikke oppgitt."
 
-#: ../src/richtext/richtextliststylepage.cpp:408
-#: ../src/richtext/richtextliststylepage.cpp:410
-#: ../src/richtext/richtextindentspage.cpp:236
-#: ../src/richtext/richtextindentspage.cpp:238
+#: ../src/richtext/richtextindentspage.cpp:230
+#: ../src/richtext/richtextindentspage.cpp:232
+#: ../src/richtext/richtextliststylepage.cpp:404
+#: ../src/richtext/richtextliststylepage.cpp:406
 msgid "The right indent."
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:448
-#: ../src/richtext/richtextliststylepage.cpp:450
-#: ../src/richtext/richtextindentspage.cpp:304
+#: ../src/richtext/richtextmarginspage.cpp:220
+#: ../src/richtext/richtextmarginspage.cpp:222
+#, fuzzy
+msgid "The right margin size."
+msgstr "Skriftpunktstørrelse"
+
+#: ../src/richtext/richtextmarginspage.cpp:334
+#: ../src/richtext/richtextmarginspage.cpp:336
+#, fuzzy
+msgid "The right padding size."
+msgstr "Skriftpunktstørrelse"
+
+#: ../src/richtext/richtextindentspage.cpp:292
+#: ../src/richtext/richtextliststylepage.cpp:440
+#: ../src/richtext/richtextliststylepage.cpp:442
 msgid "The spacing after the paragraph."
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:437
-#: ../src/richtext/richtextliststylepage.cpp:439
-#: ../src/richtext/richtextindentspage.cpp:291
-#: ../src/richtext/richtextindentspage.cpp:293
+#: ../src/richtext/richtextindentspage.cpp:282
+#: ../src/richtext/richtextindentspage.cpp:284
+#: ../src/richtext/richtextliststylepage.cpp:431
+#: ../src/richtext/richtextliststylepage.cpp:433
 msgid "The spacing before the paragraph."
 msgstr ""
 
-#: ../src/richtext/richtextstylepage.cpp:107
 #: ../src/richtext/richtextstylepage.cpp:109
+#: ../src/richtext/richtextstylepage.cpp:111
 #, fuzzy
 msgid "The style name."
 msgstr "Skriftstil"
 
-#: ../src/richtext/richtextstylepage.cpp:117
 #: ../src/richtext/richtextstylepage.cpp:119
+#: ../src/richtext/richtextstylepage.cpp:121
 msgid "The style on which this style is based."
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:206
-#: ../src/richtext/richtextstyledlg.cpp:208
+#: ../src/richtext/richtextstyledlg.cpp:218
+#: ../src/richtext/richtextstyledlg.cpp:220
 #, fuzzy
 msgid "The style preview."
-msgstr "Viser skriftforhåndsvisning."
+msgstr "Viser skriftforhåndsvisning."
+
+#: ../src/msw/ole/automtn.cpp:651
+msgid "The system cannot find the file specified."
+msgstr ""
 
-#: ../src/richtext/richtexttabspage.cpp:117
 #: ../src/richtext/richtexttabspage.cpp:119
+#: ../src/richtext/richtexttabspage.cpp:121
 #, fuzzy
 msgid "The tab position."
-msgstr "Skriftpunktstørrelse"
+msgstr "Skriftpunktstørrelse"
 
-#: ../src/richtext/richtexttabspage.cpp:123
+#: ../src/richtext/richtexttabspage.cpp:125
 #, fuzzy
 msgid "The tab positions."
-msgstr "Skriftpunktstørrelse"
+msgstr "Skriftpunktstørrelse"
 
-#: ../src/common/textcmn.cpp:760 ../src/richtext/richtextctrl.cpp:1918
+#: ../src/richtext/richtextctrl.cpp:2682
 msgid "The text couldn't be saved."
 msgstr "Klarte ikke lagre teksten."
 
-#: ../src/common/cmdline.cpp:933
+#: ../src/richtext/richtextmarginspage.cpp:243
+#: ../src/richtext/richtextmarginspage.cpp:245
+#, fuzzy
+msgid "The top margin size."
+msgstr "Skriftpunktstørrelse"
+
+#: ../src/richtext/richtextmarginspage.cpp:357
+#: ../src/richtext/richtextmarginspage.cpp:359
+#, fuzzy
+msgid "The top padding size."
+msgstr "Skriftpunktstørrelse"
+
+#: ../src/common/cmdline.cpp:1054
 #, c-format
 msgid "The value for the option '%s' must be specified."
-msgstr "Verdien for opsjonen «%s» må oppgies."
+msgstr "Verdien for opsjonen «%s» må oppgies."
 
-#: ../src/msw/dialup.cpp:455
+#: ../src/msw/dialup.cpp:453
 #, fuzzy, c-format
 msgid ""
 "The version of remote access service (RAS) installed on this machine is too "
 "old, please upgrade (the following required function is missing: %s)."
 msgstr ""
-"Versjonen av Remote Access Service (RAS) installert på denne maskinen er for "
-"gammel. Du må oppgradere - følgende påkrevd funksjon mangler: %s"
+"Versjonen av Remote Access Service (RAS) installert på denne maskinen er for "
+"gammel. Du må oppgradere - følgende påkrevd funksjon mangler: %s"
 
-#: ../src/gtk/print.cpp:921
+#: ../src/richtext/richtextsizepage.cpp:459
+#: ../src/richtext/richtextsizepage.cpp:461
+msgid "The vertical offset relative to the paragraph."
+msgstr ""
+
+#: ../src/gtk/print.cpp:950
 msgid "The wxGtkPrinterDC cannot be used."
 msgstr ""
 
-#: ../src/mac/carbon/databrow.cpp:682
+#: ../src/osx/carbon/dataview.cpp:1341
 msgid "There is no column or renderer for the specified column index."
 msgstr ""
 
-#: ../src/richtext/richtextprint.cpp:575 ../src/html/htmprint.cpp:610
+#: ../src/richtext/richtextprint.cpp:608 ../src/html/htmprint.cpp:736
 msgid ""
 "There was a problem during page setup: you may need to set a default printer."
 msgstr ""
-"Det oppstod et problem med sideoppsettet - kanskje du må installere en "
+"Det oppstod et problem med sideoppsettet - kanskje du må installere en "
 "skriver."
 
+#: ../src/html/htmprint.cpp:256
+msgid ""
+"This document doesn't fit on the page horizontally and will be truncated "
+"when it is printed."
+msgstr ""
+
+#: ../src/common/image.cpp:2517
+#, fuzzy, c-format
+msgid "This is not a %s."
+msgstr "PCX: Dette er ikke en PCX-fil"
+
+#: ../src/common/wincmn.cpp:1584
+msgid "This platform does not support background transparency."
+msgstr ""
+
+#: ../src/gtk/window.cpp:4147
+msgid ""
+"This program was compiled with a too old version of GTK+, please rebuild "
+"with GTK+ 2.12 or newer."
+msgstr ""
+
 #: ../src/msw/datecontrols.cpp:60
 #, fuzzy
 msgid ""
 "This system doesn't support date controls, please upgrade your version of "
 "comctl32.dll"
 msgstr ""
-"Dette systemet støtter ikke datavalgkontrollen. Oppgrader din versjon av "
+"Dette systemet støtter ikke datavalgkontrollen. Oppgrader din versjon av "
 "comctl32.dll."
 
-#: ../src/msw/thread.cpp:1247
+#: ../src/msw/thread.cpp:1288
 msgid ""
 "Thread module initialization failed: cannot store value in thread local "
 "storage"
 msgstr ""
-"Initialisering av trådmodul feilet: klarte ikke lagre verdien i det lokale "
-"trådlageret"
+"Initialisering av trådmodul feilet: klarte ikke lagre verdien i det lokale "
+"trådlageret"
 
-#: ../src/unix/threadpsx.cpp:1686
+#: ../src/unix/threadpsx.cpp:1714
 msgid "Thread module initialization failed: failed to create thread key"
-msgstr "Initialisering av trådmodul feilet: klarte ikke opprette trådnøkkel"
+msgstr "Initialisering av trådmodul feilet: klarte ikke opprette trådnøkkel"
 
-#: ../src/msw/thread.cpp:1235
+#: ../src/msw/thread.cpp:1276
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr ""
-"Initialisering av trådmodul feilet: umulig å reservere indeks i det lokale "
-"trådlager"
+"Initialisering av trådmodul feilet: umulig å reservere indeks i det lokale "
+"trådlager"
 
-#: ../src/unix/threadpsx.cpp:1200
+#: ../src/unix/threadpsx.cpp:1216
 msgid "Thread priority setting is ignored."
-msgstr "Trådprioritetinnstilling ignorert."
+msgstr "Trådprioritetinnstilling ignorert."
 
-#: ../src/msw/mdi.cpp:168
+#: ../src/msw/mdi.cpp:165
 msgid "Tile &Horizontally"
 msgstr "Tile &horisontalt"
 
-#: ../src/msw/mdi.cpp:169
+#: ../src/msw/mdi.cpp:166
 msgid "Tile &Vertically"
 msgstr "Tile &vertikalt"
 
-#: ../src/common/ftp.cpp:633
+#: ../src/common/ftp.cpp:205
 msgid "Timeout while waiting for FTP server to connect, try passive mode."
-msgstr "Tidsavbrudd under venting på FTP-tilkobling, prøv passiv modus."
+msgstr "Tidsavbrudd under venting på FTP-tilkobling, prøv passiv modus."
 
-#: ../src/os2/timer.cpp:100 ../src/msw/timer.cpp:93
+#: ../src/os2/timer.cpp:100
 msgid "Timer creation failed."
 msgstr "Tidtager opprettelese feilet."
 
-#: ../src/generic/tipdlg.cpp:218
+#: ../src/generic/tipdlg.cpp:221
 msgid "Tip of the Day"
 msgstr "Dagens tips"
 
-#: ../src/generic/tipdlg.cpp:153
+#: ../src/generic/tipdlg.cpp:155
 msgid "Tips not available, sorry!"
 msgstr "Tips er ikke tilgjengelig, beklager!"
 
-#: ../src/generic/prntdlgg.cpp:249
+#: ../src/generic/prntdlgg.cpp:248
 msgid "To:"
 msgstr "Til:"
 
-#: ../src/mac/carbon/dataview.cpp:648
+#: ../src/osx/carbon/dataview.cpp:2452
 msgid "Toggle renderer cannot render value; value type: "
 msgstr ""
 
-#: ../src/richtext/richtextbuffer.cpp:5473
+#: ../src/richtext/richtextbuffer.cpp:7276
 msgid "Too many EndStyle calls!"
 msgstr ""
 
-#: ../src/common/imagpng.cpp:288
+#: ../src/common/imagpng.cpp:287
 msgid "Too many colours in PNG, the image may be slightly blurred."
-msgstr "For mange farger i PNG, bildet kan være litt uskarpt."
+msgstr "For mange farger i PNG, bildet kan være litt uskarpt."
 
-#: ../src/generic/prntdlgg.cpp:886
+#: ../src/richtext/richtextsizepage.cpp:416
+#: ../src/richtext/richtextsizepage.cpp:419
+#: ../src/richtext/richtextsizepage.cpp:420 ../src/common/stockitem.cpp:201
+#, fuzzy
+msgid "Top"
+msgstr "Til:"
+
+#: ../src/generic/prntdlgg.cpp:887
 msgid "Top margin (mm):"
 msgstr "Toppmarg (mm):"
 
@@ -5806,44 +6902,56 @@ msgstr "Toppmarg (mm):"
 msgid "Translations by "
 msgstr ""
 
-#: ../src/generic/aboutdlgg.cpp:154
+#: ../src/generic/aboutdlgg.cpp:189
 msgid "Translators"
 msgstr ""
 
-#: ../src/common/fs_mem.cpp:220
+#: ../src/propgrid/propgrid.cpp:174
+msgid "True"
+msgstr ""
+
+#: ../src/common/fs_mem.cpp:228
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
-msgstr "Prøvde å fjerne filen «%s» fra VFS minne, men den er ikke lastet!"
-
-#: ../src/common/sckaddr.cpp:144 ../src/common/sckaddr.cpp:252
-msgid "Trying to solve a NULL hostname: giving up"
-msgstr "Prøver å løse NULL tjenernavn: gir opp"
+msgstr "Prøvde å fjerne filen «%s» fra VFS minne, men den er ikke lastet!"
 
-#: ../src/common/fmapbase.cpp:116
+#: ../src/common/fmapbase.cpp:155
 msgid "Turkish (ISO-8859-9)"
 msgstr "Tyrkisk (ISO-8859-9)"
 
-#: ../src/generic/filectrlg.cpp:460
+#: ../src/generic/filectrlg.cpp:455
 msgid "Type"
 msgstr "Type"
 
-#: ../src/richtext/richtextfontpage.cpp:138
-#: ../src/richtext/richtextfontpage.cpp:140
+#: ../src/richtext/richtextfontpage.cpp:148
+#: ../src/richtext/richtextfontpage.cpp:150
 #, fuzzy
 msgid "Type a font name."
 msgstr "Skriftfamilie"
 
-#: ../src/richtext/richtextfontpage.cpp:156
-#: ../src/richtext/richtextfontpage.cpp:158
+#: ../src/richtext/richtextfontpage.cpp:166
+#: ../src/richtext/richtextfontpage.cpp:168
 msgid "Type a size in points."
 msgstr ""
 
-#: ../src/common/xtixml.cpp:348 ../src/common/xtixml.cpp:495
-#: ../src/common/xtistrm.cpp:277
+#: ../src/msw/ole/automtn.cpp:647
+#, c-format
+msgid "Type mismatch in argument %u."
+msgstr ""
+
+#: ../src/common/xtixml.cpp:357 ../src/common/xtixml.cpp:510
+#: ../src/common/xtistrm.cpp:323
 msgid "Type must have enum - long conversion"
-msgstr "Type må ha enum - long conversion"
+msgstr "Type må ha enum - long conversion"
 
-#: ../src/common/accelcmn.cpp:57
+#: ../src/propgrid/propgridiface.cpp:383
+#, c-format
+msgid ""
+"Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT "
+"\"%s\"."
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:59
 msgid "UP"
 msgstr ""
 
@@ -5851,247 +6959,542 @@ msgstr ""
 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgstr "Amerikansk standard papir, 14 7/8 x 11 tommer"
 
-#: ../src/common/fmapbase.cpp:153
+#: ../src/common/fmapbase.cpp:193
 #, fuzzy
 msgid "US-ASCII"
 msgstr "ASCII"
 
-#: ../src/gtk/app.cpp:494
+#: ../src/unix/fswatcher_inotify.cpp:110
+msgid "Unable to add inotify watch"
+msgstr ""
+
+#: ../src/unix/fswatcher_kqueue.cpp:137
+msgid "Unable to add kqueue watch"
+msgstr ""
+
+#: ../include/wx/msw/private/fswatcher.h:143
+msgid "Unable to associate handle with I/O completion port"
+msgstr ""
+
+#: ../include/wx/msw/private/fswatcher.h:126
+#, fuzzy
+msgid "Unable to close I/O completion port handle"
+msgstr "Klarte ikke lukke filreferanse"
+
+#: ../src/unix/fswatcher_inotify.cpp:98
+#, fuzzy
+msgid "Unable to close inotify instance"
+msgstr "Klarte ikke lukke filreferanse"
+
+#: ../include/wx/unix/private/fswatcher_kqueue.h:75
+#, fuzzy, c-format
+msgid "Unable to close path '%s'"
+msgstr "Klarte ikke lukke låsefil «%s»"
+
+#: ../include/wx/msw/private/fswatcher.h:49
+#, fuzzy, c-format
+msgid "Unable to close the handle for '%s'"
+msgstr "Klarte ikke lukke filreferanse"
+
+#: ../include/wx/msw/private/fswatcher.h:241
+#, fuzzy
+msgid "Unable to create I/O completion port"
+msgstr "Klarte ikke opprette peker."
+
+#: ../src/msw/fswatcher.cpp:85
+#, fuzzy
+msgid "Unable to create IOCP worker thread"
+msgstr "Klarte ikke opprette MDI foreldreramme."
+
+#: ../src/unix/fswatcher_inotify.cpp:75
+#, fuzzy
+msgid "Unable to create inotify instance"
+msgstr "Klarte ikke opprette DDE-streng"
+
+#: ../src/unix/fswatcher_kqueue.cpp:98
+#, fuzzy
+msgid "Unable to create kqueue instance"
+msgstr "Klarte ikke opprette DDE-streng"
+
+#: ../include/wx/msw/private/fswatcher.h:230
+msgid "Unable to dequeue completion packet"
+msgstr ""
+
+#: ../src/unix/fswatcher_kqueue.cpp:187
+msgid "Unable to get events from kqueue"
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:1904
+msgid "Unable to handle native drag&drop data"
+msgstr ""
+
+#: ../src/gtk/app.cpp:438
 msgid "Unable to initialize GTK+, is DISPLAY set properly?"
 msgstr ""
 
-#: ../src/gtk/app.cpp:330
+#: ../src/gtk/app.cpp:273
 #, fuzzy
 msgid "Unable to initialize Hildon program"
 msgstr "Klarte ikke initialisere OpenGL"
 
-#: ../src/html/htmlwin.cpp:534
+#: ../include/wx/unix/private/fswatcher_kqueue.h:58
+#, fuzzy, c-format
+msgid "Unable to open path '%s'"
+msgstr "Klarte ikke åpne CHM arkiv «%s»."
+
+#: ../src/html/htmlwin.cpp:557
 #, c-format
 msgid "Unable to open requested HTML document: %s"
-msgstr "Klarte ikke åpne forespurt HTML-dokument: %s"
+msgstr "Klarte ikke åpne forespurt HTML-dokument: %s"
 
 #: ../src/unix/sound.cpp:369
 msgid "Unable to play sound asynchronously."
 msgstr "Klarte ikke spille lyd asynkront."
 
-#: ../src/common/stockitem.cpp:155
+#: ../include/wx/msw/private/fswatcher.h:208
+msgid "Unable to post completion status"
+msgstr ""
+
+#: ../src/unix/fswatcher_inotify.cpp:330
+#, fuzzy
+msgid "Unable to read from inotify descriptor"
+msgstr "klarte ikke lese fra fildeskriptor %d"
+
+#: ../src/unix/fswatcher_inotify.cpp:133
+msgid "Unable to remove inotify watch"
+msgstr ""
+
+#: ../src/unix/fswatcher_kqueue.cpp:155
+msgid "Unable to remove kqueue watch"
+msgstr ""
+
+#: ../src/msw/fswatcher.cpp:169
+#, fuzzy, c-format
+msgid "Unable to set up watch for '%s'"
+msgstr "Klarte ikke rør filen «%s»"
+
+#: ../src/msw/fswatcher.cpp:92
+msgid "Unable to start IOCP worker thread"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:202
 msgid "Undelete"
 msgstr "Angre sletting"
 
-#: ../src/richtext/richtextfontpage.cpp:272
-#: ../src/richtext/richtextfontpage.cpp:344
-#: ../src/richtext/richtextfontpage.cpp:588 ../src/mac/carbon/fontdlg.cpp:532
+#: ../src/common/stockitem.cpp:203
+#, fuzzy
+msgid "Underline"
+msgstr "&Strek under"
+
+#: ../src/richtext/richtextfontpage.cpp:301 ../src/osx/carbon/fontdlg.cpp:554
+#: ../src/propgrid/advprops.cpp:656
 #, fuzzy
 msgid "Underlined"
 msgstr "&Strek under"
 
-#: ../src/stc/scintilla/src/ScintillaBase.cxx:422
+#: ../src/common/stockitem.cpp:204 ../src/stc/stc_i18n.cpp:16
 #, fuzzy
 msgid "Undo"
 msgstr "&Angre"
 
-#: ../src/common/stockitem.cpp:210
+#: ../src/common/stockitem.cpp:266
 msgid "Undo last action"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:738
+#: ../src/common/cmdline.cpp:857
 #, fuzzy, c-format
 msgid "Unexpected characters following option '%s'."
-msgstr "Uventet parameter «%s»"
+msgstr "Uventet parameter «%s»"
 
-#: ../src/common/cmdline.cpp:896
+#: ../src/common/cmdline.cpp:1017
 #, c-format
 msgid "Unexpected parameter '%s'"
-msgstr "Uventet parameter «%s»"
+msgstr "Uventet parameter «%s»"
+
+#: ../include/wx/msw/private/fswatcher.h:149
+msgid "Unexpectedly new I/O completion port was created"
+msgstr ""
+
+#: ../src/msw/fswatcher.cpp:71
+#, fuzzy
+msgid "Ungraceful worker thread termination"
+msgstr "Klarte ikke vente på trådens avslutning"
 
-#: ../src/richtext/richtextsymboldlg.cpp:452
+#: ../src/richtext/richtextsymboldlg.cpp:456
+#: ../src/richtext/richtextsymboldlg.cpp:457
+#: ../src/richtext/richtextsymboldlg.cpp:458
 #, fuzzy
 msgid "Unicode"
 msgstr "&Fjern innrykk"
 
-#: ../src/common/fmapbase.cpp:142 ../src/common/fmapbase.cpp:148
+#: ../src/common/fmapbase.cpp:182 ../src/common/fmapbase.cpp:188
 msgid "Unicode 16 bit (UTF-16)"
 msgstr "Unicode 16 bit (UTF-16)"
 
-#: ../src/common/fmapbase.cpp:147
+#: ../src/common/fmapbase.cpp:187
 msgid "Unicode 16 bit Big Endian (UTF-16BE)"
 msgstr "Unicode 16 bit Big Endian (UTF-16BE)"
 
-#: ../src/common/fmapbase.cpp:143
+#: ../src/common/fmapbase.cpp:183
 msgid "Unicode 16 bit Little Endian (UTF-16LE)"
 msgstr "Unicode 16 bit Little Endian (UTF-16LE)"
 
-#: ../src/common/fmapbase.cpp:144 ../src/common/fmapbase.cpp:150
+#: ../src/common/fmapbase.cpp:184 ../src/common/fmapbase.cpp:190
 msgid "Unicode 32 bit (UTF-32)"
 msgstr "Unicode 32 bit (UTF-32)"
 
-#: ../src/common/fmapbase.cpp:149
+#: ../src/common/fmapbase.cpp:189
 msgid "Unicode 32 bit Big Endian (UTF-32BE)"
 msgstr "Unicode 32 bit Big Endian (UTF-32BE)"
 
-#: ../src/common/fmapbase.cpp:145
+#: ../src/common/fmapbase.cpp:185
 msgid "Unicode 32 bit Little Endian (UTF-32LE)"
 msgstr "Unicode 32 bit Little Endian (UTF-32LE)"
 
-#: ../src/common/fmapbase.cpp:139
+#: ../src/common/fmapbase.cpp:179
 msgid "Unicode 7 bit (UTF-7)"
 msgstr "Unicode 7 bit (UTF-7)"
 
-#: ../src/common/fmapbase.cpp:140
+#: ../src/common/fmapbase.cpp:180
 msgid "Unicode 8 bit (UTF-8)"
 msgstr "Unicode 8 bit (UTF-8)"
 
-#: ../src/generic/progdlgg.cpp:597
+#: ../src/common/stockitem.cpp:205
+#, fuzzy
+msgid "Unindent"
+msgstr "&Fjern innrykk"
+
+#: ../src/richtext/richtextborderspage.cpp:373
+#: ../src/richtext/richtextborderspage.cpp:375
+msgid "Units for the bottom border width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:278
+#: ../src/richtext/richtextmarginspage.cpp:280
+msgid "Units for the bottom margin."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:517
+#: ../src/richtext/richtextborderspage.cpp:519
+msgid "Units for the bottom outline width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:392
+#: ../src/richtext/richtextmarginspage.cpp:394
+msgid "Units for the bottom padding."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:283
+#: ../src/richtext/richtextborderspage.cpp:285
+msgid "Units for the left border width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:205
+#: ../src/richtext/richtextmarginspage.cpp:207
+msgid "Units for the left margin."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:427
+#: ../src/richtext/richtextborderspage.cpp:429
+msgid "Units for the left outline width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:319
+#: ../src/richtext/richtextmarginspage.cpp:321
+msgid "Units for the left padding."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:385
+#: ../src/richtext/richtextsizepage.cpp:387
+#, fuzzy
+msgid "Units for the maximum object height."
+msgstr "Skriftvekt"
+
+#: ../src/richtext/richtextsizepage.cpp:358
+#: ../src/richtext/richtextsizepage.cpp:360
+#, fuzzy
+msgid "Units for the maximum object width."
+msgstr "Skriftvekt"
+
+#: ../src/richtext/richtextsizepage.cpp:331
+#: ../src/richtext/richtextsizepage.cpp:333
+#, fuzzy
+msgid "Units for the minimum object height."
+msgstr "Skriftvekt"
+
+#: ../src/richtext/richtextsizepage.cpp:304
+#: ../src/richtext/richtextsizepage.cpp:306
+#, fuzzy
+msgid "Units for the minimum object width."
+msgstr "Skriftvekt"
+
+#: ../src/richtext/richtextsizepage.cpp:277
+#: ../src/richtext/richtextsizepage.cpp:279
+msgid "Units for the object height."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:469
+#: ../src/richtext/richtextsizepage.cpp:471
+msgid "Units for the object offset."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:250
+#: ../src/richtext/richtextsizepage.cpp:252
+msgid "Units for the object width."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:313
+#: ../src/richtext/richtextborderspage.cpp:315
+msgid "Units for the right border width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:230
+#: ../src/richtext/richtextmarginspage.cpp:232
+msgid "Units for the right margin."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:457
+#: ../src/richtext/richtextborderspage.cpp:459
+msgid "Units for the right outline width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:344
+#: ../src/richtext/richtextmarginspage.cpp:346
+msgid "Units for the right padding."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:343
+#: ../src/richtext/richtextborderspage.cpp:345
+msgid "Units for the top border width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:253
+#: ../src/richtext/richtextmarginspage.cpp:255
+#, fuzzy
+msgid "Units for the top margin."
+msgstr "Kan ikke vente på trådens avslutning."
+
+#: ../src/richtext/richtextborderspage.cpp:487
+#: ../src/richtext/richtextborderspage.cpp:489
+msgid "Units for the top outline width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:367
+#: ../src/richtext/richtextmarginspage.cpp:369
+msgid "Units for the top padding."
+msgstr ""
+
+#: ../src/generic/progdlgg.cpp:383 ../src/generic/progdlgg.cpp:656
 #, fuzzy
 msgid "Unknown"
 msgstr "ukjent"
 
-#: ../src/msw/dde.cpp:1175
+#: ../src/msw/dde.cpp:1178
 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "Ukjent DDE-feil %08x"
 
-#: ../src/common/xtistrm.cpp:366
+#: ../src/common/xtistrm.cpp:415
 msgid "Unknown Object passed to GetObjectClassInfo"
 msgstr "Ukjent objekt sendt til GetObjectClassInfo"
 
-#: ../src/common/xtixml.cpp:321
+#: ../src/common/imagpng.cpp:615
+#, fuzzy, c-format
+msgid "Unknown PNG resolution unit %d"
+msgstr "Ukjent opsjon «%s»"
+
+#: ../src/common/xtixml.cpp:328
 #, fuzzy, c-format
 msgid "Unknown Property %s"
 msgstr "Ukjent egenskap %s"
 
-#: ../src/common/imagtiff.cpp:379
+#: ../src/common/imagtiff.cpp:533
 #, c-format
 msgid "Unknown TIFF resolution unit %d ignored"
 msgstr ""
 
+#: ../src/osx/carbon/dataview.cpp:1979
+#, fuzzy
+msgid "Unknown data format"
+msgstr "feil i dataformat"
+
 #: ../src/unix/dlunix.cpp:335
 msgid "Unknown dynamic library error"
 msgstr "Ukjent feil i dynamisk bibliotek"
 
-#: ../src/common/fmapbase.cpp:675
+#: ../src/common/fmapbase.cpp:797
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "Ukjent koding (%d)"
 
-#: ../src/common/cmdline.cpp:643
+#: ../src/msw/ole/automtn.cpp:659
+#, fuzzy, c-format
+msgid "Unknown error %08x"
+msgstr "Ukjent DDE-feil %08x"
+
+#: ../src/msw/ole/automtn.cpp:618
+#, fuzzy
+msgid "Unknown exception"
+msgstr "Ukjent opsjon «%s»"
+
+#: ../src/common/image.cpp:2502
+#, fuzzy
+msgid "Unknown image data format."
+msgstr "feil i dataformat"
+
+#: ../src/common/cmdline.cpp:742
 #, c-format
 msgid "Unknown long option '%s'"
-msgstr "Ukjent lang opsjon «%s»"
+msgstr "Ukjent lang opsjon «%s»"
+
+#: ../src/msw/ole/automtn.cpp:602
+msgid "Unknown name or named argument."
+msgstr ""
 
-#: ../src/common/cmdline.cpp:653 ../src/common/cmdline.cpp:675
+#: ../src/common/cmdline.cpp:757 ../src/common/cmdline.cpp:779
 #, c-format
 msgid "Unknown option '%s'"
-msgstr "Ukjent opsjon «%s»"
+msgstr "Ukjent opsjon «%s»"
 
-#: ../src/xrc/xmlres.cpp:890
-msgid "Unknown style flag "
-msgstr "Ukjent stilflagg"
-
-#: ../src/common/mimecmn.cpp:225
+#: ../src/common/mimecmn.cpp:231
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
-msgstr "Ubalansert «{» i en oppføring for mime-type %s."
+msgstr "Ubalansert «{» i en oppføring for mime-type %s."
 
-#: ../src/common/cmdproc.cpp:257 ../src/common/cmdproc.cpp:283
-#: ../src/common/cmdproc.cpp:303
+#: ../src/common/cmdproc.cpp:263 ../src/common/cmdproc.cpp:289
+#: ../src/common/cmdproc.cpp:309
 msgid "Unnamed command"
 msgstr "Ikke-navngitt kommando"
 
-#: ../src/msw/clipbrd.cpp:267 ../src/msw/clipbrd.cpp:439
+#: ../src/propgrid/propgrid.cpp:399
+#, fuzzy
+msgid "Unspecified"
+msgstr "Justert"
+
+#: ../src/msw/clipbrd.cpp:269 ../src/msw/clipbrd.cpp:441
 msgid "Unsupported clipboard format."
-msgstr "Ikke-støttet utklippstavleformat."
+msgstr "Ikke-støttet utklippstavleformat."
 
-#: ../src/common/appcmn.cpp:237
+#: ../src/common/appcmn.cpp:229
 #, c-format
 msgid "Unsupported theme '%s'."
-msgstr "Ikke-støttet tema «%s»."
+msgstr "Ikke-støttet tema «%s»."
 
-#: ../src/generic/fdrepdlg.cpp:153
+#: ../src/generic/fdrepdlg.cpp:153 ../src/common/stockitem.cpp:206
 msgid "Up"
 msgstr "Opp"
 
-#: ../src/richtext/richtextliststylepage.cpp:485
-#: ../src/richtext/richtextbulletspage.cpp:283
+#: ../src/richtext/richtextliststylepage.cpp:484
+#: ../src/richtext/richtextbulletspage.cpp:289
 msgid "Upper case letters"
 msgstr ""
 
-#: ../src/richtext/richtextliststylepage.cpp:487
-#: ../src/richtext/richtextbulletspage.cpp:285
+#: ../src/richtext/richtextliststylepage.cpp:486
+#: ../src/richtext/richtextbulletspage.cpp:291
 msgid "Upper case roman numerals"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:1027
+#: ../src/common/cmdline.cpp:1148
 #, c-format
 msgid "Usage: %s"
 msgstr "Bruk: %s"
 
-#: ../src/richtext/richtextliststylepage.cpp:357
+#: ../src/richtext/richtextindentspage.cpp:182
+#: ../src/richtext/richtextindentspage.cpp:184
 #: ../src/richtext/richtextliststylepage.cpp:359
-#: ../src/richtext/richtextindentspage.cpp:179
-#: ../src/richtext/richtextindentspage.cpp:181
+#: ../src/richtext/richtextliststylepage.cpp:361
 msgid "Use the current alignment setting."
 msgstr ""
 
-#: ../src/mac/carbon/dataview.cpp:860 ../src/mac/carbon/dataview.cpp:890
+#: ../src/osx/carbon/dataview.cpp:2659 ../src/osx/carbon/dataview.cpp:2724
 msgid "Valid pointer to native data view control does not exist"
 msgstr ""
 
-#: ../src/common/valtext.cpp:196
+#: ../src/common/valtext.cpp:175
 msgid "Validation conflict"
 msgstr "Valideringskonflikt"
 
-#: ../src/msw/aboutdlg.cpp:54 ../src/mac/carbon/aboutdlg.cpp:74
+#: ../src/propgrid/manager.cpp:239
+msgid "Value"
+msgstr ""
+
+#: ../src/propgrid/props.cpp:385
+#, c-format
+msgid "Value must be %s or higher."
+msgstr ""
+
+#: ../src/propgrid/props.cpp:412
+#, c-format
+msgid "Value must be %s or less."
+msgstr ""
+
+#: ../src/propgrid/props.cpp:389 ../src/propgrid/props.cpp:416
 #, fuzzy, c-format
-msgid "Version %s"
+msgid "Value must be between %s and %s."
+msgstr "Oppgi et sidetall mellom %d og %d:"
+
+#: ../src/generic/aboutdlgg.cpp:129
+#, fuzzy
+msgid "Version "
 msgstr "Rettigheter"
 
-#: ../src/generic/filedlgg.cpp:218
+#: ../src/richtext/richtextsizepage.cpp:450
+msgid "Vertical &Offset:"
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:421
+#: ../src/richtext/richtextsizepage.cpp:423
+#, fuzzy
+msgid "Vertical alignment."
+msgstr "Klarte ikke starte utskrift."
+
+#: ../src/generic/filedlgg.cpp:216
 msgid "View files as a detailed view"
 msgstr "Vis filer i detaljert visning"
 
-#: ../src/generic/filedlgg.cpp:216
+#: ../src/generic/filedlgg.cpp:214
 msgid "View files as a list view"
 msgstr "Vis filer i liste-visning"
 
-#: ../src/common/docview.cpp:1822
+#: ../src/common/docview.cpp:1933
 msgid "Views"
 msgstr "Visninger"
 
-#: ../src/common/accelcmn.cpp:107
+#: ../src/common/accelcmn.cpp:109
 msgid "WINDOWS_LEFT"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:109
+#: ../src/common/accelcmn.cpp:111
 msgid "WINDOWS_MENU"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:108
+#: ../src/common/accelcmn.cpp:110
 msgid "WINDOWS_RIGHT"
 msgstr ""
 
-#: ../src/unix/epolldispatcher.cpp:177
+#: ../src/unix/epolldispatcher.cpp:214
 #, fuzzy, c-format
 msgid "Waiting for IO on epoll descriptor %d failed"
-msgstr "Venting på avslutning av underprosess feilet"
+msgstr "Venting på avslutning av underprosess feilet"
 
-#: ../src/common/docview.cpp:478 ../src/html/htmprint.cpp:380
-msgid "Warning"
-msgstr "Advarsel"
-
-#: ../src/common/log.cpp:713
+#: ../src/common/log.cpp:230
 msgid "Warning: "
 msgstr "Advarsel:"
 
-#: ../src/common/fmapbase.cpp:108
+#: ../src/propgrid/advprops.cpp:652
+#, fuzzy
+msgid "Weight"
+msgstr "&Vekt:"
+
+#: ../src/common/fmapbase.cpp:147
 msgid "Western European (ISO-8859-1)"
 msgstr "Vesteuropeisk (ISO-8859-1)"
 
-#: ../src/common/fmapbase.cpp:122
+#: ../src/common/fmapbase.cpp:161
 msgid "Western European with Euro (ISO-8859-15)"
 msgstr "Vesteuropeisk med euro (ISO-8859-15)"
 
-#: ../src/generic/fontdlgg.cpp:448 ../src/generic/fontdlgg.cpp:450
+#: ../src/generic/fontdlgg.cpp:447 ../src/generic/fontdlgg.cpp:449
 msgid "Whether the font is underlined."
 msgstr "Om skriften er understreket."
 
@@ -6099,192 +7502,200 @@ msgstr "Om skriften er understreket."
 msgid "Whole word"
 msgstr "Hele ord"
 
-#: ../src/html/helpwnd.cpp:533
+#: ../src/html/helpwnd.cpp:545
 msgid "Whole words only"
 msgstr "Bare hele ord"
 
-#: ../src/univ/themes/win32.cpp:1059
+#: ../src/univ/themes/win32.cpp:1105
 msgid "Win32 theme"
 msgstr "Win32-tema"
 
-#: ../src/msw/utils.cpp:1090
+#: ../src/msw/utils.cpp:1228
 msgid "Win32s on Windows 3.1"
-msgstr "Win32 på Windows 3.1"
+msgstr "Win32 på Windows 3.1"
 
-#: ../src/msw/utils.cpp:1139
-#, c-format
-msgid "Windows 2000 (build %lu"
-msgstr "Windows 2000 (build %lu"
+#: ../src/msw/utils.cpp:1278
+#, fuzzy
+msgid "Windows 2000"
+msgstr "Windows 95"
+
+#: ../src/msw/utils.cpp:1310
+#, fuzzy
+msgid "Windows 7"
+msgstr "Windows 95"
 
-#: ../src/msw/utils.cpp:1104
+#: ../src/msw/utils.cpp:1242
 msgid "Windows 95"
 msgstr "Windows 95"
 
-#: ../src/msw/utils.cpp:1100
+#: ../src/msw/utils.cpp:1238
 msgid "Windows 95 OSR2"
 msgstr "Windows 95 OSR2"
 
-#: ../src/msw/utils.cpp:1115
+#: ../src/msw/utils.cpp:1253
 msgid "Windows 98"
 msgstr "Windows 98"
 
-#: ../src/msw/utils.cpp:1111
+#: ../src/msw/utils.cpp:1249
 msgid "Windows 98 SE"
 msgstr "Windows 98 SE"
 
-#: ../src/msw/utils.cpp:1122
+#: ../src/msw/utils.cpp:1260
 #, c-format
 msgid "Windows 9x (%d.%d)"
 msgstr "Windows 9x (%d.%d)"
 
-#: ../src/common/fmapbase.cpp:136
+#: ../src/common/fmapbase.cpp:176
 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows arabisk (CP 1256)"
 
-#: ../src/common/fmapbase.cpp:137
+#: ../src/common/fmapbase.cpp:177
 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows baltisk (CP 1257)"
 
-#: ../src/msw/utils.cpp:1084
+#: ../src/msw/utils.cpp:1222
 #, fuzzy, c-format
 msgid "Windows CE (%d.%d)"
 msgstr "Windows 9x (%d.%d)"
 
-#: ../src/common/fmapbase.cpp:130
+#: ../src/common/fmapbase.cpp:170
 msgid "Windows Central European (CP 1250)"
 msgstr "Windows sentraleuropeisk (CP 1250)"
 
-#: ../src/common/fmapbase.cpp:127
-msgid "Windows Chinese Simplified (CP 936)"
+#: ../src/common/fmapbase.cpp:167
+#, fuzzy
+msgid "Windows Chinese Simplified (CP 936) or GB-2312"
 msgstr "Windows kinesisk med enkle tegn (CP 936)"
 
-#: ../src/common/fmapbase.cpp:129
-msgid "Windows Chinese Traditional (CP 950)"
+#: ../src/common/fmapbase.cpp:169
+#, fuzzy
+msgid "Windows Chinese Traditional (CP 950) or Big-5"
 msgstr "Windows kinesisk (CP 950)"
 
-#: ../src/common/fmapbase.cpp:131
+#: ../src/common/fmapbase.cpp:171
 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows kyrillisk (CP 1251)"
 
-#: ../src/common/fmapbase.cpp:133
+#: ../src/common/fmapbase.cpp:173
 msgid "Windows Greek (CP 1253)"
 msgstr "Windows gresk (CP 1253)"
 
-#: ../src/common/fmapbase.cpp:135
+#: ../src/common/fmapbase.cpp:175
 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows hebraisk (CP 1255)"
 
-#: ../src/common/fmapbase.cpp:126
-msgid "Windows Japanese (CP 932)"
+#: ../src/common/fmapbase.cpp:166
+#, fuzzy
+msgid "Windows Japanese (CP 932) or Shift-JIS"
 msgstr "Windows japansk (CP 932)"
 
-#: ../src/common/fmapbase.cpp:128
+#: ../src/common/fmapbase.cpp:168
 msgid "Windows Korean (CP 949)"
 msgstr "Windows koreansk (CP 949)"
 
-#: ../src/msw/utils.cpp:1119
+#: ../src/msw/utils.cpp:1257
 msgid "Windows ME"
 msgstr "Windows ME"
 
-#: ../src/msw/utils.cpp:1154
-#, c-format
-msgid "Windows NT %lu.%lu (build %lu"
+#: ../src/msw/utils.cpp:1318
+#, fuzzy, c-format
+msgid "Windows NT %lu.%lu"
 msgstr "Windows NT %lu.%lu (build %lu"
 
-#: ../src/msw/utils.cpp:1147
-#, c-format
-msgid "Windows Server 2003 (build %lu"
+#: ../src/msw/utils.cpp:1287
+#, fuzzy
+msgid "Windows Server 2003"
+msgstr "Windows Server 2003 (build %lu"
+
+#: ../src/msw/utils.cpp:1303
+#, fuzzy
+msgid "Windows Server 2008"
+msgstr "Windows Server 2003 (build %lu"
+
+#: ../src/msw/utils.cpp:1309
+#, fuzzy
+msgid "Windows Server 2008 R2"
 msgstr "Windows Server 2003 (build %lu"
 
-#: ../src/common/fmapbase.cpp:125
+#: ../src/common/fmapbase.cpp:165
 #, fuzzy
 msgid "Windows Thai (CP 874)"
 msgstr "Windows baltisk (CP 1257)"
 
-#: ../src/common/fmapbase.cpp:134
+#: ../src/common/fmapbase.cpp:174
 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows tyrkisk (CP 1254)"
 
-#: ../src/common/fmapbase.cpp:132
+#: ../src/msw/utils.cpp:1304
+#, fuzzy
+msgid "Windows Vista"
+msgstr "Windows 95"
+
+#: ../src/common/fmapbase.cpp:172
 msgid "Windows Western European (CP 1252)"
 msgstr "Windows vesteuropeisk (CP 1252)"
 
-#: ../src/msw/utils.cpp:1143
-#, c-format
-msgid "Windows XP (build %lu"
-msgstr "Windows XP (build %lu"
+#: ../src/msw/utils.cpp:1293
+#, fuzzy
+msgid "Windows XP"
+msgstr "Windows 95"
 
-#: ../src/common/fmapbase.cpp:138
+#: ../src/common/fmapbase.cpp:178
 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 
-#: ../src/common/ffile.cpp:159
+#: ../src/common/fmapbase.cpp:164
+#, fuzzy
+msgid "Windows/DOS OEM Cyrillic (CP 866)"
+msgstr "Windows kyrillisk (CP 1251)"
+
+#: ../src/common/ffile.cpp:147
 #, c-format
 msgid "Write error on file '%s'"
-msgstr "Skrivefeil på fil «%s»"
+msgstr "Skrivefeil på fil «%s»"
 
-#: ../src/xml/xml.cpp:733
+#: ../src/xml/xml.cpp:837
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
-msgstr "XML tolkefeil: «%s» på linje %d"
+msgstr "XML tolkefeil: «%s» på linje %d"
 
-#: ../src/common/xpmdecod.cpp:798
+#: ../src/common/xpmdecod.cpp:797
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: Ugyldig pikseldata"
 
-#: ../src/common/xpmdecod.cpp:707
+#: ../src/common/xpmdecod.cpp:706
 #, fuzzy, c-format
 msgid "XPM: incorrect colour description in line %d"
-msgstr "XPM: Ugyldig fargedefinisjon «%s»!"
+msgstr "XPM: Ugyldig fargedefinisjon «%s»!"
 
-#: ../src/common/xpmdecod.cpp:682
+#: ../src/common/xpmdecod.cpp:681
 msgid "XPM: incorrect header format!"
 msgstr ""
 
-#: ../src/common/xpmdecod.cpp:718 ../src/common/xpmdecod.cpp:727
+#: ../src/common/xpmdecod.cpp:717 ../src/common/xpmdecod.cpp:726
 #, fuzzy, c-format
 msgid "XPM: malformed colour definition '%s' at line %d!"
-msgstr "XPM: Ugyldig fargedefinisjon «%s»!"
+msgstr "XPM: Ugyldig fargedefinisjon «%s»!"
 
-#: ../src/common/xpmdecod.cpp:757
+#: ../src/common/xpmdecod.cpp:756
 msgid "XPM: no colors left to use for mask!"
 msgstr ""
 
-#: ../src/common/xpmdecod.cpp:784
+#: ../src/common/xpmdecod.cpp:783
 #, c-format
 msgid "XPM: truncated image data at line %d!"
 msgstr ""
 
-#: ../src/xrc/xmlres.cpp:634
-#, c-format
-msgid "XRC resource '%s' (class '%s') not found!"
-msgstr "XRC-ressurs «%s» (klasse «%s») ikke funnet!"
-
-#: ../src/xrc/xmlres.cpp:1181 ../src/xrc/xmlres.cpp:1193
-#, fuzzy, c-format
-msgid "XRC resource: Cannot create animation from '%s'."
-msgstr "XRC-ressurs: Klarte opprette bitmap fra «%s»."
-
-#: ../src/xrc/xmlres.cpp:1149 ../src/xrc/xmlres.cpp:1161
-#, c-format
-msgid "XRC resource: Cannot create bitmap from '%s'."
-msgstr "XRC-ressurs: Klarte opprette bitmap fra «%s»."
-
-#: ../src/xrc/xmlres.cpp:1107
-#, fuzzy, c-format
-msgid "XRC resource: Incorrect colour specification '%s' for attribute '%s'."
-msgstr "XRC-ressurs: Ugyldig fargespesifikasjon «%s» for egenskap «%s»."
-
-#: ../src/motif/msgdlg.cpp:194 ../src/mac/carbon/msgdlg.cpp:35
+#: ../src/common/stockitem.cpp:207 ../src/motif/msgdlg.cpp:194
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/mac/carbon/overlay.cpp:158
+#: ../src/osx/carbon/overlay.cpp:156
 #, fuzzy
 msgid "You cannot Clear an overlay that is not inited"
 msgstr "Du kan ikke legge til en ny mappe i denne seksjonen."
 
-#: ../src/dfb/overlay.cpp:62 ../src/mac/carbon/overlay.cpp:110
+#: ../src/osx/carbon/overlay.cpp:108 ../src/dfb/overlay.cpp:62
 msgid "You cannot Init an overlay twice"
 msgstr ""
 
@@ -6292,89 +7703,104 @@ msgstr ""
 msgid "You cannot add a new directory to this section."
 msgstr "Du kan ikke legge til en ny mappe i denne seksjonen."
 
-#: ../src/common/stockitem.cpp:162
+#: ../src/propgrid/propgrid.cpp:3259
+msgid "You have entered invalid value. Press ESC to cancel editing."
+msgstr ""
+
+#: ../src/common/stockitem.cpp:210
 msgid "Zoom &In"
-msgstr "Vis &større"
+msgstr "Vis &større"
 
-#: ../src/common/stockitem.cpp:163
+#: ../src/common/stockitem.cpp:211
 msgid "Zoom &Out"
 msgstr "Vis &mindre"
 
-#: ../src/common/stockitem.cpp:161
+#: ../src/common/stockitem.cpp:210 ../src/common/prntbase.cpp:1539
+#, fuzzy
+msgid "Zoom In"
+msgstr "Vis &større"
+
+#: ../src/common/stockitem.cpp:211 ../src/common/prntbase.cpp:1525
+#, fuzzy
+msgid "Zoom Out"
+msgstr "Vis &mindre"
+
+#: ../src/common/stockitem.cpp:209
 msgid "Zoom to &Fit"
 msgstr "Tilpass til skjerm"
 
-#: ../src/common/docview.cpp:2174
-msgid "[EMPTY]"
-msgstr "[TOM]"
+#: ../src/common/stockitem.cpp:209
+#, fuzzy
+msgid "Zoom to Fit"
+msgstr "Tilpass til skjerm"
 
-#: ../src/msw/dde.cpp:1142
+#: ../src/msw/dde.cpp:1145
 msgid "a DDEML application has created a prolonged race condition."
-msgstr "et DDEML-program har skapt en prolongert kappløpsbetingelse."
+msgstr "et DDEML-program har skapt en prolongert kappløpsbetingelse."
 
-#: ../src/msw/dde.cpp:1130
+#: ../src/msw/dde.cpp:1133
 msgid ""
 "a DDEML function was called without first calling the DdeInitialize "
 "function,\n"
 "or an invalid instance identifier\n"
 "was passed to a DDEML function."
 msgstr ""
-"en DDEML-funksjon ble kalt uten at DdeInitialize-funksjonen ble kalt først,\n"
+"en DDEML-funksjon ble kalt uten at DdeInitialize-funksjonen ble kalt først,\n"
 "eller en ugyldig instanseindentifikator\n"
 "ble sendt til en DDEML-funksjon."
 
-#: ../src/msw/dde.cpp:1148
+#: ../src/msw/dde.cpp:1151
 msgid "a client's attempt to establish a conversation has failed."
-msgstr "en klients forsøk på å etablere en konversasjon feilet."
+msgstr "en klients forsøk på å etablere en konversasjon feilet."
 
-#: ../src/msw/dde.cpp:1145
+#: ../src/msw/dde.cpp:1148
 msgid "a memory allocation failed."
 msgstr "en minnereservasjon feilet."
 
-#: ../src/msw/dde.cpp:1139
+#: ../src/msw/dde.cpp:1142
 msgid "a parameter failed to be validated by the DDEML."
 msgstr "en parameter ble ikke validert av DDEML-en."
 
-#: ../src/msw/dde.cpp:1121
+#: ../src/msw/dde.cpp:1124
 msgid "a request for a synchronous advise transaction has timed out."
-msgstr "tidsavbrudd i en forespørsel etter synkron rådtransaksjon"
+msgstr "tidsavbrudd i en forespørsel etter synkron rådtransaksjon"
 
-#: ../src/msw/dde.cpp:1127
+#: ../src/msw/dde.cpp:1130
 msgid "a request for a synchronous data transaction has timed out."
-msgstr "tidsavbrudd i en forespørsel etter synkron datatransaksjon"
+msgstr "tidsavbrudd i en forespørsel etter synkron datatransaksjon"
 
-#: ../src/msw/dde.cpp:1136
+#: ../src/msw/dde.cpp:1139
 msgid "a request for a synchronous execute transaction has timed out."
-msgstr "en forespørsel om en synkron utførselstransaksjon har gått ut på tid."
+msgstr "en forespørsel om en synkron utførselstransaksjon har gått ut på tid."
 
-#: ../src/msw/dde.cpp:1154
+#: ../src/msw/dde.cpp:1157
 msgid "a request for a synchronous poke transaction has timed out."
-msgstr "en forespørsel om en asynkron «snuse»-transaksjon har gått ut på tid."
+msgstr "en forespørsel om en asynkron «snuse»-transaksjon har gått ut på tid."
 
-#: ../src/msw/dde.cpp:1169
+#: ../src/msw/dde.cpp:1172
 msgid "a request to end an advise transaction has timed out."
 msgstr ""
-"en forespørsel om å avslutte en rådgivningstransaksjon har gått ut på tid."
+"en forespørsel om å avslutte en rådgivningstransaksjon har gått ut på tid."
 
-#: ../src/msw/dde.cpp:1163
+#: ../src/msw/dde.cpp:1166
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
 "terminated before completing a transaction."
 msgstr ""
-"en tjenerside-transaksjon ble forsøkt på en samtale\n"
+"en tjenerside-transaksjon ble forsøkt på en samtale\n"
 "som ble avsluttet av klienten, eller tjeneren ble\n"
-"slått av før transaksjonen ble fullført."
+"slått av før transaksjonen ble fullført."
 
-#: ../src/msw/dde.cpp:1151
+#: ../src/msw/dde.cpp:1154
 msgid "a transaction failed."
 msgstr "en transaksjon feilet."
 
-#: ../src/common/accelcmn.cpp:179
+#: ../src/common/accelcmn.cpp:185
 msgid "alt"
 msgstr "alt"
 
-#: ../src/msw/dde.cpp:1133
+#: ../src/msw/dde.cpp:1136
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
@@ -6382,37 +7808,37 @@ msgid ""
 "attempted to perform server transactions."
 msgstr ""
 "et program initialisert som APPCLASS_MONITOR har\n"
-"prøvd å utføre en DDE-transaksjon,\n"
+"prøvd å utføre en DDE-transaksjon,\n"
 "eller et program initialisert som APPCMD_CLIENTONLY har\n"
-"prøvd å utføre tjenertransaksjoner."
+"prøvd å utføre tjenertransaksjoner."
 
-#: ../src/msw/dde.cpp:1157
+#: ../src/msw/dde.cpp:1160
 msgid "an internal call to the PostMessage function has failed. "
 msgstr "Et internt kall til PostMessage-funksjonen feilet."
 
-#: ../src/msw/dde.cpp:1166
+#: ../src/msw/dde.cpp:1169
 msgid "an internal error has occurred in the DDEML."
-msgstr "En intern feil har oppstått i DDEML-en."
+msgstr "En intern feil har oppstått i DDEML-en."
 
-#: ../src/msw/dde.cpp:1172
+#: ../src/msw/dde.cpp:1175
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
 "the transaction identifier for that callback is no longer valid."
 msgstr ""
 "en ugyldig transaksjonsidentifikator ble sendt til en DDEML-funksjon.\n"
-"Når programmet har returnert fra et XTYP_XACT_COMPLETE-tilbakekall,\n"
-"så vil ikke transaksjonsidentifikatoren for det tilbakekallet lenger være "
+"Når programmet har returnert fra et XTYP_XACT_COMPLETE-tilbakekall,\n"
+"så vil ikke transaksjonsidentifikatoren for det tilbakekallet lenger være "
 "gyldig."
 
-#: ../src/common/zipstrm.cpp:1272
+#: ../src/common/zipstrm.cpp:1273
 msgid "assuming this is a multi-part zip concatenated"
-msgstr "antar dette er en mangedelt zip-fil slått sammen"
+msgstr "antar dette er en mangedelt zip-fil slått sammen"
 
-#: ../src/common/fileconf.cpp:1871
+#: ../src/common/fileconf.cpp:1878
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
-msgstr "forsøk på å endre uforanderlig nøkkel «%s» ignorert."
+msgstr "forsøk på å endre uforanderlig nøkkel «%s» ignorert."
 
 #: ../src/html/chm.cpp:330
 msgid "bad arguments to library function"
@@ -6422,158 +7848,184 @@ msgstr "ugyldig argument til biblioteksfunksjon"
 msgid "bad signature"
 msgstr "ugyldig signatur"
 
-#: ../src/common/zipstrm.cpp:1714
+#: ../src/common/zipstrm.cpp:1716
 msgid "bad zipfile offset to entry"
-msgstr "ugylidg zipfil forskyvning til oppføring"
+msgstr "ugylidg zipfil forskyvning til oppføring"
 
-#: ../src/common/ftp.cpp:382
+#: ../src/common/ftp.cpp:408
 msgid "binary"
-msgstr "binært"
+msgstr "binært"
 
-#: ../src/common/fontcmn.cpp:697
+#: ../src/common/fontcmn.cpp:979
 msgid "bold"
 msgstr "fet"
 
-#: ../src/os2/iniconf.cpp:458
+#: ../src/os2/iniconf.cpp:464
 msgid "buffer is too small for Windows directory."
 msgstr ""
 
-#: ../src/common/ffile.cpp:92
+#: ../src/msw/utils.cpp:1324
+#, fuzzy, c-format
+msgid "build %lu"
+msgstr "Windows XP (build %lu"
+
+#: ../src/common/ffile.cpp:80
 #, c-format
 msgid "can't close file '%s'"
-msgstr "klarte ikke lukke fil «%s»"
+msgstr "klarte ikke lukke fil «%s»"
 
-#: ../src/common/file.cpp:261
+#: ../src/common/file.cpp:279
 #, c-format
 msgid "can't close file descriptor %d"
 msgstr "klarte ikke lukke fildeskriptor %d"
 
-#: ../src/common/file.cpp:537
+#: ../src/common/file.cpp:577
 #, c-format
 msgid "can't commit changes to file '%s'"
-msgstr "klarte ikke utføre endringene på filen «%s»"
+msgstr "klarte ikke utføre endringene på filen «%s»"
 
-#: ../src/common/file.cpp:195
+#: ../src/common/file.cpp:213
 #, c-format
 msgid "can't create file '%s'"
-msgstr "klarte ikke opprette fil «%s»"
+msgstr "klarte ikke opprette fil «%s»"
 
-#: ../src/common/fileconf.cpp:1170
+#: ../src/common/fileconf.cpp:1177
 #, c-format
 msgid "can't delete user configuration file '%s'"
-msgstr "klarte ikke slette file «%s» for brukerkonfigurasjon"
+msgstr "klarte ikke slette file «%s» for brukerkonfigurasjon"
 
-#: ../src/common/file.cpp:443
+#: ../src/common/file.cpp:480
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
-msgstr "klarte ikke avgjøre om slutten på filen er nådd for deskriptor %d "
+msgstr "klarte ikke avgjøre om slutten på filen er nådd for deskriptor %d "
 
-#: ../src/msdos/utilsdos.cpp:310 ../src/msdos/utilsdos.cpp:469
+#: ../src/msdos/utilsdos.cpp:311 ../src/msdos/utilsdos.cpp:476
 #, fuzzy, c-format
 msgid "can't execute '%s'"
-msgstr "Klarte ikke utføre «%s»\n"
+msgstr "Klarte ikke utføre «%s»\n"
 
-#: ../src/common/zipstrm.cpp:1489
+#: ../src/common/zipstrm.cpp:1491
 msgid "can't find central directory in zip"
 msgstr "Klarte ikke finne zip-sentralmappe"
 
-#: ../src/common/file.cpp:413
+#: ../src/common/file.cpp:450
 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "klarte ikke finne lengde av filen med deskriptor %d"
 
-#: ../src/msw/utils.cpp:393
+#: ../src/msw/utils.cpp:376
 msgid "can't find user's HOME, using current directory."
 msgstr "klarte ikke finne brukerens HOME, bruker gjeldende katalog."
 
-#: ../src/common/file.cpp:329
+#: ../src/common/file.cpp:351
 #, c-format
 msgid "can't flush file descriptor %d"
-msgstr "klarte ikke tømme fildeskriptor %d"
+msgstr "klarte ikke tømme fildeskriptor %d"
 
-#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:199
+#: ../src/common/file.cpp:407 ../src/msw/wince/filefnwce.cpp:199
 #, c-format
 msgid "can't get seek position on file descriptor %d"
-msgstr "klarte ikke finne søkeposisjon på fildeskriptor %d"
+msgstr "klarte ikke finne søkeposisjon på fildeskriptor %d"
 
-#: ../src/common/fontmap.cpp:323
+#: ../src/common/fontmap.cpp:324
 msgid "can't load any font, aborting"
 msgstr "klarte ikke laste noe skrifter, avbryter"
 
-#: ../src/common/file.cpp:247 ../src/common/ffile.cpp:76
+#: ../src/common/file.cpp:265 ../src/common/ffile.cpp:64
 #, c-format
 msgid "can't open file '%s'"
-msgstr "klarte ikke åpne fil «%s»"
+msgstr "klarte ikke åpne fil «%s»"
 
-#: ../src/common/fileconf.cpp:357
+#: ../src/common/fileconf.cpp:352
 #, c-format
 msgid "can't open global configuration file '%s'."
-msgstr "klarte ikke åpne global konfigurasjonsfil «%s»."
+msgstr "klarte ikke åpne global konfigurasjonsfil «%s»."
 
-#: ../src/common/fileconf.cpp:373
+#: ../src/common/fileconf.cpp:368
 #, c-format
 msgid "can't open user configuration file '%s'."
-msgstr "klarte ikke åpne bruker konfigurasjonsfil «%s»."
+msgstr "klarte ikke åpne bruker konfigurasjonsfil «%s»."
 
-#: ../src/common/fileconf.cpp:1011
+#: ../src/common/fileconf.cpp:1018
 msgid "can't open user configuration file."
-msgstr "klarte ikke åpne bruker konfigurasjonsfil."
+msgstr "klarte ikke åpne bruker konfigurasjonsfil."
 
 #: ../src/common/zipstrm.cpp:528
 msgid "can't re-initialize zlib deflate stream"
-msgstr "Klarte ikke klargjøre zlib-strøm for nedpakking."
+msgstr "Klarte ikke klargjøre zlib-strøm for nedpakking."
 
 #: ../src/common/zipstrm.cpp:553
 msgid "can't re-initialize zlib inflate stream"
-msgstr "Klarte ikke klargjøre zlib-strøm for utpakking."
+msgstr "Klarte ikke klargjøre zlib-strøm for utpakking."
 
-#: ../src/common/file.cpp:285
+#: ../src/common/file.cpp:303
 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr "klarte ikke lese fra fildeskriptor %d"
 
-#: ../src/common/file.cpp:532
+#: ../src/common/file.cpp:572
 #, c-format
 msgid "can't remove file '%s'"
-msgstr "klarte ikke slette fil «%s»"
+msgstr "klarte ikke slette fil «%s»"
 
-#: ../src/common/file.cpp:548
+#: ../src/common/file.cpp:589
 #, c-format
 msgid "can't remove temporary file '%s'"
-msgstr "klarte ikke slette midlertidig fil «%s»"
+msgstr "klarte ikke slette midlertidig fil «%s»"
 
-#: ../src/common/file.cpp:371 ../src/msw/wince/filefnwce.cpp:185
+#: ../src/common/file.cpp:393 ../src/msw/wince/filefnwce.cpp:185
 #, c-format
 msgid "can't seek on file descriptor %d"
-msgstr "klarte ikke søke på fildeskriptor %d"
+msgstr "klarte ikke søke på fildeskriptor %d"
 
-#: ../src/common/textfile.cpp:275
+#: ../src/common/textfile.cpp:300
 #, c-format
 msgid "can't write buffer '%s' to disk."
-msgstr "klarte ikke skriver buffer «%s» til disk."
+msgstr "klarte ikke skriver buffer «%s» til disk."
 
-#: ../src/common/file.cpp:301
+#: ../src/common/file.cpp:319
 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr "klarte ikke skrive til deskriptor %d"
 
-#: ../src/common/fileconf.cpp:1025
+#: ../src/common/fileconf.cpp:1032
 msgid "can't write user configuration file."
 msgstr "klarte ikke skrive til bruker konfigurasjonsfil."
 
-#: ../src/common/intl.cpp:1226
-#, c-format
-msgid "catalog file for domain '%s' not found."
-msgstr "katalogfil for domene «%s» ikke funnet."
-
 #: ../src/html/chm.cpp:346
 msgid "checksum error"
 msgstr "kontrollsumfeil"
 
-#: ../src/common/tarstrm.cpp:819
+#: ../src/common/tarstrm.cpp:821
 msgid "checksum failure reading tar header block"
 msgstr ""
 
+#: ../src/richtext/richtextborderspage.cpp:280
+#: ../src/richtext/richtextborderspage.cpp:310
+#: ../src/richtext/richtextborderspage.cpp:340
+#: ../src/richtext/richtextborderspage.cpp:370
+#: ../src/richtext/richtextborderspage.cpp:424
+#: ../src/richtext/richtextborderspage.cpp:454
+#: ../src/richtext/richtextborderspage.cpp:484
+#: ../src/richtext/richtextborderspage.cpp:514
+#: ../src/richtext/richtextmarginspage.cpp:202
+#: ../src/richtext/richtextmarginspage.cpp:227
+#: ../src/richtext/richtextmarginspage.cpp:250
+#: ../src/richtext/richtextmarginspage.cpp:275
+#: ../src/richtext/richtextmarginspage.cpp:316
+#: ../src/richtext/richtextmarginspage.cpp:341
+#: ../src/richtext/richtextmarginspage.cpp:364
+#: ../src/richtext/richtextmarginspage.cpp:389
+#: ../src/richtext/richtextsizepage.cpp:246
+#: ../src/richtext/richtextsizepage.cpp:273
+#: ../src/richtext/richtextsizepage.cpp:300
+#: ../src/richtext/richtextsizepage.cpp:327
+#: ../src/richtext/richtextsizepage.cpp:354
+#: ../src/richtext/richtextsizepage.cpp:381
+#: ../src/richtext/richtextsizepage.cpp:466
+msgid "cm"
+msgstr ""
+
 #: ../src/html/chm.cpp:348
 msgid "compression error"
 msgstr "kompresjonsfeil"
@@ -6582,11 +8034,11 @@ msgstr "kompresjonsfeil"
 msgid "conversion to 8-bit encoding failed"
 msgstr "konvertering til 8-bit koding feilet"
 
-#: ../src/common/accelcmn.cpp:177
+#: ../src/common/accelcmn.cpp:183
 msgid "ctrl"
 msgstr "ctrl"
 
-#: ../src/common/cmdline.cpp:1182
+#: ../src/common/cmdline.cpp:1316
 msgid "date"
 msgstr "dato"
 
@@ -6594,198 +8046,179 @@ msgstr "dato"
 msgid "decompression error"
 msgstr "feil ved utpakking"
 
-#: ../src/common/fmapbase.cpp:685
+#: ../src/richtext/richtextstyles.cpp:759 ../src/common/fmapbase.cpp:807
 msgid "default"
 msgstr "standard"
 
-#: ../src/common/xtistrm.cpp:839
-msgid "delegate has no type info"
-msgstr "delegat har ingen typeinformasjon"
-
-#: ../src/common/cmdline.cpp:1178
+#: ../src/common/cmdline.cpp:1312
 msgid "double"
 msgstr ""
 
-#: ../src/common/debugrpt.cpp:530
+#: ../src/common/debugrpt.cpp:534
 msgid "dump of the process state (binary)"
-msgstr "dump av prosesstilstanden (binært)"
+msgstr "dump av prosesstilstanden (binært)"
 
-#: ../src/common/datetime.cpp:4009
+#: ../src/common/datetimefmt.cpp:1848
 msgid "eighteenth"
 msgstr "attende"
 
-#: ../src/common/datetime.cpp:3999
+#: ../src/common/datetimefmt.cpp:1838
 msgid "eighth"
-msgstr "åttende"
+msgstr "åttende"
 
-#: ../src/common/datetime.cpp:4002
+#: ../src/common/datetimefmt.cpp:1841
 msgid "eleventh"
 msgstr "ellevte"
 
-#: ../src/common/strconv.cpp:2981
-#, fuzzy, c-format
-msgid "encoding %i"
-msgstr "koding %s"
-
-#: ../src/common/fileconf.cpp:1857
+#: ../src/common/fileconf.cpp:1864
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
-msgstr "oppføring «%s» forekommer mer enn en gang i gruppen «%s»"
+msgstr "oppføring «%s» forekommer mer enn en gang i gruppen «%s»"
 
 #: ../src/html/chm.cpp:344
 msgid "error in data format"
 msgstr "feil i dataformat"
 
-#: ../src/msdos/utilsdos.cpp:410
+#: ../src/msdos/utilsdos.cpp:414
 #, fuzzy, c-format
 msgid "error opening '%s'"
-msgstr "feil ved åpning av fil"
+msgstr "feil ved åpning av fil"
 
 #: ../src/html/chm.cpp:332
 msgid "error opening file"
-msgstr "feil ved åpning av fil"
+msgstr "feil ved åpning av fil"
 
-#: ../src/common/zipstrm.cpp:1575
+#: ../src/common/zipstrm.cpp:1577
 msgid "error reading zip central directory"
 msgstr "Feil ved lesing av zip-sentralmappe"
 
-#: ../src/common/zipstrm.cpp:1666
+#: ../src/common/zipstrm.cpp:1668
 msgid "error reading zip local header"
 msgstr "feil ved lesing av lokalt zip-hode "
 
-#: ../src/common/zipstrm.cpp:2389
+#: ../src/common/zipstrm.cpp:2397
 #, c-format
 msgid "error writing zip entry '%s': bad crc or length"
-msgstr "feil ved skriving av zip-oppføring «%s»: feil crc eller lengde"
+msgstr "feil ved skriving av zip-oppføring «%s»: feil crc eller lengde"
 
-#: ../src/common/ffile.cpp:181
+#: ../src/common/ffile.cpp:169
 #, c-format
 msgid "failed to flush the file '%s'"
-msgstr "klarte ikke tømme filen «%s»"
+msgstr "klarte ikke tømme filen «%s»"
 
-#: ../src/common/datetime.cpp:4006
+#: ../src/common/datetimefmt.cpp:1845
 msgid "fifteenth"
 msgstr "femtende"
 
-#: ../src/common/datetime.cpp:3996
+#: ../src/common/datetimefmt.cpp:1835
 msgid "fifth"
 msgstr "femte"
 
-#: ../src/common/fileconf.cpp:613
+#: ../src/common/fileconf.cpp:611
 #, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
-msgstr "fil «%s», linje %d: «%s» ignorert etter gruppehode."
+msgstr "fil «%s», linje %d: «%s» ignorert etter gruppehode."
 
-#: ../src/common/fileconf.cpp:642
+#: ../src/common/fileconf.cpp:640
 #, c-format
 msgid "file '%s', line %d: '=' expected."
-msgstr "fil «%s», linje %d: «=» forventet."
+msgstr "fil «%s», linje %d: «=» forventet."
 
-#: ../src/common/fileconf.cpp:665
+#: ../src/common/fileconf.cpp:663
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
-msgstr "file «%s», linje %d: nøkkel «%s» ble først funnet på linje %d."
+msgstr "file «%s», linje %d: nøkkel «%s» ble først funnet på linje %d."
 
-#: ../src/common/fileconf.cpp:655
+#: ../src/common/fileconf.cpp:653
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
-msgstr "file «%s», linje %d: verdi for uforanderlig nøkkel «%s» ignorert."
+msgstr "file «%s», linje %d: verdi for uforanderlig nøkkel «%s» ignorert."
 
-#: ../src/common/fileconf.cpp:577
+#: ../src/common/fileconf.cpp:575
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
-msgstr "fil «%s»: uventet tegn %c på linje %d."
+msgstr "fil «%s»: uventet tegn %c på linje %d."
 
-#: ../src/richtext/richtextbuffer.cpp:5847
+#: ../src/richtext/richtextbuffer.cpp:7651
 #, fuzzy
 msgid "files"
 msgstr "Fil"
 
-#: ../src/common/datetime.cpp:3992
+#: ../src/common/datetimefmt.cpp:1831
 msgid "first"
-msgstr "først"
+msgstr "først"
 
-#: ../src/html/helpwnd.cpp:1260
+#: ../src/html/helpwnd.cpp:1262
 msgid "font size"
-msgstr "skriftstørrelse"
+msgstr "skriftstørrelse"
 
-#: ../src/common/datetime.cpp:4005
+#: ../src/common/datetimefmt.cpp:1844
 msgid "fourteenth"
 msgstr "fjortende"
 
-#: ../src/common/datetime.cpp:3995
+#: ../src/common/datetimefmt.cpp:1834
 msgid "fourth"
 msgstr "fjedre"
 
-#: ../src/common/appbase.cpp:491
+#: ../src/common/appbase.cpp:679
 msgid "generate verbose log messages"
 msgstr "generer ordrike loggmeldinger"
 
-#: ../src/richtext/richtextbuffer.cpp:7194
-#: ../src/richtext/richtextbuffer.cpp:7234
-#: ../src/richtext/richtextbuffer.cpp:7305
+#: ../src/richtext/richtextbuffer.cpp:10527
+#: ../src/richtext/richtextbuffer.cpp:10637
 msgid "image"
 msgstr ""
 
-#: ../src/common/tarstrm.cpp:796
+#: ../src/common/tarstrm.cpp:797
 msgid "incomplete header block in tar"
 msgstr ""
 
-#: ../src/common/xtixml.cpp:476
+#: ../src/common/xtixml.cpp:490
 msgid "incorrect event handler string, missing dot"
 msgstr "ugyldig hendelsebehandlerstreng, mangler punktum"
 
-#: ../src/common/tarstrm.cpp:1373
+#: ../src/common/tarstrm.cpp:1382
 msgid "incorrect size given for tar entry"
 msgstr ""
 
-#: ../src/common/tarstrm.cpp:992
+#: ../src/common/tarstrm.cpp:994
 msgid "invalid data in extended tar header"
 msgstr ""
 
-#: ../src/generic/logg.cpp:1103
+#: ../src/generic/logg.cpp:1052
 msgid "invalid message box return value"
 msgstr "ugyldig meldingsboks returverdi"
 
-#: ../src/common/zipstrm.cpp:1444
+#: ../src/common/zipstrm.cpp:1446
 msgid "invalid zip file"
 msgstr "ugyldig zipfil"
 
-#: ../src/common/fontcmn.cpp:702
+#: ../src/common/fontcmn.cpp:984
 msgid "italic"
 msgstr "kursiv"
 
-#: ../src/common/fontcmn.cpp:692
+#: ../src/common/fontcmn.cpp:974
 msgid "light"
 msgstr "lett"
 
-#: ../src/common/intl.cpp:1645
+#: ../src/common/intl.cpp:296
 #, c-format
 msgid "locale '%s' cannot be set."
-msgstr "klarte ikke sette lokale «%s»."
-
-#: ../src/common/intl.cpp:1210
-#, c-format
-msgid "looking for catalog '%s' in path '%s'."
-msgstr "leter etter katalog «%s» i stien «%s»."
-
-#: ../src/mac/carbon/dataview.cpp:1048 ../src/mac/carbon/dataview.cpp:1168
-msgid "m_peer is not or incorrectly initialized"
-msgstr ""
+msgstr "klarte ikke sette lokale «%s»."
 
-#: ../src/common/datetime.cpp:4164
+#: ../src/common/datetimefmt.cpp:1984
 msgid "midnight"
 msgstr "midnatt"
 
-#: ../src/common/datetime.cpp:4010
+#: ../src/common/datetimefmt.cpp:1849
 msgid "nineteenth"
 msgstr "nittende"
 
-#: ../src/common/datetime.cpp:4000
+#: ../src/common/datetimefmt.cpp:1839
 msgid "ninth"
 msgstr "niende"
 
-#: ../src/msw/dde.cpp:1117
+#: ../src/msw/dde.cpp:1120
 msgid "no DDE error."
 msgstr "ingen DDE-feil"
 
@@ -6793,28 +8226,33 @@ msgstr "ingen DDE-feil"
 msgid "no error"
 msgstr "ingen feil"
 
-#: ../src/dfb/fontmgr.cpp:178
+#: ../src/dfb/fontmgr.cpp:175
 #, c-format
 msgid "no fonts found in %s, using builtin font"
 msgstr ""
 
-#: ../src/html/htmlhelp.cpp:201 ../src/html/helpdata.cpp:648
+#: ../src/html/helpdata.cpp:641
 msgid "noname"
 msgstr "ikke navn"
 
-#: ../src/common/datetime.cpp:4163
+#: ../src/common/datetimefmt.cpp:1983
 msgid "noon"
 msgstr "middag"
 
-#: ../src/gtk/print.cpp:1165 ../src/gtk/print.cpp:1269
+#: ../src/richtext/richtextstyles.cpp:758
+#, fuzzy
+msgid "normal"
+msgstr "Normal"
+
+#: ../src/gtk/print.cpp:1215 ../src/gtk/print.cpp:1320
 msgid "not implemented"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:1174
+#: ../src/common/cmdline.cpp:1308
 msgid "num"
 msgstr "nummer"
 
-#: ../src/common/xtixml.cpp:255
+#: ../src/common/xtixml.cpp:260
 msgid "objects cannot have XML Text Nodes"
 msgstr "objekter kan ikke ha XML-tekstnoder"
 
@@ -6822,147 +8260,252 @@ msgstr "objekter kan ikke ha XML-tekstnoder"
 msgid "out of memory"
 msgstr "tom for minne"
 
-#: ../src/common/debugrpt.cpp:506
+#: ../src/richtext/richtextsizepage.cpp:247
+#: ../src/richtext/richtextsizepage.cpp:274
+#: ../src/richtext/richtextsizepage.cpp:301
+#: ../src/richtext/richtextsizepage.cpp:328
+#: ../src/richtext/richtextsizepage.cpp:355
+#: ../src/richtext/richtextsizepage.cpp:382
+msgid "percent"
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:510
 msgid "process context description"
 msgstr "beskrivelse av prosesskonteksten"
 
+#: ../src/richtext/richtextborderspage.cpp:279
+#: ../src/richtext/richtextborderspage.cpp:281
+#: ../src/richtext/richtextborderspage.cpp:282
+#: ../src/richtext/richtextborderspage.cpp:309
+#: ../src/richtext/richtextborderspage.cpp:311
+#: ../src/richtext/richtextborderspage.cpp:312
+#: ../src/richtext/richtextborderspage.cpp:339
+#: ../src/richtext/richtextborderspage.cpp:341
+#: ../src/richtext/richtextborderspage.cpp:342
+#: ../src/richtext/richtextborderspage.cpp:369
+#: ../src/richtext/richtextborderspage.cpp:371
+#: ../src/richtext/richtextborderspage.cpp:372
+#: ../src/richtext/richtextborderspage.cpp:423
+#: ../src/richtext/richtextborderspage.cpp:425
+#: ../src/richtext/richtextborderspage.cpp:426
+#: ../src/richtext/richtextborderspage.cpp:453
+#: ../src/richtext/richtextborderspage.cpp:455
+#: ../src/richtext/richtextborderspage.cpp:456
+#: ../src/richtext/richtextborderspage.cpp:483
+#: ../src/richtext/richtextborderspage.cpp:485
+#: ../src/richtext/richtextborderspage.cpp:486
+#: ../src/richtext/richtextborderspage.cpp:513
+#: ../src/richtext/richtextborderspage.cpp:515
+#: ../src/richtext/richtextborderspage.cpp:516
+#: ../src/richtext/richtextmarginspage.cpp:201
+#: ../src/richtext/richtextmarginspage.cpp:203
+#: ../src/richtext/richtextmarginspage.cpp:204
+#: ../src/richtext/richtextmarginspage.cpp:226
+#: ../src/richtext/richtextmarginspage.cpp:228
+#: ../src/richtext/richtextmarginspage.cpp:229
+#: ../src/richtext/richtextmarginspage.cpp:249
+#: ../src/richtext/richtextmarginspage.cpp:251
+#: ../src/richtext/richtextmarginspage.cpp:252
+#: ../src/richtext/richtextmarginspage.cpp:274
+#: ../src/richtext/richtextmarginspage.cpp:276
+#: ../src/richtext/richtextmarginspage.cpp:277
+#: ../src/richtext/richtextmarginspage.cpp:315
+#: ../src/richtext/richtextmarginspage.cpp:317
+#: ../src/richtext/richtextmarginspage.cpp:318
+#: ../src/richtext/richtextmarginspage.cpp:340
+#: ../src/richtext/richtextmarginspage.cpp:342
+#: ../src/richtext/richtextmarginspage.cpp:343
+#: ../src/richtext/richtextmarginspage.cpp:363
+#: ../src/richtext/richtextmarginspage.cpp:365
+#: ../src/richtext/richtextmarginspage.cpp:366
+#: ../src/richtext/richtextmarginspage.cpp:388
+#: ../src/richtext/richtextmarginspage.cpp:390
+#: ../src/richtext/richtextmarginspage.cpp:391
+#: ../src/richtext/richtextsizepage.cpp:245
+#: ../src/richtext/richtextsizepage.cpp:248
+#: ../src/richtext/richtextsizepage.cpp:249
+#: ../src/richtext/richtextsizepage.cpp:272
+#: ../src/richtext/richtextsizepage.cpp:275
+#: ../src/richtext/richtextsizepage.cpp:276
+#: ../src/richtext/richtextsizepage.cpp:299
+#: ../src/richtext/richtextsizepage.cpp:302
+#: ../src/richtext/richtextsizepage.cpp:303
+#: ../src/richtext/richtextsizepage.cpp:326
+#: ../src/richtext/richtextsizepage.cpp:329
+#: ../src/richtext/richtextsizepage.cpp:330
+#: ../src/richtext/richtextsizepage.cpp:353
+#: ../src/richtext/richtextsizepage.cpp:356
+#: ../src/richtext/richtextsizepage.cpp:357
+#: ../src/richtext/richtextsizepage.cpp:380
+#: ../src/richtext/richtextsizepage.cpp:383
+#: ../src/richtext/richtextsizepage.cpp:384
+#: ../src/richtext/richtextsizepage.cpp:465
+#: ../src/richtext/richtextsizepage.cpp:467
+#: ../src/richtext/richtextsizepage.cpp:468
+msgid "px"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:189
+#, fuzzy
+msgid "rawctrl"
+msgstr "ctrl"
+
 #: ../src/html/chm.cpp:334
 msgid "read error"
 msgstr "lesefeil"
 
-#: ../src/common/zipstrm.cpp:1878
+#: ../src/common/zipstrm.cpp:1883
 #, c-format
 msgid "reading zip stream (entry %s): bad crc"
-msgstr "leser zip-strøm (oppføring %s): feil crc"
+msgstr "leser zip-strøm (oppføring %s): feil crc"
 
-#: ../src/common/zipstrm.cpp:1875
+#: ../src/common/zipstrm.cpp:1878
 #, c-format
 msgid "reading zip stream (entry %s): bad length"
-msgstr "leser zip-strøm (oppføring %s): feil lengde"
+msgstr "leser zip-strøm (oppføring %s): feil lengde"
 
-#: ../src/msw/dde.cpp:1160
+#: ../src/msw/dde.cpp:1163
 msgid "reentrancy problem."
 msgstr "gjeninngangsproblem."
 
-#: ../src/common/datetime.cpp:3993
+#: ../src/common/datetimefmt.cpp:1832
 msgid "second"
 msgstr "andre"
 
 #: ../src/html/chm.cpp:338
 msgid "seek error"
-msgstr "søkefeil"
+msgstr "søkefeil"
 
-#: ../src/common/datetime.cpp:4008
+#: ../src/common/datetimefmt.cpp:1847
 msgid "seventeenth"
 msgstr "syttende"
 
-#: ../src/common/datetime.cpp:3998
+#: ../src/common/datetimefmt.cpp:1837
 msgid "seventh"
 msgstr "sjuende"
 
-#: ../src/common/accelcmn.cpp:181
+#: ../src/common/accelcmn.cpp:187
 msgid "shift"
 msgstr "shift"
 
-#: ../src/common/appbase.cpp:481
+#: ../src/common/appbase.cpp:669
 msgid "show this help message"
 msgstr "vis denne hjelpmeldingen"
 
-#: ../src/common/datetime.cpp:4007
+#: ../src/common/datetimefmt.cpp:1846
 msgid "sixteenth"
 msgstr "sekstende"
 
-#: ../src/common/datetime.cpp:3997
+#: ../src/common/datetimefmt.cpp:1836
 msgid "sixth"
 msgstr "sjette"
 
-#: ../src/common/appcmn.cpp:215
+#: ../src/common/appcmn.cpp:207
 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr "oppgi skjermmodus som skal brukes (f.eks. 640x480-16)"
 
-#: ../src/common/appcmn.cpp:201
+#: ../src/common/appcmn.cpp:193
 msgid "specify the theme to use"
 msgstr "oppgi temaet som skal bruker"
 
-#: ../src/common/zipstrm.cpp:1781
+#: ../src/richtext/richtextbuffer.cpp:8151
+msgid "standard/circle"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:8152
+msgid "standard/circle-outline"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:8154
+msgid "standard/diamond"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:8153
+msgid "standard/square"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:8155
+msgid "standard/triangle"
+msgstr ""
+
+#: ../src/common/zipstrm.cpp:1783
 msgid "stored file length not in Zip header"
 msgstr "lagret fillengde ikke funnet i Zip-hode"
 
-#: ../src/common/cmdline.cpp:1170
+#: ../src/common/cmdline.cpp:1304
 msgid "str"
 msgstr "str"
 
-#: ../src/common/tarstrm.cpp:1002 ../src/common/tarstrm.cpp:1024
-#: ../src/common/tarstrm.cpp:1499 ../src/common/tarstrm.cpp:1521
+#: ../src/common/fontcmn.cpp:795 ../src/common/fontcmn.cpp:970
+msgid "strikethrough"
+msgstr ""
+
+#: ../src/common/tarstrm.cpp:1004 ../src/common/tarstrm.cpp:1026
+#: ../src/common/tarstrm.cpp:1508 ../src/common/tarstrm.cpp:1530
 msgid "tar entry not open"
 msgstr ""
 
-#: ../src/common/datetime.cpp:4001
+#: ../src/common/datetimefmt.cpp:1840
 msgid "tenth"
 msgstr "tiende"
 
-#: ../src/msw/dde.cpp:1124
+#: ../src/msw/dde.cpp:1127
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
-msgstr "svaret på transaksjonen gjorde at DDE_FBUSY-biten ble satt."
+msgstr "svaret på transaksjonen gjorde at DDE_FBUSY-biten ble satt."
 
-#: ../src/common/datetime.cpp:3994
+#: ../src/common/datetimefmt.cpp:1833
 msgid "third"
 msgstr "tredje"
 
-#: ../src/common/datetime.cpp:4004
+#: ../src/common/datetimefmt.cpp:1843
 msgid "thirteenth"
 msgstr "trettende"
 
-#: ../src/common/imagtiff.cpp:73 ../src/common/imagtiff.cpp:89
-#, c-format
-msgid "tiff module: %s"
-msgstr "TIFF-modul: %s"
-
-#: ../src/common/datetime.cpp:3813
+#: ../src/common/datetimefmt.cpp:1637
 msgid "today"
 msgstr "i dag"
 
-#: ../src/common/datetime.cpp:3815
+#: ../src/common/datetimefmt.cpp:1639
 msgid "tomorrow"
 msgstr "i morgen"
 
-#: ../src/common/fileconf.cpp:1968
+#: ../src/common/fileconf.cpp:1975
 #, c-format
 msgid "trailing backslash ignored in '%s'"
 msgstr ""
 
-#: ../src/gtk/aboutdlg.cpp:190
+#: ../src/gtk/aboutdlg.cpp:198
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/common/datetime.cpp:4003
+#: ../src/common/datetimefmt.cpp:1842
 msgid "twelfth"
 msgstr "tolvte"
 
-#: ../src/common/datetime.cpp:4011
+#: ../src/common/datetimefmt.cpp:1850
 msgid "twentieth"
 msgstr "tjuende"
 
-#: ../src/common/fontcmn.cpp:603 ../src/common/fontcmn.cpp:688
+#: ../src/common/fontcmn.cpp:790 ../src/common/fontcmn.cpp:966
 msgid "underlined"
 msgstr "understreket"
 
-#: ../src/common/fileconf.cpp:2003
+#: ../src/common/fileconf.cpp:2010
 #, c-format
 msgid "unexpected \" at position %d in '%s'."
-msgstr "uventet \" i posisjon %d i «%s»."
+msgstr "uventet \" i posisjon %d i «%s»."
 
-#: ../src/common/tarstrm.cpp:1043
+#: ../src/common/tarstrm.cpp:1046
 #, fuzzy
 msgid "unexpected end of file"
-msgstr "Uventet slutt på filen under tolking av ressurs."
+msgstr "Uventet slutt på filen under tolking av ressurs."
 
-#: ../src/common/tarstrm.cpp:372 ../src/common/tarstrm.cpp:395
-#: ../src/common/tarstrm.cpp:426 ../src/generic/progdlgg.cpp:294
+#: ../src/generic/progdlgg.cpp:400 ../src/common/tarstrm.cpp:372
+#: ../src/common/tarstrm.cpp:395 ../src/common/tarstrm.cpp:426
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../src/common/xtixml.cpp:249
+#: ../src/common/xtixml.cpp:254
 #, c-format
 msgid "unknown class %s"
 msgstr "ukjent klasse %s"
@@ -6971,101 +8514,343 @@ msgstr "ukjent klasse %s"
 msgid "unknown error"
 msgstr "ukjent feil "
 
-#: ../src/msw/dialup.cpp:493
+#: ../src/msw/dialup.cpp:491
 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr "ukjent feil (feilkode %08x)."
 
 #: ../src/msw/wince/filefnwce.cpp:167
 msgid "unknown seek origin"
-msgstr "ukjent søkestartpunkt"
+msgstr "ukjent søkestartpunkt"
 
-#: ../src/common/fmapbase.cpp:699
+#: ../src/common/fmapbase.cpp:821
 #, c-format
 msgid "unknown-%d"
 msgstr "ukjent-%d"
 
-#: ../src/common/docview.cpp:450
+#: ../src/common/docview.cpp:509
 msgid "unnamed"
 msgstr "uten navn"
 
-#: ../src/common/docview.cpp:1446
+#: ../src/common/docview.cpp:1587
 #, c-format
 msgid "unnamed%d"
 msgstr "uten navn %d"
 
-#: ../src/common/zipstrm.cpp:1795 ../src/common/zipstrm.cpp:2177
+#: ../src/common/zipstrm.cpp:1797 ../src/common/zipstrm.cpp:2185
 msgid "unsupported Zip compression method"
-msgstr "ikke-støttet Zip-komprimeringsmetode"
+msgstr "ikke-støttet Zip-komprimeringsmetode"
 
-#: ../src/common/intl.cpp:1232
+#: ../src/common/translation.cpp:1724
 #, c-format
 msgid "using catalog '%s' from '%s'."
-msgstr "bruker katalog «%s» fra «%s»."
+msgstr "bruker katalog «%s» fra «%s»."
 
 #: ../src/html/chm.cpp:336
 msgid "write error"
 msgstr "skrivefeil"
 
-#: ../src/common/stopwatch.cpp:277
+#: ../src/common/time.cpp:331
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay feilet."
 
-#: ../src/gtk/print.cpp:952
+#: ../src/gtk/print.cpp:978
 msgid "wxPrintout::GetPageInfo gives a null maxPage."
 msgstr ""
 
-#: ../include/wx/richtext/richtextfontpage.h:38
-msgid "wxRichTextFontPage"
-msgstr ""
-
-#: ../src/html/search.cpp:49
-msgid "wxSearchEngine::LookFor must be called before scanning!"
-msgstr ""
-
-#: ../src/common/socket.cpp:432 ../src/common/socket.cpp:486
-msgid "wxSocket: invalid signature in ReadMsg."
-msgstr "wxSocket: ugyldig signatur i ReadMsg."
-
-#: ../src/common/socket.cpp:1013
-msgid "wxSocket: unknown event!."
-msgstr "wxSocket: ukjent hendelset!."
-
-#: ../src/mac/carbon/databrow.cpp:646
+#: ../src/osx/carbon/dataview.cpp:1304
 msgid "wxWidget control pointer is not a data view pointer"
 msgstr ""
 
-#: ../src/motif/app.cpp:248
+#: ../src/osx/carbon/dataview.cpp:908
+#, fuzzy
+msgid "wxWidget's control not initialized."
+msgstr "Klarte ikke initialisere skjerm."
+
+#: ../src/motif/app.cpp:246
 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."
-msgstr "wxWidgets klarte ikke åpne skjerm for '%s': avslutter."
+msgstr "wxWidgets klarte ikke åpne skjerm for '%s': avslutter."
 
-#: ../src/x11/app.cpp:167
+#: ../src/x11/app.cpp:165
 msgid "wxWidgets could not open display. Exiting."
-msgstr "wxWidgets klarte ikke åpne skjerm. Avslutter."
+msgstr "wxWidgets klarte ikke åpne skjerm. Avslutter."
 
-#: ../src/richtext/richtextsymboldlg.cpp:427
+#: ../src/richtext/richtextsymboldlg.cpp:431
 msgid "xxxx"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3814
+#: ../src/common/datetimefmt.cpp:1638
 msgid "yesterday"
-msgstr "i går"
+msgstr "i går"
 
-#: ../src/common/zstream.cpp:233 ../src/common/zstream.cpp:401
+#: ../src/common/zstream.cpp:244 ../src/common/zstream.cpp:419
 #, c-format
 msgid "zlib error %d"
 msgstr "zlib-feil %d"
 
-#: ../src/common/prntbase.cpp:1137
-msgid "|<<"
-msgstr "|<<"
-
-#: ../src/richtext/richtextliststylepage.cpp:498
-#: ../src/richtext/richtextbulletspage.cpp:296
+#: ../src/richtext/richtextliststylepage.cpp:497
+#: ../src/richtext/richtextbulletspage.cpp:302
 msgid "~"
 msgstr ""
 
+#~ msgid "&Save..."
+#~ msgstr "&Lagre..."
+
+#, fuzzy
+#~ msgid "About "
+#~ msgstr "%Om"
+
+#~ msgid "All files (*.*)|*"
+#~ msgstr "Alle filer (*.*)|*"
+
+#~ msgid "Cannot initialize SciTech MGL!"
+#~ msgstr "Klarte ikke initialisere SciTech MGL!"
+
+#~ msgid "Cannot initialize display."
+#~ msgstr "Klarte ikke initialisere skjerm."
+
+#~ msgid "Cannot start thread: error writing TLS"
+#~ msgstr "Klarte ikke starte tråd: feil ved skriving til TLS"
+
+#~ msgid "Close\tAlt-F4"
+#~ msgstr "Lukk\tAlt-F4"
+
+#~ msgid "Couldn't create cursor."
+#~ msgstr "Klarte ikke opprette peker."
+
+#~ msgid "Directory '%s' doesn't exist!"
+#~ msgstr "Mappen «%s» eksisterer ikke!"
+
+#~ msgid "File %s does not exist."
+#~ msgstr "Filen «%s» eksisterer ikke."
+
+#~ msgid "Mode %ix%i-%i not available."
+#~ msgstr "Modus %ix%i-%i ikke tilgjengelig."
+
+#~ msgid "Paper Size"
+#~ msgstr "Papirstørrelse"
+
+#~ msgid "&Goto..."
+#~ msgstr "&Gå til"
+
+#~ msgid "<<"
+#~ msgstr "<<"
+
+#~ msgid ">>"
+#~ msgstr ">>"
+
+#~ msgid ">>|"
+#~ msgstr ">>|"
+
+#~ msgid "Archive doesnt contain #SYSTEM file"
+#~ msgstr "Arkivet ineholder ikke #SYSTEM fil"
+
+#~ msgid "Can't check image format of file '%s': file does not exist."
+#~ msgstr ""
+#~ "Klarte ikke sjekke bildeformat for filen «%s»: filen eksisterer ikke."
+
+#~ msgid "Can't load image from file '%s': file does not exist."
+#~ msgstr "Klarte ikke lese bilde fra filen «%s»: filen eksisterer ikke."
+
+#~ msgid "Cannot convert dialog units: dialog unknown."
+#~ msgstr "Klarte ikke konvertere dialogenheter: ukjent dialog."
+
+#~ msgid "Cannot convert from the charset '%s'!"
+#~ msgstr "Klarte ikke convertere fra tegnsettet «%s»!"
+
+#~ msgid "Cannot find container for unknown control '%s'."
+#~ msgstr "Klarte ikke finne beholder for ukjent kontroll «%s»."
+
+#~ msgid "Cannot find font node '%s'."
+#~ msgstr "Klarte ikke finne fontnode «%s»."
+
+#~ msgid "Cannot open file '%s'."
+#~ msgstr "Klarte ikke åpne filen «%s»."
+
+#~ msgid "Cannot parse coordinates from '%s'."
+#~ msgstr "Klarte ikke tolke koordinater fra «%s»."
+
+#~ msgid "Cannot parse dimension from '%s'."
+#~ msgstr "Klarte ikke tolke dimensjoner fra «%s»."
+
+#~ msgid "Cant create the thread event queue"
+#~ msgstr "Klarte ikke opprette køen for trådhendelser"
+
+#, fuzzy
+#~ msgid "Click to cancel this window."
+#~ msgstr "Lukk dette vinduet"
+
+#, fuzzy
+#~ msgid "Click to confirm your selection."
+#~ msgstr "Klikk for å bekrefte skriftvalg"
+
+#~ msgid "Could not unlock mutex"
+#~ msgstr "Klarte ikke åpne mutex"
+
+#, fuzzy
+#~ msgid "Elapsed time:"
+#~ msgstr "Forløpt tid :"
+
+#~ msgid "Error while waiting on semaphore"
+#~ msgstr "Feil under venting på semafor"
+
+#, fuzzy
+#~ msgid "Estimated time:"
+#~ msgstr "Anslått tid :"
+
+#, fuzzy
+#~ msgid "Failed to connect to session manager: %s"
+#~ msgstr "Klarte ikke %s oppringingsforbindelse: %s"
+
+#~ msgid "Failed to create a status bar."
+#~ msgstr "Klarte ikke opprette statusbar."
+
+#~ msgid "Failed to register OpenGL window class."
+#~ msgstr "Klarte ikke registrere OpenGL vindusklasse."
+
+#~ msgid "Fatal error"
+#~ msgstr "Kritisk feil"
+
+#~ msgid "Fatal error: "
+#~ msgstr "Kritisk feil:"
+
+#~ msgid "Goto Page"
+#~ msgstr "Gå til side"
+
+#, fuzzy
+#~ msgid "Help : %s"
+#~ msgstr "Hjelp: %s"
+
+#~ msgid "I64"
+#~ msgstr "I64"
+
+#~ msgid "Internal error, illegal wxCustomTypeInfo"
+#~ msgstr "Intern feil, ugyldig wxCustomTypeInfo"
+
+#~ msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
+#~ msgstr "Ugyldig XRC-ressurs «%s»: har ikke rotnode «resource»."
+
+#~ msgid "No handler found for XML node '%s', class '%s'!"
+#~ msgstr "Ingen behandler funnet for XML-node «%s», klasse «%s»!"
+
+#, fuzzy
+#~ msgid "No image handler for type %ld defined."
+#~ msgstr "Ingen bildebehandler for type %d definert."
+
+#, fuzzy
+#~ msgid "Owner not initialized."
+#~ msgstr "Klarte ikke initialisere skjerm."
+
+#, fuzzy
+#~ msgid "Passed item is invalid."
+#~ msgstr "«%s» er ugyldig"
+
+#~ msgid "Passing a already registered object to SetObjectName"
+#~ msgstr "Allerede registrert objekt sendt til SetObjectName"
+
+#~ msgid "Print previe&w"
+#~ msgstr "&Forhåndsvisning av utskrift"
+
+#~ msgid "Program aborted."
+#~ msgstr "Program avbrutt."
+
+#~ msgid "Referenced object node with ref=\"%s\" not found!"
+#~ msgstr "Referert objektnode med ref=\"%s\" ikke funnet!"
+
+#, fuzzy
+#~ msgid "Remaining time:"
+#~ msgstr "Gjenstående tid :"
+
+#~ msgid "Resource files must have same version number!"
+#~ msgstr "Ressursfiler må ha samme versjonsnummer!"
+
+#, fuzzy
+#~ msgid "Search!"
+#~ msgstr "Søk"
+
+#~ msgid "Sorry, could not open this file for saving."
+#~ msgstr "Klarte ikke åpne denne filen for lagring."
+
+#~ msgid "Sorry, could not save this file."
+#~ msgstr "Klarte ikke lagre denne filen."
+
+#~ msgid "Sorry, print preview needs a printer to be installed."
+#~ msgstr "Forhåndsvisning av utskrift krever at en skriver er installert."
+
+#~ msgid "Status: "
+#~ msgstr "Status: "
+
+#~ msgid ""
+#~ "Streaming delegates for not already streamed objects not yet supported"
+#~ msgstr ""
+#~ "Dataflyt-delegater for ikke allerede flytende objekter er ikke støttet"
+
+#~ msgid "Subclass '%s' not found for resource '%s', not subclassing!"
+#~ msgstr "Underklasse «%s» ikke funnet i ressurs «%s», ikke subclassing!"
+
+#~ msgid ""
+#~ "The file '%s' couldn't be opened.\n"
+#~ "It has been removed from the most recently used files list."
+#~ msgstr ""
+#~ "Klarte ikke åpne filen «%s».\n"
+#~ "Den er fjernet fra listen over nylig brukte filer."
+
+#~ msgid "The path '%s' contains too many \"..\"!"
+#~ msgstr "Stien «%s» inneholder for mange \"..\"!"
+
+#~ msgid "Trying to solve a NULL hostname: giving up"
+#~ msgstr "Prøver å løse NULL tjenernavn: gir opp"
+
+#~ msgid "Unknown style flag "
+#~ msgstr "Ukjent stilflagg"
+
+#~ msgid "Warning"
+#~ msgstr "Advarsel"
+
+#~ msgid "Windows 2000 (build %lu"
+#~ msgstr "Windows 2000 (build %lu"
+
+#~ msgid "XRC resource '%s' (class '%s') not found!"
+#~ msgstr "XRC-ressurs «%s» (klasse «%s») ikke funnet!"
+
+#, fuzzy
+#~ msgid "XRC resource: Cannot create animation from '%s'."
+#~ msgstr "XRC-ressurs: Klarte opprette bitmap fra «%s»."
+
+#~ msgid "XRC resource: Cannot create bitmap from '%s'."
+#~ msgstr "XRC-ressurs: Klarte opprette bitmap fra «%s»."
+
+#, fuzzy
+#~ msgid ""
+#~ "XRC resource: Incorrect colour specification '%s' for attribute '%s'."
+#~ msgstr "XRC-ressurs: Ugyldig fargespesifikasjon «%s» for egenskap «%s»."
+
+#~ msgid "[EMPTY]"
+#~ msgstr "[TOM]"
+
+#~ msgid "catalog file for domain '%s' not found."
+#~ msgstr "katalogfil for domene «%s» ikke funnet."
+
+#~ msgid "delegate has no type info"
+#~ msgstr "delegat har ingen typeinformasjon"
+
+#, fuzzy
+#~ msgid "encoding %i"
+#~ msgstr "koding %s"
+
+#~ msgid "looking for catalog '%s' in path '%s'."
+#~ msgstr "leter etter katalog «%s» i stien «%s»."
+
+#~ msgid "wxSocket: invalid signature in ReadMsg."
+#~ msgstr "wxSocket: ugyldig signatur i ReadMsg."
+
+#~ msgid "wxSocket: unknown event!."
+#~ msgstr "wxSocket: ukjent hendelset!."
+
+#~ msgid "|<<"
+#~ msgstr "|<<"
+
 #~ msgid "\t%s: %s\n"
 #~ msgstr "\t%s: %s\n"
 
@@ -7074,7 +8859,7 @@ msgstr ""
 #~ msgstr "Klarte ikke opprette en timer"
 
 #~ msgid "#define %s must be an integer."
-#~ msgstr "#define %s må være et heltall."
+#~ msgstr "#define %s må være et heltall."
 
 #~ msgid "%s not a bitmap resource specification."
 #~ msgstr "%s er ikke en bitmap ressursspesifikasjon"
@@ -7085,21 +8870,17 @@ msgstr ""
 #~ msgid "%s: ill-formed resource file syntax."
 #~ msgstr "%s: feil syntaks i ressursfilen"
 
-#, fuzzy
-#~ msgid "&About"
-#~ msgstr "%Om"
-
 #~ msgid "&Open"
-#~ msgstr "&Åpne"
+#~ msgstr "&Åpne"
 
 #~ msgid "&Print"
 #~ msgstr "&Skriv ut"
 
 #~ msgid "*** A debug report has been generated\n"
-#~ msgstr "*** En feilsøkingsrapport har blitt generert\n"
+#~ msgstr "*** En feilsøkingsrapport har blitt generert\n"
 
 #~ msgid "*** It can be found in \"%s\"\n"
-#~ msgstr "*** Den kan bli funnet i «%s»\n"
+#~ msgstr "*** Den kan bli funnet i «%s»\n"
 
 #~ msgid ""
 #~ ", expected static, #include or #define\n"
@@ -7108,12 +8889,6 @@ msgstr ""
 #~ ", forventet static, #include eller #define\n"
 #~ "under tolking av ressurs."
 
-#~ msgid "AddToPropertyCollection called on a generic accessor"
-#~ msgstr "AddToPropertyCollection kalt på generisk aksessor"
-
-#~ msgid "AddToPropertyCollection called w/o valid adder"
-#~ msgstr "AddToPropertyCollection kalt uten gyldig tillegger"
-
 #~ msgid "Bitmap resource specification %s not found."
 #~ msgstr "Bitmap ressursspesifikasjon %s ikke funnet."
 
@@ -7122,7 +8897,7 @@ msgstr ""
 #~ "instead\n"
 #~ " or provide #define (see manual for caveats)"
 #~ msgstr ""
-#~ "Klarte ikke finne kontrollklasse eller ID «%s». Bruk (ikke-null) heltall "
+#~ "Klarte ikke finne kontrollklasse eller ID «%s». Bruk (ikke-null) heltall "
 #~ "istedenfor\n"
 #~ "eller oppgi #define (se manual for advarsler)"
 
@@ -7130,97 +8905,76 @@ msgstr ""
 #~ "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
 #~ "or provide #define (see manual for caveats)"
 #~ msgstr ""
-#~ "Klarte ikke finne meny-ID «%s». Bruk (ikke-null) heltall istedenfor\n"
+#~ "Klarte ikke finne meny-ID «%s». Bruk (ikke-null) heltall istedenfor\n"
 #~ "eller oppgi #define (se manual for advarsler)"
 
 #, fuzzy
 #~ msgid "Couldn't end the context on the overlay window"
-#~ msgstr "Klarte ikke finne gjeldende trådpeker"
+#~ msgstr "Klarte ikke finne gjeldende trådpeker"
 
 #~ msgid "Expected '*' while parsing resource."
-#~ msgstr "Forventet «*» under tolking av ressurs."
+#~ msgstr "Forventet «*» under tolking av ressurs."
 
 #~ msgid "Expected '=' while parsing resource."
-#~ msgstr "Forventet «=» under tolking av ressurs."
+#~ msgstr "Forventet «=» under tolking av ressurs."
 
 #~ msgid "Expected 'char' while parsing resource."
-#~ msgstr "Forventet «tegn» under tolking av ressurs."
+#~ msgstr "Forventet «tegn» under tolking av ressurs."
 
 #~ msgid ""
 #~ "Failed to find XBM resource %s.\n"
 #~ "Forgot to use wxResourceLoadBitmapData?"
 #~ msgstr ""
 #~ "Klarte ikke finne XBM-ressurs %s.\n"
-#~ "Glemt å bruke wxResourceLoadBitmapData?"
+#~ "Glemt å bruke wxResourceLoadBitmapData?"
 
 #~ msgid ""
 #~ "Failed to find XBM resource %s.\n"
 #~ "Forgot to use wxResourceLoadIconData?"
 #~ msgstr ""
 #~ "Klarte ikke finne XBM-ressurs %s.\n"
-#~ "Glemt å bruke wxResourceLoadIconData?"
+#~ "Glemt å bruke wxResourceLoadIconData?"
 
 #~ msgid ""
 #~ "Failed to find XPM resource %s.\n"
 #~ "Forgot to use wxResourceLoadBitmapData?"
 #~ msgstr ""
 #~ "Klarte ikke finne XPM-ressurs %s.\n"
-#~ "Glemt å bruke wxResourceLoadBitmapData?"
+#~ "Glemt å bruke wxResourceLoadBitmapData?"
 
 #~ msgid "Failed to get clipboard data."
 #~ msgstr "Klarte ikke hente data fra utklippstavlen."
 
 #~ msgid "Failed to load shared library '%s' Error '%s'"
-#~ msgstr "Klarte ikke laste delt bibliotek «%s» - feil «%s»"
+#~ msgstr "Klarte ikke laste delt bibliotek «%s» - feil «%s»"
 
 #~ msgid "Found "
 #~ msgstr "Fant"
 
-#~ msgid "GetProperty called w/o valid getter"
-#~ msgstr "GetProperty kalt uten gyldig henter"
-
-#~ msgid "GetPropertyCollection called on a generic accessor"
-#~ msgstr "GetPropertyCollection kalt med generisk aksessor"
-
-#~ msgid "GetPropertyCollection called w/o valid collection getter"
-#~ msgstr "GetPropertyCollection kalt uten gyldig mengdehenter"
-
 #~ msgid "Icon resource specification %s not found."
 #~ msgstr "Ikon ressursspesifikasjon %s ikke funnet."
 
 #~ msgid "Ill-formed resource file syntax."
 #~ msgstr "Ugyldig syntaks i ressursfil."
 
-#~ msgid "Illegal Parameter Count for ConstructObject Method"
-#~ msgstr "Ugyldig antall parametre for ConstructObject-metode"
-
-#~ msgid "Illegal Parameter Count for Create Method"
-#~ msgstr "Ugyldig antall parametre for Create-metode"
-
 #~ msgid "Long Conversions not supported"
-#~ msgstr "Long Conversions er ikke støttet"
-
-#~ msgid "No XBM facility available!"
-#~ msgstr "Ingen XBM-fasilitet tilgjengelig!"
+#~ msgstr "Long Conversions er ikke støttet"
 
 #~ msgid "No XPM icon facility available!"
 #~ msgstr "Ingen fasilitet for XPM-ikon tilgjengelig!"
 
 #~ msgid "Option '%s' requires a value, '=' expected."
-#~ msgstr "Opsjon «%s» må ha en verdi, «=» forventet."
+#~ msgstr "Opsjon «%s» må ha en verdi, «=» forventet."
 
 #, fuzzy
 #~ msgid "Select all"
 #~ msgstr "Velg &alle"
 
-#~ msgid "SetProperty called w/o valid setter"
-#~ msgstr "SetProperty kalt uten gyldig setter"
-
 #~ msgid "String conversions not supported"
-#~ msgstr "String conversions ikke støttet"
+#~ msgstr "String conversions ikke støttet"
 
 #~ msgid "Unexpected end of file while parsing resource."
-#~ msgstr "Uventet slutt på filen under tolking av ressurs."
+#~ msgstr "Uventet slutt på filen under tolking av ressurs."
 
 #~ msgid "Unrecognized style %s while parsing resource."
 #~ msgstr "Ikke-gjenkjent stil %s under tolking av ressurs."
@@ -7229,20 +8983,17 @@ msgstr ""
 #~ msgstr "Video utdata"
 
 #~ msgid "Warning: attempt to remove HTML tag handler from empty stack."
-#~ msgstr "Advarsel: Forsøk på å fjerne HTML-tagg fra en tom stabel."
+#~ msgstr "Advarsel: Forsøk på å fjerne HTML-tagg fra en tom stabel."
 
 #~ msgid "establish"
 #~ msgstr "opprette"
 
 #~ msgid "initiate"
-#~ msgstr "klargjør"
+#~ msgstr "klargjør"
 
 #~ msgid "invalid eof() return value."
 #~ msgstr "ugyldig eof() returverdi."
 
-#~ msgid "reading"
-#~ msgstr "leser"
-
 #~ msgid "unknown line terminator"
 #~ msgstr "ukjent linjeavslutter"
 
@@ -7252,11 +9003,8 @@ msgstr ""
 #~ msgid "."
 #~ msgstr "."
 
-#~ msgid ".."
-#~ msgstr ".."
-
 #~ msgid "Cannot open URL '%s'"
-#~ msgstr "Klarte ikke åpne URL «%s»"
+#~ msgstr "Klarte ikke åpne URL «%s»"
 
 #~ msgid "Error "
 #~ msgstr "Feil"
@@ -7268,22 +9016,22 @@ msgstr ""
 #~ msgstr "Klarte ikke oprette mappe %s/mime-info."
 
 #~ msgid "MP Thread Support is not available on this System"
-#~ msgstr "MP trådstøtte er ikke tilgjengelig på dette systemet"
+#~ msgstr "MP trådstøtte er ikke tilgjengelig på dette systemet"
 
 #~ msgid "Mailcap file %s, line %d: incomplete entry ignored."
-#~ msgstr "Mailcap-fil %s, linje %d: ufullstendig oppføring ignorert."
+#~ msgstr "Mailcap-fil %s, linje %d: ufullstendig oppføring ignorert."
 
 #~ msgid "Mime.types file %s, line %d: unterminated quoted string."
 #~ msgstr "Mime.types-fil %s, linje %d: uavsluttet sitatstreng"
 
 #~ msgid "Unknown field in file %s, line %d: '%s'."
-#~ msgstr "Ukjent felt i filen %s, linje %d: «%s»."
+#~ msgstr "Ukjent felt i filen %s, linje %d: «%s»."
 
 #~ msgid "bold "
 #~ msgstr "fet"
 
 #~ msgid "can't query for GUI plugins name in console applications"
-#~ msgstr "kan ikke spørre etter navn på GUI-programtillegg i konsollprogram"
+#~ msgstr "kan ikke spørre etter navn på GUI-programtillegg i konsollprogram"
 
 #~ msgid "light "
 #~ msgstr "lett"
@@ -7292,12 +9040,12 @@ msgstr ""
 #~ msgstr "understreket"
 
 #~ msgid "unsupported zip archive"
-#~ msgstr "ikke-støttet zip-arkiv"
+#~ msgstr "ikke-støttet zip-arkiv"
 
 #~ msgid ""
 #~ "Failed to get stack backtrace:\n"
 #~ "%s"
-#~ msgstr "Klarte ikke få tak stabeltilbakesporing: %s"
+#~ msgstr "Klarte ikke få tak stabeltilbakesporing: %s"
 
 #~ msgid "Loading Grey Ascii PNM image is not yet implemented."
 #~ msgstr "Lesing av Grey Ascii PNM bilde er ikke implementert enda."
@@ -7306,18 +9054,18 @@ msgstr ""
 #~ msgstr "Lesing av Grey Raw PNM bilde er ikke implementert enda."
 
 #~ msgid "Cannot wait on thread to exit."
-#~ msgstr "Klarte ikke vent på fullføring av tråden"
+#~ msgstr "Klarte ikke vent på fullføring av tråden"
 
 #~ msgid "Could not load Rich Edit DLL '%s'"
-#~ msgstr "Klarte ikke laste Rich Edit DLL «%s»"
+#~ msgstr "Klarte ikke laste Rich Edit DLL «%s»"
 
 #~ msgid "ZIP handler currently supports only local files!"
-#~ msgstr "ZIP-behandler støtter for øyeblikket kun lokale filer!"
+#~ msgstr "ZIP-behandler støtter for øyeblikket kun lokale filer!"
 
 #~ msgid ""
 #~ "can't seek on file descriptor %d, large files support is not enabled."
 #~ msgstr ""
-#~ "klarte ikke søke på fildeskriptor %d, støtte for store filer er ikke "
+#~ "klarte ikke søke på fildeskriptor %d, støtte for store filer er ikke "
 #~ "aktivert."
 
 #~ msgid "More..."