X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2Fnn.po;h=50c8aef25dd11b1691fd780611fd1f5e9b3a8cc8;hb=1b7b9e4980f2ed1b0201042a2cfd7d9d8536dc02;hp=ab73efcb3296b1257179ef1d7102a98dd2bbe362;hpb=bbe3218402d7fb8b5514a35d113ecf9a268e47a6;p=lyx.git

diff --git a/po/nn.po b/po/nn.po
index ab73efcb32..50c8aef25d 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2008-06-16 16:23+0200\n"
+"POT-Creation-Date: 2008-07-29 00:33+0200\n"
 "PO-Revision-Date: 2007-06-26 21:34+0200\n"
 "Last-Translator: Ingar Pareliussen <ingarp_ved_samfundet.no>\n"
 "Language-Team: Nynorsk <nn@li.org>\n"
@@ -76,7 +76,7 @@ msgstr "&Avsettplass"
 #: src/frontends/qt4/ui/MathMatrixUi.ui:167
 #: src/frontends/qt4/ui/NomenclUi.ui:92 src/frontends/qt4/ui/NoteUi.ui:38
 #: src/frontends/qt4/ui/ParagraphUi.ui:82 src/frontends/qt4/ui/RefUi.ui:77
-#: src/frontends/qt4/ui/SendtoUi.ui:72 src/frontends/qt4/ui/ShortcutUi.ui:102
+#: src/frontends/qt4/ui/SendtoUi.ui:72 src/frontends/qt4/ui/ShortcutUi.ui:52
 #: src/frontends/qt4/ui/SymbolsUi.ui:49
 #: src/frontends/qt4/ui/TabularCreateUi.ui:65
 #: src/frontends/qt4/ui/VSpaceUi.ui:36 src/frontends/qt4/ui/WrapUi.ui:150
@@ -86,15 +86,15 @@ msgstr "&OK"
 #: src/frontends/qt4/ui/AskForTextUi.ui:94
 #: src/frontends/qt4/ui/CitationUi.ui:461
 #: src/frontends/qt4/ui/DocumentUi.ui:152
-#: src/frontends/qt4/ui/ListingsUi.ui:629 src/Buffer.cpp:828
-#: src/Buffer.cpp:2507 src/Buffer.cpp:2531 src/Buffer.cpp:2566
+#: src/frontends/qt4/ui/ListingsUi.ui:629 src/Buffer.cpp:836
+#: src/Buffer.cpp:2522 src/Buffer.cpp:2546 src/Buffer.cpp:2581
 #: src/LyXFunc.cpp:666 src/LyXFunc.cpp:802 src/LyXFunc.cpp:980
-#: src/LyXVC.cpp:160 src/frontends/qt4/GuiClipboard.cpp:208
-#: src/frontends/qt4/GuiDocument.cpp:1298
+#: src/LyXVC.cpp:179 src/frontends/qt4/GuiClipboard.cpp:208
+#: src/frontends/qt4/GuiDocument.cpp:1251
 #: src/frontends/qt4/GuiParagraph.cpp:69
-#: src/frontends/qt4/GuiParagraph.cpp:159 src/frontends/qt4/GuiView.cpp:1431
-#: src/frontends/qt4/GuiView.cpp:1609 src/frontends/qt4/GuiView.cpp:1654
-#: src/frontends/qt4/GuiView.cpp:1707 src/insets/InsetBibtex.cpp:143
+#: src/frontends/qt4/GuiParagraph.cpp:159 src/frontends/qt4/GuiView.cpp:1464
+#: src/frontends/qt4/GuiView.cpp:1642 src/frontends/qt4/GuiView.cpp:1687
+#: src/frontends/qt4/GuiView.cpp:1740 src/insets/InsetBibtex.cpp:143
 msgid "&Cancel"
 msgstr "&Avbryt"
 
@@ -168,7 +168,7 @@ 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/LabelUi.ui:92
 #: src/frontends/qt4/ui/NomenclUi.ui:105 src/frontends/qt4/ui/SendtoUi.ui:92
-#: src/frontends/qt4/ui/ShortcutUi.ui:115 src/LyXFunc.cpp:772
+#: src/frontends/qt4/ui/ShortcutUi.ui:65 src/LyXFunc.cpp:772
 #: src/buffer_funcs.cpp:104 src/frontends/qt4/ButtonController.cpp:231
 msgid "Cancel"
 msgstr "Avbryt"
@@ -368,8 +368,8 @@ msgstr "Gjenopp&rett"
 #: src/frontends/qt4/ui/ParagraphUi.ui:89 src/frontends/qt4/ui/PrefsUi.ui:83
 #: src/frontends/qt4/ui/RefUi.ui:87 src/frontends/qt4/ui/SendtoUi.ui:85
 #: src/frontends/qt4/ui/SymbolsUi.ui:59 src/frontends/qt4/ui/VSpaceUi.ui:49
-#: src/frontends/qt4/ui/WrapUi.ui:163 src/frontends/qt4/GuiDocument.cpp:1318
-#: src/frontends/qt4/GuiDocument.cpp:2100
+#: src/frontends/qt4/ui/WrapUi.ui:163 src/frontends/qt4/GuiDocument.cpp:1319
+#: src/frontends/qt4/GuiDocument.cpp:2152
 msgid "&Apply"
 msgstr "&Bruk"
 
@@ -408,19 +408,19 @@ msgstr "Indre ramme - til bruk for fast breidde og linjeskift"
 #: src/frontends/qt4/ui/ListingsUi.ui:270
 #: src/frontends/qt4/ui/TabularUi.ui:903 src/frontends/qt4/ui/TabularUi.ui:922
 #: src/frontends/qt4/ui/TabularUi.ui:970 src/frontends/qt4/GuiBox.cpp:72
-#: src/frontends/qt4/GuiBox.cpp:159 src/frontends/qt4/GuiBox.cpp:320
-#: src/frontends/qt4/GuiBox.cpp:448 src/frontends/qt4/GuiDocument.cpp:81
+#: src/frontends/qt4/GuiBox.cpp:159 src/frontends/qt4/GuiBox.cpp:324
+#: src/frontends/qt4/GuiBox.cpp:452 src/frontends/qt4/GuiDocument.cpp:81
 msgid "None"
 msgstr "Ingen"
 
-#: src/frontends/qt4/ui/BoxUi.ui:366 src/frontends/qt4/GuiBox.cpp:321
-#: src/frontends/qt4/GuiBox.cpp:438 src/frontends/qt4/GuiBox.cpp:449
+#: src/frontends/qt4/ui/BoxUi.ui:366 src/frontends/qt4/GuiBox.cpp:325
+#: src/frontends/qt4/GuiBox.cpp:442 src/frontends/qt4/GuiBox.cpp:453
 #: src/insets/InsetBox.cpp:149
 msgid "Parbox"
 msgstr "Avsnittramme"
 
-#: src/frontends/qt4/ui/BoxUi.ui:371 src/frontends/qt4/GuiBox.cpp:439
-#: src/frontends/qt4/GuiBox.cpp:450 src/insets/InsetBox.cpp:151
+#: src/frontends/qt4/ui/BoxUi.ui:371 src/frontends/qt4/GuiBox.cpp:443
+#: src/frontends/qt4/GuiBox.cpp:454 src/insets/InsetBox.cpp:151
 msgid "Minipage"
 msgstr "Miniside"
 
@@ -491,11 +491,11 @@ msgstr "&Storleik:"
 #: src/frontends/qt4/GuiDocument.cpp:95 src/frontends/qt4/GuiDocument.cpp:111
 #: src/frontends/qt4/GuiDocument.cpp:124 src/frontends/qt4/GuiDocument.cpp:638
 #: src/frontends/qt4/GuiDocument.cpp:675 src/frontends/qt4/GuiDocument.cpp:687
-#: src/frontends/qt4/GuiDocument.cpp:1156
-#: src/frontends/qt4/GuiDocument.cpp:1201
-#: src/frontends/qt4/GuiDocument.cpp:2141 src/frontends/qt4/GuiExternal.cpp:75
+#: src/frontends/qt4/GuiDocument.cpp:1160
+#: src/frontends/qt4/GuiDocument.cpp:1205
+#: src/frontends/qt4/GuiDocument.cpp:2193 src/frontends/qt4/GuiExternal.cpp:75
 #: src/frontends/qt4/GuiGraphics.cpp:69 src/frontends/qt4/GuiListings.cpp:151
-#: src/frontends/qt4/GuiListings.cpp:158
+#: src/frontends/qt4/GuiListings.cpp:158 src/frontends/qt4/GuiPrefs.cpp:1707
 msgid "Default"
 msgstr "Standard"
 
@@ -612,8 +612,8 @@ msgstr "Skriftserie"
 #: src/frontends/qt4/ui/CharacterUi.ui:114
 #: src/frontends/qt4/ui/CharacterUi.ui:160
 #: src/frontends/qt4/ui/ListingsUi.ui:370 lib/layouts/europecv.layout:118
-#: lib/layouts/moderncv.layout:114 src/frontends/qt4/GuiDocument.cpp:980
-#: src/frontends/qt4/GuiPrefs.cpp:1664
+#: lib/layouts/moderncv.layout:114 src/frontends/qt4/GuiDocument.cpp:984
+#: src/frontends/qt4/GuiPrefs.cpp:1665
 msgid "Language"
 msgstr "Språk"
 
@@ -709,7 +709,7 @@ msgid "Search Field:"
 msgstr "Søk feil"
 
 #: src/frontends/qt4/ui/CitationUi.ui:125
-#: src/frontends/qt4/GuiCitation.cpp:317
+#: src/frontends/qt4/GuiCitation.cpp:325
 #, fuzzy
 msgid "All Fields"
 msgstr "Alle filer (*)"
@@ -724,7 +724,7 @@ msgid "Entry Types:"
 msgstr "Setel:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:170
-#: src/frontends/qt4/GuiCitation.cpp:332
+#: src/frontends/qt4/GuiCitation.cpp:340
 msgid "All Entry Types"
 msgstr ""
 
@@ -1369,7 +1369,8 @@ msgstr "Vassrett fyll"
 #: src/frontends/qt4/ui/ParagraphUi.ui:255
 #: src/frontends/qt4/ui/TabularUi.ui:913 src/frontends/qt4/ui/TabularUi.ui:932
 #: src/frontends/qt4/ui/TabularUi.ui:980 src/frontends/qt4/ui/VSpaceUi.ui:156
-#: src/frontends/qt4/GuiDocument.cpp:585 src/frontends/qt4/GuiDocument.cpp:688
+#: lib/layouts/stdcustom.inc:8 src/frontends/qt4/GuiDocument.cpp:585
+#: src/frontends/qt4/GuiDocument.cpp:688
 msgid "Custom"
 msgstr "Tilpassa"
 
@@ -1434,7 +1435,8 @@ msgstr "&Fil:"
 
 #: src/frontends/qt4/ui/HyperlinkUi.ui:76
 #: src/frontends/qt4/ui/HyperlinkUi.ui:90 lib/layouts/scrlttr2.layout:205
-#: lib/layouts/amsdefs.inc:158 lib/layouts/stdinsets.inc:251
+#: lib/layouts/amsdefs.inc:158 lib/layouts/stdinsets.inc:247
+#: lib/layouts/stdinsets.inc:252 lib/layouts/minimalistic.module:34
 #: lib/layouts/minimalistic.module:39 lib/ui/stdmenus.inc:340
 msgid "URL"
 msgstr "URL"
@@ -1504,11 +1506,11 @@ msgstr "Namnet p
 msgid "&Include Type:"
 msgstr "&Filtype:"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:287 src/insets/InsetInclude.cpp:346
+#: src/frontends/qt4/ui/IncludeUi.ui:287 src/insets/InsetInclude.cpp:324
 msgid "Include"
 msgstr "Underdokument"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:292 src/insets/InsetInclude.cpp:337
+#: src/frontends/qt4/ui/IncludeUi.ui:292 src/insets/InsetInclude.cpp:315
 msgid "Input"
 msgstr "Tekstfil"
 
@@ -1516,8 +1518,8 @@ msgstr "Tekstfil"
 msgid "Verbatim"
 msgstr "Verbatim"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:302 src/insets/InsetInclude.cpp:937
-#: src/insets/InsetInclude.cpp:943
+#: src/frontends/qt4/ui/IncludeUi.ui:302 src/insets/InsetInclude.cpp:915
+#: src/insets/InsetInclude.cpp:921
 msgid "Program Listing"
 msgstr "Kodelister"
 
@@ -1632,7 +1634,7 @@ msgid "&Quote Style:"
 msgstr "&Sitatstil:"
 
 #: src/frontends/qt4/ui/ListingsUi.ui:16 src/insets/InsetCaption.cpp:299
-#: src/insets/InsetListings.cpp:249 src/insets/InsetListings.cpp:251
+#: src/insets/InsetListings.cpp:320 src/insets/InsetListings.cpp:322
 msgid "Listing"
 msgstr "Kodeliste"
 
@@ -1969,6 +1971,125 @@ msgstr "&Vis i Innhaldslista"
 msgid "&Numbering"
 msgstr "&Nummerering"
 
+#: src/frontends/qt4/ui/PageLayoutUi.ui:33
+#: src/frontends/qt4/GuiDocument.cpp:982
+msgid "Page Layout"
+msgstr "Avsnittstil"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:68
+#, fuzzy
+msgid "Paper Format"
+msgstr "Datoformat"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:103
+msgid "Choose a particular paper size, or set your own with \"Custom\""
+msgstr "Vel ein papirstorleik eller lag din eigen med \"Tilpassa\""
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:121
+msgid "Style used for the page header and footer"
+msgstr "Topp og botntekst stil"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:128
+#, fuzzy
+msgid "Headings &style:"
+msgstr "&Side stil:"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:138
+msgid "&Landscape"
+msgstr "&Liggjande"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:145
+msgid "&Portrait"
+msgstr "S&tåande"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:191
+#: src/frontends/qt4/ui/PrefFileformatsUi.ui:92
+#: src/frontends/qt4/ui/RefUi.ui:129
+msgid "&Format:"
+msgstr "&Format:"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:227
+#, fuzzy
+msgid "&Orientation:"
+msgstr "Retning"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:253
+msgid "Lay out the page for double-sided printing"
+msgstr "Bruk to spaltar"
+
+#: src/frontends/qt4/ui/PageLayoutUi.ui:256
+msgid "&Two-sided document"
+msgstr "&Tosidig"
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:44
+msgid "I&mmediate Apply"
+msgstr ""
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:123
+msgid "Use the default alignment for this paragraph, whatever it is."
+msgstr ""
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:126
+#, fuzzy
+msgid "Paragraph's &Default"
+msgstr "set avsnitt stil"
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:133
+#, fuzzy
+msgid "Ri&ght"
+msgstr "Høgre"
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:140
+#, fuzzy
+msgid "C&enter"
+msgstr "Midten"
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:147
+msgid "&Left"
+msgstr "&Venstre"
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:154
+msgid "&Justified"
+msgstr "&Justert"
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:164
+#, fuzzy
+msgid "&Indent Paragraph"
+msgstr "Rykk inn &avsnitt"
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:174
+msgid "Label Width"
+msgstr "Etikettbreidd"
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:189
+#: src/frontends/qt4/ui/ParagraphUi.ui:196
+msgid "This text defines the width of the paragraph label"
+msgstr "Teksten her avgjer kor brei overskrifta til avsnittet blir"
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:199
+#, fuzzy
+msgid "Lo&ngest label"
+msgstr "&Lengste etikett"
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:212
+#, fuzzy
+msgid "Line &spacing"
+msgstr "&Linjeavstand:"
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:240 src/Text.cpp:1377
+#: src/frontends/qt4/GuiDocument.cpp:579
+msgid "Single"
+msgstr "Enkel"
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:245
+msgid "1.5"
+msgstr "1.5"
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:250 src/Text.cpp:1383
+#: src/frontends/qt4/GuiDocument.cpp:583
+msgid "Double"
+msgstr "Dobbel"
+
 #: src/frontends/qt4/ui/PDFSupportUi.ui:28
 msgid "&Use hyperref support"
 msgstr ""
@@ -2093,125 +2214,6 @@ msgstr "Andre LaTeX-val"
 msgid "e.g.: pdfstartview=XYZ, plainpages=false, pdfpagelabels"
 msgstr ""
 
-#: src/frontends/qt4/ui/PageLayoutUi.ui:33
-#: src/frontends/qt4/GuiDocument.cpp:978
-msgid "Page Layout"
-msgstr "Avsnittstil"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:68
-#, fuzzy
-msgid "Paper Format"
-msgstr "Datoformat"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:103
-msgid "Choose a particular paper size, or set your own with \"Custom\""
-msgstr "Vel ein papirstorleik eller lag din eigen med \"Tilpassa\""
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:121
-msgid "Style used for the page header and footer"
-msgstr "Topp og botntekst stil"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:128
-#, fuzzy
-msgid "Headings &style:"
-msgstr "&Side stil:"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:138
-msgid "&Landscape"
-msgstr "&Liggjande"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:145
-msgid "&Portrait"
-msgstr "S&tåande"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:191
-#: src/frontends/qt4/ui/PrefFileformatsUi.ui:92
-#: src/frontends/qt4/ui/RefUi.ui:129
-msgid "&Format:"
-msgstr "&Format:"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:227
-#, fuzzy
-msgid "&Orientation:"
-msgstr "Retning"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:253
-msgid "Lay out the page for double-sided printing"
-msgstr "Bruk to spaltar"
-
-#: src/frontends/qt4/ui/PageLayoutUi.ui:256
-msgid "&Two-sided document"
-msgstr "&Tosidig"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:44
-msgid "I&mmediate Apply"
-msgstr ""
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:123
-msgid "Use the default alignment for this paragraph, whatever it is."
-msgstr ""
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:126
-#, fuzzy
-msgid "Paragraph's &Default"
-msgstr "set avsnitt stil"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:133
-#, fuzzy
-msgid "Ri&ght"
-msgstr "Høgre"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:140
-#, fuzzy
-msgid "C&enter"
-msgstr "Midten"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:147
-msgid "&Left"
-msgstr "&Venstre"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:154
-msgid "&Justified"
-msgstr "&Justert"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:164
-#, fuzzy
-msgid "&Indent Paragraph"
-msgstr "Rykk inn &avsnitt"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:174
-msgid "Label Width"
-msgstr "Etikettbreidd"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:189
-#: src/frontends/qt4/ui/ParagraphUi.ui:196
-msgid "This text defines the width of the paragraph label"
-msgstr "Teksten her avgjer kor brei overskrifta til avsnittet blir"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:199
-#, fuzzy
-msgid "Lo&ngest label"
-msgstr "&Lengste etikett"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:212
-#, fuzzy
-msgid "Line &spacing"
-msgstr "&Linjeavstand:"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:240 src/Text.cpp:1336
-#: src/frontends/qt4/GuiDocument.cpp:579
-msgid "Single"
-msgstr "Enkel"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:245
-msgid "1.5"
-msgstr "1.5"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:250 src/Text.cpp:1342
-#: src/frontends/qt4/GuiDocument.cpp:583
-msgid "Double"
-msgstr "Dobbel"
-
 #: src/frontends/qt4/ui/PrefColorsUi.ui:50
 msgid "&Alter..."
 msgstr "&Endra..."
@@ -2343,7 +2345,7 @@ msgstr "E&ndra"
 
 #: src/frontends/qt4/ui/PrefConvertersUi.ui:209
 #: src/frontends/qt4/ui/PrefShortcutsUi.ui:61
-#: src/frontends/qt4/GuiPrefs.cpp:2224 src/frontends/qt4/GuiPrefs.cpp:2309
+#: src/frontends/qt4/GuiPrefs.cpp:2257 src/frontends/qt4/GuiPrefs.cpp:2320
 msgid "Remo&ve"
 msgstr "&Fjern"
 
@@ -2392,7 +2394,7 @@ msgstr "Ikkje nytt matte"
 msgid "On"
 msgstr "På"
 
-#: src/frontends/qt4/ui/PrefEditUi.ui:33 src/frontends/qt4/GuiPrefs.cpp:220
+#: src/frontends/qt4/ui/PrefEditUi.ui:33 src/frontends/qt4/GuiPrefs.cpp:221
 #, fuzzy
 msgid "Editing"
 msgstr "Avsluttar."
@@ -2541,115 +2543,121 @@ msgid ""
 "speed it up, low values slow it down."
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:28
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:19
 #, fuzzy
-msgid "Right-to-left language support"
-msgstr "Skriv frå høg&re til venstre"
-
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:46 src/LyXRC.cpp:2709
-msgid ""
-"Select to enable support of right-to-left languages (e.g. Hebrew, Arabic)."
-msgstr ""
-"Skriv frå høgre til venstre (t.d. for språk som Hebraisk eller Arabisk)."
+msgid "&User Interface language:"
+msgstr "Br&ukargrensesnitt fil:"
 
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:29
 #: src/frontends/qt4/ui/PrefLanguageUi.ui:49
-msgid "Enable &RTL support"
-msgstr ""
-
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:77
 #, fuzzy
-msgid "Cursor movement:"
-msgstr "Kommentar"
+msgid "Select the default language of your documents"
+msgstr "Bruk standardval for dokumentklassa"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:87
-#, fuzzy
-msgid "&Logical"
-msgstr "Sak"
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:39
+msgid "&Default language:"
+msgstr "&Standard språk:"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:97
-msgid "&Visual"
-msgstr ""
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:59
+msgid "Language pac&kage:"
+msgstr "Språ&k pakke:"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:109
-msgid "Check to highlight foreign languages visually in the work area"
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:69
+msgid "Enter the command to load the language package (default: babel)"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:112
-msgid "Mark &foreign languages"
-msgstr "Marker &framandespråk"
-
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:135
-#, fuzzy
-msgid "Select the default language of your documents"
-msgstr "Bruk standardval for dokumentklassa"
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:76
+msgid "Command s&tart:"
+msgstr "S&tart kommando:"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:145
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:86
 #, fuzzy
 msgid "The LaTeX command that starts a switch to a foreign language"
 msgstr "LaTeX kommandoen for lokal endring av språket."
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:152
-msgid "Enter the command to load the language package (default: babel)"
-msgstr ""
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:93
+msgid "Command e&nd:"
+msgstr "Slutt Komma&ndo:"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:159
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:103
 #, fuzzy
 msgid "The LaTeX command that ends a switch to a foreign language"
 msgstr "LaTeX kommandoen for lokal endring av språket."
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:179
-msgid "&Default language:"
-msgstr "&Standard språk:"
-
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:189
-msgid "Language pac&kage:"
-msgstr "Språ&k pakke:"
-
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:199
-msgid "Command s&tart:"
-msgstr "S&tart kommando:"
-
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:209
-msgid "Command e&nd:"
-msgstr "Slutt Komma&ndo:"
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:110
+msgid "Use the babel package for multilingual support"
+msgstr ""
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:219
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:113
+msgid "Use b&abel"
+msgstr "Bruk &babel"
+
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:120
 msgid ""
 "Check to pass the language globally (to the document class), not locally (to "
 "the language package)"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:222
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:123
 msgid "&Global"
 msgstr "&Global"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:229
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:130
 msgid ""
 "If checked, the document language is not explicitely set by a language "
 "switch command"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:232
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:133
 msgid "Auto &begin"
 msgstr "Start aut&omatisk"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:239
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:140
 msgid ""
 "If checked, the document language is not explicitely closed by a language "
 "switch command"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:242
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:143
 msgid "Auto &end"
 msgstr "Sl&utt automatisk"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:249
-msgid "Use the babel package for multilingual support"
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:150
+msgid "Check to highlight foreign languages visually in the work area"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:252
-msgid "Use b&abel"
-msgstr "Bruk &babel"
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:153
+msgid "Mark &foreign languages"
+msgstr "Marker &framandespråk"
+
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:179
+#, fuzzy
+msgid "Right-to-left language support"
+msgstr "Skriv frå høg&re til venstre"
+
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:197 src/LyXRC.cpp:2741
+msgid ""
+"Select to enable support of right-to-left languages (e.g. Hebrew, Arabic)."
+msgstr ""
+"Skriv frå høgre til venstre (t.d. for språk som Hebraisk eller Arabisk)."
+
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:200
+msgid "Enable &RTL support"
+msgstr ""
+
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:228
+#, fuzzy
+msgid "Cursor movement:"
+msgstr "Kommentar"
+
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:238
+#, fuzzy
+msgid "&Logical"
+msgstr "Sak"
+
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:248
+msgid "&Visual"
+msgstr ""
 
 #: src/frontends/qt4/ui/PrefLatexUi.ui:25
 msgid "Set class options to default on class change"
@@ -2787,7 +2795,7 @@ msgstr "&Mellombelslager stig:"
 msgid "&PATH prefix:"
 msgstr "&Stig-prefiks:"
 
-#: src/frontends/qt4/ui/PrefPlaintextUi.ui:57 src/LyXRC.cpp:2399
+#: src/frontends/qt4/ui/PrefPlaintextUi.ui:57 src/LyXRC.cpp:2427
 msgid ""
 "The maximum line length of exported plain text/LaTeX/SGML files. If set to "
 "0, paragraphs are output in a single line; if the line length is > 0, "
@@ -3141,7 +3149,7 @@ msgid "&User interface file:"
 msgstr "Br&ukargrensesnitt fil:"
 
 #: src/frontends/qt4/ui/PrefsUi.ui:73 src/LyXFunc.cpp:665
-#: src/frontends/qt4/GuiView.cpp:1707
+#: src/frontends/qt4/GuiView.cpp:1740
 msgid "&Save"
 msgstr "&Lagra"
 
@@ -3334,27 +3342,44 @@ msgstr "&Kommando:"
 msgid "Edit shortcut"
 msgstr "&Snøggtast:"
 
-#: src/frontends/qt4/ui/ShortcutUi.ui:31
-msgid "Type shortcut while the cursor is in this field"
+#: src/frontends/qt4/ui/ShortcutUi.ui:77
+msgid "Enter LyX function or command sequence"
 msgstr ""
 
-#: src/frontends/qt4/ui/ShortcutUi.ui:41
-msgid "Enter LyX function or command sequence"
+#: src/frontends/qt4/ui/ShortcutUi.ui:87
+msgid "Remove last key from the shortcut sequence"
 msgstr ""
 
-#: src/frontends/qt4/ui/ShortcutUi.ui:51 src/frontends/qt4/ui/TabularUi.ui:272
+#: src/frontends/qt4/ui/ShortcutUi.ui:90
+#, fuzzy
+msgid "&Delete Key"
+msgstr "&Slett"
+
+#: src/frontends/qt4/ui/ShortcutUi.ui:97
+#, fuzzy
+msgid "Clear current shortcut"
+msgstr "Klarte ikkje å lage katalog. Stoppar."
+
+#: src/frontends/qt4/ui/ShortcutUi.ui:100
+#: src/frontends/qt4/ui/TabularUi.ui:272
 msgid "C&lear"
 msgstr "&Fjern"
 
-#: src/frontends/qt4/ui/ShortcutUi.ui:58
+#: src/frontends/qt4/ui/ShortcutUi.ui:107
+#, fuzzy
+msgid "&Shortcut:"
+msgstr "&Snøggtast:"
+
+#: src/frontends/qt4/ui/ShortcutUi.ui:117
 #, fuzzy
 msgid "&Function:"
 msgstr "Funksjonar"
 
-#: src/frontends/qt4/ui/ShortcutUi.ui:68
-#, fuzzy
-msgid "&Shortcut:"
-msgstr "&Snøggtast:"
+#: src/frontends/qt4/ui/ShortcutUi.ui:130
+msgid ""
+"Type shortcut after clicking on this field. You can reset the content with "
+"the 'Clear' button"
+msgstr ""
 
 #: src/frontends/qt4/ui/SpellcheckerUi.ui:35
 msgid "Suggestions:"
@@ -3589,8 +3614,8 @@ msgstr "Buk denne rada som topprad p
 #: src/frontends/qt4/ui/TabularUi.ui:1125
 #: src/frontends/qt4/ui/TabularUi.ui:1166
 #: src/frontends/qt4/ui/TabularUi.ui:1197
-#: src/frontends/qt4/ui/TabularUi.ui:1235 src/frontends/qt4/GuiToolbar.cpp:935
-#: src/frontends/qt4/GuiToolbar.cpp:944
+#: src/frontends/qt4/ui/TabularUi.ui:1235 src/frontends/qt4/GuiToolbar.cpp:953
+#: src/frontends/qt4/GuiToolbar.cpp:962
 msgid "on"
 msgstr "på"
 
@@ -3901,7 +3926,7 @@ msgstr ""
 
 #: lib/layouts/IEEEtran.layout:18 lib/layouts/aa.layout:25
 #: lib/layouts/aapaper.layout:34 lib/layouts/aastex.layout:49
-#: lib/layouts/amsart.layout:23 lib/layouts/amsbook.layout:24
+#: lib/layouts/amsart.layout:24 lib/layouts/amsbook.layout:25
 #: lib/layouts/apa.layout:24 lib/layouts/beamer.layout:39
 #: lib/layouts/broadway.layout:175 lib/layouts/chess.layout:29
 #: lib/layouts/cl2emult.layout:125 lib/layouts/dtk.layout:31
@@ -3946,12 +3971,12 @@ msgstr "Prov:"
 #: lib/layouts/heb-article.layout:18 lib/layouts/ijmpc.layout:196
 #: lib/layouts/ijmpd.layout:199 lib/layouts/llncs.layout:412
 #: lib/layouts/siamltex.layout:200 lib/layouts/svjour.inc:475
-#: lib/layouts/theorems-ams.inc:24 lib/layouts/theorems-ams.inc:25
-#: lib/layouts/theorems-ams.inc:208 lib/layouts/theorems-order.inc:7
-#: lib/layouts/theorems-proof.inc:14
+#: lib/layouts/theorems.inc:24 lib/layouts/theorems.inc:25
+#: lib/layouts/theorems.inc:202 lib/layouts/theorems-ams.inc:24
+#: lib/layouts/theorems-ams.inc:25 lib/layouts/theorems-ams.inc:208
+#: lib/layouts/theorems-order.inc:7 lib/layouts/theorems-proof.inc:14
+#: lib/layouts/theorems-starred.inc:24
 #: lib/layouts/theorems-starred-equivalents.inc:6
-#: lib/layouts/theorems-starred.inc:24 lib/layouts/theorems.inc:24
-#: lib/layouts/theorems.inc:25 lib/layouts/theorems.inc:202
 #: lib/layouts/theorems-chap.module:17 lib/layouts/theorems-sec.module:16
 msgid "Theorem"
 msgstr "Teorem"
@@ -3964,9 +3989,9 @@ msgstr "Teorem #:"
 #: lib/layouts/foils.layout:243 lib/layouts/heb-article.layout:45
 #: lib/layouts/ijmpc.layout:246 lib/layouts/ijmpd.layout:251
 #: lib/layouts/llncs.layout:351 lib/layouts/siamltex.layout:215
-#: lib/layouts/svjour.inc:412 lib/layouts/theorems-ams.inc:71
-#: lib/layouts/theorems-order.inc:19
-#: lib/layouts/theorems-starred-equivalents.inc:20 lib/layouts/theorems.inc:69
+#: lib/layouts/svjour.inc:412 lib/layouts/theorems.inc:69
+#: lib/layouts/theorems-ams.inc:71 lib/layouts/theorems-order.inc:19
+#: lib/layouts/theorems-starred-equivalents.inc:20
 msgid "Lemma"
 msgstr "Lemma"
 
@@ -3979,8 +4004,9 @@ msgstr "Lemma #:"
 #: lib/layouts/heb-article.layout:55 lib/layouts/ijmpc.layout:236
 #: lib/layouts/ijmpd.layout:237 lib/layouts/llncs.layout:316
 #: lib/layouts/siamltex.layout:222 lib/layouts/svjour.inc:373
-#: lib/layouts/theorems-ams.inc:59 lib/layouts/theorems-order.inc:13
-#: lib/layouts/theorems-starred-equivalents.inc:13 lib/layouts/theorems.inc:58
+#: lib/layouts/theorems.inc:58 lib/layouts/theorems-ams.inc:59
+#: lib/layouts/theorems-order.inc:13
+#: lib/layouts/theorems-starred-equivalents.inc:13
 msgid "Corollary"
 msgstr "Korollar"
 
@@ -3992,8 +4018,9 @@ msgstr "Korollar #:"
 #: lib/layouts/foils.layout:257 lib/layouts/ijmpc.layout:256
 #: lib/layouts/ijmpd.layout:262 lib/layouts/llncs.layout:385
 #: lib/layouts/siamltex.layout:229 lib/layouts/svjour.inc:447
-#: lib/layouts/theorems-ams.inc:83 lib/layouts/theorems-order.inc:25
-#: lib/layouts/theorems-starred-equivalents.inc:27 lib/layouts/theorems.inc:80
+#: lib/layouts/theorems.inc:80 lib/layouts/theorems-ams.inc:83
+#: lib/layouts/theorems-order.inc:25
+#: lib/layouts/theorems-starred-equivalents.inc:27
 msgid "Proposition"
 msgstr "Framlegg"
 
@@ -4004,8 +4031,9 @@ msgstr "Framlegg #:"
 #: lib/layouts/IEEEtran.layout:113 lib/layouts/elsart.layout:363
 #: lib/layouts/ijmpc.layout:296 lib/layouts/ijmpd.layout:306
 #: lib/layouts/llncs.layout:309 lib/layouts/svjour.inc:366
-#: lib/layouts/theorems-ams.inc:95 lib/layouts/theorems-order.inc:31
-#: lib/layouts/theorems-starred-equivalents.inc:34 lib/layouts/theorems.inc:91
+#: lib/layouts/theorems.inc:91 lib/layouts/theorems-ams.inc:95
+#: lib/layouts/theorems-order.inc:31
+#: lib/layouts/theorems-starred-equivalents.inc:34
 msgid "Conjecture"
 msgstr "Konjektur"
 
@@ -4023,7 +4051,7 @@ msgid "Criterion #:"
 msgstr "Kriterium #:"
 
 #: lib/layouts/IEEEtran.layout:133 lib/layouts/beamer.layout:977
-#: lib/layouts/theorems-ams.inc:107 lib/layouts/theorems.inc:102
+#: lib/layouts/theorems.inc:102 lib/layouts/theorems-ams.inc:107
 msgid "Fact"
 msgstr "Faktum"
 
@@ -4044,9 +4072,9 @@ msgstr "Aksiom #:"
 #: lib/layouts/heb-article.layout:75 lib/layouts/ijmpc.layout:132
 #: lib/layouts/ijmpd.layout:129 lib/layouts/llncs.layout:330
 #: lib/layouts/siamltex.layout:236 lib/layouts/svjour.inc:387
-#: lib/layouts/theorems-ams.inc:119 lib/layouts/theorems-order.inc:37
+#: lib/layouts/theorems.inc:113 lib/layouts/theorems-ams.inc:119
+#: lib/layouts/theorems-order.inc:37
 #: lib/layouts/theorems-starred-equivalents.inc:41
-#: lib/layouts/theorems.inc:113
 msgid "Definition"
 msgstr "Definisjon"
 
@@ -4057,10 +4085,10 @@ msgstr "Definisjon #:"
 #: lib/layouts/IEEEtran.layout:163 lib/layouts/beamer.layout:959
 #: lib/layouts/elsart.layout:370 lib/layouts/ijmpc.layout:166
 #: lib/layouts/ijmpd.layout:163 lib/layouts/llncs.layout:337
-#: lib/layouts/svjour.inc:394 lib/layouts/theorems-ams.inc:138
-#: lib/layouts/theorems-order.inc:43
+#: lib/layouts/svjour.inc:394 lib/layouts/theorems.inc:132
+#: lib/layouts/theorems-ams.inc:138 lib/layouts/theorems-order.inc:43
 #: lib/layouts/theorems-starred-equivalents.inc:48
-#: lib/layouts/theorems.inc:132 src/frontends/qt4/GuiDocument.cpp:825
+#: src/frontends/qt4/GuiDocument.cpp:827
 msgid "Example"
 msgstr "Døme"
 
@@ -4079,9 +4107,9 @@ msgstr "Vilk
 
 #: lib/layouts/IEEEtran.layout:183 lib/layouts/elsart.layout:377
 #: lib/layouts/llncs.layout:364 lib/layouts/svjour.inc:426
-#: lib/layouts/theorems-ams.inc:150 lib/layouts/theorems-order.inc:49
+#: lib/layouts/theorems.inc:144 lib/layouts/theorems-ams.inc:150
+#: lib/layouts/theorems-order.inc:49
 #: lib/layouts/theorems-starred-equivalents.inc:55
-#: lib/layouts/theorems.inc:144
 msgid "Problem"
 msgstr "Problem"
 
@@ -4090,10 +4118,9 @@ msgid "Problem #:"
 msgstr "Problem #:"
 
 #: lib/layouts/IEEEtran.layout:193 lib/layouts/llncs.layout:344
-#: lib/layouts/svjour.inc:401 lib/layouts/theorems-ams.inc:162
-#: lib/layouts/theorems-order.inc:55
+#: lib/layouts/svjour.inc:401 lib/layouts/theorems.inc:156
+#: lib/layouts/theorems-ams.inc:162 lib/layouts/theorems-order.inc:55
 #: lib/layouts/theorems-starred-equivalents.inc:62
-#: lib/layouts/theorems.inc:156
 msgid "Exercise"
 msgstr "Øving"
 
@@ -4104,9 +4131,9 @@ msgstr "
 #: lib/layouts/IEEEtran.layout:203 lib/layouts/elsart.layout:384
 #: lib/layouts/ijmpc.layout:176 lib/layouts/ijmpd.layout:174
 #: lib/layouts/llncs.layout:398 lib/layouts/svjour.inc:461
-#: lib/layouts/theorems-ams.inc:174 lib/layouts/theorems-order.inc:61
+#: lib/layouts/theorems.inc:168 lib/layouts/theorems-ams.inc:174
+#: lib/layouts/theorems-order.inc:61
 #: lib/layouts/theorems-starred-equivalents.inc:69
-#: lib/layouts/theorems.inc:168
 msgid "Remark"
 msgstr "Merknad"
 
@@ -4117,10 +4144,9 @@ msgstr "Merknad #:"
 #: lib/layouts/IEEEtran.layout:213 lib/layouts/elsart.layout:398
 #: lib/layouts/heb-article.layout:65 lib/layouts/ijmpc.layout:286
 #: lib/layouts/ijmpd.layout:295 lib/layouts/llncs.layout:302
-#: lib/layouts/svjour.inc:345 lib/layouts/theorems-ams.inc:194
-#: lib/layouts/theorems-order.inc:67
+#: lib/layouts/svjour.inc:345 lib/layouts/theorems.inc:188
+#: lib/layouts/theorems-ams.inc:194 lib/layouts/theorems-order.inc:67
 #: lib/layouts/theorems-starred-equivalents.inc:76
-#: lib/layouts/theorems.inc:188
 msgid "Claim"
 msgstr "Påstand"
 
@@ -4150,21 +4176,20 @@ msgid "Notation #:"
 msgstr "Notasjon #:"
 
 #: lib/layouts/IEEEtran.layout:243 lib/layouts/elsart.layout:413
-#: lib/layouts/llncs.layout:281 lib/layouts/theorems-ams.inc:207
-#: lib/layouts/theorems-order.inc:73 lib/layouts/theorems.inc:201
+#: lib/layouts/llncs.layout:281 lib/layouts/theorems.inc:201
+#: lib/layouts/theorems-ams.inc:207 lib/layouts/theorems-order.inc:73
 msgid "Case"
 msgstr "Tilfelle"
 
-#: lib/layouts/IEEEtran.layout:246 lib/layouts/theorems-ams.inc:213
-#: lib/layouts/theorems.inc:207
+#: lib/layouts/IEEEtran.layout:246
 msgid "Case #:"
 msgstr "Tilfelle #:"
 
 #: lib/layouts/IEEEtran.layout:272 lib/layouts/aa.layout:40
 #: lib/layouts/aa.layout:217 lib/layouts/aapaper.layout:64
 #: lib/layouts/aapaper.layout:130 lib/layouts/aastex.layout:64
-#: lib/layouts/aastex.layout:167 lib/layouts/amsart.layout:63
-#: lib/layouts/amsbook.layout:49 lib/layouts/amsbook.layout:89
+#: lib/layouts/aastex.layout:167 lib/layouts/amsart.layout:64
+#: lib/layouts/amsbook.layout:50 lib/layouts/amsbook.layout:90
 #: lib/layouts/apa.layout:307 lib/layouts/beamer.layout:118
 #: lib/layouts/beamer.layout:147 lib/layouts/beamer.layout:148
 #: lib/layouts/beamer.layout:190 lib/layouts/egs.layout:30
@@ -4188,8 +4213,8 @@ msgstr "Bolk"
 #: lib/layouts/IEEEtran.layout:282 lib/layouts/aa.layout:43
 #: lib/layouts/aa.layout:227 lib/layouts/aapaper.layout:67
 #: lib/layouts/aapaper.layout:139 lib/layouts/aastex.layout:67
-#: lib/layouts/aastex.layout:179 lib/layouts/amsart.layout:73
-#: lib/layouts/amsbook.layout:59 lib/layouts/apa.layout:317
+#: lib/layouts/aastex.layout:179 lib/layouts/amsart.layout:74
+#: lib/layouts/amsbook.layout:60 lib/layouts/apa.layout:317
 #: lib/layouts/beamer.layout:189 lib/layouts/egs.layout:51
 #: lib/layouts/ijmpc.layout:109 lib/layouts/ijmpd.layout:105
 #: lib/layouts/isprs.layout:166 lib/layouts/kluwer.layout:66
@@ -4208,8 +4233,8 @@ msgstr "Underbolk"
 #: lib/layouts/IEEEtran.layout:290 lib/layouts/aa.layout:46
 #: lib/layouts/aa.layout:239 lib/layouts/aapaper.layout:70
 #: lib/layouts/aapaper.layout:150 lib/layouts/aastex.layout:70
-#: lib/layouts/aastex.layout:191 lib/layouts/amsart.layout:81
-#: lib/layouts/amsbook.layout:67 lib/layouts/apa.layout:326
+#: lib/layouts/aastex.layout:191 lib/layouts/amsart.layout:82
+#: lib/layouts/amsbook.layout:68 lib/layouts/apa.layout:326
 #: lib/layouts/ijmpc.layout:117 lib/layouts/ijmpd.layout:113
 #: lib/layouts/isprs.layout:175 lib/layouts/kluwer.layout:75
 #: lib/layouts/llncs.layout:61 lib/layouts/ltugboat.layout:83
@@ -4306,7 +4331,7 @@ msgstr "Indeksord---"
 #: lib/layouts/simplecv.layout:139 lib/layouts/aguplus.inc:167
 #: lib/layouts/aguplus.inc:169 lib/layouts/amsdefs.inc:201
 #: lib/layouts/scrclass.inc:223 lib/layouts/stdstruct.inc:39
-#: lib/layouts/svjour.inc:323 src/frontends/qt4/GuiDocument.cpp:982
+#: lib/layouts/svjour.inc:323 src/frontends/qt4/GuiDocument.cpp:986
 msgid "Bibliography"
 msgstr "Litteratur"
 
@@ -4494,8 +4519,18 @@ msgstr "Takk til."
 msgid "Key words."
 msgstr "Nøkkelord."
 
+#: lib/layouts/aa.layout:349
+#, fuzzy
+msgid "CharStyle:Institute"
+msgstr "Endring: "
+
+#: lib/layouts/aa.layout:359
+#, fuzzy
+msgid "CharStyle:E-Mail"
+msgstr "Endring: "
+
 #: lib/layouts/aapaper.layout:61 lib/layouts/egs.layout:612
-#: src/frontends/qt4/GuiPrefs.cpp:524
+#: src/frontends/qt4/GuiPrefs.cpp:525
 msgid "LaTeX"
 msgstr "LaTeX"
 
@@ -4512,7 +4547,7 @@ msgstr "E-post"
 msgid "Thesaurus"
 msgstr "Synonym ordbok"
 
-#: lib/layouts/aastex.layout:73 lib/layouts/amsbook.layout:95
+#: lib/layouts/aastex.layout:73 lib/layouts/amsbook.layout:96
 #: lib/layouts/apa.layout:335 lib/layouts/egs.layout:69
 #: lib/layouts/kluwer.layout:84 lib/layouts/llncs.layout:69
 #: lib/layouts/ltugboat.layout:102 lib/layouts/memoir.layout:71
@@ -4600,10 +4635,10 @@ msgstr "Subjekt overskrifter:"
 msgid "[Acknowledgements]"
 msgstr "[Takk til]"
 
-#: lib/layouts/aastex.layout:350 src/frontends/qt4/GuiDocument.cpp:1341
-#: src/frontends/qt4/GuiDocument.cpp:1351
-#: src/frontends/qt4/GuiDocument.cpp:1391
-#: src/frontends/qt4/GuiDocument.cpp:1410
+#: lib/layouts/aastex.layout:350 src/frontends/qt4/GuiDocument.cpp:1347
+#: src/frontends/qt4/GuiDocument.cpp:1357
+#: src/frontends/qt4/GuiDocument.cpp:1397
+#: src/frontends/qt4/GuiDocument.cpp:1416
 msgid "and"
 msgstr "og"
 
@@ -4651,7 +4686,7 @@ msgstr "Obj:"
 msgid "Dataset:"
 msgstr "Datasett:"
 
-#: lib/layouts/amsart.layout:24 lib/layouts/amsbook.layout:25
+#: lib/layouts/amsart.layout:25 lib/layouts/amsbook.layout:26
 #: lib/layouts/beamer.layout:40 lib/layouts/beamer.layout:998
 #: lib/layouts/beamer.layout:1022 lib/layouts/beamer.layout:1060
 #: lib/layouts/lyxmacros.inc:13 lib/layouts/stdclass.inc:29
@@ -4661,12 +4696,12 @@ msgstr "Datasett:"
 msgid "MainText"
 msgstr "Rein tekst"
 
-#: lib/layouts/amsbook.layout:90 lib/layouts/amsbook.layout:91
+#: lib/layouts/amsbook.layout:91 lib/layouts/amsbook.layout:92
 #: lib/layouts/powerdot.layout:229 lib/layouts/numarticle.inc:10
 msgid "\\arabic{section}"
 msgstr "\\arabic{section}"
 
-#: lib/layouts/amsbook.layout:103
+#: lib/layouts/amsbook.layout:104
 msgid "Chapter Exercises"
 msgstr "Kapittel øving"
 
@@ -4799,11 +4834,6 @@ msgstr "LatinOff"
 msgid "Latin off"
 msgstr "Latin off"
 
-#: lib/layouts/article-beamer.layout:22 lib/layouts/beamer.layout:232
-#: lib/layouts/scrarticle-beamer.layout:22
-msgid "BeginFrame"
-msgstr "Start lysark"
-
 #: lib/layouts/article.layout:18 lib/layouts/beamer.layout:117
 #: lib/layouts/beamer.layout:132 lib/layouts/mwart.layout:23
 #: lib/layouts/paper.layout:32 lib/layouts/scrartcl.layout:20
@@ -4819,6 +4849,11 @@ msgstr "Del"
 msgid "Part*"
 msgstr "Del*"
 
+#: lib/layouts/article-beamer.layout:22 lib/layouts/beamer.layout:232
+#: lib/layouts/scrarticle-beamer.layout:22
+msgid "BeginFrame"
+msgstr "Start lysark"
+
 #: lib/layouts/beamer.layout:107 lib/layouts/egs.layout:196
 #: lib/layouts/manpage.layout:114 lib/layouts/stdlists.inc:65
 msgid "MM"
@@ -5104,27 +5139,46 @@ msgstr "Notat"
 msgid "Note:"
 msgstr "Notat:"
 
+#: lib/layouts/beamer.layout:1087
+#, fuzzy
+msgid "CharStyle:Alert"
+msgstr "Endring: "
+
 #: lib/layouts/beamer.layout:1089
 #, fuzzy
 msgid "Alert"
 msgstr "Åtvaring ramme"
 
+#: lib/layouts/beamer.layout:1098
+#, fuzzy
+msgid "CharStyle:Structure"
+msgstr "Endring: "
+
 #: lib/layouts/beamer.layout:1100
 msgid "Structure"
 msgstr ""
 
+#: lib/layouts/beamer.layout:1109
+msgid "Custom:ArticleMode"
+msgstr ""
+
 #: lib/layouts/beamer.layout:1114
 #, fuzzy
 msgid "Article"
 msgstr "Loddrett"
 
+#: lib/layouts/beamer.layout:1119
+#, fuzzy
+msgid "Custom:PresentationMode"
+msgstr "Retning"
+
 #: lib/layouts/beamer.layout:1124
 #, fuzzy
 msgid "Presentation"
 msgstr "Retning"
 
 #: lib/layouts/beamer.layout:1131 lib/layouts/powerdot.layout:377
-#: lib/layouts/stdfloats.inc:10 lib/layouts/stdinsets.inc:229
+#: lib/layouts/stdfloats.inc:10 lib/layouts/stdinsets.inc:230
 #: lib/ui/stdtoolbars.inc:115
 msgid "Table"
 msgstr "Tabell"
@@ -5135,7 +5189,7 @@ msgid "List of Tables"
 msgstr "Liste over tabellar"
 
 #: lib/layouts/beamer.layout:1143 lib/layouts/powerdot.layout:387
-#: lib/layouts/stdfloats.inc:22 lib/layouts/stdinsets.inc:220
+#: lib/layouts/stdfloats.inc:22 lib/layouts/stdinsets.inc:221
 msgid "Figure"
 msgstr "Figur"
 
@@ -5555,7 +5609,7 @@ msgid "Criterion \\arabic{theorem}"
 msgstr "Kriterium \\arabic{theorem}"
 
 #: lib/layouts/elsart.layout:342 lib/layouts/powerdot.layout:397
-#: lib/layouts/stdfloats.inc:34 lib/layouts/stdinsets.inc:238
+#: lib/layouts/stdfloats.inc:34 lib/layouts/stdinsets.inc:239
 #: lib/layouts/theorems-ams-extended.module:55
 msgid "Algorithm"
 msgstr "Algoritme"
@@ -6520,7 +6574,7 @@ msgid "Notation \\thenotation."
 msgstr "Notasjon \\arabic{notation}."
 
 #: lib/layouts/ijmpc.layout:206 lib/layouts/ijmpd.layout:209
-#: lib/layouts/theorems-ams.inc:42 lib/layouts/theorems.inc:42
+#: lib/layouts/theorems.inc:42 lib/layouts/theorems-ams.inc:42
 #, fuzzy
 msgid "Theorem \\thetheorem."
 msgstr "Teorem \\arabic{theorem}."
@@ -6590,7 +6644,7 @@ msgstr "Sj
 msgid "Topical"
 msgstr "Sak"
 
-#: lib/layouts/iopart.layout:86 src/insets/InsetNote.cpp:66
+#: lib/layouts/iopart.layout:86 src/insets/InsetNote.cpp:67
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -6725,7 +6779,8 @@ msgstr "Forfatter p
 msgid "TOC Author:"
 msgstr "Forfatter på Innhaldslista:"
 
-#: lib/layouts/llncs.layout:295
+#: lib/layouts/llncs.layout:295 lib/layouts/theorems.inc:207
+#: lib/layouts/theorems-ams.inc:213
 msgid "Case #."
 msgstr "Tilfelle #."
 
@@ -7262,68 +7317,141 @@ msgstr "epost:"
 msgid "Thesaurus not supported in recent A&A:"
 msgstr "Synonymordbok ikkje støtta i dei siste A&A:"
 
+#: lib/layouts/agu_stdclass.inc:34 lib/layouts/db_stdcharstyles.inc:35
+#, fuzzy
+msgid "Element:Firstname"
+msgstr "Fornamn"
+
 #: lib/layouts/agu_stdclass.inc:36 lib/layouts/db_stdcharstyles.inc:37
 #, fuzzy
 msgid "Firstname"
 msgstr "Fornamn"
 
+#: lib/layouts/agu_stdclass.inc:48
+#, fuzzy
+msgid "Element:Fname"
+msgstr "Plassering:"
+
 #: lib/layouts/agu_stdclass.inc:50
 #, fuzzy
 msgid "Fname"
 msgstr "Lysark "
 
+#: lib/layouts/agu_stdclass.inc:63 lib/layouts/db_stdcharstyles.inc:46
+#, fuzzy
+msgid "Element:Surname"
+msgstr "Etternamn"
+
 #: lib/layouts/agu_stdclass.inc:65 lib/layouts/db_stdcharstyles.inc:48
 #: lib/layouts/db_stdtitle.inc:98
 msgid "Surname"
 msgstr "Etternamn"
 
+#: lib/layouts/agu_stdclass.inc:78 lib/layouts/db_stdcharstyles.inc:6
+#, fuzzy
+msgid "Element:Filename"
+msgstr "Filnamn"
+
+#: lib/layouts/agu_stdclass.inc:93 lib/layouts/db_stdcharstyles.inc:57
+#, fuzzy
+msgid "Element:Literal"
+msgstr "Ordrett"
+
 #: lib/layouts/agu_stdclass.inc:95 lib/layouts/db_stdcharstyles.inc:59
 #: lib/layouts/db_stdlayouts.inc:11
 msgid "Literal"
 msgstr "Ordrett"
 
+#: lib/layouts/agu_stdclass.inc:108
+#, fuzzy
+msgid "Element:Emph"
+msgstr "Plassering:"
+
 #: lib/layouts/agu_stdclass.inc:110 src/frontends/qt4/GuiCharacter.cpp:77
 msgid "Emph"
 msgstr "Utheva "
 
+#: lib/layouts/agu_stdclass.inc:124
+#, fuzzy
+msgid "Element:Abbrev"
+msgstr "korttrykk"
+
 #: lib/layouts/agu_stdclass.inc:126
 #, fuzzy
 msgid "Abbrev"
 msgstr "korttrykk"
 
+#: lib/layouts/agu_stdclass.inc:135
+#, fuzzy
+msgid "Element:Citation-number"
+msgstr "Litteraturnummer"
+
 #: lib/layouts/agu_stdclass.inc:137 lib/layouts/agu_stdtitle.inc:56
 msgid "Citation-number"
 msgstr "Litteraturnummer"
 
+#: lib/layouts/agu_stdclass.inc:146
+#, fuzzy
+msgid "Element:Volume"
+msgstr "Kolonne"
+
 #: lib/layouts/agu_stdclass.inc:148
 #, fuzzy
 msgid "Volume"
 msgstr "Kolonne"
 
+#: lib/layouts/agu_stdclass.inc:157
+#, fuzzy
+msgid "Element:Day"
+msgstr "Tillegg"
+
 #: lib/layouts/agu_stdclass.inc:159
 #, fuzzy
 msgid "Day"
 msgstr "Vis"
 
+#: lib/layouts/agu_stdclass.inc:168
+#, fuzzy
+msgid "Element:Month"
+msgstr "Plassering:"
+
 #: lib/layouts/agu_stdclass.inc:170
 #, fuzzy
 msgid "Month"
 msgstr "Matte"
 
+#: lib/layouts/agu_stdclass.inc:179
+#, fuzzy
+msgid "Element:Year"
+msgstr "Tillegg"
+
 #: lib/layouts/agu_stdclass.inc:181
 #, fuzzy
 msgid "Year"
 msgstr "&Fjern"
 
+#: lib/layouts/agu_stdclass.inc:190
+#, fuzzy
+msgid "Element:Issue-number"
+msgstr "msnummer"
+
 #: lib/layouts/agu_stdclass.inc:192
 #, fuzzy
 msgid "Issue-number"
 msgstr "msnummer"
 
+#: lib/layouts/agu_stdclass.inc:201
+msgid "Element:Issue-day"
+msgstr ""
+
 #: lib/layouts/agu_stdclass.inc:203
 msgid "Issue-day"
 msgstr ""
 
+#: lib/layouts/agu_stdclass.inc:212
+msgid "Element:Issue-months"
+msgstr ""
+
 #: lib/layouts/agu_stdclass.inc:214
 msgid "Issue-months"
 msgstr ""
@@ -7456,7 +7584,7 @@ msgstr "Topptekst:"
 msgid "Published-online:"
 msgstr "Nettpublikasjon:"
 
-#: lib/layouts/agu_stdtitle.inc:263 src/frontends/qt4/GuiCitation.cpp:85
+#: lib/layouts/agu_stdtitle.inc:263 src/frontends/qt4/GuiCitation.cpp:86
 msgid "Citation"
 msgstr "Litteratur"
 
@@ -7512,55 +7640,130 @@ msgstr "Datasett"
 msgid "Datasets:"
 msgstr "Datasett:"
 
+#: lib/layouts/agu_stdtitle.inc:321
+#, fuzzy
+msgid "Element:ISSN"
+msgstr "Plassering:"
+
 #: lib/layouts/agu_stdtitle.inc:323
 msgid "ISSN"
 msgstr ""
 
+#: lib/layouts/agu_stdtitle.inc:332
+#, fuzzy
+msgid "Element:CODEN"
+msgstr "Plassering:"
+
 #: lib/layouts/agu_stdtitle.inc:334
 #, fuzzy
 msgid "CODEN"
 msgstr "SCENE"
 
+#: lib/layouts/agu_stdtitle.inc:344
+#, fuzzy
+msgid "Element:SS-Code"
+msgstr "Kode"
+
 #: lib/layouts/agu_stdtitle.inc:346
 #, fuzzy
 msgid "SS-Code"
 msgstr "Kode"
 
+#: lib/layouts/agu_stdtitle.inc:355
+#, fuzzy
+msgid "Element:SS-Title"
+msgstr "Tittel"
+
 #: lib/layouts/agu_stdtitle.inc:357
 #, fuzzy
 msgid "SS-Title"
 msgstr "Tittel"
 
+#: lib/layouts/agu_stdtitle.inc:367
+#, fuzzy
+msgid "Element:CCC-Code"
+msgstr "CCC Kode:"
+
 #: lib/layouts/agu_stdtitle.inc:369
 #, fuzzy
 msgid "CCC-Code"
 msgstr "CCC Kode:"
 
+#: lib/layouts/agu_stdtitle.inc:380
+#, fuzzy
+msgid "Element:Code"
+msgstr "Plassering:"
+
+#: lib/layouts/agu_stdtitle.inc:391
+#, fuzzy
+msgid "Element:Dscr"
+msgstr "Plassering:"
+
 #: lib/layouts/agu_stdtitle.inc:393
 #, fuzzy
 msgid "Dscr"
 msgstr "&Forkast"
 
+#: lib/layouts/agu_stdtitle.inc:403
+#, fuzzy
+msgid "Element:Keyword"
+msgstr "Nøkkelord"
+
+#: lib/layouts/agu_stdtitle.inc:415
+#, fuzzy
+msgid "Element:Orgdiv"
+msgstr "div"
+
 #: lib/layouts/agu_stdtitle.inc:417
 #, fuzzy
 msgid "Orgdiv"
 msgstr "div"
 
+#: lib/layouts/agu_stdtitle.inc:426
+#, fuzzy
+msgid "Element:Orgname"
+msgstr "Etternamn"
+
 #: lib/layouts/agu_stdtitle.inc:428
 #, fuzzy
 msgid "Orgname"
 msgstr "Etternamn"
 
+#: lib/layouts/agu_stdtitle.inc:437
+#, fuzzy
+msgid "Element:Street"
+msgstr "Gate"
+
+#: lib/layouts/agu_stdtitle.inc:448
+#, fuzzy
+msgid "Element:City"
+msgstr "Plassering:"
+
 #: lib/layouts/agu_stdtitle.inc:450
 #, fuzzy
 msgid "City"
 msgstr "infty"
 
+#: lib/layouts/agu_stdtitle.inc:459
+#, fuzzy
+msgid "Element:State"
+msgstr "Plassering:"
+
+#: lib/layouts/agu_stdtitle.inc:470
+#, fuzzy
+msgid "Element:Postcode"
+msgstr "Post-rekkjefølgje"
+
 #: lib/layouts/agu_stdtitle.inc:472
 #, fuzzy
 msgid "Postcode"
 msgstr "Post-rekkjefølgje"
 
+#: lib/layouts/agu_stdtitle.inc:481
+#, fuzzy
+msgid "Element:Country"
+msgstr "Setelen"
+
 #: lib/layouts/agu_stdtitle.inc:483
 #, fuzzy
 msgid "Country"
@@ -7655,33 +7858,69 @@ msgstr "Subjekt klassifikasjon"
 msgid "2000 Mathematics Subject Classification:"
 msgstr "1991 Matematikk subjekt klassifikasjon:"
 
+#: lib/layouts/db_stdcharstyles.inc:20
+#, fuzzy
+msgid "Element:Directory"
+msgstr "Katalogar"
+
 #: lib/layouts/db_stdcharstyles.inc:22
 #, fuzzy
 msgid "Directory"
 msgstr "Katalogar"
 
+#: lib/layouts/db_stdcharstyles.inc:71
+#, fuzzy
+msgid "Element:Email"
+msgstr "Plassering:"
+
+#: lib/layouts/db_stdcharstyles.inc:85
+#, fuzzy
+msgid "Element:KeyCombo"
+msgstr "Tastatur"
+
 #: lib/layouts/db_stdcharstyles.inc:87
 #, fuzzy
 msgid "KeyCombo"
 msgstr "Tastatur"
 
+#: lib/layouts/db_stdcharstyles.inc:99
+#, fuzzy
+msgid "Element:KeyCap"
+msgstr "Cap"
+
 #: lib/layouts/db_stdcharstyles.inc:101
 #, fuzzy
 msgid "KeyCap"
 msgstr "Cap"
 
+#: lib/layouts/db_stdcharstyles.inc:113
+msgid "Element:GuiMenu"
+msgstr ""
+
 #: lib/layouts/db_stdcharstyles.inc:115
 msgid "GuiMenu"
 msgstr ""
 
+#: lib/layouts/db_stdcharstyles.inc:127
+msgid "Element:GuiMenuItem"
+msgstr ""
+
 #: lib/layouts/db_stdcharstyles.inc:129
 msgid "GuiMenuItem"
 msgstr ""
 
+#: lib/layouts/db_stdcharstyles.inc:141
+msgid "Element:GuiButton"
+msgstr ""
+
 #: lib/layouts/db_stdcharstyles.inc:143
 msgid "GuiButton"
 msgstr ""
 
+#: lib/layouts/db_stdcharstyles.inc:155
+msgid "Element:MenuChoice"
+msgstr ""
+
 #: lib/layouts/db_stdcharstyles.inc:157
 msgid "MenuChoice"
 msgstr ""
@@ -7823,6 +8062,11 @@ msgstr "Under_figurtekst"
 msgid "Dictum"
 msgstr "Dictum "
 
+#: lib/layouts/stdcharstyles.inc:8
+#, fuzzy
+msgid "CharStyle"
+msgstr "Endring: "
+
 #: lib/layouts/stdcharstyles.inc:10 lib/layouts/stdcustom.inc:10
 #: src/insets/InsetCollapsable.cpp:151
 msgid "UNDEFINED"
@@ -7833,43 +8077,106 @@ msgstr ""
 msgid "\\Roman{part}"
 msgstr "Del \\Roman{part}"
 
+#: lib/layouts/stdinsets.inc:54
+#, fuzzy
+msgid "Marginal"
+msgstr "margin"
+
 #: lib/layouts/stdinsets.inc:55 src/insets/InsetMarginal.cpp:50
 msgid "margin"
 msgstr "margin"
 
+#: lib/layouts/stdinsets.inc:75
+#, fuzzy
+msgid "Foot"
+msgstr "fot"
+
 #: lib/layouts/stdinsets.inc:76
 msgid "foot"
 msgstr "fot"
 
+#: lib/layouts/stdinsets.inc:96
+#, fuzzy
+msgid "Note:Comment"
+msgstr "Kommentar"
+
 #: lib/layouts/stdinsets.inc:97
 msgid "comment"
 msgstr "kommentar"
 
-#: lib/layouts/stdinsets.inc:110 src/insets/InsetNote.cpp:297
+#: lib/layouts/stdinsets.inc:109
+#, fuzzy
+msgid "Note:Note"
+msgstr "Notat:"
+
+#: lib/layouts/stdinsets.inc:110 src/insets/InsetNote.cpp:298
 msgid "note"
 msgstr "notat"
 
+#: lib/layouts/stdinsets.inc:121
+#, fuzzy
+msgid "Note:Greyedout"
+msgstr "Som Grå-tekst"
+
 #: lib/layouts/stdinsets.inc:122
 #, fuzzy
 msgid "greyedout"
 msgstr "Som Grå-tekst"
 
-#: lib/layouts/stdinsets.inc:134 src/insets/InsetERT.cpp:166
-#: src/insets/InsetERT.cpp:168
+#: lib/layouts/stdinsets.inc:133 lib/layouts/stdinsets.inc:134
+#: src/insets/InsetERT.cpp:166 src/insets/InsetERT.cpp:168
 msgid "ERT"
 msgstr "ERT"
 
-#: lib/layouts/stdinsets.inc:153
+#: lib/layouts/stdinsets.inc:152 lib/layouts/stdinsets.inc:153
 #, fuzzy
 msgid "Listings"
 msgstr "Kodeliste"
 
-#: lib/layouts/stdinsets.inc:180 lib/layouts/minimalistic.module:10
+#: lib/layouts/stdinsets.inc:171 lib/layouts/minimalistic.module:25
+#: src/frontends/qt4/GuiBranches.cpp:42
+msgid "Branch"
+msgstr "Grein"
+
+#: lib/layouts/stdinsets.inc:180 lib/layouts/minimalistic.module:8
+#: src/insets/InsetIndex.cpp:149
+msgid "Index"
+msgstr "Indeks"
+
+#: lib/layouts/stdinsets.inc:181 lib/layouts/minimalistic.module:10
 #, fuzzy
 msgid "Idx"
 msgstr "ldx "
 
+#: lib/layouts/stdinsets.inc:203 src/insets/InsetBox.cpp:145
+msgid "Box"
+msgstr "Ramme"
+
+#: lib/layouts/stdinsets.inc:211
+#, fuzzy
+msgid "Box:Shaded"
+msgstr "Skuggelagd"
+
+#: lib/layouts/stdinsets.inc:220
+#, fuzzy
+msgid "figure"
+msgstr "Figur"
+
+#: lib/layouts/stdinsets.inc:229
+#, fuzzy
+msgid "table"
+msgstr "Tabell"
+
+#: lib/layouts/stdinsets.inc:238
+#, fuzzy
+msgid "algorithm"
+msgstr "Algoritme"
+
 #: lib/layouts/stdinsets.inc:267
+msgid "OptArg"
+msgstr ""
+
+#: lib/layouts/stdinsets.inc:268
 msgid "opt"
 msgstr "opt "
 
@@ -7918,56 +8225,56 @@ msgstr "Ekstra_kopiar"
 msgid "Offprints:"
 msgstr "Ekstra_kopiar:"
 
-#: lib/layouts/theorems-ams.inc:63 lib/layouts/theorems.inc:62
+#: lib/layouts/theorems.inc:62 lib/layouts/theorems-ams.inc:63
 #, fuzzy
 msgid "Corollary \\thetheorem."
 msgstr "Korollar \\arabic{theorem}"
 
-#: lib/layouts/theorems-ams.inc:75 lib/layouts/theorems.inc:73
+#: lib/layouts/theorems.inc:73 lib/layouts/theorems-ams.inc:75
 #, fuzzy
 msgid "Lemma \\thetheorem."
 msgstr "Lemma \\arabic{theorem}"
 
-#: lib/layouts/theorems-ams.inc:87 lib/layouts/theorems.inc:84
+#: lib/layouts/theorems.inc:84 lib/layouts/theorems-ams.inc:87
 #, fuzzy
 msgid "Proposition \\thetheorem."
 msgstr "Framlegg \\arabic{theorem}"
 
-#: lib/layouts/theorems-ams.inc:99 lib/layouts/theorems.inc:95
+#: lib/layouts/theorems.inc:95 lib/layouts/theorems-ams.inc:99
 #, fuzzy
 msgid "Conjecture \\thetheorem."
 msgstr "Konjektur \\arabic{theorem}"
 
-#: lib/layouts/theorems-ams.inc:111 lib/layouts/theorems.inc:106
+#: lib/layouts/theorems.inc:106 lib/layouts/theorems-ams.inc:111
 msgid "Fact \\thetheorem."
 msgstr ""
 
-#: lib/layouts/theorems-ams.inc:123 lib/layouts/theorems.inc:117
+#: lib/layouts/theorems.inc:117 lib/layouts/theorems-ams.inc:123
 #, fuzzy
 msgid "Definition \\thetheorem."
 msgstr "Definisjon \\arabic{theorem}"
 
-#: lib/layouts/theorems-ams.inc:141 lib/layouts/theorems.inc:135
+#: lib/layouts/theorems.inc:135 lib/layouts/theorems-ams.inc:141
 #, fuzzy
 msgid "Example \\thetheorem."
 msgstr "Døme \\arabic{theorem}"
 
-#: lib/layouts/theorems-ams.inc:153 lib/layouts/theorems.inc:147
+#: lib/layouts/theorems.inc:147 lib/layouts/theorems-ams.inc:153
 #, fuzzy
 msgid "Problem \\thetheorem."
 msgstr "Problem \\arabic{theorem}"
 
-#: lib/layouts/theorems-ams.inc:165 lib/layouts/theorems.inc:159
+#: lib/layouts/theorems.inc:159 lib/layouts/theorems-ams.inc:165
 #, fuzzy
 msgid "Exercise \\thetheorem."
 msgstr "Øving @Section@.\\arabic{theorem}."
 
-#: lib/layouts/theorems-ams.inc:178 lib/layouts/theorems.inc:172
+#: lib/layouts/theorems.inc:172 lib/layouts/theorems-ams.inc:178
 #, fuzzy
 msgid "Remark \\thetheorem."
 msgstr "Merknad \\arabic{theorem}"
 
-#: lib/layouts/theorems-ams.inc:197 lib/layouts/theorems.inc:191
+#: lib/layouts/theorems.inc:191 lib/layouts/theorems-ams.inc:197
 #, fuzzy
 msgid "Claim \\thetheorem."
 msgstr "Påstand \\arabic{theorem}"
@@ -8078,10 +8385,15 @@ msgstr "notat"
 
 #: lib/layouts/endnotes.module:6
 msgid ""
-"Adds an endnote command, in addition to footnotes. You will need to add "
+"Adds an endnote inset, in addition to footnotes. You will need to add "
 "\\theendnotes in ERT where you want the endnotes to appear."
 msgstr ""
 
+#: lib/layouts/endnotes.module:9
+#, fuzzy
+msgid "Custom:Endnote"
+msgstr "notat"
+
 #: lib/layouts/endnotes.module:18
 #, fuzzy
 msgid "endnote"
@@ -8098,15 +8410,17 @@ msgid ""
 "where you want the endnotes to appear."
 msgstr ""
 
-#: lib/layouts/hanging.module:2 lib/layouts/hanging.module:15
+#: lib/layouts/hanging.module:2 lib/layouts/hanging.module:16
 #, fuzzy
 msgid "Hanging"
 msgstr "margin"
 
-#: lib/layouts/hanging.module:5
-#, fuzzy
-msgid "Adds an environment for hanging paragraphs."
-msgstr "Kan ikkje lage indeks av meir enn eit avsnitt!"
+#: lib/layouts/hanging.module:6
+msgid ""
+"Adds an environment for hanging paragraphs. Hanging paragraph is a paragraph "
+"in which the first line is set to the left margin, but all subsequent lines "
+"are indented."
+msgstr ""
 
 #: lib/layouts/linguistics.module:2
 msgid "Linguistics"
@@ -8146,25 +8460,50 @@ msgstr "D
 msgid "Subexample:"
 msgstr "Døme"
 
+#: lib/layouts/linguistics.module:68
+#, fuzzy
+msgid "Custom:Glosse"
+msgstr "Kunde"
+
 #: lib/layouts/linguistics.module:70
 #, fuzzy
 msgid "Glosse"
 msgstr "Lat att"
 
+#: lib/layouts/linguistics.module:92
+#, fuzzy
+msgid "Custom:Tri-Glosse"
+msgstr "Kunde"
+
 #: lib/layouts/linguistics.module:94
 msgid "Tri-Glosse"
 msgstr ""
 
+#: lib/layouts/linguistics.module:114
+#, fuzzy
+msgid "CharStyle:Expression"
+msgstr "Endring: "
+
 #: lib/layouts/linguistics.module:116
 #, fuzzy
 msgid "expr."
 msgstr "exp"
 
+#: lib/layouts/linguistics.module:128
+#, fuzzy
+msgid "CharStyle:Concepts"
+msgstr "Endring: "
+
 #: lib/layouts/linguistics.module:130
 #, fuzzy
 msgid "concept"
 msgstr "&Godta"
 
+#: lib/layouts/linguistics.module:142
+#, fuzzy
+msgid "CharStyle:Meaning"
+msgstr "Endring: "
+
 #: lib/layouts/linguistics.module:144
 #, fuzzy
 msgid "meaning"
@@ -8181,21 +8520,41 @@ msgid ""
 "code."
 msgstr ""
 
+#: lib/layouts/logicalmkup.module:10
+#, fuzzy
+msgid "CharStyle:Noun"
+msgstr "Endring: "
+
 #: lib/layouts/logicalmkup.module:12
 #, fuzzy
 msgid "noun"
 msgstr "ingen"
 
+#: lib/layouts/logicalmkup.module:22
+#, fuzzy
+msgid "CharStyle:Emph"
+msgstr "Endring: "
+
 #: lib/layouts/logicalmkup.module:24
 #, fuzzy
 msgid "emph"
 msgstr "Utheva "
 
+#: lib/layouts/logicalmkup.module:33
+#, fuzzy
+msgid "CharStyle:Strong"
+msgstr "Endring: "
+
 #: lib/layouts/logicalmkup.module:35
 #, fuzzy
 msgid "strong"
 msgstr "Kodeliste"
 
+#: lib/layouts/logicalmkup.module:47
+#, fuzzy
+msgid "CharStyle:Code"
+msgstr "Endring: "
+
 #: lib/layouts/logicalmkup.module:49
 #, fuzzy
 msgid "code"
@@ -8207,7 +8566,7 @@ msgid "Minimalistic"
 msgstr "Mini_bolk "
 
 #: lib/layouts/minimalistic.module:5
-msgid "Redefines several insets as being Minimalistic, for use by old-timers."
+msgid "Redefines several insets (Index, Branch, URL) as being Minimalistic."
 msgstr ""
 
 #: lib/layouts/theorems-ams-extended.module:2
@@ -8562,149 +8921,365 @@ msgstr "Tysk"
 msgid "Greek"
 msgstr "Gresk"
 
-#: lib/languages:45 src/frontends/qt4/GuiSymbols.cpp:62
+#: lib/languages:45
+msgid "Greek (polytonic)"
+msgstr ""
+
+#: lib/languages:46 src/frontends/qt4/GuiSymbols.cpp:62
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: lib/languages:49
+#: lib/languages:50
 msgid "Icelandic"
 msgstr "Islandsk"
 
-#: lib/languages:51
+#: lib/languages:52
 #, fuzzy
 msgid "Interlingua"
 msgstr "Set inn integral"
 
-#: lib/languages:52
+#: lib/languages:53
 msgid "Irish"
 msgstr "Irsk"
 
-#: lib/languages:53
+#: lib/languages:54
 msgid "Italian"
 msgstr "Italiensk"
 
-#: lib/languages:54
+#: lib/languages:55
 msgid "Japanese"
 msgstr "Japansk"
 
-#: lib/languages:55
+#: lib/languages:56
+#, fuzzy
+msgid "Japanese (CJK)"
+msgstr "Japansk"
+
+#: lib/languages:57
 msgid "Kazakh"
 msgstr "Kasakhstansk"
 
-#: lib/languages:57
+#: lib/languages:59
 msgid "Korean"
 msgstr "Koreansk"
 
-#: lib/languages:59
+#: lib/languages:61
 #, fuzzy
 msgid "Latin"
 msgstr "LatinON"
 
-#: lib/languages:60
+#: lib/languages:62
 msgid "Latvian"
 msgstr "Latvisk"
 
-#: lib/languages:61
+#: lib/languages:63
 msgid "Lithuanian"
 msgstr "Litauisk"
 
-#: lib/languages:62
+#: lib/languages:64
 #, fuzzy
 msgid "Lower Sorbian"
 msgstr "Øvre Sorbisk"
 
-#: lib/languages:63
+#: lib/languages:65
 #, fuzzy
 msgid "Hungarian"
 msgstr "Bulgarsk"
 
-#: lib/languages:64
+#: lib/languages:66
 msgid "Norsk"
 msgstr "Bokmål"
 
-#: lib/languages:65
+#: lib/languages:67
 msgid "Nynorsk"
 msgstr "Nynorsk"
 
-#: lib/languages:66
+#: lib/languages:68
 msgid "Polish"
 msgstr "Polsk"
 
-#: lib/languages:67
+#: lib/languages:69
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: lib/languages:68
+#: lib/languages:70
 msgid "Romanian"
 msgstr "Rumensk"
 
-#: lib/languages:69
+#: lib/languages:71
 msgid "Russian"
 msgstr "Russisk"
 
-#: lib/languages:70
+#: lib/languages:72
 msgid "North Sami"
 msgstr ""
 
-#: lib/languages:71
+#: lib/languages:73
 msgid "Scottish"
 msgstr "Skotsk"
 
-#: lib/languages:72
+#: lib/languages:74
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: lib/languages:73
+#: lib/languages:75
 #, fuzzy
 msgid "Serbian (Latin)"
 msgstr "Serbisk"
 
-#: lib/languages:74
+#: lib/languages:76
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: lib/languages:75
+#: lib/languages:77
 msgid "Slovene"
 msgstr "Slovensk"
 
-#: lib/languages:76
+#: lib/languages:78
 msgid "Spanish"
 msgstr "Spansk"
 
-#: lib/languages:77
+#: lib/languages:79
 #, fuzzy
 msgid "Spanish (Mexico)"
 msgstr "Spansk"
 
-#: lib/languages:78
+#: lib/languages:80
 msgid "Swedish"
 msgstr "Svensk"
 
-#: lib/languages:79 src/frontends/qt4/GuiSymbols.cpp:73
+#: lib/languages:81 src/frontends/qt4/GuiSymbols.cpp:73
 msgid "Thai"
 msgstr "Thailandsk"
 
-#: lib/languages:80
+#: lib/languages:82
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: lib/languages:81
+#: lib/languages:83
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: lib/languages:82
+#: lib/languages:84
 msgid "Upper Sorbian"
 msgstr "Øvre Sorbisk"
 
-#: lib/languages:83
+#: lib/languages:85
 #, fuzzy
 msgid "Vietnamese"
 msgstr "Filnamn"
 
-#: lib/languages:84
+#: lib/languages:86
 msgid "Welsh"
 msgstr "Walisisk"
 
+#: lib/encodings:14
+msgid "Unicode (utf8)"
+msgstr ""
+
+#: lib/encodings:19
+msgid "Unicode (ucs-extended) (utf8x)"
+msgstr ""
+
+#: lib/encodings:23
+msgid "Armenian (ArmSCII8)"
+msgstr ""
+
+#: lib/encodings:26
+msgid "Western European (ISO 8859-1)"
+msgstr ""
+
+#: lib/encodings:29
+msgid "Central European (ISO 8859-2)"
+msgstr ""
+
+#: lib/encodings:32
+#, fuzzy
+msgid "South European (ISO 8859-3)"
+msgstr "Arabisk"
+
+#: lib/encodings:35
+#, fuzzy
+msgid "Baltic (ISO 8859-4)"
+msgstr "Arabisk"
+
+#: lib/encodings:38
+msgid "Cyrillic (ISO 8859-5)"
+msgstr ""
+
+#: lib/encodings:42
+#, fuzzy
+msgid "Arabic (ISO 8859-6)"
+msgstr "Arabisk"
+
+#: lib/encodings:45
+msgid "Greek (ISO 8859-7)"
+msgstr ""
+
+#: lib/encodings:48
+msgid "Hebrew (ISO 8859-8)"
+msgstr ""
+
+#: lib/encodings:51
+msgid "Turkish (ISO 8859-9)"
+msgstr ""
+
+#: lib/encodings:55
+#, fuzzy
+msgid "Baltic (ISO 8859-13)"
+msgstr "Arabisk"
+
+#: lib/encodings:58
+msgid "Western European (ISO 8859-15)"
+msgstr ""
+
+#: lib/encodings:61
+msgid "South-Eastern European (ISO 8859-16)"
+msgstr ""
+
+#: lib/encodings:64
+msgid "DOS (CP 437)"
+msgstr ""
+
+#: lib/encodings:68
+msgid "DOS-de (CP 437-de)"
+msgstr ""
+
+#: lib/encodings:71
+msgid "Western European (CP 850)"
+msgstr ""
+
+#: lib/encodings:74
+msgid "Central European (CP 852)"
+msgstr ""
+
+#: lib/encodings:77
+#, fuzzy
+msgid "Cyrillic (CP 855)"
+msgstr "Arabisk"
+
+#: lib/encodings:80
+msgid "Western European (CP 858)"
+msgstr ""
+
+#: lib/encodings:83
+msgid "Hebrew (CP 862)"
+msgstr ""
+
+#: lib/encodings:86
+#, fuzzy
+msgid "Nordic languages (CP 865)"
+msgstr "Ikkje oppgitt språk"
+
+#: lib/encodings:89
+#, fuzzy
+msgid "Cyrillic (CP 866)"
+msgstr "Arabisk"
+
+#: lib/encodings:92
+msgid "Central European (CP 1250)"
+msgstr ""
+
+#: lib/encodings:95
+#, fuzzy
+msgid "Cyrillic (CP 1251)"
+msgstr "Arabisk"
+
+#: lib/encodings:98
+msgid "Western European (CP 1252)"
+msgstr ""
+
+#: lib/encodings:101
+#, fuzzy
+msgid "Hebrew (CP 1255)"
+msgstr "Arabisk"
+
+#: lib/encodings:105
+#, fuzzy
+msgid "Arabic (CP 1256)"
+msgstr "Arabisk"
+
+#: lib/encodings:108
+#, fuzzy
+msgid "Baltic (CP 1257)"
+msgstr "Arabisk"
+
+#: lib/encodings:111
+msgid "Cyrillic (KOI8-R)"
+msgstr ""
+
+#: lib/encodings:114
+msgid "Cyrillic (KOI8-U)"
+msgstr ""
+
+#: lib/encodings:117
+msgid "Cyrillic (pt 154)"
+msgstr ""
+
+#: lib/encodings:120
+msgid "Cyrillic (pt 254)"
+msgstr ""
+
+#: lib/encodings:145
+#, fuzzy
+msgid "Chinese (simplified) (EUC-CN)"
+msgstr "Kinesisk (forenkla)"
+
+#: lib/encodings:149
+#, fuzzy
+msgid "Chinese (simplified) (GBK)"
+msgstr "Kinesisk (forenkla)"
+
+#: lib/encodings:153
+#, fuzzy
+msgid "Japanese (CJK) (JIS)"
+msgstr "Japansk"
+
+#: lib/encodings:157
+msgid "Korean (EUC-KR)"
+msgstr ""
+
+#: lib/encodings:161
+msgid "Unicode (CJK) (utf8)"
+msgstr ""
+
+#: lib/encodings:165
+#, fuzzy
+msgid "Chinese (traditional) (EUC-TW)"
+msgstr "Kinesisk (tradisjonelt)/"
+
+#: lib/encodings:169
+#, fuzzy
+msgid "Japanese (CJK) (EUC-JP)"
+msgstr "Japansk"
+
+#: lib/encodings:176
+#, fuzzy
+msgid "Japanese (non-CJK) (EUC-JP)"
+msgstr "Japansk"
+
+#: lib/encodings:178
+#, fuzzy
+msgid "Japanese (non-CJK) (JIS)"
+msgstr "Japansk"
+
+#: lib/encodings:180
+#, fuzzy
+msgid "Japanese (non-CJK) (SJIS)"
+msgstr "Japansk"
+
+#: lib/encodings:187
+msgid "Thai (TIS 620-0)"
+msgstr ""
+
+#: lib/encodings:192
+msgid "Unicode (XeTeX) (utf8)"
+msgstr ""
+
+#: lib/encodings:196
+msgid "ASCII"
+msgstr ""
+
 #: lib/ui/classic.ui:32 lib/ui/stdmenus.inc:20
 msgid "File|F"
 msgstr "Fil|F"
@@ -8802,7 +9377,8 @@ msgid "Check Out for Edit|O"
 msgstr "Hent ut til editering|t"
 
 #: lib/ui/classic.ui:71 lib/ui/stdmenus.inc:66
-msgid "Revert to Last Version|L"
+#, fuzzy
+msgid "Revert to Repository Version|R"
 msgstr "Gå tilbake til siste versjon|s"
 
 #: lib/ui/classic.ui:72 lib/ui/stdmenus.inc:67
@@ -8810,7 +9386,8 @@ msgid "Undo Last Check In|U"
 msgstr "Angra siste registrering|A"
 
 #: lib/ui/classic.ui:73 lib/ui/stdmenus.inc:68
-msgid "Show History|H"
+#, fuzzy
+msgid "Show History...|H"
 msgstr "Vis Historie|H"
 
 #: lib/ui/classic.ui:82 lib/ui/stdmenus.inc:77
@@ -8890,7 +9467,7 @@ msgstr "Utval som linjer|l"
 msgid "Selection as Paragraphs|P"
 msgstr "Utval som som avsnitt|a"
 
-#: lib/ui/classic.ui:120 lib/ui/stdcontext.inc:322 lib/ui/stdmenus.inc:161
+#: lib/ui/classic.ui:120 lib/ui/stdcontext.inc:326 lib/ui/stdmenus.inc:161
 msgid "Multicolumn|M"
 msgstr "Multikolonne|M"
 
@@ -8914,7 +9491,7 @@ msgstr "H
 msgid "Alignment|i"
 msgstr "Justering|J"
 
-#: lib/ui/classic.ui:129 lib/ui/stdcontext.inc:337 lib/ui/stdmenus.inc:179
+#: lib/ui/classic.ui:129 lib/ui/stdcontext.inc:341 lib/ui/stdmenus.inc:179
 msgid "Add Row|A"
 msgstr "Legg til rad|L"
 
@@ -8930,7 +9507,7 @@ msgstr "Kopier rad|K"
 msgid "Swap Rows"
 msgstr "Byt om på rader|d"
 
-#: lib/ui/classic.ui:134 lib/ui/stdcontext.inc:342 lib/ui/stdmenus.inc:184
+#: lib/ui/classic.ui:134 lib/ui/stdcontext.inc:346 lib/ui/stdmenus.inc:184
 msgid "Add Column|u"
 msgstr "Legg til kolonne|k"
 
@@ -8946,27 +9523,27 @@ msgstr "Kopier kolonne|p"
 msgid "Swap Columns"
 msgstr "Byt kolonner"
 
-#: lib/ui/classic.ui:141 lib/ui/stdcontext.inc:329 lib/ui/stdmenus.inc:171
+#: lib/ui/classic.ui:141 lib/ui/stdcontext.inc:333 lib/ui/stdmenus.inc:171
 msgid "Left|L"
 msgstr "Venstre|V"
 
-#: lib/ui/classic.ui:142 lib/ui/stdcontext.inc:330 lib/ui/stdmenus.inc:172
+#: lib/ui/classic.ui:142 lib/ui/stdcontext.inc:334 lib/ui/stdmenus.inc:172
 msgid "Center|C"
 msgstr "Sentrum|S"
 
-#: lib/ui/classic.ui:143 lib/ui/stdcontext.inc:331 lib/ui/stdmenus.inc:173
+#: lib/ui/classic.ui:143 lib/ui/stdcontext.inc:335 lib/ui/stdmenus.inc:173
 msgid "Right|R"
 msgstr "Høgre|H"
 
-#: lib/ui/classic.ui:145 lib/ui/stdcontext.inc:333 lib/ui/stdmenus.inc:175
+#: lib/ui/classic.ui:145 lib/ui/stdcontext.inc:337 lib/ui/stdmenus.inc:175
 msgid "Top|T"
 msgstr "Topp|T"
 
-#: lib/ui/classic.ui:146 lib/ui/stdcontext.inc:334 lib/ui/stdmenus.inc:176
+#: lib/ui/classic.ui:146 lib/ui/stdcontext.inc:338 lib/ui/stdmenus.inc:176
 msgid "Middle|M"
 msgstr "Midten|M"
 
-#: lib/ui/classic.ui:147 lib/ui/stdcontext.inc:335 lib/ui/stdmenus.inc:177
+#: lib/ui/classic.ui:147 lib/ui/stdcontext.inc:339 lib/ui/stdmenus.inc:177
 msgid "Bottom|B"
 msgstr "Nedst|N"
 
@@ -8998,7 +9575,7 @@ msgstr "Justering|J"
 msgid "Add Row|R"
 msgstr "Legg til rad|L"
 
-#: lib/ui/classic.ui:171 lib/ui/stdcontext.inc:338 lib/ui/stdmenus.inc:180
+#: lib/ui/classic.ui:171 lib/ui/stdcontext.inc:342 lib/ui/stdmenus.inc:180
 msgid "Delete Row|D"
 msgstr "Fjern rad|F"
 
@@ -9006,7 +9583,7 @@ msgstr "Fjern rad|F"
 msgid "Add Column|C"
 msgstr "Legg til kolonne|k"
 
-#: lib/ui/classic.ui:176 lib/ui/stdcontext.inc:343 lib/ui/stdmenus.inc:185
+#: lib/ui/classic.ui:176 lib/ui/stdcontext.inc:347 lib/ui/stdmenus.inc:185
 msgid "Delete Column|e"
 msgstr "Fjern kolonne|j"
 
@@ -9573,7 +10150,7 @@ msgstr "LaTeX innstillingar|L"
 msgid "About LyX|X"
 msgstr "Om LyX|X"
 
-#: lib/ui/classic.ui:428 src/frontends/qt4/GuiAbout.cpp:98
+#: lib/ui/classic.ui:428 src/frontends/qt4/GuiAbout.cpp:99
 msgid "About LyX"
 msgstr "Om LyX"
 
@@ -9720,9 +10297,9 @@ msgstr "Formatert referanse"
 #: lib/ui/stdcontext.inc:111 lib/ui/stdcontext.inc:125
 #: lib/ui/stdcontext.inc:132 lib/ui/stdcontext.inc:150
 #: lib/ui/stdcontext.inc:188 lib/ui/stdcontext.inc:215
-#: lib/ui/stdcontext.inc:292 lib/ui/stdcontext.inc:300
-#: lib/ui/stdcontext.inc:312 lib/ui/stdcontext.inc:347
-#: lib/ui/stdcontext.inc:356 lib/ui/stdmenus.inc:458
+#: lib/ui/stdcontext.inc:296 lib/ui/stdcontext.inc:304
+#: lib/ui/stdcontext.inc:316 lib/ui/stdcontext.inc:351
+#: lib/ui/stdcontext.inc:360 lib/ui/stdmenus.inc:458
 msgid "Settings...|S"
 msgstr "Dokumentval...|D"
 
@@ -9735,18 +10312,19 @@ msgstr ""
 msgid "Edit Database(s) externally...|x"
 msgstr "Rediger fila eksternt"
 
-#: lib/ui/stdcontext.inc:121
+#: lib/ui/stdcontext.inc:121 lib/ui/stdcontext.inc:292
 #, fuzzy
 msgid "Open Inset|O"
 msgstr "Opna alle innskot|i"
 
-#: lib/ui/stdcontext.inc:122
+#: lib/ui/stdcontext.inc:122 lib/ui/stdcontext.inc:293
 #, fuzzy
 msgid "Close Inset|C"
 msgstr "Lat att alle innskot|L"
 
 #: lib/ui/stdcontext.inc:124 lib/ui/stdcontext.inc:130
 #: lib/ui/stdcontext.inc:149 lib/ui/stdcontext.inc:162
+#: lib/ui/stdcontext.inc:295
 #, fuzzy
 msgid "Dissolve Inset|D"
 msgstr "Løys opp innskot|p"
@@ -9976,20 +10554,20 @@ msgid "Justified Line Break|J"
 msgstr "Ny linje|L"
 
 #: lib/ui/stdcontext.inc:242 lib/ui/stdcontext.inc:287 lib/ui/stdmenus.inc:88
-#: lib/ui/stdtoolbars.inc:66 src/Text3.cpp:968
-#: src/mathed/InsetMathNest.cpp:551
+#: lib/ui/stdtoolbars.inc:66 src/Text3.cpp:973
+#: src/mathed/InsetMathNest.cpp:540
 msgid "Cut"
 msgstr "Klipp"
 
 #: lib/ui/stdcontext.inc:243 lib/ui/stdcontext.inc:288 lib/ui/stdmenus.inc:89
-#: lib/ui/stdtoolbars.inc:67 src/Text3.cpp:973
-#: src/mathed/InsetMathNest.cpp:559
+#: lib/ui/stdtoolbars.inc:67 src/Text3.cpp:978
+#: src/mathed/InsetMathNest.cpp:548
 msgid "Copy"
 msgstr "Kopier"
 
 #: lib/ui/stdcontext.inc:244 lib/ui/stdcontext.inc:289 lib/ui/stdmenus.inc:90
-#: lib/ui/stdtoolbars.inc:68 src/Text3.cpp:928
-#: src/mathed/InsetMathGrid.cpp:1246 src/mathed/InsetMathNest.cpp:531
+#: lib/ui/stdtoolbars.inc:68 src/Text3.cpp:933
+#: src/mathed/InsetMathGrid.cpp:1239 src/mathed/InsetMathNest.cpp:520
 msgid "Paste"
 msgstr "Lim inn"
 
@@ -10096,32 +10674,32 @@ msgstr ""
 msgid "Remove Last Parameter Spitting Out To The Right"
 msgstr ""
 
-#: lib/ui/stdcontext.inc:302 lib/ui/stdcontext.inc:314
+#: lib/ui/stdcontext.inc:306 lib/ui/stdcontext.inc:318
 #, fuzzy
 msgid "Edit externally...|x"
 msgstr "Rediger fila eksternt"
 
-#: lib/ui/stdcontext.inc:324 lib/ui/stdmenus.inc:163
+#: lib/ui/stdcontext.inc:328 lib/ui/stdmenus.inc:163
 msgid "Top Line|T"
 msgstr "Topplinje|T"
 
-#: lib/ui/stdcontext.inc:325 lib/ui/stdmenus.inc:164
+#: lib/ui/stdcontext.inc:329 lib/ui/stdmenus.inc:164
 msgid "Bottom Line|B"
 msgstr "Botnlinje|B"
 
-#: lib/ui/stdcontext.inc:326 lib/ui/stdmenus.inc:165
+#: lib/ui/stdcontext.inc:330 lib/ui/stdmenus.inc:165
 msgid "Left Line|L"
 msgstr "Venstrelinje|V"
 
-#: lib/ui/stdcontext.inc:327 lib/ui/stdmenus.inc:166
+#: lib/ui/stdcontext.inc:331 lib/ui/stdmenus.inc:166
 msgid "Right Line|R"
 msgstr "Høgrelinje|H"
 
-#: lib/ui/stdcontext.inc:339 lib/ui/stdmenus.inc:181
+#: lib/ui/stdcontext.inc:343 lib/ui/stdmenus.inc:181
 msgid "Copy Row|o"
 msgstr "Kopier rad|o"
 
-#: lib/ui/stdcontext.inc:344 lib/ui/stdmenus.inc:186
+#: lib/ui/stdcontext.inc:348 lib/ui/stdmenus.inc:186
 msgid "Copy Column|p"
 msgstr "Kopier kolonne|p"
 
@@ -10373,11 +10951,11 @@ msgid "View Source|S"
 msgstr "Vis kjeldekode|V"
 
 #: lib/ui/stdmenus.inc:297
-msgid "Split View Horizontally|i"
+msgid "Split View Into Left And Right Half|i"
 msgstr ""
 
 #: lib/ui/stdmenus.inc:298
-msgid "Split View Vertically|V"
+msgid "Split View Into Upper And Lower Half|V"
 msgstr ""
 
 #: lib/ui/stdmenus.inc:299
@@ -10595,11 +11173,11 @@ msgstr "Skriv ut dokument"
 msgid "Check spelling"
 msgstr "Sjekk rettskriving"
 
-#: lib/ui/stdtoolbars.inc:64 src/BufferView.cpp:1010
+#: lib/ui/stdtoolbars.inc:64 src/BufferView.cpp:1021
 msgid "Undo"
 msgstr "Angre"
 
-#: lib/ui/stdtoolbars.inc:65 src/BufferView.cpp:1019
+#: lib/ui/stdtoolbars.inc:65 src/BufferView.cpp:1030
 msgid "Redo"
 msgstr "Gjer om"
 
@@ -10901,12 +11479,14 @@ msgid "Next change"
 msgstr "Neste endring"
 
 #: lib/ui/stdtoolbars.inc:193
-msgid "Accept change"
+#, fuzzy
+msgid "Accept change inside selection"
 msgstr "Godta endring"
 
 #: lib/ui/stdtoolbars.inc:194
-msgid "Reject change"
-msgstr "Avvis endring"
+#, fuzzy
+msgid "Reject change inside selection"
+msgstr "Erstatta setelen med utvalet"
 
 #: lib/ui/stdtoolbars.inc:196
 msgid "Merge changes"
@@ -10969,7 +11549,7 @@ msgid "Fractions"
 msgstr "Brøkar"
 
 #: lib/ui/stdtoolbars.inc:217 lib/ui/stdtoolbars.inc:309
-#: src/frontends/qt4/GuiDocument.cpp:976
+#: src/frontends/qt4/GuiDocument.cpp:980
 msgid "Fonts"
 msgstr "Skrifttypar"
 
@@ -13355,7 +13935,7 @@ msgstr ""
 msgid "LaTeX (pdflatex)"
 msgstr "Oppdater pdf (pdflatex)"
 
-#: lib/configure.py:275 src/frontends/qt4/GuiPrefs.cpp:329
+#: lib/configure.py:275 src/frontends/qt4/GuiPrefs.cpp:330
 msgid "Plain text"
 msgstr "Rein tekst"
 
@@ -13470,8 +14050,8 @@ msgstr "Neste kommando"
 msgid "Table (CSV)"
 msgstr "Tabell"
 
-#: lib/configure.py:319 src/frontends/qt4/GuiView.cpp:740
-#: src/frontends/qt4/GuiView.cpp:741 src/mathed/MathMacroTemplate.cpp:536
+#: lib/configure.py:319 src/frontends/qt4/GuiView.cpp:764
+#: src/frontends/qt4/GuiView.cpp:765 src/mathed/MathMacroTemplate.cpp:536
 msgid "LyX"
 msgstr "LyX"
 
@@ -13549,7 +14129,7 @@ msgstr "Tel ord|o"
 msgid "HTML (MS Word)"
 msgstr ""
 
-#: src/BiblioInfo.cpp:118 src/frontends/qt4/GuiDocument.cpp:1340
+#: src/BiblioInfo.cpp:118 src/frontends/qt4/GuiDocument.cpp:1346
 #, c-format
 msgid "%1$s and %2$s"
 msgstr "%1$s og %2$s"
@@ -13582,47 +14162,47 @@ msgid ""
 "LyX could not create the temporary directory '%1$s' (Disk is full maybe?)"
 msgstr "Klarte ikkje å fjerna den mellombelse katalogen %1$s"
 
-#: src/Buffer.cpp:283
+#: src/Buffer.cpp:290
 msgid "Could not remove temporary directory"
 msgstr "Klarte ikkje å fjerna den mellombelse katalogen"
 
-#: src/Buffer.cpp:284
+#: src/Buffer.cpp:291
 #, c-format
 msgid "Could not remove the temporary directory %1$s"
 msgstr "Klarte ikkje å fjerna den mellombelse katalogen %1$s"
 
-#: src/Buffer.cpp:498
+#: src/Buffer.cpp:506
 msgid "Unknown document class"
 msgstr "Ukjent dokumentklasse"
 
-#: src/Buffer.cpp:499
+#: src/Buffer.cpp:507
 #, c-format
 msgid "Using the default document class, because the class %1$s is unknown."
 msgstr "Brukar standard dokumentklasse sidan dokumentklassa %1$s er ukjent."
 
-#: src/Buffer.cpp:503 src/Text.cpp:246
+#: src/Buffer.cpp:511 src/Text.cpp:241
 #, c-format
 msgid "Unknown token: %1$s %2$s\n"
 msgstr "Ukjent symbol %1$s %2$s\n"
 
-#: src/Buffer.cpp:507 src/Buffer.cpp:514 src/Buffer.cpp:534
+#: src/Buffer.cpp:515 src/Buffer.cpp:522 src/Buffer.cpp:542
 msgid "Document header error"
 msgstr "Filhovud-feil"
 
-#: src/Buffer.cpp:513
+#: src/Buffer.cpp:521
 msgid "\\begin_header is missing"
 msgstr "\\begin_header manglar"
 
-#: src/Buffer.cpp:533
+#: src/Buffer.cpp:541
 msgid "\\begin_document is missing"
 msgstr "\\begin_document manglar"
 
-#: src/Buffer.cpp:549 src/Buffer.cpp:555 src/BufferView.cpp:1126
-#: src/BufferView.cpp:1132
+#: src/Buffer.cpp:557 src/Buffer.cpp:563 src/BufferView.cpp:1140
+#: src/BufferView.cpp:1146
 msgid "Changes not shown in LaTeX output"
 msgstr "Endring blir ikkje vist i LaTeX eksporten"
 
-#: src/Buffer.cpp:550 src/BufferView.cpp:1127
+#: src/Buffer.cpp:558 src/BufferView.cpp:1141
 msgid ""
 "Changes will not be highlighted in LaTeX output, because neither dvipost nor "
 "xcolor/soul are installed.\n"
@@ -13634,7 +14214,7 @@ msgstr ""
 "Ver venleg å instaler desse pakkane eller redefiner \\lyxadded og "
 "\\lyxdeleted i LaTeX fortekst."
 
-#: src/Buffer.cpp:556 src/BufferView.cpp:1133
+#: src/Buffer.cpp:564 src/BufferView.cpp:1147
 msgid ""
 "Changes will not be highlighted in LaTeX output when using pdflatex, because "
 "xcolor and soul are not installed.\n"
@@ -13646,20 +14226,20 @@ msgstr ""
 "Ver venleg å instaler desse pakkane eller redefiner \\lyxadded og "
 "\\lyxdeleted i LaTeX fortekst."
 
-#: src/Buffer.cpp:697 src/Buffer.cpp:780
+#: src/Buffer.cpp:705 src/Buffer.cpp:788
 msgid "Document format failure"
 msgstr "Dokumentstil feil"
 
-#: src/Buffer.cpp:698
+#: src/Buffer.cpp:706
 #, fuzzy, c-format
 msgid "%1$s is not a readable LyX document."
 msgstr "%1$s er ikkje eit LyX dokumentet."
 
-#: src/Buffer.cpp:735
+#: src/Buffer.cpp:743
 msgid "Conversion failed"
 msgstr "Feil oppstod i konverteringa"
 
-#: src/Buffer.cpp:736
+#: src/Buffer.cpp:744
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but a temporary file for converting "
@@ -13668,11 +14248,11 @@ msgstr ""
 "%1$s vart laga i ein annan LyX versjon, Desverre kunne vi ikkje lage ein "
 "mellombels kopi for å konvertere dokumentet."
 
-#: src/Buffer.cpp:745
+#: src/Buffer.cpp:753
 msgid "Conversion script not found"
 msgstr "Fann ikkje eksport programmet"
 
-#: src/Buffer.cpp:746
+#: src/Buffer.cpp:754
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but the conversion script lyx2lyx "
@@ -13681,11 +14261,11 @@ msgstr ""
 "%1$s vart laga i ein anna LyX versjon. men programmet for å fornye "
 "dokumentet \"lyx2lyx\" vart ikkje funne."
 
-#: src/Buffer.cpp:765
+#: src/Buffer.cpp:773
 msgid "Conversion script failed"
 msgstr "Feil ved køyring av eksport programmet"
 
-#: src/Buffer.cpp:766
+#: src/Buffer.cpp:774
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but the lyx2lyx script failed to "
@@ -13694,16 +14274,16 @@ msgstr ""
 "%1$s vart laga i ein annan LyX versjon. men lyx2lyx-programmet klarte ikkje "
 "å konvertere det."
 
-#: src/Buffer.cpp:781
+#: src/Buffer.cpp:789
 #, c-format
 msgid "%1$s ended unexpectedly, which means that it is probably corrupted."
 msgstr "%1$s slutta før tida, noko som truleg tyder at det er øydelagd."
 
-#: src/Buffer.cpp:814
+#: src/Buffer.cpp:822
 msgid "Backup failure"
 msgstr "Kan ikkje laga reservekopi"
 
-#: src/Buffer.cpp:815
+#: src/Buffer.cpp:823
 #, c-format
 msgid ""
 "Cannot create backup file %1$s.\n"
@@ -13712,7 +14292,7 @@ msgstr ""
 "LyX klarte ikkje å lage reservekopi %1$s.\n"
 "Er du sikker at stigen eksiterar og du kan skrive til den?"
 
-#: src/Buffer.cpp:825
+#: src/Buffer.cpp:833
 #, fuzzy, c-format
 msgid ""
 "Document %1$s has been externally modified. Are you sure you want to "
@@ -13722,49 +14302,49 @@ msgstr ""
 "\n"
 "Vil du skriva over dokumentet?"
 
-#: src/Buffer.cpp:827
+#: src/Buffer.cpp:835
 #, fuzzy
 msgid "Overwrite modified file?"
 msgstr "Skriv over dokumentet?"
 
-#: src/Buffer.cpp:828 src/Exporter.cpp:49 src/LyXFunc.cpp:980
-#: src/frontends/qt4/GuiClipboard.cpp:208 src/frontends/qt4/GuiView.cpp:1431
-#: src/frontends/qt4/GuiView.cpp:1609
+#: src/Buffer.cpp:836 src/Exporter.cpp:49 src/LyXFunc.cpp:980
+#: src/frontends/qt4/GuiClipboard.cpp:208 src/frontends/qt4/GuiView.cpp:1464
+#: src/frontends/qt4/GuiView.cpp:1642
 #, fuzzy
 msgid "&Overwrite"
 msgstr "Skriv&over"
 
-#: src/Buffer.cpp:852
+#: src/Buffer.cpp:860
 #, c-format
 msgid "Saving document %1$s..."
 msgstr "Lagrar %1$s..."
 
-#: src/Buffer.cpp:865
+#: src/Buffer.cpp:873
 #, fuzzy
 msgid " could not write file!"
 msgstr "Kan ikkje lese fila"
 
-#: src/Buffer.cpp:872
+#: src/Buffer.cpp:880
 msgid " done."
 msgstr "ferdig."
 
-#: src/Buffer.cpp:951
+#: src/Buffer.cpp:959
 msgid "Iconv software exception Detected"
 msgstr ""
 
-#: src/Buffer.cpp:951
+#: src/Buffer.cpp:959
 #, c-format
 msgid ""
 "Please verify that the support software for your encoding (%1$s) is properly "
 "installed"
 msgstr ""
 
-#: src/Buffer.cpp:973
+#: src/Buffer.cpp:981
 #, c-format
 msgid "Could not find LaTeX command for character '%1$s' (code point %2$s)"
 msgstr ""
 
-#: src/Buffer.cpp:976
+#: src/Buffer.cpp:984
 msgid ""
 "Some characters of your document are probably not representable in the "
 "chosen encoding.\n"
@@ -13773,87 +14353,87 @@ msgstr ""
 "Nokre av teikna i dokumentet er ikkje i teiknkodinga. \n"
 "Prøv å endre teiknkodinga til utf8."
 
-#: src/Buffer.cpp:983
+#: src/Buffer.cpp:991
 #, fuzzy
 msgid "iconv conversion failed"
 msgstr "Feil oppstod i konverteringa"
 
-#: src/Buffer.cpp:988
+#: src/Buffer.cpp:996
 #, fuzzy
 msgid "conversion failed"
 msgstr "Feil oppstod i konverteringa"
 
-#: src/Buffer.cpp:1260
+#: src/Buffer.cpp:1268
 msgid "Running chktex..."
 msgstr "Køyrer ChkTeX ..."
 
-#: src/Buffer.cpp:1273
+#: src/Buffer.cpp:1281
 msgid "chktex failure"
 msgstr "ChkTeX feil"
 
-#: src/Buffer.cpp:1274
+#: src/Buffer.cpp:1282
 msgid "Could not run chktex successfully."
 msgstr "Kunne ikkje køyre ChkTeX."
 
-#: src/Buffer.cpp:2098
+#: src/Buffer.cpp:2112
 msgid "Preview source code"
 msgstr "Førehandsvising av kjeldekode"
 
-#: src/Buffer.cpp:2110
+#: src/Buffer.cpp:2124
 #, fuzzy, c-format
 msgid "Preview source code for paragraph %1$d"
 msgstr "Førehandsvising av kjeldekode av avsnittet %1$s"
 
-#: src/Buffer.cpp:2114
+#: src/Buffer.cpp:2128
 #, c-format
 msgid "Preview source code from paragraph %1$s to %2$s"
 msgstr "Førehandsvising av kjeldekode av avsnittet %1$s til %2$s"
 
-#: src/Buffer.cpp:2213
+#: src/Buffer.cpp:2227
 #, c-format
 msgid "Auto-saving %1$s"
 msgstr "Automatisk lagring %1$s"
 
-#: src/Buffer.cpp:2257
+#: src/Buffer.cpp:2271
 msgid "Autosave failed!"
 msgstr "Automatisk lagring feila!"
 
-#: src/Buffer.cpp:2280
+#: src/Buffer.cpp:2294
 msgid "Autosaving current document..."
 msgstr "Automatisk lagring av dette dokumentet..."
 
-#: src/Buffer.cpp:2328
+#: src/Buffer.cpp:2342
 msgid "Couldn't export file"
 msgstr "Kan ikkje eksportere dokumentet"
 
-#: src/Buffer.cpp:2329
+#: src/Buffer.cpp:2343
 #, c-format
 msgid "No information for exporting the format %1$s."
 msgstr "Veit ikkje korleis ein importerer %1$s."
 
-#: src/Buffer.cpp:2366
+#: src/Buffer.cpp:2380
 msgid "File name error"
 msgstr "Feil på filnamn"
 
-#: src/Buffer.cpp:2367
+#: src/Buffer.cpp:2381
 msgid "The directory path to the document cannot contain spaces."
 msgstr "Stigen til dokumentet kan ikkje ha mellomrom i seg."
 
-#: src/Buffer.cpp:2408
+#: src/Buffer.cpp:2423
 msgid "Document export cancelled."
 msgstr "Eksport av dokumentet er stoppa."
 
-#: src/Buffer.cpp:2414
+#: src/Buffer.cpp:2429
 #, c-format
 msgid "Document exported as %1$s to file `%2$s'"
 msgstr "Dokumentet eksportert som %1$s til %2$s'"
 
-#: src/Buffer.cpp:2420
+#: src/Buffer.cpp:2435
 #, c-format
 msgid "Document exported as %1$s"
 msgstr "Dokumentet eksportert som %1$s"
 
-#: src/Buffer.cpp:2490
+#: src/Buffer.cpp:2505
 #, c-format
 msgid ""
 "The specified document\n"
@@ -13864,11 +14444,11 @@ msgstr ""
 "%1$s\n"
 "kunne ikkje bli lest."
 
-#: src/Buffer.cpp:2492
+#: src/Buffer.cpp:2507
 msgid "Could not read document"
 msgstr "Kunne ikkje lese dokumentet"
 
-#: src/Buffer.cpp:2502
+#: src/Buffer.cpp:2517
 #, c-format
 msgid ""
 "An emergency save of the document %1$s exists.\n"
@@ -13879,19 +14459,19 @@ msgstr ""
 "\n"
 "Gå tilbake til nødkopien?"
 
-#: src/Buffer.cpp:2505
+#: src/Buffer.cpp:2520
 msgid "Load emergency save?"
 msgstr "Last nødkopien av dokumentet?"
 
-#: src/Buffer.cpp:2506
+#: src/Buffer.cpp:2521
 msgid "&Recover"
 msgstr "&Gå tilbake"
 
-#: src/Buffer.cpp:2506
+#: src/Buffer.cpp:2521
 msgid "&Load Original"
 msgstr "&Last Original"
 
-#: src/Buffer.cpp:2526
+#: src/Buffer.cpp:2541
 #, c-format
 msgid ""
 "The backup of the document %1$s is newer.\n"
@@ -13902,28 +14482,28 @@ msgstr ""
 "\n"
 "Skal vi opna det istaden?"
 
-#: src/Buffer.cpp:2529
+#: src/Buffer.cpp:2544
 msgid "Load backup?"
 msgstr "Gå tilbake til reservekopi?"
 
-#: src/Buffer.cpp:2530
+#: src/Buffer.cpp:2545
 msgid "&Load backup"
 msgstr "Gå tilbake til &reservekopi"
 
-#: src/Buffer.cpp:2530
+#: src/Buffer.cpp:2545
 msgid "Load &original"
 msgstr "Last &original"
 
-#: src/Buffer.cpp:2563
+#: src/Buffer.cpp:2578
 #, c-format
 msgid "Do you want to retrieve the document %1$s from version control?"
 msgstr "Vil du laste inn dokumentet %1$s frå versjonkontroll?"
 
-#: src/Buffer.cpp:2565
+#: src/Buffer.cpp:2580
 msgid "Retrieve from version control?"
 msgstr "Vil du laste inn frå versjonkontroll?"
 
-#: src/Buffer.cpp:2566
+#: src/Buffer.cpp:2581
 msgid "&Retrieve"
 msgstr "&Hent inn"
 
@@ -13951,7 +14531,7 @@ msgstr "  Lagring fungerte ikkje. Pr
 msgid "  Save failed! Bummer. Document is lost."
 msgstr "  Lagring fungerte ikkje. Diverre har dokumentet gått tapt."
 
-#: src/BufferParams.cpp:481
+#: src/BufferParams.cpp:475
 #, c-format
 msgid ""
 "The layout file requested by this document,\n"
@@ -13968,28 +14548,28 @@ msgstr ""
 "ikkje er tilgjengeleg. Sjå i Tilpassing under\n"
 "hjelp menyen for meir informasjon.\n"
 
-#: src/BufferParams.cpp:487
+#: src/BufferParams.cpp:481
 msgid "Document class not available"
 msgstr "Dokumentklassa er ikkje tilgjengeleg"
 
-#: src/BufferParams.cpp:488
+#: src/BufferParams.cpp:482
 msgid "LyX will not be able to produce output."
 msgstr "LyX kan ikkje lage eit korrekt resultat."
 
-#: src/BufferParams.cpp:1424
-#, fuzzy, c-format
-msgid "The document class %1$s could not be found."
+#: src/BufferParams.cpp:1435
+#, c-format
+msgid ""
+"The document class %1$s could not be found. A default textclass with default "
+"layouts will be used. LyX might not be able to produce output unless a "
+"correct textclass is selected from the document settings dialog."
 msgstr ""
-"Dokumentet\n"
-"%1$s\n"
-"kunne ikkje bli lest."
 
-#: src/BufferParams.cpp:1426
+#: src/BufferParams.cpp:1440
 #, fuzzy
-msgid "Class not found"
-msgstr "Kan ikkje finne fila"
+msgid "Document class not found"
+msgstr "Dokumentklassa er ikkje tilgjengeleg"
 
-#: src/BufferParams.cpp:1436 src/LyXFunc.cpp:697
+#: src/BufferParams.cpp:1447 src/LyXFunc.cpp:697
 #, fuzzy, c-format
 msgid "The document class %1$s could not be loaded."
 msgstr ""
@@ -13997,12 +14577,12 @@ msgstr ""
 "%1$s\n"
 "kunne ikkje bli lest."
 
-#: src/BufferParams.cpp:1438 src/LyXFunc.cpp:699
+#: src/BufferParams.cpp:1449 src/LyXFunc.cpp:699
 #, fuzzy
 msgid "Could not load class"
 msgstr "Kan ikkje endra klassa"
 
-#: src/BufferParams.cpp:1474
+#: src/BufferParams.cpp:1535
 #, c-format
 msgid ""
 "The module %1$s has been requested by\n"
@@ -14011,17 +14591,17 @@ msgid ""
 "probably need to reconfigure LyX.\n"
 msgstr ""
 
-#: src/BufferParams.cpp:1478
+#: src/BufferParams.cpp:1539
 #, fuzzy
 msgid "Module not available"
 msgstr "Dokumentklassa er ikkje tilgjengeleg"
 
-#: src/BufferParams.cpp:1479
+#: src/BufferParams.cpp:1540
 #, fuzzy
 msgid "Some layouts may not be available."
 msgstr "Dokumentklassa er ikkje tilgjengeleg"
 
-#: src/BufferParams.cpp:1486
+#: src/BufferParams.cpp:1547
 #, c-format
 msgid ""
 "The module %1$s requires a package that is\n"
@@ -14029,121 +14609,121 @@ msgid ""
 "may not be possible.\n"
 msgstr ""
 
-#: src/BufferParams.cpp:1489
+#: src/BufferParams.cpp:1550
 #, fuzzy
 msgid "Package not available"
 msgstr "Dokumentklassa er ikkje tilgjengeleg"
 
-#: src/BufferParams.cpp:1494
+#: src/BufferParams.cpp:1555
 #, c-format
 msgid "Error reading module %1$s\n"
 msgstr ""
 
-#: src/BufferParams.cpp:1495 src/BufferParams.cpp:1501
+#: src/BufferParams.cpp:1556 src/BufferParams.cpp:1562
 #, fuzzy
 msgid "Read Error"
 msgstr "Søk feil"
 
-#: src/BufferParams.cpp:1500
+#: src/BufferParams.cpp:1561
 #, fuzzy
 msgid "Error reading internal layout information"
 msgstr "Generell informasjon"
 
-#: src/BufferView.cpp:177
+#: src/BufferView.cpp:178
 msgid "No more insets"
 msgstr "Det er ikkje fleire innskot"
 
-#: src/BufferView.cpp:669
+#: src/BufferView.cpp:672
 msgid "Save bookmark"
 msgstr "Lagra bokmerke"
 
-#: src/BufferView.cpp:1013
+#: src/BufferView.cpp:1024
 msgid "No further undo information"
 msgstr "Ikkje meir \"Angre\" informasjon"
 
-#: src/BufferView.cpp:1022
+#: src/BufferView.cpp:1033
 msgid "No further redo information"
 msgstr "Ikkje meir \"Gjer om\" informasjon"
 
-#: src/BufferView.cpp:1176 src/lyxfind.cpp:295 src/lyxfind.cpp:313
+#: src/BufferView.cpp:1194 src/lyxfind.cpp:295 src/lyxfind.cpp:313
 msgid "String not found!"
 msgstr "Kan ikkje finne teksten."
 
-#: src/BufferView.cpp:1200
+#: src/BufferView.cpp:1218
 msgid "Mark off"
 msgstr "Merke slått av"
 
-#: src/BufferView.cpp:1207
+#: src/BufferView.cpp:1225
 msgid "Mark on"
 msgstr "Merke på"
 
-#: src/BufferView.cpp:1214
+#: src/BufferView.cpp:1232
 msgid "Mark removed"
 msgstr "Fjerna merke"
 
-#: src/BufferView.cpp:1217
+#: src/BufferView.cpp:1235
 msgid "Mark set"
 msgstr "Merke sett"
 
-#: src/BufferView.cpp:1264
+#: src/BufferView.cpp:1282
 #, fuzzy
 msgid "Statistics for the selection:"
 msgstr "&Byt til dokument"
 
-#: src/BufferView.cpp:1266
+#: src/BufferView.cpp:1284
 #, fuzzy
 msgid "Statistics for the document:"
 msgstr "&Byt til dokument"
 
-#: src/BufferView.cpp:1269
+#: src/BufferView.cpp:1287
 #, fuzzy, c-format
 msgid "%1$d words"
 msgstr "%1$d ord sjekka."
 
-#: src/BufferView.cpp:1271
+#: src/BufferView.cpp:1289
 #, fuzzy
 msgid "One word"
 msgstr "Nøkkelord"
 
-#: src/BufferView.cpp:1274
+#: src/BufferView.cpp:1292
 #, c-format
 msgid "%1$d characters (including blanks)"
 msgstr ""
 
-#: src/BufferView.cpp:1277
+#: src/BufferView.cpp:1295
 msgid "One character (including blanks)"
 msgstr ""
 
-#: src/BufferView.cpp:1280
+#: src/BufferView.cpp:1298
 #, c-format
 msgid "%1$d characters (excluding blanks)"
 msgstr ""
 
-#: src/BufferView.cpp:1283
+#: src/BufferView.cpp:1301
 msgid "One character (excluding blanks)"
 msgstr ""
 
-#: src/BufferView.cpp:1285
+#: src/BufferView.cpp:1303
 #, fuzzy
 msgid "Statistics"
 msgstr "Status"
 
-#: src/BufferView.cpp:1963
+#: src/BufferView.cpp:2039
 #, c-format
 msgid "Inserting document %1$s..."
 msgstr "Set inn dokument %1$s..."
 
-#: src/BufferView.cpp:1974
+#: src/BufferView.cpp:2050
 #, c-format
 msgid "Document %1$s inserted."
 msgstr "Dokument %1$s er sett inn."
 
-#: src/BufferView.cpp:1976
+#: src/BufferView.cpp:2052
 #, c-format
 msgid "Could not insert document %1$s"
 msgstr "Kunne ikkje sette inn dokumentet %1$s"
 
-#: src/BufferView.cpp:2202
+#: src/BufferView.cpp:2280
 #, c-format
 msgid ""
 "Could not read the specified document\n"
@@ -14154,26 +14734,26 @@ msgstr ""
 "%1$s\n"
 "på grunn av feilen: %2$s"
 
-#: src/BufferView.cpp:2204
+#: src/BufferView.cpp:2282
 msgid "Could not read file"
 msgstr "Kan ikkje lese fila"
 
-#: src/BufferView.cpp:2211
+#: src/BufferView.cpp:2289
 #, fuzzy, c-format
 msgid ""
 "%1$s\n"
 " is not readable."
 msgstr "Kunne ikkje lese %1$s."
 
-#: src/BufferView.cpp:2212 src/output.cpp:39
+#: src/BufferView.cpp:2290 src/output.cpp:39
 msgid "Could not open file"
 msgstr "Kan ikkje opnafila"
 
-#: src/BufferView.cpp:2219
+#: src/BufferView.cpp:2297
 msgid "Reading not UTF-8 encoded file"
 msgstr "Les fil som ikkje er koda i UTF-8"
 
-#: src/BufferView.cpp:2220
+#: src/BufferView.cpp:2298
 msgid ""
 "The file is not UTF-8 encoded.\n"
 "It will be read as local 8Bit-encoded.\n"
@@ -14579,23 +15159,6 @@ msgstr "Ingenting kom ut av konverteringa"
 msgid "An empty output file was generated."
 msgstr "Det vart berre laga ei tom fil."
 
-#: src/CutAndPaste.cpp:516
-#, c-format
-msgid ""
-"Layout had to be changed from\n"
-"%1$s to %2$s\n"
-"because of class conversion from\n"
-"%3$s to %4$s"
-msgstr ""
-"Stil har blitt endra frå\n"
-"%1$s til %2$s\n"
-"fordi klassa vart konvertert frå\n"
-"%3$s til %4$s"
-
-#: src/CutAndPaste.cpp:521
-msgid "Changed Layout"
-msgstr "Endra avsnittstil"
-
 #: src/CutAndPaste.cpp:541
 #, fuzzy, c-format
 msgid ""
@@ -14645,19 +15208,19 @@ msgid "Copying %1$s to %2$s failed."
 msgstr "Kan ikkje kopiere %1$s til %2$s."
 
 #: src/Font.cpp:49 src/frontends/qt4/GuiCharacter.cpp:118
-#: src/frontends/qt4/GuiDocument.cpp:2141
+#: src/frontends/qt4/GuiDocument.cpp:2193
 #: src/frontends/qt4/GuiListings.cpp:158
 msgid "Roman"
 msgstr "Romansk"
 
 #: src/Font.cpp:49 src/frontends/qt4/GuiCharacter.cpp:119
-#: src/frontends/qt4/GuiDocument.cpp:2141
+#: src/frontends/qt4/GuiDocument.cpp:2193
 #: src/frontends/qt4/GuiListings.cpp:158
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
 #: src/Font.cpp:49 src/frontends/qt4/GuiCharacter.cpp:120
-#: src/frontends/qt4/GuiDocument.cpp:2141
+#: src/frontends/qt4/GuiDocument.cpp:2193
 #: src/frontends/qt4/GuiListings.cpp:158
 msgid "Typewriter"
 msgstr "Typewriter"
@@ -14845,11 +15408,11 @@ msgstr "BibTeX k
 msgid "Running MakeIndex for nomencl."
 msgstr "Køyrer MakeIndex for nomenklatur."
 
-#: src/LyX.cpp:99
+#: src/LyX.cpp:101
 msgid "Could not read configuration file"
 msgstr "Kan ikkje lese fila med innstillingar"
 
-#: src/LyX.cpp:100 src/frontends/qt4/GuiApplication.cpp:1336
+#: src/LyX.cpp:102 src/frontends/qt4/GuiApplication.cpp:1402
 #, c-format
 msgid ""
 "Error while reading the configuration file\n"
@@ -14860,72 +15423,72 @@ msgstr ""
 "%1$s.\n"
 "Sjekk LyX installasjonen din."
 
-#: src/LyX.cpp:109
+#: src/LyX.cpp:111
 msgid "LyX: reconfiguring user directory"
 msgstr "LyX: Set opp brukarstig"
 
-#: src/LyX.cpp:113
+#: src/LyX.cpp:115
 msgid "Done!"
 msgstr "Ferdig!"
 
-#: src/LyX.cpp:476
+#: src/LyX.cpp:374
 #, fuzzy, c-format
 msgid "%1$s does not appear like a LyX created temporary directory."
 msgstr "Klarte ikkje å laga mellombelskatalog"
 
-#: src/LyX.cpp:478
+#: src/LyX.cpp:376
 #, fuzzy
 msgid "Cannot remove temporary directory"
 msgstr "Klarte ikkje å fjerna den mellombelse katalogen"
 
-#: src/LyX.cpp:484
+#: src/LyX.cpp:382
 #, c-format
 msgid "Unable to remove the temporary directory %1$s"
 msgstr "Klarte ikkje å fjerna mellombelskatalogen %1$s"
 
-#: src/LyX.cpp:486
+#: src/LyX.cpp:384
 msgid "Unable to remove temporary directory"
 msgstr "Klarte ikkje å fjerna mellombelskatalogen"
 
-#: src/LyX.cpp:515
+#: src/LyX.cpp:413
 #, c-format
 msgid "Wrong command line option `%1$s'. Exiting."
 msgstr "Feil kommandolinje val:`%1$s'. Farvel."
 
-#: src/LyX.cpp:582
+#: src/LyX.cpp:487
 #, fuzzy
 msgid "No textclass is found"
 msgstr "Kan ikkje finne fila"
 
-#: src/LyX.cpp:583
+#: src/LyX.cpp:488
 msgid ""
 "LyX cannot continue because no textclass is found. You can either "
 "reconfigure normally, or reconfigure using default textclasses, or quit LyX."
 msgstr ""
 
-#: src/LyX.cpp:587
+#: src/LyX.cpp:492
 #, fuzzy
 msgid "&Reconfigure"
 msgstr "Set opp på nytt|n"
 
-#: src/LyX.cpp:588
+#: src/LyX.cpp:493
 #, fuzzy
 msgid "&Use Default"
 msgstr "&Standard"
 
-#: src/LyX.cpp:589 src/LyX.cpp:949
+#: src/LyX.cpp:494 src/LyX.cpp:857
 msgid "&Exit LyX"
 msgstr "&Skru av LyX"
 
-#: src/LyX.cpp:736 src/frontends/qt4/GuiView.cpp:639
+#: src/LyX.cpp:641 src/frontends/qt4/GuiView.cpp:650
 msgid "LyX: "
 msgstr "LyX: "
 
-#: src/LyX.cpp:858
+#: src/LyX.cpp:766
 msgid "Could not create temporary directory"
 msgstr "Klarte ikkje å laga mellombelskatalog"
 
-#: src/LyX.cpp:859
+#: src/LyX.cpp:767
 #, fuzzy, c-format
 msgid ""
 "Could not create a temporary directory in\n"
@@ -14936,11 +15499,11 @@ msgstr ""
 "%1$s. Ver sikker på at stigen eksisterar \n"
 "og er skrivbar og prøv igjen."
 
-#: src/LyX.cpp:942
+#: src/LyX.cpp:850
 msgid "Missing user LyX directory"
 msgstr "Manglar brukerstig for LyX"
 
-#: src/LyX.cpp:943
+#: src/LyX.cpp:851
 #, c-format
 msgid ""
 "You have specified a non-existent user LyX directory, %1$s.\n"
@@ -14949,33 +15512,33 @@ msgstr ""
 "Du har sett ein brukarstig for LyX som ikkje eksisterar  %1$s.\n"
 "LyX treng den for å lagre vala dine."
 
-#: src/LyX.cpp:948
+#: src/LyX.cpp:856
 msgid "&Create directory"
 msgstr "&Lag katalog"
 
-#: src/LyX.cpp:950
+#: src/LyX.cpp:858
 msgid "No user LyX directory. Exiting."
 msgstr "Ingen brukarstig for LyX. Stoppar."
 
-#: src/LyX.cpp:954
+#: src/LyX.cpp:862
 #, c-format
 msgid "LyX: Creating directory %1$s"
 msgstr "LyX: Lagar katalogen %1$s"
 
-#: src/LyX.cpp:959
+#: src/LyX.cpp:867
 msgid "Failed to create directory. Exiting."
 msgstr "Klarte ikkje å lage katalog. Stoppar."
 
-#: src/LyX.cpp:1031
+#: src/LyX.cpp:939
 msgid "List of supported debug flags:"
 msgstr "Liste over val ved avlusing:"
 
-#: src/LyX.cpp:1035
+#: src/LyX.cpp:943
 #, c-format
 msgid "Setting debug level to %1$s"
 msgstr "Set nivået til avlusinga til %1$s"
 
-#: src/LyX.cpp:1046
+#: src/LyX.cpp:954
 #, fuzzy
 msgid ""
 "Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
@@ -15018,39 +15581,39 @@ msgstr ""
 "\t-version        samandrag av versjon og byggje info\n"
 "Sjå `man' sida til LyX for meir informasjon."
 
-#: src/LyX.cpp:1086
+#: src/LyX.cpp:994 src/support/Package.cpp:554
 msgid "No system directory"
 msgstr "Ingen systemkatalog"
 
-#: src/LyX.cpp:1087
+#: src/LyX.cpp:995
 msgid "Missing directory for -sysdir switch"
 msgstr "Manglar katalog for -sysdir val"
 
-#: src/LyX.cpp:1098
+#: src/LyX.cpp:1006
 msgid "No user directory"
 msgstr "Ingen brukar katalog"
 
-#: src/LyX.cpp:1099
+#: src/LyX.cpp:1007
 msgid "Missing directory for -userdir switch"
 msgstr "Manglar katalog for -userdir val"
 
-#: src/LyX.cpp:1110
+#: src/LyX.cpp:1018
 msgid "Incomplete command"
 msgstr "Kommando er ikkje komplett"
 
-#: src/LyX.cpp:1111
+#: src/LyX.cpp:1019
 msgid "Missing command string after --execute switch"
 msgstr "Manglar kommando etter --execute val"
 
-#: src/LyX.cpp:1122
+#: src/LyX.cpp:1030
 msgid "Missing file type [eg latex, ps...] after --export switch"
 msgstr "Manglar filtype [t.d. latex, ps...] etter --export val"
 
-#: src/LyX.cpp:1135
+#: src/LyX.cpp:1043
 msgid "Missing file type [eg latex, ps...] after --import switch"
 msgstr "Manglar filtype [t.d. latex, ps...] etter --import val"
 
-#: src/LyX.cpp:1140
+#: src/LyX.cpp:1048
 msgid "Missing filename for --import"
 msgstr "Manglar filnamn for --import"
 
@@ -15127,7 +15690,7 @@ msgstr ""
 "\n"
 "Vil du lagra dokumentet?"
 
-#: src/LyXFunc.cpp:664 src/frontends/qt4/GuiView.cpp:1706
+#: src/LyXFunc.cpp:664 src/frontends/qt4/GuiView.cpp:1739
 msgid "Save changed document?"
 msgstr "Vil du lagre dokumentet?"
 
@@ -15157,11 +15720,11 @@ msgstr ""
 msgid "Revert to saved document?"
 msgstr "Gå tilbake til sist lagra?"
 
-#: src/LyXFunc.cpp:802 src/LyXVC.cpp:160
+#: src/LyXFunc.cpp:802 src/LyXVC.cpp:179
 msgid "&Revert"
 msgstr "&Gå tilbake til sist lagra"
 
-#: src/LyXFunc.cpp:1016 src/Text3.cpp:1481
+#: src/LyXFunc.cpp:1016 src/Text3.cpp:1483
 msgid "Missing argument"
 msgstr "Manglande val"
 
@@ -15170,52 +15733,52 @@ msgstr "Manglande val"
 msgid "Opening help file %1$s..."
 msgstr "Opnar hjelpfila %1$s..."
 
-#: src/LyXFunc.cpp:1273
+#: src/LyXFunc.cpp:1272
 #, c-format
 msgid "Opening child document %1$s..."
 msgstr "Opnar barne dokumentet %1$s..."
 
-#: src/LyXFunc.cpp:1452
+#: src/LyXFunc.cpp:1414
 #, c-format
 msgid "Document defaults saved in %1$s"
 msgstr "Standardval for dokument er lagra i %1$s"
 
-#: src/LyXFunc.cpp:1455
+#: src/LyXFunc.cpp:1417
 msgid "Unable to save document defaults"
 msgstr "Klarte ikkje å lagre standardval for dokument "
 
-#: src/LyXFunc.cpp:1732
+#: src/LyXFunc.cpp:1694
 #, fuzzy, c-format
 msgid "Document %1$s reloaded."
 msgstr "Dokumentet %1$s er ope."
 
-#: src/LyXFunc.cpp:1734
+#: src/LyXFunc.cpp:1696
 #, fuzzy, c-format
 msgid "Could not reload document %1$s"
 msgstr "Kunne ikkje lese dokumentet"
 
-#: src/LyXFunc.cpp:1771
+#: src/LyXFunc.cpp:1733
 msgid "Welcome to LyX!"
 msgstr "Velkomen til LyX!"
 
-#: src/LyXFunc.cpp:1792
+#: src/LyXFunc.cpp:1754
 msgid "Converting document to new document class..."
 msgstr "Konverterer dokumentet til ny dokument klasse ..."
 
-#: src/LyXRC.cpp:2386
+#: src/LyXRC.cpp:2414
 msgid ""
 "Consider run-together words, such as \"diskdrive\" for \"disk drive\", as "
 "legal words?"
 msgstr ""
 "La samanskrivne ord slik som \"helikoptersjøførsertifikat\"vere korrekt?"
 
-#: src/LyXRC.cpp:2391
+#: src/LyXRC.cpp:2419
 msgid ""
 "Specify an alternate language. The default is to use the language of the "
 "document."
 msgstr "Vel eit alternativt språk. Standarden er å bruke språket i dokumentet."
 
-#: src/LyXRC.cpp:2395
+#: src/LyXRC.cpp:2423
 msgid ""
 "Use to define an external program to render tables in plain text output. E."
 "g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If \"\" is "
@@ -15225,13 +15788,13 @@ msgstr ""
 "d.: \"groff -t -Tlatin1 $$FName\" Der $$FName er namnet på startfila. Dersom "
 "\"none\" blir brukt, vil LyX bruke intern teikning."
 
-#: src/LyXRC.cpp:2403
+#: src/LyXRC.cpp:2431
 msgid ""
 "De-select if you don't want the current selection to be replaced "
 "automatically by what you type."
 msgstr "Vil du erstatta merka teksten med ny tekst du skriv inn?"
 
-#: src/LyXRC.cpp:2407
+#: src/LyXRC.cpp:2435
 msgid ""
 "De-select if you don't want the class options to be reset to defaults after "
 "class change."
@@ -15239,14 +15802,14 @@ msgstr ""
 "Vil du at standardvala for den nye klassa skal gjelde for dokumentet nå du "
 "bytter klasse."
 
-#: src/LyXRC.cpp:2411
+#: src/LyXRC.cpp:2439
 msgid ""
 "The time interval between auto-saves (in seconds). 0 means no auto-save."
 msgstr ""
 "Kor lang tid  mellom kvar automatiske lagring (i sekund). 0 skrur av "
 "automatisk lagring."
 
-#: src/LyXRC.cpp:2418
+#: src/LyXRC.cpp:2446
 msgid ""
 "The path for storing backup files. If it is an empty string, LyX will store "
 "the backup file in the same directory as the original file."
@@ -15254,7 +15817,7 @@ msgstr ""
 "Stigen til reservekopiane. Om ingen stig er gitt, vil reservekopiane bli "
 "lagt i den same katalogen som original fila."
 
-#: src/LyXRC.cpp:2422
+#: src/LyXRC.cpp:2450
 msgid ""
 "Define the options of bibtex (cf. man bibtex) or select an alternative "
 "compiler (e.g. mlbibtex or bibulus)."
@@ -15262,7 +15825,7 @@ msgstr ""
 "Gi vala for BibTeX (sjå man bibtex) eller vel ein annan litteraturhandsamar "
 "slik som mlbibtex eller bibulus."
 
-#: src/LyXRC.cpp:2426
+#: src/LyXRC.cpp:2454
 msgid ""
 "Keybindings file. Can either specify an absolute path, or LyX will look in "
 "its global and local bind/ directories."
@@ -15270,11 +15833,11 @@ msgstr ""
 "Fila for tastaurbindingar. Gje anten ein stig til ei fil eller så vil LyX "
 "bruke filer frå dei globale og lokale bindingskatalogar."
 
-#: src/LyXRC.cpp:2430
+#: src/LyXRC.cpp:2458
 msgid "Select to check whether the lastfiles still exist."
 msgstr "Sjekk at dei sist opna filene finst enno."
 
-#: src/LyXRC.cpp:2434
+#: src/LyXRC.cpp:2462
 msgid ""
 "Define how to run chktex. E.g. \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -"
 "n38\" Refer to the ChkTeX documentation."
@@ -15282,7 +15845,7 @@ msgstr ""
 "Korleis skal vi køyre ChkTeX? T.d: \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -"
 "n30 -n38\". Ver god og les ChkTeX dokumentasjonen."
 
-#: src/LyXRC.cpp:2444
+#: src/LyXRC.cpp:2472
 msgid ""
 "LyX normally doesn't update the cursor position if you move the scrollbar. "
 "Set to true if you'd prefer to always have the cursor on screen."
@@ -15290,13 +15853,17 @@ msgstr ""
 "La skrivemerket alltid vera på skjermen når du nyttar rullefeltet. LyX "
 "endrar vanlegvis ikkje plassen til skrivemerket."
 
-#: src/LyXRC.cpp:2448
+#: src/LyXRC.cpp:2476
+msgid "Use the Mac OS X conventions for the word-level cursor movement"
+msgstr ""
+
+#: src/LyXRC.cpp:2480
 msgid ""
 "Show a small box around a Math Macro with the macro name when the cursor is "
 "inside."
 msgstr ""
 
-#: src/LyXRC.cpp:2459
+#: src/LyXRC.cpp:2491
 #, no-c-format
 msgid ""
 "This accepts the normal strftime formats; see man strftime for full details. "
@@ -15305,7 +15872,7 @@ msgstr ""
 "Her kan du bruke normal strftime syntaks; bruk man strftime for alle "
 "detaljar.T.d.: \"%A, %e. %B %Y\"."
 
-#: src/LyXRC.cpp:2463
+#: src/LyXRC.cpp:2495
 #, fuzzy
 msgid ""
 "Command definition file. Can either specify an absolute path, or LyX will "
@@ -15314,15 +15881,15 @@ msgstr ""
 "Fila for tastaurbindingar. Gje anten ein stig til ei fil eller så vil LyX "
 "bruke filer frå dei globale og lokale bindingskatalogar."
 
-#: src/LyXRC.cpp:2467
+#: src/LyXRC.cpp:2499
 msgid "New documents will be assigned this language."
 msgstr "språket til nye dokument."
 
-#: src/LyXRC.cpp:2471
+#: src/LyXRC.cpp:2503
 msgid "Specify the default paper size."
 msgstr "Vel standard papirstorleik."
 
-#: src/LyXRC.cpp:2475
+#: src/LyXRC.cpp:2507
 msgid ""
 "Iconify the dialogs when the main window is iconified. (Affects only dialogs "
 "shown after the change has been made.)"
@@ -15330,11 +15897,11 @@ msgstr ""
 "Legg ned barnevindauge saman med hovudvindauge. (gjeld berre barnevindauge "
 "oppretta etter endringa)."
 
-#: src/LyXRC.cpp:2479
+#: src/LyXRC.cpp:2511
 msgid "Select how LyX will display any graphics."
 msgstr "Vel korleis LyX skal vise grafikk."
 
-#: src/LyXRC.cpp:2483
+#: src/LyXRC.cpp:2515
 msgid ""
 "The default path for your documents. An empty value selects the directory "
 "LyX was started from."
@@ -15342,11 +15909,11 @@ msgstr ""
 "Standard stigen til dokumenta dine. Er standard stigen tom, blir "
 "dokumentstigen den same stigen som LyX vart starta i."
 
-#: src/LyXRC.cpp:2488
+#: src/LyXRC.cpp:2520
 msgid "Specify additional chars that can be part of a word."
 msgstr "Vel uvanlege bokstavar som kan vere ein del av eit ord."
 
-#: src/LyXRC.cpp:2492
+#: src/LyXRC.cpp:2524
 #, fuzzy
 msgid ""
 "The path that LyX will set when offering to choose an example. An empty "
@@ -15355,13 +15922,13 @@ msgstr ""
 "Stigen til malane.  Er malstigen tom, blir stigen den same stigen som LyX "
 "vart starta i."
 
-#: src/LyXRC.cpp:2496
+#: src/LyXRC.cpp:2528
 msgid ""
 "The font encoding used for the LaTeX2e fontenc package. T1 is highly "
 "recommended for non-English languages."
 msgstr "Teiknsettet for LaTeX2e fontenc pakken. Bruk T1 til Norsk."
 
-#: src/LyXRC.cpp:2503
+#: src/LyXRC.cpp:2535
 msgid ""
 "Define the options of makeindex (cf. man makeindex) or select an alternative "
 "compiler. E.g., using xindy/make-rules, the command string would be "
@@ -15371,7 +15938,7 @@ msgstr ""
 "Dvs dersom du brukar  xindy/make-rule vil val vere \"makeindex.sh -m $$lang"
 "\"."
 
-#: src/LyXRC.cpp:2512
+#: src/LyXRC.cpp:2544
 msgid ""
 "Use this to set the correct mapping file for your keyboard. You'll need this "
 "if you for instance want to type German documents on an American keyboard."
@@ -15379,22 +15946,22 @@ msgstr ""
 "Bruk dette for å bruke rett tastaturoversikt-fil. Du treng dette dersom du "
 "ønskjer å skrive tyske dokument med norsk tastatur."
 
-#: src/LyXRC.cpp:2516
+#: src/LyXRC.cpp:2548
 msgid "Maximum number of words in the initialization string for a new label"
 msgstr "Kor mange ord skal ein ny etikett innhalde, maksimalt?"
 
-#: src/LyXRC.cpp:2520
+#: src/LyXRC.cpp:2552
 msgid ""
 "Select if a language switching command is needed at the beginning of the "
 "document."
 msgstr "Trengs det ein språk endring først i dokumentet?"
 
-#: src/LyXRC.cpp:2524
+#: src/LyXRC.cpp:2556
 msgid ""
 "Select if a language switching command is needed at the end of the document."
 msgstr "Trengs det ein språk endring sist i dokumentet?"
 
-#: src/LyXRC.cpp:2528
+#: src/LyXRC.cpp:2560
 msgid ""
 "The LaTeX command for changing from the language of the document to another "
 "language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the "
@@ -15404,21 +15971,21 @@ msgstr ""
 "alternativt språk. t.d \\selectlanguage{$$lang} der  $$lang blir bytta ut "
 "med namnet på det alternative språket."
 
-#: src/LyXRC.cpp:2532
+#: src/LyXRC.cpp:2564
 msgid "The LaTeX command for changing back to the language of the document."
 msgstr "LaTeX kommandoen for å gå tilbake til standard språket."
 
-#: src/LyXRC.cpp:2536
+#: src/LyXRC.cpp:2568
 msgid "The LaTeX command for local changing of the language."
 msgstr "LaTeX kommandoen for lokal endring av språket."
 
-#: src/LyXRC.cpp:2540
+#: src/LyXRC.cpp:2572
 msgid ""
 "De-select if you don't want the language(s) used as an argument to "
 "\\documentclass."
 msgstr "La språka bli eit argument i \\documentclass."
 
-#: src/LyXRC.cpp:2544
+#: src/LyXRC.cpp:2576
 msgid ""
 "The LaTeX command for loading the language package. E.g. \"\\usepackage"
 "{babel}\", \"\\usepackage{omega}\"."
@@ -15426,84 +15993,84 @@ msgstr ""
 "LaTeX kommandoen for å laste språk-pakken. T.d.: \"\\usepackage{babel}\", "
 "\"\\usepackage{omega}\"."
 
-#: src/LyXRC.cpp:2548
+#: src/LyXRC.cpp:2580
 msgid ""
 "De-select if you don't want babel to be used when the language of the "
 "document is the default language."
 msgstr "Bruk babel saman med dokument i standard språket."
 
-#: src/LyXRC.cpp:2552
+#: src/LyXRC.cpp:2584
 msgid "De-select if you do not want LyX to scroll to saved position."
 msgstr "Vel om du vil  at LyX skal ta reservekopiar."
 
-#: src/LyXRC.cpp:2556
+#: src/LyXRC.cpp:2588
 #, fuzzy
 msgid "De-select to prevent loading files opened from the last LyX session."
 msgstr "Vel om du vil laste filane frå førre gang du brukte LyX automatisk."
 
-#: src/LyXRC.cpp:2560
+#: src/LyXRC.cpp:2592
 msgid "De-select if you don't want LyX to create backup files."
 msgstr "Vel om du vil  at LyX skal ta reservekopiar."
 
-#: src/LyXRC.cpp:2564
+#: src/LyXRC.cpp:2596
 msgid ""
 "Select to control the highlighting of words with a language foreign to that "
 "of the document."
 msgstr ""
 "Gje ord på eit anna språk enn standard språket i dokumentet  ein annan farge."
 
-#: src/LyXRC.cpp:2568
+#: src/LyXRC.cpp:2600
 msgid "The scrolling speed of the mouse wheel."
 msgstr ""
 
-#: src/LyXRC.cpp:2573
+#: src/LyXRC.cpp:2605
 #, fuzzy
 msgid "The completion popup delay."
 msgstr "&Kodelister i teksten"
 
-#: src/LyXRC.cpp:2577
+#: src/LyXRC.cpp:2609
 msgid "Select to display the completion popup in math mode."
 msgstr ""
 
-#: src/LyXRC.cpp:2581
+#: src/LyXRC.cpp:2613
 msgid "Select to display the completion popup in text mode."
 msgstr ""
 
-#: src/LyXRC.cpp:2585
+#: src/LyXRC.cpp:2617
 msgid ""
 "Show the completion popup without delay after non-unique completion attempt."
 msgstr ""
 
-#: src/LyXRC.cpp:2589
+#: src/LyXRC.cpp:2621
 msgid ""
 "Show a small triangle on the cursor to indicate that a completion is "
 "available."
 msgstr ""
 
-#: src/LyXRC.cpp:2593
+#: src/LyXRC.cpp:2625
 #, fuzzy
 msgid "The inline completion delay."
 msgstr "&Kodelister i teksten"
 
-#: src/LyXRC.cpp:2597
+#: src/LyXRC.cpp:2629
 msgid "Select to display the inline completion in math mode."
 msgstr ""
 
-#: src/LyXRC.cpp:2601
+#: src/LyXRC.cpp:2633
 msgid "Select to display the inline completion in text mode."
 msgstr ""
 
-#: src/LyXRC.cpp:2605
+#: src/LyXRC.cpp:2637
 msgid "Use \"...\" to shorten long completions."
 msgstr ""
 
-#: src/LyXRC.cpp:2609
+#: src/LyXRC.cpp:2641
 #, c-format
 msgid "Maximal number of lastfiles. Up to %1$d can appear in the file menu."
 msgstr ""
 "Kor mange sist opna filer skal vere tilgjengeleg i filmenyen (opp til %1$d)."
 
-#: src/LyXRC.cpp:2614
+#: src/LyXRC.cpp:2646
 msgid ""
 "Specify those directories which should be prepended to the PATH environment "
 "variable. Use the OS native format."
@@ -15511,33 +16078,33 @@ msgstr ""
 "Kva stig skal PATH-miljø ha framfor seg. Bruk standarden for "
 "operativsystemet."
 
-#: src/LyXRC.cpp:2621
+#: src/LyXRC.cpp:2653
 msgid ""
 "Specify an alternate personal dictionary file. E.g. \".ispell_english\"."
 msgstr "Vel ei alternativ personleg ordbok. T.d.: \"ispell_engelsk\"."
 
-#: src/LyXRC.cpp:2625
+#: src/LyXRC.cpp:2657
 msgid "Shows a typeset preview of things such as math"
 msgstr "Vis førehandsvising av typesettet av slike ting som matte"
 
-#: src/LyXRC.cpp:2629
+#: src/LyXRC.cpp:2661
 msgid "Previewed equations will have \"(#)\" labels rather than numbered ones"
 msgstr ""
 "Førehandsvising av likningar vil ha \"(#)\"-merke istaden for nummererte."
 
-#: src/LyXRC.cpp:2633
+#: src/LyXRC.cpp:2665
 msgid "Scale the preview size to suit."
 msgstr "La førehandsvising bli skalert etter høvet."
 
-#: src/LyXRC.cpp:2637
+#: src/LyXRC.cpp:2669
 msgid "The option for specifying whether the copies should be collated."
 msgstr "Melding som skal sendast til skrivaren for å samle utskriftene."
 
-#: src/LyXRC.cpp:2641
+#: src/LyXRC.cpp:2673
 msgid "The option for specifying the number of copies to print."
 msgstr "Kor mange kopiar skal skrivast ut."
 
-#: src/LyXRC.cpp:2645
+#: src/LyXRC.cpp:2677
 msgid ""
 "The default printer to print on. If none is specified, LyX will use the "
 "environment variable PRINTER."
@@ -15545,11 +16112,11 @@ msgstr ""
 "Standard skrivar. Om denne er tom, vil LyX bruke miljø variabelen \"PRINTER"
 "\" frå operativsystemet."
 
-#: src/LyXRC.cpp:2649
+#: src/LyXRC.cpp:2681
 msgid "The option to print only even pages."
 msgstr "Skriv berre ut partal-sider."
 
-#: src/LyXRC.cpp:2653
+#: src/LyXRC.cpp:2685
 msgid ""
 "Extra options to pass to printing program after everything else, but before "
 "the filename of the DVI file to be printed."
@@ -15557,35 +16124,35 @@ msgstr ""
 "Ekstra val til skriveprogrammet, gitt etter dei andre, men før namnet på dvi-"
 "fila."
 
-#: src/LyXRC.cpp:2657
+#: src/LyXRC.cpp:2689
 msgid "Extension of printer program output file. Usually \".ps\"."
 msgstr "Etternamn til fila det blir skreve ut til. \".ps\"."
 
-#: src/LyXRC.cpp:2661
+#: src/LyXRC.cpp:2693
 msgid "The option to print out in landscape."
 msgstr "Skriv ut liggjande sider."
 
-#: src/LyXRC.cpp:2665
+#: src/LyXRC.cpp:2697
 msgid "The option to print only odd pages."
 msgstr "Skriv berre ut oddetal-sider."
 
-#: src/LyXRC.cpp:2669
+#: src/LyXRC.cpp:2701
 msgid "The option for specifying a comma-separated list of pages to print."
 msgstr "Ei komma separert liste for sider som skal skrivast ut."
 
-#: src/LyXRC.cpp:2673
+#: src/LyXRC.cpp:2705
 msgid "Option to specify the dimensions of the print paper."
 msgstr "Kva dimensjonar er det på papiret som det skal skrivast ut på."
 
-#: src/LyXRC.cpp:2677
+#: src/LyXRC.cpp:2709
 msgid "The option to specify paper type."
 msgstr "Kva slags papir skal det skrivast ut på."
 
-#: src/LyXRC.cpp:2681
+#: src/LyXRC.cpp:2713
 msgid "The option to reverse the order of the pages printed."
 msgstr "Skriv sidene ut i omvendt rekkjefølgje."
 
-#: src/LyXRC.cpp:2685
+#: src/LyXRC.cpp:2717
 msgid ""
 "When set, this printer option automatically prints to a file and then calls "
 "a separate print spooling program on that file with the given name and "
@@ -15594,37 +16161,37 @@ msgstr ""
 "La skriveprogrammet skrive til fil først og så gje filnamnet til eit anna "
 "programfor å skriva dokumentet ut."
 
-#: src/LyXRC.cpp:2689
+#: src/LyXRC.cpp:2721
 msgid ""
 "If you specify a printer name in the print dialog, the following argument is "
 "prepended along with the printer name after the spool command."
 msgstr ""
 "Prefiks som blir lagt til skrivarar som blir spesifisert i skrivar-dialogen."
 
-#: src/LyXRC.cpp:2693
+#: src/LyXRC.cpp:2725
 msgid "Option to pass to the print program to print to a file."
 msgstr "Melding til skrivarprogrammet om at det skal skriva til fil."
 
-#: src/LyXRC.cpp:2697
+#: src/LyXRC.cpp:2729
 msgid "Option to pass to the print program to print on a specific printer."
 msgstr "Melding til skrivarprogrammet om kva skrivar du vil skrive ut på."
 
-#: src/LyXRC.cpp:2701
+#: src/LyXRC.cpp:2733
 msgid ""
 "Select for LyX to pass the name of the destination printer to your print "
 "command."
 msgstr "Send melding til skrivarprogrammet om kva skrivar du vil bruke."
 
-#: src/LyXRC.cpp:2705
+#: src/LyXRC.cpp:2737
 msgid "Your favorite print program, e.g. \"dvips\", \"dvilj4\"."
 msgstr "Favoritt utskrift program, t.d.  \"dvips\", \"dvilj4\"."
 
-#: src/LyXRC.cpp:2713
+#: src/LyXRC.cpp:2745
 msgid ""
 "Select to have visual bidi cursor movement, unselect for logical movement."
 msgstr ""
 
-#: src/LyXRC.cpp:2717
+#: src/LyXRC.cpp:2749
 msgid ""
 "DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes "
 "wrong, override the setting here."
@@ -15632,11 +16199,11 @@ msgstr ""
 "DPI (Oppløysing) å skjermen er vanlegvis automatisk i LyX. Dersom du vil ha "
 "ein annan oppløysing kan du sette det her."
 
-#: src/LyXRC.cpp:2723
+#: src/LyXRC.cpp:2755
 msgid "The screen fonts used to display the text while editing."
 msgstr "Skjermskrifttype som blir brukt til redigering av tekst."
 
-#: src/LyXRC.cpp:2732
+#: src/LyXRC.cpp:2764
 msgid ""
 "Allow bitmap fonts to be resized. If you are using a bitmap font, selecting "
 "this option may make some fonts look blocky in LyX. Deselecting this option "
@@ -15646,13 +16213,13 @@ msgstr ""
 "bokstavane  i LyX blir stygge og firkanta. Om ikkje endring av storleiken er "
 "tilete vil LyX bruke den næraste skriftstorleiken."
 
-#: src/LyXRC.cpp:2736
+#: src/LyXRC.cpp:2768
 msgid "The font sizes used for calculating the scaling of the screen fonts."
 msgstr ""
 "Storleiken på skrifttypane som blir brukt for å utrekning  av skjerm "
 "skrifttypane."
 
-#: src/LyXRC.cpp:2741
+#: src/LyXRC.cpp:2773
 #, no-c-format
 msgid ""
 "The zoom percentage for screen fonts. A setting of 100% will make the fonts "
@@ -15660,12 +16227,12 @@ msgid ""
 msgstr ""
 "Forstørring for skjermskrifttypar. 100% er om lag like stort som på arket."
 
-#: src/LyXRC.cpp:2745
+#: src/LyXRC.cpp:2777
 #, fuzzy
 msgid "Allow session manager to save and restore windows geometry."
 msgstr "Set vindauge på same plass på skjermen kvar gang du startar LyX."
 
-#: src/LyXRC.cpp:2749
+#: src/LyXRC.cpp:2781
 msgid ""
 "This starts the lyxserver. The pipes get an additional extension \".in\" and "
 "\".out\". Only for advanced users."
@@ -15673,15 +16240,15 @@ msgstr ""
 "Dette startar LyXServer. Datarøyra gir ekstra integrasjon med andre program. "
 "Mest for røynde brukarar."
 
-#: src/LyXRC.cpp:2756
+#: src/LyXRC.cpp:2788
 msgid "De-select if you don't want the startup banner."
 msgstr "Vis startopp bilete."
 
-#: src/LyXRC.cpp:2760
+#: src/LyXRC.cpp:2792
 msgid "What command runs the spellchecker?"
 msgstr "Kva heiter stavekontroll-programmet?"
 
-#: src/LyXRC.cpp:2764
+#: src/LyXRC.cpp:2796
 msgid ""
 "LyX will place its temporary directories in this path. They will be deleted "
 "when you quit LyX."
@@ -15689,7 +16256,7 @@ msgstr ""
 "Stigen til mellombels filer.  Er mellombelsstigen tom, blir stigen den same "
 "stigen som LyX vart starta i."
 
-#: src/LyXRC.cpp:2768
+#: src/LyXRC.cpp:2800
 msgid ""
 "The path that LyX will set when offering to choose a template. An empty "
 "value selects the directory LyX was started from."
@@ -15697,7 +16264,7 @@ msgstr ""
 "Stigen til malane.  Er malstigen tom, blir stigen den same stigen som LyX "
 "vart starta i."
 
-#: src/LyXRC.cpp:2778
+#: src/LyXRC.cpp:2810
 msgid ""
 "The UI (user interface) file. Can either specify an absolute path, or LyX "
 "will look in its global and local ui/ directories."
@@ -15705,7 +16272,7 @@ msgstr ""
 "UI-fila (Brukarmiljøet). Gje anten ein stig til ei fil eller så vil LyX "
 "bruke filer frå dei globale og lokale ui-katalogane."
 
-#: src/LyXRC.cpp:2791
+#: src/LyXRC.cpp:2823
 msgid ""
 "Specify whether to pass the -T input encoding option to ispell. Enable this "
 "if you cannot check the spelling of words containing accented letters. This "
@@ -15715,82 +16282,84 @@ msgstr ""
 "\" om du ikkje klarar å få stavekontroll til å virke på internationale "
 "bokstavar. Det kan oppstå feil saman med enkelte ordbøker."
 
-#: src/LyXRC.cpp:2795
+#: src/LyXRC.cpp:2827
 msgid "Enable the automatic appearance of tool tips in the work area."
 msgstr ""
 
-#: src/LyXRC.cpp:2799
+#: src/LyXRC.cpp:2831
 msgid ""
 "Enable the pixmap cache that might improve performance on Mac and Windows."
 msgstr ""
 
-#: src/LyXRC.cpp:2806
+#: src/LyXRC.cpp:2838
 msgid "Specify the paper command to DVI viewer (leave empty or use \"-paper\")"
 msgstr ""
 "Papir meldinga til DVI-framsynar (La den vere tom eller bruk \"-paper\")"
 
-#: src/LyXVC.cpp:91
+#: src/LyXVC.cpp:100
 msgid "Document not saved"
 msgstr "Dokumentet er ikkje lagra!"
 
-#: src/LyXVC.cpp:92
+#: src/LyXVC.cpp:101
 msgid "You must save the document before it can be registered."
 msgstr "Du må lagra dokumentet før du kan registrere det."
 
-#: src/LyXVC.cpp:117
+#: src/LyXVC.cpp:133
 msgid "LyX VC: Initial description"
 msgstr "LyX VK: Omtale av dokumentet. "
 
-#: src/LyXVC.cpp:118
+#: src/LyXVC.cpp:134
 msgid "(no initial description)"
 msgstr "(ingen skildring)"
 
-#: src/LyXVC.cpp:133
+#: src/LyXVC.cpp:149
 msgid "LyX VC: Log Message"
 msgstr "LyX VK: Loggmelding"
 
-#: src/LyXVC.cpp:136
+#: src/LyXVC.cpp:152
 msgid "(no log message)"
 msgstr "(Inga loggmelding)"
 
-#: src/LyXVC.cpp:156
-#, c-format
+#: src/LyXVC.cpp:175
+#, fuzzy, c-format
 msgid ""
 "Reverting to the stored version of the document %1$s will lose all current "
 "changes.\n"
 "\n"
-"Do you want to revert to the saved version?"
+"Do you want to revert to the older version?"
 msgstr ""
 "Dersom du går tilbake til det sist lagra versjon av dokumentet %1$s, vil "
 "alle endringane gå tapt\n"
 "\n"
 "Vil du gå tilbake til den siste lagra versjonen?"
 
-#: src/LyXVC.cpp:159
+#: src/LyXVC.cpp:178
 msgid "Revert to stored version of document?"
 msgstr "Gå tilbake til den siste lagra versjonen av dokumentet?"
 
-#: src/Paragraph.cpp:1509 src/frontends/qt4/GuiParagraph.cpp:246
+#: src/Paragraph.cpp:1512 src/frontends/qt4/GuiParagraph.cpp:246
 msgid "Senseless with this layout!"
 msgstr "Meiningslaust med denne stilen."
 
-#: src/Paragraph.cpp:1575
+#: src/Paragraph.cpp:1578
 msgid "Alignment not permitted"
 msgstr ""
 
-#: src/Paragraph.cpp:1576
+#: src/Paragraph.cpp:1579
 msgid ""
 "The new layout does not permit the alignment previously used.\n"
 "Setting to default."
 msgstr ""
 
-#: src/Paragraph.cpp:2044 src/frontends/qt4/LaTeXHighlighter.cpp:108
-#: src/mathed/InsetMathString.cpp:164
+#: src/Paragraph.cpp:2047 src/frontends/qt4/LaTeXHighlighter.cpp:108
+#: src/insets/InsetListings.cpp:182 src/insets/InsetListings.cpp:190
+#: src/insets/InsetListings.cpp:214 src/mathed/InsetMathString.cpp:164
 #, fuzzy
 msgid "LyX Warning: "
 msgstr "LyX Versjon "
 
-#: src/Paragraph.cpp:2045 src/mathed/InsetMathString.cpp:165
+#: src/Paragraph.cpp:2048 src/insets/InsetListings.cpp:183
+#: src/insets/InsetListings.cpp:191 src/mathed/InsetMathString.cpp:165
 #, fuzzy
 msgid "uncodable character"
 msgstr "spesial teikn"
@@ -15799,42 +16368,29 @@ msgstr "spesial teikn"
 msgid "Native OS API not yet supported."
 msgstr "Dessverre er ikkje stavekontroll for ditt operativsystem støtta enno."
 
-#: src/Text.cpp:121
-msgid "Unknown layout"
-msgstr "Ukjend Stil"
-
-#: src/Text.cpp:122
-#, c-format
-msgid ""
-"Layout '%1$s' does not exist in textclass '%2$s'\n"
-"Trying to use the default instead.\n"
-msgstr ""
-"Stilen '%1$s' er ikkje i tekstklassa '%2$s'\n"
-"Prøver å bruke standard istaden\n"
-
-#: src/Text.cpp:151
+#: src/Text.cpp:146
 msgid "Unknown Inset"
 msgstr "Ukjend innskot"
 
-#: src/Text.cpp:224 src/Text.cpp:237
+#: src/Text.cpp:219 src/Text.cpp:232
 msgid "Change tracking error"
 msgstr "Feil i endra sporing"
 
-#: src/Text.cpp:225
+#: src/Text.cpp:220
 #, c-format
 msgid "Unknown author index for insertion: %1$d\n"
 msgstr "Kan ikkje sette inn ukjent forfattar indeks:%1$d\n"
 
-#: src/Text.cpp:238
+#: src/Text.cpp:233
 #, c-format
 msgid "Unknown author index for deletion: %1$d\n"
 msgstr "Kan ikkje slette ukjent forfattar index: %1$d\n"
 
-#: src/Text.cpp:245
+#: src/Text.cpp:240
 msgid "Unknown token"
 msgstr "Ukjent symbol: "
 
-#: src/Text.cpp:527
+#: src/Text.cpp:522
 msgid ""
 "You cannot insert a space at the beginning of a paragraph. Please read the "
 "Tutorial."
@@ -15842,103 +16398,103 @@ msgstr ""
 "Du kan ikkje sette inn eit mellomrom i starten av eit avsnitt. Ver så snill "
 "å lese innføring i LyX."
 
-#: src/Text.cpp:538
+#: src/Text.cpp:533
 msgid "You cannot type two spaces this way. Please read the Tutorial."
 msgstr ""
 "Du kan ikkje sette inn to mellomrom etter kvarandre. Ver så snill å lese "
 "innføring i LyX."
 
-#: src/Text.cpp:1302
+#: src/Text.cpp:1343
 msgid "[Change Tracking] "
 msgstr "[Spor endringar] "
 
-#: src/Text.cpp:1308
+#: src/Text.cpp:1349
 msgid "Change: "
 msgstr "Endring: "
 
-#: src/Text.cpp:1312
+#: src/Text.cpp:1353
 msgid " at "
 msgstr " til "
 
-#: src/Text.cpp:1322
+#: src/Text.cpp:1363
 #, c-format
 msgid "Font: %1$s"
 msgstr "Skrifttype:%1$s"
 
-#: src/Text.cpp:1327
+#: src/Text.cpp:1368
 #, c-format
 msgid ", Depth: %1$d"
 msgstr " Djupn: %1$d"
 
-#: src/Text.cpp:1333
+#: src/Text.cpp:1374
 msgid ", Spacing: "
 msgstr ", mellomrom: "
 
-#: src/Text.cpp:1339 src/frontends/qt4/GuiDocument.cpp:581
+#: src/Text.cpp:1380 src/frontends/qt4/GuiDocument.cpp:581
 msgid "OneHalf"
 msgstr "Halvannan"
 
-#: src/Text.cpp:1345
+#: src/Text.cpp:1386
 msgid "Other ("
 msgstr "Anna ("
 
-#: src/Text.cpp:1354
+#: src/Text.cpp:1395
 msgid ", Inset: "
 msgstr ", Innskot: "
 
-#: src/Text.cpp:1355
+#: src/Text.cpp:1396
 msgid ", Paragraph: "
 msgstr ", Avsnitt: "
 
-#: src/Text.cpp:1356
+#: src/Text.cpp:1397
 msgid ", Id: "
 msgstr " Id: "
 
-#: src/Text.cpp:1357
+#: src/Text.cpp:1398
 msgid ", Position: "
 msgstr ", plass: "
 
-#: src/Text.cpp:1363
+#: src/Text.cpp:1404
 msgid ", Char: 0x"
 msgstr ", Teikn: 0x"
 
-#: src/Text.cpp:1365
+#: src/Text.cpp:1406
 msgid ", Boundary: "
 msgstr ", Grense: "
 
-#: src/Text2.cpp:391
+#: src/Text2.cpp:373
 msgid "No font change defined."
 msgstr "Det er ikkje definert noko skrifttype endring."
 
-#: src/Text2.cpp:431
+#: src/Text2.cpp:413
 msgid "Nothing to index!"
 msgstr "Ingenting å lage indeks av!"
 
-#: src/Text2.cpp:433
+#: src/Text2.cpp:415
 msgid "Cannot index more than one paragraph!"
 msgstr "Kan ikkje lage indeks av meir enn eit avsnitt!"
 
-#: src/Text3.cpp:173 src/mathed/InsetMathHull.cpp:1456
+#: src/Text3.cpp:173 src/mathed/InsetMathHull.cpp:1461
 msgid "Math editor mode"
 msgstr "Mattemodus"
 
-#: src/Text3.cpp:792
+#: src/Text3.cpp:797
 msgid "Unknown spacing argument: "
 msgstr "Ukjent argument for linjeavstand: "
 
-#: src/Text3.cpp:1033
+#: src/Text3.cpp:1038
 msgid "Layout "
 msgstr "Stil "
 
-#: src/Text3.cpp:1034
+#: src/Text3.cpp:1039
 msgid " not known"
 msgstr " ukjent"
 
-#: src/Text3.cpp:1588 src/Text3.cpp:1600
+#: src/Text3.cpp:1590 src/Text3.cpp:1602
 msgid "Character set"
 msgstr "Teiknsett"
 
-#: src/Text3.cpp:1746 src/Text3.cpp:1757
+#: src/Text3.cpp:1748 src/Text3.cpp:1759
 msgid "Paragraph layout set"
 msgstr "set avsnitt stil"
 
@@ -15947,21 +16503,21 @@ msgstr "set avsnitt stil"
 msgid "Plain Layout"
 msgstr "Avsnittstil"
 
-#: src/TextClass.cpp:594
+#: src/TextClass.cpp:580
 #, fuzzy
 msgid "Missing File"
 msgstr "Manglande val"
 
-#: src/TextClass.cpp:595
+#: src/TextClass.cpp:581
 msgid "Could not find stdinsets.inc! This may lead to data loss!"
 msgstr ""
 
-#: src/TextClass.cpp:598
+#: src/TextClass.cpp:584
 #, fuzzy
 msgid "Corrupt File"
 msgstr "Kort tittel"
 
-#: src/TextClass.cpp:599
+#: src/TextClass.cpp:585
 msgid "Could not read stdinsets.inc! This may lead to data loss!"
 msgstr ""
 
@@ -15978,6 +16534,35 @@ msgid ""
 "%1$s."
 msgstr ""
 
+#: src/VCBackend.cpp:46 src/VCBackend.cpp:468 src/VCBackend.cpp:515
+#, fuzzy
+msgid "Revision control error."
+msgstr "Kontroll av versjonar"
+
+#: src/VCBackend.cpp:47
+#, fuzzy, c-format
+msgid ""
+"Some problem occured while running the command:\n"
+"'%1$s'."
+msgstr "Vi fekk ein feil når vi køyrde %1$s"
+
+#: src/VCBackend.cpp:469
+msgid ""
+"Error when commiting to repository.\n"
+"You have to manually resolve the problem.\n"
+"After pressing OK, LyX will reopen the document."
+msgstr ""
+
+#: src/VCBackend.cpp:516
+#, c-format
+msgid ""
+"Error when updating from repository.\n"
+"You have to manually resolve the conflicts NOW!\n"
+"'%1$s'.\n"
+"\n"
+"After pressing OK, LyX will try to reopen resolved document."
+msgstr ""
+
 #: src/VSpace.cpp:472
 msgid "Default skip"
 msgstr "Standard mellomrom"
@@ -16127,7 +16712,7 @@ msgstr "Instaler korrekt for 
 msgid "amount of work other people have done for the LyX project."
 msgstr "alt arbeidet folk har gjort for LyX-prosjektet."
 
-#: src/frontends/qt4/GuiAbout.cpp:63
+#: src/frontends/qt4/GuiAbout.cpp:64
 #, fuzzy
 msgid ""
 "LyX is Copyright (C) 1995 by Matthias Ettrich,\n"
@@ -16136,7 +16721,7 @@ msgstr ""
 "LyX har Kopirett (C) 1995 av Matthias Ettrich,\n"
 "1995-2007 LyX Teamet"
 
-#: src/frontends/qt4/GuiAbout.cpp:69
+#: src/frontends/qt4/GuiAbout.cpp:70
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -16148,7 +16733,7 @@ msgstr ""
 "publisert av Free Software Foundation; enten versjon 2 eller seinare "
 "versjonar om du ynskjer det."
 
-#: src/frontends/qt4/GuiAbout.cpp:75
+#: src/frontends/qt4/GuiAbout.cpp:76
 msgid ""
 "LyX is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -16168,15 +16753,15 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
 "Ave, Cambridge, MA 02139, USA."
 
-#: src/frontends/qt4/GuiAbout.cpp:83
+#: src/frontends/qt4/GuiAbout.cpp:84
 msgid "LyX Version "
 msgstr "LyX Versjon "
 
-#: src/frontends/qt4/GuiAbout.cpp:88
+#: src/frontends/qt4/GuiAbout.cpp:89
 msgid "Library directory: "
 msgstr "Bibliotek katalog: "
 
-#: src/frontends/qt4/GuiAbout.cpp:91
+#: src/frontends/qt4/GuiAbout.cpp:92
 msgid "User directory: "
 msgstr "Brukar katalog"
 
@@ -16187,46 +16772,46 @@ msgstr "Brukar katalog"
 msgid "LyX: %1$s"
 msgstr "LyX: %1$s"
 
-#: src/frontends/qt4/GuiApplication.cpp:385
+#: src/frontends/qt4/GuiApplication.cpp:387
 #, fuzzy
 msgid "About %1"
 msgstr "Om LyX"
 
-#: src/frontends/qt4/GuiApplication.cpp:385
-#: src/frontends/qt4/GuiPrefs.cpp:2437
+#: src/frontends/qt4/GuiApplication.cpp:387
+#: src/frontends/qt4/GuiPrefs.cpp:2497
 msgid "Preferences"
 msgstr "LyX-Val"
 
-#: src/frontends/qt4/GuiApplication.cpp:386
+#: src/frontends/qt4/GuiApplication.cpp:388
 #, fuzzy
 msgid "Reconfigure"
 msgstr "Set opp på nytt|n"
 
-#: src/frontends/qt4/GuiApplication.cpp:386
+#: src/frontends/qt4/GuiApplication.cpp:388
 #, fuzzy
 msgid "Quit %1"
 msgstr "Skru av LyX"
 
-#: src/frontends/qt4/GuiApplication.cpp:794
+#: src/frontends/qt4/GuiApplication.cpp:784
 msgid "Exiting."
 msgstr "Avsluttar."
 
-#: src/frontends/qt4/GuiApplication.cpp:856
+#: src/frontends/qt4/GuiApplication.cpp:851
 msgid "Syntax: set-color <lyx_name> <x11_name>"
 msgstr "Syntaks: set-color <lyx_name> <x11_name>"
 
-#: src/frontends/qt4/GuiApplication.cpp:872
+#: src/frontends/qt4/GuiApplication.cpp:867
 #, c-format
 msgid "Set-color \"%1$s\" failed - color is undefined or may not be redefined"
 msgstr ""
 "Kan ikkje sette fargen  \"%1$s\", den finst ikkje eller kan ikkje bli endra"
 
-#: src/frontends/qt4/GuiApplication.cpp:1152
+#: src/frontends/qt4/GuiApplication.cpp:1211
 #, fuzzy
 msgid "The current document was closed."
 msgstr "Kan ikkje skrive ut"
 
-#: src/frontends/qt4/GuiApplication.cpp:1162
+#: src/frontends/qt4/GuiApplication.cpp:1221
 msgid ""
 "LyX has caught an exception, it will now attempt to save all unsaved "
 "documents and exit.\n"
@@ -16234,18 +16819,18 @@ msgid ""
 "Exception: "
 msgstr ""
 
-#: src/frontends/qt4/GuiApplication.cpp:1166
-#: src/frontends/qt4/GuiApplication.cpp:1172
+#: src/frontends/qt4/GuiApplication.cpp:1225
+#: src/frontends/qt4/GuiApplication.cpp:1231
 msgid "Software exception Detected"
 msgstr ""
 
-#: src/frontends/qt4/GuiApplication.cpp:1170
+#: src/frontends/qt4/GuiApplication.cpp:1229
 msgid ""
 "LyX has caught some really weird exception, it will now attempt to save all "
 "unsaved documents and exit."
 msgstr ""
 
-#: src/frontends/qt4/GuiApplication.cpp:1335
+#: src/frontends/qt4/GuiApplication.cpp:1401
 #, fuzzy
 msgid "Could not find UI definition file"
 msgstr "Kan ikkje lese fila med innstillingar"
@@ -16259,11 +16844,11 @@ msgid "BibTeX Bibliography"
 msgstr "BibTeX litteraturliste"
 
 #: src/frontends/qt4/GuiBibtex.cpp:424 src/frontends/qt4/GuiBibtex.cpp:434
-#: src/frontends/qt4/GuiDocument.cpp:1279
+#: src/frontends/qt4/GuiDocument.cpp:1293
 #: src/frontends/qt4/GuiExternal.cpp:661 src/frontends/qt4/GuiGraphics.cpp:740
-#: src/frontends/qt4/GuiInclude.cpp:325 src/frontends/qt4/GuiView.cpp:1190
-#: src/frontends/qt4/GuiView.cpp:1248 src/frontends/qt4/GuiView.cpp:1381
-#: src/frontends/qt4/GuiView.cpp:1500 src/frontends/qt4/GuiView.cpp:1579
+#: src/frontends/qt4/GuiInclude.cpp:325 src/frontends/qt4/GuiView.cpp:1219
+#: src/frontends/qt4/GuiView.cpp:1277 src/frontends/qt4/GuiView.cpp:1414
+#: src/frontends/qt4/GuiView.cpp:1533 src/frontends/qt4/GuiView.cpp:1612
 msgid "Documents|#o#O"
 msgstr "Dokument|#o#O"
 
@@ -16317,24 +16902,24 @@ msgstr "notat bakgrunn"
 msgid "Double rectangular frame"
 msgstr "dobbel"
 
-#: src/frontends/qt4/GuiBox.cpp:72 src/frontends/qt4/GuiBox.cpp:331
-#: src/frontends/qt4/GuiBox.cpp:366
+#: src/frontends/qt4/GuiBox.cpp:72 src/frontends/qt4/GuiBox.cpp:335
+#: src/frontends/qt4/GuiBox.cpp:370
 msgid "Height"
 msgstr "Høgd"
 
-#: src/frontends/qt4/GuiBox.cpp:72 src/frontends/qt4/GuiBox.cpp:334
-#: src/frontends/qt4/GuiBox.cpp:369
+#: src/frontends/qt4/GuiBox.cpp:72 src/frontends/qt4/GuiBox.cpp:338
+#: src/frontends/qt4/GuiBox.cpp:373
 msgid "Depth"
 msgstr "Djupn"
 
-#: src/frontends/qt4/GuiBox.cpp:73 src/frontends/qt4/GuiBox.cpp:201
-#: src/frontends/qt4/GuiBox.cpp:337 src/frontends/qt4/GuiBox.cpp:372
-#: src/frontends/qt4/GuiBox.cpp:417
+#: src/frontends/qt4/GuiBox.cpp:73 src/frontends/qt4/GuiBox.cpp:203
+#: src/frontends/qt4/GuiBox.cpp:341 src/frontends/qt4/GuiBox.cpp:376
+#: src/frontends/qt4/GuiBox.cpp:421
 msgid "Total Height"
 msgstr "Heile høgda"
 
-#: src/frontends/qt4/GuiBox.cpp:73 src/frontends/qt4/GuiBox.cpp:340
-#: src/frontends/qt4/GuiBox.cpp:375
+#: src/frontends/qt4/GuiBox.cpp:73 src/frontends/qt4/GuiBox.cpp:344
+#: src/frontends/qt4/GuiBox.cpp:379
 msgid "Width"
 msgstr "Breidd"
 
@@ -16346,10 +16931,6 @@ msgstr "Rammeval"
 msgid "Branch Settings"
 msgstr "Greinval"
 
-#: src/frontends/qt4/GuiBranches.cpp:42
-msgid "Branch"
-msgstr "Grein"
-
 #: src/frontends/qt4/GuiBranches.cpp:43
 msgid "Activated"
 msgstr "Aktivert"
@@ -16359,11 +16940,11 @@ msgid "Color"
 msgstr "Farge"
 
 #: src/frontends/qt4/GuiBranches.cpp:72 src/frontends/qt4/GuiBranches.cpp:146
-#: src/frontends/qt4/GuiDocument.cpp:1436
+#: src/frontends/qt4/GuiDocument.cpp:1442
 msgid "Yes"
 msgstr "Ja"
 
-#: src/frontends/qt4/GuiBranches.cpp:72 src/frontends/qt4/GuiDocument.cpp:1435
+#: src/frontends/qt4/GuiBranches.cpp:72 src/frontends/qt4/GuiDocument.cpp:1441
 msgid "No"
 msgstr "Nei"
 
@@ -16453,7 +17034,7 @@ msgstr "Gul"
 msgid "Text Style"
 msgstr "Tekststil"
 
-#: src/frontends/qt4/GuiCitation.cpp:318
+#: src/frontends/qt4/GuiCitation.cpp:326
 #, fuzzy
 msgid "Keys"
 msgstr "&Nøkkel:"
@@ -16481,10 +17062,10 @@ msgstr "%1$s og %2$s"
 msgid "Choose a filename to save the pasted graphic as"
 msgstr "Vel eit anna filnamn"
 
-#: src/frontends/qt4/GuiClipboard.cpp:176 src/frontends/qt4/GuiView.cpp:1262
-#: src/frontends/qt4/GuiView.cpp:1401 src/frontends/qt4/GuiView.cpp:1417
-#: src/frontends/qt4/GuiView.cpp:1434 src/frontends/qt4/GuiView.cpp:1517
-#: src/frontends/qt4/GuiView.cpp:1555
+#: src/frontends/qt4/GuiClipboard.cpp:176 src/frontends/qt4/GuiView.cpp:1295
+#: src/frontends/qt4/GuiView.cpp:1434 src/frontends/qt4/GuiView.cpp:1450
+#: src/frontends/qt4/GuiView.cpp:1467 src/frontends/qt4/GuiView.cpp:1550
+#: src/frontends/qt4/GuiView.cpp:1588
 msgid "Canceled."
 msgstr "Avbroten."
 
@@ -16640,7 +17221,7 @@ msgid "Document Settings"
 msgstr "Dokumentval"
 
 #: src/frontends/qt4/GuiDocument.cpp:566
-#: src/frontends/qt4/GuiDocument.cpp:1051
+#: src/frontends/qt4/GuiDocument.cpp:1055
 msgid ""
 "Input listings parameters on the right. Enter ? for a list of parameters."
 msgstr ""
@@ -16691,217 +17272,217 @@ msgstr "B3"
 msgid "B4"
 msgstr "B4"
 
-#: src/frontends/qt4/GuiDocument.cpp:800
+#: src/frontends/qt4/GuiDocument.cpp:799
 msgid "LaTeX default"
 msgstr "LaTeX standard"
 
-#: src/frontends/qt4/GuiDocument.cpp:806
+#: src/frontends/qt4/GuiDocument.cpp:808
 msgid "``text''"
 msgstr "``tekst''"
 
-#: src/frontends/qt4/GuiDocument.cpp:807
+#: src/frontends/qt4/GuiDocument.cpp:809
 msgid "''text''"
 msgstr "''tekst''"
 
-#: src/frontends/qt4/GuiDocument.cpp:808
+#: src/frontends/qt4/GuiDocument.cpp:810
 msgid ",,text``"
 msgstr ",,tekst``"
 
-#: src/frontends/qt4/GuiDocument.cpp:809
+#: src/frontends/qt4/GuiDocument.cpp:811
 msgid ",,text''"
 msgstr ",,tekst''"
 
-#: src/frontends/qt4/GuiDocument.cpp:810
+#: src/frontends/qt4/GuiDocument.cpp:812
 msgid "<<text>>"
 msgstr "<<tekst>>"
 
-#: src/frontends/qt4/GuiDocument.cpp:811
+#: src/frontends/qt4/GuiDocument.cpp:813
 msgid ">>text<<"
 msgstr ">>tekst<<"
 
-#: src/frontends/qt4/GuiDocument.cpp:826
+#: src/frontends/qt4/GuiDocument.cpp:828
 msgid "Numbered"
 msgstr "Nummerering"
 
-#: src/frontends/qt4/GuiDocument.cpp:827
+#: src/frontends/qt4/GuiDocument.cpp:829
 msgid "Appears in TOC"
 msgstr "Kjem i innhaldslista"
 
-#: src/frontends/qt4/GuiDocument.cpp:847
+#: src/frontends/qt4/GuiDocument.cpp:849
 msgid "Author-year"
 msgstr "Forfattar-år"
 
-#: src/frontends/qt4/GuiDocument.cpp:848
+#: src/frontends/qt4/GuiDocument.cpp:850
 msgid "Numerical"
 msgstr "Numerisk"
 
-#: src/frontends/qt4/GuiDocument.cpp:913
+#: src/frontends/qt4/GuiDocument.cpp:917
 #, c-format
 msgid "Unavailable: %1$s"
 msgstr "Utilgjengeleg %1$s"
 
-#: src/frontends/qt4/GuiDocument.cpp:975 src/frontends/qt4/GuiDocument.cpp:989
+#: src/frontends/qt4/GuiDocument.cpp:979 src/frontends/qt4/GuiDocument.cpp:993
 msgid "Document Class"
 msgstr "Dokumentklasse"
 
-#: src/frontends/qt4/GuiDocument.cpp:977
+#: src/frontends/qt4/GuiDocument.cpp:981
 msgid "Text Layout"
 msgstr "Tekststil"
 
-#: src/frontends/qt4/GuiDocument.cpp:979
+#: src/frontends/qt4/GuiDocument.cpp:983
 msgid "Page Margins"
 msgstr "Sidemargar"
 
-#: src/frontends/qt4/GuiDocument.cpp:981
+#: src/frontends/qt4/GuiDocument.cpp:985
 msgid "Numbering & TOC"
 msgstr "Tal og bolkar"
 
-#: src/frontends/qt4/GuiDocument.cpp:983
+#: src/frontends/qt4/GuiDocument.cpp:987
 #, fuzzy
 msgid "PDF Properties"
 msgstr "Eigenskapar"
 
-#: src/frontends/qt4/GuiDocument.cpp:984
+#: src/frontends/qt4/GuiDocument.cpp:988
 msgid "Math Options"
 msgstr "Matte val"
 
-#: src/frontends/qt4/GuiDocument.cpp:985
+#: src/frontends/qt4/GuiDocument.cpp:989
 msgid "Float Placement"
 msgstr "Flytar plassering"
 
-#: src/frontends/qt4/GuiDocument.cpp:986
+#: src/frontends/qt4/GuiDocument.cpp:990
 msgid "Bullets"
 msgstr "Punkt"
 
-#: src/frontends/qt4/GuiDocument.cpp:987
+#: src/frontends/qt4/GuiDocument.cpp:991
 msgid "Branches"
 msgstr "Greiner"
 
-#: src/frontends/qt4/GuiDocument.cpp:988
-#: src/frontends/qt4/GuiDocument.cpp:1000
+#: src/frontends/qt4/GuiDocument.cpp:992
+#: src/frontends/qt4/GuiDocument.cpp:1004
 msgid "LaTeX Preamble"
 msgstr "LaTeX fortekst"
 
-#: src/frontends/qt4/GuiDocument.cpp:1229
+#: src/frontends/qt4/GuiDocument.cpp:1233
 #, fuzzy
 msgid "Layouts|#o#O"
 msgstr "Oppsett|O"
 
-#: src/frontends/qt4/GuiDocument.cpp:1231
+#: src/frontends/qt4/GuiDocument.cpp:1235
 #, fuzzy
 msgid "LyX Layout (*.layout)"
 msgstr "LyX Dokument (*.lyx)"
 
-#: src/frontends/qt4/GuiDocument.cpp:1233
-#: src/frontends/qt4/GuiDocument.cpp:1293
+#: src/frontends/qt4/GuiDocument.cpp:1237
+#: src/frontends/qt4/GuiDocument.cpp:1246
 #, fuzzy
 msgid "Local layout file"
 msgstr "Tekststil"
 
+#: src/frontends/qt4/GuiDocument.cpp:1247
+msgid ""
+"The layout file you have selected is a local layout\n"
+"file, not one in the system or user directory. Your\n"
+"document may not work with this layout if you do not\n"
+"keep the layout file in the document directory."
+msgstr ""
+
 #: src/frontends/qt4/GuiDocument.cpp:1251
-#: src/frontends/qt4/GuiDocument.cpp:1310
-#: src/frontends/qt4/GuiDocument.cpp:2108
+#, fuzzy
+msgid "&Set Layout"
+msgstr "Tekststil"
+
+#: src/frontends/qt4/GuiDocument.cpp:1264
+#: src/frontends/qt4/GuiDocument.cpp:1311
+#: src/frontends/qt4/GuiDocument.cpp:2160
 #, fuzzy
 msgid "Error"
 msgstr "Pil"
 
-#: src/frontends/qt4/GuiDocument.cpp:1252
+#: src/frontends/qt4/GuiDocument.cpp:1265
 #, fuzzy
 msgid "Unable to read local layout file."
 msgstr "Klarte ikkje å lagre standardval for dokument "
 
-#: src/frontends/qt4/GuiDocument.cpp:1273
+#: src/frontends/qt4/GuiDocument.cpp:1287
 #, fuzzy
 msgid "Select master document"
 msgstr "Hovuddokumentet"
 
-#: src/frontends/qt4/GuiDocument.cpp:1277
+#: src/frontends/qt4/GuiDocument.cpp:1291
 #, fuzzy
 msgid "LyX Files (*.lyx)"
 msgstr "LyX Dokument (*.lyx)"
 
-#: src/frontends/qt4/GuiDocument.cpp:1294
-msgid ""
-"The layout file you have selected is a local layout\n"
-"file, not one in the system or user directory. Your\n"
-"document may not work with this layout if you do not\n"
-"keep the layout file in the same directory."
-msgstr ""
-
-#: src/frontends/qt4/GuiDocument.cpp:1298
-#, fuzzy
-msgid "&Set Layout"
-msgstr "Tekststil"
-
-#: src/frontends/qt4/GuiDocument.cpp:1310
-#: src/frontends/qt4/GuiDocument.cpp:2108
+#: src/frontends/qt4/GuiDocument.cpp:1311
+#: src/frontends/qt4/GuiDocument.cpp:2160
 #, fuzzy
 msgid "Unable to set document class."
 msgstr "Klarte ikkje å lagre standardval for dokument "
 
-#: src/frontends/qt4/GuiDocument.cpp:1315
-#: src/frontends/qt4/GuiDocument.cpp:2097
+#: src/frontends/qt4/GuiDocument.cpp:1316
+#: src/frontends/qt4/GuiDocument.cpp:2149
 #, fuzzy
 msgid "Unapplied changes"
 msgstr "Registrer endringar"
 
-#: src/frontends/qt4/GuiDocument.cpp:1316
-#: src/frontends/qt4/GuiDocument.cpp:2098
+#: src/frontends/qt4/GuiDocument.cpp:1317
+#: src/frontends/qt4/GuiDocument.cpp:2150
 msgid ""
 "Some changes in the dialog were not yet applied.\n"
 "If you do not apply now, they will be lost after this action."
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1318
-#: src/frontends/qt4/GuiDocument.cpp:2100
+#: src/frontends/qt4/GuiDocument.cpp:1319
+#: src/frontends/qt4/GuiDocument.cpp:2152
 msgid "&Dismiss"
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1345
+#: src/frontends/qt4/GuiDocument.cpp:1351
 #, fuzzy, c-format
 msgid "%1$s, %2$s"
 msgstr "%1$s og %2$s"
 
-#: src/frontends/qt4/GuiDocument.cpp:1350
+#: src/frontends/qt4/GuiDocument.cpp:1356
 #, fuzzy, c-format
 msgid "%1$s, %2$s, and %3$s"
 msgstr "%1$s og %2$s"
 
-#: src/frontends/qt4/GuiDocument.cpp:1395
+#: src/frontends/qt4/GuiDocument.cpp:1401
 #, c-format
 msgid "Package(s) required: %1$s."
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1401
+#: src/frontends/qt4/GuiDocument.cpp:1407
 #, fuzzy
 msgid "or"
 msgstr "Skjema"
 
-#: src/frontends/qt4/GuiDocument.cpp:1404
+#: src/frontends/qt4/GuiDocument.cpp:1410
 #, c-format
 msgid "Module required: %1$s."
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1413
+#: src/frontends/qt4/GuiDocument.cpp:1419
 #, c-format
 msgid "Modules excluded: %1$s."
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1419
+#: src/frontends/qt4/GuiDocument.cpp:1425
 msgid "WARNING: Some packages are unavailable!"
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:2120
+#: src/frontends/qt4/GuiDocument.cpp:2172
 #, fuzzy
 msgid "Can't set layout!"
 msgstr "Endra avsnittstil"
 
-#: src/frontends/qt4/GuiDocument.cpp:2121
+#: src/frontends/qt4/GuiDocument.cpp:2173
 #, fuzzy, c-format
 msgid "Unable to set layout for ID: %1$s"
 msgstr "Klarte ikkje å lagre standardval for dokument "
 
-#: src/frontends/qt4/GuiDocument.cpp:2198
+#: src/frontends/qt4/GuiDocument.cpp:2250
 #, fuzzy
 msgid "Not Found"
 msgstr "Ikkje vist."
@@ -16915,7 +17496,7 @@ msgstr "TeX val"
 msgid "Error List"
 msgstr "Kodelister"
 
-#: src/frontends/qt4/GuiErrorList.cpp:91
+#: src/frontends/qt4/GuiErrorList.cpp:94
 #, c-format
 msgid "%1$s Errors (%2$s)"
 msgstr "%1$s feil (%2$s)"
@@ -16972,7 +17553,7 @@ msgstr "Vel ekstern fil"
 msgid "Float Settings"
 msgstr "Flytarval"
 
-#: src/frontends/qt4/GuiGraphics.cpp:152 src/frontends/qt4/GuiPrefs.cpp:864
+#: src/frontends/qt4/GuiGraphics.cpp:152 src/frontends/qt4/GuiPrefs.cpp:865
 msgid "Graphics"
 msgstr "Grafikk"
 
@@ -17086,35 +17667,35 @@ msgstr "Val for Kodelister"
 msgid "No dialect"
 msgstr "Ingen dialekt"
 
-#: src/frontends/qt4/GuiLog.cpp:103 src/frontends/qt4/GuiLog.cpp:177
+#: src/frontends/qt4/GuiLog.cpp:103 src/frontends/qt4/GuiLog.cpp:180
 msgid "LaTeX Log"
 msgstr "LaTeX-logg"
 
-#: src/frontends/qt4/GuiLog.cpp:179
+#: src/frontends/qt4/GuiLog.cpp:182
 msgid "Literate Programming Build Log"
 msgstr "Loggen til lesbar programmering"
 
-#: src/frontends/qt4/GuiLog.cpp:181
+#: src/frontends/qt4/GuiLog.cpp:184
 msgid "lyx2lyx Error Log"
 msgstr "lyx2lyx feillogg"
 
-#: src/frontends/qt4/GuiLog.cpp:183
+#: src/frontends/qt4/GuiLog.cpp:186
 msgid "Version Control Log"
 msgstr "Loggen til versjonkontrollen"
 
-#: src/frontends/qt4/GuiLog.cpp:209
+#: src/frontends/qt4/GuiLog.cpp:212
 msgid "No LaTeX log file found."
 msgstr "Ingen LaTeX loggfiler."
 
-#: src/frontends/qt4/GuiLog.cpp:212
+#: src/frontends/qt4/GuiLog.cpp:215
 msgid "No literate programming build log file found."
 msgstr "Fann ingen logg for lesbar programmering."
 
-#: src/frontends/qt4/GuiLog.cpp:215
+#: src/frontends/qt4/GuiLog.cpp:218
 msgid "No lyx2lyx error log file found."
 msgstr "Fann ingen lyx2lyx loggfiler."
 
-#: src/frontends/qt4/GuiLog.cpp:218
+#: src/frontends/qt4/GuiLog.cpp:221
 msgid "No version control log file found."
 msgstr "Fann ingen versjonkontroll-logg."
 
@@ -17148,245 +17729,255 @@ msgstr ""
 " Vanlegvis treng du ikkje endre denne, fordi vi nyttar den lengste etiketten "
 "til å sette bredda på etikettane."
 
-#: src/frontends/qt4/GuiPrefs.cpp:131
+#: src/frontends/qt4/GuiPrefs.cpp:132
 msgid "System files|#S#s"
 msgstr "System filer|#S#s"
 
-#: src/frontends/qt4/GuiPrefs.cpp:135
+#: src/frontends/qt4/GuiPrefs.cpp:136
 msgid "User files|#U#u"
 msgstr "Brukar filer|#B#b"
 
-#: src/frontends/qt4/GuiPrefs.cpp:219
+#: src/frontends/qt4/GuiPrefs.cpp:220
 #, fuzzy
 msgid "Look & Feel"
 msgstr "Utsjånad og kjensle"
 
-#: src/frontends/qt4/GuiPrefs.cpp:221
+#: src/frontends/qt4/GuiPrefs.cpp:222
 #, fuzzy
 msgid "Language Settings"
 msgstr "Språkval"
 
-#: src/frontends/qt4/GuiPrefs.cpp:222
+#: src/frontends/qt4/GuiPrefs.cpp:223
 #, fuzzy
 msgid "Output"
 msgstr "Eksportvegar"
 
-#: src/frontends/qt4/GuiPrefs.cpp:223
+#: src/frontends/qt4/GuiPrefs.cpp:224
 #, fuzzy
 msgid "File Handling"
 msgstr "Handsaming av skrifttyper"
 
-#: src/frontends/qt4/GuiPrefs.cpp:360
+#: src/frontends/qt4/GuiPrefs.cpp:361
 msgid "Date format"
 msgstr "Datoformat"
 
-#: src/frontends/qt4/GuiPrefs.cpp:387
+#: src/frontends/qt4/GuiPrefs.cpp:388
 #, fuzzy
 msgid "Keyboard/Mouse"
 msgstr "Tastatur"
 
-#: src/frontends/qt4/GuiPrefs.cpp:462
+#: src/frontends/qt4/GuiPrefs.cpp:463
 #, fuzzy
 msgid "Input Completion"
 msgstr "Figur/tabell-tekst"
 
-#: src/frontends/qt4/GuiPrefs.cpp:591
+#: src/frontends/qt4/GuiPrefs.cpp:592
 msgid "Screen fonts"
 msgstr "Skjerm skrift"
 
-#: src/frontends/qt4/GuiPrefs.cpp:765
+#: src/frontends/qt4/GuiPrefs.cpp:766
 msgid "Colors"
 msgstr "Fargar"
 
-#: src/frontends/qt4/GuiPrefs.cpp:918
+#: src/frontends/qt4/GuiPrefs.cpp:919
 msgid "Paths"
 msgstr "Stigar"
 
-#: src/frontends/qt4/GuiPrefs.cpp:973
+#: src/frontends/qt4/GuiPrefs.cpp:974
 #, fuzzy
 msgid "Select directory for example files"
 msgstr "Vel mal"
 
-#: src/frontends/qt4/GuiPrefs.cpp:982
+#: src/frontends/qt4/GuiPrefs.cpp:983
 msgid "Select a document templates directory"
 msgstr "Vel ein stig til malar"
 
-#: src/frontends/qt4/GuiPrefs.cpp:991
+#: src/frontends/qt4/GuiPrefs.cpp:992
 msgid "Select a temporary directory"
 msgstr "Katalog for mellombelse filer"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1000
+#: src/frontends/qt4/GuiPrefs.cpp:1001
 msgid "Select a backups directory"
 msgstr "Vel stil til reservekopiar"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1009
+#: src/frontends/qt4/GuiPrefs.cpp:1010
 msgid "Select a document directory"
 msgstr "Vel stig til dokument"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1018
+#: src/frontends/qt4/GuiPrefs.cpp:1019
 msgid "Give a filename for the LyX server pipe"
 msgstr "Fil namnet til LyXServer datarøyr"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1031
+#: src/frontends/qt4/GuiPrefs.cpp:1032
 #: src/frontends/qt4/GuiSpellchecker.cpp:57
 msgid "Spellchecker"
 msgstr "Stavekontroll"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1053
+#: src/frontends/qt4/GuiPrefs.cpp:1054
 msgid "ispell"
 msgstr "ispell"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1054
+#: src/frontends/qt4/GuiPrefs.cpp:1055
 msgid "aspell"
 msgstr "aspell"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1055
+#: src/frontends/qt4/GuiPrefs.cpp:1056
 msgid "hspell"
 msgstr "hspell"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1057
+#: src/frontends/qt4/GuiPrefs.cpp:1058
 msgid "pspell (library)"
 msgstr "psspell (bibliotek )"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1060
+#: src/frontends/qt4/GuiPrefs.cpp:1061
 msgid "aspell (library)"
 msgstr "aspell (bibliotek )"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1140
+#: src/frontends/qt4/GuiPrefs.cpp:1141
 msgid "Converters"
 msgstr "Eksportprogram"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1445
+#: src/frontends/qt4/GuiPrefs.cpp:1446
 msgid "File formats"
 msgstr "Filformat"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1643
+#: src/frontends/qt4/GuiPrefs.cpp:1644
 msgid "Format in use"
 msgstr "Format som er i bruk"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1644
+#: src/frontends/qt4/GuiPrefs.cpp:1645
 msgid "Cannot remove a Format used by a Converter. Remove the converter first."
 msgstr ""
 "Kan ikkje fjerna eit format som er brukt av eit eksportprogram. Fjern "
 "programmet fyrst."
 
-#: src/frontends/qt4/GuiPrefs.cpp:1749
+#: src/frontends/qt4/GuiPrefs.cpp:1719
+msgid "LyX needs to be restarted!"
+msgstr ""
+
+#: src/frontends/qt4/GuiPrefs.cpp:1720
+msgid ""
+"The change of user interface language will be fully effective only after a "
+"restart."
+msgstr ""
+
+#: src/frontends/qt4/GuiPrefs.cpp:1778
 msgid "Printer"
 msgstr "Skrivar"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1847 src/frontends/qt4/GuiPrefs.cpp:2476
+#: src/frontends/qt4/GuiPrefs.cpp:1876 src/frontends/qt4/GuiPrefs.cpp:2536
 msgid "User interface"
 msgstr "Grensesnitt"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1926
+#: src/frontends/qt4/GuiPrefs.cpp:1955
 #, fuzzy
 msgid "Control"
 msgstr "Setelen"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1998
+#: src/frontends/qt4/GuiPrefs.cpp:2027
 #, fuzzy
 msgid "Shortcuts"
 msgstr "&Snøggtast:"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2003
+#: src/frontends/qt4/GuiPrefs.cpp:2032
 #, fuzzy
 msgid "Function"
 msgstr "Funksjonar"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2004
+#: src/frontends/qt4/GuiPrefs.cpp:2033
 #, fuzzy
 msgid "Shortcut"
 msgstr "&Snøggtast:"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2080
+#: src/frontends/qt4/GuiPrefs.cpp:2113
 msgid "Cursor, Mouse and Editing functions"
 msgstr ""
 
-#: src/frontends/qt4/GuiPrefs.cpp:2084
+#: src/frontends/qt4/GuiPrefs.cpp:2117
 #, fuzzy
 msgid "Mathematical Symbols"
 msgstr "Fonetiske symbol|y"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2088
+#: src/frontends/qt4/GuiPrefs.cpp:2121
 #, fuzzy
 msgid "Document and Window"
 msgstr "Filhovud-feil"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2092
+#: src/frontends/qt4/GuiPrefs.cpp:2125
 msgid "Font, Layouts and Textclasses"
 msgstr ""
 
-#: src/frontends/qt4/GuiPrefs.cpp:2096
+#: src/frontends/qt4/GuiPrefs.cpp:2129
 #, fuzzy
 msgid "System and Miscellaneous"
 msgstr "AMS ymse"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2222 src/frontends/qt4/GuiPrefs.cpp:2289
+#: src/frontends/qt4/GuiPrefs.cpp:2255 src/frontends/qt4/GuiPrefs.cpp:2300
 #, fuzzy
 msgid "Res&tore"
 msgstr "Gjenopp&rett"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2357 src/frontends/qt4/GuiPrefs.cpp:2364
-#: src/frontends/qt4/GuiPrefs.cpp:2371 src/frontends/qt4/GuiPrefs.cpp:2383
+#: src/frontends/qt4/GuiPrefs.cpp:2401 src/frontends/qt4/GuiPrefs.cpp:2408
+#: src/frontends/qt4/GuiPrefs.cpp:2415 src/frontends/qt4/GuiPrefs.cpp:2432
 #, fuzzy
 msgid "Failed to create shortcut"
 msgstr "Klarte ikkje å lage katalog. Stoppar."
 
-#: src/frontends/qt4/GuiPrefs.cpp:2358
+#: src/frontends/qt4/GuiPrefs.cpp:2402
 #, fuzzy
 msgid "Unknown or invalid LyX function"
 msgstr "Ukjent funksjon."
 
-#: src/frontends/qt4/GuiPrefs.cpp:2365
+#: src/frontends/qt4/GuiPrefs.cpp:2409
 msgid "Invalid or empty key sequence"
 msgstr ""
 
-#: src/frontends/qt4/GuiPrefs.cpp:2372
+#: src/frontends/qt4/GuiPrefs.cpp:2416
 msgid "Shortcut is already defined"
 msgstr ""
 
-#: src/frontends/qt4/GuiPrefs.cpp:2384
+#: src/frontends/qt4/GuiPrefs.cpp:2433
 #, fuzzy
 msgid "Can not insert shortcut to the list"
 msgstr "Legg til ei ny grein til lista"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2404
+#: src/frontends/qt4/GuiPrefs.cpp:2464
 msgid "Identity"
 msgstr "Identitet"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2599
+#: src/frontends/qt4/GuiPrefs.cpp:2653
 msgid "Choose bind file"
 msgstr "Vel bindingsfil"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2600
+#: src/frontends/qt4/GuiPrefs.cpp:2654
 msgid "LyX bind files (*.bind)"
 msgstr "LyX teiknbindingar (*.bind)"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2606
+#: src/frontends/qt4/GuiPrefs.cpp:2660
 msgid "Choose UI file"
 msgstr "Vel UI fil"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2607
+#: src/frontends/qt4/GuiPrefs.cpp:2661
 msgid "LyX UI files (*.ui)"
 msgstr "LyX UI-filer(*.ui)"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2613
+#: src/frontends/qt4/GuiPrefs.cpp:2667
 msgid "Choose keyboard map"
 msgstr "Vel tastatur oversikt"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2614
+#: src/frontends/qt4/GuiPrefs.cpp:2668
 msgid "LyX keyboard maps (*.kmap)"
 msgstr "LyX;tastaturoversikt.(*.kmap)"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2620
+#: src/frontends/qt4/GuiPrefs.cpp:2674
 msgid "Choose personal dictionary"
 msgstr "Vel personleg ordbok"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2621
+#: src/frontends/qt4/GuiPrefs.cpp:2675
 msgid "*.pws"
 msgstr "*.pws"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2621
+#: src/frontends/qt4/GuiPrefs.cpp:2675
 msgid "*.ispell"
 msgstr "*.ispell"
 
@@ -17912,17 +18503,22 @@ msgstr ""
 msgid "Enter characters to filter the layout list."
 msgstr ""
 
-#: src/frontends/qt4/GuiToolbar.cpp:927
+#: src/frontends/qt4/GuiToolbar.cpp:537
+#, fuzzy
+msgid " (unknown)"
+msgstr " ukjent"
+
+#: src/frontends/qt4/GuiToolbar.cpp:945
 #, fuzzy
 msgid "auto"
 msgstr " (auto)"
 
-#: src/frontends/qt4/GuiToolbar.cpp:932 src/frontends/qt4/GuiToolbar.cpp:941
+#: src/frontends/qt4/GuiToolbar.cpp:950 src/frontends/qt4/GuiToolbar.cpp:959
 #, fuzzy
 msgid "off"
 msgstr "Av"
 
-#: src/frontends/qt4/GuiToolbar.cpp:948
+#: src/frontends/qt4/GuiToolbar.cpp:966
 #, c-format
 msgid "Toolbar \"%1$s\" state set to %2$s"
 msgstr ""
@@ -17952,67 +18548,82 @@ msgstr "Normale ikon"
 msgid "Big-sized icons"
 msgstr "Store ikon"
 
-#: src/frontends/qt4/GuiView.cpp:390
+#: src/frontends/qt4/GuiView.cpp:396
 #, fuzzy, c-format
 msgid "Unknown toolbar \"%1$s\""
 msgstr "Ukjent tabellval '%1$s'"
 
-#: src/frontends/qt4/GuiView.cpp:1189
+#: src/frontends/qt4/GuiView.cpp:1218
 msgid "Select template file"
 msgstr "Vel mal"
 
-#: src/frontends/qt4/GuiView.cpp:1191 src/frontends/qt4/GuiView.cpp:1580
+#: src/frontends/qt4/GuiView.cpp:1220 src/frontends/qt4/GuiView.cpp:1613
 msgid "Templates|#T#t"
 msgstr "Malar|#M#m"
 
-#: src/frontends/qt4/GuiView.cpp:1194 src/frontends/qt4/GuiView.cpp:1253
-#: src/frontends/qt4/GuiView.cpp:1506 src/frontends/qt4/GuiView.cpp:1587
+#: src/frontends/qt4/GuiView.cpp:1223 src/frontends/qt4/GuiView.cpp:1281
+#: src/frontends/qt4/GuiView.cpp:1539 src/frontends/qt4/GuiView.cpp:1620
 msgid "LyX Documents (*.lyx)"
 msgstr "LyX Dokument (*.lyx)"
 
-#: src/frontends/qt4/GuiView.cpp:1211
+#: src/frontends/qt4/GuiView.cpp:1240
 msgid "Document not loaded."
 msgstr "Dokumentet er ikkje lasta."
 
-#: src/frontends/qt4/GuiView.cpp:1247
+#: src/frontends/qt4/GuiView.cpp:1276
 msgid "Select document to open"
 msgstr "Vel dokument"
 
-#: src/frontends/qt4/GuiView.cpp:1249 src/frontends/qt4/GuiView.cpp:1382
-#: src/frontends/qt4/GuiView.cpp:1501
+#: src/frontends/qt4/GuiView.cpp:1278 src/frontends/qt4/GuiView.cpp:1415
+#: src/frontends/qt4/GuiView.cpp:1534
 msgid "Examples|#E#e"
 msgstr "Eksempla|#E#e"
 
-#: src/frontends/qt4/GuiView.cpp:1285
+#: src/frontends/qt4/GuiView.cpp:1282
+#, fuzzy
+msgid "LyX-1.3.x Documents (*.lyx13)"
+msgstr "LyX Dokument (*.lyx)"
+
+#: src/frontends/qt4/GuiView.cpp:1283
+#, fuzzy
+msgid "LyX-1.4.x Documents (*.lyx14)"
+msgstr "LyX Dokument (*.lyx)"
+
+#: src/frontends/qt4/GuiView.cpp:1284
+#, fuzzy
+msgid "LyX-1.5.x Documents (*.lyx15)"
+msgstr "LyX Dokument (*.lyx)"
+
+#: src/frontends/qt4/GuiView.cpp:1318
 #, c-format
 msgid "Opening document %1$s..."
 msgstr "Opnar dokumentet %1$s..."
 
-#: src/frontends/qt4/GuiView.cpp:1294
+#: src/frontends/qt4/GuiView.cpp:1327
 #, c-format
 msgid "Document %1$s opened."
 msgstr "Dokumentet %1$s er ope."
 
-#: src/frontends/qt4/GuiView.cpp:1296
+#: src/frontends/qt4/GuiView.cpp:1329
 #, c-format
 msgid "Could not open document %1$s"
 msgstr "Kunne ikkje opna dokumentet %1$s"
 
-#: src/frontends/qt4/GuiView.cpp:1325
+#: src/frontends/qt4/GuiView.cpp:1358
 msgid "Couldn't import file"
 msgstr "Kan ikkje importere fila"
 
-#: src/frontends/qt4/GuiView.cpp:1326
+#: src/frontends/qt4/GuiView.cpp:1359
 #, c-format
 msgid "No information for importing the format %1$s."
 msgstr "Veit ikkje korleis ein importerer %1$s."
 
-#: src/frontends/qt4/GuiView.cpp:1377
+#: src/frontends/qt4/GuiView.cpp:1410
 #, c-format
 msgid "Select %1$s file to import"
 msgstr "Vel %1$s filen som skal importerast"
 
-#: src/frontends/qt4/GuiView.cpp:1428 src/frontends/qt4/GuiView.cpp:1604
+#: src/frontends/qt4/GuiView.cpp:1461 src/frontends/qt4/GuiView.cpp:1637
 #, fuzzy, c-format
 msgid ""
 "The document %1$s already exists.\n"
@@ -18023,42 +18634,42 @@ msgstr ""
 "\n"
 "Vil du skriva over dokumentet?"
 
-#: src/frontends/qt4/GuiView.cpp:1430 src/frontends/qt4/GuiView.cpp:1608
+#: src/frontends/qt4/GuiView.cpp:1463 src/frontends/qt4/GuiView.cpp:1641
 #, fuzzy
 msgid "Overwrite document?"
 msgstr "Skriv over dokumentet?"
 
-#: src/frontends/qt4/GuiView.cpp:1439
+#: src/frontends/qt4/GuiView.cpp:1472
 #, c-format
 msgid "Importing %1$s..."
 msgstr "Importerer %1$s..."
 
-#: src/frontends/qt4/GuiView.cpp:1442
+#: src/frontends/qt4/GuiView.cpp:1475
 msgid "imported."
 msgstr "importert."
 
-#: src/frontends/qt4/GuiView.cpp:1444
+#: src/frontends/qt4/GuiView.cpp:1477
 #, fuzzy
 msgid "file not imported!"
 msgstr "Kan ikkje finne fila"
 
-#: src/frontends/qt4/GuiView.cpp:1499
+#: src/frontends/qt4/GuiView.cpp:1532
 msgid "Select LyX document to insert"
 msgstr "Vel kva for LyX-dokument som skal bli henta inn"
 
-#: src/frontends/qt4/GuiView.cpp:1540
+#: src/frontends/qt4/GuiView.cpp:1573
 msgid "Select file to insert"
 msgstr "Vel fil å setje inn"
 
-#: src/frontends/qt4/GuiView.cpp:1577
+#: src/frontends/qt4/GuiView.cpp:1610
 msgid "Choose a filename to save document as"
 msgstr "Vel eit anna filnamn"
 
-#: src/frontends/qt4/GuiView.cpp:1609 src/frontends/qt4/GuiView.cpp:1654
+#: src/frontends/qt4/GuiView.cpp:1642 src/frontends/qt4/GuiView.cpp:1687
 msgid "&Rename"
 msgstr "End&ra namn"
 
-#: src/frontends/qt4/GuiView.cpp:1650
+#: src/frontends/qt4/GuiView.cpp:1683
 #, c-format
 msgid ""
 "The document %1$s could not be saved.\n"
@@ -18069,16 +18680,16 @@ msgstr ""
 "\n"
 "Vil du prøve å gi dokumentet eit nytt namn?"
 
-#: src/frontends/qt4/GuiView.cpp:1653
+#: src/frontends/qt4/GuiView.cpp:1686
 msgid "Rename and save?"
 msgstr "Gje nytt namn og lagra?"
 
-#: src/frontends/qt4/GuiView.cpp:1654
+#: src/frontends/qt4/GuiView.cpp:1687
 #, fuzzy
 msgid "&Retry"
 msgstr "Gjenopp&rett"
 
-#: src/frontends/qt4/GuiView.cpp:1704
+#: src/frontends/qt4/GuiView.cpp:1737
 #, c-format
 msgid ""
 "The document %1$s has unsaved changes.\n"
@@ -18089,21 +18700,21 @@ msgstr ""
 "\n"
 "Vil du lagra dokumentet eller forkaste endringane?"
 
-#: src/frontends/qt4/GuiView.cpp:1707
+#: src/frontends/qt4/GuiView.cpp:1740
 msgid "&Discard"
 msgstr "&Forkast"
 
-#: src/frontends/qt4/GuiView.cpp:1806
+#: src/frontends/qt4/GuiView.cpp:1844
 #, fuzzy
 msgid "Saving all documents..."
 msgstr "Lagrar %1$s..."
 
-#: src/frontends/qt4/GuiView.cpp:1816
+#: src/frontends/qt4/GuiView.cpp:1854
 #, fuzzy
 msgid "All documents saved."
 msgstr "Dokumentet er ikkje lagra!"
 
-#: src/frontends/qt4/GuiView.cpp:2010
+#: src/frontends/qt4/GuiView.cpp:2054
 #, c-format
 msgid "%1$s unknown command!"
 msgstr ""
@@ -18123,25 +18734,25 @@ msgstr "Bokmerke|B"
 msgid "Literate Source"
 msgstr "LaTeX kjeldekode"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:1128
+#: src/frontends/qt4/GuiWorkArea.cpp:1150
 msgid " (changed)"
 msgstr " (endra)"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:1132
+#: src/frontends/qt4/GuiWorkArea.cpp:1154
 msgid " (read only)"
 msgstr " (berre lesing)"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:1219
+#: src/frontends/qt4/GuiWorkArea.cpp:1241
 #, fuzzy
 msgid "Close File"
 msgstr "Lat att"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:1617
+#: src/frontends/qt4/GuiWorkArea.cpp:1634
 #, fuzzy
 msgid "Hide tab"
 msgstr "delta"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:1619
+#: src/frontends/qt4/GuiWorkArea.cpp:1636
 #, fuzzy
 msgid "Close tab"
 msgstr "Lat att"
@@ -18159,50 +18770,50 @@ msgstr ""
 msgid "No Group"
 msgstr ""
 
-#: src/frontends/qt4/Menus.cpp:694
+#: src/frontends/qt4/Menus.cpp:699
 #, fuzzy
 msgid "No Documents Open!"
 msgstr "Ingen opne dokument!"
 
-#: src/frontends/qt4/Menus.cpp:720 src/frontends/qt4/Menus.cpp:799
-#: src/frontends/qt4/Menus.cpp:819 src/frontends/qt4/Menus.cpp:840
-#: src/frontends/qt4/Menus.cpp:922 src/frontends/qt4/Menus.cpp:1032
-#: src/frontends/qt4/Menus.cpp:1063
+#: src/frontends/qt4/Menus.cpp:725 src/frontends/qt4/Menus.cpp:804
+#: src/frontends/qt4/Menus.cpp:824 src/frontends/qt4/Menus.cpp:845
+#: src/frontends/qt4/Menus.cpp:927 src/frontends/qt4/Menus.cpp:1033
+#: src/frontends/qt4/Menus.cpp:1064
 msgid "No Document Open!"
 msgstr "Ingen opne dokument!"
 
-#: src/frontends/qt4/Menus.cpp:937
+#: src/frontends/qt4/Menus.cpp:938
 msgid "Master Document"
 msgstr "Hovuddokumentet"
 
-#: src/frontends/qt4/Menus.cpp:954
+#: src/frontends/qt4/Menus.cpp:955
 msgid "Open Navigator..."
 msgstr ""
 
-#: src/frontends/qt4/Menus.cpp:975
+#: src/frontends/qt4/Menus.cpp:976
 #, fuzzy
 msgid "Other Lists"
 msgstr "Andre flytarar"
 
-#: src/frontends/qt4/Menus.cpp:984
+#: src/frontends/qt4/Menus.cpp:985
 msgid "No Table of contents"
 msgstr "Inga innhaldsliste"
 
-#: src/frontends/qt4/Menus.cpp:1021
+#: src/frontends/qt4/Menus.cpp:1022
 #, fuzzy
 msgid "Other Toolbars"
 msgstr "Verktylinjer|y"
 
-#: src/frontends/qt4/Menus.cpp:1040
+#: src/frontends/qt4/Menus.cpp:1041
 msgid "No Branch in Document!"
 msgstr "Ingen greiner i dokumentet!"
 
-#: src/frontends/qt4/Menus.cpp:1071
+#: src/frontends/qt4/Menus.cpp:1072
 #, fuzzy
 msgid "No Citation in Scope!"
 msgstr "Det er ikkje definert noko skrifttype endring."
 
-#: src/frontends/qt4/Menus.cpp:1590
+#: src/frontends/qt4/Menus.cpp:1600
 #, fuzzy
 msgid "No action defined!"
 msgstr "Det er ikkje definert noko skrifttype endring."
@@ -18213,7 +18824,7 @@ msgstr "mellomrom"
 
 #: src/frontends/qt4/Validator.cpp:175 src/insets/ExternalSupport.cpp:365
 #: src/insets/InsetBibtex.cpp:286 src/insets/InsetGraphics.cpp:586
-#: src/insets/InsetInclude.cpp:465
+#: src/insets/InsetInclude.cpp:443
 msgid "Invalid filename"
 msgstr "Ugyldig filnamn"
 
@@ -18223,87 +18834,87 @@ msgid ""
 "characters:\n"
 msgstr "LyX støttar ikkje LaTeX filer med desse teikna i filnamnet:\n"
 
-#: src/frontends/qt4/qt_helpers.cpp:179
+#: src/frontends/qt4/qt_helpers.cpp:173
 msgid "Could not update TeX information"
 msgstr "Kan ikkje oppdatere TeX informasjon"
 
-#: src/frontends/qt4/qt_helpers.cpp:180
+#: src/frontends/qt4/qt_helpers.cpp:174
 #, c-format
 msgid "The script `%s' failed."
 msgstr "Køyringa av programmet %s gjekk gale."
 
-#: src/frontends/qt4/qt_helpers.cpp:411
+#: src/frontends/qt4/qt_helpers.cpp:405
 #, fuzzy
 msgid "All Files "
 msgstr "Alle filer (*)"
 
-#: src/frontends/qt4/qt_helpers.cpp:484 src/insets/InsetTOC.cpp:48
+#: src/frontends/qt4/qt_helpers.cpp:478 src/insets/InsetTOC.cpp:49
 msgid "Table of Contents"
 msgstr "Innhaldsliste"
 
-#: src/frontends/qt4/qt_helpers.cpp:486
+#: src/frontends/qt4/qt_helpers.cpp:480
 #, fuzzy
 msgid "Child Documents"
 msgstr "Barnedokumentet"
 
-#: src/frontends/qt4/qt_helpers.cpp:488
+#: src/frontends/qt4/qt_helpers.cpp:482
 #, fuzzy
 msgid "List of Graphics"
 msgstr "Liste over tabellar"
 
-#: src/frontends/qt4/qt_helpers.cpp:490
+#: src/frontends/qt4/qt_helpers.cpp:484
 #, fuzzy
 msgid "List of Equations"
 msgstr "Liste over kodelister"
 
-#: src/frontends/qt4/qt_helpers.cpp:492
+#: src/frontends/qt4/qt_helpers.cpp:486
 #, fuzzy
 msgid "List of Footnotes"
 msgstr "Liste over figurar"
 
-#: src/frontends/qt4/qt_helpers.cpp:494
+#: src/frontends/qt4/qt_helpers.cpp:488
 #, fuzzy
 msgid "List of Listings"
 msgstr "Liste over kodelister"
 
-#: src/frontends/qt4/qt_helpers.cpp:496
+#: src/frontends/qt4/qt_helpers.cpp:490
 #, fuzzy
 msgid "List of Indexes"
 msgstr "Liste over tabellar"
 
-#: src/frontends/qt4/qt_helpers.cpp:498
+#: src/frontends/qt4/qt_helpers.cpp:492
 #, fuzzy
 msgid "List of Marginal notes"
 msgstr "Liste over tabellar"
 
-#: src/frontends/qt4/qt_helpers.cpp:500
+#: src/frontends/qt4/qt_helpers.cpp:494
 #, fuzzy
 msgid "List of Notes"
 msgstr "Liste over tabellar"
 
-#: src/frontends/qt4/qt_helpers.cpp:502
+#: src/frontends/qt4/qt_helpers.cpp:496
 #, fuzzy
 msgid "List of Citations"
 msgstr "Liste over kodelister"
 
-#: src/frontends/qt4/qt_helpers.cpp:504
+#: src/frontends/qt4/qt_helpers.cpp:498
 #, fuzzy
 msgid "Labels and References"
 msgstr "Litteratur ikkje nytta i teksten"
 
-#: src/frontends/qt4/qt_helpers.cpp:506
+#: src/frontends/qt4/qt_helpers.cpp:500
 #, fuzzy
 msgid "List of Branches"
 msgstr "Liste over tabellar"
 
 #: src/insets/ExternalSupport.cpp:366 src/insets/InsetBibtex.cpp:287
-#: src/insets/InsetGraphics.cpp:587 src/insets/InsetInclude.cpp:466
+#: src/insets/InsetGraphics.cpp:587 src/insets/InsetInclude.cpp:444
 msgid ""
 "The following filename is likely to cause trouble when running the exported "
 "file through LaTeX: "
 msgstr ""
 
-#: src/insets/Inset.cpp:334
+#: src/insets/Inset.cpp:333
 msgid "Opened inset"
 msgstr "Opna innskot"
 
@@ -18420,10 +19031,6 @@ msgstr "dobbel"
 msgid "Opened Box Inset"
 msgstr "Opna ramme innskot"
 
-#: src/insets/InsetBox.cpp:145
-msgid "Box"
-msgstr "Ramme"
-
 #: src/insets/InsetBranch.cpp:55
 msgid "Opened Branch Inset"
 msgstr "Opna grein innskot"
@@ -18498,16 +19105,12 @@ msgstr "Manglar \\end_inset her."
 msgid "Opened ERT Inset"
 msgstr "Opna ERT innskot"
 
-#: src/insets/InsetEnvironment.cpp:53
-msgid "Opened Environment Inset: "
-msgstr "Opna miljø innskot"
-
-#: src/insets/InsetExternal.cpp:493
+#: src/insets/InsetExternal.cpp:491
 #, c-format
 msgid "External template %1$s is not installed"
 msgstr "Ekstern mal %1$s er ikkje installert"
 
-#: src/insets/InsetFlex.cpp:52
+#: src/insets/InsetFlex.cpp:51
 #, fuzzy
 msgid "Opened Flex Inset"
 msgstr "Opna tekst innskot"
@@ -18551,7 +19154,7 @@ msgstr "Opna botntekst innskot"
 msgid "footnote"
 msgstr "botntekst"
 
-#: src/insets/InsetGraphics.cpp:464 src/insets/InsetInclude.cpp:543
+#: src/insets/InsetGraphics.cpp:464 src/insets/InsetInclude.cpp:521
 #, c-format
 msgid ""
 "Could not copy the file\n"
@@ -18572,24 +19175,24 @@ msgstr "Ingen konvertering av %1$s var naudsynt likvel"
 msgid "Graphics file: %1$s"
 msgstr "Grafikk-fil: %1$s"
 
-#: src/insets/InsetInclude.cpp:340
+#: src/insets/InsetInclude.cpp:318
 msgid "Verbatim Input"
 msgstr "Set inn Verbatim"
 
-#: src/insets/InsetInclude.cpp:343
+#: src/insets/InsetInclude.cpp:321
 msgid "Verbatim Input*"
 msgstr "Set inn Verbatim*"
 
-#: src/insets/InsetInclude.cpp:439 src/insets/InsetInclude.cpp:631
+#: src/insets/InsetInclude.cpp:417 src/insets/InsetInclude.cpp:609
 msgid "Recursive input"
 msgstr "Rekursiv"
 
-#: src/insets/InsetInclude.cpp:440 src/insets/InsetInclude.cpp:632
+#: src/insets/InsetInclude.cpp:418 src/insets/InsetInclude.cpp:610
 #, c-format
 msgid "Attempted to include file %1$s in itself! Ignoring inclusion."
 msgstr "Prøvde å sette inn fila  %1$s inn i seg sjølv. Dette overser eg glatt."
 
-#: src/insets/InsetInclude.cpp:488
+#: src/insets/InsetInclude.cpp:466
 #, c-format
 msgid ""
 "Included file `%1$s'\n"
@@ -18600,11 +19203,11 @@ msgstr ""
 "har tekstklassa %2$s'\n"
 "medan hovuddokumentet har tekstklassa `%3$s'."
 
-#: src/insets/InsetInclude.cpp:494
+#: src/insets/InsetInclude.cpp:472
 msgid "Different textclasses"
 msgstr "Ulike tekstklassar"
 
-#: src/insets/InsetInclude.cpp:509
+#: src/insets/InsetInclude.cpp:487
 #, fuzzy, c-format
 msgid ""
 "Included file `%1$s'\n"
@@ -18615,15 +19218,11 @@ msgstr ""
 "har tekstklassa %2$s'\n"
 "medan hovuddokumentet har tekstklassa `%3$s'."
 
-#: src/insets/InsetInclude.cpp:513
+#: src/insets/InsetInclude.cpp:491
 #, fuzzy
 msgid "Module not found"
 msgstr "Kan ikkje finne fila"
 
-#: src/insets/InsetIndex.cpp:132
-msgid "Index"
-msgstr "Indeks"
-
 #: src/insets/InsetInfo.cpp:81
 #, fuzzy
 msgid "Information regarding "
@@ -18659,78 +19258,109 @@ msgstr ""
 msgid "DUPLICATE: "
 msgstr ""
 
-#: src/insets/InsetListings.cpp:123
+#: src/insets/InsetListings.cpp:126
 msgid "Opened Listing Inset"
 msgstr "Opna kodelisteinnskot"
 
-#: src/insets/InsetListingsParams.cpp:117
+#: src/insets/InsetListings.cpp:215
+msgid "no more lstline delimiters available"
+msgstr ""
+
+#: src/insets/InsetListings.cpp:220
+#, fuzzy
+msgid "Running out of delimiters"
+msgstr "Set inn skiljeteikn"
+
+#: src/insets/InsetListings.cpp:221
+msgid ""
+"For inline program listings, one character must be reserved\n"
+"as a delimiter. One of the listings, however, uses all available\n"
+"characters, so none is left for delimiting purposes.\n"
+"For the time being, I have replaced '!' by a warning, but you\n"
+"must investigate!"
+msgstr ""
+
+#: src/insets/InsetListings.cpp:265
+#, fuzzy
+msgid "Uncodable characters in listings inset"
+msgstr "spesial teikn"
+
+#: src/insets/InsetListings.cpp:266
+#, c-format
+msgid ""
+"The following characters in one of the program listings are\n"
+"not representable in the current encoding and have been omitted:\n"
+"%1$s."
+msgstr ""
+
+#: src/insets/InsetListingsParams.cpp:116
 msgid "A value is expected."
 msgstr "Eg venta ein verdi."
 
-#: src/insets/InsetListingsParams.cpp:120
-#: src/insets/InsetListingsParams.cpp:133
-#: src/insets/InsetListingsParams.cpp:146
-#: src/insets/InsetListingsParams.cpp:159
-#: src/insets/InsetListingsParams.cpp:186
-#: src/insets/InsetListingsParams.cpp:219
+#: src/insets/InsetListingsParams.cpp:119
+#: src/insets/InsetListingsParams.cpp:132
+#: src/insets/InsetListingsParams.cpp:145
+#: src/insets/InsetListingsParams.cpp:158
+#: src/insets/InsetListingsParams.cpp:185
+#: src/insets/InsetListingsParams.cpp:218
 msgid "Unbalanced braces!"
 msgstr "Ubalanserte parentesar!"
 
-#: src/insets/InsetListingsParams.cpp:128
+#: src/insets/InsetListingsParams.cpp:127
 msgid "Please specify true or false."
 msgstr "Ver venleg å skriv true(sant) eller false(falskt)."
 
-#: src/insets/InsetListingsParams.cpp:131
+#: src/insets/InsetListingsParams.cpp:130
 msgid "Only true or false is allowed."
 msgstr "Berre true(sant) eller false(falskt) er godtatt."
 
-#: src/insets/InsetListingsParams.cpp:141
+#: src/insets/InsetListingsParams.cpp:140
 msgid "Please specify an integer value."
 msgstr "Ver venleg å skriv inn eit heil tal."
 
-#: src/insets/InsetListingsParams.cpp:144
+#: src/insets/InsetListingsParams.cpp:143
 msgid "An integer is expected."
 msgstr "Eg venta eitt heiltal."
 
-#: src/insets/InsetListingsParams.cpp:154
+#: src/insets/InsetListingsParams.cpp:153
 msgid "Please specify a LaTeX length expression."
 msgstr "Ver venleg å skriv inn ei LaTeX lengde."
 
-#: src/insets/InsetListingsParams.cpp:157
+#: src/insets/InsetListingsParams.cpp:156
 msgid "Invalid LaTeX length expression."
 msgstr "Ugyldig LaTeX lengde."
 
-#: src/insets/InsetListingsParams.cpp:167
+#: src/insets/InsetListingsParams.cpp:166
 #, c-format
 msgid "Please specify one of %1$s."
 msgstr "Ver venleg skriv inn ein av %1$s."
 
-#: src/insets/InsetListingsParams.cpp:201
+#: src/insets/InsetListingsParams.cpp:200
 #, c-format
 msgid "Try one of %1$s."
 msgstr "Prøv ein av %1$s."
 
-#: src/insets/InsetListingsParams.cpp:203
+#: src/insets/InsetListingsParams.cpp:202
 #, c-format
 msgid "I guess you mean %1$s."
 msgstr "Eg tippe du meinte %1$s."
 
-#: src/insets/InsetListingsParams.cpp:211
+#: src/insets/InsetListingsParams.cpp:210
 #, c-format
 msgid "Please specify one or more of '%1$s'."
 msgstr "Ver venleg å skriv inn ein eller fleire %1$s."
 
-#: src/insets/InsetListingsParams.cpp:216
+#: src/insets/InsetListingsParams.cpp:215
 #, c-format
 msgid "Should be composed of one or more of %1$s."
 msgstr "Skal vere samansett av ein  eller fleire %1$s."
 
-#: src/insets/InsetListingsParams.cpp:279
+#: src/insets/InsetListingsParams.cpp:278
 msgid ""
 "Use \\footnotesize, \\small, \\itshape, \\ttfamily or something like that"
 msgstr "Bruk f.eks \\footnotesize, \\small, \\itshape, \\ttfamily"
 
-#: src/insets/InsetListingsParams.cpp:281
+#: src/insets/InsetListingsParams.cpp:280
 msgid ""
 "none, leftline, topline, bottomline, lines, single, shadowbox or subset of "
 "trblTRBL"
@@ -18738,7 +19368,7 @@ msgstr ""
 "none, leftline, topline, bottomline, lines, single, shadowbox or subset of "
 "trblTRBL"
 
-#: src/insets/InsetListingsParams.cpp:283
+#: src/insets/InsetListingsParams.cpp:282
 msgid ""
 "Enter four letters (either t = round or f = square) for top right, bottom "
 "right, bottom left and top left corner."
@@ -18746,19 +19376,19 @@ msgstr ""
 "Skriv inn fire bokstavar (enten t = trinne eller f=firkanta) høgretopp,"
 "høgrebotn, venstre botn og venstretopp. "
 
-#: src/insets/InsetListingsParams.cpp:286
+#: src/insets/InsetListingsParams.cpp:285
 msgid "Enter something like \\color{white}"
 msgstr "Skriv inn noko slik som \\color{white}"
 
-#: src/insets/InsetListingsParams.cpp:314
+#: src/insets/InsetListingsParams.cpp:313
 msgid "Expect a number with an optional * before it"
 msgstr "Eg venta eit nummer med ein valfri * framfor. "
 
-#: src/insets/InsetListingsParams.cpp:398
+#: src/insets/InsetListingsParams.cpp:397
 msgid "auto, last or a number"
 msgstr "auto, last(siste) eller eit nummer"
 
-#: src/insets/InsetListingsParams.cpp:408
+#: src/insets/InsetListingsParams.cpp:407
 #, fuzzy
 msgid ""
 "This parameter should not be entered here. Please use the caption edit box "
@@ -18768,7 +19398,7 @@ msgstr ""
 "Dette valet burde ikkje skrivast her. Bruk heller ledetekstboksen (når du "
 "brukar inkluderdialogen) eller menyen Set Inn-> Figur/tabell-tekst"
 
-#: src/insets/InsetListingsParams.cpp:414
+#: src/insets/InsetListingsParams.cpp:413
 #, fuzzy
 msgid ""
 "This parameter should not be entered here. Please use the label edit box "
@@ -18779,31 +19409,31 @@ msgstr ""
 "brukar inkluderdialogen) eller menyen Set Inn-> Etikett (når du brukar eit "
 "kodelisteinnskot)"
 
-#: src/insets/InsetListingsParams.cpp:617
+#: src/insets/InsetListingsParams.cpp:616
 msgid "Invalid (empty) listing parameter name."
 msgstr "Ugyldig (Tom) namn på val for kodelista."
 
-#: src/insets/InsetListingsParams.cpp:633
+#: src/insets/InsetListingsParams.cpp:632
 #, c-format
 msgid "Available listing parameters are %1$s"
 msgstr "Moglege kodeliste val er %1$s"
 
-#: src/insets/InsetListingsParams.cpp:636
+#: src/insets/InsetListingsParams.cpp:635
 #, fuzzy, c-format
 msgid "Available listings parameters containing string \"%1$s\" are %2$s"
 msgstr "Moglege kodeliste val er %1$s"
 
-#: src/insets/InsetListingsParams.cpp:647
+#: src/insets/InsetListingsParams.cpp:646
 #, c-format
 msgid "Parameter %1$s: "
 msgstr "Val %1$s: "
 
-#: src/insets/InsetListingsParams.cpp:660
+#: src/insets/InsetListingsParams.cpp:659
 #, c-format
 msgid "Unknown listing parameter name: %1$s"
 msgstr "Ukjent namn på val for kodelister: %1$s"
 
-#: src/insets/InsetListingsParams.cpp:663
+#: src/insets/InsetListingsParams.cpp:662
 #, c-format
 msgid "Parameters starting with '%1$s': %2$s"
 msgstr "Val startar med '%1$s': %2$s"
@@ -18829,15 +19459,15 @@ msgstr "Klargjer dobbelside"
 msgid "Nom"
 msgstr "Nom"
 
-#: src/insets/InsetNote.cpp:65
+#: src/insets/InsetNote.cpp:66
 msgid "Note[[InsetNote]]"
 msgstr ""
 
-#: src/insets/InsetNote.cpp:67
+#: src/insets/InsetNote.cpp:68
 msgid "Greyed out"
 msgstr "Som Grå-tekst"
 
-#: src/insets/InsetNote.cpp:132
+#: src/insets/InsetNote.cpp:133
 msgid "Opened Note Inset"
 msgstr "Opna notat innskot"
 
@@ -18978,15 +19608,15 @@ msgstr "Vassrett linje"
 msgid "Protected Horizontal Space (%1$s)"
 msgstr "Ekstra mellomrom|E"
 
-#: src/insets/InsetTOC.cpp:49
+#: src/insets/InsetTOC.cpp:50
 msgid "Unknown TOC type"
 msgstr "Ukjent type av innhaldsliste"
 
-#: src/insets/InsetTabular.cpp:3055
+#: src/insets/InsetTabular.cpp:3054
 msgid "Opened table"
 msgstr "Opna Tabell"
 
-#: src/insets/InsetText.cpp:206
+#: src/insets/InsetText.cpp:215
 msgid "Opened Text Inset"
 msgstr "Opna tekst innskot"
 
@@ -19006,59 +19636,59 @@ msgstr "Opna tekstbrekking innskot"
 msgid "wrap"
 msgstr "Brekk tekst"
 
-#: src/insets/RenderGraphic.cpp:80 src/insets/RenderGraphic.cpp:84
+#: src/insets/RenderGraphic.cpp:79 src/insets/RenderGraphic.cpp:83
 msgid "Not shown."
 msgstr "Ikkje vist."
 
-#: src/insets/RenderGraphic.cpp:87
+#: src/insets/RenderGraphic.cpp:86
 msgid "Loading..."
 msgstr "Lastar ..."
 
-#: src/insets/RenderGraphic.cpp:90
+#: src/insets/RenderGraphic.cpp:89
 msgid "Converting to loadable format..."
 msgstr "Feil ved konvertering..."
 
-#: src/insets/RenderGraphic.cpp:93
+#: src/insets/RenderGraphic.cpp:92
 msgid "Loaded into memory. Generating pixmap..."
 msgstr "Lasta til minne, Lagar punktgrafikk..."
 
-#: src/insets/RenderGraphic.cpp:96
+#: src/insets/RenderGraphic.cpp:95
 msgid "Scaling etc..."
 msgstr "Storleik etc..."
 
-#: src/insets/RenderGraphic.cpp:99
+#: src/insets/RenderGraphic.cpp:98
 msgid "Ready to display"
 msgstr "Klar til vising"
 
-#: src/insets/RenderGraphic.cpp:102
+#: src/insets/RenderGraphic.cpp:101
 msgid "No file found!"
 msgstr "Fann ikkje fila!"
 
-#: src/insets/RenderGraphic.cpp:105
+#: src/insets/RenderGraphic.cpp:104
 msgid "Error converting to loadable format"
 msgstr "Feil ved konvertering"
 
-#: src/insets/RenderGraphic.cpp:108
+#: src/insets/RenderGraphic.cpp:107
 msgid "Error loading file into memory"
 msgstr "Feil ved lasting til minne"
 
-#: src/insets/RenderGraphic.cpp:111
+#: src/insets/RenderGraphic.cpp:110
 msgid "Error generating the pixmap"
 msgstr "Feil ved lagring av punktgrafikk"
 
-#: src/insets/RenderGraphic.cpp:114
+#: src/insets/RenderGraphic.cpp:113
 msgid "No image"
 msgstr "Fann ingen bilete"
 
-#: src/insets/RenderPreview.cpp:96
+#: src/insets/RenderPreview.cpp:95
 msgid "Preview loading"
 msgstr "Lasting av førehandvising"
 
-#: src/insets/RenderPreview.cpp:99
+#: src/insets/RenderPreview.cpp:98
 msgid "Preview ready"
 msgstr "Førehandsvising klar"
 
-#: src/insets/RenderPreview.cpp:102
+#: src/insets/RenderPreview.cpp:101
 msgid "Preview failed"
 msgstr "Feil ved førehandsvising"
 
@@ -19142,12 +19772,7 @@ msgstr "Teksten er bytta ut."
 msgid " strings have been replaced."
 msgstr " tekstane har blitt bytta ut."
 
-#: src/mathed/InsetFormulaMacro.cpp:118
-#, c-format
-msgid " Macro: %1$s: "
-msgstr "Makro: %1$s: "
-
-#: src/mathed/InsetMathAMSArray.cpp:111 src/mathed/InsetMathHull.cpp:1365
+#: src/mathed/InsetMathAMSArray.cpp:111 src/mathed/InsetMathHull.cpp:1370
 #: src/mathed/InsetMathSplit.cpp:76 src/mathed/InsetMathSubstack.cpp:71
 #, c-format
 msgid "Can't add vertical grid lines in '%1$s'"
@@ -19158,55 +19783,55 @@ msgstr "Kan ikkje leggje til fleire loddrette linjer i rutenettet '%1$s'"
 msgid "No vertical grid lines in 'cases': feature %1$s"
 msgstr "Ingen loddrette linjer i rutenettet '%1$s'"
 
-#: src/mathed/InsetMathGrid.cpp:1357
+#: src/mathed/InsetMathGrid.cpp:1350
 msgid "Only one row"
 msgstr "Berre ei rad"
 
-#: src/mathed/InsetMathGrid.cpp:1363
+#: src/mathed/InsetMathGrid.cpp:1356
 msgid "Only one column"
 msgstr "Berre ei kolonne"
 
-#: src/mathed/InsetMathGrid.cpp:1371
+#: src/mathed/InsetMathGrid.cpp:1364
 msgid "No hline to delete"
 msgstr "Har inga vassrettlinje å slette"
 
-#: src/mathed/InsetMathGrid.cpp:1380
+#: src/mathed/InsetMathGrid.cpp:1373
 msgid "No vline to delete"
 msgstr "Har inga loddrettlinje å slette"
 
-#: src/mathed/InsetMathGrid.cpp:1398
+#: src/mathed/InsetMathGrid.cpp:1391
 #, c-format
 msgid "Unknown tabular feature '%1$s'"
 msgstr "Ukjent tabellval '%1$s'"
 
-#: src/mathed/InsetMathHull.cpp:1161 src/mathed/InsetMathHull.cpp:1169
+#: src/mathed/InsetMathHull.cpp:1166 src/mathed/InsetMathHull.cpp:1174
 msgid "No number"
 msgstr "Ingen nummer"
 
-#: src/mathed/InsetMathHull.cpp:1161 src/mathed/InsetMathHull.cpp:1169
+#: src/mathed/InsetMathHull.cpp:1166 src/mathed/InsetMathHull.cpp:1174
 msgid "Number"
 msgstr "Nummer"
 
-#: src/mathed/InsetMathHull.cpp:1338
+#: src/mathed/InsetMathHull.cpp:1343
 #, c-format
 msgid "Can't change number of rows in '%1$s'"
 msgstr "Kan ikkje endre talet på radar i '%1$s'"
 
-#: src/mathed/InsetMathHull.cpp:1348
+#: src/mathed/InsetMathHull.cpp:1353
 #, c-format
 msgid "Can't change number of columns in '%1$s'"
 msgstr "Kan ikkje endre talet på kolonner i '%1$s'"
 
-#: src/mathed/InsetMathHull.cpp:1358
+#: src/mathed/InsetMathHull.cpp:1363
 #, c-format
 msgid "Can't add horizontal grid lines in '%1$s'"
 msgstr "Kan ikkje leggje til fleire vassrette linjer i rutenettet '%1$s'"
 
-#: src/mathed/InsetMathNest.cpp:954
+#: src/mathed/InsetMathNest.cpp:943
 msgid "create new math text environment ($...$)"
 msgstr "Lag nytt mattemiljø ($...$)"
 
-#: src/mathed/InsetMathNest.cpp:957
+#: src/mathed/InsetMathNest.cpp:946
 msgid "entered math text mode (textrm)"
 msgstr "Nyttar mattemiljø (textrm)"
 
@@ -19245,6 +19870,63 @@ msgstr "Samandrag: "
 msgid "References: "
 msgstr "Referansar: "
 
+#: src/support/Package.cpp:435
+msgid "LyX binary not found"
+msgstr "Fann ikkje LyX-programmet"
+
+#: src/support/Package.cpp:436
+#, c-format
+msgid ""
+"Unable to determine the path to the LyX binary from the command line %1$s"
+msgstr "Klarte ikkje å finne stigen til LyX frå kommandolinja %1$s"
+
+#: src/support/Package.cpp:555
+#, fuzzy, c-format
+msgid ""
+"Unable to determine the system directory having searched\n"
+"\t%1$s\n"
+"Use the '-sysdir' command line parameter or set the environment variable "
+msgstr ""
+"Klarte ikkje å finne systemstigen etter å ha leita i\n"
+"\t%1$s\n"
+"Prøv '-sysdir' valet til LyX frå kommandolina eller set miljøvalet "
+"LYX_DIR_15x til systemstigen i fila `chkconfig.ltx'."
+
+#: src/support/Package.cpp:636 src/support/Package.cpp:663
+msgid "File not found"
+msgstr "Kan ikkje finne fila"
+
+#: src/support/Package.cpp:637
+#, c-format
+msgid ""
+"Invalid %1$s switch.\n"
+"Directory %2$s does not contain %3$s."
+msgstr ""
+"Ikkje tillate val %1$s\n"
+"Stigen %2$s har ikkje %3$s i seg."
+
+#: src/support/Package.cpp:664
+#, c-format
+msgid ""
+"Invalid %1$s environment variable.\n"
+"Directory %2$s does not contain %3$s."
+msgstr ""
+"Ikkje tillate miljøval %1$s\n"
+"Stigen %2$s har ikkje %3$s i seg."
+
+#: src/support/Package.cpp:688
+#, c-format
+msgid ""
+"Invalid %1$s environment variable.\n"
+"%2$s is not a directory."
+msgstr ""
+"Ikkje tillate miljøval %1$s\n"
+"%2$s er ikkje ein stig."
+
+#: src/support/Package.cpp:690
+msgid "Directory not found"
+msgstr "Kan ikkje finne katalogen"
+
 #: src/support/debug.cpp:38
 msgid "No debugging message"
 msgstr "Inga melding frå avlusinga"
@@ -19363,14 +20045,23 @@ msgid "RTL/Bidi"
 msgstr ""
 
 #: src/support/debug.cpp:67
+msgid "Locale/Internationalisation"
+msgstr ""
+
+#: src/support/debug.cpp:68
+#, fuzzy
+msgid "Selection copy/paste mechanism"
+msgstr "Utval som linjer|l"
+
+#: src/support/debug.cpp:69
 msgid "Developers' general debug messages"
 msgstr "Generelle meldingar frå avlusinga"
 
-#: src/support/debug.cpp:68
+#: src/support/debug.cpp:70
 msgid "All debugging messages"
 msgstr "Alle meldingane frå avlusinga"
 
-#: src/support/debug.cpp:113
+#: src/support/debug.cpp:115
 #, c-format
 msgid "Debugging `%1$s' (%2$s)"
 msgstr "Avlusar `%1$s' (%2$s)"
@@ -19408,6 +20099,54 @@ msgstr ""
 msgid "Unknown user"
 msgstr "ukjend brukar"
 
+#~ msgid " Macro: %1$s: "
+#~ msgstr "Makro: %1$s: "
+
+#~ msgid "Reject change"
+#~ msgstr "Avvis endring"
+
+#, fuzzy
+#~ msgid "The document class %1$s could not be found."
+#~ msgstr ""
+#~ "Dokumentet\n"
+#~ "%1$s\n"
+#~ "kunne ikkje bli lest."
+
+#, fuzzy
+#~ msgid "Class not found"
+#~ msgstr "Kan ikkje finne fila"
+
+#~ msgid ""
+#~ "Layout had to be changed from\n"
+#~ "%1$s to %2$s\n"
+#~ "because of class conversion from\n"
+#~ "%3$s to %4$s"
+#~ msgstr ""
+#~ "Stil har blitt endra frå\n"
+#~ "%1$s til %2$s\n"
+#~ "fordi klassa vart konvertert frå\n"
+#~ "%3$s til %4$s"
+
+#~ msgid "Changed Layout"
+#~ msgstr "Endra avsnittstil"
+
+#~ msgid "Unknown layout"
+#~ msgstr "Ukjend Stil"
+
+#~ msgid ""
+#~ "Layout '%1$s' does not exist in textclass '%2$s'\n"
+#~ "Trying to use the default instead.\n"
+#~ msgstr ""
+#~ "Stilen '%1$s' er ikkje i tekstklassa '%2$s'\n"
+#~ "Prøver å bruke standard istaden\n"
+
+#, fuzzy
+#~ msgid "Adds an environment for hanging paragraphs."
+#~ msgstr "Kan ikkje lage indeks av meir enn eit avsnitt!"
+
+#~ msgid "Opened Environment Inset: "
+#~ msgstr "Opna miljø innskot"
+
 #~ msgid "Display image in LyX"
 #~ msgstr "Vis bilete i LyX"
 
@@ -19439,52 +20178,6 @@ msgstr "ukjend brukar"
 #~ msgid "Do not display"
 #~ msgstr "Ikkje vis matte"
 
-#~ msgid "LyX binary not found"
-#~ msgstr "Fann ikkje LyX-programmet"
-
-#~ msgid ""
-#~ "Unable to determine the path to the LyX binary from the command line %1$s"
-#~ msgstr "Klarte ikkje å finne stigen til LyX frå kommandolinja %1$s"
-
-#~ msgid ""
-#~ "Unable to determine the system directory having searched\n"
-#~ "\t%1$s\n"
-#~ "Use the '-sysdir' command line parameter or set the environment variable "
-#~ "LYX_DIR_15x to the LyX system directory containing the file `chkconfig."
-#~ "ltx'."
-#~ msgstr ""
-#~ "Klarte ikkje å finne systemstigen etter å ha leita i\n"
-#~ "\t%1$s\n"
-#~ "Prøv '-sysdir' valet til LyX frå kommandolina eller set miljøvalet "
-#~ "LYX_DIR_15x til systemstigen i fila `chkconfig.ltx'."
-
-#~ msgid "File not found"
-#~ msgstr "Kan ikkje finne fila"
-
-#~ msgid ""
-#~ "Invalid %1$s switch.\n"
-#~ "Directory %2$s does not contain %3$s."
-#~ msgstr ""
-#~ "Ikkje tillate val %1$s\n"
-#~ "Stigen %2$s har ikkje %3$s i seg."
-
-#~ msgid ""
-#~ "Invalid %1$s environment variable.\n"
-#~ "Directory %2$s does not contain %3$s."
-#~ msgstr ""
-#~ "Ikkje tillate miljøval %1$s\n"
-#~ "Stigen %2$s har ikkje %3$s i seg."
-
-#~ msgid ""
-#~ "Invalid %1$s environment variable.\n"
-#~ "%2$s is not a directory."
-#~ msgstr ""
-#~ "Ikkje tillate miljøval %1$s\n"
-#~ "%2$s er ikkje ein stig."
-
-#~ msgid "Directory not found"
-#~ msgstr "Kan ikkje finne katalogen"
-
 #, fuzzy
 #~ msgid "Unknown Info: "
 #~ msgstr "Ukjent ord:"
@@ -19684,10 +20377,6 @@ msgstr "ukjend brukar"
 #~ msgid "You cannot set multicolumn vertically."
 #~ msgstr "Du kan ikkje bruke multikolonne loddrett."
 
-#, fuzzy
-#~ msgid "Japanese (non-CJK)"
-#~ msgstr "Japansk"
-
 #, fuzzy
 #~ msgid "Enspace|E"
 #~ msgstr "mellomrom"
@@ -20082,9 +20771,6 @@ msgstr "ukjend brukar"
 #~ msgid "Framed"
 #~ msgstr "Med ramme"
 
-#~ msgid "Shaded"
-#~ msgstr "Skuggelagd"
-
 #, fuzzy
 #~ msgid "theorem"
 #~ msgstr "Teorem"
@@ -20099,10 +20785,6 @@ msgstr "ukjend brukar"
 #~ msgid "HtmlUrl: "
 #~ msgstr "HtmlUrl: "
 
-#, fuzzy
-#~ msgid "CharStyle: "
-#~ msgstr "Endring: "
-
 #~ msgid "Default (outer)"
 #~ msgstr "Standard (ytre)"
 
@@ -20167,9 +20849,6 @@ msgstr "ukjend brukar"
 #~ msgid "&Extended Chars"
 #~ msgstr "&Utvida teikntabell"
 
-#~ msgid "Placement:"
-#~ msgstr "Plassering:"
-
 #~ msgid "Use printer name explicitely"
 #~ msgstr "Bruk namnet på skrivaren utan omsvøp "