Change converter and format definitons for OpenDocument format.

[lyx.git] / po / nb.po

diff --git a/po/nb.po b/po/nb.po
index 70ceb199314d2e21da793fc65b5c89c11f3e04f7..15c76bcc9ce40d9e361c1a9ad93550a998fbd4f9 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lyx 1.4.0\n"
 "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-04-30 14:08+0200\n"
+"POT-Creation-Date: 2007-05-18 00:09+0100\n"
 "PO-Revision-Date: 2007-02-26 23:42+0100\n"
 "Last-Translator: Lars Gullik Bjønnes <larsbj@lyx.org>\n"
 "Language-Team: norsk <no@li.org>\n"
@@ -14,395 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/frontends/qt4/ui/BiblioUi.ui:28
-msgid "Citation Style"
-msgstr "Referansestil"
-
-#: src/frontends/qt4/ui/BiblioUi.ui:40
-msgid "Use the jurabib styles for law and humanities"
-msgstr "Jurabib egner seg for jurister og humanister"
-
-#: src/frontends/qt4/ui/BiblioUi.ui:43
-msgid "&Jurabib"
-msgstr "&Jurabib"
-
-#: src/frontends/qt4/ui/BiblioUi.ui:50
-msgid "Use the natbib styles for natural sciences and arts"
-msgstr "Natbib-stilene brukes for naturvitenskap"
-
-#: src/frontends/qt4/ui/BiblioUi.ui:53
-msgid "&Natbib"
-msgstr "&Natbib"
-
-#: src/frontends/qt4/ui/BiblioUi.ui:60
-msgid "Use BibTeX's default numerical styles"
-msgstr ""
-
-#: src/frontends/qt4/ui/BiblioUi.ui:63
-msgid "&Default (numerical)"
-msgstr "Stan&dard (numerisk)"
-
-#: src/frontends/qt4/ui/BiblioUi.ui:81
-msgid "Natbib &style:"
-msgstr "Natbib-&stil:"
-
-#: src/frontends/qt4/ui/BiblioUi.ui:127
-msgid "Select this if you want to split your bibliography into sections"
-msgstr "Velg dette hvis du ønsker å dele referanselisten inn i seksjoner"
-
-#: src/frontends/qt4/ui/BiblioUi.ui:130
-msgid "S&ectioned bibliography"
-msgstr "Seksjonsinndelt bibliografi"
-
-#: src/frontends/qt4/ui/BranchesUi.ui:47
-msgid "Add a new branch to the list"
-msgstr "Legg en ny dokumentgren til listen"
-
-#: src/frontends/qt4/ui/BranchesUi.ui:50
-#: src/frontends/qt4/ui/BibtexAddUi.ui:70
-#: src/frontends/qt4/ui/CitationUi.ui:116
-#: src/frontends/qt4/ui/PrefCopiersUi.ui:54
-#: src/frontends/qt4/ui/PrefFileformatsUi.ui:54
-msgid "&Add"
-msgstr "Legg til"
-
-#: src/frontends/qt4/ui/BranchesUi.ui:57
-msgid "A&vailable Branches:"
-msgstr "&Tilgjengelige dokumentgrener:"
-
-#: src/frontends/qt4/ui/BranchesUi.ui:67
-msgid "&New:"
-msgstr "&Ny:"
-
-#: src/frontends/qt4/ui/BranchesUi.ui:80
-msgid "Remove the selected branch"
-msgstr "Fjern den valgte dokumentgrenen"
-
-#: src/frontends/qt4/ui/BranchesUi.ui:83
-#: src/frontends/qt4/ui/PrefCopiersUi.ui:68
-#: src/frontends/qt4/ui/PrefFileformatsUi.ui:68
-msgid "&Remove"
-msgstr "Fjern"
-
-#: src/frontends/qt4/ui/BranchesUi.ui:90
-msgid "Toggle the selected branch"
-msgstr "Slår den valgte grenen av eller på"
-
-#: src/frontends/qt4/ui/BranchesUi.ui:93
-msgid "(&De)activate"
-msgstr "&Av/På"
-
-#: src/frontends/qt4/ui/BranchesUi.ui:100
-msgid "Define or change background color"
-msgstr "Velge/forandre bakgrunnsfarge"
-
-#: src/frontends/qt4/ui/BranchesUi.ui:103
-msgid "Alter Co&lor..."
-msgstr "&Endre farge..."
-
-#: src/frontends/qt4/ui/BulletsUi.ui:34
-msgid "&Font:"
-msgstr "&Font:"
-
-#: src/frontends/qt4/ui/BulletsUi.ui:44
-#: src/frontends/qt4/ui/CharacterUi.ui:227
-msgid "Si&ze:"
-msgstr "Størrelse:"
-
-#: src/frontends/qt4/ui/BulletsUi.ui:66 src/frontends/qt4/ui/ExternalUi.ui:192
-#: src/frontends/qt4/ui/GraphicsUi.ui:604
-#: src/frontends/qt4/ui/ParagraphUi.ui:214
-#: src/frontends/qt4/ui/PrefLatexUi.ui:78
-#: src/frontends/qt4/ui/TabularUi.ui:707 src/frontends/qt4/ui/TabularUi.ui:726
-#: src/frontends/qt4/ui/TabularUi.ui:774 lib/ui/stdtoolbars.inc:81
-#: src/Font.cpp:518 src/frontends/controllers/ControlDocument.cpp:49
-#: src/frontends/controllers/ControlExternal.cpp:234
-#: src/frontends/controllers/ControlGraphics.cpp:170
-#: src/frontends/qt4/QDocument.cpp:229 src/tex-strings.cpp:68
-#: src/tex-strings.cpp:79 src/tex-strings.cpp:89
-msgid "Default"
-msgstr "Standard"
-
-#: src/frontends/qt4/ui/BulletsUi.ui:71 src/Font.cpp:64
-#: src/frontends/controllers/frontend_helpers.cpp:960
-msgid "Tiny"
-msgstr "Bitteliten"
-
-#: src/frontends/qt4/ui/BulletsUi.ui:76 src/Font.cpp:64
-#: src/frontends/controllers/frontend_helpers.cpp:964
-msgid "Smallest"
-msgstr "Minst"
-
-#: src/frontends/qt4/ui/BulletsUi.ui:81 src/Font.cpp:64
-#: src/frontends/controllers/frontend_helpers.cpp:968
-msgid "Smaller"
-msgstr "Mindre"
-
-#: src/frontends/qt4/ui/BulletsUi.ui:86 src/Font.cpp:64
-#: src/frontends/controllers/frontend_helpers.cpp:972
-msgid "Small"
-msgstr "Liten"
-
-#: src/frontends/qt4/ui/BulletsUi.ui:91 src/Font.cpp:64
-#: src/frontends/controllers/frontend_helpers.cpp:976
-msgid "Normal"
-msgstr "Normal"
-
-#: src/frontends/qt4/ui/BulletsUi.ui:96 src/Font.cpp:64
-#: src/frontends/controllers/frontend_helpers.cpp:980
-msgid "Large"
-msgstr "Stor"
-
-#: src/frontends/qt4/ui/BulletsUi.ui:101 src/Font.cpp:65
-#: src/frontends/controllers/frontend_helpers.cpp:984
-msgid "Larger"
-msgstr "Større"
-
-#: src/frontends/qt4/ui/BulletsUi.ui:106 src/Font.cpp:65
-#: src/frontends/controllers/frontend_helpers.cpp:988
-msgid "Largest"
-msgstr "Størst"
-
-#: src/frontends/qt4/ui/BulletsUi.ui:111 src/Font.cpp:65
-#: src/frontends/controllers/frontend_helpers.cpp:992
-msgid "Huge"
-msgstr "Enorm"
-
-#: src/frontends/qt4/ui/BulletsUi.ui:116 src/Font.cpp:65
-#: src/frontends/controllers/frontend_helpers.cpp:996
-msgid "Huger"
-msgstr "Gigantisk"
-
-#: src/frontends/qt4/ui/BulletsUi.ui:144
-msgid "&Custom Bullet:"
-msgstr "&Egendefinert bombe:"
-
-#: src/frontends/qt4/ui/BulletsUi.ui:174
-msgid "&Level:"
-msgstr "&Nivå:"
-
-#: src/frontends/qt4/ui/FloatPlacementUi.ui:16
-msgid "Form"
-msgstr ""
-
-#: src/frontends/qt4/ui/FloatPlacementUi.ui:28
-msgid "Use &default placement"
-msgstr "Bruk standard plassering"
-
-#: src/frontends/qt4/ui/FloatPlacementUi.ui:35
-msgid "Advanced Placement Options"
-msgstr "Avanserte plasseringsinnstillinger"
-
-#: src/frontends/qt4/ui/FloatPlacementUi.ui:47
-msgid "&Top of page"
-msgstr "Øverst på siden"
-
-#: src/frontends/qt4/ui/FloatPlacementUi.ui:54
-msgid "&Ignore LaTeX rules"
-msgstr "Ignorer LaTeX regler"
-
-#: src/frontends/qt4/ui/FloatPlacementUi.ui:61
-msgid "Here de&finitely"
-msgstr "Her, uansett"
-
-#: src/frontends/qt4/ui/FloatPlacementUi.ui:68
-msgid "&Here if possible"
-msgstr "&Her, om mulig"
-
-#: src/frontends/qt4/ui/FloatPlacementUi.ui:75
-msgid "&Page of floats"
-msgstr "Side med \"floats\""
-
-#: src/frontends/qt4/ui/FloatPlacementUi.ui:82
-msgid "&Bottom of page"
-msgstr "Nederst på siden"
-
-#: src/frontends/qt4/ui/FloatPlacementUi.ui:92
-msgid "&Span columns"
-msgstr "&Gå over flere kolonner"
-
-#: src/frontends/qt4/ui/FloatPlacementUi.ui:99
-msgid "&Rotate sideways"
-msgstr "Rotér 90°"
-
-#: src/frontends/qt4/ui/FontUi.ui:13
-msgid "FontUi"
-msgstr ""
-
-#: src/frontends/qt4/ui/FontUi.ui:64
-msgid "Sc&ale (%):"
-msgstr "Sk&alert (%):"
-
-#: src/frontends/qt4/ui/FontUi.ui:77
-msgid "&Typewriter:"
-msgstr "&Maskinskrift:"
-
-#: src/frontends/qt4/ui/FontUi.ui:90
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:114
-msgid "&Roman:"
-msgstr ""
-
-#: src/frontends/qt4/ui/FontUi.ui:110
-msgid "S&cale (%):"
-msgstr "Sk&alert (%):"
-
-#: src/frontends/qt4/ui/FontUi.ui:123
-msgid "&Sans Serif:"
-msgstr "&Sans Serif:"
-
-#: src/frontends/qt4/ui/FontUi.ui:146
-msgid "Use &Old Style Figures"
-msgstr "Bruk renessanse&tall"
-
-#: 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:58
-msgid "Document &class:"
-msgstr "Dokument&klasse:"
-
-#: src/frontends/qt4/ui/LaTeXUi.ui:68
-msgid "&Options:"
-msgstr "&Innstillinger:"
-
-#: src/frontends/qt4/ui/LaTeXUi.ui:78
-msgid "Postscript &driver:"
-msgstr "Postscript&driver:"
-
-#: src/frontends/qt4/ui/LanguageUi.ui:36
-#: src/frontends/qt4/ui/CharacterUi.ui:163
-msgid "&Language:"
-msgstr "Språk:"
-
-#: src/frontends/qt4/ui/LanguageUi.ui:76
-msgid "&Use language's default encoding"
-msgstr "&Bruk standard tegnkoding for språket"
-
-#: src/frontends/qt4/ui/LanguageUi.ui:131
-msgid "&Encoding:"
-msgstr "&Enkoding:"
-
-#: src/frontends/qt4/ui/LanguageUi.ui:141
-msgid "&Quote Style:"
-msgstr "Siteringsstil:"
-
-#: src/frontends/qt4/ui/MarginsUi.ui:28
-msgid "Use the margin settings provided by the document class"
-msgstr "Bruk standardmarger for dokumentklassen"
-
-#: src/frontends/qt4/ui/MarginsUi.ui:31
-msgid "&Default Margins"
-msgstr "Standard marger"
-
-#: src/frontends/qt4/ui/MarginsUi.ui:89
-msgid "&Top:"
-msgstr "Øverst:"
-
-#: src/frontends/qt4/ui/MarginsUi.ui:102
-msgid "&Bottom:"
-msgstr "Nederst:"
-
-#: src/frontends/qt4/ui/MarginsUi.ui:115
-msgid "&Inner:"
-msgstr "Indre:"
-
-#: src/frontends/qt4/ui/MarginsUi.ui:128
-msgid "O&uter:"
-msgstr "Ytre:"
-
-#: src/frontends/qt4/ui/MarginsUi.ui:141
-msgid "Head &sep:"
-msgstr "Avstand til topptekst:"
-
-#: src/frontends/qt4/ui/MarginsUi.ui:154
-msgid "Head &height:"
-msgstr "&Høyde på topptekst:"
-
-#: src/frontends/qt4/ui/MarginsUi.ui:167
-msgid "&Foot skip:"
-msgstr "Avstand til bunntekst:"
-
-#: src/frontends/qt4/ui/MathsUi.ui:28
-msgid "&Use AMS math package automatically"
-msgstr "Bruk AMS-matematikk automatisk"
-
-#: src/frontends/qt4/ui/MathsUi.ui:38
-msgid "Use AMS &math package"
-msgstr "Bruk AMS-matematikk"
-
-#: src/frontends/qt4/ui/MathsUi.ui:45
-msgid "Use esint package &automatically"
-msgstr "Bruk \"esint\"-pakken automatisk"
-
-#: src/frontends/qt4/ui/MathsUi.ui:55
-msgid "Use &esint package"
-msgstr "Bruk \"esint\"-pakken"
-
-#: src/frontends/qt4/ui/NumberingUi.ui:63
-msgid "&List in Table of Contents"
-msgstr "&Vis i innholdsfortegnelse"
-
-#: src/frontends/qt4/ui/NumberingUi.ui:73
-msgid "&Numbering"
-msgstr "Nummerering"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:28
-msgid "Paper Size"
-msgstr "Arkstørrelse"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:43 src/frontends/qt4/ui/BoxUi.ui:122
-#: src/frontends/qt4/ui/ExternalUi.ui:507
-msgid "&Height:"
-msgstr "&Høyde:"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:56 src/frontends/qt4/ui/BoxUi.ui:138
-#: src/frontends/qt4/ui/ExternalUi.ui:484
-#: src/frontends/qt4/ui/TabularUi.ui:103 src/frontends/qt4/ui/WrapUi.ui:39
-msgid "&Width:"
-msgstr "Bredde:"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:74
-msgid "Choose a particular paper size, or set your own with \"Custom\""
-msgstr ""
-"Velg en papirstørrelse, eller spesifiser din egen med \"Brukerdefinert\""
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:128
-msgid "Orientation"
-msgstr "Orientering"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:140
-msgid "&Portrait"
-msgstr "Stående"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:150
-msgid "&Landscape"
-msgstr "Liggende"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:168
-msgid "Page &style:"
-msgstr "Sidestil:"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:186
-msgid "Style used for the page header and footer"
-msgstr "Stil for sidens hode og fot"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:195
-msgid "Lay out the page for double-sided printing"
-msgstr "Layout for dobbeltsidig utskrift"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:198
-msgid "&Two-sided document"
-msgstr "&Tosidig dokument"
-
 #: src/frontends/qt4/ui/AboutUi.ui:32
 msgid "Version"
 msgstr "Versjon"
@@ -425,7 +36,7 @@ msgstr "Copyright"
 #: src/frontends/qt4/ui/DelimiterUi.ui:107
 #: src/frontends/qt4/ui/ErrorListUi.ui:62
 #: src/frontends/qt4/ui/ExternalUi.ui:705 src/frontends/qt4/ui/FloatUi.ui:85
-#: src/frontends/qt4/ui/IncludeUi.ui:199 src/frontends/qt4/ui/LogUi.ui:71
+#: src/frontends/qt4/ui/IncludeUi.ui:237 src/frontends/qt4/ui/LogUi.ui:71
 #: src/frontends/qt4/ui/ParagraphUi.ui:99 src/frontends/qt4/ui/PrefsUi.ui:96
 #: src/frontends/qt4/ui/RefUi.ui:100 src/frontends/qt4/ui/SearchUi.ui:210
 #: src/frontends/qt4/ui/ShowFileUi.ui:58
@@ -452,7 +63,7 @@ msgstr "&Dummy"
 #: src/frontends/qt4/ui/DocumentUi.ui:135 src/frontends/qt4/ui/ERTUi.ui:100
 #: src/frontends/qt4/ui/ExternalUi.ui:685 src/frontends/qt4/ui/FloatUi.ui:68
 #: src/frontends/qt4/ui/GraphicsUi.ui:702
-#: src/frontends/qt4/ui/IncludeUi.ui:189 src/frontends/qt4/ui/IndexUi.ui:82
+#: src/frontends/qt4/ui/IncludeUi.ui:227 src/frontends/qt4/ui/IndexUi.ui:82
 #: src/frontends/qt4/ui/MathMatrixUi.ui:170
 #: src/frontends/qt4/ui/NomenclUi.ui:92 src/frontends/qt4/ui/NoteUi.ui:31
 #: src/frontends/qt4/ui/ParagraphUi.ui:76 src/frontends/qt4/ui/RefUi.ui:80
@@ -466,8 +77,8 @@ msgstr "&OK"
 #: src/frontends/qt4/ui/AskForTextUi.ui:94
 #: src/frontends/qt4/ui/CitationUi.ui:323
 #: src/frontends/qt4/ui/DocumentUi.ui:152 src/BufferList.cpp:114
-#: src/BufferList.cpp:222 src/LyXFunc.cpp:727 src/LyXFunc.cpp:900
-#: src/LyXFunc.cpp:1066 src/LyXFunc.cpp:2027 src/LyXVC.cpp:175
+#: src/BufferList.cpp:222 src/LyXFunc.cpp:735 src/LyXFunc.cpp:908
+#: src/LyXFunc.cpp:1074 src/LyXFunc.cpp:2039 src/LyXVC.cpp:175
 #: src/buffer_funcs.cpp:101 src/buffer_funcs.cpp:128 src/buffer_funcs.cpp:169
 #: src/callback.cpp:117 src/callback.cpp:170
 msgid "&Cancel"
@@ -482,7 +93,7 @@ msgid "The label as it appears in the document"
 msgstr "Referansemerket slik det vises i dokumentet"
 
 #: src/frontends/qt4/ui/BibitemUi.ui:64 src/frontends/qt4/ui/RefUi.ui:145
-#: src/frontends/qt4/Dialogs.cpp:234
+#: src/frontends/qt4/Dialogs.cpp:236
 msgid "&Label:"
 msgstr "&Merke:"
 
@@ -490,14 +101,63 @@ msgstr "&Merke:"
 msgid "&Key:"
 msgstr "&Nøkkel:"
 
+#: src/frontends/qt4/ui/BiblioUi.ui:28
+msgid "Citation Style"
+msgstr "Referansestil"
+
+#: src/frontends/qt4/ui/BiblioUi.ui:40
+msgid "Use the jurabib styles for law and humanities"
+msgstr "Jurabib egner seg for jurister og humanister"
+
+#: src/frontends/qt4/ui/BiblioUi.ui:43
+msgid "&Jurabib"
+msgstr "&Jurabib"
+
+#: src/frontends/qt4/ui/BiblioUi.ui:50
+msgid "Use the natbib styles for natural sciences and arts"
+msgstr "Natbib-stilene brukes for naturvitenskap"
+
+#: src/frontends/qt4/ui/BiblioUi.ui:53
+msgid "&Natbib"
+msgstr "&Natbib"
+
+#: src/frontends/qt4/ui/BiblioUi.ui:60
+msgid "Use BibTeX's default numerical styles"
+msgstr ""
+
+#: src/frontends/qt4/ui/BiblioUi.ui:63
+msgid "&Default (numerical)"
+msgstr "Stan&dard (numerisk)"
+
+#: src/frontends/qt4/ui/BiblioUi.ui:81
+msgid "Natbib &style:"
+msgstr "Natbib-&stil:"
+
+#: src/frontends/qt4/ui/BiblioUi.ui:127
+msgid "Select this if you want to split your bibliography into sections"
+msgstr "Velg dette hvis du ønsker å dele referanselisten inn i seksjoner"
+
+#: src/frontends/qt4/ui/BiblioUi.ui:130
+msgid "S&ectioned bibliography"
+msgstr "Seksjonsinndelt bibliografi"
+
 #: src/frontends/qt4/ui/BibtexAddUi.ui:24
 msgid "LyX: Add BibTeX Database"
 msgstr "LyX: Legg til BibTeX Database"
 
+#: src/frontends/qt4/ui/BibtexAddUi.ui:70
+#: src/frontends/qt4/ui/BranchesUi.ui:50
+#: src/frontends/qt4/ui/CitationUi.ui:116
+#: src/frontends/qt4/ui/PrefCopiersUi.ui:54
+#: src/frontends/qt4/ui/PrefFileformatsUi.ui:54
+msgid "&Add"
+msgstr "Legg til"
+
 #: src/frontends/qt4/ui/BibtexAddUi.ui:83 src/frontends/qt4/ui/BibtexUi.ui:229
 #: src/frontends/qt4/ui/ChangesUi.ui:78 src/frontends/qt4/ui/IndexUi.ui:92
+#: src/frontends/qt4/ui/ListingsUi.ui:534
 #: src/frontends/qt4/ui/NomenclUi.ui:105 src/frontends/qt4/ui/SendtoUi.ui:95
-#: src/BufferView.cpp:264 src/LyXFunc.cpp:843 src/frontends/qt4/Qt2BC.h:36
+#: src/BufferView.cpp:264 src/LyXFunc.cpp:851 src/frontends/qt4/Qt2BC.h:36
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -507,7 +167,7 @@ msgstr "Velg en BibTeX database som skal legges til"
 
 #: src/frontends/qt4/ui/BibtexAddUi.ui:126
 #: src/frontends/qt4/ui/BibtexUi.ui:106 src/frontends/qt4/ui/ExternalUi.ui:99
-#: src/frontends/qt4/ui/GraphicsUi.ui:71 src/frontends/qt4/ui/IncludeUi.ui:145
+#: src/frontends/qt4/ui/GraphicsUi.ui:71 src/frontends/qt4/ui/IncludeUi.ui:319
 #: src/frontends/qt4/ui/PrintUi.ui:316
 msgid "&Browse..."
 msgstr "&Se igjennom..."
@@ -619,6 +279,17 @@ msgstr "H
 msgid "Width value"
 msgstr "Breddemål"
 
+#: src/frontends/qt4/ui/BoxUi.ui:122 src/frontends/qt4/ui/ExternalUi.ui:507
+#: src/frontends/qt4/ui/PageLayoutUi.ui:43
+msgid "&Height:"
+msgstr "&Høyde:"
+
+#: src/frontends/qt4/ui/BoxUi.ui:138 src/frontends/qt4/ui/ExternalUi.ui:484
+#: src/frontends/qt4/ui/PageLayoutUi.ui:56
+#: src/frontends/qt4/ui/TabularUi.ui:103 src/frontends/qt4/ui/WrapUi.ui:39
+msgid "&Width:"
+msgstr "Bredde:"
+
 #: src/frontends/qt4/ui/BoxUi.ui:148 src/frontends/qt4/ui/MathMatrixUi.ui:202
 #: src/frontends/qt4/ui/ParagraphUi.ui:251
 msgid "Alignment"
@@ -691,31 +362,150 @@ msgstr "Vertikal justering av innholdet i boksen"
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: src/frontends/qt4/ui/BoxUi.ui:293 src/frontends/qt4/ui/CitationUi.ui:283
-#: src/frontends/qt4/ui/DocumentUi.ui:112 src/frontends/qt4/ui/FloatUi.ui:42
-#: src/frontends/qt4/ui/GraphicsUi.ui:673
-#: src/frontends/qt4/ui/ParagraphUi.ui:50 src/frontends/qt4/ui/PrefsUi.ui:50
-#: src/frontends/qt4/ui/WrapUi.ui:164
-msgid "&Restore"
-msgstr "&Tilbakestill"
+#: src/frontends/qt4/ui/BoxUi.ui:293 src/frontends/qt4/ui/CitationUi.ui:283
+#: src/frontends/qt4/ui/DocumentUi.ui:112 src/frontends/qt4/ui/FloatUi.ui:42
+#: src/frontends/qt4/ui/GraphicsUi.ui:673
+#: src/frontends/qt4/ui/ParagraphUi.ui:50 src/frontends/qt4/ui/PrefsUi.ui:50
+#: src/frontends/qt4/ui/WrapUi.ui:164
+msgid "&Restore"
+msgstr "&Tilbakestill"
+
+#: src/frontends/qt4/ui/BoxUi.ui:338 src/frontends/qt4/ui/CharacterUi.ui:380
+#: src/frontends/qt4/ui/DocumentUi.ui:145
+#: src/frontends/qt4/ui/ExternalUi.ui:695 src/frontends/qt4/ui/FloatUi.ui:78
+#: src/frontends/qt4/ui/GraphicsUi.ui:723
+#: src/frontends/qt4/ui/ParagraphUi.ui:89 src/frontends/qt4/ui/PrefsUi.ui:86
+#: src/frontends/qt4/ui/RefUi.ui:90 src/frontends/qt4/ui/SendtoUi.ui:88
+#: src/frontends/qt4/ui/VSpaceUi.ui:158 src/frontends/qt4/ui/WrapUi.ui:206
+msgid "&Apply"
+msgstr "&Bruk"
+
+#: src/frontends/qt4/ui/BranchUi.ui:59
+msgid "&Available branches:"
+msgstr "Tilgjengelige dokumentgrener:"
+
+#: src/frontends/qt4/ui/BranchUi.ui:69
+msgid "Select your branch"
+msgstr "Velg dokumentgren"
+
+#: src/frontends/qt4/ui/BranchesUi.ui:47
+msgid "Add a new branch to the list"
+msgstr "Legg en ny dokumentgren til listen"
+
+#: src/frontends/qt4/ui/BranchesUi.ui:57
+msgid "A&vailable Branches:"
+msgstr "&Tilgjengelige dokumentgrener:"
+
+#: src/frontends/qt4/ui/BranchesUi.ui:67
+msgid "&New:"
+msgstr "&Ny:"
+
+#: src/frontends/qt4/ui/BranchesUi.ui:80
+msgid "Remove the selected branch"
+msgstr "Fjern den valgte dokumentgrenen"
+
+#: src/frontends/qt4/ui/BranchesUi.ui:83
+#: src/frontends/qt4/ui/PrefCopiersUi.ui:68
+#: src/frontends/qt4/ui/PrefFileformatsUi.ui:68
+msgid "&Remove"
+msgstr "Fjern"
+
+#: src/frontends/qt4/ui/BranchesUi.ui:90
+msgid "Toggle the selected branch"
+msgstr "Slår den valgte grenen av eller på"
+
+#: src/frontends/qt4/ui/BranchesUi.ui:93
+msgid "(&De)activate"
+msgstr "&Av/På"
+
+#: src/frontends/qt4/ui/BranchesUi.ui:100
+msgid "Define or change background color"
+msgstr "Velge/forandre bakgrunnsfarge"
+
+#: src/frontends/qt4/ui/BranchesUi.ui:103
+msgid "Alter Co&lor..."
+msgstr "&Endre farge..."
+
+#: src/frontends/qt4/ui/BulletsUi.ui:34
+msgid "&Font:"
+msgstr "&Font:"
+
+#: src/frontends/qt4/ui/BulletsUi.ui:44
+#: src/frontends/qt4/ui/CharacterUi.ui:227
+msgid "Si&ze:"
+msgstr "Størrelse:"
+
+#: src/frontends/qt4/ui/BulletsUi.ui:66 src/frontends/qt4/ui/ExternalUi.ui:192
+#: src/frontends/qt4/ui/GraphicsUi.ui:604
+#: src/frontends/qt4/ui/ParagraphUi.ui:214
+#: src/frontends/qt4/ui/PrefLatexUi.ui:78
+#: src/frontends/qt4/ui/TabularUi.ui:707 src/frontends/qt4/ui/TabularUi.ui:726
+#: src/frontends/qt4/ui/TabularUi.ui:774 lib/ui/stdtoolbars.inc:81
+#: src/Font.cpp:521 src/frontends/controllers/ControlDocument.cpp:48
+#: src/frontends/controllers/ControlExternal.cpp:234
+#: src/frontends/controllers/ControlGraphics.cpp:170
+#: src/frontends/qt4/QDocument.cpp:71 src/frontends/qt4/QDocument.cpp:82
+#: src/frontends/qt4/QDocument.cpp:92 src/frontends/qt4/QDocument.cpp:336
+msgid "Default"
+msgstr "Standard"
+
+#: src/frontends/qt4/ui/BulletsUi.ui:71 src/Font.cpp:67
+#: src/frontends/controllers/frontend_helpers.cpp:960
+msgid "Tiny"
+msgstr "Bitteliten"
+
+#: src/frontends/qt4/ui/BulletsUi.ui:76 src/Font.cpp:67
+#: src/frontends/controllers/frontend_helpers.cpp:964
+msgid "Smallest"
+msgstr "Minst"
+
+#: src/frontends/qt4/ui/BulletsUi.ui:81 src/Font.cpp:67
+#: src/frontends/controllers/frontend_helpers.cpp:968
+msgid "Smaller"
+msgstr "Mindre"
+
+#: src/frontends/qt4/ui/BulletsUi.ui:86 src/Font.cpp:67
+#: src/frontends/controllers/frontend_helpers.cpp:972
+msgid "Small"
+msgstr "Liten"
+
+#: src/frontends/qt4/ui/BulletsUi.ui:91 src/Font.cpp:67
+#: src/frontends/controllers/frontend_helpers.cpp:976
+msgid "Normal"
+msgstr "Normal"
+
+#: src/frontends/qt4/ui/BulletsUi.ui:96 src/Font.cpp:67
+#: src/frontends/controllers/frontend_helpers.cpp:980
+msgid "Large"
+msgstr "Stor"
+
+#: src/frontends/qt4/ui/BulletsUi.ui:101 src/Font.cpp:68
+#: src/frontends/controllers/frontend_helpers.cpp:984
+msgid "Larger"
+msgstr "Større"
+
+#: src/frontends/qt4/ui/BulletsUi.ui:106 src/Font.cpp:68
+#: src/frontends/controllers/frontend_helpers.cpp:988
+msgid "Largest"
+msgstr "Størst"
+
+#: src/frontends/qt4/ui/BulletsUi.ui:111 src/Font.cpp:68
+#: src/frontends/controllers/frontend_helpers.cpp:992
+msgid "Huge"
+msgstr "Enorm"
 
-#: src/frontends/qt4/ui/BoxUi.ui:338 src/frontends/qt4/ui/CharacterUi.ui:380
-#: src/frontends/qt4/ui/DocumentUi.ui:145
-#: src/frontends/qt4/ui/ExternalUi.ui:695 src/frontends/qt4/ui/FloatUi.ui:78
-#: src/frontends/qt4/ui/GraphicsUi.ui:723
-#: src/frontends/qt4/ui/ParagraphUi.ui:89 src/frontends/qt4/ui/PrefsUi.ui:86
-#: src/frontends/qt4/ui/RefUi.ui:90 src/frontends/qt4/ui/SendtoUi.ui:88
-#: src/frontends/qt4/ui/VSpaceUi.ui:158 src/frontends/qt4/ui/WrapUi.ui:206
-msgid "&Apply"
-msgstr "&Bruk"
+#: src/frontends/qt4/ui/BulletsUi.ui:116 src/Font.cpp:68
+#: src/frontends/controllers/frontend_helpers.cpp:996
+msgid "Huger"
+msgstr "Gigantisk"
 
-#: src/frontends/qt4/ui/BranchUi.ui:59
-msgid "&Available branches:"
-msgstr "Tilgjengelige dokumentgrener:"
+#: src/frontends/qt4/ui/BulletsUi.ui:144
+msgid "&Custom Bullet:"
+msgstr "&Egendefinert bombe:"
 
-#: src/frontends/qt4/ui/BranchUi.ui:69
-msgid "Select your branch"
-msgstr "Velg dokumentgren"
+#: src/frontends/qt4/ui/BulletsUi.ui:174
+msgid "&Level:"
+msgstr "&Nivå:"
 
 #: src/frontends/qt4/ui/ChangesUi.ui:31
 msgid "Change:"
@@ -769,9 +559,10 @@ msgid "Font series"
 msgstr "Font serier"
 
 #: src/frontends/qt4/ui/CharacterUi.ui:114
-#: src/frontends/qt4/ui/CharacterUi.ui:160 lib/layouts/europecv.layout:144
-#: lib/layouts/moderncv.layout:129 src/frontends/qt4/QDocument.cpp:467
-#: src/frontends/qt4/QPrefs.cpp:1569
+#: src/frontends/qt4/ui/CharacterUi.ui:160
+#: src/frontends/qt4/ui/ListingsUi.ui:105 lib/layouts/europecv.layout:144
+#: lib/layouts/moderncv.layout:129 src/frontends/qt4/QDocument.cpp:570
+#: src/frontends/qt4/QPrefs.cpp:1587
 msgid "Language"
 msgstr "Språk"
 
@@ -780,6 +571,11 @@ msgstr "Spr
 msgid "Font color"
 msgstr "Fontfarge"
 
+#: src/frontends/qt4/ui/CharacterUi.ui:163
+#: src/frontends/qt4/ui/LanguageUi.ui:36
+msgid "&Language:"
+msgstr "Språk:"
+
 #: src/frontends/qt4/ui/CharacterUi.ui:176
 msgid "&Series:"
 msgstr "Serie:"
@@ -829,8 +625,9 @@ msgstr "Gj
 #: src/frontends/qt4/ui/CharacterUi.ui:390 src/frontends/qt4/ui/ERTUi.ui:110
 #: src/frontends/qt4/ui/GraphicsUi.ui:744
 #: src/frontends/qt4/ui/MathMatrixUi.ui:177 src/frontends/qt4/ui/NoteUi.ui:41
-#: src/frontends/qt4/ui/PrintUi.ui:246 src/frontends/qt4/ui/TabularUi.ui:1131
-#: src/frontends/qt4/ui/TabularCreateUi.ui:75 src/frontends/qt4/Qt2BC.h:37
+#: src/frontends/qt4/ui/PrintUi.ui:246
+#: src/frontends/qt4/ui/TabularCreateUi.ui:75
+#: src/frontends/qt4/ui/TabularUi.ui:1131 src/frontends/qt4/Qt2BC.h:37
 msgid "Close"
 msgstr "Lukk"
 
@@ -838,7 +635,7 @@ msgstr "Lukk"
 msgid "Move the selected citation up"
 msgstr "Flytt den valgte litteraturreferansen opp"
 
-#: src/frontends/qt4/ui/CitationUi.ui:55 src/frontends/qt4/ui/TocUi.ui:79
+#: src/frontends/qt4/ui/CitationUi.ui:55
 msgid "&Up"
 msgstr "&Opp"
 
@@ -1024,7 +821,7 @@ msgstr "Rediger filen eksternt"
 msgid "&Edit File..."
 msgstr "Rediger fil..."
 
-#: src/frontends/qt4/ui/ExternalUi.ui:96 src/frontends/qt4/ui/IncludeUi.ui:142
+#: src/frontends/qt4/ui/ExternalUi.ui:96 src/frontends/qt4/ui/IncludeUi.ui:316
 msgid "Select a file"
 msgstr "Velg en fil"
 
@@ -1034,7 +831,7 @@ msgid "Filename"
 msgstr "Filnavn"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:109
-#: src/frontends/qt4/ui/GraphicsUi.ui:88 src/frontends/qt4/ui/IncludeUi.ui:155
+#: src/frontends/qt4/ui/GraphicsUi.ui:88 src/frontends/qt4/ui/IncludeUi.ui:249
 #: src/frontends/qt4/ui/PrintUi.ui:296
 msgid "&File:"
 msgstr "&Fil:"
@@ -1211,6 +1008,91 @@ msgstr "Innstillinger:"
 msgid "Forma&t:"
 msgstr "Forma&t:"
 
+#: src/frontends/qt4/ui/FloatPlacementUi.ui:16
+msgid "Form"
+msgstr ""
+
+#: src/frontends/qt4/ui/FloatPlacementUi.ui:28
+msgid "Use &default placement"
+msgstr "Bruk standard plassering"
+
+#: src/frontends/qt4/ui/FloatPlacementUi.ui:35
+msgid "Advanced Placement Options"
+msgstr "Avanserte plasseringsinnstillinger"
+
+#: src/frontends/qt4/ui/FloatPlacementUi.ui:47
+msgid "&Top of page"
+msgstr "Øverst på siden"
+
+#: src/frontends/qt4/ui/FloatPlacementUi.ui:54
+msgid "&Ignore LaTeX rules"
+msgstr "Ignorer LaTeX regler"
+
+#: src/frontends/qt4/ui/FloatPlacementUi.ui:61
+msgid "Here de&finitely"
+msgstr "Her, uansett"
+
+#: src/frontends/qt4/ui/FloatPlacementUi.ui:68
+msgid "&Here if possible"
+msgstr "&Her, om mulig"
+
+#: src/frontends/qt4/ui/FloatPlacementUi.ui:75
+msgid "&Page of floats"
+msgstr "Side med \"floats\""
+
+#: src/frontends/qt4/ui/FloatPlacementUi.ui:82
+msgid "&Bottom of page"
+msgstr "Nederst på siden"
+
+#: src/frontends/qt4/ui/FloatPlacementUi.ui:92
+msgid "&Span columns"
+msgstr "&Gå over flere kolonner"
+
+#: src/frontends/qt4/ui/FloatPlacementUi.ui:99
+msgid "&Rotate sideways"
+msgstr "Rotér 90°"
+
+#: src/frontends/qt4/ui/FontUi.ui:13
+msgid "FontUi"
+msgstr ""
+
+#: src/frontends/qt4/ui/FontUi.ui:64
+msgid "Sc&ale (%):"
+msgstr "Sk&alert (%):"
+
+#: src/frontends/qt4/ui/FontUi.ui:77
+msgid "&Typewriter:"
+msgstr "&Maskinskrift:"
+
+#: src/frontends/qt4/ui/FontUi.ui:90
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:114
+msgid "&Roman:"
+msgstr ""
+
+#: src/frontends/qt4/ui/FontUi.ui:110
+msgid "S&cale (%):"
+msgstr "Sk&alert (%):"
+
+#: src/frontends/qt4/ui/FontUi.ui:123
+msgid "&Sans Serif:"
+msgstr "&Sans Serif:"
+
+#: src/frontends/qt4/ui/FontUi.ui:146
+msgid "Use &Old Style Figures"
+msgstr "Bruk renessanse&tall"
+
+#: 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/GraphicsUi.ui:43
 msgid "&Graphics"
 msgstr "&Grafikk"
@@ -1224,6 +1106,7 @@ msgid "Select an image file"
 msgstr "Velg en bildefil"
 
 #: src/frontends/qt4/ui/GraphicsUi.ui:78 src/frontends/qt4/ui/GraphicsUi.ui:85
+#: src/frontends/qt4/ui/ListingsUi.ui:165
 msgid "File name of image"
 msgstr "Filnavn for bildet"
 
@@ -1335,48 +1218,226 @@ msgid "Sca&le on Screen (%):"
 msgstr "Størrelse på skjermen (%):"
 
 #: src/frontends/qt4/ui/IncludeUi.ui:36
-msgid "Show LaTeX preview"
-msgstr "Vis LaTeX forhåndsvisning"
+msgid "Listing Params"
+msgstr ""
 
-#: src/frontends/qt4/ui/IncludeUi.ui:39
-msgid "&Show preview"
-msgstr "&Forhåndsvisning"
+#: src/frontends/qt4/ui/IncludeUi.ui:76
+#, fuzzy
+msgid "C&aption:"
+msgstr "&Bildetekst:"
+
+#: src/frontends/qt4/ui/IncludeUi.ui:89
+#, fuzzy
+msgid "La&bel:"
+msgstr "&Merke:"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:54
+#: src/frontends/qt4/ui/IncludeUi.ui:99
+msgid "Mo&re parameters"
+msgstr ""
+
+#: src/frontends/qt4/ui/IncludeUi.ui:173
 msgid "Underline spaces in generated output"
 msgstr "Understrek blanke tegn i utskrift"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:57
+#: src/frontends/qt4/ui/IncludeUi.ui:176
 msgid "&Mark spaces in output"
 msgstr "&Vis mellomrom i utskrift"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:80
+#: src/frontends/qt4/ui/IncludeUi.ui:191
+msgid "Show LaTeX preview"
+msgstr "Vis LaTeX forhåndsvisning"
+
+#: src/frontends/qt4/ui/IncludeUi.ui:194
+msgid "&Show preview"
+msgstr "&Forhåndsvisning"
+
+#: src/frontends/qt4/ui/IncludeUi.ui:259
 msgid "File name to include"
 msgstr "Velg dokument som skal settes inn"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:87
+#: src/frontends/qt4/ui/IncludeUi.ui:266
+msgid "&Include Type:"
+msgstr "&Innkluderingsform:"
+
+#: src/frontends/qt4/ui/IncludeUi.ui:277 src/insets/InsetInclude.cpp:322
+msgid "Include"
+msgstr "Inkluder"
+
+#: src/frontends/qt4/ui/IncludeUi.ui:282 src/insets/InsetInclude.cpp:313
+msgid "Input"
+msgstr ""
+
+#: src/frontends/qt4/ui/IncludeUi.ui:287 lib/layouts/manpage.layout:122
+msgid "Verbatim"
+msgstr ""
+
+#: src/frontends/qt4/ui/IncludeUi.ui:292 src/insets/InsetListings.cpp:238
+#, fuzzy
+msgid "Listings"
+msgstr "Liste"
+
+#: src/frontends/qt4/ui/IncludeUi.ui:326
 msgid "Load the file"
 msgstr "Les inn filen"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:90
+#: src/frontends/qt4/ui/IncludeUi.ui:329
 msgid "&Load"
 msgstr "&Les inn"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:114 src/insets/InsetInclude.cpp:312
-msgid "Include"
-msgstr "Inkluder"
+#: src/frontends/qt4/ui/LaTeXUi.ui:58
+msgid "Document &class:"
+msgstr "Dokument&klasse:"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:119 src/insets/InsetInclude.cpp:303
-msgid "Input"
+#: src/frontends/qt4/ui/LaTeXUi.ui:68
+msgid "&Options:"
+msgstr "&Innstillinger:"
+
+#: src/frontends/qt4/ui/LaTeXUi.ui:78
+msgid "Postscript &driver:"
+msgstr "Postscript&driver:"
+
+#: src/frontends/qt4/ui/LanguageUi.ui:76
+msgid "&Use language's default encoding"
+msgstr "&Bruk standard tegnkoding for språket"
+
+#: src/frontends/qt4/ui/LanguageUi.ui:131
+msgid "&Encoding:"
+msgstr "&Enkoding:"
+
+#: src/frontends/qt4/ui/LanguageUi.ui:141
+msgid "&Quote Style:"
+msgstr "Siteringsstil:"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:16
+#, fuzzy
+msgid "Listing"
+msgstr "Liste"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:35
+#, fuzzy
+msgid "Main Settings"
+msgstr "Gren-innstillinger"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:63
+#, fuzzy
+msgid "Placement"
+msgstr "&Plassering:"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:78
+#, fuzzy
+msgid "Placement:"
+msgstr "&Plassering:"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:88
+#, fuzzy
+msgid "Float"
+msgstr "Flytende (Float)|a"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:95
+msgid "Inline listing"
 msgstr ""
 
-#: src/frontends/qt4/ui/IncludeUi.ui:124 lib/layouts/manpage.layout:122
-msgid "Verbatim"
+#: src/frontends/qt4/ui/ListingsUi.ui:133
+#, fuzzy
+msgid "Line numbering"
+msgstr "Nummerering"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:145
+#, fuzzy
+msgid "Side: "
+msgstr "Lysark"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:152
+#: src/frontends/qt4/ui/ListingsUi.ui:249
+#: src/frontends/qt4/ui/ListingsUi.ui:262
+msgid "Differenz between two numbered lines"
 msgstr ""
 
-#: src/frontends/qt4/ui/IncludeUi.ui:132
-msgid "&Include Type:"
-msgstr "&Innkluderingsform:"
+#: src/frontends/qt4/ui/ListingsUi.ui:168
+#, fuzzy
+msgid "Step:"
+msgstr "Stat:"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:181
+#: src/frontends/qt4/ui/ListingsUi.ui:384
+#, fuzzy
+msgid "Font size:"
+msgstr "Fontstørrelse"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:202
+#: src/frontends/qt4/ui/ListingsUi.ui:405
+#, fuzzy
+msgid "Choose the Font Size"
+msgstr "Velg en stilfil"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:224
+#, fuzzy
+msgid "Range"
+msgstr "Enkel"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:236
+#, fuzzy
+msgid "First line:"
+msgstr "Fornavn"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:275
+#, fuzzy
+msgid "Last line:"
+msgstr "matte linje"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:293
+#: src/frontends/qt4/ui/TabularUi.ui:301
+msgid "Style"
+msgstr "Stil"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:305
+msgid "Breaking lines longer than the linewidth"
+msgstr ""
+
+#: src/frontends/qt4/ui/ListingsUi.ui:308
+#, fuzzy
+msgid "&Break long lines"
+msgstr "&Bruk lang tabell"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:318
+msgid "Insert a special symbol for a space"
+msgstr ""
+
+#: src/frontends/qt4/ui/ListingsUi.ui:321
+msgid "&Space as Symbol"
+msgstr ""
+
+#: src/frontends/qt4/ui/ListingsUi.ui:334
+#, fuzzy
+msgid "Use extended character table"
+msgstr "Udefinert tekststil"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:337
+#, fuzzy
+msgid "&Extended Chars"
+msgstr "Utvidede egenskaper|U"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:347
+#, fuzzy
+msgid "Font style:"
+msgstr "Fontstørrelse"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:368
+msgid "Choose the Font Style"
+msgstr ""
+
+#: src/frontends/qt4/ui/ListingsUi.ui:427
+msgid "Advanced"
+msgstr ""
+
+#: src/frontends/qt4/ui/ListingsUi.ui:447
+msgid "More Parameters"
+msgstr ""
+
+#: src/frontends/qt4/ui/ListingsUi.ui:524
+#, fuzzy
+msgid "OK"
+msgstr "&OK"
 
 #: src/frontends/qt4/ui/LogUi.ui:58
 msgid "Update the display"
@@ -1387,6 +1448,42 @@ msgstr "Oppdater log"
 msgid "&Update"
 msgstr "&Oppdater"
 
+#: src/frontends/qt4/ui/MarginsUi.ui:28
+msgid "Use the margin settings provided by the document class"
+msgstr "Bruk standardmarger for dokumentklassen"
+
+#: src/frontends/qt4/ui/MarginsUi.ui:31
+msgid "&Default Margins"
+msgstr "Standard marger"
+
+#: src/frontends/qt4/ui/MarginsUi.ui:89
+msgid "&Top:"
+msgstr "Øverst:"
+
+#: src/frontends/qt4/ui/MarginsUi.ui:102
+msgid "&Bottom:"
+msgstr "Nederst:"
+
+#: src/frontends/qt4/ui/MarginsUi.ui:115
+msgid "&Inner:"
+msgstr "Indre:"
+
+#: src/frontends/qt4/ui/MarginsUi.ui:128
+msgid "O&uter:"
+msgstr "Ytre:"
+
+#: src/frontends/qt4/ui/MarginsUi.ui:141
+msgid "Head &sep:"
+msgstr "Avstand til topptekst:"
+
+#: src/frontends/qt4/ui/MarginsUi.ui:154
+msgid "Head &height:"
+msgstr "&Høyde på topptekst:"
+
+#: src/frontends/qt4/ui/MarginsUi.ui:167
+msgid "&Foot skip:"
+msgstr "Avstand til bunntekst:"
+
 #: src/frontends/qt4/ui/MathMatrixUi.ui:39
 #: src/frontends/qt4/ui/MathMatrixUi.ui:52
 #: src/frontends/qt4/ui/TabularCreateUi.ui:84
@@ -1431,6 +1528,22 @@ msgstr "Horisontaljustering pr kolonne (l=venstre,c=sentrert,r=h
 msgid "&Horizontal:"
 msgstr "&Horisontal:"
 
+#: src/frontends/qt4/ui/MathsUi.ui:28
+msgid "&Use AMS math package automatically"
+msgstr "Bruk AMS-matematikk automatisk"
+
+#: src/frontends/qt4/ui/MathsUi.ui:38
+msgid "Use AMS &math package"
+msgstr "Bruk AMS-matematikk"
+
+#: src/frontends/qt4/ui/MathsUi.ui:45
+msgid "Use esint package &automatically"
+msgstr "Bruk \"esint\"-pakken automatisk"
+
+#: src/frontends/qt4/ui/MathsUi.ui:55
+msgid "Use &esint package"
+msgstr "Bruk \"esint\"-pakken"
+
 #: src/frontends/qt4/ui/NomenclUi.ui:31
 msgid "Sort &as:"
 msgstr "Sortér som:"
@@ -1487,6 +1600,51 @@ msgstr "Boks med skyggelagt bakgrunn"
 msgid "&Shaded"
 msgstr "&Skyggelagt"
 
+#: src/frontends/qt4/ui/NumberingUi.ui:63
+msgid "&List in Table of Contents"
+msgstr "&Vis i innholdsfortegnelse"
+
+#: src/frontends/qt4/ui/NumberingUi.ui:73
+msgid "&Numbering"
+msgstr "Nummerering"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:28
+msgid "Paper Size"
+msgstr "Arkstørrelse"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:74
+msgid "Choose a particular paper size, or set your own with \"Custom\""
+msgstr ""
+"Velg en papirstørrelse, eller spesifiser din egen med \"Brukerdefinert\""
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:128
+msgid "Orientation"
+msgstr "Orientering"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:140
+msgid "&Portrait"
+msgstr "Stående"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:150
+msgid "&Landscape"
+msgstr "Liggende"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:168
+msgid "Page &style:"
+msgstr "Sidestil:"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:186
+msgid "Style used for the page header and footer"
+msgstr "Stil for sidens hode og fot"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:195
+msgid "Lay out the page for double-sided printing"
+msgstr "Layout for dobbeltsidig utskrift"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:198
+msgid "&Two-sided document"
+msgstr "&Tosidig dokument"
+
 #: src/frontends/qt4/ui/ParagraphUi.ui:114
 msgid "Label Width"
 msgstr "Etikettbredde for lister"
@@ -1509,8 +1667,8 @@ msgstr "Rykk inn avsnitt"
 msgid "L&ine spacing:"
 msgstr "L&injeavstand:"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:219 src/Text.cpp:1737
-#: src/frontends/qt4/QDocument.cpp:123
+#: src/frontends/qt4/ui/ParagraphUi.ui:219 src/Text.cpp:1773
+#: src/frontends/qt4/QDocument.cpp:230
 msgid "Single"
 msgstr "Enkel"
 
@@ -1518,15 +1676,15 @@ msgstr "Enkel"
 msgid "1.5"
 msgstr "1.5"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:229 src/Text.cpp:1743
-#: src/frontends/qt4/QDocument.cpp:127
+#: src/frontends/qt4/ui/ParagraphUi.ui:229 src/Text.cpp:1779
+#: src/frontends/qt4/QDocument.cpp:234
 msgid "Double"
 msgstr "Dobbel"
 
 #: src/frontends/qt4/ui/ParagraphUi.ui:234
 #: src/frontends/qt4/ui/TabularUi.ui:712 src/frontends/qt4/ui/TabularUi.ui:731
 #: src/frontends/qt4/ui/TabularUi.ui:779 src/frontends/qt4/ui/VSpaceUi.ui:110
-#: src/frontends/qt4/QDocument.cpp:129 src/frontends/qt4/QDocument.cpp:230
+#: src/frontends/qt4/QDocument.cpp:236 src/frontends/qt4/QDocument.cpp:337
 msgid "Custom"
 msgstr "Brukerdefinert"
 
@@ -1655,7 +1813,7 @@ msgstr "Datoformat for \"strftime\""
 msgid "Display &Graphics:"
 msgstr "Grafikkvisning:"
 
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:47 src/Font.cpp:69
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:47 src/Font.cpp:72
 msgid "Off"
 msgstr "Av"
 
@@ -1663,7 +1821,7 @@ msgstr "Av"
 msgid "No math"
 msgstr "Ikke matte"
 
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:57 src/Font.cpp:69
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:57 src/Font.cpp:72
 msgid "On"
 msgstr "På"
 
@@ -1806,31 +1964,31 @@ msgstr "Standard arkst
 msgid "Te&X encoding:"
 msgstr "Te&X tegnkoding"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:83 src/frontends/qt4/QDocument.cpp:231
+#: src/frontends/qt4/ui/PrefLatexUi.ui:83 src/frontends/qt4/QDocument.cpp:338
 msgid "US letter"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:88 src/frontends/qt4/QDocument.cpp:232
+#: src/frontends/qt4/ui/PrefLatexUi.ui:88 src/frontends/qt4/QDocument.cpp:339
 msgid "US legal"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:93 src/frontends/qt4/QDocument.cpp:233
+#: src/frontends/qt4/ui/PrefLatexUi.ui:93 src/frontends/qt4/QDocument.cpp:340
 msgid "US executive"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:98 src/frontends/qt4/QDocument.cpp:234
+#: src/frontends/qt4/ui/PrefLatexUi.ui:98 src/frontends/qt4/QDocument.cpp:341
 msgid "A3"
 msgstr "A3"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:103 src/frontends/qt4/QDocument.cpp:235
+#: src/frontends/qt4/ui/PrefLatexUi.ui:103 src/frontends/qt4/QDocument.cpp:342
 msgid "A4"
 msgstr "A4"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:108 src/frontends/qt4/QDocument.cpp:236
+#: src/frontends/qt4/ui/PrefLatexUi.ui:108 src/frontends/qt4/QDocument.cpp:343
 msgid "A5"
 msgstr "A5"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:113 src/frontends/qt4/QDocument.cpp:239
+#: src/frontends/qt4/ui/PrefLatexUi.ui:113 src/frontends/qt4/QDocument.cpp:346
 msgid "B5"
 msgstr "B5"
 
@@ -2182,7 +2340,7 @@ msgid "&Maximum last files:"
 msgstr "Max antall tidligere filer"
 
 #: src/frontends/qt4/ui/PrefsUi.ui:76 src/BufferList.cpp:114
-#: src/BufferList.cpp:222 src/LyXFunc.cpp:726
+#: src/BufferList.cpp:222 src/LyXFunc.cpp:734
 msgid "&Save"
 msgstr "Lagre"
 
@@ -2318,7 +2476,7 @@ msgstr "Oppdater referanselisten"
 msgid "Jump to the label"
 msgstr "Flytt markøren til referansen"
 
-#: src/frontends/qt4/ui/RefUi.ui:253 src/frontends/qt4/QRef.cpp:292
+#: src/frontends/qt4/ui/RefUi.ui:253 src/frontends/qt4/QRef.cpp:293
 msgid "&Go to Label"
 msgstr "&Gå til merket"
 
@@ -2500,10 +2658,6 @@ msgstr "Sl
 msgid "C&lear"
 msgstr "Av"
 
-#: src/frontends/qt4/ui/TabularUi.ui:301
-msgid "Style"
-msgstr "Stil"
-
 #: src/frontends/qt4/ui/TabularUi.ui:313
 msgid "Use formal (a.k.a. booktabs) border style (no vertical borders)"
 msgstr "Bruk formell stil (som i \"booktabs\"), ingen vertikale streker"
@@ -2699,11 +2853,49 @@ msgstr ""
 msgid "Show &path"
 msgstr "Vis sti"
 
+#: src/frontends/qt4/ui/TextLayoutUi.ui:25
+msgid "Separate Paragraphs With"
+msgstr "Skill avsnitt med"
+
+#: src/frontends/qt4/ui/TextLayoutUi.ui:101
+msgid "&Vertical space"
+msgstr "&Vertikal avstand"
+
+#: src/frontends/qt4/ui/TextLayoutUi.ui:108
+msgid "Indent consecutive paragraphs"
+msgstr "Rykk inn avsnitt som kommer etter hverandre"
+
+#: src/frontends/qt4/ui/TextLayoutUi.ui:111
+msgid "&Indentation"
+msgstr "&Innrykk"
+
+#: src/frontends/qt4/ui/TextLayoutUi.ui:121
+#, fuzzy
+msgid "Spacing"
+msgstr "&Avstand:"
+
+#: src/frontends/qt4/ui/TextLayoutUi.ui:149
+msgid "&Line spacing:"
+msgstr "L&injeavstand:"
+
+#: src/frontends/qt4/ui/TextLayoutUi.ui:191
+msgid "Format text into two columns"
+msgstr "Formater tekst med to kolonner"
+
+#: src/frontends/qt4/ui/TextLayoutUi.ui:194
+msgid "Two-&column document"
+msgstr "To &kolonners dokument"
+
+#: src/frontends/qt4/ui/TextLayoutUi.ui:223
+#, fuzzy
+msgid "Listings settings"
+msgstr "Språkinnstillinger"
+
 #: src/frontends/qt4/ui/ThesaurusUi.ui:42
 msgid "Index entry"
 msgstr "Nøkkelord for register"
 
-#: src/frontends/qt4/ui/ThesaurusUi.ui:45 src/frontends/qt4/Dialogs.cpp:224
+#: src/frontends/qt4/ui/ThesaurusUi.ui:45 src/frontends/qt4/Dialogs.cpp:226
 msgid "&Keyword:"
 msgstr "Nø&kkelord:"
 
@@ -2725,58 +2917,44 @@ msgid "Replace the entry with the selection"
 msgstr ""
 
 #: src/frontends/qt4/ui/TocUi.ui:36
-msgid "Decrease nesting depth of selected item"
+msgid "Adjust the depth of the navigation tree"
 msgstr ""
 
-#: src/frontends/qt4/ui/TocUi.ui:39
-#, fuzzy
-msgid "<- P&romote"
-msgstr "<- &Forfremme"
-
-#: src/frontends/qt4/ui/TocUi.ui:46
-#, fuzzy
-msgid "Move selected item down by one"
-msgstr "Flytt den valgte litteraturreferansen ned"
+#: src/frontends/qt4/ui/TocUi.ui:66
+msgid ""
+"Switch between table of contents, list of figures or list of tables, if "
+"available"
+msgstr ""
 
-#: src/frontends/qt4/ui/TocUi.ui:49
-#, fuzzy
-msgid "D&own"
-msgstr "&Ned"
+#: src/frontends/qt4/ui/TocUi.ui:93
+msgid "Update navigation tree"
+msgstr ""
 
-#: src/frontends/qt4/ui/TocUi.ui:56
-msgid "Increase nesting depth of selected item"
+#: src/frontends/qt4/ui/TocUi.ui:96 src/frontends/qt4/ui/TocUi.ui:128
+#: src/frontends/qt4/ui/TocUi.ui:147 src/frontends/qt4/ui/TocUi.ui:166
+#: src/frontends/qt4/ui/TocUi.ui:185
+msgid "..."
 msgstr ""
 
-#: src/frontends/qt4/ui/TocUi.ui:59
-#, fuzzy
-msgid "De&mote ->"
-msgstr "&Degradere ->"
+#: src/frontends/qt4/ui/TocUi.ui:125
+msgid "Decrease nesting depth of selected item"
+msgstr ""
 
-#: src/frontends/qt4/ui/TocUi.ui:66
-msgid "Update navigation tree"
+#: src/frontends/qt4/ui/TocUi.ui:144
+msgid "Increase nesting depth of selected item"
 msgstr ""
 
-#: src/frontends/qt4/ui/TocUi.ui:69
+#: src/frontends/qt4/ui/TocUi.ui:163
 #, fuzzy
-msgid "Upd&ate"
-msgstr "&Oppdater"
+msgid "Move selected item down by one"
+msgstr "Flytt den valgte litteraturreferansen ned"
 
-#: src/frontends/qt4/ui/TocUi.ui:76
+#: src/frontends/qt4/ui/TocUi.ui:182
 #, fuzzy
 msgid "Move selected item up by one"
 msgstr "Flytt den valgte litteraturreferansen opp"
 
-#: src/frontends/qt4/ui/TocUi.ui:96
-msgid ""
-"Switch between table of contents, list of figures or list of tables, if "
-"available"
-msgstr ""
-
-#: src/frontends/qt4/ui/TocUi.ui:115
-msgid "Adjust the depth of the navigation tree"
-msgstr ""
-
-#: src/frontends/qt4/ui/TocUi.ui:137
+#: src/frontends/qt4/ui/TocUi.ui:203
 msgid "&Type:"
 msgstr "&Type:"
 
@@ -2830,15 +3008,15 @@ msgstr "Typer vertikalt mellomrom"
 msgid "DefSkip"
 msgstr "Standard avstand"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:90 src/frontends/qt4/QDocument.cpp:116
+#: src/frontends/qt4/ui/VSpaceUi.ui:90 src/frontends/qt4/QDocument.cpp:223
 msgid "SmallSkip"
 msgstr "Liten avstand"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:95 src/frontends/qt4/QDocument.cpp:117
+#: src/frontends/qt4/ui/VSpaceUi.ui:95 src/frontends/qt4/QDocument.cpp:224
 msgid "MedSkip"
 msgstr "Medium avstand"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:100 src/frontends/qt4/QDocument.cpp:118
+#: src/frontends/qt4/ui/VSpaceUi.ui:100 src/frontends/qt4/QDocument.cpp:225
 msgid "BigSkip"
 msgstr "Stor avstand"
 
@@ -2874,56 +3052,27 @@ msgstr "Enheter for breddem
 msgid "&Units:"
 msgstr "&Enhet:"
 
-#: src/frontends/qt4/ui/TextLayoutUi.ui:58
-msgid "&Line spacing:"
-msgstr "L&injeavstand:"
-
-#: src/frontends/qt4/ui/TextLayoutUi.ui:68
-msgid "Separate Paragraphs With"
-msgstr "Skill avsnitt med"
-
-#: src/frontends/qt4/ui/TextLayoutUi.ui:144
-msgid "&Vertical space"
-msgstr "&Vertikal avstand"
-
-#: src/frontends/qt4/ui/TextLayoutUi.ui:151
-msgid "Indent consecutive paragraphs"
-msgstr "Rykk inn avsnitt som kommer etter hverandre"
-
-#: src/frontends/qt4/ui/TextLayoutUi.ui:154
-msgid "&Indentation"
-msgstr "&Innrykk"
-
-#: src/frontends/qt4/ui/TextLayoutUi.ui:180
-msgid "Format text into two columns"
-msgstr "Formater tekst med to kolonner"
-
-#: src/frontends/qt4/ui/TextLayoutUi.ui:183
-msgid "Two-&column document"
-msgstr "To &kolonners dokument"
-
 #: lib/layouts/IEEEtran.layout:18 lib/layouts/aa.layout:22
 #: lib/layouts/aapaper.layout:34 lib/layouts/aastex.layout:49
 #: lib/layouts/amsart.layout:21 lib/layouts/amsbook.layout:22
-#: lib/layouts/apa.layout:24 lib/layouts/beamer.layout:29
+#: lib/layouts/apa.layout:24 lib/layouts/beamer.layout:37
 #: lib/layouts/broadway.layout:183 lib/layouts/chess.layout:27
-#: lib/layouts/cl2emult.layout:125 lib/layouts/cv.layout:14
-#: lib/layouts/dtk.layout:31 lib/layouts/egs.layout:18
-#: lib/layouts/elsart.layout:49 lib/layouts/europecv.layout:16
-#: lib/layouts/foils.layout:30 lib/layouts/g-brief2.layout:30
-#: lib/layouts/hollywood.layout:360 lib/layouts/kluwer.layout:33
-#: lib/layouts/llncs.layout:23 lib/layouts/ltugboat.layout:30
-#: lib/layouts/manpage.layout:17 lib/layouts/memoir.layout:26
-#: lib/layouts/moderncv.layout:16 lib/layouts/paper.layout:14
-#: lib/layouts/revtex.layout:22 lib/layouts/revtex4.layout:26
-#: lib/layouts/scrlettr.layout:7 lib/layouts/scrlttr2.layout:7
-#: lib/layouts/siamltex.layout:19 lib/layouts/simplecv.layout:15
-#: 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 lib/ui/stdtoolbars.inc:55
-#: src/frontends/qt4/BulletsModule.cpp:46 src/insets/InsetRef.cpp:151
-#: src/mathed/InsetMathRef.cpp:187
+#: lib/layouts/cl2emult.layout:125 lib/layouts/dtk.layout:31
+#: lib/layouts/egs.layout:18 lib/layouts/elsart.layout:49
+#: lib/layouts/europecv.layout:16 lib/layouts/foils.layout:30
+#: lib/layouts/g-brief2.layout:30 lib/layouts/hollywood.layout:360
+#: lib/layouts/kluwer.layout:33 lib/layouts/llncs.layout:23
+#: lib/layouts/ltugboat.layout:30 lib/layouts/manpage.layout:17
+#: lib/layouts/memoir.layout:26 lib/layouts/moderncv.layout:16
+#: lib/layouts/paper.layout:14 lib/layouts/revtex.layout:22
+#: lib/layouts/revtex4.layout:26 lib/layouts/scrlettr.layout:7
+#: lib/layouts/scrlttr2.layout:7 lib/layouts/siamltex.layout:19
+#: lib/layouts/simplecv.layout:15 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
+#: lib/ui/stdtoolbars.inc:55 src/frontends/qt4/BulletsModule.cpp:46
+#: src/insets/InsetRef.cpp:151 src/mathed/InsetMathRef.cpp:187
 msgid "Standard"
 msgstr "Standard"
 
@@ -2931,7 +3080,7 @@ msgstr "Standard"
 msgid "TheoremTemplate"
 msgstr ""
 
-#: lib/layouts/IEEEtran.layout:63 lib/layouts/beamer.layout:925
+#: lib/layouts/IEEEtran.layout:63 lib/layouts/beamer.layout:948
 #: lib/layouts/elsart.layout:291 lib/layouts/foils.layout:283
 #: lib/layouts/heb-article.layout:95 lib/layouts/ijmpc.layout:227
 #: lib/layouts/ijmpd.layout:227 lib/layouts/llncs.layout:374
@@ -2945,7 +3094,7 @@ msgid "Proof:"
 msgstr "Bevis:"
 
 #: lib/layouts/IEEEtran.layout:71 lib/layouts/amsart-plain.layout:26
-#: lib/layouts/amsart-seq.layout:137 lib/layouts/beamer.layout:1003
+#: lib/layouts/amsart-seq.layout:137 lib/layouts/beamer.layout:954
 #: lib/layouts/elsart.layout:262 lib/layouts/foils.layout:223
 #: lib/layouts/heb-article.layout:18 lib/layouts/ijmpc.layout:205
 #: lib/layouts/ijmpd.layout:208 lib/layouts/llncs.layout:415
@@ -2974,7 +3123,7 @@ msgid "Lemma #:"
 msgstr "Lemma #:"
 
 #: lib/layouts/IEEEtran.layout:91 lib/layouts/amsart-plain.layout:31
-#: lib/layouts/amsart-seq.layout:143 lib/layouts/beamer.layout:489
+#: lib/layouts/amsart-seq.layout:143 lib/layouts/beamer.layout:885
 #: lib/layouts/elsart.layout:325 lib/layouts/foils.layout:255
 #: lib/layouts/heb-article.layout:55 lib/layouts/ijmpc.layout:247
 #: lib/layouts/ijmpd.layout:248 lib/layouts/llncs.layout:319
@@ -3026,7 +3175,7 @@ msgid "Criterion #:"
 msgstr "Kriterie #:"
 
 #: lib/layouts/IEEEtran.layout:131 lib/layouts/amsart-plain.layout:67
-#: lib/layouts/amsart-seq.layout:179 lib/layouts/beamer.layout:710
+#: lib/layouts/amsart-seq.layout:179 lib/layouts/beamer.layout:942
 #: lib/layouts/amsmaths-plain.inc:103 lib/layouts/amsmaths-seq.inc:88
 #: lib/layouts/amsmaths.inc:213
 msgid "Fact"
@@ -3047,7 +3196,7 @@ msgid "Axiom #:"
 msgstr "Aksiom #:"
 
 #: lib/layouts/IEEEtran.layout:151 lib/layouts/amsart-plain.layout:79
-#: lib/layouts/amsart-seq.layout:191 lib/layouts/beamer.layout:652
+#: lib/layouts/amsart-seq.layout:191 lib/layouts/beamer.layout:912
 #: lib/layouts/elsart.layout:353 lib/layouts/foils.layout:269
 #: lib/layouts/heb-article.layout:75 lib/layouts/ijmpc.layout:140
 #: lib/layouts/ijmpd.layout:137 lib/layouts/llncs.layout:333
@@ -3062,12 +3211,12 @@ msgid "Definition #:"
 msgstr "Definisjon #:"
 
 #: lib/layouts/IEEEtran.layout:161 lib/layouts/amsart-plain.layout:85
-#: lib/layouts/amsart-seq.layout:197 lib/layouts/beamer.layout:664
+#: lib/layouts/amsart-seq.layout:197 lib/layouts/beamer.layout:924
 #: lib/layouts/elsart.layout:374 lib/layouts/ijmpc.layout:175
 #: lib/layouts/ijmpd.layout:172 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/QDocument.cpp:367
+#: src/frontends/qt4/QDocument.cpp:474
 msgid "Example"
 msgstr "Eksempel"
 
@@ -3139,7 +3288,7 @@ msgstr "P
 #: lib/layouts/elsart.layout:395 lib/layouts/llncs.layout:360
 #: lib/layouts/slides.layout:167 lib/layouts/amsmaths-plain.inc:193
 #: lib/layouts/amsmaths-seq.inc:160 lib/layouts/amsmaths.inc:418
-#: lib/layouts/svjour.inc:422 src/insets/InsetNote.cpp:65
+#: lib/layouts/svjour.inc:422 src/insets/InsetNote.cpp:66
 msgid "Note"
 msgstr "Notis"
 
@@ -3174,21 +3323,20 @@ msgstr ""
 #: lib/layouts/aapaper.layout:129 lib/layouts/aastex.layout:64
 #: lib/layouts/aastex.layout:166 lib/layouts/amsart.layout:61
 #: lib/layouts/amsbook.layout:47 lib/layouts/amsbook.layout:95
-#: lib/layouts/beamer.layout:265 lib/layouts/cv.layout:29
-#: lib/layouts/egs.layout:30 lib/layouts/europecv.layout:28
-#: lib/layouts/ijmpc.layout:99 lib/layouts/ijmpd.layout:95
-#: lib/layouts/isprs.layout:157 lib/layouts/kluwer.layout:57
-#: lib/layouts/latex8.layout:41 lib/layouts/llncs.layout:44
-#: lib/layouts/ltugboat.layout:45 lib/layouts/manpage.layout:41
-#: lib/layouts/memoir.layout:51 lib/layouts/moderncv.layout:29
-#: lib/layouts/paper.layout:44 lib/layouts/revtex.layout:38
-#: lib/layouts/revtex4.layout:44 lib/layouts/siamltex.layout:41
-#: lib/layouts/simplecv.layout:27 lib/layouts/spie.layout:19
-#: lib/layouts/agu_stdsections.inc:30 lib/layouts/aguplus.inc:27
-#: lib/layouts/db_stdsections.inc:28 lib/layouts/numarticle.inc:13
-#: lib/layouts/numreport.inc:21 lib/layouts/numrevtex.inc:6
-#: lib/layouts/scrclass.inc:61 lib/layouts/stdsections.inc:51
-#: lib/layouts/svjour.inc:52
+#: lib/layouts/beamer.layout:140 lib/layouts/egs.layout:30
+#: lib/layouts/europecv.layout:28 lib/layouts/ijmpc.layout:99
+#: lib/layouts/ijmpd.layout:95 lib/layouts/isprs.layout:157
+#: lib/layouts/kluwer.layout:57 lib/layouts/latex8.layout:41
+#: lib/layouts/llncs.layout:44 lib/layouts/ltugboat.layout:45
+#: lib/layouts/manpage.layout:41 lib/layouts/memoir.layout:51
+#: lib/layouts/moderncv.layout:29 lib/layouts/paper.layout:44
+#: lib/layouts/revtex.layout:38 lib/layouts/revtex4.layout:44
+#: lib/layouts/siamltex.layout:41 lib/layouts/simplecv.layout:27
+#: lib/layouts/spie.layout:19 lib/layouts/agu_stdsections.inc:30
+#: lib/layouts/aguplus.inc:27 lib/layouts/db_stdsections.inc:28
+#: lib/layouts/numarticle.inc:13 lib/layouts/numreport.inc:21
+#: lib/layouts/numrevtex.inc:6 lib/layouts/scrclass.inc:61
+#: lib/layouts/stdsections.inc:51 lib/layouts/svjour.inc:52
 msgid "Section"
 msgstr "Seksjon"
 
@@ -3196,19 +3344,18 @@ msgstr "Seksjon"
 #: lib/layouts/aa.layout:226 lib/layouts/aapaper.layout:67
 #: lib/layouts/aapaper.layout:138 lib/layouts/aastex.layout:67
 #: lib/layouts/aastex.layout:179 lib/layouts/amsart.layout:72
-#: lib/layouts/amsbook.layout:58 lib/layouts/beamer.layout:306
-#: lib/layouts/cv.layout:50 lib/layouts/egs.layout:51
-#: lib/layouts/ijmpc.layout:115 lib/layouts/ijmpd.layout:111
-#: lib/layouts/isprs.layout:168 lib/layouts/kluwer.layout:66
-#: lib/layouts/latex8.layout:49 lib/layouts/llncs.layout:52
-#: lib/layouts/ltugboat.layout:65 lib/layouts/memoir.layout:56
-#: lib/layouts/paper.layout:53 lib/layouts/revtex.layout:49
-#: lib/layouts/revtex4.layout:55 lib/layouts/siamltex.layout:59
-#: lib/layouts/simplecv.layout:48 lib/layouts/agu_stdsections.inc:40
-#: lib/layouts/aguplus.inc:41 lib/layouts/db_stdsections.inc:36
-#: lib/layouts/numarticle.inc:22 lib/layouts/numrevtex.inc:15
-#: lib/layouts/scrclass.inc:68 lib/layouts/stdsections.inc:72
-#: lib/layouts/svjour.inc:61
+#: lib/layouts/amsbook.layout:58 lib/layouts/beamer.layout:181
+#: lib/layouts/egs.layout:51 lib/layouts/ijmpc.layout:115
+#: lib/layouts/ijmpd.layout:111 lib/layouts/isprs.layout:168
+#: lib/layouts/kluwer.layout:66 lib/layouts/latex8.layout:49
+#: lib/layouts/llncs.layout:52 lib/layouts/ltugboat.layout:65
+#: lib/layouts/memoir.layout:56 lib/layouts/paper.layout:53
+#: lib/layouts/revtex.layout:49 lib/layouts/revtex4.layout:55
+#: lib/layouts/siamltex.layout:59 lib/layouts/simplecv.layout:48
+#: lib/layouts/agu_stdsections.inc:40 lib/layouts/aguplus.inc:41
+#: lib/layouts/db_stdsections.inc:36 lib/layouts/numarticle.inc:22
+#: lib/layouts/numrevtex.inc:15 lib/layouts/scrclass.inc:68
+#: lib/layouts/stdsections.inc:72 lib/layouts/svjour.inc:61
 msgid "Subsection"
 msgstr "Underseksjon"
 
@@ -3229,7 +3376,7 @@ msgstr "Underseksjon"
 msgid "Subsubsection"
 msgstr "UnderUnderSeksjon"
 
-#: lib/layouts/IEEEtran.layout:295 lib/layouts/beamer.layout:297
+#: lib/layouts/IEEEtran.layout:295 lib/layouts/beamer.layout:172
 #: lib/layouts/egs.layout:587 lib/layouts/ijmpc.layout:107
 #: lib/layouts/ijmpd.layout:103 lib/layouts/isprs.layout:186
 #: lib/layouts/siamltex.layout:81 lib/layouts/spie.layout:29
@@ -3238,7 +3385,7 @@ msgstr "UnderUnderSeksjon"
 msgid "Section*"
 msgstr "Seksjon*"
 
-#: lib/layouts/IEEEtran.layout:305 lib/layouts/beamer.layout:339
+#: lib/layouts/IEEEtran.layout:305 lib/layouts/beamer.layout:214
 #: lib/layouts/egs.layout:607 lib/layouts/isprs.layout:197
 #: lib/layouts/siamltex.layout:88 lib/layouts/aguplus.inc:48
 #: lib/layouts/db_stdstarsections.inc:48 lib/layouts/stdstarsections.inc:39
@@ -3295,23 +3442,23 @@ msgstr ""
 
 #: lib/layouts/IEEEtran.layout:371 lib/layouts/aa.layout:86
 #: lib/layouts/aa.layout:314 lib/layouts/aapaper.layout:103
-#: lib/layouts/aapaper.layout:209 lib/layouts/beamer.layout:440
+#: lib/layouts/aapaper.layout:209 lib/layouts/beamer.layout:836
 #: lib/layouts/book.layout:21 lib/layouts/book.layout:23
-#: lib/layouts/cl2emult.layout:102 lib/layouts/cv.layout:143
-#: lib/layouts/egs.layout:563 lib/layouts/foils.layout:215
-#: lib/layouts/ijmpc.layout:358 lib/layouts/ijmpd.layout:369
-#: lib/layouts/latex8.layout:118 lib/layouts/llncs.layout:261
-#: lib/layouts/memoir.layout:138 lib/layouts/memoir.layout:140
-#: lib/layouts/moderncv.layout:193 lib/layouts/mwbk.layout:21
-#: lib/layouts/mwbk.layout:23 lib/layouts/mwrep.layout:12
-#: lib/layouts/mwrep.layout:14 lib/layouts/report.layout:12
-#: lib/layouts/report.layout:14 lib/layouts/scrbook.layout:22
-#: lib/layouts/scrbook.layout:24 lib/layouts/scrreprt.layout:11
-#: lib/layouts/scrreprt.layout:13 lib/layouts/siamltex.layout:183
-#: lib/layouts/simplecv.layout:145 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/QDocument.cpp:469
+#: lib/layouts/cl2emult.layout:102 lib/layouts/egs.layout:563
+#: lib/layouts/foils.layout:215 lib/layouts/ijmpc.layout:358
+#: lib/layouts/ijmpd.layout:369 lib/layouts/latex8.layout:118
+#: lib/layouts/llncs.layout:261 lib/layouts/memoir.layout:138
+#: lib/layouts/memoir.layout:140 lib/layouts/moderncv.layout:193
+#: lib/layouts/mwbk.layout:21 lib/layouts/mwbk.layout:23
+#: lib/layouts/mwrep.layout:12 lib/layouts/mwrep.layout:14
+#: lib/layouts/report.layout:12 lib/layouts/report.layout:14
+#: lib/layouts/scrbook.layout:22 lib/layouts/scrbook.layout:24
+#: lib/layouts/scrreprt.layout:11 lib/layouts/scrreprt.layout:13
+#: lib/layouts/siamltex.layout:183 lib/layouts/simplecv.layout:140
+#: 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/QDocument.cpp:572
 msgid "Bibliography"
 msgstr "Referanseliste"
 
@@ -3345,23 +3492,23 @@ msgstr ""
 
 #: lib/layouts/aa.layout:46 lib/layouts/aapaper.layout:48
 #: lib/layouts/aastex.layout:76 lib/layouts/apa.layout:308
-#: lib/layouts/beamer.layout:41 lib/layouts/cv.layout:80
-#: lib/layouts/egs.layout:163 lib/layouts/manpage.layout:82
-#: lib/layouts/simplecv.layout:82 lib/layouts/agu_stdlists.inc:13
-#: lib/layouts/db_stdlists.inc:12 lib/layouts/stdlists.inc:11
+#: lib/layouts/beamer.layout:50 lib/layouts/egs.layout:163
+#: lib/layouts/manpage.layout:82 lib/layouts/simplecv.layout:77
+#: lib/layouts/agu_stdlists.inc:13 lib/layouts/db_stdlists.inc:12
+#: lib/layouts/stdlists.inc:11
 msgid "Itemize"
 msgstr "Punktliste"
 
 #: lib/layouts/aa.layout:49 lib/layouts/aapaper.layout:51
 #: lib/layouts/aastex.layout:79 lib/layouts/apa.layout:326
-#: lib/layouts/beamer.layout:59 lib/layouts/egs.layout:145
+#: lib/layouts/beamer.layout:68 lib/layouts/egs.layout:145
 #: lib/layouts/manpage.layout:65 lib/layouts/agu_stdlists.inc:21
 #: lib/layouts/db_stdlists.inc:19 lib/layouts/stdlists.inc:29
 msgid "Enumerate"
 msgstr "Nummerert liste"
 
 #: lib/layouts/aa.layout:52 lib/layouts/aapaper.layout:54
-#: lib/layouts/aastex.layout:82 lib/layouts/beamer.layout:77
+#: lib/layouts/aastex.layout:82 lib/layouts/beamer.layout:86
 #: lib/layouts/egs.layout:181 lib/layouts/hollywood.layout:134
 #: lib/layouts/manpage.layout:100 lib/layouts/paper.layout:103
 #: lib/layouts/scrlettr.layout:17 lib/layouts/scrlttr2.layout:18
@@ -3382,28 +3529,28 @@ msgstr "Liste"
 #: lib/layouts/aa.layout:59 lib/layouts/aa.layout:248
 #: lib/layouts/aapaper.layout:73 lib/layouts/aapaper.layout:159
 #: lib/layouts/aastex.layout:88 lib/layouts/aastex.layout:206
-#: lib/layouts/apa.layout:39 lib/layouts/beamer.layout:956
+#: lib/layouts/apa.layout:39 lib/layouts/beamer.layout:717
 #: lib/layouts/broadway.layout:195 lib/layouts/cl2emult.layout:39
-#: lib/layouts/cv.layout:122 lib/layouts/docbook-book.layout:11
-#: lib/layouts/docbook-chapter.layout:9 lib/layouts/docbook-section.layout:9
-#: lib/layouts/egs.layout:247 lib/layouts/elsart.layout:92
-#: lib/layouts/entcs.layout:37 lib/layouts/foils.layout:129
-#: lib/layouts/hollywood.layout:346 lib/layouts/ijmpc.layout:33
-#: lib/layouts/ijmpd.layout:36 lib/layouts/isprs.layout:94
-#: lib/layouts/kluwer.layout:104 lib/layouts/latex8.layout:33
-#: lib/layouts/llncs.layout:99 lib/layouts/ltugboat.layout:134
-#: lib/layouts/paper.layout:112 lib/layouts/revtex.layout:90
-#: lib/layouts/revtex4.layout:107 lib/layouts/scrlettr.layout:193
-#: lib/layouts/scrlttr2.layout:271 lib/layouts/siamltex.layout:109
-#: lib/layouts/simplecv.layout:124 lib/layouts/svprobth.layout:35
-#: lib/layouts/agu_stdtitle.inc:246 lib/layouts/amsdefs.inc:60
-#: lib/layouts/db_stdtitle.inc:13 lib/layouts/scrclass.inc:146
-#: lib/layouts/stdtitle.inc:12 lib/layouts/svjour.inc:129
+#: lib/layouts/docbook-book.layout:11 lib/layouts/docbook-chapter.layout:9
+#: lib/layouts/docbook-section.layout:9 lib/layouts/egs.layout:247
+#: lib/layouts/elsart.layout:92 lib/layouts/entcs.layout:37
+#: lib/layouts/foils.layout:129 lib/layouts/hollywood.layout:346
+#: lib/layouts/ijmpc.layout:33 lib/layouts/ijmpd.layout:36
+#: lib/layouts/isprs.layout:94 lib/layouts/kluwer.layout:104
+#: lib/layouts/latex8.layout:33 lib/layouts/llncs.layout:99
+#: lib/layouts/ltugboat.layout:134 lib/layouts/paper.layout:112
+#: lib/layouts/revtex.layout:90 lib/layouts/revtex4.layout:107
+#: lib/layouts/scrlettr.layout:193 lib/layouts/scrlttr2.layout:271
+#: lib/layouts/siamltex.layout:109 lib/layouts/simplecv.layout:119
+#: lib/layouts/svprobth.layout:35 lib/layouts/agu_stdtitle.inc:246
+#: lib/layouts/amsdefs.inc:60 lib/layouts/db_stdtitle.inc:13
+#: lib/layouts/scrclass.inc:146 lib/layouts/stdtitle.inc:12
+#: lib/layouts/svjour.inc:129
 msgid "Title"
 msgstr "Tittel"
 
 #: lib/layouts/aa.layout:62 lib/layouts/aa.layout:106
-#: lib/layouts/aapaper.layout:76 lib/layouts/beamer.layout:1009
+#: lib/layouts/aapaper.layout:76 lib/layouts/beamer.layout:741
 #: lib/layouts/kluwer.layout:122 lib/layouts/llncs.layout:122
 #: lib/layouts/svprobth.layout:44 lib/layouts/aapaper.inc:9
 #: lib/layouts/svjour.inc:152
@@ -3413,7 +3560,7 @@ msgstr "Undertittel"
 #: lib/layouts/aa.layout:65 lib/layouts/aa.layout:260
 #: lib/layouts/aapaper.layout:79 lib/layouts/aapaper.layout:170
 #: lib/layouts/aastex.layout:91 lib/layouts/aastex.layout:219
-#: lib/layouts/apa.layout:114 lib/layouts/beamer.layout:416
+#: lib/layouts/apa.layout:114 lib/layouts/beamer.layout:766
 #: lib/layouts/broadway.layout:208 lib/layouts/cl2emult.layout:56
 #: lib/layouts/egs.layout:290 lib/layouts/elsart.layout:112
 #: lib/layouts/entcs.layout:47 lib/layouts/foils.layout:137
@@ -3454,7 +3601,7 @@ msgstr ""
 #: lib/layouts/aa.layout:77 lib/layouts/aa.layout:272
 #: lib/layouts/aapaper.layout:94 lib/layouts/aapaper.layout:181
 #: lib/layouts/aastex.layout:103 lib/layouts/aastex.layout:232
-#: lib/layouts/beamer.layout:630 lib/layouts/egs.layout:476
+#: lib/layouts/beamer.layout:812 lib/layouts/egs.layout:476
 #: lib/layouts/foils.layout:144 lib/layouts/g-brief-en.layout:188
 #: lib/layouts/g-brief2.layout:800 lib/layouts/kluwer.layout:143
 #: lib/layouts/revtex.layout:106 lib/layouts/revtex4.layout:123
@@ -3462,7 +3609,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.inc:314
+#: lib/layouts/svjour.inc:230 lib/ui/stdmenus.inc:315
 msgid "Date"
 msgstr "Dato"
 
@@ -3489,7 +3636,7 @@ msgid "Acknowledgements."
 msgstr ""
 
 #: lib/layouts/aapaper.layout:61 lib/layouts/egs.layout:623
-#: src/frontends/qt4/QPrefs.cpp:302
+#: src/frontends/qt4/QPrefs.cpp:303
 msgid "LaTeX"
 msgstr "LaTeX"
 
@@ -3538,7 +3685,7 @@ msgid "Acknowledgements"
 msgstr ""
 
 #: lib/layouts/aastex.layout:118 lib/layouts/aastex.layout:441
-#: lib/layouts/aastex.layout:453 lib/layouts/beamer.layout:454
+#: lib/layouts/aastex.layout:453 lib/layouts/beamer.layout:850
 #: lib/layouts/cl2emult.layout:116 lib/layouts/egs.layout:577
 #: lib/layouts/kluwer.layout:344 lib/layouts/kluwer.layout:356
 #: lib/layouts/llncs.layout:275 lib/layouts/moderncv.layout:207
@@ -3955,10 +4102,9 @@ msgstr ""
 msgid "FitBitmap"
 msgstr ""
 
-#: lib/layouts/apa.layout:322 lib/layouts/beamer.layout:55
-#: lib/layouts/cv.layout:94 lib/layouts/egs.layout:177
-#: lib/layouts/manpage.layout:96 lib/layouts/simplecv.layout:96
-#: lib/layouts/stdlists.inc:25
+#: lib/layouts/apa.layout:322 lib/layouts/beamer.layout:64
+#: lib/layouts/egs.layout:177 lib/layouts/manpage.layout:96
+#: lib/layouts/simplecv.layout:91 lib/layouts/stdlists.inc:25
 msgid "*"
 msgstr "*"
 
@@ -3967,11 +4113,31 @@ msgid "Seriate"
 msgstr ""
 
 #: lib/layouts/apa.layout:360 lib/layouts/apa.layout:361
-#: src/buffer_funcs.cpp:524
+#: src/buffer_funcs.cpp:526
 msgid "(\\alph{enumii})"
 msgstr "(\\alph{enumii})"
 
-#: lib/layouts/article.layout:18 lib/layouts/beamer.layout:897
+#: lib/layouts/armenian-article.layout:9
+#, fuzzy
+msgid "LatinOn"
+msgstr "Latvisk"
+
+#: lib/layouts/armenian-article.layout:18
+#, fuzzy
+msgid "Latin on"
+msgstr "Sted"
+
+#: lib/layouts/armenian-article.layout:25
+#, fuzzy
+msgid "LatinOff"
+msgstr "Latvisk"
+
+#: lib/layouts/armenian-article.layout:34
+#, fuzzy
+msgid "Latin off"
+msgstr "Latvisk"
+
+#: lib/layouts/article.layout:18 lib/layouts/beamer.layout:111
 #: lib/layouts/mwart.layout:23 lib/layouts/paper.layout:31
 #: lib/layouts/scrartcl.layout:20 lib/layouts/seminar.layout:24
 #: lib/layouts/agu_stdsections.inc:12 lib/layouts/db_stdsections.inc:12
@@ -3986,247 +4152,258 @@ msgstr "Del"
 msgid "Part*"
 msgstr "Del*"
 
-#: lib/layouts/beamer.layout:92 lib/layouts/egs.layout:196
+#: lib/layouts/beamer.layout:101 lib/layouts/egs.layout:196
 #: lib/layouts/manpage.layout:115 lib/layouts/stdlists.inc:62
 msgid "MM"
 msgstr "MM"
 
-#: lib/layouts/beamer.layout:100
-msgid "BeginFrame"
-msgstr "Begynn ramme"
-
-#: lib/layouts/beamer.layout:115
-msgid "Frame   "
-msgstr ""
-
-#: lib/layouts/beamer.layout:141
-msgid "BeginPlainFrame"
-msgstr ""
-
-#: lib/layouts/beamer.layout:156
-msgid "Frame (no head/foot/sidebars)  "
-msgstr ""
-
-#: lib/layouts/beamer.layout:179
-msgid "EndFrame"
-msgstr "Slutt ramme"
-
-#: lib/layouts/beamer.layout:193
-msgid "________________________________ "
-msgstr ""
-
-#: lib/layouts/beamer.layout:207
-msgid "Pause"
-msgstr "Pause"
-
-#: lib/layouts/beamer.layout:222
-msgid "_ _ _ _ _ _ _ _ _ _ _ _ _ _"
-msgstr ""
+#: lib/layouts/beamer.layout:125
+msgid "Part "
+msgstr "Del "
 
-#: lib/layouts/beamer.layout:280
+#: lib/layouts/beamer.layout:155
 msgid "Section \\arabic{section}"
 msgstr ""
 
-#: lib/layouts/beamer.layout:292 lib/layouts/numarticle.inc:17
+#: lib/layouts/beamer.layout:167 lib/layouts/numarticle.inc:17
 msgid "\\Alph{section}"
 msgstr "\\Alph{section}"
 
-#: lib/layouts/beamer.layout:321
+#: lib/layouts/beamer.layout:196
 msgid "Subsection \\arabic{section}.\\arabic{subsection}"
 msgstr ""
 
-#: lib/layouts/beamer.layout:334
+#: lib/layouts/beamer.layout:209
 msgid "\\arabic{section}.\\arabic{subsection}"
 msgstr ""
 
-#: lib/layouts/beamer.layout:347
-msgid "AgainFrame"
+#: lib/layouts/beamer.layout:223
+msgid "BeginFrame"
+msgstr "Begynn ramme"
+
+#: lib/layouts/beamer.layout:238
+#, fuzzy
+msgid "Frame "
+msgstr "Innrammet"
+
+#: lib/layouts/beamer.layout:264
+msgid "BeginPlainFrame"
 msgstr ""
 
-#: lib/layouts/beamer.layout:362
-msgid "Again frame with label   "
+#: lib/layouts/beamer.layout:279
+msgid "Frame (no head/foot/sidebars)__"
 msgstr ""
 
-#: lib/layouts/beamer.layout:386
-msgid "AlertBlock"
+#: lib/layouts/beamer.layout:302
+msgid "AgainFrame"
 msgstr ""
 
-#: lib/layouts/beamer.layout:396
-msgid "block with alerted text "
+#: lib/layouts/beamer.layout:317
+msgid "Again frame with label__"
 msgstr ""
 
-#: lib/layouts/beamer.layout:464
-msgid "Block"
-msgstr "Blokk"
+#: lib/layouts/beamer.layout:341
+msgid "EndFrame"
+msgstr "Slutt ramme"
 
-#: lib/layouts/beamer.layout:474
-msgid "block "
-msgstr "blokk"
+#: lib/layouts/beamer.layout:355
+msgid "________________________________ "
+msgstr ""
 
-#: lib/layouts/beamer.layout:499
-msgid "Corollary.  "
-msgstr "Korollar."
+#: lib/layouts/beamer.layout:370
+msgid "FrameSubtitle"
+msgstr ""
 
-#: lib/layouts/beamer.layout:516
+#: lib/layouts/beamer.layout:393
 msgid "Column"
 msgstr "Kolonne"
 
-#: lib/layouts/beamer.layout:527
-msgid "start column of width:  "
+#: lib/layouts/beamer.layout:405
+msgid "start column (increase depth!), width: "
 msgstr ""
 
-#: lib/layouts/beamer.layout:539
+#: lib/layouts/beamer.layout:417
 msgid "Columns"
 msgstr "Kolonner"
 
-#: lib/layouts/beamer.layout:551
+#: lib/layouts/beamer.layout:429
 msgid "columns "
 msgstr "kolonner "
 
-#: lib/layouts/beamer.layout:568
+#: lib/layouts/beamer.layout:446
 msgid "ColumnsCenterAligned"
 msgstr ""
 
-#: lib/layouts/beamer.layout:579
+#: lib/layouts/beamer.layout:457
 msgid "columns (center aligned) "
 msgstr ""
 
-#: lib/layouts/beamer.layout:598
+#: lib/layouts/beamer.layout:476
 msgid "ColumnsTopAligned"
 msgstr ""
 
-#: lib/layouts/beamer.layout:609
-msgid "columns (top aligned) "
+#: lib/layouts/beamer.layout:487
+msgid "columns (top aligned) "
+msgstr ""
+
+#: lib/layouts/beamer.layout:507
+msgid "Pause"
+msgstr "Pause"
+
+#: lib/layouts/beamer.layout:522
+msgid "_ _ _ _ _ _ _ _ _ _ _ _ _ _"
+msgstr ""
+
+#: lib/layouts/beamer.layout:532
+msgid "Overprint"
+msgstr ""
+
+#: lib/layouts/beamer.layout:542
+msgid "overprint "
+msgstr ""
+
+#: lib/layouts/beamer.layout:558
+msgid "OverlayArea"
 msgstr ""
 
-#: lib/layouts/beamer.layout:655
-msgid "Definition.  "
-msgstr "Definisjon.  "
+#: lib/layouts/beamer.layout:568
+#, fuzzy
+msgid "overlayarea"
+msgstr "Slovensk"
 
-#: lib/layouts/beamer.layout:658
-msgid "Definitions"
-msgstr "Definisjoner"
+#: lib/layouts/beamer.layout:583
+msgid "Uncover"
+msgstr ""
 
-#: lib/layouts/beamer.layout:661
-msgid "Definitions.  "
-msgstr "Definisjoner.  "
+#: lib/layouts/beamer.layout:592
+msgid "uncovered on slides  "
+msgstr ""
 
-#: lib/layouts/beamer.layout:667
-msgid "Example.  "
-msgstr "Eksempel.  "
+#: lib/layouts/beamer.layout:607
+msgid "Only"
+msgstr "Bare"
 
-#: lib/layouts/beamer.layout:675
-msgid "Examples"
-msgstr "Eksempler"
+#: lib/layouts/beamer.layout:616
+msgid "only on slides_"
+msgstr ""
 
-#: lib/layouts/beamer.layout:678
-msgid "Examples.  "
-msgstr "Eksempler.  "
+#: lib/layouts/beamer.layout:632
+msgid "Block"
+msgstr "Blokk"
+
+#: lib/layouts/beamer.layout:642
+msgid "block ( ERT[{title}] body ): "
+msgstr ""
 
-#: lib/layouts/beamer.layout:681
+#: lib/layouts/beamer.layout:657
 msgid "ExampleBlock"
 msgstr ""
 
-#: lib/layouts/beamer.layout:691
-msgid "block showing an example "
+#: lib/layouts/beamer.layout:667
+msgid "block ( ERT[{title}] example text ): "
 msgstr ""
 
-#: lib/layouts/beamer.layout:713
-msgid "Fact.  "
-msgstr "Faktum.  "
+#: lib/layouts/beamer.layout:686
+msgid "AlertBlock"
+msgstr ""
 
-#: lib/layouts/beamer.layout:716
-msgid "FrameSubtitle"
+#: lib/layouts/beamer.layout:696
+msgid "block ( ERT[{title}] alert text ): "
 msgstr ""
 
-#: lib/layouts/beamer.layout:739 lib/layouts/cl2emult.layout:68
+#: lib/layouts/beamer.layout:789 lib/layouts/cl2emult.layout:68
 #: lib/layouts/llncs.layout:213 lib/layouts/svjour.inc:211
 msgid "Institute"
 msgstr "Institutt"
 
-#: lib/layouts/beamer.layout:761 lib/layouts/egs.layout:641
-#: lib/layouts/db_lyxmacros.inc:18 lib/layouts/lyxmacros.inc:12
-msgid "LyX-Code"
-msgstr "LyX-Kode"
-
-#: lib/layouts/beamer.layout:798
-msgid "NoteItem"
-msgstr ""
+#: lib/layouts/beamer.layout:860
+msgid "TitleGraphic"
+msgstr "Tittelgrafikk"
 
-#: lib/layouts/beamer.layout:809
-msgid "note:  "
-msgstr "notis:  "
+#: lib/layouts/beamer.layout:895
+#, fuzzy
+msgid "Corollary_"
+msgstr "Korollar"
 
-#: lib/layouts/beamer.layout:821
-msgid "Only"
-msgstr "Bare"
+#: lib/layouts/beamer.layout:915
+#, fuzzy
+msgid "Definition. "
+msgstr "Definisjon.  "
 
-#: lib/layouts/beamer.layout:830
-msgid "only on slides  "
-msgstr ""
+#: lib/layouts/beamer.layout:918
+msgid "Definitions"
+msgstr "Definisjoner"
 
-#: lib/layouts/beamer.layout:845
-msgid "Overprint"
-msgstr ""
+#: lib/layouts/beamer.layout:921
+#, fuzzy
+msgid "Definitions. "
+msgstr "Definisjoner.  "
 
-#: lib/layouts/beamer.layout:855
-msgid "overprint "
-msgstr ""
+#: lib/layouts/beamer.layout:927
+#, fuzzy
+msgid "Example. "
+msgstr "Eksempel.  "
 
-#: lib/layouts/beamer.layout:871
-msgid "OverlayArea"
-msgstr ""
+#: lib/layouts/beamer.layout:935
+msgid "Examples"
+msgstr "Eksempler"
 
-#: lib/layouts/beamer.layout:881
-msgid "overlayarea "
-msgstr ""
+#: lib/layouts/beamer.layout:938
+#, fuzzy
+msgid "Examples. "
+msgstr "Eksempler.  "
 
-#: lib/layouts/beamer.layout:911
-msgid "Part "
-msgstr "Del "
+#: lib/layouts/beamer.layout:945
+#, fuzzy
+msgid "Fact. "
+msgstr "Faktum.  "
 
-#: lib/layouts/beamer.layout:928
-msgid "Proof.  "
+#: lib/layouts/beamer.layout:951
+#, fuzzy
+msgid "Proof. "
 msgstr "Bevis.  "
 
-#: lib/layouts/beamer.layout:932
+#: lib/layouts/beamer.layout:957
+#, fuzzy
+msgid "Theorem. "
+msgstr "Teorem.  "
+
+#: lib/layouts/beamer.layout:962
 msgid "Separator"
 msgstr "Separator"
 
-#: lib/layouts/beamer.layout:945
+#: lib/layouts/beamer.layout:975
 msgid "___"
 msgstr "___"
 
-#: lib/layouts/beamer.layout:980
-msgid "TitleGraphic"
-msgstr "Tittelgrafikk"
-
-#: lib/layouts/beamer.layout:1006
-msgid "Theorem.  "
-msgstr "Teorem.  "
+#: lib/layouts/beamer.layout:985 lib/layouts/egs.layout:641
+#: lib/layouts/db_lyxmacros.inc:18 lib/layouts/lyxmacros.inc:12
+msgid "LyX-Code"
+msgstr "LyX-Kode"
 
-#: lib/layouts/beamer.layout:1034
-msgid "Uncover"
+#: lib/layouts/beamer.layout:1022
+msgid "NoteItem"
 msgstr ""
 
-#: lib/layouts/beamer.layout:1043
-msgid "uncovered on slides  "
-msgstr ""
+#: lib/layouts/beamer.layout:1033
+#, fuzzy
+msgid "note: "
+msgstr "notis:  "
 
-#: lib/layouts/beamer.layout:1065 lib/layouts/stdfloats.inc:10
+#: lib/layouts/beamer.layout:1069 lib/layouts/stdfloats.inc:10
 #: lib/ui/stdtoolbars.inc:110
 msgid "Table"
 msgstr "Tabell"
 
-#: lib/layouts/beamer.layout:1070 lib/layouts/stdfloats.inc:15
+#: lib/layouts/beamer.layout:1074 lib/layouts/stdfloats.inc:15
 msgid "List of Tables"
 msgstr "Liste over tabeller"
 
-#: lib/layouts/beamer.layout:1076 lib/layouts/stdfloats.inc:22
+#: lib/layouts/beamer.layout:1080 lib/layouts/stdfloats.inc:22
 msgid "Figure"
 msgstr "Figur"
 
-#: lib/layouts/beamer.layout:1081 lib/layouts/stdfloats.inc:27
+#: lib/layouts/beamer.layout:1085 lib/layouts/stdfloats.inc:27
 msgid "List of Figures"
 msgstr "Liste over figurer"
 
@@ -4391,24 +4568,6 @@ msgstr ""
 msgid "KnightMove:"
 msgstr ""
 
-#: lib/layouts/cv.layout:58 lib/layouts/simplecv.layout:60
-msgid "Topic"
-msgstr "Sak"
-
-#: lib/layouts/cv.layout:72 lib/layouts/simplecv.layout:74
-msgid "MMMMM"
-msgstr "MMMMM"
-
-#: lib/layouts/cv.layout:98 lib/layouts/foils.layout:190
-#: lib/layouts/simplecv.layout:100 lib/layouts/aguplus.inc:75
-msgid "Left Header"
-msgstr "Venstre hode"
-
-#: lib/layouts/cv.layout:115 lib/layouts/foils.layout:198
-#: lib/layouts/simplecv.layout:117 lib/layouts/aguplus.inc:99
-msgid "Right Header"
-msgstr "Høyre hode"
-
 #: lib/layouts/dinbrief.layout:13 lib/layouts/heb-letter.layout:10
 #: lib/layouts/stdletter.inc:24
 msgid "My Address"
@@ -4855,10 +5014,20 @@ msgstr "Restriksjon"
 msgid "Restriction:"
 msgstr "Restriksjon:"
 
+#: lib/layouts/foils.layout:190 lib/layouts/simplecv.layout:95
+#: lib/layouts/aguplus.inc:75
+msgid "Left Header"
+msgstr "Venstre hode"
+
 #: lib/layouts/foils.layout:194 lib/layouts/aguplus.inc:89
 msgid "Left Header:"
 msgstr "Venstre hode:"
 
+#: lib/layouts/foils.layout:198 lib/layouts/simplecv.layout:112
+#: lib/layouts/aguplus.inc:99
+msgid "Right Header"
+msgstr "Høyre hode"
+
 #: lib/layouts/foils.layout:202 lib/layouts/aguplus.inc:103
 msgid "Right Header:"
 msgstr "Høyre hode:"
@@ -6215,10 +6384,13 @@ msgstr ""
 msgid "AMS subject classifications."
 msgstr ""
 
-#: lib/layouts/simplecv.layout:56
-#, fuzzy
-msgid "SubSection"
-msgstr "Underseksjon"
+#: lib/layouts/simplecv.layout:55
+msgid "Topic"
+msgstr "Sak"
+
+#: lib/layouts/simplecv.layout:69
+msgid "MMMMM"
+msgstr "MMMMM"
 
 #: lib/layouts/slides.layout:104
 msgid "New Slide:"
@@ -6893,207 +7065,209 @@ msgid "Arabic"
 msgstr "Arabisk"
 
 #: lib/languages:5
+#, fuzzy
+msgid "Armenian"
+msgstr "Amerikansk"
+
+#: lib/languages:6 lib/languages:7
 msgid "Austrian"
 msgstr "Østerisk"
 
-#: lib/languages:6
-msgid "Austrian (new spelling)"
-msgstr "Østerisk (ny stavemåte)"
-
-#: lib/languages:7
+#: lib/languages:8
 msgid "Bahasa"
 msgstr "Bahasa"
 
-#: lib/languages:8
+#: lib/languages:9
 msgid "Belarusian"
 msgstr "Hviterussisk"
 
-#: lib/languages:9
+#: lib/languages:10
 msgid "Basque"
 msgstr "Baskisk"
 
-#: lib/languages:10
-msgid "Portuguese (Brazil)"
-msgstr "Portugisisk (Brasil)"
+#: lib/languages:11 lib/languages:53
+msgid "Portuguese"
+msgstr "Portugisisk"
 
-#: lib/languages:11
+#: lib/languages:12
 msgid "Breton"
 msgstr "Bretonsk"
 
-#: lib/languages:12
+#: lib/languages:13
 msgid "British"
 msgstr "Britisk"
 
-#: lib/languages:13
+#: lib/languages:14
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: lib/languages:14
+#: lib/languages:15
 msgid "Canadian"
 msgstr "Kanadisk"
 
-#: lib/languages:15
-msgid "French Canadian"
-msgstr "Fransk-Kanadisk"
+#: lib/languages:16 lib/languages:30
+msgid "French"
+msgstr "Fransk"
 
-#: lib/languages:16
+#: lib/languages:17
 msgid "Catalan"
 msgstr "Katalansk"
 
-#: lib/languages:17
+#: lib/languages:18 lib/languages:19
+#, fuzzy
+msgid "Chinese"
+msgstr "Kopier"
+
+#: lib/languages:20
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: lib/languages:18
+#: lib/languages:21
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: lib/languages:19
+#: lib/languages:22
 msgid "Danish"
 msgstr "Dansk"
 
-#: lib/languages:20
+#: lib/languages:23
 msgid "Dutch"
 msgstr "Nederlandsk"
 
-#: lib/languages:21
+#: lib/languages:24
 msgid "English"
 msgstr "Engelsk"
 
-#: lib/languages:23
+#: lib/languages:26
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: lib/languages:24
+#: lib/languages:27
 msgid "Estonian"
 msgstr "Estlandsk"
 
-#: lib/languages:25
+#: lib/languages:28
 msgid "Finnish"
 msgstr "Finsk"
 
-#: lib/languages:27
-msgid "French"
-msgstr "Fransk"
-
-#: lib/languages:28
+#: lib/languages:31
 msgid "Galician"
 msgstr "Gælisk"
 
-#: lib/languages:31
+#: lib/languages:34 lib/languages:35
 msgid "German"
 msgstr "Tysk"
 
-#: lib/languages:32
-msgid "German (new spelling)"
-msgstr "Tysk (ny stavemåte)"
-
-#: lib/languages:33 lib/ui/stdtoolbars.inc:431
+#: lib/languages:36 lib/ui/stdtoolbars.inc:431
 msgid "Greek"
 msgstr "Gresk"
 
-#: lib/languages:34
+#: lib/languages:37
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: lib/languages:36
+#: lib/languages:39
 msgid "Irish"
 msgstr "Irsk"
 
-#: lib/languages:37
+#: lib/languages:40
 msgid "Italian"
 msgstr "Italiensk"
 
-#: lib/languages:38
+#: lib/languages:41
+msgid "Japanese"
+msgstr ""
+
+#: lib/languages:42
 msgid "Kazakh"
 msgstr "Kasakstansk"
 
-#: lib/languages:40
+#: lib/languages:44
+msgid "Korean"
+msgstr ""
+
+#: lib/languages:46
 msgid "Lithuanian"
 msgstr "Litauisk"
 
-#: lib/languages:41
+#: lib/languages:47
 msgid "Latvian"
 msgstr "Latvisk"
 
-#: lib/languages:42
+#: lib/languages:48
 msgid "Icelandic"
 msgstr "Islandsk"
 
-#: lib/languages:43
+#: lib/languages:49
 msgid "Magyar"
 msgstr "Ungarsk"
 
-#: lib/languages:44
+#: lib/languages:50
 msgid "Norsk"
 msgstr "Norsk"
 
-#: lib/languages:45
+#: lib/languages:51
 msgid "Nynorsk"
 msgstr "Nynorsk"
 
-#: lib/languages:46
+#: lib/languages:52
 msgid "Polish"
 msgstr "Polsk"
 
-#: lib/languages:47
-msgid "Portuguese"
-msgstr "Portugisisk"
-
-#: lib/languages:48
+#: lib/languages:54
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: lib/languages:49
+#: lib/languages:55
 msgid "Russian"
 msgstr "Russisk"
 
-#: lib/languages:50
+#: lib/languages:56
 msgid "Scottish"
 msgstr "Skotsk"
 
-#: lib/languages:51
+#: lib/languages:57
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: lib/languages:52
+#: lib/languages:58
 msgid "Serbo-Croatian"
 msgstr "Serbo-Kroatisk"
 
-#: lib/languages:53
+#: lib/languages:59
 msgid "Spanish"
 msgstr "Spansk"
 
-#: lib/languages:54
+#: lib/languages:60
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: lib/languages:55
+#: lib/languages:61
 msgid "Slovene"
 msgstr "Slovensk"
 
-#: lib/languages:56
+#: lib/languages:62
 msgid "Swedish"
 msgstr "Svensk"
 
-#: lib/languages:57
+#: lib/languages:63
 msgid "Thai"
 msgstr "Thai"
 
-#: lib/languages:58
+#: lib/languages:64
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: lib/languages:59
+#: lib/languages:65
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: lib/languages:60
+#: lib/languages:66
 #, fuzzy
-msgid "Upper Sorbian"
-msgstr "Serbisk"
+msgid "Upper"
+msgstr "Store bokstaver|o"
 
-#: lib/languages:61
+#: lib/languages:67
 msgid "Welsh"
 msgstr "Walisisk"
 
@@ -7245,7 +7419,7 @@ msgstr "Tabell|T"
 msgid "Math|M"
 msgstr "Matte|M"
 
-#: lib/ui/classic.ui:104 lib/ui/stdmenus.inc:455
+#: lib/ui/classic.ui:104 lib/ui/stdmenus.inc:456
 msgid "Spellchecker...|S"
 msgstr "Stavekontroll...|S"
 
@@ -7253,11 +7427,11 @@ msgstr "Stavekontroll...|S"
 msgid "Thesaurus..."
 msgstr ""
 
-#: lib/ui/classic.ui:106 lib/ui/stdmenus.inc:457
+#: lib/ui/classic.ui:106 lib/ui/stdmenus.inc:458
 msgid "Count Words|W"
 msgstr "Tell ord|T"
 
-#: lib/ui/classic.ui:107 lib/ui/stdmenus.inc:458
+#: lib/ui/classic.ui:107 lib/ui/stdmenus.inc:459
 msgid "Check TeX|h"
 msgstr "Sjekk TeX|j"
 
@@ -7265,11 +7439,11 @@ msgstr "Sjekk TeX|j"
 msgid "Change Tracking|g"
 msgstr "Spore endringer|S"
 
-#: lib/ui/classic.ui:110 lib/ui/stdmenus.inc:465
+#: lib/ui/classic.ui:110 lib/ui/stdmenus.inc:466
 msgid "Preferences...|P"
 msgstr "Preferanser...|P"
 
-#: lib/ui/classic.ui:111 lib/ui/stdmenus.inc:464
+#: lib/ui/classic.ui:111 lib/ui/stdmenus.inc:465
 msgid "Reconfigure|R"
 msgstr "Rekonfigurer|R"
 
@@ -7442,7 +7616,7 @@ msgid "Maple, evalf"
 msgstr "Maple, evalf"
 
 #: lib/ui/classic.ui:199 lib/ui/classic.ui:261 lib/ui/stdmenus.inc:249
-#: lib/ui/stdmenus.inc:347
+#: lib/ui/stdmenus.inc:348
 msgid "Inline Formula|I"
 msgstr "Formel i teksten|i"
 
@@ -7510,7 +7684,7 @@ msgstr "Kort tittel"
 msgid "Index Entry|I"
 msgstr "Nøkkelord for register|N"
 
-#: lib/ui/classic.ui:224 src/frontends/qt4/Dialogs.cpp:228
+#: lib/ui/classic.ui:224 src/frontends/qt4/Dialogs.cpp:230
 msgid "Nomenclature Entry"
 msgstr ""
 
@@ -7558,11 +7732,11 @@ msgstr "Sett inn fil|e"
 msgid "External Material...|x"
 msgstr "Eksternt materiale...|E"
 
-#: lib/ui/classic.ui:241 lib/ui/stdmenus.inc:327
+#: lib/ui/classic.ui:241 lib/ui/stdmenus.inc:328
 msgid "Superscript|S"
 msgstr "Hevet skrift|H"
 
-#: lib/ui/classic.ui:242 lib/ui/stdmenus.inc:328
+#: lib/ui/classic.ui:242 lib/ui/stdmenus.inc:329
 msgid "Subscript|u"
 msgstr "Senket skrift|S"
 
@@ -7574,7 +7748,7 @@ msgstr "Horisontalt fyll\t\\hfill"
 msgid "Hyphenation Point|P"
 msgstr "Orddelingspunkt|p"
 
-#: lib/ui/classic.ui:245 lib/ui/stdmenus.inc:338
+#: lib/ui/classic.ui:245 lib/ui/stdmenus.inc:339
 msgid "Ligature Break|k"
 msgstr "Ligaturbrekk|g"
 
@@ -7582,11 +7756,11 @@ msgstr "Ligaturbrekk|g"
 msgid "Protected Space|r"
 msgstr "Hardt mellomrom"
 
-#: lib/ui/classic.ui:247 lib/ui/stdmenus.inc:331
+#: lib/ui/classic.ui:247 lib/ui/stdmenus.inc:332
 msgid "Inter-word Space|w"
 msgstr "Ordmellomrom|O"
 
-#: lib/ui/classic.ui:248 lib/ui/stdmenus.inc:332
+#: lib/ui/classic.ui:248 lib/ui/stdmenus.inc:333
 msgid "Thin Space|T"
 msgstr "Kort mellomrom\t\\,|K"
 
@@ -7598,11 +7772,11 @@ msgstr "Vertikal avstand..."
 msgid "Line Break|L"
 msgstr "Linjeskift|i"
 
-#: lib/ui/classic.ui:251 lib/ui/stdmenus.inc:318
+#: lib/ui/classic.ui:251 lib/ui/stdmenus.inc:319
 msgid "Ellipsis|i"
 msgstr "Ellipse|i"
 
-#: lib/ui/classic.ui:252 lib/ui/stdmenus.inc:319
+#: lib/ui/classic.ui:252 lib/ui/stdmenus.inc:320
 msgid "End of Sentence|E"
 msgstr "Punktum som avslutter setning|s"
 
@@ -7614,7 +7788,7 @@ msgstr "Enkelt sitattegn"
 msgid "Ordinary Quote|O"
 msgstr "\"Anførselstegn\""
 
-#: lib/ui/classic.ui:255 lib/ui/stdmenus.inc:322
+#: lib/ui/classic.ui:255 lib/ui/stdmenus.inc:323
 msgid "Menu Separator|M"
 msgstr "Menyseparator|M"
 
@@ -7626,43 +7800,43 @@ msgstr "Horisontal linje"
 msgid "Page Break"
 msgstr "Sideskift"
 
-#: lib/ui/classic.ui:262 lib/ui/stdmenus.inc:348
+#: lib/ui/classic.ui:262 lib/ui/stdmenus.inc:349
 msgid "Display Formula|D"
 msgstr "Fremhevet formel"
 
-#: lib/ui/classic.ui:263 lib/ui/stdmenus.inc:251 lib/ui/stdmenus.inc:350
+#: lib/ui/classic.ui:263 lib/ui/stdmenus.inc:251 lib/ui/stdmenus.inc:351
 msgid "Eqnarray Environment|E"
 msgstr ""
 
-#: lib/ui/classic.ui:264 lib/ui/stdmenus.inc:252 lib/ui/stdmenus.inc:351
+#: lib/ui/classic.ui:264 lib/ui/stdmenus.inc:252 lib/ui/stdmenus.inc:352
 msgid "AMS align Environment|a"
 msgstr ""
 
-#: lib/ui/classic.ui:265 lib/ui/stdmenus.inc:253 lib/ui/stdmenus.inc:352
+#: lib/ui/classic.ui:265 lib/ui/stdmenus.inc:253 lib/ui/stdmenus.inc:353
 msgid "AMS alignat Environment|t"
 msgstr ""
 
-#: lib/ui/classic.ui:266 lib/ui/stdmenus.inc:254 lib/ui/stdmenus.inc:353
+#: lib/ui/classic.ui:266 lib/ui/stdmenus.inc:254 lib/ui/stdmenus.inc:354
 msgid "AMS flalign Environment|f"
 msgstr ""
 
-#: lib/ui/classic.ui:269 lib/ui/stdmenus.inc:255 lib/ui/stdmenus.inc:354
+#: lib/ui/classic.ui:269 lib/ui/stdmenus.inc:255 lib/ui/stdmenus.inc:355
 msgid "AMS gather Environment|g"
 msgstr ""
 
-#: lib/ui/classic.ui:270 lib/ui/stdmenus.inc:256 lib/ui/stdmenus.inc:355
+#: lib/ui/classic.ui:270 lib/ui/stdmenus.inc:256 lib/ui/stdmenus.inc:356
 msgid "AMS multline Environment|m"
 msgstr ""
 
-#: lib/ui/classic.ui:272 lib/ui/stdmenus.inc:357
+#: lib/ui/classic.ui:272 lib/ui/stdmenus.inc:358
 msgid "Array Environment|y"
 msgstr ""
 
-#: lib/ui/classic.ui:273 lib/ui/stdmenus.inc:358
+#: lib/ui/classic.ui:273 lib/ui/stdmenus.inc:359
 msgid "Cases Environment|C"
 msgstr ""
 
-#: lib/ui/classic.ui:274 lib/ui/stdmenus.inc:362
+#: lib/ui/classic.ui:274 lib/ui/stdmenus.inc:363
 msgid "Split Environment|S"
 msgstr ""
 
@@ -7738,40 +7912,40 @@ msgstr "Tekst St
 msgid "Floatflt Figure"
 msgstr "\"Floatflt\" figur"
 
-#: lib/ui/classic.ui:310 lib/ui/classic.ui:360 lib/ui/stdmenus.inc:375
+#: lib/ui/classic.ui:310 lib/ui/classic.ui:360 lib/ui/stdmenus.inc:376
 msgid "Table of Contents|C"
 msgstr "Innholdsfortegnelse|n"
 
-#: lib/ui/classic.ui:312 lib/ui/stdmenus.inc:377
+#: lib/ui/classic.ui:312 lib/ui/stdmenus.inc:378
 msgid "Index List|I"
 msgstr "Register|R"
 
-#: lib/ui/classic.ui:313 lib/ui/stdmenus.inc:378
+#: lib/ui/classic.ui:313 lib/ui/stdmenus.inc:379
 #, fuzzy
 msgid "Nomenclature|N"
 msgstr "Notis|s"
 
-#: lib/ui/classic.ui:314 lib/ui/stdmenus.inc:379
+#: lib/ui/classic.ui:314 lib/ui/stdmenus.inc:380
 msgid "BibTeX Bibliography...|B"
 msgstr "BibTeX Referanseliste...|B"
 
-#: lib/ui/classic.ui:318 lib/ui/stdmenus.inc:383
+#: lib/ui/classic.ui:318 lib/ui/stdmenus.inc:384
 msgid "LyX Document...|X"
 msgstr "LyX dokument...|X"
 
-#: lib/ui/classic.ui:319 lib/ui/stdmenus.inc:384
+#: lib/ui/classic.ui:319 lib/ui/stdmenus.inc:385
 msgid "Plain Text...|T"
 msgstr "Ren tekst...|t"
 
-#: lib/ui/classic.ui:320 lib/ui/stdmenus.inc:385
+#: lib/ui/classic.ui:320 lib/ui/stdmenus.inc:386
 msgid "Plain Text, Join Lines...|J"
 msgstr "Ren tekst, skjøt sammen linjer...|l"
 
-#: lib/ui/classic.ui:324 lib/ui/stdmenus.inc:417
+#: lib/ui/classic.ui:324 lib/ui/stdmenus.inc:418
 msgid "Track Changes|T"
 msgstr "Spor endringer|S"
 
-#: lib/ui/classic.ui:325 lib/ui/stdmenus.inc:418
+#: lib/ui/classic.ui:325 lib/ui/stdmenus.inc:419
 msgid "Merge Changes...|M"
 msgstr "Flett inn endringer...|F"
 
@@ -7783,7 +7957,7 @@ msgstr "Godta alle endringer|G"
 msgid "Reject All Changes|R"
 msgstr "Forkast alle endringer|k"
 
-#: lib/ui/classic.ui:328 lib/ui/stdmenus.inc:423
+#: lib/ui/classic.ui:328 lib/ui/stdmenus.inc:424
 msgid "Show Changes in Output|S"
 msgstr "Vis endringer i utskrift|V"
 
@@ -7827,7 +8001,7 @@ msgstr "
 msgid "Start Appendix Here|S"
 msgstr "Begynn appendiks her|a"
 
-#: lib/ui/classic.ui:356 lib/ui/stdmenus.inc:407
+#: lib/ui/classic.ui:356 lib/ui/stdmenus.inc:408
 msgid "Build Program|B"
 msgstr "Lag programm|o"
 
@@ -7835,7 +8009,7 @@ msgstr "Lag programm|o"
 msgid "Update|U"
 msgstr "Oppdater|O"
 
-#: lib/ui/classic.ui:359 lib/ui/stdmenus.inc:408
+#: lib/ui/classic.ui:359 lib/ui/stdmenus.inc:409
 msgid "LaTeX Log|L"
 msgstr "LaTeX Logg|L"
 
@@ -7843,35 +8017,35 @@ msgstr "LaTeX Logg|L"
 msgid "TeX Information|X"
 msgstr "LaTeX Konfigurasjon|X"
 
-#: lib/ui/classic.ui:374 lib/ui/stdmenus.inc:431
+#: lib/ui/classic.ui:374 lib/ui/stdmenus.inc:432
 msgid "Next Note|N"
 msgstr "Neste notis|o"
 
-#: lib/ui/classic.ui:375 lib/ui/stdmenus.inc:434
+#: lib/ui/classic.ui:375 lib/ui/stdmenus.inc:435
 msgid "Go to Label|L"
 msgstr "Gå til merke"
 
-#: lib/ui/classic.ui:376 lib/ui/stdmenus.inc:430
+#: lib/ui/classic.ui:376 lib/ui/stdmenus.inc:431
 msgid "Bookmarks|B"
 msgstr "Bokmerker|B"
 
-#: lib/ui/classic.ui:380 lib/ui/stdmenus.inc:440
+#: lib/ui/classic.ui:380 lib/ui/stdmenus.inc:441
 msgid "Save Bookmark 1|S"
 msgstr "Lagre bokmerke 1"
 
-#: lib/ui/classic.ui:381 lib/ui/stdmenus.inc:441
+#: lib/ui/classic.ui:381 lib/ui/stdmenus.inc:442
 msgid "Save Bookmark 2"
 msgstr "Lagre bokmerke 2"
 
-#: lib/ui/classic.ui:382 lib/ui/stdmenus.inc:442
+#: lib/ui/classic.ui:382 lib/ui/stdmenus.inc:443
 msgid "Save Bookmark 3"
 msgstr "Lagre bokmerke 3"
 
-#: lib/ui/classic.ui:383 lib/ui/stdmenus.inc:443
+#: lib/ui/classic.ui:383 lib/ui/stdmenus.inc:444
 msgid "Save Bookmark 4"
 msgstr "Lagre bokmerke 4"
 
-#: lib/ui/classic.ui:384 lib/ui/stdmenus.inc:444
+#: lib/ui/classic.ui:384 lib/ui/stdmenus.inc:445
 msgid "Save Bookmark 5"
 msgstr "Lagre bokmerke 5"
 
@@ -7895,43 +8069,43 @@ msgstr "G
 msgid "Go to Bookmark 5|5"
 msgstr "Gå til bokmerke 5|5"
 
-#: lib/ui/classic.ui:405 lib/ui/stdmenus.inc:472
+#: lib/ui/classic.ui:405 lib/ui/stdmenus.inc:473
 msgid "Introduction|I"
 msgstr "Introduksjon|I"
 
-#: lib/ui/classic.ui:406 lib/ui/stdmenus.inc:473
+#: lib/ui/classic.ui:406 lib/ui/stdmenus.inc:474
 msgid "Tutorial|T"
 msgstr "Innføring|f"
 
-#: lib/ui/classic.ui:407 lib/ui/stdmenus.inc:474
+#: lib/ui/classic.ui:407 lib/ui/stdmenus.inc:475
 msgid "User's Guide|U"
 msgstr "Brukermanual|B"
 
-#: lib/ui/classic.ui:408 lib/ui/stdmenus.inc:475
+#: lib/ui/classic.ui:408 lib/ui/stdmenus.inc:476
 msgid "Extended Features|E"
 msgstr "Utvidede egenskaper|U"
 
-#: lib/ui/classic.ui:409 lib/ui/stdmenus.inc:476
+#: lib/ui/classic.ui:409 lib/ui/stdmenus.inc:477
 msgid "Embedded Objects|m"
 msgstr ""
 
-#: lib/ui/classic.ui:410 lib/ui/stdmenus.inc:477
+#: lib/ui/classic.ui:410 lib/ui/stdmenus.inc:478
 msgid "Customization|C"
 msgstr "Tilpasning|T"
 
-#: lib/ui/classic.ui:412 lib/ui/stdmenus.inc:478
+#: lib/ui/classic.ui:412 lib/ui/stdmenus.inc:479
 msgid "FAQ|F"
 msgstr "FAQ|Q"
 
-#: lib/ui/classic.ui:413 lib/ui/stdmenus.inc:479
+#: lib/ui/classic.ui:413 lib/ui/stdmenus.inc:480
 msgid "Table of Contents|a"
 msgstr "Innholdsfortegnelse|h"
 
-#: lib/ui/classic.ui:414 lib/ui/stdmenus.inc:480
+#: lib/ui/classic.ui:414 lib/ui/stdmenus.inc:481
 msgid "LaTeX Configuration|L"
 msgstr "LaTeX Konfigurasjon|L"
 
-#: lib/ui/classic.ui:416 lib/ui/stdmenus.inc:482
+#: lib/ui/classic.ui:416 lib/ui/stdmenus.inc:483
 msgid "About LyX|X"
 msgstr "Om LyX|X"
 
@@ -7975,18 +8149,18 @@ msgstr "Steng vindu|d"
 msgid "Redo|R"
 msgstr "Gjør om|G"
 
-#: lib/ui/stdmenus.inc:87 lib/ui/stdtoolbars.inc:66 src/Text3.cpp:835
+#: lib/ui/stdmenus.inc:87 lib/ui/stdtoolbars.inc:66 src/Text3.cpp:836
 #: src/mathed/InsetMathNest.cpp:447
 msgid "Cut"
 msgstr "Klipp"
 
-#: lib/ui/stdmenus.inc:88 lib/ui/stdtoolbars.inc:67 src/Text3.cpp:840
+#: lib/ui/stdmenus.inc:88 lib/ui/stdtoolbars.inc:67 src/Text3.cpp:841
 #: src/mathed/InsetMathNest.cpp:455
 msgid "Copy"
 msgstr "Kopier"
 
-#: lib/ui/stdmenus.inc:89 lib/ui/stdtoolbars.inc:68 src/Text3.cpp:816
-#: src/mathed/InsetMathGrid.cpp:1206 src/mathed/InsetMathNest.cpp:426
+#: lib/ui/stdmenus.inc:89 lib/ui/stdtoolbars.inc:68 src/Text3.cpp:817
+#: src/mathed/InsetMathGrid.cpp:1167 src/mathed/InsetMathNest.cpp:426
 msgid "Paste"
 msgstr "Lim inn"
 
@@ -8299,157 +8473,162 @@ msgstr "Kort tittel"
 msgid "TeX Code|X"
 msgstr "TeX-kode|X"
 
-#: lib/ui/stdmenus.inc:320
+#: lib/ui/stdmenus.inc:314 src/insets/InsetInclude.cpp:325
+#, fuzzy
+msgid "Program Listing"
+msgstr "Initialisering av programmet"
+
+#: lib/ui/stdmenus.inc:321
 msgid "Ordinary Quote|Q"
 msgstr "Vanlig sitattegn"
 
-#: lib/ui/stdmenus.inc:321
+#: lib/ui/stdmenus.inc:322
 msgid "Single Quote|S"
 msgstr "Enkelt sitattegn"
 
-#: lib/ui/stdmenus.inc:323
+#: lib/ui/stdmenus.inc:324
 msgid "Phonetic Symbols|y"
 msgstr "Fonetiske symboler|y"
 
-#: lib/ui/stdmenus.inc:330
+#: lib/ui/stdmenus.inc:331
 msgid "Protected Space|P"
 msgstr "Hardt mellomrom|a"
 
-#: lib/ui/stdmenus.inc:333
+#: lib/ui/stdmenus.inc:334
 msgid "Horizontal Fill|F"
 msgstr "Horisontalt fyll\t\\hfill|f"
 
-#: lib/ui/stdmenus.inc:334
+#: lib/ui/stdmenus.inc:335
 msgid "Horizontal Line|L"
 msgstr "Horisontal linje|l"
 
-#: lib/ui/stdmenus.inc:335
+#: lib/ui/stdmenus.inc:336
 msgid "Vertical Space...|V"
 msgstr "Vertikal avstand...|V"
 
-#: lib/ui/stdmenus.inc:337
+#: lib/ui/stdmenus.inc:338
 msgid "Hyphenation Point|H"
 msgstr "Orddelingspunkt|p"
 
-#: lib/ui/stdmenus.inc:339
+#: lib/ui/stdmenus.inc:340
 msgid "Line Break|B"
 msgstr "Linjeskift|i"
 
-#: lib/ui/stdmenus.inc:341
+#: lib/ui/stdmenus.inc:342
 msgid "Page Break|a"
 msgstr "Sideskift|e"
 
-#: lib/ui/stdmenus.inc:342
+#: lib/ui/stdmenus.inc:343
 msgid "Clear Page|C"
 msgstr "Blank side|B"
 
-#: lib/ui/stdmenus.inc:343
+#: lib/ui/stdmenus.inc:344
 msgid "Clear Double Page|D"
 msgstr "Doble blanke sider|D"
 
-#: lib/ui/stdmenus.inc:349
+#: lib/ui/stdmenus.inc:350
 msgid "Numbered Formula|N"
 msgstr "Nummerert formel|N"
 
-#: lib/ui/stdmenus.inc:359
+#: lib/ui/stdmenus.inc:360
 msgid "Aligned Environment|l"
 msgstr ""
 
-#: lib/ui/stdmenus.inc:360
+#: lib/ui/stdmenus.inc:361
 msgid "AlignedAt Environment|v"
 msgstr ""
 
-#: lib/ui/stdmenus.inc:361
+#: lib/ui/stdmenus.inc:362
 msgid "Gathered Environment|h"
 msgstr ""
 
-#: lib/ui/stdmenus.inc:364
+#: lib/ui/stdmenus.inc:365
 #, fuzzy
 msgid "Delimiters|r"
 msgstr "Parenteser og klammer"
 
-#: lib/ui/stdmenus.inc:365
+#: lib/ui/stdmenus.inc:366
 #, fuzzy
 msgid "Matrix|x"
 msgstr "Matte, matrise"
 
-#: lib/ui/stdmenus.inc:371
+#: lib/ui/stdmenus.inc:372
 msgid "Text Wrap Float|W"
 msgstr "Område som teksten brytes rundt"
 
-#: lib/ui/stdmenus.inc:387
+#: lib/ui/stdmenus.inc:388
 msgid "External Material...|M"
 msgstr "Eksternt materiale...|E"
 
-#: lib/ui/stdmenus.inc:388
+#: lib/ui/stdmenus.inc:389
 msgid "Child Document...|d"
 msgstr "Underdokument...|d"
 
-#: lib/ui/stdmenus.inc:392
+#: lib/ui/stdmenus.inc:393
 msgid "LyX Note|N"
 msgstr "Notis|N"
 
-#: lib/ui/stdmenus.inc:393
+#: lib/ui/stdmenus.inc:394
 msgid "Comment|C"
 msgstr "Kommentar|K"
 
-#: lib/ui/stdmenus.inc:394
+#: lib/ui/stdmenus.inc:395
 msgid "Greyed Out|G"
 msgstr "Grået ut|G"
 
-#: lib/ui/stdmenus.inc:406
+#: lib/ui/stdmenus.inc:407
 msgid "Change Tracking|C"
 msgstr "Spore endringer"
 
-#: lib/ui/stdmenus.inc:409
+#: lib/ui/stdmenus.inc:410
 msgid "Table of Contents|T"
 msgstr "Innholdsfortegnelse|n"
 
-#: lib/ui/stdmenus.inc:410
+#: lib/ui/stdmenus.inc:411
 msgid "Start Appendix Here|A"
 msgstr "Begynn appendiks her|a"
 
-#: lib/ui/stdmenus.inc:412
+#: lib/ui/stdmenus.inc:413
 msgid "Compressed|o"
 msgstr "Komprimert|o"
 
-#: lib/ui/stdmenus.inc:413
+#: lib/ui/stdmenus.inc:414
 msgid "Settings...|S"
 msgstr "Innstillinger...|I"
 
-#: lib/ui/stdmenus.inc:419
+#: lib/ui/stdmenus.inc:420
 msgid "Accept Change|A"
 msgstr "Godta endring|G"
 
-#: lib/ui/stdmenus.inc:420
+#: lib/ui/stdmenus.inc:421
 msgid "Reject Change|R"
 msgstr "Forkast endring|k"
 
-#: lib/ui/stdmenus.inc:421
+#: lib/ui/stdmenus.inc:422
 msgid "Accept All Changes|c"
 msgstr "Godta alle endringer|a"
 
-#: lib/ui/stdmenus.inc:422
+#: lib/ui/stdmenus.inc:423
 msgid "Reject All Changes|e"
 msgstr "Forkast alle endringer|t"
 
-#: lib/ui/stdmenus.inc:432
+#: lib/ui/stdmenus.inc:433
 msgid "Next Change|C"
 msgstr "Neste endring|N"
 
-#: lib/ui/stdmenus.inc:433
+#: lib/ui/stdmenus.inc:434
 msgid "Next Cross-Reference|R"
 msgstr "Neste kryssreferanse|r"
 
-#: lib/ui/stdmenus.inc:445
+#: lib/ui/stdmenus.inc:446
 msgid "Clear Bookmarks|C"
 msgstr "Fjerne bokmerker|F"
 
-#: lib/ui/stdmenus.inc:456
+#: lib/ui/stdmenus.inc:457
 msgid "Thesaurus...|T"
 msgstr ""
 
-#: lib/ui/stdmenus.inc:459
+#: lib/ui/stdmenus.inc:460
 msgid "TeX Information|I"
 msgstr "LaTeX Konfigurasjon|X"
 
@@ -8473,11 +8652,11 @@ msgstr "Skriv ut dokumentet"
 msgid "Check spelling"
 msgstr "Stavesjekk"
 
-#: lib/ui/stdtoolbars.inc:64 src/BufferView.cpp:762
+#: lib/ui/stdtoolbars.inc:64 src/BufferView.cpp:763
 msgid "Undo"
 msgstr "Angre"
 
-#: lib/ui/stdtoolbars.inc:65 src/BufferView.cpp:772
+#: lib/ui/stdtoolbars.inc:65 src/BufferView.cpp:773
 msgid "Redo"
 msgstr "Gjør omigjen"
 
@@ -8811,7 +8990,7 @@ msgstr "Mattepanel"
 
 #: lib/ui/stdtoolbars.inc:191
 #, fuzzy
-msgid "Math Spacing"
+msgid "Math Spacings"
 msgstr "LyX: matematiske mellomrom"
 
 #: lib/ui/stdtoolbars.inc:192 lib/ui/stdtoolbars.inc:257
@@ -8830,7 +9009,7 @@ msgid "Fractions"
 msgstr "LyX: Brøker"
 
 #: lib/ui/stdtoolbars.inc:195 lib/ui/stdtoolbars.inc:278
-#: src/frontends/qt4/QDocument.cpp:463
+#: src/frontends/qt4/QDocument.cpp:566
 msgid "Fonts"
 msgstr "Fonter"
 
@@ -8994,7 +9173,7 @@ msgstr "Del"
 
 #: lib/ui/stdtoolbars.inc:248
 #, fuzzy
-msgid "Spacing"
+msgid "Spacings"
 msgstr "&Avstand:"
 
 #: lib/ui/stdtoolbars.inc:249
@@ -11174,75 +11353,96 @@ msgstr "Sentrert"
 msgid "intercal"
 msgstr "Skriver"
 
-#: src/Buffer.cpp:229
+#: src/Buffer.cpp:230
 msgid "Could not remove temporary directory"
 msgstr "Kunne ikke fjerne midlertidig mappe"
 
-#: src/Buffer.cpp:230
+#: src/Buffer.cpp:231
 #, c-format
 msgid "Could not remove the temporary directory %1$s"
 msgstr "Kunne ikke fjerne den midlertidige mappa %1$s"
 
-#: src/Buffer.cpp:401
+#: src/Buffer.cpp:402
 msgid "Unknown document class"
 msgstr "Ukjent dokumentklasse"
 
-#: src/Buffer.cpp:402
+#: src/Buffer.cpp:403
 #, c-format
 msgid "Using the default document class, because the class %1$s is unknown."
 msgstr "Bruker standard dokumentklasse, fordi klassen %1$s er ukjent."
 
-#: src/Buffer.cpp:461 src/Text.cpp:293
+#: src/Buffer.cpp:462 src/Text.cpp:293
 #, c-format
 msgid "Unknown token: %1$s %2$s\n"
 msgstr "Ukjent symbol: %1$s %2$s\n"
 
-#: src/Buffer.cpp:465 src/Buffer.cpp:472 src/Buffer.cpp:492
+#: src/Buffer.cpp:466 src/Buffer.cpp:473 src/Buffer.cpp:493
 msgid "Document header error"
 msgstr ""
 
-#: src/Buffer.cpp:471
+#: src/Buffer.cpp:472
 msgid "\\begin_header is missing"
 msgstr "\\begin_header mangler"
 
-#: src/Buffer.cpp:491
+#: src/Buffer.cpp:492
 msgid "\\begin_document is missing"
 msgstr "\\begin_document mangler"
 
-#: src/Buffer.cpp:502
+#: src/Buffer.cpp:503
 msgid "Can't load document class"
 msgstr "Kan ikke laste inn dokumentklasse"
 
-#: src/Buffer.cpp:503
-#, c-format
+#: src/Buffer.cpp:504
+#, c-format
+msgid ""
+"Using the default document class, because the class %1$s could not be loaded."
+msgstr ""
+"Bruker standard dokumentklasse, fordi klassen %1$s ikke kunne lastes inn."
+
+#: src/Buffer.cpp:515 src/Buffer.cpp:521 src/BufferView.cpp:899
+#: src/BufferView.cpp:905
+msgid "Changes not shown in LaTeX output"
+msgstr ""
+
+#: src/Buffer.cpp:516 src/BufferView.cpp:900
 msgid ""
-"Using the default document class, because the class %1$s could not be loaded."
+"Changes will not be highlighted in LaTeX output, because neither dvipost nor "
+"xcolor/soul are installed.\n"
+"Please install these packages or redefine \\lyxadded and \\lyxdeleted in the "
+"LaTeX preamble."
 msgstr ""
-"Bruker standard dokumentklasse, fordi klassen %1$s ikke kunne lastes inn."
 
-#: src/Buffer.cpp:636 src/Buffer.cpp:645
+#: src/Buffer.cpp:522 src/BufferView.cpp:906
+msgid ""
+"Changes will not be highlighted in LaTeX output when using pdflatex, because "
+"xcolor and soul are not installed.\n"
+"Please install both packages or redefine \\lyxadded and \\lyxdeleted in the "
+"LaTeX preamble."
+msgstr ""
+
+#: src/Buffer.cpp:657 src/Buffer.cpp:666
 msgid "Document could not be read"
 msgstr "Dokumentet lot seg ikke lese"
 
-#: src/Buffer.cpp:637 src/Buffer.cpp:646
+#: src/Buffer.cpp:658 src/Buffer.cpp:667
 #, c-format
 msgid "%1$s could not be read."
 msgstr "%1$s var uleselig"
 
-#: src/Buffer.cpp:654 src/Buffer.cpp:726
+#: src/Buffer.cpp:675 src/Buffer.cpp:747
 msgid "Document format failure"
 msgstr "Feil med dokumentformatet"
 
-#: src/Buffer.cpp:655
+#: src/Buffer.cpp:676
 #, c-format
 msgid "%1$s is not a LyX document."
 msgstr "%1$s er ikke et LyX-dokument."
 
-#: src/Buffer.cpp:679
+#: src/Buffer.cpp:700
 msgid "Conversion failed"
 msgstr "Kunne ikke konvertere"
 
-#: src/Buffer.cpp:680
+#: src/Buffer.cpp:701
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but a temporary file for converting "
@@ -11251,11 +11451,11 @@ msgstr ""
 "%1$s ble laget med en annen versjon av LyX, men en midlertidig fil for "
 "konvertering kunne ikke bli laget."
 
-#: src/Buffer.cpp:689
+#: src/Buffer.cpp:710
 msgid "Conversion script not found"
 msgstr "Fant ikke konverteringsscriptet"
 
-#: src/Buffer.cpp:690
+#: src/Buffer.cpp:711
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but the conversion script lyx2lyx "
@@ -11264,11 +11464,11 @@ msgstr ""
 "%1$s er fra en annen versjon av LyX, men konverteringsskriptet lyx2lyx var "
 "ikke å finne."
 
-#: src/Buffer.cpp:711
+#: src/Buffer.cpp:732
 msgid "Conversion script failed"
 msgstr "Konverteringsscriptet mislyktes"
 
-#: src/Buffer.cpp:712
+#: src/Buffer.cpp:733
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but the lyx2lyx script failed to "
@@ -11277,16 +11477,16 @@ msgstr ""
 "%1$s er fra en annen versjon av LyX, men konverteringsscriptet lyx2lyx "
 "mislyktes med konverteringen."
 
-#: src/Buffer.cpp:727
+#: src/Buffer.cpp:748
 #, c-format
 msgid "%1$s ended unexpectedly, which means that it is probably corrupted."
 msgstr "%1$s tok uventet slutt, filen er sannsynligvis korrupt."
 
-#: src/Buffer.cpp:763
+#: src/Buffer.cpp:784
 msgid "Backup failure"
 msgstr "Sikkerhetskopi mislyktes"
 
-#: src/Buffer.cpp:764
+#: src/Buffer.cpp:785
 #, c-format
 msgid ""
 "Cannot create backup file %1$s.\n"
@@ -11295,45 +11495,30 @@ msgstr ""
 "Kan ikke lage sikkerhetskopien %1$s.\n"
 "Vennligst sjekk at mappen fins og er skrivbar."
 
-#: src/Buffer.cpp:876
+#: src/Buffer.cpp:918
 msgid "Encoding error"
 msgstr "Feil med tegnkoding"
 
-#: src/Buffer.cpp:877
+#: src/Buffer.cpp:919
+#, fuzzy
 msgid ""
-"Some characters of your document are not representable in the chosen "
-"encoding.\n"
+"Some characters of your document are probably not representable in the "
+"chosen encoding.\n"
 "Changing the document encoding to utf8 could help."
 msgstr ""
 "Noen tegn i dokumentet ditt kan ikke representeres med den valgte "
 "tegnkodingen.\n"
 "Å forandre tegnkodingen for dokumentet til utf8 burde hjelpe."
 
-#: src/Buffer.cpp:886
-msgid "Error closing file"
-msgstr "Mislyktes med å lukke fil"
-
-#: src/Buffer.cpp:887
-msgid ""
-"The output file could not be closed properly.\n"
-" Probably some characters of your document are not representable in the "
-"chosen encoding.\n"
-"Changing the document encoding to utf8 could help."
-msgstr ""
-"Filen kunne ikke lukkes ordentlig.\n"
-" Antagelig er det noen tegn som ikke kan representeres i den valgte "
-"tegnkodingen.\n"
-"Å forandre dokumentets tegnkoding til utf8 kan hjelpe."
-
-#: src/Buffer.cpp:1146
+#: src/Buffer.cpp:1197
 msgid "Running chktex..."
 msgstr "Kjører chktex..."
 
-#: src/Buffer.cpp:1159
+#: src/Buffer.cpp:1210
 msgid "chktex failure"
 msgstr "chktex mislyktes"
 
-#: src/Buffer.cpp:1160
+#: src/Buffer.cpp:1211
 msgid "Could not run chktex successfully."
 msgstr "Mislyktes med chktex."
 
@@ -11348,7 +11533,7 @@ msgstr ""
 "\n"
 "Vil du lagre dokumentet, eller forkaste endringene?"
 
-#: src/BufferList.cpp:113 src/BufferList.cpp:221 src/LyXFunc.cpp:725
+#: src/BufferList.cpp:113 src/BufferList.cpp:221 src/LyXFunc.cpp:733
 msgid "Save changed document?"
 msgstr "Lagre dokumentet?"
 
@@ -11373,7 +11558,7 @@ msgstr "  Lagring feilet! Pr
 msgid "  Save failed! Bummer. Document is lost."
 msgstr "  Lagring feilet! Æsj. Mistet dokumentet."
 
-#: src/BufferParams.cpp:438
+#: src/BufferParams.cpp:476
 #, c-format
 msgid ""
 "The layout file requested by this document,\n"
@@ -11384,11 +11569,11 @@ msgid ""
 "for more information.\n"
 msgstr ""
 
-#: src/BufferParams.cpp:444
+#: src/BufferParams.cpp:482
 msgid "Document class not available"
 msgstr "Dokumentklassen er ikke tilgjengelig"
 
-#: src/BufferParams.cpp:445
+#: src/BufferParams.cpp:483
 msgid "LyX will not be able to produce output."
 msgstr "LyX får ikke produsert utdata."
 
@@ -11403,11 +11588,11 @@ msgstr ""
 "\n"
 "Vil du gå tilbake til den lagrede versjonen? "
 
-#: src/BufferView.cpp:237 src/LyXFunc.cpp:899
+#: src/BufferView.cpp:237 src/LyXFunc.cpp:907
 msgid "Revert to saved document?"
 msgstr "Tilbake til sist lagret"
 
-#: src/BufferView.cpp:238 src/LyXFunc.cpp:900 src/LyXVC.cpp:175
+#: src/BufferView.cpp:238 src/LyXFunc.cpp:908 src/LyXVC.cpp:175
 msgid "&Revert"
 msgstr "&Tilbake til lagret"
 
@@ -11438,91 +11623,91 @@ msgstr "&Nytt"
 msgid "Save bookmark"
 msgstr "Lagre bokmerke"
 
-#: src/BufferView.cpp:765
+#: src/BufferView.cpp:766
 msgid "No further undo information"
 msgstr "Ikke mer \"Angre\" informasjon"
 
-#: src/BufferView.cpp:775
+#: src/BufferView.cpp:776
 msgid "No further redo information"
 msgstr "Ikke mer \"Gjør om\" informasjon"
 
-#: src/BufferView.cpp:933
+#: src/BufferView.cpp:953
 msgid "Mark off"
 msgstr "Merke slått av"
 
-#: src/BufferView.cpp:940
+#: src/BufferView.cpp:960
 msgid "Mark on"
 msgstr "Merke på"
 
-#: src/BufferView.cpp:947
+#: src/BufferView.cpp:967
 msgid "Mark removed"
 msgstr "Fjernet merke"
 
-#: src/BufferView.cpp:950
+#: src/BufferView.cpp:970
 msgid "Mark set"
 msgstr "Merke satt"
 
-#: src/BufferView.cpp:996
+#: src/BufferView.cpp:1016
 #, c-format
 msgid "%1$d words in selection."
 msgstr "Det er %1$d ord i utvalget"
 
-#: src/BufferView.cpp:999
+#: src/BufferView.cpp:1019
 #, c-format
 msgid "%1$d words in document."
 msgstr "Det er %1$d ord i dokumentet."
 
-#: src/BufferView.cpp:1004
+#: src/BufferView.cpp:1024
 msgid "One word in selection."
 msgstr "Det er ett ord i utvalget."
 
-#: src/BufferView.cpp:1006
+#: src/BufferView.cpp:1026
 msgid "One word in document."
 msgstr "Ett ord i dokumentet."
 
-#: src/BufferView.cpp:1009
+#: src/BufferView.cpp:1029
 msgid "Count words"
 msgstr "Telle ord"
 
-#: src/BufferView.cpp:1588
+#: src/BufferView.cpp:1608
 msgid "Select LyX document to insert"
 msgstr "Velg LyX dokument som skal settes inn"
 
-#: src/BufferView.cpp:1590 src/LyXFunc.cpp:1866 src/LyXFunc.cpp:1905
-#: src/LyXFunc.cpp:1978 src/callback.cpp:136
+#: src/BufferView.cpp:1610 src/LyXFunc.cpp:1878 src/LyXFunc.cpp:1917
+#: src/LyXFunc.cpp:1990 src/callback.cpp:136
 #: src/frontends/controllers/ControlBibtex.cpp:52
 #: src/frontends/controllers/ControlBibtex.cpp:64
 #: src/frontends/controllers/ControlExternal.cpp:169
 #: src/frontends/controllers/ControlGraphics.cpp:96
-#: src/frontends/controllers/ControlInclude.cpp:91
+#: src/frontends/controllers/ControlInclude.cpp:93
 msgid "Documents|#o#O"
 msgstr "Dokumenter|#o#O"
 
-#: src/BufferView.cpp:1591 src/LyXFunc.cpp:1906 src/LyXFunc.cpp:1979
+#: src/BufferView.cpp:1611 src/LyXFunc.cpp:1918 src/LyXFunc.cpp:1991
 msgid "Examples|#E#e"
 msgstr "Eksempler|#E#e"
 
-#: src/BufferView.cpp:1595 src/LyXFunc.cpp:1871 src/LyXFunc.cpp:1910
+#: src/BufferView.cpp:1615 src/LyXFunc.cpp:1883 src/LyXFunc.cpp:1922
 #: src/callback.cpp:142
 msgid "LyX Documents (*.lyx)"
 msgstr "LyX-Dokumenter (*.lyx)"
 
-#: src/BufferView.cpp:1607 src/LyXFunc.cpp:1920 src/LyXFunc.cpp:2000
-#: src/LyXFunc.cpp:2014 src/LyXFunc.cpp:2030
+#: src/BufferView.cpp:1627 src/LyXFunc.cpp:1932 src/LyXFunc.cpp:2012
+#: src/LyXFunc.cpp:2026 src/LyXFunc.cpp:2042
 msgid "Canceled."
 msgstr "Avbrutt."
 
-#: src/BufferView.cpp:1618
+#: src/BufferView.cpp:1638
 #, c-format
 msgid "Inserting document %1$s..."
 msgstr "Setter inn dokumentet %1$s..."
 
-#: src/BufferView.cpp:1629
+#: src/BufferView.cpp:1649
 #, c-format
 msgid "Document %1$s inserted."
 msgstr "Satt inn document %1$s."
 
-#: src/BufferView.cpp:1631
+#: src/BufferView.cpp:1651
 #, c-format
 msgid "Could not insert document %1$s"
 msgstr "Kunne ikke sette inn dokumentet %1$s"
@@ -11596,7 +11781,7 @@ msgstr "LaTeX tekst"
 msgid "previewed snippet"
 msgstr "forhåndsviste formler o.l."
 
-#: src/Color.cpp:283 src/insets/InsetNote.cpp:310
+#: src/Color.cpp:283 src/insets/InsetNote.cpp:311
 msgid "note"
 msgstr "notis"
 
@@ -11669,62 +11854,67 @@ msgid "math frame"
 msgstr "matte ramme"
 
 #: src/Color.cpp:301
-msgid "math line"
+#, fuzzy
+msgid "math corners"
 msgstr "matte linje"
 
 #: src/Color.cpp:302
+msgid "math line"
+msgstr "matte linje"
+
+#: src/Color.cpp:303
 msgid "caption frame"
 msgstr "ramme rundt bildetekst"
 
-#: src/Color.cpp:303
+#: src/Color.cpp:304
 msgid "collapsable inset text"
 msgstr "foldbare \"inset\", tekst"
 
-#: src/Color.cpp:304
+#: src/Color.cpp:305
 msgid "collapsable inset frame"
 msgstr "foldbare \"inset\", ramme"
 
-#: src/Color.cpp:305
+#: src/Color.cpp:306
 msgid "inset background"
 msgstr "inset bakgrunn"
 
-#: src/Color.cpp:306
+#: src/Color.cpp:307
 msgid "inset frame"
 msgstr "inset ramme"
 
-#: src/Color.cpp:307
+#: src/Color.cpp:308
 msgid "LaTeX error"
 msgstr "LaTeX feil"
 
-#: src/Color.cpp:308
+#: src/Color.cpp:309
 msgid "end-of-line marker"
 msgstr "linjesluttmerke"
 
-#: src/Color.cpp:309
+#: src/Color.cpp:310
 msgid "appendix marker"
 msgstr "appendiksmarkering"
 
-#: src/Color.cpp:310
+#: src/Color.cpp:311
 msgid "change bar"
 msgstr "endringsmerke"
 
-#: src/Color.cpp:311
+#: src/Color.cpp:312
 msgid "Deleted text"
 msgstr "slettet tekst"
 
-#: src/Color.cpp:312
+#: src/Color.cpp:313
 msgid "Added text"
 msgstr "tillagt tekst"
 
-#: src/Color.cpp:313
+#: src/Color.cpp:314
 msgid "added space markers"
 msgstr "avstandsmarkering"
 
-#: src/Color.cpp:314
+#: src/Color.cpp:315
 msgid "top/bottom line"
 msgstr "topp/bunn linje"
 
-#: src/Color.cpp:315
+#: src/Color.cpp:316
 msgid "table line"
 msgstr "tabell-linje"
 
@@ -11829,7 +12019,7 @@ msgstr "Ingen utdata"
 msgid "An empty output file was generated."
 msgstr "Det ble produsert en tom fil"
 
-#: src/CutAndPaste.cpp:435
+#: src/CutAndPaste.cpp:441
 #, c-format
 msgid ""
 "Layout had to be changed from\n"
@@ -11842,11 +12032,11 @@ msgstr ""
 "som en følge av bytte av dokumentklasse\n"
 "fra %3$s til %4$s."
 
-#: src/CutAndPaste.cpp:440
+#: src/CutAndPaste.cpp:446
 msgid "Changed Layout"
 msgstr "Endret stil"
 
-#: src/CutAndPaste.cpp:459
+#: src/CutAndPaste.cpp:465
 #, c-format
 msgid ""
 "Character style %1$s is undefined because of class conversion from\n"
@@ -11855,11 +12045,11 @@ msgstr ""
 "Tekststilen %1$s er udefinert på grunn av konvertering fra\n"
 "%2$s til %3$s"
 
-#: src/CutAndPaste.cpp:466
+#: src/CutAndPaste.cpp:472
 msgid "Undefined character style"
 msgstr "Udefinert tekststil"
 
-#: src/Exporter.cpp:82 src/LyXFunc.cpp:1062
+#: src/Exporter.cpp:82 src/LyXFunc.cpp:1070
 #, c-format
 msgid ""
 "The file %1$s already exists.\n"
@@ -11870,11 +12060,11 @@ msgstr ""
 "\n"
 "Vil du skrive over den?"
 
-#: src/Exporter.cpp:85 src/LyXFunc.cpp:1065
+#: src/Exporter.cpp:85 src/LyXFunc.cpp:1073
 msgid "Over-write file?"
 msgstr "Overskrive filen?"
 
-#: src/Exporter.cpp:87 src/LyXFunc.cpp:1066 src/LyXFunc.cpp:2027
+#: src/Exporter.cpp:87 src/LyXFunc.cpp:1074 src/LyXFunc.cpp:2039
 #: src/callback.cpp:170
 msgid "&Over-write"
 msgstr "Overskrive"
@@ -11927,92 +12117,92 @@ msgstr "Dokumentet eksportert som %1$s til filen `%2$s'"
 msgid "Document exported as %1$s"
 msgstr "Dokumentet eksportert som %1$s"
 
-#: src/Font.cpp:52 src/frontends/controllers/ControlDocument.cpp:49
+#: src/Font.cpp:55 src/frontends/controllers/ControlDocument.cpp:48
 #: src/frontends/controllers/frontend_helpers.cpp:870
 msgid "Roman"
 msgstr "Roman"
 
-#: src/Font.cpp:52 src/frontends/controllers/ControlDocument.cpp:49
+#: src/Font.cpp:55 src/frontends/controllers/ControlDocument.cpp:48
 #: src/frontends/controllers/frontend_helpers.cpp:874
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: src/Font.cpp:52 src/frontends/controllers/ControlDocument.cpp:49
+#: src/Font.cpp:55 src/frontends/controllers/ControlDocument.cpp:48
 #: src/frontends/controllers/frontend_helpers.cpp:878
 msgid "Typewriter"
 msgstr "Skrivemaskin"
 
-#: src/Font.cpp:52
+#: src/Font.cpp:55
 msgid "Symbol"
 msgstr "Symbol"
 
-#: src/Font.cpp:54 src/Font.cpp:57 src/Font.cpp:60 src/Font.cpp:66
-#: src/Font.cpp:69
+#: src/Font.cpp:57 src/Font.cpp:60 src/Font.cpp:63 src/Font.cpp:69
+#: src/Font.cpp:72
 msgid "Inherit"
 msgstr "Arv"
 
-#: src/Font.cpp:54 src/Font.cpp:57 src/Font.cpp:61 src/Font.cpp:66
-#: src/Font.cpp:69
+#: src/Font.cpp:57 src/Font.cpp:60 src/Font.cpp:64 src/Font.cpp:69
+#: src/Font.cpp:72
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: src/Font.cpp:57 src/frontends/controllers/frontend_helpers.cpp:900
+#: src/Font.cpp:60 src/frontends/controllers/frontend_helpers.cpp:900
 msgid "Medium"
 msgstr "Medium"
 
-#: src/Font.cpp:57 src/frontends/controllers/frontend_helpers.cpp:904
+#: src/Font.cpp:60 src/frontends/controllers/frontend_helpers.cpp:904
 msgid "Bold"
 msgstr "Fet"
 
-#: src/Font.cpp:60 src/frontends/controllers/frontend_helpers.cpp:926
+#: src/Font.cpp:63 src/frontends/controllers/frontend_helpers.cpp:926
 msgid "Upright"
 msgstr "Stående"
 
-#: src/Font.cpp:60 src/frontends/controllers/frontend_helpers.cpp:930
+#: src/Font.cpp:63 src/frontends/controllers/frontend_helpers.cpp:930
 msgid "Italic"
 msgstr "Kursiv"
 
-#: src/Font.cpp:60 src/frontends/controllers/frontend_helpers.cpp:934
+#: src/Font.cpp:63 src/frontends/controllers/frontend_helpers.cpp:934
 msgid "Slanted"
 msgstr "Skråstilt"
 
-#: src/Font.cpp:60
+#: src/Font.cpp:63
 msgid "Smallcaps"
 msgstr "Kapiteler"
 
-#: src/Font.cpp:65 src/frontends/controllers/frontend_helpers.cpp:1000
+#: src/Font.cpp:68 src/frontends/controllers/frontend_helpers.cpp:1000
 msgid "Increase"
 msgstr "Øk"
 
-#: src/Font.cpp:65 src/frontends/controllers/frontend_helpers.cpp:1004
+#: src/Font.cpp:68 src/frontends/controllers/frontend_helpers.cpp:1004
 msgid "Decrease"
 msgstr "Minsk"
 
-#: src/Font.cpp:69
+#: src/Font.cpp:72
 msgid "Toggle"
 msgstr "Bytt"
 
-#: src/Font.cpp:509
+#: src/Font.cpp:512
 #, c-format
 msgid "Emphasis %1$s, "
 msgstr "Uthevet %1$s, "
 
-#: src/Font.cpp:512
+#: src/Font.cpp:515
 #, c-format
 msgid "Underline %1$s, "
 msgstr "Understreket %1$s, "
 
-#: src/Font.cpp:515
+#: src/Font.cpp:518
 #, c-format
 msgid "Noun %1$s, "
 msgstr "Substantiv %1$s, "
 
-#: src/Font.cpp:520
+#: src/Font.cpp:523
 #, c-format
 msgid "Language: %1$s, "
 msgstr "Språk: %1$s, "
 
-#: src/Font.cpp:523
+#: src/Font.cpp:526
 #, c-format
 msgid "  Number %1$s"
 msgstr "  Nummer %1s"
@@ -12144,11 +12334,11 @@ msgstr "Kj
 msgid "Running MakeIndex for nomencl."
 msgstr "Kjører MakeIndex for glossar."
 
-#: src/LyX.cpp:129
+#: src/LyX.cpp:130
 msgid "Could not read configuration file"
 msgstr "Kunne ikke lese konfigurasjonsfilen"
 
-#: src/LyX.cpp:130
+#: src/LyX.cpp:131
 #, c-format
 msgid ""
 "Error while reading the configuration file\n"
@@ -12159,37 +12349,37 @@ msgstr ""
 "%1$s.\n"
 "Sjekk om LyX er rett installert."
 
-#: src/LyX.cpp:139
+#: src/LyX.cpp:140
 msgid "LyX: reconfiguring user directory"
 msgstr "LyX: rekonfigurerer brukerfolder"
 
-#: src/LyX.cpp:143
+#: src/LyX.cpp:144
 msgid "Done!"
 msgstr "Ferdig!"
 
-#: src/LyX.cpp:489
+#: src/LyX.cpp:490
 #, c-format
 msgid "Unable to remove the temporary directory %1$s"
 msgstr "Feil: Klarte ikke å fjerne den midlertidige mappen %1$s"
 
-#: src/LyX.cpp:491
+#: src/LyX.cpp:492
 msgid "Unable to remove temporary directory"
 msgstr "Feil: Klarte ikke å fjerne midlertidig mappe"
 
-#: src/LyX.cpp:527
+#: src/LyX.cpp:528
 #, c-format
 msgid "Wrong command line option `%1$s'. Exiting."
 msgstr "Feil kommandolineargument `%1$s'. Avslutter."
 
-#: src/LyX.cpp:784
+#: src/LyX.cpp:796
 msgid "LyX: "
 msgstr "LyX: "
 
-#: src/LyX.cpp:913
+#: src/LyX.cpp:925
 msgid "Could not create temporary directory"
 msgstr "Klarte ikke å lage midlertidig mappe"
 
-#: src/LyX.cpp:914
+#: src/LyX.cpp:926
 #, c-format
 msgid ""
 "Could not create a temporary directory in\n"
@@ -12200,11 +12390,11 @@ msgstr ""
 "%1$s. Forsikre deg om at denne\n"
 "stien eksisteres og er skrivbar, og prøv igjen."
 
-#: src/LyX.cpp:1081
+#: src/LyX.cpp:1093
 msgid "Missing user LyX directory"
 msgstr "Ingen brukerkatalog for LyX"
 
-#: src/LyX.cpp:1082
+#: src/LyX.cpp:1094
 #, c-format
 msgid ""
 "You have specified a non-existent user LyX directory, %1$s.\n"
@@ -12213,37 +12403,37 @@ msgstr ""
 "Du har oppgitt en brukermappe som ikke fins, %1$s.\n"
 "Brukermappa trengs for å lagre programkonfigurasjonen."
 
-#: src/LyX.cpp:1087
+#: src/LyX.cpp:1099
 msgid "&Create directory"
 msgstr "&Opprett mappe"
 
-#: src/LyX.cpp:1088
+#: src/LyX.cpp:1100
 msgid "&Exit LyX"
 msgstr "&Avslutt LyX"
 
-#: src/LyX.cpp:1089
+#: src/LyX.cpp:1101
 msgid "No user LyX directory. Exiting."
 msgstr "Ingen brukerkatalog for LyX. Avslutter."
 
-#: src/LyX.cpp:1093
+#: src/LyX.cpp:1105
 #, c-format
 msgid "LyX: Creating directory %1$s"
 msgstr "LyX: Lager mappen %1$s"
 
-#: src/LyX.cpp:1099
+#: src/LyX.cpp:1111
 msgid "Failed to create directory. Exiting."
 msgstr "Mislyktes i å lage mappen. Avslutter."
 
-#: src/LyX.cpp:1272
+#: src/LyX.cpp:1284
 msgid "List of supported debug flags:"
 msgstr "Liste over debug flagg some støttes:"
 
-#: src/LyX.cpp:1276
+#: src/LyX.cpp:1288
 #, c-format
 msgid "Setting debug level to %1$s"
 msgstr "Setter debug nivå til %1$s"
 
-#: src/LyX.cpp:1287
+#: src/LyX.cpp:1299
 msgid ""
 "Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
 "Command line switches (case sensitive):\n"
@@ -12283,71 +12473,71 @@ msgstr ""
 "\t-version        versjons- og byggeinformasjon\n"
 "Les man sidene til LyX for flere detaljer."
 
-#: src/LyX.cpp:1323 src/support/Package.cpp.in:568
+#: src/LyX.cpp:1335 src/support/Package.cpp.in:568
 msgid "No system directory"
 msgstr ""
 
-#: src/LyX.cpp:1324
+#: src/LyX.cpp:1336
 msgid "Missing directory for -sysdir switch"
 msgstr "Mangler folder for -sysdir parameter"
 
-#: src/LyX.cpp:1334
+#: src/LyX.cpp:1346
 msgid "No user directory"
 msgstr ""
 
-#: src/LyX.cpp:1335
+#: src/LyX.cpp:1347
 msgid "Missing directory for -userdir switch"
 msgstr "Mangler folder for -userdir parameter"
 
-#: src/LyX.cpp:1345
+#: src/LyX.cpp:1357
 msgid "Incomplete command"
 msgstr "Ikke komplett kommando"
 
-#: src/LyX.cpp:1346
+#: src/LyX.cpp:1358
 msgid "Missing command string after --execute switch"
 msgstr "Mangler kommandostreng etter --execute parameter"
 
-#: src/LyX.cpp:1356
+#: src/LyX.cpp:1368
 msgid "Missing file type [eg latex, ps...] after --export switch"
 msgstr "Mangler fil type [eks. latex, ps...] etter --export parameter"
 
-#: src/LyX.cpp:1368
+#: src/LyX.cpp:1380
 msgid "Missing file type [eg latex, ps...] after --import switch"
 msgstr "Mangler fil type [eks. latex, ps...] etter --import parameter"
 
-#: src/LyX.cpp:1373
+#: src/LyX.cpp:1385
 msgid "Missing filename for --import"
 msgstr "Mangler filnavn for --import"
 
-#: src/LyXFunc.cpp:362
+#: src/LyXFunc.cpp:363
 msgid "Unknown function."
 msgstr "Ukjent funksjon."
 
-#: src/LyXFunc.cpp:401
+#: src/LyXFunc.cpp:402
 msgid "Nothing to do"
 msgstr "Ingenting å utføre"
 
-#: src/LyXFunc.cpp:420
+#: src/LyXFunc.cpp:421
 msgid "Unknown action"
 msgstr "Ukjent operasjon"
 
-#: src/LyXFunc.cpp:426 src/LyXFunc.cpp:709
+#: src/LyXFunc.cpp:427 src/LyXFunc.cpp:717
 msgid "Command disabled"
 msgstr "Det går ikke her og nå"
 
-#: src/LyXFunc.cpp:433
+#: src/LyXFunc.cpp:434
 msgid "Command not allowed without any document open"
 msgstr "Kommandoen er ikke lov uten åpne dokumenter"
 
-#: src/LyXFunc.cpp:695
+#: src/LyXFunc.cpp:703
 msgid "Document is read-only"
 msgstr "Dokumentet er ikke skrivbart."
 
-#: src/LyXFunc.cpp:703
+#: src/LyXFunc.cpp:711
 msgid "This portion of the document is deleted."
 msgstr "Denne delen av dokumentet er slettet."
 
-#: src/LyXFunc.cpp:722
+#: src/LyXFunc.cpp:730
 #, c-format
 msgid ""
 "The document %1$s has unsaved changes.\n"
@@ -12358,7 +12548,7 @@ msgstr ""
 "\n"
 "Vil du lagre dokumentet?"
 
-#: src/LyXFunc.cpp:740
+#: src/LyXFunc.cpp:748
 #, c-format
 msgid ""
 "Could not print the document %1$s.\n"
@@ -12367,11 +12557,11 @@ msgstr ""
 "Kunne ikke skrive ut dokumentet %1$s.\n"
 "Sjekk at skriveren er rett konfigurert."
 
-#: src/LyXFunc.cpp:743
+#: src/LyXFunc.cpp:751
 msgid "Print document failed"
 msgstr "Utskrift av dokumentet mislyktes"
 
-#: src/LyXFunc.cpp:762
+#: src/LyXFunc.cpp:770
 #, c-format
 msgid ""
 "The document could not be converted\n"
@@ -12380,20 +12570,20 @@ msgstr ""
 "Dokumentet kunne ikke konverteres\n"
 "til dokumentklassen %1$s."
 
-#: src/LyXFunc.cpp:765
+#: src/LyXFunc.cpp:773
 msgid "Could not change class"
 msgstr "Fikk ikke byttet klasse"
 
-#: src/LyXFunc.cpp:877
+#: src/LyXFunc.cpp:885
 #, c-format
 msgid "Saving document %1$s..."
 msgstr "Lagrer dokument %1$s..."
 
-#: src/LyXFunc.cpp:881
+#: src/LyXFunc.cpp:889
 msgid " done."
 msgstr "ferdig."
 
-#: src/LyXFunc.cpp:897
+#: src/LyXFunc.cpp:905
 #, c-format
 msgid ""
 "Any changes will be lost. Are you sure you want to revert to the saved "
@@ -12402,11 +12592,11 @@ msgstr ""
 "Alle endringer går tapt. Er du sikker på at du vil gå tilbake til den "
 "lagrede versjonen av dokumentet %1$s?"
 
-#: src/LyXFunc.cpp:1089
+#: src/LyXFunc.cpp:1097
 msgid "Exiting."
 msgstr "Avslutter."
 
-#: src/LyXFunc.cpp:1115 src/Text3.cpp:1312
+#: src/LyXFunc.cpp:1115 src/Text3.cpp:1314
 msgid "Missing argument"
 msgstr "Mangler argument"
 
@@ -12415,66 +12605,66 @@ msgstr "Mangler argument"
 msgid "Opening help file %1$s..."
 msgstr "Åpner hjelpefil %1$s..."
 
-#: src/LyXFunc.cpp:1399
+#: src/LyXFunc.cpp:1411
 #, c-format
 msgid "Opening child document %1$s..."
 msgstr "Åpner sub-dokument %1$s...\""
 
-#: src/LyXFunc.cpp:1486
+#: src/LyXFunc.cpp:1498
 msgid "Syntax: set-color <lyx_name> <x11_name>"
 msgstr ""
 
-#: src/LyXFunc.cpp:1497
+#: src/LyXFunc.cpp:1509
 #, c-format
 msgid "Set-color \"%1$s\" failed - color is undefined or may not be redefined"
 msgstr ""
 
-#: src/LyXFunc.cpp:1611
+#: src/LyXFunc.cpp:1623
 #, c-format
 msgid "Document defaults saved in %1$s"
 msgstr "Standardverdier for dokumenter lagret i %1$s"
 
-#: src/LyXFunc.cpp:1614
+#: src/LyXFunc.cpp:1626
 msgid "Unable to save document defaults"
 msgstr "Fikk ikke lagret standardverdier for dokumenter"
 
-#: src/LyXFunc.cpp:1670
+#: src/LyXFunc.cpp:1682
 msgid "Converting document to new document class..."
 msgstr "Konverterer dokument til ny tekstklasse..."
 
-#: src/LyXFunc.cpp:1864
+#: src/LyXFunc.cpp:1876
 msgid "Select template file"
 msgstr "Velg mal"
 
-#: src/LyXFunc.cpp:1867 src/callback.cpp:137
+#: src/LyXFunc.cpp:1879 src/callback.cpp:137
 msgid "Templates|#T#t"
 msgstr "Maler"
 
-#: src/LyXFunc.cpp:1903
+#: src/LyXFunc.cpp:1915
 msgid "Select document to open"
 msgstr "Velg dokument som skal åpnes"
 
-#: src/LyXFunc.cpp:1942
+#: src/LyXFunc.cpp:1954
 #, c-format
 msgid "Opening document %1$s..."
 msgstr "Åpner dokument %1$s...\""
 
-#: src/LyXFunc.cpp:1946
+#: src/LyXFunc.cpp:1958
 #, c-format
 msgid "Document %1$s opened."
 msgstr "Dokument %1$s åpnet."
 
-#: src/LyXFunc.cpp:1948
+#: src/LyXFunc.cpp:1960
 #, c-format
 msgid "Could not open document %1$s"
 msgstr "Kunne ikke åpne dokumentet %1$s"
 
-#: src/LyXFunc.cpp:1973
+#: src/LyXFunc.cpp:1985
 #, c-format
 msgid "Select %1$s file to import"
 msgstr "Velg %1$s fil som skal importeres"
 
-#: src/LyXFunc.cpp:2024 src/callback.cpp:167
+#: src/LyXFunc.cpp:2036 src/callback.cpp:167
 #, c-format
 msgid ""
 "The document %1$s already exists.\n"
@@ -12485,11 +12675,11 @@ msgstr ""
 "\n"
 "Vil du overskrive det dokumentet?"
 
-#: src/LyXFunc.cpp:2026 src/callback.cpp:169
+#: src/LyXFunc.cpp:2038 src/callback.cpp:169
 msgid "Over-write document?"
 msgstr "OVerskrive dokument?"
 
-#: src/LyXFunc.cpp:2097
+#: src/LyXFunc.cpp:2109
 msgid "Welcome to LyX!"
 msgstr "Velkommen til LyX!"
 
@@ -12957,7 +13147,7 @@ msgstr "Innholdsfortegnelsen finnes ikke"
 msgid " (auto)"
 msgstr ""
 
-#: src/Paragraph.cpp:1587 src/frontends/qt4/QParagraph.cpp:238
+#: src/Paragraph.cpp:1581 src/frontends/qt4/QParagraph.cpp:237
 msgid "Senseless with this layout!"
 msgstr "Uten mening for denne stilen!"
 
@@ -13012,101 +13202,98 @@ 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.cpp:1703
+#: src/Text.cpp:1739
 msgid "[Change Tracking] "
 msgstr "[Endringssporing] "
 
-#: src/Text.cpp:1709
+#: src/Text.cpp:1745
 msgid "Change: "
 msgstr "Endring: "
 
-#: src/Text.cpp:1713
+#: src/Text.cpp:1749
 msgid " at "
 msgstr ""
 
-#: src/Text.cpp:1723
+#: src/Text.cpp:1759
 #, c-format
 msgid "Font: %1$s"
 msgstr "Font: %1$s"
 
-#: src/Text.cpp:1728
+#: src/Text.cpp:1764
 #, c-format
 msgid ", Depth: %1$d"
 msgstr ", Dybde: %1$d"
 
-#: src/Text.cpp:1734
+#: src/Text.cpp:1770
 msgid ", Spacing: "
 msgstr ", Linjeavstand: "
 
-#: src/Text.cpp:1740 src/frontends/qt4/QDocument.cpp:125
+#: src/Text.cpp:1776 src/frontends/qt4/QDocument.cpp:232
 msgid "OneHalf"
 msgstr "Halvannen"
 
-#: src/Text.cpp:1746
+#: src/Text.cpp:1782
 msgid "Other ("
 msgstr "Annet ("
 
-#: src/Text.cpp:1755
+#: src/Text.cpp:1791
 msgid ", Inset: "
 msgstr ""
 
-#: src/Text.cpp:1756
+#: src/Text.cpp:1792
 msgid ", Paragraph: "
 msgstr ", Avsnitt: "
 
-#: src/Text.cpp:1757
+#: src/Text.cpp:1793
 msgid ", Id: "
 msgstr ", Id: "
 
-#: src/Text.cpp:1758
+#: src/Text.cpp:1794
 msgid ", Position: "
 msgstr ", Posisjon : "
 
-#: src/Text.cpp:1764
+#: src/Text.cpp:1800
 msgid ", Char: 0x"
 msgstr ""
 
-#: src/Text.cpp:1766
+#: src/Text.cpp:1802
 msgid ", Boundary: "
 msgstr ""
 
 #: src/Text2.cpp:540
-msgid ""
-"No font change defined. Use Character under the Layout menu to define font "
-"change."
-msgstr ""
-"Ingen font endring definert. Bruk Tegn under Stil menyen to å definere font "
-"endring."
+#, fuzzy
+msgid "No font change defined."
+msgstr "Gå til neste endring"
 
-#: src/Text2.cpp:582
+#: src/Text2.cpp:581
 msgid "Nothing to index!"
 msgstr "Ingenting å indeksere!"
 
-#: src/Text2.cpp:584
+#: src/Text2.cpp:583
 msgid "Cannot index more than one paragraph!"
 msgstr "Kan ikke indeksere mer enn ett avsnitt!"
 
-#: src/Text3.cpp:185 src/mathed/InsetMathHull.cpp:1330
+#: src/Text3.cpp:185 src/mathed/InsetMathHull.cpp:1338
 msgid "Math editor mode"
 msgstr "Matte editerings modus"
 
-#: src/Text3.cpp:721
+#: src/Text3.cpp:722
 msgid "Unknown spacing argument: "
 msgstr "Ukjent argument til linjeavstand: "
 
-#: src/Text3.cpp:894
+#: src/Text3.cpp:895
 msgid "Layout "
 msgstr "Stil "
 
-#: src/Text3.cpp:895
+#: src/Text3.cpp:896
 msgid " not known"
 msgstr " ukjent"
 
-#: src/Text3.cpp:1417 src/Text3.cpp:1429
+#: src/Text3.cpp:1419 src/Text3.cpp:1431
 msgid "Character set"
 msgstr "Tegnsett"
 
-#: src/Text3.cpp:1560
+#: src/Text3.cpp:1565
 msgid "Paragraph layout set"
 msgstr "Avsnittstil satt"
 
@@ -13221,15 +13408,15 @@ msgstr ""
 msgid "Could not read template"
 msgstr "Uleselig mal"
 
-#: src/buffer_funcs.cpp:521
+#: src/buffer_funcs.cpp:523
 msgid "\\arabic{enumi}."
 msgstr "\\arabic{enumi}."
 
-#: src/buffer_funcs.cpp:527
+#: src/buffer_funcs.cpp:529
 msgid "\\roman{enumiii}."
 msgstr "\\roman{enumiii}."
 
-#: src/buffer_funcs.cpp:530
+#: src/buffer_funcs.cpp:532
 msgid "\\Alph{enumiv}."
 msgstr "\\Alph{enumiv}."
 
@@ -13307,19 +13494,32 @@ msgstr ""
 msgid "Could not open file"
 msgstr "Kan ikke åpne fil"
 
-#: src/callback.cpp:411
+#: src/callback.cpp:404
+msgid "Reading not UTF-8 encoded file"
+msgstr ""
+
+#: src/callback.cpp:405
+msgid ""
+"The file is not UTF-8 encoded.\n"
+"It will be read as local 8Bit-encoded.\n"
+"If this does not give the correct result\n"
+"then please change the encoding of the file\n"
+"to UTF-8 with a program other than LyX.\n"
+msgstr ""
+
+#: src/callback.cpp:422
 msgid "Running configure..."
 msgstr "Kjører \"configure\"..."
 
-#: src/callback.cpp:420
+#: src/callback.cpp:431
 msgid "Reloading configuration..."
 msgstr "Leser konfigurasjon om igjen..."
 
-#: src/callback.cpp:425
+#: src/callback.cpp:436
 msgid "System reconfigured"
 msgstr "Systemed har blitt rekonfigurert."
 
-#: src/callback.cpp:426
+#: src/callback.cpp:437
 msgid ""
 "The system has been reconfigured.\n"
 "You need to restart LyX to make use of any\n"
@@ -13748,7 +13948,7 @@ msgstr "Ett ord kontrollert."
 msgid "Spelling check completed"
 msgstr "Stavekontroll fullført"
 
-#: src/frontends/controllers/ControlToc.cpp:134 src/insets/InsetTOC.cpp:46
+#: src/frontends/controllers/ControlToc.cpp:137 src/insets/InsetTOC.cpp:46
 msgid "Table of Contents"
 msgstr "Innholdsfortegnelse"
 
@@ -13879,20 +14079,20 @@ msgstr "Dings 3"
 msgid "Dings 4"
 msgstr "Dings 4"
 
-#: src/frontends/qt4/Dialogs.cpp:223
+#: src/frontends/qt4/Dialogs.cpp:225
 msgid "Index Entry"
 msgstr "Nøkkelord"
 
-#: src/frontends/qt4/Dialogs.cpp:233
+#: src/frontends/qt4/Dialogs.cpp:235
 msgid "Label"
 msgstr "Merke"
 
-#: src/frontends/qt4/Dialogs.cpp:245
+#: src/frontends/qt4/Dialogs.cpp:247
 #, fuzzy
 msgid "LaTeX Source"
 msgstr "Vis kode|s"
 
-#: src/frontends/qt4/Dialogs.cpp:307
+#: src/frontends/qt4/Dialogs.cpp:309
 msgid "Toc"
 msgstr "Innhold"
 
@@ -13916,7 +14116,7 @@ msgstr "Store ikoner"
 msgid "LyX"
 msgstr "LyX"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:467
+#: src/frontends/qt4/GuiWorkArea.cpp:477
 msgid "unknown version"
 msgstr "ukjent versjon"
 
@@ -13945,11 +14145,11 @@ msgid "Activated"
 msgstr "Aktivert"
 
 #: src/frontends/qt4/QBranches.cpp:73 src/frontends/qt4/QBranches.cpp:145
-#: src/frontends/qt4/QDocument.cpp:690
+#: src/frontends/qt4/QDocument.cpp:813
 msgid "Yes"
 msgstr "Ja"
 
-#: src/frontends/qt4/QBranches.cpp:73 src/frontends/qt4/QDocument.cpp:689
+#: src/frontends/qt4/QBranches.cpp:73 src/frontends/qt4/QDocument.cpp:812
 msgid "No"
 msgstr "Nei"
 
@@ -14016,146 +14216,242 @@ msgstr "(Ingen)"
 msgid "Variable"
 msgstr "Variabel"
 
-#: src/frontends/qt4/QDocument.cpp:119
+#: src/frontends/qt4/QDocument.cpp:71
+msgid "Computer Modern Roman"
+msgstr "Computer Modern Roman"
+
+#: src/frontends/qt4/QDocument.cpp:71
+msgid "Latin Modern Roman"
+msgstr "Latin Modern Roman"
+
+#: src/frontends/qt4/QDocument.cpp:72
+msgid "AE (Almost European)"
+msgstr ""
+
+#: src/frontends/qt4/QDocument.cpp:72
+msgid "Times Roman"
+msgstr "Times Roman"
+
+#: src/frontends/qt4/QDocument.cpp:72
+msgid "Palatino"
+msgstr "Palatino"
+
+#: src/frontends/qt4/QDocument.cpp:72
+msgid "Bitstream Charter"
+msgstr "Bitstream Charter"
+
+#: src/frontends/qt4/QDocument.cpp:73
+msgid "New Century Schoolbook"
+msgstr "New Century Schoolbook"
+
+#: src/frontends/qt4/QDocument.cpp:73
+msgid "Bookman"
+msgstr "Bookman"
+
+#: src/frontends/qt4/QDocument.cpp:73
+msgid "Utopia"
+msgstr "Utopia"
+
+#: src/frontends/qt4/QDocument.cpp:73
+msgid "Bera Serif"
+msgstr "Bera Serif"
+
+#: src/frontends/qt4/QDocument.cpp:74
+msgid "Concrete Roman"
+msgstr "Concrete Roman"
+
+#: src/frontends/qt4/QDocument.cpp:74
+msgid "Zapf Chancery"
+msgstr "Zapf Chancery"
+
+#: src/frontends/qt4/QDocument.cpp:82
+msgid "Computer Modern Sans"
+msgstr "Computer Modern Sans"
+
+#: src/frontends/qt4/QDocument.cpp:82
+msgid "Latin Modern Sans"
+msgstr "Latin Modern Sans"
+
+#: src/frontends/qt4/QDocument.cpp:83
+msgid "Helvetica"
+msgstr "Helvetica"
+
+#: src/frontends/qt4/QDocument.cpp:83
+msgid "Avant Garde"
+msgstr "Avant Garde"
+
+#: src/frontends/qt4/QDocument.cpp:83
+msgid "Bera Sans"
+msgstr "Bera Sans"
+
+#: src/frontends/qt4/QDocument.cpp:83
+msgid "CM Bright"
+msgstr "CM Bright"
+
+#: src/frontends/qt4/QDocument.cpp:92
+msgid "Computer Modern Typewriter"
+msgstr "Computer Modern Typewriter"
+
+#: src/frontends/qt4/QDocument.cpp:93
+msgid "Latin Modern Typewriter"
+msgstr "Latin Modern Typewriter"
+
+#: src/frontends/qt4/QDocument.cpp:93
+msgid "Courier"
+msgstr "Courier"
+
+#: src/frontends/qt4/QDocument.cpp:93
+msgid "Bera Mono"
+msgstr "Bera Mono"
+
+#: src/frontends/qt4/QDocument.cpp:93
+msgid "LuxiMono"
+msgstr "LuxiMono"
+
+#: src/frontends/qt4/QDocument.cpp:94
+msgid "CM Typewriter Light"
+msgstr "CM Typewriter Light"
+
+#: src/frontends/qt4/QDocument.cpp:226
 msgid "Length"
 msgstr "Lengde"
 
-#: src/frontends/qt4/QDocument.cpp:164 src/frontends/qt4/QDocument.cpp:170
-#: src/frontends/qt4/QDocument.cpp:176
+#: src/frontends/qt4/QDocument.cpp:271 src/frontends/qt4/QDocument.cpp:277
+#: src/frontends/qt4/QDocument.cpp:283
 msgid " (not installed)"
 msgstr " (ikke installert)"
 
-#: src/frontends/qt4/QDocument.cpp:180 src/frontends/qt4/QDocument.cpp:217
-#: src/frontends/qt4/QDocument.cpp:599
+#: src/frontends/qt4/QDocument.cpp:287 src/frontends/qt4/QDocument.cpp:324
+#: src/frontends/qt4/QDocument.cpp:722
 msgid "default"
 msgstr "standard"
 
-#: src/frontends/qt4/QDocument.cpp:181
+#: src/frontends/qt4/QDocument.cpp:288
 msgid "10"
 msgstr "10"
 
-#: src/frontends/qt4/QDocument.cpp:182
+#: src/frontends/qt4/QDocument.cpp:289
 msgid "11"
 msgstr "11"
 
-#: src/frontends/qt4/QDocument.cpp:183
+#: src/frontends/qt4/QDocument.cpp:290
 msgid "12"
 msgstr "12"
 
-#: src/frontends/qt4/QDocument.cpp:218
+#: src/frontends/qt4/QDocument.cpp:325
 msgid "empty"
 msgstr "tom"
 
-#: src/frontends/qt4/QDocument.cpp:219
+#: src/frontends/qt4/QDocument.cpp:326
 msgid "plain"
 msgstr "enkel"
 
-#: src/frontends/qt4/QDocument.cpp:220
+#: src/frontends/qt4/QDocument.cpp:327
 msgid "headings"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:221
+#: src/frontends/qt4/QDocument.cpp:328
 msgid "fancy"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:237
+#: src/frontends/qt4/QDocument.cpp:344
 msgid "B3"
 msgstr "B3"
 
-#: src/frontends/qt4/QDocument.cpp:238
+#: src/frontends/qt4/QDocument.cpp:345
 msgid "B4"
 msgstr "B4"
 
-#: src/frontends/qt4/QDocument.cpp:341
+#: src/frontends/qt4/QDocument.cpp:448
 msgid "LaTeX default"
 msgstr "LaTeX standard"
 
-#: src/frontends/qt4/QDocument.cpp:347
+#: src/frontends/qt4/QDocument.cpp:454
 msgid "``text''"
 msgstr "``tekst''"
 
-#: src/frontends/qt4/QDocument.cpp:348
+#: src/frontends/qt4/QDocument.cpp:455
 msgid "''text''"
 msgstr "''tekst''"
 
-#: src/frontends/qt4/QDocument.cpp:349
+#: src/frontends/qt4/QDocument.cpp:456
 msgid ",,text``"
 msgstr ",,tekst``"
 
-#: src/frontends/qt4/QDocument.cpp:350
+#: src/frontends/qt4/QDocument.cpp:457
 msgid ",,text''"
 msgstr ",,tekst''"
 
-#: src/frontends/qt4/QDocument.cpp:351
+#: src/frontends/qt4/QDocument.cpp:458
 msgid "<<text>>"
 msgstr "<<tekst>>"
 
-#: src/frontends/qt4/QDocument.cpp:352
+#: src/frontends/qt4/QDocument.cpp:459
 msgid ">>text<<"
 msgstr ">>tekst<<"
 
-#: src/frontends/qt4/QDocument.cpp:368
+#: src/frontends/qt4/QDocument.cpp:475
 msgid "Numbered"
 msgstr "Nummerert"
 
-#: src/frontends/qt4/QDocument.cpp:369
+#: src/frontends/qt4/QDocument.cpp:476
 msgid "Appears in TOC"
 msgstr "I innholdsliste"
 
-#: src/frontends/qt4/QDocument.cpp:389
+#: src/frontends/qt4/QDocument.cpp:496
 msgid "Author-year"
 msgstr "Forfatter-år"
 
-#: src/frontends/qt4/QDocument.cpp:390
+#: src/frontends/qt4/QDocument.cpp:497
 msgid "Numerical"
 msgstr "Numerisk"
 
-#: src/frontends/qt4/QDocument.cpp:432
+#: src/frontends/qt4/QDocument.cpp:539
 #, c-format
 msgid "Unavailable: %1$s"
 msgstr "Utilgjengelig: %1$s"
 
-#: src/frontends/qt4/QDocument.cpp:462 src/frontends/qt4/QDocument.cpp:475
+#: src/frontends/qt4/QDocument.cpp:565 src/frontends/qt4/QDocument.cpp:578
 msgid "Document Class"
 msgstr "Dokumentklasse"
 
-#: src/frontends/qt4/QDocument.cpp:464
+#: src/frontends/qt4/QDocument.cpp:567
 msgid "Text Layout"
 msgstr "Tekststil"
 
-#: src/frontends/qt4/QDocument.cpp:465
+#: src/frontends/qt4/QDocument.cpp:568
 msgid "Page Layout"
 msgstr "Sidestil"
 
-#: src/frontends/qt4/QDocument.cpp:466
+#: src/frontends/qt4/QDocument.cpp:569
 msgid "Page Margins"
 msgstr "Tekstmarger"
 
-#: src/frontends/qt4/QDocument.cpp:468
+#: src/frontends/qt4/QDocument.cpp:571
 msgid "Numbering & TOC"
 msgstr "Seksjonsnumre"
 
-#: src/frontends/qt4/QDocument.cpp:470
+#: src/frontends/qt4/QDocument.cpp:573
 msgid "Math Options"
 msgstr "Matte-innstillinger"
 
-#: src/frontends/qt4/QDocument.cpp:471
+#: src/frontends/qt4/QDocument.cpp:574
 msgid "Float Placement"
 msgstr "\"Float\"-plassering"
 
-#: src/frontends/qt4/QDocument.cpp:472
+#: src/frontends/qt4/QDocument.cpp:575
 msgid "Bullets"
 msgstr "Bomber"
 
-#: src/frontends/qt4/QDocument.cpp:473
+#: src/frontends/qt4/QDocument.cpp:576
 msgid "Branches"
 msgstr "Dokumentgrener"
 
-#: src/frontends/qt4/QDocument.cpp:474 src/frontends/qt4/QDocument.cpp:486
+#: src/frontends/qt4/QDocument.cpp:577 src/frontends/qt4/QDocument.cpp:589
 msgid "LaTeX Preamble"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:1237
+#: src/frontends/qt4/QDocument.cpp:1364
 msgid "Document Settings"
 msgstr "Dokumentinnstillinger"
 
@@ -14163,11 +14459,11 @@ msgstr "Dokumentinnstillinger"
 msgid "TeX Code Settings"
 msgstr "TeX innstillinger"
 
-#: src/frontends/qt4/QExternal.cpp:495
+#: src/frontends/qt4/QExternal.cpp:497
 msgid "External Material"
 msgstr "Eksternt materiale"
 
-#: src/frontends/qt4/QExternal.cpp:555
+#: src/frontends/qt4/QExternal.cpp:557
 msgid "Scale%"
 msgstr "Skaler%"
 
@@ -14175,14 +14471,19 @@ msgstr "Skaler%"
 msgid "Float Settings"
 msgstr "\"Float\" innstillinger"
 
-#: src/frontends/qt4/QGraphics.cpp:63 src/frontends/qt4/QPrefs.cpp:625
+#: src/frontends/qt4/QGraphics.cpp:63 src/frontends/qt4/QPrefs.cpp:635
 msgid "Graphics"
 msgstr "Grafikk"
 
-#: src/frontends/qt4/QInclude.cpp:134
+#: src/frontends/qt4/QInclude.cpp:171
 msgid "Child Document"
 msgstr "Underdokument"
 
+#: src/frontends/qt4/QListings.cpp:183
+#, fuzzy
+msgid "Program Listings Settings"
+msgstr "Avsnittinnstillinger"
+
 #: src/frontends/qt4/QMathMatrixDialog.cpp:46
 msgid "Math Matrix"
 msgstr "Matte, matrise"
@@ -14197,133 +14498,132 @@ msgstr "Notisinnstillinger"
 
 #: src/frontends/qt4/QParagraph.cpp:70
 msgid ""
-"As described in the User Guide, the length of this text will determine how "
-"wide the label part of each item is in environments like List and "
-"Description.\n"
+"As described in the User Guide, the width of this text determines the width "
+"of the label part of each item in environments like List and Description.\n"
 "\n"
-" Normally you won't need to set this, since the largest label width of all "
-"the items is used. But if you need to, you can change it here."
+" Normally, you won't need to set this, since the largest label width of all "
+"the items is used."
 msgstr ""
 
-#: src/frontends/qt4/QParagraph.cpp:176
+#: src/frontends/qt4/QParagraph.cpp:175
 msgid "Paragraph Settings"
 msgstr "Innstillinger for avsnitt"
 
-#: src/frontends/qt4/QPrefs.cpp:73
+#: src/frontends/qt4/QPrefs.cpp:74
 msgid "Look and feel"
 msgstr "Utseende"
 
-#: src/frontends/qt4/QPrefs.cpp:74
+#: src/frontends/qt4/QPrefs.cpp:75
 msgid "Language settings"
 msgstr "Språkinnstillinger"
 
-#: src/frontends/qt4/QPrefs.cpp:75
+#: src/frontends/qt4/QPrefs.cpp:76
 msgid "Outputs"
 msgstr "Utdata"
 
-#: src/frontends/qt4/QPrefs.cpp:173
+#: src/frontends/qt4/QPrefs.cpp:174
 msgid "Plain text"
 msgstr "Ren tekst"
 
-#: src/frontends/qt4/QPrefs.cpp:204
+#: src/frontends/qt4/QPrefs.cpp:205
 msgid "Date format"
 msgstr "Datoformat"
 
-#: src/frontends/qt4/QPrefs.cpp:231
+#: src/frontends/qt4/QPrefs.cpp:232
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: src/frontends/qt4/QPrefs.cpp:355
+#: src/frontends/qt4/QPrefs.cpp:356
 msgid "Screen fonts"
 msgstr "Skjermfonter"
 
-#: src/frontends/qt4/QPrefs.cpp:513
+#: src/frontends/qt4/QPrefs.cpp:514
 msgid "Colors"
 msgstr "Farger"
 
-#: src/frontends/qt4/QPrefs.cpp:599 src/frontends/qt4/QPrefs.cpp:698
+#: src/frontends/qt4/QPrefs.cpp:609 src/frontends/qt4/QPrefs.cpp:708
 msgid "Paths"
 msgstr "Mapper"
 
-#: src/frontends/qt4/QPrefs.cpp:749
+#: src/frontends/qt4/QPrefs.cpp:759
 msgid "Select a document templates directory"
 msgstr "Velg folder for dokument maler"
 
-#: src/frontends/qt4/QPrefs.cpp:759
+#: src/frontends/qt4/QPrefs.cpp:769
 msgid "Select a temporary directory"
 msgstr "Velg en temporær folder"
 
-#: src/frontends/qt4/QPrefs.cpp:769
+#: src/frontends/qt4/QPrefs.cpp:779
 msgid "Select a backups directory"
 msgstr "Velg folder for sikkerhetskopier"
 
-#: src/frontends/qt4/QPrefs.cpp:779
+#: src/frontends/qt4/QPrefs.cpp:789
 msgid "Select a document directory"
 msgstr "Velg folder for dokumenter"
 
-#: src/frontends/qt4/QPrefs.cpp:789
+#: src/frontends/qt4/QPrefs.cpp:799
 msgid "Give a filename for the LyX server pipe"
 msgstr ""
 
-#: src/frontends/qt4/QPrefs.cpp:802 src/frontends/qt4/QSpellchecker.cpp:135
+#: src/frontends/qt4/QPrefs.cpp:812 src/frontends/qt4/QSpellchecker.cpp:135
 msgid "Spellchecker"
 msgstr "Stavekontroll"
 
-#: src/frontends/qt4/QPrefs.cpp:824
+#: src/frontends/qt4/QPrefs.cpp:834
 msgid "ispell"
 msgstr "ispell"
 
-#: src/frontends/qt4/QPrefs.cpp:825
+#: src/frontends/qt4/QPrefs.cpp:835
 msgid "aspell"
 msgstr "aspell"
 
-#: src/frontends/qt4/QPrefs.cpp:826
+#: src/frontends/qt4/QPrefs.cpp:836
 msgid "hspell"
 msgstr "hspell"
 
-#: src/frontends/qt4/QPrefs.cpp:828
+#: src/frontends/qt4/QPrefs.cpp:838
 msgid "pspell (library)"
 msgstr "pspell (bibliotek)"
 
-#: src/frontends/qt4/QPrefs.cpp:831
+#: src/frontends/qt4/QPrefs.cpp:841
 msgid "aspell (library)"
 msgstr "aspell (bibliotek)"
 
-#: src/frontends/qt4/QPrefs.cpp:912
+#: src/frontends/qt4/QPrefs.cpp:922
 msgid "Converters"
 msgstr "Konvertere"
 
-#: src/frontends/qt4/QPrefs.cpp:1102
+#: src/frontends/qt4/QPrefs.cpp:1120
 msgid "Copiers"
 msgstr "Kopi-programmer"
 
-#: src/frontends/qt4/QPrefs.cpp:1355
+#: src/frontends/qt4/QPrefs.cpp:1373
 msgid "File formats"
 msgstr "Filformater"
 
-#: src/frontends/qt4/QPrefs.cpp:1547
+#: src/frontends/qt4/QPrefs.cpp:1565
 msgid "Format in use"
 msgstr "Formater i bruk"
 
-#: src/frontends/qt4/QPrefs.cpp:1548
+#: src/frontends/qt4/QPrefs.cpp:1566
 msgid "Cannot remove a Format used by a Converter. Remove the converter first."
 msgstr ""
 "Kan ikke fjerne et format som brukes av en konverter. Fjern konverteren "
 "først."
 
-#: src/frontends/qt4/QPrefs.cpp:1649
+#: src/frontends/qt4/QPrefs.cpp:1667
 msgid "Printer"
 msgstr "Skriver"
 
-#: src/frontends/qt4/QPrefs.cpp:1747 src/frontends/qt4/QPrefs.cpp:1941
+#: src/frontends/qt4/QPrefs.cpp:1765 src/frontends/qt4/QPrefs.cpp:1959
 msgid "User interface"
 msgstr "Brukergrensesnitt"
 
-#: src/frontends/qt4/QPrefs.cpp:1865
+#: src/frontends/qt4/QPrefs.cpp:1883
 msgid "Identity"
 msgstr "Identitet"
 
-#: src/frontends/qt4/QPrefs.cpp:2007
+#: src/frontends/qt4/QPrefs.cpp:2025
 msgid "Preferences"
 msgstr "Preferanser"
 
@@ -14331,19 +14631,19 @@ msgstr "Preferanser"
 msgid "Print Document"
 msgstr "Skriv ut dokumentet"
 
-#: src/frontends/qt4/QRef.cpp:188
+#: src/frontends/qt4/QRef.cpp:189
 msgid "Cross-reference"
 msgstr "Kryssreferanse"
 
-#: src/frontends/qt4/QRef.cpp:284
+#: src/frontends/qt4/QRef.cpp:285
 msgid "&Go Back"
 msgstr "&Tilbake"
 
-#: src/frontends/qt4/QRef.cpp:286
+#: src/frontends/qt4/QRef.cpp:287
 msgid "Jump back"
 msgstr "Gå tilbake igjen"
 
-#: src/frontends/qt4/QRef.cpp:294
+#: src/frontends/qt4/QRef.cpp:295
 msgid "Jump to label"
 msgstr "Gå til referanse"
 
@@ -14400,7 +14700,7 @@ msgstr ""
 msgid "LyX: %1$s"
 msgstr "LyX: %1$s"
 
-#: src/insets/Inset.cpp:265
+#: src/insets/Inset.cpp:260
 msgid "Opened inset"
 msgstr "Åpnet inset"
 
@@ -14473,11 +14773,11 @@ msgstr ""
 msgid "branch"
 msgstr ""
 
-#: src/insets/InsetCaption.cpp:87
+#: src/insets/InsetCaption.cpp:95
 msgid "Opened Caption Inset"
 msgstr ""
 
-#: src/insets/InsetCaption.cpp:276
+#: src/insets/InsetCaption.cpp:298
 msgid "Senseless!!! "
 msgstr "Gir ikke mening!"
 
@@ -14485,26 +14785,26 @@ msgstr "Gir ikke mening!"
 msgid "Opened CharStyle Inset"
 msgstr ""
 
-#: src/insets/InsetCommand.cpp:98
+#: src/insets/InsetCommand.cpp:99
 msgid "LaTeX Command: "
 msgstr ""
 
-#: src/insets/InsetCommandParams.cpp:268
+#: src/insets/InsetCommandParams.cpp:275
 #, fuzzy
 msgid "Unknown inset name: "
 msgstr "Ukjent argument til linjeavstand: "
 
-#: src/insets/InsetCommandParams.cpp:292
+#: src/insets/InsetCommandParams.cpp:299
 #, fuzzy
 msgid "Inset Command: "
 msgstr "Register-kommando:"
 
-#: src/insets/InsetCommandParams.cpp:293
+#: src/insets/InsetCommandParams.cpp:300
 #, fuzzy
 msgid "Unknown parameter name: "
 msgstr "Ukjent argument til linjeavstand: "
 
-#: src/insets/InsetCommandParams.cpp:300
+#: src/insets/InsetCommandParams.cpp:307
 msgid "Missing \\end_inset at this point."
 msgstr ""
 
@@ -14551,19 +14851,19 @@ msgstr "FEIL: Ukjent type flytende objekt!"
 msgid "List of %1$s"
 msgstr "Liste over %1$s"
 
-#: src/insets/InsetFoot.cpp:37 src/insets/InsetFoot.cpp:44
+#: src/insets/InsetFoot.cpp:38 src/insets/InsetFoot.cpp:45
 msgid "foot"
 msgstr "fot"
 
-#: src/insets/InsetFoot.cpp:56
+#: src/insets/InsetFoot.cpp:57
 msgid "Opened Footnote Inset"
 msgstr "Åpnet fotnote"
 
-#: src/insets/InsetFoot.cpp:85
+#: src/insets/InsetFoot.cpp:86
 msgid "footnote"
 msgstr "fotnote"
 
-#: src/insets/InsetGraphics.cpp:472 src/insets/InsetInclude.cpp:448
+#: src/insets/InsetGraphics.cpp:472 src/insets/InsetInclude.cpp:461
 #, c-format
 msgid ""
 "Could not copy the file\n"
@@ -14588,15 +14888,15 @@ msgstr "Grafikkfil: %1$s"
 msgid "Horizontal Fill"
 msgstr "Horisontalt fyll"
 
-#: src/insets/InsetInclude.cpp:306
+#: src/insets/InsetInclude.cpp:316
 msgid "Verbatim Input"
 msgstr "Sett inn Verbatim"
 
-#: src/insets/InsetInclude.cpp:309
+#: src/insets/InsetInclude.cpp:319
 msgid "Verbatim Input*"
 msgstr ""
 
-#: src/insets/InsetInclude.cpp:411
+#: src/insets/InsetInclude.cpp:424
 #, c-format
 msgid ""
 "Included file `%1$s'\n"
@@ -14607,7 +14907,7 @@ msgstr ""
 "har tekstklasse `%2$s'\n"
 "mens hovedfilen har tekstklasse `%3$s'."
 
-#: src/insets/InsetInclude.cpp:417
+#: src/insets/InsetInclude.cpp:430
 msgid "Different textclasses"
 msgstr "Ulike tekstklasser"
 
@@ -14619,12 +14919,17 @@ msgstr "N
 msgid "Index"
 msgstr "Register"
 
-#: src/insets/InsetMarginal.cpp:33 src/insets/InsetMarginal.cpp:40
-#: src/insets/InsetMarginal.cpp:69
+#: src/insets/InsetListings.cpp:128
+#, fuzzy
+msgid "Opened Listings Inset"
+msgstr "Åpnet text inset"
+
+#: src/insets/InsetMarginal.cpp:34 src/insets/InsetMarginal.cpp:41
+#: src/insets/InsetMarginal.cpp:70
 msgid "margin"
 msgstr "marg"
 
-#: src/insets/InsetMarginal.cpp:52
+#: src/insets/InsetMarginal.cpp:53
 msgid "Opened Marginal Note Inset"
 msgstr ""
 
@@ -14637,23 +14942,23 @@ msgstr "Nei"
 msgid "Nomenclature"
 msgstr ""
 
-#: src/insets/InsetNote.cpp:66
+#: src/insets/InsetNote.cpp:67
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/insets/InsetNote.cpp:67
+#: src/insets/InsetNote.cpp:68
 msgid "Greyed out"
 msgstr "Grået ut"
 
-#: src/insets/InsetNote.cpp:68
+#: src/insets/InsetNote.cpp:69
 msgid "Framed"
 msgstr "Innrammet"
 
-#: src/insets/InsetNote.cpp:69
+#: src/insets/InsetNote.cpp:70
 msgid "Shaded"
 msgstr "Skyggelagt"
 
-#: src/insets/InsetNote.cpp:148
+#: src/insets/InsetNote.cpp:149
 msgid "Opened Note Inset"
 msgstr ""
 
@@ -14718,18 +15023,19 @@ msgid "FormatRef: "
 msgstr ""
 
 #: src/insets/InsetTOC.cpp:47
-msgid "Unknown toc list"
-msgstr "Ukjent innholdsliste"
+#, fuzzy
+msgid "Unknown TOC type"
+msgstr "Ukjent bruker"
 
-#: src/insets/InsetTabular.cpp:3141
+#: src/insets/InsetTabular.cpp:3143
 msgid "Opened table"
 msgstr "Åpen tabell"
 
-#: src/insets/InsetTabular.cpp:4292
+#: src/insets/InsetTabular.cpp:4313
 msgid "Error setting multicolumn"
 msgstr "Feil bruk av multikolonne"
 
-#: src/insets/InsetTabular.cpp:4293
+#: src/insets/InsetTabular.cpp:4314
 msgid "You cannot set multicolumn vertically."
 msgstr "Multikolonne kan ikke brukes vertikalt."
 
@@ -14737,6 +15043,15 @@ msgstr "Multikolonne kan ikke brukes vertikalt."
 msgid "Opened Text Inset"
 msgstr "Åpnet text inset"
 
+#: src/insets/InsetTheorem.cpp:41
+msgid "theorem"
+msgstr "teorem"
+
+#: src/insets/InsetTheorem.cpp:91
+#, fuzzy
+msgid "Opened Theorem Inset"
+msgstr "Åpnet text inset"
+
 #: src/insets/InsetUrl.cpp:42
 msgid "Url: "
 msgstr "Url: "
@@ -14897,7 +15212,12 @@ msgstr "En streng har blitt erstattet."
 msgid " strings have been replaced."
 msgstr " strenger har blitt erstattet."
 
-#: src/mathed/InsetMathAMSArray.cpp:112 src/mathed/InsetMathHull.cpp:1241
+#: src/mathed/InsetFormulaMacro.cpp:124 src/mathed/MathMacroTemplate.cpp:109
+#, c-format
+msgid " Macro: %1$s: "
+msgstr " Makro: %1$s: "
+
+#: src/mathed/InsetMathAMSArray.cpp:112 src/mathed/InsetMathHull.cpp:1249
 #: src/mathed/InsetMathSplit.cpp:76 src/mathed/InsetMathSubstack.cpp:75
 #, c-format
 msgid "Can't add vertical grid lines in '%1$s'"
@@ -14908,64 +15228,59 @@ msgstr ""
 msgid "No vertical grid lines in '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathGrid.cpp:1312
+#: src/mathed/InsetMathGrid.cpp:1273
 msgid "Only one row"
 msgstr "Bare én rad"
 
-#: src/mathed/InsetMathGrid.cpp:1318
+#: src/mathed/InsetMathGrid.cpp:1279
 msgid "Only one column"
 msgstr "Bare én kolonne"
 
-#: src/mathed/InsetMathGrid.cpp:1326
+#: src/mathed/InsetMathGrid.cpp:1287
 msgid "No hline to delete"
 msgstr "Ingen horisontal linje å fjerne"
 
-#: src/mathed/InsetMathGrid.cpp:1335
+#: src/mathed/InsetMathGrid.cpp:1296
 msgid "No vline to delete"
 msgstr "Ingen vertikal linje å fjerne"
 
-#: src/mathed/InsetMathGrid.cpp:1353
+#: src/mathed/InsetMathGrid.cpp:1314
 #, c-format
 msgid "Unknown tabular feature '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathHull.cpp:1080 src/mathed/InsetMathHull.cpp:1089
+#: src/mathed/InsetMathHull.cpp:1088 src/mathed/InsetMathHull.cpp:1097
 msgid "No number"
 msgstr ""
 
-#: src/mathed/InsetMathHull.cpp:1080 src/mathed/InsetMathHull.cpp:1089
+#: src/mathed/InsetMathHull.cpp:1088 src/mathed/InsetMathHull.cpp:1097
 msgid "Number"
 msgstr ""
 
-#: src/mathed/InsetMathHull.cpp:1214
+#: src/mathed/InsetMathHull.cpp:1222
 #, c-format
 msgid "Can't change number of rows in '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathHull.cpp:1224
+#: src/mathed/InsetMathHull.cpp:1232
 #, c-format
 msgid "Can't change number of columns in '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathHull.cpp:1234
+#: src/mathed/InsetMathHull.cpp:1242
 #, c-format
 msgid "Can't add horizontal grid lines in '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathNest.cpp:845
+#: src/mathed/InsetMathNest.cpp:853
 msgid "create new math text environment ($...$)"
 msgstr ""
 
-#: src/mathed/InsetMathNest.cpp:848
+#: src/mathed/InsetMathNest.cpp:856
 msgid "entered math text mode (textrm)"
 msgstr ""
 
-#: src/mathed/MathMacroTemplate.cpp:108
-#, c-format
-msgid " Macro: %1$s: "
-msgstr " Makro: %1$s: "
-
-#: src/mathed/MathMacroTemplate.cpp:240
+#: src/mathed/MathMacroTemplate.cpp:241
 msgid "math macro"
 msgstr ""
 
@@ -15062,101 +15377,95 @@ msgstr ""
 msgid "Unknown user"
 msgstr "Ukjent bruker"
 
-#: src/tex-strings.cpp:68
-msgid "Computer Modern Roman"
-msgstr "Computer Modern Roman"
-
-#: src/tex-strings.cpp:68
-msgid "Latin Modern Roman"
-msgstr "Latin Modern Roman"
-
-#: src/tex-strings.cpp:69
-msgid "AE (Almost European)"
-msgstr ""
+#, fuzzy
+#~ msgid "Number style"
+#~ msgstr "Nummerert liste"
 
-#: src/tex-strings.cpp:69
-msgid "Times Roman"
-msgstr "Times Roman"
+#~ msgid "Error closing file"
+#~ msgstr "Mislyktes med å lukke fil"
 
-#: src/tex-strings.cpp:69
-msgid "Palatino"
-msgstr "Palatino"
+#~ msgid ""
+#~ "The output file could not be closed properly.\n"
+#~ " Probably some characters of your document are not representable in the "
+#~ "chosen encoding.\n"
+#~ "Changing the document encoding to utf8 could help."
+#~ msgstr ""
+#~ "Filen kunne ikke lukkes ordentlig.\n"
+#~ " Antagelig er det noen tegn som ikke kan representeres i den valgte "
+#~ "tegnkodingen.\n"
+#~ "Å forandre dokumentets tegnkoding til utf8 kan hjelpe."
 
-#: src/tex-strings.cpp:69
-msgid "Bitstream Charter"
-msgstr "Bitstream Charter"
+#~ msgid "block "
+#~ msgstr "blokk"
 
-#: src/tex-strings.cpp:70
-msgid "New Century Schoolbook"
-msgstr "New Century Schoolbook"
+#~ msgid "Corollary.  "
+#~ msgstr "Korollar."
 
-#: src/tex-strings.cpp:70
-msgid "Bookman"
-msgstr "Bookman"
+#, fuzzy
+#~ msgid "Basic style"
+#~ msgstr "Natbib-&stil:"
 
-#: src/tex-strings.cpp:70
-msgid "Utopia"
-msgstr "Utopia"
+#, fuzzy
+#~ msgid "&Caption"
+#~ msgstr "Bildetekst"
 
-#: src/tex-strings.cpp:70
-msgid "Bera Serif"
-msgstr "Bera Serif"
+#, fuzzy
+#~ msgid "A caption for the List of Listings"
+#~ msgstr "Bildetekst for sub-figuren"
 
-#: src/tex-strings.cpp:71
-msgid "Concrete Roman"
-msgstr "Concrete Roman"
+#, fuzzy
+#~ msgid "&Label"
+#~ msgstr "&Merke:"
 
-#: src/tex-strings.cpp:71
-msgid "Zapf Chancery"
-msgstr "Zapf Chancery"
+#, fuzzy
+#~ msgid "A Label for the caption"
+#~ msgstr "Tabelltittel"
 
-#: src/tex-strings.cpp:79
-msgid "Computer Modern Sans"
-msgstr "Computer Modern Sans"
+#, fuzzy
+#~ msgid "<- P&romote"
+#~ msgstr "<- &Forfremme"
 
-#: src/tex-strings.cpp:79
-msgid "Latin Modern Sans"
-msgstr "Latin Modern Sans"
+#, fuzzy
+#~ msgid "D&own"
+#~ msgstr "&Ned"
 
-#: src/tex-strings.cpp:80
-msgid "Helvetica"
-msgstr "Helvetica"
+#, fuzzy
+#~ msgid "De&mote ->"
+#~ msgstr "&Degradere ->"
 
-#: src/tex-strings.cpp:80
-msgid "Avant Garde"
-msgstr "Avant Garde"
+#, fuzzy
+#~ msgid "Upd&ate"
+#~ msgstr "&Oppdater"
 
-#: src/tex-strings.cpp:80
-msgid "Bera Sans"
-msgstr "Bera Sans"
+#, fuzzy
+#~ msgid "SubSection"
+#~ msgstr "Underseksjon"
 
-#: src/tex-strings.cpp:80
-msgid "CM Bright"
-msgstr "CM Bright"
+#~ msgid "Austrian (new spelling)"
+#~ msgstr "Østerisk (ny stavemåte)"
 
-#: src/tex-strings.cpp:89
-msgid "Computer Modern Typewriter"
-msgstr "Computer Modern Typewriter"
+#~ msgid "Portuguese (Brazil)"
+#~ msgstr "Portugisisk (Brasil)"
 
-#: src/tex-strings.cpp:90
-msgid "Latin Modern Typewriter"
-msgstr "Latin Modern Typewriter"
+#~ msgid "French Canadian"
+#~ msgstr "Fransk-Kanadisk"
 
-#: src/tex-strings.cpp:90
-msgid "Courier"
-msgstr "Courier"
+#~ msgid "German (new spelling)"
+#~ msgstr "Tysk (ny stavemåte)"
 
-#: src/tex-strings.cpp:90
-msgid "Bera Mono"
-msgstr "Bera Mono"
+#, fuzzy
+#~ msgid "Upper Sorbian"
+#~ msgstr "Serbisk"
 
-#: src/tex-strings.cpp:90
-msgid "LuxiMono"
-msgstr "LuxiMono"
+#~ msgid ""
+#~ "No font change defined. Use Character under the Layout menu to define "
+#~ "font change."
+#~ msgstr ""
+#~ "Ingen font endring definert. Bruk Tegn under Stil menyen to å definere "
+#~ "font endring."
 
-#: src/tex-strings.cpp:91
-msgid "CM Typewriter Light"
-msgstr "CM Typewriter Light"
+#~ msgid "Unknown toc list"
+#~ msgstr "Ukjent innholdsliste"
 
 #~ msgid "Glossary Entry"
 #~ msgstr "Oppføring i glossar"
@@ -15173,9 +15482,6 @@ msgstr "CM Typewriter Light"
 #~ msgid "Glossary"
 #~ msgstr "Glossar"
 
-#~ msgid "theorem"
-#~ msgstr "teorem"
-
 #, fuzzy
 #~ msgid "TeX Code:"
 #~ msgstr "TeX-kode|X"