]> git.lyx.org Git - lyx.git/blobdiff - po/nb.po
Fix bug 3080
[lyx.git] / po / nb.po
index c21aa86cedcb51759571acfe9e69d59b5abd26a3..8f0af6fc54d1c3377894631a486903661a8726b2 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 00:13+0100\n"
+"POT-Creation-Date: 2007-02-24 18:10+0100\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"
@@ -434,9 +434,8 @@ msgstr "Copyright"
 #: src/frontends/qt4/ui/QDelimiterUi.ui:148
 #: src/frontends/qt4/ui/QErrorListUi.ui:62
 #: src/frontends/qt4/ui/QExternalUi.ui:705 src/frontends/qt4/ui/QFloatUi.ui:85
-#: src/frontends/qt4/ui/QHSpaceUi.ui:171
 #: src/frontends/qt4/ui/QIncludeUi.ui:202 src/frontends/qt4/ui/QLogUi.ui:71
-#: src/frontends/qt4/ui/QMathUi.ui:60 src/frontends/qt4/ui/QParagraphUi.ui:281
+#: src/frontends/qt4/ui/QMathUi.ui:57 src/frontends/qt4/ui/QParagraphUi.ui:281
 #: src/frontends/qt4/ui/QPrefsUi.ui:96 src/frontends/qt4/ui/QRefUi.ui:100
 #: src/frontends/qt4/ui/QSearchUi.ui:210
 #: src/frontends/qt4/ui/QShowFileUi.ui:58
@@ -466,10 +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/QHSpaceUi.ui:148
-#: 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
@@ -480,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"
 
@@ -510,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"
 
@@ -725,7 +723,6 @@ msgstr "&Tilbakestill"
 #: src/frontends/qt4/ui/QDocumentUi.ui:145
 #: src/frontends/qt4/ui/QExternalUi.ui:695 src/frontends/qt4/ui/QFloatUi.ui:78
 #: src/frontends/qt4/ui/QGraphicsUi.ui:723
-#: src/frontends/qt4/ui/QHSpaceUi.ui:161
 #: src/frontends/qt4/ui/QParagraphUi.ui:271
 #: src/frontends/qt4/ui/QPrefsUi.ui:86 src/frontends/qt4/ui/QRefUi.ui:90
 #: src/frontends/qt4/ui/QSendtoUi.ui:88 src/frontends/qt4/ui/QVSpaceUi.ui:161
@@ -794,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"
@@ -1315,64 +1312,6 @@ msgstr "&Vis i LyX"
 msgid "Sca&le on Screen (%):"
 msgstr "Størrelse på skjermen (%):"
 
-#: src/frontends/qt4/ui/QHSpaceUi.ui:31 src/frontends/qt4/ui/QVSpaceUi.ui:31
-msgid "&Spacing:"
-msgstr "&Avstand:"
-
-#: src/frontends/qt4/ui/QHSpaceUi.ui:41 src/frontends/qt4/ui/QVSpaceUi.ui:41
-msgid "&Value:"
-msgstr "&Verdi:"
-
-#: src/frontends/qt4/ui/QHSpaceUi.ui:54 src/frontends/qt4/ui/QVSpaceUi.ui:54
-msgid "&Protect:"
-msgstr "Beskytt:"
-
-#: src/frontends/qt4/ui/QHSpaceUi.ui:64 src/frontends/qt4/ui/QVSpaceUi.ui:64
-msgid "Insert the spacing even after a page break"
-msgstr "Setter inn vertikal avstand også rett etter sideskift"
-
-#: src/frontends/qt4/ui/QHSpaceUi.ui:77 src/frontends/qt4/ui/QVSpaceUi.ui:77
-msgid "Custom value. Needs spacing type \"Custom\"."
-msgstr "Brukerdefinert verdi. Krever typen \"Brukerdefinert\"."
-
-#: src/frontends/qt4/ui/QHSpaceUi.ui:84 src/frontends/qt4/ui/QVSpaceUi.ui:84
-msgid "Supported spacing types"
-msgstr "Typer vertikalt mellomrom"
-
-#: src/frontends/qt4/ui/QHSpaceUi.ui:88 src/frontends/qt4/ui/QVSpaceUi.ui:88
-msgid "DefSkip"
-msgstr "Standard avstand"
-
-#: src/frontends/qt4/ui/QHSpaceUi.ui:93 src/frontends/qt4/ui/QVSpaceUi.ui:93
-#: src/frontends/qt4/QDocumentDialog.C:106
-msgid "SmallSkip"
-msgstr "Liten avstand"
-
-#: src/frontends/qt4/ui/QHSpaceUi.ui:98 src/frontends/qt4/ui/QVSpaceUi.ui:98
-#: src/frontends/qt4/QDocumentDialog.C:107
-msgid "MedSkip"
-msgstr "Medium avstand"
-
-#: src/frontends/qt4/ui/QHSpaceUi.ui:103 src/frontends/qt4/ui/QVSpaceUi.ui:103
-#: src/frontends/qt4/QDocumentDialog.C:108
-msgid "BigSkip"
-msgstr "Stor avstand"
-
-#: src/frontends/qt4/ui/QHSpaceUi.ui:108 src/frontends/qt4/ui/QVSpaceUi.ui:108
-msgid "VFill"
-msgstr "Vertikalt fyll (\\vfill)"
-
-#: src/frontends/qt4/ui/QHSpaceUi.ui:113
-#: src/frontends/qt4/ui/QParagraphUi.ui:52
-#: src/frontends/qt4/ui/QTabularUi.ui:712
-#: 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
-msgid "Custom"
-msgstr "Brukerdefinert"
-
 #: src/frontends/qt4/ui/QIncludeUi.ui:39
 #, fuzzy
 msgid "Show LaTeX preview"
@@ -1473,119 +1412,123 @@ msgstr "Horisontaljustering pr kolonne (l=venstre,c=sentrert,r=h
 msgid "&Horizontal:"
 msgstr "&Horisontal:"
 
-#: src/frontends/qt4/ui/QMathUi.ui:67
+#: src/frontends/qt4/ui/QMathUi.ui:64
 msgid "Open this panel as a separate window"
 msgstr "Åpne dette panelet som et eget vindu"
 
-#: src/frontends/qt4/ui/QMathUi.ui:70
+#: src/frontends/qt4/ui/QMathUi.ui:67
 msgid "&Detach panel"
 msgstr "&Riv løs panel"
 
-#: src/frontends/qt4/ui/QMathUi.ui:98
+#: src/frontends/qt4/ui/QMathUi.ui:95
 msgid "Select a page of symbols"
 msgstr "Velg symbolsett"
 
-#: src/frontends/qt4/ui/QMathUi.ui:102
+#: src/frontends/qt4/ui/QMathUi.ui:99
 msgid "Operators"
 msgstr "Operatorer"
 
-#: src/frontends/qt4/ui/QMathUi.ui:107
+#: src/frontends/qt4/ui/QMathUi.ui:104
 msgid "Big operators"
 msgstr "Store operatorer"
 
-#: src/frontends/qt4/ui/QMathUi.ui:112
+#: src/frontends/qt4/ui/QMathUi.ui:109
 msgid "Relations"
 msgstr "Relasjoner"
 
-#: src/frontends/qt4/ui/QMathUi.ui:117 lib/languages:33
+#: src/frontends/qt4/ui/QMathUi.ui:114 lib/languages:33
 msgid "Greek"
 msgstr "Gresk"
 
-#: src/frontends/qt4/ui/QMathUi.ui:122
+#: src/frontends/qt4/ui/QMathUi.ui:119
 msgid "Arrows"
 msgstr "Piler"
 
-#: src/frontends/qt4/ui/QMathUi.ui:127
+#: src/frontends/qt4/ui/QMathUi.ui:124
 msgid "Dots"
 msgstr "Prikker"
 
-#: src/frontends/qt4/ui/QMathUi.ui:132
+#: src/frontends/qt4/ui/QMathUi.ui:129
 msgid "Frame decorations"
 msgstr "Pil/hatt/klamme over/under teksten"
 
-#: src/frontends/qt4/ui/QMathUi.ui:137
+#: src/frontends/qt4/ui/QMathUi.ui:134
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: src/frontends/qt4/ui/QMathUi.ui:142
+#: src/frontends/qt4/ui/QMathUi.ui:139
 msgid "AMS operators"
 msgstr "AMS operatorer"
 
-#: src/frontends/qt4/ui/QMathUi.ui:147
+#: src/frontends/qt4/ui/QMathUi.ui:144
 msgid "AMS relations"
 msgstr "AMS relasjoner"
 
-#: src/frontends/qt4/ui/QMathUi.ui:152
+#: src/frontends/qt4/ui/QMathUi.ui:149
 msgid "AMS negated relations"
 msgstr "AMS negerte relasjoner"
 
-#: src/frontends/qt4/ui/QMathUi.ui:157
+#: src/frontends/qt4/ui/QMathUi.ui:154
 msgid "AMS arrows"
 msgstr "AMS piler"
 
-#: src/frontends/qt4/ui/QMathUi.ui:162
+#: src/frontends/qt4/ui/QMathUi.ui:159
 msgid "AMS Miscellaneous"
 msgstr "AMS diverse"
 
-#: src/frontends/qt4/ui/QMathUi.ui:195
+#: src/frontends/qt4/ui/QMathUi.ui:192
 msgid "&Functions"
 msgstr "Funksjoner"
 
-#: src/frontends/qt4/ui/QMathUi.ui:240 lib/ui/stdtoolbars.inc:127
+#: src/frontends/qt4/ui/QMathUi.ui:237 lib/ui/stdtoolbars.inc:127
 msgid "Insert root"
 msgstr "Sett inn n-rot"
 
-#: src/frontends/qt4/ui/QMathUi.ui:265
+#: src/frontends/qt4/ui/QMathUi.ui:262
 msgid "Insert spacing"
 msgstr "Sett inn mellomrom"
 
-#: src/frontends/qt4/ui/QMathUi.ui:290
+#: src/frontends/qt4/ui/QMathUi.ui:287
 msgid "Set limits style"
 msgstr "Stil for grenseverdier"
 
-#: src/frontends/qt4/ui/QMathUi.ui:315 src/frontends/qt4/ui/QMathUi.ui:340
+#: src/frontends/qt4/ui/QMathUi.ui:312
 msgid "Set math font"
 msgstr "Sett matte-font"
 
-#: src/frontends/qt4/ui/QMathUi.ui:367
+#: src/frontends/qt4/ui/QMathUi.ui:337 lib/ui/stdtoolbars.inc:133
+msgid "Insert fraction"
+msgstr "Sett inn brøk"
+
+#: src/frontends/qt4/ui/QMathUi.ui:364
 msgid "Toggle between display and inline mode"
 msgstr "Bytt mellom formel i tekst, og fremhevet formel"
 
-#: src/frontends/qt4/ui/QMathUi.ui:386 lib/ui/stdtoolbars.inc:125
+#: src/frontends/qt4/ui/QMathUi.ui:383 lib/ui/stdtoolbars.inc:125
 msgid "Subscript"
 msgstr "Senket skrift"
 
-#: src/frontends/qt4/ui/QMathUi.ui:405 lib/ui/stdtoolbars.inc:126
+#: src/frontends/qt4/ui/QMathUi.ui:402 lib/ui/stdtoolbars.inc:126
 msgid "Superscript"
 msgstr "Hevet skrift"
 
-#: src/frontends/qt4/ui/QMathUi.ui:424 lib/ui/stdtoolbars.inc:138
+#: src/frontends/qt4/ui/QMathUi.ui:421 lib/ui/stdtoolbars.inc:138
 msgid "Insert matrix"
 msgstr "Sett inn matrise"
 
-#: src/frontends/qt4/ui/QMathUi.ui:443
+#: src/frontends/qt4/ui/QMathUi.ui:440
 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:"
 
@@ -1634,7 +1577,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"
 
@@ -1643,10 +1586,20 @@ 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"
 
+#: src/frontends/qt4/ui/QParagraphUi.ui:52
+#: src/frontends/qt4/ui/QTabularUi.ui:712
+#: 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:120
+#: src/frontends/qt4/QDocumentDialog.C:201
+msgid "Custom"
+msgstr "Brukerdefinert"
+
 #: src/frontends/qt4/ui/QParagraphUi.ui:60
 msgid "L&ine spacing:"
 msgstr "L&injeavstand:"
@@ -1916,37 +1869,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"
 
@@ -2298,7 +2251,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"
 
@@ -2860,7 +2813,7 @@ msgid "&Type:"
 msgstr "&Type:"
 
 #: src/frontends/qt4/ui/QURLUi.ui:31 src/frontends/qt4/ui/QURLUi.ui:64
-#: lib/layouts/scrlttr2.layout:208 lib/layouts/amsdefs.inc:186
+#: lib/layouts/scrlttr2.layout:207 lib/layouts/amsdefs.inc:186
 #: src/frontends/qt4/UrlView.C:33
 msgid "URL"
 msgstr "URL"
@@ -2881,6 +2834,53 @@ msgstr "Eksport
 msgid "&Generate hyperlink"
 msgstr "&Lag hyperlink"
 
+#: src/frontends/qt4/ui/QVSpaceUi.ui:31
+msgid "&Spacing:"
+msgstr "&Avstand:"
+
+#: src/frontends/qt4/ui/QVSpaceUi.ui:41
+msgid "&Value:"
+msgstr "&Verdi:"
+
+#: src/frontends/qt4/ui/QVSpaceUi.ui:54
+msgid "&Protect:"
+msgstr "Beskytt:"
+
+#: src/frontends/qt4/ui/QVSpaceUi.ui:64
+msgid "Insert the spacing even after a page break"
+msgstr "Setter inn vertikal avstand også rett etter sideskift"
+
+#: src/frontends/qt4/ui/QVSpaceUi.ui:77
+msgid "Custom value. Needs spacing type \"Custom\"."
+msgstr "Brukerdefinert verdi. Krever typen \"Brukerdefinert\"."
+
+#: src/frontends/qt4/ui/QVSpaceUi.ui:84
+msgid "Supported spacing types"
+msgstr "Typer vertikalt mellomrom"
+
+#: src/frontends/qt4/ui/QVSpaceUi.ui:88
+msgid "DefSkip"
+msgstr "Standard avstand"
+
+#: src/frontends/qt4/ui/QVSpaceUi.ui:93
+#: src/frontends/qt4/QDocumentDialog.C:107
+msgid "SmallSkip"
+msgstr "Liten avstand"
+
+#: src/frontends/qt4/ui/QVSpaceUi.ui:98
+#: src/frontends/qt4/QDocumentDialog.C:108
+msgid "MedSkip"
+msgstr "Medium avstand"
+
+#: src/frontends/qt4/ui/QVSpaceUi.ui:103
+#: src/frontends/qt4/QDocumentDialog.C:109
+msgid "BigSkip"
+msgstr "Stor avstand"
+
+#: src/frontends/qt4/ui/QVSpaceUi.ui:108
+msgid "VFill"
+msgstr "Vertikalt fyll (\\vfill)"
+
 #: src/frontends/qt4/ui/QViewSourceUi.ui:46
 msgid "Display complete source"
 msgstr ""
@@ -2955,8 +2955,8 @@ 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/mathed/InsetMathRef.C:183
+#: src/frontends/qt4/BulletsModule.C:46 src/insets/insetref.C:151
+#: src/mathed/InsetMathRef.C:175
 msgid "Standard"
 msgstr "Standard"
 
@@ -2964,7 +2964,7 @@ msgstr "Standard"
 msgid "TheoremTemplate"
 msgstr ""
 
-#: lib/layouts/IEEEtran.layout:63 lib/layouts/beamer.layout:946
+#: lib/layouts/IEEEtran.layout:63 lib/layouts/beamer.layout:925
 #: lib/layouts/elsart.layout:291 lib/layouts/foils.layout:283
 #: lib/layouts/heb-article.layout:95 lib/layouts/ijmpc.layout:230
 #: lib/layouts/ijmpd.layout:230 lib/layouts/llncs.layout:374
@@ -2978,7 +2978,7 @@ msgid "Proof:"
 msgstr "Bevis:"
 
 #: lib/layouts/IEEEtran.layout:71 lib/layouts/amsart-plain.layout:26
-#: lib/layouts/amsart-seq.layout:137 lib/layouts/beamer.layout:1024
+#: lib/layouts/amsart-seq.layout:137 lib/layouts/beamer.layout:1003
 #: lib/layouts/elsart.layout:262 lib/layouts/foils.layout:223
 #: lib/layouts/heb-article.layout:18 lib/layouts/ijmpc.layout:208
 #: lib/layouts/ijmpd.layout:211 lib/layouts/llncs.layout:415
@@ -3007,7 +3007,7 @@ msgid "Lemma #:"
 msgstr "Lemma #:"
 
 #: lib/layouts/IEEEtran.layout:91 lib/layouts/amsart-plain.layout:31
-#: lib/layouts/amsart-seq.layout:143 lib/layouts/beamer.layout:510
+#: lib/layouts/amsart-seq.layout:143 lib/layouts/beamer.layout:489
 #: lib/layouts/elsart.layout:325 lib/layouts/foils.layout:255
 #: lib/layouts/heb-article.layout:55 lib/layouts/ijmpc.layout:250
 #: lib/layouts/ijmpd.layout:251 lib/layouts/llncs.layout:319
@@ -3059,7 +3059,7 @@ msgid "Criterion #:"
 msgstr "Kriterie #:"
 
 #: lib/layouts/IEEEtran.layout:131 lib/layouts/amsart-plain.layout:67
-#: lib/layouts/amsart-seq.layout:179 lib/layouts/beamer.layout:731
+#: lib/layouts/amsart-seq.layout:179 lib/layouts/beamer.layout:710
 #: lib/layouts/amsmaths-plain.inc:103 lib/layouts/amsmaths-seq.inc:88
 #: lib/layouts/amsmaths.inc:213
 msgid "Fact"
@@ -3080,7 +3080,7 @@ msgid "Axiom #:"
 msgstr "Aksiom #:"
 
 #: lib/layouts/IEEEtran.layout:151 lib/layouts/amsart-plain.layout:79
-#: lib/layouts/amsart-seq.layout:191 lib/layouts/beamer.layout:673
+#: lib/layouts/amsart-seq.layout:191 lib/layouts/beamer.layout:652
 #: lib/layouts/elsart.layout:353 lib/layouts/foils.layout:269
 #: lib/layouts/heb-article.layout:75 lib/layouts/ijmpc.layout:143
 #: lib/layouts/ijmpd.layout:140 lib/layouts/llncs.layout:333
@@ -3095,12 +3095,12 @@ msgid "Definition #:"
 msgstr "Definisjon #:"
 
 #: lib/layouts/IEEEtran.layout:161 lib/layouts/amsart-plain.layout:85
-#: lib/layouts/amsart-seq.layout:197 lib/layouts/beamer.layout:685
+#: lib/layouts/amsart-seq.layout:197 lib/layouts/beamer.layout:664
 #: lib/layouts/elsart.layout:374 lib/layouts/ijmpc.layout:178
 #: 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"
 
@@ -3203,9 +3203,9 @@ msgid "Case #:"
 msgstr ""
 
 #: lib/layouts/IEEEtran.layout:269 lib/layouts/aa.layout:37
-#: lib/layouts/aa.layout:234 lib/layouts/aapaper.layout:66
-#: lib/layouts/aapaper.layout:131 lib/layouts/aastex.layout:64
-#: lib/layouts/aastex.layout:168 lib/layouts/amsart.layout:61
+#: lib/layouts/aa.layout:216 lib/layouts/aapaper.layout:64
+#: lib/layouts/aapaper.layout:129 lib/layouts/aastex.layout:64
+#: lib/layouts/aastex.layout:166 lib/layouts/amsart.layout:61
 #: lib/layouts/amsbook.layout:47 lib/layouts/amsbook.layout:95
 #: lib/layouts/beamer.layout:265 lib/layouts/cv.layout:29
 #: lib/layouts/egs.layout:29 lib/layouts/ijmpc.layout:102
@@ -3224,9 +3224,9 @@ msgid "Section"
 msgstr "Seksjon"
 
 #: lib/layouts/IEEEtran.layout:279 lib/layouts/aa.layout:40
-#: lib/layouts/aa.layout:244 lib/layouts/aapaper.layout:69
-#: lib/layouts/aapaper.layout:140 lib/layouts/aastex.layout:67
-#: lib/layouts/aastex.layout:181 lib/layouts/amsart.layout:72
+#: lib/layouts/aa.layout:226 lib/layouts/aapaper.layout:67
+#: lib/layouts/aapaper.layout:138 lib/layouts/aastex.layout:67
+#: lib/layouts/aastex.layout:179 lib/layouts/amsart.layout:72
 #: lib/layouts/amsbook.layout:58 lib/layouts/beamer.layout:306
 #: lib/layouts/cv.layout:50 lib/layouts/egs.layout:50
 #: lib/layouts/ijmpc.layout:118 lib/layouts/ijmpd.layout:114
@@ -3243,9 +3243,9 @@ msgid "Subsection"
 msgstr "Underseksjon"
 
 #: lib/layouts/IEEEtran.layout:287 lib/layouts/aa.layout:43
-#: lib/layouts/aa.layout:256 lib/layouts/aapaper.layout:72
-#: lib/layouts/aapaper.layout:151 lib/layouts/aastex.layout:70
-#: lib/layouts/aastex.layout:194 lib/layouts/amsart.layout:80
+#: lib/layouts/aa.layout:238 lib/layouts/aapaper.layout:70
+#: lib/layouts/aapaper.layout:149 lib/layouts/aastex.layout:70
+#: lib/layouts/aastex.layout:192 lib/layouts/amsart.layout:80
 #: lib/layouts/amsbook.layout:66 lib/layouts/ijmpc.layout:127
 #: lib/layouts/ijmpd.layout:123 lib/layouts/isprs.layout:177
 #: lib/layouts/kluwer.layout:75 lib/layouts/llncs.layout:60
@@ -3260,7 +3260,7 @@ msgid "Subsubsection"
 msgstr "UnderUnderSeksjon"
 
 #: lib/layouts/IEEEtran.layout:295 lib/layouts/beamer.layout:297
-#: lib/layouts/egs.layout:601 lib/layouts/ijmpc.layout:110
+#: lib/layouts/egs.layout:586 lib/layouts/ijmpc.layout:110
 #: lib/layouts/ijmpd.layout:106 lib/layouts/isprs.layout:186
 #: lib/layouts/siamltex.layout:81 lib/layouts/spie.layout:29
 #: lib/layouts/aguplus.inc:34 lib/layouts/db_stdstarsections.inc:36
@@ -3269,7 +3269,7 @@ msgid "Section*"
 msgstr "Seksjon*"
 
 #: lib/layouts/IEEEtran.layout:305 lib/layouts/beamer.layout:339
-#: lib/layouts/egs.layout:621 lib/layouts/isprs.layout:197
+#: lib/layouts/egs.layout:606 lib/layouts/isprs.layout:197
 #: lib/layouts/siamltex.layout:88 lib/layouts/aguplus.inc:48
 #: lib/layouts/db_stdstarsections.inc:48 lib/layouts/stdstarsections.inc:39
 msgid "Subsection*"
@@ -3281,10 +3281,10 @@ msgstr "Underseksjon*"
 msgid "Subsubsection*"
 msgstr "UnderUnderSeksjon*"
 
-#: lib/layouts/IEEEtran.layout:328 lib/layouts/aa.layout:82
-#: lib/layouts/aa.layout:302 lib/layouts/aa.layout:318
-#: lib/layouts/aapaper.layout:99 lib/layouts/aapaper.layout:194
-#: lib/layouts/aastex.layout:106 lib/layouts/aastex.layout:246
+#: lib/layouts/IEEEtran.layout:328 lib/layouts/aa.layout:80
+#: lib/layouts/aa.layout:284 lib/layouts/aa.layout:300
+#: lib/layouts/aapaper.layout:97 lib/layouts/aapaper.layout:192
+#: lib/layouts/aastex.layout:106 lib/layouts/aastex.layout:244
 #: lib/layouts/apa.layout:70 lib/layouts/cl2emult.layout:79
 #: lib/layouts/cl2emult.layout:91 lib/layouts/egs.layout:491
 #: lib/layouts/elsart.layout:206 lib/layouts/elsart.layout:222
@@ -3300,7 +3300,7 @@ msgstr "UnderUnderSeksjon*"
 #: lib/layouts/amsdefs.inc:125 lib/layouts/db_stdstruct.inc:11
 #: lib/layouts/scrclass.inc:216 lib/layouts/stdstruct.inc:12
 #: lib/layouts/stdstruct.inc:27 lib/layouts/svjour.inc:252
-#: src/output_plaintext.C:152
+#: src/output_plaintext.C:146
 msgid "Abstract"
 msgstr "Sammendrag"
 
@@ -3309,7 +3309,7 @@ msgid "Abstract---"
 msgstr "Sammendrag---"
 
 #: lib/layouts/IEEEtran.layout:348 lib/layouts/aastex.layout:109
-#: lib/layouts/aastex.layout:283 lib/layouts/elsart.layout:64
+#: lib/layouts/aastex.layout:281 lib/layouts/elsart.layout:64
 #: lib/layouts/ijmpc.layout:80 lib/layouts/ijmpd.layout:83
 #: lib/layouts/isprs.layout:52 lib/layouts/kluwer.layout:282
 #: lib/layouts/paper.layout:174 lib/layouts/revtex4.layout:241
@@ -3323,14 +3323,14 @@ msgstr "N
 msgid "Index Terms---"
 msgstr ""
 
-#: lib/layouts/IEEEtran.layout:371 lib/layouts/aa.layout:88
-#: lib/layouts/aa.layout:332 lib/layouts/aapaper.layout:105
-#: lib/layouts/aapaper.layout:211 lib/layouts/beamer.layout:440
+#: lib/layouts/IEEEtran.layout:371 lib/layouts/aa.layout:86
+#: lib/layouts/aa.layout:314 lib/layouts/aapaper.layout:103
+#: lib/layouts/aapaper.layout:209 lib/layouts/beamer.layout:440
 #: lib/layouts/book.layout:21 lib/layouts/book.layout:23
 #: lib/layouts/cl2emult.layout:102 lib/layouts/cv.layout:143
 #: lib/layouts/egs.layout:562 lib/layouts/foils.layout:215
 #: lib/layouts/ijmpc.layout:361 lib/layouts/ijmpd.layout:372
-#: lib/layouts/latex8.layout:123 lib/layouts/llncs.layout:261
+#: lib/layouts/latex8.layout:118 lib/layouts/llncs.layout:261
 #: lib/layouts/memoir.layout:138 lib/layouts/memoir.layout:140
 #: lib/layouts/mwbk.layout:21 lib/layouts/mwbk.layout:23
 #: lib/layouts/mwrep.layout:12 lib/layouts/mwrep.layout:14
@@ -3340,12 +3340,12 @@ 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"
 
 #: lib/layouts/IEEEtran.layout:380 lib/layouts/IEEEtran.layout:391
-#: lib/layouts/aastex.layout:115 lib/layouts/aastex.layout:410
+#: lib/layouts/aastex.layout:115 lib/layouts/aastex.layout:408
 #: lib/layouts/ijmpc.layout:338 lib/layouts/ijmpd.layout:349
 #: lib/layouts/kluwer.layout:323 lib/layouts/kluwer.layout:336
 #: src/rowpainter.C:507
@@ -3364,28 +3364,16 @@ msgstr "Biografi"
 msgid "BiographyNoPhoto"
 msgstr "BiografiUtenFoto"
 
-#: lib/layouts/IEEEtran.layout:439 lib/layouts/aa.layout:58
-#: lib/layouts/aa.layout:216 lib/layouts/aa.layout:227
-#: lib/layouts/aapaper.layout:60 lib/layouts/aastex.layout:133
-#: lib/layouts/aastex.layout:530 lib/layouts/aastex.layout:541
-#: lib/layouts/beamer.layout:490 lib/layouts/beamer.layout:501
-#: lib/layouts/egs.layout:584 lib/layouts/egs.layout:594
-#: lib/layouts/isprs.layout:215 lib/layouts/latex8.layout:116
-#: lib/layouts/db_stdlayouts.inc:29 lib/layouts/stdlayouts.inc:64
-#: lib/ui/stdmenus.inc:303
-msgid "Caption"
-msgstr "Bildetekst"
-
-#: lib/layouts/IEEEtran.layout:446 lib/layouts/IEEEtran.layout:457
+#: lib/layouts/IEEEtran.layout:441 lib/layouts/IEEEtran.layout:452
 msgid "Footernote"
 msgstr ""
 
-#: lib/layouts/IEEEtran.layout:469
+#: lib/layouts/IEEEtran.layout:464
 msgid "MarkBoth"
 msgstr ""
 
 #: lib/layouts/aa.layout:46 lib/layouts/aapaper.layout:48
-#: lib/layouts/aastex.layout:76 lib/layouts/apa.layout:294
+#: lib/layouts/aastex.layout:76 lib/layouts/apa.layout:308
 #: lib/layouts/beamer.layout:41 lib/layouts/cv.layout:80
 #: lib/layouts/egs.layout:162 lib/layouts/manpage.layout:82
 #: lib/layouts/agu_stdlists.inc:13 lib/layouts/db_stdlists.inc:12
@@ -3394,7 +3382,7 @@ msgid "Itemize"
 msgstr "Punktliste"
 
 #: lib/layouts/aa.layout:49 lib/layouts/aapaper.layout:51
-#: lib/layouts/aastex.layout:79 lib/layouts/apa.layout:312
+#: lib/layouts/aastex.layout:79 lib/layouts/apa.layout:326
 #: lib/layouts/beamer.layout:59 lib/layouts/egs.layout:144
 #: lib/layouts/manpage.layout:65 lib/layouts/agu_stdlists.inc:21
 #: lib/layouts/db_stdlists.inc:19 lib/layouts/stdlists.inc:29
@@ -3420,10 +3408,10 @@ msgstr "Beskrivelse"
 msgid "List"
 msgstr "Liste"
 
-#: lib/layouts/aa.layout:61 lib/layouts/aa.layout:266
-#: lib/layouts/aapaper.layout:75 lib/layouts/aapaper.layout:161
-#: lib/layouts/aastex.layout:88 lib/layouts/aastex.layout:208
-#: lib/layouts/apa.layout:39 lib/layouts/beamer.layout:977
+#: lib/layouts/aa.layout:59 lib/layouts/aa.layout:248
+#: lib/layouts/aapaper.layout:73 lib/layouts/aapaper.layout:159
+#: lib/layouts/aastex.layout:88 lib/layouts/aastex.layout:206
+#: lib/layouts/apa.layout:39 lib/layouts/beamer.layout:956
 #: lib/layouts/broadway.layout:190 lib/layouts/cl2emult.layout:39
 #: lib/layouts/cv.layout:122 lib/layouts/docbook-book.layout:11
 #: lib/layouts/docbook-chapter.layout:9 lib/layouts/docbook-section.layout:9
@@ -3434,8 +3422,8 @@ msgstr "Liste"
 #: lib/layouts/kluwer.layout:104 lib/layouts/latex8.layout:33
 #: lib/layouts/llncs.layout:99 lib/layouts/ltugboat.layout:134
 #: lib/layouts/paper.layout:112 lib/layouts/revtex.layout:90
-#: lib/layouts/revtex4.layout:107 lib/layouts/scrlettr.layout:194
-#: lib/layouts/scrlttr2.layout:272 lib/layouts/siamltex.layout:109
+#: lib/layouts/revtex4.layout:107 lib/layouts/scrlettr.layout:193
+#: lib/layouts/scrlttr2.layout:271 lib/layouts/siamltex.layout:109
 #: lib/layouts/svprobth.layout:35 lib/layouts/agu_stdtitle.inc:246
 #: lib/layouts/amsdefs.inc:60 lib/layouts/db_stdtitle.inc:13
 #: lib/layouts/scrclass.inc:146 lib/layouts/stdtitle.inc:12
@@ -3443,17 +3431,17 @@ msgstr "Liste"
 msgid "Title"
 msgstr "Tittel"
 
-#: lib/layouts/aa.layout:64 lib/layouts/aa.layout:108
-#: lib/layouts/aapaper.layout:78 lib/layouts/beamer.layout:1030
+#: lib/layouts/aa.layout:62 lib/layouts/aa.layout:106
+#: lib/layouts/aapaper.layout:76 lib/layouts/beamer.layout:1009
 #: lib/layouts/kluwer.layout:122 lib/layouts/llncs.layout:122
 #: lib/layouts/svprobth.layout:44 lib/layouts/aapaper.inc:9
 #: lib/layouts/svjour.inc:152
 msgid "Subtitle"
 msgstr "Undertittel"
 
-#: lib/layouts/aa.layout:67 lib/layouts/aa.layout:278
-#: lib/layouts/aapaper.layout:81 lib/layouts/aapaper.layout:172
-#: lib/layouts/aastex.layout:91 lib/layouts/aastex.layout:221
+#: lib/layouts/aa.layout:65 lib/layouts/aa.layout:260
+#: lib/layouts/aapaper.layout:79 lib/layouts/aapaper.layout:170
+#: lib/layouts/aastex.layout:91 lib/layouts/aastex.layout:219
 #: lib/layouts/apa.layout:114 lib/layouts/beamer.layout:416
 #: lib/layouts/broadway.layout:203 lib/layouts/cl2emult.layout:56
 #: lib/layouts/egs.layout:289 lib/layouts/elsart.layout:112
@@ -3470,36 +3458,36 @@ msgstr "Undertittel"
 msgid "Author"
 msgstr "Forfatter"
 
-#: lib/layouts/aa.layout:70 lib/layouts/aa.layout:129
-#: lib/layouts/aapaper.layout:84 lib/layouts/egs.layout:233
+#: lib/layouts/aa.layout:68 lib/layouts/aa.layout:127
+#: lib/layouts/aapaper.layout:82 lib/layouts/egs.layout:233
 #: lib/layouts/entcs.layout:57 lib/layouts/g-brief-en.layout:179
 #: lib/layouts/g-brief2.layout:799 lib/layouts/ijmpc.layout:53
 #: lib/layouts/ijmpd.layout:56 lib/layouts/isprs.layout:115
 #: lib/layouts/kluwer.layout:178 lib/layouts/revtex.layout:116
-#: lib/layouts/revtex4.layout:164 lib/layouts/scrlettr.layout:145
-#: lib/layouts/scrlttr2.layout:40 lib/layouts/aapaper.inc:30
+#: lib/layouts/revtex4.layout:164 lib/layouts/scrlettr.layout:144
+#: lib/layouts/scrlttr2.layout:39 lib/layouts/aapaper.inc:30
 #: lib/layouts/amsdefs.inc:152 lib/layouts/lyxmacros.inc:43
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/layouts/aa.layout:73 lib/layouts/aa.layout:146
-#: lib/layouts/aapaper.layout:90 lib/layouts/aapaper.inc:65
+#: lib/layouts/aa.layout:71 lib/layouts/aa.layout:144
+#: lib/layouts/aapaper.layout:88 lib/layouts/aapaper.inc:65
 msgid "Offprint"
 msgstr ""
 
-#: lib/layouts/aa.layout:76 lib/layouts/aa.layout:169
+#: lib/layouts/aa.layout:74 lib/layouts/aa.layout:167
 #: lib/layouts/svjour.inc:236
 msgid "Mail"
 msgstr ""
 
-#: lib/layouts/aa.layout:79 lib/layouts/aa.layout:290
-#: lib/layouts/aapaper.layout:96 lib/layouts/aapaper.layout:183
-#: lib/layouts/aastex.layout:103 lib/layouts/aastex.layout:234
-#: lib/layouts/beamer.layout:651 lib/layouts/egs.layout:475
+#: lib/layouts/aa.layout:77 lib/layouts/aa.layout:272
+#: lib/layouts/aapaper.layout:94 lib/layouts/aapaper.layout:181
+#: lib/layouts/aastex.layout:103 lib/layouts/aastex.layout:232
+#: lib/layouts/beamer.layout:630 lib/layouts/egs.layout:475
 #: lib/layouts/foils.layout:144 lib/layouts/g-brief-en.layout:188
 #: lib/layouts/g-brief2.layout:821 lib/layouts/kluwer.layout:143
 #: lib/layouts/revtex.layout:106 lib/layouts/revtex4.layout:123
-#: lib/layouts/scrlettr.layout:166 lib/layouts/scrlttr2.layout:240
+#: lib/layouts/scrlettr.layout:165 lib/layouts/scrlttr2.layout:239
 #: lib/layouts/siamltex.layout:137 lib/layouts/agu_stdtitle.inc:238
 #: lib/layouts/amsdefs.inc:101 lib/layouts/db_stdtitle.inc:35
 #: lib/layouts/scrclass.inc:161 lib/layouts/stdtitle.inc:50
@@ -3507,8 +3495,8 @@ msgstr ""
 msgid "Date"
 msgstr "Dato"
 
-#: lib/layouts/aa.layout:85 lib/layouts/aa.layout:192
-#: lib/layouts/aapaper.layout:102 lib/layouts/amsart-plain.layout:139
+#: lib/layouts/aa.layout:83 lib/layouts/aa.layout:190
+#: lib/layouts/aapaper.layout:100 lib/layouts/amsart-plain.layout:139
 #: lib/layouts/amsart-seq.layout:251 lib/layouts/egs.layout:537
 #: lib/layouts/elsart.layout:427 lib/layouts/aapaper.inc:83
 #: lib/layouts/amsmaths-plain.inc:223 lib/layouts/amsmaths-seq.inc:184
@@ -3516,32 +3504,32 @@ msgstr "Dato"
 msgid "Acknowledgement"
 msgstr ""
 
-#: lib/layouts/aa.layout:155 lib/layouts/aapaper.inc:74
+#: lib/layouts/aa.layout:153 lib/layouts/aapaper.inc:74
 msgid "Offprint Requests to:"
 msgstr ""
 
-#: lib/layouts/aa.layout:178
+#: lib/layouts/aa.layout:176
 msgid "Correspondence to:"
 msgstr ""
 
-#: lib/layouts/aa.layout:204 lib/layouts/egs.layout:526
+#: lib/layouts/aa.layout:202 lib/layouts/egs.layout:526
 #: lib/layouts/svjour.inc:308
 msgid "Acknowledgements."
 msgstr ""
 
-#: lib/layouts/aapaper.layout:63 lib/layouts/egs.layout:637
+#: lib/layouts/aapaper.layout:61 lib/layouts/egs.layout:622
 #: src/frontends/qt4/QPrefsDialog.C:286
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: lib/layouts/aapaper.layout:87 lib/layouts/aastex.layout:97
-#: lib/layouts/aastex.layout:309 lib/layouts/latex8.layout:57
+#: lib/layouts/aapaper.layout:85 lib/layouts/aastex.layout:97
+#: lib/layouts/aastex.layout:307 lib/layouts/latex8.layout:57
 #: lib/layouts/llncs.layout:232 lib/layouts/aapaper.inc:47
 #: lib/layouts/amsdefs.inc:178
 msgid "Email"
 msgstr "E-post"
 
-#: lib/layouts/aapaper.layout:93 lib/layouts/aapaper.inc:107
+#: lib/layouts/aapaper.layout:91 lib/layouts/aapaper.inc:107
 #: lib/ui/stdtoolbars.inc:93 src/frontends/qt4/QThesaurus.C:29
 msgid "Thesaurus"
 msgstr ""
@@ -3559,124 +3547,124 @@ msgstr ""
 msgid "Paragraph"
 msgstr "Avsnitt"
 
-#: lib/layouts/aastex.layout:94 lib/layouts/aastex.layout:265
+#: lib/layouts/aastex.layout:94 lib/layouts/aastex.layout:263
 #: lib/layouts/apa.layout:150 lib/layouts/latex8.layout:81
 #: lib/layouts/revtex4.layout:133 lib/layouts/agu_stdtitle.inc:128
 #: lib/layouts/aguplus.inc:60
 msgid "Affiliation"
 msgstr ""
 
-#: lib/layouts/aastex.layout:100 lib/layouts/aastex.layout:348
+#: lib/layouts/aastex.layout:100 lib/layouts/aastex.layout:346
 msgid "And"
 msgstr "Og"
 
-#: lib/layouts/aastex.layout:112 lib/layouts/aastex.layout:327
+#: lib/layouts/aastex.layout:112 lib/layouts/aastex.layout:325
 #: lib/layouts/apa.layout:222 lib/layouts/egs.layout:512
-#: lib/layouts/isprs.layout:238 lib/layouts/kluwer.layout:302
+#: lib/layouts/isprs.layout:215 lib/layouts/kluwer.layout:302
 #: lib/layouts/kluwer.layout:314 lib/layouts/aapaper.inc:95
 #: lib/layouts/svjour.inc:294
 msgid "Acknowledgements"
 msgstr ""
 
-#: lib/layouts/aastex.layout:118 lib/layouts/aastex.layout:443
-#: lib/layouts/aastex.layout:455 lib/layouts/beamer.layout:454
+#: lib/layouts/aastex.layout:118 lib/layouts/aastex.layout:441
+#: lib/layouts/aastex.layout:453 lib/layouts/beamer.layout:454
 #: lib/layouts/cl2emult.layout:116 lib/layouts/egs.layout:576
 #: lib/layouts/kluwer.layout:344 lib/layouts/kluwer.layout:356
 #: lib/layouts/llncs.layout:275 lib/layouts/siamltex.layout:194
 #: lib/layouts/amsdefs.inc:243 lib/layouts/stdstruct.inc:53
-#: lib/layouts/svjour.inc:340 src/output_plaintext.C:164
+#: lib/layouts/svjour.inc:340 src/output_plaintext.C:158
 msgid "References"
 msgstr "Referanser"
 
-#: lib/layouts/aastex.layout:121 lib/layouts/aastex.layout:368
+#: lib/layouts/aastex.layout:121 lib/layouts/aastex.layout:366
 msgid "PlaceFigure"
 msgstr ""
 
-#: lib/layouts/aastex.layout:124 lib/layouts/aastex.layout:389
+#: lib/layouts/aastex.layout:124 lib/layouts/aastex.layout:387
 msgid "PlaceTable"
 msgstr ""
 
-#: lib/layouts/aastex.layout:127 lib/layouts/aastex.layout:510
+#: lib/layouts/aastex.layout:127 lib/layouts/aastex.layout:508
 msgid "TableComments"
 msgstr ""
 
-#: lib/layouts/aastex.layout:130 lib/layouts/aastex.layout:490
+#: lib/layouts/aastex.layout:130 lib/layouts/aastex.layout:488
 msgid "TableRefs"
 msgstr ""
 
-#: lib/layouts/aastex.layout:136 lib/layouts/aastex.layout:431
+#: lib/layouts/aastex.layout:134 lib/layouts/aastex.layout:429
 msgid "MathLetters"
 msgstr ""
 
-#: lib/layouts/aastex.layout:139 lib/layouts/aastex.layout:469
+#: lib/layouts/aastex.layout:137 lib/layouts/aastex.layout:467
 msgid "NoteToEditor"
 msgstr ""
 
-#: lib/layouts/aastex.layout:142 lib/layouts/aastex.layout:563
+#: lib/layouts/aastex.layout:140 lib/layouts/aastex.layout:545
 msgid "Facility"
 msgstr ""
 
-#: lib/layouts/aastex.layout:145 lib/layouts/aastex.layout:589
+#: lib/layouts/aastex.layout:143 lib/layouts/aastex.layout:571
 msgid "Objectname"
 msgstr "Objektnavn"
 
-#: lib/layouts/aastex.layout:148 lib/layouts/aastex.layout:616
+#: lib/layouts/aastex.layout:146 lib/layouts/aastex.layout:598
 msgid "Dataset"
 msgstr "Datasett"
 
-#: lib/layouts/aastex.layout:295
+#: lib/layouts/aastex.layout:293
 msgid "Subject headings:"
 msgstr ""
 
-#: lib/layouts/aastex.layout:338
+#: lib/layouts/aastex.layout:336
 msgid "[Acknowledgements]"
 msgstr ""
 
-#: lib/layouts/aastex.layout:359
+#: lib/layouts/aastex.layout:357
 msgid "and"
 msgstr "og"
 
-#: lib/layouts/aastex.layout:380
+#: lib/layouts/aastex.layout:378
 msgid "Place Figure here:"
 msgstr "Plassér figur her:"
 
-#: lib/layouts/aastex.layout:401
+#: lib/layouts/aastex.layout:399
 msgid "Place Table here:"
 msgstr "Plassér tabell her:"
 
-#: lib/layouts/aastex.layout:421
+#: lib/layouts/aastex.layout:419
 msgid "[Appendix]"
 msgstr "[Tillegg]"
 
-#: lib/layouts/aastex.layout:481
+#: lib/layouts/aastex.layout:479
 msgid "Note to Editor:"
 msgstr "Notat til redaktør:"
 
-#: lib/layouts/aastex.layout:502
+#: lib/layouts/aastex.layout:500
 msgid "References. ---"
 msgstr "Referanser. ---"
 
-#: lib/layouts/aastex.layout:522
+#: lib/layouts/aastex.layout:520
 msgid "Note. ---"
 msgstr "Notat. ---"
 
-#: lib/layouts/aastex.layout:548
+#: lib/layouts/aastex.layout:530
 msgid "FigCaption"
 msgstr "Figurtekst"
 
-#: lib/layouts/aastex.layout:558
+#: lib/layouts/aastex.layout:540
 msgid "Fig. ---"
 msgstr "Fig. ---"
 
-#: lib/layouts/aastex.layout:575
+#: lib/layouts/aastex.layout:557
 msgid "Facility:"
 msgstr "Fasilitet:"
 
-#: lib/layouts/aastex.layout:601
+#: lib/layouts/aastex.layout:583
 msgid "Obj:"
 msgstr "Obj:"
 
-#: lib/layouts/aastex.layout:628
+#: lib/layouts/aastex.layout:610
 msgid "Dataset:"
 msgstr "Datasett:"
 
@@ -3983,30 +3971,35 @@ msgstr ""
 msgid "CenteredCaption"
 msgstr ""
 
-#: lib/layouts/apa.layout:266
+#: lib/layouts/apa.layout:269 lib/layouts/scrclass.inc:242
+#: lib/layouts/scrclass.inc:262
+msgid "Senseless!"
+msgstr "Meningsløst!"
+
+#: lib/layouts/apa.layout:280
 msgid "FitFigure"
 msgstr ""
 
-#: lib/layouts/apa.layout:272
+#: lib/layouts/apa.layout:286
 msgid "FitBitmap"
 msgstr ""
 
-#: lib/layouts/apa.layout:308 lib/layouts/beamer.layout:55
+#: lib/layouts/apa.layout:322 lib/layouts/beamer.layout:55
 #: lib/layouts/cv.layout:94 lib/layouts/egs.layout:176
 #: lib/layouts/manpage.layout:96 lib/layouts/stdlists.inc:25
 msgid "*"
 msgstr "*"
 
-#: lib/layouts/apa.layout:330
+#: lib/layouts/apa.layout:344
 msgid "Seriate"
 msgstr ""
 
-#: lib/layouts/apa.layout:346 lib/layouts/apa.layout:347
-#: src/buffer_funcs.C:517
+#: lib/layouts/apa.layout:360 lib/layouts/apa.layout:361
+#: src/buffer_funcs.C:525
 msgid "(\\alph{enumii})"
 msgstr "(\\alph{enumii})"
 
-#: lib/layouts/article.layout:18 lib/layouts/beamer.layout:918
+#: lib/layouts/article.layout:18 lib/layouts/beamer.layout:897
 #: lib/layouts/mwart.layout:23 lib/layouts/paper.layout:31
 #: lib/layouts/scrartcl.layout:20 lib/layouts/seminar.layout:24
 #: lib/layouts/agu_stdsections.inc:12 lib/layouts/db_stdsections.inc:12
@@ -4104,176 +4097,176 @@ msgstr ""
 msgid "block "
 msgstr "Blokk"
 
-#: lib/layouts/beamer.layout:520
+#: lib/layouts/beamer.layout:499
 #, fuzzy
 msgid "Corollary.  "
 msgstr "Korollar."
 
-#: lib/layouts/beamer.layout:537
+#: lib/layouts/beamer.layout:516
 msgid "Column"
 msgstr "Kolonne"
 
-#: lib/layouts/beamer.layout:548
+#: lib/layouts/beamer.layout:527
 msgid "start column of width:  "
 msgstr ""
 
-#: lib/layouts/beamer.layout:560
+#: lib/layouts/beamer.layout:539
 msgid "Columns"
 msgstr "Kolonner"
 
-#: lib/layouts/beamer.layout:572
+#: lib/layouts/beamer.layout:551
 msgid "columns "
 msgstr "kolonner "
 
-#: lib/layouts/beamer.layout:589
+#: lib/layouts/beamer.layout:568
 msgid "ColumnsCenterAligned"
 msgstr ""
 
-#: lib/layouts/beamer.layout:600
+#: lib/layouts/beamer.layout:579
 msgid "columns (center aligned) "
 msgstr ""
 
-#: lib/layouts/beamer.layout:619
+#: lib/layouts/beamer.layout:598
 msgid "ColumnsTopAligned"
 msgstr ""
 
-#: lib/layouts/beamer.layout:630
+#: lib/layouts/beamer.layout:609
 msgid "columns (top aligned) "
 msgstr ""
 
-#: lib/layouts/beamer.layout:676
+#: lib/layouts/beamer.layout:655
 msgid "Definition.  "
 msgstr "Definisjon.  "
 
-#: lib/layouts/beamer.layout:679
+#: lib/layouts/beamer.layout:658
 msgid "Definitions"
 msgstr "Definisjoner"
 
-#: lib/layouts/beamer.layout:682
+#: lib/layouts/beamer.layout:661
 msgid "Definitions.  "
 msgstr "Definisjoner.  "
 
-#: lib/layouts/beamer.layout:688
+#: lib/layouts/beamer.layout:667
 msgid "Example.  "
 msgstr "Eksempel.  "
 
-#: lib/layouts/beamer.layout:696
+#: lib/layouts/beamer.layout:675
 msgid "Examples"
 msgstr "Eksempler"
 
-#: lib/layouts/beamer.layout:699
+#: lib/layouts/beamer.layout:678
 msgid "Examples.  "
 msgstr "Eksempler.  "
 
-#: lib/layouts/beamer.layout:702
+#: lib/layouts/beamer.layout:681
 #, fuzzy
 msgid "ExampleBlock"
 msgstr "Eksempel"
 
-#: lib/layouts/beamer.layout:712
+#: lib/layouts/beamer.layout:691
 msgid "block showing an example "
 msgstr ""
 
-#: lib/layouts/beamer.layout:734
+#: lib/layouts/beamer.layout:713
 msgid "Fact.  "
 msgstr "Faktum.  "
 
-#: lib/layouts/beamer.layout:737
+#: lib/layouts/beamer.layout:716
 #, fuzzy
 msgid "FrameSubtitle"
 msgstr "Undertittel"
 
-#: lib/layouts/beamer.layout:760 lib/layouts/cl2emult.layout:68
+#: lib/layouts/beamer.layout:739 lib/layouts/cl2emult.layout:68
 #: lib/layouts/llncs.layout:213 lib/layouts/svjour.inc:211
 msgid "Institute"
 msgstr "Institutt"
 
-#: lib/layouts/beamer.layout:782 lib/layouts/egs.layout:655
+#: lib/layouts/beamer.layout:761 lib/layouts/egs.layout:640
 #: lib/layouts/db_lyxmacros.inc:18 lib/layouts/lyxmacros.inc:12
 msgid "LyX-Code"
 msgstr "LyX-Kode"
 
-#: lib/layouts/beamer.layout:819
+#: lib/layouts/beamer.layout:798
 #, fuzzy
 msgid "NoteItem"
 msgstr "Notis"
 
-#: lib/layouts/beamer.layout:830
+#: lib/layouts/beamer.layout:809
 msgid "note:  "
 msgstr "notis:  "
 
-#: lib/layouts/beamer.layout:842
+#: lib/layouts/beamer.layout:821
 msgid "Only"
 msgstr "Bare"
 
-#: lib/layouts/beamer.layout:851
+#: lib/layouts/beamer.layout:830
 msgid "only on slides  "
 msgstr ""
 
-#: lib/layouts/beamer.layout:866
+#: lib/layouts/beamer.layout:845
 #, fuzzy
 msgid "Overprint"
 msgstr "Overskrive"
 
-#: lib/layouts/beamer.layout:876
+#: lib/layouts/beamer.layout:855
 msgid "overprint "
 msgstr ""
 
-#: lib/layouts/beamer.layout:892
+#: lib/layouts/beamer.layout:871
 msgid "OverlayArea"
 msgstr ""
 
-#: lib/layouts/beamer.layout:902
+#: lib/layouts/beamer.layout:881
 msgid "overlayarea "
 msgstr ""
 
-#: lib/layouts/beamer.layout:932
+#: lib/layouts/beamer.layout:911
 msgid "Part "
 msgstr "Del "
 
-#: lib/layouts/beamer.layout:949
+#: lib/layouts/beamer.layout:928
 msgid "Proof.  "
 msgstr "Bevis.  "
 
-#: lib/layouts/beamer.layout:953
+#: lib/layouts/beamer.layout:932
 msgid "Separator"
 msgstr "Separator"
 
-#: lib/layouts/beamer.layout:966
+#: lib/layouts/beamer.layout:945
 msgid "___"
 msgstr "___"
 
-#: lib/layouts/beamer.layout:1001
+#: lib/layouts/beamer.layout:980
 msgid "TitleGraphic"
 msgstr "Tittelgrafikk"
 
-#: lib/layouts/beamer.layout:1027
+#: lib/layouts/beamer.layout:1006
 msgid "Theorem.  "
 msgstr "Teorem.  "
 
-#: lib/layouts/beamer.layout:1055
+#: lib/layouts/beamer.layout:1034
 #, fuzzy
 msgid "Uncover"
 msgstr "&Gjenopprett"
 
-#: lib/layouts/beamer.layout:1064
+#: lib/layouts/beamer.layout:1043
 msgid "uncovered on slides  "
 msgstr ""
 
-#: lib/layouts/beamer.layout:1086 lib/layouts/stdfloats.inc:10
+#: lib/layouts/beamer.layout:1065 lib/layouts/stdfloats.inc:10
 #: lib/ui/stdtoolbars.inc:96
 msgid "Table"
 msgstr "Tabell"
 
-#: lib/layouts/beamer.layout:1091 lib/layouts/stdfloats.inc:15
+#: lib/layouts/beamer.layout:1070 lib/layouts/stdfloats.inc:15
 msgid "List of Tables"
 msgstr "Liste over tabeller"
 
-#: lib/layouts/beamer.layout:1097 lib/layouts/stdfloats.inc:22
+#: lib/layouts/beamer.layout:1076 lib/layouts/stdfloats.inc:22
 msgid "Figure"
 msgstr "Figur"
 
-#: lib/layouts/beamer.layout:1102 lib/layouts/stdfloats.inc:27
+#: lib/layouts/beamer.layout:1081 lib/layouts/stdfloats.inc:27
 msgid "List of Figures"
 msgstr "Liste over figurer"
 
@@ -4476,8 +4469,8 @@ msgid "Adresse:"
 msgstr "Adresse:"
 
 #: lib/layouts/dinbrief.layout:46 lib/layouts/g-brief-en.layout:204
-#: lib/layouts/g-brief2.layout:864 lib/layouts/scrlettr.layout:62
-#: lib/layouts/scrlttr2.layout:92 lib/layouts/stdletter.inc:50
+#: lib/layouts/g-brief2.layout:864 lib/layouts/scrlettr.layout:61
+#: lib/layouts/scrlttr2.layout:91 lib/layouts/stdletter.inc:50
 msgid "Opening"
 msgstr "Åpning"
 
@@ -4486,8 +4479,8 @@ msgid "Anrede:"
 msgstr "Åpning"
 
 #: lib/layouts/dinbrief.layout:59 lib/layouts/g-brief-en.layout:53
-#: lib/layouts/g-brief2.layout:212 lib/layouts/scrlettr.layout:138
-#: lib/layouts/scrlttr2.layout:168 lib/layouts/stdletter.inc:72
+#: lib/layouts/g-brief2.layout:212 lib/layouts/scrlettr.layout:137
+#: lib/layouts/scrlttr2.layout:167 lib/layouts/stdletter.inc:72
 msgid "Signature"
 msgstr "Signatur"
 
@@ -4496,8 +4489,8 @@ msgid "Unterschrift:"
 msgstr "Underskrift:"
 
 #: lib/layouts/dinbrief.layout:72 lib/layouts/g-brief-en.layout:230
-#: lib/layouts/g-brief2.layout:934 lib/layouts/scrlettr.layout:72
-#: lib/layouts/scrlttr2.layout:114 lib/layouts/stdletter.inc:93
+#: lib/layouts/g-brief2.layout:934 lib/layouts/scrlettr.layout:71
+#: lib/layouts/scrlttr2.layout:113 lib/layouts/stdletter.inc:93
 msgid "Closing"
 msgstr "Avslutning"
 
@@ -4660,8 +4653,8 @@ msgstr "Forfatteradresse"
 
 #: lib/layouts/elsart.layout:141 lib/layouts/g-brief-en.layout:184
 #: lib/layouts/g-brief2.layout:810 lib/layouts/revtex.layout:128
-#: lib/layouts/revtex4.layout:167 lib/layouts/scrlettr.layout:148
-#: lib/layouts/scrlttr2.layout:57 lib/layouts/amsdefs.inc:163
+#: lib/layouts/revtex4.layout:167 lib/layouts/scrlettr.layout:147
+#: lib/layouts/scrlttr2.layout:56 lib/layouts/amsdefs.inc:163
 msgid "Address:"
 msgstr "Adresse:"
 
@@ -4902,13 +4895,13 @@ msgid "Text:"
 msgstr "Tekst:"
 
 #: lib/layouts/g-brief-de.layout:34 lib/layouts/g-brief-en.layout:34
-#: lib/layouts/g-brief2.layout:56 lib/layouts/scrlettr.layout:117
-#: lib/layouts/scrlttr2.layout:145 lib/layouts/agu_stdtitle.inc:184
+#: lib/layouts/g-brief2.layout:56 lib/layouts/scrlettr.layout:116
+#: lib/layouts/scrlttr2.layout:144 lib/layouts/agu_stdtitle.inc:184
 msgid "Name"
 msgstr "Navn"
 
 #: lib/layouts/g-brief-de.layout:44 lib/layouts/g-brief-en.layout:44
-#: lib/layouts/g-brief2.layout:66 lib/layouts/scrlettr.layout:129
+#: lib/layouts/g-brief2.layout:66 lib/layouts/scrlettr.layout:128
 #: lib/layouts/agu_stdtitle.inc:188
 msgid "Name:"
 msgstr "Navn:"
@@ -5022,12 +5015,12 @@ msgid "HTTP:"
 msgstr "HTTP:"
 
 #: lib/layouts/g-brief-de.layout:151 lib/layouts/g-brief-en.layout:151
-#: lib/layouts/scrlttr2.layout:216
+#: lib/layouts/scrlttr2.layout:215
 msgid "Bank"
 msgstr "Bank"
 
 #: lib/layouts/g-brief-de.layout:154 lib/layouts/g-brief-en.layout:154
-#: lib/layouts/scrlttr2.layout:220
+#: lib/layouts/scrlttr2.layout:219
 msgid "Bank:"
 msgstr "Bank:"
 
@@ -5076,7 +5069,7 @@ msgid "Gruss"
 msgstr ""
 
 #: lib/layouts/g-brief-en.layout:16 lib/layouts/g-brief2.layout:34
-#: lib/layouts/scrlettr.layout:41
+#: lib/layouts/scrlettr.layout:40
 msgid "Letter"
 msgstr "Brev"
 
@@ -5085,7 +5078,7 @@ msgid "Letter:"
 msgstr "Brev:"
 
 #: lib/layouts/g-brief-en.layout:56 lib/layouts/g-brief2.layout:222
-#: lib/layouts/scrlettr.layout:141 lib/layouts/scrlttr2.layout:172
+#: lib/layouts/scrlettr.layout:140 lib/layouts/scrlttr2.layout:171
 #: lib/layouts/stdletter.inc:84
 msgid "Signature:"
 msgstr "Signatur:"
@@ -5188,7 +5181,7 @@ msgstr ""
 
 #: lib/layouts/g-brief-en.layout:191 lib/layouts/g-brief2.layout:831
 #: lib/layouts/revtex.layout:108 lib/layouts/revtex4.layout:125
-#: lib/layouts/scrlettr.layout:169 lib/layouts/scrlttr2.layout:244
+#: lib/layouts/scrlettr.layout:168 lib/layouts/scrlttr2.layout:243
 #: lib/layouts/amsdefs.inc:114
 msgid "Date:"
 msgstr "Dato:"
@@ -5202,7 +5195,7 @@ msgid "Reference:"
 msgstr "Referanse:"
 
 #: lib/layouts/g-brief-en.layout:209 lib/layouts/g-brief2.layout:876
-#: lib/layouts/scrlttr2.layout:104 lib/layouts/stdletter.inc:63
+#: lib/layouts/scrlttr2.layout:103 lib/layouts/stdletter.inc:63
 msgid "Opening:"
 msgstr "Åpning:"
 
@@ -5215,13 +5208,13 @@ msgid "Encl.:"
 msgstr "Vedlegg:"
 
 #: lib/layouts/g-brief-en.layout:226 lib/layouts/g-brief2.layout:923
-#: lib/layouts/scrlettr.layout:106 lib/layouts/scrlttr2.layout:134
+#: lib/layouts/scrlettr.layout:105 lib/layouts/scrlttr2.layout:133
 #: lib/layouts/stdletter.inc:114
 msgid "cc:"
 msgstr ""
 
 #: lib/layouts/g-brief-en.layout:235 lib/layouts/g-brief2.layout:946
-#: lib/layouts/scrlttr2.layout:118 lib/layouts/stdletter.inc:97
+#: lib/layouts/scrlttr2.layout:117 lib/layouts/stdletter.inc:97
 msgid "Closing:"
 msgstr "Avslutning:"
 
@@ -5669,11 +5662,6 @@ msgid "Commission"
 msgstr "Forutsetning"
 
 #: lib/layouts/isprs.layout:225
-#, fuzzy
-msgid "Caption."
-msgstr "Bildetekst"
-
-#: lib/layouts/isprs.layout:248
 msgid "ACKNOWLEDGEMENTS"
 msgstr ""
 
@@ -5796,7 +5784,7 @@ msgstr "L
 msgid "Code"
 msgstr "Kode"
 
-#: lib/layouts/manpage.layout:163 lib/layouts/db_stdlayouts.inc:34
+#: lib/layouts/manpage.layout:163 lib/layouts/db_stdlayouts.inc:30
 msgid "SGML"
 msgstr "SGML"
 
@@ -5870,180 +5858,180 @@ msgstr "\\Alph{chapter}"
 msgid "Labeling"
 msgstr ""
 
-#: lib/layouts/scrlettr.layout:52
+#: lib/layouts/scrlettr.layout:51
 msgid "L"
 msgstr ""
 
-#: lib/layouts/scrlettr.layout:65
+#: lib/layouts/scrlettr.layout:64
 msgid "O"
 msgstr ""
 
-#: lib/layouts/scrlettr.layout:84 lib/layouts/scrlttr2.layout:122
+#: lib/layouts/scrlettr.layout:83 lib/layouts/scrlttr2.layout:121
 msgid "PS"
 msgstr ""
 
-#: lib/layouts/scrlettr.layout:95 lib/layouts/scrlttr2.layout:130
+#: lib/layouts/scrlettr.layout:94 lib/layouts/scrlttr2.layout:129
 msgid "CC"
 msgstr ""
 
-#: lib/layouts/scrlettr.layout:110 lib/layouts/scrlttr2.layout:138
+#: lib/layouts/scrlettr.layout:109 lib/layouts/scrlttr2.layout:137
 msgid "Encl"
 msgstr ""
 
-#: lib/layouts/scrlettr.layout:113 lib/layouts/scrlttr2.layout:141
+#: lib/layouts/scrlettr.layout:112 lib/layouts/scrlttr2.layout:140
 #: lib/layouts/stdletter.inc:122
 msgid "encl:"
 msgstr "vedlegg:"
 
-#: lib/layouts/scrlettr.layout:152 lib/layouts/scrlttr2.layout:184
+#: lib/layouts/scrlettr.layout:151 lib/layouts/scrlttr2.layout:183
 #: lib/layouts/stdletter.inc:135
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/layouts/scrlettr.layout:155 lib/layouts/stdletter.inc:139
+#: lib/layouts/scrlettr.layout:154 lib/layouts/stdletter.inc:139
 msgid "Telephone:"
 msgstr "Telefon:"
 
-#: lib/layouts/scrlettr.layout:159 lib/layouts/scrlttr2.layout:232
+#: lib/layouts/scrlettr.layout:158 lib/layouts/scrlttr2.layout:231
 msgid "Place"
 msgstr "Sted"
 
-#: lib/layouts/scrlettr.layout:162 lib/layouts/scrlttr2.layout:236
+#: lib/layouts/scrlettr.layout:161 lib/layouts/scrlttr2.layout:235
 msgid "Place:"
 msgstr "Sted:"
 
-#: lib/layouts/scrlettr.layout:173 lib/layouts/scrlttr2.layout:248
+#: lib/layouts/scrlettr.layout:172 lib/layouts/scrlttr2.layout:247
 msgid "Backaddress"
 msgstr "Returadresse"
 
-#: lib/layouts/scrlettr.layout:176 lib/layouts/scrlttr2.layout:252
+#: lib/layouts/scrlettr.layout:175 lib/layouts/scrlttr2.layout:251
 msgid "Backaddress:"
 msgstr "Returadresse"
 
-#: lib/layouts/scrlettr.layout:180 lib/layouts/scrlttr2.layout:256
+#: lib/layouts/scrlettr.layout:179 lib/layouts/scrlttr2.layout:255
 msgid "Specialmail"
 msgstr ""
 
-#: lib/layouts/scrlettr.layout:183 lib/layouts/scrlttr2.layout:260
+#: lib/layouts/scrlettr.layout:182 lib/layouts/scrlttr2.layout:259
 msgid "Specialmail:"
 msgstr ""
 
-#: lib/layouts/scrlettr.layout:187 lib/layouts/scrlttr2.layout:264
+#: lib/layouts/scrlettr.layout:186 lib/layouts/scrlttr2.layout:263
 #: lib/layouts/stdletter.inc:127
 msgid "Location"
 msgstr "Sted"
 
-#: lib/layouts/scrlettr.layout:190 lib/layouts/scrlttr2.layout:268
+#: lib/layouts/scrlettr.layout:189 lib/layouts/scrlttr2.layout:267
 #: lib/layouts/stdletter.inc:131
 msgid "Location:"
 msgstr "Sted:"
 
-#: lib/layouts/scrlettr.layout:197 lib/layouts/scrlttr2.layout:276
+#: lib/layouts/scrlettr.layout:196 lib/layouts/scrlttr2.layout:275
 msgid "Title:"
 msgstr "Tittel:"
 
-#: lib/layouts/scrlettr.layout:201 lib/layouts/scrlttr2.layout:280
+#: lib/layouts/scrlettr.layout:200 lib/layouts/scrlttr2.layout:279
 #: lib/layouts/scrclass.inc:168
 msgid "Subject"
 msgstr ""
 
-#: lib/layouts/scrlettr.layout:204 lib/layouts/scrlttr2.layout:284
+#: lib/layouts/scrlettr.layout:203 lib/layouts/scrlttr2.layout:283
 msgid "Subject:"
 msgstr ""
 
-#: lib/layouts/scrlettr.layout:208 lib/layouts/scrlttr2.layout:288
+#: lib/layouts/scrlettr.layout:207 lib/layouts/scrlttr2.layout:287
 msgid "Yourref"
 msgstr "Deres ref."
 
-#: lib/layouts/scrlettr.layout:211 lib/layouts/scrlttr2.layout:292
+#: lib/layouts/scrlettr.layout:210 lib/layouts/scrlttr2.layout:291
 msgid "Your ref.:"
 msgstr "Deres ref.:"
 
-#: lib/layouts/scrlettr.layout:222 lib/layouts/scrlttr2.layout:304
+#: lib/layouts/scrlettr.layout:221 lib/layouts/scrlttr2.layout:303
 msgid "Yourmail"
 msgstr ""
 
-#: lib/layouts/scrlettr.layout:225 lib/layouts/scrlttr2.layout:308
+#: lib/layouts/scrlettr.layout:224 lib/layouts/scrlttr2.layout:307
 msgid "Your letter of:"
 msgstr ""
 
-#: lib/layouts/scrlettr.layout:229 lib/layouts/scrlttr2.layout:312
+#: lib/layouts/scrlettr.layout:228 lib/layouts/scrlttr2.layout:311
 msgid "Myref"
 msgstr "Min ref."
 
-#: lib/layouts/scrlettr.layout:232 lib/layouts/scrlttr2.layout:316
+#: lib/layouts/scrlettr.layout:231 lib/layouts/scrlttr2.layout:315
 msgid "Our ref.:"
 msgstr "Vår ref.:"
 
-#: lib/layouts/scrlettr.layout:236 lib/layouts/scrlttr2.layout:320
+#: lib/layouts/scrlettr.layout:235 lib/layouts/scrlttr2.layout:319
 msgid "Customer"
 msgstr "Kunde"
 
-#: lib/layouts/scrlettr.layout:239 lib/layouts/scrlttr2.layout:324
+#: lib/layouts/scrlettr.layout:238 lib/layouts/scrlttr2.layout:323
 msgid "Customer no.:"
 msgstr "Kunde nr.: "
 
-#: lib/layouts/scrlettr.layout:243 lib/layouts/scrlttr2.layout:328
+#: lib/layouts/scrlettr.layout:242 lib/layouts/scrlttr2.layout:327
 msgid "Invoice"
 msgstr "Faktura"
 
-#: lib/layouts/scrlettr.layout:246 lib/layouts/scrlttr2.layout:332
+#: lib/layouts/scrlettr.layout:245 lib/layouts/scrlttr2.layout:331
 msgid "Invoice no.:"
 msgstr "Faktura nr.:"
 
-#: lib/layouts/scrlttr2.layout:69
+#: lib/layouts/scrlttr2.layout:68
 msgid "NextAddress"
 msgstr "NesteAdresse:"
 
-#: lib/layouts/scrlttr2.layout:81
+#: lib/layouts/scrlttr2.layout:80
 msgid "Next Address:"
 msgstr "Neste Adresse:"
 
-#: lib/layouts/scrlttr2.layout:126
+#: lib/layouts/scrlttr2.layout:125
 msgid "Post Scriptum:"
 msgstr "Post Scriptum"
 
-#: lib/layouts/scrlttr2.layout:158
+#: lib/layouts/scrlttr2.layout:157
 msgid "Sender Name:"
 msgstr "Avsender:"
 
-#: lib/layouts/scrlttr2.layout:176
+#: lib/layouts/scrlttr2.layout:175
 msgid "SenderAddress"
 msgstr "Avsenderadresse"
 
-#: lib/layouts/scrlttr2.layout:180
+#: lib/layouts/scrlttr2.layout:179
 msgid "Sender Address:"
 msgstr "Avsenderadresse:"
 
-#: lib/layouts/scrlttr2.layout:188
+#: lib/layouts/scrlttr2.layout:187
 msgid "Sender Phone:"
 msgstr ""
 
-#: lib/layouts/scrlttr2.layout:192
+#: lib/layouts/scrlttr2.layout:191
 msgid "Fax"
 msgstr ""
 
-#: lib/layouts/scrlttr2.layout:196
+#: lib/layouts/scrlttr2.layout:195
 msgid "Sender Fax:"
 msgstr ""
 
-#: lib/layouts/scrlttr2.layout:200
+#: lib/layouts/scrlttr2.layout:199
 msgid "E-Mail"
 msgstr "E-post"
 
-#: lib/layouts/scrlttr2.layout:204
+#: lib/layouts/scrlttr2.layout:203
 msgid "Sender E-Mail:"
 msgstr "Avsender e-post"
 
-#: lib/layouts/scrlttr2.layout:212
+#: lib/layouts/scrlttr2.layout:211
 msgid "Sender URL:"
 msgstr "Avsender URL:"
 
-#: lib/layouts/scrlttr2.layout:224
+#: lib/layouts/scrlttr2.layout:223
 msgid "Logo"
 msgstr "Logo"
 
-#: lib/layouts/scrlttr2.layout:228
+#: lib/layouts/scrlttr2.layout:227
 msgid "Logo:"
 msgstr "Logo:"
 
@@ -6775,11 +6763,11 @@ msgstr "Ekstratittel"
 msgid "Captionabove"
 msgstr "Bildetekst-over"
 
-#: lib/layouts/scrclass.inc:237
+#: lib/layouts/scrclass.inc:251
 msgid "Captionbelow"
 msgstr "Bildetekst-under"
 
-#: lib/layouts/scrclass.inc:243
+#: lib/layouts/scrclass.inc:271
 msgid "Dictum"
 msgstr ""
 
@@ -6787,10 +6775,6 @@ msgstr ""
 msgid "List of Algorithms"
 msgstr "Liste over algoritmer"
 
-#: lib/layouts/stdlayouts.inc:75
-msgid "Senseless!"
-msgstr "Meningsløst!"
-
 #: lib/layouts/stdlists.inc:103
 msgid "#*"
 msgstr "#*"
@@ -7841,35 +7825,39 @@ msgstr "Brukermanual|B"
 msgid "Extended Features|E"
 msgstr "Utvidede egenskaper|U"
 
-#: lib/ui/classic.ui:410 lib/ui/stdmenus.inc:472
+#: lib/ui/classic.ui:410 lib/ui/stdmenus.inc:471
+msgid "Embedded Objects|m"
+msgstr ""
+
+#: lib/ui/classic.ui:411 lib/ui/stdmenus.inc:472
 msgid "Customization|C"
 msgstr "Tilpasning|T"
 
-#: lib/ui/classic.ui:412 lib/ui/stdmenus.inc:473
+#: lib/ui/classic.ui:413 lib/ui/stdmenus.inc:473
 msgid "FAQ|F"
 msgstr "FAQ|Q"
 
-#: lib/ui/classic.ui:413 lib/ui/stdmenus.inc:474
+#: lib/ui/classic.ui:414 lib/ui/stdmenus.inc:474
 msgid "Table of Contents|a"
 msgstr "Innholdsfortegnelse|h"
 
-#: lib/ui/classic.ui:414 lib/ui/stdmenus.inc:475
+#: lib/ui/classic.ui:415 lib/ui/stdmenus.inc:475
 msgid "LaTeX Configuration|L"
 msgstr "LaTeX Konfigurasjon|L"
 
-#: lib/ui/classic.ui:416 lib/ui/stdmenus.inc:477
+#: lib/ui/classic.ui:417 lib/ui/stdmenus.inc:477
 msgid "About LyX|X"
 msgstr "Om LyX|X"
 
-#: lib/ui/classic.ui:424 src/frontends/qt4/QAbout.C:44
+#: lib/ui/classic.ui:425 src/frontends/qt4/QAbout.C:44
 msgid "About LyX"
 msgstr "Om LyX"
 
-#: lib/ui/classic.ui:425
+#: lib/ui/classic.ui:426
 msgid "Preferences..."
 msgstr "Preferanser..."
 
-#: lib/ui/classic.ui:426
+#: lib/ui/classic.ui:427
 msgid "Quit LyX"
 msgstr "Avslutt LyX"
 
@@ -7902,18 +7890,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"
 
@@ -8202,6 +8190,10 @@ msgstr "Boks|B"
 msgid "Cross-Reference...|R"
 msgstr "Kryssreferanse...|K"
 
+#: lib/ui/stdmenus.inc:303
+msgid "Caption"
+msgstr "Bildetekst"
+
 #: lib/ui/stdmenus.inc:304
 msgid "Index Entry|d"
 msgstr "Nøkkelord|ø"
@@ -8374,11 +8366,6 @@ msgstr ""
 msgid "TeX Information|I"
 msgstr "LaTeX Konfigurasjon|X"
 
-#: lib/ui/stdmenus.inc:471
-#, fuzzy
-msgid "Special Insets|S"
-msgstr "Åpne alle \"insets\"|a"
-
 #: lib/ui/stdtoolbars.inc:44
 msgid "New document"
 msgstr "Nytt dokument"
@@ -8395,11 +8382,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"
 
@@ -8623,10 +8610,6 @@ msgstr "Sett inn integral"
 msgid "Insert product"
 msgstr "Sett inn produkt"
 
-#: lib/ui/stdtoolbars.inc:133
-msgid "Insert fraction"
-msgstr "Sett inn brøk"
-
 #: lib/ui/stdtoolbars.inc:134
 msgid "Insert ( )"
 msgstr "Sett inn ( )"
@@ -8726,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"
 
@@ -8761,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:1525
+#: src/BufferView.C:1511
 msgid "Select LyX document to insert"
 msgstr "Velg LyX dokument som skal settes inn"
 
-#: src/BufferView.C:1527 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:1528 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:1532 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:1544 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:1555
+#: src/BufferView.C:1541
 #, c-format
 msgid "Inserting document %1$s..."
 msgstr "Setter inn dokumentet %1$s..."
 
-#: src/BufferView.C:1566
+#: src/BufferView.C:1552
 #, c-format
 msgid "Document %1$s inserted."
 msgstr "Satt inn document %1$s."
 
-#: src/BufferView.C:1568
+#: src/BufferView.C:1554
 #, c-format
 msgid "Could not insert document %1$s"
 msgstr "Kunne ikke sette inn dokumentet %1$s"
@@ -8858,7 +8841,7 @@ msgstr "ChkTeX advarsel id # %1$d"
 msgid "ChkTeX warning id # "
 msgstr "ChkTeX advarsel id # "
 
-#: src/CutAndPaste.C:423
+#: src/CutAndPaste.C:434
 #, c-format
 msgid ""
 "Layout had to be changed from\n"
@@ -8871,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:439
 msgid "Changed Layout"
 msgstr "Endret stil"
 
-#: src/CutAndPaste.C:447
+#: src/CutAndPaste.C:458
 #, c-format
 msgid ""
 "Character style %1$s is undefined because of class conversion from\n"
@@ -8884,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:465
 msgid "Undefined character style"
 msgstr "Udefinert tekststil"
 
@@ -8948,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"
 
@@ -9112,45 +9095,45 @@ msgstr "arv"
 msgid "ignore"
 msgstr "ignorer"
 
-#: src/LaTeX.C:92
+#: src/LaTeX.C:94
 #, 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:297 src/LaTeX.C:384
 msgid "Running MakeIndex."
 msgstr "Kjører MakeIndex."
 
-#: src/LaTeX.C:295 src/LaTeX.C:373
+#: src/LaTeX.C:306 src/LaTeX.C:395
 msgid "Running MakeIndex for nomencl."
 msgstr "Kjører MakeIndex for glossar."
 
-#: src/LaTeX.C:309
+#: src/LaTeX.C:325
 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 ""
 
@@ -9176,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"
@@ -9227,9 +9210,9 @@ msgid "Conversion failed"
 msgstr "Kunne ikke konvertere"
 
 #: src/buffer.C:688
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%1$s is from an earlier version of LyX, but a temporary file for converting "
+"%1$s is from a different version of LyX, but a temporary file for converting "
 "it could not be created."
 msgstr ""
 "%1$s ble laget med en tidligere versjon av LyX. Fikk ikke laget en "
@@ -9240,9 +9223,9 @@ msgid "Conversion script not found"
 msgstr "Fant ikke konverteringsscriptet"
 
 #: src/buffer.C:698
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%1$s is from an earlier version of LyX, but the conversion script lyx2lyx "
+"%1$s is from a different version of LyX, but the conversion script lyx2lyx "
 "could not be found."
 msgstr ""
 "%1$s er fra en tidligere versjon av LyX, men konverteringsscriptet lyx2lyx "
@@ -9253,9 +9236,9 @@ msgid "Conversion script failed"
 msgstr "Konverteringsscriptet mislyktes"
 
 #: src/buffer.C:720
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%1$s is from an earlier version of LyX, but the lyx2lyx script failed to "
+"%1$s is from a different version of LyX, but the lyx2lyx script failed to "
 "convert it."
 msgstr ""
 "%1$s er fra en tidligere versjon av LyX, men konverteringsscriptet lyx2lyx "
@@ -9321,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"
@@ -9331,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"
@@ -9346,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"
@@ -9369,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"
@@ -9404,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}."
 
@@ -9431,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?"
 
@@ -9439,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."
 
@@ -9659,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"
@@ -9670,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"
 
@@ -9695,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"
@@ -9767,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..."
 
@@ -10011,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"
 
@@ -10064,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"
 
@@ -10242,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"
 
@@ -10287,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"
@@ -10308,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"
@@ -10358,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 ""
 
@@ -10903,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"
 
@@ -10959,28 +10947,38 @@ 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:275
+#, fuzzy
+msgid "Senseless!!! "
+msgstr "Meningsløst!"
+
 #: src/insets/insetcharstyle.C:123
 msgid "Opened CharStyle Inset"
 msgstr ""
 
-#: src/insets/insetenv.C:65
+#: src/insets/insetenv.C:66
 msgid "Opened Environment Inset: "
 msgstr ""
 
@@ -10997,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: "
 
@@ -11006,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°"
 
@@ -11027,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 ""
@@ -11038,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"
@@ -11084,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\""
@@ -11139,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:175
 msgid "Ref: "
 msgstr "Ref: "
 
-#: src/insets/insetref.C:151 src/mathed/InsetMathRef.C:184
+#: src/insets/insetref.C:152 src/mathed/InsetMathRef.C:176
 msgid "Equation"
 msgstr "Ligning"
 
-#: src/insets/insetref.C:151 src/mathed/InsetMathRef.C:184
+#: src/insets/insetref.C:152 src/mathed/InsetMathRef.C:176
 msgid "EqRef: "
 msgstr "Formelref: "
 
-#: src/insets/insetref.C:152 src/mathed/InsetMathRef.C:185
+#: src/insets/insetref.C:153 src/mathed/InsetMathRef.C:177
 msgid "Page Number"
 msgstr "Sidetall"
 
-#: src/insets/insetref.C:152 src/mathed/InsetMathRef.C:185
+#: src/insets/insetref.C:153 src/mathed/InsetMathRef.C:177
 msgid "Page: "
 msgstr "Side: "
 
-#: src/insets/insetref.C:153 src/mathed/InsetMathRef.C:186
+#: src/insets/insetref.C:154 src/mathed/InsetMathRef.C:178
 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:178
 #, fuzzy
 msgid "TextPage: "
 msgstr "Side: "
 
-#: src/insets/insetref.C:154 src/mathed/InsetMathRef.C:187
+#: src/insets/insetref.C:155 src/mathed/InsetMathRef.C:179
 #, 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:179
 #, 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:180
 #, fuzzy
 msgid "PrettyRef"
 msgstr "Ref: "
 
-#: src/insets/insetref.C:155 src/mathed/InsetMathRef.C:188
+#: src/insets/insetref.C:156 src/mathed/InsetMathRef.C:180
 #, 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"
 
@@ -11213,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"
 
@@ -11225,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"
 
@@ -11238,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."
@@ -11444,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"
@@ -11459,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?"
 
@@ -11710,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."
 
@@ -11789,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å"
 
@@ -11797,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"
@@ -11816,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"
@@ -11825,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"
@@ -11838,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 "
@@ -11860,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:1221
+#: 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!"
 
@@ -12388,7 +12404,7 @@ msgstr ""
 msgid "Revert to stored version of document?"
 msgstr "Tilbake til lagret versjon av dokumentet?"
 
-#: src/mathed/InsetFormulaMacro.C:123 src/mathed/MathMacroTemplate.C:108
+#: src/mathed/InsetFormulaMacro.C:127 src/mathed/MathMacroTemplate.C:108
 #, c-format
 msgid " Macro: %1$s: "
 msgstr " Makro: %1$s: "
@@ -12404,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 ""
@@ -12472,11 +12488,11 @@ msgstr ""
 "Kunne ikke åpne dokumentet\n"
 "%1$s."
 
-#: src/output_plaintext.C:155
+#: src/output_plaintext.C:149
 msgid "Abstract: "
 msgstr "Sammendrag: "
 
-#: src/output_plaintext.C:167
+#: src/output_plaintext.C:161
 msgid "References: "
 msgstr "Referanser: "
 
@@ -12657,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"
@@ -12670,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 ""
 
@@ -12775,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:1326 src/text3.C:1338
+#: src/text3.C:1408 src/text3.C:1420
 msgid "Character set"
 msgstr "Tegnsett"
 
-#: src/text3.C:1469
+#: src/text3.C:1551
 msgid "Paragraph layout set"
 msgstr "Avsnittstil satt"
 
@@ -12818,3 +12834,18 @@ msgstr "vertikalt fyll, \\vfill"
 #: src/vspace.C:509
 msgid "protected"
 msgstr "beskyttet"
+
+#, fuzzy
+#~ msgid "PrettyRef: "
+#~ msgstr "Ref: "
+
+#~ msgid "Opening child document "
+#~ msgstr "Åpner subdokument "
+
+#, fuzzy
+#~ msgid "Caption."
+#~ msgstr "Bildetekst"
+
+#, fuzzy
+#~ msgid "Special Insets|S"
+#~ msgstr "Åpne alle \"insets\"|a"