merge po files for beta1

[features.git] / po / nb.po

diff --git a/po/nb.po b/po/nb.po
index a13defb0609bdc511ef7a77fd52bebadae341959..c40777c9a7adbb3e949d951b3448ebc923f6a27f 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lyx 1.4.0\n"
 "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-01-31 20:06+0100\n"
+"POT-Creation-Date: 2007-02-19 22:04+0000\n"
 "PO-Revision-Date: 2007-01-31 00:58+0100\n"
 "Last-Translator: Lars Gullik Bjønnes <larsbj@lyx.org>\n"
 "Language-Team: norsk <no@li.org>\n"
@@ -121,7 +121,7 @@ msgstr "St
 #: src/frontends/controllers/ControlDocument.C:49
 #: src/frontends/controllers/ControlExternal.C:234
 #: src/frontends/controllers/ControlGraphics.C:170
-#: src/frontends/qt4/QDocumentDialog.C:199 src/lyxfont.C:519
+#: src/frontends/qt4/QDocumentDialog.C:200 src/lyxfont.C:519
 #: src/tex-strings.C:68 src/tex-strings.C:79 src/tex-strings.C:89
 msgid "Default"
 msgstr "Standard"
@@ -465,9 +465,9 @@ msgstr "&Dummy"
 #: src/frontends/qt4/ui/QDocumentUi.ui:135 src/frontends/qt4/ui/QERTUi.ui:100
 #: src/frontends/qt4/ui/QExternalUi.ui:685 src/frontends/qt4/ui/QFloatUi.ui:68
 #: src/frontends/qt4/ui/QGraphicsUi.ui:702
-#: src/frontends/qt4/ui/QIncludeUi.ui:192 src/frontends/qt4/ui/QIndexUi.ui:85
+#: src/frontends/qt4/ui/QIncludeUi.ui:192 src/frontends/qt4/ui/QIndexUi.ui:82
 #: src/frontends/qt4/ui/QMathMatrixUi.ui:170
-#: src/frontends/qt4/ui/QNomenclUi.ui:98 src/frontends/qt4/ui/QNoteUi.ui:31
+#: src/frontends/qt4/ui/QNomenclUi.ui:95 src/frontends/qt4/ui/QNoteUi.ui:31
 #: src/frontends/qt4/ui/QParagraphUi.ui:258 src/frontends/qt4/ui/QRefUi.ui:80
 #: src/frontends/qt4/ui/QSendtoUi.ui:75
 #: src/frontends/qt4/ui/QTabularCreateUi.ui:68
@@ -478,10 +478,10 @@ msgstr "&OK"
 
 #: src/frontends/qt4/ui/QAskForTextUi.ui:94
 #: src/frontends/qt4/ui/QCitationUi.ui:124
-#: src/frontends/qt4/ui/QDocumentUi.ui:152 src/buffer_funcs.C:100
-#: src/buffer_funcs.C:127 src/buffer_funcs.C:168 src/bufferlist.C:114
-#: src/bufferlist.C:222 src/lyx_cb.C:115 src/lyx_cb.C:168 src/lyxfunc.C:728
-#: src/lyxfunc.C:901 src/lyxfunc.C:2016 src/lyxvc.C:175
+#: src/frontends/qt4/ui/QDocumentUi.ui:152 src/buffer_funcs.C:101
+#: src/buffer_funcs.C:128 src/buffer_funcs.C:169 src/bufferlist.C:114
+#: src/bufferlist.C:222 src/lyx_cb.C:115 src/lyx_cb.C:168 src/lyxfunc.C:733
+#: src/lyxfunc.C:906 src/lyxfunc.C:1070 src/lyxfunc.C:2030 src/lyxvc.C:175
 msgid "&Cancel"
 msgstr "&Avbryt"
 
@@ -508,9 +508,9 @@ msgstr "LyX: Legg til BibTeX Database"
 
 #: src/frontends/qt4/ui/QBibtexAddUi.ui:83
 #: src/frontends/qt4/ui/QBibtexUi.ui:229 src/frontends/qt4/ui/QChangesUi.ui:78
-#: src/frontends/qt4/ui/QIndexUi.ui:95 src/frontends/qt4/ui/QNomenclUi.ui:111
+#: src/frontends/qt4/ui/QIndexUi.ui:92 src/frontends/qt4/ui/QNomenclUi.ui:108
 #: src/frontends/qt4/ui/QSendtoUi.ui:95 src/BufferView.C:259
-#: src/frontends/qt4/Qt2BC.h:36 src/lyxfunc.C:844
+#: src/frontends/qt4/Qt2BC.h:36 src/lyxfunc.C:849
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -791,7 +791,7 @@ msgstr "Font serier"
 
 #: src/frontends/qt4/ui/QCharacterUi.ui:114
 #: src/frontends/qt4/ui/QCharacterUi.ui:160
-#: src/frontends/qt4/QDocumentDialog.C:390
+#: src/frontends/qt4/QDocumentDialog.C:391
 #: src/frontends/qt4/QPrefsDialog.C:1457
 msgid "Language"
 msgstr "Språk"
@@ -1516,15 +1516,15 @@ msgstr "Sett inn matrise"
 msgid "Show delimiter and bracket dialog"
 msgstr "Parenteser og klammer"
 
-#: src/frontends/qt4/ui/QNomenclUi.ui:37
+#: src/frontends/qt4/ui/QNomenclUi.ui:34
 msgid "Sort &as:"
 msgstr "Sortér som:"
 
-#: src/frontends/qt4/ui/QNomenclUi.ui:47
+#: src/frontends/qt4/ui/QNomenclUi.ui:44
 msgid "&Description:"
 msgstr "Beskrivelse"
 
-#: src/frontends/qt4/ui/QNomenclUi.ui:57
+#: src/frontends/qt4/ui/QNomenclUi.ui:54
 msgid "&Symbol:"
 msgstr "&Symbol:"
 
@@ -1573,7 +1573,7 @@ msgid "&Shaded"
 msgstr "&Skyggelagt"
 
 #: src/frontends/qt4/ui/QParagraphUi.ui:37
-#: src/frontends/qt4/QDocumentDialog.C:113 src/text.C:1692
+#: src/frontends/qt4/QDocumentDialog.C:114 src/text.C:1686
 msgid "Single"
 msgstr "Enkel"
 
@@ -1582,7 +1582,7 @@ msgid "1.5"
 msgstr "1.5"
 
 #: src/frontends/qt4/ui/QParagraphUi.ui:47
-#: src/frontends/qt4/QDocumentDialog.C:117 src/text.C:1698
+#: src/frontends/qt4/QDocumentDialog.C:118 src/text.C:1692
 msgid "Double"
 msgstr "Dobbel"
 
@@ -1591,8 +1591,8 @@ msgstr "Dobbel"
 #: src/frontends/qt4/ui/QTabularUi.ui:731
 #: src/frontends/qt4/ui/QTabularUi.ui:779
 #: src/frontends/qt4/ui/QVSpaceUi.ui:113
-#: src/frontends/qt4/QDocumentDialog.C:119
-#: src/frontends/qt4/QDocumentDialog.C:200
+#: src/frontends/qt4/QDocumentDialog.C:120
+#: src/frontends/qt4/QDocumentDialog.C:201
 msgid "Custom"
 msgstr "Brukerdefinert"
 
@@ -1865,37 +1865,37 @@ msgid "Te&X encoding:"
 msgstr "Te&X tegnkoding"
 
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:83
-#: src/frontends/qt4/QDocumentDialog.C:201
+#: src/frontends/qt4/QDocumentDialog.C:202
 msgid "US letter"
 msgstr ""
 
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:88
-#: src/frontends/qt4/QDocumentDialog.C:202
+#: src/frontends/qt4/QDocumentDialog.C:203
 msgid "US legal"
 msgstr ""
 
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:93
-#: src/frontends/qt4/QDocumentDialog.C:203
+#: src/frontends/qt4/QDocumentDialog.C:204
 msgid "US executive"
 msgstr ""
 
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:98
-#: src/frontends/qt4/QDocumentDialog.C:204
+#: src/frontends/qt4/QDocumentDialog.C:205
 msgid "A3"
 msgstr "A3"
 
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:103
-#: src/frontends/qt4/QDocumentDialog.C:205
+#: src/frontends/qt4/QDocumentDialog.C:206
 msgid "A4"
 msgstr "A4"
 
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:108
-#: src/frontends/qt4/QDocumentDialog.C:206
+#: src/frontends/qt4/QDocumentDialog.C:207
 msgid "A5"
 msgstr "A5"
 
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:113
-#: src/frontends/qt4/QDocumentDialog.C:209
+#: src/frontends/qt4/QDocumentDialog.C:210
 msgid "B5"
 msgstr "B5"
 
@@ -2247,7 +2247,7 @@ msgid "&Maximum last files:"
 msgstr "Max antall tidligere filer"
 
 #: src/frontends/qt4/ui/QPrefsUi.ui:76 src/bufferlist.C:114
-#: src/bufferlist.C:222 src/lyxfunc.C:727
+#: src/bufferlist.C:222 src/lyxfunc.C:732
 msgid "&Save"
 msgstr "Lagre"
 
@@ -2859,17 +2859,17 @@ msgid "DefSkip"
 msgstr "Standard avstand"
 
 #: src/frontends/qt4/ui/QVSpaceUi.ui:93
-#: src/frontends/qt4/QDocumentDialog.C:106
+#: src/frontends/qt4/QDocumentDialog.C:107
 msgid "SmallSkip"
 msgstr "Liten avstand"
 
 #: src/frontends/qt4/ui/QVSpaceUi.ui:98
-#: src/frontends/qt4/QDocumentDialog.C:107
+#: src/frontends/qt4/QDocumentDialog.C:108
 msgid "MedSkip"
 msgstr "Medium avstand"
 
 #: src/frontends/qt4/ui/QVSpaceUi.ui:103
-#: src/frontends/qt4/QDocumentDialog.C:108
+#: src/frontends/qt4/QDocumentDialog.C:109
 msgid "BigSkip"
 msgstr "Stor avstand"
 
@@ -2951,7 +2951,7 @@ msgstr "To &kolonners dokument"
 #: lib/layouts/db_stdclass.inc:22 lib/layouts/scrclass.inc:15
 #: lib/layouts/stdclass.inc:28 lib/layouts/stdletter.inc:12
 #: lib/layouts/svjour.inc:27 lib/ui/stdtoolbars.inc:42
-#: src/frontends/qt4/BulletsModule.C:46 src/insets/insetref.C:150
+#: src/frontends/qt4/BulletsModule.C:46 src/insets/insetref.C:151
 #: src/mathed/InsetMathRef.C:183
 msgid "Standard"
 msgstr "Standard"
@@ -3096,7 +3096,7 @@ msgstr "Definisjon #:"
 #: lib/layouts/ijmpd.layout:175 lib/layouts/llncs.layout:340
 #: lib/layouts/amsmaths-plain.inc:133 lib/layouts/amsmaths-seq.inc:112
 #: lib/layouts/amsmaths.inc:276 lib/layouts/svjour.inc:397
-#: src/frontends/qt4/QDocumentDialog.C:314
+#: src/frontends/qt4/QDocumentDialog.C:315
 msgid "Example"
 msgstr "Eksempel"
 
@@ -3336,7 +3336,7 @@ msgstr ""
 #: lib/layouts/siamltex.layout:183 lib/layouts/aguplus.inc:168
 #: lib/layouts/aguplus.inc:170 lib/layouts/amsdefs.inc:229
 #: lib/layouts/scrclass.inc:223 lib/layouts/stdstruct.inc:39
-#: lib/layouts/svjour.inc:326 src/frontends/qt4/QDocumentDialog.C:392
+#: lib/layouts/svjour.inc:326 src/frontends/qt4/QDocumentDialog.C:393
 msgid "Bibliography"
 msgstr "Referanseliste"
 
@@ -3991,7 +3991,7 @@ msgid "Seriate"
 msgstr ""
 
 #: lib/layouts/apa.layout:360 lib/layouts/apa.layout:361
-#: src/buffer_funcs.C:517
+#: src/buffer_funcs.C:525
 msgid "(\\alph{enumii})"
 msgstr "(\\alph{enumii})"
 
@@ -7886,18 +7886,18 @@ msgid "Redo|R"
 msgstr "Gjør om|G"
 
 #: lib/ui/stdmenus.inc:87 lib/ui/stdtoolbars.inc:51
-#: src/mathed/InsetMathNest.C:460 src/text3.C:780
+#: src/mathed/InsetMathNest.C:460 src/text3.C:824
 msgid "Cut"
 msgstr "Klipp"
 
 #: lib/ui/stdmenus.inc:88 lib/ui/stdtoolbars.inc:52
-#: src/mathed/InsetMathNest.C:468 src/text3.C:785
+#: src/mathed/InsetMathNest.C:468 src/text3.C:829
 msgid "Copy"
 msgstr "Kopier"
 
 #: lib/ui/stdmenus.inc:89 lib/ui/stdtoolbars.inc:53
-#: src/mathed/InsetMathGrid.C:1212 src/mathed/InsetMathNest.C:439
-#: src/text3.C:761
+#: src/mathed/InsetMathGrid.C:1211 src/mathed/InsetMathNest.C:439
+#: src/text3.C:805
 msgid "Paste"
 msgstr "Lim inn"
 
@@ -8378,11 +8378,11 @@ msgstr "Lagre dokumentet"
 msgid "Print document"
 msgstr "Skriv ut dokumentet"
 
-#: lib/ui/stdtoolbars.inc:49 src/BufferView.C:740
+#: lib/ui/stdtoolbars.inc:49 src/BufferView.C:739
 msgid "Undo"
 msgstr "Angre"
 
-#: lib/ui/stdtoolbars.inc:50 src/BufferView.C:750
+#: lib/ui/stdtoolbars.inc:50 src/BufferView.C:749
 msgid "Redo"
 msgstr "Gjør omigjen"
 
@@ -8709,11 +8709,11 @@ msgstr ""
 "\n"
 "Vil du gå tilbake til den lagrede versjonen? "
 
-#: src/BufferView.C:232 src/lyxfunc.C:900
+#: src/BufferView.C:232 src/lyxfunc.C:905
 msgid "Revert to saved document?"
 msgstr "Tilbake til sist lagret"
 
-#: src/BufferView.C:233 src/lyxfunc.C:901 src/lyxvc.C:175
+#: src/BufferView.C:233 src/lyxfunc.C:906 src/lyxvc.C:175
 msgid "&Revert"
 msgstr "&Tilbake til lagret"
 
@@ -8744,90 +8744,90 @@ msgstr "&Nytt"
 msgid "Save bookmark"
 msgstr "Lagre bokmerke"
 
-#: src/BufferView.C:743
+#: src/BufferView.C:742
 msgid "No further undo information"
 msgstr "Ikke mer \"Angre\" informasjon"
 
-#: src/BufferView.C:753
+#: src/BufferView.C:752
 msgid "No further redo information"
 msgstr "Ikke mer \"Gjør om\" informasjon"
 
-#: src/BufferView.C:912
+#: src/BufferView.C:910
 msgid "Mark off"
 msgstr "Merke slått av"
 
-#: src/BufferView.C:919
+#: src/BufferView.C:917
 msgid "Mark on"
 msgstr "Merke på"
 
-#: src/BufferView.C:926
+#: src/BufferView.C:924
 msgid "Mark removed"
 msgstr "Fjernet merke"
 
-#: src/BufferView.C:929
+#: src/BufferView.C:927
 msgid "Mark set"
 msgstr "Merke satt"
 
-#: src/BufferView.C:975
+#: src/BufferView.C:973
 #, c-format
 msgid "%1$d words in selection."
 msgstr "Det er %1$d ord i utvalget"
 
-#: src/BufferView.C:978
+#: src/BufferView.C:976
 #, c-format
 msgid "%1$d words in document."
 msgstr "Det er %1$d ord i dokumentet."
 
-#: src/BufferView.C:983
+#: src/BufferView.C:981
 msgid "One word in selection."
 msgstr "Det er ett ord i utvalget."
 
-#: src/BufferView.C:985
+#: src/BufferView.C:983
 msgid "One word in document."
 msgstr "Ett ord i dokumentet."
 
-#: src/BufferView.C:988
+#: src/BufferView.C:986
 msgid "Count words"
 msgstr "Telle ord"
 
-#: src/BufferView.C:1527
+#: src/BufferView.C:1511
 msgid "Select LyX document to insert"
 msgstr "Velg LyX dokument som skal settes inn"
 
-#: src/BufferView.C:1529 src/frontends/controllers/ControlBibtex.C:54
+#: src/BufferView.C:1513 src/frontends/controllers/ControlBibtex.C:54
 #: src/frontends/controllers/ControlBibtex.C:66
 #: src/frontends/controllers/ControlExternal.C:169
 #: src/frontends/controllers/ControlGraphics.C:96
 #: src/frontends/controllers/ControlInclude.C:91 src/lyx_cb.C:134
-#: src/lyxfunc.C:1857 src/lyxfunc.C:1894 src/lyxfunc.C:1967
+#: src/lyxfunc.C:1871 src/lyxfunc.C:1908 src/lyxfunc.C:1981
 msgid "Documents|#o#O"
 msgstr "Dokumenter|#o#O"
 
-#: src/BufferView.C:1530 src/lyxfunc.C:1895 src/lyxfunc.C:1968
+#: src/BufferView.C:1514 src/lyxfunc.C:1909 src/lyxfunc.C:1982
 msgid "Examples|#E#e"
 msgstr "Eksempler|#E#e"
 
-#: src/BufferView.C:1534 src/lyx_cb.C:140 src/lyxfunc.C:1862
-#: src/lyxfunc.C:1899
+#: src/BufferView.C:1518 src/lyx_cb.C:140 src/lyxfunc.C:1876
+#: src/lyxfunc.C:1913
 msgid "LyX Documents (*.lyx)"
 msgstr "LyX-Dokumenter (*.lyx)"
 
-#: src/BufferView.C:1546 src/lyxfunc.C:1909 src/lyxfunc.C:1989
-#: src/lyxfunc.C:2003 src/lyxfunc.C:2019
+#: src/BufferView.C:1530 src/lyxfunc.C:1923 src/lyxfunc.C:2003
+#: src/lyxfunc.C:2017 src/lyxfunc.C:2033
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: src/BufferView.C:1557
+#: src/BufferView.C:1541
 #, c-format
 msgid "Inserting document %1$s..."
 msgstr "Setter inn dokumentet %1$s..."
 
-#: src/BufferView.C:1568
+#: src/BufferView.C:1552
 #, c-format
 msgid "Document %1$s inserted."
 msgstr "Satt inn document %1$s."
 
-#: src/BufferView.C:1570
+#: src/BufferView.C:1554
 #, c-format
 msgid "Could not insert document %1$s"
 msgstr "Kunne ikke sette inn dokumentet %1$s"
@@ -8841,7 +8841,7 @@ msgstr "ChkTeX advarsel id # %1$d"
 msgid "ChkTeX warning id # "
 msgstr "ChkTeX advarsel id # "
 
-#: src/CutAndPaste.C:423
+#: src/CutAndPaste.C:433
 #, c-format
 msgid ""
 "Layout had to be changed from\n"
@@ -8854,11 +8854,11 @@ msgstr ""
 "som en følge av bytte av dokumentklasse\n"
 "fra %3$s til %4$s."
 
-#: src/CutAndPaste.C:428
+#: src/CutAndPaste.C:438
 msgid "Changed Layout"
 msgstr "Endret stil"
 
-#: src/CutAndPaste.C:447
+#: src/CutAndPaste.C:457
 #, c-format
 msgid ""
 "Character style %1$s is undefined because of class conversion from\n"
@@ -8867,7 +8867,7 @@ msgstr ""
 "Tekststilen %1$s er udefinert på grunn av konvertering fra\n"
 "%2$s til %3$s"
 
-#: src/CutAndPaste.C:454
+#: src/CutAndPaste.C:464
 msgid "Undefined character style"
 msgstr "Udefinert tekststil"
 
@@ -8931,7 +8931,7 @@ msgstr "LaTeX tekst"
 msgid "previewed snippet"
 msgstr "forhåndsviste formler o.l."
 
-#: src/LColor.C:110
+#: src/LColor.C:110 src/insets/insetnote.C:310
 msgid "note"
 msgstr "notis"
 
@@ -9095,45 +9095,45 @@ msgstr "arv"
 msgid "ignore"
 msgstr "ignorer"
 
-#: src/LaTeX.C:92
+#: src/LaTeX.C:93
 #, c-format
 msgid "Waiting for LaTeX run number %1$d"
 msgstr "Venter på LaTeX-kjøring nummer %1$d"
 
-#: src/LaTeX.C:289 src/LaTeX.C:365
+#: src/LaTeX.C:290 src/LaTeX.C:366
 msgid "Running MakeIndex."
 msgstr "Kjører MakeIndex."
 
-#: src/LaTeX.C:295 src/LaTeX.C:373
+#: src/LaTeX.C:296 src/LaTeX.C:374
 msgid "Running MakeIndex for nomencl."
 msgstr "Kjører MakeIndex for glossar."
 
-#: src/LaTeX.C:309
+#: src/LaTeX.C:310
 msgid "Running BibTeX."
 msgstr "Kjører BibTeX."
 
-#: src/MenuBackend.C:465 src/MenuBackend.C:502 src/MenuBackend.C:572
-#: src/MenuBackend.C:594 src/MenuBackend.C:617 src/MenuBackend.C:703
+#: src/MenuBackend.C:465 src/MenuBackend.C:502 src/MenuBackend.C:574
+#: src/MenuBackend.C:596 src/MenuBackend.C:619 src/MenuBackend.C:705
 msgid "No Documents Open!"
 msgstr "Ingen åpne dokumenter!"
 
-#: src/MenuBackend.C:540
+#: src/MenuBackend.C:542
 msgid "Plain Text"
 msgstr "Bare tekst"
 
-#: src/MenuBackend.C:542
+#: src/MenuBackend.C:544
 msgid "Plain Text, Join Lines"
 msgstr "Ren tekst, skjøt sammen linjer"
 
-#: src/MenuBackend.C:714
+#: src/MenuBackend.C:716
 msgid "Master Document"
 msgstr "Hoveddokument"
 
-#: src/MenuBackend.C:746
+#: src/MenuBackend.C:748
 msgid "No Table of contents"
 msgstr "Innholdsfortegnelsen finnes ikke"
 
-#: src/MenuBackend.C:791
+#: src/MenuBackend.C:793
 msgid " (auto)"
 msgstr ""
 
@@ -9159,7 +9159,7 @@ msgstr "Ukjent dokumentklasse"
 msgid "Using the default document class, because the class %1$s is unknown."
 msgstr "Bruker standard dokumentklasse, fordi klassen %1$s er ukjent."
 
-#: src/buffer.C:459 src/text.C:298
+#: src/buffer.C:459 src/text.C:292
 #, c-format
 msgid "Unknown token: %1$s %2$s\n"
 msgstr "Ukjent symbol: %1$s %2$s\n"
@@ -9304,7 +9304,7 @@ msgstr "chktex mislyktes"
 msgid "Could not run chktex successfully."
 msgstr "Mislyktes med chktex."
 
-#: src/buffer_funcs.C:80
+#: src/buffer_funcs.C:81
 #, c-format
 msgid ""
 "The specified document\n"
@@ -9314,11 +9314,11 @@ msgstr ""
 "Dokumentet %1$s\n"
 "var uleselig."
 
-#: src/buffer_funcs.C:82
+#: src/buffer_funcs.C:83
 msgid "Could not read document"
 msgstr "Kunne ikke åpne dokumentet"
 
-#: src/buffer_funcs.C:95
+#: src/buffer_funcs.C:96
 #, c-format
 msgid ""
 "An emergency save of the document %1$s exists.\n"
@@ -9329,19 +9329,19 @@ msgstr ""
 "\n"
 "Gjenopprette det nødlagrede dokumentet?"
 
-#: src/buffer_funcs.C:98
+#: src/buffer_funcs.C:99
 msgid "Load emergency save?"
 msgstr "Åpne nødlagret fil?"
 
-#: src/buffer_funcs.C:99
+#: src/buffer_funcs.C:100
 msgid "&Recover"
 msgstr "&Gjenopprett"
 
-#: src/buffer_funcs.C:99
+#: src/buffer_funcs.C:100
 msgid "&Load Original"
 msgstr "&Åpne originalen"
 
-#: src/buffer_funcs.C:122
+#: src/buffer_funcs.C:123
 #, c-format
 msgid ""
 "The backup of the document %1$s is newer.\n"
@@ -9352,32 +9352,32 @@ msgstr ""
 "\n"
 "Åpne sikkerhetskopien i stedet?"
 
-#: src/buffer_funcs.C:125
+#: src/buffer_funcs.C:126
 msgid "Load backup?"
 msgstr "Åpne sikkerhetskopi i stedet?"
 
-#: src/buffer_funcs.C:126
+#: src/buffer_funcs.C:127
 msgid "&Load backup"
 msgstr "&Åpne sikkerhetskopien"
 
-#: src/buffer_funcs.C:126
+#: src/buffer_funcs.C:127
 msgid "Load &original"
 msgstr "Åpne &originalen"
 
-#: src/buffer_funcs.C:165
+#: src/buffer_funcs.C:166
 #, c-format
 msgid "Do you want to retrieve the document %1$s from version control?"
 msgstr "Vil du hente inn dokumentet %1$s som er under versionskontroll?"
 
-#: src/buffer_funcs.C:167
+#: src/buffer_funcs.C:168
 msgid "Retrieve from version control?"
 msgstr "Vil du hente inn filen som er under versjonskontroll?"
 
-#: src/buffer_funcs.C:168
+#: src/buffer_funcs.C:169
 msgid "&Retrieve"
 msgstr "&Hent"
 
-#: src/buffer_funcs.C:201
+#: src/buffer_funcs.C:202
 #, c-format
 msgid ""
 "The specified document template\n"
@@ -9387,19 +9387,19 @@ msgstr ""
 "Malfilen %1$s\n"
 "kunne ikke leses."
 
-#: src/buffer_funcs.C:203
+#: src/buffer_funcs.C:204
 msgid "Could not read template"
 msgstr "Uleselig mal"
 
-#: src/buffer_funcs.C:514
+#: src/buffer_funcs.C:522
 msgid "\\arabic{enumi}."
 msgstr "\\arabic{enumi}."
 
-#: src/buffer_funcs.C:520
+#: src/buffer_funcs.C:528
 msgid "\\roman{enumiii}."
 msgstr "\\roman{enumiii}."
 
-#: src/buffer_funcs.C:523
+#: src/buffer_funcs.C:531
 msgid "\\Alph{enumiv}."
 msgstr "\\Alph{enumiv}."
 
@@ -9414,7 +9414,7 @@ msgstr ""
 "\n"
 "Vil du lagre dokumentet, eller forkaste endringene?"
 
-#: src/bufferlist.C:113 src/bufferlist.C:221 src/lyxfunc.C:726
+#: src/bufferlist.C:113 src/bufferlist.C:221 src/lyxfunc.C:731
 msgid "Save changed document?"
 msgstr "Lagre dokumentet?"
 
@@ -9422,20 +9422,20 @@ msgstr "Lagre dokumentet?"
 msgid "&Discard"
 msgstr "&Forkast"
 
-#: src/bufferlist.C:350
+#: src/bufferlist.C:348
 #, c-format
 msgid "LyX: Attempting to save document %1$s"
 msgstr "LyX: Forsøker å lagre dokument %1$s"
 
-#: src/bufferlist.C:361 src/bufferlist.C:374 src/bufferlist.C:388
+#: src/bufferlist.C:359 src/bufferlist.C:372 src/bufferlist.C:386
 msgid "  Save seems successful. Phew."
 msgstr "  Lagring trolig en suksess. Puh."
 
-#: src/bufferlist.C:364 src/bufferlist.C:378
+#: src/bufferlist.C:362 src/bufferlist.C:376
 msgid "  Save failed! Trying..."
 msgstr "  Lagring feilet! Prøver..."
 
-#: src/bufferlist.C:391
+#: src/bufferlist.C:389
 msgid "  Save failed! Bummer. Document is lost."
 msgstr "  Lagring feilet! Æsj. Mistet dokumentet."
 
@@ -9642,7 +9642,7 @@ msgstr ""
 msgid "RowPainter profiling"
 msgstr ""
 
-#: src/exporter.C:82
+#: src/exporter.C:82 src/lyxfunc.C:1066
 #, c-format
 msgid ""
 "The file %1$s already exists.\n"
@@ -9653,11 +9653,11 @@ msgstr ""
 "\n"
 "Vil du skrive over den?"
 
-#: src/exporter.C:85
+#: src/exporter.C:85 src/lyxfunc.C:1069
 msgid "Over-write file?"
 msgstr "Overskrive filen?"
 
-#: src/exporter.C:87 src/lyx_cb.C:168 src/lyxfunc.C:2016
+#: src/exporter.C:87 src/lyx_cb.C:168 src/lyxfunc.C:1070 src/lyxfunc.C:2030
 msgid "&Over-write"
 msgstr "Overskrive"
 
@@ -9678,33 +9678,33 @@ msgstr "Fikk ikke kopiert fil"
 msgid "Copying %1$s to %2$s failed."
 msgstr "Mislyktes i å kopiere %1$s til %2$s."
 
-#: src/exporter.C:177
+#: src/exporter.C:170
 msgid "Couldn't export file"
 msgstr "Kunne ikke eksportere fil"
 
-#: src/exporter.C:178
+#: src/exporter.C:171
 #, c-format
 msgid "No information for exporting the format %1$s."
 msgstr "Ingen informasjon om å eksportere formatet %1$s."
 
-#: src/exporter.C:212
+#: src/exporter.C:205
 msgid "File name error"
 msgstr "Feil med filnavnet"
 
-#: src/exporter.C:213
+#: src/exporter.C:206
 msgid "The directory path to the document cannot contain spaces."
 msgstr "Stien til dokumentet kan ikke inneholde mellomrom."
 
-#: src/exporter.C:252
+#: src/exporter.C:245
 msgid "Document export cancelled."
 msgstr "Avbrøt eksport av dokumentet."
 
-#: src/exporter.C:258
+#: src/exporter.C:251
 #, c-format
 msgid "Document exported as %1$s to file `%2$s'"
 msgstr "Dokumentet eksportert som %1$s til filen `%2$s'"
 
-#: src/exporter.C:264
+#: src/exporter.C:257
 #, c-format
 msgid "Document exported as %1$s"
 msgstr "Dokumentet eksportert som %1$s"
@@ -9750,7 +9750,7 @@ msgstr " (endret)"
 msgid " (read only)"
 msgstr " (skrivebeskyttet)"
 
-#: src/frontends/WorkArea.C:239
+#: src/frontends/WorkArea.C:243
 msgid "Formatting document..."
 msgstr "Formaterer dokument..."
 
@@ -9994,11 +9994,16 @@ msgstr "Velg tastaturoppsett"
 msgid "LyX keyboard maps (*.kmap)"
 msgstr "Lyx tastaturoppsettfiler (*.kmap)"
 
-#: src/frontends/controllers/ControlPrefs.C:136
+#: src/frontends/controllers/ControlPrefs.C:137
+#: src/frontends/controllers/ControlPrefs.C:141
 msgid "Choose personal dictionary"
 msgstr "Velg personlig ordliste"
 
-#: src/frontends/controllers/ControlPrefs.C:137
+#: src/frontends/controllers/ControlPrefs.C:138
+msgid "*.pws"
+msgstr ""
+
+#: src/frontends/controllers/ControlPrefs.C:142
 msgid "*.ispell"
 msgstr "*.ispell"
 
@@ -10047,7 +10052,7 @@ msgstr "Ett ord kontrollert."
 msgid "Spelling check completed"
 msgstr "Stavekontroll fullført"
 
-#: src/frontends/controllers/ControlToc.C:99 src/insets/insettoc.C:45
+#: src/frontends/controllers/ControlToc.C:99 src/insets/insettoc.C:46
 msgid "Table of Contents"
 msgstr "Innholdsfortegnelse"
 
@@ -10225,23 +10230,23 @@ msgstr "Merke"
 msgid "Directories"
 msgstr "Foldere"
 
-#: src/frontends/qt4/GuiView.C:126
+#: src/frontends/qt4/GuiView.C:133
 msgid "Small-sized icons"
 msgstr "Små ikoner"
 
-#: src/frontends/qt4/GuiView.C:132
+#: src/frontends/qt4/GuiView.C:139
 msgid "Normal-sized icons"
 msgstr "Normale ikoner"
 
-#: src/frontends/qt4/GuiView.C:139
+#: src/frontends/qt4/GuiView.C:146
 msgid "Big-sized icons"
 msgstr "Store ikoner"
 
-#: src/frontends/qt4/GuiView.C:669
+#: src/frontends/qt4/GuiView.C:617
 msgid "LyX"
 msgstr "LyX"
 
-#: src/frontends/qt4/GuiWorkArea.C:455
+#: src/frontends/qt4/GuiWorkArea.C:462
 msgid "unknown version"
 msgstr "ukjent versjon"
 
@@ -10270,19 +10275,19 @@ msgid "Activated"
 msgstr "Aktivert"
 
 #: src/frontends/qt4/QBranches.C:73 src/frontends/qt4/QBranches.C:145
-#: src/frontends/qt4/QDocumentDialog.C:618
+#: src/frontends/qt4/QDocumentDialog.C:619
 msgid "Yes"
 msgstr "Ja"
 
-#: src/frontends/qt4/QBranches.C:73 src/frontends/qt4/QDocumentDialog.C:617
+#: src/frontends/qt4/QBranches.C:73 src/frontends/qt4/QDocumentDialog.C:618
 msgid "No"
 msgstr "Nei"
 
-#: src/frontends/qt4/QChanges.C:36
+#: src/frontends/qt4/QChanges.C:35
 msgid "Merge Changes"
 msgstr "Revidere endringer"
 
-#: src/frontends/qt4/QChanges.C:66
+#: src/frontends/qt4/QChanges.C:57
 #, c-format
 msgid ""
 "Change by %1$s\n"
@@ -10291,7 +10296,7 @@ msgstr ""
 "Endring av %1$s\n"
 "\n"
 
-#: src/frontends/qt4/QChanges.C:68
+#: src/frontends/qt4/QChanges.C:59
 #, c-format
 msgid "Change made at %1$s\n"
 msgstr "Endring utført %1$s\n"
@@ -10341,154 +10346,154 @@ msgstr "Variabel"
 msgid "Document Settings"
 msgstr "Dokumentinnstillinger"
 
-#: src/frontends/qt4/QDocumentDialog.C:109
+#: src/frontends/qt4/QDocumentDialog.C:110
 msgid "Length"
 msgstr "Lengde"
 
-#: src/frontends/qt4/QDocumentDialog.C:115 src/text.C:1695
+#: src/frontends/qt4/QDocumentDialog.C:116 src/text.C:1689
 msgid "OneHalf"
 msgstr "Halvannen"
 
-#: src/frontends/qt4/QDocumentDialog.C:145
-#: src/frontends/qt4/QDocumentDialog.C:151
-#: src/frontends/qt4/QDocumentDialog.C:157
+#: src/frontends/qt4/QDocumentDialog.C:146
+#: src/frontends/qt4/QDocumentDialog.C:152
+#: src/frontends/qt4/QDocumentDialog.C:158
 msgid " (not installed)"
 msgstr " (ikke installert)"
 
-#: src/frontends/qt4/QDocumentDialog.C:161
-#: src/frontends/qt4/QDocumentDialog.C:187
-#: src/frontends/qt4/QDocumentDialog.C:527
+#: src/frontends/qt4/QDocumentDialog.C:162
+#: src/frontends/qt4/QDocumentDialog.C:188
+#: src/frontends/qt4/QDocumentDialog.C:528
 msgid "default"
 msgstr "standard"
 
-#: src/frontends/qt4/QDocumentDialog.C:162
+#: src/frontends/qt4/QDocumentDialog.C:163
 msgid "10"
 msgstr "10"
 
-#: src/frontends/qt4/QDocumentDialog.C:163
+#: src/frontends/qt4/QDocumentDialog.C:164
 msgid "11"
 msgstr "11"
 
-#: src/frontends/qt4/QDocumentDialog.C:164
+#: src/frontends/qt4/QDocumentDialog.C:165
 msgid "12"
 msgstr "12"
 
-#: src/frontends/qt4/QDocumentDialog.C:188
+#: src/frontends/qt4/QDocumentDialog.C:189
 msgid "empty"
 msgstr "tom"
 
-#: src/frontends/qt4/QDocumentDialog.C:189
+#: src/frontends/qt4/QDocumentDialog.C:190
 msgid "plain"
 msgstr "enkel"
 
-#: src/frontends/qt4/QDocumentDialog.C:190
+#: src/frontends/qt4/QDocumentDialog.C:191
 msgid "headings"
 msgstr ""
 
-#: src/frontends/qt4/QDocumentDialog.C:191
+#: src/frontends/qt4/QDocumentDialog.C:192
 msgid "fancy"
 msgstr ""
 
-#: src/frontends/qt4/QDocumentDialog.C:207
+#: src/frontends/qt4/QDocumentDialog.C:208
 msgid "B3"
 msgstr "B3"
 
-#: src/frontends/qt4/QDocumentDialog.C:208
+#: src/frontends/qt4/QDocumentDialog.C:209
 msgid "B4"
 msgstr "B4"
 
-#: src/frontends/qt4/QDocumentDialog.C:292
+#: src/frontends/qt4/QDocumentDialog.C:293
 msgid "LaTeX default"
 msgstr "LaTeX standard"
 
-#: src/frontends/qt4/QDocumentDialog.C:298
+#: src/frontends/qt4/QDocumentDialog.C:299
 msgid "``text''"
 msgstr "``tekst''"
 
-#: src/frontends/qt4/QDocumentDialog.C:299
+#: src/frontends/qt4/QDocumentDialog.C:300
 msgid "''text''"
 msgstr "''tekst''"
 
-#: src/frontends/qt4/QDocumentDialog.C:300
+#: src/frontends/qt4/QDocumentDialog.C:301
 msgid ",,text``"
 msgstr ",,tekst``"
 
-#: src/frontends/qt4/QDocumentDialog.C:301
+#: src/frontends/qt4/QDocumentDialog.C:302
 msgid ",,text''"
 msgstr ",,tekst''"
 
-#: src/frontends/qt4/QDocumentDialog.C:302
+#: src/frontends/qt4/QDocumentDialog.C:303
 msgid "<<text>>"
 msgstr "<<tekst>>"
 
-#: src/frontends/qt4/QDocumentDialog.C:303
+#: src/frontends/qt4/QDocumentDialog.C:304
 msgid ">>text<<"
 msgstr ">>tekst<<"
 
-#: src/frontends/qt4/QDocumentDialog.C:315
+#: src/frontends/qt4/QDocumentDialog.C:316
 msgid "Numbered"
 msgstr "Nummerert"
 
-#: src/frontends/qt4/QDocumentDialog.C:316
+#: src/frontends/qt4/QDocumentDialog.C:317
 msgid "Appears in TOC"
 msgstr "I innholdsliste"
 
-#: src/frontends/qt4/QDocumentDialog.C:329
+#: src/frontends/qt4/QDocumentDialog.C:330
 msgid "Author-year"
 msgstr "Forfatter-år"
 
-#: src/frontends/qt4/QDocumentDialog.C:330
+#: src/frontends/qt4/QDocumentDialog.C:331
 msgid "Numerical"
 msgstr "Numerisk"
 
-#: src/frontends/qt4/QDocumentDialog.C:362
+#: src/frontends/qt4/QDocumentDialog.C:363
 #, c-format
 msgid "Unavailable: %1$s"
 msgstr "Utilgjengelig: %1$s"
 
-#: src/frontends/qt4/QDocumentDialog.C:385
-#: src/frontends/qt4/QDocumentDialog.C:398
+#: src/frontends/qt4/QDocumentDialog.C:386
+#: src/frontends/qt4/QDocumentDialog.C:399
 msgid "Document Class"
 msgstr "Dokumentklasse"
 
-#: src/frontends/qt4/QDocumentDialog.C:386
+#: src/frontends/qt4/QDocumentDialog.C:387
 msgid "Fonts"
 msgstr "Fonter"
 
-#: src/frontends/qt4/QDocumentDialog.C:387
+#: src/frontends/qt4/QDocumentDialog.C:388
 msgid "Text Layout"
 msgstr "Tekststil"
 
-#: src/frontends/qt4/QDocumentDialog.C:388
+#: src/frontends/qt4/QDocumentDialog.C:389
 msgid "Page Layout"
 msgstr "Sidestil"
 
-#: src/frontends/qt4/QDocumentDialog.C:389
+#: src/frontends/qt4/QDocumentDialog.C:390
 msgid "Page Margins"
 msgstr "Tekstmarger"
 
-#: src/frontends/qt4/QDocumentDialog.C:391
+#: src/frontends/qt4/QDocumentDialog.C:392
 msgid "Numbering & TOC"
 msgstr "Seksjonsnumre"
 
-#: src/frontends/qt4/QDocumentDialog.C:393
+#: src/frontends/qt4/QDocumentDialog.C:394
 msgid "Math Options"
 msgstr "Matte-innstillinger"
 
-#: src/frontends/qt4/QDocumentDialog.C:394
+#: src/frontends/qt4/QDocumentDialog.C:395
 msgid "Float Placement"
 msgstr "\"Float\"-plassering"
 
-#: src/frontends/qt4/QDocumentDialog.C:395
+#: src/frontends/qt4/QDocumentDialog.C:396
 msgid "Bullets"
 msgstr "Bomber"
 
-#: src/frontends/qt4/QDocumentDialog.C:396
+#: src/frontends/qt4/QDocumentDialog.C:397
 msgid "Branches"
 msgstr "Dokumentgrener"
 
-#: src/frontends/qt4/QDocumentDialog.C:397
-#: src/frontends/qt4/QDocumentDialog.C:414
+#: src/frontends/qt4/QDocumentDialog.C:398
+#: src/frontends/qt4/QDocumentDialog.C:415
 msgid "LaTeX Preamble"
 msgstr ""
 
@@ -10886,7 +10891,7 @@ msgstr "Ingen informasjon om importering fra %1$s"
 msgid "imported."
 msgstr "importert."
 
-#: src/insets/insetbase.C:249
+#: src/insets/insetbase.C:242
 msgid "Opened inset"
 msgstr "Åpnet inset"
 
@@ -10942,24 +10947,29 @@ msgstr "Dobbel boks"
 msgid "Opened Box Inset"
 msgstr "Åpnet box inset"
 
-#: src/insets/insetbranch.C:75
+#: src/insets/insetbranch.C:76
 msgid "Opened Branch Inset"
 msgstr "Åpnet \"gren-inset\""
 
-#: src/insets/insetbranch.C:100
+#: src/insets/insetbranch.C:101
 msgid "Branch: "
 msgstr "Gren: "
 
-#: src/insets/insetbranch.C:107 src/insets/insetcharstyle.C:163
+#: src/insets/insetbranch.C:108 src/insets/insetcharstyle.C:163
 #: src/insets/insetcharstyle.C:212
 msgid "Undef: "
 msgstr ""
 
-#: src/insets/insetcaption.C:84
+#: src/insets/insetbranch.C:239
+#, fuzzy
+msgid "branch"
+msgstr "Dokumentgren"
+
+#: src/insets/insetcaption.C:87
 msgid "Opened Caption Inset"
 msgstr ""
 
-#: src/insets/insetcaption.C:106
+#: src/insets/insetcaption.C:275
 #, fuzzy
 msgid "Senseless!!! "
 msgstr "Meningsløst!"
@@ -10968,7 +10978,7 @@ msgstr "Meningsl
 msgid "Opened CharStyle Inset"
 msgstr ""
 
-#: src/insets/insetenv.C:65
+#: src/insets/insetenv.C:66
 msgid "Opened Environment Inset: "
 msgstr ""
 
@@ -10985,8 +10995,8 @@ msgstr "ERT"
 msgid "External template %1$s is not installed"
 msgstr "Ekstern mal %1$s er ikke installert"
 
-#: src/insets/insetfloat.C:121 src/insets/insetfloat.C:362
-#: src/insets/insetfloat.C:372
+#: src/insets/insetfloat.C:121 src/insets/insetfloat.C:373
+#: src/insets/insetfloat.C:383
 msgid "float: "
 msgstr "flytende: "
 
@@ -10994,7 +11004,12 @@ msgstr "flytende: "
 msgid "Opened Float Inset"
 msgstr "Åpnet \"float inset\""
 
-#: src/insets/insetfloat.C:374
+#: src/insets/insetfloat.C:334
+#, fuzzy
+msgid "float"
+msgstr "flytende: "
+
+#: src/insets/insetfloat.C:385
 msgid " (sideways)"
 msgstr "Rotér 90°"
 
@@ -11015,6 +11030,11 @@ msgstr "fot"
 msgid "Opened Footnote Inset"
 msgstr "Åpnet fotnote"
 
+#: src/insets/insetfoot.C:86
+#, fuzzy
+msgid "footnote"
+msgstr "Fotnote|n"
+
 #: src/insets/insetgraphics.C:472 src/insets/insetinclude.C:443
 #, c-format
 msgid ""
@@ -11026,12 +11046,12 @@ msgstr ""
 "%1$s\n"
 "inn i midlertidig mappe."
 
-#: src/insets/insetgraphics.C:706
+#: src/insets/insetgraphics.C:709
 #, c-format
 msgid "No conversion of %1$s is needed after all"
 msgstr "Det er ikke nødvendig å kovnvertere %1$s"
 
-#: src/insets/insetgraphics.C:817
+#: src/insets/insetgraphics.C:821
 #, c-format
 msgid "Graphics file: %1$s"
 msgstr "Grafikkfil: %1$s"
@@ -11072,11 +11092,12 @@ msgstr "N
 msgid "Index"
 msgstr "Register"
 
-#: src/insets/insetmarginal.C:32 src/insets/insetmarginal.C:40
+#: src/insets/insetmarginal.C:33 src/insets/insetmarginal.C:41
+#: src/insets/insetmarginal.C:71
 msgid "margin"
 msgstr "marg"
 
-#: src/insets/insetmarginal.C:53
+#: src/insets/insetmarginal.C:54
 #, fuzzy
 msgid "Opened Marginal Note Inset"
 msgstr "Åpnet \"float inset\""
@@ -11127,68 +11148,68 @@ msgstr "Blank side"
 msgid "Clear Double Page"
 msgstr "Dobbelt blank side"
 
-#: src/insets/insetref.C:150 src/mathed/InsetMathRef.C:183
+#: src/insets/insetref.C:151 src/mathed/InsetMathRef.C:183
 msgid "Ref: "
 msgstr "Ref: "
 
-#: src/insets/insetref.C:151 src/mathed/InsetMathRef.C:184
+#: src/insets/insetref.C:152 src/mathed/InsetMathRef.C:184
 msgid "Equation"
 msgstr "Ligning"
 
-#: src/insets/insetref.C:151 src/mathed/InsetMathRef.C:184
+#: src/insets/insetref.C:152 src/mathed/InsetMathRef.C:184
 msgid "EqRef: "
 msgstr "Formelref: "
 
-#: src/insets/insetref.C:152 src/mathed/InsetMathRef.C:185
+#: src/insets/insetref.C:153 src/mathed/InsetMathRef.C:185
 msgid "Page Number"
 msgstr "Sidetall"
 
-#: src/insets/insetref.C:152 src/mathed/InsetMathRef.C:185
+#: src/insets/insetref.C:153 src/mathed/InsetMathRef.C:185
 msgid "Page: "
 msgstr "Side: "
 
-#: src/insets/insetref.C:153 src/mathed/InsetMathRef.C:186
+#: src/insets/insetref.C:154 src/mathed/InsetMathRef.C:186
 msgid "Textual Page Number"
 msgstr "Sidetall"
 
-#: src/insets/insetref.C:153 src/mathed/InsetMathRef.C:186
+#: src/insets/insetref.C:154 src/mathed/InsetMathRef.C:186
 #, fuzzy
 msgid "TextPage: "
 msgstr "Side: "
 
-#: src/insets/insetref.C:154 src/mathed/InsetMathRef.C:187
+#: src/insets/insetref.C:155 src/mathed/InsetMathRef.C:187
 #, fuzzy
 msgid "Standard+Textual Page"
 msgstr "Sidetall"
 
-#: src/insets/insetref.C:154 src/mathed/InsetMathRef.C:187
+#: src/insets/insetref.C:155 src/mathed/InsetMathRef.C:187
 #, fuzzy
 msgid "Ref+Text: "
 msgstr "Ref: "
 
-#: src/insets/insetref.C:155 src/mathed/InsetMathRef.C:188
+#: src/insets/insetref.C:156 src/mathed/InsetMathRef.C:188
 #, fuzzy
 msgid "PrettyRef"
 msgstr "Ref: "
 
-#: src/insets/insetref.C:155 src/mathed/InsetMathRef.C:188
+#: src/insets/insetref.C:156 src/mathed/InsetMathRef.C:188
 #, fuzzy
-msgid "PrettyRef: "
-msgstr "Ref: "
+msgid "FormatRef: "
+msgstr "F&ormat:"
 
-#: src/insets/insettabular.C:449
+#: src/insets/insettabular.C:450
 msgid "Opened table"
 msgstr "Åpen tabell"
 
-#: src/insets/insettabular.C:1585
+#: src/insets/insettabular.C:1605
 msgid "Error setting multicolumn"
 msgstr "Feil bruk av multikolonne"
 
-#: src/insets/insettabular.C:1586
+#: src/insets/insettabular.C:1606
 msgid "You cannot set multicolumn vertically."
 msgstr "Multikolonne kan ikke brukes vertikalt."
 
-#: src/insets/insettext.C:233
+#: src/insets/insettext.C:234
 msgid "Opened Text Inset"
 msgstr "Åpnet text inset"
 
@@ -11201,7 +11222,7 @@ msgstr "teorem"
 msgid "Opened Theorem Inset"
 msgstr "Åpnet text inset"
 
-#: src/insets/insettoc.C:46
+#: src/insets/insettoc.C:47
 msgid "Unknown toc list"
 msgstr "Ukjent innholdsliste"
 
@@ -11213,7 +11234,7 @@ msgstr "Url: "
 msgid "HtmlUrl: "
 msgstr "HtmlUrl: "
 
-#: src/insets/insetvspace.C:109
+#: src/insets/insetvspace.C:110
 msgid "Vertical Space"
 msgstr "Vertikal avstand"
 
@@ -11226,6 +11247,11 @@ msgstr "tekstbryting: "
 msgid "Opened Wrap Inset"
 msgstr "Åpnet \"float inset\""
 
+#: src/insets/insetwrap.C:198
+#, fuzzy
+msgid "wrap"
+msgstr "tekstbryting: "
+
 #: src/insets/render_graphic.C:90 src/insets/render_graphic.C:94
 msgid "Not shown."
 msgstr "Vises ikke."
@@ -11432,11 +11458,11 @@ msgstr "&Bytte navn"
 msgid "Choose a filename to save document as"
 msgstr "Velg filnavn som dokumentet skal lagres som"
 
-#: src/lyx_cb.C:135 src/lyxfunc.C:1858
+#: src/lyx_cb.C:135 src/lyxfunc.C:1872
 msgid "Templates|#T#t"
 msgstr "Maler"
 
-#: src/lyx_cb.C:165 src/lyxfunc.C:2013
+#: src/lyx_cb.C:165 src/lyxfunc.C:2027
 #, c-format
 msgid ""
 "The document %1$s already exists.\n"
@@ -11447,7 +11473,7 @@ msgstr ""
 "\n"
 "Vil du overskrive det dokumentet?"
 
-#: src/lyx_cb.C:167 src/lyxfunc.C:2015
+#: src/lyx_cb.C:167 src/lyxfunc.C:2029
 msgid "Over-write document?"
 msgstr "OVerskrive dokument?"
 
@@ -11698,23 +11724,23 @@ msgstr "Mangler fil type [eks. latex, ps...] etter --import parameter"
 msgid "Missing filename for --import"
 msgstr "Mangler filnavn for --import"
 
-#: src/lyxfind.C:137
+#: src/lyxfind.C:136
 msgid "Search error"
 msgstr "Søkefeil"
 
-#: src/lyxfind.C:138
+#: src/lyxfind.C:137
 msgid "Search string is empty"
 msgstr "Ingenting å finne"
 
-#: src/lyxfind.C:289 src/lyxfind.C:320
+#: src/lyxfind.C:288 src/lyxfind.C:319
 msgid "String not found!"
 msgstr "Streng ikke funnet!"
 
-#: src/lyxfind.C:324
+#: src/lyxfind.C:323
 msgid "String has been replaced."
 msgstr "En streng har blitt erstattet."
 
-#: src/lyxfind.C:327
+#: src/lyxfind.C:326
 msgid " strings have been replaced."
 msgstr " strenger har blitt erstattet."
 
@@ -11777,7 +11803,7 @@ msgstr "Ingenting 
 msgid "Unknown action"
 msgstr "Ukjent operasjon"
 
-#: src/lyxfunc.C:431 src/lyxfunc.C:710
+#: src/lyxfunc.C:431 src/lyxfunc.C:715
 msgid "Command disabled"
 msgstr "Det går ikke her og nå"
 
@@ -11785,15 +11811,15 @@ msgstr "Det g
 msgid "Command not allowed without any document open"
 msgstr "Kommandoen er ikke lov uten åpne dokumenter"
 
-#: src/lyxfunc.C:696
+#: src/lyxfunc.C:701
 msgid "Document is read-only"
 msgstr "Dokumentet er ikke skrivbart."
 
-#: src/lyxfunc.C:704
+#: src/lyxfunc.C:709
 msgid "This portion of the document is deleted."
 msgstr "Denne delen av dokumentet er slettet."
 
-#: src/lyxfunc.C:723
+#: src/lyxfunc.C:728
 #, c-format
 msgid ""
 "The document %1$s has unsaved changes.\n"
@@ -11804,7 +11830,7 @@ msgstr ""
 "\n"
 "Vil du lagre dokumentet?"
 
-#: src/lyxfunc.C:741
+#: src/lyxfunc.C:746
 #, c-format
 msgid ""
 "Could not print the document %1$s.\n"
@@ -11813,11 +11839,11 @@ msgstr ""
 "Kunne ikke skrive ut dokumentet %1$s.\n"
 "Sjekk at skriveren er rett konfigurert."
 
-#: src/lyxfunc.C:744
+#: src/lyxfunc.C:749
 msgid "Print document failed"
 msgstr "Utskrift av dokumentet mislyktes"
 
-#: src/lyxfunc.C:763
+#: src/lyxfunc.C:768
 #, c-format
 msgid ""
 "The document could not be converted\n"
@@ -11826,20 +11852,20 @@ msgstr ""
 "Dokumentet kunne ikke konverteres\n"
 "til dokumentklassen %1$s."
 
-#: src/lyxfunc.C:766
+#: src/lyxfunc.C:771
 msgid "Could not change class"
 msgstr "Fikk ikke byttet klasse"
 
-#: src/lyxfunc.C:878
+#: src/lyxfunc.C:883
 #, c-format
 msgid "Saving document %1$s..."
 msgstr "Lagrer dokument %1$s..."
 
-#: src/lyxfunc.C:882
+#: src/lyxfunc.C:887
 msgid " done."
 msgstr "ferdig."
 
-#: src/lyxfunc.C:898
+#: src/lyxfunc.C:903
 #, c-format
 msgid ""
 "Any changes will be lost. Are you sure you want to revert to the saved "
@@ -11848,74 +11874,76 @@ msgstr ""
 "Alle endringer går tapt. Er du sikker på at du vil gå tilbake til den "
 "lagrede versjonen av dokumentet %1$s?"
 
-#: src/lyxfunc.C:1079
+#: src/lyxfunc.C:1093
 #, fuzzy
 msgid "Exiting."
 msgstr "Avslutter"
 
-#: src/lyxfunc.C:1105 src/text3.C:1229
+#: src/lyxfunc.C:1119 src/text3.C:1303
 msgid "Missing argument"
 msgstr "Mangler argument"
 
-#: src/lyxfunc.C:1114
+#: src/lyxfunc.C:1128
 #, c-format
 msgid "Opening help file %1$s..."
 msgstr "Åpner hjelpefil %1$s..."
 
-#: src/lyxfunc.C:1389
-msgid "Opening child document "
-msgstr "Åpner subdokument "
+#: src/lyxfunc.C:1402
+#, fuzzy, c-format
+msgid "Opening child document %1$s..."
+msgstr "Åpner dokument %1$s...\""
 
-#: src/lyxfunc.C:1476
+#: src/lyxfunc.C:1490
 msgid "Syntax: set-color <lyx_name> <x11_name>"
 msgstr ""
 
-#: src/lyxfunc.C:1487
+#: src/lyxfunc.C:1501
 #, c-format
 msgid "Set-color \"%1$s\" failed - color is undefined or may not be redefined"
 msgstr ""
 
-#: src/lyxfunc.C:1603
-msgid "Document defaults saved in "
+#: src/lyxfunc.C:1616
+#, fuzzy, c-format
+msgid "Document defaults saved in %1$s"
 msgstr "Standardverdier for dokumenter lagret i "
 
-#: src/lyxfunc.C:1606
+#: src/lyxfunc.C:1619
 msgid "Unable to save document defaults"
 msgstr "Fikk ikke lagret dokumentstandarder"
 
-#: src/lyxfunc.C:1662
+#: src/lyxfunc.C:1675
 msgid "Converting document to new document class..."
 msgstr "Konverterer dokument til ny tekstklasse..."
 
-#: src/lyxfunc.C:1855
+#: src/lyxfunc.C:1869
 msgid "Select template file"
 msgstr "Velg mal"
 
-#: src/lyxfunc.C:1892
+#: src/lyxfunc.C:1906
 msgid "Select document to open"
 msgstr "Velg dokument som skal åpnes"
 
-#: src/lyxfunc.C:1931
+#: src/lyxfunc.C:1945
 #, c-format
 msgid "Opening document %1$s..."
 msgstr "Åpner dokument %1$s...\""
 
-#: src/lyxfunc.C:1935
+#: src/lyxfunc.C:1949
 #, c-format
 msgid "Document %1$s opened."
 msgstr "Dokument %1$s åpnet."
 
-#: src/lyxfunc.C:1937
+#: src/lyxfunc.C:1951
 #, c-format
 msgid "Could not open document %1$s"
 msgstr "Kunne ikke åpne dokumentet %1$s"
 
-#: src/lyxfunc.C:1962
+#: src/lyxfunc.C:1976
 #, c-format
 msgid "Select %1$s file to import"
 msgstr "Velg %1$s fil som skal importeres"
 
-#: src/lyxfunc.C:2089
+#: src/lyxfunc.C:2103
 msgid "Welcome to LyX!"
 msgstr "Velkommen til LyX!"
 
@@ -12392,23 +12420,23 @@ msgstr ""
 msgid "No vertical grid lines in '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathGrid.C:1318
+#: src/mathed/InsetMathGrid.C:1317
 msgid "Only one row"
 msgstr "Bare én rad"
 
-#: src/mathed/InsetMathGrid.C:1324
+#: src/mathed/InsetMathGrid.C:1323
 msgid "Only one column"
 msgstr "Bare én kolonne"
 
-#: src/mathed/InsetMathGrid.C:1332
+#: src/mathed/InsetMathGrid.C:1331
 msgid "No hline to delete"
 msgstr "Ingen horisontal linje å fjerne"
 
-#: src/mathed/InsetMathGrid.C:1341
+#: src/mathed/InsetMathGrid.C:1340
 msgid "No vline to delete"
 msgstr "Ingen vertikal linje å fjerne"
 
-#: src/mathed/InsetMathGrid.C:1359
+#: src/mathed/InsetMathGrid.C:1358
 #, c-format
 msgid "Unknown tabular feature '%1$s'"
 msgstr ""
@@ -12645,11 +12673,11 @@ msgstr "LuxiMono"
 msgid "CM Typewriter Light"
 msgstr "CM Typewriter Light"
 
-#: src/text.C:134
+#: src/text.C:132
 msgid "Unknown layout"
 msgstr "Ukjent stil"
 
-#: src/text.C:135
+#: src/text.C:133
 #, c-format
 msgid ""
 "Layout '%1$s' does not exist in textclass '%2$s'\n"
@@ -12658,92 +12686,92 @@ msgstr ""
 "Avsnittstype '%1$s' fins ikke i klassen '%2$s'\n"
 "Prøver med standard i stedet.\n"
 
-#: src/text.C:166
+#: src/text.C:164
 msgid "Unknown Inset"
 msgstr ""
 
-#: src/text.C:276 src/text.C:289
+#: src/text.C:270 src/text.C:283
 msgid "Change tracking error"
 msgstr "Feil i endringssporing"
 
-#: src/text.C:277
+#: src/text.C:271
 #, c-format
 msgid "Unknown author index for insertion: %1$d\n"
 msgstr ""
 
-#: src/text.C:290
+#: src/text.C:284
 #, c-format
 msgid "Unknown author index for deletion: %1$d\n"
 msgstr ""
 
-#: src/text.C:297
+#: src/text.C:291
 msgid "Unknown token"
 msgstr ""
 
-#: src/text.C:733
+#: src/text.C:727
 msgid ""
 "You cannot insert a space at the beginning of a paragraph. Please read the "
 "Tutorial."
 msgstr ""
 "Det er ikke mulig å bruke to mellomrom på denne måten. Les 'Innføring.'"
 
-#: src/text.C:744
+#: src/text.C:738
 msgid "You cannot type two spaces this way. Please read the Tutorial."
 msgstr ""
 "Det er ikke mulig å bruke to mellomrom på denne måten. Les 'Innføring.'"
 
-#: src/text.C:1658
+#: src/text.C:1652
 msgid "[Change Tracking] "
 msgstr "[Endringssporing] "
 
-#: src/text.C:1664
+#: src/text.C:1658
 msgid "Change: "
 msgstr "Endring: "
 
-#: src/text.C:1668
+#: src/text.C:1662
 #, fuzzy
 msgid " at "
 msgstr " til "
 
-#: src/text.C:1678
+#: src/text.C:1672
 #, c-format
 msgid "Font: %1$s"
 msgstr "Font: %1$s"
 
-#: src/text.C:1683
+#: src/text.C:1677
 #, c-format
 msgid ", Depth: %1$d"
 msgstr ", Dybde: %1$d"
 
-#: src/text.C:1689
+#: src/text.C:1683
 msgid ", Spacing: "
 msgstr ", Linjeavstand: "
 
-#: src/text.C:1701
+#: src/text.C:1695
 msgid "Other ("
 msgstr "Annet ("
 
-#: src/text.C:1710
+#: src/text.C:1704
 msgid ", Inset: "
 msgstr ""
 
-#: src/text.C:1711
+#: src/text.C:1705
 msgid ", Paragraph: "
 msgstr ", Avsnitt: "
 
-#: src/text.C:1712
+#: src/text.C:1706
 msgid ", Id: "
 msgstr ", Id: "
 
-#: src/text.C:1713
+#: src/text.C:1707
 msgid ", Position: "
 msgstr ", Posisjon : "
 
-#: src/text.C:1719
+#: src/text.C:1713
 msgid ", Char: 0x"
 msgstr ""
 
-#: src/text.C:1721
+#: src/text.C:1715
 msgid ", Boundary: "
 msgstr ""
 
@@ -12763,23 +12791,23 @@ msgstr "Ingenting 
 msgid "Cannot index more than one paragraph!"
 msgstr "Kan ikke indeksere mer enn ett avsnitt!"
 
-#: src/text3.C:688
+#: src/text3.C:710
 msgid "Unknown spacing argument: "
 msgstr "Ukjent argument til linjeavstand: "
 
-#: src/text3.C:839
+#: src/text3.C:883
 msgid "Layout "
 msgstr "Stil "
 
-#: src/text3.C:840
+#: src/text3.C:884
 msgid " not known"
 msgstr " ukjent"
 
-#: src/text3.C:1334 src/text3.C:1346
+#: src/text3.C:1408 src/text3.C:1420
 msgid "Character set"
 msgstr "Tegnsett"
 
-#: src/text3.C:1477
+#: src/text3.C:1551
 msgid "Paragraph layout set"
 msgstr "Avsnittstil satt"
 
@@ -12807,6 +12835,13 @@ msgstr "vertikalt fyll, \\vfill"
 msgid "protected"
 msgstr "beskyttet"
 
+#, fuzzy
+#~ msgid "PrettyRef: "
+#~ msgstr "Ref: "
+
+#~ msgid "Opening child document "
+#~ msgstr "Åpner subdokument "
+
 #, fuzzy
 #~ msgid "Caption."
 #~ msgstr "Bildetekst"