* po/*.po: remerge (again :-( )

[lyx.git] / po / nb.po

diff --git a/po/nb.po b/po/nb.po
index d9670cafa48f762a3fa5975bac907461db50e9ca..2575ff3cccc700cf56b8a70844d87c0566a6e555 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lyx 1.4.0\n"
 "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2006-11-01 16:33+0100\n"
-"PO-Revision-Date: 2006-10-22 19:37+0200\n"
+"POT-Creation-Date: 2007-01-21 12:01+0100\n"
+"PO-Revision-Date: 2006-11-03 15:48+0100\n"
 "Last-Translator: Lars Gullik Bjønnes <larsbj@lyx.org>\n"
 "Language-Team: norsk <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +60,7 @@ msgstr "Legg en ny dokumentgren til listen"
 
 #: src/frontends/qt4/ui/BranchesUi.ui:50
 #: src/frontends/qt4/ui/QBibtexAddUi.ui:70
-#: src/frontends/qt4/ui/QCitationUi.ui:60
+#: src/frontends/qt4/ui/QCitationUi.ui:273
 #: src/frontends/qt4/ui/QPrefCopiersUi.ui:148
 #: src/frontends/qt4/ui/QPrefFileformatsUi.ui:225
 msgid "&Add"
@@ -79,7 +79,7 @@ msgid "Remove the selected branch"
 msgstr "Fjern den valgte dokumentgrenen"
 
 #: src/frontends/qt4/ui/BranchesUi.ui:83
-#: src/frontends/qt4/ui/QPrefConvertersUi.ui:205
+#: src/frontends/qt4/ui/QPrefConvertersUi.ui:202
 #: src/frontends/qt4/ui/QPrefCopiersUi.ui:82
 #: src/frontends/qt4/ui/QPrefFileformatsUi.ui:52
 msgid "&Remove"
@@ -102,27 +102,26 @@ msgid "Alter Co&lor..."
 msgstr "&Endre farge..."
 
 #: src/frontends/qt4/ui/BulletsUi.ui:37
-#, fuzzy
 msgid "&Font:"
 msgstr "&Font:"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:47
-#: src/frontends/qt4/ui/QCharacterUi.ui:215
+#: src/frontends/qt4/ui/QCharacterUi.ui:227
 msgid "Si&ze:"
 msgstr "Størrelse:"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:69
 #: src/frontends/qt4/ui/QExternalUi.ui:192
-#: src/frontends/qt4/ui/QGraphicsUi.ui:138
+#: src/frontends/qt4/ui/QGraphicsUi.ui:604
 #: src/frontends/qt4/ui/QParagraphUi.ui:32
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:78
-#: src/frontends/qt4/ui/QTabularUi.ui:704
-#: src/frontends/qt4/ui/QTabularUi.ui:723
-#: src/frontends/qt4/ui/QTabularUi.ui:771
-#: src/frontends/controllers/ControlDocument.C:44
+#: src/frontends/qt4/ui/QTabularUi.ui:707
+#: src/frontends/qt4/ui/QTabularUi.ui:726
+#: src/frontends/qt4/ui/QTabularUi.ui:774 lib/ui/stdtoolbars.inc:66
+#: src/frontends/controllers/ControlDocument.C:49
 #: src/frontends/controllers/ControlExternal.C:234
 #: src/frontends/controllers/ControlGraphics.C:170
-#: src/frontends/qt4/QDocumentDialog.C:212 src/lyxfont.C:520
+#: src/frontends/qt4/QDocumentDialog.C:199 src/lyxfont.C:519
 #: src/tex-strings.C:68 src/tex-strings.C:79 src/tex-strings.C:89
 msgid "Default"
 msgstr "Standard"
@@ -179,18 +178,16 @@ msgstr "Gigantisk"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:147
 #, fuzzy
-msgid "Custom Bullet:"
-msgstr "Kunde"
+msgid "&Custom Bullet:"
+msgstr "Egendefinert bombe:"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:177
-#, fuzzy
 msgid "&Level:"
-msgstr "&Merke:"
+msgstr "&Nivå:"
 
 #: src/frontends/qt4/ui/FloatPlacementUi.ui:16
-#, fuzzy
 msgid "Form"
-msgstr "Normal"
+msgstr ""
 
 #: src/frontends/qt4/ui/FloatPlacementUi.ui:28
 msgid "Use &default placement"
@@ -209,7 +206,6 @@ msgid "&Ignore LaTeX rules"
 msgstr "Ignorer LaTeX regler"
 
 #: src/frontends/qt4/ui/FloatPlacementUi.ui:61
-#, fuzzy
 msgid "Here de&finitely"
 msgstr "Her, uansett"
 
@@ -233,65 +229,50 @@ msgstr "&G
 msgid "&Rotate sideways"
 msgstr "Rotér 90°"
 
-#: src/frontends/qt4/ui/FontUi.ui:16
+#: src/frontends/qt4/ui/FontUi.ui:13
 #, fuzzy
 msgid "FontUi"
 msgstr "&Font:"
 
-#: src/frontends/qt4/ui/FontUi.ui:44
-msgid "Advanced Options"
-msgstr "Avanserte innstillinger"
-
-#: src/frontends/qt4/ui/FontUi.ui:56
-msgid "Use true S&mall Caps"
-msgstr "Bruk kapitéler"
-
-#: src/frontends/qt4/ui/FontUi.ui:63
-msgid "Use &Old Style Figures"
-msgstr ""
-
-#: src/frontends/qt4/ui/FontUi.ui:73
+#: src/frontends/qt4/ui/FontUi.ui:64
 #, fuzzy
-msgid "Sizes"
-msgstr "Størrelse:"
-
-#: src/frontends/qt4/ui/FontUi.ui:97
-#, fuzzy
-msgid "&Base Size:"
-msgstr "&Størrelse:"
+msgid "Sc&ale (%):"
+msgstr "Skaler%"
 
-#: src/frontends/qt4/ui/FontUi.ui:107
-#, fuzzy
-msgid "Sc&ale Typewriter %:"
+#: src/frontends/qt4/ui/FontUi.ui:77
+msgid "&Typewriter:"
 msgstr "&Maskinskrift:"
 
-#: src/frontends/qt4/ui/FontUi.ui:137
-#, fuzzy
-msgid "S&cale Sans Serif %:"
-msgstr "Sans Serif:"
-
-#: src/frontends/qt4/ui/FontUi.ui:150
-#, fuzzy
-msgid "Families"
-msgstr "Uten ramme"
-
-#: src/frontends/qt4/ui/FontUi.ui:210
-msgid "&Default Family:"
+#: src/frontends/qt4/ui/FontUi.ui:90
+#: src/frontends/qt4/ui/QPrefScreenFontsUi.ui:114
+msgid "&Roman:"
 msgstr ""
 
-#: src/frontends/qt4/ui/FontUi.ui:220
-msgid "&Typewriter:"
-msgstr "&Maskinskrift:"
+#: src/frontends/qt4/ui/FontUi.ui:110
+#, fuzzy
+msgid "S&cale (%):"
+msgstr "Skaler%"
 
-#: src/frontends/qt4/ui/FontUi.ui:230
+#: src/frontends/qt4/ui/FontUi.ui:123
 msgid "&Sans Serif:"
 msgstr "&Sans Serif:"
 
-#: src/frontends/qt4/ui/FontUi.ui:240
-#: src/frontends/qt4/ui/QPrefScreenFontsUi.ui:114
-msgid "&Roman:"
+#: src/frontends/qt4/ui/FontUi.ui:146
+msgid "Use &Old Style Figures"
 msgstr ""
 
+#: src/frontends/qt4/ui/FontUi.ui:153
+msgid "Use true S&mall Caps"
+msgstr "Bruk kapitéler"
+
+#: src/frontends/qt4/ui/FontUi.ui:160
+msgid "&Default Family:"
+msgstr "Standard familie:"
+
+#: src/frontends/qt4/ui/FontUi.ui:173
+msgid "&Base Size:"
+msgstr "&Basis størrelse:"
+
 #: src/frontends/qt4/ui/LaTeXUi.ui:44
 msgid "Document &class:"
 msgstr "Dokument&klasse:"
@@ -309,7 +290,7 @@ msgid "Postscript &driver:"
 msgstr "Postscript&driver:"
 
 #: src/frontends/qt4/ui/LanguageUi.ui:36
-#: src/frontends/qt4/ui/QCharacterUi.ui:151
+#: src/frontends/qt4/ui/QCharacterUi.ui:163
 msgid "&Language:"
 msgstr "Språk:"
 
@@ -319,9 +300,8 @@ msgid "&Use language's default encoding"
 msgstr "Bruk \"input-encod&ing\""
 
 #: src/frontends/qt4/ui/LanguageUi.ui:131
-#, fuzzy
 msgid "&Encoding:"
-msgstr "&Avstand:"
+msgstr "&Enkoding:"
 
 #: src/frontends/qt4/ui/LanguageUi.ui:141
 msgid "&Quote Style:"
@@ -333,9 +313,8 @@ msgid "Use the margin settings provided by the document class"
 msgstr "Tilbake til standardinnstillinger for dokumentklassen"
 
 #: src/frontends/qt4/ui/MarginsUi.ui:31
-#, fuzzy
 msgid "&Default Margins"
-msgstr "Stan&dardspråk:"
+msgstr "Standard marger"
 
 #: src/frontends/qt4/ui/MarginsUi.ui:89
 msgid "&Top:"
@@ -364,9 +343,8 @@ msgid "Head &height:"
 msgstr "&Høyde:"
 
 #: src/frontends/qt4/ui/MarginsUi.ui:167
-#, fuzzy
 msgid "&Foot skip:"
-msgstr "Fontstørrelse"
+msgstr ""
 
 #: src/frontends/qt4/ui/MathsUi.ui:28
 msgid "&Use AMS math package automatically"
@@ -376,6 +354,16 @@ msgstr "Bruk AMS-matematikk automatisk"
 msgid "Use AMS &math package"
 msgstr "Bruk AMS-matematikk"
 
+#: src/frontends/qt4/ui/MathsUi.ui:45
+#, fuzzy
+msgid "Use esint package &automatically"
+msgstr "Bruk AMS-matematikk automatisk"
+
+#: src/frontends/qt4/ui/MathsUi.ui:55
+#, fuzzy
+msgid "Use &esint package"
+msgstr "Bruk AMS-matematikk"
+
 #: src/frontends/qt4/ui/NumberingUi.ui:63
 msgid "&List in Table of Contents"
 msgstr "&Vis i innholdsfortegnelse"
@@ -390,13 +378,13 @@ msgstr "Arkst
 
 #: src/frontends/qt4/ui/PageLayoutUi.ui:43 src/frontends/qt4/ui/QBoxUi.ui:122
 #: src/frontends/qt4/ui/QExternalUi.ui:507
-#: src/frontends/qt4/ui/QGraphicsUi.ui:239
+#: src/frontends/qt4/ui/QGraphicsUi.ui:174
 msgid "&Height:"
 msgstr "&Høyde:"
 
 #: src/frontends/qt4/ui/PageLayoutUi.ui:56 src/frontends/qt4/ui/QBoxUi.ui:138
 #: src/frontends/qt4/ui/QExternalUi.ui:484
-#: src/frontends/qt4/ui/QGraphicsUi.ui:179
+#: src/frontends/qt4/ui/QGraphicsUi.ui:194
 #: src/frontends/qt4/ui/QTabularUi.ui:103 src/frontends/qt4/ui/QWrapUi.ui:39
 msgid "&Width:"
 msgstr "Bredde:"
@@ -439,9 +427,8 @@ msgid "Version"
 msgstr "Versjon"
 
 #: src/frontends/qt4/ui/QAboutUi.ui:50
-#, fuzzy
 msgid "Version goes here"
-msgstr "Versjonskontroll"
+msgstr ""
 
 #: src/frontends/qt4/ui/QAboutUi.ui:64
 msgid "Credits"
@@ -464,17 +451,16 @@ msgstr "Copyright"
 #: src/frontends/qt4/ui/QShowFileUi.ui:58
 #: src/frontends/qt4/ui/QSpellcheckerUi.ui:31
 #: src/frontends/qt4/ui/QTexinfoUi.ui:61
-#: src/frontends/qt4/ui/QThesaurusUi.ui:144 src/frontends/qt4/ui/QTocUi.ui:74
+#: src/frontends/qt4/ui/QThesaurusUi.ui:144 src/frontends/qt4/ui/QTocUi.ui:77
 #: src/frontends/qt4/ui/QURLUi.ui:115 src/frontends/qt4/ui/QVSpaceUi.ui:171
-#: src/frontends/qt4/ui/QViewSourceUi.ui:118
+#: src/frontends/qt4/ui/QViewSourceUi.ui:115
 #: src/frontends/qt4/ui/QWrapUi.ui:216
 msgid "&Close"
 msgstr "&Lukk"
 
 #: src/frontends/qt4/ui/QAskForTextUi.ui:16
-#, fuzzy
 msgid "LyX: Enter text"
-msgstr "LyX: Sett inn matrise"
+msgstr "LyX: Skriv inn tekst"
 
 #: src/frontends/qt4/ui/QAskForTextUi.ui:47
 msgid "&Dummy"
@@ -484,15 +470,16 @@ msgstr "&Dummy"
 #: src/frontends/qt4/ui/QBibitemUi.ui:111
 #: src/frontends/qt4/ui/QBibtexUi.ui:216 src/frontends/qt4/ui/QBoxUi.ui:325
 #: src/frontends/qt4/ui/QBranchUi.ui:31
-#: src/frontends/qt4/ui/QCharacterUi.ui:352
-#: src/frontends/qt4/ui/QCitationUi.ui:329
+#: src/frontends/qt4/ui/QCharacterUi.ui:370
+#: src/frontends/qt4/ui/QCitationUi.ui:104
 #: 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:791
+#: src/frontends/qt4/ui/QGraphicsUi.ui:702
 #: src/frontends/qt4/ui/QIncludeUi.ui:192 src/frontends/qt4/ui/QIndexUi.ui:85
 #: src/frontends/qt4/ui/QMathMatrixUi.ui:170
-#: 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/QNomenclUi.ui:98 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
 #: src/frontends/qt4/ui/QURLUi.ui:105 src/frontends/qt4/ui/QVSpaceUi.ui:148
 #: src/frontends/qt4/ui/QWrapUi.ui:193
@@ -500,11 +487,11 @@ msgid "&OK"
 msgstr "&OK"
 
 #: src/frontends/qt4/ui/QAskForTextUi.ui:94
-#: src/frontends/qt4/ui/QCitationUi.ui:349
-#: src/frontends/qt4/ui/QDocumentUi.ui:152 src/buffer_funcs.C:97
-#: src/buffer_funcs.C:123 src/buffer_funcs.C:164 src/bufferlist.C:90
-#: src/bufferlist.C:198 src/lyx_cb.C:116 src/lyx_cb.C:168 src/lyxfunc.C:677
-#: src/lyxfunc.C:849 src/lyxfunc.C:1955 src/lyxvc.C:173
+#: src/frontends/qt4/ui/QCitationUi.ui:124
+#: src/frontends/qt4/ui/QDocumentUi.ui:152 src/buffer_funcs.C:99
+#: src/buffer_funcs.C:126 src/buffer_funcs.C:167 src/bufferlist.C:114
+#: src/bufferlist.C:222 src/lyx_cb.C:115 src/lyx_cb.C:168 src/lyxfunc.C:727
+#: src/lyxfunc.C:899 src/lyxfunc.C:2018 src/lyxvc.C:175
 msgid "&Cancel"
 msgstr "&Avbryt"
 
@@ -517,7 +504,7 @@ msgid "The label as it appears in the document"
 msgstr "Referansemerket slik det vises i dokumentet"
 
 #: src/frontends/qt4/ui/QBibitemUi.ui:64 src/frontends/qt4/ui/QRefUi.ui:145
-#: src/frontends/qt4/Dialogs.C:226
+#: src/frontends/qt4/Dialogs.C:231
 msgid "&Label:"
 msgstr "&Merke:"
 
@@ -531,8 +518,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/QSendtoUi.ui:95
-#: src/BufferView.C:265 src/frontends/qt4/Qt2BC.h:36 src/lyxfunc.C:793
+#: src/frontends/qt4/ui/QIndexUi.ui:95 src/frontends/qt4/ui/QNomenclUi.ui:111
+#: src/frontends/qt4/ui/QSendtoUi.ui:95 src/BufferView.C:246
+#: src/frontends/qt4/Qt2BC.h:36 src/lyxfunc.C:843
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -543,7 +531,7 @@ msgstr "Velg en BibTeX database som skal legges til"
 #: src/frontends/qt4/ui/QBibtexAddUi.ui:126
 #: src/frontends/qt4/ui/QBibtexUi.ui:106
 #: src/frontends/qt4/ui/QExternalUi.ui:99
-#: src/frontends/qt4/ui/QGraphicsUi.ui:375
+#: src/frontends/qt4/ui/QGraphicsUi.ui:78
 #: src/frontends/qt4/ui/QIncludeUi.ui:148 src/frontends/qt4/ui/QPrintUi.ui:316
 msgid "&Browse..."
 msgstr "&Se igjennom..."
@@ -561,7 +549,6 @@ msgid "This bibliography section contains..."
 msgstr "Denne bibliografiseksjonen inneholder..."
 
 #: src/frontends/qt4/ui/QBibtexUi.ui:55
-#, fuzzy
 msgid "&Content:"
 msgstr "Innh&old"
 
@@ -619,22 +606,22 @@ msgstr "Stil"
 msgid "Inner box -- needed for fixed width & line breaks"
 msgstr "Indre boks -- nødvendig for fast bredde og linjeskift"
 
-#: src/frontends/qt4/ui/QBoxUi.ui:38 src/frontends/qt4/ui/QTabularUi.ui:699
-#: src/frontends/qt4/ui/QTabularUi.ui:718
-#: src/frontends/qt4/ui/QTabularUi.ui:766
-#: src/frontends/controllers/ControlBox.C:81 src/frontends/qt4/QBox.C:170
+#: src/frontends/qt4/ui/QBoxUi.ui:38 src/frontends/qt4/ui/QTabularUi.ui:702
+#: src/frontends/qt4/ui/QTabularUi.ui:721
+#: src/frontends/qt4/ui/QTabularUi.ui:769
+#: src/frontends/controllers/ControlBox.C:79 src/frontends/qt4/QBox.C:170
 #: src/frontends/qt4/QBox.C:286 src/frontends/qt4/QBoxDialog.C:74
 msgid "None"
 msgstr "Ingen"
 
 #: src/frontends/qt4/ui/QBoxUi.ui:43 src/frontends/qt4/QBox.C:172
 #: src/frontends/qt4/QBox.C:279 src/frontends/qt4/QBox.C:287
-#: src/insets/insetbox.C:157
+#: src/insets/insetbox.C:156
 msgid "Parbox"
 msgstr "Parbox"
 
 #: src/frontends/qt4/ui/QBoxUi.ui:48 src/frontends/qt4/QBox.C:280
-#: src/frontends/qt4/QBox.C:288 src/insets/insetbox.C:159
+#: src/frontends/qt4/QBox.C:288 src/insets/insetbox.C:158
 msgid "Minipage"
 msgstr "Miniside"
 
@@ -643,14 +630,12 @@ msgid "Supported box types"
 msgstr "Tilgjengelige bokstyper"
 
 #: src/frontends/qt4/ui/QBoxUi.ui:66
-#, fuzzy
 msgid "Inner Bo&x:"
 msgstr "&Indre boks:"
 
 #: src/frontends/qt4/ui/QBoxUi.ui:79
-#, fuzzy
 msgid "&Decoration:"
-msgstr "Dediserting:"
+msgstr ""
 
 #: src/frontends/qt4/ui/QBoxUi.ui:97 src/frontends/qt4/ui/QBoxUi.ui:119
 msgid "Height value"
@@ -695,9 +680,8 @@ msgid "Stretch"
 msgstr "Strekk"
 
 #: src/frontends/qt4/ui/QBoxUi.ui:190
-#, fuzzy
 msgid "Horizontal"
-msgstr "&Horisontal:"
+msgstr "Horisontal"
 
 #: src/frontends/qt4/ui/QBoxUi.ui:197 src/frontends/qt4/ui/QBoxUi.ui:219
 msgid "Vertical alignment of the box (with regard to baseline)"
@@ -722,36 +706,33 @@ msgid "Bottom"
 msgstr "Nederst"
 
 #: src/frontends/qt4/ui/QBoxUi.ui:222
-#, fuzzy
 msgid "&Box:"
-msgstr "Boks"
+msgstr "&Boks:"
 
 #: src/frontends/qt4/ui/QBoxUi.ui:232
-#, fuzzy
 msgid "Co&ntent:"
-msgstr "Innh&old"
+msgstr "Innh&old:"
 
 #: src/frontends/qt4/ui/QBoxUi.ui:242 src/frontends/qt4/ui/QBoxUi.ui:269
 msgid "Vertical alignment of the content inside the box"
 msgstr "Vertikal justering av innholdet i boksen"
 
 #: src/frontends/qt4/ui/QBoxUi.ui:272
-#, fuzzy
 msgid "Vertical"
-msgstr "&Vertikal:"
+msgstr "Vertikal"
 
-#: src/frontends/qt4/ui/QBoxUi.ui:293 src/frontends/qt4/ui/QCitationUi.ui:309
+#: src/frontends/qt4/ui/QBoxUi.ui:293 src/frontends/qt4/ui/QCitationUi.ui:84
 #: src/frontends/qt4/ui/QDocumentUi.ui:112 src/frontends/qt4/ui/QFloatUi.ui:42
-#: src/frontends/qt4/ui/QGraphicsUi.ui:762
+#: src/frontends/qt4/ui/QGraphicsUi.ui:673
 #: src/frontends/qt4/ui/QParagraphUi.ui:232
 #: src/frontends/qt4/ui/QPrefsUi.ui:50 src/frontends/qt4/ui/QWrapUi.ui:164
 msgid "&Restore"
 msgstr "&Tilbakestill"
 
-#: src/frontends/qt4/ui/QBoxUi.ui:338 src/frontends/qt4/ui/QCharacterUi.ui:362
+#: src/frontends/qt4/ui/QBoxUi.ui:338 src/frontends/qt4/ui/QCharacterUi.ui:380
 #: 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:812
+#: src/frontends/qt4/ui/QGraphicsUi.ui:723
 #: 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
@@ -795,16 +776,16 @@ msgstr "Forkast denne endringen"
 msgid "&Reject"
 msgstr "&Forkast"
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:47
-#: src/frontends/qt4/ui/QCharacterUi.ui:126
+#: src/frontends/qt4/ui/QCharacterUi.ui:44
+#: src/frontends/qt4/ui/QCharacterUi.ui:132
 msgid "Font family"
 msgstr "Fontfamilie"
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:50
+#: src/frontends/qt4/ui/QCharacterUi.ui:47
 msgid "&Family:"
 msgstr "Familie:"
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:68
+#: src/frontends/qt4/ui/QCharacterUi.ui:65
 #: src/frontends/qt4/ui/QCharacterUi.ui:75
 msgid "Font shape"
 msgstr "Form"
@@ -814,165 +795,163 @@ msgid "S&hape:"
 msgstr "Form:"
 
 #: src/frontends/qt4/ui/QCharacterUi.ui:96
-#: src/frontends/qt4/ui/QCharacterUi.ui:161
+#: src/frontends/qt4/ui/QCharacterUi.ui:173
 msgid "Font series"
 msgstr "Font serier"
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:111
-#: src/frontends/qt4/ui/QCharacterUi.ui:148
-#: src/frontends/qt4/QDocumentDialog.C:400
-#: src/frontends/qt4/QPrefsDialog.C:1534
+#: src/frontends/qt4/ui/QCharacterUi.ui:114
+#: src/frontends/qt4/ui/QCharacterUi.ui:160
+#: src/frontends/qt4/QDocumentDialog.C:390
+#: src/frontends/qt4/QPrefsDialog.C:1457
 msgid "Language"
 msgstr "Språk"
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:141
-#: src/frontends/qt4/ui/QCharacterUi.ui:177
+#: src/frontends/qt4/ui/QCharacterUi.ui:150
+#: src/frontends/qt4/ui/QCharacterUi.ui:189
 msgid "Font color"
 msgstr "Fontfarge"
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:164
+#: src/frontends/qt4/ui/QCharacterUi.ui:176
 msgid "&Series:"
 msgstr "Serie:"
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:180
+#: src/frontends/qt4/ui/QCharacterUi.ui:192
 msgid "&Color:"
 msgstr "Farge:"
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:200
-#, fuzzy
+#: src/frontends/qt4/ui/QCharacterUi.ui:212
 msgid "Never Toggled"
-msgstr "Bytt"
+msgstr ""
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:212
-#: src/frontends/qt4/ui/QCharacterUi.ui:233
+#: src/frontends/qt4/ui/QCharacterUi.ui:224
+#: src/frontends/qt4/ui/QCharacterUi.ui:245
 msgid "Font size"
 msgstr "Fontstørrelse"
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:243
-#: src/frontends/qt4/ui/QCharacterUi.ui:268
+#: src/frontends/qt4/ui/QCharacterUi.ui:258
+#: src/frontends/qt4/ui/QCharacterUi.ui:283
 msgid "Other font settings"
 msgstr "Andre font innstillinger"
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:246
-#, fuzzy
+#: src/frontends/qt4/ui/QCharacterUi.ui:261
 msgid "Always Toggled"
-msgstr "Bytt"
+msgstr ""
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:258
+#: src/frontends/qt4/ui/QCharacterUi.ui:273
 msgid "&Misc:"
 msgstr "Diverse:"
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:290
+#: src/frontends/qt4/ui/QCharacterUi.ui:308
 msgid "toggle font on all of the above"
 msgstr ""
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:293
-#, fuzzy
+#: src/frontends/qt4/ui/QCharacterUi.ui:311
 msgid "&Toggle all"
-msgstr "Bytt"
+msgstr ""
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:300
+#: src/frontends/qt4/ui/QCharacterUi.ui:318
 msgid "Apply each change automatically"
 msgstr "Bruk endringer med én gang"
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:303
+#: src/frontends/qt4/ui/QCharacterUi.ui:321
 msgid "Apply changes immediately"
 msgstr "Gjør endringer øyeblikkelig"
 
-#: src/frontends/qt4/ui/QCharacterUi.ui:372 src/frontends/qt4/ui/QERTUi.ui:110
-#: src/frontends/qt4/ui/QGraphicsUi.ui:833
+#: src/frontends/qt4/ui/QCharacterUi.ui:390 src/frontends/qt4/ui/QERTUi.ui:110
+#: src/frontends/qt4/ui/QGraphicsUi.ui:744
 #: src/frontends/qt4/ui/QMathMatrixUi.ui:177
 #: src/frontends/qt4/ui/QNoteUi.ui:41 src/frontends/qt4/ui/QPrintUi.ui:246
 #: src/frontends/qt4/ui/QTabularCreateUi.ui:75
-#: src/frontends/qt4/ui/QTabularUi.ui:1128 src/frontends/qt4/Qt2BC.h:37
+#: src/frontends/qt4/ui/QTabularUi.ui:1131 src/frontends/qt4/Qt2BC.h:37
 msgid "Close"
 msgstr "Lukk"
 
-#: src/frontends/qt4/ui/QCitationUi.ui:47
-#, fuzzy
-msgid "&Available Citations:"
-msgstr "Tilgjengelige dokumentgrener:"
+#: src/frontends/qt4/ui/QCitationUi.ui:44 src/frontends/qt4/ui/QSearchUi.ui:31
+msgid "&Find:"
+msgstr "&Finn:"
 
-#: src/frontends/qt4/ui/QCitationUi.ui:70
+#: src/frontends/qt4/ui/QCitationUi.ui:67
 #, fuzzy
-msgid "&Selected citations:"
-msgstr "Merking:"
-
-#: src/frontends/qt4/ui/QCitationUi.ui:88
-msgid "Move the selected citation up"
-msgstr "Flytt den valgte litteraturreferansen opp"
+msgid "<- Clear"
+msgstr "Av"
 
-#: src/frontends/qt4/ui/QCitationUi.ui:91 src/frontends/qt4/ui/QTocUi.ui:36
-#, fuzzy
-msgid "&Up"
-msgstr "&Oppdater"
+#: src/frontends/qt4/ui/QCitationUi.ui:117
+msgid "A&pply"
+msgstr "&Bruk"
 
 #: src/frontends/qt4/ui/QCitationUi.ui:136
-msgid "Move the selected citation down"
-msgstr "Flytt den valgte litteraturreferansen ned"
-
-#: src/frontends/qt4/ui/QCitationUi.ui:139 src/frontends/qt4/ui/QTocUi.ui:43
-#, fuzzy
-msgid "&Down"
-msgstr "By"
-
-#: src/frontends/qt4/ui/QCitationUi.ui:149
-msgid "D&elete"
-msgstr "Sl&ett"
-
-#: src/frontends/qt4/ui/QCitationUi.ui:166
-#: src/frontends/qt4/ui/QSearchUi.ui:31
-msgid "&Find:"
-msgstr "&Finn:"
-
-#: src/frontends/qt4/ui/QCitationUi.ui:191
-#, fuzzy
 msgid "Formatting"
-msgstr "Formater"
+msgstr "Formatering"
 
-#: src/frontends/qt4/ui/QCitationUi.ui:211
+#: src/frontends/qt4/ui/QCitationUi.ui:159
 msgid "Natbib citation style to use"
 msgstr "Hvilken 'Natbib' referansestil som skal brukes"
 
-#: src/frontends/qt4/ui/QCitationUi.ui:218
+#: src/frontends/qt4/ui/QCitationUi.ui:166
 msgid "Citation &style:"
 msgstr "Siteringsstil:"
 
-#: src/frontends/qt4/ui/QCitationUi.ui:228
+#: src/frontends/qt4/ui/QCitationUi.ui:176
 msgid "List all authors"
 msgstr "Vis alle forfatterne"
 
-#: src/frontends/qt4/ui/QCitationUi.ui:231
+#: src/frontends/qt4/ui/QCitationUi.ui:179
 msgid "&Full author list"
 msgstr "Komplett forfatterliste"
 
-#: src/frontends/qt4/ui/QCitationUi.ui:238
+#: src/frontends/qt4/ui/QCitationUi.ui:186
 msgid "Force upper case in citation"
 msgstr "Store bokstaver i referansen"
 
-#: src/frontends/qt4/ui/QCitationUi.ui:241
+#: src/frontends/qt4/ui/QCitationUi.ui:189
 msgid "Force &upper case"
 msgstr "Store bokstaver"
 
-#: src/frontends/qt4/ui/QCitationUi.ui:248
+#: src/frontends/qt4/ui/QCitationUi.ui:196
 msgid "&Text after:"
 msgstr "&Tekst etter:"
 
-#: src/frontends/qt4/ui/QCitationUi.ui:266
+#: src/frontends/qt4/ui/QCitationUi.ui:214
 msgid "Text to place after citation"
 msgstr "Tekst som skal plasseres etter referansen"
 
-#: src/frontends/qt4/ui/QCitationUi.ui:273
+#: src/frontends/qt4/ui/QCitationUi.ui:221
 msgid "Text &before:"
 msgstr "Tekst &før:"
 
-#: src/frontends/qt4/ui/QCitationUi.ui:291
+#: src/frontends/qt4/ui/QCitationUi.ui:239
 msgid "Text to place before citation"
 msgstr "Tekst som skal plasseres før referansen"
 
-#: src/frontends/qt4/ui/QCitationUi.ui:342
-msgid "A&pply"
-msgstr "&Bruk"
+#: src/frontends/qt4/ui/QCitationUi.ui:260
+#, fuzzy
+msgid "&Available Citations:"
+msgstr "Tilgjengelige dokumentgrener:"
+
+#: src/frontends/qt4/ui/QCitationUi.ui:283
+#, fuzzy
+msgid "&Selected Citations:"
+msgstr "Merking:"
+
+#: src/frontends/qt4/ui/QCitationUi.ui:301
+msgid "Move the selected citation up"
+msgstr "Flytt den valgte litteraturreferansen opp"
+
+#: src/frontends/qt4/ui/QCitationUi.ui:304 src/frontends/qt4/ui/QTocUi.ui:39
+msgid "&Up"
+msgstr "&Opp"
+
+#: src/frontends/qt4/ui/QCitationUi.ui:349
+msgid "Move the selected citation down"
+msgstr "Flytt den valgte litteraturreferansen ned"
+
+#: src/frontends/qt4/ui/QCitationUi.ui:352 src/frontends/qt4/ui/QTocUi.ui:46
+msgid "&Down"
+msgstr "&Ned"
+
+#: src/frontends/qt4/ui/QCitationUi.ui:362
+msgid "D&elete"
+msgstr "Sl&ett"
 
 #: src/frontends/qt4/ui/QDelimiterUi.ui:49
 msgid "Match delimiter types"
@@ -983,9 +962,8 @@ msgid "&Keep matched"
 msgstr "Samme sort"
 
 #: src/frontends/qt4/ui/QDelimiterUi.ui:104
-#, fuzzy
 msgid "&Size:"
-msgstr "Størrelse:"
+msgstr "&Størrelse:"
 
 #: src/frontends/qt4/ui/QDelimiterUi.ui:138
 msgid "Insert the delimiters"
@@ -1012,9 +990,8 @@ msgid "Save as Document Defaults"
 msgstr "Lagre som dokumentstandard"
 
 #: src/frontends/qt4/ui/QERTUi.ui:31
-#, fuzzy
 msgid "Display"
-msgstr "Visning:"
+msgstr ""
 
 #: src/frontends/qt4/ui/QERTUi.ui:43
 #, fuzzy
@@ -1031,9 +1008,8 @@ msgid "Show ERT button only"
 msgstr ""
 
 #: src/frontends/qt4/ui/QERTUi.ui:56
-#, fuzzy
 msgid "&Collapsed"
-msgstr "&Lukk"
+msgstr "&Kollapset"
 
 #: src/frontends/qt4/ui/QERTUi.ui:63
 #, fuzzy
@@ -1072,7 +1048,7 @@ msgid "Filename"
 msgstr "Filnavn"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:109
-#: src/frontends/qt4/ui/QGraphicsUi.ui:385
+#: src/frontends/qt4/ui/QGraphicsUi.ui:65
 #: src/frontends/qt4/ui/QIncludeUi.ui:158 src/frontends/qt4/ui/QPrintUi.ui:296
 msgid "&File:"
 msgstr "&Fil:"
@@ -1091,26 +1067,26 @@ msgstr "LyX-visning"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:188
 #: src/frontends/qt4/ui/QExternalUi.ui:261
-#: src/frontends/qt4/ui/QGraphicsUi.ui:90
-#: src/frontends/qt4/ui/QGraphicsUi.ui:134
+#: src/frontends/qt4/ui/QGraphicsUi.ui:587
+#: src/frontends/qt4/ui/QGraphicsUi.ui:600
 msgid "Screen display"
 msgstr "Visning på skjermen"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:197
-#: src/frontends/qt4/ui/QGraphicsUi.ui:143
+#: src/frontends/qt4/ui/QGraphicsUi.ui:609
 #: src/frontends/qt4/ui/QPrefDisplayUi.ui:66
 msgid "Monochrome"
 msgstr "Sort/Hvitt"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:202
-#: src/frontends/qt4/ui/QGraphicsUi.ui:148
+#: src/frontends/qt4/ui/QGraphicsUi.ui:614
 #: src/frontends/qt4/ui/QPrefDisplayUi.ui:71
 msgid "Grayscale"
 msgstr "Gråskala"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:207
-#: src/frontends/qt4/ui/QGraphicsUi.ui:153
-#: src/frontends/qt4/ui/QPrefDisplayUi.ui:76
+#: src/frontends/qt4/ui/QGraphicsUi.ui:619
+#: src/frontends/qt4/ui/QPrefDisplayUi.ui:76 src/frontends/qt4/QBranches.C:44
 msgid "Color"
 msgstr "Farge"
 
@@ -1120,33 +1096,29 @@ msgstr "Forh
 
 #: src/frontends/qt4/ui/QExternalUi.ui:239
 #: src/frontends/qt4/ui/QExternalUi.ui:274
-#: src/frontends/qt4/ui/QGraphicsUi.ui:114
-#: src/frontends/qt4/ui/QGraphicsUi.ui:121
+#: src/frontends/qt4/ui/QGraphicsUi.ui:627
+#: src/frontends/qt4/ui/QGraphicsUi.ui:651
 msgid "Percentage to scale by in LyX"
 msgstr "Prosentvis skalering for visning i LyX"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:252
-#: src/frontends/qt4/ui/QGraphicsUi.ui:73
 msgid "%"
 msgstr "%"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:264
-#: src/frontends/qt4/ui/QGraphicsUi.ui:93
+#: src/frontends/qt4/ui/QGraphicsUi.ui:590
 msgid "&Display:"
 msgstr "&Visning:"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:277
-#: src/frontends/qt4/ui/QGraphicsUi.ui:124
 msgid "Sca&le:"
 msgstr "Skalér:"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:300
-#: src/frontends/qt4/ui/QGraphicsUi.ui:80
 msgid "Display image in LyX"
 msgstr "Vis bilde i LyX"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:303
-#: src/frontends/qt4/ui/QGraphicsUi.ui:83
 msgid "&Show in LyX"
 msgstr "&Vis i LyX"
 
@@ -1156,15 +1128,15 @@ msgstr "Rotasjon"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:381
 #: src/frontends/qt4/ui/QExternalUi.ui:411
-#: src/frontends/qt4/ui/QGraphicsUi.ui:277
-#: src/frontends/qt4/ui/QGraphicsUi.ui:298
+#: src/frontends/qt4/ui/QGraphicsUi.ui:235
+#: src/frontends/qt4/ui/QGraphicsUi.ui:256
 msgid "Angle to rotate image by"
 msgstr "Vinkel for å vri bildet"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:391
 #: src/frontends/qt4/ui/QExternalUi.ui:404
-#: src/frontends/qt4/ui/QGraphicsUi.ui:305
-#: src/frontends/qt4/ui/QGraphicsUi.ui:318
+#: src/frontends/qt4/ui/QGraphicsUi.ui:263
+#: src/frontends/qt4/ui/QGraphicsUi.ui:276
 msgid "The origin of the rotation"
 msgstr "Punktet bildet roteres rundt"
 
@@ -1173,7 +1145,6 @@ msgid "&Origin:"
 msgstr "&Origo:"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:414
-#: src/frontends/qt4/ui/QGraphicsUi.ui:280
 msgid "A&ngle:"
 msgstr "Vi&nkel:"
 
@@ -1182,22 +1153,22 @@ msgid "Scale"
 msgstr "Skaler"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:448
-#: src/frontends/qt4/ui/QGraphicsUi.ui:229
+#: src/frontends/qt4/ui/QGraphicsUi.ui:164
 msgid "Height of image in output"
 msgstr "Bildehøyde i utskrift"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:458
-#: src/frontends/qt4/ui/QGraphicsUi.ui:252
+#: src/frontends/qt4/ui/QGraphicsUi.ui:207
 msgid "Maintain aspect ratio with largest dimension"
 msgstr "Korrekt bredde/høydeforhold, etter største dimensjon"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:461
-#: src/frontends/qt4/ui/QGraphicsUi.ui:255
+#: src/frontends/qt4/ui/QGraphicsUi.ui:210
 msgid "&Maintain aspect ratio"
 msgstr "&Korrekt forhold mellom bredde og høyde"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:497
-#: src/frontends/qt4/ui/QGraphicsUi.ui:192
+#: src/frontends/qt4/ui/QGraphicsUi.ui:130
 msgid "Width of image in output"
 msgstr "Bildebredde i utskrift"
 
@@ -1206,44 +1177,40 @@ msgid "Crop"
 msgstr "Klipp"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:530
-#: src/frontends/qt4/ui/QGraphicsUi.ui:545
+#: src/frontends/qt4/ui/QGraphicsUi.ui:440
 msgid "Get bounding box from the (EPS) file"
 msgstr "Hent størrelse fra (EPS)-fil"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:533
-#: src/frontends/qt4/ui/QGraphicsUi.ui:548
+#: src/frontends/qt4/ui/QGraphicsUi.ui:443
 msgid "&Get from File"
 msgstr "&Les fra fil"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:553
-#: src/frontends/qt4/ui/QGraphicsUi.ui:535
+#: src/frontends/qt4/ui/QGraphicsUi.ui:312
 msgid "Clip to bounding box values"
 msgstr "Klipp til rammestørrelsen"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:556
-#: src/frontends/qt4/ui/QGraphicsUi.ui:538
+#: src/frontends/qt4/ui/QGraphicsUi.ui:315
 msgid "Clip to &bounding box"
 msgstr "Klipp til ramma"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:573
-#: src/frontends/qt4/ui/QGraphicsUi.ui:436
+#: src/frontends/qt4/ui/QGraphicsUi.ui:348
 msgid "&Left bottom:"
 msgstr "Venstre nederst"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:586
-#: src/frontends/qt4/ui/QGraphicsUi.ui:446
+#: src/frontends/qt4/ui/QGraphicsUi.ui:386
 msgid "Right &top:"
 msgstr "Høyre øverst"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:612
-#: src/frontends/qt4/ui/QGraphicsUi.ui:464
-#: src/frontends/qt4/ui/QGraphicsUi.ui:504
 msgid "x"
 msgstr "x"
 
 #: src/frontends/qt4/ui/QExternalUi.ui:619
-#: src/frontends/qt4/ui/QGraphicsUi.ui:481
-#: src/frontends/qt4/ui/QGraphicsUi.ui:517
 msgid "y"
 msgstr "y"
 
@@ -1264,90 +1231,111 @@ msgid "&Graphics"
 msgstr "&Grafikk"
 
 #: src/frontends/qt4/ui/QGraphicsUi.ui:55
-msgid "LyX Display"
-msgstr "Visning i LyX"
+#: src/frontends/qt4/ui/QGraphicsUi.ui:62
+msgid "File name of image"
+msgstr "Filnavn for bildet"
 
-#: src/frontends/qt4/ui/QGraphicsUi.ui:164
+#: src/frontends/qt4/ui/QGraphicsUi.ui:75
+msgid "Select an image file"
+msgstr "Velg en bildefil"
+
+#: src/frontends/qt4/ui/QGraphicsUi.ui:85
+msgid "&Edit"
+msgstr "&Rediger"
+
+#: src/frontends/qt4/ui/QGraphicsUi.ui:98
 #, fuzzy
-msgid "Output"
+msgid "Output Size"
 msgstr "Utdata"
 
-#: src/frontends/qt4/ui/QGraphicsUi.ui:219
-msgid "Units of height value"
-msgstr "Enheter for høydemål"
+#: src/frontends/qt4/ui/QGraphicsUi.ui:184
+#, fuzzy
+msgid "&Scale Graphics (%):"
+msgstr "&Grafikk"
 
-#: src/frontends/qt4/ui/QGraphicsUi.ui:265
-msgid "Rotation"
-msgstr "Rotasjon"
+#: src/frontends/qt4/ui/QGraphicsUi.ui:220
+#, fuzzy
+msgid "Rotate Graphics"
+msgstr "Grafikk"
+
+#: src/frontends/qt4/ui/QGraphicsUi.ui:238
+msgid "A&ngle (Degrees):"
+msgstr ""
 
-#: src/frontends/qt4/ui/QGraphicsUi.ui:308
+#: src/frontends/qt4/ui/QGraphicsUi.ui:266
 #, fuzzy
 msgid "Or&igin:"
 msgstr "&Origo"
 
-#: src/frontends/qt4/ui/QGraphicsUi.ui:352
-msgid "&Edit"
-msgstr "&Rediger"
-
-#: src/frontends/qt4/ui/QGraphicsUi.ui:365
-#: src/frontends/qt4/ui/QGraphicsUi.ui:382
-msgid "File name of image"
-msgstr "Filnavn for bildet"
-
-#: src/frontends/qt4/ui/QGraphicsUi.ui:372
-msgid "Select an image file"
-msgstr "Velg en bildefil"
-
-#: src/frontends/qt4/ui/QGraphicsUi.ui:398
+#: src/frontends/qt4/ui/QGraphicsUi.ui:287
 msgid "&Clipping"
 msgstr "&Klipp"
 
-#: src/frontends/qt4/ui/QGraphicsUi.ui:598
+#: src/frontends/qt4/ui/QGraphicsUi.ui:396
+#: src/frontends/qt4/ui/QGraphicsUi.ui:403
+#, fuzzy
+msgid "y:"
+msgstr "y"
+
+#: src/frontends/qt4/ui/QGraphicsUi.ui:410
+#: src/frontends/qt4/ui/QGraphicsUi.ui:417
+#, fuzzy
+msgid "x:"
+msgstr "x"
+
+#: src/frontends/qt4/ui/QGraphicsUi.ui:451
 msgid "E&xtra options"
 msgstr "E&kstra opsjoner"
 
-#: src/frontends/qt4/ui/QGraphicsUi.ui:610
-msgid "Is this just one part of a figure float ?"
-msgstr "Er dette bare en del av en flytende figur?"
+#: src/frontends/qt4/ui/QGraphicsUi.ui:463
+#: src/frontends/qt4/ui/QGraphicsUi.ui:484
+msgid "Additional LaTeX options"
+msgstr "Ekstra opsjoner for LaTeX"
 
-#: src/frontends/qt4/ui/QGraphicsUi.ui:613
-msgid "Su&bfigure"
-msgstr "&Subfigur"
+#: src/frontends/qt4/ui/QGraphicsUi.ui:466
+msgid "LaTeX &options:"
+msgstr "LaTeX-opsjoner"
 
-#: src/frontends/qt4/ui/QGraphicsUi.ui:620
+#: src/frontends/qt4/ui/QGraphicsUi.ui:491
 msgid "Don't uncompress image before exporting to LaTeX"
 msgstr "Ikke pakk ut bildefil før eksport til LaTeX"
 
-#: src/frontends/qt4/ui/QGraphicsUi.ui:623
+#: src/frontends/qt4/ui/QGraphicsUi.ui:494
 msgid "Don't un&zip on export"
 msgstr "Ikke un&zip før eksport"
 
-#: src/frontends/qt4/ui/QGraphicsUi.ui:630
-#: src/frontends/qt4/ui/QGraphicsUi.ui:643
-msgid "Additional LaTeX options"
-msgstr "Ekstra opsjoner for LaTeX"
-
-#: src/frontends/qt4/ui/QGraphicsUi.ui:633
-msgid "LaTeX &options:"
-msgstr "LaTeX-opsjoner"
-
-#: src/frontends/qt4/ui/QGraphicsUi.ui:650
+#: src/frontends/qt4/ui/QGraphicsUi.ui:501
 msgid "Draft mode"
 msgstr "Kladdemodus"
 
-#: src/frontends/qt4/ui/QGraphicsUi.ui:653
+#: src/frontends/qt4/ui/QGraphicsUi.ui:504
 msgid "&Draft mode"
 msgstr "&Kladd"
 
-#: src/frontends/qt4/ui/QGraphicsUi.ui:711
-#: src/frontends/qt4/ui/QGraphicsUi.ui:727
+#: src/frontends/qt4/ui/QGraphicsUi.ui:514
+#, fuzzy
+msgid "S&ubfigure"
+msgstr "&Subfigur"
+
+#: src/frontends/qt4/ui/QGraphicsUi.ui:535
+#: src/frontends/qt4/ui/QGraphicsUi.ui:556
 msgid "The caption for the sub-figure"
 msgstr "Bildetekst for sub-figuren"
 
-#: src/frontends/qt4/ui/QGraphicsUi.ui:714
+#: src/frontends/qt4/ui/QGraphicsUi.ui:538
 msgid "Ca&ption:"
 msgstr "&Bildetekst:"
 
+#: src/frontends/qt4/ui/QGraphicsUi.ui:569
+#, fuzzy
+msgid "Sho&w in LyX"
+msgstr "&Vis i LyX"
+
+#: src/frontends/qt4/ui/QGraphicsUi.ui:630
+#, fuzzy
+msgid "Sca&le on Screen (%):"
+msgstr "Sans Serif:"
+
 #: src/frontends/qt4/ui/QIncludeUi.ui:39
 #, fuzzy
 msgid "Show LaTeX preview"
@@ -1377,11 +1365,11 @@ msgstr "Les inn filen"
 msgid "&Load"
 msgstr "&Les inn"
 
-#: src/frontends/qt4/ui/QIncludeUi.ui:117 src/insets/insetinclude.C:286
+#: src/frontends/qt4/ui/QIncludeUi.ui:117 src/insets/insetinclude.C:303
 msgid "Input"
 msgstr ""
 
-#: src/frontends/qt4/ui/QIncludeUi.ui:122 src/insets/insetinclude.C:295
+#: src/frontends/qt4/ui/QIncludeUi.ui:122 src/insets/insetinclude.C:312
 msgid "Include"
 msgstr "Inkluder"
 
@@ -1399,7 +1387,7 @@ msgid "Update the display"
 msgstr "Oppdater referanselisten"
 
 #: src/frontends/qt4/ui/QLogUi.ui:61 src/frontends/qt4/ui/QRefUi.ui:235
-#: src/frontends/qt4/ui/QTocUi.ui:97 src/frontends/qt4/ui/QViewSourceUi.ui:95
+#: src/frontends/qt4/ui/QTocUi.ui:100 src/frontends/qt4/ui/QViewSourceUi.ui:92
 msgid "&Update"
 msgstr "&Oppdater"
 
@@ -1516,7 +1504,7 @@ msgstr "AMS diverse"
 msgid "&Functions"
 msgstr "Funksjoner"
 
-#: src/frontends/qt4/ui/QMathUi.ui:240 lib/ui/stdtoolbars.ui:125
+#: src/frontends/qt4/ui/QMathUi.ui:240 lib/ui/stdtoolbars.inc:127
 msgid "Insert root"
 msgstr "Sett inn n-rot"
 
@@ -1536,15 +1524,15 @@ msgstr "Sett matte-font"
 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.ui:123
+#: src/frontends/qt4/ui/QMathUi.ui:386 lib/ui/stdtoolbars.inc:125
 msgid "Subscript"
 msgstr "Senket skrift"
 
-#: src/frontends/qt4/ui/QMathUi.ui:405 lib/ui/stdtoolbars.ui:124
+#: src/frontends/qt4/ui/QMathUi.ui:405 lib/ui/stdtoolbars.inc:126
 msgid "Superscript"
 msgstr "Hevet skrift"
 
-#: src/frontends/qt4/ui/QMathUi.ui:424 lib/ui/stdtoolbars.ui:136
+#: src/frontends/qt4/ui/QMathUi.ui:424 lib/ui/stdtoolbars.inc:138
 msgid "Insert matrix"
 msgstr "Sett inn matrise"
 
@@ -1552,6 +1540,21 @@ msgstr "Sett inn matrise"
 msgid "Show delimiter and bracket dialog"
 msgstr "Parenteser og klammer"
 
+#: src/frontends/qt4/ui/QNomenclUi.ui:37
+#, fuzzy
+msgid "Sort &as:"
+msgstr "Gate:"
+
+#: src/frontends/qt4/ui/QNomenclUi.ui:47
+#, fuzzy
+msgid "&Description:"
+msgstr "Beskrivelse"
+
+#: src/frontends/qt4/ui/QNomenclUi.ui:57
+#, fuzzy
+msgid "&Symbol:"
+msgstr "Symbol"
+
 #: src/frontends/qt4/ui/QNoteUi.ui:51
 msgid "Type"
 msgstr "Type"
@@ -1569,9 +1572,8 @@ msgid "Export to LaTeX/Docbook but don't print"
 msgstr "Eksporteres til LaTeX/Docbook, men skrives ikke ut"
 
 #: src/frontends/qt4/ui/QNoteUi.ui:76
-#, fuzzy
 msgid "&Comment"
-msgstr "Kommentar"
+msgstr "&Kommentar"
 
 #: src/frontends/qt4/ui/QNoteUi.ui:83
 msgid "Print as grey text"
@@ -1597,12 +1599,11 @@ msgid "Box with shaded background"
 msgstr "notis bakgrunn"
 
 #: src/frontends/qt4/ui/QNoteUi.ui:106
-#, fuzzy
 msgid "&Shaded"
-msgstr "Lagre"
+msgstr "&Skyggelagt"
 
 #: src/frontends/qt4/ui/QParagraphUi.ui:37
-#: src/frontends/qt4/QDocumentDialog.C:126 src/text.C:2426
+#: src/frontends/qt4/QDocumentDialog.C:113 src/text.C:1600
 msgid "Single"
 msgstr "Enkel"
 
@@ -1611,17 +1612,17 @@ msgid "1.5"
 msgstr "1.5"
 
 #: src/frontends/qt4/ui/QParagraphUi.ui:47
-#: src/frontends/qt4/QDocumentDialog.C:130 src/text.C:2432
+#: src/frontends/qt4/QDocumentDialog.C:117 src/text.C:1606
 msgid "Double"
 msgstr "Dobbel"
 
 #: src/frontends/qt4/ui/QParagraphUi.ui:52
-#: src/frontends/qt4/ui/QTabularUi.ui:709
-#: src/frontends/qt4/ui/QTabularUi.ui:728
-#: src/frontends/qt4/ui/QTabularUi.ui:776
+#: 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:132
-#: src/frontends/qt4/QDocumentDialog.C:213
+#: src/frontends/qt4/QDocumentDialog.C:119
+#: src/frontends/qt4/QDocumentDialog.C:200
 msgid "Custom"
 msgstr "Brukerdefinert"
 
@@ -1656,22 +1657,6 @@ msgstr "Denne teksten definerer bredden p
 msgid "&Longest label"
 msgstr "Lengste listeetikett"
 
-#: src/frontends/qt4/ui/QPrefAsciiUi.ui:36
-msgid "&roff command:"
-msgstr "&roff-kommando:"
-
-#: src/frontends/qt4/ui/QPrefAsciiUi.ui:54
-msgid "Max. line length of exported plain text/LaTeX/SGML files"
-msgstr ""
-
-#: src/frontends/qt4/ui/QPrefAsciiUi.ui:82
-msgid "Output &line length:"
-msgstr "Maksimal linjelengde:"
-
-#: src/frontends/qt4/ui/QPrefAsciiUi.ui:92
-msgid "External app for formating tables in plain text output"
-msgstr "Eksternt program som formatterer tabeller ved eksport til ren tekst"
-
 #: src/frontends/qt4/ui/QPrefColorsUi.ui:44
 msgid "&Colors"
 msgstr "Farger:"
@@ -1692,9 +1677,8 @@ msgid "&Modify"
 msgstr "Modifiser"
 
 #: src/frontends/qt4/ui/QPrefConvertersUi.ui:105
-#, fuzzy
 msgid "&From:"
-msgstr "F&ra:"
+msgstr "&Fra:"
 
 #: src/frontends/qt4/ui/QPrefConvertersUi.ui:130
 msgid "E&xtra flag:"
@@ -1705,20 +1689,11 @@ msgid "C&onverter:"
 msgstr "K&onverteringsprogram:"
 
 #: src/frontends/qt4/ui/QPrefConvertersUi.ui:150
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /></head><body style=\" "
-"white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-"
-"weight:400; font-style:normal; text-decoration:none;\"><p style=\" margin-"
-"top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-"
-"indent:0; text-indent:0px;\">[[as in 'From format x to format y']]</p></"
-"body></html>"
-msgstr ""
-
-#: src/frontends/qt4/ui/QPrefConvertersUi.ui:153
-msgid "&To:"
+#, fuzzy
+msgid "&To:[[as in 'From format x to format y']]"
 msgstr "&Til:"
 
-#: src/frontends/qt4/ui/QPrefConvertersUi.ui:171
+#: src/frontends/qt4/ui/QPrefConvertersUi.ui:168
 msgid "&Converters"
 msgstr "&Konverterteringer"
 
@@ -1735,14 +1710,14 @@ msgstr "&Format:"
 msgid "&Copier:"
 msgstr "Kopiprogram:"
 
-#: src/frontends/qt4/ui/QPrefCygwinPathUi.ui:34
+#: src/frontends/qt4/ui/QPrefCygwinPathUi.ui:44
 msgid ""
 "Select if LyX should output Windows-style paths rather than Posix-style "
 "paths to LaTeX files. Useful if you're using the native Windows MikTeX "
 "rather than the Cygwin teTeX."
 msgstr ""
 
-#: src/frontends/qt4/ui/QPrefCygwinPathUi.ui:37
+#: src/frontends/qt4/ui/QPrefCygwinPathUi.ui:47
 msgid "&Use Windows-style paths in LaTeX files"
 msgstr ""
 
@@ -1814,14 +1789,13 @@ msgstr "Velg grafikkfil"
 
 #: src/frontends/qt4/ui/QPrefFileformatsUi.ui:165
 msgid ""
-"Tell whether this format is a document format. A document can not be "
-"exported to or viewed in a non-document format."
+"Tell whether this format is a document format. A document cannot be exported "
+"to or viewed in a non-document format."
 msgstr ""
 
 #: src/frontends/qt4/ui/QPrefFileformatsUi.ui:168
-#, fuzzy
 msgid "&Document format"
-msgstr "Feil med dokumentformatet"
+msgstr "&Dokumentformat"
 
 #: src/frontends/qt4/ui/QPrefFileformatsUi.ui:175
 msgid "&File formats"
@@ -1844,25 +1818,25 @@ msgstr "&Navn:"
 msgid "Your E-mail address"
 msgstr "E-postadressen din"
 
-#: src/frontends/qt4/ui/QPrefKeyboardUi.ui:50
-#: src/frontends/qt4/ui/QPrefUi.ui:104
+#: src/frontends/qt4/ui/QPrefKeyboardUi.ui:58
+#: src/frontends/qt4/ui/QPrefUi.ui:101
 msgid "Bro&wse..."
 msgstr "Se igjennom..."
 
-#: src/frontends/qt4/ui/QPrefKeyboardUi.ui:60
+#: src/frontends/qt4/ui/QPrefKeyboardUi.ui:71
 msgid "S&econd:"
 msgstr "Andre:"
 
-#: src/frontends/qt4/ui/QPrefKeyboardUi.ui:70
+#: src/frontends/qt4/ui/QPrefKeyboardUi.ui:84
 msgid "&First:"
 msgstr "Første:"
 
-#: src/frontends/qt4/ui/QPrefKeyboardUi.ui:80
+#: src/frontends/qt4/ui/QPrefKeyboardUi.ui:97
 #: src/frontends/qt4/ui/QPrefSpellcheckerUi.ui:82
 msgid "Br&owse..."
 msgstr "Se igjennom..."
 
-#: src/frontends/qt4/ui/QPrefKeyboardUi.ui:90
+#: src/frontends/qt4/ui/QPrefKeyboardUi.ui:107
 msgid "Use &keyboard map"
 msgstr "Bruk &tastaturoppsett"
 
@@ -1925,37 +1899,37 @@ msgid "Te&X encoding:"
 msgstr "TeX innstillinger"
 
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:83
-#: src/frontends/qt4/QDocumentDialog.C:214
+#: src/frontends/qt4/QDocumentDialog.C:201
 msgid "US letter"
 msgstr ""
 
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:88
-#: src/frontends/qt4/QDocumentDialog.C:215
+#: src/frontends/qt4/QDocumentDialog.C:202
 msgid "US legal"
 msgstr ""
 
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:93
-#: src/frontends/qt4/QDocumentDialog.C:216
+#: src/frontends/qt4/QDocumentDialog.C:203
 msgid "US executive"
 msgstr ""
 
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:98
-#: src/frontends/qt4/QDocumentDialog.C:217
+#: src/frontends/qt4/QDocumentDialog.C:204
 msgid "A3"
 msgstr "A3"
 
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:103
-#: src/frontends/qt4/QDocumentDialog.C:218
+#: src/frontends/qt4/QDocumentDialog.C:205
 msgid "A4"
 msgstr "A4"
 
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:108
-#: src/frontends/qt4/QDocumentDialog.C:219
+#: src/frontends/qt4/QDocumentDialog.C:206
 msgid "A5"
 msgstr "A5"
 
 #: src/frontends/qt4/ui/QPrefLatexUi.ui:113
-#: src/frontends/qt4/QDocumentDialog.C:222
+#: src/frontends/qt4/QDocumentDialog.C:209
 msgid "B5"
 msgstr "B5"
 
@@ -2027,9 +2001,28 @@ msgstr "&Arbeidskatalog:"
 msgid "&Document templates:"
 msgstr "&Dokumentmaler:"
 
-#: src/frontends/qt4/ui/QPrefPrinterUi.ui:47
-msgid "Name of the default printer"
-msgstr "Navn på standardskriver"
+#: src/frontends/qt4/ui/QPrefPlaintextUi.ui:36
+msgid "&roff command:"
+msgstr "&roff-kommando:"
+
+#: src/frontends/qt4/ui/QPrefPlaintextUi.ui:54 src/lyxrc.C:2181
+msgid ""
+"The maximum line length of exported plain text/LaTeX/SGML files. If set to "
+"0, paragraphs are output in a single line; if the line length is > 0, "
+"paragraphs are separated by a blank line."
+msgstr ""
+
+#: src/frontends/qt4/ui/QPrefPlaintextUi.ui:82
+msgid "Output &line length:"
+msgstr "Maksimal linjelengde:"
+
+#: src/frontends/qt4/ui/QPrefPlaintextUi.ui:92
+msgid "External app for formating tables in plain text output"
+msgstr "Eksternt program som formatterer tabeller ved eksport til ren tekst"
+
+#: src/frontends/qt4/ui/QPrefPrinterUi.ui:47
+msgid "Name of the default printer"
+msgstr "Navn på standardskriver"
 
 #: src/frontends/qt4/ui/QPrefPrinterUi.ui:54
 msgid "Use printer name explicitely"
@@ -2214,89 +2207,89 @@ msgstr "Tillat sammensatte &ord"
 msgid "Use input encod&ing"
 msgstr "Bruk \"input-encod&ing\""
 
-#: src/frontends/qt4/ui/QPrefUi.ui:36
+#: src/frontends/qt4/ui/QPrefUi.ui:33
 msgid "Scrolling"
 msgstr ""
 
-#: src/frontends/qt4/ui/QPrefUi.ui:51
+#: src/frontends/qt4/ui/QPrefUi.ui:48
 #, fuzzy
 msgid "Cursor follows &scrollbar"
 msgstr "Mar&køren følger rullefeltet"
 
-#: src/frontends/qt4/ui/QPrefUi.ui:74
+#: src/frontends/qt4/ui/QPrefUi.ui:71
 msgid "B&rowse..."
 msgstr "Se igjennom..."
 
-#: src/frontends/qt4/ui/QPrefUi.ui:81
+#: src/frontends/qt4/ui/QPrefUi.ui:78
 msgid "&User interface file:"
 msgstr "&Brukergrensesnittfil:"
 
-#: src/frontends/qt4/ui/QPrefUi.ui:91
+#: src/frontends/qt4/ui/QPrefUi.ui:88
 msgid "&Bind file:"
 msgstr "&Hurtigtast-fil:"
 
-#: src/frontends/qt4/ui/QPrefUi.ui:122
+#: src/frontends/qt4/ui/QPrefUi.ui:119
 #, fuzzy
 msgid "Session"
 msgstr "Versjon"
 
-#: src/frontends/qt4/ui/QPrefUi.ui:134
-msgid "Save/restore window size, or use fixed window"
-msgstr ""
+#: src/frontends/qt4/ui/QPrefUi.ui:131
+#, fuzzy
+msgid "Save/restore window size, or use fixed size"
+msgstr "rad nr"
 
-#: src/frontends/qt4/ui/QPrefUi.ui:157
+#: src/frontends/qt4/ui/QPrefUi.ui:154
 msgid "Load opened files from last session"
 msgstr ""
 
-#: src/frontends/qt4/ui/QPrefUi.ui:164
-#, fuzzy
+#: src/frontends/qt4/ui/QPrefUi.ui:161
 msgid "Restore cursor positions"
-msgstr "rad nr"
+msgstr ""
 
-#: src/frontends/qt4/ui/QPrefUi.ui:174
+#: src/frontends/qt4/ui/QPrefUi.ui:171
 #, fuzzy
 msgid "Restore to cursor position when the file was last closed"
 msgstr "rad nr"
 
-#: src/frontends/qt4/ui/QPrefUi.ui:177
+#: src/frontends/qt4/ui/QPrefUi.ui:174
 #, fuzzy
 msgid "Save/restore window position"
 msgstr "rad nr"
 
-#: src/frontends/qt4/ui/QPrefUi.ui:211
-#: src/frontends/controllers/ControlBox.C:85 src/frontends/qt4/QBox.C:194
+#: src/frontends/qt4/ui/QPrefUi.ui:208
+#: src/frontends/controllers/ControlBox.C:83 src/frontends/qt4/QBox.C:194
 #: src/frontends/qt4/QBox.C:228
 msgid "Width"
 msgstr "Bredde"
 
 #: src/frontends/qt4/ui/QPrefUi.ui:234
-#: src/frontends/controllers/ControlBox.C:82 src/frontends/qt4/QBox.C:185
+#: src/frontends/controllers/ControlBox.C:80 src/frontends/qt4/QBox.C:185
 #: src/frontends/qt4/QBox.C:219
 msgid "Height"
 msgstr "Høyde"
 
-#: src/frontends/qt4/ui/QPrefUi.ui:275
+#: src/frontends/qt4/ui/QPrefUi.ui:278
 msgid "Documents"
 msgstr "Dokumenter"
 
-#: src/frontends/qt4/ui/QPrefUi.ui:287
+#: src/frontends/qt4/ui/QPrefUi.ui:290
 msgid "B&ackup documents "
 msgstr "Sikkerhetskopiér dokumenter "
 
-#: src/frontends/qt4/ui/QPrefUi.ui:318
+#: src/frontends/qt4/ui/QPrefUi.ui:321
 msgid " every"
 msgstr " hvert"
 
-#: src/frontends/qt4/ui/QPrefUi.ui:338
+#: src/frontends/qt4/ui/QPrefUi.ui:341
 msgid "minutes"
 msgstr "minutt"
 
-#: src/frontends/qt4/ui/QPrefUi.ui:355
+#: src/frontends/qt4/ui/QPrefUi.ui:358
 msgid "&Maximum last files:"
 msgstr "Max antall tidligere filer"
 
-#: src/frontends/qt4/ui/QPrefsUi.ui:76 src/bufferlist.C:90
-#: src/bufferlist.C:198 src/lyxfunc.C:676
+#: src/frontends/qt4/ui/QPrefsUi.ui:76 src/bufferlist.C:114
+#: src/bufferlist.C:222 src/lyxfunc.C:726
 msgid "&Save"
 msgstr "Lagre"
 
@@ -2530,7 +2523,6 @@ msgid "&Table Settings"
 msgstr "&Tabellinnstillinger"
 
 #: src/frontends/qt4/ui/QTabularUi.ui:53
-#, fuzzy
 msgid "Column Width"
 msgstr "Kolonnebredde"
 
@@ -2630,155 +2622,155 @@ msgstr ""
 msgid "Fo&rmal"
 msgstr "Normal"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:323
+#: src/frontends/qt4/ui/QTabularUi.ui:326
 msgid "Use default (grid-like) border style"
 msgstr ""
 
-#: src/frontends/qt4/ui/QTabularUi.ui:326
+#: src/frontends/qt4/ui/QTabularUi.ui:329
 #, fuzzy
 msgid "De&fault"
 msgstr "Standard"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:349
+#: src/frontends/qt4/ui/QTabularUi.ui:352
 msgid "Set Borders"
 msgstr "Kantlinjer"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:657
+#: src/frontends/qt4/ui/QTabularUi.ui:660
 msgid "Set borders of the current (selected) cell(s)"
 msgstr "Kantlinjer for (valgte) ruter"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:670
+#: src/frontends/qt4/ui/QTabularUi.ui:673
 #, fuzzy
 msgid "Additional Space"
 msgstr "Vertikal avstand"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:682
+#: src/frontends/qt4/ui/QTabularUi.ui:685
 msgid "T&op of row:"
 msgstr ""
 
-#: src/frontends/qt4/ui/QTabularUi.ui:742
+#: src/frontends/qt4/ui/QTabularUi.ui:745
 #, fuzzy
 msgid "Botto&m of row:"
 msgstr "Nederst på siden"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:755
+#: src/frontends/qt4/ui/QTabularUi.ui:758
 msgid "Bet&ween rows:"
 msgstr ""
 
-#: src/frontends/qt4/ui/QTabularUi.ui:793
+#: src/frontends/qt4/ui/QTabularUi.ui:796
 msgid "&Longtable"
 msgstr "&Lang tabell"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:821
+#: src/frontends/qt4/ui/QTabularUi.ui:824
 msgid "Set a page break on the current row"
 msgstr "Sideskift på denne raden"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:824
+#: src/frontends/qt4/ui/QTabularUi.ui:827
 msgid "Page &break on current row"
 msgstr "Sideskift på denne raden"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:834
+#: src/frontends/qt4/ui/QTabularUi.ui:837
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:846
+#: src/frontends/qt4/ui/QTabularUi.ui:849
 msgid "Status"
 msgstr "Status"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:853
+#: src/frontends/qt4/ui/QTabularUi.ui:856
 msgid "Header:"
 msgstr "Hode:"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:860
+#: src/frontends/qt4/ui/QTabularUi.ui:863
 msgid "Footer:"
 msgstr "Fot:"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:867
+#: src/frontends/qt4/ui/QTabularUi.ui:870
 msgid "First header:"
 msgstr "Første hode:"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:874
+#: src/frontends/qt4/ui/QTabularUi.ui:877
 msgid "Last footer:"
 msgstr "Siste fot:"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:881
+#: src/frontends/qt4/ui/QTabularUi.ui:884
 msgid "Contents"
 msgstr "Innhold"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:888
+#: src/frontends/qt4/ui/QTabularUi.ui:891
 msgid "Border above"
 msgstr "Strek over"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:895
+#: src/frontends/qt4/ui/QTabularUi.ui:898
 msgid "Border below"
 msgstr "Strek under"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:902
+#: src/frontends/qt4/ui/QTabularUi.ui:905
 msgid "Repeat this row as header on every (except the first) page"
 msgstr "Bruk denne raden som førsterad på hver side (utenom den første)"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:905
-#: src/frontends/qt4/ui/QTabularUi.ui:918
-#: src/frontends/qt4/ui/QTabularUi.ui:928
-#: src/frontends/qt4/ui/QTabularUi.ui:938
+#: src/frontends/qt4/ui/QTabularUi.ui:908
+#: src/frontends/qt4/ui/QTabularUi.ui:921
+#: src/frontends/qt4/ui/QTabularUi.ui:931
+#: src/frontends/qt4/ui/QTabularUi.ui:941
 msgid "on"
 msgstr "på"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:912
+#: src/frontends/qt4/ui/QTabularUi.ui:915
 msgid "This row is the header of the first page"
 msgstr "Denne raden er tabellhode på den første siden"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:925
+#: src/frontends/qt4/ui/QTabularUi.ui:928
 msgid "Repeat this row as footer on every (except the last) page"
 msgstr "Bruk denne raden som sisterad på hver side (utenom den siste)"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:935
+#: src/frontends/qt4/ui/QTabularUi.ui:938
 msgid "This row is the footer of the last page"
 msgstr "Denne raden er den siste på den siste siden"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:948
-#: src/frontends/qt4/ui/QTabularUi.ui:955
-#: src/frontends/qt4/ui/QTabularUi.ui:962
-#: src/frontends/qt4/ui/QTabularUi.ui:969
-#: src/frontends/qt4/ui/QTabularUi.ui:976
-#: src/frontends/qt4/ui/QTabularUi.ui:983
-#: src/frontends/qt4/ui/QTabularUi.ui:990
-#: src/frontends/qt4/ui/QTabularUi.ui:997
+#: src/frontends/qt4/ui/QTabularUi.ui:951
+#: src/frontends/qt4/ui/QTabularUi.ui:958
+#: src/frontends/qt4/ui/QTabularUi.ui:965
+#: src/frontends/qt4/ui/QTabularUi.ui:972
+#: src/frontends/qt4/ui/QTabularUi.ui:979
+#: src/frontends/qt4/ui/QTabularUi.ui:986
+#: src/frontends/qt4/ui/QTabularUi.ui:993
+#: src/frontends/qt4/ui/QTabularUi.ui:1000
 msgid "double"
 msgstr "dobbel"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:1004
+#: src/frontends/qt4/ui/QTabularUi.ui:1007
 #, fuzzy
 msgid "Don't output the last footer"
 msgstr "Utskrift til fil"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:1007
-#: src/frontends/qt4/ui/QTabularUi.ui:1017
+#: src/frontends/qt4/ui/QTabularUi.ui:1010
+#: src/frontends/qt4/ui/QTabularUi.ui:1020
 msgid "is empty"
 msgstr "er tom"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:1014
+#: src/frontends/qt4/ui/QTabularUi.ui:1017
 #, fuzzy
 msgid "Don't output the first header"
 msgstr "Skriv ut til skriveren"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:1027
+#: src/frontends/qt4/ui/QTabularUi.ui:1030
 msgid "Select for tables that span multiple pages"
 msgstr "Brukes for tabeller som går over flere sider"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:1030
+#: src/frontends/qt4/ui/QTabularUi.ui:1033
 msgid "&Use long table"
 msgstr "&Bruk lang tabell"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:1049
+#: src/frontends/qt4/ui/QTabularUi.ui:1052
 msgid "Current cell:"
 msgstr "Tabellrute:"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:1073
+#: src/frontends/qt4/ui/QTabularUi.ui:1076
 msgid "Current row position"
 msgstr "rad nr"
 
-#: src/frontends/qt4/ui/QTabularUi.ui:1097
+#: src/frontends/qt4/ui/QTabularUi.ui:1100
 msgid "Current column position"
 msgstr "Kolonne nr"
 
@@ -2833,7 +2825,7 @@ msgstr "Mattepanel"
 msgid "Index entry"
 msgstr "Nøkkelord for register"
 
-#: src/frontends/qt4/ui/QThesaurusUi.ui:45 src/frontends/qt4/Dialogs.C:220
+#: src/frontends/qt4/ui/QThesaurusUi.ui:45 src/frontends/qt4/Dialogs.C:221
 msgid "&Keyword:"
 msgstr "Nø&kkelord:"
 
@@ -2857,16 +2849,16 @@ msgstr "Merking:"
 msgid "Replace the entry with the selection"
 msgstr "Bytt ut med valgt ord"
 
-#: src/frontends/qt4/ui/QTocUi.ui:50
+#: src/frontends/qt4/ui/QTocUi.ui:53
 #, fuzzy
 msgid "<- &Promote"
 msgstr "Beskytt:"
 
-#: src/frontends/qt4/ui/QTocUi.ui:57
+#: src/frontends/qt4/ui/QTocUi.ui:60
 msgid "&Demote ->"
 msgstr ""
 
-#: src/frontends/qt4/ui/QTocUi.ui:130
+#: src/frontends/qt4/ui/QTocUi.ui:136
 msgid "&Type:"
 msgstr "&Type:"
 
@@ -2921,17 +2913,17 @@ msgid "DefSkip"
 msgstr "Standard avstand"
 
 #: src/frontends/qt4/ui/QVSpaceUi.ui:93
-#: src/frontends/qt4/QDocumentDialog.C:119
+#: src/frontends/qt4/QDocumentDialog.C:106
 msgid "SmallSkip"
 msgstr "Liten avstand"
 
 #: src/frontends/qt4/ui/QVSpaceUi.ui:98
-#: src/frontends/qt4/QDocumentDialog.C:120
+#: src/frontends/qt4/QDocumentDialog.C:107
 msgid "MedSkip"
 msgstr "Medium avstand"
 
 #: src/frontends/qt4/ui/QVSpaceUi.ui:103
-#: src/frontends/qt4/QDocumentDialog.C:121
+#: src/frontends/qt4/QDocumentDialog.C:108
 msgid "BigSkip"
 msgstr "Stor avstand"
 
@@ -2939,20 +2931,11 @@ msgstr "Stor avstand"
 msgid "VFill"
 msgstr "Vertikalt fyll (\\vfill)"
 
-#: src/frontends/qt4/ui/QViewSourceUi.ui:31
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /></head><body style=\" "
-"white-space: pre-wrap; font-family:Sans Serif; font-size:13pt; font-"
-"weight:400; font-style:normal; text-decoration:none;\"><p style=\"-qt-"
-"paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; "
-"margin-right:0px; -qt-block-indent:0; text-indent:0px;\"></p></body></html>"
-msgstr ""
-
-#: src/frontends/qt4/ui/QViewSourceUi.ui:49
+#: src/frontends/qt4/ui/QViewSourceUi.ui:46
 msgid "Display complete source"
 msgstr ""
 
-#: src/frontends/qt4/ui/QViewSourceUi.ui:56
+#: src/frontends/qt4/ui/QViewSourceUi.ui:53
 msgid "Automatic update"
 msgstr ""
 
@@ -3023,8 +3006,9 @@ msgstr "To &kolonners dokument"
 #: lib/layouts/slides.layout:60 lib/layouts/agu_stdclass.inc:22
 #: 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 src/frontends/qt4/BulletsModule.C:46
-#: src/insets/insetref.C:150 src/mathed/InsetMathRef.C:183
+#: 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
 msgid "Standard"
 msgstr "Standard"
 
@@ -3168,7 +3152,7 @@ msgstr "Definisjon #:"
 #: lib/layouts/ijmpd.layout:175 lib/layouts/llncs.layout:340
 #: lib/layouts/amsmaths-plain.inc:133 lib/layouts/amsmaths-seq.inc:112
 #: lib/layouts/amsmaths.inc:276 lib/layouts/svjour.inc:397
-#: src/frontends/qt4/QDocumentDialog.C:324
+#: src/frontends/qt4/QDocumentDialog.C:314
 msgid "Example"
 msgstr "Eksempel"
 
@@ -3273,7 +3257,7 @@ 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:62
+#: lib/layouts/aastex.layout:168 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
@@ -3294,7 +3278,7 @@ 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:73
+#: lib/layouts/aastex.layout:181 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
@@ -3313,7 +3297,7 @@ 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:81
+#: lib/layouts/aastex.layout:194 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
@@ -3362,13 +3346,13 @@ msgstr "UnderUnderSeksjon*"
 #: lib/layouts/latex8.layout:100 lib/layouts/llncs.layout:240
 #: lib/layouts/ltugboat.layout:171 lib/layouts/ltugboat.layout:186
 #: lib/layouts/paper.layout:135 lib/layouts/revtex.layout:135
-#: lib/layouts/revtex4.layout:191 lib/layouts/siamltex.layout:143
+#: lib/layouts/revtex4.layout:202 lib/layouts/siamltex.layout:143
 #: lib/layouts/spie.layout:73 lib/layouts/svglobal.layout:29
 #: lib/layouts/svjog.layout:34 lib/layouts/agu_stdtitle.inc:193
 #: 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:153
+#: src/output_plaintext.C:152
 msgid "Abstract"
 msgstr "Sammendrag"
 
@@ -3380,7 +3364,7 @@ msgstr "Sammendrag---"
 #: lib/layouts/aastex.layout:283 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:230
+#: lib/layouts/paper.layout:174 lib/layouts/revtex4.layout:241
 #: lib/layouts/siamltex.layout:169 lib/layouts/spie.layout:39
 #: lib/layouts/agu_stdtitle.inc:120 lib/layouts/amsdefs.inc:194
 #: lib/layouts/svjour.inc:273
@@ -3408,7 +3392,7 @@ msgstr ""
 #: lib/layouts/siamltex.layout:183 lib/layouts/aguplus.inc:168
 #: lib/layouts/aguplus.inc:170 lib/layouts/amsdefs.inc:229
 #: lib/layouts/scrclass.inc:223 lib/layouts/stdstruct.inc:39
-#: lib/layouts/svjour.inc:326 src/frontends/qt4/QDocumentDialog.C:402
+#: lib/layouts/svjour.inc:326 src/frontends/qt4/QDocumentDialog.C:392
 msgid "Bibliography"
 msgstr "Referanseliste"
 
@@ -3416,7 +3400,7 @@ msgstr "Referanseliste"
 #: lib/layouts/aastex.layout:115 lib/layouts/aastex.layout:410
 #: lib/layouts/ijmpc.layout:338 lib/layouts/ijmpd.layout:349
 #: lib/layouts/kluwer.layout:323 lib/layouts/kluwer.layout:336
-#: src/rowpainter.C:458
+#: src/rowpainter.C:507
 msgid "Appendix"
 msgstr "Appendiks"
 
@@ -3475,7 +3459,7 @@ msgstr "Nummerert liste"
 #: lib/layouts/scrlettr.layout:17 lib/layouts/scrlttr2.layout:18
 #: lib/layouts/agu_stdlists.inc:29 lib/layouts/db_stdlists.inc:26
 #: lib/layouts/scrclass.inc:26 lib/layouts/stdlists.inc:47
-#: lib/ui/stdtoolbars.ui:69
+#: lib/ui/stdtoolbars.inc:70
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -3483,7 +3467,7 @@ msgstr "Beskrivelse"
 #: lib/layouts/aastex.layout:85 lib/layouts/egs.layout:127
 #: lib/layouts/scrlettr.layout:32 lib/layouts/scrlttr2.layout:33
 #: lib/layouts/scrclass.inc:40 lib/layouts/stdlists.inc:69
-#: lib/ui/stdtoolbars.ui:68
+#: lib/ui/stdtoolbars.inc:69
 msgid "List"
 msgstr "Liste"
 
@@ -3543,7 +3527,7 @@ msgstr "Forfatter"
 #: 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:155 lib/layouts/scrlettr.layout:145
+#: lib/layouts/revtex4.layout:164 lib/layouts/scrlettr.layout:145
 #: lib/layouts/scrlttr2.layout:40 lib/layouts/aapaper.inc:30
 #: lib/layouts/amsdefs.inc:152 lib/layouts/lyxmacros.inc:43
 msgid "Address"
@@ -3570,7 +3554,7 @@ msgstr ""
 #: 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
-#: lib/layouts/svjour.inc:230 lib/ui/stdmenus.ui:297
+#: lib/layouts/svjour.inc:230 lib/ui/stdmenus.inc:311
 msgid "Date"
 msgstr "Dato"
 
@@ -3597,7 +3581,7 @@ msgid "Acknowledgements."
 msgstr ""
 
 #: lib/layouts/aapaper.layout:63 lib/layouts/egs.layout:637
-#: src/frontends/qt4/QPrefsDialog.C:302
+#: src/frontends/qt4/QPrefsDialog.C:286
 msgid "LaTeX"
 msgstr "LaTeX"
 
@@ -3609,7 +3593,7 @@ msgid "Email"
 msgstr "E-post"
 
 #: lib/layouts/aapaper.layout:93 lib/layouts/aapaper.inc:107
-#: lib/ui/stdtoolbars.ui:91 src/frontends/qt4/QThesaurus.C:29
+#: lib/ui/stdtoolbars.inc:93 src/frontends/qt4/QThesaurus.C:29
 msgid "Thesaurus"
 msgstr ""
 
@@ -3651,7 +3635,7 @@ msgstr ""
 #: 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:165
+#: lib/layouts/svjour.inc:340 src/output_plaintext.C:164
 msgid "References"
 msgstr "Referanser"
 
@@ -4037,7 +4021,7 @@ msgstr ""
 msgid "Acknowledgements:"
 msgstr ""
 
-#: lib/layouts/apa.layout:243 lib/layouts/revtex4.layout:201
+#: lib/layouts/apa.layout:243 lib/layouts/revtex4.layout:212
 #: lib/layouts/spie.layout:88
 msgid "Acknowledgments"
 msgstr ""
@@ -4069,7 +4053,7 @@ msgid "Seriate"
 msgstr ""
 
 #: lib/layouts/apa.layout:346 lib/layouts/apa.layout:347
-#: src/buffer_funcs.C:452
+#: src/buffer_funcs.C:455
 msgid "(\\alph{enumii})"
 msgstr "(\\alph{enumii})"
 
@@ -4177,23 +4161,20 @@ msgid "Corollary.  "
 msgstr "Korollar."
 
 #: lib/layouts/beamer.layout:537
-#, fuzzy
 msgid "Column"
-msgstr "&Kolonner:"
+msgstr "Kolonne"
 
 #: lib/layouts/beamer.layout:548
 msgid "start column of width:  "
 msgstr ""
 
 #: lib/layouts/beamer.layout:560
-#, fuzzy
 msgid "Columns"
-msgstr "&Kolonner:"
+msgstr "Kolonner"
 
 #: lib/layouts/beamer.layout:572
-#, fuzzy
 msgid "columns "
-msgstr "&Kolonner:"
+msgstr "kolonner "
 
 #: lib/layouts/beamer.layout:589
 msgid "ColumnsCenterAligned"
@@ -4212,34 +4193,28 @@ msgid "columns (top aligned) "
 msgstr ""
 
 #: lib/layouts/beamer.layout:676
-#, fuzzy
 msgid "Definition.  "
-msgstr "Definisjon."
+msgstr "Definisjon.  "
 
 #: lib/layouts/beamer.layout:679
-#, fuzzy
 msgid "Definitions"
-msgstr "Definisjon"
+msgstr "Definisjoner"
 
 #: lib/layouts/beamer.layout:682
-#, fuzzy
 msgid "Definitions.  "
-msgstr "Definisjon."
+msgstr "Definisjoner.  "
 
 #: lib/layouts/beamer.layout:688
-#, fuzzy
 msgid "Example.  "
-msgstr "Eksempel."
+msgstr "Eksempel.  "
 
 #: lib/layouts/beamer.layout:696
-#, fuzzy
 msgid "Examples"
-msgstr "Eksempel"
+msgstr "Eksempler"
 
 #: lib/layouts/beamer.layout:699
-#, fuzzy
 msgid "Examples.  "
-msgstr "Eksempel."
+msgstr "Eksempler.  "
 
 #: lib/layouts/beamer.layout:702
 #, fuzzy
@@ -4251,9 +4226,8 @@ msgid "block showing an example "
 msgstr ""
 
 #: lib/layouts/beamer.layout:734
-#, fuzzy
 msgid "Fact.  "
-msgstr "Faktum."
+msgstr "Faktum.  "
 
 #: lib/layouts/beamer.layout:737
 #, fuzzy
@@ -4276,14 +4250,12 @@ msgid "NoteItem"
 msgstr "Notis"
 
 #: lib/layouts/beamer.layout:830
-#, fuzzy
 msgid "note:  "
-msgstr "notis"
+msgstr "notis:  "
 
 #: lib/layouts/beamer.layout:842
-#, fuzzy
 msgid "Only"
-msgstr "På"
+msgstr "Bare"
 
 #: lib/layouts/beamer.layout:851
 msgid "only on slides  "
@@ -4307,33 +4279,28 @@ msgid "overlayarea "
 msgstr ""
 
 #: lib/layouts/beamer.layout:932
-#, fuzzy
 msgid "Part "
-msgstr "Del"
+msgstr "Del "
 
 #: lib/layouts/beamer.layout:949
-#, fuzzy
 msgid "Proof.  "
-msgstr "Bevis."
+msgstr "Bevis.  "
 
 #: lib/layouts/beamer.layout:953
-#, fuzzy
 msgid "Separator"
-msgstr "Menyseparator|M"
+msgstr "Separator"
 
 #: lib/layouts/beamer.layout:966
 msgid "___"
-msgstr ""
+msgstr "___"
 
 #: lib/layouts/beamer.layout:1001
-#, fuzzy
 msgid "TitleGraphic"
-msgstr "Grafikk"
+msgstr "Tittelgrafikk"
 
 #: lib/layouts/beamer.layout:1027
-#, fuzzy
 msgid "Theorem.  "
-msgstr "Teorem."
+msgstr "Teorem.  "
 
 #: lib/layouts/beamer.layout:1055
 #, fuzzy
@@ -4345,6 +4312,7 @@ msgid "uncovered on slides  "
 msgstr ""
 
 #: lib/layouts/beamer.layout:1086 lib/layouts/stdfloats.inc:10
+#: lib/ui/stdtoolbars.inc:96
 msgid "Table"
 msgstr "Tabell"
 
@@ -4743,12 +4711,12 @@ 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:158 lib/layouts/scrlettr.layout:148
+#: lib/layouts/revtex4.layout:167 lib/layouts/scrlettr.layout:148
 #: lib/layouts/scrlttr2.layout:57 lib/layouts/amsdefs.inc:163
 msgid "Address:"
 msgstr "Adresse:"
 
-#: lib/layouts/elsart.layout:149 lib/layouts/revtex4.layout:169
+#: lib/layouts/elsart.layout:149 lib/layouts/revtex4.layout:178
 msgid "Author Email"
 msgstr "Forfatters E-post"
 
@@ -4756,16 +4724,16 @@ msgstr "Forfatters E-post"
 msgid "Email:"
 msgstr "E-post:"
 
-#: lib/layouts/elsart.layout:170 lib/layouts/revtex4.layout:183
+#: lib/layouts/elsart.layout:170 lib/layouts/revtex4.layout:193
 msgid "Author URL"
 msgstr "Forfatter URL"
 
-#: lib/layouts/elsart.layout:181 lib/layouts/revtex4.layout:187
+#: lib/layouts/elsart.layout:181 lib/layouts/revtex4.layout:198
 #: lib/layouts/amsdefs.inc:190
 msgid "URL:"
 msgstr "URL:"
 
-#: lib/layouts/elsart.layout:193 lib/layouts/revtex4.layout:162
+#: lib/layouts/elsart.layout:193 lib/layouts/revtex4.layout:171
 #: lib/layouts/amsdefs.inc:201
 msgid "Thanks"
 msgstr "Takk"
@@ -5626,7 +5594,7 @@ msgstr ""
 
 #: lib/layouts/ijmpc.layout:86 lib/layouts/ijmpd.layout:89
 #: lib/layouts/kluwer.layout:290 lib/layouts/paper.layout:177
-#: lib/layouts/revtex4.layout:235 lib/layouts/spie.layout:46
+#: lib/layouts/revtex4.layout:246 lib/layouts/spie.layout:46
 #: lib/layouts/agu_stdtitle.inc:123
 msgid "Keywords:"
 msgstr "Nøkkelord:"
@@ -5915,23 +5883,27 @@ msgstr ""
 msgid "Preprint"
 msgstr ""
 
-#: lib/layouts/revtex4.layout:165 lib/layouts/amsdefs.inc:204
+#: lib/layouts/revtex4.layout:153 lib/layouts/revtex4.layout:158
+msgid "AltAffiliation"
+msgstr ""
+
+#: lib/layouts/revtex4.layout:174 lib/layouts/amsdefs.inc:204
 msgid "Thanks:"
 msgstr "Takk:"
 
-#: lib/layouts/revtex4.layout:173
+#: lib/layouts/revtex4.layout:183
 msgid "Electronic Address:"
 msgstr "Elektronisk adresse:"
 
-#: lib/layouts/revtex4.layout:209
+#: lib/layouts/revtex4.layout:220
 msgid "acknowledgments"
 msgstr ""
 
-#: lib/layouts/revtex4.layout:219
+#: lib/layouts/revtex4.layout:230
 msgid "PACS"
 msgstr ""
 
-#: lib/layouts/revtex4.layout:226
+#: lib/layouts/revtex4.layout:237
 #, fuzzy
 msgid "PACS number:"
 msgstr "Nummerering"
@@ -6411,7 +6383,7 @@ msgstr ""
 msgid "Published-online:"
 msgstr ""
 
-#: lib/layouts/agu_stdtitle.inc:263 src/frontends/qt4/QCitationDialog.C:41
+#: lib/layouts/agu_stdtitle.inc:263 src/frontends/qt4/QCitationDialog.C:44
 msgid "Citation"
 msgstr "Litteraturreferanse"
 
@@ -6432,9 +6404,8 @@ msgid "AGU-pages"
 msgstr ""
 
 #: lib/layouts/agu_stdtitle.inc:282
-#, fuzzy
 msgid "AGU-pages:"
-msgstr "Oddetallssider:"
+msgstr ""
 
 #: lib/layouts/agu_stdtitle.inc:287
 msgid "Words"
@@ -7104,15 +7075,15 @@ msgstr "Ukrainsk"
 msgid "Welsh"
 msgstr "Walisisk"
 
-#: lib/ui/classic.ui:32 lib/ui/stdmenus.ui:20
+#: lib/ui/classic.ui:32 lib/ui/stdmenus.inc:20
 msgid "File|F"
 msgstr "Fil|F"
 
-#: lib/ui/classic.ui:33 lib/ui/stdmenus.ui:21
+#: lib/ui/classic.ui:33 lib/ui/stdmenus.inc:21
 msgid "Edit|E"
 msgstr "Rediger|R"
 
-#: lib/ui/classic.ui:34 lib/ui/stdmenus.ui:23
+#: lib/ui/classic.ui:34 lib/ui/stdmenus.inc:23
 msgid "Insert|I"
 msgstr "Sett inn|S"
 
@@ -7120,11 +7091,11 @@ msgstr "Sett inn|S"
 msgid "Layout|L"
 msgstr "Stil|S"
 
-#: lib/ui/classic.ui:36 lib/ui/stdmenus.ui:22
+#: lib/ui/classic.ui:36 lib/ui/stdmenus.inc:22
 msgid "View|V"
 msgstr "Vis|V"
 
-#: lib/ui/classic.ui:37 lib/ui/stdmenus.ui:24
+#: lib/ui/classic.ui:37 lib/ui/stdmenus.inc:24
 msgid "Navigate|N"
 msgstr "Naviger|N"
 
@@ -7132,11 +7103,11 @@ msgstr "Naviger|N"
 msgid "Documents|D"
 msgstr "Dokumenter|D"
 
-#: lib/ui/classic.ui:39 lib/ui/stdmenus.ui:27
+#: lib/ui/classic.ui:39 lib/ui/stdmenus.inc:27
 msgid "Help|H"
 msgstr "Hjelp|H"
 
-#: lib/ui/classic.ui:47 lib/ui/stdmenus.ui:35
+#: lib/ui/classic.ui:47 lib/ui/stdmenus.inc:35
 msgid "New|N"
 msgstr "Ny|N"
 
@@ -7144,79 +7115,79 @@ msgstr "Ny|N"
 msgid "New from Template...|T"
 msgstr "Ny med mal...|m"
 
-#: lib/ui/classic.ui:49 lib/ui/stdmenus.ui:37
+#: lib/ui/classic.ui:49 lib/ui/stdmenus.inc:37
 msgid "Open...|O"
 msgstr "Åpne...|p"
 
-#: lib/ui/classic.ui:51 lib/ui/stdmenus.ui:40
+#: lib/ui/classic.ui:51 lib/ui/stdmenus.inc:40
 msgid "Close|C"
 msgstr "Lukk|L"
 
-#: lib/ui/classic.ui:52 lib/ui/stdmenus.ui:41
+#: lib/ui/classic.ui:52 lib/ui/stdmenus.inc:41
 msgid "Save|S"
 msgstr "Lagre|a"
 
-#: lib/ui/classic.ui:53 lib/ui/stdmenus.ui:42
+#: lib/ui/classic.ui:53 lib/ui/stdmenus.inc:42
 msgid "Save As...|A"
 msgstr "Lagre som|s"
 
-#: lib/ui/classic.ui:54 lib/ui/stdmenus.ui:43
+#: lib/ui/classic.ui:54 lib/ui/stdmenus.inc:43
 msgid "Revert|R"
 msgstr "Angre all redigering"
 
-#: lib/ui/classic.ui:55 lib/ui/stdmenus.ui:44
+#: lib/ui/classic.ui:55 lib/ui/stdmenus.inc:44
 msgid "Version Control|V"
 msgstr "Versjonskontroll|V"
 
-#: lib/ui/classic.ui:57 lib/ui/stdmenus.ui:46
+#: lib/ui/classic.ui:57 lib/ui/stdmenus.inc:46
 msgid "Import|I"
 msgstr "Importer|I"
 
-#: lib/ui/classic.ui:58 lib/ui/stdmenus.ui:47
+#: lib/ui/classic.ui:58 lib/ui/stdmenus.inc:47
 msgid "Export|E"
 msgstr "Eksporter|E"
 
-#: lib/ui/classic.ui:59 lib/ui/stdmenus.ui:48
+#: lib/ui/classic.ui:59 lib/ui/stdmenus.inc:48
 msgid "Print...|P"
 msgstr "Skriv ut...|u"
 
-#: lib/ui/classic.ui:60 lib/ui/stdmenus.ui:49
+#: lib/ui/classic.ui:60 lib/ui/stdmenus.inc:49
 msgid "Fax...|F"
 msgstr "Faks...|F"
 
-#: lib/ui/classic.ui:62 lib/ui/stdmenus.ui:54
+#: lib/ui/classic.ui:62 lib/ui/stdmenus.inc:54
 msgid "Exit|x"
 msgstr "Avslutt|v"
 
-#: lib/ui/classic.ui:68 lib/ui/stdmenus.ui:62
+#: lib/ui/classic.ui:68 lib/ui/stdmenus.inc:62
 msgid "Register...|R"
 msgstr "Registrer...|R"
 
-#: lib/ui/classic.ui:69 lib/ui/stdmenus.ui:63
+#: lib/ui/classic.ui:69 lib/ui/stdmenus.inc:63
 msgid "Check In Changes...|I"
 msgstr "Sjekk inn endringer...|i"
 
-#: lib/ui/classic.ui:70 lib/ui/stdmenus.ui:64
+#: lib/ui/classic.ui:70 lib/ui/stdmenus.inc:64
 msgid "Check Out for Edit|O"
 msgstr "Sjekk ut for endring|u"
 
-#: lib/ui/classic.ui:71 lib/ui/stdmenus.ui:65
+#: lib/ui/classic.ui:71 lib/ui/stdmenus.inc:65
 msgid "Revert to Last Version|L"
 msgstr "Tilbake til siste versjon|s"
 
-#: lib/ui/classic.ui:72 lib/ui/stdmenus.ui:66
+#: lib/ui/classic.ui:72 lib/ui/stdmenus.inc:66
 msgid "Undo Last Check In|U"
 msgstr "Angre siste innsjekking|A"
 
-#: lib/ui/classic.ui:73 lib/ui/stdmenus.ui:67
+#: lib/ui/classic.ui:73 lib/ui/stdmenus.inc:67
 msgid "Show History|H"
 msgstr "Vis Historie|H"
 
-#: lib/ui/classic.ui:82 lib/ui/stdmenus.ui:76
+#: lib/ui/classic.ui:82 lib/ui/stdmenus.inc:76
 msgid "Custom...|C"
 msgstr "Egendefinert...|E"
 
-#: lib/ui/classic.ui:90 lib/ui/stdmenus.ui:84
+#: lib/ui/classic.ui:90 lib/ui/stdmenus.inc:84
 msgid "Undo|U"
 msgstr "Angre|A"
 
@@ -7240,7 +7211,7 @@ msgstr "Lim inn|L"
 msgid "Paste External Selection|x"
 msgstr "Lim inn eksternt utvalg"
 
-#: lib/ui/classic.ui:98 lib/ui/stdmenus.ui:93
+#: lib/ui/classic.ui:98 lib/ui/stdmenus.inc:93
 msgid "Find & Replace...|F"
 msgstr "Finn & Erstatt...|F"
 
@@ -7248,11 +7219,11 @@ msgstr "Finn & Erstatt...|F"
 msgid "Tabular|T"
 msgstr "Tabell|T"
 
-#: lib/ui/classic.ui:101 lib/ui/stdmenus.ui:103
+#: lib/ui/classic.ui:101 lib/ui/stdmenus.inc:103
 msgid "Math|M"
 msgstr "Matte|M"
 
-#: lib/ui/classic.ui:104 lib/ui/stdmenus.ui:445
+#: lib/ui/classic.ui:104 lib/ui/stdmenus.inc:447
 msgid "Spellchecker...|S"
 msgstr "Stavekontroll...|S"
 
@@ -7260,11 +7231,11 @@ msgstr "Stavekontroll...|S"
 msgid "Thesaurus..."
 msgstr ""
 
-#: lib/ui/classic.ui:106 lib/ui/stdmenus.ui:447
+#: lib/ui/classic.ui:106 lib/ui/stdmenus.inc:449
 msgid "Count Words|W"
 msgstr "Tell ord"
 
-#: lib/ui/classic.ui:107 lib/ui/stdmenus.ui:448
+#: lib/ui/classic.ui:107 lib/ui/stdmenus.inc:450
 msgid "Check TeX|h"
 msgstr "Sjekk TeX|j"
 
@@ -7272,23 +7243,23 @@ msgstr "Sjekk TeX|j"
 msgid "Change Tracking|g"
 msgstr "Spore endringer|S"
 
-#: lib/ui/classic.ui:110 lib/ui/stdmenus.ui:455
+#: lib/ui/classic.ui:110 lib/ui/stdmenus.inc:457
 msgid "Preferences...|P"
 msgstr "Preferanser...|P"
 
-#: lib/ui/classic.ui:111 lib/ui/stdmenus.ui:454
+#: lib/ui/classic.ui:111 lib/ui/stdmenus.inc:456
 msgid "Reconfigure|R"
 msgstr "Rekonfigurer|R"
 
-#: lib/ui/classic.ui:115 lib/ui/stdmenus.ui:130
+#: lib/ui/classic.ui:115
 msgid "Selection as Lines|L"
 msgstr "som linjer|l"
 
-#: lib/ui/classic.ui:116 lib/ui/stdmenus.ui:131
+#: lib/ui/classic.ui:116
 msgid "Selection as Paragraphs|P"
 msgstr "som avsnitt|a"
 
-#: lib/ui/classic.ui:120 lib/ui/stdmenus.ui:150
+#: lib/ui/classic.ui:120 lib/ui/stdmenus.inc:151
 msgid "Multicolumn|M"
 msgstr "Multikolonne|M"
 
@@ -7312,7 +7283,7 @@ msgstr "H
 msgid "Alignment|i"
 msgstr "Justering|J"
 
-#: lib/ui/classic.ui:129
+#: lib/ui/classic.ui:129 lib/ui/stdmenus.inc:169
 msgid "Add Row|A"
 msgstr "Legg til rad|a"
 
@@ -7320,15 +7291,15 @@ msgstr "Legg til rad|a"
 msgid "Delete Row|w"
 msgstr "Slett rad|l"
 
-#: lib/ui/classic.ui:131 lib/ui/classic.ui:172 lib/ui/stdmenus.ui:170
+#: lib/ui/classic.ui:131 lib/ui/classic.ui:172
 msgid "Copy Row"
 msgstr "Kopier rad"
 
-#: lib/ui/classic.ui:132 lib/ui/classic.ui:173 lib/ui/stdmenus.ui:171
+#: lib/ui/classic.ui:132 lib/ui/classic.ui:173
 msgid "Swap Rows"
 msgstr "Bytt om rader"
 
-#: lib/ui/classic.ui:134
+#: lib/ui/classic.ui:134 lib/ui/stdmenus.inc:174
 msgid "Add Column|u"
 msgstr "Legg til kolonne|n"
 
@@ -7336,55 +7307,55 @@ msgstr "Legg til kolonne|n"
 msgid "Delete Column|D"
 msgstr "Slett kolonne|S"
 
-#: lib/ui/classic.ui:136 lib/ui/classic.ui:177 lib/ui/stdmenus.ui:175
+#: lib/ui/classic.ui:136 lib/ui/classic.ui:177
 msgid "Copy Column"
 msgstr "Kopier kolonne"
 
-#: lib/ui/classic.ui:137 lib/ui/classic.ui:178 lib/ui/stdmenus.ui:176
+#: lib/ui/classic.ui:137 lib/ui/classic.ui:178
 msgid "Swap Columns"
 msgstr "Bytt om kolonner"
 
-#: lib/ui/classic.ui:141 lib/ui/stdmenus.ui:160
+#: lib/ui/classic.ui:141 lib/ui/stdmenus.inc:161
 msgid "Left|L"
 msgstr "Venstrejuster|V"
 
-#: lib/ui/classic.ui:142 lib/ui/stdmenus.ui:161
+#: lib/ui/classic.ui:142 lib/ui/stdmenus.inc:162
 msgid "Center|C"
 msgstr "Sentrer"
 
-#: lib/ui/classic.ui:143 lib/ui/stdmenus.ui:162
+#: lib/ui/classic.ui:143 lib/ui/stdmenus.inc:163
 msgid "Right|R"
 msgstr "Høyrejuster|H"
 
-#: lib/ui/classic.ui:145 lib/ui/stdmenus.ui:164
+#: lib/ui/classic.ui:145 lib/ui/stdmenus.inc:165
 msgid "Top|T"
 msgstr "Toppjustere rad|T"
 
-#: lib/ui/classic.ui:146 lib/ui/stdmenus.ui:165
+#: lib/ui/classic.ui:146 lib/ui/stdmenus.inc:166
 msgid "Middle|M"
 msgstr "Midtjustere rad|M"
 
-#: lib/ui/classic.ui:147 lib/ui/stdmenus.ui:166
+#: lib/ui/classic.ui:147 lib/ui/stdmenus.inc:167
 msgid "Bottom|B"
 msgstr "Bunnjustere rad|B"
 
-#: lib/ui/classic.ui:159 lib/ui/stdmenus.ui:180
+#: lib/ui/classic.ui:159 lib/ui/stdmenus.inc:181
 msgid "Toggle Numbering|N"
 msgstr "Numerering av/på|N"
 
-#: lib/ui/classic.ui:160 lib/ui/stdmenus.ui:181
+#: lib/ui/classic.ui:160 lib/ui/stdmenus.inc:182
 msgid "Toggle Numbering of Line|u"
 msgstr "Linjenummerering av/på|u"
 
-#: lib/ui/classic.ui:162 lib/ui/stdmenus.ui:182
+#: lib/ui/classic.ui:162 lib/ui/stdmenus.inc:183
 msgid "Change Limits Type|L"
 msgstr "Endre grensetype"
 
-#: lib/ui/classic.ui:164 lib/ui/stdmenus.ui:184
+#: lib/ui/classic.ui:164 lib/ui/stdmenus.inc:185
 msgid "Change Formula Type|F"
 msgstr "Endre formeltype"
 
-#: lib/ui/classic.ui:166 lib/ui/stdmenus.ui:188
+#: lib/ui/classic.ui:166 lib/ui/stdmenus.inc:189
 msgid "Use Computer Algebra System|S"
 msgstr "Bruk algebra-programvare"
 
@@ -7396,7 +7367,7 @@ msgstr "Justering|J"
 msgid "Add Row|R"
 msgstr "Legg til rad|r"
 
-#: lib/ui/classic.ui:171
+#: lib/ui/classic.ui:171 lib/ui/stdmenus.inc:170
 msgid "Delete Row|D"
 msgstr "Slett rad|l"
 
@@ -7404,60 +7375,60 @@ msgstr "Slett rad|l"
 msgid "Add Column|C"
 msgstr "Legg til kolonne|k"
 
-#: lib/ui/classic.ui:176
+#: lib/ui/classic.ui:176 lib/ui/stdmenus.inc:175
 msgid "Delete Column|e"
 msgstr "Slett kolonne|S"
 
-#: lib/ui/classic.ui:182 lib/ui/stdmenus.ui:204
+#: lib/ui/classic.ui:182 lib/ui/stdmenus.inc:205
 msgid "Default|t"
 msgstr "Standard|t"
 
-#: lib/ui/classic.ui:183 lib/ui/stdmenus.ui:205
+#: lib/ui/classic.ui:183 lib/ui/stdmenus.inc:206
 msgid "Display|D"
 msgstr ""
 
-#: lib/ui/classic.ui:184 lib/ui/stdmenus.ui:206
+#: lib/ui/classic.ui:184 lib/ui/stdmenus.inc:207
 msgid "Inline|I"
 msgstr ""
 
-#: lib/ui/classic.ui:188 lib/ui/stdmenus.ui:235
+#: lib/ui/classic.ui:188
 msgid "Octave"
 msgstr "Octave"
 
-#: lib/ui/classic.ui:189 lib/ui/stdmenus.ui:236
+#: lib/ui/classic.ui:189
 msgid "Maxima"
 msgstr "Maxima"
 
-#: lib/ui/classic.ui:190 lib/ui/stdmenus.ui:237
+#: lib/ui/classic.ui:190
 msgid "Mathematica"
 msgstr "Mathematica"
 
-#: lib/ui/classic.ui:192 lib/ui/stdmenus.ui:239
+#: lib/ui/classic.ui:192
 msgid "Maple, simplify"
 msgstr ""
 
-#: lib/ui/classic.ui:193 lib/ui/stdmenus.ui:240
+#: lib/ui/classic.ui:193
 msgid "Maple, factor"
 msgstr ""
 
-#: lib/ui/classic.ui:194 lib/ui/stdmenus.ui:241
+#: lib/ui/classic.ui:194
 msgid "Maple, evalm"
 msgstr ""
 
-#: lib/ui/classic.ui:195 lib/ui/stdmenus.ui:242
+#: lib/ui/classic.ui:195
 msgid "Maple, evalf"
 msgstr ""
 
-#: lib/ui/classic.ui:199 lib/ui/classic.ui:260 lib/ui/stdmenus.ui:246
-#: lib/ui/stdmenus.ui:336
+#: lib/ui/classic.ui:199 lib/ui/classic.ui:261 lib/ui/stdmenus.inc:247
+#: lib/ui/stdmenus.inc:344
 msgid "Inline Formula|I"
 msgstr "Formel i teksten|i"
 
-#: lib/ui/classic.ui:200 lib/ui/stdmenus.ui:247
+#: lib/ui/classic.ui:200 lib/ui/stdmenus.inc:248
 msgid "Displayed Formula|D"
 msgstr "Fremhevet formel|h"
 
-#: lib/ui/classic.ui:201 lib/ui/stdmenus.ui:248
+#: lib/ui/classic.ui:201
 msgid "Eqnarray Environment|q"
 msgstr ""
 
@@ -7481,35 +7452,35 @@ msgstr ""
 msgid "Multline Environment"
 msgstr ""
 
-#: lib/ui/classic.ui:214 lib/ui/stdmenus.ui:282
+#: lib/ui/classic.ui:214 lib/ui/stdmenus.inc:288
 msgid "Math|h"
 msgstr "Matte|M"
 
-#: lib/ui/classic.ui:216 lib/ui/stdmenus.ui:283
+#: lib/ui/classic.ui:216
 msgid "Special Character|S"
 msgstr "Spesielt tegn|S"
 
-#: lib/ui/classic.ui:217 lib/ui/stdmenus.ui:293
+#: lib/ui/classic.ui:217 lib/ui/stdmenus.inc:298
 msgid "Citation...|C"
 msgstr "Litteraturreferanse...|L"
 
-#: lib/ui/classic.ui:218 lib/ui/stdmenus.ui:294
+#: lib/ui/classic.ui:218
 msgid "Cross-reference...|r"
 msgstr "Kryssreferanse...|K"
 
-#: lib/ui/classic.ui:219 lib/ui/stdmenus.ui:295
+#: lib/ui/classic.ui:219 lib/ui/stdmenus.inc:300
 msgid "Label...|L"
 msgstr "Referansemerke...|R"
 
-#: lib/ui/classic.ui:220 lib/ui/stdmenus.ui:303
+#: lib/ui/classic.ui:220 lib/ui/stdmenus.inc:307
 msgid "Footnote|F"
 msgstr "Fotnote|F"
 
-#: lib/ui/classic.ui:221 lib/ui/stdmenus.ui:304
+#: lib/ui/classic.ui:221 lib/ui/stdmenus.inc:308
 msgid "Marginal Note|M"
 msgstr "Margnotis|M"
 
-#: lib/ui/classic.ui:222 lib/ui/stdmenus.ui:305
+#: lib/ui/classic.ui:222
 msgid "Short Title"
 msgstr "Kort tittel"
 
@@ -7517,1148 +7488,1347 @@ msgstr "Kort tittel"
 msgid "Index Entry|I"
 msgstr "Nøkkelord for register|N"
 
-#: lib/ui/classic.ui:224 lib/ui/stdmenus.ui:302
+#: lib/ui/classic.ui:224 src/frontends/qt4/Dialogs.C:225
+msgid "Glossary Entry"
+msgstr ""
+
+#: lib/ui/classic.ui:225 lib/ui/stdmenus.inc:306
 msgid "URL...|U"
 msgstr "URL...|U"
 
-#: lib/ui/classic.ui:225 lib/ui/stdmenus.ui:288
+#: lib/ui/classic.ui:226 lib/ui/stdmenus.inc:293
 msgid "Note|N"
 msgstr "Notis|o"
 
-#: lib/ui/classic.ui:226
+#: lib/ui/classic.ui:227
 msgid "Lists & TOC|O"
 msgstr "Lister & innhold|o"
 
-#: lib/ui/classic.ui:228
+#: lib/ui/classic.ui:229
 msgid "TeX Code|T"
 msgstr "TeX Kode|T"
 
-#: lib/ui/classic.ui:229
+#: lib/ui/classic.ui:230
 msgid "Minipage|p"
 msgstr "Miniside|s"
 
-#: lib/ui/classic.ui:230 lib/ui/stdmenus.ui:301
+#: lib/ui/classic.ui:231 lib/ui/stdmenus.inc:305
 msgid "Graphics...|G"
 msgstr "Grafikk...|G"
 
-#: lib/ui/classic.ui:231
+#: lib/ui/classic.ui:232
 msgid "Tabular Material...|b"
 msgstr "Tabellmateriale...|b"
 
-#: lib/ui/classic.ui:232
+#: lib/ui/classic.ui:233
 msgid "Floats|a"
 msgstr "Floats|a"
 
-#: lib/ui/classic.ui:234
+#: lib/ui/classic.ui:235
 msgid "Include File...|d"
 msgstr "Inkluder fil...|d"
 
-#: lib/ui/classic.ui:235
+#: lib/ui/classic.ui:236
 msgid "Insert File|e"
 msgstr "Sett inn fil|e"
 
-#: lib/ui/classic.ui:236
+#: lib/ui/classic.ui:237
 msgid "External Material...|x"
 msgstr "Eksternt materiale...|E"
 
-#: lib/ui/classic.ui:240 lib/ui/stdmenus.ui:319
+#: lib/ui/classic.ui:241 lib/ui/stdmenus.inc:324
 msgid "Superscript|S"
 msgstr "Hevet skrift|H"
 
-#: lib/ui/classic.ui:241 lib/ui/stdmenus.ui:320
+#: lib/ui/classic.ui:242 lib/ui/stdmenus.inc:325
 msgid "Subscript|u"
 msgstr "Senket skrift|S"
 
-#: lib/ui/classic.ui:242 lib/ui/stdmenus.ui:325
+#: lib/ui/classic.ui:243
 msgid "Horizontal Fill|H"
 msgstr "Horisontalt fyll\t\\hfill"
 
-#: lib/ui/classic.ui:243 lib/ui/stdmenus.ui:329
+#: lib/ui/classic.ui:244
 msgid "Hyphenation Point|P"
 msgstr "Orddelingspunkt|p"
 
-#: lib/ui/classic.ui:244 lib/ui/stdmenus.ui:330
+#: lib/ui/classic.ui:245 lib/ui/stdmenus.inc:335
 msgid "Ligature Break|k"
 msgstr "Ligaturbrekk|L"
 
-#: lib/ui/classic.ui:245 lib/ui/stdmenus.ui:322
+#: lib/ui/classic.ui:246
 msgid "Protected Space|r"
 msgstr "Hardt mellomrom"
 
-#: lib/ui/classic.ui:246 lib/ui/stdmenus.ui:323
+#: lib/ui/classic.ui:247 lib/ui/stdmenus.inc:328
 msgid "Inter-word Space|w"
 msgstr "Ordmellomrom"
 
-#: lib/ui/classic.ui:247 lib/ui/stdmenus.ui:324
+#: lib/ui/classic.ui:248 lib/ui/stdmenus.inc:329
 msgid "Thin Space|T"
 msgstr "Kort mellomrom\t\\,"
 
-#: lib/ui/classic.ui:248 lib/ui/stdmenus.ui:327
+#: lib/ui/classic.ui:249
 msgid "Vertical Space..."
 msgstr "Vertikal avstand..."
 
-#: lib/ui/classic.ui:249 lib/ui/stdmenus.ui:331
+#: lib/ui/classic.ui:250
 msgid "Line Break|L"
 msgstr "Linjeskift|i"
 
-#: lib/ui/classic.ui:250 lib/ui/stdmenus.ui:310
+#: lib/ui/classic.ui:251 lib/ui/stdmenus.inc:315
 msgid "Ellipsis|i"
 msgstr "Ellipse|i"
 
-#: lib/ui/classic.ui:251 lib/ui/stdmenus.ui:311
+#: lib/ui/classic.ui:252 lib/ui/stdmenus.inc:316
 msgid "End of Sentence|E"
 msgstr "Punktum som avslutter setning|s"
 
-#: lib/ui/classic.ui:252
+#: lib/ui/classic.ui:253
 msgid "Single Quote|Q"
 msgstr "Enkelt sitattegn"
 
-#: lib/ui/classic.ui:253
+#: lib/ui/classic.ui:254
 msgid "Ordinary Quote|O"
 msgstr "\"Anførselstegn\""
 
-#: lib/ui/classic.ui:254 lib/ui/stdmenus.ui:314
+#: lib/ui/classic.ui:255 lib/ui/stdmenus.inc:319
 msgid "Menu Separator|M"
 msgstr "Menyseparator|M"
 
-#: lib/ui/classic.ui:255 lib/ui/stdmenus.ui:326
+#: lib/ui/classic.ui:256
 msgid "Horizontal Line"
 msgstr "Horisontal linje"
 
-#: lib/ui/classic.ui:256 lib/ui/stdmenus.ui:332 src/insets/insetpagebreak.C:56
+#: lib/ui/classic.ui:257 src/insets/insetpagebreak.h:49
 msgid "Page Break"
 msgstr "Sideskift"
 
-#: lib/ui/classic.ui:261 lib/ui/stdmenus.ui:337
+#: lib/ui/classic.ui:262 lib/ui/stdmenus.inc:345
 msgid "Display Formula|D"
 msgstr "Fremhevet formel|h"
 
-#: lib/ui/classic.ui:262 lib/ui/stdmenus.ui:339
+#: lib/ui/classic.ui:263 lib/ui/stdmenus.inc:249 lib/ui/stdmenus.inc:347
 msgid "Eqnarray Environment|E"
 msgstr ""
 
-#: lib/ui/classic.ui:263 lib/ui/stdmenus.ui:249 lib/ui/stdmenus.ui:340
+#: lib/ui/classic.ui:264 lib/ui/stdmenus.inc:250 lib/ui/stdmenus.inc:348
 msgid "AMS align Environment|a"
 msgstr ""
 
-#: lib/ui/classic.ui:264 lib/ui/stdmenus.ui:250 lib/ui/stdmenus.ui:341
+#: lib/ui/classic.ui:265 lib/ui/stdmenus.inc:251 lib/ui/stdmenus.inc:349
 msgid "AMS alignat Environment|t"
 msgstr ""
 
-#: lib/ui/classic.ui:265 lib/ui/stdmenus.ui:251 lib/ui/stdmenus.ui:342
+#: lib/ui/classic.ui:266 lib/ui/stdmenus.inc:252 lib/ui/stdmenus.inc:350
 msgid "AMS flalign Environment|f"
 msgstr ""
 
-#: lib/ui/classic.ui:268 lib/ui/stdmenus.ui:252 lib/ui/stdmenus.ui:343
+#: lib/ui/classic.ui:269 lib/ui/stdmenus.inc:253 lib/ui/stdmenus.inc:351
 msgid "AMS gather Environment|g"
 msgstr ""
 
-#: lib/ui/classic.ui:269 lib/ui/stdmenus.ui:253 lib/ui/stdmenus.ui:344
+#: lib/ui/classic.ui:270 lib/ui/stdmenus.inc:254 lib/ui/stdmenus.inc:352
 msgid "AMS multline Environment|m"
 msgstr ""
 
-#: lib/ui/classic.ui:271 lib/ui/stdmenus.ui:346
+#: lib/ui/classic.ui:272 lib/ui/stdmenus.inc:354
 msgid "Array Environment|y"
 msgstr ""
 
-#: lib/ui/classic.ui:272 lib/ui/stdmenus.ui:347
+#: lib/ui/classic.ui:273 lib/ui/stdmenus.inc:355
 msgid "Cases Environment|C"
 msgstr ""
 
-#: lib/ui/classic.ui:273 lib/ui/stdmenus.ui:351
+#: lib/ui/classic.ui:274 lib/ui/stdmenus.inc:359
 msgid "Split Environment|S"
 msgstr ""
 
-#: lib/ui/classic.ui:275
+#: lib/ui/classic.ui:276
 msgid "Font Change|o"
 msgstr "Fontendring|o"
 
-#: lib/ui/classic.ui:276
+#: lib/ui/classic.ui:277
 msgid "Math Panel|l"
 msgstr "Mattepanel|l"
 
-#: lib/ui/classic.ui:280 lib/ui/stdmenus.ui:210
+#: lib/ui/classic.ui:281
 msgid "Math Normal Font"
 msgstr "Normal mattefont"
 
-#: lib/ui/classic.ui:282 lib/ui/stdmenus.ui:212
+#: lib/ui/classic.ui:283
 msgid "Math Calligraphic Family"
 msgstr "Matte Kalligrafisk"
 
-#: lib/ui/classic.ui:283 lib/ui/stdmenus.ui:213
+#: lib/ui/classic.ui:284
 msgid "Math Fraktur Family"
 msgstr "Matte Fraktur"
 
-#: lib/ui/classic.ui:284 lib/ui/stdmenus.ui:214
+#: lib/ui/classic.ui:285
 msgid "Math Roman Family"
 msgstr "Matte Roman"
 
-#: lib/ui/classic.ui:285 lib/ui/stdmenus.ui:215
+#: lib/ui/classic.ui:286
 msgid "Math Sans Serif Family"
 msgstr "Matte Sans Serif"
 
-#: lib/ui/classic.ui:287 lib/ui/stdmenus.ui:217
+#: lib/ui/classic.ui:288
 msgid "Math Bold Series"
 msgstr "Matte Fet"
 
-#: lib/ui/classic.ui:289 lib/ui/stdmenus.ui:219
+#: lib/ui/classic.ui:290
 msgid "Text Normal Font"
 msgstr "Normal tekstfont"
 
-#: lib/ui/classic.ui:291 lib/ui/stdmenus.ui:221
+#: lib/ui/classic.ui:292 lib/ui/stdmenus.inc:222
 msgid "Text Roman Family"
 msgstr "Tekst Roman"
 
-#: lib/ui/classic.ui:292 lib/ui/stdmenus.ui:222
+#: lib/ui/classic.ui:293 lib/ui/stdmenus.inc:223
 msgid "Text Sans Serif Family"
 msgstr "Tekst Sans Serif"
 
-#: lib/ui/classic.ui:293 lib/ui/stdmenus.ui:223
+#: lib/ui/classic.ui:294 lib/ui/stdmenus.inc:224
 msgid "Text Typewriter Family"
 msgstr "Tekst Skrivemaskin"
 
-#: lib/ui/classic.ui:295 lib/ui/stdmenus.ui:225
+#: lib/ui/classic.ui:296 lib/ui/stdmenus.inc:226
 msgid "Text Bold Series"
 msgstr "Tekst Fet"
 
-#: lib/ui/classic.ui:296 lib/ui/stdmenus.ui:226
+#: lib/ui/classic.ui:297 lib/ui/stdmenus.inc:227
 msgid "Text Medium Series"
 msgstr "Tekst Medium"
 
-#: lib/ui/classic.ui:298 lib/ui/stdmenus.ui:228
+#: lib/ui/classic.ui:299 lib/ui/stdmenus.inc:229
 msgid "Text Italic Shape"
 msgstr "Tekst Kursiv"
 
-#: lib/ui/classic.ui:299 lib/ui/stdmenus.ui:229
+#: lib/ui/classic.ui:300 lib/ui/stdmenus.inc:230
 msgid "Text Small Caps Shape"
 msgstr "Tekst Kapiteler"
 
-#: lib/ui/classic.ui:300 lib/ui/stdmenus.ui:230
+#: lib/ui/classic.ui:301 lib/ui/stdmenus.inc:231
 msgid "Text Slanted Shape"
 msgstr "Tekst Skrå"
 
-#: lib/ui/classic.ui:301 lib/ui/stdmenus.ui:231
+#: lib/ui/classic.ui:302 lib/ui/stdmenus.inc:232
 msgid "Text Upright Shape"
 msgstr "Tekst Stående"
 
-#: lib/ui/classic.ui:306
+#: lib/ui/classic.ui:307
 msgid "Floatflt Figure"
 msgstr "\"Floatflt\" figur"
 
-#: lib/ui/classic.ui:310 lib/ui/classic.ui:359 lib/ui/stdmenus.ui:363
+#: lib/ui/classic.ui:311 lib/ui/classic.ui:361 lib/ui/stdmenus.inc:371
 msgid "Table of Contents|C"
 msgstr "Innholdsfortegnelse|n"
 
-#: lib/ui/classic.ui:312 lib/ui/stdmenus.ui:365
+#: lib/ui/classic.ui:313 lib/ui/stdmenus.inc:373
 msgid "Index List|I"
 msgstr "Register|R"
 
-#: lib/ui/classic.ui:313 lib/ui/stdmenus.ui:366
+#: lib/ui/classic.ui:314 lib/ui/stdmenus.inc:374
+msgid "Glossary|G"
+msgstr ""
+
+#: lib/ui/classic.ui:315 lib/ui/stdmenus.inc:375
 msgid "BibTeX Bibliography...|B"
 msgstr "BibTeX Referanseliste...|B"
 
-#: lib/ui/classic.ui:317 lib/ui/stdmenus.ui:370
+#: lib/ui/classic.ui:319 lib/ui/stdmenus.inc:379
 msgid "LyX Document...|X"
 msgstr "LyX dokument...|X"
 
-#: lib/ui/classic.ui:318 lib/ui/stdmenus.ui:371
-msgid "Plain Text as Lines...|L"
-msgstr "Ren tekst som linjer...|l"
+#: lib/ui/classic.ui:320 lib/ui/stdmenus.inc:380
+#, fuzzy
+msgid "Plain Text...|T"
+msgstr "Ren tekst"
 
-#: lib/ui/classic.ui:319 lib/ui/stdmenus.ui:372
-msgid "Plain Text as Paragraphs...|P"
-msgstr "Ren tekst som avsnitt...|a"
+#: lib/ui/classic.ui:321 lib/ui/stdmenus.inc:381
+#, fuzzy
+msgid "Plain Text, Join Lines...|J"
+msgstr "Ren tekst som linjer...|l"
 
-#: lib/ui/classic.ui:323 lib/ui/stdmenus.ui:404
+#: lib/ui/classic.ui:325 lib/ui/stdmenus.inc:413
 msgid "Track Changes|T"
 msgstr "Spor endringer|S"
 
-#: lib/ui/classic.ui:324 lib/ui/stdmenus.ui:405
+#: lib/ui/classic.ui:326 lib/ui/stdmenus.inc:414
 msgid "Merge Changes...|M"
 msgstr "Flett inn endringer...|F"
 
-#: lib/ui/classic.ui:325
+#: lib/ui/classic.ui:327
 msgid "Accept All Changes|A"
 msgstr "Godta alle endringer|G"
 
-#: lib/ui/classic.ui:326
+#: lib/ui/classic.ui:328
 msgid "Reject All Changes|R"
 msgstr "Forkast alle endringer|k"
 
-#: lib/ui/classic.ui:327 lib/ui/stdmenus.ui:410
+#: lib/ui/classic.ui:329 lib/ui/stdmenus.inc:419
 msgid "Show Changes in Output|S"
 msgstr "Vis endringer i utskrift|V"
 
-#: lib/ui/classic.ui:334
+#: lib/ui/classic.ui:336
 msgid "Character...|C"
 msgstr ""
 
-#: lib/ui/classic.ui:335
+#: lib/ui/classic.ui:337
 msgid "Paragraph...|P"
 msgstr "Avsnitt...|v"
 
-#: lib/ui/classic.ui:336
+#: lib/ui/classic.ui:338
 msgid "Document...|D"
 msgstr "Dokument...|D"
 
-#: lib/ui/classic.ui:337
+#: lib/ui/classic.ui:339
 msgid "Tabular...|T"
 msgstr "Tabell...|T"
 
-#: lib/ui/classic.ui:339
+#: lib/ui/classic.ui:341
 msgid "Emphasize Style|E"
 msgstr "Uthevet stil|U"
 
-#: lib/ui/classic.ui:340
+#: lib/ui/classic.ui:342
 msgid "Noun Style|N"
 msgstr "Substantiv stil|S"
 
-#: lib/ui/classic.ui:341
+#: lib/ui/classic.ui:343
 msgid "Bold Style|B"
 msgstr "Fet stil|F"
 
-#: lib/ui/classic.ui:344
+#: lib/ui/classic.ui:346
 msgid "Decrease Environment Depth|v"
 msgstr "Minsk omgivelsesdybde|M"
 
-#: lib/ui/classic.ui:345
+#: lib/ui/classic.ui:347
 msgid "Increase Environment Depth|i"
 msgstr "Øk omgivelsedybde|k"
 
-#: lib/ui/classic.ui:346
+#: lib/ui/classic.ui:348
 msgid "Start Appendix Here|S"
 msgstr "Begynn appendiks her|a"
 
-#: lib/ui/classic.ui:355 lib/ui/stdmenus.ui:394
+#: lib/ui/classic.ui:357 lib/ui/stdmenus.inc:403
 msgid "Build Program|B"
 msgstr "Lag programm|o"
 
-#: lib/ui/classic.ui:356 lib/ui/stdmenus.ui:265
+#: lib/ui/classic.ui:358 lib/ui/stdmenus.inc:266
 msgid "Update|U"
 msgstr "Oppdater|O"
 
-#: lib/ui/classic.ui:358 lib/ui/stdmenus.ui:395
+#: lib/ui/classic.ui:360 lib/ui/stdmenus.inc:404
 msgid "LaTeX Log|L"
 msgstr "LaTeX Logg|L"
 
-#: lib/ui/classic.ui:360
+#: lib/ui/classic.ui:362
 msgid "TeX Information|X"
 msgstr "LaTeX Konfigurasjon|X"
 
-#: lib/ui/classic.ui:373 lib/ui/stdmenus.ui:418
+#: lib/ui/classic.ui:375 lib/ui/stdmenus.inc:427
 msgid "Next Note|N"
 msgstr "Neste notis|n"
 
-#: lib/ui/classic.ui:374 lib/ui/stdmenus.ui:421
+#: lib/ui/classic.ui:376 lib/ui/stdmenus.inc:430
 msgid "Go to Label|L"
 msgstr "Gå til merke"
 
-#: lib/ui/classic.ui:375 lib/ui/stdmenus.ui:417
+#: lib/ui/classic.ui:377 lib/ui/stdmenus.inc:426
 msgid "Bookmarks|B"
 msgstr "Bokmerker|B"
 
-#: lib/ui/classic.ui:379 lib/ui/stdmenus.ui:433
+#: lib/ui/classic.ui:381
 msgid "Save Bookmark 1|S"
 msgstr "Lagre bokmerke 1"
 
-#: lib/ui/classic.ui:380 lib/ui/stdmenus.ui:434
+#: lib/ui/classic.ui:382
 msgid "Save Bookmark 2"
 msgstr "Lagre bokmerke 2"
 
-#: lib/ui/classic.ui:381 lib/ui/stdmenus.ui:435
+#: lib/ui/classic.ui:383
 msgid "Save Bookmark 3"
 msgstr "Lagre bokmerke 3"
 
-#: lib/ui/classic.ui:382 lib/ui/stdmenus.ui:436
+#: lib/ui/classic.ui:384
 msgid "Save Bookmark 4"
 msgstr "Lagre bokmerke 4"
 
-#: lib/ui/classic.ui:383 lib/ui/stdmenus.ui:437
+#: lib/ui/classic.ui:385
 msgid "Save Bookmark 5"
 msgstr "Lagre bokmerke 5"
 
-#: lib/ui/classic.ui:385 lib/ui/stdmenus.ui:427
+#: lib/ui/classic.ui:387
 msgid "Go to Bookmark 1|1"
 msgstr "Gå til bokmerke 1|1"
 
-#: lib/ui/classic.ui:386 lib/ui/stdmenus.ui:428
+#: lib/ui/classic.ui:388
 msgid "Go to Bookmark 2|2"
 msgstr "Gå til bokmerke 2|2"
 
-#: lib/ui/classic.ui:387 lib/ui/stdmenus.ui:429
+#: lib/ui/classic.ui:389
 msgid "Go to Bookmark 3|3"
 msgstr "Gå til bokmerke 3|3"
 
-#: lib/ui/classic.ui:388 lib/ui/stdmenus.ui:430
+#: lib/ui/classic.ui:390
 msgid "Go to Bookmark 4|4"
 msgstr "Gå til bokmerke 4|4"
 
-#: lib/ui/classic.ui:389 lib/ui/stdmenus.ui:431
+#: lib/ui/classic.ui:391
 msgid "Go to Bookmark 5|5"
 msgstr "Gå til bokmerke 5|5"
 
-#: lib/ui/classic.ui:404 lib/ui/stdmenus.ui:462
+#: lib/ui/classic.ui:406 lib/ui/stdmenus.inc:464
 msgid "Introduction|I"
 msgstr "Introduksjon|I"
 
-#: lib/ui/classic.ui:405 lib/ui/stdmenus.ui:463
+#: lib/ui/classic.ui:407 lib/ui/stdmenus.inc:465
 msgid "Tutorial|T"
 msgstr "Innføring|n"
 
-#: lib/ui/classic.ui:406 lib/ui/stdmenus.ui:464
+#: lib/ui/classic.ui:408 lib/ui/stdmenus.inc:466
 msgid "User's Guide|U"
 msgstr "Brukermanual|B"
 
-#: lib/ui/classic.ui:407 lib/ui/stdmenus.ui:465
+#: lib/ui/classic.ui:409 lib/ui/stdmenus.inc:467
 msgid "Extended Features|E"
 msgstr "Utvidede egenskaper|U"
 
-#: lib/ui/classic.ui:408 lib/ui/stdmenus.ui:466
+#: lib/ui/classic.ui:410 lib/ui/stdmenus.inc:469
 msgid "Customization|C"
 msgstr "Tilpasning|T"
 
-#: lib/ui/classic.ui:410 lib/ui/stdmenus.ui:467
+#: lib/ui/classic.ui:412 lib/ui/stdmenus.inc:470
 msgid "FAQ|F"
 msgstr "FAQ|F"
 
-#: lib/ui/classic.ui:411 lib/ui/stdmenus.ui:468
+#: lib/ui/classic.ui:413 lib/ui/stdmenus.inc:471
 msgid "Table of Contents|a"
 msgstr "Innholdsfortegnelse|h"
 
-#: lib/ui/classic.ui:412 lib/ui/stdmenus.ui:469
+#: lib/ui/classic.ui:414 lib/ui/stdmenus.inc:472
 msgid "LaTeX Configuration|L"
 msgstr "LaTeX Konfigurasjon|L"
 
-#: lib/ui/classic.ui:414 lib/ui/stdmenus.ui:471
+#: lib/ui/classic.ui:416 lib/ui/stdmenus.inc:474
 msgid "About LyX|X"
 msgstr "Om LyX|X"
 
-#: lib/ui/classic.ui:422 lib/ui/stdmenus.ui:479 src/frontends/qt4/QAbout.C:44
+#: lib/ui/classic.ui:424 src/frontends/qt4/QAbout.C:44
 msgid "About LyX"
 msgstr "Om LyX"
 
-#: lib/ui/classic.ui:423 lib/ui/stdmenus.ui:480
+#: lib/ui/classic.ui:425
 msgid "Preferences..."
 msgstr "Preferanser..."
 
-#: lib/ui/classic.ui:424 lib/ui/stdmenus.ui:481
+#: lib/ui/classic.ui:426
 msgid "Quit LyX"
 msgstr "Avslutt LyX"
 
-#: lib/ui/classic.ui:444 lib/ui/default.ui:34
-msgid "Toolbars"
-msgstr ""
-
-#: lib/ui/stdmenus.ui:25
+#: lib/ui/stdmenus.inc:25
 msgid "Document|D"
 msgstr "Dokument|D"
 
-#: lib/ui/stdmenus.ui:26
+#: lib/ui/stdmenus.inc:26
 msgid "Tools|T"
 msgstr "Verktøy|V"
 
-#: lib/ui/stdmenus.ui:36
+#: lib/ui/stdmenus.inc:36
 msgid "New from Template...|m"
 msgstr "Ny med mal...|m"
 
-#: lib/ui/stdmenus.ui:38
-msgid "Open recent|t"
+#: lib/ui/stdmenus.inc:38
+#, fuzzy
+msgid "Open Recent|t"
 msgstr "Åpne et dokument du har brukt før"
 
-#: lib/ui/stdmenus.ui:51
+#: lib/ui/stdmenus.inc:51
 msgid "New Window|W"
 msgstr ""
 
-#: lib/ui/stdmenus.ui:52
+#: lib/ui/stdmenus.inc:52
 msgid "Close Window|d"
 msgstr ""
 
-#: lib/ui/stdmenus.ui:85
+#: lib/ui/stdmenus.inc:85
 msgid "Redo|R"
 msgstr "Gjør om|G"
 
-#: lib/ui/stdmenus.ui:87 lib/ui/stdtoolbars.ui:51
-#: src/mathed/InsetMathNest.C:453 src/text3.C:771
+#: lib/ui/stdmenus.inc:87 lib/ui/stdtoolbars.inc:51
+#: src/mathed/InsetMathNest.C:460 src/text3.C:780
 msgid "Cut"
 msgstr "Klipp"
 
-#: lib/ui/stdmenus.ui:88 lib/ui/stdtoolbars.ui:52
-#: src/mathed/InsetMathNest.C:462 src/text3.C:776
+#: lib/ui/stdmenus.inc:88 lib/ui/stdtoolbars.inc:52
+#: src/mathed/InsetMathNest.C:468 src/text3.C:785
 msgid "Copy"
 msgstr "Kopier"
 
-#: lib/ui/stdmenus.ui:89 lib/ui/stdtoolbars.ui:53
-#: src/mathed/InsetMathGrid.C:1208 src/mathed/InsetMathNest.C:437
-#: src/text3.C:755
+#: lib/ui/stdmenus.inc:89 lib/ui/stdtoolbars.inc:53
+#: src/mathed/InsetMathGrid.C:1212 src/mathed/InsetMathNest.C:439
+#: src/text3.C:761
 msgid "Paste"
 msgstr "Lim inn"
 
-#: lib/ui/stdmenus.ui:90
-msgid "Paste Recent"
+#: lib/ui/stdmenus.inc:90
+#, fuzzy
+msgid "Paste Recent|e"
 msgstr "Lim inn tidligere utvalg"
 
-#: lib/ui/stdmenus.ui:91
+#: lib/ui/stdmenus.inc:91
 #, fuzzy
-msgid "Paste External Clipboard/Selection"
-msgstr "Lim inn eksternt utvalg"
+msgid "Paste Special"
+msgstr "Lim inn|L"
 
-#: lib/ui/stdmenus.ui:95
+#: lib/ui/stdmenus.inc:95
 msgid "Move Paragraph Up|o"
 msgstr "Flytt avsnitt opp|o"
 
-#: lib/ui/stdmenus.ui:96
+#: lib/ui/stdmenus.inc:96
 msgid "Move Paragraph Down|v"
 msgstr "Flytt avsnitt ned|v"
 
-#: lib/ui/stdmenus.ui:98
-#, fuzzy
+#: lib/ui/stdmenus.inc:98
 msgid "Text Style|S"
-msgstr "Tekststil"
+msgstr "Tekststil|s"
 
-#: lib/ui/stdmenus.ui:99
+#: lib/ui/stdmenus.inc:99
 msgid "Paragraph Settings...|P"
 msgstr "Avsnittsinnstillinger...|v"
 
-#: lib/ui/stdmenus.ui:102
+#: lib/ui/stdmenus.inc:102
 msgid "Table|T"
 msgstr "Tabell|T"
 
-#: lib/ui/stdmenus.ui:104
-#, fuzzy
+#: lib/ui/stdmenus.inc:104
 msgid "Rows & Columns|C"
-msgstr "Rader og kolonner"
+msgstr "Rader og kolonner|k"
 
-#: lib/ui/stdmenus.ui:106
+#: lib/ui/stdmenus.inc:111
 msgid "Increase List Depth|I"
 msgstr "Øk listedybde|k"
 
-#: lib/ui/stdmenus.ui:107
+#: lib/ui/stdmenus.inc:112
 msgid "Decrease List Depth|D"
 msgstr "Minsk listedybde|M"
 
-#: lib/ui/stdmenus.ui:108
-msgid "Dissolve Inset|s"
+#: lib/ui/stdmenus.inc:113
+msgid "Dissolve Inset|l"
 msgstr ""
 
-#: lib/ui/stdmenus.ui:114
+#: lib/ui/stdmenus.inc:114
 msgid "TeX Code Settings...|C"
 msgstr "TeX-innstillinger...|T"
 
-#: lib/ui/stdmenus.ui:116
+#: lib/ui/stdmenus.inc:116
 msgid "Float Settings...|a"
 msgstr "Innstillinger for flytende (float)"
 
-#: lib/ui/stdmenus.ui:117
+#: lib/ui/stdmenus.inc:117
 msgid "Text Wrap Settings...|W"
 msgstr ""
 
-#: lib/ui/stdmenus.ui:118
+#: lib/ui/stdmenus.inc:118
 msgid "Note Settings...|N"
 msgstr "Notisinnstillinger...|N"
 
-#: lib/ui/stdmenus.ui:119
+#: lib/ui/stdmenus.inc:119
 msgid "Branch Settings...|B"
 msgstr "Gren-innstillinger...|G"
 
-#: lib/ui/stdmenus.ui:120
+#: lib/ui/stdmenus.inc:120
 msgid "Box Settings...|x"
 msgstr "Boksinnstillinger...|B"
 
-#: lib/ui/stdmenus.ui:124
+#: lib/ui/stdmenus.inc:124
 msgid "Table Settings...|a"
 msgstr "Tabellinnstillinger...|a"
 
-#: lib/ui/stdmenus.ui:128
+#: lib/ui/stdmenus.inc:128
 #, fuzzy
-msgid "Clipboard as Lines|C"
-msgstr "som linjer|l"
+msgid "Plain Text|T"
+msgstr "Ren tekst"
 
-#: lib/ui/stdmenus.ui:129
+#: lib/ui/stdmenus.inc:129
 #, fuzzy
-msgid "Clipboard as Paragraphs|a"
-msgstr "som avsnitt|a"
+msgid "Plain Text, Join Lines|J"
+msgstr "Ren tekst som linjer"
 
-#: lib/ui/stdmenus.ui:141
+#: lib/ui/stdmenus.inc:131
 #, fuzzy
+msgid "Selection|S"
+msgstr "Merking:"
+
+#: lib/ui/stdmenus.inc:132
+#, fuzzy
+msgid "Selection, Join Lines|i"
+msgstr "som linjer|l"
+
+#: lib/ui/stdmenus.inc:142
 msgid "Customized...|C"
 msgstr "Egendefinert...|E"
 
-#: lib/ui/stdmenus.ui:143
-#, fuzzy
+#: lib/ui/stdmenus.inc:144
 msgid "Capitalize|a"
-msgstr "Katalansk"
+msgstr ""
 
-#: lib/ui/stdmenus.ui:144
+#: lib/ui/stdmenus.inc:145
 #, fuzzy
 msgid "Uppercase|U"
 msgstr "Store bokstaver"
 
-#: lib/ui/stdmenus.ui:145
+#: lib/ui/stdmenus.inc:146
 msgid "Lowercase|L"
 msgstr ""
 
-#: lib/ui/stdmenus.ui:152
+#: lib/ui/stdmenus.inc:153
 msgid "Top Line|T"
 msgstr "Topplinje|T"
 
-#: lib/ui/stdmenus.ui:153
+#: lib/ui/stdmenus.inc:154
 msgid "Bottom Line|B"
 msgstr "Bunnlinje|B"
 
-#: lib/ui/stdmenus.ui:154
+#: lib/ui/stdmenus.inc:155
 msgid "Left Line|L"
 msgstr "Venstre linje|V"
 
-#: lib/ui/stdmenus.ui:155
+#: lib/ui/stdmenus.inc:156
 msgid "Right Line|R"
 msgstr "Høyre linje|H"
 
-#: lib/ui/stdmenus.ui:168
-msgid "Add Row"
-msgstr "Legg til rad"
-
-#: lib/ui/stdmenus.ui:169
-msgid "Delete Row"
-msgstr "Slett rad"
+#: lib/ui/stdmenus.inc:171
+#, fuzzy
+msgid "Copy Row|o"
+msgstr "Kopier rad"
 
-#: lib/ui/stdmenus.ui:173
-msgid "Add Column"
-msgstr "Legg til kolonne"
+#: lib/ui/stdmenus.inc:172
+#, fuzzy
+msgid "Swap Rows|S"
+msgstr "Bytt om rader"
 
-#: lib/ui/stdmenus.ui:174
-msgid "Delete Column"
-msgstr "Slett kolonne"
+#: lib/ui/stdmenus.inc:176
+#, fuzzy
+msgid "Copy Column|p"
+msgstr "Kopier kolonne"
 
-#: lib/ui/stdmenus.ui:186
+#: lib/ui/stdmenus.inc:177
 #, fuzzy
+msgid "Swap Columns|w"
+msgstr "Bytt om kolonner"
+
+#: lib/ui/stdmenus.inc:187
 msgid "Text Style|T"
-msgstr "Tekststil"
+msgstr "Tekststil|T"
 
-#: lib/ui/stdmenus.ui:190
+#: lib/ui/stdmenus.inc:191
 msgid "Split Cell|C"
 msgstr ""
 
-#: lib/ui/stdmenus.ui:192
-msgid "Add Line Above"
+#: lib/ui/stdmenus.inc:193
+#, fuzzy
+msgid "Add Line Above|A"
 msgstr "Ny linje over"
 
-#: lib/ui/stdmenus.ui:193
-msgid "Add Line Below"
+#: lib/ui/stdmenus.inc:194
+#, fuzzy
+msgid "Add Line Below|B"
 msgstr "Ny linje under"
 
-#: lib/ui/stdmenus.ui:194
-msgid "Delete Line Above"
+#: lib/ui/stdmenus.inc:195
+#, fuzzy
+msgid "Delete Line Above|D"
 msgstr "Fjern linje over"
 
-#: lib/ui/stdmenus.ui:195
-msgid "Delete Line Below"
+#: lib/ui/stdmenus.inc:196
+#, fuzzy
+msgid "Delete Line Below|e"
 msgstr "Fjern linje under"
 
-#: lib/ui/stdmenus.ui:197
+#: lib/ui/stdmenus.inc:198
 msgid "Add Line to Left"
 msgstr "Ny linje på venstre side"
 
-#: lib/ui/stdmenus.ui:198
+#: lib/ui/stdmenus.inc:199
 msgid "Add Line to Right"
 msgstr "Ny linje på høyre side"
 
-#: lib/ui/stdmenus.ui:199
+#: lib/ui/stdmenus.inc:200
 msgid "Delete Line to Left"
 msgstr "Fjern linje på venstre side"
 
-#: lib/ui/stdmenus.ui:200
+#: lib/ui/stdmenus.inc:201
 msgid "Delete Line to Right"
 msgstr "Fjern linje på høyre side"
 
-#: lib/ui/stdmenus.ui:261
+#: lib/ui/stdmenus.inc:211
+#, fuzzy
+msgid "Math Normal Font|N"
+msgstr "Normal mattefont"
+
+#: lib/ui/stdmenus.inc:213
+#, fuzzy
+msgid "Math Calligraphic Family|C"
+msgstr "Matte Kalligrafisk"
+
+#: lib/ui/stdmenus.inc:214
+#, fuzzy
+msgid "Math Fraktur Family|F"
+msgstr "Matte Fraktur"
+
+#: lib/ui/stdmenus.inc:215
+#, fuzzy
+msgid "Math Roman Family|R"
+msgstr "Matte Roman"
+
+#: lib/ui/stdmenus.inc:216
+#, fuzzy
+msgid "Math Sans Serif Family|S"
+msgstr "Matte Sans Serif"
+
+#: lib/ui/stdmenus.inc:218
+#, fuzzy
+msgid "Math Bold Series|B"
+msgstr "Matte Fet"
+
+#: lib/ui/stdmenus.inc:220
 #, fuzzy
+msgid "Text Normal Font|T"
+msgstr "Normal tekstfont"
+
+#: lib/ui/stdmenus.inc:236
+#, fuzzy
+msgid "Octave|O"
+msgstr "Octave"
+
+#: lib/ui/stdmenus.inc:237
+#, fuzzy
+msgid "Maxima|M"
+msgstr "Maxima"
+
+#: lib/ui/stdmenus.inc:238
+#, fuzzy
+msgid "Mathematica|a"
+msgstr "Mathematica"
+
+#: lib/ui/stdmenus.inc:240
+msgid "Maple, simplify|s"
+msgstr ""
+
+#: lib/ui/stdmenus.inc:241
+msgid "Maple, factor|f"
+msgstr ""
+
+#: lib/ui/stdmenus.inc:242
+msgid "Maple, evalm|e"
+msgstr ""
+
+#: lib/ui/stdmenus.inc:243
+msgid "Maple, evalf|v"
+msgstr ""
+
+#: lib/ui/stdmenus.inc:262
 msgid "Open All Insets|O"
-msgstr "Åpnet \"float inset\""
+msgstr "Åpne alle \"insets\"|a"
 
-#: lib/ui/stdmenus.ui:262
+#: lib/ui/stdmenus.inc:263
 msgid "Close All Insets|C"
 msgstr ""
 
-#: lib/ui/stdmenus.ui:264
+#: lib/ui/stdmenus.inc:265
+#, fuzzy
+msgid "View Source|S"
+msgstr "Vis kode|s"
+
+#: lib/ui/stdmenus.inc:269
 #, fuzzy
-msgid "View source|s"
-msgstr "Synlig mellomrom"
+msgid "Toolbars|b"
+msgstr "Verktøy|V"
+
+#: lib/ui/stdmenus.inc:289
+#, fuzzy
+msgid "Special Character|p"
+msgstr "Spesielt tegn|S"
 
-#: lib/ui/stdmenus.ui:284
-msgid "Special Formatting|o"
-msgstr "Spesiell formattering|p"
+#: lib/ui/stdmenus.inc:290
+#, fuzzy
+msgid "Formatting|o"
+msgstr "Formatering"
 
-#: lib/ui/stdmenus.ui:285
+#: lib/ui/stdmenus.inc:291
 msgid "List / TOC|i"
 msgstr "Lister & innhold|i"
 
-#: lib/ui/stdmenus.ui:286
+#: lib/ui/stdmenus.inc:292
 msgid "Float|a"
 msgstr "Flytende (Float)|a"
 
-#: lib/ui/stdmenus.ui:289
+#: lib/ui/stdmenus.inc:294
 msgid "Branch|B"
 msgstr "Dokumentgren|D"
 
-#: lib/ui/stdmenus.ui:290
+#: lib/ui/stdmenus.inc:295
 msgid "File|e"
 msgstr "Fil|F"
 
-#: lib/ui/stdmenus.ui:291 src/insets/insetbox.C:153
+#: lib/ui/stdmenus.inc:296 src/insets/insetbox.C:152
 msgid "Box"
 msgstr "Boks"
 
-#: lib/ui/stdmenus.ui:296
+#: lib/ui/stdmenus.inc:299
+#, fuzzy
+msgid "Cross-Reference...|R"
+msgstr "Kryssreferanse...|K"
+
+#: lib/ui/stdmenus.inc:301
 msgid "Index Entry|d"
 msgstr "Nøkkelord|N"
 
-#: lib/ui/stdmenus.ui:300
+#: lib/ui/stdmenus.inc:302
+msgid "Glossary Entry|y"
+msgstr ""
+
+#: lib/ui/stdmenus.inc:304
 msgid "Table...|T"
 msgstr "Tabell...|T"
 
-#: lib/ui/stdmenus.ui:306
+#: lib/ui/stdmenus.inc:309
+#, fuzzy
+msgid "Short Title|S"
+msgstr "Kort tittel"
+
+#: lib/ui/stdmenus.inc:310
 msgid "TeX Code|X"
 msgstr "TeX-kode|X"
 
-#: lib/ui/stdmenus.ui:312
+#: lib/ui/stdmenus.inc:317
 msgid "Ordinary Quote|Q"
 msgstr "Vanlig sitattegn"
 
-#: lib/ui/stdmenus.ui:313
+#: lib/ui/stdmenus.inc:318
 msgid "Single Quote|S"
 msgstr "Enkelt sitattegn"
 
-#: lib/ui/stdmenus.ui:315
+#: lib/ui/stdmenus.inc:320
 msgid "Phonetic Symbols|y"
 msgstr ""
 
-#: lib/ui/stdmenus.ui:338
+#: lib/ui/stdmenus.inc:327
 #, fuzzy
-msgid "Numbered Formula|N"
-msgstr "Nummerert liste"
+msgid "Protected Space|P"
+msgstr "Hardt mellomrom"
 
-#: lib/ui/stdmenus.ui:348
-msgid "Aligned Environment"
-msgstr ""
+#: lib/ui/stdmenus.inc:330
+#, fuzzy
+msgid "Horizontal Fill|F"
+msgstr "Horisontalt fyll\t\\hfill"
 
-#: lib/ui/stdmenus.ui:349
-msgid "AlignedAt Environment"
-msgstr ""
+#: lib/ui/stdmenus.inc:331
+#, fuzzy
+msgid "Horizontal Line|L"
+msgstr "Horisontal linje"
 
-#: lib/ui/stdmenus.ui:350
-msgid "Gathered Environment"
+#: lib/ui/stdmenus.inc:332
+#, fuzzy
+msgid "Vertical Space...|V"
+msgstr "Vertikal avstand..."
+
+#: lib/ui/stdmenus.inc:334
+#, fuzzy
+msgid "Hyphenation Point|H"
+msgstr "Orddelingspunkt|p"
+
+#: lib/ui/stdmenus.inc:336
+#, fuzzy
+msgid "Line Break|B"
+msgstr "Linjeskift|i"
+
+#: lib/ui/stdmenus.inc:338
+#, fuzzy
+msgid "Page Break|a"
+msgstr "Sideskift"
+
+#: lib/ui/stdmenus.inc:339
+#, fuzzy
+msgid "Clear Page|C"
+msgstr "Bokmerker|B"
+
+#: lib/ui/stdmenus.inc:340
+msgid "Clear Double Page|D"
 msgstr ""
 
-#: lib/ui/stdmenus.ui:353
+#: lib/ui/stdmenus.inc:346
+msgid "Numbered Formula|N"
+msgstr "Nummerert formel|N"
+
+#: lib/ui/stdmenus.inc:356
+#, fuzzy
+msgid "Aligned Environment|l"
+msgstr "Åpnet text inset"
+
+#: lib/ui/stdmenus.inc:357
+#, fuzzy
+msgid "AlignedAt Environment|v"
+msgstr "Åpnet text inset"
+
+#: lib/ui/stdmenus.inc:358
+#, fuzzy
+msgid "Gathered Environment|h"
+msgstr "Minsk omgivelsesdybde|M"
+
+#: lib/ui/stdmenus.inc:361
 msgid "Math Panel|P"
 msgstr "Mattepanel|p"
 
-#: lib/ui/stdmenus.ui:359
+#: lib/ui/stdmenus.inc:367
 msgid "Text Wrap Float|W"
 msgstr "Område som teksten brytes rundt"
 
-#: lib/ui/stdmenus.ui:374
+#: lib/ui/stdmenus.inc:383
 msgid "External Material...|M"
 msgstr "Eksternt materiale...|E"
 
-#: lib/ui/stdmenus.ui:375
+#: lib/ui/stdmenus.inc:384
 msgid "Child Document...|d"
 msgstr "Underdokument...|d"
 
-#: lib/ui/stdmenus.ui:379
+#: lib/ui/stdmenus.inc:388
 msgid "LyX Note|N"
 msgstr "Notis|N"
 
-#: lib/ui/stdmenus.ui:380
+#: lib/ui/stdmenus.inc:389
 msgid "Comment|C"
 msgstr "Kommentar|K"
 
-#: lib/ui/stdmenus.ui:381
+#: lib/ui/stdmenus.inc:390
 msgid "Greyed Out|G"
 msgstr "Grået ut|G"
 
-#: lib/ui/stdmenus.ui:393
+#: lib/ui/stdmenus.inc:402
 msgid "Change Tracking|C"
 msgstr "Spore endringer"
 
-#: lib/ui/stdmenus.ui:396
+#: lib/ui/stdmenus.inc:405
 msgid "Table of Contents|T"
 msgstr "Innholdsfortegnelse|n"
 
-#: lib/ui/stdmenus.ui:397
+#: lib/ui/stdmenus.inc:406
 msgid "Start Appendix Here|A"
 msgstr "Begynn appendiks her|a"
 
-#: lib/ui/stdmenus.ui:399
+#: lib/ui/stdmenus.inc:408
 msgid "Compressed|o"
 msgstr ""
 
-#: lib/ui/stdmenus.ui:400
+#: lib/ui/stdmenus.inc:409
 msgid "Settings...|S"
 msgstr "Innstillinger...|I"
 
-#: lib/ui/stdmenus.ui:406
-#, fuzzy
+#: lib/ui/stdmenus.inc:415
 msgid "Accept Change|A"
-msgstr "Godta alle endringer|G"
+msgstr "Godta endring|G"
 
-#: lib/ui/stdmenus.ui:407
-#, fuzzy
+#: lib/ui/stdmenus.inc:416
 msgid "Reject Change|R"
-msgstr "Forkast alle endringer|k"
+msgstr "Forkast endring|k"
 
-#: lib/ui/stdmenus.ui:408
-#, fuzzy
+#: lib/ui/stdmenus.inc:417
 msgid "Accept All Changes|c"
 msgstr "Godta alle endringer|G"
 
-#: lib/ui/stdmenus.ui:409
-#, fuzzy
+#: lib/ui/stdmenus.inc:418
 msgid "Reject All Changes|e"
 msgstr "Forkast alle endringer|k"
 
-#: lib/ui/stdmenus.ui:419
-#, fuzzy
+#: lib/ui/stdmenus.inc:428
 msgid "Next Change|C"
-msgstr "&Neste endring"
+msgstr "Neste endring|N"
 
-#: lib/ui/stdmenus.ui:420
+#: lib/ui/stdmenus.inc:429
 #, fuzzy
-msgid "Next Reference|R"
-msgstr "Referanse"
+msgid "Next Cross-Reference|R"
+msgstr "Neste referanse|r"
+
+#: lib/ui/stdmenus.inc:436
+#, fuzzy
+msgid "Save Bookmark|S"
+msgstr "Lagre bokmerke 1"
 
-#: lib/ui/stdmenus.ui:446
+#: lib/ui/stdmenus.inc:437
+#, fuzzy
+msgid "Clear Bookmarks|C"
+msgstr "Bokmerker|B"
+
+#: lib/ui/stdmenus.inc:448
 msgid "Thesaurus...|T"
 msgstr ""
 
-#: lib/ui/stdmenus.ui:449
+#: lib/ui/stdmenus.inc:451
 msgid "TeX Information|I"
 msgstr "LaTeX Konfigurasjon|X"
 
-#: lib/ui/stdtoolbars.ui:42
-msgid "standard"
-msgstr ""
+#: lib/ui/stdmenus.inc:468
+#, fuzzy
+msgid "Insets|n"
+msgstr "Sett inn|S"
 
-#: lib/ui/stdtoolbars.ui:44
+#: lib/ui/stdtoolbars.inc:44
 msgid "New document"
 msgstr "Nytt dokument"
 
-#: lib/ui/stdtoolbars.ui:45
+#: lib/ui/stdtoolbars.inc:45
 msgid "Open document"
 msgstr "Åpne dokument"
 
-#: lib/ui/stdtoolbars.ui:46
+#: lib/ui/stdtoolbars.inc:46
 msgid "Save document"
 msgstr "Lagre dokumentet"
 
-#: lib/ui/stdtoolbars.ui:47
+#: lib/ui/stdtoolbars.inc:47
 msgid "Print document"
 msgstr "Skriv ut dokumentet"
 
-#: lib/ui/stdtoolbars.ui:49 src/BufferView.C:723
+#: lib/ui/stdtoolbars.inc:49 src/BufferView.C:713
 msgid "Undo"
 msgstr "Angre"
 
-#: lib/ui/stdtoolbars.ui:50 src/BufferView.C:734
+#: lib/ui/stdtoolbars.inc:50 src/BufferView.C:724
 msgid "Redo"
 msgstr "Gjør omigjen"
 
-#: lib/ui/stdtoolbars.ui:54
+#: lib/ui/stdtoolbars.inc:54
 msgid "Find and replace"
 msgstr "Finn og erstatt"
 
-#: lib/ui/stdtoolbars.ui:56
+#: lib/ui/stdtoolbars.inc:56
 msgid "Toggle emphasis"
 msgstr "Uthevet av/på"
 
-#: lib/ui/stdtoolbars.ui:57
+#: lib/ui/stdtoolbars.inc:57
 msgid "Toggle noun"
 msgstr "Substantiv stil av/på"
 
-#: lib/ui/stdtoolbars.ui:58
+#: lib/ui/stdtoolbars.inc:58
 msgid "Apply last"
 msgstr "Bruk siste"
 
-#: lib/ui/stdtoolbars.ui:60
+#: lib/ui/stdtoolbars.inc:60
 msgid "Insert math"
 msgstr "Sett inn formel"
 
-#: lib/ui/stdtoolbars.ui:61
+#: lib/ui/stdtoolbars.inc:61
 msgid "Insert graphics"
 msgstr "Sett inn grafikk"
 
-#: lib/ui/stdtoolbars.ui:62
+#: lib/ui/stdtoolbars.inc:62
 msgid "Insert table"
 msgstr "Sett inn tabell"
 
-#: lib/ui/stdtoolbars.ui:65
-msgid "extra"
+#: lib/ui/stdtoolbars.inc:65
+#, fuzzy
+msgid "Extra"
 msgstr "ekstra"
 
-#: lib/ui/stdtoolbars.ui:66
+#: lib/ui/stdtoolbars.inc:67
 msgid "Numbered list"
 msgstr "Nummerert liste"
 
-#: lib/ui/stdtoolbars.ui:67
+#: lib/ui/stdtoolbars.inc:68
 msgid "Itemized list"
 msgstr "Punktliste"
 
-#: lib/ui/stdtoolbars.ui:70
+#: lib/ui/stdtoolbars.inc:71
 msgid "Increase depth"
 msgstr "Øk dybden"
 
-#: lib/ui/stdtoolbars.ui:71
+#: lib/ui/stdtoolbars.inc:72
 msgid "Decrease depth"
 msgstr "Minsk dybden"
 
-#: lib/ui/stdtoolbars.ui:73
+#: lib/ui/stdtoolbars.inc:74
 msgid "Insert figure float"
 msgstr "Sett inn flytende figur"
 
-#: lib/ui/stdtoolbars.ui:74
+#: lib/ui/stdtoolbars.inc:75
 msgid "Insert table float"
 msgstr "Sett inn flytende tabell"
 
-#: lib/ui/stdtoolbars.ui:75
+#: lib/ui/stdtoolbars.inc:76
 msgid "Insert label"
 msgstr "Sett inn referansemerke"
 
-#: lib/ui/stdtoolbars.ui:76
+#: lib/ui/stdtoolbars.inc:77
 msgid "Insert cross-reference"
 msgstr "Sett inn kryssreferanse"
 
-#: lib/ui/stdtoolbars.ui:77
+#: lib/ui/stdtoolbars.inc:78
 msgid "Insert citation"
 msgstr "Sett inn sitat"
 
-#: lib/ui/stdtoolbars.ui:78
+#: lib/ui/stdtoolbars.inc:79
 msgid "Insert index entry"
 msgstr "Sett inn nøkkelord for registeret"
 
-#: lib/ui/stdtoolbars.ui:80
+#: lib/ui/stdtoolbars.inc:80
+#, fuzzy
+msgid "Insert glossary entry"
+msgstr "Sett inn nøkkelord for registeret"
+
+#: lib/ui/stdtoolbars.inc:82
 msgid "Insert footnote"
 msgstr "Sett inn fotnote"
 
-#: lib/ui/stdtoolbars.ui:81
+#: lib/ui/stdtoolbars.inc:83
 msgid "Insert margin note"
 msgstr "Sett inn margnotis"
 
-#: lib/ui/stdtoolbars.ui:82 lib/ui/stdtoolbars.ui:160
+#: lib/ui/stdtoolbars.inc:84 lib/ui/stdtoolbars.inc:162
 msgid "Insert note"
 msgstr "Sett inn notis"
 
-#: lib/ui/stdtoolbars.ui:83
+#: lib/ui/stdtoolbars.inc:85
 msgid "Insert URL"
 msgstr "Sett inn URL"
 
-#: lib/ui/stdtoolbars.ui:84
-msgid "Insert TeX Code"
+#: lib/ui/stdtoolbars.inc:86
+#, fuzzy
+msgid "Insert TeX code"
 msgstr "Sett inn TeX-kode"
 
-#: lib/ui/stdtoolbars.ui:85
+#: lib/ui/stdtoolbars.inc:87
 msgid "Include file"
 msgstr "Inkluder fil"
 
-#: lib/ui/stdtoolbars.ui:87
+#: lib/ui/stdtoolbars.inc:89
 msgid "Text style"
 msgstr "Tekststil"
 
-#: lib/ui/stdtoolbars.ui:88
+#: lib/ui/stdtoolbars.inc:90
 msgid "Paragraph settings"
 msgstr "Avsnittinnstillinger"
 
-#: lib/ui/stdtoolbars.ui:89
+#: lib/ui/stdtoolbars.inc:91
 msgid "Table of contents"
 msgstr "Innholdsfortegnelse"
 
-#: lib/ui/stdtoolbars.ui:90
+#: lib/ui/stdtoolbars.inc:92
 msgid "Check spelling"
 msgstr "Stavesjekk"
 
-#: lib/ui/stdtoolbars.ui:94
-msgid "table"
-msgstr "Tabell"
-
-#: lib/ui/stdtoolbars.ui:95 lib/ui/stdtoolbars.ui:138
+#: lib/ui/stdtoolbars.inc:97 lib/ui/stdtoolbars.inc:140
 msgid "Add row"
 msgstr "Legg til rad"
 
-#: lib/ui/stdtoolbars.ui:96 lib/ui/stdtoolbars.ui:139
+#: lib/ui/stdtoolbars.inc:98 lib/ui/stdtoolbars.inc:141
 msgid "Add column"
 msgstr "Legg til kolonne"
 
-#: lib/ui/stdtoolbars.ui:97 lib/ui/stdtoolbars.ui:140
+#: lib/ui/stdtoolbars.inc:99 lib/ui/stdtoolbars.inc:142
 msgid "Delete row"
 msgstr "Slett rad"
 
-#: lib/ui/stdtoolbars.ui:98 lib/ui/stdtoolbars.ui:141
+#: lib/ui/stdtoolbars.inc:100 lib/ui/stdtoolbars.inc:143
 msgid "Delete column"
 msgstr "Slett kolonne"
 
-#: lib/ui/stdtoolbars.ui:100
+#: lib/ui/stdtoolbars.inc:102
 msgid "Set top line"
 msgstr "Toppstrek på/av"
 
-#: lib/ui/stdtoolbars.ui:101
+#: lib/ui/stdtoolbars.inc:103
 msgid "Set bottom line"
 msgstr "Bunnstrek på/av"
 
-#: lib/ui/stdtoolbars.ui:102
+#: lib/ui/stdtoolbars.inc:104
 msgid "Set left line"
 msgstr "Venstre strek på/av"
 
-#: lib/ui/stdtoolbars.ui:103
+#: lib/ui/stdtoolbars.inc:105
 msgid "Set right line"
 msgstr "Høyre strek på/av"
 
-#: lib/ui/stdtoolbars.ui:104
+#: lib/ui/stdtoolbars.inc:106
 msgid "Set all lines"
 msgstr "Alle linjer på"
 
-#: lib/ui/stdtoolbars.ui:105
+#: lib/ui/stdtoolbars.inc:107
 msgid "Unset all lines"
 msgstr "Alle linjer av"
 
-#: lib/ui/stdtoolbars.ui:107
+#: lib/ui/stdtoolbars.inc:109
 msgid "Align left"
 msgstr "Venstrejuster"
 
-#: lib/ui/stdtoolbars.ui:108
+#: lib/ui/stdtoolbars.inc:110
 msgid "Align center"
 msgstr "Midtjuster"
 
-#: lib/ui/stdtoolbars.ui:109
+#: lib/ui/stdtoolbars.inc:111
 msgid "Align right"
 msgstr "Høyrejuster"
 
-#: lib/ui/stdtoolbars.ui:111
+#: lib/ui/stdtoolbars.inc:113
 msgid "Align top"
 msgstr "Toppjuster rad"
 
-#: lib/ui/stdtoolbars.ui:112
+#: lib/ui/stdtoolbars.inc:114
 msgid "Align middle"
 msgstr "Midtjuster rad"
 
-#: lib/ui/stdtoolbars.ui:113
+#: lib/ui/stdtoolbars.inc:115
 msgid "Align bottom"
 msgstr "Bunnjuster rad"
 
-#: lib/ui/stdtoolbars.ui:115
+#: lib/ui/stdtoolbars.inc:117
 msgid "Rotate cell"
 msgstr "Vri tabellruten 90°"
 
-#: lib/ui/stdtoolbars.ui:116
+#: lib/ui/stdtoolbars.inc:118
 msgid "Rotate table"
 msgstr "Vri tabellen 90°"
 
-#: lib/ui/stdtoolbars.ui:117
+#: lib/ui/stdtoolbars.inc:119
 msgid "Set multi-column"
 msgstr "Multikolonne|M"
 
-#: lib/ui/stdtoolbars.ui:120 src/LColor.C:123
-msgid "math"
-msgstr "matte"
+#: lib/ui/stdtoolbars.inc:122
+#, fuzzy
+msgid "Math"
+msgstr "Matte"
 
-#: lib/ui/stdtoolbars.ui:121
+#: lib/ui/stdtoolbars.inc:123
 msgid "Show math panel"
 msgstr "Mattepanel"
 
-#: lib/ui/stdtoolbars.ui:122
+#: lib/ui/stdtoolbars.inc:124
 msgid "Set display mode"
 msgstr "Bytt mellom formel i tekst, og fremhevet formel"
 
-#: lib/ui/stdtoolbars.ui:126
+#: lib/ui/stdtoolbars.inc:128
 msgid "Insert square root"
 msgstr "Sett inn kvadratrot"
 
-#: lib/ui/stdtoolbars.ui:127
+#: lib/ui/stdtoolbars.inc:129
 msgid "Insert sum"
 msgstr "Sett inn sum"
 
-#: lib/ui/stdtoolbars.ui:128
+#: lib/ui/stdtoolbars.inc:130
 msgid "Insert integral"
 msgstr "Sett inn integral"
 
-#: lib/ui/stdtoolbars.ui:129
+#: lib/ui/stdtoolbars.inc:131
 msgid "Insert product"
 msgstr "Sett inn produkt"
 
-#: lib/ui/stdtoolbars.ui:131
+#: lib/ui/stdtoolbars.inc:133
 msgid "Insert fraction"
 msgstr "Sett inn brøk"
 
-#: lib/ui/stdtoolbars.ui:132
+#: lib/ui/stdtoolbars.inc:134
 msgid "Insert ( )"
 msgstr "Sett inn ( )"
 
-#: lib/ui/stdtoolbars.ui:133
+#: lib/ui/stdtoolbars.inc:135
 msgid "Insert [ ]"
 msgstr "Sett inn [ ]"
 
-#: lib/ui/stdtoolbars.ui:134
+#: lib/ui/stdtoolbars.inc:136
 msgid "Insert { }"
 msgstr "Sett inn { }"
 
-#: lib/ui/stdtoolbars.ui:137
+#: lib/ui/stdtoolbars.inc:139
 #, fuzzy
 msgid "Insert cases environment"
 msgstr "Øk omgivelsedybde|k"
 
-#: lib/ui/stdtoolbars.ui:144
-msgid "minibuffer"
-msgstr "minibuffer"
+#: lib/ui/stdtoolbars.inc:146
+#, fuzzy
+msgid "Command Buffer"
+msgstr "Sluttkommando:"
 
-#: lib/ui/stdtoolbars.ui:148
+#: lib/ui/stdtoolbars.inc:150
 #, fuzzy
-msgid "review"
-msgstr "Forhåndsvisning"
+msgid "Review"
+msgstr "forhåndsvisning"
 
-#: lib/ui/stdtoolbars.ui:149
+#: lib/ui/stdtoolbars.inc:151
 #, fuzzy
 msgid "Track changes"
 msgstr "Spor endringer|S"
 
-#: lib/ui/stdtoolbars.ui:150
+#: lib/ui/stdtoolbars.inc:152
 #, fuzzy
 msgid "Show changes in output"
 msgstr "Vis endringer i utskrift|V"
 
-#: lib/ui/stdtoolbars.ui:152
+#: lib/ui/stdtoolbars.inc:154
 #, fuzzy
 msgid "Next change"
 msgstr "&Neste endring"
 
-#: lib/ui/stdtoolbars.ui:153
+#: lib/ui/stdtoolbars.inc:155
 #, fuzzy
 msgid "Accept change"
 msgstr "Godta alle endringer|G"
 
-#: lib/ui/stdtoolbars.ui:154
+#: lib/ui/stdtoolbars.inc:156
 #, fuzzy
 msgid "Reject change"
 msgstr "Forkast alle endringer|k"
 
-#: lib/ui/stdtoolbars.ui:156
+#: lib/ui/stdtoolbars.inc:158
 #, fuzzy
 msgid "Merge changes"
 msgstr "Revidere endringer"
 
-#: lib/ui/stdtoolbars.ui:157
+#: lib/ui/stdtoolbars.inc:159
 #, fuzzy
 msgid "Accept all changes"
 msgstr "Godta alle endringer|G"
 
-#: lib/ui/stdtoolbars.ui:158
-#, fuzzy
+#: lib/ui/stdtoolbars.inc:160
 msgid "Reject all changes"
-msgstr "Forkast alle endringer|k"
+msgstr "Forkast alle endringer"
 
-#: lib/ui/stdtoolbars.ui:161
-#, fuzzy
+#: lib/ui/stdtoolbars.inc:163
 msgid "Next note"
-msgstr "Neste notis|n"
+msgstr "Neste notis"
+
+#: lib/ui/stdtoolbars.inc:166
+#, fuzzy
+msgid "View/Update Document"
+msgstr "Lagre dokumentet"
 
-#: src/BufferView.C:235
+#: lib/ui/stdtoolbars.inc:167
+#, fuzzy
+msgid "View DVI"
+msgstr "Vis|V"
+
+#: lib/ui/stdtoolbars.inc:168
+#, fuzzy
+msgid "Update DVI"
+msgstr "&Oppdater"
+
+#: lib/ui/stdtoolbars.inc:169
+msgid "View PDF (pdflatex)"
+msgstr ""
+
+#: lib/ui/stdtoolbars.inc:170
+msgid "Update PDF (pdflatex)"
+msgstr ""
+
+#: lib/ui/stdtoolbars.inc:171
+#, fuzzy
+msgid "View PostScript"
+msgstr "Post Scriptum"
+
+#: lib/ui/stdtoolbars.inc:172
+#, fuzzy
+msgid "Update PostScript"
+msgstr "Post Scriptum"
+
+#: src/BufferView.C:216
 #, c-format
 msgid ""
 "The document %1$s is already loaded.\n"
@@ -8669,19 +8839,19 @@ msgstr ""
 "\n"
 "Vil du gå tilbake til den lagrede versjonen? "
 
-#: src/BufferView.C:238 src/lyxfunc.C:848
+#: src/BufferView.C:219 src/lyxfunc.C:898
 msgid "Revert to saved document?"
 msgstr "Tilbake til sist lagret"
 
-#: src/BufferView.C:239 src/lyxfunc.C:849 src/lyxvc.C:173
+#: src/BufferView.C:220 src/lyxfunc.C:899 src/lyxvc.C:175
 msgid "&Revert"
 msgstr "&Tilbake til lagret"
 
-#: src/BufferView.C:239
+#: src/BufferView.C:220
 msgid "&Switch to document"
 msgstr "Bytt til det åpne dokumentet"
 
-#: src/BufferView.C:261
+#: src/BufferView.C:242
 #, c-format
 msgid ""
 "The document %1$s does not yet exist.\n"
@@ -8692,29 +8862,24 @@ msgstr ""
 "\n"
 "Vil du lage et nytt dokument?"
 
-#: src/BufferView.C:264
+#: src/BufferView.C:245
 msgid "Create new document?"
 msgstr "Lage nytt dokument med dette navnet?"
 
-#: src/BufferView.C:265
+#: src/BufferView.C:246
 msgid "&Create"
 msgstr "&Nytt"
 
-#: src/BufferView.C:527
-#, c-format
-msgid "Saved bookmark %1$d"
-msgstr "Lagret bokmerke %1$d"
-
-#: src/BufferView.C:561
-#, c-format
-msgid "Moved to bookmark %1$d"
-msgstr "Flyttet til bokmerke %1$d"
+#: src/BufferView.C:542
+#, fuzzy
+msgid "Save bookmark"
+msgstr "Lagre bokmerke 5"
 
-#: src/BufferView.C:726
+#: src/BufferView.C:716
 msgid "No further undo information"
 msgstr "Ikke mer \"Angre\" informasjon"
 
-#: src/BufferView.C:737
+#: src/BufferView.C:727
 msgid "No further redo information"
 msgstr "Ikke mer \"Gjør om\" informasjon"
 
@@ -8756,58 +8921,58 @@ msgstr "Ett ord i dokumentet."
 msgid "Count words"
 msgstr "Telle ord"
 
-#: src/BufferView.C:1396
+#: src/BufferView.C:1501
 msgid "Select LyX document to insert"
 msgstr "Velg LyX dokument som skal settes inn"
 
-#: src/BufferView.C:1398 src/frontends/controllers/ControlBibtex.C:54
+#: src/BufferView.C:1503 src/frontends/controllers/ControlBibtex.C:54
 #: src/frontends/controllers/ControlBibtex.C:66
-#: src/frontends/controllers/ControlExternal.C:168
-#: src/frontends/controllers/ControlGraphics.C:95
-#: src/frontends/controllers/ControlInclude.C:90 src/lyx_cb.C:135
-#: src/lyxfunc.C:1794 src/lyxfunc.C:1831 src/lyxfunc.C:1906
+#: 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:1859 src/lyxfunc.C:1896 src/lyxfunc.C:1969
 msgid "Documents|#o#O"
 msgstr "Dokumenter|#o#O"
 
-#: src/BufferView.C:1399 src/lyxfunc.C:1832 src/lyxfunc.C:1907
+#: src/BufferView.C:1504 src/lyxfunc.C:1897 src/lyxfunc.C:1970
 msgid "Examples|#E#e"
 msgstr "Eksempler|#E#e"
 
-#: src/BufferView.C:1403 src/lyx_cb.C:141 src/lyxfunc.C:1799
-#: src/lyxfunc.C:1836
+#: src/BufferView.C:1508 src/lyx_cb.C:140 src/lyxfunc.C:1864
+#: src/lyxfunc.C:1901
 msgid "LyX Documents (*.lyx)"
 msgstr "LyX-Dokumenter (*.lyx)"
 
-#: src/BufferView.C:1415 src/lyxfunc.C:1846 src/lyxfunc.C:1928
-#: src/lyxfunc.C:1942 src/lyxfunc.C:1958
+#: src/BufferView.C:1520 src/lyxfunc.C:1911 src/lyxfunc.C:1991
+#: src/lyxfunc.C:2005 src/lyxfunc.C:2021
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: src/BufferView.C:1426
+#: src/BufferView.C:1531
 #, c-format
 msgid "Inserting document %1$s..."
 msgstr "Setter inn dokumentet %1$s..."
 
-#: src/BufferView.C:1436
+#: src/BufferView.C:1542
 #, c-format
 msgid "Document %1$s inserted."
 msgstr "Satt inn document %1$s."
 
-#: src/BufferView.C:1438
+#: src/BufferView.C:1544
 #, c-format
 msgid "Could not insert document %1$s"
 msgstr "Kunne ikke sette inn dokumentet %1$s"
 
-#: src/Chktex.C:70
+#: src/Chktex.C:71
 #, c-format
 msgid "ChkTeX warning id # %1$d"
 msgstr "ChkTeX advarsel id # %1$d"
 
-#: src/Chktex.C:72
+#: src/Chktex.C:73
 msgid "ChkTeX warning id # "
 msgstr "ChkTeX advarsel id # "
 
-#: src/CutAndPaste.C:415
+#: src/CutAndPaste.C:423
 #, c-format
 msgid ""
 "Layout had to be changed from\n"
@@ -8820,11 +8985,11 @@ msgstr ""
 "som en følge av bytte av dokumentklasse\n"
 "fra %3$s til %4$s."
 
-#: src/CutAndPaste.C:420
+#: src/CutAndPaste.C:428
 msgid "Changed Layout"
 msgstr "Endret stil"
 
-#: src/CutAndPaste.C:439
+#: src/CutAndPaste.C:447
 #, c-format
 msgid ""
 "Character style %1$s is undefined because of class conversion from\n"
@@ -8833,7 +8998,7 @@ msgstr ""
 "Tekststilen %1$s er udefinert på grunn av konvertering fra\n"
 "%2$s til %3$s"
 
-#: src/CutAndPaste.C:446
+#: src/CutAndPaste.C:454
 msgid "Undefined character style"
 msgstr "Udefinert tekststil"
 
@@ -8950,6 +9115,10 @@ msgstr "kommando-\"inset\" ramme"
 msgid "special character"
 msgstr "spesielle tegn"
 
+#: src/LColor.C:123
+msgid "math"
+msgstr "matte"
+
 #: src/LColor.C:124
 msgid "math background"
 msgstr "matte bakgrunn"
@@ -9039,137 +9208,146 @@ msgid "page break"
 msgstr "sidebrekk"
 
 #: src/LColor.C:148
-msgid "top of button"
-msgstr "knapptopp"
+#, fuzzy
+msgid "frame of button"
+msgstr "knappvenstre"
 
 #: src/LColor.C:149
-msgid "bottom of button"
-msgstr "knappbunn"
+msgid "button background"
+msgstr "knappbakgrunn"
 
 #: src/LColor.C:150
-msgid "left of button"
-msgstr "knappvenstre"
-
-#: src/LColor.C:151
-msgid "right of button"
-msgstr "knapphøyre"
-
-#: src/LColor.C:152
-msgid "button background"
+#, fuzzy
+msgid "button background under focus"
 msgstr "knappbakgrunn"
 
-#: src/LColor.C:153
+#: src/LColor.C:151
 msgid "inherit"
 msgstr "arv"
 
-#: src/LColor.C:154
+#: src/LColor.C:152
 msgid "ignore"
 msgstr "ignorer"
 
-#: src/LaTeX.C:89
+#: src/LaTeX.C:92
 #, c-format
 msgid "Waiting for LaTeX run number %1$d"
 msgstr ""
 
-#: src/LaTeX.C:283 src/LaTeX.C:351
+#: src/LaTeX.C:289 src/LaTeX.C:365
 msgid "Running MakeIndex."
 msgstr "Kjører MakeIndex."
 
-#: src/LaTeX.C:295
+#: src/LaTeX.C:295 src/LaTeX.C:373
+#, fuzzy
+msgid "Running MakeIndex for nomencl."
+msgstr "Kjører MakeIndex."
+
+#: src/LaTeX.C:309
 msgid "Running BibTeX."
 msgstr "Kjører BibTeX."
 
-#: src/MenuBackend.C:450 src/MenuBackend.C:471 src/MenuBackend.C:541
-#: src/MenuBackend.C:563 src/MenuBackend.C:586 src/MenuBackend.C:672
+#: src/MenuBackend.C:465 src/MenuBackend.C:502 src/MenuBackend.C:572
+#: src/MenuBackend.C:594 src/MenuBackend.C:617 src/MenuBackend.C:703
 msgid "No Documents Open!"
 msgstr "Ingen åpne dokumenter!"
 
-#: src/MenuBackend.C:509
-msgid "Plain Text as Lines"
+#: src/MenuBackend.C:540
+#, fuzzy
+msgid "Plain Text"
+msgstr "Ren tekst"
+
+#: src/MenuBackend.C:542
+#, fuzzy
+msgid "Plain Text, Join Lines"
 msgstr "Ren tekst som linjer"
 
-#: src/MenuBackend.C:511
-msgid "Plain Text as Paragraphs"
-msgstr "Ren tekst som avsnitt"
+#: src/MenuBackend.C:714
+#, fuzzy
+msgid "Master Document"
+msgstr "Lagre dokumentet"
 
-#: src/MenuBackend.C:706
+#: src/MenuBackend.C:746
 msgid "No Table of contents"
 msgstr "Innholdsfortegnelsen finnes ikke"
 
+#: src/MenuBackend.C:791
+msgid " (auto)"
+msgstr ""
+
 #: src/SpellBase.C:51
 msgid "Native OS API not yet supported."
 msgstr ""
 
-#: src/buffer.C:229
+#: src/buffer.C:231
 msgid "Could not remove temporary directory"
 msgstr "Kunne ikke fjerne midlertidig mappe"
 
-#: src/buffer.C:230
+#: src/buffer.C:232
 #, c-format
 msgid "Could not remove the temporary directory %1$s"
 msgstr "Kunne ikke fjerne den midlertidige mappa %1$s"
 
-#: src/buffer.C:388
+#: src/buffer.C:403
 msgid "Unknown document class"
 msgstr "Ukjent dokumentklasse"
 
-#: src/buffer.C:389
+#: src/buffer.C:404
 #, c-format
 msgid "Using the default document class, because the class %1$s is unknown."
 msgstr ""
 
-#: src/buffer.C:444 src/text.C:353
+#: src/buffer.C:459 src/text.C:298
 #, c-format
 msgid "Unknown token: %1$s %2$s\n"
 msgstr "Ukjent symbol: %1$s %2$s\n"
 
-#: src/buffer.C:448 src/buffer.C:455 src/buffer.C:475
+#: src/buffer.C:463 src/buffer.C:470 src/buffer.C:490
 #, fuzzy
 msgid "Document header error"
 msgstr "Dokumentet er ikke skrivbart."
 
-#: src/buffer.C:454
+#: src/buffer.C:469
 msgid "\\begin_header is missing"
 msgstr "\\begin_header mangler"
 
-#: src/buffer.C:474
+#: src/buffer.C:489
 msgid "\\begin_document is missing"
 msgstr "\\begin_document mangler"
 
-#: src/buffer.C:485
+#: src/buffer.C:500
 msgid "Can't load document class"
 msgstr "Kan ikke laste inn dokumentklasse"
 
-#: src/buffer.C:486
+#: src/buffer.C:501
 #, c-format
 msgid ""
-"Using the default document class, because the  class %1$s could not be "
-"loaded."
+"Using the default document class, because the class %1$s could not be loaded."
 msgstr ""
 
-#: src/buffer.C:598 src/buffer.C:607
+#: src/buffer.C:644 src/buffer.C:653
 msgid "Document could not be read"
 msgstr "Dokumentet lot seg ikke lese"
 
-#: src/buffer.C:599 src/buffer.C:608
+#: src/buffer.C:645 src/buffer.C:654
 #, c-format
 msgid "%1$s could not be read."
 msgstr "%1$s var uleselig"
 
-#: src/buffer.C:616 src/buffer.C:682
+#: src/buffer.C:662 src/buffer.C:734
 msgid "Document format failure"
 msgstr "Feil med dokumentformatet"
 
-#: src/buffer.C:617
+#: src/buffer.C:663
 #, c-format
 msgid "%1$s is not a LyX document."
 msgstr "%1$s er ikke et LyX-dokument."
 
-#: src/buffer.C:636
+#: src/buffer.C:687
 msgid "Conversion failed"
 msgstr "Kunne ikke konvertere"
 
-#: src/buffer.C:637
+#: src/buffer.C:688
 #, c-format
 msgid ""
 "%1$s is from an earlier version of LyX, but a temporary file for converting "
@@ -9178,63 +9356,63 @@ msgstr ""
 "%1$s ble laget med en tidligere versjon av LyX. Fikk ikke laget en "
 "midlertidig fil for konvertering."
 
-#: src/buffer.C:646
+#: src/buffer.C:697
 msgid "Conversion script not found"
 msgstr "Fant ikke konverteringsscriptet"
 
-#: src/buffer.C:647
+#: src/buffer.C:698
 #, c-format
 msgid ""
 "%1$s is from an earlier version of LyX, but the conversion script lyx2lyx "
 "could not be found."
 msgstr ""
 
-#: src/buffer.C:667
+#: src/buffer.C:719
 msgid "Conversion script failed"
 msgstr "Konverteringsscriptet mislyktes"
 
-#: src/buffer.C:668
+#: src/buffer.C:720
 #, c-format
 msgid ""
 "%1$s is from an earlier version of LyX, but the lyx2lyx script failed to "
 "convert it."
 msgstr ""
 
-#: src/buffer.C:683
+#: src/buffer.C:735
 #, c-format
 msgid "%1$s ended unexpectedly, which means that it is probably corrupted."
 msgstr ""
 
-#: src/buffer.C:719
+#: src/buffer.C:771
 #, fuzzy
 msgid "Backup failure"
 msgstr "&Sikkerhetskopier:"
 
-#: src/buffer.C:720
+#: src/buffer.C:772
 #, c-format
 msgid ""
-"LyX was not able to make a backup copy in %1$s.\n"
-"Please check if the directory exists and is writeable."
+"Cannot create backup file %1$s.\n"
+"Please check whether the directory exists and is writeable."
 msgstr ""
 
-#: src/buffer.C:835
+#: src/buffer.C:884
 #, fuzzy
 msgid "Encoding error"
 msgstr "&Avstand:"
 
-#: src/buffer.C:836
+#: src/buffer.C:885
 msgid ""
 "Some characters of your document are not representable in the chosen "
 "encoding.\n"
 "Changing the document encoding to utf8 could help."
 msgstr ""
 
-#: src/buffer.C:845
+#: src/buffer.C:894
 #, fuzzy
 msgid "Error closing file"
 msgstr "Feil bruk av multikolonne"
 
-#: src/buffer.C:846
+#: src/buffer.C:895
 msgid ""
 "The output file could not be closed properly.\n"
 " Probably some characters of your document are not representable in the "
@@ -9242,19 +9420,19 @@ msgid ""
 "Changing the document encoding to utf8 could help."
 msgstr ""
 
-#: src/buffer.C:1104
+#: src/buffer.C:1153
 msgid "Running chktex..."
 msgstr "Kjører chktex..."
 
-#: src/buffer.C:1117
+#: src/buffer.C:1166
 msgid "chktex failure"
 msgstr ""
 
-#: src/buffer.C:1118
+#: src/buffer.C:1167
 msgid "Could not run chktex successfully."
 msgstr "Mislyktes med chktex."
 
-#: src/buffer_funcs.C:78
+#: src/buffer_funcs.C:79
 #, c-format
 msgid ""
 "The specified document\n"
@@ -9264,11 +9442,11 @@ msgstr ""
 "Dokumentet %1$s\n"
 "var uleselig."
 
-#: src/buffer_funcs.C:80
+#: src/buffer_funcs.C:81
 msgid "Could not read document"
 msgstr "Kunne ikke åpne dokumentet"
 
-#: src/buffer_funcs.C:92
+#: src/buffer_funcs.C:94
 #, c-format
 msgid ""
 "An emergency save of the document %1$s exists.\n"
@@ -9279,19 +9457,19 @@ msgstr ""
 "\n"
 "Gjenopprette det nødlagrede dokumentet?"
 
-#: src/buffer_funcs.C:95
+#: src/buffer_funcs.C:97
 msgid "Load emergency save?"
 msgstr "Åpne nødlagret fil?"
 
-#: src/buffer_funcs.C:96
+#: src/buffer_funcs.C:98
 msgid "&Recover"
 msgstr "&Gjenopprett"
 
-#: src/buffer_funcs.C:96
+#: src/buffer_funcs.C:98
 msgid "&Load Original"
 msgstr "&Åpne originalen"
 
-#: src/buffer_funcs.C:118
+#: src/buffer_funcs.C:121
 #, c-format
 msgid ""
 "The backup of the document %1$s is newer.\n"
@@ -9302,32 +9480,32 @@ msgstr ""
 "\n"
 "Åpne sikkerhetskopien i stedet?"
 
-#: src/buffer_funcs.C:121
+#: src/buffer_funcs.C:124
 msgid "Load backup?"
 msgstr "Åpne sikkerhetskopi i stedet?"
 
-#: src/buffer_funcs.C:122
+#: src/buffer_funcs.C:125
 msgid "&Load backup"
 msgstr "&Åpne sikkerhetskopien"
 
-#: src/buffer_funcs.C:122
+#: src/buffer_funcs.C:125
 msgid "Load &original"
 msgstr "Åpne &originalen"
 
-#: src/buffer_funcs.C:161
+#: src/buffer_funcs.C:164
 #, 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:163
+#: src/buffer_funcs.C:166
 msgid "Retrieve from version control?"
 msgstr "Vil du hente inn filen som er under versjonskontroll?"
 
-#: src/buffer_funcs.C:164
+#: src/buffer_funcs.C:167
 msgid "&Retrieve"
 msgstr "&Hent"
 
-#: src/buffer_funcs.C:197
+#: src/buffer_funcs.C:200
 #, c-format
 msgid ""
 "The specified document template\n"
@@ -9337,28 +9515,23 @@ msgstr ""
 "Malfilen %1$s\n"
 "kunne ikke leses."
 
-#: src/buffer_funcs.C:199
+#: src/buffer_funcs.C:202
 msgid "Could not read template"
 msgstr "Uleselig mal"
 
-#: src/buffer_funcs.C:449
+#: src/buffer_funcs.C:452
 msgid "\\arabic{enumi}."
 msgstr "\\arabic{enumi}."
 
-#: src/buffer_funcs.C:455
+#: src/buffer_funcs.C:458
 msgid "\\roman{enumiii}."
 msgstr "\\roman{enumiii}."
 
-#: src/buffer_funcs.C:458
+#: src/buffer_funcs.C:461
 msgid "\\Alph{enumiv}."
-msgstr "\\Alph{enumiv}."
-
-#: src/buffer_funcs.C:495
-#, c-format
-msgid "%1$s #:"
-msgstr "%1$s #:"
+msgstr "\\Alph{enumiv}."
 
-#: src/bufferlist.C:86 src/bufferlist.C:194
+#: src/bufferlist.C:110 src/bufferlist.C:218
 #, c-format
 msgid ""
 "The document %1$s has unsaved changes.\n"
@@ -9369,45 +9542,45 @@ msgstr ""
 "\n"
 "Vil du lagre dokumentet, eller forkaste endringene?"
 
-#: src/bufferlist.C:89 src/bufferlist.C:197 src/lyxfunc.C:675
+#: src/bufferlist.C:113 src/bufferlist.C:221 src/lyxfunc.C:725
 msgid "Save changed document?"
 msgstr "Lagre dokumentet?"
 
-#: src/bufferlist.C:90 src/bufferlist.C:198
+#: src/bufferlist.C:114 src/bufferlist.C:222
 msgid "&Discard"
 msgstr "&Forkast"
 
-#: src/bufferlist.C:318
+#: src/bufferlist.C:350
 #, c-format
 msgid "LyX: Attempting to save document %1$s"
 msgstr "LyX: Forsøker å lagre dokument %1$s"
 
-#: src/bufferlist.C:329 src/bufferlist.C:342 src/bufferlist.C:356
+#: src/bufferlist.C:361 src/bufferlist.C:374 src/bufferlist.C:388
 msgid "  Save seems successful. Phew."
 msgstr "  Lagring trolig en suksess. Puh."
 
-#: src/bufferlist.C:332 src/bufferlist.C:346
+#: src/bufferlist.C:364 src/bufferlist.C:378
 msgid "  Save failed! Trying..."
 msgstr "  Lagring feilet! Prøver..."
 
-#: src/bufferlist.C:359
+#: src/bufferlist.C:391
 msgid "  Save failed! Bummer. Document is lost."
 msgstr "  Lagring feilet! Æsj. Mistet dokumentet."
 
-#: src/bufferparams.C:433
+#: src/bufferparams.C:434
 #, c-format
 msgid "The document uses a missing TeX class \"%1$s\".\n"
 msgstr "Dokumentet har en ukjent TeX-klasse \"%1$s\".\n"
 
-#: src/bufferparams.C:435
+#: src/bufferparams.C:436
 msgid "Document class not available"
 msgstr "Dokumentklassen er ikke tilgjengelig"
 
-#: src/bufferparams.C:436
+#: src/bufferparams.C:437
 msgid "LyX will not be able to produce output."
 msgstr ""
 
-#: src/bufferview_funcs.C:308
+#: src/bufferview_funcs.C:307
 msgid "No more insets"
 msgstr "Ingen flere insets"
 
@@ -9432,65 +9605,70 @@ msgstr "Alle debug meldinger"
 msgid "Debugging `%1$s' (%2$s)"
 msgstr "Debugger `%1$s' (%2$s)"
 
-#: src/converter.C:323 src/converter.C:455 src/converter.C:479
-#: src/converter.C:518
+#: src/converter.C:333 src/converter.C:465 src/converter.C:488
+#: src/converter.C:533
 msgid "Cannot convert file"
 msgstr "Kan ikke konvertere fil"
 
-#: src/converter.C:324
+#: src/converter.C:334
 #, c-format
 msgid ""
 "No information for converting %1$s format files to %2$s.\n"
 "Define a converter in the preferences."
 msgstr ""
 
-#: src/converter.C:410 src/format.C:319 src/format.C:378
+#: src/converter.C:420 src/format.C:320 src/format.C:379
 msgid "Executing command: "
 msgstr "Eksekverer kommando: "
 
-#: src/converter.C:450
+#: src/converter.C:460
 msgid "Build errors"
 msgstr "'Build'-feil"
 
-#: src/converter.C:451
+#: src/converter.C:461
 msgid "There were errors during the build process."
 msgstr "Det ble rapportert feil under kjøring av 'Build' prosessen."
 
-#: src/converter.C:456 src/format.C:326 src/format.C:385
+#: src/converter.C:466 src/format.C:327 src/format.C:386
 #, c-format
 msgid "An error occurred whilst running %1$s"
 msgstr "Det skjedde en feil ved kjøring av %1$s"
 
-#: src/converter.C:480 src/converter.C:521
-#, c-format
-msgid "Could not move a temporary file from %1$s to %2$s."
+#: src/converter.C:489
+#, fuzzy, c-format
+msgid "Could not move a temporary directory from %1$s to %2$s."
 msgstr "Fikk ikke flyttet midlertidig fil fra %1$s til %2$s."
 
-#: src/converter.C:520
+#: src/converter.C:535
 #, c-format
 msgid "Could not copy a temporary file from %1$s to %2$s."
 msgstr "Fikk ikke kopiert midlertidig fil fra %1$s til %2$s."
 
-#: src/converter.C:589
+#: src/converter.C:536
+#, c-format
+msgid "Could not move a temporary file from %1$s to %2$s."
+msgstr "Fikk ikke flyttet midlertidig fil fra %1$s til %2$s."
+
+#: src/converter.C:594
 msgid "Running LaTeX..."
 msgstr "Kjører LaTeX..."
 
-#: src/converter.C:607
+#: src/converter.C:612
 #, c-format
 msgid ""
 "LaTeX did not run successfully. Additionally, LyX could not locate the LaTeX "
 "log %1$s."
 msgstr ""
 
-#: src/converter.C:610
+#: src/converter.C:615
 msgid "LaTeX failed"
 msgstr "LaTeX mislyktes"
 
-#: src/converter.C:612
+#: src/converter.C:617
 msgid "Output is empty"
 msgstr "Ingen utdata"
 
-#: src/converter.C:613
+#: src/converter.C:618
 msgid "An empty output file was generated."
 msgstr "Det ble produsert en tom fil"
 
@@ -9590,7 +9768,7 @@ msgstr ""
 msgid "RowPainter profiling"
 msgstr ""
 
-#: src/exporter.C:81
+#: src/exporter.C:82
 #, c-format
 msgid ""
 "The file %1$s already exists.\n"
@@ -9601,63 +9779,63 @@ msgstr ""
 "\n"
 "Vil du skrive over den?"
 
-#: src/exporter.C:84
+#: src/exporter.C:85
 msgid "Over-write file?"
 msgstr "Overskrive filen?"
 
-#: src/exporter.C:86 src/lyx_cb.C:168 src/lyxfunc.C:1955
+#: src/exporter.C:87 src/lyx_cb.C:168 src/lyxfunc.C:2018
 msgid "&Over-write"
 msgstr "Overskrive"
 
-#: src/exporter.C:86
+#: src/exporter.C:87
 msgid "Over-write &all"
 msgstr "Overskrive &alt"
 
-#: src/exporter.C:87
+#: src/exporter.C:88
 msgid "&Cancel export"
 msgstr "&Avbryt eksport"
 
-#: src/exporter.C:136
+#: src/exporter.C:137
 msgid "Couldn't copy file"
 msgstr "Fikk ikke kopiert fil"
 
-#: src/exporter.C:137
+#: src/exporter.C:138
 #, c-format
 msgid "Copying %1$s to %2$s failed."
 msgstr "Mislyktes i å kopiere %1$s til %2$s."
 
-#: src/exporter.C:175
+#: src/exporter.C:177
 msgid "Couldn't export file"
 msgstr "Kunne ikke eksportere fil"
 
-#: src/exporter.C:176
+#: src/exporter.C:178
 #, c-format
 msgid "No information for exporting the format %1$s."
 msgstr "Ingen informasjon om å eksportere formatet %1$s."
 
-#: src/exporter.C:210
+#: src/exporter.C:212
 msgid "File name error"
 msgstr "Feil med filnavnet"
 
-#: src/exporter.C:211
+#: src/exporter.C:213
 msgid "The directory path to the document cannot contain spaces."
 msgstr "Stien til dokumentet kan ikke inneholde mellomrom."
 
-#: src/exporter.C:247
+#: src/exporter.C:251
 msgid "Document export cancelled."
 msgstr "Avbrøt eksport av dokumentet."
 
-#: src/exporter.C:253
+#: src/exporter.C:257
 #, 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:259
+#: src/exporter.C:263
 #, c-format
 msgid "Document exported as %1$s"
 msgstr "Dokumentet eksportert som %1$s"
 
-#: src/format.C:269 src/format.C:282 src/format.C:292 src/format.C:325
+#: src/format.C:269 src/format.C:282 src/format.C:292 src/format.C:326
 msgid "Cannot view file"
 msgstr "Kan ikke vise fil"
 
@@ -9676,7 +9854,7 @@ msgstr "Ingen informasjon om visning av %1$s"
 msgid "Auto-view file %1$s failed"
 msgstr "Autolagring feilet!"
 
-#: src/format.C:339 src/format.C:352 src/format.C:362 src/format.C:384
+#: src/format.C:339 src/format.C:352 src/format.C:362 src/format.C:385
 msgid "Cannot edit file"
 msgstr "Kan ikke redigere filen"
 
@@ -9690,59 +9868,50 @@ msgstr "Ingen informasjon om 
 msgid "Auto-edit file %1$s failed"
 msgstr ""
 
-#: src/frontends/LyXView.C:368
+#: src/frontends/LyXView.C:411
 msgid " (changed)"
 msgstr " (endret)"
 
-#: src/frontends/LyXView.C:372
+#: src/frontends/LyXView.C:415
 msgid " (read only)"
 msgstr " (skrivebeskyttet)"
 
-#: src/frontends/WorkArea.C:224
+#: src/frontends/WorkArea.C:227
 msgid "Formatting document..."
 msgstr "Formaterer dokument..."
 
-#: src/frontends/controllers/ControlAboutlyx.C:57
+#: src/frontends/controllers/ControlAboutlyx.C:58
 msgid "ERROR: LyX wasn't able to read CREDITS file\n"
 msgstr "FEIL! LyX Kunne ikke lese filen med Kreditteringer\n"
 
-#: src/frontends/controllers/ControlAboutlyx.C:58
+#: src/frontends/controllers/ControlAboutlyx.C:59
 msgid "Please install correctly to estimate the great\n"
 msgstr "Vennligst installer korrekt, slik at du kan se\n"
 
-#: src/frontends/controllers/ControlAboutlyx.C:59
+#: src/frontends/controllers/ControlAboutlyx.C:60
 msgid "amount of work other people have done for the LyX project."
 msgstr "alt arbeidet som har blitt lagt ned i Lyx prosjektet."
 
-#: src/frontends/controllers/ControlAboutlyx.C:66
+#: src/frontends/controllers/ControlAboutlyx.C:67
+#, fuzzy
 msgid ""
 "LyX is Copyright (C) 1995 by Matthias Ettrich,\n"
-"1995-2001 LyX Team"
+"1995-2006 LyX Team"
 msgstr ""
 "LyX is Copyright (C) 1995 by Matthias Ettrich,\n"
 "1995-2001 LyX Team"
 
-#: src/frontends/controllers/ControlAboutlyx.C:72
-msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
-msgstr ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
-
-#: src/frontends/controllers/ControlAboutlyx.C:78
+#: src/frontends/controllers/ControlAboutlyx.C:73
+#: src/frontends/controllers/ControlAboutlyx.C:79
+#, fuzzy
 msgid ""
 "LyX is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
 "FOR A PARTICULAR PURPOSE.\n"
 "See the GNU General Public License for more details.\n"
 "You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
-"Ave, Cambridge, MA 02139, USA."
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 "LyX is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -9752,15 +9921,15 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
 "Ave, Cambridge, MA 02139, USA."
 
-#: src/frontends/controllers/ControlAboutlyx.C:86
+#: src/frontends/controllers/ControlAboutlyx.C:87
 msgid "LyX Version "
 msgstr "LyX Versjon "
 
-#: src/frontends/controllers/ControlAboutlyx.C:91
+#: src/frontends/controllers/ControlAboutlyx.C:92
 msgid "Library directory: "
 msgstr "Library directory: "
 
-#: src/frontends/controllers/ControlAboutlyx.C:94
+#: src/frontends/controllers/ControlAboutlyx.C:95
 msgid "User directory: "
 msgstr "Bruker folder: "
 
@@ -9780,62 +9949,62 @@ msgstr "BibTeX stiler (*.bst"
 msgid "Select a BibTeX style"
 msgstr "Velg en BibTeX stil"
 
-#: src/frontends/controllers/ControlBox.C:63
+#: src/frontends/controllers/ControlBox.C:62
 msgid "No frame drawn"
 msgstr "Uten ramme"
 
-#: src/frontends/controllers/ControlBox.C:64
+#: src/frontends/controllers/ControlBox.C:63
 msgid "Rectangular box"
 msgstr "Rektangulær"
 
-#: src/frontends/controllers/ControlBox.C:65
+#: src/frontends/controllers/ControlBox.C:64
 msgid "Oval box, thin"
 msgstr "Avrundet, tynn"
 
-#: src/frontends/controllers/ControlBox.C:66
+#: src/frontends/controllers/ControlBox.C:65
 msgid "Oval box, thick"
 msgstr "Avrundet, tykk"
 
-#: src/frontends/controllers/ControlBox.C:67
+#: src/frontends/controllers/ControlBox.C:66
 msgid "Shadow box"
 msgstr "Med skygge"
 
-#: src/frontends/controllers/ControlBox.C:68
+#: src/frontends/controllers/ControlBox.C:67
 msgid "Double box"
 msgstr "Dobbel boks"
 
-#: src/frontends/controllers/ControlBox.C:83 src/frontends/qt4/QBox.C:188
+#: src/frontends/controllers/ControlBox.C:81 src/frontends/qt4/QBox.C:188
 #: src/frontends/qt4/QBox.C:222
 msgid "Depth"
 msgstr "Dybde"
 
-#: src/frontends/controllers/ControlBox.C:84 src/frontends/qt4/QBox.C:191
+#: src/frontends/controllers/ControlBox.C:82 src/frontends/qt4/QBox.C:191
 #: src/frontends/qt4/QBox.C:225 src/frontends/qt4/QBox.C:258
 #: src/frontends/qt4/QBoxDialog.C:107
 msgid "Total Height"
 msgstr "Total høyde"
 
-#: src/frontends/controllers/ControlDocument.C:44
+#: src/frontends/controllers/ControlDocument.C:49
 #: src/frontends/controllers/character.C:33 src/lyxfont.C:53
 msgid "Roman"
 msgstr "Roman"
 
-#: src/frontends/controllers/ControlDocument.C:44
+#: src/frontends/controllers/ControlDocument.C:49
 #: src/frontends/controllers/character.C:37 src/lyxfont.C:53
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: src/frontends/controllers/ControlDocument.C:44
+#: src/frontends/controllers/ControlDocument.C:49
 #: src/frontends/controllers/character.C:41 src/lyxfont.C:53
 msgid "Typewriter"
 msgstr "Skrivemaskin"
 
-#: src/frontends/controllers/ControlErrorList.C:51
+#: src/frontends/controllers/ControlErrorList.C:56
 #, c-format
 msgid "%1$s Errors (%2$s)"
 msgstr "%1$s feil (%2$s)"
 
-#: src/frontends/controllers/ControlExternal.C:162
+#: src/frontends/controllers/ControlExternal.C:163
 msgid "Select external file"
 msgstr "Velg ekstern fil"
 
@@ -9888,79 +10057,79 @@ msgstr "Grunnlinje, h
 msgid "Select graphics file"
 msgstr "Velg grafikkfil"
 
-#: src/frontends/controllers/ControlGraphics.C:94
+#: src/frontends/controllers/ControlGraphics.C:95
 msgid "Clipart|#C#c"
 msgstr ""
 
-#: src/frontends/controllers/ControlInclude.C:77
+#: src/frontends/controllers/ControlInclude.C:78
 msgid "Select document to include"
 msgstr "Velg dokument som skal settes inn"
 
-#: src/frontends/controllers/ControlInclude.C:84
+#: src/frontends/controllers/ControlInclude.C:85
 msgid "LaTeX/LyX Documents (*.tex *.lyx)"
 msgstr "LaTeX/LyX dokumenter (*.tex *.lyx)"
 
-#: src/frontends/controllers/ControlLog.C:80
+#: src/frontends/controllers/ControlLog.C:81
 msgid "LaTeX Log"
 msgstr "LaTeX logg"
 
-#: src/frontends/controllers/ControlLog.C:83
+#: src/frontends/controllers/ControlLog.C:84
 msgid "Literate Programming Build Log"
 msgstr ""
 
-#: src/frontends/controllers/ControlLog.C:86
+#: src/frontends/controllers/ControlLog.C:87
 msgid "lyx2lyx Error Log"
 msgstr "lyx2lyx feil-logg"
 
-#: src/frontends/controllers/ControlLog.C:89
+#: src/frontends/controllers/ControlLog.C:90
 msgid "Version Control Log"
 msgstr "Versjonskontroll-logg"
 
-#: src/frontends/controllers/ControlLog.C:112
+#: src/frontends/controllers/ControlLog.C:116
 msgid "No LaTeX log file found."
 msgstr "Ingen LaTeX logfil funnet."
 
-#: src/frontends/controllers/ControlLog.C:115
+#: src/frontends/controllers/ControlLog.C:119
 msgid "No literate programming build log file found."
 msgstr "Ingen bygge-logfil for \"literate programming\" funnet."
 
-#: src/frontends/controllers/ControlLog.C:118
+#: src/frontends/controllers/ControlLog.C:122
 msgid "No lyx2lyx error log file found."
 msgstr "Fant ikke feillogg fra lyx2lyx"
 
-#: src/frontends/controllers/ControlLog.C:121
+#: src/frontends/controllers/ControlLog.C:125
 msgid "No version control log file found."
 msgstr "Ingen logfil for versjonskontroll funnet."
 
-#: src/frontends/controllers/ControlPrefs.C:111
+#: src/frontends/controllers/ControlPrefs.C:112
 msgid "Choose bind file"
 msgstr "Velg hurtigtastfil"
 
-#: src/frontends/controllers/ControlPrefs.C:112
+#: src/frontends/controllers/ControlPrefs.C:113
 msgid "LyX bind files (*.bind)"
 msgstr "LyX hurtigtastfiler (*.bind)"
 
-#: src/frontends/controllers/ControlPrefs.C:119
+#: src/frontends/controllers/ControlPrefs.C:120
 msgid "Choose UI file"
 msgstr "Velg brukergrensesnittfil"
 
-#: src/frontends/controllers/ControlPrefs.C:120
+#: src/frontends/controllers/ControlPrefs.C:121
 msgid "LyX UI files (*.ui)"
 msgstr "LyX brukergrensesnittfiler (*.ui)"
 
-#: src/frontends/controllers/ControlPrefs.C:127
+#: src/frontends/controllers/ControlPrefs.C:128
 msgid "Choose keyboard map"
 msgstr "Velg tastaturoppsett"
 
-#: src/frontends/controllers/ControlPrefs.C:128
+#: src/frontends/controllers/ControlPrefs.C:129
 msgid "LyX keyboard maps (*.kmap)"
 msgstr "Lyx tastaturoppsettfiler (*.kmap)"
 
-#: src/frontends/controllers/ControlPrefs.C:135
+#: src/frontends/controllers/ControlPrefs.C:136
 msgid "Choose personal dictionary"
 msgstr "Velg personlig ordliste"
 
-#: src/frontends/controllers/ControlPrefs.C:136
+#: src/frontends/controllers/ControlPrefs.C:137
 msgid "*.ispell"
 msgstr "*.ispell"
 
@@ -9972,17 +10141,17 @@ msgstr "Skriv til fil"
 msgid "PostScript files (*.ps)"
 msgstr "PostScript filer (*.ps)"
 
-#: src/frontends/controllers/ControlSpellchecker.C:114
+#: src/frontends/controllers/ControlSpellchecker.C:117
 #, fuzzy
 msgid "Spellchecker error"
 msgstr "Stavekontroll"
 
-#: src/frontends/controllers/ControlSpellchecker.C:115
+#: src/frontends/controllers/ControlSpellchecker.C:118
 #, fuzzy
 msgid "The spellchecker could not be started\n"
 msgstr "Fikk ikke i gang stavekontrollen"
 
-#: src/frontends/controllers/ControlSpellchecker.C:271
+#: src/frontends/controllers/ControlSpellchecker.C:276
 #, fuzzy
 msgid ""
 "The spellchecker has died for some reason.\n"
@@ -9991,35 +10160,35 @@ msgstr ""
 "Stavekontrolleren kjører ikke.\n"
 "Det er mulig den har blitt drept."
 
-#: src/frontends/controllers/ControlSpellchecker.C:274
+#: src/frontends/controllers/ControlSpellchecker.C:279
 #, fuzzy
 msgid "The spellchecker has failed.\n"
 msgstr "Stavekontrollen mislyktes"
 
-#: src/frontends/controllers/ControlSpellchecker.C:278
+#: src/frontends/controllers/ControlSpellchecker.C:283
 #, fuzzy
 msgid "The spellchecker has failed"
 msgstr "Stavekontrollen mislyktes"
 
-#: src/frontends/controllers/ControlSpellchecker.C:293
+#: src/frontends/controllers/ControlSpellchecker.C:297
 #, c-format
 msgid "%1$d words checked."
 msgstr "%1$d ord kontrollert."
 
-#: src/frontends/controllers/ControlSpellchecker.C:295
+#: src/frontends/controllers/ControlSpellchecker.C:299
 msgid "One word checked."
 msgstr "Ett ord kontrollert."
 
-#: src/frontends/controllers/ControlSpellchecker.C:298
+#: src/frontends/controllers/ControlSpellchecker.C:302
 #, fuzzy
 msgid "Spelling check completed"
 msgstr "Stavekontroll fullført!"
 
-#: src/frontends/controllers/ControlToc.C:91 src/insets/insettoc.C:44
+#: src/frontends/controllers/ControlToc.C:99 src/insets/insettoc.C:45
 msgid "Table of Contents"
 msgstr "Innholdsfortegnelse"
 
-#: src/frontends/controllers/biblio.C:223
+#: src/frontends/controllers/biblio.C:224
 #, c-format
 msgid "%1$s and %2$s"
 msgstr "%1$s og %2$s"
@@ -10033,7 +10202,7 @@ msgstr "%1$s m.fl."
 msgid "No year"
 msgstr "Uten årstall"
 
-#: src/frontends/controllers/biblio.C:802
+#: src/frontends/controllers/biblio.C:804
 msgid "before"
 msgstr "før"
 
@@ -10145,25 +10314,24 @@ msgstr "Systemfiler|#S#s"
 msgid "User files|#U#u"
 msgstr "Brukerfiler|#U#u"
 
-#: src/frontends/controllers/tex_helpers.C:64
+#: src/frontends/controllers/tex_helpers.C:65
 #, fuzzy
 msgid "Could not update TeX information"
 msgstr "Ikke mer \"Gjør om\" informasjon"
 
-#: src/frontends/controllers/tex_helpers.C:65
+#: src/frontends/controllers/tex_helpers.C:66
 #, fuzzy, c-format
 msgid "The script `%s' failed."
 msgstr "Stavekontrollen mislyktes"
 
-#: src/frontends/qt4/Alert_pimpl.C:58 src/frontends/qt4/Alert_pimpl.C:80
-#: src/frontends/qt4/Alert_pimpl.C:91 src/frontends/qt4/Alert_pimpl.C:101
-#: src/frontends/qt4/Alert_pimpl.C:112
+#: src/frontends/qt4/Alert_pimpl.C:58 src/frontends/qt4/Alert_pimpl.C:85
+#: src/frontends/qt4/Alert_pimpl.C:96 src/frontends/qt4/Alert_pimpl.C:106
+#: src/frontends/qt4/Alert_pimpl.C:117
 #, c-format
 msgid "LyX: %1$s"
 msgstr "LyX: %1$s"
 
 #: src/frontends/qt4/BulletsModule.C:47
-#, fuzzy
 msgid "Maths"
 msgstr "Matte"
 
@@ -10183,22 +10351,27 @@ msgstr "Dings 3"
 msgid "Dings 4"
 msgstr "Dings 4"
 
-#: src/frontends/qt4/Dialogs.C:219
+#: src/frontends/qt4/Dialogs.C:220
 msgid "Index Entry"
 msgstr "Nøkkelord"
 
-#: src/frontends/qt4/Dialogs.C:225
+#: src/frontends/qt4/Dialogs.C:230
 msgid "Label"
 msgstr "Merke"
 
-#: src/frontends/qt4/FileDialog.C:155
+#: src/frontends/qt4/FileDialog.C:159
 msgid "Directories"
 msgstr "Foldere"
 
-#: src/frontends/qt4/GuiView.C:448
+#: src/frontends/qt4/GuiView.C:669
 msgid "LyX"
 msgstr "LyX"
 
+#: src/frontends/qt4/GuiWorkArea.C:455
+#, fuzzy
+msgid "unknown version"
+msgstr "Ukjent operasjon"
+
 #: src/frontends/qt4/QBibitem.C:31
 msgid "Bibliography Entry Settings"
 msgstr "Instillinger for Referanse-elementer"
@@ -10211,25 +10384,25 @@ msgstr "BibTeX referanseliste"
 msgid "Box Settings"
 msgstr "Boksinnstillinger"
 
-#: src/frontends/qt4/QBranch.C:35
+#: src/frontends/qt4/QBranch.C:33
 msgid "Branch Settings"
 msgstr "Gren-innstillinger"
 
-#: src/frontends/qt4/QBranches.C:43
+#: src/frontends/qt4/QBranches.C:42
 #, fuzzy
 msgid "Branch"
 msgstr "Dokumentgren|D"
 
-#: src/frontends/qt4/QBranches.C:44
+#: src/frontends/qt4/QBranches.C:43
 msgid "Activated"
 msgstr "Aktivert"
 
-#: src/frontends/qt4/QBranches.C:72 src/frontends/qt4/QBranches.C:139
-#: src/frontends/qt4/QDocumentDialog.C:623
+#: src/frontends/qt4/QBranches.C:73 src/frontends/qt4/QBranches.C:145
+#: src/frontends/qt4/QDocumentDialog.C:618
 msgid "Yes"
 msgstr "Ja"
 
-#: src/frontends/qt4/QBranches.C:72 src/frontends/qt4/QDocumentDialog.C:622
+#: src/frontends/qt4/QBranches.C:73 src/frontends/qt4/QDocumentDialog.C:617
 msgid "No"
 msgstr "Nei"
 
@@ -10255,32 +10428,29 @@ msgstr "Endring utf
 msgid "Text Style"
 msgstr "Tekststil"
 
-#: src/frontends/qt4/QCommandBuffer.C:88
+#: src/frontends/qt4/QCommandBuffer.C:87
 msgid "Previous command"
 msgstr "Forrige kommando"
 
-#: src/frontends/qt4/QCommandBuffer.C:91
+#: src/frontends/qt4/QCommandBuffer.C:90
 msgid "Next command"
 msgstr "Neste kommando"
 
 #: src/frontends/qt4/QDelimiterDialog.C:48
-#, fuzzy
-msgid "big size"
-msgstr "stor avstand"
+msgid "big[[delimiter size]]"
+msgstr ""
 
 #: src/frontends/qt4/QDelimiterDialog.C:48
-#, fuzzy
-msgid "Big size"
-msgstr "stor avstand"
+msgid "Big[[delimiter size]]"
+msgstr ""
 
 #: src/frontends/qt4/QDelimiterDialog.C:49
-msgid "bigg size"
+msgid "bigg[[delimiter size]]"
 msgstr ""
 
 #: src/frontends/qt4/QDelimiterDialog.C:49
-#, fuzzy
-msgid "Bigg size"
-msgstr "stor avstand"
+msgid "Bigg[[delimiter size]]"
+msgstr ""
 
 #: src/frontends/qt4/QDelimiterDialog.C:98
 msgid "LyX: Delimiters"
@@ -10293,157 +10463,162 @@ msgstr "(Ingen)"
 
 #: src/frontends/qt4/QDelimiterDialog.C:110
 #, fuzzy
-msgid "Variable size"
+msgid "Variable"
 msgstr "tabell-linje"
 
 #: src/frontends/qt4/QDocument.C:48
 msgid "Document Settings"
 msgstr "Dokumentinnstillinger"
 
-#: src/frontends/qt4/QDocumentDialog.C:122
+#: src/frontends/qt4/QDocumentDialog.C:109
 msgid "Length"
 msgstr "Lengde"
 
-#: src/frontends/qt4/QDocumentDialog.C:128 src/text.C:2429
+#: src/frontends/qt4/QDocumentDialog.C:115 src/text.C:1603
 msgid "OneHalf"
 msgstr "Halvannen"
 
-#: src/frontends/qt4/QDocumentDialog.C:158
-#: src/frontends/qt4/QDocumentDialog.C:164
-#: src/frontends/qt4/QDocumentDialog.C:170
+#: src/frontends/qt4/QDocumentDialog.C:145
+#: src/frontends/qt4/QDocumentDialog.C:151
+#: src/frontends/qt4/QDocumentDialog.C:157
 msgid " (not installed)"
 msgstr ""
 
-#: src/frontends/qt4/QDocumentDialog.C:174
-#: src/frontends/qt4/QDocumentDialog.C:200
-#: src/frontends/qt4/QDocumentDialog.C:532
+#: src/frontends/qt4/QDocumentDialog.C:161
+#: src/frontends/qt4/QDocumentDialog.C:187
+#: src/frontends/qt4/QDocumentDialog.C:527
 msgid "default"
 msgstr "standard"
 
-#: src/frontends/qt4/QDocumentDialog.C:175
+#: src/frontends/qt4/QDocumentDialog.C:162
 msgid "10"
 msgstr "10"
 
-#: src/frontends/qt4/QDocumentDialog.C:176
+#: src/frontends/qt4/QDocumentDialog.C:163
 msgid "11"
 msgstr "11"
 
-#: src/frontends/qt4/QDocumentDialog.C:177
+#: src/frontends/qt4/QDocumentDialog.C:164
 msgid "12"
 msgstr "12"
 
-#: src/frontends/qt4/QDocumentDialog.C:201
+#: src/frontends/qt4/QDocumentDialog.C:188
 msgid "empty"
 msgstr "tom"
 
-#: src/frontends/qt4/QDocumentDialog.C:202
+#: src/frontends/qt4/QDocumentDialog.C:189
 msgid "plain"
 msgstr "enkel"
 
-#: src/frontends/qt4/QDocumentDialog.C:203
+#: src/frontends/qt4/QDocumentDialog.C:190
 msgid "headings"
 msgstr ""
 
-#: src/frontends/qt4/QDocumentDialog.C:204
+#: src/frontends/qt4/QDocumentDialog.C:191
 msgid "fancy"
 msgstr ""
 
-#: src/frontends/qt4/QDocumentDialog.C:220
+#: src/frontends/qt4/QDocumentDialog.C:207
 msgid "B3"
 msgstr "B3"
 
-#: src/frontends/qt4/QDocumentDialog.C:221
+#: src/frontends/qt4/QDocumentDialog.C:208
 msgid "B4"
 msgstr "B4"
 
-#: src/frontends/qt4/QDocumentDialog.C:308
+#: src/frontends/qt4/QDocumentDialog.C:292
+#, fuzzy
+msgid "LaTeX default"
+msgstr "LaTeX mislyktes"
+
+#: src/frontends/qt4/QDocumentDialog.C:298
 msgid "``text''"
 msgstr "``tekst''"
 
-#: src/frontends/qt4/QDocumentDialog.C:309
+#: src/frontends/qt4/QDocumentDialog.C:299
 msgid "''text''"
 msgstr "''tekst''"
 
-#: src/frontends/qt4/QDocumentDialog.C:310
+#: src/frontends/qt4/QDocumentDialog.C:300
 msgid ",,text``"
 msgstr ",,tekst``"
 
-#: src/frontends/qt4/QDocumentDialog.C:311
+#: src/frontends/qt4/QDocumentDialog.C:301
 msgid ",,text''"
 msgstr ",,tekst''"
 
-#: src/frontends/qt4/QDocumentDialog.C:312
+#: src/frontends/qt4/QDocumentDialog.C:302
 msgid "<<text>>"
 msgstr "<<tekst>>"
 
-#: src/frontends/qt4/QDocumentDialog.C:313
+#: src/frontends/qt4/QDocumentDialog.C:303
 msgid ">>text<<"
 msgstr ">>tekst<<"
 
-#: src/frontends/qt4/QDocumentDialog.C:325
+#: src/frontends/qt4/QDocumentDialog.C:315
 msgid "Numbered"
 msgstr "Nummerert"
 
-#: src/frontends/qt4/QDocumentDialog.C:326
+#: src/frontends/qt4/QDocumentDialog.C:316
 msgid "Appears in TOC"
 msgstr "I innholdsliste"
 
-#: src/frontends/qt4/QDocumentDialog.C:339
+#: src/frontends/qt4/QDocumentDialog.C:329
 msgid "Author-year"
 msgstr "Forfatter-år"
 
-#: src/frontends/qt4/QDocumentDialog.C:340
+#: src/frontends/qt4/QDocumentDialog.C:330
 msgid "Numerical"
 msgstr "Numerisk"
 
-#: src/frontends/qt4/QDocumentDialog.C:370
+#: src/frontends/qt4/QDocumentDialog.C:362
 #, c-format
 msgid "Unavailable: %1$s"
 msgstr "Utilgjengelig: %1$s"
 
-#: src/frontends/qt4/QDocumentDialog.C:395
-#: src/frontends/qt4/QDocumentDialog.C:408
+#: src/frontends/qt4/QDocumentDialog.C:385
+#: src/frontends/qt4/QDocumentDialog.C:398
 msgid "Document Class"
 msgstr "Dokumentklasse"
 
-#: src/frontends/qt4/QDocumentDialog.C:396
+#: src/frontends/qt4/QDocumentDialog.C:386
 msgid "Fonts"
 msgstr "Fonter"
 
-#: src/frontends/qt4/QDocumentDialog.C:397
+#: src/frontends/qt4/QDocumentDialog.C:387
 msgid "Text Layout"
 msgstr "Tekststil"
 
-#: src/frontends/qt4/QDocumentDialog.C:398
+#: src/frontends/qt4/QDocumentDialog.C:388
 msgid "Page Layout"
 msgstr "Sidestil"
 
-#: src/frontends/qt4/QDocumentDialog.C:399
+#: src/frontends/qt4/QDocumentDialog.C:389
 msgid "Page Margins"
 msgstr "Tekstmarger"
 
-#: src/frontends/qt4/QDocumentDialog.C:401
+#: src/frontends/qt4/QDocumentDialog.C:391
 msgid "Numbering & TOC"
 msgstr "Seksjonsnumre"
 
-#: src/frontends/qt4/QDocumentDialog.C:403
+#: src/frontends/qt4/QDocumentDialog.C:393
 msgid "Math Options"
 msgstr "Matte-innstillinger"
 
-#: src/frontends/qt4/QDocumentDialog.C:404
+#: src/frontends/qt4/QDocumentDialog.C:394
 msgid "Float Placement"
 msgstr "\"Float\"-plassering"
 
-#: src/frontends/qt4/QDocumentDialog.C:405
+#: src/frontends/qt4/QDocumentDialog.C:395
 msgid "Bullets"
 msgstr "Bomber"
 
-#: src/frontends/qt4/QDocumentDialog.C:406
+#: src/frontends/qt4/QDocumentDialog.C:396
 msgid "Branches"
 msgstr "Dokumentgrener"
 
-#: src/frontends/qt4/QDocumentDialog.C:407
-#: src/frontends/qt4/QDocumentDialog.C:419
+#: src/frontends/qt4/QDocumentDialog.C:397
+#: src/frontends/qt4/QDocumentDialog.C:414
 msgid "LaTeX Preamble"
 msgstr ""
 
@@ -10452,11 +10627,11 @@ msgstr ""
 msgid "TeX Code Settings"
 msgstr "LaTeX innstillinger"
 
-#: src/frontends/qt4/QExternal.C:279
+#: src/frontends/qt4/QExternal.C:282
 msgid "External Material"
 msgstr "Eksternt materiale"
 
-#: src/frontends/qt4/QExternal.C:339 src/frontends/qt4/QGraphics.C:252
+#: src/frontends/qt4/QExternal.C:342
 msgid "Scale%"
 msgstr "Skaler%"
 
@@ -10464,11 +10639,11 @@ msgstr "Skaler%"
 msgid "Float Settings"
 msgstr "\"Float\" innstillinger"
 
-#: src/frontends/qt4/QGraphics.C:59 src/frontends/qt4/QPrefsDialog.C:591
+#: src/frontends/qt4/QGraphics.C:62 src/frontends/qt4/QPrefsDialog.C:575
 msgid "Graphics"
 msgstr "Grafikk"
 
-#: src/frontends/qt4/QInclude.C:38
+#: src/frontends/qt4/QInclude.C:42
 msgid "Child Document"
 msgstr "Underdokument"
 
@@ -10485,140 +10660,140 @@ msgstr "Matte, matrise"
 msgid "Math Delimiter"
 msgstr "Parenteser og klammer"
 
-#: src/frontends/qt4/QMathDialog.C:109
+#: src/frontends/qt4/QMathDialog.C:107
 msgid "LyX: Math Spacing"
 msgstr ""
 
-#: src/frontends/qt4/QMathDialog.C:111
+#: src/frontends/qt4/QMathDialog.C:109
 msgid "Thin space\t\\,"
 msgstr "Lite mellomrom\t\\,"
 
-#: src/frontends/qt4/QMathDialog.C:112
+#: src/frontends/qt4/QMathDialog.C:110
 msgid "Medium space\t\\:"
 msgstr "Medium mellomrom\t\\:"
 
-#: src/frontends/qt4/QMathDialog.C:113
+#: src/frontends/qt4/QMathDialog.C:111
 msgid "Thick space\t\\;"
 msgstr "Stort mellomrom\t\\;"
 
-#: src/frontends/qt4/QMathDialog.C:114
+#: src/frontends/qt4/QMathDialog.C:112
 msgid "Quadratin space\t\\quad"
 msgstr "Quad mellomrom\t\\quad"
 
-#: src/frontends/qt4/QMathDialog.C:115
+#: src/frontends/qt4/QMathDialog.C:113
 msgid "Double quadratin space\t\\qquad"
 msgstr "Dobbel quad mellomrom\t\\qquad"
 
-#: src/frontends/qt4/QMathDialog.C:116
+#: src/frontends/qt4/QMathDialog.C:114
 msgid "Negative space\t\\!"
 msgstr "Negativt mellomrom\t\\!"
 
-#: src/frontends/qt4/QMathDialog.C:120
+#: src/frontends/qt4/QMathDialog.C:118
 msgid "LyX: Math Roots"
 msgstr ""
 
-#: src/frontends/qt4/QMathDialog.C:122
+#: src/frontends/qt4/QMathDialog.C:120
 msgid "Square root\t\\sqrt"
 msgstr "Kvadratrot\t\\sqrt"
 
-#: src/frontends/qt4/QMathDialog.C:123
+#: src/frontends/qt4/QMathDialog.C:121
 msgid "Cube root\t\\root"
 msgstr "Kubikkrot\t\\root"
 
-#: src/frontends/qt4/QMathDialog.C:126
+#: src/frontends/qt4/QMathDialog.C:124
 msgid "Other root\t\\root"
 msgstr "Andre røtter\t\\root"
 
-#: src/frontends/qt4/QMathDialog.C:130
+#: src/frontends/qt4/QMathDialog.C:128
 msgid "LyX: Math Styles"
 msgstr "LyX: Mattestil"
 
-#: src/frontends/qt4/QMathDialog.C:132
+#: src/frontends/qt4/QMathDialog.C:130
 msgid "Display style\t\\displaystyle"
 msgstr "Fremhevet\t\\displaystyle"
 
-#: src/frontends/qt4/QMathDialog.C:133
+#: src/frontends/qt4/QMathDialog.C:131
 msgid "Normal text style\t\\textstyle"
 msgstr "Normal tekststil\t\\textstyle"
 
-#: src/frontends/qt4/QMathDialog.C:134
+#: src/frontends/qt4/QMathDialog.C:132
 msgid "Script (small) style\t\\scriptstyle"
 msgstr "Script (liten)\t\\scriptstyle"
 
-#: src/frontends/qt4/QMathDialog.C:135
+#: src/frontends/qt4/QMathDialog.C:133
 msgid "Scriptscript (smaller) style\t\\scriptscriptstyle"
 msgstr "Scriptscript (mindre)\t\\scriptscriptstyle"
 
-#: src/frontends/qt4/QMathDialog.C:139
+#: src/frontends/qt4/QMathDialog.C:137
 msgid "LyX: Fractions"
 msgstr "LyX: Brøker"
 
-#: src/frontends/qt4/QMathDialog.C:141
+#: src/frontends/qt4/QMathDialog.C:139
 msgid "Standard\t\\frac"
 msgstr "Standard\t\\frac"
 
-#: src/frontends/qt4/QMathDialog.C:142
+#: src/frontends/qt4/QMathDialog.C:140
 #, fuzzy
 msgid "No hor. line\t\\atop"
 msgstr "Ingen flere insets"
 
-#: src/frontends/qt4/QMathDialog.C:143
+#: src/frontends/qt4/QMathDialog.C:141
 msgid "Nice\t\\nicefrac"
 msgstr ""
 
-#: src/frontends/qt4/QMathDialog.C:144
+#: src/frontends/qt4/QMathDialog.C:142
 msgid "Text frac (amsmath)\t\\tfrac"
 msgstr ""
 
-#: src/frontends/qt4/QMathDialog.C:145
+#: src/frontends/qt4/QMathDialog.C:143
 msgid "Display frac (amsmath)\t\\dfrac"
 msgstr ""
 
-#: src/frontends/qt4/QMathDialog.C:146
+#: src/frontends/qt4/QMathDialog.C:144
 msgid "Binomial\t\\choose"
 msgstr ""
 
-#: src/frontends/qt4/QMathDialog.C:150
+#: src/frontends/qt4/QMathDialog.C:148
 msgid "LyX: Math Fonts"
 msgstr "LyX: Mattefonter"
 
-#: src/frontends/qt4/QMathDialog.C:152
+#: src/frontends/qt4/QMathDialog.C:150
 msgid "Roman\t\\mathrm"
 msgstr ""
 
-#: src/frontends/qt4/QMathDialog.C:153
+#: src/frontends/qt4/QMathDialog.C:151
 msgid "Bold\t\\mathbf"
 msgstr "Fet\t\\mathbf"
 
-#: src/frontends/qt4/QMathDialog.C:154
+#: src/frontends/qt4/QMathDialog.C:152
 msgid "Bold symbol\t\\boldsymbol"
 msgstr ""
 
-#: src/frontends/qt4/QMathDialog.C:155
+#: src/frontends/qt4/QMathDialog.C:153
 msgid "Sans serif\t\\mathsf"
 msgstr ""
 
-#: src/frontends/qt4/QMathDialog.C:156
+#: src/frontends/qt4/QMathDialog.C:154
 msgid "Italic\t\\mathit"
 msgstr "Kursiv\t\\mathit"
 
-#: src/frontends/qt4/QMathDialog.C:157
+#: src/frontends/qt4/QMathDialog.C:155
 msgid "Typewriter\t\\mathtt"
 msgstr "Skrivemaskin\t\\mathtt"
 
-#: src/frontends/qt4/QMathDialog.C:158
+#: src/frontends/qt4/QMathDialog.C:156
 msgid "Blackboard\t\\mathbb"
 msgstr ""
 
-#: src/frontends/qt4/QMathDialog.C:159
+#: src/frontends/qt4/QMathDialog.C:157
 msgid "Fraktur\t\\mathfrak"
 msgstr ""
 
-#: src/frontends/qt4/QMathDialog.C:160
+#: src/frontends/qt4/QMathDialog.C:158
 msgid "Calligraphic\t\\mathcal"
 msgstr ""
 
-#: src/frontends/qt4/QMathDialog.C:161
+#: src/frontends/qt4/QMathDialog.C:159
 msgid "Normal text mode\t\\textrm"
 msgstr "Normal tekstmodus\t\\textrm"
 
@@ -10634,7 +10809,7 @@ msgstr "Notisinnstillinger"
 msgid "Paragraph Settings"
 msgstr "Innstillinger for avsnitt"
 
-#: src/frontends/qt4/QParagraph.C:118 src/paragraph.C:618
+#: src/frontends/qt4/QParagraph.C:118 src/paragraph.C:625
 msgid "Senseless with this layout!"
 msgstr "Uten mening for denne stilen!"
 
@@ -10642,104 +10817,118 @@ msgstr "Uten mening for denne stilen!"
 msgid "Preferences"
 msgstr "Preferanser"
 
-#: src/frontends/qt4/QPrefsDialog.C:182
+#: src/frontends/qt4/QPrefsDialog.C:78
+msgid "Look and feel"
+msgstr ""
+
+#: src/frontends/qt4/QPrefsDialog.C:79
+#, fuzzy
+msgid "Language settings"
+msgstr "Avsnittinnstillinger"
+
+#: src/frontends/qt4/QPrefsDialog.C:80
+#, fuzzy
+msgid "Outputs"
+msgstr "Utdata"
+
+#: src/frontends/qt4/QPrefsDialog.C:174
 msgid "Plain text"
 msgstr "Ren tekst"
 
-#: src/frontends/qt4/QPrefsDialog.C:207
+#: src/frontends/qt4/QPrefsDialog.C:199
 msgid "Date format"
 msgstr "Datoformat"
 
-#: src/frontends/qt4/QPrefsDialog.C:228
+#: src/frontends/qt4/QPrefsDialog.C:220
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: src/frontends/qt4/QPrefsDialog.C:349
+#: src/frontends/qt4/QPrefsDialog.C:333
 msgid "Screen fonts"
 msgstr "Skjermfonter"
 
-#: src/frontends/qt4/QPrefsDialog.C:501
+#: src/frontends/qt4/QPrefsDialog.C:485
 msgid "Colors"
 msgstr "Farger"
 
-#: src/frontends/qt4/QPrefsDialog.C:570 src/frontends/qt4/QPrefsDialog.C:658
+#: src/frontends/qt4/QPrefsDialog.C:554 src/frontends/qt4/QPrefsDialog.C:642
 msgid "Paths"
 msgstr "Mapper"
 
-#: src/frontends/qt4/QPrefsDialog.C:708
+#: src/frontends/qt4/QPrefsDialog.C:693
 msgid "Select a document templates directory"
 msgstr "Velg folder for dokument maler"
 
-#: src/frontends/qt4/QPrefsDialog.C:718
+#: src/frontends/qt4/QPrefsDialog.C:703
 msgid "Select a temporary directory"
 msgstr "Velg en temporær folder"
 
-#: src/frontends/qt4/QPrefsDialog.C:728
+#: src/frontends/qt4/QPrefsDialog.C:713
 msgid "Select a backups directory"
 msgstr "Vel folder for sikkerhetskopier"
 
-#: src/frontends/qt4/QPrefsDialog.C:738
+#: src/frontends/qt4/QPrefsDialog.C:723
 msgid "Select a document directory"
 msgstr "Velg folder for dokumenter"
 
-#: src/frontends/qt4/QPrefsDialog.C:748
+#: src/frontends/qt4/QPrefsDialog.C:733
 msgid "Give a filename for the LyX server pipe"
 msgstr ""
 
-#: src/frontends/qt4/QPrefsDialog.C:755 src/frontends/qt4/QSpellchecker.C:34
+#: src/frontends/qt4/QPrefsDialog.C:740 src/frontends/qt4/QSpellchecker.C:34
 msgid "Spellchecker"
 msgstr "Stavekontroll"
 
-#: src/frontends/qt4/QPrefsDialog.C:777
+#: src/frontends/qt4/QPrefsDialog.C:762
 msgid "ispell"
 msgstr "ispell"
 
-#: src/frontends/qt4/QPrefsDialog.C:778
+#: src/frontends/qt4/QPrefsDialog.C:763
 msgid "aspell"
 msgstr "aspell"
 
-#: src/frontends/qt4/QPrefsDialog.C:779
+#: src/frontends/qt4/QPrefsDialog.C:764
 msgid "hspell"
 msgstr "hspell"
 
-#: src/frontends/qt4/QPrefsDialog.C:781
+#: src/frontends/qt4/QPrefsDialog.C:766
 msgid "pspell (library)"
 msgstr "pspell (bibliotek)"
 
-#: src/frontends/qt4/QPrefsDialog.C:784
+#: src/frontends/qt4/QPrefsDialog.C:769
 msgid "aspell (library)"
 msgstr "aspell (bibliotek)"
 
-#: src/frontends/qt4/QPrefsDialog.C:856
+#: src/frontends/qt4/QPrefsDialog.C:842
 msgid "Converters"
 msgstr "Konvertere"
 
-#: src/frontends/qt4/QPrefsDialog.C:1045
+#: src/frontends/qt4/QPrefsDialog.C:1004
 msgid "Copiers"
 msgstr "Kopi-programmer"
 
-#: src/frontends/qt4/QPrefsDialog.C:1289
+#: src/frontends/qt4/QPrefsDialog.C:1248
 msgid "File formats"
 msgstr "Filformater"
 
-#: src/frontends/qt4/QPrefsDialog.C:1517
+#: src/frontends/qt4/QPrefsDialog.C:1440
 #, fuzzy
 msgid "Format in use"
 msgstr "Formater"
 
-#: src/frontends/qt4/QPrefsDialog.C:1518
+#: src/frontends/qt4/QPrefsDialog.C:1441
 msgid "Cannot remove a Format used by a Converter. Remove the converter first."
 msgstr ""
 
-#: src/frontends/qt4/QPrefsDialog.C:1610
+#: src/frontends/qt4/QPrefsDialog.C:1532
 msgid "Printer"
 msgstr "Skriver"
 
-#: src/frontends/qt4/QPrefsDialog.C:1702 src/frontends/qt4/QPrefsDialog.C:1883
+#: src/frontends/qt4/QPrefsDialog.C:1624 src/frontends/qt4/QPrefsDialog.C:1807
 msgid "User interface"
 msgstr "Brukergrensesnitt"
 
-#: src/frontends/qt4/QPrefsDialog.C:1814
+#: src/frontends/qt4/QPrefsDialog.C:1737
 msgid "Identity"
 msgstr "Identitet"
 
@@ -10814,43 +11003,43 @@ msgid ""
 "characters:\n"
 msgstr ""
 
-#: src/importer.C:46
+#: src/importer.C:47
 #, c-format
 msgid "Importing %1$s..."
 msgstr "Importerer %1$s..."
 
-#: src/importer.C:64
+#: src/importer.C:68
 msgid "Couldn't import file"
 msgstr "Kan ikke importere fil"
 
-#: src/importer.C:65
+#: src/importer.C:69
 #, c-format
 msgid "No information for importing the format %1$s."
 msgstr "Ingen informasjon om importering fra %1$s"
 
-#: src/importer.C:91
+#: src/importer.C:95
 msgid "imported."
 msgstr "importert."
 
-#: src/insets/insetbase.C:247
+#: src/insets/insetbase.C:249
 msgid "Opened inset"
 msgstr "Åpnet inset"
 
-#: src/insets/insetbibtex.C:110
+#: src/insets/insetbibtex.C:107
 msgid "BibTeX Generated Bibliography"
 msgstr "BibTeX-genererte referanser"
 
-#: src/insets/insetbibtex.C:198 src/insets/insetbibtex.C:250
+#: src/insets/insetbibtex.C:202 src/insets/insetbibtex.C:255
 msgid "Export Warning!"
 msgstr ""
 
-#: src/insets/insetbibtex.C:199
+#: src/insets/insetbibtex.C:203
 msgid ""
 "There are spaces in the paths to your BibTeX databases.\n"
 "BibTeX will be unable to find them."
 msgstr ""
 
-#: src/insets/insetbibtex.C:251
+#: src/insets/insetbibtex.C:256
 msgid ""
 "There are spaces in the path to your BibTeX style file.\n"
 "BibTeX will be unable to find it."
@@ -10888,12 +11077,12 @@ msgstr "
 msgid "Opened Branch Inset"
 msgstr "Åpnet \"gren-inset\""
 
-#: src/insets/insetbranch.C:101
+#: src/insets/insetbranch.C:100
 msgid "Branch: "
 msgstr "Gren: "
 
 #: src/insets/insetbranch.C:107 src/insets/insetcharstyle.C:163
-#: src/insets/insetcharstyle.C:211
+#: src/insets/insetcharstyle.C:212
 msgid "Undef: "
 msgstr ""
 
@@ -10916,25 +11105,25 @@ msgstr "
 msgid "Opened ERT Inset"
 msgstr "Åpnet ERT inset"
 
-#: src/insets/insetert.C:386
+#: src/insets/insetert.C:390
 msgid "ERT"
 msgstr "ERT"
 
-#: src/insets/insetexternal.C:574
+#: src/insets/insetexternal.C:576
 #, c-format
 msgid "External template %1$s is not installed"
 msgstr "Ekstern mal %1$s er ikke installert"
 
-#: src/insets/insetfloat.C:123 src/insets/insetfloat.C:364
-#: src/insets/insetfloat.C:374
+#: src/insets/insetfloat.C:121 src/insets/insetfloat.C:362
+#: src/insets/insetfloat.C:372
 msgid "float: "
 msgstr "flytende: "
 
-#: src/insets/insetfloat.C:280
+#: src/insets/insetfloat.C:278
 msgid "Opened Float Inset"
 msgstr "Åpnet \"float inset\""
 
-#: src/insets/insetfloat.C:376
+#: src/insets/insetfloat.C:374
 msgid " (sideways)"
 msgstr "Rotér 90°"
 
@@ -10955,7 +11144,7 @@ msgstr "fot"
 msgid "Opened Footnote Inset"
 msgstr "Åpnet fotnote"
 
-#: src/insets/insetgraphics.C:474 src/insets/insetinclude.C:427
+#: src/insets/insetgraphics.C:472 src/insets/insetinclude.C:443
 #, c-format
 msgid ""
 "Could not copy the file\n"
@@ -10966,31 +11155,31 @@ msgstr ""
 "%1$s\n"
 "inn i midlertidig mappe."
 
-#: src/insets/insetgraphics.C:707
+#: src/insets/insetgraphics.C:706
 #, 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:816
+#: src/insets/insetgraphics.C:817
 #, c-format
 msgid "Graphics file: %1$s"
 msgstr "Grafikkfil: %1$s"
 
-#: src/insets/insethfill.C:46
+#: src/insets/insethfill.C:48
 #, fuzzy
 msgid "Horizontal Fill"
 msgstr "Horisontalt fyll\t\\hfill"
 
-#: src/insets/insetinclude.C:289
+#: src/insets/insetinclude.C:306
 msgid "Verbatim Input"
 msgstr "Sett inn Verbatim"
 
-#: src/insets/insetinclude.C:292
+#: src/insets/insetinclude.C:309
 #, fuzzy
 msgid "Verbatim Input*"
 msgstr "Sett inn Verbatim"
 
-#: src/insets/insetinclude.C:394
+#: src/insets/insetinclude.C:410
 #, c-format
 msgid ""
 "Included file `%1$s'\n"
@@ -11001,7 +11190,7 @@ msgstr ""
 "har tekstklasse `%2$s'\n"
 "mens hovedfilen har tekstklasse `%3$s'."
 
-#: src/insets/insetinclude.C:400
+#: src/insets/insetinclude.C:416
 msgid "Different textclasses"
 msgstr "Ulike tekstklasser"
 
@@ -11022,6 +11211,15 @@ msgstr "marg"
 msgid "Opened Marginal Note Inset"
 msgstr "Åpnet \"float inset\""
 
+#: src/insets/insetnomencl.C:39
+#, fuzzy
+msgid "Glo"
+msgstr "Global"
+
+#: src/insets/insetnomencl.C:86
+msgid "Glossary"
+msgstr ""
+
 #: src/insets/insetnote.C:66
 msgid "Comment"
 msgstr "Kommentar"
@@ -11054,6 +11252,15 @@ msgstr "alt"
 msgid "Opened Optional Argument Inset"
 msgstr "Åpnet text inset"
 
+#: src/insets/insetpagebreak.h:65
+#, fuzzy
+msgid "Clear Page"
+msgstr "Av"
+
+#: src/insets/insetpagebreak.h:81
+msgid "Clear Double Page"
+msgstr ""
+
 #: src/insets/insetref.C:150 src/mathed/InsetMathRef.C:183
 msgid "Ref: "
 msgstr "Ref: "
@@ -11104,20 +11311,20 @@ msgstr "Ref: "
 msgid "PrettyRef: "
 msgstr "Ref: "
 
-#: src/insets/insettabular.C:453
+#: src/insets/insettabular.C:449
 #, fuzzy
 msgid "Opened table"
 msgstr "Åpne en fil"
 
-#: src/insets/insettabular.C:1567
+#: src/insets/insettabular.C:1585
 msgid "Error setting multicolumn"
 msgstr "Feil bruk av multikolonne"
 
-#: src/insets/insettabular.C:1568
+#: src/insets/insettabular.C:1586
 msgid "You cannot set multicolumn vertically."
 msgstr "Multikolonne kan ikke brukes vertikalt."
 
-#: src/insets/insettext.C:225
+#: src/insets/insettext.C:233
 msgid "Opened Text Inset"
 msgstr "Åpnet text inset"
 
@@ -11125,12 +11332,12 @@ msgstr "
 msgid "theorem"
 msgstr "teorem"
 
-#: src/insets/insettheorem.C:89
+#: src/insets/insettheorem.C:91
 #, fuzzy
 msgid "Opened Theorem Inset"
 msgstr "Åpnet text inset"
 
-#: src/insets/insettoc.C:45
+#: src/insets/insettoc.C:46
 #, fuzzy
 msgid "Unknown toc list"
 msgstr "Ukjent operasjon"
@@ -11143,7 +11350,7 @@ msgstr "Url: "
 msgid "HtmlUrl: "
 msgstr "HtmlUrl: "
 
-#: src/insets/insetvspace.C:110
+#: src/insets/insetvspace.C:109
 msgid "Vertical Space"
 msgstr "Vertikal avstand"
 
@@ -11156,74 +11363,74 @@ msgstr ""
 msgid "Opened Wrap Inset"
 msgstr "Åpnet \"float inset\""
 
-#: src/insets/render_graphic.C:92 src/insets/render_graphic.C:96
+#: src/insets/render_graphic.C:90 src/insets/render_graphic.C:94
 msgid "Not shown."
 msgstr "Ikke vist."
 
-#: src/insets/render_graphic.C:99
+#: src/insets/render_graphic.C:97
 msgid "Loading..."
 msgstr "Leser..."
 
-#: src/insets/render_graphic.C:102
+#: src/insets/render_graphic.C:100
 msgid "Converting to loadable format..."
 msgstr "Konverterer til lastbart format..."
 
-#: src/insets/render_graphic.C:105
+#: src/insets/render_graphic.C:103
 msgid "Loaded into memory. Generating pixmap..."
 msgstr ""
 
-#: src/insets/render_graphic.C:108
+#: src/insets/render_graphic.C:106
 msgid "Scaling etc..."
 msgstr "Skalering etc..."
 
-#: src/insets/render_graphic.C:111
+#: src/insets/render_graphic.C:109
 msgid "Ready to display"
 msgstr "Klar for visning"
 
-#: src/insets/render_graphic.C:114
+#: src/insets/render_graphic.C:112
 msgid "No file found!"
 msgstr "Ingen fil funnet!"
 
-#: src/insets/render_graphic.C:117
+#: src/insets/render_graphic.C:115
 #, fuzzy
 msgid "Error converting to loadable format"
 msgstr "Konverterer til lastbart format..."
 
-#: src/insets/render_graphic.C:120
+#: src/insets/render_graphic.C:118
 msgid "Error loading file into memory"
 msgstr ""
 
-#: src/insets/render_graphic.C:123
+#: src/insets/render_graphic.C:121
 #, fuzzy
 msgid "Error generating the pixmap"
 msgstr "Konverterer til lastbart format..."
 
-#: src/insets/render_graphic.C:126
+#: src/insets/render_graphic.C:124
 #, fuzzy
 msgid "No image"
 msgstr "Ingen endring"
 
-#: src/insets/render_preview.C:89
+#: src/insets/render_preview.C:92
 msgid "Preview loading"
 msgstr "Forhåndsvisning lastes inn"
 
-#: src/insets/render_preview.C:92
+#: src/insets/render_preview.C:95
 msgid "Preview ready"
 msgstr "Forhåndsvisning klar"
 
-#: src/insets/render_preview.C:95
+#: src/insets/render_preview.C:98
 msgid "Preview failed"
 msgstr "Forhåndsvisning mislyktes"
 
-#: src/ispell.C:209 src/ispell.C:216 src/ispell.C:225
+#: src/ispell.C:238 src/ispell.C:245 src/ispell.C:254
 msgid "Can't create pipe for spellchecker."
 msgstr "Får ikke laget 'pipe' for stavekontrollen."
 
-#: src/ispell.C:230 src/ispell.C:235 src/ispell.C:240
+#: src/ispell.C:259 src/ispell.C:264 src/ispell.C:269
 msgid "Can't open pipe for spellchecker."
 msgstr "Får ikke åpnet 'pipe' for stavekontrollen."
 
-#: src/ispell.C:249
+#: src/ispell.C:278
 msgid ""
 "Could not create an ispell process.\n"
 "You may not have the right languages installed."
@@ -11231,7 +11438,7 @@ msgstr ""
 "Får ikke kjørt igang stavekontrollen 'ispell'.\n"
 "Kanskje du ikke har rett språk installert."
 
-#: src/ispell.C:271
+#: src/ispell.C:301
 #, fuzzy
 msgid ""
 "The ispell process returned an error.\n"
@@ -11240,12 +11447,33 @@ msgstr ""
 "Stavekontrollprosessen returnerte en feilkode.\n"
 "Kanskje den er galt konfigurert?"
 
-#: src/ispell.C:380
+#: src/ispell.C:406
+#, c-format
+msgid ""
+"Could not check word `%1$s' because it could not be converted to encoding `%2"
+"$s'."
+msgstr ""
+
+#: src/ispell.C:417
 #, fuzzy
 msgid "Could not communicate with the ispell spellchecker process."
 msgstr "Kunne ikke kommunisere med stavekontrollprogrammet."
 
-#: src/kbsequence.C:163
+#: src/ispell.C:477
+#, c-format
+msgid ""
+"Could not insert word `%1$s' because it could not be converted to encoding `%"
+"2$s'."
+msgstr ""
+
+#: src/ispell.C:492
+#, c-format
+msgid ""
+"Could not accept word `%1$s' because it could not be converted to encoding `%"
+"2$s'."
+msgstr ""
+
+#: src/kbsequence.C:160
 msgid "   options: "
 msgstr "   opsjoner: "
 
@@ -11323,7 +11551,7 @@ msgstr "Total h
 msgid "Page Height %"
 msgstr "Total høyde"
 
-#: src/lyx_cb.C:113
+#: src/lyx_cb.C:112
 #, c-format
 msgid ""
 "The document %1$s could not be saved.\n"
@@ -11334,23 +11562,23 @@ msgstr ""
 "\n"
 "Vil du prøve å lagre det under et annet navn?"
 
-#: src/lyx_cb.C:115
+#: src/lyx_cb.C:114
 msgid "Rename and save?"
 msgstr "Bytte navn og lagre?"
 
-#: src/lyx_cb.C:116
+#: src/lyx_cb.C:115
 msgid "&Rename"
 msgstr "&Bytte navn"
 
-#: src/lyx_cb.C:133
+#: src/lyx_cb.C:132
 msgid "Choose a filename to save document as"
 msgstr "Velg filnavn som dokumentet skal lagres som"
 
-#: src/lyx_cb.C:136 src/lyxfunc.C:1795
+#: src/lyx_cb.C:135 src/lyxfunc.C:1860
 msgid "Templates|#T#t"
 msgstr "Maler"
 
-#: src/lyx_cb.C:165 src/lyxfunc.C:1952
+#: src/lyx_cb.C:165 src/lyxfunc.C:2015
 #, c-format
 msgid ""
 "The document %1$s already exists.\n"
@@ -11361,7 +11589,7 @@ msgstr ""
 "\n"
 "Vil du overskrive det dokumentet?"
 
-#: src/lyx_cb.C:167 src/lyxfunc.C:1954
+#: src/lyx_cb.C:167 src/lyxfunc.C:2017
 msgid "Over-write document?"
 msgstr "OVerskrive dokument?"
 
@@ -11408,7 +11636,7 @@ msgstr ""
 "%1$s\n"
 "på grunn av feilen: %2$s"
 
-#: src/lyx_cb.C:381 src/output.C:40
+#: src/lyx_cb.C:381 src/output.C:41
 msgid "Could not open file"
 msgstr "Kan ikke åpne fil"
 
@@ -11434,11 +11662,11 @@ msgstr ""
 "Du må restarte LyX for å kunne\n"
 "bruke oppdaterte dokumentklasser."
 
-#: src/lyx_main.C:119
+#: src/lyx_main.C:129
 msgid "Could not read configuration file"
 msgstr "Kunne ikke lese konfigurasjonsfilen"
 
-#: src/lyx_main.C:120
+#: src/lyx_main.C:130
 #, c-format
 msgid ""
 "Error while reading the configuration file\n"
@@ -11449,37 +11677,37 @@ msgstr ""
 "%1$s.\n"
 "Sjekk om LyX er rett installert."
 
-#: src/lyx_main.C:129
+#: src/lyx_main.C:139
 msgid "LyX: reconfiguring user directory"
 msgstr "LyX: rekonfigurerer brukerfolder"
 
-#: src/lyx_main.C:133
+#: src/lyx_main.C:143
 msgid "Done!"
 msgstr "Ferdig!"
 
-#: src/lyx_main.C:379
+#: src/lyx_main.C:491
 #, c-format
 msgid "Unable to remove the temporary directory %1$s"
 msgstr "Feil: Klarte ikke å fjerne den midlertidige mappen %1$s"
 
-#: src/lyx_main.C:381
+#: src/lyx_main.C:493
 msgid "Unable to remove temporary directory"
 msgstr "Feil: Klarte ikke å fjerne midlertidig mappe"
 
-#: src/lyx_main.C:419
+#: src/lyx_main.C:529
 #, c-format
 msgid "Wrong command line option `%1$s'. Exiting."
 msgstr "Feil kommandolineargument `%1$s'. Avslutter."
 
-#: src/lyx_main.C:658
+#: src/lyx_main.C:785
 msgid "LyX: "
 msgstr "LyX: "
 
-#: src/lyx_main.C:780
+#: src/lyx_main.C:914
 msgid "Could not create temporary directory"
 msgstr "Klarte ikke å lage midlertidig mappe"
 
-#: src/lyx_main.C:781
+#: src/lyx_main.C:915
 #, c-format
 msgid ""
 "Could not create a temporary directory in\n"
@@ -11487,50 +11715,50 @@ msgid ""
 "path exists and is writable and try again."
 msgstr ""
 
-#: src/lyx_main.C:933
+#: src/lyx_main.C:1082
 msgid "Missing user LyX directory"
 msgstr "Ingen brukerkatalog for LyX"
 
-#: src/lyx_main.C:934
+#: src/lyx_main.C:1083
 #, c-format
 msgid ""
 "You have specified a non-existent user LyX directory, %1$s.\n"
 "It is needed to keep your own configuration."
 msgstr ""
 
-#: src/lyx_main.C:939
+#: src/lyx_main.C:1088
 #, fuzzy
 msgid "&Create directory"
 msgstr "&Opprett mappe."
 
-#: src/lyx_main.C:940
+#: src/lyx_main.C:1089
 #, fuzzy
 msgid "&Exit LyX"
 msgstr "&Avslutt LyX."
 
-#: src/lyx_main.C:941
+#: src/lyx_main.C:1090
 msgid "No user LyX directory. Exiting."
 msgstr "Ingen brukerkatalog for LyX. Avslutter."
 
-#: src/lyx_main.C:945
+#: src/lyx_main.C:1094
 #, c-format
 msgid "LyX: Creating directory %1$s"
 msgstr "LyX: Lager mappen %1$s"
 
-#: src/lyx_main.C:951
+#: src/lyx_main.C:1100
 msgid "Failed to create directory. Exiting."
 msgstr "Mislyktes i å lage mappen. Avslutter."
 
-#: src/lyx_main.C:1106
+#: src/lyx_main.C:1265
 msgid "List of supported debug flags:"
 msgstr "Liste over debug flagg some støttes:"
 
-#: src/lyx_main.C:1110
+#: src/lyx_main.C:1269
 #, c-format
 msgid "Setting debug level to %1$s"
 msgstr "Setter debug nivå til %1$s"
 
-#: src/lyx_main.C:1121
+#: src/lyx_main.C:1280
 #, fuzzy
 msgid ""
 "Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
@@ -11571,47 +11799,47 @@ msgstr ""
 "\t-version        versjons og byggeinformasjon\n"
 "Les man sidene til LyX for flere detaljer."
 
-#: src/lyx_main.C:1157
+#: src/lyx_main.C:1316
 msgid "Missing directory for -sysdir switch"
 msgstr "Mangler folder for -sysdir parameter"
 
-#: src/lyx_main.C:1167
+#: src/lyx_main.C:1326
 msgid "Missing directory for -userdir switch"
 msgstr "Mangler folder for -userdir parameter"
 
-#: src/lyx_main.C:1177
+#: src/lyx_main.C:1336
 msgid "Missing command string after --execute switch"
 msgstr "Mangler kommandostreng etter --execute parameter"
 
-#: src/lyx_main.C:1187
+#: src/lyx_main.C:1346
 msgid "Missing file type [eg latex, ps...] after --export switch"
 msgstr "Mangler fil type [eks. latex, ps...] etter --export parameter"
 
-#: src/lyx_main.C:1199
+#: src/lyx_main.C:1358
 msgid "Missing file type [eg latex, ps...] after --import switch"
 msgstr "Mangler fil type [eks. latex, ps...] etter --import parameter"
 
-#: src/lyx_main.C:1204
+#: src/lyx_main.C:1363
 msgid "Missing filename for --import"
 msgstr "Mangler filnavn for --import"
 
-#: src/lyxfind.C:138
+#: src/lyxfind.C:137
 msgid "Search error"
 msgstr "Søkefeil"
 
-#: src/lyxfind.C:139
+#: src/lyxfind.C:138
 msgid "Search string is empty"
 msgstr "Ingenting å finne"
 
-#: src/lyxfind.C:290 src/lyxfind.C:321
+#: src/lyxfind.C:289 src/lyxfind.C:320
 msgid "String not found!"
 msgstr "Streng ikke funnet!"
 
-#: src/lyxfind.C:325
+#: src/lyxfind.C:324
 msgid "String has been replaced."
 msgstr "En streng har blitt erstattet."
 
-#: src/lyxfind.C:328
+#: src/lyxfind.C:327
 msgid " strings have been replaced."
 msgstr " strenger har blitt erstattet."
 
@@ -11637,65 +11865,65 @@ msgstr "Kapiteler"
 msgid "Toggle"
 msgstr "Bytt"
 
-#: src/lyxfont.C:511
+#: src/lyxfont.C:510
 #, c-format
 msgid "Emphasis %1$s, "
 msgstr "Uthevet %1$s, "
 
-#: src/lyxfont.C:514
+#: src/lyxfont.C:513
 #, c-format
 msgid "Underline %1$s, "
 msgstr "Understreket %1$s, "
 
-#: src/lyxfont.C:517
+#: src/lyxfont.C:516
 #, c-format
 msgid "Noun %1$s, "
 msgstr "Substantiv %1$s, "
 
-#: src/lyxfont.C:522
+#: src/lyxfont.C:521
 #, c-format
 msgid "Language: %1$s, "
 msgstr "Språk: %1$s, "
 
-#: src/lyxfont.C:525
+#: src/lyxfont.C:524
 #, c-format
 msgid "  Number %1$s"
 msgstr "  Nummer %1s"
 
-#: src/lyxfunc.C:327
+#: src/lyxfunc.C:365
 msgid "Unknown function."
 msgstr "Ukjent funksjon."
 
-#: src/lyxfunc.C:352
+#: src/lyxfunc.C:390
 #, fuzzy
 msgid "Exiting"
 msgstr "Avslutt|v"
 
-#: src/lyxfunc.C:374
+#: src/lyxfunc.C:422
 msgid "Nothing to do"
 msgstr "Ingenting å utføre"
 
-#: src/lyxfunc.C:393
+#: src/lyxfunc.C:441
 msgid "Unknown action"
 msgstr "Ukjent operasjon"
 
-#: src/lyxfunc.C:399 src/lyxfunc.C:659
+#: src/lyxfunc.C:447 src/lyxfunc.C:709
 msgid "Command disabled"
 msgstr ""
 
-#: src/lyxfunc.C:406
+#: src/lyxfunc.C:454
 msgid "Command not allowed without any document open"
 msgstr "Kommandoen er ikke lov uten åpne dokumenter"
 
-#: src/lyxfunc.C:645
+#: src/lyxfunc.C:695
 msgid "Document is read-only"
 msgstr "Dokumentet er ikke skrivbart."
 
-#: src/lyxfunc.C:653
+#: src/lyxfunc.C:703
 msgid "This portion of the document is deleted."
 msgstr ""
 
-#: src/lyxfunc.C:672
+#: src/lyxfunc.C:722
 #, c-format
 msgid ""
 "The document %1$s has unsaved changes.\n"
@@ -11706,18 +11934,18 @@ msgstr ""
 "\n"
 "Vil du lagre dokumentet?"
 
-#: src/lyxfunc.C:690
+#: src/lyxfunc.C:740
 #, c-format
 msgid ""
 "Could not print the document %1$s.\n"
 "Check that your printer is set up correctly."
 msgstr ""
 
-#: src/lyxfunc.C:693
+#: src/lyxfunc.C:743
 msgid "Print document failed"
 msgstr "Utskrift av dokumentet mislyktes"
 
-#: src/lyxfunc.C:712
+#: src/lyxfunc.C:762
 #, c-format
 msgid ""
 "The document could not be converted\n"
@@ -11726,529 +11954,523 @@ msgstr ""
 "Dokumentet kunne ikke konverteres\n"
 "til dokumentklassen %1$s."
 
-#: src/lyxfunc.C:715
+#: src/lyxfunc.C:765
 msgid "Could not change class"
 msgstr "Fikk ikke byttet klasse"
 
-#: src/lyxfunc.C:827
+#: src/lyxfunc.C:877
 #, c-format
 msgid "Saving document %1$s..."
 msgstr "Lagrer dokument %1$s..."
 
-#: src/lyxfunc.C:831
+#: src/lyxfunc.C:881
 msgid " done."
 msgstr "ferdig."
 
-#: src/lyxfunc.C:846
+#: src/lyxfunc.C:896
 #, c-format
 msgid ""
 "Any changes will be lost. Are you sure you want to revert to the saved "
 "version of the document %1$s?"
 msgstr ""
 
-#: src/lyxfunc.C:1066 src/text3.C:1209
+#: src/lyxfunc.C:1102 src/text3.C:1222
 msgid "Missing argument"
 msgstr "Mangler argument"
 
-#: src/lyxfunc.C:1075
+#: src/lyxfunc.C:1111
 #, c-format
 msgid "Opening help file %1$s..."
 msgstr "Åpner hjelpefil %1$s..."
 
-#: src/lyxfunc.C:1344
+#: src/lyxfunc.C:1390
 msgid "Opening child document "
 msgstr "Åpner subdokument "
 
-#: src/lyxfunc.C:1429
+#: src/lyxfunc.C:1477
 msgid "Syntax: set-color <lyx_name> <x11_name>"
 msgstr ""
 
-#: src/lyxfunc.C:1440
+#: src/lyxfunc.C:1488
 #, c-format
 msgid "Set-color \"%1$s\" failed - color is undefined or may not be redefined"
 msgstr ""
 
-#: src/lyxfunc.C:1556
+#: src/lyxfunc.C:1604
 msgid "Document defaults saved in "
 msgstr "Standardverdier for dokumenter lagret i "
 
-#: src/lyxfunc.C:1559
+#: src/lyxfunc.C:1607
 msgid "Unable to save document defaults"
 msgstr "Fikk ikke lagret dokumentstandarder"
 
-#: src/lyxfunc.C:1615
+#: src/lyxfunc.C:1663
 msgid "Converting document to new document class..."
 msgstr "Konverterer dokument til ny tekstklasse..."
 
-#: src/lyxfunc.C:1792
+#: src/lyxfunc.C:1857
 msgid "Select template file"
 msgstr "Velg mal"
 
-#: src/lyxfunc.C:1829
+#: src/lyxfunc.C:1894
 msgid "Select document to open"
 msgstr "Velg dokument som skal åpnes"
 
-#: src/lyxfunc.C:1870
+#: src/lyxfunc.C:1933
 #, c-format
 msgid "Opening document %1$s..."
 msgstr "Åpner dokument %1$s...\""
 
-#: src/lyxfunc.C:1874
+#: src/lyxfunc.C:1937
 #, c-format
 msgid "Document %1$s opened."
 msgstr "Dokument %1$s åpnet."
 
-#: src/lyxfunc.C:1876
+#: src/lyxfunc.C:1939
 #, c-format
 msgid "Could not open document %1$s"
 msgstr "Kunne ikke åpne dokumentet %1$s"
 
-#: src/lyxfunc.C:1901
+#: src/lyxfunc.C:1964
 #, c-format
 msgid "Select %1$s file to import"
 msgstr "Velg %1$s fil som skal importeres"
 
-#: src/lyxfunc.C:2018
+#: src/lyxfunc.C:2091
 msgid "Welcome to LyX!"
 msgstr "Velkommen til LyX!"
 
-#: src/lyxrc.C:2136
+#: src/lyxrc.C:2168
 msgid ""
 "Consider run-together words, such as \"diskdrive\" for \"disk drive\", as "
 "legal words?"
 msgstr ""
 
-#: src/lyxrc.C:2141
+#: src/lyxrc.C:2173
 msgid ""
 "Specify an alternate language. The default is to use the language of the "
 "document."
 msgstr ""
 
-#: src/lyxrc.C:2145
+#: src/lyxrc.C:2177
 msgid ""
 "Use to define an external program to render tables in plain text output. E."
 "g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If \"\" is "
 "specified, an internal routine is used."
 msgstr ""
 
-#: src/lyxrc.C:2149
-msgid ""
-"This is the maximum line length of an exported text file (LaTeX, SGML or "
-"plain text)."
-msgstr ""
-
-#: src/lyxrc.C:2153
+#: src/lyxrc.C:2185
 msgid ""
 "De-select if you don't want the current selection to be replaced "
 "automatically by what you type."
 msgstr ""
 
-#: src/lyxrc.C:2157
+#: src/lyxrc.C:2189
 #, fuzzy
 msgid ""
 "De-select if you don't want the class options to be reset to defaults after "
 "class change."
 msgstr "Sett klasse innstillingene til standardverdier ved klasse bytte"
 
-#: src/lyxrc.C:2161
+#: src/lyxrc.C:2193
 msgid ""
 "The time interval between auto-saves (in seconds). 0 means no auto-save."
 msgstr ""
 
-#: src/lyxrc.C:2168
+#: src/lyxrc.C:2200
 msgid ""
 "The path for storing backup files. If it is an empty string, LyX will store "
 "the backup file in the same directory as the original file."
 msgstr ""
 
-#: src/lyxrc.C:2172
+#: src/lyxrc.C:2204
 msgid ""
 "Define the options of bibtex (cf. man bibtex) or select an alternative "
 "compiler (e.g. mlbibtex or bibulus)."
 msgstr ""
 
-#: src/lyxrc.C:2176
+#: src/lyxrc.C:2208
 msgid ""
 "Keybindings file. Can either specify an absolute path, or LyX will look in "
 "its global and local bind/ directories."
 msgstr ""
 
-#: src/lyxrc.C:2180
+#: src/lyxrc.C:2212
 msgid "Select to check whether the lastfiles still exist."
 msgstr ""
 
-#: src/lyxrc.C:2184
+#: src/lyxrc.C:2216
 msgid ""
 "Define how to run chktex. E.g. \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -"
 "n38\" Refer to the ChkTeX documentation."
 msgstr ""
 
-#: src/lyxrc.C:2194
+#: src/lyxrc.C:2226
 msgid ""
 "LyX normally doesn't update the cursor position if you move the scrollbar. "
 "Set to true if you'd prefer to always have the cursor on screen."
 msgstr ""
 
-#: src/lyxrc.C:2205
+#: src/lyxrc.C:2237
 #, no-c-format
 msgid ""
 "This accepts the normal strftime formats; see man strftime for full details. "
 "E.g.\"%A, %e. %B %Y\"."
 msgstr ""
 
-#: src/lyxrc.C:2209
+#: src/lyxrc.C:2241
 msgid "New documents will be assigned this language."
 msgstr "Nye dokumenter lages med dette språket."
 
-#: src/lyxrc.C:2213
+#: src/lyxrc.C:2245
 msgid "Specify the default paper size."
 msgstr "Sett standard arkstørrelse."
 
-#: src/lyxrc.C:2217
+#: src/lyxrc.C:2249
 msgid ""
 "Iconify the dialogs when the main window is iconified. (Affects only dialogs "
 "shown after the change has been made.)"
 msgstr ""
 
-#: src/lyxrc.C:2221
+#: src/lyxrc.C:2253
 msgid "Select how LyX will display any graphics."
 msgstr ""
 
-#: src/lyxrc.C:2225
+#: src/lyxrc.C:2257
 msgid ""
 "The default path for your documents. An empty value selects the directory "
 "LyX was started from."
 msgstr ""
 
-#: src/lyxrc.C:2230
+#: src/lyxrc.C:2262
 msgid "Specify additional chars that can be part of a word."
 msgstr ""
 
-#: src/lyxrc.C:2234
+#: src/lyxrc.C:2266
 msgid ""
 "The font encoding used for the LaTeX2e fontenc package. T1 is highly "
 "recommended for non-English languages."
 msgstr ""
 
-#: src/lyxrc.C:2241
+#: src/lyxrc.C:2273
 msgid ""
 "Define the options of makeindex (cf. man makeindex) or select an alternative "
 "compiler. E.g., using xindy/make-rules, the command string would be "
 "\"makeindex.sh -m $$lang\"."
 msgstr ""
 
-#: src/lyxrc.C:2250
+#: src/lyxrc.C:2282
 msgid ""
 "Use this to set the correct mapping file for your keyboard. You'll need this "
 "if you for instance want to type German documents on an American keyboard."
 msgstr ""
 
-#: src/lyxrc.C:2254
+#: src/lyxrc.C:2286
 msgid "Maximum number of words in the initialization string for a new label"
 msgstr ""
 
-#: src/lyxrc.C:2258
+#: src/lyxrc.C:2290
 msgid ""
 "Select if a language switching command is needed at the beginning of the "
 "document."
 msgstr ""
 
-#: src/lyxrc.C:2262
+#: src/lyxrc.C:2294
 msgid ""
 "Select if a language switching command is needed at the end of the document."
 msgstr ""
 
-#: src/lyxrc.C:2266
+#: src/lyxrc.C:2298
 msgid ""
 "The LaTeX command for changing from the language of the document to another "
 "language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the "
 "name of the second language."
 msgstr ""
 
-#: src/lyxrc.C:2270
+#: src/lyxrc.C:2302
 msgid "The LaTeX command for changing back to the language of the document."
 msgstr ""
 
-#: src/lyxrc.C:2274
+#: src/lyxrc.C:2306
 msgid "The LaTeX command for local changing of the language."
 msgstr ""
 
-#: src/lyxrc.C:2278
+#: src/lyxrc.C:2310
 msgid ""
 "De-select if you don't want the language(s) used as an argument to "
 "\\documentclass."
 msgstr ""
 
-#: src/lyxrc.C:2282
+#: src/lyxrc.C:2314
 msgid ""
 "The LaTeX command for loading the language package. E.g. \"\\usepackage"
 "{babel}\", \"\\usepackage{omega}\"."
 msgstr ""
 
-#: src/lyxrc.C:2286
+#: src/lyxrc.C:2318
 msgid ""
 "De-select if you don't want babel to be used when the language of the "
 "document is the default language."
 msgstr ""
 
-#: src/lyxrc.C:2290
+#: src/lyxrc.C:2322
 msgid "De-select if you do not want LyX to scroll to saved position."
 msgstr ""
 
-#: src/lyxrc.C:2294
+#: src/lyxrc.C:2326
 msgid "De-select to prevent loading files opened from the last lyx session."
 msgstr ""
 
-#: src/lyxrc.C:2298
+#: src/lyxrc.C:2330
 msgid "De-select if you don't want LyX to create backup files."
 msgstr ""
 
-#: src/lyxrc.C:2302
+#: src/lyxrc.C:2334
 msgid ""
 "Select to control the highlighting of words with a language foreign to that "
 "of the document."
 msgstr ""
 
-#: src/lyxrc.C:2306
+#: src/lyxrc.C:2338
 #, c-format
 msgid "Maximal number of lastfiles. Up to %1$d can appear in the file menu."
 msgstr ""
 
-#: src/lyxrc.C:2311
+#: src/lyxrc.C:2343
 msgid ""
 "Specify those directories which should be prepended to the PATH environment "
 "variable. Use the OS native format."
 msgstr ""
 
-#: src/lyxrc.C:2318
+#: src/lyxrc.C:2350
 msgid ""
 "Specify an alternate personal dictionary file. E.g. \".ispell_english\"."
 msgstr ""
 
-#: src/lyxrc.C:2322
+#: src/lyxrc.C:2354
 msgid "The bold font in the dialogs."
 msgstr ""
 
-#: src/lyxrc.C:2326
+#: src/lyxrc.C:2358
 msgid "The encoding for the menu/popups fonts."
 msgstr ""
 
-#: src/lyxrc.C:2330
+#: src/lyxrc.C:2362
 msgid "The normal font in the dialogs."
 msgstr ""
 
-#: src/lyxrc.C:2334
+#: src/lyxrc.C:2366
 msgid "Shows a typeset preview of things such as math"
 msgstr ""
 
-#: src/lyxrc.C:2338
+#: src/lyxrc.C:2370
 msgid "Previewed equations will have \"(#)\" labels rather than numbered ones"
 msgstr ""
 
-#: src/lyxrc.C:2342
+#: src/lyxrc.C:2374
 msgid "Scale the preview size to suit."
 msgstr ""
 
-#: src/lyxrc.C:2346
+#: src/lyxrc.C:2378
 msgid "The option for specifying whether the copies should be collated."
 msgstr ""
 
-#: src/lyxrc.C:2350
+#: src/lyxrc.C:2382
 msgid "The option for specifying the number of copies to print."
 msgstr ""
 
-#: src/lyxrc.C:2354
+#: src/lyxrc.C:2386
 msgid ""
 "The default printer to print on. If none is specified, LyX will use the "
 "environment variable PRINTER."
 msgstr ""
 
-#: src/lyxrc.C:2358
+#: src/lyxrc.C:2390
 msgid "The option to print only even pages."
 msgstr "Mulighet for å bare skrive ut sider hvor sidetallet er partall"
 
-#: src/lyxrc.C:2362
+#: src/lyxrc.C:2394
 msgid ""
 "Extra options to pass to printing program after everything else, but before "
 "the filename of the DVI file to be printed."
 msgstr ""
 
-#: src/lyxrc.C:2366
+#: src/lyxrc.C:2398
 msgid "Extension of printer program output file. Usually \".ps\"."
 msgstr ""
 
-#: src/lyxrc.C:2370
+#: src/lyxrc.C:2402
 msgid "The option to print out in landscape."
 msgstr ""
 
-#: src/lyxrc.C:2374
+#: src/lyxrc.C:2406
 msgid "The option to print only odd pages."
 msgstr ""
 
-#: src/lyxrc.C:2378
+#: src/lyxrc.C:2410
 msgid "The option for specifying a comma-separated list of pages to print."
 msgstr ""
 
-#: src/lyxrc.C:2382
+#: src/lyxrc.C:2414
 msgid "Option to specify the dimensions of the print paper."
 msgstr ""
 
-#: src/lyxrc.C:2386
+#: src/lyxrc.C:2418
 msgid "The option to specify paper type."
 msgstr ""
 
-#: src/lyxrc.C:2390
+#: src/lyxrc.C:2422
 #, fuzzy
 msgid "The option to reverse the order of the pages printed."
 msgstr "Skriv ut i omvendt rekkefølge."
 
-#: src/lyxrc.C:2394
+#: src/lyxrc.C:2426
 msgid ""
 "When set, this printer option automatically prints to a file and then calls "
 "a separate print spooling program on that file with the given name and "
 "arguments."
 msgstr ""
 
-#: src/lyxrc.C:2398
+#: src/lyxrc.C:2430
 msgid ""
 "If you specify a printer name in the print dialog, the following argument is "
 "prepended along with the printer name after the spool command."
 msgstr ""
 
-#: src/lyxrc.C:2402
+#: src/lyxrc.C:2434
 msgid "Option to pass to the print program to print to a file."
 msgstr ""
 
-#: src/lyxrc.C:2406
+#: src/lyxrc.C:2438
 msgid "Option to pass to the print program to print on a specific printer."
 msgstr ""
 
-#: src/lyxrc.C:2410
+#: src/lyxrc.C:2442
 msgid ""
 "Select for LyX to pass the name of the destination printer to your print "
 "command."
 msgstr ""
 
-#: src/lyxrc.C:2414
+#: src/lyxrc.C:2446
 msgid "Your favorite print program, e.g. \"dvips\", \"dvilj4\"."
 msgstr ""
 
-#: src/lyxrc.C:2418
+#: src/lyxrc.C:2450
 msgid ""
 "Select to enable support of right-to-left languages (e.g. Hebrew, Arabic)."
 msgstr ""
 
-#: src/lyxrc.C:2422
+#: src/lyxrc.C:2454
 msgid ""
 "DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes "
 "wrong, override the setting here."
 msgstr ""
 
-#: src/lyxrc.C:2426
+#: src/lyxrc.C:2458
 msgid "The encoding for the screen fonts."
 msgstr ""
 
-#: src/lyxrc.C:2432
+#: src/lyxrc.C:2464
 msgid "The screen fonts used to display the text while editing."
 msgstr ""
 
-#: src/lyxrc.C:2441
+#: src/lyxrc.C:2473
 msgid ""
 "Allow bitmap fonts to be resized. If you are using a bitmap font, selecting "
 "this option may make some fonts look blocky in LyX. Deselecting this option "
 "makes LyX use the nearest bitmap font size available, instead of scaling."
 msgstr ""
 
-#: src/lyxrc.C:2445
+#: src/lyxrc.C:2477
 msgid "The font sizes used for calculating the scaling of the screen fonts."
 msgstr ""
 
-#: src/lyxrc.C:2450
+#: src/lyxrc.C:2482
 #, no-c-format
 msgid ""
 "The zoom percentage for screen fonts. A setting of 100% will make the fonts "
 "roughly the same size as on paper."
 msgstr ""
 
-#: src/lyxrc.C:2455
+#: src/lyxrc.C:2487
 msgid ""
 "Specify geometry of the main view in width x height (values from last "
 "session will not be used if non-zero values are specified)."
 msgstr ""
 
-#: src/lyxrc.C:2459
+#: src/lyxrc.C:2491
 msgid "Allow session manager to save and restore windows position."
 msgstr ""
 
-#: src/lyxrc.C:2463
+#: src/lyxrc.C:2495
 msgid ""
 "This starts the lyxserver. The pipes get an additional extension \".in\" and "
 "\".out\". Only for advanced users."
 msgstr ""
 
-#: src/lyxrc.C:2470
+#: src/lyxrc.C:2502
 msgid "De-select if you don't want the startup banner."
 msgstr ""
 
-#: src/lyxrc.C:2474
+#: src/lyxrc.C:2506
 #, fuzzy
 msgid "What command runs the spellchecker?"
 msgstr "What command runs the spell checker?"
 
-#: src/lyxrc.C:2478
+#: src/lyxrc.C:2510
 msgid ""
 "LyX will place its temporary directories in this path. They will be deleted "
 "when you quit LyX."
 msgstr ""
 
-#: src/lyxrc.C:2482
+#: src/lyxrc.C:2514
 msgid ""
 "The path that LyX will set when offering to choose a template. An empty "
 "value selects the directory LyX was started from."
 msgstr ""
 
-#: src/lyxrc.C:2492
+#: src/lyxrc.C:2524
 msgid ""
 "The UI (user interface) file. Can either specify an absolute path, or LyX "
 "will look in its global and local ui/ directories."
 msgstr ""
 
-#: src/lyxrc.C:2505
+#: src/lyxrc.C:2537
 msgid ""
 "Specify whether to pass the -T input encoding option to ispell. Enable this "
 "if you cannot check the spelling of words containing accented letters. This "
 "may not work with all dictionaries."
 msgstr ""
 
-#: src/lyxrc.C:2512
+#: src/lyxrc.C:2544
 msgid "Specify the paper command to DVI viewer (leave empty or use \"-paper\")"
 msgstr ""
 
-#: src/lyxvc.C:98
+#: src/lyxvc.C:100
 msgid "Document not saved"
 msgstr "Dokumentet ble ikke lagret"
 
-#: src/lyxvc.C:99
+#: src/lyxvc.C:101
 msgid "You must save the document before it can be registered."
 msgstr "Du må lagre dokumentet får det kan registeres."
 
-#: src/lyxvc.C:128
+#: src/lyxvc.C:130
 msgid "LyX VC: Initial description"
 msgstr "LyX VC: Initiell beskrivelse"
 
-#: src/lyxvc.C:129
+#: src/lyxvc.C:131
 msgid "(no initial description)"
 msgstr "(ingen beskrivelse)"
 
-#: src/lyxvc.C:144
+#: src/lyxvc.C:146
 msgid "LyX VC: Log Message"
 msgstr "LyX VC: Logg melding"
 
-#: src/lyxvc.C:147
+#: src/lyxvc.C:149
 msgid "(no log message)"
 msgstr "(ingen logg melding)"
 
-#: src/lyxvc.C:169
+#: src/lyxvc.C:171
 #, c-format
 msgid ""
 "Reverting to the stored version of the document %1$s will lose all current "
@@ -12257,86 +12479,86 @@ msgid ""
 "Do you want to revert to the saved version?"
 msgstr ""
 
-#: src/lyxvc.C:172
+#: src/lyxvc.C:174
 msgid "Revert to stored version of document?"
 msgstr "Tilbake til lagret versjon av dokumentet?"
 
-#: src/mathed/InsetFormulaMacro.C:123 src/mathed/MathMacroTemplate.C:111
+#: src/mathed/InsetFormulaMacro.C:123 src/mathed/MathMacroTemplate.C:108
 #, c-format
 msgid " Macro: %1$s: "
 msgstr " Makro: %1$s: "
 
-#: src/mathed/InsetMathAMSArray.C:110 src/mathed/InsetMathHull.C:1236
-#: src/mathed/InsetMathSplit.C:76 src/mathed/InsetMathSubstack.C:72
+#: src/mathed/InsetMathAMSArray.C:112 src/mathed/InsetMathHull.C:1240
+#: src/mathed/InsetMathSplit.C:76 src/mathed/InsetMathSubstack.C:75
 #, c-format
 msgid "Can't add vertical grid lines in '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathCases.C:93
+#: src/mathed/InsetMathCases.C:98
 #, c-format
 msgid "No vertical grid lines in '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathGrid.C:1308
+#: src/mathed/InsetMathGrid.C:1318
 msgid "Only one row"
 msgstr ""
 
-#: src/mathed/InsetMathGrid.C:1314
+#: src/mathed/InsetMathGrid.C:1324
 msgid "Only one column"
 msgstr ""
 
-#: src/mathed/InsetMathGrid.C:1322
+#: src/mathed/InsetMathGrid.C:1332
 msgid "No hline to delete"
 msgstr "Ingen horisontal linje å fjerne"
 
-#: src/mathed/InsetMathGrid.C:1331
+#: src/mathed/InsetMathGrid.C:1341
 msgid "No vline to delete"
 msgstr "Ingen vertikal linje å fjerne"
 
-#: src/mathed/InsetMathGrid.C:1349
+#: src/mathed/InsetMathGrid.C:1359
 #, c-format
 msgid "Unknown tabular feature '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathHull.C:1075 src/mathed/InsetMathHull.C:1084
+#: src/mathed/InsetMathHull.C:1079 src/mathed/InsetMathHull.C:1088
 #, fuzzy
 msgid "No number"
 msgstr "Nummerering"
 
-#: src/mathed/InsetMathHull.C:1075 src/mathed/InsetMathHull.C:1084
+#: src/mathed/InsetMathHull.C:1079 src/mathed/InsetMathHull.C:1088
 #, fuzzy
 msgid "Number"
 msgstr "Nummerering"
 
-#: src/mathed/InsetMathHull.C:1209
+#: src/mathed/InsetMathHull.C:1213
 #, c-format
 msgid "Can't change number of rows in '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathHull.C:1219
+#: src/mathed/InsetMathHull.C:1223
 #, c-format
 msgid "Can't change number of columns in '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathHull.C:1229
+#: src/mathed/InsetMathHull.C:1233
 #, c-format
 msgid "Can't add horizontal grid lines in '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathHull.C:1321 src/text3.C:182
+#: src/mathed/InsetMathHull.C:1325 src/text3.C:185
 msgid "Math editor mode"
 msgstr "Matte editerings modus"
 
-#: src/mathed/InsetMathNest.C:832
+#: src/mathed/InsetMathNest.C:858
 msgid "create new math text environment ($...$)"
 msgstr ""
 
-#: src/mathed/InsetMathNest.C:835
+#: src/mathed/InsetMathNest.C:861
 #, fuzzy
 msgid "entered math text mode (textrm)"
 msgstr "Normal tekstmodus\t\\textrm"
 
-#: src/output.C:38
+#: src/output.C:39
 #, c-format
 msgid ""
 "Could not open the specified document\n"
@@ -12345,11 +12567,11 @@ msgstr ""
 "Kunne ikke åpne dokumentet\n"
 "%1$s."
 
-#: src/output_plaintext.C:156
+#: src/output_plaintext.C:155
 msgid "Abstract: "
 msgstr "Sammendrag: "
 
-#: src/output_plaintext.C:168
+#: src/output_plaintext.C:167
 msgid "References: "
 msgstr "Referanser: "
 
@@ -12357,36 +12579,36 @@ msgstr "Referanser: "
 msgid "All files (*)"
 msgstr "Alle filer (*)"
 
-#: src/support/package.C.in:440
+#: src/support/package.C.in:443
 #, c-format
 msgid ""
 "Unable to determine the path to the LyX binary from the command line %1$s"
 msgstr ""
 
-#: src/support/package.C.in:562
+#: src/support/package.C.in:565
 #, c-format
 msgid ""
 "Unable to determine the system directory having searched\n"
 "\t%1$s\n"
 "Use the '-sysdir' command line parameter or set the environment variable "
-"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
+"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
 msgstr ""
 
-#: src/support/package.C.in:648
+#: src/support/package.C.in:651
 #, c-format
 msgid ""
 "Invalid %1$s switch.\n"
 "Directory %2$s does not contain %3$s."
 msgstr ""
 
-#: src/support/package.C.in:676
+#: src/support/package.C.in:679
 #, c-format
 msgid ""
 "Invalid %1$s environment variable.\n"
 "Directory %2$s does not contain %3$s."
 msgstr ""
 
-#: src/support/package.C.in:700
+#: src/support/package.C.in:704
 #, c-format
 msgid ""
 "Invalid %1$s environment variable.\n"
@@ -12501,101 +12723,106 @@ msgstr ""
 msgid "CM Typewriter Light"
 msgstr "Skrivemaskin"
 
-#: src/text.C:190
+#: src/text.C:134
 msgid "Unknown layout"
 msgstr "Ukjent stil"
 
-#: src/text.C:191
+#: src/text.C:135
 #, c-format
 msgid ""
 "Layout '%1$s' does not exist in textclass '%2$s'\n"
 "Trying to use the default instead.\n"
 msgstr ""
 
-#: src/text.C:222
+#: src/text.C:166
 msgid "Unknown Inset"
 msgstr ""
 
-#: src/text.C:331 src/text.C:344
+#: src/text.C:276 src/text.C:289
 #, fuzzy
 msgid "Change tracking error"
 msgstr "Spore endringer"
 
-#: src/text.C:332
+#: src/text.C:277
 #, c-format
 msgid "Unknown author index for insertion: %1$d\n"
 msgstr ""
 
-#: src/text.C:345
+#: src/text.C:290
 #, c-format
 msgid "Unknown author index for deletion: %1$d\n"
 msgstr ""
 
-#: src/text.C:352
+#: src/text.C:297
 msgid "Unknown token"
 msgstr ""
 
-#: src/text.C:1228
+#: src/text.C:733
 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:1239
+#: src/text.C:744
 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:2395
+#: src/text.C:1566
+#, fuzzy
+msgid "[Change Tracking] "
+msgstr "Spore endringer"
+
+#: src/text.C:1572
 #, fuzzy
 msgid "Change: "
 msgstr "Side: "
 
-#: src/text.C:2398
+#: src/text.C:1576
 #, fuzzy
 msgid " at "
 msgstr " til "
 
-#: src/text.C:2410
+#: src/text.C:1586
 #, c-format
 msgid "Font: %1$s"
 msgstr "Font: %1$s"
 
-#: src/text.C:2417
+#: src/text.C:1591
 #, c-format
 msgid ", Depth: %1$d"
 msgstr ", Dybde: %1$d"
 
-#: src/text.C:2423
+#: src/text.C:1597
 msgid ", Spacing: "
 msgstr ", Linjeavstand: "
 
-#: src/text.C:2435
+#: src/text.C:1609
 msgid "Other ("
 msgstr "Annet ("
 
-#: src/text.C:2444
+#: src/text.C:1618
 msgid ", Inset: "
 msgstr ""
 
-#: src/text.C:2445
+#: src/text.C:1619
 msgid ", Paragraph: "
 msgstr ", Avsnitt: "
 
-#: src/text.C:2446
+#: src/text.C:1620
 msgid ", Id: "
 msgstr ", Id: "
 
-#: src/text.C:2447
+#: src/text.C:1621
 msgid ", Position: "
 msgstr ", Posisjon : "
 
-#: src/text.C:2448
+#: src/text.C:1622
 msgid ", Boundary: "
 msgstr ""
 
-#: src/text2.C:552
+#: src/text2.C:540
 msgid ""
 "No font change defined. Use Character under the Layout menu to define font "
 "change."
@@ -12603,22 +12830,18 @@ msgstr ""
 "Ingen font endring definert. Bruk Tegn under Stil menyen to å definere font "
 "endring."
 
-#: src/text2.C:594
+#: src/text2.C:582
 msgid "Nothing to index!"
 msgstr "Ingenting å indeksere!"
 
-#: src/text2.C:596
+#: src/text2.C:584
 msgid "Cannot index more than one paragraph!"
 msgstr ""
 
-#: src/text3.C:682
+#: src/text3.C:688
 msgid "Unknown spacing argument: "
 msgstr "Ukjent argument til linjeavstand: "
 
-#: src/text3.C:821
-msgid "LyX function 'layout' needs an argument."
-msgstr "LyX funksjonen 'layout' behøver et argument."
-
 #: src/text3.C:839
 msgid "Layout "
 msgstr "Stil "
@@ -12627,11 +12850,11 @@ msgstr "Stil "
 msgid " not known"
 msgstr " ukjent"
 
-#: src/text3.C:1314 src/text3.C:1326
+#: src/text3.C:1327 src/text3.C:1339
 msgid "Character set"
 msgstr "Tegnsett"
 
-#: src/text3.C:1458
+#: src/text3.C:1470
 msgid "Paragraph layout set"
 msgstr "Avsnittstil satt"