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

diff --git a/po/nn.po b/po/nn.po
index f3601dcf09..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-04-16 22:44+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"
@@ -38,18 +38,19 @@ msgstr "Opphavsrett"
 
 #: src/frontends/qt4/ui/AboutUi.ui:131 src/frontends/qt4/ui/BibitemUi.ui:121
 #: src/frontends/qt4/ui/BoxUi.ui:260 src/frontends/qt4/ui/BranchUi.ui:41
-#: src/frontends/qt4/ui/DelimiterUi.ui:107
+#: src/frontends/qt4/ui/DelimiterUi.ui:268
 #: src/frontends/qt4/ui/ErrorListUi.ui:62
-#: src/frontends/qt4/ui/ExternalUi.ui:696 src/frontends/qt4/ui/FloatUi.ui:85
-#: src/frontends/qt4/ui/HSpaceUi.ui:194
+#: src/frontends/qt4/ui/ExternalUi.ui:625 src/frontends/qt4/ui/FloatUi.ui:85
+#: src/frontends/qt4/ui/HSpaceUi.ui:214
 #: src/frontends/qt4/ui/HyperlinkUi.ui:150
-#: src/frontends/qt4/ui/IncludeUi.ui:247 src/frontends/qt4/ui/LogUi.ui:54
+#: src/frontends/qt4/ui/IncludeUi.ui:247 src/frontends/qt4/ui/InfoUi.ui:71
+#: src/frontends/qt4/ui/LogUi.ui:54 src/frontends/qt4/ui/ParagraphUi.ui:99
 #: src/frontends/qt4/ui/PrefsUi.ui:93 src/frontends/qt4/ui/RefUi.ui:97
 #: src/frontends/qt4/ui/SearchUi.ui:207 src/frontends/qt4/ui/ShowFileUi.ui:55
 #: src/frontends/qt4/ui/SpellcheckerUi.ui:28
 #: src/frontends/qt4/ui/SymbolsUi.ui:66 src/frontends/qt4/ui/TexinfoUi.ui:58
 #: src/frontends/qt4/ui/ThesaurusUi.ui:141 src/frontends/qt4/ui/VSpaceUi.ui:59
-#: src/frontends/qt4/ui/WrapUi.ui:173
+#: src/frontends/qt4/ui/WrapUi.ui:173 src/frontends/qt4/GuiParagraph.cpp:161
 msgid "&Close"
 msgstr "&Lat att"
 
@@ -65,35 +66,35 @@ msgstr "&Avsettplass"
 #: src/frontends/qt4/ui/BibitemUi.ui:111 src/frontends/qt4/ui/BibtexUi.ui:216
 #: src/frontends/qt4/ui/BoxUi.ui:234 src/frontends/qt4/ui/BranchUi.ui:31
 #: src/frontends/qt4/ui/CharacterUi.ui:370
-#: src/frontends/qt4/ui/CitationUi.ui:405
+#: src/frontends/qt4/ui/CitationUi.ui:438
 #: src/frontends/qt4/ui/DocumentUi.ui:135 src/frontends/qt4/ui/ERTUi.ui:90
-#: src/frontends/qt4/ui/ExternalUi.ui:676 src/frontends/qt4/ui/FloatUi.ui:68
-#: src/frontends/qt4/ui/GraphicsUi.ui:677 src/frontends/qt4/ui/HSpaceUi.ui:171
+#: src/frontends/qt4/ui/ExternalUi.ui:605 src/frontends/qt4/ui/FloatUi.ui:68
+#: src/frontends/qt4/ui/GraphicsUi.ui:71 src/frontends/qt4/ui/HSpaceUi.ui:191
 #: src/frontends/qt4/ui/HyperlinkUi.ui:140
 #: src/frontends/qt4/ui/IncludeUi.ui:237 src/frontends/qt4/ui/LabelUi.ui:82
 #: src/frontends/qt4/ui/ListingsUi.ui:609
 #: 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/RefUi.ui:77 src/frontends/qt4/ui/SendtoUi.ui:72
-#: src/frontends/qt4/ui/ShortcutUi.ui:99 src/frontends/qt4/ui/SymbolsUi.ui:49
+#: 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: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
 msgid "&OK"
 msgstr "&OK"
 
 #: src/frontends/qt4/ui/AskForTextUi.ui:94
-#: src/frontends/qt4/ui/CitationUi.ui:425
+#: src/frontends/qt4/ui/CitationUi.ui:461
 #: src/frontends/qt4/ui/DocumentUi.ui:152
-#: src/frontends/qt4/ui/ListingsUi.ui:629 src/Buffer.cpp:867
-#: src/Buffer.cpp:2503 src/Buffer.cpp:2527 src/Buffer.cpp:2562
-#: src/EmbeddedFiles.cpp:171 src/EmbeddedFiles.cpp:233
-#: src/EmbeddedFiles.cpp:292 src/LyXFunc.cpp:693 src/LyXFunc.cpp:829
-#: src/LyXFunc.cpp:1007 src/LyXVC.cpp:160
-#: src/frontends/qt4/GuiClipboard.cpp:403
-#: src/frontends/qt4/GuiDocument.cpp:1287
-#: src/frontends/qt4/GuiDocument.cpp:1298 src/frontends/qt4/GuiView.cpp:1365
-#: src/frontends/qt4/GuiView.cpp:1546 src/frontends/qt4/GuiView.cpp:1591
-#: src/frontends/qt4/GuiView.cpp:1644
+#: 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: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: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"
 
@@ -159,26 +160,27 @@ msgid "LyX: Add BibTeX Database"
 msgstr "LyX: Legg til BibTeX Database"
 
 #: src/frontends/qt4/ui/BibtexAddUi.ui:70
-#: src/frontends/qt4/ui/BranchesUi.ui:50 src/frontends/qt4/ui/CitationUi.ui:98
+#: src/frontends/qt4/ui/BranchesUi.ui:50
+#: src/frontends/qt4/ui/CitationUi.ui:550
 msgid "&Add"
 msgstr "&Legg til"
 
 #: src/frontends/qt4/ui/BibtexAddUi.ui:83 src/frontends/qt4/ui/BibtexUi.ui:229
 #: src/frontends/qt4/ui/ChangesUi.ui:78 src/frontends/qt4/ui/LabelUi.ui:92
 #: src/frontends/qt4/ui/NomenclUi.ui:105 src/frontends/qt4/ui/SendtoUi.ui:92
-#: src/frontends/qt4/ui/ShortcutUi.ui:112 src/LyXFunc.cpp:799
-#: src/buffer_funcs.cpp:104 src/frontends/qt4/ButtonController.cpp:123
+#: 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"
 
 #: src/frontends/qt4/ui/BibtexAddUi.ui:119
-#: src/frontends/qt4/ui/ShortcutUi.ui:34 src/frontends/qt4/ui/ShortcutUi.ui:44
 msgid "Enter BibTeX database name"
 msgstr "Vel BibTeX database"
 
 #: src/frontends/qt4/ui/BibtexAddUi.ui:126
-#: src/frontends/qt4/ui/BibtexUi.ui:106 src/frontends/qt4/ui/ExternalUi.ui:90
-#: src/frontends/qt4/ui/GraphicsUi.ui:65 src/frontends/qt4/ui/IncludeUi.ui:336
+#: src/frontends/qt4/ui/BibtexUi.ui:106 src/frontends/qt4/ui/ExternalUi.ui:78
+#: src/frontends/qt4/ui/GraphicsUi.ui:151
+#: src/frontends/qt4/ui/IncludeUi.ui:329 src/frontends/qt4/ui/LaTeXUi.ui:56
 #: src/frontends/qt4/ui/PrintUi.ui:313
 msgid "&Browse..."
 msgstr "&Bla gjennom..."
@@ -199,15 +201,16 @@ msgstr "Denne delen av litteraturlista inneheld..."
 msgid "&Content:"
 msgstr "&Innhald:"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:69
+#: src/frontends/qt4/ui/BibtexUi.ui:69 src/insets/InsetBibtex.cpp:207
 msgid "all cited references"
 msgstr "Litteratur nytta i teksten"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:74 src/frontends/qt4/GuiBibtex.cpp:324
+#: src/frontends/qt4/ui/BibtexUi.ui:74 src/frontends/qt4/GuiBibtex.cpp:317
+#: src/insets/InsetBibtex.cpp:205
 msgid "all uncited references"
 msgstr "Litteratur ikkje nytta i teksten"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:79
+#: src/frontends/qt4/ui/BibtexUi.ui:79 src/insets/InsetBibtex.cpp:203
 msgid "all references"
 msgstr "Tilgjengeleg litteratur"
 
@@ -236,8 +239,8 @@ msgid "BibTeX database to use"
 msgstr "Vel BibTeX database"
 
 #: src/frontends/qt4/ui/BibtexUi.ui:179
-msgid "Databa&ses (select to embed when saved in bundled format)"
-msgstr ""
+msgid "Databa&ses"
+msgstr "Databa&sar"
 
 #: src/frontends/qt4/ui/BibtexUi.ui:249
 msgid "The BibTeX style"
@@ -252,8 +255,8 @@ msgstr "&Stil"
 msgid "Move the selected database upwards in the list"
 msgstr "Fjern den valde BibTeX databasen"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:265 src/frontends/qt4/ui/CitationUi.ui:39
-#: src/frontends/qt4/ui/LaTeXUi.ui:73
+#: src/frontends/qt4/ui/BibtexUi.ui:265 src/frontends/qt4/ui/CitationUi.ui:597
+#: src/frontends/qt4/ui/LaTeXUi.ui:108
 msgid "&Up"
 msgstr "&Opp"
 
@@ -262,7 +265,7 @@ msgstr "&Opp"
 msgid "Move the selected database downwards in the list"
 msgstr "Fjern den valde BibTeX databasen"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:275 src/frontends/qt4/ui/LaTeXUi.ui:66
+#: src/frontends/qt4/ui/BibtexUi.ui:275 src/frontends/qt4/ui/LaTeXUi.ui:101
 #, fuzzy
 msgid "Do&wn"
 msgstr "&Ned"
@@ -277,7 +280,7 @@ msgid "Allow &page breaks"
 msgstr "sideskift"
 
 #: src/frontends/qt4/ui/BoxUi.ui:38 src/frontends/qt4/ui/MathMatrixUi.ui:199
-#: src/frontends/qt4/ui/ParagraphUi.ui:76
+#: src/frontends/qt4/ui/ParagraphUi.ui:108
 msgid "Alignment"
 msgstr "Justering"
 
@@ -287,19 +290,19 @@ msgstr "Vassrett justering av innhaldet i ramma"
 
 #: src/frontends/qt4/ui/BoxUi.ui:65 src/frontends/qt4/ui/ListingsUi.ui:275
 #: src/frontends/qt4/ui/TabularUi.ui:142 src/frontends/qt4/ui/WrapUi.ui:209
-#: src/frontends/qt4/GuiParagraph.cpp:92 src/frontends/qt4/GuiTabular.cpp:675
+#: src/frontends/qt4/GuiParagraph.cpp:109 src/frontends/qt4/GuiTabular.cpp:713
 msgid "Left"
 msgstr "Venstre"
 
 #: src/frontends/qt4/ui/BoxUi.ui:70 src/frontends/qt4/ui/TabularUi.ui:147
-#: src/frontends/qt4/GuiExternal.cpp:87 src/frontends/qt4/GuiGraphics.cpp:800
-#: src/frontends/qt4/GuiParagraph.cpp:94 src/frontends/qt4/GuiTabular.cpp:676
+#: src/frontends/qt4/GuiExternal.cpp:77 src/frontends/qt4/GuiGraphics.cpp:71
+#: src/frontends/qt4/GuiParagraph.cpp:111 src/frontends/qt4/GuiTabular.cpp:714
 msgid "Center"
 msgstr "Midten"
 
 #: src/frontends/qt4/ui/BoxUi.ui:75 src/frontends/qt4/ui/ListingsUi.ui:280
 #: src/frontends/qt4/ui/TabularUi.ui:152 src/frontends/qt4/ui/WrapUi.ui:214
-#: src/frontends/qt4/GuiParagraph.cpp:93 src/frontends/qt4/GuiTabular.cpp:677
+#: src/frontends/qt4/GuiParagraph.cpp:110 src/frontends/qt4/GuiTabular.cpp:715
 msgid "Right"
 msgstr "Høgre"
 
@@ -349,28 +352,28 @@ msgstr "Loddrett"
 msgid "Horizontal"
 msgstr "Vassrett"
 
-#: src/frontends/qt4/ui/BoxUi.ui:202 src/frontends/qt4/ui/CitationUi.ui:385
+#: src/frontends/qt4/ui/BoxUi.ui:202 src/frontends/qt4/ui/CitationUi.ui:415
 #: src/frontends/qt4/ui/DocumentUi.ui:112 src/frontends/qt4/ui/FloatUi.ui:42
-#: src/frontends/qt4/ui/GraphicsUi.ui:648
-#: src/frontends/qt4/ui/ParagraphUi.ui:205 src/frontends/qt4/ui/PrefsUi.ui:47
+#: src/frontends/qt4/ui/GraphicsUi.ui:42
+#: src/frontends/qt4/ui/ParagraphUi.ui:59 src/frontends/qt4/ui/PrefsUi.ui:47
 #: src/frontends/qt4/ui/WrapUi.ui:121
 msgid "&Restore"
 msgstr "Gjenopp&rett"
 
 #: src/frontends/qt4/ui/BoxUi.ui:247 src/frontends/qt4/ui/CharacterUi.ui:380
 #: src/frontends/qt4/ui/DocumentUi.ui:145
-#: src/frontends/qt4/ui/ExternalUi.ui:686 src/frontends/qt4/ui/FloatUi.ui:78
-#: src/frontends/qt4/ui/GraphicsUi.ui:698 src/frontends/qt4/ui/HSpaceUi.ui:184
+#: src/frontends/qt4/ui/ExternalUi.ui:615 src/frontends/qt4/ui/FloatUi.ui:78
+#: src/frontends/qt4/ui/GraphicsUi.ui:90 src/frontends/qt4/ui/HSpaceUi.ui:204
 #: src/frontends/qt4/ui/ListingsUi.ui:619
-#: src/frontends/qt4/ui/ParagraphUi.ui:238 src/frontends/qt4/ui/PrefsUi.ui:83
+#: 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:1317
-#: src/frontends/qt4/GuiDocument.cpp:2149
+#: src/frontends/qt4/ui/WrapUi.ui:163 src/frontends/qt4/GuiDocument.cpp:1319
+#: src/frontends/qt4/GuiDocument.cpp:2152
 msgid "&Apply"
 msgstr "&Bruk"
 
-#: src/frontends/qt4/ui/BoxUi.ui:285 src/frontends/qt4/ui/ExternalUi.ui:498
+#: src/frontends/qt4/ui/BoxUi.ui:285 src/frontends/qt4/ui/ExternalUi.ui:463
 #: src/frontends/qt4/ui/PageLayoutUi.ui:204
 msgid "&Height:"
 msgstr "&Høgd:"
@@ -383,7 +386,7 @@ msgstr "&Indre ramme:"
 msgid "&Decoration:"
 msgstr "&Dekorasjon:"
 
-#: src/frontends/qt4/ui/BoxUi.ui:330 src/frontends/qt4/ui/ExternalUi.ui:475
+#: src/frontends/qt4/ui/BoxUi.ui:330 src/frontends/qt4/ui/ExternalUi.ui:437
 #: src/frontends/qt4/ui/PageLayoutUi.ui:217
 #: src/frontends/qt4/ui/TabularUi.ui:100 src/frontends/qt4/ui/WrapUi.ui:85
 msgid "&Width:"
@@ -403,21 +406,21 @@ msgstr "Indre ramme - til bruk for fast breidde og linjeskift"
 
 #: src/frontends/qt4/ui/BoxUi.ui:361 src/frontends/qt4/ui/HSpaceUi.ui:32
 #: src/frontends/qt4/ui/ListingsUi.ui:270
-#: src/frontends/qt4/ui/TabularUi.ui:699 src/frontends/qt4/ui/TabularUi.ui:718
-#: src/frontends/qt4/ui/TabularUi.ui:766 src/frontends/qt4/GuiBox.cpp:68
-#: src/frontends/qt4/GuiBox.cpp:155 src/frontends/qt4/GuiBox.cpp:316
-#: src/frontends/qt4/GuiBox.cpp:444 src/frontends/qt4/GuiDocument.cpp:79
+#: 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: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:317
-#: src/frontends/qt4/GuiBox.cpp:434 src/frontends/qt4/GuiBox.cpp:445
+#: 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:435
-#: src/frontends/qt4/GuiBox.cpp:446 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"
 
@@ -479,71 +482,70 @@ msgstr "Skri&fttypar:"
 msgid "Si&ze:"
 msgstr "&Storleik:"
 
-#: src/frontends/qt4/ui/BulletsUi.ui:66 src/frontends/qt4/ui/ExternalUi.ui:183
-#: src/frontends/qt4/ui/GraphicsUi.ui:536
-#: src/frontends/qt4/ui/ParagraphUi.ui:166
+#: src/frontends/qt4/ui/BulletsUi.ui:66
+#: src/frontends/qt4/ui/ParagraphUi.ui:235
 #: src/frontends/qt4/ui/PrefLatexUi.ui:178
-#: src/frontends/qt4/ui/TabularUi.ui:704 src/frontends/qt4/ui/TabularUi.ui:723
-#: src/frontends/qt4/ui/TabularUi.ui:771 lib/ui/stdtoolbars.inc:85
-#: src/Font.cpp:180 src/frontends/qt4/GuiDocument.cpp:78
-#: src/frontends/qt4/GuiDocument.cpp:93 src/frontends/qt4/GuiDocument.cpp:109
-#: src/frontends/qt4/GuiDocument.cpp:122 src/frontends/qt4/GuiDocument.cpp:638
+#: src/frontends/qt4/ui/TabularUi.ui:908 src/frontends/qt4/ui/TabularUi.ui:927
+#: src/frontends/qt4/ui/TabularUi.ui:975 lib/ui/stdtoolbars.inc:85
+#: src/Font.cpp:182 src/frontends/qt4/GuiDocument.cpp:80
+#: 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:1159
-#: src/frontends/qt4/GuiDocument.cpp:1204
-#: src/frontends/qt4/GuiDocument.cpp:2190 src/frontends/qt4/GuiExternal.cpp:85
-#: src/frontends/qt4/GuiGraphics.cpp:798 src/frontends/qt4/GuiListings.cpp:151
-#: src/frontends/qt4/GuiListings.cpp:158
+#: 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/GuiPrefs.cpp:1707
 msgid "Default"
 msgstr "Standard"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:71 src/Font.cpp:61
-#: src/frontends/qt4/GuiCharacter.cpp:47 src/frontends/qt4/GuiListings.cpp:151
+#: src/frontends/qt4/GuiCharacter.cpp:56 src/frontends/qt4/GuiListings.cpp:151
 msgid "Tiny"
 msgstr "Svært liten"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:76 src/Font.cpp:61
-#: src/frontends/qt4/GuiCharacter.cpp:48 src/frontends/qt4/GuiListings.cpp:151
+#: src/frontends/qt4/GuiCharacter.cpp:57 src/frontends/qt4/GuiListings.cpp:151
 msgid "Smallest"
 msgstr "Minst"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:81 src/Font.cpp:61
-#: src/frontends/qt4/GuiCharacter.cpp:49 src/frontends/qt4/GuiListings.cpp:151
+#: src/frontends/qt4/GuiCharacter.cpp:58 src/frontends/qt4/GuiListings.cpp:151
 msgid "Smaller"
 msgstr "Mindre"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:86 src/Font.cpp:61
-#: src/frontends/qt4/GuiCharacter.cpp:50 src/frontends/qt4/GuiListings.cpp:151
+#: src/frontends/qt4/GuiCharacter.cpp:59 src/frontends/qt4/GuiListings.cpp:151
 msgid "Small"
 msgstr "Lite"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:91 src/Font.cpp:61
-#: src/frontends/qt4/GuiCharacter.cpp:51 src/frontends/qt4/GuiListings.cpp:151
+#: src/frontends/qt4/GuiCharacter.cpp:60 src/frontends/qt4/GuiListings.cpp:151
 msgid "Normal"
 msgstr "Normal"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:96 src/Font.cpp:61
-#: src/frontends/qt4/GuiCharacter.cpp:52 src/frontends/qt4/GuiListings.cpp:152
+#: src/frontends/qt4/GuiCharacter.cpp:61 src/frontends/qt4/GuiListings.cpp:152
 msgid "Large"
 msgstr "Stor"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:101 src/Font.cpp:62
-#: src/frontends/qt4/GuiCharacter.cpp:53 src/frontends/qt4/GuiListings.cpp:152
+#: src/frontends/qt4/GuiCharacter.cpp:62 src/frontends/qt4/GuiListings.cpp:152
 msgid "Larger"
 msgstr "Større"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:106 src/Font.cpp:62
-#: src/frontends/qt4/GuiCharacter.cpp:54
+#: src/frontends/qt4/GuiCharacter.cpp:63
 msgid "Largest"
 msgstr "Størst"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:111 src/Font.cpp:62
-#: src/frontends/qt4/GuiCharacter.cpp:55
+#: src/frontends/qt4/GuiCharacter.cpp:64
 msgid "Huge"
 msgstr "Enorm"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:116 src/Font.cpp:62
-#: src/frontends/qt4/GuiCharacter.cpp:56
+#: src/frontends/qt4/GuiCharacter.cpp:65
 msgid "Huger"
 msgstr "Gigantisk"
 
@@ -552,7 +554,7 @@ msgid "&Custom Bullet:"
 msgstr "&Sjølvvalt punkt:"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:174
-#: src/frontends/qt4/ui/PDFSupportUi.ui:400
+#: src/frontends/qt4/ui/PDFSupportUi.ui:333
 msgid "&Level:"
 msgstr "&Nivå:"
 
@@ -610,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:982
-#: src/frontends/qt4/GuiPrefs.cpp:1628
+#: lib/layouts/moderncv.layout:114 src/frontends/qt4/GuiDocument.cpp:984
+#: src/frontends/qt4/GuiPrefs.cpp:1665
 msgid "Language"
 msgstr "Språk"
 
@@ -672,153 +674,179 @@ msgid "Apply changes immediately"
 msgstr "Bruk endringane med det same"
 
 #: src/frontends/qt4/ui/CharacterUi.ui:390 src/frontends/qt4/ui/ERTUi.ui:100
-#: src/frontends/qt4/ui/GraphicsUi.ui:719
+#: src/frontends/qt4/ui/GraphicsUi.ui:109
 #: src/frontends/qt4/ui/MathMatrixUi.ui:174 src/frontends/qt4/ui/NoteUi.ui:28
 #: src/frontends/qt4/ui/PrintUi.ui:243
 #: src/frontends/qt4/ui/TabularCreateUi.ui:72
-#: src/frontends/qt4/ui/TabularUi.ui:1128
-#: src/frontends/qt4/ButtonController.cpp:125
+#: src/frontends/qt4/ui/TabularUi.ui:1346
+#: src/frontends/qt4/ButtonController.cpp:233
 msgid "Close"
 msgstr "Lat att"
 
-#: src/frontends/qt4/ui/CitationUi.ui:36
-msgid "Move the selected citation up"
-msgstr "Flytt den valde litteraturen oppover"
-
-#: src/frontends/qt4/ui/CitationUi.ui:55
-msgid "Move the selected citation down"
-msgstr "Flytt den valde litteraturen nedover"
-
-#: src/frontends/qt4/ui/CitationUi.ui:58
-msgid "&Down"
-msgstr "&Ned"
-
-#: src/frontends/qt4/ui/CitationUi.ui:81
-msgid "D&elete"
-msgstr "Sle&tt"
-
-#: src/frontends/qt4/ui/CitationUi.ui:108
-msgid "&Selected Citations:"
-msgstr "&Valt litteratur:"
-
-#: src/frontends/qt4/ui/CitationUi.ui:118
-msgid "A&vailable Citations:"
-msgstr "&Tilgjengeleg litteratur:"
-
-#: src/frontends/qt4/ui/CitationUi.ui:144
+#: src/frontends/qt4/ui/CitationUi.ui:51
 msgid "Search Citation"
 msgstr "Leit i litteraturen"
 
-#: src/frontends/qt4/ui/CitationUi.ui:153
+#: src/frontends/qt4/ui/CitationUi.ui:66
 msgid "F&ind:"
 msgstr "&Finn:"
 
-#: src/frontends/qt4/ui/CitationUi.ui:176
-msgid "<- C&lear"
-msgstr "<-&Tøm"
+#: src/frontends/qt4/ui/CitationUi.ui:79
+msgid "Hit Enter to search, or click Go!"
+msgstr ""
+
+#: src/frontends/qt4/ui/CitationUi.ui:92
+msgid "You can also hit Enter in the search box"
+msgstr ""
+
+#: src/frontends/qt4/ui/CitationUi.ui:95
+msgid "&Go!"
+msgstr ""
 
-#: src/frontends/qt4/ui/CitationUi.ui:183
+#: src/frontends/qt4/ui/CitationUi.ui:105
 #, fuzzy
 msgid "Search Field:"
 msgstr "Søk feil"
 
-#: src/frontends/qt4/ui/CitationUi.ui:203
-#: src/frontends/qt4/GuiCitation.cpp:311
+#: src/frontends/qt4/ui/CitationUi.ui:125
+#: src/frontends/qt4/GuiCitation.cpp:325
 #, fuzzy
 msgid "All Fields"
 msgstr "Alle filer (*)"
 
-#: src/frontends/qt4/ui/CitationUi.ui:224
+#: src/frontends/qt4/ui/CitationUi.ui:146
 msgid "Regular E&xpression"
 msgstr "Bru&k regulære uttrykk"
 
-#: src/frontends/qt4/ui/CitationUi.ui:231
+#: src/frontends/qt4/ui/CitationUi.ui:153
 #, fuzzy
 msgid "Entry Types:"
 msgstr "Setel:"
 
-#: src/frontends/qt4/ui/CitationUi.ui:248
-#: src/frontends/qt4/GuiCitation.cpp:326
+#: src/frontends/qt4/ui/CitationUi.ui:170
+#: src/frontends/qt4/GuiCitation.cpp:340
 msgid "All Entry Types"
 msgstr ""
 
-#: src/frontends/qt4/ui/CitationUi.ui:269
+#: src/frontends/qt4/ui/CitationUi.ui:191
 msgid "Case Se&nsitive"
 msgstr "&Skil mellom små og store bokstavar"
 
-#: src/frontends/qt4/ui/CitationUi.ui:279
+#: src/frontends/qt4/ui/CitationUi.ui:211
+msgid "Search As You &Type"
+msgstr ""
+
+#: src/frontends/qt4/ui/CitationUi.ui:221
 msgid "Formatting"
 msgstr "Formatering"
 
-#: src/frontends/qt4/ui/CitationUi.ui:294
-msgid "Natbib citation style to use"
-msgstr "Bruk denne Natbib litteraturstilen"
-
-#: src/frontends/qt4/ui/CitationUi.ui:301
-msgid "Citation st&yle:"
-msgstr "&Litteraturstil:"
-
-#: src/frontends/qt4/ui/CitationUi.ui:311
+#: src/frontends/qt4/ui/CitationUi.ui:244
 msgid "List all authors"
 msgstr "Alle forfattarane"
 
-#: src/frontends/qt4/ui/CitationUi.ui:314
+#: src/frontends/qt4/ui/CitationUi.ui:247
 msgid "Full aut&hor list"
 msgstr "&Heile forfattarlista"
 
-#: src/frontends/qt4/ui/CitationUi.ui:321
+#: src/frontends/qt4/ui/CitationUi.ui:254
 msgid "Force upper case in citation"
 msgstr "Bruk store bokstavar i litteraturen"
 
-#: src/frontends/qt4/ui/CitationUi.ui:324
-msgid "&Force upper case"
+#: src/frontends/qt4/ui/CitationUi.ui:257
+#, fuzzy
+msgid "Force u&pper case"
 msgstr "Br&uk storebokstavar"
 
-#: src/frontends/qt4/ui/CitationUi.ui:331
-msgid "&Text after:"
-msgstr "&Tekst etter:"
-
-#: src/frontends/qt4/ui/CitationUi.ui:347
-msgid "Text to place after citation"
-msgstr "Tekst etter litteratur-referansen"
+#: src/frontends/qt4/ui/CitationUi.ui:295
+msgid "Citation st&yle:"
+msgstr "&Litteraturstil:"
 
-#: src/frontends/qt4/ui/CitationUi.ui:354
+#: src/frontends/qt4/ui/CitationUi.ui:305
 msgid "Text &before:"
 msgstr "Tekst &før:"
 
-#: src/frontends/qt4/ui/CitationUi.ui:370
+#: src/frontends/qt4/ui/CitationUi.ui:341
+msgid "Natbib citation style to use"
+msgstr "Bruk denne Natbib litteraturstilen"
+
+#: src/frontends/qt4/ui/CitationUi.ui:366
 msgid "Text to place before citation"
 msgstr "Tekst før litteratur-referansen"
 
-#: src/frontends/qt4/ui/CitationUi.ui:418
-msgid "A&pply"
+#: src/frontends/qt4/ui/CitationUi.ui:373
+#, fuzzy
+msgid "Text a&fter:"
+msgstr "&Tekst etter:"
+
+#: src/frontends/qt4/ui/CitationUi.ui:391
+msgid "Text to place after citation"
+msgstr "Tekst etter litteratur-referansen"
+
+#: src/frontends/qt4/ui/CitationUi.ui:451
+#, fuzzy
+msgid "App&ly"
 msgstr "&Bruk"
 
-#: src/frontends/qt4/ui/DelimiterUi.ui:89 src/frontends/qt4/ui/SymbolsUi.ui:56
-msgid "Insert the delimiters"
-msgstr "Set inn skiljeteikn"
+#: src/frontends/qt4/ui/CitationUi.ui:489
+msgid "A&vailable Citations:"
+msgstr "&Tilgjengeleg litteratur:"
 
-#: src/frontends/qt4/ui/DelimiterUi.ui:92
-msgid "&Insert"
-msgstr "&Set inn"
+#: src/frontends/qt4/ui/CitationUi.ui:512
+msgid "&Selected Citations:"
+msgstr "&Valt litteratur:"
 
-#: src/frontends/qt4/ui/DelimiterUi.ui:132
-msgid "&Size:"
-msgstr "&Storleik:"
+#: src/frontends/qt4/ui/CitationUi.ui:547
+msgid "The Enter key works, too"
+msgstr ""
+
+#: src/frontends/qt4/ui/CitationUi.ui:560
+msgid "The delete key works, too"
+msgstr ""
+
+#: src/frontends/qt4/ui/CitationUi.ui:563
+msgid "D&elete"
+msgstr "Sle&tt"
+
+#: src/frontends/qt4/ui/CitationUi.ui:594
+#, fuzzy
+msgid "Move the selected citation up (try Ctrl-Up)"
+msgstr "Flytt den valde litteraturen oppover"
+
+#: src/frontends/qt4/ui/CitationUi.ui:618
+#, fuzzy
+msgid "Move the selected citation down (try Ctrl-Down)"
+msgstr "Flytt den valde litteraturen nedover"
+
+#: src/frontends/qt4/ui/CitationUi.ui:621
+msgid "&Down"
+msgstr "&Ned"
 
-#: src/frontends/qt4/ui/DelimiterUi.ui:180
-#: src/frontends/qt4/GuiDelimiter.cpp:179
+#: src/frontends/qt4/ui/DelimiterUi.ui:135
+#: src/frontends/qt4/GuiDelimiter.cpp:275
 msgid "TeX Code: "
 msgstr "TeX: "
 
-#: src/frontends/qt4/ui/DelimiterUi.ui:289
+#: src/frontends/qt4/ui/DelimiterUi.ui:157
 msgid "Match delimiter types"
 msgstr "Like skiljeteikn"
 
-#: src/frontends/qt4/ui/DelimiterUi.ui:292
+#: src/frontends/qt4/ui/DelimiterUi.ui:160
 msgid "&Keep matched"
 msgstr "&Hald uendra"
 
+#: src/frontends/qt4/ui/DelimiterUi.ui:184
+msgid "&Size:"
+msgstr "&Storleik:"
+
+#: src/frontends/qt4/ui/DelimiterUi.ui:252
+#: src/frontends/qt4/ui/SymbolsUi.ui:56
+msgid "Insert the delimiters"
+msgstr "Set inn skiljeteikn"
+
+#: src/frontends/qt4/ui/DelimiterUi.ui:255
+msgid "&Insert"
+msgstr "&Set inn"
+
 #: src/frontends/qt4/ui/DocumentUi.ui:58
 msgid "Reset to the default settings for the document class"
 msgstr "Bruk standardval for dokumentklassa"
@@ -855,235 +883,169 @@ msgstr "Vis innhaldet i ERT"
 msgid "O&pen"
 msgstr "&Opna"
 
-#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:13
-#, fuzzy
-msgid "EmbeddedFiles"
-msgstr "Innlemma object|m"
-
-#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:25
-msgid "Extra embedded files:"
-msgstr ""
-
-#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:44
-#, fuzzy
-msgid "Add"
-msgstr "&Legg til"
-
-#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:51
+#: src/frontends/qt4/ui/ExternalUi.ui:43
 #, fuzzy
-msgid "Remove"
-msgstr "&Fjern"
-
-#: src/frontends/qt4/ui/ExternalUi.ui:51
-msgid "File"
+msgid "F&ile"
 msgstr "Fil"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:63
-msgid "&Draft"
-msgstr "Kla&dd"
-
-#: src/frontends/qt4/ui/ExternalUi.ui:70 src/frontends/qt4/ui/GraphicsUi.ui:55
-#: src/frontends/qt4/ui/IncludeUi.ui:326
-#, fuzzy
-msgid "E&mbed"
-msgstr "&Omramma"
-
-#: src/frontends/qt4/ui/ExternalUi.ui:77
-msgid "Edit the file externally"
-msgstr "Rediger fila eksternt"
-
-#: src/frontends/qt4/ui/ExternalUi.ui:80
-msgid "&Edit File..."
-msgstr "&Rediger fil..."
-
-#: src/frontends/qt4/ui/ExternalUi.ui:87 src/frontends/qt4/ui/IncludeUi.ui:333
-msgid "Select a file"
-msgstr "Vel ei-fil"
-
-#: src/frontends/qt4/ui/ExternalUi.ui:97
-#: src/frontends/qt4/ui/ExternalUi.ui:110 lib/layouts/agu_stdclass.inc:80
-#: lib/layouts/db_stdcharstyles.inc:8
+#: src/frontends/qt4/ui/ExternalUi.ui:55 src/frontends/qt4/ui/ExternalUi.ui:62
+#: lib/layouts/agu_stdclass.inc:80 lib/layouts/db_stdcharstyles.inc:8
 msgid "Filename"
 msgstr "Filnamn"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:100
-#: src/frontends/qt4/ui/GraphicsUi.ui:273
+#: src/frontends/qt4/ui/ExternalUi.ui:65
+#: src/frontends/qt4/ui/GraphicsUi.ui:353
 #: src/frontends/qt4/ui/IncludeUi.ui:259 src/frontends/qt4/ui/PrintUi.ui:293
 msgid "&File:"
 msgstr "&Fil:"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:117
-msgid "Template"
+#: src/frontends/qt4/ui/ExternalUi.ui:75 src/frontends/qt4/ui/IncludeUi.ui:326
+msgid "Select a file"
+msgstr "Vel ei-fil"
+
+#: src/frontends/qt4/ui/ExternalUi.ui:85
+msgid "&Draft"
+msgstr "Kla&dd"
+
+#: src/frontends/qt4/ui/ExternalUi.ui:92
+#, fuzzy
+msgid "&Template"
 msgstr "Mal"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:156
+#: src/frontends/qt4/ui/ExternalUi.ui:129
 msgid "Available templates"
 msgstr "Tilgjengelege malar"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:167
-msgid "LyX View"
-msgstr "LyX utsjånad"
-
-#: src/frontends/qt4/ui/ExternalUi.ui:179
-#: src/frontends/qt4/ui/ExternalUi.ui:252
-#: src/frontends/qt4/ui/GraphicsUi.ui:532
-#: src/frontends/qt4/ui/GraphicsUi.ui:559
-msgid "Screen display"
-msgstr "Skjerm"
-
-#: src/frontends/qt4/ui/ExternalUi.ui:188
-#: src/frontends/qt4/ui/GraphicsUi.ui:541
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:58
-msgid "Monochrome"
-msgstr "Svart/kvit"
-
-#: src/frontends/qt4/ui/ExternalUi.ui:193
-#: src/frontends/qt4/ui/GraphicsUi.ui:546
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:63
-msgid "Grayscale"
-msgstr "Gråtonar"
-
-#: src/frontends/qt4/ui/ExternalUi.ui:198
-#: src/frontends/qt4/ui/GraphicsUi.ui:551
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:68
-#: src/frontends/qt4/GuiBranches.cpp:43
-msgid "Color"
-msgstr "Farge"
+#: src/frontends/qt4/ui/ExternalUi.ui:148
+#: src/frontends/qt4/ui/GraphicsUi.ui:549
+msgid "LaTe&X and LyX options"
+msgstr "LaTeX- og LyX-&val"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:203
-msgid "Preview"
-msgstr "Førehandsvising"
+#: src/frontends/qt4/ui/ExternalUi.ui:154
+#, fuzzy
+msgid "LaTeX Options"
+msgstr "LaTeX-&val:"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:230
-#: src/frontends/qt4/ui/ExternalUi.ui:265
-#: src/frontends/qt4/ui/GraphicsUi.ui:512
-#: src/frontends/qt4/ui/GraphicsUi.ui:519
-msgid "Percentage to scale by in LyX"
-msgstr "Bilete skalert i LyX etter denne prosentdelen"
+#: src/frontends/qt4/ui/ExternalUi.ui:172
+msgid "O&ption:"
+msgstr "Va&l:"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:243
-msgid "%"
-msgstr "%"
+#: src/frontends/qt4/ui/ExternalUi.ui:185
+msgid "Forma&t:"
+msgstr "Forma&t:"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:255
-#: src/frontends/qt4/ui/GraphicsUi.ui:562
-msgid "&Display:"
-msgstr "&Vis:"
+#: src/frontends/qt4/ui/ExternalUi.ui:209
+msgid "&Show in LyX"
+msgstr "&Vis i LyX"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:268
-msgid "Sca&le:"
-msgstr "Ska&la:"
+#: src/frontends/qt4/ui/ExternalUi.ui:221
+#: src/frontends/qt4/ui/ExternalUi.ui:243
+#: src/frontends/qt4/ui/GraphicsUi.ui:676
+#: src/frontends/qt4/ui/GraphicsUi.ui:683
+msgid "Percentage to scale by in LyX"
+msgstr "Bilete skalert i LyX etter denne prosentdelen"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:291
-msgid "Display image in LyX"
-msgstr "Vis bilete i LyX"
+#: src/frontends/qt4/ui/ExternalUi.ui:224
+#: src/frontends/qt4/ui/GraphicsUi.ui:686
+msgid "Sca&le on Screen (%):"
+msgstr "Ska&ler på skjermen (%):"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:294
-msgid "&Show in LyX"
-msgstr "&Vis i LyX"
+#: src/frontends/qt4/ui/ExternalUi.ui:288
+#, fuzzy
+msgid "Si&ze and Rotation"
+msgstr "Leit i litteraturen"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:315
+#: src/frontends/qt4/ui/ExternalUi.ui:300
 msgid "Rotate"
 msgstr "Roter"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:372
-#: src/frontends/qt4/ui/ExternalUi.ui:402
-#: src/frontends/qt4/ui/GraphicsUi.ui:247
-#: src/frontends/qt4/ui/GraphicsUi.ui:254
+#: src/frontends/qt4/ui/ExternalUi.ui:345
+#: src/frontends/qt4/ui/ExternalUi.ui:375
+#: src/frontends/qt4/ui/GraphicsUi.ui:327
+#: src/frontends/qt4/ui/GraphicsUi.ui:334
 msgid "Angle to rotate image by"
 msgstr "Vinkelen som bilete blir rotert med"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:382
-#: src/frontends/qt4/ui/ExternalUi.ui:395
-#: src/frontends/qt4/ui/GraphicsUi.ui:219
-#: src/frontends/qt4/ui/GraphicsUi.ui:226
+#: src/frontends/qt4/ui/ExternalUi.ui:355
+#: src/frontends/qt4/ui/ExternalUi.ui:368
+#: src/frontends/qt4/ui/GraphicsUi.ui:301
+#: src/frontends/qt4/ui/GraphicsUi.ui:308
 msgid "The origin of the rotation"
 msgstr "Origo for roteringa"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:385
-msgid "&Origin:"
+#: src/frontends/qt4/ui/ExternalUi.ui:358
+#, fuzzy
+msgid "Ori&gin:"
 msgstr "&Origo:"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:405
+#: src/frontends/qt4/ui/ExternalUi.ui:378
 msgid "A&ngle:"
 msgstr "Vi&nkel:"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:418
+#: src/frontends/qt4/ui/ExternalUi.ui:393
 msgid "Scale"
 msgstr "Storleik"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:439
-#: src/frontends/qt4/ui/GraphicsUi.ui:138
+#: src/frontends/qt4/ui/ExternalUi.ui:417
+#: src/frontends/qt4/ui/GraphicsUi.ui:220
 msgid "Height of image in output"
 msgstr "Høgda på bilete i det ferdig dokument"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:449
+#: src/frontends/qt4/ui/ExternalUi.ui:427
+#: src/frontends/qt4/ui/GraphicsUi.ui:188
+msgid "Width of image in output"
+msgstr "Breidde i ferdig dokument"
+
+#: src/frontends/qt4/ui/ExternalUi.ui:450
 msgid "Maintain aspect ratio with largest dimension"
 msgstr "Same høgde og bredde høve etter den største lengda"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:452
-#: src/frontends/qt4/ui/GraphicsUi.ui:184
+#: src/frontends/qt4/ui/ExternalUi.ui:453
+#: src/frontends/qt4/ui/GraphicsUi.ui:266
 msgid "&Maintain aspect ratio"
 msgstr "&Same høgde og breidde høve"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:488
-#: src/frontends/qt4/ui/GraphicsUi.ui:104
-msgid "Width of image in output"
-msgstr "Breidde i ferdig dokument"
-
-#: src/frontends/qt4/ui/ExternalUi.ui:509
+#: src/frontends/qt4/ui/ExternalUi.ui:476
 msgid "Crop"
 msgstr "Kutt"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:521
-#: src/frontends/qt4/ui/GraphicsUi.ui:444
-msgid "Get bounding box from the (EPS) file"
-msgstr "Hent storleiken til ramma frå (EPS-) fila"
-
-#: src/frontends/qt4/ui/ExternalUi.ui:524
-#: src/frontends/qt4/ui/GraphicsUi.ui:447
-msgid "&Get from File"
-msgstr "&Hent frå fil"
-
-#: src/frontends/qt4/ui/ExternalUi.ui:544
-#: src/frontends/qt4/ui/GraphicsUi.ui:316
+#: src/frontends/qt4/ui/ExternalUi.ui:491
+#: src/frontends/qt4/ui/GraphicsUi.ui:404
 msgid "Clip to bounding box values"
 msgstr "Klipp til storleiken av ramma"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:547
-#: src/frontends/qt4/ui/GraphicsUi.ui:319
+#: src/frontends/qt4/ui/ExternalUi.ui:494
+#: src/frontends/qt4/ui/GraphicsUi.ui:407
 msgid "Clip to &bounding box"
 msgstr "Klipp til &ramma"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:564
-#: src/frontends/qt4/ui/GraphicsUi.ui:352
+#: src/frontends/qt4/ui/ExternalUi.ui:501
+#: src/frontends/qt4/ui/GraphicsUi.ui:438
 msgid "&Left bottom:"
 msgstr "&Til venstre nede:"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:577
-#: src/frontends/qt4/ui/GraphicsUi.ui:390
-msgid "Right &top:"
-msgstr "Til høgre &oppe:"
-
-#: src/frontends/qt4/ui/ExternalUi.ui:603
+#: src/frontends/qt4/ui/ExternalUi.ui:514
 msgid "x"
 msgstr "x"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:610
-msgid "y"
-msgstr "y"
+#: src/frontends/qt4/ui/ExternalUi.ui:521
+#: src/frontends/qt4/ui/GraphicsUi.ui:476
+msgid "Right &top:"
+msgstr "Til høgre &oppe:"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:618
-msgid "Options"
-msgstr "Val"
+#: src/frontends/qt4/ui/ExternalUi.ui:531
+#: src/frontends/qt4/ui/GraphicsUi.ui:530
+msgid "Get bounding box from the (EPS) file"
+msgstr "Hent storleiken til ramma frå (EPS-) fila"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:646
-msgid "O&ption:"
-msgstr "Va&l:"
+#: src/frontends/qt4/ui/ExternalUi.ui:534
+#: src/frontends/qt4/ui/GraphicsUi.ui:533
+msgid "&Get from File"
+msgstr "&Hent frå fil"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:659
-msgid "Forma&t:"
-msgstr "Forma&t:"
+#: src/frontends/qt4/ui/ExternalUi.ui:564
+msgid "y"
+msgstr "y"
 
 #: src/frontends/qt4/ui/FloatPlacementUi.ui:13
 #: src/frontends/qt4/ui/PDFSupportUi.ui:13
@@ -1134,158 +1096,206 @@ msgstr "&Roter 90
 msgid "FontUi"
 msgstr "SkrifttypeUI"
 
-#: src/frontends/qt4/ui/FontUi.ui:64
-msgid "Sc&ale (%):"
-msgstr "St&orleik (%):"
-
-#: src/frontends/qt4/ui/FontUi.ui:77
-msgid "&Typewriter:"
-msgstr "&Typewriter:"
-
-#: src/frontends/qt4/ui/FontUi.ui:90
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:117
-msgid "&Roman:"
-msgstr "&Romansk:"
+#: src/frontends/qt4/ui/FontUi.ui:41
+#, fuzzy
+msgid "C&JK:"
+msgstr "&Nøkkel:"
 
-#: src/frontends/qt4/ui/FontUi.ui:110
-msgid "S&cale (%):"
-msgstr "Stor&leik (%):"
+#: src/frontends/qt4/ui/FontUi.ui:51
+msgid "Input the font to be used for Chinese, Japanese or Korean (CJK) script"
+msgstr ""
 
-#: src/frontends/qt4/ui/FontUi.ui:123
-msgid "&Sans Serif:"
-msgstr "&Sans Serif:"
+#: src/frontends/qt4/ui/FontUi.ui:71
+msgid "Use old style instead of lining figures"
+msgstr ""
 
-#: src/frontends/qt4/ui/FontUi.ui:146
+#: src/frontends/qt4/ui/FontUi.ui:74
 msgid "Use &Old Style Figures"
 msgstr "Bruk &gamle figurstiler"
 
-#: src/frontends/qt4/ui/FontUi.ui:153
+#: src/frontends/qt4/ui/FontUi.ui:81
+msgid "Use a real small caps shape, if the font provides one"
+msgstr ""
+
+#: src/frontends/qt4/ui/FontUi.ui:84
 msgid "Use true S&mall Caps"
 msgstr "Bruk ekte &liten skrifttype"
 
-#: src/frontends/qt4/ui/FontUi.ui:160
-msgid "&Default Family:"
-msgstr "&Standard familie:"
+#: src/frontends/qt4/ui/FontUi.ui:91
+#, fuzzy
+msgid "Select the default family for the document"
+msgstr "Bruk standardval for dokumentklassa"
 
-#: src/frontends/qt4/ui/FontUi.ui:173
+#: src/frontends/qt4/ui/FontUi.ui:98
 msgid "&Base Size:"
 msgstr "&Start storleik:"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:43
+#: src/frontends/qt4/ui/FontUi.ui:115
+msgid "&Default Family:"
+msgstr "&Standard familie:"
+
+#: src/frontends/qt4/ui/FontUi.ui:138
+msgid "&Sans Serif:"
+msgstr "&Sans Serif:"
+
+#: src/frontends/qt4/ui/FontUi.ui:148
+msgid "Select the Sans Serif (grotesque) typeface"
+msgstr ""
+
+#: src/frontends/qt4/ui/FontUi.ui:155
+msgid "S&cale (%):"
+msgstr "Stor&leik (%):"
+
+#: src/frontends/qt4/ui/FontUi.ui:165
+msgid "Scale the Sans Serif font to match the base font's dimensions"
+msgstr ""
+
+#: src/frontends/qt4/ui/FontUi.ui:178
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:117
+msgid "&Roman:"
+msgstr "&Romansk:"
+
+#: src/frontends/qt4/ui/FontUi.ui:188
+msgid "Select the roman (serif) typeface"
+msgstr ""
+
+#: src/frontends/qt4/ui/FontUi.ui:195
+msgid "&Typewriter:"
+msgstr "&Typewriter:"
+
+#: src/frontends/qt4/ui/FontUi.ui:205
+msgid "Select the typewriter (monospaced) typeface"
+msgstr ""
+
+#: src/frontends/qt4/ui/FontUi.ui:212
+msgid "Sc&ale (%):"
+msgstr "St&orleik (%):"
+
+#: src/frontends/qt4/ui/FontUi.ui:222
+msgid "Scale the Typewriter font to match the base font's dimensions"
+msgstr ""
+
+#: src/frontends/qt4/ui/GraphicsUi.ui:136
 msgid "&Graphics"
 msgstr "&Grafikk"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:62
+#: src/frontends/qt4/ui/GraphicsUi.ui:148
 msgid "Select an image file"
 msgstr "Vel ei biletefil"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:72
+#: src/frontends/qt4/ui/GraphicsUi.ui:158
 msgid "Output Size"
 msgstr "Storleik i ferdig dokument"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:148
+#: src/frontends/qt4/ui/GraphicsUi.ui:230
 msgid "Sets height of graphic. Leave unchecked to set automatically."
 msgstr ""
 "Set høgda på grafikken. Om den ikkje er sett avgjer LyX høgda automatisk."
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:151
+#: src/frontends/qt4/ui/GraphicsUi.ui:233
 msgid "Set &height:"
 msgstr "Set &høgd:"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:158
+#: src/frontends/qt4/ui/GraphicsUi.ui:240
 msgid "&Scale Graphics (%):"
 msgstr "&Skaler Grafikk (%):"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:168
+#: src/frontends/qt4/ui/GraphicsUi.ui:250
 msgid "Sets width of graphic. Leave unchecked to set automatically."
 msgstr ""
 "Set breidda på grafikken. Om den ikkje er sett avgjer LyX breidda automatisk."
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:171
+#: src/frontends/qt4/ui/GraphicsUi.ui:253
 msgid "Set &width:"
 msgstr "Set &breidd:"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:181
+#: src/frontends/qt4/ui/GraphicsUi.ui:263
 msgid "Scale image to maximum size not exceeding width and height"
 msgstr ""
 "Gjer grafikken så stor som mogeleg utan å gå over største breidde og høgde"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:194
+#: src/frontends/qt4/ui/GraphicsUi.ui:276
 msgid "Rotate Graphics"
 msgstr "Roter grafikk"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:209
+#: src/frontends/qt4/ui/GraphicsUi.ui:291
 msgid "Check to change the order of rotating and scaling"
 msgstr ""
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:212
+#: src/frontends/qt4/ui/GraphicsUi.ui:294
 #, fuzzy
 msgid "Ro&tate after scaling"
 msgstr "Rotèr tabell"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:229
+#: src/frontends/qt4/ui/GraphicsUi.ui:311
 msgid "Or&igin:"
 msgstr "&Origo:"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:257
+#: src/frontends/qt4/ui/GraphicsUi.ui:337
 msgid "A&ngle (Degrees):"
 msgstr "&Vinkel (Grader):"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:270
-#: src/frontends/qt4/ui/GraphicsUi.ui:283
+#: src/frontends/qt4/ui/GraphicsUi.ui:350
+#: src/frontends/qt4/ui/GraphicsUi.ui:363
 msgid "File name of image"
 msgstr "Namnet på fila med grafikk"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:291
+#: src/frontends/qt4/ui/GraphicsUi.ui:379
 msgid "&Clipping"
 msgstr "&Klipping"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:400
-#: src/frontends/qt4/ui/GraphicsUi.ui:407
+#: src/frontends/qt4/ui/GraphicsUi.ui:486
+#: src/frontends/qt4/ui/GraphicsUi.ui:493
 msgid "y:"
 msgstr "y:"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:414
-#: src/frontends/qt4/ui/GraphicsUi.ui:421
+#: src/frontends/qt4/ui/GraphicsUi.ui:500
+#: src/frontends/qt4/ui/GraphicsUi.ui:507
 msgid "x:"
 msgstr "x:"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:455
-msgid "LaTe&X and LyX options"
-msgstr "LaTeX- og LyX-&val"
+#: src/frontends/qt4/ui/GraphicsUi.ui:555
+#: src/frontends/qt4/ui/GraphicsUi.ui:574
+msgid "Additional LaTeX options"
+msgstr "Andre LaTeX-val"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:470
-msgid "Sho&w in LyX"
-msgstr "V&is i LyX"
+#: src/frontends/qt4/ui/GraphicsUi.ui:558
+msgid "LaTeX &options:"
+msgstr "LaTeX-&val:"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:522
-msgid "Sca&le on Screen (%):"
-msgstr "Ska&ler på skjermen (%):"
+#: src/frontends/qt4/ui/GraphicsUi.ui:581
+msgid "Draft mode"
+msgstr "Kladd"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:588
-msgid "Don't uncompress image before exporting to LaTeX"
-msgstr "Pakk ikkje ut bilete før det blir eksportert til LaTeX"
+#: src/frontends/qt4/ui/GraphicsUi.ui:584
+msgid "&Draft mode"
+msgstr "&Kladd"
 
 #: src/frontends/qt4/ui/GraphicsUi.ui:591
+msgid "Don't uncompress image before exporting to LaTeX"
+msgstr "Pakk ikkje ut bilete før det blir eksportert til LaTeX"
+
+#: src/frontends/qt4/ui/GraphicsUi.ui:594
 msgid "Don't un&zip on export"
 msgstr "Ikkje un&zip ved eksport"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:606
-#: src/frontends/qt4/ui/GraphicsUi.ui:613
-msgid "Additional LaTeX options"
-msgstr "Andre LaTeX-val"
+#: src/frontends/qt4/ui/GraphicsUi.ui:604
+msgid ""
+"Enable LyX to preview this graphics, only if graphics previewing is not "
+"disabled at application level (see Preference dialog)."
+msgstr ""
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:616
-msgid "LaTeX &options:"
-msgstr "LaTeX-&val:"
+#: src/frontends/qt4/ui/GraphicsUi.ui:607
+msgid "Sho&w in LyX"
+msgstr "V&is i LyX"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:626
-msgid "Draft mode"
-msgstr "Kladd"
+#: src/frontends/qt4/ui/GraphicsUi.ui:644
+msgid "&Initialize Group Name:"
+msgstr ""
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:629
-msgid "&Draft mode"
-msgstr "&Kladd"
+#: src/frontends/qt4/ui/GraphicsUi.ui:660
+msgid "Group Name to be set up from the current parameters"
+msgstr ""
 
 #: src/frontends/qt4/ui/HSpaceUi.ui:28
 msgid "Select a fill pattern style for HFills"
@@ -1299,71 +1309,89 @@ msgstr ""
 msgid "________"
 msgstr ""
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:50 src/frontends/qt4/ui/VSpaceUi.ui:71
+#: src/frontends/qt4/ui/HSpaceUi.ui:47
+msgid "<-----------"
+msgstr ""
+
+#: src/frontends/qt4/ui/HSpaceUi.ui:52
+msgid "----------->"
+msgstr ""
+
+#: src/frontends/qt4/ui/HSpaceUi.ui:57
+msgid "\\-----v-----/"
+msgstr ""
+
+#: src/frontends/qt4/ui/HSpaceUi.ui:62
+msgid "/-----^-----\\"
+msgstr ""
+
+#: src/frontends/qt4/ui/HSpaceUi.ui:70 src/frontends/qt4/ui/VSpaceUi.ui:71
 msgid "&Spacing:"
 msgstr "Mellom&rom:"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:60 src/frontends/qt4/ui/VSpaceUi.ui:127
+#: src/frontends/qt4/ui/HSpaceUi.ui:80 src/frontends/qt4/ui/VSpaceUi.ui:127
 msgid "Supported spacing types"
 msgstr "Ulike slag mellomrom"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:64
+#: src/frontends/qt4/ui/HSpaceUi.ui:84
 #, fuzzy
 msgid "Inter-word space"
 msgstr "Mellom bokstav mellomrom|M"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:69
+#: src/frontends/qt4/ui/HSpaceUi.ui:89
 #, fuzzy
 msgid "Thin space"
 msgstr "Lite mellomrom\t\\,"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:74
+#: src/frontends/qt4/ui/HSpaceUi.ui:94
 #, fuzzy
 msgid "Negative thin space"
 msgstr "Negativt mellomrom\t\\!"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:79
+#: src/frontends/qt4/ui/HSpaceUi.ui:99
 msgid "Half Quad (0.5 em)"
 msgstr ""
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:84
+#: src/frontends/qt4/ui/HSpaceUi.ui:104
 msgid "Quad (1 em)"
 msgstr ""
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:89
+#: src/frontends/qt4/ui/HSpaceUi.ui:109
 #, fuzzy
 msgid "Double Quad (2 em)"
 msgstr "Dobbeltpunkt:"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:94 src/insets/InsetSpace.cpp:94
+#: src/frontends/qt4/ui/HSpaceUi.ui:114 src/insets/InsetSpace.cpp:94
 msgid "Horizontal Fill"
 msgstr "Vassrett fyll"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:99 src/frontends/qt4/ui/ParagraphUi.ui:186
-#: src/frontends/qt4/ui/TabularUi.ui:709 src/frontends/qt4/ui/TabularUi.ui:728
-#: src/frontends/qt4/ui/TabularUi.ui:776 src/frontends/qt4/ui/VSpaceUi.ui:156
-#: src/frontends/qt4/GuiDocument.cpp:587 src/frontends/qt4/GuiDocument.cpp:688
+#: src/frontends/qt4/ui/HSpaceUi.ui:119
+#: 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
+#: lib/layouts/stdcustom.inc:8 src/frontends/qt4/GuiDocument.cpp:585
+#: src/frontends/qt4/GuiDocument.cpp:688
 msgid "Custom"
 msgstr "Tilpassa"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:107 src/frontends/qt4/ui/VSpaceUi.ui:117
+#: src/frontends/qt4/ui/HSpaceUi.ui:127 src/frontends/qt4/ui/VSpaceUi.ui:117
 msgid "&Value:"
 msgstr "&Verdi:"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:120 src/frontends/qt4/ui/VSpaceUi.ui:110
+#: src/frontends/qt4/ui/HSpaceUi.ui:140 src/frontends/qt4/ui/VSpaceUi.ui:110
 msgid "Custom value. Needs spacing type \"Custom\"."
 msgstr "Spesialtilpassa verdiar, Bruk \"spesialtilpassa\" mellomrom."
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:130
+#: src/frontends/qt4/ui/HSpaceUi.ui:150
 #, fuzzy
 msgid "&Fill Pattern:"
 msgstr "&Fil:"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:143 src/frontends/qt4/ui/VSpaceUi.ui:94
+#: src/frontends/qt4/ui/HSpaceUi.ui:163 src/frontends/qt4/ui/VSpaceUi.ui:94
 msgid "&Protect:"
 msgstr "Ve&rn:"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:153 src/frontends/qt4/GuiHSpace.cpp:104
+#: src/frontends/qt4/ui/HSpaceUi.ui:173 src/frontends/qt4/GuiHSpace.cpp:104
 #, fuzzy
 msgid "Insert the spacing even after a line break"
 msgstr "Set inn mellomrom sjølv etter eit sideskift"
@@ -1407,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"
@@ -1477,11 +1506,11 @@ msgstr "Namnet p
 msgid "&Include Type:"
 msgstr "&Filtype:"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:287 src/insets/InsetInclude.cpp:325
+#: 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:316
+#: src/frontends/qt4/ui/IncludeUi.ui:292 src/insets/InsetInclude.cpp:315
 msgid "Input"
 msgstr "Tekstfil"
 
@@ -1489,64 +1518,99 @@ msgstr "Tekstfil"
 msgid "Verbatim"
 msgstr "Verbatim"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:302 src/insets/InsetInclude.cpp:934
+#: src/frontends/qt4/ui/IncludeUi.ui:302 src/insets/InsetInclude.cpp:915
+#: src/insets/InsetInclude.cpp:921
 msgid "Program Listing"
 msgstr "Kodelister"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:343
+#: src/frontends/qt4/ui/IncludeUi.ui:336
 #, fuzzy
 msgid "Edit the file"
 msgstr "Last fila"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:346
+#: src/frontends/qt4/ui/IncludeUi.ui:339
 msgid "&Edit"
 msgstr "&Endre"
 
-#: src/frontends/qt4/ui/LaTeXUi.ui:38
+#: src/frontends/qt4/ui/InfoUi.ui:24
+#, fuzzy
+msgid "Information Type:"
+msgstr "TeX informasjon"
+
+#: src/frontends/qt4/ui/InfoUi.ui:34
+#, fuzzy
+msgid "Information Name:"
+msgstr "TeX informasjon"
+
+#: src/frontends/qt4/ui/InfoUi.ui:64
+#, fuzzy
+msgid "&New"
+msgstr "&Ny:"
+
+#: src/frontends/qt4/ui/LaTeXUi.ui:25
+msgid "Select if the current document is included to a master file"
+msgstr ""
+
+#: src/frontends/qt4/ui/LaTeXUi.ui:31
+#, fuzzy
+msgid "Select de&fault master document"
+msgstr "Bruk standardval for dokumentklassa"
+
+#: src/frontends/qt4/ui/LaTeXUi.ui:46
+#, fuzzy
+msgid "&Master:"
+msgstr "&Ytre:"
+
+#: src/frontends/qt4/ui/LaTeXUi.ui:63
+#, fuzzy
+msgid "Enter the name of the default master document"
+msgstr "Namnet på standard skrivaren"
+
+#: src/frontends/qt4/ui/LaTeXUi.ui:73
 #, fuzzy
 msgid "Modules"
 msgstr "Midten"
 
-#: src/frontends/qt4/ui/LaTeXUi.ui:80
+#: src/frontends/qt4/ui/LaTeXUi.ui:115
 #, fuzzy
 msgid "De&lete"
 msgstr "&Slett"
 
-#: src/frontends/qt4/ui/LaTeXUi.ui:94
+#: src/frontends/qt4/ui/LaTeXUi.ui:129
 #: src/frontends/qt4/ui/PrefConvertersUi.ui:187
 #: src/frontends/qt4/ui/SpellcheckerUi.ui:58
 msgid "A&dd"
 msgstr "&Legg til"
 
-#: src/frontends/qt4/ui/LaTeXUi.ui:108
+#: src/frontends/qt4/ui/LaTeXUi.ui:143
 #, fuzzy
 msgid "S&elected:"
 msgstr "&Slett"
 
-#: src/frontends/qt4/ui/LaTeXUi.ui:118
+#: src/frontends/qt4/ui/LaTeXUi.ui:153
 #, fuzzy
 msgid "A&vailable:"
 msgstr "T&ilgjengelege greiner:"
 
-#: src/frontends/qt4/ui/LaTeXUi.ui:151
+#: src/frontends/qt4/ui/LaTeXUi.ui:186
 #, fuzzy
 msgid "&Postscript driver:"
 msgstr "Postscript-&drivaren:"
 
-#: src/frontends/qt4/ui/LaTeXUi.ui:164
+#: src/frontends/qt4/ui/LaTeXUi.ui:199
 msgid "&Options:"
 msgstr "&Val:"
 
-#: src/frontends/qt4/ui/LaTeXUi.ui:182
+#: src/frontends/qt4/ui/LaTeXUi.ui:217
 msgid "Click to select a local document class definition file"
 msgstr ""
 
-#: src/frontends/qt4/ui/LaTeXUi.ui:185
+#: src/frontends/qt4/ui/LaTeXUi.ui:220
 #, fuzzy
 msgid "&Local Layout..."
 msgstr "Tekststil"
 
-#: src/frontends/qt4/ui/LaTeXUi.ui:192
+#: src/frontends/qt4/ui/LaTeXUi.ui:227
 msgid "Document &class:"
 msgstr "&Dokumentklasse:"
 
@@ -1569,8 +1633,8 @@ msgstr "&Ytre:"
 msgid "&Quote Style:"
 msgstr "&Sitatstil:"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:16 src/insets/InsetCaption.cpp:296
-#: src/insets/InsetListings.cpp:249 src/insets/InsetListings.cpp:251
+#: src/frontends/qt4/ui/ListingsUi.ui:16 src/insets/InsetCaption.cpp:299
+#: src/insets/InsetListings.cpp:320 src/insets/InsetListings.cpp:322
 msgid "Listing"
 msgstr "Kodeliste"
 
@@ -1908,7 +1972,7 @@ msgid "&Numbering"
 msgstr "&Nummerering"
 
 #: src/frontends/qt4/ui/PageLayoutUi.ui:33
-#: src/frontends/qt4/GuiDocument.cpp:980
+#: src/frontends/qt4/GuiDocument.cpp:982
 msgid "Page Layout"
 msgstr "Avsnittstil"
 
@@ -1957,197 +2021,198 @@ msgstr "Bruk to spaltar"
 msgid "&Two-sided document"
 msgstr "&Tosidig"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:28
-#, fuzzy
-msgid "&Indent Paragraph"
-msgstr "Rykk inn &avsnitt"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:38
-msgid "Label Width"
-msgstr "Etikettbreidd"
-
-#: src/frontends/qt4/ui/ParagraphUi.ui:53
-#: src/frontends/qt4/ui/ParagraphUi.ui:60
-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:63
-#, fuzzy
-msgid "Lo&ngest label"
-msgstr "&Lengste etikett"
+#: src/frontends/qt4/ui/ParagraphUi.ui:44
+msgid "I&mmediate Apply"
+msgstr ""
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:102
+#: 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:105
+#: src/frontends/qt4/ui/ParagraphUi.ui:126
 #, fuzzy
 msgid "Paragraph's &Default"
 msgstr "set avsnitt stil"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:112
-msgid "&Justified"
-msgstr "&Justert"
+#: 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:119
+#: src/frontends/qt4/ui/ParagraphUi.ui:147
 msgid "&Left"
 msgstr "&Venstre"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:126
-msgid "&Center"
-msgstr "&Midten"
+#: src/frontends/qt4/ui/ParagraphUi.ui:154
+msgid "&Justified"
+msgstr "&Justert"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:133
+#: src/frontends/qt4/ui/ParagraphUi.ui:164
 #, fuzzy
-msgid "Ri&ght"
-msgstr "Høgre"
+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:143
+#: src/frontends/qt4/ui/ParagraphUi.ui:212
 #, fuzzy
 msgid "Line &spacing"
 msgstr "&Linjeavstand:"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:171 src/Text.cpp:1258
-#: src/frontends/qt4/GuiDocument.cpp:581
+#: 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:176
+#: src/frontends/qt4/ui/ParagraphUi.ui:245
 msgid "1.5"
 msgstr "1.5"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:181 src/Text.cpp:1264
-#: src/frontends/qt4/GuiDocument.cpp:585
+#: 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/ParagraphUi.ui:231
-msgid "I&mmediate Apply"
-msgstr ""
-
-#: src/frontends/qt4/ui/PDFSupportUi.ui:41
+#: src/frontends/qt4/ui/PDFSupportUi.ui:28
 msgid "&Use hyperref support"
 msgstr ""
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:62
-#, fuzzy
-msgid "Additional o&ptions"
-msgstr "Andre LaTeX-val"
-
-#: src/frontends/qt4/ui/PDFSupportUi.ui:91
-msgid "e.g.: pdfstartview=XYZ, plainpages=false, pdfpagelabels"
-msgstr ""
-
-#: src/frontends/qt4/ui/PDFSupportUi.ui:105
+#: src/frontends/qt4/ui/PDFSupportUi.ui:53
 #, fuzzy
 msgid "&General"
 msgstr "Generelt"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:151
+#: src/frontends/qt4/ui/PDFSupportUi.ui:99
 msgid ""
 "If not stated explicitly, fill title and author from appropriate environments"
 msgstr ""
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:154
+#: src/frontends/qt4/ui/PDFSupportUi.ui:102
 #, fuzzy
 msgid "Automatically fi&ll header"
 msgstr "Vis endringar automatisk"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:161
+#: src/frontends/qt4/ui/PDFSupportUi.ui:109
 msgid "Enable fullscreen PDF presentation"
 msgstr ""
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:164
+#: src/frontends/qt4/ui/PDFSupportUi.ui:112
 msgid "Load in &fullscreen mode"
 msgstr ""
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:173
+#: src/frontends/qt4/ui/PDFSupportUi.ui:121
 #, fuzzy
 msgid "Header Information"
 msgstr "TeX informasjon"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:185
+#: src/frontends/qt4/ui/PDFSupportUi.ui:133
 #, fuzzy
 msgid "&Title:"
 msgstr "Tittel:"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:198
+#: src/frontends/qt4/ui/PDFSupportUi.ui:146
 #, fuzzy
 msgid "&Author:"
 msgstr "Forfattar:"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:211
+#: src/frontends/qt4/ui/PDFSupportUi.ui:159
 #, fuzzy
 msgid "&Subject:"
 msgstr "Emne:"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:224
+#: src/frontends/qt4/ui/PDFSupportUi.ui:172
 #, fuzzy
 msgid "&Keywords:"
 msgstr "&Nøkkelord:"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:241
+#: src/frontends/qt4/ui/PDFSupportUi.ui:189
 #, fuzzy
 msgid "H&yperlinks"
 msgstr "&Lag lenke"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:274
+#: src/frontends/qt4/ui/PDFSupportUi.ui:222
 msgid "Allows link text to break across lines."
 msgstr ""
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:277
+#: src/frontends/qt4/ui/PDFSupportUi.ui:225
 #, fuzzy
 msgid "B&reak links over lines"
 msgstr "&Brekk lange linjer"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:284
+#: src/frontends/qt4/ui/PDFSupportUi.ui:232
 #, fuzzy
 msgid "No &frames around links"
 msgstr "Inga ramme"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:294
+#: src/frontends/qt4/ui/PDFSupportUi.ui:242
 #, fuzzy
 msgid "C&olor links"
 msgstr "Fargar"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:301
-#: src/frontends/qt4/ui/PDFSupportUi.ui:311
+#: src/frontends/qt4/ui/PDFSupportUi.ui:249
+#: src/frontends/qt4/ui/PDFSupportUi.ui:259
 msgid "Adds \"backlink\" text to the end of each item in the bibliography"
 msgstr ""
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:304
+#: src/frontends/qt4/ui/PDFSupportUi.ui:252
 msgid "B&ibliographical backreferences"
 msgstr ""
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:314
+#: src/frontends/qt4/ui/PDFSupportUi.ui:262
 #, fuzzy
 msgid "Backreference by pa&ge number"
 msgstr "<referanse> på side <side>"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:337
+#: src/frontends/qt4/ui/PDFSupportUi.ui:285
 #, fuzzy
 msgid "&Bookmarks"
 msgstr "Bokmerke|B"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:349
+#: src/frontends/qt4/ui/PDFSupportUi.ui:297
 #, fuzzy
 msgid "G&enerate Bookmarks"
 msgstr "Fjern Bokmerke|B"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:370
+#: src/frontends/qt4/ui/PDFSupportUi.ui:318
 #, fuzzy
-msgid "&Open bookmarks"
-msgstr "Lagra bokmerke"
+msgid "&Numbered bookmarks"
+msgstr "Nummerert formel|f"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:390
+#: src/frontends/qt4/ui/PDFSupportUi.ui:343
 #, fuzzy
 msgid "Number of levels"
 msgstr "Kor mange kopiar"
 
-#: src/frontends/qt4/ui/PDFSupportUi.ui:410
+#: src/frontends/qt4/ui/PDFSupportUi.ui:352
 #, fuzzy
-msgid "&Numbered bookmarks"
-msgstr "Nummerert formel|f"
+msgid "&Open bookmarks"
+msgstr "Lagra bokmerke"
+
+#: src/frontends/qt4/ui/PDFSupportUi.ui:392
+#, fuzzy
+msgid "Additional o&ptions"
+msgstr "Andre LaTeX-val"
+
+#: src/frontends/qt4/ui/PDFSupportUi.ui:421
+msgid "e.g.: pdfstartview=XYZ, plainpages=false, pdfpagelabels"
+msgstr ""
 
 #: src/frontends/qt4/ui/PrefColorsUi.ui:50
 msgid "&Alter..."
@@ -2274,12 +2339,13 @@ msgid "&To format:"
 msgstr "&Til format:"
 
 #: src/frontends/qt4/ui/PrefConvertersUi.ui:194
+#: src/frontends/qt4/ui/PrefShortcutsUi.ui:54
 msgid "&Modify"
 msgstr "E&ndra"
 
 #: src/frontends/qt4/ui/PrefConvertersUi.ui:209
-#: src/frontends/qt4/ui/PrefShortcutsUi.ui:100
-#: src/frontends/qt4/GuiPrefs.cpp:2190 src/frontends/qt4/GuiPrefs.cpp:2265
+#: src/frontends/qt4/ui/PrefShortcutsUi.ui:61
+#: src/frontends/qt4/GuiPrefs.cpp:2257 src/frontends/qt4/GuiPrefs.cpp:2320
 msgid "Remo&ve"
 msgstr "&Fjern"
 
@@ -2307,31 +2373,28 @@ msgstr "&Datoformat:"
 msgid "Date format for strftime output"
 msgstr "Datoformatet til strftime"
 
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:39 src/Font.cpp:66
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:19
+#, fuzzy
+msgid "Display &Graphics"
+msgstr "Vis &grafikk:"
+
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:39
+msgid "Instant &Preview:"
+msgstr "Vis med det &same:"
+
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:50 src/Font.cpp:66
 msgid "Off"
 msgstr "Av"
 
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:44
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:55
 msgid "No math"
 msgstr "Ikkje nytt matte"
 
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:49 src/Font.cpp:66
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:60 src/Font.cpp:66
 msgid "On"
 msgstr "På"
 
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:73
-msgid "Do not display"
-msgstr "Ikkje vis matte"
-
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:81
-msgid "Display &Graphics:"
-msgstr "Vis &grafikk:"
-
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:91
-msgid "Instant &Preview:"
-msgstr "Vis med det &same:"
-
-#: src/frontends/qt4/ui/PrefEditUi.ui:33 src/frontends/qt4/GuiPrefs.cpp:214
+#: src/frontends/qt4/ui/PrefEditUi.ui:33 src/frontends/qt4/GuiPrefs.cpp:221
 #, fuzzy
 msgid "Editing"
 msgstr "Avsluttar."
@@ -2375,17 +2438,17 @@ msgstr ""
 
 #: src/frontends/qt4/ui/PrefEditUi.ui:169
 #, fuzzy
-msgid "Toggle tabba&r"
-msgstr "Skru av/på tabellverktylinje"
+msgid "Hide tabba&r"
+msgstr "delta"
 
 #: src/frontends/qt4/ui/PrefEditUi.ui:176
 #, fuzzy
-msgid "To&ggle scrollbar"
+msgid "Hide scr&ollbar"
 msgstr "Skru av/på matteverktylinje"
 
 #: src/frontends/qt4/ui/PrefEditUi.ui:191
 #, fuzzy
-msgid "T&oggle toolbars"
+msgid "&Hide toolbars"
 msgstr "Skru av/på matteverktylinje"
 
 #: src/frontends/qt4/ui/PrefFileformatsUi.ui:31
@@ -2452,7 +2515,7 @@ msgid "&First:"
 msgstr "&Første:"
 
 #: src/frontends/qt4/ui/PrefInputUi.ui:76
-#: src/frontends/qt4/ui/PrefShortcutsUi.ui:66
+#: src/frontends/qt4/ui/PrefShortcutsUi.ui:83
 #: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:57
 msgid "Br&owse..."
 msgstr "B&la gjennom..."
@@ -2480,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:2703
-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:110
+msgid "Use the babel package for multilingual support"
+msgstr ""
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:209
-msgid "Command e&nd:"
-msgstr "Slutt Komma&ndo:"
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:113
+msgid "Use b&abel"
+msgstr "Bruk &babel"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:219
+#: 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"
@@ -2726,7 +2795,7 @@ msgstr "&Mellombelslager stig:"
 msgid "&PATH prefix:"
 msgstr "&Stig-prefiks:"
 
-#: src/frontends/qt4/ui/PrefPlaintextUi.ui:57 src/LyXRC.cpp:2393
+#: 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, "
@@ -2965,18 +3034,18 @@ msgstr ""
 msgid "Use Pixmap Cache to speed up font rendering"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefShortcutsUi.ui:41
-msgid "Show ke&y-bindings containing:"
-msgstr ""
+#: src/frontends/qt4/ui/PrefShortcutsUi.ui:68
+#, fuzzy
+msgid "Ne&w"
+msgstr "&Ny:"
 
-#: src/frontends/qt4/ui/PrefShortcutsUi.ui:56
+#: src/frontends/qt4/ui/PrefShortcutsUi.ui:90
 msgid "&Bind file:"
 msgstr "Fil med &tastaurbindingar:"
 
-#: src/frontends/qt4/ui/PrefShortcutsUi.ui:107
-#, fuzzy
-msgid "Ne&w"
-msgstr "&Ny:"
+#: src/frontends/qt4/ui/PrefShortcutsUi.ui:108
+msgid "Show ke&y-bindings containing:"
+msgstr ""
 
 #: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:64
 msgid "Al&ternative language:"
@@ -3056,36 +3125,31 @@ msgstr "L&ag reservekopi "
 msgid "Open documents in &tabs"
 msgstr "Opna eit dokument"
 
-#: src/frontends/qt4/ui/PrefUi.ui:177
-#, fuzzy
-msgid "Use &bundled format for new documents"
-msgstr "Kunne ikkje lese dokumentet"
-
-#: src/frontends/qt4/ui/PrefUi.ui:200
+#: src/frontends/qt4/ui/PrefUi.ui:193
 #, fuzzy
 msgid "Automatic help"
 msgstr "Vis endringar automatisk"
 
-#: src/frontends/qt4/ui/PrefUi.ui:218
+#: src/frontends/qt4/ui/PrefUi.ui:211
 msgid ""
 "Checking this allow the automatic display of helpful comments for insets in "
 "the main work area of an edited document"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefUi.ui:221
+#: src/frontends/qt4/ui/PrefUi.ui:214
 msgid "Enable &tool tips in main work area"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefUi.ui:231
+#: src/frontends/qt4/ui/PrefUi.ui:224
 msgid "Bro&wse..."
 msgstr "B&la gjennom..."
 
-#: src/frontends/qt4/ui/PrefUi.ui:241
+#: src/frontends/qt4/ui/PrefUi.ui:234
 msgid "&User interface file:"
 msgstr "Br&ukargrensesnitt fil:"
 
-#: src/frontends/qt4/ui/PrefsUi.ui:73 src/LyXFunc.cpp:692
-#: src/frontends/qt4/GuiView.cpp:1644
+#: src/frontends/qt4/ui/PrefsUi.ui:73 src/LyXFunc.cpp:665
+#: src/frontends/qt4/GuiView.cpp:1740
 msgid "&Save"
 msgstr "&Lagra"
 
@@ -3222,7 +3286,7 @@ msgstr "Oppdater referanselista"
 msgid "Jump to the label"
 msgstr "Hopp til etikett"
 
-#: src/frontends/qt4/ui/RefUi.ui:250 src/frontends/qt4/GuiRef.cpp:264
+#: src/frontends/qt4/ui/RefUi.ui:250 src/frontends/qt4/GuiRef.cpp:272
 msgid "&Go to Label"
 msgstr "&Gå til etikett"
 
@@ -3273,26 +3337,50 @@ msgstr "Eks&portformat:"
 msgid "&Command:"
 msgstr "&Kommando:"
 
-#: src/frontends/qt4/ui/ShortcutUi.ui:16
+#: src/frontends/qt4/ui/ShortcutUi.ui:13
 #, fuzzy
 msgid "Edit shortcut"
 msgstr "&Snøggtast:"
 
-#: src/frontends/qt4/ui/ShortcutUi.ui:54
+#: src/frontends/qt4/ui/ShortcutUi.ui:77
+msgid "Enter LyX function or command sequence"
+msgstr ""
+
+#: src/frontends/qt4/ui/ShortcutUi.ui:87
+msgid "Remove last key from the shortcut sequence"
+msgstr ""
+
+#: src/frontends/qt4/ui/ShortcutUi.ui:90
 #, fuzzy
-msgid "Clear"
-msgstr "&Fjern"
+msgid "&Delete Key"
+msgstr "&Slett"
 
-#: src/frontends/qt4/ui/ShortcutUi.ui:61
+#: src/frontends/qt4/ui/ShortcutUi.ui:97
 #, fuzzy
-msgid "Function:"
-msgstr "Funksjonar"
+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:68 src/frontends/qt4/GuiPrefs.cpp:1973
+#: src/frontends/qt4/ui/ShortcutUi.ui:107
 #, fuzzy
-msgid "Shortcut"
+msgid "&Shortcut:"
 msgstr "&Snøggtast:"
 
+#: src/frontends/qt4/ui/ShortcutUi.ui:117
+#, fuzzy
+msgid "&Function:"
+msgstr "Funksjonar"
+
+#: 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:"
 msgstr "Framlegg:"
@@ -3385,8 +3473,8 @@ msgstr "&Vassrett tekstjustering:"
 msgid "Horizontal alignment in column"
 msgstr "Vassrett tekstjustering i kolonner"
 
-#: src/frontends/qt4/ui/TabularUi.ui:137 src/frontends/qt4/GuiParagraph.cpp:91
-#: src/frontends/qt4/GuiTabular.cpp:679
+#: src/frontends/qt4/ui/TabularUi.ui:137
+#: src/frontends/qt4/GuiParagraph.cpp:108 src/frontends/qt4/GuiTabular.cpp:717
 msgid "Justified"
 msgstr "Justert"
 
@@ -3442,10 +3530,6 @@ msgstr "&Sett inn"
 msgid "Unset all borders of the current (selected) cell(s)"
 msgstr "Skru av rammene på dei valde cellene"
 
-#: src/frontends/qt4/ui/TabularUi.ui:272
-msgid "C&lear"
-msgstr "&Fjern"
-
 #: src/frontends/qt4/ui/TabularUi.ui:310
 msgid "Use formal (a.k.a. booktabs) border style (no vertical borders)"
 msgstr "Formelle (booktabs) kantlinjer (utan vertikale linjer)"
@@ -3466,133 +3550,145 @@ msgstr "Stan&dard"
 msgid "Set Borders"
 msgstr "Endre kantlinjer"
 
-#: src/frontends/qt4/ui/TabularUi.ui:657
+#: src/frontends/qt4/ui/TabularUi.ui:861
 msgid "Set borders of the current (selected) cell(s)"
 msgstr "Lag ramme på dei valde cellene"
 
-#: src/frontends/qt4/ui/TabularUi.ui:670
+#: src/frontends/qt4/ui/TabularUi.ui:874
 msgid "Additional Space"
 msgstr "Ekstra mellomrom"
 
-#: src/frontends/qt4/ui/TabularUi.ui:682
+#: src/frontends/qt4/ui/TabularUi.ui:886
 msgid "T&op of row:"
 msgstr "Øvste ra&da:"
 
-#: src/frontends/qt4/ui/TabularUi.ui:742
+#: src/frontends/qt4/ui/TabularUi.ui:946
 msgid "Botto&m of row:"
 msgstr "&Nedste rada:"
 
-#: src/frontends/qt4/ui/TabularUi.ui:755
+#: src/frontends/qt4/ui/TabularUi.ui:959
 msgid "Bet&ween rows:"
 msgstr "Me&llom radane:"
 
-#: src/frontends/qt4/ui/TabularUi.ui:793
+#: src/frontends/qt4/ui/TabularUi.ui:997
 msgid "&Longtable"
 msgstr "&Langtabell"
 
-#: src/frontends/qt4/ui/TabularUi.ui:821
+#: src/frontends/qt4/ui/TabularUi.ui:1025
 msgid "Set a page break on the current row"
 msgstr "Skifter sida ved den rada som skrivemerket står i"
 
-#: src/frontends/qt4/ui/TabularUi.ui:824
+#: src/frontends/qt4/ui/TabularUi.ui:1028
 msgid "Page &break on current row"
 msgstr "Skift si&de i denne rada"
 
-#: src/frontends/qt4/ui/TabularUi.ui:834
+#: src/frontends/qt4/ui/TabularUi.ui:1038
 msgid "Settings"
 msgstr "Val"
 
-#: src/frontends/qt4/ui/TabularUi.ui:846
+#: src/frontends/qt4/ui/TabularUi.ui:1050
 msgid "Status"
 msgstr "Status"
 
-#: src/frontends/qt4/ui/TabularUi.ui:853
-msgid "Header:"
-msgstr "Overskrift:"
-
-#: src/frontends/qt4/ui/TabularUi.ui:860
-msgid "Footer:"
-msgstr "Botntekst:"
-
-#: src/frontends/qt4/ui/TabularUi.ui:867
-msgid "First header:"
-msgstr "Første overskrift:"
-
-#: src/frontends/qt4/ui/TabularUi.ui:874
-msgid "Last footer:"
-msgstr "Siste botntekst:"
-
-#: src/frontends/qt4/ui/TabularUi.ui:881
-msgid "Contents"
-msgstr "Innhald"
-
-#: src/frontends/qt4/ui/TabularUi.ui:888
+#: src/frontends/qt4/ui/TabularUi.ui:1057
 msgid "Border above"
 msgstr "Kantlinje over"
 
-#: src/frontends/qt4/ui/TabularUi.ui:895
+#: src/frontends/qt4/ui/TabularUi.ui:1064
 msgid "Border below"
 msgstr "Kantlinje under"
 
-#: src/frontends/qt4/ui/TabularUi.ui:902
+#: src/frontends/qt4/ui/TabularUi.ui:1071
+msgid "Contents"
+msgstr "Innhald"
+
+#: src/frontends/qt4/ui/TabularUi.ui:1078
+msgid "Header:"
+msgstr "Overskrift:"
+
+#: src/frontends/qt4/ui/TabularUi.ui:1085
 msgid "Repeat this row as header on every (except the first) page"
 msgstr "Buk denne rada som topprad på alle sidene (utanom den fyrste)"
 
-#: src/frontends/qt4/ui/TabularUi.ui:905 src/frontends/qt4/ui/TabularUi.ui:918
-#: src/frontends/qt4/ui/TabularUi.ui:928 src/frontends/qt4/ui/TabularUi.ui:938
-#: src/frontends/qt4/GuiView.cpp:1770
+#: src/frontends/qt4/ui/TabularUi.ui:1088
+#: 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:953
+#: src/frontends/qt4/GuiToolbar.cpp:962
 msgid "on"
 msgstr "på"
 
-#: src/frontends/qt4/ui/TabularUi.ui:912
+#: src/frontends/qt4/ui/TabularUi.ui:1098
+#: src/frontends/qt4/ui/TabularUi.ui:1105
+#: src/frontends/qt4/ui/TabularUi.ui:1132
+#: src/frontends/qt4/ui/TabularUi.ui:1139
+#: src/frontends/qt4/ui/TabularUi.ui:1173
+#: src/frontends/qt4/ui/TabularUi.ui:1180
+#: src/frontends/qt4/ui/TabularUi.ui:1204
+#: src/frontends/qt4/ui/TabularUi.ui:1211
+msgid "double"
+msgstr "dobbel"
+
+#: src/frontends/qt4/ui/TabularUi.ui:1112
+msgid "First header:"
+msgstr "Første overskrift:"
+
+#: src/frontends/qt4/ui/TabularUi.ui:1119
 msgid "This row is the header of the first page"
 msgstr "Bruk denne rada som topprad på fyrste sida"
 
-#: src/frontends/qt4/ui/TabularUi.ui:925
+#: src/frontends/qt4/ui/TabularUi.ui:1146
+msgid "Don't output the first header"
+msgstr "Skriv ikkje de fyrste topprada"
+
+#: src/frontends/qt4/ui/TabularUi.ui:1149
+#: src/frontends/qt4/ui/TabularUi.ui:1221
+msgid "is empty"
+msgstr "Skal vere tom"
+
+#: src/frontends/qt4/ui/TabularUi.ui:1156
+msgid "Footer:"
+msgstr "Botntekst:"
+
+#: src/frontends/qt4/ui/TabularUi.ui:1163
 msgid "Repeat this row as footer on every (except the last) page"
 msgstr "Bruk denne rada som botnrad på alle sidene (utanom av den siste)"
 
-#: src/frontends/qt4/ui/TabularUi.ui:935
+#: src/frontends/qt4/ui/TabularUi.ui:1187
+msgid "Last footer:"
+msgstr "Siste botntekst:"
+
+#: src/frontends/qt4/ui/TabularUi.ui:1194
 msgid "This row is the footer of the last page"
 msgstr "Denne rada er botnrada på siste sida"
 
-#: src/frontends/qt4/ui/TabularUi.ui:948 src/frontends/qt4/ui/TabularUi.ui:955
-#: src/frontends/qt4/ui/TabularUi.ui:962 src/frontends/qt4/ui/TabularUi.ui:969
-#: src/frontends/qt4/ui/TabularUi.ui:976 src/frontends/qt4/ui/TabularUi.ui:983
-#: src/frontends/qt4/ui/TabularUi.ui:990 src/frontends/qt4/ui/TabularUi.ui:997
-msgid "double"
-msgstr "dobbel"
-
-#: src/frontends/qt4/ui/TabularUi.ui:1004
+#: src/frontends/qt4/ui/TabularUi.ui:1218
 msgid "Don't output the last footer"
 msgstr "Skriv ikkje den siste botnrada"
 
-#: src/frontends/qt4/ui/TabularUi.ui:1007
-#: src/frontends/qt4/ui/TabularUi.ui:1017
-msgid "is empty"
-msgstr "Skal vere tom"
-
-#: src/frontends/qt4/ui/TabularUi.ui:1014
-msgid "Don't output the first header"
-msgstr "Skriv ikkje de fyrste topprada"
+#: src/frontends/qt4/ui/TabularUi.ui:1228
+#, fuzzy
+msgid "Caption:"
+msgstr "L&edetekst:"
 
-#: src/frontends/qt4/ui/TabularUi.ui:1027
+#: src/frontends/qt4/ui/TabularUi.ui:1245
 msgid "Select for tables that span multiple pages"
 msgstr "Vel for lange tabellar som skal gå over fleire sider"
 
-#: src/frontends/qt4/ui/TabularUi.ui:1030
+#: src/frontends/qt4/ui/TabularUi.ui:1248
 msgid "&Use long table"
 msgstr "&Bruk langtabell"
 
-#: src/frontends/qt4/ui/TabularUi.ui:1049
+#: src/frontends/qt4/ui/TabularUi.ui:1267
 msgid "Current cell:"
 msgstr "Noverande celle:"
 
-#: src/frontends/qt4/ui/TabularUi.ui:1073
+#: src/frontends/qt4/ui/TabularUi.ui:1291
 msgid "Current row position"
 msgstr "Den noverande rada"
 
-#: src/frontends/qt4/ui/TabularUi.ui:1097
+#: src/frontends/qt4/ui/TabularUi.ui:1315
 msgid "Current column position"
 msgstr "Den noverande kolonna"
 
@@ -3748,15 +3844,15 @@ msgstr "Set inn mellomrom sj
 msgid "DefSkip"
 msgstr "Standard avstand"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:136 src/frontends/qt4/GuiDocument.cpp:574
+#: src/frontends/qt4/ui/VSpaceUi.ui:136 src/frontends/qt4/GuiDocument.cpp:572
 msgid "SmallSkip"
 msgstr "Liten avstand"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:141 src/frontends/qt4/GuiDocument.cpp:575
+#: src/frontends/qt4/ui/VSpaceUi.ui:141 src/frontends/qt4/GuiDocument.cpp:573
 msgid "MedSkip"
 msgstr "Medium avstand"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:146 src/frontends/qt4/GuiDocument.cpp:576
+#: src/frontends/qt4/ui/VSpaceUi.ui:146 src/frontends/qt4/GuiDocument.cpp:574
 msgid "BigSkip"
 msgstr "Stor avstand"
 
@@ -3828,9 +3924,9 @@ msgstr ""
 msgid "Allow &floating"
 msgstr ""
 
-#: lib/layouts/IEEEtran.layout:18 lib/layouts/aa.layout:22
+#: 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
@@ -3856,7 +3952,7 @@ msgstr "Standard"
 msgid "TheoremTemplate"
 msgstr "Teorem-mal"
 
-#: lib/layouts/IEEEtran.layout:65 lib/layouts/beamer.layout:949
+#: lib/layouts/IEEEtran.layout:65 lib/layouts/beamer.layout:983
 #: lib/layouts/elsart.layout:287 lib/layouts/foils.layout:278
 #: lib/layouts/heb-article.layout:95 lib/layouts/ijmpc.layout:217
 #: lib/layouts/ijmpd.layout:217 lib/layouts/llncs.layout:371
@@ -3870,7 +3966,7 @@ msgstr "Prov"
 msgid "Proof:"
 msgstr "Prov:"
 
-#: lib/layouts/IEEEtran.layout:73 lib/layouts/beamer.layout:955
+#: lib/layouts/IEEEtran.layout:73 lib/layouts/beamer.layout:989
 #: lib/layouts/elsart.layout:258 lib/layouts/foils.layout:218
 #: lib/layouts/heb-article.layout:18 lib/layouts/ijmpc.layout:196
 #: lib/layouts/ijmpd.layout:199 lib/layouts/llncs.layout:412
@@ -3895,7 +3991,7 @@ msgstr "Teorem #:"
 #: lib/layouts/llncs.layout:351 lib/layouts/siamltex.layout:215
 #: 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:14
+#: lib/layouts/theorems-starred-equivalents.inc:20
 msgid "Lemma"
 msgstr "Lemma"
 
@@ -3903,14 +3999,14 @@ msgstr "Lemma"
 msgid "Lemma #:"
 msgstr "Lemma #:"
 
-#: lib/layouts/IEEEtran.layout:93 lib/layouts/beamer.layout:886
+#: lib/layouts/IEEEtran.layout:93 lib/layouts/beamer.layout:919
 #: lib/layouts/elsart.layout:321 lib/layouts/foils.layout:250
 #: 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.inc:58 lib/layouts/theorems-ams.inc:59
 #: lib/layouts/theorems-order.inc:13
-#: lib/layouts/theorems-starred-equivalents.inc:10
+#: lib/layouts/theorems-starred-equivalents.inc:13
 msgid "Corollary"
 msgstr "Korollar"
 
@@ -3924,7 +4020,7 @@ msgstr "Korollar #:"
 #: lib/layouts/siamltex.layout:229 lib/layouts/svjour.inc:447
 #: lib/layouts/theorems.inc:80 lib/layouts/theorems-ams.inc:83
 #: lib/layouts/theorems-order.inc:25
-#: lib/layouts/theorems-starred-equivalents.inc:18
+#: lib/layouts/theorems-starred-equivalents.inc:27
 msgid "Proposition"
 msgstr "Framlegg"
 
@@ -3937,7 +4033,7 @@ msgstr "Framlegg #:"
 #: lib/layouts/llncs.layout:309 lib/layouts/svjour.inc:366
 #: lib/layouts/theorems.inc:91 lib/layouts/theorems-ams.inc:95
 #: lib/layouts/theorems-order.inc:31
-#: lib/layouts/theorems-starred-equivalents.inc:22
+#: lib/layouts/theorems-starred-equivalents.inc:34
 msgid "Conjecture"
 msgstr "Konjektur"
 
@@ -3954,7 +4050,7 @@ msgstr "Kriterium"
 msgid "Criterion #:"
 msgstr "Kriterium #:"
 
-#: lib/layouts/IEEEtran.layout:133 lib/layouts/beamer.layout:943
+#: lib/layouts/IEEEtran.layout:133 lib/layouts/beamer.layout:977
 #: lib/layouts/theorems.inc:102 lib/layouts/theorems-ams.inc:107
 msgid "Fact"
 msgstr "Faktum"
@@ -3971,14 +4067,14 @@ msgstr "Aksiom"
 msgid "Axiom #:"
 msgstr "Aksiom #:"
 
-#: lib/layouts/IEEEtran.layout:153 lib/layouts/beamer.layout:913
+#: lib/layouts/IEEEtran.layout:153 lib/layouts/beamer.layout:947
 #: lib/layouts/elsart.layout:349 lib/layouts/foils.layout:264
 #: 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.inc:113 lib/layouts/theorems-ams.inc:119
 #: lib/layouts/theorems-order.inc:37
-#: lib/layouts/theorems-starred-equivalents.inc:26
+#: lib/layouts/theorems-starred-equivalents.inc:41
 msgid "Definition"
 msgstr "Definisjon"
 
@@ -3986,13 +4082,13 @@ msgstr "Definisjon"
 msgid "Definition #:"
 msgstr "Definisjon #:"
 
-#: lib/layouts/IEEEtran.layout:163 lib/layouts/beamer.layout:925
+#: 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.inc:132
 #: lib/layouts/theorems-ams.inc:138 lib/layouts/theorems-order.inc:43
-#: lib/layouts/theorems-starred-equivalents.inc:30
-#: src/frontends/qt4/GuiDocument.cpp:826
+#: lib/layouts/theorems-starred-equivalents.inc:48
+#: src/frontends/qt4/GuiDocument.cpp:827
 msgid "Example"
 msgstr "Døme"
 
@@ -4013,7 +4109,7 @@ msgstr "Vilk
 #: lib/layouts/llncs.layout:364 lib/layouts/svjour.inc:426
 #: lib/layouts/theorems.inc:144 lib/layouts/theorems-ams.inc:150
 #: lib/layouts/theorems-order.inc:49
-#: lib/layouts/theorems-starred-equivalents.inc:34
+#: lib/layouts/theorems-starred-equivalents.inc:55
 msgid "Problem"
 msgstr "Problem"
 
@@ -4024,7 +4120,7 @@ msgstr "Problem #:"
 #: lib/layouts/IEEEtran.layout:193 lib/layouts/llncs.layout:344
 #: 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:38
+#: lib/layouts/theorems-starred-equivalents.inc:62
 msgid "Exercise"
 msgstr "Øving"
 
@@ -4037,7 +4133,7 @@ msgstr "
 #: lib/layouts/llncs.layout:398 lib/layouts/svjour.inc:461
 #: lib/layouts/theorems.inc:168 lib/layouts/theorems-ams.inc:174
 #: lib/layouts/theorems-order.inc:61
-#: lib/layouts/theorems-starred-equivalents.inc:42
+#: lib/layouts/theorems-starred-equivalents.inc:69
 msgid "Remark"
 msgstr "Merknad"
 
@@ -4050,7 +4146,7 @@ msgstr "Merknad #:"
 #: lib/layouts/ijmpd.layout:295 lib/layouts/llncs.layout:302
 #: 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:46
+#: lib/layouts/theorems-starred-equivalents.inc:76
 msgid "Claim"
 msgstr "Påstand"
 
@@ -4085,17 +4181,18 @@ msgstr "Notasjon #:"
 msgid "Case"
 msgstr "Tilfelle"
 
-#: lib/layouts/IEEEtran.layout:246 lib/layouts/theorems.inc:207
-#: lib/layouts/theorems-ams.inc:213
+#: lib/layouts/IEEEtran.layout:246
 msgid "Case #:"
 msgstr "Tilfelle #:"
 
-#: lib/layouts/IEEEtran.layout:272 lib/layouts/aa.layout:37
-#: lib/layouts/aa.layout:214 lib/layouts/aapaper.layout:64
+#: 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/beamer.layout:142 lib/layouts/egs.layout:30
+#: 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
 #: lib/layouts/europecv.layout:29 lib/layouts/ijmpc.layout:95
 #: lib/layouts/ijmpd.layout:91 lib/layouts/isprs.layout:155
 #: lib/layouts/kluwer.layout:58 lib/layouts/latex8.layout:41
@@ -4113,42 +4210,44 @@ msgstr "Tilfelle #:"
 msgid "Section"
 msgstr "Bolk"
 
-#: lib/layouts/IEEEtran.layout:282 lib/layouts/aa.layout:40
-#: lib/layouts/aa.layout:224 lib/layouts/aapaper.layout:67
+#: 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/beamer.layout:182
-#: 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 lib/layouts/latex8.layout:49
-#: lib/layouts/llncs.layout:53 lib/layouts/ltugboat.layout:64
-#: lib/layouts/memoir.layout:61 lib/layouts/moderncv.layout:52
-#: lib/layouts/paper.layout:53 lib/layouts/revtex.layout:49
-#: lib/layouts/revtex4.layout:56 lib/layouts/siamltex.layout:59
-#: lib/layouts/simplecv.layout:48 lib/layouts/agu_stdsections.inc:40
-#: lib/layouts/aguplus.inc:41 lib/layouts/db_stdsections.inc:36
-#: lib/layouts/numrevtex.inc:15 lib/layouts/scrclass.inc:69
-#: lib/layouts/stdsections.inc:85 lib/layouts/svjour.inc:62
+#: 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
+#: lib/layouts/latex8.layout:49 lib/layouts/llncs.layout:53
+#: lib/layouts/ltugboat.layout:64 lib/layouts/memoir.layout:61
+#: lib/layouts/moderncv.layout:52 lib/layouts/paper.layout:53
+#: lib/layouts/revtex.layout:49 lib/layouts/revtex4.layout:56
+#: lib/layouts/siamltex.layout:59 lib/layouts/simplecv.layout:48
+#: lib/layouts/agu_stdsections.inc:40 lib/layouts/aguplus.inc:41
+#: lib/layouts/db_stdsections.inc:36 lib/layouts/numrevtex.inc:15
+#: lib/layouts/scrclass.inc:69 lib/layouts/stdsections.inc:85
+#: lib/layouts/svjour.inc:62
 msgid "Subsection"
 msgstr "Underbolk"
 
-#: lib/layouts/IEEEtran.layout:290 lib/layouts/aa.layout:43
-#: lib/layouts/aa.layout:236 lib/layouts/aapaper.layout:70
+#: 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/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 lib/layouts/memoir.layout:66
-#: lib/layouts/paper.layout:62 lib/layouts/revtex.layout:57
-#: lib/layouts/revtex4.layout:64 lib/layouts/siamltex.layout:65
-#: lib/layouts/agu_stdsections.inc:50 lib/layouts/db_stdsections.inc:44
-#: lib/layouts/numrevtex.inc:24 lib/layouts/scrclass.inc:76
-#: lib/layouts/stdsections.inc:100 lib/layouts/svjour.inc:71
+#: 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
+#: lib/layouts/memoir.layout:66 lib/layouts/paper.layout:62
+#: lib/layouts/revtex.layout:57 lib/layouts/revtex4.layout:64
+#: lib/layouts/siamltex.layout:65 lib/layouts/agu_stdsections.inc:50
+#: lib/layouts/db_stdsections.inc:44 lib/layouts/numrevtex.inc:24
+#: lib/layouts/scrclass.inc:76 lib/layouts/stdsections.inc:100
+#: lib/layouts/svjour.inc:71
 msgid "Subsubsection"
 msgstr "Underunderbolk"
 
-#: lib/layouts/IEEEtran.layout:298 lib/layouts/beamer.layout:173
+#: lib/layouts/IEEEtran.layout:298 lib/layouts/beamer.layout:179
 #: lib/layouts/egs.layout:576 lib/layouts/ijmpc.layout:102
 #: lib/layouts/ijmpd.layout:98 lib/layouts/isprs.layout:184
 #: lib/layouts/siamltex.layout:81 lib/layouts/spie.layout:29
@@ -4157,7 +4256,7 @@ msgstr "Underunderbolk"
 msgid "Section*"
 msgstr "Bolk*"
 
-#: lib/layouts/IEEEtran.layout:308 lib/layouts/beamer.layout:214
+#: lib/layouts/IEEEtran.layout:308 lib/layouts/beamer.layout:222
 #: lib/layouts/egs.layout:596 lib/layouts/isprs.layout:195
 #: lib/layouts/siamltex.layout:88 lib/layouts/aguplus.inc:48
 #: lib/layouts/db_stdstarsections.inc:48 lib/layouts/stdstarsections.inc:45
@@ -4170,8 +4269,8 @@ msgstr "Underbolk*"
 msgid "Subsubsection*"
 msgstr "Underunderbolk*"
 
-#: lib/layouts/IEEEtran.layout:331 lib/layouts/aa.layout:80
-#: lib/layouts/aa.layout:280 lib/layouts/aa.layout:295
+#: lib/layouts/IEEEtran.layout:331 lib/layouts/aa.layout:83
+#: lib/layouts/aa.layout:283 lib/layouts/aa.layout:298
 #: lib/layouts/aapaper.layout:97 lib/layouts/aapaper.layout:193
 #: lib/layouts/aastex.layout:106 lib/layouts/aastex.layout:239
 #: lib/layouts/apa.layout:69 lib/layouts/cl2emult.layout:80
@@ -4198,14 +4297,15 @@ msgstr "Samandrag"
 msgid "Abstract---"
 msgstr "Samandrag---"
 
-#: lib/layouts/IEEEtran.layout:351 lib/layouts/aastex.layout:109
-#: lib/layouts/aastex.layout:276 lib/layouts/elsart.layout:64
-#: lib/layouts/ijmpc.layout:73 lib/layouts/ijmpd.layout:76
-#: lib/layouts/iopart.layout:193 lib/layouts/isprs.layout:51
-#: lib/layouts/kluwer.layout:274 lib/layouts/paper.layout:171
-#: lib/layouts/revtex4.layout:241 lib/layouts/siamltex.layout:167
-#: lib/layouts/spie.layout:39 lib/layouts/agu_stdtitle.inc:120
-#: lib/layouts/amsdefs.inc:166 lib/layouts/svjour.inc:270
+#: lib/layouts/IEEEtran.layout:351 lib/layouts/aa.layout:312
+#: lib/layouts/aastex.layout:109 lib/layouts/aastex.layout:276
+#: lib/layouts/elsart.layout:64 lib/layouts/ijmpc.layout:73
+#: lib/layouts/ijmpd.layout:76 lib/layouts/iopart.layout:193
+#: lib/layouts/isprs.layout:51 lib/layouts/kluwer.layout:274
+#: lib/layouts/paper.layout:171 lib/layouts/revtex4.layout:241
+#: lib/layouts/siamltex.layout:167 lib/layouts/spie.layout:39
+#: lib/layouts/agu_stdtitle.inc:120 lib/layouts/amsdefs.inc:166
+#: lib/layouts/svjour.inc:270
 msgid "Keywords"
 msgstr "Stikkord"
 
@@ -4213,9 +4313,9 @@ msgstr "Stikkord"
 msgid "Index Terms---"
 msgstr "Indeksord---"
 
-#: lib/layouts/IEEEtran.layout:374 lib/layouts/aa.layout:86
-#: lib/layouts/aa.layout:309 lib/layouts/aapaper.layout:103
-#: lib/layouts/aapaper.layout:210 lib/layouts/beamer.layout:839
+#: lib/layouts/IEEEtran.layout:374 lib/layouts/aa.layout:89
+#: lib/layouts/aa.layout:341 lib/layouts/aapaper.layout:103
+#: lib/layouts/aapaper.layout:210 lib/layouts/beamer.layout:870
 #: lib/layouts/book.layout:21 lib/layouts/book.layout:23
 #: lib/layouts/cl2emult.layout:102 lib/layouts/egs.layout:552
 #: lib/layouts/foils.layout:210 lib/layouts/ijmpc.layout:345
@@ -4231,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:984
+#: lib/layouts/svjour.inc:323 src/frontends/qt4/GuiDocument.cpp:986
 msgid "Bibliography"
 msgstr "Litteratur"
 
@@ -4239,7 +4339,7 @@ msgstr "Litteratur"
 #: lib/layouts/aastex.layout:115 lib/layouts/aastex.layout:399
 #: lib/layouts/ijmpc.layout:323 lib/layouts/ijmpd.layout:334
 #: lib/layouts/kluwer.layout:313 lib/layouts/kluwer.layout:326
-#: src/rowpainter.cpp:464
+#: src/rowpainter.cpp:462
 msgid "Appendix"
 msgstr "Vedlegg"
 
@@ -4263,26 +4363,26 @@ msgstr "Botntekst"
 msgid "MarkBoth"
 msgstr "Markerbegge"
 
-#: lib/layouts/aa.layout:46 lib/layouts/aapaper.layout:48
-#: lib/layouts/aastex.layout:76 lib/layouts/apa.layout:305
-#: lib/layouts/beamer.layout:52 lib/layouts/egs.layout:163
+#: lib/layouts/aa.layout:49 lib/layouts/aapaper.layout:48
+#: lib/layouts/aastex.layout:76 lib/layouts/apa.layout:354
+#: lib/layouts/beamer.layout:53 lib/layouts/egs.layout:163
 #: lib/layouts/manpage.layout:81 lib/layouts/powerdot.layout:241
 #: lib/layouts/simplecv.layout:77 lib/layouts/agu_stdlists.inc:13
 #: lib/layouts/db_stdlists.inc:12 lib/layouts/stdlists.inc:11
 msgid "Itemize"
 msgstr "Punktliste"
 
-#: lib/layouts/aa.layout:49 lib/layouts/aapaper.layout:51
-#: lib/layouts/aastex.layout:79 lib/layouts/apa.layout:323
-#: lib/layouts/beamer.layout:70 lib/layouts/egs.layout:145
+#: lib/layouts/aa.layout:52 lib/layouts/aapaper.layout:51
+#: lib/layouts/aastex.layout:79 lib/layouts/apa.layout:372
+#: lib/layouts/beamer.layout:72 lib/layouts/egs.layout:145
 #: lib/layouts/manpage.layout:64 lib/layouts/powerdot.layout:266
 #: lib/layouts/agu_stdlists.inc:21 lib/layouts/db_stdlists.inc:19
 #: lib/layouts/stdlists.inc:30
 msgid "Enumerate"
 msgstr "Nummerert"
 
-#: lib/layouts/aa.layout:52 lib/layouts/aapaper.layout:54
-#: lib/layouts/aastex.layout:82 lib/layouts/beamer.layout:88
+#: lib/layouts/aa.layout:55 lib/layouts/aapaper.layout:54
+#: lib/layouts/aastex.layout:82 lib/layouts/beamer.layout:91
 #: lib/layouts/egs.layout:181 lib/layouts/hollywood.layout:129
 #: lib/layouts/manpage.layout:99 lib/layouts/paper.layout:103
 #: lib/layouts/scrlettr.layout:17 lib/layouts/scrlttr2.layout:19
@@ -4292,20 +4392,21 @@ msgstr "Nummerert"
 msgid "Description"
 msgstr "Skildring"
 
-#: lib/layouts/aa.layout:55 lib/layouts/aapaper.layout:57
-#: lib/layouts/aastex.layout:85 lib/layouts/egs.layout:128
-#: lib/layouts/scrlettr.layout:32 lib/layouts/scrlttr2.layout:35
-#: lib/layouts/scrclass.inc:41 lib/layouts/stdlists.inc:12
-#: lib/layouts/stdlists.inc:31 lib/layouts/stdlists.inc:50
-#: lib/layouts/stdlists.inc:72 lib/layouts/stdlists.inc:73
-#: lib/ui/stdtoolbars.inc:88
+#: lib/layouts/aa.layout:58 lib/layouts/aapaper.layout:57
+#: lib/layouts/aastex.layout:85 lib/layouts/beamer.layout:54
+#: lib/layouts/beamer.layout:73 lib/layouts/beamer.layout:92
+#: lib/layouts/egs.layout:128 lib/layouts/scrlettr.layout:32
+#: lib/layouts/scrlttr2.layout:35 lib/layouts/scrclass.inc:41
+#: lib/layouts/stdlists.inc:12 lib/layouts/stdlists.inc:31
+#: lib/layouts/stdlists.inc:50 lib/layouts/stdlists.inc:72
+#: lib/layouts/stdlists.inc:73 lib/ui/stdtoolbars.inc:88
 msgid "List"
 msgstr "Liste"
 
-#: lib/layouts/aa.layout:59 lib/layouts/aa.layout:246
+#: lib/layouts/aa.layout:62 lib/layouts/aa.layout:249
 #: lib/layouts/aapaper.layout:73 lib/layouts/aapaper.layout:160
 #: lib/layouts/aastex.layout:88 lib/layouts/aastex.layout:204
-#: lib/layouts/apa.layout:39 lib/layouts/beamer.layout:720
+#: lib/layouts/apa.layout:39 lib/layouts/beamer.layout:746
 #: lib/layouts/broadway.layout:187 lib/layouts/cl2emult.layout:40
 #: lib/layouts/docbook-book.layout:11 lib/layouts/docbook-chapter.layout:9
 #: lib/layouts/docbook-section.layout:9 lib/layouts/egs.layout:246
@@ -4326,18 +4427,18 @@ msgstr "Liste"
 msgid "Title"
 msgstr "Tittel"
 
-#: lib/layouts/aa.layout:62 lib/layouts/aa.layout:107
-#: lib/layouts/aapaper.layout:76 lib/layouts/beamer.layout:751
+#: lib/layouts/aa.layout:65 lib/layouts/aa.layout:110
+#: lib/layouts/aapaper.layout:76 lib/layouts/beamer.layout:778
 #: lib/layouts/kluwer.layout:121 lib/layouts/llncs.layout:123
 #: lib/layouts/svprobth.layout:44 lib/layouts/aapaper.inc:9
 #: lib/layouts/svjour.inc:152
 msgid "Subtitle"
 msgstr "Undertittel"
 
-#: lib/layouts/aa.layout:65 lib/layouts/aa.layout:258
+#: lib/layouts/aa.layout:68 lib/layouts/aa.layout:261
 #: lib/layouts/aapaper.layout:79 lib/layouts/aapaper.layout:171
 #: lib/layouts/aastex.layout:91 lib/layouts/aastex.layout:216
-#: lib/layouts/apa.layout:113 lib/layouts/beamer.layout:775
+#: lib/layouts/apa.layout:113 lib/layouts/beamer.layout:803
 #: lib/layouts/broadway.layout:200 lib/layouts/cl2emult.layout:57
 #: lib/layouts/egs.layout:288 lib/layouts/elsart.layout:113
 #: lib/layouts/entcs.layout:49 lib/layouts/foils.layout:133
@@ -4354,7 +4455,7 @@ msgstr "Undertittel"
 msgid "Author"
 msgstr "Forfattar"
 
-#: lib/layouts/aa.layout:68 lib/layouts/aa.layout:128
+#: lib/layouts/aa.layout:71 lib/layouts/aa.layout:131
 #: lib/layouts/aapaper.layout:82 lib/layouts/egs.layout:233
 #: lib/layouts/entcs.layout:59 lib/layouts/g-brief-en.layout:180
 #: lib/layouts/g-brief2.layout:716 lib/layouts/ijmpc.layout:48
@@ -4367,20 +4468,20 @@ msgstr "Forfattar"
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/layouts/aa.layout:71 lib/layouts/aa.layout:145
+#: lib/layouts/aa.layout:74 lib/layouts/aa.layout:148
 #: lib/layouts/aapaper.layout:88 lib/layouts/aapaper.inc:63
 msgid "Offprint"
 msgstr "Ekstratrykk"
 
-#: lib/layouts/aa.layout:74 lib/layouts/aa.layout:167
+#: lib/layouts/aa.layout:77 lib/layouts/aa.layout:170
 #: lib/layouts/svjour.inc:233
 msgid "Mail"
 msgstr "E-post"
 
-#: lib/layouts/aa.layout:77 lib/layouts/aa.layout:269
+#: lib/layouts/aa.layout:80 lib/layouts/aa.layout:272
 #: lib/layouts/aapaper.layout:94 lib/layouts/aapaper.layout:182
 #: lib/layouts/aastex.layout:103 lib/layouts/aastex.layout:228
-#: lib/layouts/beamer.layout:817 lib/layouts/egs.layout:466
+#: lib/layouts/beamer.layout:847 lib/layouts/egs.layout:466
 #: lib/layouts/foils.layout:140 lib/layouts/g-brief-en.layout:189
 #: lib/layouts/g-brief2.layout:801 lib/layouts/kluwer.layout:141
 #: lib/layouts/powerdot.layout:84 lib/layouts/revtex.layout:106
@@ -4389,33 +4490,47 @@ msgstr "E-post"
 #: lib/layouts/agu_stdtitle.inc:238 lib/layouts/amsdefs.inc:72
 #: lib/layouts/db_stdtitle.inc:35 lib/layouts/scrclass.inc:162
 #: lib/layouts/stdtitle.inc:50 lib/layouts/svjour.inc:227
-#: lib/ui/stdmenus.inc:347 lib/external_templates:287
-#: lib/external_templates:288 lib/external_templates:292
+#: lib/ui/stdmenus.inc:347 lib/external_templates:297
+#: lib/external_templates:298 lib/external_templates:302
 msgid "Date"
 msgstr "Dato"
 
-#: lib/layouts/aa.layout:83 lib/layouts/aa.layout:189
+#: lib/layouts/aa.layout:86 lib/layouts/aa.layout:192
 #: lib/layouts/aapaper.layout:100 lib/layouts/egs.layout:527
 #: lib/layouts/elsart.layout:423 lib/layouts/aapaper.inc:80
 #: lib/layouts/svjour.inc:316 lib/layouts/theorems-ams-extended.module:189
 msgid "Acknowledgement"
 msgstr "Takk til"
 
-#: lib/layouts/aa.layout:153 lib/layouts/aapaper.inc:71
+#: lib/layouts/aa.layout:156 lib/layouts/aapaper.inc:71
 msgid "Offprint Requests to:"
 msgstr "Send spørsmål om kopiar til:"
 
-#: lib/layouts/aa.layout:175
+#: lib/layouts/aa.layout:178
 msgid "Correspondence to:"
 msgstr "Brevbyt med:"
 
-#: lib/layouts/aa.layout:200 lib/layouts/egs.layout:516
+#: lib/layouts/aa.layout:203 lib/layouts/egs.layout:516
 #: lib/layouts/svjour.inc:305
 msgid "Acknowledgements."
 msgstr "Takk til."
 
+#: lib/layouts/aa.layout:327 lib/layouts/siamltex.layout:170
+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:526
+#: src/frontends/qt4/GuiPrefs.cpp:525
 msgid "LaTeX"
 msgstr "LaTeX"
 
@@ -4432,15 +4547,16 @@ msgstr "E-post"
 msgid "Thesaurus"
 msgstr "Synonym ordbok"
 
-#: lib/layouts/aastex.layout:73 lib/layouts/amsbook.layout:95
-#: 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 lib/layouts/paper.layout:71
-#: lib/layouts/revtex.layout:65 lib/layouts/revtex4.layout:72
-#: lib/layouts/siamltex.layout:71 lib/layouts/agu_stdsections.inc:60
-#: lib/layouts/aguplus.inc:55 lib/layouts/db_stdsections.inc:52
-#: lib/layouts/numrevtex.inc:33 lib/layouts/scrclass.inc:83
-#: lib/layouts/stdsections.inc:114 lib/layouts/svjour.inc:80
+#: 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
+#: lib/layouts/paper.layout:71 lib/layouts/revtex.layout:65
+#: lib/layouts/revtex4.layout:72 lib/layouts/siamltex.layout:71
+#: lib/layouts/agu_stdsections.inc:60 lib/layouts/aguplus.inc:55
+#: lib/layouts/db_stdsections.inc:52 lib/layouts/numrevtex.inc:33
+#: lib/layouts/scrclass.inc:83 lib/layouts/stdsections.inc:114
+#: lib/layouts/svjour.inc:80
 msgid "Paragraph"
 msgstr "Avsnitt"
 
@@ -4464,7 +4580,7 @@ msgid "Acknowledgements"
 msgstr "Takk til"
 
 #: lib/layouts/aastex.layout:118 lib/layouts/aastex.layout:431
-#: lib/layouts/aastex.layout:443 lib/layouts/beamer.layout:852
+#: lib/layouts/aastex.layout:443 lib/layouts/beamer.layout:884
 #: lib/layouts/cl2emult.layout:116 lib/layouts/egs.layout:566
 #: lib/layouts/iopart.layout:267 lib/layouts/iopart.layout:281
 #: lib/layouts/kluwer.layout:334 lib/layouts/kluwer.layout:346
@@ -4519,10 +4635,10 @@ msgstr "Subjekt overskrifter:"
 msgid "[Acknowledgements]"
 msgstr "[Takk til]"
 
-#: lib/layouts/aastex.layout:350 src/frontends/qt4/GuiDocument.cpp:1340
-#: src/frontends/qt4/GuiDocument.cpp:1350
-#: src/frontends/qt4/GuiDocument.cpp:1390
-#: src/frontends/qt4/GuiDocument.cpp:1409
+#: 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"
 
@@ -4570,7 +4686,9 @@ 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
 #: lib/layouts/stdlayouts.inc:12 lib/layouts/stdlayouts.inc:31
 #: lib/layouts/stdlayouts.inc:50 lib/layouts/stdlayouts.inc:68
@@ -4578,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"
 
@@ -4675,19 +4793,28 @@ msgstr "Tilpass_Figur"
 msgid "FitBitmap"
 msgstr "Tilpass_punktgrafikk"
 
-#: lib/layouts/apa.layout:319 lib/layouts/beamer.layout:66
+#: lib/layouts/apa.layout:344 lib/layouts/egs.layout:86
+#: lib/layouts/kluwer.layout:93 lib/layouts/llncs.layout:78
+#: lib/layouts/memoir.layout:76 lib/layouts/paper.layout:80
+#: lib/layouts/agu_stdsections.inc:70 lib/layouts/db_stdsections.inc:60
+#: lib/layouts/scrclass.inc:90 lib/layouts/stdsections.inc:124
+#: lib/layouts/svjour.inc:89
+msgid "Subparagraph"
+msgstr "Underavsnitt"
+
+#: lib/layouts/apa.layout:368 lib/layouts/beamer.layout:68
 #: lib/layouts/egs.layout:177 lib/layouts/manpage.layout:95
 #: lib/layouts/powerdot.layout:255 lib/layouts/simplecv.layout:91
 #: lib/layouts/stdlists.inc:26
 msgid "*"
 msgstr "*"
 
-#: lib/layouts/apa.layout:341
+#: lib/layouts/apa.layout:390
 msgid "Seriate"
 msgstr "Punkt i teksten"
 
-#: lib/layouts/apa.layout:357 lib/layouts/apa.layout:358
-#: src/buffer_funcs.cpp:389
+#: lib/layouts/apa.layout:406 lib/layouts/apa.layout:407
+#: src/buffer_funcs.cpp:390
 msgid "(\\alph{enumii})"
 msgstr "(\\alph{enumii})"
 
@@ -4707,8 +4834,8 @@ msgstr "LatinOff"
 msgid "Latin off"
 msgstr "Latin off"
 
-#: lib/layouts/article.layout:18 lib/layouts/beamer.layout:113
-#: lib/layouts/beamer.layout:127 lib/layouts/mwart.layout:23
+#: 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
 #: lib/layouts/seminar.layout:24 lib/layouts/agu_stdsections.inc:12
 #: lib/layouts/db_stdsections.inc:12 lib/layouts/numreport.inc:6
@@ -4722,275 +4849,351 @@ msgstr "Del"
 msgid "Part*"
 msgstr "Del*"
 
-#: lib/layouts/article-beamer.layout:22 lib/layouts/beamer.layout:223
+#: 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:103 lib/layouts/egs.layout:196
+#: lib/layouts/beamer.layout:107 lib/layouts/egs.layout:196
 #: lib/layouts/manpage.layout:114 lib/layouts/stdlists.inc:65
 msgid "MM"
 msgstr "MM"
 
-#: lib/layouts/beamer.layout:156
+#: lib/layouts/beamer.layout:162
 msgid "Section \\arabic{section}"
 msgstr "Section.\\arabic{section}"
 
-#: lib/layouts/beamer.layout:168 lib/layouts/powerdot.layout:235
+#: lib/layouts/beamer.layout:174 lib/layouts/powerdot.layout:235
 #: lib/layouts/numarticle.inc:11
 msgid "\\Alph{section}"
 msgstr "\\Alph{section}"
 
-#: lib/layouts/beamer.layout:196
+#: lib/layouts/beamer.layout:181 lib/layouts/beamer.layout:224
+#: lib/layouts/stdstarsections.inc:15 lib/layouts/stdstarsections.inc:25
+#: lib/layouts/stdstarsections.inc:36 lib/layouts/stdstarsections.inc:47
+#: lib/layouts/stdstarsections.inc:58 lib/layouts/stdstarsections.inc:69
+#: lib/layouts/stdstarsections.inc:80
+#, fuzzy
+msgid "Unnumbered"
+msgstr "Nummerering"
+
+#: lib/layouts/beamer.layout:204
 msgid "Subsection \\arabic{section}.\\arabic{subsection}"
 msgstr "Subsection.\\arabic{subsection}"
 
-#: lib/layouts/beamer.layout:209
+#: lib/layouts/beamer.layout:217
 msgid "\\arabic{section}.\\arabic{subsection}"
 msgstr "\\arabic{section}.\\arabic{subsection}"
 
-#: lib/layouts/beamer.layout:240
+#: lib/layouts/beamer.layout:233 lib/layouts/beamer.layout:277
+#: lib/layouts/beamer.layout:317 lib/layouts/beamer.layout:358
+#: lib/layouts/beamer.layout:387
+#, fuzzy
+msgid "Frames"
+msgstr "Lysark "
+
+#: lib/layouts/beamer.layout:250
 #, fuzzy
 msgid "Frame"
 msgstr "Lysark "
 
-#: lib/layouts/beamer.layout:266
+#: lib/layouts/beamer.layout:276
 msgid "BeginPlainFrame"
 msgstr "Start enkelt lysark"
 
-#: lib/layouts/beamer.layout:282
+#: lib/layouts/beamer.layout:293
 #, fuzzy
 msgid "Frame (no head/foot/sidebars)"
 msgstr "Lysark (utan kantgarnityr)"
 
-#: lib/layouts/beamer.layout:305
+#: lib/layouts/beamer.layout:316
 msgid "AgainFrame"
 msgstr "Lysarket igjen"
 
-#: lib/layouts/beamer.layout:321
+#: lib/layouts/beamer.layout:333
 #, fuzzy
 msgid "Again frame with label"
 msgstr "Lysark igjen med etikett"
 
-#: lib/layouts/beamer.layout:345
+#: lib/layouts/beamer.layout:357
 msgid "EndFrame"
 msgstr "Slutten på lysarket"
 
-#: lib/layouts/beamer.layout:358
+#: lib/layouts/beamer.layout:371
 #, fuzzy
 msgid "________________________________"
 msgstr "________________________________ "
 
-#: lib/layouts/beamer.layout:373
+#: lib/layouts/beamer.layout:386
 msgid "FrameSubtitle"
 msgstr "Lysark undertittel"
 
-#: lib/layouts/beamer.layout:395
+#: lib/layouts/beamer.layout:409
 msgid "Column"
 msgstr "Kolonne"
 
-#: lib/layouts/beamer.layout:407
+#: lib/layouts/beamer.layout:410 lib/layouts/beamer.layout:434
+#: lib/layouts/beamer.layout:435 lib/layouts/beamer.layout:446
+#: lib/layouts/beamer.layout:464 lib/layouts/beamer.layout:495
+msgid "Columns"
+msgstr "Kolonnar"
+
+#: lib/layouts/beamer.layout:422
 #, fuzzy
 msgid "Start column (increase depth!), width:"
 msgstr "Start kolonne med innrykk: "
 
-#: lib/layouts/beamer.layout:419 lib/layouts/beamer.layout:430
-msgid "Columns"
-msgstr "Kolonnar"
-
-#: lib/layouts/beamer.layout:447
+#: lib/layouts/beamer.layout:463
 msgid "ColumnsCenterAligned"
 msgstr "Sentrerte kolonnar"
 
-#: lib/layouts/beamer.layout:458
+#: lib/layouts/beamer.layout:475
 #, fuzzy
 msgid "Columns (center aligned)"
 msgstr "kolonnar (Sentrerte kolonnar)"
 
-#: lib/layouts/beamer.layout:477
+#: lib/layouts/beamer.layout:494
 msgid "ColumnsTopAligned"
 msgstr "Toppjusterte kolonnar"
 
-#: lib/layouts/beamer.layout:488
+#: lib/layouts/beamer.layout:506
 #, fuzzy
 msgid "Columns (top aligned)"
 msgstr "kolonnar (topp kolonnar)"
 
-#: lib/layouts/beamer.layout:508
+#: lib/layouts/beamer.layout:526
 msgid "Pause"
 msgstr "Pause"
 
-#: lib/layouts/beamer.layout:523
+#: lib/layouts/beamer.layout:527 lib/layouts/beamer.layout:553
+#: lib/layouts/beamer.layout:580 lib/layouts/beamer.layout:606
+#: lib/layouts/beamer.layout:632
+#, fuzzy
+msgid "Overlays"
+msgstr "Overliggar"
+
+#: lib/layouts/beamer.layout:542
 msgid "_ _ _ _ _ _ _ _ _ _ _ _ _ _"
 msgstr "_ _ _ _ _ _ _ _ _ _ _ _ _ _"
 
-#: lib/layouts/beamer.layout:533 lib/layouts/beamer.layout:543
+#: lib/layouts/beamer.layout:552 lib/layouts/beamer.layout:563
 msgid "Overprint"
 msgstr "Legg over"
 
-#: lib/layouts/beamer.layout:559
+#: lib/layouts/beamer.layout:579
 msgid "OverlayArea"
 msgstr "Legg over område"
 
-#: lib/layouts/beamer.layout:569
+#: lib/layouts/beamer.layout:590
 #, fuzzy
 msgid "Overlayarea"
 msgstr "Legg over område"
 
-#: lib/layouts/beamer.layout:584
+#: lib/layouts/beamer.layout:605
 msgid "Uncover"
 msgstr "Avslør"
 
-#: lib/layouts/beamer.layout:594
+#: lib/layouts/beamer.layout:616
 #, fuzzy
 msgid "Uncovered on slides"
 msgstr "Blir avslørt på lysarka"
 
-#: lib/layouts/beamer.layout:609
+#: lib/layouts/beamer.layout:631
 msgid "Only"
 msgstr "Berre i framføring"
 
-#: lib/layouts/beamer.layout:619
+#: lib/layouts/beamer.layout:642
 #, fuzzy
 msgid "Only on slides"
 msgstr "Vis berre i framføringar"
 
-#: lib/layouts/beamer.layout:635
+#: lib/layouts/beamer.layout:658
 msgid "Block"
 msgstr "Ramme"
 
-#: lib/layouts/beamer.layout:645
+#: lib/layouts/beamer.layout:659 lib/layouts/beamer.layout:685
+#: lib/layouts/beamer.layout:715
+#, fuzzy
+msgid "Blocks"
+msgstr "Ramme"
+
+#: lib/layouts/beamer.layout:669
 #, fuzzy
 msgid "Block ( ERT[{title}] body ):"
 msgstr "Ramme (ERT[{Tittel}] tekst): "
 
-#: lib/layouts/beamer.layout:660
+#: lib/layouts/beamer.layout:684
 msgid "ExampleBlock"
 msgstr "Ramme med døme"
 
-#: lib/layouts/beamer.layout:670
+#: lib/layouts/beamer.layout:695
 #, fuzzy
 msgid "Block ( ERT[{title}] example text ):"
 msgstr "Ramme (ERT[{Tittel}] eksempeltekst): "
 
-#: lib/layouts/beamer.layout:689
+#: lib/layouts/beamer.layout:714
 msgid "AlertBlock"
 msgstr "Åtvaring ramme"
 
-#: lib/layouts/beamer.layout:699
+#: lib/layouts/beamer.layout:725
 #, fuzzy
 msgid "Block ( ERT[{title}] alert text ):"
 msgstr "Ramme (ERT[{Tittel}] åtvaring): "
 
-#: lib/layouts/beamer.layout:743
+#: lib/layouts/beamer.layout:747 lib/layouts/beamer.layout:779
+#: lib/layouts/beamer.layout:804 lib/layouts/beamer.layout:826
+#: lib/layouts/beamer.layout:848 lib/layouts/beamer.layout:895
+#, fuzzy
+msgid "Titling"
+msgstr "Kodeliste"
+
+#: lib/layouts/beamer.layout:770
 #, fuzzy
 msgid "Title (Plain Frame)"
 msgstr "Start enkelt lysark"
 
-#: lib/layouts/beamer.layout:796 lib/layouts/cl2emult.layout:69
+#: lib/layouts/beamer.layout:825 lib/layouts/cl2emult.layout:69
 #: lib/layouts/llncs.layout:211 lib/layouts/svjour.inc:209
 msgid "Institute"
 msgstr "Institutt"
 
-#: lib/layouts/beamer.layout:862
+#: lib/layouts/beamer.layout:871 lib/layouts/stdstruct.inc:43
+msgid "BackMatter"
+msgstr ""
+
+#: lib/layouts/beamer.layout:894
 msgid "TitleGraphic"
 msgstr "Tittelgrafikk"
 
-#: lib/layouts/beamer.layout:896 lib/layouts/foils.layout:309
+#: lib/layouts/beamer.layout:920 lib/layouts/theorems-std.module:2
+#, fuzzy
+msgid "Theorems"
+msgstr "Teorem"
+
+#: lib/layouts/beamer.layout:930 lib/layouts/foils.layout:309
 #: lib/layouts/siamltex.layout:282 lib/layouts/theorems-starred.inc:60
 msgid "Corollary."
 msgstr "Korollar."
 
-#: lib/layouts/beamer.layout:916 lib/layouts/foils.layout:323
+#: lib/layouts/beamer.layout:950 lib/layouts/foils.layout:323
 #: lib/layouts/siamltex.layout:295 lib/layouts/theorems-starred.inc:121
 msgid "Definition."
 msgstr "Definisjon."
 
-#: lib/layouts/beamer.layout:919
+#: lib/layouts/beamer.layout:953
 msgid "Definitions"
 msgstr "Definisjonar"
 
-#: lib/layouts/beamer.layout:922
+#: lib/layouts/beamer.layout:956
 #, fuzzy
 msgid "Definitions."
 msgstr "Definisjonar. "
 
-#: lib/layouts/beamer.layout:928 lib/layouts/theorems-starred.inc:140
+#: lib/layouts/beamer.layout:962 lib/layouts/theorems-starred.inc:140
 msgid "Example."
 msgstr "Døme."
 
-#: lib/layouts/beamer.layout:936
+#: lib/layouts/beamer.layout:970
 msgid "Examples"
 msgstr "Døme"
 
-#: lib/layouts/beamer.layout:939
+#: lib/layouts/beamer.layout:973
 #, fuzzy
 msgid "Examples."
 msgstr "Døme. "
 
-#: lib/layouts/beamer.layout:946 lib/layouts/theorems-starred.inc:108
+#: lib/layouts/beamer.layout:980 lib/layouts/theorems-starred.inc:108
 msgid "Fact."
 msgstr "Faktum."
 
-#: lib/layouts/beamer.layout:952 lib/layouts/foils.layout:281
+#: lib/layouts/beamer.layout:986 lib/layouts/foils.layout:281
 #: lib/layouts/ijmpc.layout:225 lib/layouts/ijmpd.layout:225
 #: lib/layouts/llncs.layout:374 lib/layouts/siamltex.layout:253
 #: lib/layouts/svjour.inc:436 lib/layouts/theorems-proof.inc:30
 msgid "Proof."
 msgstr "Prov."
 
-#: lib/layouts/beamer.layout:958 lib/layouts/foils.layout:295
+#: lib/layouts/beamer.layout:992 lib/layouts/foils.layout:295
 #: lib/layouts/siamltex.layout:268 lib/layouts/theorems-starred.inc:29
 msgid "Theorem."
 msgstr "Teorem."
 
-#: lib/layouts/beamer.layout:963
+#: lib/layouts/beamer.layout:997
 msgid "Separator"
 msgstr "Separator"
 
-#: lib/layouts/beamer.layout:976
+#: lib/layouts/beamer.layout:1011
 msgid "___"
 msgstr "___"
 
-#: lib/layouts/beamer.layout:986 lib/layouts/egs.layout:630
+#: lib/layouts/beamer.layout:1021 lib/layouts/egs.layout:630
 #: lib/layouts/db_lyxmacros.inc:18 lib/layouts/lyxmacros.inc:12
 msgid "LyX-Code"
 msgstr "LyX-Kode"
 
-#: lib/layouts/beamer.layout:1023
+#: lib/layouts/beamer.layout:1059
 msgid "NoteItem"
 msgstr "Notat"
 
-#: lib/layouts/beamer.layout:1034 lib/layouts/powerdot.layout:209
+#: lib/layouts/beamer.layout:1071 lib/layouts/powerdot.layout:209
 msgid "Note:"
 msgstr "Notat:"
 
-#: lib/layouts/beamer.layout:1052
+#: 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:1063
+#: lib/layouts/beamer.layout:1098
+#, fuzzy
+msgid "CharStyle:Structure"
+msgstr "Endring: "
+
+#: lib/layouts/beamer.layout:1100
 msgid "Structure"
 msgstr ""
 
-#: lib/layouts/beamer.layout:1074 lib/layouts/powerdot.layout:377
-#: lib/layouts/stdfloats.inc:10 lib/layouts/stdinsets.inc:229
+#: 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:230
 #: lib/ui/stdtoolbars.inc:115
 msgid "Table"
 msgstr "Tabell"
 
-#: lib/layouts/beamer.layout:1079 lib/layouts/powerdot.layout:381
+#: lib/layouts/beamer.layout:1136 lib/layouts/powerdot.layout:381
 #: lib/layouts/stdfloats.inc:15
 msgid "List of Tables"
 msgstr "Liste over tabellar"
 
-#: lib/layouts/beamer.layout:1085 lib/layouts/powerdot.layout:387
-#: lib/layouts/stdfloats.inc:22 lib/layouts/stdinsets.inc:220
+#: lib/layouts/beamer.layout:1143 lib/layouts/powerdot.layout:387
+#: lib/layouts/stdfloats.inc:22 lib/layouts/stdinsets.inc:221
 msgid "Figure"
 msgstr "Figur"
 
-#: lib/layouts/beamer.layout:1090 lib/layouts/powerdot.layout:391
+#: lib/layouts/beamer.layout:1148 lib/layouts/powerdot.layout:391
 #: lib/layouts/stdfloats.inc:27
 msgid "List of Figures"
 msgstr "Liste over figurar"
@@ -5253,14 +5456,6 @@ msgstr "Dato"
 msgid "Datum:"
 msgstr "Dato:"
 
-#: lib/layouts/egs.layout:86 lib/layouts/kluwer.layout:93
-#: lib/layouts/llncs.layout:78 lib/layouts/memoir.layout:76
-#: lib/layouts/paper.layout:80 lib/layouts/agu_stdsections.inc:70
-#: lib/layouts/db_stdsections.inc:60 lib/layouts/scrclass.inc:90
-#: lib/layouts/stdsections.inc:124 lib/layouts/svjour.inc:89
-msgid "Subparagraph"
-msgstr "Underavsnitt"
-
 #: lib/layouts/egs.layout:94 lib/layouts/powerdot.layout:312
 #: lib/layouts/db_stdlayouts.inc:18 lib/layouts/stdlayouts.inc:11
 msgid "Quotation"
@@ -5414,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"
@@ -6449,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"
 
@@ -6584,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 #."
 
@@ -6950,7 +7146,7 @@ msgstr "SendarSinAdresse:"
 msgid "Sender Phone:"
 msgstr "Sendaren sin telefon:"
 
-#: lib/layouts/scrlttr2.layout:189
+#: lib/layouts/scrlttr2.layout:189 lib/configure.py:318
 msgid "Fax"
 msgstr "Faks"
 
@@ -7049,10 +7245,6 @@ msgstr "."
 msgid "Paragraph*"
 msgstr "Avsnitt*"
 
-#: lib/layouts/siamltex.layout:170
-msgid "Key words."
-msgstr "Nøkkelord."
-
 #: lib/layouts/siamltex.layout:174
 msgid "AMS"
 msgstr "AMS"
@@ -7125,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:110 src/frontends/qt4/GuiCharacter.cpp:68
+#: 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 ""
@@ -7319,7 +7584,7 @@ msgstr "Topptekst:"
 msgid "Published-online:"
 msgstr "Nettpublikasjon:"
 
-#: lib/layouts/agu_stdtitle.inc:263 src/frontends/qt4/GuiCitation.cpp:79
+#: lib/layouts/agu_stdtitle.inc:263 src/frontends/qt4/GuiCitation.cpp:86
 msgid "Citation"
 msgstr "Litteratur"
 
@@ -7375,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"
@@ -7518,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 ""
@@ -7686,8 +8062,13 @@ 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:138
+#: src/insets/InsetCollapsable.cpp:151
 msgid "UNDEFINED"
 msgstr ""
 
@@ -7696,49 +8077,112 @@ msgstr ""
 msgid "\\Roman{part}"
 msgstr "Del \\Roman{part}"
 
-#: lib/layouts/stdinsets.inc:55 src/insets/InsetMarginal.cpp:69
+#: 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:304
+#: 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:267
-msgid "opt"
-msgstr "opt "
+#: lib/layouts/stdinsets.inc:203 src/insets/InsetBox.cpp:145
+msgid "Box"
+msgstr "Ramme"
 
-#: lib/layouts/stdlayouts.inc:67
+#: lib/layouts/stdinsets.inc:211
 #, fuzzy
-msgid "--Separator--"
+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 "
+
+#: lib/layouts/stdlayouts.inc:67
+#, fuzzy
+msgid "--Separator--"
 msgstr "Separator"
 
 #: lib/layouts/stdlayouts.inc:76
@@ -7761,18 +8205,6 @@ msgstr "Chapter \\arabic{chapter}"
 msgid "Appendix \\thechapter"
 msgstr "Appendix \\Alph{chapter}"
 
-#: lib/layouts/stdstarsections.inc:15 lib/layouts/stdstarsections.inc:25
-#: lib/layouts/stdstarsections.inc:36 lib/layouts/stdstarsections.inc:47
-#: lib/layouts/stdstarsections.inc:58 lib/layouts/stdstarsections.inc:69
-#: lib/layouts/stdstarsections.inc:80
-#, fuzzy
-msgid "Unnumbered"
-msgstr "Nummerering"
-
-#: lib/layouts/stdstruct.inc:43
-msgid "BackMatter"
-msgstr ""
-
 #: lib/layouts/svjour.inc:98
 msgid "Headnote"
 msgstr "Topptekst"
@@ -7953,11 +8385,16 @@ 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:17
+#: lib/layouts/endnotes.module:9
+#, fuzzy
+msgid "Custom:Endnote"
+msgstr "notat"
+
+#: lib/layouts/endnotes.module:18
 #, fuzzy
 msgid "endnote"
 msgstr "Topptekst"
@@ -7973,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"
@@ -8021,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"
@@ -8056,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"
@@ -8082,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
@@ -8275,11 +8759,6 @@ msgid ""
 "using the extended AMS machinery."
 msgstr ""
 
-#: lib/layouts/theorems-std.module:2
-#, fuzzy
-msgid "Theorems"
-msgstr "Teorem"
-
 #: lib/layouts/theorems-std.module:7
 msgid ""
 "Defines some theorem environments for use with non-AMS classes. By default, "
@@ -8319,7 +8798,7 @@ msgstr ""
 msgid "Arabic (Arabi)"
 msgstr "Arabisk"
 
-#: lib/languages:12 src/frontends/qt4/GuiSymbols.cpp:60
+#: lib/languages:12 src/frontends/qt4/GuiSymbols.cpp:61
 msgid "Armenian"
 msgstr "Armensk"
 
@@ -8438,153 +8917,369 @@ msgid "German"
 msgstr "Tysk"
 
 #: lib/languages:44 lib/ui/stdtoolbars.inc:462
-#: src/frontends/qt4/GuiSymbols.cpp:58
+#: src/frontends/qt4/GuiSymbols.cpp:59
 msgid "Greek"
 msgstr "Gresk"
 
-#: lib/languages:45 src/frontends/qt4/GuiSymbols.cpp:61
+#: 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:72
+#: 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"
@@ -8682,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
@@ -8690,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
@@ -8733,7 +9430,7 @@ msgstr "Tabell|T"
 msgid "Math|M"
 msgstr "Matte|M"
 
-#: lib/ui/classic.ui:104 lib/ui/stdmenus.inc:502
+#: lib/ui/classic.ui:104 lib/ui/stdmenus.inc:500
 msgid "Spellchecker...|S"
 msgstr "Stavekontroll...|S"
 
@@ -8746,7 +9443,7 @@ msgstr "Synonymordbok..."
 msgid "Statistics...|i"
 msgstr "Status"
 
-#: lib/ui/classic.ui:107 lib/ui/stdmenus.inc:505
+#: lib/ui/classic.ui:107 lib/ui/stdmenus.inc:503
 msgid "Check TeX|h"
 msgstr "Sjekk TeX|k"
 
@@ -8754,11 +9451,11 @@ msgstr "Sjekk TeX|k"
 msgid "Change Tracking|g"
 msgstr "Endra sporing|g"
 
-#: lib/ui/classic.ui:110 lib/ui/stdmenus.inc:512
+#: lib/ui/classic.ui:110 lib/ui/stdmenus.inc:510
 msgid "Preferences...|P"
 msgstr "LyX-val...|L"
 
-#: lib/ui/classic.ui:111 lib/ui/stdmenus.inc:511
+#: lib/ui/classic.ui:111 lib/ui/stdmenus.inc:509
 msgid "Reconfigure|R"
 msgstr "Set opp på nytt|n"
 
@@ -8770,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:273 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"
 
@@ -8794,7 +9491,7 @@ msgstr "H
 msgid "Alignment|i"
 msgstr "Justering|J"
 
-#: lib/ui/classic.ui:129 lib/ui/stdcontext.inc:288 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"
 
@@ -8810,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:293 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"
 
@@ -8826,27 +9523,27 @@ msgstr "Kopier kolonne|p"
 msgid "Swap Columns"
 msgstr "Byt kolonner"
 
-#: lib/ui/classic.ui:141 lib/ui/stdcontext.inc:280 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:281 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:282 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:284 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:285 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:286 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"
 
@@ -8878,7 +9575,7 @@ msgstr "Justering|J"
 msgid "Add Row|R"
 msgstr "Legg til rad|L"
 
-#: lib/ui/classic.ui:171 lib/ui/stdcontext.inc:289 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"
 
@@ -8886,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:294 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"
 
@@ -8963,7 +9660,7 @@ msgstr "Samla milj
 msgid "Multline Environment"
 msgstr "Multilinje miljø"
 
-#: lib/ui/classic.ui:214 lib/ui/stdmenus.inc:320 lib/ui/stdmenus.inc:524
+#: lib/ui/classic.ui:214 lib/ui/stdmenus.inc:320 lib/ui/stdmenus.inc:522
 msgid "Math|h"
 msgstr "Matte|M"
 
@@ -9081,7 +9778,7 @@ msgstr "Ekstra mellomrom|E"
 msgid "Inter-word Space|w"
 msgstr "Mellom bokstav mellomrom|M"
 
-#: lib/ui/classic.ui:249 lib/ui/stdcontext.inc:155 lib/ui/stdmenus.inc:368
+#: lib/ui/classic.ui:249 lib/ui/stdcontext.inc:172 lib/ui/stdmenus.inc:368
 msgid "Thin Space|T"
 msgstr "Lite mellomrom|t"
 
@@ -9131,7 +9828,7 @@ msgstr "Meny delar|M"
 msgid "Horizontal Line"
 msgstr "Vassrett linje"
 
-#: lib/ui/classic.ui:261 src/insets/InsetNewpage.cpp:183
+#: lib/ui/classic.ui:261 src/insets/InsetNewpage.cpp:182
 msgid "Page Break"
 msgstr "Sideskift"
 
@@ -9253,39 +9950,39 @@ msgstr "Opprett tekst"
 msgid "Floatflt Figure"
 msgstr "Flytar figur"
 
-#: lib/ui/classic.ui:314 lib/ui/stdmenus.inc:417
+#: lib/ui/classic.ui:314 lib/ui/stdmenus.inc:415
 msgid "Table of Contents|C"
 msgstr "Innhaldsliste|I"
 
-#: lib/ui/classic.ui:316 lib/ui/stdmenus.inc:419
+#: lib/ui/classic.ui:316 lib/ui/stdmenus.inc:417
 msgid "Index List|I"
 msgstr "Indeks liste|l"
 
-#: lib/ui/classic.ui:317 lib/ui/stdmenus.inc:420
+#: lib/ui/classic.ui:317 lib/ui/stdmenus.inc:418
 msgid "Nomenclature|N"
 msgstr "Nomenklatur|N"
 
-#: lib/ui/classic.ui:318 lib/ui/stdmenus.inc:421
+#: lib/ui/classic.ui:318 lib/ui/stdmenus.inc:419
 msgid "BibTeX Bibliography...|B"
 msgstr "BibTeX Litteratur...|B"
 
-#: lib/ui/classic.ui:322 lib/ui/stdmenus.inc:425
+#: lib/ui/classic.ui:322 lib/ui/stdmenus.inc:423
 msgid "LyX Document...|X"
 msgstr "LyX dokument...|X"
 
-#: lib/ui/classic.ui:323 lib/ui/stdmenus.inc:426
+#: lib/ui/classic.ui:323 lib/ui/stdmenus.inc:424
 msgid "Plain Text...|T"
 msgstr "Rein tekst...|t"
 
-#: lib/ui/classic.ui:324 lib/ui/stdmenus.inc:427
+#: lib/ui/classic.ui:324 lib/ui/stdmenus.inc:425
 msgid "Plain Text, Join Lines...|J"
 msgstr "Rein tekst, knyt saman linjer...|R"
 
-#: lib/ui/classic.ui:328 lib/ui/stdmenus.inc:464
+#: lib/ui/classic.ui:328 lib/ui/stdmenus.inc:462
 msgid "Track Changes|T"
 msgstr "Registrer endringar...|r"
 
-#: lib/ui/classic.ui:329 lib/ui/stdmenus.inc:465
+#: lib/ui/classic.ui:329 lib/ui/stdmenus.inc:463
 msgid "Merge Changes...|M"
 msgstr "Flett endringar...|l"
 
@@ -9297,7 +9994,7 @@ msgstr "Godta alle endringar|G"
 msgid "Reject All Changes|R"
 msgstr "Forkast alle endringar|F"
 
-#: lib/ui/classic.ui:332 lib/ui/stdmenus.inc:470
+#: lib/ui/classic.ui:332 lib/ui/stdmenus.inc:468
 msgid "Show Changes in Output|S"
 msgstr "Vis endringar i sluttdokumentet|V"
 
@@ -9341,7 +10038,7 @@ msgstr "Auk listedjup|A"
 msgid "Start Appendix Here|S"
 msgstr "Start vedlegga her|S"
 
-#: lib/ui/classic.ui:360 lib/ui/stdmenus.inc:453
+#: lib/ui/classic.ui:360 lib/ui/stdmenus.inc:451
 msgid "Build Program|B"
 msgstr "Lag program|B"
 
@@ -9349,11 +10046,11 @@ msgstr "Lag program|B"
 msgid "Update|U"
 msgstr "Oppdater|O"
 
-#: lib/ui/classic.ui:363 lib/ui/stdmenus.inc:454
+#: lib/ui/classic.ui:363 lib/ui/stdmenus.inc:452
 msgid "LaTeX Log|L"
 msgstr "LaTeX loggfil|L"
 
-#: lib/ui/classic.ui:364 lib/ui/stdmenus.inc:455
+#: lib/ui/classic.ui:364 lib/ui/stdmenus.inc:453
 msgid "Outline|O"
 msgstr "Disposisjon|i"
 
@@ -9361,35 +10058,35 @@ msgstr "Disposisjon|i"
 msgid "TeX Information|X"
 msgstr "TeX informasjon|T"
 
-#: lib/ui/classic.ui:378 lib/ui/stdmenus.inc:478
+#: lib/ui/classic.ui:378 lib/ui/stdmenus.inc:476
 msgid "Next Note|N"
 msgstr "Neste notat|n"
 
-#: lib/ui/classic.ui:379 lib/ui/stdmenus.inc:481
+#: lib/ui/classic.ui:379 lib/ui/stdmenus.inc:479
 msgid "Go to Label|L"
 msgstr "Gå til etikett|G"
 
-#: lib/ui/classic.ui:380 lib/ui/stdmenus.inc:477
+#: lib/ui/classic.ui:380 lib/ui/stdmenus.inc:475
 msgid "Bookmarks|B"
 msgstr "Bokmerke|B"
 
-#: lib/ui/classic.ui:384 lib/ui/stdmenus.inc:487
+#: lib/ui/classic.ui:384 lib/ui/stdmenus.inc:485
 msgid "Save Bookmark 1|S"
 msgstr "Lagra bokmerke 1|L"
 
-#: lib/ui/classic.ui:385 lib/ui/stdmenus.inc:488
+#: lib/ui/classic.ui:385 lib/ui/stdmenus.inc:486
 msgid "Save Bookmark 2"
 msgstr "Lagra bokmerke 2"
 
-#: lib/ui/classic.ui:386 lib/ui/stdmenus.inc:489
+#: lib/ui/classic.ui:386 lib/ui/stdmenus.inc:487
 msgid "Save Bookmark 3"
 msgstr "Lagra bokmerke 3"
 
-#: lib/ui/classic.ui:387 lib/ui/stdmenus.inc:490
+#: lib/ui/classic.ui:387 lib/ui/stdmenus.inc:488
 msgid "Save Bookmark 4"
 msgstr "Lagra bokmerke 4"
 
-#: lib/ui/classic.ui:388 lib/ui/stdmenus.inc:491
+#: lib/ui/classic.ui:388 lib/ui/stdmenus.inc:489
 msgid "Save Bookmark 5"
 msgstr "Lagra bokmerke 5"
 
@@ -9413,47 +10110,47 @@ msgstr "G
 msgid "Go to Bookmark 5|5"
 msgstr "Gå til bokmerke 5|5"
 
-#: lib/ui/classic.ui:409 lib/ui/stdmenus.inc:519
+#: lib/ui/classic.ui:409 lib/ui/stdmenus.inc:517
 msgid "Introduction|I"
 msgstr "Introduksjon|I"
 
-#: lib/ui/classic.ui:410 lib/ui/stdmenus.inc:520
+#: lib/ui/classic.ui:410 lib/ui/stdmenus.inc:518
 msgid "Tutorial|T"
 msgstr "Lærebok|æ"
 
-#: lib/ui/classic.ui:411 lib/ui/stdmenus.inc:521
+#: lib/ui/classic.ui:411 lib/ui/stdmenus.inc:519
 msgid "User's Guide|U"
 msgstr "Brukarhandbok|B"
 
-#: lib/ui/classic.ui:412 lib/ui/stdmenus.inc:522
+#: lib/ui/classic.ui:412 lib/ui/stdmenus.inc:520
 msgid "Extended Features|E"
 msgstr "Utvida Funksjonar|U"
 
-#: lib/ui/classic.ui:413 lib/ui/stdmenus.inc:523
+#: lib/ui/classic.ui:413 lib/ui/stdmenus.inc:521
 msgid "Embedded Objects|m"
 msgstr "Innlemma object|m"
 
-#: lib/ui/classic.ui:414 lib/ui/stdmenus.inc:525
+#: lib/ui/classic.ui:414 lib/ui/stdmenus.inc:523
 msgid "Customization|C"
 msgstr "Tilpassing|T"
 
-#: lib/ui/classic.ui:416 lib/ui/stdmenus.inc:527
+#: lib/ui/classic.ui:416 lib/ui/stdmenus.inc:525
 msgid "FAQ|F"
 msgstr "FAQ|Q"
 
-#: lib/ui/classic.ui:417 lib/ui/stdmenus.inc:528
+#: lib/ui/classic.ui:417 lib/ui/stdmenus.inc:526
 msgid "Table of Contents|a"
 msgstr "Innhaldsliste|a"
 
-#: lib/ui/classic.ui:418 lib/ui/stdmenus.inc:529
+#: lib/ui/classic.ui:418 lib/ui/stdmenus.inc:527
 msgid "LaTeX Configuration|L"
 msgstr "LaTeX innstillingar|L"
 
-#: lib/ui/classic.ui:420 lib/ui/stdmenus.inc:531
+#: lib/ui/classic.ui:420 lib/ui/stdmenus.inc:529
 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"
 
@@ -9478,11 +10175,13 @@ msgid "Gathered Environment|h"
 msgstr "Samla miljø|S"
 
 #: lib/ui/stdcontext.inc:27 lib/ui/stdmenus.inc:402
-msgid "Delimiters|r"
+#, fuzzy
+msgid "Delimiters...|r"
 msgstr "Skiljeteikn"
 
 #: lib/ui/stdcontext.inc:28 lib/ui/stdmenus.inc:403
-msgid "Matrix|x"
+#, fuzzy
+msgid "Matrix...|x"
 msgstr "Matrise|r"
 
 #: lib/ui/stdcontext.inc:29 lib/ui/stdmenus.inc:404
@@ -9554,7 +10253,7 @@ msgstr "Skru av/p
 msgid "Toggle Table Toolbar"
 msgstr "Skru av/på tabellverktylinje"
 
-#: lib/ui/stdcontext.inc:73 lib/ui/stdcontext.inc:94
+#: lib/ui/stdcontext.inc:73 lib/ui/stdcontext.inc:90
 #, fuzzy
 msgid "Next Cross-Reference|N"
 msgstr "Neste kryssreferanse|r"
@@ -9594,331 +10293,413 @@ msgstr "<referanse> p
 msgid "Formatted reference|t"
 msgstr "Formatert referanse"
 
-#: lib/ui/stdcontext.inc:83 lib/ui/stdcontext.inc:97 lib/ui/stdcontext.inc:108
-#: lib/ui/stdcontext.inc:115 lib/ui/stdcontext.inc:133
-#: lib/ui/stdcontext.inc:167 lib/ui/stdcontext.inc:181
-#: lib/ui/stdcontext.inc:255 lib/ui/stdcontext.inc:263
-#: lib/ui/stdcontext.inc:298 lib/ui/stdmenus.inc:460
+#: lib/ui/stdcontext.inc:83 lib/ui/stdcontext.inc:93 lib/ui/stdcontext.inc:103
+#: 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: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"
 
-#: lib/ui/stdcontext.inc:95
+#: lib/ui/stdcontext.inc:91
 msgid "Go back to Reference|G"
 msgstr ""
 
-#: lib/ui/stdcontext.inc:104
+#: lib/ui/stdcontext.inc:113
+#, fuzzy
+msgid "Edit Database(s) externally...|x"
+msgstr "Rediger fila eksternt"
+
+#: lib/ui/stdcontext.inc:121 lib/ui/stdcontext.inc:292
 #, fuzzy
 msgid "Open Inset|O"
 msgstr "Opna alle innskot|i"
 
-#: lib/ui/stdcontext.inc:105
+#: 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:107 lib/ui/stdcontext.inc:113
-#: lib/ui/stdcontext.inc:132 lib/ui/stdcontext.inc:145
+#: 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"
 
-#: lib/ui/stdcontext.inc:112
+#: lib/ui/stdcontext.inc:129
 #, fuzzy
 msgid "Toggle Label|L"
 msgstr "&Byt alle"
 
-#: lib/ui/stdcontext.inc:123
+#: lib/ui/stdcontext.inc:140
 #, fuzzy
 msgid "Frameless|l"
 msgstr "Utan ramme"
 
-#: lib/ui/stdcontext.inc:124
+#: lib/ui/stdcontext.inc:141
 #, fuzzy
 msgid "Simple frame|f"
 msgstr "innskot ramme"
 
-#: lib/ui/stdcontext.inc:125
+#: lib/ui/stdcontext.inc:142
 msgid "Simple frame, page breaks|p"
 msgstr ""
 
-#: lib/ui/stdcontext.inc:126
+#: lib/ui/stdcontext.inc:143
 #, fuzzy
 msgid "Oval, thin|O"
 msgstr "Tynn, oval ramme"
 
-#: lib/ui/stdcontext.inc:127
+#: lib/ui/stdcontext.inc:144
 #, fuzzy
 msgid "Oval, thick|v"
 msgstr "Tjukk oval ramme"
 
-#: lib/ui/stdcontext.inc:128
+#: lib/ui/stdcontext.inc:145
 msgid "Drop Shadow|w"
 msgstr ""
 
-#: lib/ui/stdcontext.inc:129
+#: lib/ui/stdcontext.inc:146
 #, fuzzy
 msgid "Shaded background|b"
 msgstr "notat bakgrunn"
 
-#: lib/ui/stdcontext.inc:130
+#: lib/ui/stdcontext.inc:147
 #, fuzzy
 msgid "Double frame|D"
 msgstr "dobbel"
 
-#: lib/ui/stdcontext.inc:141 lib/ui/stdmenus.inc:434
+#: lib/ui/stdcontext.inc:158 lib/ui/stdmenus.inc:432
 msgid "LyX Note|N"
 msgstr "LyX notat|n"
 
-#: lib/ui/stdcontext.inc:142 lib/ui/stdmenus.inc:435
+#: lib/ui/stdcontext.inc:159 lib/ui/stdmenus.inc:433
 msgid "Comment|C"
 msgstr "Kommentar|K"
 
-#: lib/ui/stdcontext.inc:143 lib/ui/stdmenus.inc:436
+#: lib/ui/stdcontext.inc:160 lib/ui/stdmenus.inc:434
 msgid "Greyed Out|G"
 msgstr "Som Grå-tekst|G"
 
-#: lib/ui/stdcontext.inc:153
+#: lib/ui/stdcontext.inc:170
 #, fuzzy
 msgid "Interword Space|w"
 msgstr "Mellom bokstav mellomrom|M"
 
-#: lib/ui/stdcontext.inc:154
+#: lib/ui/stdcontext.inc:171
 #, fuzzy
 msgid "Protected Space|o"
 msgstr "Ekstra mellomrom|E"
 
-#: lib/ui/stdcontext.inc:156
+#: lib/ui/stdcontext.inc:173
 #, fuzzy
 msgid "Negative Thin Space|N"
 msgstr "Negativt mellomrom\t\\!"
 
-#: lib/ui/stdcontext.inc:157
+#: lib/ui/stdcontext.inc:174
 msgid "Half Quad Space (Enskip)|k"
 msgstr ""
 
-#: lib/ui/stdcontext.inc:158
+#: lib/ui/stdcontext.inc:175
 #, fuzzy
 msgid "Protected Half Quad Space (Enspace)|E"
 msgstr "Ekstra mellomrom|E"
 
-#: lib/ui/stdcontext.inc:159
+#: lib/ui/stdcontext.inc:176
 #, fuzzy
 msgid "Quad Space|Q"
 msgstr "Avstand"
 
-#: lib/ui/stdcontext.inc:160
+#: lib/ui/stdcontext.inc:177
 #, fuzzy
 msgid "Double Quad Space|u"
 msgstr "Avstand"
 
-#: lib/ui/stdcontext.inc:161
+#: lib/ui/stdcontext.inc:178
 msgid "Horizontal Fill|F"
 msgstr "Vassrett fyll|y"
 
-#: lib/ui/stdcontext.inc:162
+#: lib/ui/stdcontext.inc:179
 #, fuzzy
 msgid "Protected Horizontal Fill|i"
 msgstr "Vassrett fyll"
 
-#: lib/ui/stdcontext.inc:163
+#: lib/ui/stdcontext.inc:180
 #, fuzzy
 msgid "Horizontal Fill (Dots)|D"
 msgstr "Vassrett fyll"
 
-#: lib/ui/stdcontext.inc:164
+#: lib/ui/stdcontext.inc:181
 #, fuzzy
 msgid "Horizontal Fill (Rule)|R"
 msgstr "Vassrett fyll"
 
-#: lib/ui/stdcontext.inc:165
+#: lib/ui/stdcontext.inc:182
+#, fuzzy
+msgid "Horizontal Fill (Left Arrow)|L"
+msgstr "Vassrett fyll"
+
+#: lib/ui/stdcontext.inc:183
+#, fuzzy
+msgid "Horizontal Fill (Right Arrow)|g"
+msgstr "Vassrett fyll"
+
+#: lib/ui/stdcontext.inc:184
+#, fuzzy
+msgid "Horizontal Fill (Up Brace)|p"
+msgstr "Vassrett fyll"
+
+#: lib/ui/stdcontext.inc:185
+#, fuzzy
+msgid "Horizontal Fill (Down Brace)|B"
+msgstr "Vassrett fyll"
+
+#: lib/ui/stdcontext.inc:186
 #, fuzzy
 msgid "Custom Length|C"
 msgstr "Kommentar|K"
 
-#: lib/ui/stdcontext.inc:174
+#: lib/ui/stdcontext.inc:195
 #, fuzzy
 msgid "DefSkip|D"
 msgstr "Standard avstand"
 
-#: lib/ui/stdcontext.inc:175
+#: lib/ui/stdcontext.inc:196
 #, fuzzy
 msgid "SmallSkip|S"
 msgstr "Liten avstand"
 
-#: lib/ui/stdcontext.inc:176
+#: lib/ui/stdcontext.inc:197
 #, fuzzy
 msgid "MedSkip|M"
 msgstr "Medium avstand"
 
-#: lib/ui/stdcontext.inc:177
+#: lib/ui/stdcontext.inc:198
 #, fuzzy
 msgid "BigSkip|B"
 msgstr "Stor avstand"
 
-#: lib/ui/stdcontext.inc:178
+#: lib/ui/stdcontext.inc:199
 #, fuzzy
 msgid "VFill|F"
 msgstr "Fyll vertikalt"
 
-#: lib/ui/stdcontext.inc:179
+#: lib/ui/stdcontext.inc:200
 #, fuzzy
 msgid "Custom|C"
 msgstr "Tilpassa"
 
-#: lib/ui/stdcontext.inc:192 lib/ui/stdmenus.inc:378
+#: lib/ui/stdcontext.inc:202
+#, fuzzy
+msgid "Settings...|e"
+msgstr "Dokumentval...|D"
+
+#: lib/ui/stdcontext.inc:209
+#, fuzzy
+msgid "Include|c"
+msgstr "Underdokument"
+
+#: lib/ui/stdcontext.inc:210
+#, fuzzy
+msgid "Input|p"
+msgstr "Tekstfil"
+
+#: lib/ui/stdcontext.inc:211
+#, fuzzy
+msgid "Verbatim|V"
+msgstr "Verbatim"
+
+#: lib/ui/stdcontext.inc:212
+msgid "Verbatim (marked blanks)|b"
+msgstr ""
+
+#: lib/ui/stdcontext.inc:213
+#, fuzzy
+msgid "Listing|L"
+msgstr "Kodeliste"
+
+#: lib/ui/stdcontext.inc:217
+#, fuzzy
+msgid "Edit included file...|E"
+msgstr "Set inn underdokument...|S"
+
+#: lib/ui/stdcontext.inc:224 lib/ui/stdmenus.inc:378
 #, fuzzy
 msgid "New Page|N"
 msgstr "Ny|N"
 
-#: lib/ui/stdcontext.inc:193 lib/ui/stdmenus.inc:379
+#: lib/ui/stdcontext.inc:225 lib/ui/stdmenus.inc:379
 msgid "Page Break|a"
 msgstr "Sideskift|e"
 
-#: lib/ui/stdcontext.inc:194 lib/ui/stdmenus.inc:380
+#: lib/ui/stdcontext.inc:226 lib/ui/stdmenus.inc:380
 msgid "Clear Page|C"
 msgstr "Klargjer sida|g"
 
-#: lib/ui/stdcontext.inc:195 lib/ui/stdmenus.inc:381
+#: lib/ui/stdcontext.inc:227 lib/ui/stdmenus.inc:381
 msgid "Clear Double Page|D"
 msgstr "Klargjer dobbelside|d"
 
-#: lib/ui/stdcontext.inc:202 lib/ui/stdmenus.inc:375
+#: lib/ui/stdcontext.inc:234 lib/ui/stdmenus.inc:375
 #, fuzzy
 msgid "Ragged Line Break|R"
 msgstr "Ny linje|L"
 
-#: lib/ui/stdcontext.inc:203 lib/ui/stdmenus.inc:376
+#: lib/ui/stdcontext.inc:235 lib/ui/stdmenus.inc:376
 #, fuzzy
 msgid "Justified Line Break|J"
 msgstr "Ny linje|L"
 
-#: lib/ui/stdcontext.inc:210 lib/ui/stdcontext.inc:250 lib/ui/stdmenus.inc:88
-#: lib/ui/stdtoolbars.inc:66 src/Text3.cpp:942
-#: src/mathed/InsetMathNest.cpp:537
+#: lib/ui/stdcontext.inc:242 lib/ui/stdcontext.inc:287 lib/ui/stdmenus.inc:88
+#: lib/ui/stdtoolbars.inc:66 src/Text3.cpp:973
+#: src/mathed/InsetMathNest.cpp:540
 msgid "Cut"
 msgstr "Klipp"
 
-#: lib/ui/stdcontext.inc:211 lib/ui/stdcontext.inc:251 lib/ui/stdmenus.inc:89
-#: lib/ui/stdtoolbars.inc:67 src/Text3.cpp:947
-#: src/mathed/InsetMathNest.cpp:545
+#: lib/ui/stdcontext.inc:243 lib/ui/stdcontext.inc:288 lib/ui/stdmenus.inc:89
+#: lib/ui/stdtoolbars.inc:67 src/Text3.cpp:978
+#: src/mathed/InsetMathNest.cpp:548
 msgid "Copy"
 msgstr "Kopier"
 
-#: lib/ui/stdcontext.inc:212 lib/ui/stdcontext.inc:252 lib/ui/stdmenus.inc:90
-#: lib/ui/stdtoolbars.inc:68 src/Text3.cpp:902
-#: src/mathed/InsetMathGrid.cpp:1234 src/mathed/InsetMathNest.cpp:517
+#: lib/ui/stdcontext.inc:244 lib/ui/stdcontext.inc:289 lib/ui/stdmenus.inc:90
+#: lib/ui/stdtoolbars.inc:68 src/Text3.cpp:933
+#: src/mathed/InsetMathGrid.cpp:1239 src/mathed/InsetMathNest.cpp:520
 msgid "Paste"
 msgstr "Lim inn"
 
-#: lib/ui/stdcontext.inc:213 lib/ui/stdcontext.inc:253 lib/ui/stdmenus.inc:91
+#: lib/ui/stdcontext.inc:245 lib/ui/stdcontext.inc:290 lib/ui/stdmenus.inc:91
 msgid "Paste Recent|e"
 msgstr "Lim inn nyleg brukte|m"
 
-#: lib/ui/stdcontext.inc:215
+#: lib/ui/stdcontext.inc:247
 #, fuzzy
 msgid "Jump to Saved Bookmark|B"
 msgstr "Lagra bokmerke 1|L"
 
-#: lib/ui/stdcontext.inc:217 lib/ui/stdmenus.inc:98
+#: lib/ui/stdcontext.inc:249 lib/ui/stdmenus.inc:98
 msgid "Move Paragraph Up|o"
 msgstr "Flytt Avsnitt opp|o"
 
-#: lib/ui/stdcontext.inc:218 lib/ui/stdmenus.inc:99
+#: lib/ui/stdcontext.inc:250 lib/ui/stdmenus.inc:99
 msgid "Move Paragraph Down|v"
 msgstr "Flytt Avsnitt ned|v"
 
-#: lib/ui/stdcontext.inc:220
+#: lib/ui/stdcontext.inc:252
+#, fuzzy
+msgid "Promote Section|r"
+msgstr "Tom bolk"
+
+#: lib/ui/stdcontext.inc:253
+#, fuzzy
+msgid "Demote Section|m"
+msgstr "Tom bolk"
+
+#: lib/ui/stdcontext.inc:254
+#, fuzzy
+msgid "Move Section down|d"
+msgstr "Lukk bolken"
+
+#: lib/ui/stdcontext.inc:255
+#, fuzzy
+msgid "Move Section up|u"
+msgstr "Lukk bolken"
+
+#: lib/ui/stdcontext.inc:257
 #, fuzzy
 msgid "Apply Last Text Style|A"
 msgstr "Tekststil|k"
 
-#: lib/ui/stdcontext.inc:221 lib/ui/stdmenus.inc:101
+#: lib/ui/stdcontext.inc:258 lib/ui/stdmenus.inc:101
 msgid "Text Style|S"
 msgstr "Tekststil|k"
 
-#: lib/ui/stdcontext.inc:222 lib/ui/stdmenus.inc:102
+#: lib/ui/stdcontext.inc:259 lib/ui/stdmenus.inc:102
 msgid "Paragraph Settings...|P"
 msgstr "Avsnittval...|n"
 
-#: lib/ui/stdcontext.inc:224
+#: lib/ui/stdcontext.inc:261
 msgid "Fullscreen Mode"
 msgstr ""
 
-#: lib/ui/stdcontext.inc:232 lib/ui/stdmenus.inc:216
+#: lib/ui/stdcontext.inc:269 lib/ui/stdmenus.inc:216
 #: lib/ui/stdtoolbars.inc:171
 #, fuzzy
 msgid "Append Parameter"
 msgstr "Flei&re val"
 
-#: lib/ui/stdcontext.inc:233 lib/ui/stdmenus.inc:217
+#: lib/ui/stdcontext.inc:270 lib/ui/stdmenus.inc:217
 #: lib/ui/stdtoolbars.inc:170
 #, fuzzy
 msgid "Remove Last Parameter"
 msgstr "Val for kodeliste"
 
-#: lib/ui/stdcontext.inc:235 lib/ui/stdmenus.inc:219
+#: lib/ui/stdcontext.inc:272 lib/ui/stdmenus.inc:219
 #: lib/ui/stdtoolbars.inc:173
 msgid "Make First Non-Optional into Optional Parameter"
 msgstr ""
 
-#: lib/ui/stdcontext.inc:236 lib/ui/stdmenus.inc:220
+#: lib/ui/stdcontext.inc:273 lib/ui/stdmenus.inc:220
 #: lib/ui/stdtoolbars.inc:174
 msgid "Make Last Optional into Non-Optional Parameter"
 msgstr ""
 
-#: lib/ui/stdcontext.inc:237 lib/ui/stdmenus.inc:221
+#: lib/ui/stdcontext.inc:274 lib/ui/stdmenus.inc:221
 #: lib/ui/stdtoolbars.inc:177
 #, fuzzy
 msgid "Insert Optional Parameter"
 msgstr "Val for kodeliste"
 
-#: lib/ui/stdcontext.inc:238 lib/ui/stdmenus.inc:222
+#: lib/ui/stdcontext.inc:275 lib/ui/stdmenus.inc:222
 #: lib/ui/stdtoolbars.inc:176
 #, fuzzy
 msgid "Remove Optional Parameter"
 msgstr "Opna valfritt argument innskot"
 
-#: lib/ui/stdcontext.inc:240 lib/ui/stdmenus.inc:224
+#: lib/ui/stdcontext.inc:277 lib/ui/stdmenus.inc:224
 #: lib/ui/stdtoolbars.inc:180
 msgid "Append Parameter Eating From The Right"
 msgstr ""
 
-#: lib/ui/stdcontext.inc:241 lib/ui/stdmenus.inc:225
+#: lib/ui/stdcontext.inc:278 lib/ui/stdmenus.inc:225
 #: lib/ui/stdtoolbars.inc:181
 msgid "Append Optional Parameter Eating From The Right"
 msgstr ""
 
-#: lib/ui/stdcontext.inc:242 lib/ui/stdmenus.inc:226
+#: lib/ui/stdcontext.inc:279 lib/ui/stdmenus.inc:226
 #: lib/ui/stdtoolbars.inc:179
 msgid "Remove Last Parameter Spitting Out To The Right"
 msgstr ""
 
-#: lib/ui/stdcontext.inc:265
+#: lib/ui/stdcontext.inc:306 lib/ui/stdcontext.inc:318
 #, fuzzy
 msgid "Edit externally...|x"
 msgstr "Rediger fila eksternt"
 
-#: lib/ui/stdcontext.inc:275 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:276 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:277 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:278 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:290 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:295 lib/ui/stdmenus.inc:186
+#: lib/ui/stdcontext.inc:348 lib/ui/stdmenus.inc:186
 msgid "Copy Column|p"
 msgstr "Kopier kolonne|p"
 
@@ -10170,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
@@ -10292,86 +11073,82 @@ msgstr "Orddelingspunkt|p"
 msgid "Numbered Formula|N"
 msgstr "Nummerert formel|f"
 
-#: lib/ui/stdmenus.inc:406 lib/ui/stdtoolbars.inc:166
-msgid "Toggle Math Panels"
-msgstr "Matte dialog"
-
-#: lib/ui/stdmenus.inc:412
+#: lib/ui/stdmenus.inc:410
 #, fuzzy
 msgid "Figure Wrap Float|F"
 msgstr "Set inn ein tekstbrekking flytar|f"
 
-#: lib/ui/stdmenus.inc:413
+#: lib/ui/stdmenus.inc:411
 #, fuzzy
 msgid "Table Wrap Float|T"
 msgstr "Set inn ein tekstbrekking flytar|f"
 
-#: lib/ui/stdmenus.inc:429
+#: lib/ui/stdmenus.inc:427
 msgid "External Material...|M"
 msgstr "Eksternt materiale...|E"
 
-#: lib/ui/stdmenus.inc:430
+#: lib/ui/stdmenus.inc:428
 msgid "Child Document...|d"
 msgstr "Barnedokument...|d"
 
-#: lib/ui/stdmenus.inc:452
+#: lib/ui/stdmenus.inc:450
 msgid "Change Tracking|C"
 msgstr "Spor endring|e"
 
-#: lib/ui/stdmenus.inc:456
+#: lib/ui/stdmenus.inc:454
 msgid "Start Appendix Here|A"
 msgstr "Start vedlegga her|S"
 
-#: lib/ui/stdmenus.inc:458
+#: lib/ui/stdmenus.inc:456
 msgid "Save in Bundled Format|F"
 msgstr ""
 
-#: lib/ui/stdmenus.inc:459
+#: lib/ui/stdmenus.inc:457
 msgid "Compressed|m"
 msgstr "Komprimert|o"
 
-#: lib/ui/stdmenus.inc:466
+#: lib/ui/stdmenus.inc:464
 msgid "Accept Change|A"
 msgstr "Godta endring|G"
 
-#: lib/ui/stdmenus.inc:467
+#: lib/ui/stdmenus.inc:465
 msgid "Reject Change|R"
 msgstr "Ikkje godta endring|I"
 
-#: lib/ui/stdmenus.inc:468
+#: lib/ui/stdmenus.inc:466
 msgid "Accept All Changes|c"
 msgstr "Godta alle endringar|a"
 
-#: lib/ui/stdmenus.inc:469
+#: lib/ui/stdmenus.inc:467
 msgid "Reject All Changes|e"
 msgstr "Ikkje godta nokon av endringane|e"
 
-#: lib/ui/stdmenus.inc:479
+#: lib/ui/stdmenus.inc:477
 msgid "Next Change|C"
 msgstr "Neste endring|e"
 
-#: lib/ui/stdmenus.inc:480
+#: lib/ui/stdmenus.inc:478
 msgid "Next Cross-Reference|R"
 msgstr "Neste kryssreferanse|r"
 
-#: lib/ui/stdmenus.inc:492
+#: lib/ui/stdmenus.inc:490
 msgid "Clear Bookmarks|C"
 msgstr "Fjern Bokmerke|B"
 
-#: lib/ui/stdmenus.inc:503
+#: lib/ui/stdmenus.inc:501
 msgid "Thesaurus...|T"
 msgstr "Synonymordbok...|S"
 
-#: lib/ui/stdmenus.inc:504
+#: lib/ui/stdmenus.inc:502
 #, fuzzy
 msgid "Statistics...|a"
 msgstr "Status"
 
-#: lib/ui/stdmenus.inc:506
+#: lib/ui/stdmenus.inc:504
 msgid "TeX Information|I"
 msgstr "TeX informasjon|T"
 
-#: lib/ui/stdmenus.inc:526
+#: lib/ui/stdmenus.inc:524
 #, fuzzy
 msgid "Shortcuts|S"
 msgstr "&Snøggtast:"
@@ -10396,11 +11173,11 @@ msgstr "Skriv ut dokument"
 msgid "Check spelling"
 msgstr "Sjekk rettskriving"
 
-#: lib/ui/stdtoolbars.inc:64 src/BufferView.cpp:1029
+#: lib/ui/stdtoolbars.inc:64 src/BufferView.cpp:1021
 msgid "Undo"
 msgstr "Angre"
 
-#: lib/ui/stdtoolbars.inc:65 src/BufferView.cpp:1038
+#: lib/ui/stdtoolbars.inc:65 src/BufferView.cpp:1030
 msgid "Redo"
 msgstr "Gjer om"
 
@@ -10672,6 +11449,10 @@ msgstr "Sett inn matrise"
 msgid "Insert cases environment"
 msgstr "Sett inn alternativ-miljø"
 
+#: lib/ui/stdtoolbars.inc:166
+msgid "Toggle Math Panels"
+msgstr "Matte dialog"
+
 #: lib/ui/stdtoolbars.inc:169
 #, fuzzy
 msgid "Math Macros"
@@ -10698,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"
@@ -10766,7 +11549,7 @@ msgid "Fractions"
 msgstr "Brøkar"
 
 #: lib/ui/stdtoolbars.inc:217 lib/ui/stdtoolbars.inc:309
-#: src/frontends/qt4/GuiDocument.cpp:978
+#: src/frontends/qt4/GuiDocument.cpp:980
 msgid "Fonts"
 msgstr "Skrifttypar"
 
@@ -11189,7 +11972,7 @@ msgstr "h
 msgid "underset"
 msgstr "settunder"
 
-#: lib/ui/stdtoolbars.inc:356 src/frontends/qt4/GuiSymbols.cpp:86
+#: lib/ui/stdtoolbars.inc:356 src/frontends/qt4/GuiSymbols.cpp:87
 msgid "Arrows"
 msgstr "Piler"
 
@@ -12934,30 +13717,30 @@ msgstr ""
 msgid "A bitmap file.\n"
 msgstr ""
 
-#: lib/external_templates:102
+#: lib/external_templates:109
 #, fuzzy
 msgid "XFig"
 msgstr " Xi"
 
-#: lib/external_templates:103 lib/external_templates:106
+#: lib/external_templates:110 lib/external_templates:113
 msgid "Xfig: $$AbsOrRelPathParent$$Basename"
 msgstr ""
 
-#: lib/external_templates:105
+#: lib/external_templates:112
 #, fuzzy
 msgid "An Xfig figure.\n"
 msgstr "Køyrer \"stiller inn\"..."
 
-#: lib/external_templates:154
+#: lib/external_templates:162
 #, fuzzy
 msgid "ChessDiagram"
 msgstr "Sjakkbrett"
 
-#: lib/external_templates:155 lib/external_templates:174
+#: lib/external_templates:163 lib/external_templates:182
 msgid "Chess: $$AbsOrRelPathParent$$Basename"
 msgstr ""
 
-#: lib/external_templates:157
+#: lib/external_templates:165
 msgid ""
 "A chess position diagram.\n"
 "This template will use XBoard to edit the position.\n"
@@ -12978,15 +13761,15 @@ msgid ""
 "to install the skak package from CTAN.\n"
 msgstr ""
 
-#: lib/external_templates:199
+#: lib/external_templates:208
 msgid "LilyPond"
 msgstr ""
 
-#: lib/external_templates:200 lib/external_templates:206
+#: lib/external_templates:209 lib/external_templates:215
 msgid "Lilypond typeset music"
 msgstr ""
 
-#: lib/external_templates:202
+#: lib/external_templates:211
 msgid ""
 "Sheet music typeset by GNU LilyPond,\n"
 "converted to .pdf or .eps for inclusion\n"
@@ -12994,16 +13777,16 @@ msgid ""
 "Using .pdf requires at least lilypond 2.9\n"
 msgstr ""
 
-#: lib/external_templates:247
+#: lib/external_templates:257
 #, fuzzy
 msgid "PDFPages"
 msgstr "Sider"
 
-#: lib/external_templates:248 lib/external_templates:261
+#: lib/external_templates:258 lib/external_templates:271
 msgid "PDF pages: $$AbsOrRelPathParent$$Basename"
 msgstr ""
 
-#: lib/external_templates:250
+#: lib/external_templates:260
 msgid ""
 "Includes PDF documents, using the 'pdfpages' package.\n"
 "To include multiple pages, use the pages-option,\n"
@@ -13016,86 +13799,410 @@ msgid ""
 "for further options and details.\n"
 msgstr ""
 
-#: lib/external_templates:290
+#: lib/external_templates:300
 msgid ""
 "Today's date.\n"
 "Read 'info date' for more information.\n"
 msgstr ""
 
-#: src/BiblioInfo.cpp:123 src/frontends/qt4/GuiDocument.cpp:1339
+#: lib/configure.py:236
+msgid "Tgif"
+msgstr ""
+
+#: lib/configure.py:239
+msgid "FIG"
+msgstr ""
+
+#: lib/configure.py:242
+#, fuzzy
+msgid "Grace"
+msgstr "Gråtonar"
+
+#: lib/configure.py:245
+msgid "FEN"
+msgstr ""
+
+#: lib/configure.py:249
+msgid "BMP"
+msgstr ""
+
+#: lib/configure.py:250
+msgid "GIF"
+msgstr ""
+
+#: lib/configure.py:251 src/frontends/qt4/GuiClipboard.cpp:138
+msgid "JPEG"
+msgstr ""
+
+#: lib/configure.py:252
+msgid "PBM"
+msgstr ""
+
+#: lib/configure.py:253
+msgid "PGM"
+msgstr ""
+
+#: lib/configure.py:254 src/frontends/qt4/GuiClipboard.cpp:137
+msgid "PNG"
+msgstr ""
+
+#: lib/configure.py:255
+msgid "PPM"
+msgstr ""
+
+#: lib/configure.py:256
+msgid "TIFF"
+msgstr ""
+
+#: lib/configure.py:257
+msgid "XBM"
+msgstr ""
+
+#: lib/configure.py:258
+msgid "XPM"
+msgstr ""
+
+#: lib/configure.py:263
+msgid "Plain text (chess output)"
+msgstr ""
+
+#: lib/configure.py:264
+#, fuzzy
+msgid "Plain text (image)"
+msgstr "Rein tekst"
+
+#: lib/configure.py:265
+msgid "Plain text (Xfig output)"
+msgstr ""
+
+#: lib/configure.py:266
+#, fuzzy
+msgid "date (output)"
+msgstr "S&end skrivar namn"
+
+#: lib/configure.py:267
+msgid "DocBook"
+msgstr ""
+
+#: lib/configure.py:267
+#, fuzzy
+msgid "DocBook|B"
+msgstr "Bokmerke|B"
+
+#: lib/configure.py:268
+msgid "Docbook (XML)"
+msgstr ""
+
+#: lib/configure.py:269
+#, fuzzy
+msgid "Graphviz Dot"
+msgstr "Grafikk"
+
+#: lib/configure.py:270
+#, fuzzy
+msgid "NoWeb"
+msgstr "Ingen"
+
+#: lib/configure.py:270
+#, fuzzy
+msgid "NoWeb|N"
+msgstr "Notat|N"
+
+#: lib/configure.py:271
+msgid "LilyPond music"
+msgstr ""
+
+#: lib/configure.py:272
+#, fuzzy
+msgid "LaTeX (plain)"
+msgstr "LaTeX-&val:"
+
+#: lib/configure.py:272
+#, fuzzy
+msgid "LaTeX (plain)|L"
+msgstr "LaTeX-&val:"
+
+#: lib/configure.py:273
+msgid "LinuxDoc"
+msgstr ""
+
+#: lib/configure.py:273
+msgid "LinuxDoc|x"
+msgstr ""
+
+#: lib/configure.py:274
+#, fuzzy
+msgid "LaTeX (pdflatex)"
+msgstr "Oppdater pdf (pdflatex)"
+
+#: lib/configure.py:275 src/frontends/qt4/GuiPrefs.cpp:330
+msgid "Plain text"
+msgstr "Rein tekst"
+
+#: lib/configure.py:275
+#, fuzzy
+msgid "Plain text|a"
+msgstr "Rein tekst"
+
+#: lib/configure.py:276
+#, fuzzy
+msgid "Plain text (pstotext)"
+msgstr "Rein tekst"
+
+#: lib/configure.py:277
+#, fuzzy
+msgid "Plain text (ps2ascii)"
+msgstr "Rein tekst"
+
+#: lib/configure.py:278
+#, fuzzy
+msgid "Plain text (catdvi)"
+msgstr "Rein tekst"
+
+#: lib/configure.py:279
+msgid "Plain Text, Join Lines"
+msgstr "Rein tekst, knyt saman linjer"
+
+#: lib/configure.py:286
+#, fuzzy
+msgid "BibTeX"
+msgstr "LaTeX"
+
+#: lib/configure.py:291
+#, fuzzy
+msgid "EPS"
+msgstr "PS"
+
+#: lib/configure.py:292
+#, fuzzy
+msgid "Postscript"
+msgstr "Post Scriptum:"
+
+#: lib/configure.py:292
+#, fuzzy
+msgid "Postscript|t"
+msgstr "Post Scriptum:"
+
+#: lib/configure.py:296
+msgid "PDF (ps2pdf)"
+msgstr ""
+
+#: lib/configure.py:296
+msgid "PDF (ps2pdf)|P"
+msgstr ""
+
+#: lib/configure.py:297
+#, fuzzy
+msgid "PDF (pdflatex)"
+msgstr "Vis pdf (pdflatex)"
+
+#: lib/configure.py:297
+#, fuzzy
+msgid "PDF (pdflatex)|F"
+msgstr "Vis pdf (pdflatex)"
+
+#: lib/configure.py:298
+msgid "PDF (dvipdfm)"
+msgstr ""
+
+#: lib/configure.py:298
+msgid "PDF (dvipdfm)|m"
+msgstr ""
+
+#: lib/configure.py:301
+msgid "DVI"
+msgstr ""
+
+#: lib/configure.py:301
+msgid "DVI|D"
+msgstr ""
+
+#: lib/configure.py:304
+#, fuzzy
+msgid "DraftDVI"
+msgstr "Kla&dd"
+
+#: lib/configure.py:307
+msgid "HTML"
+msgstr ""
+
+#: lib/configure.py:307
+msgid "HTML|H"
+msgstr ""
+
+#: lib/configure.py:310
+#, fuzzy
+msgid "Noteedit"
+msgstr "Notat_Til_Utgjevar"
+
+#: lib/configure.py:313
+#, fuzzy
+msgid "OpenDocument"
+msgstr "Opna eit dokument"
+
+#: lib/configure.py:316
+#, fuzzy
+msgid "date command"
+msgstr "Neste kommando"
+
+#: lib/configure.py:317
+#, fuzzy
+msgid "Table (CSV)"
+msgstr "Tabell"
+
+#: 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"
+
+#: lib/configure.py:320
+msgid "LyX 1.3.x"
+msgstr ""
+
+#: lib/configure.py:321
+msgid "LyX 1.4.x"
+msgstr ""
+
+#: lib/configure.py:322
+msgid "LyX 1.5.x"
+msgstr ""
+
+#: lib/configure.py:323
+msgid "CJK LyX 1.4.x (big5)"
+msgstr ""
+
+#: lib/configure.py:324
+msgid "CJK LyX 1.4.x (euc-jp)"
+msgstr ""
+
+#: lib/configure.py:325
+msgid "CJK LyX 1.4.x (euc-kr)"
+msgstr ""
+
+#: lib/configure.py:326
+#, fuzzy
+msgid "LyX Preview"
+msgstr "Førehandsvising"
+
+#: lib/configure.py:327
+msgid "PDFTEX"
+msgstr ""
+
+#: lib/configure.py:328
+#, fuzzy
+msgid "Program"
+msgstr "Kodelister"
+
+#: lib/configure.py:329
+msgid "PSTEX"
+msgstr ""
+
+#: lib/configure.py:330
+#, fuzzy
+msgid "Rich Text Format"
+msgstr "Normal tekst skriftype"
+
+#: lib/configure.py:331
+msgid "OpenOffice.Org (sxw)"
+msgstr ""
+
+#: lib/configure.py:332 src/frontends/qt4/GuiClipboard.cpp:134
+#, fuzzy
+msgid "Windows Metafile"
+msgstr "Skriv ut til fil"
+
+#: lib/configure.py:333 src/frontends/qt4/GuiClipboard.cpp:133
+msgid "Enhanced Metafile"
+msgstr ""
+
+#: lib/configure.py:334
+#, fuzzy
+msgid "MS Word"
+msgstr "Ord"
+
+#: lib/configure.py:334
+#, fuzzy
+msgid "MS Word|W"
+msgstr "Tel ord|o"
+
+#: lib/configure.py:335
+msgid "HTML (MS Word)"
+msgstr ""
+
+#: src/BiblioInfo.cpp:118 src/frontends/qt4/GuiDocument.cpp:1346
 #, c-format
 msgid "%1$s and %2$s"
 msgstr "%1$s og %2$s"
 
-#: src/BiblioInfo.cpp:127
+#: src/BiblioInfo.cpp:122
 #, c-format
 msgid "%1$s et al."
 msgstr "%1$s et al."
 
-#: src/BiblioInfo.cpp:140
+#: src/BiblioInfo.cpp:135
 msgid "No year"
 msgstr "Utan år"
 
-#: src/BiblioInfo.cpp:324 src/BiblioInfo.cpp:385
+#: src/BiblioInfo.cpp:317 src/BiblioInfo.cpp:377
 #, fuzzy
 msgid "Add to bibliography only."
 msgstr "Legg &til innhaldslista"
 
-#: src/BiblioInfo.cpp:381
+#: src/BiblioInfo.cpp:373
 msgid "before"
 msgstr "Tekst før"
 
-#: src/Buffer.cpp:230
+#: src/Buffer.cpp:236
 msgid "Disk Error: "
 msgstr ""
 
-#: src/Buffer.cpp:231
+#: src/Buffer.cpp:237
 #, fuzzy, c-format
 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:278
+#: src/Buffer.cpp:290
 msgid "Could not remove temporary directory"
 msgstr "Klarte ikkje å fjerna den mellombelse katalogen"
 
-#: src/Buffer.cpp:279
+#: 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:510
+#: src/Buffer.cpp:506
 msgid "Unknown document class"
 msgstr "Ukjent dokumentklasse"
 
-#: src/Buffer.cpp:511
+#: 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:515 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:519 src/Buffer.cpp:526 src/Buffer.cpp:546
+#: src/Buffer.cpp:515 src/Buffer.cpp:522 src/Buffer.cpp:542
 msgid "Document header error"
 msgstr "Filhovud-feil"
 
-#: src/Buffer.cpp:525
+#: src/Buffer.cpp:521
 msgid "\\begin_header is missing"
 msgstr "\\begin_header manglar"
 
-#: src/Buffer.cpp:545
+#: src/Buffer.cpp:541
 msgid "\\begin_document is missing"
 msgstr "\\begin_document manglar"
 
-#: src/Buffer.cpp:561 src/Buffer.cpp:567 src/BufferView.cpp:1146
-#: src/BufferView.cpp:1152
+#: 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:562 src/BufferView.cpp:1147
+#: 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"
@@ -13107,7 +14214,7 @@ msgstr ""
 "Ver venleg å instaler desse pakkane eller redefiner \\lyxadded og "
 "\\lyxdeleted i LaTeX fortekst."
 
-#: src/Buffer.cpp:568 src/BufferView.cpp:1153
+#: 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"
@@ -13119,33 +14226,20 @@ msgstr ""
 "Ver venleg å instaler desse pakkane eller redefiner \\lyxadded og "
 "\\lyxdeleted i LaTeX fortekst."
 
-#: src/Buffer.cpp:585
-#, fuzzy
-msgid "Failed to read embedded files"
-msgstr "Kan ikkje lese fila"
-
-#: src/Buffer.cpp:586
-msgid ""
-"Due to most likely a bug, LyX failed to locate all embedded file. If you "
-"unzip the LyX file, you should be able to see and open content.lyx which is "
-"your main text. You may also be able to recover some embedded files. Please "
-"report this bug to the lyx-devel mailing list."
-msgstr ""
-
-#: src/Buffer.cpp:736 src/Buffer.cpp:819
+#: src/Buffer.cpp:705 src/Buffer.cpp:788
 msgid "Document format failure"
 msgstr "Dokumentstil feil"
 
-#: src/Buffer.cpp:737
+#: 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:774
+#: src/Buffer.cpp:743
 msgid "Conversion failed"
 msgstr "Feil oppstod i konverteringa"
 
-#: src/Buffer.cpp:775
+#: src/Buffer.cpp:744
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but a temporary file for converting "
@@ -13154,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:784
+#: src/Buffer.cpp:753
 msgid "Conversion script not found"
 msgstr "Fann ikkje eksport programmet"
 
-#: src/Buffer.cpp:785
+#: src/Buffer.cpp:754
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but the conversion script lyx2lyx "
@@ -13167,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:804
+#: src/Buffer.cpp:773
 msgid "Conversion script failed"
 msgstr "Feil ved køyring av eksport programmet"
 
-#: src/Buffer.cpp:805
+#: src/Buffer.cpp:774
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but the lyx2lyx script failed to "
@@ -13180,16 +14274,16 @@ msgstr ""
 "%1$s vart laga i ein annan LyX versjon. men lyx2lyx-programmet klarte ikkje "
 "å konvertere det."
 
-#: src/Buffer.cpp:820
+#: 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:853
+#: src/Buffer.cpp:822
 msgid "Backup failure"
 msgstr "Kan ikkje laga reservekopi"
 
-#: src/Buffer.cpp:854
+#: src/Buffer.cpp:823
 #, c-format
 msgid ""
 "Cannot create backup file %1$s.\n"
@@ -13198,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:864
+#: src/Buffer.cpp:833
 #, fuzzy, c-format
 msgid ""
 "Document %1$s has been externally modified. Are you sure you want to "
@@ -13208,60 +14302,49 @@ msgstr ""
 "\n"
 "Vil du skriva over dokumentet?"
 
-#: src/Buffer.cpp:866
+#: src/Buffer.cpp:835
 #, fuzzy
 msgid "Overwrite modified file?"
 msgstr "Skriv over dokumentet?"
 
-#: src/Buffer.cpp:867 src/EmbeddedFiles.cpp:171 src/EmbeddedFiles.cpp:233
-#: src/EmbeddedFiles.cpp:292 src/Exporter.cpp:49 src/LyXFunc.cpp:1007
-#: src/frontends/qt4/GuiClipboard.cpp:403 src/frontends/qt4/GuiView.cpp:1365
-#: src/frontends/qt4/GuiView.cpp:1546
+#: 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:898
+#: src/Buffer.cpp:860
 #, c-format
 msgid "Saving document %1$s..."
 msgstr "Lagrar %1$s..."
 
-#: src/Buffer.cpp:911
+#: src/Buffer.cpp:873
 #, fuzzy
 msgid " could not write file!"
 msgstr "Kan ikkje lese fila"
 
-#: src/Buffer.cpp:918
-#, fuzzy
-msgid " writing embedded files."
-msgstr "Kan ikkje lese fila"
-
-#: src/Buffer.cpp:922
-#, fuzzy
-msgid " could not write embedded files!"
-msgstr "Kan ikkje lese fila"
-
-#: src/Buffer.cpp:927
+#: src/Buffer.cpp:880
 msgid " done."
 msgstr "ferdig."
 
-#: src/Buffer.cpp:1006
+#: src/Buffer.cpp:959
 msgid "Iconv software exception Detected"
 msgstr ""
 
-#: src/Buffer.cpp:1006
+#: 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:1028
+#: src/Buffer.cpp:981
 #, c-format
 msgid "Could not find LaTeX command for character '%1$s' (code point %2$s)"
 msgstr ""
 
-#: src/Buffer.cpp:1031
+#: src/Buffer.cpp:984
 msgid ""
 "Some characters of your document are probably not representable in the "
 "chosen encoding.\n"
@@ -13270,87 +14353,87 @@ msgstr ""
 "Nokre av teikna i dokumentet er ikkje i teiknkodinga. \n"
 "Prøv å endre teiknkodinga til utf8."
 
-#: src/Buffer.cpp:1038
+#: src/Buffer.cpp:991
 #, fuzzy
 msgid "iconv conversion failed"
 msgstr "Feil oppstod i konverteringa"
 
-#: src/Buffer.cpp:1043
+#: src/Buffer.cpp:996
 #, fuzzy
 msgid "conversion failed"
 msgstr "Feil oppstod i konverteringa"
 
-#: src/Buffer.cpp:1315
+#: src/Buffer.cpp:1268
 msgid "Running chktex..."
 msgstr "Køyrer ChkTeX ..."
 
-#: src/Buffer.cpp:1328
+#: src/Buffer.cpp:1281
 msgid "chktex failure"
 msgstr "ChkTeX feil"
 
-#: src/Buffer.cpp:1329
+#: src/Buffer.cpp:1282
 msgid "Could not run chktex successfully."
 msgstr "Kunne ikkje køyre ChkTeX."
 
-#: src/Buffer.cpp:2094
+#: src/Buffer.cpp:2112
 msgid "Preview source code"
 msgstr "Førehandsvising av kjeldekode"
 
-#: src/Buffer.cpp:2106
+#: 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:2110
+#: 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:2209
+#: src/Buffer.cpp:2227
 #, c-format
 msgid "Auto-saving %1$s"
 msgstr "Automatisk lagring %1$s"
 
-#: src/Buffer.cpp:2253
+#: src/Buffer.cpp:2271
 msgid "Autosave failed!"
 msgstr "Automatisk lagring feila!"
 
-#: src/Buffer.cpp:2276
+#: src/Buffer.cpp:2294
 msgid "Autosaving current document..."
 msgstr "Automatisk lagring av dette dokumentet..."
 
-#: src/Buffer.cpp:2324
+#: src/Buffer.cpp:2342
 msgid "Couldn't export file"
 msgstr "Kan ikkje eksportere dokumentet"
 
-#: src/Buffer.cpp:2325
+#: 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:2362
+#: src/Buffer.cpp:2380
 msgid "File name error"
 msgstr "Feil på filnamn"
 
-#: src/Buffer.cpp:2363
+#: 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:2404
+#: src/Buffer.cpp:2423
 msgid "Document export cancelled."
 msgstr "Eksport av dokumentet er stoppa."
 
-#: src/Buffer.cpp:2410
+#: 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:2416
+#: src/Buffer.cpp:2435
 #, c-format
 msgid "Document exported as %1$s"
 msgstr "Dokumentet eksportert som %1$s"
 
-#: src/Buffer.cpp:2486
+#: src/Buffer.cpp:2505
 #, c-format
 msgid ""
 "The specified document\n"
@@ -13361,11 +14444,11 @@ msgstr ""
 "%1$s\n"
 "kunne ikkje bli lest."
 
-#: src/Buffer.cpp:2488
+#: src/Buffer.cpp:2507
 msgid "Could not read document"
 msgstr "Kunne ikkje lese dokumentet"
 
-#: src/Buffer.cpp:2498
+#: src/Buffer.cpp:2517
 #, c-format
 msgid ""
 "An emergency save of the document %1$s exists.\n"
@@ -13376,19 +14459,19 @@ msgstr ""
 "\n"
 "Gå tilbake til nødkopien?"
 
-#: src/Buffer.cpp:2501
+#: src/Buffer.cpp:2520
 msgid "Load emergency save?"
 msgstr "Last nødkopien av dokumentet?"
 
-#: src/Buffer.cpp:2502
+#: src/Buffer.cpp:2521
 msgid "&Recover"
 msgstr "&Gå tilbake"
 
-#: src/Buffer.cpp:2502
+#: src/Buffer.cpp:2521
 msgid "&Load Original"
 msgstr "&Last Original"
 
-#: src/Buffer.cpp:2522
+#: src/Buffer.cpp:2541
 #, c-format
 msgid ""
 "The backup of the document %1$s is newer.\n"
@@ -13399,28 +14482,28 @@ msgstr ""
 "\n"
 "Skal vi opna det istaden?"
 
-#: src/Buffer.cpp:2525
+#: src/Buffer.cpp:2544
 msgid "Load backup?"
 msgstr "Gå tilbake til reservekopi?"
 
-#: src/Buffer.cpp:2526
+#: src/Buffer.cpp:2545
 msgid "&Load backup"
 msgstr "Gå tilbake til &reservekopi"
 
-#: src/Buffer.cpp:2526
+#: src/Buffer.cpp:2545
 msgid "Load &original"
 msgstr "Last &original"
 
-#: src/Buffer.cpp:2559
+#: 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:2561
+#: src/Buffer.cpp:2580
 msgid "Retrieve from version control?"
 msgstr "Vil du laste inn frå versjonkontroll?"
 
-#: src/Buffer.cpp:2562
+#: src/Buffer.cpp:2581
 msgid "&Retrieve"
 msgstr "&Hent inn"
 
@@ -13448,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:497
+#: src/BufferParams.cpp:475
 #, c-format
 msgid ""
 "The layout file requested by this document,\n"
@@ -13465,28 +14548,28 @@ msgstr ""
 "ikkje er tilgjengeleg. Sjå i Tilpassing under\n"
 "hjelp menyen for meir informasjon.\n"
 
-#: src/BufferParams.cpp:503
+#: src/BufferParams.cpp:481
 msgid "Document class not available"
 msgstr "Dokumentklassa er ikkje tilgjengeleg"
 
-#: src/BufferParams.cpp:504
+#: src/BufferParams.cpp:482
 msgid "LyX will not be able to produce output."
 msgstr "LyX kan ikkje lage eit korrekt resultat."
 
-#: src/BufferParams.cpp:1451
-#, 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:1453
+#: 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:1463 src/LyXFunc.cpp:724
+#: src/BufferParams.cpp:1447 src/LyXFunc.cpp:697
 #, fuzzy, c-format
 msgid "The document class %1$s could not be loaded."
 msgstr ""
@@ -13494,12 +14577,12 @@ msgstr ""
 "%1$s\n"
 "kunne ikkje bli lest."
 
-#: src/BufferParams.cpp:1465 src/LyXFunc.cpp:726
+#: src/BufferParams.cpp:1449 src/LyXFunc.cpp:699
 #, fuzzy
 msgid "Could not load class"
 msgstr "Kan ikkje endra klassa"
 
-#: src/BufferParams.cpp:1501
+#: src/BufferParams.cpp:1535
 #, c-format
 msgid ""
 "The module %1$s has been requested by\n"
@@ -13508,17 +14591,17 @@ msgid ""
 "probably need to reconfigure LyX.\n"
 msgstr ""
 
-#: src/BufferParams.cpp:1505
+#: src/BufferParams.cpp:1539
 #, fuzzy
 msgid "Module not available"
 msgstr "Dokumentklassa er ikkje tilgjengeleg"
 
-#: src/BufferParams.cpp:1506
+#: src/BufferParams.cpp:1540
 #, fuzzy
 msgid "Some layouts may not be available."
 msgstr "Dokumentklassa er ikkje tilgjengeleg"
 
-#: src/BufferParams.cpp:1514
+#: src/BufferParams.cpp:1547
 #, c-format
 msgid ""
 "The module %1$s requires a package that is\n"
@@ -13526,120 +14609,121 @@ msgid ""
 "may not be possible.\n"
 msgstr ""
 
-#: src/BufferParams.cpp:1517
+#: src/BufferParams.cpp:1550
 #, fuzzy
 msgid "Package not available"
 msgstr "Dokumentklassa er ikkje tilgjengeleg"
 
-#: src/BufferParams.cpp:1522
+#: src/BufferParams.cpp:1555
 #, c-format
 msgid "Error reading module %1$s\n"
 msgstr ""
 
-#: src/BufferParams.cpp:1523 src/BufferParams.cpp:1529
+#: src/BufferParams.cpp:1556 src/BufferParams.cpp:1562
 #, fuzzy
 msgid "Read Error"
 msgstr "Søk feil"
 
-#: src/BufferParams.cpp:1528
+#: 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:1032
+#: src/BufferView.cpp:1024
 msgid "No further undo information"
 msgstr "Ikkje meir \"Angre\" informasjon"
 
-#: src/BufferView.cpp:1041
+#: src/BufferView.cpp:1033
 msgid "No further redo information"
 msgstr "Ikkje meir \"Gjer om\" informasjon"
 
-#: src/BufferView.cpp:1196 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:1220
+#: src/BufferView.cpp:1218
 msgid "Mark off"
 msgstr "Merke slått av"
 
-#: src/BufferView.cpp:1227
+#: src/BufferView.cpp:1225
 msgid "Mark on"
 msgstr "Merke på"
 
-#: src/BufferView.cpp:1234
+#: src/BufferView.cpp:1232
 msgid "Mark removed"
 msgstr "Fjerna merke"
 
-#: src/BufferView.cpp:1237
+#: src/BufferView.cpp:1235
 msgid "Mark set"
 msgstr "Merke sett"
 
-#: src/BufferView.cpp:1284
+#: src/BufferView.cpp:1282
+#, fuzzy
 msgid "Statistics for the selection:"
-msgstr ""
+msgstr "&Byt til dokument"
 
-#: src/BufferView.cpp:1286
+#: src/BufferView.cpp:1284
 #, fuzzy
 msgid "Statistics for the document:"
 msgstr "&Byt til dokument"
 
-#: src/BufferView.cpp:1289
+#: src/BufferView.cpp:1287
 #, fuzzy, c-format
 msgid "%1$d words"
 msgstr "%1$d ord sjekka."
 
-#: src/BufferView.cpp:1291
+#: src/BufferView.cpp:1289
 #, fuzzy
 msgid "One word"
 msgstr "Nøkkelord"
 
-#: src/BufferView.cpp:1294
+#: src/BufferView.cpp:1292
 #, c-format
 msgid "%1$d characters (including blanks)"
 msgstr ""
 
-#: src/BufferView.cpp:1297
+#: src/BufferView.cpp:1295
 msgid "One character (including blanks)"
 msgstr ""
 
-#: src/BufferView.cpp:1300
+#: src/BufferView.cpp:1298
 #, c-format
 msgid "%1$d characters (excluding blanks)"
 msgstr ""
 
-#: src/BufferView.cpp:1303
+#: src/BufferView.cpp:1301
 msgid "One character (excluding blanks)"
 msgstr ""
 
-#: src/BufferView.cpp:1305
+#: src/BufferView.cpp:1303
 #, fuzzy
 msgid "Statistics"
 msgstr "Status"
 
-#: src/BufferView.cpp:1987
+#: src/BufferView.cpp:2039
 #, c-format
 msgid "Inserting document %1$s..."
 msgstr "Set inn dokument %1$s..."
 
-#: src/BufferView.cpp:1998
+#: src/BufferView.cpp:2050
 #, c-format
 msgid "Document %1$s inserted."
 msgstr "Dokument %1$s er sett inn."
 
-#: src/BufferView.cpp:2000
+#: src/BufferView.cpp:2052
 #, c-format
 msgid "Could not insert document %1$s"
 msgstr "Kunne ikkje sette inn dokumentet %1$s"
 
-#: src/BufferView.cpp:2226
+#: src/BufferView.cpp:2280
 #, c-format
 msgid ""
 "Could not read the specified document\n"
@@ -13650,26 +14734,26 @@ msgstr ""
 "%1$s\n"
 "på grunn av feilen: %2$s"
 
-#: src/BufferView.cpp:2228
+#: src/BufferView.cpp:2282
 msgid "Could not read file"
 msgstr "Kan ikkje lese fila"
 
-#: src/BufferView.cpp:2235
+#: src/BufferView.cpp:2289
 #, fuzzy, c-format
 msgid ""
 "%1$s\n"
 " is not readable."
 msgstr "Kunne ikkje lese %1$s."
 
-#: src/BufferView.cpp:2236 src/output.cpp:39
+#: src/BufferView.cpp:2290 src/output.cpp:39
 msgid "Could not open file"
 msgstr "Kan ikkje opnafila"
 
-#: src/BufferView.cpp:2243
+#: src/BufferView.cpp:2297
 msgid "Reading not UTF-8 encoded file"
 msgstr "Les fil som ikkje er koda i UTF-8"
 
-#: src/BufferView.cpp:2244
+#: src/BufferView.cpp:2298
 msgid ""
 "The file is not UTF-8 encoded.\n"
 "It will be read as local 8Bit-encoded.\n"
@@ -13691,323 +14775,325 @@ msgstr "ChkTeX 
 msgid "ChkTeX warning id # "
 msgstr "ChkTeX åtvaring id #"
 
-#: src/Color.cpp:92
+#: src/Color.cpp:95 src/insets/InsetBibtex.cpp:173
+#: src/insets/InsetBibtex.cpp:198
 msgid "none"
 msgstr "ingen"
 
-#: src/Color.cpp:93
+#: src/Color.cpp:96
 msgid "black"
 msgstr "svart"
 
-#: src/Color.cpp:94
+#: src/Color.cpp:97
 msgid "white"
 msgstr "kvit"
 
-#: src/Color.cpp:95
+#: src/Color.cpp:98
 msgid "red"
 msgstr "raud"
 
-#: src/Color.cpp:96
+#: src/Color.cpp:99
 msgid "green"
 msgstr "grøn"
 
-#: src/Color.cpp:97
+#: src/Color.cpp:100
 msgid "blue"
 msgstr "blå"
 
-#: src/Color.cpp:98
+#: src/Color.cpp:101
 msgid "cyan"
 msgstr "cyanblå"
 
-#: src/Color.cpp:99
+#: src/Color.cpp:102
 msgid "magenta"
 msgstr "magentaraud"
 
-#: src/Color.cpp:100
+#: src/Color.cpp:103
 msgid "yellow"
 msgstr "gul"
 
-#: src/Color.cpp:101
+#: src/Color.cpp:104
 msgid "cursor"
 msgstr "skrivemerke"
 
-#: src/Color.cpp:102
+#: src/Color.cpp:105
 msgid "background"
 msgstr "bakgrunn"
 
-#: src/Color.cpp:103
+#: src/Color.cpp:106
 msgid "text"
 msgstr "tekst"
 
-#: src/Color.cpp:104
+#: src/Color.cpp:107
 msgid "selection"
 msgstr "utvalet"
 
-#: src/Color.cpp:105
+#: src/Color.cpp:108
 #, fuzzy
 msgid "selected text"
 msgstr "Sletta tekst"
 
-#: src/Color.cpp:107
+#: src/Color.cpp:110
 msgid "LaTeX text"
 msgstr "LaTeX tekst"
 
-#: src/Color.cpp:108
+#: src/Color.cpp:111
 #, fuzzy
 msgid "inline completion"
 msgstr "&Kodelister i teksten"
 
-#: src/Color.cpp:110
+#: src/Color.cpp:113
+#, fuzzy
 msgid "non-unique inline completion"
-msgstr ""
+msgstr "&Kodelister i teksten"
 
-#: src/Color.cpp:112
+#: src/Color.cpp:115
 msgid "previewed snippet"
 msgstr "Førehandvist bit"
 
-#: src/Color.cpp:113
+#: src/Color.cpp:116
 #, fuzzy
 msgid "note label"
 msgstr "botntekst"
 
-#: src/Color.cpp:114
+#: src/Color.cpp:117
 msgid "note background"
 msgstr "notat bakgrunn"
 
-#: src/Color.cpp:115
+#: src/Color.cpp:118
 #, fuzzy
 msgid "comment label"
 msgstr "kommentar"
 
-#: src/Color.cpp:116
+#: src/Color.cpp:119
 msgid "comment background"
 msgstr "bakgrunnen til kommandoar"
 
-#: src/Color.cpp:117
+#: src/Color.cpp:120
 #, fuzzy
 msgid "greyedout inset label"
 msgstr "gråfarga innskot"
 
-#: src/Color.cpp:118
+#: src/Color.cpp:121
 msgid "greyedout inset background"
 msgstr "Bakgrunnen til gråfarga innskot"
 
-#: src/Color.cpp:119
+#: src/Color.cpp:122
 msgid "shaded box"
 msgstr "Skuggelagd ramme"
 
-#: src/Color.cpp:120
+#: src/Color.cpp:123
 #, fuzzy
 msgid "branch label"
 msgstr "Grein"
 
-#: src/Color.cpp:121
+#: src/Color.cpp:124
 #, fuzzy
 msgid "footnote label"
 msgstr "botntekst"
 
-#: src/Color.cpp:122
+#: src/Color.cpp:125
 #, fuzzy
 msgid "index label"
 msgstr "Set inn ein etikett"
 
-#: src/Color.cpp:123
+#: src/Color.cpp:126
 #, fuzzy
 msgid "margin note label"
 msgstr "Hopp til etikett"
 
-#: src/Color.cpp:124
+#: src/Color.cpp:127
 #, fuzzy
 msgid "URL label"
 msgstr "Etikett"
 
-#: src/Color.cpp:125
+#: src/Color.cpp:128
 #, fuzzy
 msgid "URL text"
 msgstr "tekst"
 
-#: src/Color.cpp:126
+#: src/Color.cpp:129
 msgid "depth bar"
 msgstr "djupnmerke"
 
-#: src/Color.cpp:127
+#: src/Color.cpp:130
 msgid "language"
 msgstr "språk"
 
-#: src/Color.cpp:128
+#: src/Color.cpp:131
 msgid "command inset"
 msgstr "kommando innskot"
 
-#: src/Color.cpp:129
+#: src/Color.cpp:132
 msgid "command inset background"
 msgstr "bakgrunnen til kommando innskot"
 
-#: src/Color.cpp:130
+#: src/Color.cpp:133
 msgid "command inset frame"
 msgstr "ramma til kommandoinnskot"
 
-#: src/Color.cpp:131
+#: src/Color.cpp:134
 msgid "special character"
 msgstr "spesial teikn"
 
-#: src/Color.cpp:132
+#: src/Color.cpp:135
 msgid "math"
 msgstr "matte"
 
-#: src/Color.cpp:133
+#: src/Color.cpp:136
 msgid "math background"
 msgstr "matte bakgrunn"
 
-#: src/Color.cpp:134
+#: src/Color.cpp:137
 msgid "graphics background"
 msgstr "grafikk -bakgrunn"
 
-#: src/Color.cpp:135 src/Color.cpp:139
+#: src/Color.cpp:138 src/Color.cpp:142
 msgid "Math macro background"
 msgstr "Bakgrunn for matte makroar"
 
-#: src/Color.cpp:136
+#: src/Color.cpp:139
 msgid "math frame"
 msgstr "matte ramme"
 
-#: src/Color.cpp:137
+#: src/Color.cpp:140
 msgid "math corners"
 msgstr "matte hjørne"
 
-#: src/Color.cpp:138
+#: src/Color.cpp:141
 msgid "math line"
 msgstr "matte linje"
 
-#: src/Color.cpp:140
+#: src/Color.cpp:143
 #, fuzzy
 msgid "Math macro hovered background"
 msgstr "Bakgrunn for matte makroar"
 
-#: src/Color.cpp:141
+#: src/Color.cpp:144
 #, fuzzy
 msgid "Math macro label"
 msgstr "mattemakro"
 
-#: src/Color.cpp:142
+#: src/Color.cpp:145
 #, fuzzy
 msgid "Math macro frame"
 msgstr "matte ramme"
 
-#: src/Color.cpp:143
+#: src/Color.cpp:146
 #, fuzzy
 msgid "Math macro blended out"
 msgstr "Bakgrunn for matte makroar"
 
-#: src/Color.cpp:144
+#: src/Color.cpp:147
 #, fuzzy
 msgid "Math macro old parameter"
 msgstr "matte ramme"
 
-#: src/Color.cpp:145
+#: src/Color.cpp:148
 #, fuzzy
 msgid "Math macro new parameter"
 msgstr "matte ramme"
 
-#: src/Color.cpp:146
+#: src/Color.cpp:149
 msgid "caption frame"
 msgstr "figur/tabell tekstramme"
 
-#: src/Color.cpp:147
+#: src/Color.cpp:150
 msgid "collapsable inset text"
 msgstr "Teksten til samanleggbar innskot"
 
-#: src/Color.cpp:148
+#: src/Color.cpp:151
 msgid "collapsable inset frame"
 msgstr "Ramma til samanleggbar innskot"
 
-#: src/Color.cpp:149
+#: src/Color.cpp:152
 msgid "inset background"
 msgstr "Innskot bakgrunn"
 
-#: src/Color.cpp:150
+#: src/Color.cpp:153
 msgid "inset frame"
 msgstr "innskot ramme"
 
-#: src/Color.cpp:151
+#: src/Color.cpp:154
 msgid "LaTeX error"
 msgstr "LaTeX-feil"
 
-#: src/Color.cpp:152
+#: src/Color.cpp:155
 msgid "end-of-line marker"
 msgstr "linjesluttmerke"
 
-#: src/Color.cpp:153
+#: src/Color.cpp:156
 msgid "appendix marker"
 msgstr "Vedegg merke"
 
-#: src/Color.cpp:154
+#: src/Color.cpp:157
 msgid "change bar"
 msgstr "Linje for endring"
 
-#: src/Color.cpp:155
+#: src/Color.cpp:158
 msgid "Deleted text"
 msgstr "Sletta tekst"
 
-#: src/Color.cpp:156
+#: src/Color.cpp:159
 msgid "Added text"
 msgstr "Lagt til tekst"
 
-#: src/Color.cpp:157
+#: src/Color.cpp:160
 msgid "added space markers"
 msgstr "la til mellomrom markør"
 
-#: src/Color.cpp:158
+#: src/Color.cpp:161
 msgid "top/bottom line"
 msgstr "Topp-/botn linje"
 
-#: src/Color.cpp:159
+#: src/Color.cpp:162
 msgid "table line"
 msgstr "tabell-linje"
 
-#: src/Color.cpp:160
+#: src/Color.cpp:163
 msgid "table on/off line"
 msgstr "Tabell linja av/på"
 
-#: src/Color.cpp:162
+#: src/Color.cpp:165
 msgid "bottom area"
 msgstr "botnområde"
 
-#: src/Color.cpp:163
+#: src/Color.cpp:166
 #, fuzzy
 msgid "new page"
 msgstr "på side <side>"
 
-#: src/Color.cpp:164
+#: src/Color.cpp:167
 #, fuzzy
 msgid "page break / line break"
 msgstr "sideskift"
 
-#: src/Color.cpp:165
+#: src/Color.cpp:168
 msgid "frame of button"
 msgstr "ramma til knappen"
 
-#: src/Color.cpp:166
+#: src/Color.cpp:169
 msgid "button background"
 msgstr "bakgrunn på knappen"
 
-#: src/Color.cpp:167
+#: src/Color.cpp:170
 msgid "button background under focus"
 msgstr "bakgrunn på knappen med fokus"
 
-#: src/Color.cpp:168
+#: src/Color.cpp:171
 msgid "inherit"
 msgstr "arv"
 
-#: src/Color.cpp:169
+#: src/Color.cpp:172
 msgid "ignore"
 msgstr "ignorer"
 
-#: src/Converter.cpp:306 src/Converter.cpp:449 src/Converter.cpp:472
-#: src/Converter.cpp:515
+#: src/Converter.cpp:305 src/Converter.cpp:448 src/Converter.cpp:471
+#: src/Converter.cpp:514
 msgid "Cannot convert file"
 msgstr "Kan ikkje konvertere fila"
 
-#: src/Converter.cpp:307
+#: src/Converter.cpp:306
 #, c-format
 msgid ""
 "No information for converting %1$s format files to %2$s.\n"
@@ -14016,43 +15102,43 @@ msgstr ""
 "Ingen informasjon om korleis ein konverterer %1$s formatet til %2$s.\n"
 "Prøv å sett det opp sjølv i LyX-Val."
 
-#: src/Converter.cpp:404 src/Format.cpp:305 src/Format.cpp:377
+#: src/Converter.cpp:403 src/Format.cpp:305 src/Format.cpp:377
 msgid "Executing command: "
 msgstr "Køyrer kommando: "
 
-#: src/Converter.cpp:444
+#: src/Converter.cpp:443
 msgid "Build errors"
 msgstr "Byggjefeil"
 
-#: src/Converter.cpp:445
+#: src/Converter.cpp:444
 msgid "There were errors during the build process."
 msgstr "Det vart rapportert feil under bygginga."
 
-#: src/Converter.cpp:450 src/Format.cpp:312 src/Format.cpp:384
+#: src/Converter.cpp:449 src/Format.cpp:312 src/Format.cpp:384
 #, c-format
 msgid "An error occurred whilst running %1$s"
 msgstr "Vi fekk ein feil når vi køyrde %1$s"
 
-#: src/Converter.cpp:473
+#: src/Converter.cpp:472
 #, c-format
 msgid "Could not move a temporary directory from %1$s to %2$s."
 msgstr "Kunne ikkje flytte ei mellombels katalog frå %1$s til %2$s."
 
-#: src/Converter.cpp:517
+#: src/Converter.cpp:516
 #, c-format
 msgid "Could not copy a temporary file from %1$s to %2$s."
 msgstr "Kunne ikkje flytte ei mellombels fil frå %1$s til %2$s."
 
-#: src/Converter.cpp:518
+#: src/Converter.cpp:517
 #, c-format
 msgid "Could not move a temporary file from %1$s to %2$s."
 msgstr "Kunne ikkje flytte ei mellombels fil frå %1$s til %2$s."
 
-#: src/Converter.cpp:574
+#: src/Converter.cpp:573
 msgid "Running LaTeX..."
 msgstr "Køyrer LaTeX..."
 
-#: src/Converter.cpp:592
+#: src/Converter.cpp:591
 #, c-format
 msgid ""
 "LaTeX did not run successfully. Additionally, LyX could not locate the LaTeX "
@@ -14061,36 +15147,19 @@ msgstr ""
 "Køyringa av LaTeX gjekk gale. Og i tillegg klarar ikkje LyX å finne LaTeX "
 "loggen %1$s."
 
-#: src/Converter.cpp:595
+#: src/Converter.cpp:594
 msgid "LaTeX failed"
 msgstr "Feil ved LaTeX køyring"
 
-#: src/Converter.cpp:597
+#: src/Converter.cpp:596
 msgid "Output is empty"
 msgstr "Ingenting kom ut av konverteringa"
 
-#: src/Converter.cpp:598
+#: src/Converter.cpp:597
 msgid "An empty output file was generated."
 msgstr "Det vart berre laga ei tom fil."
 
-#: src/CutAndPaste.cpp:503
-#, 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:508
-msgid "Changed Layout"
-msgstr "Endra avsnittstil"
-
-#: src/CutAndPaste.cpp:528
+#: src/CutAndPaste.cpp:541
 #, fuzzy, c-format
 msgid ""
 "Flex inset %1$s is undefined because of class conversion from\n"
@@ -14099,249 +15168,89 @@ msgstr ""
 "Teiknstil %1$s er ikkje definert fordi klassa vart konvertert frå\n"
 "%2$s til %3$s"
 
-#: src/CutAndPaste.cpp:535
+#: src/CutAndPaste.cpp:548
 #, fuzzy
 msgid "Undefined flex inset"
 msgstr "Opna tekst innskot"
 
-#: src/EmbeddedFiles.cpp:156
-#, fuzzy
-msgid "Failed to extract file"
-msgstr "Vel ekstern fil"
-
-#: src/EmbeddedFiles.cpp:157
-#, c-format
-msgid ""
-"Cannot extract file '%1$s'.\n"
-"Source file %2$s does not exist"
-msgstr ""
-
-#: src/EmbeddedFiles.cpp:169 src/frontends/qt4/GuiClipboard.cpp:401
-#, fuzzy
-msgid "Overwrite external file?"
-msgstr "Skriv over dokumentet?"
-
-#: src/EmbeddedFiles.cpp:170
+#: src/Exporter.cpp:44 src/LyXFunc.cpp:976
 #, fuzzy, c-format
-msgid "External file %1$s already exists, do you want to overwrite it?"
+msgid ""
+"The file %1$s already exists.\n"
+"\n"
+"Do you want to overwrite that file?"
 msgstr ""
 "Dokumentet %1$s finst frå før.\n"
 "\n"
 "Vil du skrive over dette dokumentet?"
 
-#: src/EmbeddedFiles.cpp:182 src/EmbeddedFiles.cpp:194
-#: src/EmbeddedFiles.cpp:247 src/EmbeddedFiles.cpp:306
+#: src/Exporter.cpp:47 src/LyXFunc.cpp:979
 #, fuzzy
-msgid "Copy file failure"
-msgstr "Kan ikkje vise fila"
-
-#: src/EmbeddedFiles.cpp:183 src/EmbeddedFiles.cpp:417
-#, fuzzy, c-format
-msgid ""
-"Cannot create file path '%1$s'.\n"
-"Please check whether the path is writeable."
-msgstr ""
-"LyX klarte ikkje å lage reservekopi %1$s.\n"
-"Er du sikker at stigen eksiterar og du kan skrive til den?"
-
-#: src/EmbeddedFiles.cpp:195 src/EmbeddedFiles.cpp:248
-#: src/EmbeddedFiles.cpp:307 src/EmbeddedFiles.cpp:430
-#, fuzzy, c-format
-msgid ""
-"Cannot copy file %1$s to %2$s.\n"
-"Please check whether the directory exists and is writeable."
-msgstr ""
-"LyX klarte ikkje å lage reservekopi %1$s.\n"
-"Er du sikker at stigen eksiterar og du kan skrive til den?"
+msgid "Overwrite file?"
+msgstr "Skriv over dokumentet?"
 
-#: src/EmbeddedFiles.cpp:218
+#: src/Exporter.cpp:49
 #, fuzzy
-msgid "Failed to embed file"
-msgstr "Kan ikkje lese fila"
+msgid "Overwrite &all"
+msgstr "Skrivover &alt"
 
-#: src/EmbeddedFiles.cpp:219
-#, fuzzy, c-format
-msgid ""
-"Failed to embed file %1$s.\n"
-"Please check whether this file exists and is readable."
-msgstr ""
-"LyX klarte ikkje å lage reservekopi %1$s.\n"
-"Er du sikker at stigen eksiterar og du kan skrive til den?"
+#: src/Exporter.cpp:50
+msgid "&Cancel export"
+msgstr "&Avbryt eksport"
 
-#: src/EmbeddedFiles.cpp:231 src/EmbeddedFiles.cpp:290
-msgid "Update embedded file?"
-msgstr ""
+#: src/Exporter.cpp:90
+msgid "Couldn't copy file"
+msgstr "Kan ikkje lage kopi av dokumentet"
 
-#: src/EmbeddedFiles.cpp:232 src/EmbeddedFiles.cpp:291
-#, fuzzy, c-format
-msgid "Embedded file %1$s already exists, do you want to overwrite it"
-msgstr ""
-"Dokumentet %1$s finst frå før.\n"
-"\n"
-"Vil du skrive over dette dokumentet?"
+#: src/Exporter.cpp:91
+#, c-format
+msgid "Copying %1$s to %2$s failed."
+msgstr "Kan ikkje kopiere %1$s til %2$s."
 
-#: src/EmbeddedFiles.cpp:275
-#, fuzzy
-msgid "Failed to copy embedded file"
-msgstr "Kan ikkje lese fila"
+#: src/Font.cpp:49 src/frontends/qt4/GuiCharacter.cpp:118
+#: src/frontends/qt4/GuiDocument.cpp:2193
+#: src/frontends/qt4/GuiListings.cpp:158
+msgid "Roman"
+msgstr "Romansk"
 
-#: src/EmbeddedFiles.cpp:276
-#, fuzzy, c-format
-msgid ""
-"Failed to embed file %1$s.\n"
-"Please check whether the source file is available"
-msgstr ""
-"LyX klarte ikkje å lage reservekopi %1$s.\n"
-"Er du sikker at stigen eksiterar og du kan skrive til den?"
+#: src/Font.cpp:49 src/frontends/qt4/GuiCharacter.cpp:119
+#: src/frontends/qt4/GuiDocument.cpp:2193
+#: src/frontends/qt4/GuiListings.cpp:158
+msgid "Sans Serif"
+msgstr "Sans Serif"
 
-#: src/EmbeddedFiles.cpp:399 src/EmbeddedFiles.cpp:575
-#, fuzzy
-msgid "Failed to open file"
-msgstr "Kan ikkje lese fila"
+#: src/Font.cpp:49 src/frontends/qt4/GuiCharacter.cpp:120
+#: src/frontends/qt4/GuiDocument.cpp:2193
+#: src/frontends/qt4/GuiListings.cpp:158
+msgid "Typewriter"
+msgstr "Typewriter"
 
-#: src/EmbeddedFiles.cpp:400 src/EmbeddedFiles.cpp:576
-#: src/EmbeddedFiles.cpp:621
-#, c-format
-msgid ""
-"Embedded file %1$s does not exist. Did you tamper lyx temporary directory?"
-msgstr ""
+#: src/Font.cpp:49
+msgid "Symbol"
+msgstr "Symbol"
 
-#: src/EmbeddedFiles.cpp:416 src/EmbeddedFiles.cpp:429
-#, fuzzy
-msgid "Sync file failure"
-msgstr "ChkTeX feil"
+#: src/Font.cpp:51 src/Font.cpp:54 src/Font.cpp:57 src/Font.cpp:63
+#: src/Font.cpp:66
+msgid "Inherit"
+msgstr "Arv"
 
-#: src/EmbeddedFiles.cpp:479
-#, c-format
-msgid ""
-"%1$d external files are ignored.\n"
-"%2$d embeddable files are embedded.\n"
-msgstr ""
-
-#: src/EmbeddedFiles.cpp:481
-#, fuzzy
-msgid "Packing all files"
-msgstr "Skriv ut alle sider"
-
-#: src/EmbeddedFiles.cpp:483
-#, c-format
-msgid ""
-"%1$d external files are ignored.\n"
-"%2$d embedded files are extracted.\n"
-msgstr ""
-
-#: src/EmbeddedFiles.cpp:485
-msgid "Unpacking all files"
-msgstr ""
-
-#: src/EmbeddedFiles.cpp:499
-msgid "Wrong embedding status."
-msgstr ""
-
-#: src/EmbeddedFiles.cpp:500
-#, c-format
-msgid ""
-"File %1$s is included in more than one insets, but with different embedding "
-"status. Assuming embedding status."
-msgstr ""
-
-#: src/EmbeddedFiles.cpp:620
-#, fuzzy
-msgid "Failed to write file"
-msgstr "Skriv over dokumentet?"
-
-#: src/EmbeddedFiles.cpp:637
-#, fuzzy
-msgid "Save failure"
-msgstr "Kan ikkje laga reservekopi"
-
-#: src/EmbeddedFiles.cpp:638
-#, fuzzy, c-format
-msgid ""
-"Cannot create file %1$s.\n"
-"Please check whether the directory exists and is writeable."
-msgstr ""
-"LyX klarte ikkje å lage reservekopi %1$s.\n"
-"Er du sikker at stigen eksiterar og du kan skrive til den?"
-
-#: src/Exporter.cpp:44 src/LyXFunc.cpp:1003
-#, fuzzy, c-format
-msgid ""
-"The file %1$s already exists.\n"
-"\n"
-"Do you want to overwrite that file?"
-msgstr ""
-"Dokumentet %1$s finst frå før.\n"
-"\n"
-"Vil du skrive over dette dokumentet?"
-
-#: src/Exporter.cpp:47 src/LyXFunc.cpp:1006
-#, fuzzy
-msgid "Overwrite file?"
-msgstr "Skriv over dokumentet?"
-
-#: src/Exporter.cpp:49
-#, fuzzy
-msgid "Overwrite &all"
-msgstr "Skrivover &alt"
-
-#: src/Exporter.cpp:50
-msgid "&Cancel export"
-msgstr "&Avbryt eksport"
-
-#: src/Exporter.cpp:90
-msgid "Couldn't copy file"
-msgstr "Kan ikkje lage kopi av dokumentet"
-
-#: src/Exporter.cpp:91
-#, c-format
-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:109
-#: src/frontends/qt4/GuiDocument.cpp:2190
-#: src/frontends/qt4/GuiListings.cpp:158
-msgid "Roman"
-msgstr "Romansk"
-
-#: src/Font.cpp:49 src/frontends/qt4/GuiCharacter.cpp:110
-#: src/frontends/qt4/GuiDocument.cpp:2190
-#: src/frontends/qt4/GuiListings.cpp:158
-msgid "Sans Serif"
-msgstr "Sans Serif"
-
-#: src/Font.cpp:49 src/frontends/qt4/GuiCharacter.cpp:111
-#: src/frontends/qt4/GuiDocument.cpp:2190
-#: src/frontends/qt4/GuiListings.cpp:158
-msgid "Typewriter"
-msgstr "Typewriter"
-
-#: src/Font.cpp:49
-msgid "Symbol"
-msgstr "Symbol"
-
-#: src/Font.cpp:51 src/Font.cpp:54 src/Font.cpp:57 src/Font.cpp:63
-#: src/Font.cpp:66
-msgid "Inherit"
-msgstr "Arv"
-
-#: src/Font.cpp:54 src/frontends/qt4/GuiCharacter.cpp:98
+#: src/Font.cpp:54 src/frontends/qt4/GuiCharacter.cpp:107
 msgid "Medium"
 msgstr "Middels"
 
-#: src/Font.cpp:54 src/frontends/qt4/GuiCharacter.cpp:99
+#: src/Font.cpp:54 src/frontends/qt4/GuiCharacter.cpp:108
 msgid "Bold"
 msgstr "Feit"
 
-#: src/Font.cpp:57 src/frontends/qt4/GuiCharacter.cpp:34
+#: src/Font.cpp:57 src/frontends/qt4/GuiCharacter.cpp:43
 msgid "Upright"
 msgstr "Ståande"
 
-#: src/Font.cpp:57 src/frontends/qt4/GuiCharacter.cpp:35
+#: src/Font.cpp:57 src/frontends/qt4/GuiCharacter.cpp:44
 msgid "Italic"
 msgstr "Kursiv"
 
-#: src/Font.cpp:57 src/frontends/qt4/GuiCharacter.cpp:36
+#: src/Font.cpp:57 src/frontends/qt4/GuiCharacter.cpp:45
 msgid "Slanted"
 msgstr "Skråstilt"
 
@@ -14349,11 +15258,11 @@ msgstr "Skr
 msgid "Smallcaps"
 msgstr "Kapiteler"
 
-#: src/Font.cpp:62 src/frontends/qt4/GuiCharacter.cpp:57
+#: src/Font.cpp:62 src/frontends/qt4/GuiCharacter.cpp:66
 msgid "Increase"
 msgstr "Auk"
 
-#: src/Font.cpp:62 src/frontends/qt4/GuiCharacter.cpp:58
+#: src/Font.cpp:62 src/frontends/qt4/GuiCharacter.cpp:67
 msgid "Decrease"
 msgstr "Minsk"
 
@@ -14361,27 +15270,27 @@ msgstr "Minsk"
 msgid "Toggle"
 msgstr "Av/på"
 
-#: src/Font.cpp:171
+#: src/Font.cpp:173
 #, c-format
 msgid "Emphasis %1$s, "
 msgstr "Utheva %1$s, "
 
-#: src/Font.cpp:174
+#: src/Font.cpp:176
 #, c-format
 msgid "Underline %1$s, "
 msgstr "Strek under %1$s,"
 
-#: src/Font.cpp:177
+#: src/Font.cpp:179
 #, c-format
 msgid "Noun %1$s, "
 msgstr "Storbokstavar %1$s, "
 
-#: src/Font.cpp:191
+#: src/Font.cpp:193
 #, c-format
 msgid "Language: %1$s, "
 msgstr "Språk: %1$s,"
 
-#: src/Font.cpp:194
+#: src/Font.cpp:196
 #, c-format
 msgid "  Number %1$s"
 msgstr "   Nummerering %1$s"
@@ -14499,11 +15408,11 @@ msgstr "BibTeX k
 msgid "Running MakeIndex for nomencl."
 msgstr "Køyrer MakeIndex for nomenklatur."
 
-#: src/LyX.cpp:100
+#: src/LyX.cpp:101
 msgid "Could not read configuration file"
 msgstr "Kan ikkje lese fila med innstillingar"
 
-#: src/LyX.cpp:101
+#: src/LyX.cpp:102 src/frontends/qt4/GuiApplication.cpp:1402
 #, c-format
 msgid ""
 "Error while reading the configuration file\n"
@@ -14514,76 +15423,87 @@ msgstr ""
 "%1$s.\n"
 "Sjekk LyX installasjonen din."
 
-#: src/LyX.cpp:110
+#: src/LyX.cpp:111
 msgid "LyX: reconfiguring user directory"
 msgstr "LyX: Set opp brukarstig"
 
-#: src/LyX.cpp:114
+#: src/LyX.cpp:115
 msgid "Done!"
 msgstr "Ferdig!"
 
-#: src/LyX.cpp:467
+#: 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:376
+#, fuzzy
+msgid "Cannot remove temporary directory"
+msgstr "Klarte ikkje å fjerna den mellombelse katalogen"
+
+#: 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:469
+#: src/LyX.cpp:384
 msgid "Unable to remove temporary directory"
 msgstr "Klarte ikkje å fjerna mellombelskatalogen"
 
-#: src/LyX.cpp:497
+#: src/LyX.cpp:413
 #, c-format
 msgid "Wrong command line option `%1$s'. Exiting."
 msgstr "Feil kommandolinje val:`%1$s'. Farvel."
 
-#: src/LyX.cpp:570
+#: src/LyX.cpp:487
+#, fuzzy
 msgid "No textclass is found"
-msgstr ""
+msgstr "Kan ikkje finne fila"
 
-#: src/LyX.cpp:571
+#: 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:575
+#: src/LyX.cpp:492
 #, fuzzy
 msgid "&Reconfigure"
 msgstr "Set opp på nytt|n"
 
-#: src/LyX.cpp:576
+#: src/LyX.cpp:493
 #, fuzzy
 msgid "&Use Default"
 msgstr "&Standard"
 
-#: src/LyX.cpp:577 src/LyX.cpp:943
+#: src/LyX.cpp:494 src/LyX.cpp:857
 msgid "&Exit LyX"
 msgstr "&Skru av LyX"
 
-#: src/LyX.cpp:721 src/frontends/qt4/GuiView.cpp:525
+#: src/LyX.cpp:641 src/frontends/qt4/GuiView.cpp:650
 msgid "LyX: "
 msgstr "LyX: "
 
-#: src/LyX.cpp:847
+#: src/LyX.cpp:766
 msgid "Could not create temporary directory"
 msgstr "Klarte ikkje å laga mellombelskatalog"
 
-#: src/LyX.cpp:848
-#, c-format
+#: src/LyX.cpp:767
+#, fuzzy, c-format
 msgid ""
 "Could not create a temporary directory in\n"
-"%1$s. Make sure that this\n"
-"path exists and is writable and try again."
+"\"%1$s\"\n"
+"Make sure that this path exists and is writable and try again."
 msgstr ""
 "Kan ikkje lage mellombelskatalog i stigen \n"
 "%1$s. Ver sikker på at stigen eksisterar \n"
 "og er skrivbar og prøv igjen."
 
-#: src/LyX.cpp:936
+#: src/LyX.cpp:850
 msgid "Missing user LyX directory"
 msgstr "Manglar brukerstig for LyX"
 
-#: src/LyX.cpp:937
+#: src/LyX.cpp:851
 #, c-format
 msgid ""
 "You have specified a non-existent user LyX directory, %1$s.\n"
@@ -14592,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:942
+#: src/LyX.cpp:856
 msgid "&Create directory"
 msgstr "&Lag katalog"
 
-#: src/LyX.cpp:944
+#: src/LyX.cpp:858
 msgid "No user LyX directory. Exiting."
 msgstr "Ingen brukarstig for LyX. Stoppar."
 
-#: src/LyX.cpp:948
+#: src/LyX.cpp:862
 #, c-format
 msgid "LyX: Creating directory %1$s"
 msgstr "LyX: Lagar katalogen %1$s"
 
-#: src/LyX.cpp:953
+#: src/LyX.cpp:867
 msgid "Failed to create directory. Exiting."
 msgstr "Klarte ikkje å lage katalog. Stoppar."
 
-#: src/LyX.cpp:1121
+#: src/LyX.cpp:939
 msgid "List of supported debug flags:"
 msgstr "Liste over val ved avlusing:"
 
-#: src/LyX.cpp:1125
+#: 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:1136
+#: src/LyX.cpp:954
 #, fuzzy
 msgid ""
 "Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
@@ -14661,39 +15581,39 @@ msgstr ""
 "\t-version        samandrag av versjon og byggje info\n"
 "Sjå `man' sida til LyX for meir informasjon."
 
-#: src/LyX.cpp:1176 src/support/Package.cpp:560
+#: src/LyX.cpp:994 src/support/Package.cpp:554
 msgid "No system directory"
 msgstr "Ingen systemkatalog"
 
-#: src/LyX.cpp:1177
+#: src/LyX.cpp:995
 msgid "Missing directory for -sysdir switch"
 msgstr "Manglar katalog for -sysdir val"
 
-#: src/LyX.cpp:1188
+#: src/LyX.cpp:1006
 msgid "No user directory"
 msgstr "Ingen brukar katalog"
 
-#: src/LyX.cpp:1189
+#: src/LyX.cpp:1007
 msgid "Missing directory for -userdir switch"
 msgstr "Manglar katalog for -userdir val"
 
-#: src/LyX.cpp:1200
+#: src/LyX.cpp:1018
 msgid "Incomplete command"
 msgstr "Kommando er ikkje komplett"
 
-#: src/LyX.cpp:1201
+#: src/LyX.cpp:1019
 msgid "Missing command string after --execute switch"
 msgstr "Manglar kommando etter --execute val"
 
-#: src/LyX.cpp:1212
+#: 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:1225
+#: 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:1230
+#: src/LyX.cpp:1048
 msgid "Missing filename for --import"
 msgstr "Manglar filnamn for --import"
 
@@ -14735,31 +15655,31 @@ msgstr ""
 msgid "Unknown function."
 msgstr "Ukjent funksjon."
 
-#: src/LyXFunc.cpp:394
+#: src/LyXFunc.cpp:391
 msgid "Nothing to do"
 msgstr "Har ingenting å gjere"
 
-#: src/LyXFunc.cpp:413
+#: src/LyXFunc.cpp:410
 msgid "Unknown action"
 msgstr "Ukjend handling"
 
-#: src/LyXFunc.cpp:419 src/LyXFunc.cpp:675
+#: src/LyXFunc.cpp:416 src/LyXFunc.cpp:648
 msgid "Command disabled"
 msgstr "Den kommandoen er stengt"
 
-#: src/LyXFunc.cpp:426
+#: src/LyXFunc.cpp:423
 msgid "Command not allowed without any document open"
 msgstr "Kan ikkje gjera det utan eit dokument"
 
-#: src/LyXFunc.cpp:660
+#: src/LyXFunc.cpp:633
 msgid "Document is read-only"
 msgstr "Dokumentet kan berre bli lest frå"
 
-#: src/LyXFunc.cpp:669
+#: src/LyXFunc.cpp:642
 msgid "This portion of the document is deleted."
 msgstr "Denne delen av dokumetet er sletta."
 
-#: src/LyXFunc.cpp:688
+#: src/LyXFunc.cpp:661
 #, c-format
 msgid ""
 "The document %1$s has unsaved changes.\n"
@@ -14770,11 +15690,11 @@ msgstr ""
 "\n"
 "Vil du lagra dokumentet?"
 
-#: src/LyXFunc.cpp:691 src/frontends/qt4/GuiView.cpp:1643
+#: src/LyXFunc.cpp:664 src/frontends/qt4/GuiView.cpp:1739
 msgid "Save changed document?"
 msgstr "Vil du lagre dokumentet?"
 
-#: src/LyXFunc.cpp:706
+#: src/LyXFunc.cpp:679
 #, c-format
 msgid ""
 "Could not print the document %1$s.\n"
@@ -14783,11 +15703,11 @@ msgstr ""
 "Kunne ikkje skrive ut dokumentet %1$s.\n"
 "Sjekk at skrivaren har dei rette vala."
 
-#: src/LyXFunc.cpp:709
+#: src/LyXFunc.cpp:682
 msgid "Print document failed"
 msgstr "Kan ikkje skrive ut"
 
-#: src/LyXFunc.cpp:826
+#: src/LyXFunc.cpp:799
 #, c-format
 msgid ""
 "Any changes will be lost. Are you sure you want to revert to the saved "
@@ -14796,79 +15716,69 @@ msgstr ""
 "Alle endringar vil forsvinne. Er du sikker at du vil gå tilbake til siste "
 "lagra versjon av dokumentet %1$s?"
 
-#: src/LyXFunc.cpp:828
+#: src/LyXFunc.cpp:801
 msgid "Revert to saved document?"
 msgstr "Gå tilbake til sist lagra?"
 
-#: src/LyXFunc.cpp:829 src/LyXVC.cpp:160
+#: src/LyXFunc.cpp:802 src/LyXVC.cpp:179
 msgid "&Revert"
 msgstr "&Gå tilbake til sist lagra"
 
-#: src/LyXFunc.cpp:1043 src/Text3.cpp:1463
+#: src/LyXFunc.cpp:1016 src/Text3.cpp:1483
 msgid "Missing argument"
 msgstr "Manglande val"
 
-#: src/LyXFunc.cpp:1052
+#: src/LyXFunc.cpp:1025
 #, c-format
 msgid "Opening help file %1$s..."
 msgstr "Opnar hjelpfila %1$s..."
 
-#: src/LyXFunc.cpp:1300
+#: src/LyXFunc.cpp:1272
 #, c-format
 msgid "Opening child document %1$s..."
 msgstr "Opnar barne dokumentet %1$s..."
 
-#: src/LyXFunc.cpp:1409
-msgid "Syntax: set-color <lyx_name> <x11_name>"
-msgstr "Syntaks: set-color <lyx_name> <x11_name>"
-
-#: src/LyXFunc.cpp:1420
-#, 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/LyXFunc.cpp:1502
+#: 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:1505
+#: src/LyXFunc.cpp:1417
 msgid "Unable to save document defaults"
 msgstr "Klarte ikkje å lagre standardval for dokument "
 
-#: src/LyXFunc.cpp:1782
+#: src/LyXFunc.cpp:1694
 #, fuzzy, c-format
 msgid "Document %1$s reloaded."
 msgstr "Dokumentet %1$s er ope."
 
-#: src/LyXFunc.cpp:1784
+#: src/LyXFunc.cpp:1696
 #, fuzzy, c-format
 msgid "Could not reload document %1$s"
 msgstr "Kunne ikkje lese dokumentet"
 
-#: src/LyXFunc.cpp:1821
+#: src/LyXFunc.cpp:1733
 msgid "Welcome to LyX!"
 msgstr "Velkomen til LyX!"
 
-#: src/LyXFunc.cpp:1842
+#: src/LyXFunc.cpp:1754
 msgid "Converting document to new document class..."
 msgstr "Konverterer dokumentet til ny dokument klasse ..."
 
-#: src/LyXRC.cpp:2380
+#: 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:2385
+#: 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:2389
+#: 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 "
@@ -14878,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:2397
+#: 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:2401
+#: src/LyXRC.cpp:2435
 msgid ""
 "De-select if you don't want the class options to be reset to defaults after "
 "class change."
@@ -14892,14 +15802,14 @@ msgstr ""
 "Vil du at standardvala for den nye klassa skal gjelde for dokumentet nå du "
 "bytter klasse."
 
-#: src/LyXRC.cpp:2405
+#: 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:2412
+#: 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."
@@ -14907,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:2416
+#: src/LyXRC.cpp:2450
 msgid ""
 "Define the options of bibtex (cf. man bibtex) or select an alternative "
 "compiler (e.g. mlbibtex or bibulus)."
@@ -14915,7 +15825,7 @@ msgstr ""
 "Gi vala for BibTeX (sjå man bibtex) eller vel ein annan litteraturhandsamar "
 "slik som mlbibtex eller bibulus."
 
-#: src/LyXRC.cpp:2420
+#: src/LyXRC.cpp:2454
 msgid ""
 "Keybindings file. Can either specify an absolute path, or LyX will look in "
 "its global and local bind/ directories."
@@ -14923,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:2424
+#: 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:2428
+#: 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."
@@ -14935,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:2438
+#: 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."
@@ -14943,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:2442
+#: 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:2453
+#: src/LyXRC.cpp:2491
 #, no-c-format
 msgid ""
 "This accepts the normal strftime formats; see man strftime for full details. "
@@ -14958,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:2457
+#: src/LyXRC.cpp:2495
 #, fuzzy
 msgid ""
 "Command definition file. Can either specify an absolute path, or LyX will "
@@ -14967,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:2461
+#: src/LyXRC.cpp:2499
 msgid "New documents will be assigned this language."
 msgstr "språket til nye dokument."
 
-#: src/LyXRC.cpp:2465
+#: src/LyXRC.cpp:2503
 msgid "Specify the default paper size."
 msgstr "Vel standard papirstorleik."
 
-#: src/LyXRC.cpp:2469
+#: src/LyXRC.cpp:2507
 msgid ""
 "Iconify the dialogs when the main window is iconified. (Affects only dialogs "
 "shown after the change has been made.)"
@@ -14983,11 +15897,11 @@ msgstr ""
 "Legg ned barnevindauge saman med hovudvindauge. (gjeld berre barnevindauge "
 "oppretta etter endringa)."
 
-#: src/LyXRC.cpp:2473
+#: src/LyXRC.cpp:2511
 msgid "Select how LyX will display any graphics."
 msgstr "Vel korleis LyX skal vise grafikk."
 
-#: src/LyXRC.cpp:2477
+#: src/LyXRC.cpp:2515
 msgid ""
 "The default path for your documents. An empty value selects the directory "
 "LyX was started from."
@@ -14995,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:2482
+#: 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:2486
+#: src/LyXRC.cpp:2524
 #, fuzzy
 msgid ""
 "The path that LyX will set when offering to choose an example. An empty "
@@ -15008,13 +15922,13 @@ msgstr ""
 "Stigen til malane.  Er malstigen tom, blir stigen den same stigen som LyX "
 "vart starta i."
 
-#: src/LyXRC.cpp:2490
+#: 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:2497
+#: 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 "
@@ -15024,7 +15938,7 @@ msgstr ""
 "Dvs dersom du brukar  xindy/make-rule vil val vere \"makeindex.sh -m $$lang"
 "\"."
 
-#: src/LyXRC.cpp:2506
+#: 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."
@@ -15032,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:2510
+#: 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:2514
+#: 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:2518
+#: 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:2522
+#: 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 "
@@ -15057,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:2526
+#: 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:2530
+#: 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:2534
+#: 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:2538
+#: src/LyXRC.cpp:2576
 msgid ""
 "The LaTeX command for loading the language package. E.g. \"\\usepackage"
 "{babel}\", \"\\usepackage{omega}\"."
@@ -15079,82 +15993,84 @@ msgstr ""
 "LaTeX kommandoen for å laste språk-pakken. T.d.: \"\\usepackage{babel}\", "
 "\"\\usepackage{omega}\"."
 
-#: src/LyXRC.cpp:2542
+#: 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:2546
+#: 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:2550
+#: 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:2554
+#: 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:2558
+#: 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:2562
+#: src/LyXRC.cpp:2600
 msgid "The scrolling speed of the mouse wheel."
 msgstr ""
 
-#: src/LyXRC.cpp:2567
+#: src/LyXRC.cpp:2605
+#, fuzzy
 msgid "The completion popup delay."
-msgstr ""
+msgstr "&Kodelister i teksten"
 
-#: src/LyXRC.cpp:2571
+#: src/LyXRC.cpp:2609
 msgid "Select to display the completion popup in math mode."
 msgstr ""
 
-#: src/LyXRC.cpp:2575
+#: src/LyXRC.cpp:2613
 msgid "Select to display the completion popup in text mode."
 msgstr ""
 
-#: src/LyXRC.cpp:2579
+#: src/LyXRC.cpp:2617
 msgid ""
 "Show the completion popup without delay after non-unique completion attempt."
 msgstr ""
 
-#: src/LyXRC.cpp:2583
+#: src/LyXRC.cpp:2621
 msgid ""
 "Show a small triangle on the cursor to indicate that a completion is "
 "available."
 msgstr ""
 
-#: src/LyXRC.cpp:2587
+#: src/LyXRC.cpp:2625
+#, fuzzy
 msgid "The inline completion delay."
-msgstr ""
+msgstr "&Kodelister i teksten"
 
-#: src/LyXRC.cpp:2591
+#: src/LyXRC.cpp:2629
 msgid "Select to display the inline completion in math mode."
 msgstr ""
 
-#: src/LyXRC.cpp:2595
+#: src/LyXRC.cpp:2633
 msgid "Select to display the inline completion in text mode."
 msgstr ""
 
-#: src/LyXRC.cpp:2599
+#: src/LyXRC.cpp:2637
 msgid "Use \"...\" to shorten long completions."
 msgstr ""
 
-#: src/LyXRC.cpp:2603
+#: 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:2608
+#: src/LyXRC.cpp:2646
 msgid ""
 "Specify those directories which should be prepended to the PATH environment "
 "variable. Use the OS native format."
@@ -15162,33 +16078,33 @@ msgstr ""
 "Kva stig skal PATH-miljø ha framfor seg. Bruk standarden for "
 "operativsystemet."
 
-#: src/LyXRC.cpp:2615
+#: 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:2619
+#: 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:2623
+#: 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:2627
+#: src/LyXRC.cpp:2665
 msgid "Scale the preview size to suit."
 msgstr "La førehandsvising bli skalert etter høvet."
 
-#: src/LyXRC.cpp:2631
+#: 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:2635
+#: 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:2639
+#: src/LyXRC.cpp:2677
 msgid ""
 "The default printer to print on. If none is specified, LyX will use the "
 "environment variable PRINTER."
@@ -15196,11 +16112,11 @@ msgstr ""
 "Standard skrivar. Om denne er tom, vil LyX bruke miljø variabelen \"PRINTER"
 "\" frå operativsystemet."
 
-#: src/LyXRC.cpp:2643
+#: src/LyXRC.cpp:2681
 msgid "The option to print only even pages."
 msgstr "Skriv berre ut partal-sider."
 
-#: src/LyXRC.cpp:2647
+#: 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."
@@ -15208,35 +16124,35 @@ msgstr ""
 "Ekstra val til skriveprogrammet, gitt etter dei andre, men før namnet på dvi-"
 "fila."
 
-#: src/LyXRC.cpp:2651
+#: 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:2655
+#: src/LyXRC.cpp:2693
 msgid "The option to print out in landscape."
 msgstr "Skriv ut liggjande sider."
 
-#: src/LyXRC.cpp:2659
+#: src/LyXRC.cpp:2697
 msgid "The option to print only odd pages."
 msgstr "Skriv berre ut oddetal-sider."
 
-#: src/LyXRC.cpp:2663
+#: 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:2667
+#: 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:2671
+#: src/LyXRC.cpp:2709
 msgid "The option to specify paper type."
 msgstr "Kva slags papir skal det skrivast ut på."
 
-#: src/LyXRC.cpp:2675
+#: 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:2679
+#: 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 "
@@ -15245,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:2683
+#: 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:2687
+#: 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:2691
+#: 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:2695
+#: 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:2699
+#: src/LyXRC.cpp:2737
 msgid "Your favorite print program, e.g. \"dvips\", \"dvilj4\"."
 msgstr "Favoritt utskrift program, t.d.  \"dvips\", \"dvilj4\"."
 
-#: src/LyXRC.cpp:2707
+#: src/LyXRC.cpp:2745
 msgid ""
 "Select to have visual bidi cursor movement, unselect for logical movement."
 msgstr ""
 
-#: src/LyXRC.cpp:2711
+#: 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."
@@ -15283,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:2717
+#: 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:2726
+#: 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 "
@@ -15297,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:2730
+#: 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:2735
+#: src/LyXRC.cpp:2773
 #, no-c-format
 msgid ""
 "The zoom percentage for screen fonts. A setting of 100% will make the fonts "
@@ -15311,12 +16227,12 @@ msgid ""
 msgstr ""
 "Forstørring for skjermskrifttypar. 100% er om lag like stort som på arket."
 
-#: src/LyXRC.cpp:2739
+#: 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:2743
+#: src/LyXRC.cpp:2781
 msgid ""
 "This starts the lyxserver. The pipes get an additional extension \".in\" and "
 "\".out\". Only for advanced users."
@@ -15324,15 +16240,15 @@ msgstr ""
 "Dette startar LyXServer. Datarøyra gir ekstra integrasjon med andre program. "
 "Mest for røynde brukarar."
 
-#: src/LyXRC.cpp:2750
+#: src/LyXRC.cpp:2788
 msgid "De-select if you don't want the startup banner."
 msgstr "Vis startopp bilete."
 
-#: src/LyXRC.cpp:2754
+#: src/LyXRC.cpp:2792
 msgid "What command runs the spellchecker?"
 msgstr "Kva heiter stavekontroll-programmet?"
 
-#: src/LyXRC.cpp:2758
+#: src/LyXRC.cpp:2796
 msgid ""
 "LyX will place its temporary directories in this path. They will be deleted "
 "when you quit LyX."
@@ -15340,7 +16256,7 @@ msgstr ""
 "Stigen til mellombels filer.  Er mellombelsstigen tom, blir stigen den same "
 "stigen som LyX vart starta i."
 
-#: src/LyXRC.cpp:2762
+#: 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."
@@ -15348,7 +16264,7 @@ msgstr ""
 "Stigen til malane.  Er malstigen tom, blir stigen den same stigen som LyX "
 "vart starta i."
 
-#: src/LyXRC.cpp:2772
+#: 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."
@@ -15356,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:2785
+#: 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 "
@@ -15366,81 +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:2789
+#: src/LyXRC.cpp:2827
 msgid "Enable the automatic appearance of tool tips in the work area."
 msgstr ""
 
-#: src/LyXRC.cpp:2793
+#: src/LyXRC.cpp:2831
 msgid ""
 "Enable the pixmap cache that might improve performance on Mac and Windows."
 msgstr ""
 
-#: src/LyXRC.cpp:2800
+#: 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:1500 src/frontends/qt4/GuiParagraph.cpp:216
+#: src/Paragraph.cpp:1512 src/frontends/qt4/GuiParagraph.cpp:246
 msgid "Senseless with this layout!"
 msgstr "Meiningslaust med denne stilen."
 
-#: src/Paragraph.cpp:1566
+#: src/Paragraph.cpp:1578
 msgid "Alignment not permitted"
 msgstr ""
 
-#: src/Paragraph.cpp:1567
+#: src/Paragraph.cpp:1579
 msgid ""
 "The new layout does not permit the alignment previously used.\n"
 "Setting to default."
 msgstr ""
 
-#: src/Paragraph.cpp:2035 src/frontends/qt4/LaTeXHighlighter.cpp:108
+#: 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:2036
+#: 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"
@@ -15449,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."
@@ -15492,126 +16398,126 @@ 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:1224
+#: src/Text.cpp:1343
 msgid "[Change Tracking] "
 msgstr "[Spor endringar] "
 
-#: src/Text.cpp:1230
+#: src/Text.cpp:1349
 msgid "Change: "
 msgstr "Endring: "
 
-#: src/Text.cpp:1234
+#: src/Text.cpp:1353
 msgid " at "
 msgstr " til "
 
-#: src/Text.cpp:1244
+#: src/Text.cpp:1363
 #, c-format
 msgid "Font: %1$s"
 msgstr "Skrifttype:%1$s"
 
-#: src/Text.cpp:1249
+#: src/Text.cpp:1368
 #, c-format
 msgid ", Depth: %1$d"
 msgstr " Djupn: %1$d"
 
-#: src/Text.cpp:1255
+#: src/Text.cpp:1374
 msgid ", Spacing: "
 msgstr ", mellomrom: "
 
-#: src/Text.cpp:1261 src/frontends/qt4/GuiDocument.cpp:583
+#: src/Text.cpp:1380 src/frontends/qt4/GuiDocument.cpp:581
 msgid "OneHalf"
 msgstr "Halvannan"
 
-#: src/Text.cpp:1267
+#: src/Text.cpp:1386
 msgid "Other ("
 msgstr "Anna ("
 
-#: src/Text.cpp:1276
+#: src/Text.cpp:1395
 msgid ", Inset: "
 msgstr ", Innskot: "
 
-#: src/Text.cpp:1277
+#: src/Text.cpp:1396
 msgid ", Paragraph: "
 msgstr ", Avsnitt: "
 
-#: src/Text.cpp:1278
+#: src/Text.cpp:1397
 msgid ", Id: "
 msgstr " Id: "
 
-#: src/Text.cpp:1279
+#: src/Text.cpp:1398
 msgid ", Position: "
 msgstr ", plass: "
 
-#: src/Text.cpp:1285
+#: src/Text.cpp:1404
 msgid ", Char: 0x"
 msgstr ", Teikn: 0x"
 
-#: src/Text.cpp:1287
+#: src/Text.cpp:1406
 msgid ", Boundary: "
 msgstr ", Grense: "
 
-#: src/Text2.cpp:392
+#: src/Text2.cpp:373
 msgid "No font change defined."
 msgstr "Det er ikkje definert noko skrifttype endring."
 
-#: src/Text2.cpp:432
+#: src/Text2.cpp:413
 msgid "Nothing to index!"
 msgstr "Ingenting å lage indeks av!"
 
-#: src/Text2.cpp:434
+#: src/Text2.cpp:415
 msgid "Cannot index more than one paragraph!"
 msgstr "Kan ikkje lage indeks av meir enn eit avsnitt!"
 
-#: src/Text3.cpp:171 src/mathed/InsetMathHull.cpp:1446
+#: src/Text3.cpp:173 src/mathed/InsetMathHull.cpp:1461
 msgid "Math editor mode"
 msgstr "Mattemodus"
 
-#: src/Text3.cpp:794
+#: src/Text3.cpp:797
 msgid "Unknown spacing argument: "
 msgstr "Ukjent argument for linjeavstand: "
 
-#: src/Text3.cpp:1016
+#: src/Text3.cpp:1038
 msgid "Layout "
 msgstr "Stil "
 
-#: src/Text3.cpp:1017
+#: src/Text3.cpp:1039
 msgid " not known"
 msgstr " ukjent"
 
-#: src/Text3.cpp:1570 src/Text3.cpp:1582
+#: src/Text3.cpp:1590 src/Text3.cpp:1602
 msgid "Character set"
 msgstr "Teiknsett"
 
-#: src/Text3.cpp:1729 src/Text3.cpp:1740
+#: src/Text3.cpp:1748 src/Text3.cpp:1759
 msgid "Paragraph layout set"
 msgstr "set avsnitt stil"
 
-#: src/TextClass.cpp:134
+#: src/TextClass.cpp:140
 #, fuzzy
 msgid "Plain Layout"
 msgstr "Avsnittstil"
 
-#: src/TextClass.cpp:588
+#: src/TextClass.cpp:580
 #, fuzzy
 msgid "Missing File"
 msgstr "Manglande val"
 
-#: src/TextClass.cpp:589
+#: src/TextClass.cpp:581
 msgid "Could not find stdinsets.inc! This may lead to data loss!"
 msgstr ""
 
-#: src/TextClass.cpp:592
+#: src/TextClass.cpp:584
 #, fuzzy
 msgid "Corrupt File"
 msgstr "Kort tittel"
 
-#: src/TextClass.cpp:593
+#: src/TextClass.cpp:585
 msgid "Could not read stdinsets.inc! This may lead to data loss!"
 msgstr ""
 
@@ -15628,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"
@@ -15721,19 +16656,19 @@ msgstr ""
 msgid "Could not read template"
 msgstr "Kan ikkje lese malen"
 
-#: src/buffer_funcs.cpp:386
+#: src/buffer_funcs.cpp:387
 msgid "\\arabic{enumi}."
 msgstr "\\arabic{enumi}."
 
-#: src/buffer_funcs.cpp:392
+#: src/buffer_funcs.cpp:393
 msgid "\\roman{enumiii}."
 msgstr "\\roman{enumiii}."
 
-#: src/buffer_funcs.cpp:395
+#: src/buffer_funcs.cpp:396
 msgid "\\Alph{enumiv}."
 msgstr "\\Alph{enumiv}."
 
-#: src/buffer_funcs.cpp:412 src/insets/InsetCaption.cpp:290
+#: src/buffer_funcs.cpp:413 src/insets/InsetCaption.cpp:293
 msgid "Senseless!!! "
 msgstr "Meiningslaust! "
 
@@ -15761,7 +16696,7 @@ msgstr "Dings 3"
 msgid "Dings 4"
 msgstr "Dings 4"
 
-#: src/frontends/qt4/FileDialog.cpp:176
+#: src/frontends/qt4/FileDialog.cpp:168
 msgid "Directories"
 msgstr "Katalogar"
 
@@ -15777,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"
@@ -15786,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 "
@@ -15798,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 "
@@ -15818,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"
 
@@ -15837,36 +16772,46 @@ msgstr "Brukar katalog"
 msgid "LyX: %1$s"
 msgstr "LyX: %1$s"
 
-#: src/frontends/qt4/GuiApplication.cpp:118
+#: src/frontends/qt4/GuiApplication.cpp:387
 #, fuzzy
 msgid "About %1"
 msgstr "Om LyX"
 
-#: src/frontends/qt4/GuiApplication.cpp:118
-#: src/frontends/qt4/GuiPrefs.cpp:2393
+#: src/frontends/qt4/GuiApplication.cpp:387
+#: src/frontends/qt4/GuiPrefs.cpp:2497
 msgid "Preferences"
 msgstr "LyX-Val"
 
-#: src/frontends/qt4/GuiApplication.cpp:119
+#: src/frontends/qt4/GuiApplication.cpp:388
 #, fuzzy
 msgid "Reconfigure"
 msgstr "Set opp på nytt|n"
 
-#: src/frontends/qt4/GuiApplication.cpp:119
+#: src/frontends/qt4/GuiApplication.cpp:388
 #, fuzzy
 msgid "Quit %1"
 msgstr "Skru av LyX"
 
-#: src/frontends/qt4/GuiApplication.cpp:301
+#: src/frontends/qt4/GuiApplication.cpp:784
 msgid "Exiting."
 msgstr "Avsluttar."
 
-#: src/frontends/qt4/GuiApplication.cpp:570
+#: 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: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:1211
 #, fuzzy
 msgid "The current document was closed."
 msgstr "Kan ikkje skrive ut"
 
-#: src/frontends/qt4/GuiApplication.cpp:580
+#: src/frontends/qt4/GuiApplication.cpp:1221
 msgid ""
 "LyX has caught an exception, it will now attempt to save all unsaved "
 "documents and exit.\n"
@@ -15874,104 +16819,111 @@ msgid ""
 "Exception: "
 msgstr ""
 
-#: src/frontends/qt4/GuiApplication.cpp:584
-#: src/frontends/qt4/GuiApplication.cpp:590
+#: src/frontends/qt4/GuiApplication.cpp:1225
+#: src/frontends/qt4/GuiApplication.cpp:1231
 msgid "Software exception Detected"
 msgstr ""
 
-#: src/frontends/qt4/GuiApplication.cpp:588
+#: 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/GuiBibitem.cpp:26
+#: src/frontends/qt4/GuiApplication.cpp:1401
+#, fuzzy
+msgid "Could not find UI definition file"
+msgstr "Kan ikkje lese fila med innstillingar"
+
+#: src/frontends/qt4/GuiBibitem.cpp:28
 msgid "Bibliography Entry Settings"
 msgstr "Val for litteraturnøkkel"
 
-#: src/frontends/qt4/GuiBibtex.cpp:52
+#: src/frontends/qt4/GuiBibtex.cpp:53
 msgid "BibTeX Bibliography"
 msgstr "BibTeX litteraturliste"
 
-#: src/frontends/qt4/GuiBibtex.cpp:442 src/frontends/qt4/GuiBibtex.cpp:452
-#: src/frontends/qt4/GuiDocument.cpp:1439
-#: src/frontends/qt4/GuiExternal.cpp:797 src/frontends/qt4/GuiGraphics.cpp:741
-#: src/frontends/qt4/GuiInclude.cpp:343 src/frontends/qt4/GuiView.cpp:1123
-#: src/frontends/qt4/GuiView.cpp:1182 src/frontends/qt4/GuiView.cpp:1315
-#: src/frontends/qt4/GuiView.cpp:1434 src/frontends/qt4/GuiView.cpp:1514
+#: src/frontends/qt4/GuiBibtex.cpp:424 src/frontends/qt4/GuiBibtex.cpp:434
+#: 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: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"
 
-#: src/frontends/qt4/GuiBibtex.cpp:444
+#: src/frontends/qt4/GuiBibtex.cpp:426
 msgid "BibTeX Databases (*.bib)"
 msgstr "BibTeX Databasar (*.bib)"
 
-#: src/frontends/qt4/GuiBibtex.cpp:446
+#: src/frontends/qt4/GuiBibtex.cpp:428
 msgid "Select a BibTeX database to add"
 msgstr "Vel ein BibTeX database "
 
-#: src/frontends/qt4/GuiBibtex.cpp:454
+#: src/frontends/qt4/GuiBibtex.cpp:436
 msgid "BibTeX Styles (*.bst)"
 msgstr "BibTeX stilfiler (*.bst)"
 
-#: src/frontends/qt4/GuiBibtex.cpp:456
+#: src/frontends/qt4/GuiBibtex.cpp:438
 msgid "Select a BibTeX style"
 msgstr "Vel BibTeX stil"
 
-#: src/frontends/qt4/GuiBox.cpp:52
+#: src/frontends/qt4/GuiBox.cpp:56
 #, fuzzy
 msgid "No frame"
 msgstr "Inga ramme"
 
-#: src/frontends/qt4/GuiBox.cpp:52
+#: src/frontends/qt4/GuiBox.cpp:56
+#, fuzzy
 msgid "Simple rectangular frame"
-msgstr ""
+msgstr "innskot ramme"
 
-#: src/frontends/qt4/GuiBox.cpp:53
+#: src/frontends/qt4/GuiBox.cpp:57
 #, fuzzy
 msgid "Oval frame, thin"
 msgstr "Tynn, oval ramme"
 
-#: src/frontends/qt4/GuiBox.cpp:53
+#: src/frontends/qt4/GuiBox.cpp:57
 #, fuzzy
 msgid "Oval frame, thick"
 msgstr "Tjukk oval ramme"
 
-#: src/frontends/qt4/GuiBox.cpp:54
+#: src/frontends/qt4/GuiBox.cpp:58
 msgid "Drop shadow"
 msgstr ""
 
-#: src/frontends/qt4/GuiBox.cpp:54
+#: src/frontends/qt4/GuiBox.cpp:58
 #, fuzzy
 msgid "Shaded background"
 msgstr "notat bakgrunn"
 
-#: src/frontends/qt4/GuiBox.cpp:55
+#: src/frontends/qt4/GuiBox.cpp:59
+#, fuzzy
 msgid "Double rectangular frame"
-msgstr ""
+msgstr "dobbel"
 
-#: src/frontends/qt4/GuiBox.cpp:68 src/frontends/qt4/GuiBox.cpp:327
-#: src/frontends/qt4/GuiBox.cpp:362
+#: 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:68 src/frontends/qt4/GuiBox.cpp:330
-#: src/frontends/qt4/GuiBox.cpp:365
+#: 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:69 src/frontends/qt4/GuiBox.cpp:197
-#: src/frontends/qt4/GuiBox.cpp:333 src/frontends/qt4/GuiBox.cpp:368
-#: src/frontends/qt4/GuiBox.cpp:413
+#: 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:69 src/frontends/qt4/GuiBox.cpp:336
-#: src/frontends/qt4/GuiBox.cpp:371
+#: src/frontends/qt4/GuiBox.cpp:73 src/frontends/qt4/GuiBox.cpp:344
+#: src/frontends/qt4/GuiBox.cpp:379
 msgid "Width"
 msgstr "Breidd"
 
-#: src/frontends/qt4/GuiBox.cpp:74
+#: src/frontends/qt4/GuiBox.cpp:78
 msgid "Box Settings"
 msgstr "Rammeval"
 
@@ -15979,20 +16931,20 @@ msgstr "Rammeval"
 msgid "Branch Settings"
 msgstr "Greinval"
 
-#: src/frontends/qt4/GuiBranches.cpp:41
-msgid "Branch"
-msgstr "Grein"
-
-#: src/frontends/qt4/GuiBranches.cpp:42
+#: src/frontends/qt4/GuiBranches.cpp:43
 msgid "Activated"
 msgstr "Aktivert"
 
-#: src/frontends/qt4/GuiBranches.cpp:71 src/frontends/qt4/GuiBranches.cpp:145
-#: src/frontends/qt4/GuiDocument.cpp:1470
+#: src/frontends/qt4/GuiBranches.cpp:44
+msgid "Color"
+msgstr "Farge"
+
+#: src/frontends/qt4/GuiBranches.cpp:72 src/frontends/qt4/GuiBranches.cpp:146
+#: src/frontends/qt4/GuiDocument.cpp:1442
 msgid "Yes"
 msgstr "Ja"
 
-#: src/frontends/qt4/GuiBranches.cpp:71 src/frontends/qt4/GuiDocument.cpp:1469
+#: src/frontends/qt4/GuiBranches.cpp:72 src/frontends/qt4/GuiDocument.cpp:1441
 msgid "No"
 msgstr "Nei"
 
@@ -16014,125 +16966,115 @@ msgstr ""
 msgid "Change made at %1$s\n"
 msgstr "Endringa gjort %1$s\n"
 
-#: src/frontends/qt4/GuiCharacter.cpp:33 src/frontends/qt4/GuiCharacter.cpp:46
-#: src/frontends/qt4/GuiCharacter.cpp:67 src/frontends/qt4/GuiCharacter.cpp:79
-#: src/frontends/qt4/GuiCharacter.cpp:97
-#: src/frontends/qt4/GuiCharacter.cpp:108 src/frontends/qt4/qt_helpers.cpp:194
+#: src/frontends/qt4/GuiCharacter.cpp:42 src/frontends/qt4/GuiCharacter.cpp:55
+#: src/frontends/qt4/GuiCharacter.cpp:76 src/frontends/qt4/GuiCharacter.cpp:88
+#: src/frontends/qt4/GuiCharacter.cpp:106
+#: src/frontends/qt4/GuiCharacter.cpp:117
+#: src/frontends/qt4/GuiCharacter.cpp:188
 msgid "No change"
 msgstr "Inga endring"
 
-#: src/frontends/qt4/GuiCharacter.cpp:37
+#: src/frontends/qt4/GuiCharacter.cpp:46
 msgid "Small Caps"
 msgstr "Lita skrifttype"
 
-#: src/frontends/qt4/GuiCharacter.cpp:38 src/frontends/qt4/GuiCharacter.cpp:59
-#: src/frontends/qt4/GuiCharacter.cpp:71 src/frontends/qt4/GuiCharacter.cpp:89
-#: src/frontends/qt4/GuiCharacter.cpp:100
-#: src/frontends/qt4/GuiCharacter.cpp:112 src/frontends/qt4/qt_helpers.cpp:196
+#: src/frontends/qt4/GuiCharacter.cpp:47 src/frontends/qt4/GuiCharacter.cpp:68
+#: src/frontends/qt4/GuiCharacter.cpp:80 src/frontends/qt4/GuiCharacter.cpp:98
+#: src/frontends/qt4/GuiCharacter.cpp:109
+#: src/frontends/qt4/GuiCharacter.cpp:121
+#: src/frontends/qt4/GuiCharacter.cpp:187
 msgid "Reset"
 msgstr "Nullstill"
 
-#: src/frontends/qt4/GuiCharacter.cpp:69
+#: src/frontends/qt4/GuiCharacter.cpp:78
 msgid "Underbar"
 msgstr "Understrek"
 
-#: src/frontends/qt4/GuiCharacter.cpp:70
+#: src/frontends/qt4/GuiCharacter.cpp:79
 msgid "Noun"
 msgstr "Storebokstaver"
 
-#: src/frontends/qt4/GuiCharacter.cpp:80
+#: src/frontends/qt4/GuiCharacter.cpp:89
 msgid "No color"
 msgstr "Ingen fargar"
 
-#: src/frontends/qt4/GuiCharacter.cpp:81
+#: src/frontends/qt4/GuiCharacter.cpp:90
 msgid "Black"
 msgstr "Svart"
 
-#: src/frontends/qt4/GuiCharacter.cpp:82
+#: src/frontends/qt4/GuiCharacter.cpp:91
 msgid "White"
 msgstr "Kvit"
 
-#: src/frontends/qt4/GuiCharacter.cpp:83
+#: src/frontends/qt4/GuiCharacter.cpp:92
 msgid "Red"
 msgstr "Raud"
 
-#: src/frontends/qt4/GuiCharacter.cpp:84
+#: src/frontends/qt4/GuiCharacter.cpp:93
 msgid "Green"
 msgstr "Grøn"
 
-#: src/frontends/qt4/GuiCharacter.cpp:85
+#: src/frontends/qt4/GuiCharacter.cpp:94
 msgid "Blue"
 msgstr "Blå"
 
-#: src/frontends/qt4/GuiCharacter.cpp:86
+#: src/frontends/qt4/GuiCharacter.cpp:95
 msgid "Cyan"
 msgstr "Cyan"
 
-#: src/frontends/qt4/GuiCharacter.cpp:87
+#: src/frontends/qt4/GuiCharacter.cpp:96
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/frontends/qt4/GuiCharacter.cpp:88
+#: src/frontends/qt4/GuiCharacter.cpp:97
 msgid "Yellow"
 msgstr "Gul"
 
-#: src/frontends/qt4/GuiCharacter.cpp:118
+#: src/frontends/qt4/GuiCharacter.cpp:159
 msgid "Text Style"
 msgstr "Tekststil"
 
-#: src/frontends/qt4/GuiCitation.cpp:312
+#: src/frontends/qt4/GuiCitation.cpp:326
 #, fuzzy
 msgid "Keys"
 msgstr "&Nøkkel:"
 
-#: src/frontends/qt4/GuiClipboard.cpp:328
-msgid "Enhanced Metafile"
-msgstr ""
-
-#: src/frontends/qt4/GuiClipboard.cpp:329
-#, fuzzy
-msgid "Windows Metafile"
-msgstr "Skriv ut til fil"
-
-#: src/frontends/qt4/GuiClipboard.cpp:330
+#: src/frontends/qt4/GuiClipboard.cpp:135
 msgid "LinkBack PDF"
 msgstr ""
 
-#: src/frontends/qt4/GuiClipboard.cpp:331
+#: src/frontends/qt4/GuiClipboard.cpp:136
 msgid "PDF"
 msgstr ""
 
-#: src/frontends/qt4/GuiClipboard.cpp:332
-msgid "PNG"
-msgstr ""
-
-#: src/frontends/qt4/GuiClipboard.cpp:333
-msgid "JPEG"
-msgstr ""
-
-#: src/frontends/qt4/GuiClipboard.cpp:342
+#: src/frontends/qt4/GuiClipboard.cpp:147
 #, fuzzy
 msgid "pasted"
 msgstr "Lim inn"
 
-#: src/frontends/qt4/GuiClipboard.cpp:351
-#, c-format
+#: src/frontends/qt4/GuiClipboard.cpp:156
+#, fuzzy, c-format
 msgid "%1$s Files"
-msgstr ""
+msgstr "%1$s og %2$s"
 
-#: src/frontends/qt4/GuiClipboard.cpp:361
+#: src/frontends/qt4/GuiClipboard.cpp:166
 #, fuzzy
 msgid "Choose a filename to save the pasted graphic as"
 msgstr "Vel eit anna filnamn"
 
-#: src/frontends/qt4/GuiClipboard.cpp:371 src/frontends/qt4/GuiView.cpp:1196
-#: src/frontends/qt4/GuiView.cpp:1335 src/frontends/qt4/GuiView.cpp:1351
-#: src/frontends/qt4/GuiView.cpp:1368 src/frontends/qt4/GuiView.cpp:1452
-#: src/frontends/qt4/GuiView.cpp:1490
+#: 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."
 
-#: src/frontends/qt4/GuiClipboard.cpp:402
+#: src/frontends/qt4/GuiClipboard.cpp:206
+#, fuzzy
+msgid "Overwrite external file?"
+msgstr "Skriv over dokumentet?"
+
+#: src/frontends/qt4/GuiClipboard.cpp:207
 #, fuzzy, c-format
 msgid "File %1$s already exists, do you want to overwrite it?"
 msgstr ""
@@ -16144,148 +17086,148 @@ msgstr ""
 msgid "Next command"
 msgstr "Neste kommando"
 
-#: src/frontends/qt4/GuiDelimiter.cpp:44
+#: src/frontends/qt4/GuiDelimiter.cpp:57
 msgid "big[[delimiter size]]"
 msgstr "store[[Storleik på skiljeteikn]]"
 
-#: src/frontends/qt4/GuiDelimiter.cpp:45
+#: src/frontends/qt4/GuiDelimiter.cpp:58
 msgid "Big[[delimiter size]]"
 msgstr "Store[[Storleik på skiljeteikn]]"
 
-#: src/frontends/qt4/GuiDelimiter.cpp:46
+#: src/frontends/qt4/GuiDelimiter.cpp:59
 msgid "bigg[[delimiter size]]"
 msgstr "storee[[Storleik på skiljeteikn]]"
 
-#: src/frontends/qt4/GuiDelimiter.cpp:47
+#: src/frontends/qt4/GuiDelimiter.cpp:60
 msgid "Bigg[[delimiter size]]"
 msgstr "Storee[[Storleik på skiljeteikn]]"
 
-#: src/frontends/qt4/GuiDelimiter.cpp:71
+#: src/frontends/qt4/GuiDelimiter.cpp:165
 msgid "Math Delimiter"
 msgstr "Skiljeteikn i matte"
 
-#: src/frontends/qt4/GuiDelimiter.cpp:107
-#: src/frontends/qt4/GuiDelimiter.cpp:108
+#: src/frontends/qt4/GuiDelimiter.cpp:203
+#: src/frontends/qt4/GuiDelimiter.cpp:204
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: src/frontends/qt4/GuiDelimiter.cpp:110
+#: src/frontends/qt4/GuiDelimiter.cpp:206
 msgid "Variable"
 msgstr "Variabel"
 
-#: src/frontends/qt4/GuiDocument.cpp:93
+#: src/frontends/qt4/GuiDocument.cpp:95
 msgid "Computer Modern Roman"
 msgstr "Computer Modern Romansk"
 
-#: src/frontends/qt4/GuiDocument.cpp:93
+#: src/frontends/qt4/GuiDocument.cpp:95
 msgid "Latin Modern Roman"
 msgstr "Latin Modern Romansk"
 
-#: src/frontends/qt4/GuiDocument.cpp:94
+#: src/frontends/qt4/GuiDocument.cpp:96
 msgid "AE (Almost European)"
 msgstr "AE (mestA Europeisk)"
 
-#: src/frontends/qt4/GuiDocument.cpp:94
+#: src/frontends/qt4/GuiDocument.cpp:96
 msgid "Times Roman"
 msgstr "Times-Romansk"
 
-#: src/frontends/qt4/GuiDocument.cpp:94
+#: src/frontends/qt4/GuiDocument.cpp:96
 msgid "Palatino"
 msgstr "Palatino"
 
-#: src/frontends/qt4/GuiDocument.cpp:95
+#: src/frontends/qt4/GuiDocument.cpp:97
 msgid "Bitstream Charter"
 msgstr "Bitstream Charter"
 
-#: src/frontends/qt4/GuiDocument.cpp:95
+#: src/frontends/qt4/GuiDocument.cpp:97
 msgid "New Century Schoolbook"
 msgstr "New Century Schoolbook"
 
-#: src/frontends/qt4/GuiDocument.cpp:95
+#: src/frontends/qt4/GuiDocument.cpp:97
 msgid "Bookman"
 msgstr "Bookman"
 
-#: src/frontends/qt4/GuiDocument.cpp:96
+#: src/frontends/qt4/GuiDocument.cpp:98
 msgid "Utopia"
 msgstr "Utopia"
 
-#: src/frontends/qt4/GuiDocument.cpp:96
+#: src/frontends/qt4/GuiDocument.cpp:98
 msgid "Bera Serif"
 msgstr "Bera Serif"
 
-#: src/frontends/qt4/GuiDocument.cpp:96
+#: src/frontends/qt4/GuiDocument.cpp:98
 msgid "Concrete Roman"
 msgstr "Concrete Romansk"
 
-#: src/frontends/qt4/GuiDocument.cpp:96
+#: src/frontends/qt4/GuiDocument.cpp:98
 msgid "Zapf Chancery"
 msgstr "Zapf Chancery"
 
-#: src/frontends/qt4/GuiDocument.cpp:109
+#: src/frontends/qt4/GuiDocument.cpp:111
 msgid "Computer Modern Sans"
 msgstr "Computer Modern Sans"
 
-#: src/frontends/qt4/GuiDocument.cpp:109
+#: src/frontends/qt4/GuiDocument.cpp:111
 msgid "Latin Modern Sans"
 msgstr "Latin Modern Sans"
 
-#: src/frontends/qt4/GuiDocument.cpp:110
+#: src/frontends/qt4/GuiDocument.cpp:112
 msgid "Helvetica"
 msgstr "Helvetica"
 
-#: src/frontends/qt4/GuiDocument.cpp:110
+#: src/frontends/qt4/GuiDocument.cpp:112
 msgid "Avant Garde"
 msgstr "Avant Garde"
 
-#: src/frontends/qt4/GuiDocument.cpp:110
+#: src/frontends/qt4/GuiDocument.cpp:112
 msgid "Bera Sans"
 msgstr "Bera Sans"
 
-#: src/frontends/qt4/GuiDocument.cpp:110
+#: src/frontends/qt4/GuiDocument.cpp:112
 msgid "CM Bright"
 msgstr "CM Bright"
 
-#: src/frontends/qt4/GuiDocument.cpp:122
+#: src/frontends/qt4/GuiDocument.cpp:124
 msgid "Computer Modern Typewriter"
 msgstr "Computer Modern Typewriter"
 
-#: src/frontends/qt4/GuiDocument.cpp:123
+#: src/frontends/qt4/GuiDocument.cpp:125
 msgid "Latin Modern Typewriter"
 msgstr "Latin Modern Typewriter"
 
-#: src/frontends/qt4/GuiDocument.cpp:123
+#: src/frontends/qt4/GuiDocument.cpp:125
 msgid "Courier"
 msgstr "Courier"
 
-#: src/frontends/qt4/GuiDocument.cpp:123
+#: src/frontends/qt4/GuiDocument.cpp:125
 msgid "Bera Mono"
 msgstr "Bera Mono"
 
-#: src/frontends/qt4/GuiDocument.cpp:124
+#: src/frontends/qt4/GuiDocument.cpp:126
 msgid "LuxiMono"
 msgstr "LuxiMono"
 
-#: src/frontends/qt4/GuiDocument.cpp:124
+#: src/frontends/qt4/GuiDocument.cpp:126
 msgid "CM Typewriter Light"
 msgstr "CM Typewriter Light"
 
-#: src/frontends/qt4/GuiDocument.cpp:194
+#: src/frontends/qt4/GuiDocument.cpp:196
 #, fuzzy
 msgid "Module not found!"
 msgstr "Kan ikkje finne fila"
 
-#: src/frontends/qt4/GuiDocument.cpp:510
+#: src/frontends/qt4/GuiDocument.cpp:512
 msgid "Document Settings"
 msgstr "Dokumentval"
 
-#: src/frontends/qt4/GuiDocument.cpp:568
-#: src/frontends/qt4/GuiDocument.cpp:1054
+#: src/frontends/qt4/GuiDocument.cpp:566
+#: src/frontends/qt4/GuiDocument.cpp:1055
 msgid ""
 "Input listings parameters on the right. Enter ? for a list of parameters."
 msgstr ""
 "Skriv inn val for kodelister til høgre. Skriv eit ? for å sjå mogelege val."
 
-#: src/frontends/qt4/GuiDocument.cpp:577
+#: src/frontends/qt4/GuiDocument.cpp:575
 msgid "Length"
 msgstr "Lengd"
 
@@ -16330,235 +17272,221 @@ msgstr "B3"
 msgid "B4"
 msgstr "B4"
 
-#: src/frontends/qt4/GuiDocument.cpp:801
+#: src/frontends/qt4/GuiDocument.cpp:799
 msgid "LaTeX default"
 msgstr "LaTeX standard"
 
-#: src/frontends/qt4/GuiDocument.cpp:807
+#: src/frontends/qt4/GuiDocument.cpp:808
 msgid "``text''"
 msgstr "``tekst''"
 
-#: src/frontends/qt4/GuiDocument.cpp:808
+#: src/frontends/qt4/GuiDocument.cpp:809
 msgid "''text''"
 msgstr "''tekst''"
 
-#: src/frontends/qt4/GuiDocument.cpp:809
+#: src/frontends/qt4/GuiDocument.cpp:810
 msgid ",,text``"
 msgstr ",,tekst``"
 
-#: src/frontends/qt4/GuiDocument.cpp:810
+#: src/frontends/qt4/GuiDocument.cpp:811
 msgid ",,text''"
 msgstr ",,tekst''"
 
-#: src/frontends/qt4/GuiDocument.cpp:811
+#: src/frontends/qt4/GuiDocument.cpp:812
 msgid "<<text>>"
 msgstr "<<tekst>>"
 
-#: src/frontends/qt4/GuiDocument.cpp:812
+#: src/frontends/qt4/GuiDocument.cpp:813
 msgid ">>text<<"
 msgstr ">>tekst<<"
 
-#: src/frontends/qt4/GuiDocument.cpp:827
+#: src/frontends/qt4/GuiDocument.cpp:828
 msgid "Numbered"
 msgstr "Nummerering"
 
-#: src/frontends/qt4/GuiDocument.cpp:828
+#: src/frontends/qt4/GuiDocument.cpp:829
 msgid "Appears in TOC"
 msgstr "Kjem i innhaldslista"
 
-#: src/frontends/qt4/GuiDocument.cpp:848
+#: src/frontends/qt4/GuiDocument.cpp:849
 msgid "Author-year"
 msgstr "Forfattar-år"
 
-#: src/frontends/qt4/GuiDocument.cpp:849
+#: src/frontends/qt4/GuiDocument.cpp:850
 msgid "Numerical"
 msgstr "Numerisk"
 
-#: src/frontends/qt4/GuiDocument.cpp:908
+#: src/frontends/qt4/GuiDocument.cpp:917
 #, c-format
 msgid "Unavailable: %1$s"
 msgstr "Utilgjengeleg %1$s"
 
-#: src/frontends/qt4/GuiDocument.cpp:977 src/frontends/qt4/GuiDocument.cpp:992
+#: src/frontends/qt4/GuiDocument.cpp:979 src/frontends/qt4/GuiDocument.cpp:993
 msgid "Document Class"
 msgstr "Dokumentklasse"
 
-#: src/frontends/qt4/GuiDocument.cpp:979
+#: src/frontends/qt4/GuiDocument.cpp:981
 msgid "Text Layout"
 msgstr "Tekststil"
 
-#: src/frontends/qt4/GuiDocument.cpp:981
+#: src/frontends/qt4/GuiDocument.cpp:983
 msgid "Page Margins"
 msgstr "Sidemargar"
 
-#: src/frontends/qt4/GuiDocument.cpp:983
+#: src/frontends/qt4/GuiDocument.cpp:985
 msgid "Numbering & TOC"
 msgstr "Tal og bolkar"
 
-#: src/frontends/qt4/GuiDocument.cpp:985
+#: src/frontends/qt4/GuiDocument.cpp:987
 #, fuzzy
 msgid "PDF Properties"
 msgstr "Eigenskapar"
 
-#: src/frontends/qt4/GuiDocument.cpp:986
+#: src/frontends/qt4/GuiDocument.cpp:988
 msgid "Math Options"
 msgstr "Matte val"
 
-#: src/frontends/qt4/GuiDocument.cpp:987
+#: src/frontends/qt4/GuiDocument.cpp:989
 msgid "Float Placement"
 msgstr "Flytar plassering"
 
-#: src/frontends/qt4/GuiDocument.cpp:988
+#: src/frontends/qt4/GuiDocument.cpp:990
 msgid "Bullets"
 msgstr "Punkt"
 
-#: src/frontends/qt4/GuiDocument.cpp:989
+#: src/frontends/qt4/GuiDocument.cpp:991
 msgid "Branches"
 msgstr "Greiner"
 
-#: src/frontends/qt4/GuiDocument.cpp:990 src/frontends/qt4/GuiToc.cpp:228
-#: src/frontends/qt4/Menus.cpp:918
-#, fuzzy
-msgid "Embedded Files"
-msgstr "Innlemma object|m"
-
-#: src/frontends/qt4/GuiDocument.cpp:991
-#: src/frontends/qt4/GuiDocument.cpp:1003
+#: src/frontends/qt4/GuiDocument.cpp:992
+#: src/frontends/qt4/GuiDocument.cpp:1004
 msgid "LaTeX Preamble"
 msgstr "LaTeX fortekst"
 
-#: src/frontends/qt4/GuiDocument.cpp:1232
+#: src/frontends/qt4/GuiDocument.cpp:1233
 #, fuzzy
 msgid "Layouts|#o#O"
 msgstr "Oppsett|O"
 
-#: src/frontends/qt4/GuiDocument.cpp:1234
+#: src/frontends/qt4/GuiDocument.cpp:1235
 #, fuzzy
 msgid "LyX Layout (*.layout)"
 msgstr "LyX Dokument (*.lyx)"
 
-#: src/frontends/qt4/GuiDocument.cpp:1236
-#: src/frontends/qt4/GuiDocument.cpp:1282
-msgid "Local layout file"
-msgstr ""
-
-#: src/frontends/qt4/GuiDocument.cpp:1254
-#: src/frontends/qt4/GuiDocument.cpp:1309
-#: src/frontends/qt4/GuiDocument.cpp:2157
-#, fuzzy
-msgid "Error"
-msgstr "Pil"
-
-#: src/frontends/qt4/GuiDocument.cpp:1255
+#: src/frontends/qt4/GuiDocument.cpp:1237
+#: src/frontends/qt4/GuiDocument.cpp:1246
 #, fuzzy
-msgid "Unable to read local layout file."
-msgstr "Klarte ikkje å lagre standardval for dokument "
+msgid "Local layout file"
+msgstr "Tekststil"
 
-#: src/frontends/qt4/GuiDocument.cpp:1283
+#: 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 same directory."
+"keep the layout file in the document directory."
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1287
-#: src/frontends/qt4/GuiDocument.cpp:1298
+#: src/frontends/qt4/GuiDocument.cpp:1251
 #, fuzzy
 msgid "&Set Layout"
 msgstr "Tekststil"
 
-#: src/frontends/qt4/GuiDocument.cpp:1294
+#: src/frontends/qt4/GuiDocument.cpp:1264
+#: src/frontends/qt4/GuiDocument.cpp:1311
+#: src/frontends/qt4/GuiDocument.cpp:2160
 #, fuzzy
-msgid "Embedded layout"
-msgstr "Innlemma object|m"
-
-#: src/frontends/qt4/GuiDocument.cpp:1295
-msgid ""
-"The layout file you have selected is an embedded layout that\n"
-"is embedded to a buffer. You cannot make use of it unless\n"
-"it is already embedded to this buffer.\n"
-msgstr ""
+msgid "Error"
+msgstr "Pil"
 
-#: src/frontends/qt4/GuiDocument.cpp:1309
-#: src/frontends/qt4/GuiDocument.cpp:2157
+#: src/frontends/qt4/GuiDocument.cpp:1265
 #, fuzzy
-msgid "Unable to set document class."
+msgid "Unable to read local layout file."
 msgstr "Klarte ikkje å lagre standardval for dokument "
 
-#: src/frontends/qt4/GuiDocument.cpp:1314
-#: src/frontends/qt4/GuiDocument.cpp:2146
+#: src/frontends/qt4/GuiDocument.cpp:1287
+#, fuzzy
+msgid "Select master document"
+msgstr "Hovuddokumentet"
+
+#: src/frontends/qt4/GuiDocument.cpp:1291
+#, fuzzy
+msgid "LyX Files (*.lyx)"
+msgstr "LyX Dokument (*.lyx)"
+
+#: 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:1316
+#: src/frontends/qt4/GuiDocument.cpp:2149
 #, fuzzy
 msgid "Unapplied changes"
 msgstr "Registrer endringar"
 
-#: src/frontends/qt4/GuiDocument.cpp:1315
-#: src/frontends/qt4/GuiDocument.cpp:2147
+#: 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:1317
-#: src/frontends/qt4/GuiDocument.cpp:2149
+#: src/frontends/qt4/GuiDocument.cpp:1319
+#: src/frontends/qt4/GuiDocument.cpp:2152
 msgid "&Dismiss"
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1344
+#: 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:1349
+#: 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:1394
+#: src/frontends/qt4/GuiDocument.cpp:1401
 #, c-format
 msgid "Package(s) required: %1$s."
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1400
+#: src/frontends/qt4/GuiDocument.cpp:1407
 #, fuzzy
 msgid "or"
 msgstr "Skjema"
 
-#: src/frontends/qt4/GuiDocument.cpp:1403
+#: src/frontends/qt4/GuiDocument.cpp:1410
 #, c-format
 msgid "Module required: %1$s."
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1412
+#: src/frontends/qt4/GuiDocument.cpp:1419
 #, c-format
 msgid "Modules excluded: %1$s."
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1418
+#: src/frontends/qt4/GuiDocument.cpp:1425
 msgid "WARNING: Some packages are unavailable!"
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1441
-msgid ""
-"LyX Layout (*.layout);;LaTeX Classes (*.{cls,sty});;BibTeX Databases (*.{bib,"
-"bst})"
-msgstr ""
-
-#: src/frontends/qt4/GuiDocument.cpp:1443
-#, fuzzy
-msgid "Extra embedded file"
-msgstr "Innlemma object|m"
-
-#: src/frontends/qt4/GuiDocument.cpp:2169
+#: src/frontends/qt4/GuiDocument.cpp:2172
 #, fuzzy
 msgid "Can't set layout!"
 msgstr "Endra avsnittstil"
 
-#: src/frontends/qt4/GuiDocument.cpp:2170
+#: 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:2250
+#, fuzzy
+msgid "Not Found"
+msgstr "Ikkje vist."
+
 #: src/frontends/qt4/GuiERT.cpp:29
 msgid "TeX Code Settings"
 msgstr "TeX val"
@@ -16568,56 +17496,56 @@ 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)"
 
-#: src/frontends/qt4/GuiExternal.cpp:86 src/frontends/qt4/GuiGraphics.cpp:799
+#: src/frontends/qt4/GuiExternal.cpp:76 src/frontends/qt4/GuiGraphics.cpp:70
 msgid "Top left"
 msgstr "Øvst til venstre"
 
-#: src/frontends/qt4/GuiExternal.cpp:86 src/frontends/qt4/GuiGraphics.cpp:799
+#: src/frontends/qt4/GuiExternal.cpp:76 src/frontends/qt4/GuiGraphics.cpp:70
 msgid "Bottom left"
 msgstr "Nedst til venstre"
 
-#: src/frontends/qt4/GuiExternal.cpp:86 src/frontends/qt4/GuiGraphics.cpp:799
+#: src/frontends/qt4/GuiExternal.cpp:76 src/frontends/qt4/GuiGraphics.cpp:70
 msgid "Baseline left"
 msgstr "Venstre grunnlinje"
 
-#: src/frontends/qt4/GuiExternal.cpp:87 src/frontends/qt4/GuiGraphics.cpp:800
+#: src/frontends/qt4/GuiExternal.cpp:77 src/frontends/qt4/GuiGraphics.cpp:71
 msgid "Top center"
 msgstr "Øvst midt på"
 
-#: src/frontends/qt4/GuiExternal.cpp:87 src/frontends/qt4/GuiGraphics.cpp:800
+#: src/frontends/qt4/GuiExternal.cpp:77 src/frontends/qt4/GuiGraphics.cpp:71
 msgid "Bottom center"
 msgstr "Nedst midt på"
 
-#: src/frontends/qt4/GuiExternal.cpp:87 src/frontends/qt4/GuiGraphics.cpp:800
+#: src/frontends/qt4/GuiExternal.cpp:77 src/frontends/qt4/GuiGraphics.cpp:71
 msgid "Baseline center"
 msgstr "Midt på grunnlina"
 
-#: src/frontends/qt4/GuiExternal.cpp:88 src/frontends/qt4/GuiGraphics.cpp:801
+#: src/frontends/qt4/GuiExternal.cpp:78 src/frontends/qt4/GuiGraphics.cpp:72
 msgid "Top right"
 msgstr "Øvst til høgre"
 
-#: src/frontends/qt4/GuiExternal.cpp:88 src/frontends/qt4/GuiGraphics.cpp:801
+#: src/frontends/qt4/GuiExternal.cpp:78 src/frontends/qt4/GuiGraphics.cpp:72
 msgid "Bottom right"
 msgstr "Nedst til høgre"
 
-#: src/frontends/qt4/GuiExternal.cpp:88 src/frontends/qt4/GuiGraphics.cpp:801
+#: src/frontends/qt4/GuiExternal.cpp:78 src/frontends/qt4/GuiGraphics.cpp:72
 msgid "Baseline right"
 msgstr "Høgre grunnlinje"
 
-#: src/frontends/qt4/GuiExternal.cpp:95
+#: src/frontends/qt4/GuiExternal.cpp:93
 msgid "External Material"
 msgstr "Eksternt materiale"
 
-#: src/frontends/qt4/GuiExternal.cpp:218
+#: src/frontends/qt4/GuiExternal.cpp:207
 msgid "Scale%"
 msgstr "Storleik%"
 
-#: src/frontends/qt4/GuiExternal.cpp:792
+#: src/frontends/qt4/GuiExternal.cpp:657
 msgid "Select external file"
 msgstr "Vel ekstern fil"
 
@@ -16625,15 +17553,15 @@ msgstr "Vel ekstern fil"
 msgid "Float Settings"
 msgstr "Flytarval"
 
-#: src/frontends/qt4/GuiGraphics.cpp:119 src/frontends/qt4/GuiPrefs.cpp:866
+#: src/frontends/qt4/GuiGraphics.cpp:152 src/frontends/qt4/GuiPrefs.cpp:865
 msgid "Graphics"
 msgstr "Grafikk"
 
-#: src/frontends/qt4/GuiGraphics.cpp:728
+#: src/frontends/qt4/GuiGraphics.cpp:727
 msgid "Select graphics file"
 msgstr "Vel grafikk fil"
 
-#: src/frontends/qt4/GuiGraphics.cpp:740
+#: src/frontends/qt4/GuiGraphics.cpp:739
 msgid "Clipart|#C#c"
 msgstr "Biletesamling|#C#c"
 
@@ -16650,14 +17578,15 @@ msgid ""
 msgstr ""
 
 #: src/frontends/qt4/GuiHyperlink.cpp:29
+#, fuzzy
 msgid "Hyperlink"
-msgstr ""
+msgstr "&Lag lenke"
 
-#: src/frontends/qt4/GuiInclude.cpp:53
+#: src/frontends/qt4/GuiInclude.cpp:48
 msgid "Child Document"
 msgstr "Barnedokumentet"
 
-#: src/frontends/qt4/GuiInclude.cpp:125 src/frontends/qt4/GuiInclude.cpp:188
+#: src/frontends/qt4/GuiInclude.cpp:120 src/frontends/qt4/GuiInclude.cpp:182
 #: src/frontends/qt4/GuiListings.cpp:235 src/frontends/qt4/GuiListings.cpp:368
 #: src/frontends/qt4/GuiListings.cpp:443
 msgid ""
@@ -16665,15 +17594,64 @@ msgid ""
 msgstr ""
 "Skriv inn val for kodelister til høgre. Skriv eit ? for å sjå mogelege val."
 
-#: src/frontends/qt4/GuiInclude.cpp:326
+#: src/frontends/qt4/GuiInclude.cpp:308
 msgid "Select document to include"
 msgstr "Vel eit dokument som skal inn"
 
-#: src/frontends/qt4/GuiInclude.cpp:333
+#: src/frontends/qt4/GuiInclude.cpp:315
 msgid "LaTeX/LyX Documents (*.tex *.lyx)"
 msgstr "LaTeX/LyX Dokument (*.tex *.lyx)"
 
-#: src/frontends/qt4/GuiLabel.cpp:35
+#: src/frontends/qt4/GuiInfo.cpp:46
+#, fuzzy
+msgid "unknown"
+msgstr " ukjent"
+
+#: src/frontends/qt4/GuiInfo.cpp:46
+#, fuzzy
+msgid "shortcut"
+msgstr "&Snøggtast:"
+
+#: src/frontends/qt4/GuiInfo.cpp:46
+#, fuzzy
+msgid "shortcuts"
+msgstr "&Snøggtast:"
+
+#: src/frontends/qt4/GuiInfo.cpp:46
+msgid "lyxrc"
+msgstr ""
+
+#: src/frontends/qt4/GuiInfo.cpp:46
+#, fuzzy
+msgid "package"
+msgstr "Avstand"
+
+#: src/frontends/qt4/GuiInfo.cpp:46
+#, fuzzy
+msgid "textclass"
+msgstr "Subjekt klassifikasjon"
+
+#: src/frontends/qt4/GuiInfo.cpp:47
+#, fuzzy
+msgid "menu"
+msgstr "mu"
+
+#: src/frontends/qt4/GuiInfo.cpp:47
+#, fuzzy
+msgid "icon"
+msgstr "cong"
+
+#: src/frontends/qt4/GuiInfo.cpp:47
+#, fuzzy
+msgid "buffer"
+msgstr "blå"
+
+#: src/frontends/qt4/GuiInfo.cpp:51
+#, fuzzy
+msgid "Info"
+msgstr "Angre"
+
+#: src/frontends/qt4/GuiLabel.cpp:37
 msgid "Label"
 msgstr "Etikett"
 
@@ -16689,39 +17667,39 @@ msgstr "Val for Kodelister"
 msgid "No dialect"
 msgstr "Ingen dialekt"
 
-#: src/frontends/qt4/GuiLog.cpp:101 src/frontends/qt4/GuiLog.cpp:175
+#: src/frontends/qt4/GuiLog.cpp:103 src/frontends/qt4/GuiLog.cpp:180
 msgid "LaTeX Log"
 msgstr "LaTeX-logg"
 
-#: src/frontends/qt4/GuiLog.cpp:177
+#: src/frontends/qt4/GuiLog.cpp:182
 msgid "Literate Programming Build Log"
 msgstr "Loggen til lesbar programmering"
 
-#: src/frontends/qt4/GuiLog.cpp:179
+#: src/frontends/qt4/GuiLog.cpp:184
 msgid "lyx2lyx Error Log"
 msgstr "lyx2lyx feillogg"
 
-#: src/frontends/qt4/GuiLog.cpp:181
+#: src/frontends/qt4/GuiLog.cpp:186
 msgid "Version Control Log"
 msgstr "Loggen til versjonkontrollen"
 
-#: src/frontends/qt4/GuiLog.cpp:207
+#: src/frontends/qt4/GuiLog.cpp:212
 msgid "No LaTeX log file found."
 msgstr "Ingen LaTeX loggfiler."
 
-#: src/frontends/qt4/GuiLog.cpp:210
+#: 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:213
+#: src/frontends/qt4/GuiLog.cpp:218
 msgid "No lyx2lyx error log file found."
 msgstr "Fann ingen lyx2lyx loggfiler."
 
-#: src/frontends/qt4/GuiLog.cpp:216
+#: src/frontends/qt4/GuiLog.cpp:221
 msgid "No version control log file found."
 msgstr "Fann ingen versjonkontroll-logg."
 
-#: src/frontends/qt4/GuiMathMatrix.cpp:31
+#: src/frontends/qt4/GuiMathMatrix.cpp:30
 msgid "Math Matrix"
 msgstr "Matte matrise"
 
@@ -16733,11 +17711,11 @@ msgstr "Nomenklatur"
 msgid "Note Settings"
 msgstr "Notaval"
 
-#: src/frontends/qt4/GuiParagraph.cpp:46
+#: src/frontends/qt4/GuiParagraph.cpp:48
 msgid "Paragraph Settings"
 msgstr "Val for avsnitt"
 
-#: src/frontends/qt4/GuiParagraph.cpp:75
+#: src/frontends/qt4/GuiParagraph.cpp:78
 msgid ""
 "As described in the User Guide, the width of this text determines the width "
 "of the label part of each item in environments like List and Description.\n"
@@ -16751,255 +17729,267 @@ msgstr ""
 " Vanlegvis treng du ikkje endre denne, fordi vi nyttar den lengste etiketten "
 "til å sette bredda på etikettane."
 
-#: src/frontends/qt4/GuiPrefs.cpp:127
+#: src/frontends/qt4/GuiPrefs.cpp:132
 msgid "System files|#S#s"
 msgstr "System filer|#S#s"
 
-#: src/frontends/qt4/GuiPrefs.cpp:131
+#: src/frontends/qt4/GuiPrefs.cpp:136
 msgid "User files|#U#u"
 msgstr "Brukar filer|#B#b"
 
-#: src/frontends/qt4/GuiPrefs.cpp:213
+#: src/frontends/qt4/GuiPrefs.cpp:220
 #, fuzzy
 msgid "Look & Feel"
 msgstr "Utsjånad og kjensle"
 
-#: src/frontends/qt4/GuiPrefs.cpp:215
+#: src/frontends/qt4/GuiPrefs.cpp:222
 #, fuzzy
 msgid "Language Settings"
 msgstr "Språkval"
 
-#: src/frontends/qt4/GuiPrefs.cpp:216
+#: src/frontends/qt4/GuiPrefs.cpp:223
 #, fuzzy
 msgid "Output"
 msgstr "Eksportvegar"
 
-#: src/frontends/qt4/GuiPrefs.cpp:217
+#: src/frontends/qt4/GuiPrefs.cpp:224
 #, fuzzy
 msgid "File Handling"
 msgstr "Handsaming av skrifttyper"
 
-#: src/frontends/qt4/GuiPrefs.cpp:331
-msgid "Plain text"
-msgstr "Rein tekst"
-
-#: src/frontends/qt4/GuiPrefs.cpp:362
+#: src/frontends/qt4/GuiPrefs.cpp:361
 msgid "Date format"
 msgstr "Datoformat"
 
-#: src/frontends/qt4/GuiPrefs.cpp:389
+#: src/frontends/qt4/GuiPrefs.cpp:388
 #, fuzzy
 msgid "Keyboard/Mouse"
 msgstr "Tastatur"
 
-#: src/frontends/qt4/GuiPrefs.cpp:464
+#: src/frontends/qt4/GuiPrefs.cpp:463
 #, fuzzy
 msgid "Input Completion"
 msgstr "Figur/tabell-tekst"
 
-#: src/frontends/qt4/GuiPrefs.cpp:593
+#: src/frontends/qt4/GuiPrefs.cpp:592
 msgid "Screen fonts"
 msgstr "Skjerm skrift"
 
-#: src/frontends/qt4/GuiPrefs.cpp:767
+#: src/frontends/qt4/GuiPrefs.cpp:766
 msgid "Colors"
 msgstr "Fargar"
 
-#: src/frontends/qt4/GuiPrefs.cpp:937
+#: src/frontends/qt4/GuiPrefs.cpp:919
 msgid "Paths"
 msgstr "Stigar"
 
-#: src/frontends/qt4/GuiPrefs.cpp:992
+#: src/frontends/qt4/GuiPrefs.cpp:974
 #, fuzzy
 msgid "Select directory for example files"
 msgstr "Vel mal"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1001
+#: src/frontends/qt4/GuiPrefs.cpp:983
 msgid "Select a document templates directory"
 msgstr "Vel ein stig til malar"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1010
+#: src/frontends/qt4/GuiPrefs.cpp:992
 msgid "Select a temporary directory"
 msgstr "Katalog for mellombelse filer"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1019
+#: src/frontends/qt4/GuiPrefs.cpp:1001
 msgid "Select a backups directory"
 msgstr "Vel stil til reservekopiar"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1028
+#: src/frontends/qt4/GuiPrefs.cpp:1010
 msgid "Select a document directory"
 msgstr "Vel stig til dokument"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1037
+#: 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:1050
+#: src/frontends/qt4/GuiPrefs.cpp:1032
 #: src/frontends/qt4/GuiSpellchecker.cpp:57
 msgid "Spellchecker"
 msgstr "Stavekontroll"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1072
+#: src/frontends/qt4/GuiPrefs.cpp:1054
 msgid "ispell"
 msgstr "ispell"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1073
+#: src/frontends/qt4/GuiPrefs.cpp:1055
 msgid "aspell"
 msgstr "aspell"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1074
+#: src/frontends/qt4/GuiPrefs.cpp:1056
 msgid "hspell"
 msgstr "hspell"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1076
+#: src/frontends/qt4/GuiPrefs.cpp:1058
 msgid "pspell (library)"
 msgstr "psspell (bibliotek )"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1079
+#: src/frontends/qt4/GuiPrefs.cpp:1061
 msgid "aspell (library)"
 msgstr "aspell (bibliotek )"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1159
+#: src/frontends/qt4/GuiPrefs.cpp:1141
 msgid "Converters"
 msgstr "Eksportprogram"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1429
+#: src/frontends/qt4/GuiPrefs.cpp:1446
 msgid "File formats"
 msgstr "Filformat"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1607
+#: src/frontends/qt4/GuiPrefs.cpp:1644
 msgid "Format in use"
 msgstr "Format som er i bruk"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1608
+#: 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:1715
+#: 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:1813 src/frontends/qt4/GuiPrefs.cpp:2432
+#: src/frontends/qt4/GuiPrefs.cpp:1876 src/frontends/qt4/GuiPrefs.cpp:2536
 msgid "User interface"
 msgstr "Grensesnitt"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1895
+#: src/frontends/qt4/GuiPrefs.cpp:1955
 #, fuzzy
 msgid "Control"
 msgstr "Setelen"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1967
+#: src/frontends/qt4/GuiPrefs.cpp:2027
 #, fuzzy
 msgid "Shortcuts"
 msgstr "&Snøggtast:"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1972
+#: src/frontends/qt4/GuiPrefs.cpp:2032
 #, fuzzy
 msgid "Function"
 msgstr "Funksjonar"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2050
+#: src/frontends/qt4/GuiPrefs.cpp:2033
+#, fuzzy
+msgid "Shortcut"
+msgstr "&Snøggtast:"
+
+#: src/frontends/qt4/GuiPrefs.cpp:2113
 msgid "Cursor, Mouse and Editing functions"
 msgstr ""
 
-#: src/frontends/qt4/GuiPrefs.cpp:2054
+#: src/frontends/qt4/GuiPrefs.cpp:2117
 #, fuzzy
 msgid "Mathematical Symbols"
 msgstr "Fonetiske symbol|y"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2058
-msgid "Buffer and Window"
-msgstr ""
+#: src/frontends/qt4/GuiPrefs.cpp:2121
+#, fuzzy
+msgid "Document and Window"
+msgstr "Filhovud-feil"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2062
+#: src/frontends/qt4/GuiPrefs.cpp:2125
 msgid "Font, Layouts and Textclasses"
 msgstr ""
 
-#: src/frontends/qt4/GuiPrefs.cpp:2066
+#: src/frontends/qt4/GuiPrefs.cpp:2129
 #, fuzzy
 msgid "System and Miscellaneous"
 msgstr "AMS ymse"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2188 src/frontends/qt4/GuiPrefs.cpp:2245
+#: src/frontends/qt4/GuiPrefs.cpp:2255 src/frontends/qt4/GuiPrefs.cpp:2300
 #, fuzzy
 msgid "Res&tore"
 msgstr "Gjenopp&rett"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2313 src/frontends/qt4/GuiPrefs.cpp:2320
-#: src/frontends/qt4/GuiPrefs.cpp:2327 src/frontends/qt4/GuiPrefs.cpp:2339
+#: 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:2314
+#: src/frontends/qt4/GuiPrefs.cpp:2402
 #, fuzzy
 msgid "Unknown or invalid LyX function"
 msgstr "Ukjent funksjon."
 
-#: src/frontends/qt4/GuiPrefs.cpp:2321
+#: src/frontends/qt4/GuiPrefs.cpp:2409
 msgid "Invalid or empty key sequence"
 msgstr ""
 
-#: src/frontends/qt4/GuiPrefs.cpp:2328
+#: src/frontends/qt4/GuiPrefs.cpp:2416
 msgid "Shortcut is already defined"
 msgstr ""
 
-#: src/frontends/qt4/GuiPrefs.cpp:2340
+#: 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:2360
+#: src/frontends/qt4/GuiPrefs.cpp:2464
 msgid "Identity"
 msgstr "Identitet"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2555
+#: src/frontends/qt4/GuiPrefs.cpp:2653
 msgid "Choose bind file"
 msgstr "Vel bindingsfil"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2556
+#: src/frontends/qt4/GuiPrefs.cpp:2654
 msgid "LyX bind files (*.bind)"
 msgstr "LyX teiknbindingar (*.bind)"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2562
+#: src/frontends/qt4/GuiPrefs.cpp:2660
 msgid "Choose UI file"
 msgstr "Vel UI fil"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2563
+#: src/frontends/qt4/GuiPrefs.cpp:2661
 msgid "LyX UI files (*.ui)"
 msgstr "LyX UI-filer(*.ui)"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2569
+#: src/frontends/qt4/GuiPrefs.cpp:2667
 msgid "Choose keyboard map"
 msgstr "Vel tastatur oversikt"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2570
+#: src/frontends/qt4/GuiPrefs.cpp:2668
 msgid "LyX keyboard maps (*.kmap)"
 msgstr "LyX;tastaturoversikt.(*.kmap)"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2576
+#: src/frontends/qt4/GuiPrefs.cpp:2674
 msgid "Choose personal dictionary"
 msgstr "Vel personleg ordbok"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2577
+#: src/frontends/qt4/GuiPrefs.cpp:2675
 msgid "*.pws"
 msgstr "*.pws"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2577
+#: src/frontends/qt4/GuiPrefs.cpp:2675
 msgid "*.ispell"
 msgstr "*.ispell"
 
-#: src/frontends/qt4/GuiPrint.cpp:44
+#: src/frontends/qt4/GuiPrint.cpp:43
 msgid "Print Document"
 msgstr "Skriv ut dokumentet"
 
-#: src/frontends/qt4/GuiPrint.cpp:88
+#: src/frontends/qt4/GuiPrint.cpp:87
 msgid "Print to file"
 msgstr "Skriv ut til fil"
 
-#: src/frontends/qt4/GuiPrint.cpp:89
+#: src/frontends/qt4/GuiPrint.cpp:88
 msgid "PostScript files (*.ps)"
 msgstr "PostScript filer (*.ps)"
 
@@ -17007,15 +17997,15 @@ msgstr "PostScript filer (*.ps)"
 msgid "Cross-reference"
 msgstr "Kryssreferanse"
 
-#: src/frontends/qt4/GuiRef.cpp:256
+#: src/frontends/qt4/GuiRef.cpp:264
 msgid "&Go Back"
 msgstr "&Gå tilbake"
 
-#: src/frontends/qt4/GuiRef.cpp:258
+#: src/frontends/qt4/GuiRef.cpp:266
 msgid "Jump back"
 msgstr "Hopp tilbake"
 
-#: src/frontends/qt4/GuiRef.cpp:266
+#: src/frontends/qt4/GuiRef.cpp:274
 msgid "Jump to label"
 msgstr "Gå til referanse"
 
@@ -17073,413 +18063,423 @@ msgstr "Eit ord er sjekka."
 msgid "Spelling check completed"
 msgstr "Stavekontrollen er ferdig"
 
-#: src/frontends/qt4/GuiSymbols.cpp:51
+#: src/frontends/qt4/GuiSymbols.cpp:52
 #, fuzzy
 msgid "Basic Latin"
 msgstr "Variasjon"
 
-#: src/frontends/qt4/GuiSymbols.cpp:52
+#: src/frontends/qt4/GuiSymbols.cpp:53
 #, fuzzy
 msgid "Latin-1 Supplement"
 msgstr "Tillegg"
 
-#: src/frontends/qt4/GuiSymbols.cpp:53
+#: src/frontends/qt4/GuiSymbols.cpp:54
 msgid "Latin Extended-A"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:54
+#: src/frontends/qt4/GuiSymbols.cpp:55
 msgid "Latin Extended-B"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:55
+#: src/frontends/qt4/GuiSymbols.cpp:56
 #, fuzzy
 msgid "IPA Extensions"
 msgstr "Fil E&tternamn:"
 
-#: src/frontends/qt4/GuiSymbols.cpp:56
+#: src/frontends/qt4/GuiSymbols.cpp:57
 msgid "Spacing Modifier Letters"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:57
+#: src/frontends/qt4/GuiSymbols.cpp:58
 msgid "Combining Diacritical Marks"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:59
+#: src/frontends/qt4/GuiSymbols.cpp:60
 msgid "Cyrillic"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:62
+#: src/frontends/qt4/GuiSymbols.cpp:63
 #, fuzzy
 msgid "Arabic"
 msgstr "Arabisk"
 
-#: src/frontends/qt4/GuiSymbols.cpp:63
+#: src/frontends/qt4/GuiSymbols.cpp:64
 msgid "Devanagari"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:64
+#: src/frontends/qt4/GuiSymbols.cpp:65
 #, fuzzy
 msgid "Bengali"
 msgstr "Start"
 
-#: src/frontends/qt4/GuiSymbols.cpp:65
+#: src/frontends/qt4/GuiSymbols.cpp:66
 msgid "Gurmukhi"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:66
+#: src/frontends/qt4/GuiSymbols.cpp:67
 #, fuzzy
 msgid "Gujarati"
 msgstr "Undervariasjon"
 
-#: src/frontends/qt4/GuiSymbols.cpp:67
+#: src/frontends/qt4/GuiSymbols.cpp:68
 msgid "Oriya"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:68
+#: src/frontends/qt4/GuiSymbols.cpp:69
 #, fuzzy
 msgid "Tamil"
 msgstr "E-post"
 
-#: src/frontends/qt4/GuiSymbols.cpp:69
+#: src/frontends/qt4/GuiSymbols.cpp:70
 msgid "Telugu"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:70
+#: src/frontends/qt4/GuiSymbols.cpp:71
 #, fuzzy
 msgid "Kannada"
 msgstr "Kanadisk"
 
-#: src/frontends/qt4/GuiSymbols.cpp:71
+#: src/frontends/qt4/GuiSymbols.cpp:72
 msgid "Malayalam"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:73
+#: src/frontends/qt4/GuiSymbols.cpp:74
 #, fuzzy
 msgid "Lao"
 msgstr "Stil "
 
-#: src/frontends/qt4/GuiSymbols.cpp:74
+#: src/frontends/qt4/GuiSymbols.cpp:75
 #, fuzzy
 msgid "Tibetan"
 msgstr "beta"
 
-#: src/frontends/qt4/GuiSymbols.cpp:75
+#: src/frontends/qt4/GuiSymbols.cpp:76
 #, fuzzy
 msgid "Georgian"
 msgstr "Tysk"
 
-#: src/frontends/qt4/GuiSymbols.cpp:76
+#: src/frontends/qt4/GuiSymbols.cpp:77
 msgid "Hangul Jamo"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:77
+#: src/frontends/qt4/GuiSymbols.cpp:78
 #, fuzzy
 msgid "Phonetic Extensions"
 msgstr "Fil E&tternamn:"
 
-#: src/frontends/qt4/GuiSymbols.cpp:78
+#: src/frontends/qt4/GuiSymbols.cpp:79
 msgid "Latin Extended Additional"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:79
+#: src/frontends/qt4/GuiSymbols.cpp:80
 msgid "Greek Extended"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:80
+#: src/frontends/qt4/GuiSymbols.cpp:81
 #, fuzzy
 msgid "General Punctuation"
 msgstr "Generell informasjon"
 
-#: src/frontends/qt4/GuiSymbols.cpp:81
+#: src/frontends/qt4/GuiSymbols.cpp:82
 #, fuzzy
 msgid "Superscripts and Subscripts"
 msgstr "Heva tekst|v"
 
-#: src/frontends/qt4/GuiSymbols.cpp:82
+#: src/frontends/qt4/GuiSymbols.cpp:83
+#, fuzzy
 msgid "Currency Symbols"
-msgstr ""
+msgstr "Fonetiske symbol|y"
 
-#: src/frontends/qt4/GuiSymbols.cpp:83
+#: src/frontends/qt4/GuiSymbols.cpp:84
 msgid "Combining Diacritical Marks for Symbols"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:84
+#: src/frontends/qt4/GuiSymbols.cpp:85
 #, fuzzy
 msgid "Letterlike Symbols"
 msgstr "Fonetiske symbol|y"
 
-#: src/frontends/qt4/GuiSymbols.cpp:85
+#: src/frontends/qt4/GuiSymbols.cpp:86
 #, fuzzy
 msgid "Number Forms"
 msgstr "Tal på rader"
 
-#: src/frontends/qt4/GuiSymbols.cpp:87
+#: src/frontends/qt4/GuiSymbols.cpp:88
 #, fuzzy
 msgid "Mathematical Operators"
 msgstr "Mathematica|a"
 
-#: src/frontends/qt4/GuiSymbols.cpp:88
+#: src/frontends/qt4/GuiSymbols.cpp:89
 #, fuzzy
 msgid "Miscellaneous Technical"
 msgstr "Ymse"
 
-#: src/frontends/qt4/GuiSymbols.cpp:89
+#: src/frontends/qt4/GuiSymbols.cpp:90
 #, fuzzy
 msgid "Control Pictures"
 msgstr "Konjektur"
 
-#: src/frontends/qt4/GuiSymbols.cpp:90
+#: src/frontends/qt4/GuiSymbols.cpp:91
 msgid "Optical Character Recognition"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:91
+#: src/frontends/qt4/GuiSymbols.cpp:92
 msgid "Enclosed Alphanumerics"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:92
+#: src/frontends/qt4/GuiSymbols.cpp:93
 #, fuzzy
 msgid "Box Drawing"
 msgstr "Rammeval"
 
-#: src/frontends/qt4/GuiSymbols.cpp:93
+#: src/frontends/qt4/GuiSymbols.cpp:94
 #, fuzzy
 msgid "Block Elements"
 msgstr "Takk"
 
-#: src/frontends/qt4/GuiSymbols.cpp:94
+#: src/frontends/qt4/GuiSymbols.cpp:95
 #, fuzzy
 msgid "Geometric Shapes"
 msgstr "Kursiv tekst"
 
-#: src/frontends/qt4/GuiSymbols.cpp:95
+#: src/frontends/qt4/GuiSymbols.cpp:96
 #, fuzzy
 msgid "Miscellaneous Symbols"
 msgstr "Ymse"
 
-#: src/frontends/qt4/GuiSymbols.cpp:96
+#: src/frontends/qt4/GuiSymbols.cpp:97
 #, fuzzy
 msgid "Dingbats"
 msgstr "Dings 1"
 
-#: src/frontends/qt4/GuiSymbols.cpp:97
+#: src/frontends/qt4/GuiSymbols.cpp:98
+#, fuzzy
 msgid "Miscellaneous Mathematical Symbols-A"
-msgstr ""
+msgstr "Ymse"
 
-#: src/frontends/qt4/GuiSymbols.cpp:98
+#: src/frontends/qt4/GuiSymbols.cpp:99
 msgid "CJK Symbols and Punctuation"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:99
+#: src/frontends/qt4/GuiSymbols.cpp:100
 msgid "Hiragana"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:100
+#: src/frontends/qt4/GuiSymbols.cpp:101
 #, fuzzy
 msgid "Katakana"
 msgstr "Katalansk"
 
-#: src/frontends/qt4/GuiSymbols.cpp:101
+#: src/frontends/qt4/GuiSymbols.cpp:102
 #, fuzzy
 msgid "Bopomofo"
 msgstr "&Nedste rada:"
 
-#: src/frontends/qt4/GuiSymbols.cpp:102
+#: src/frontends/qt4/GuiSymbols.cpp:103
 msgid "Hangul Compatibility Jamo"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:103
+#: src/frontends/qt4/GuiSymbols.cpp:104
+#, fuzzy
 msgid "Kanbun"
-msgstr ""
+msgstr "Kanadisk"
 
-#: src/frontends/qt4/GuiSymbols.cpp:104
+#: src/frontends/qt4/GuiSymbols.cpp:105
 msgid "Enclosed CJK Letters and Months"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:105
+#: src/frontends/qt4/GuiSymbols.cpp:106
 msgid "CJK Compatibility"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:106
+#: src/frontends/qt4/GuiSymbols.cpp:107
 msgid "CJK Unified Ideographs"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:107
+#: src/frontends/qt4/GuiSymbols.cpp:108
 msgid "Hangul Syllables"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:108
+#: src/frontends/qt4/GuiSymbols.cpp:109
 msgid "High Surrogates"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:109
+#: src/frontends/qt4/GuiSymbols.cpp:110
 msgid "Private Use High Surrogates"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:110
+#: src/frontends/qt4/GuiSymbols.cpp:111
 msgid "Low Surrogates"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:111
+#: src/frontends/qt4/GuiSymbols.cpp:112
 msgid "Private Use Area"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:112
+#: src/frontends/qt4/GuiSymbols.cpp:113
 msgid "CJK Compatibility Ideographs"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:113
+#: src/frontends/qt4/GuiSymbols.cpp:114
 msgid "Alphabetic Presentation Forms"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:114
+#: src/frontends/qt4/GuiSymbols.cpp:115
+#, fuzzy
 msgid "Arabic Presentation Forms-A"
-msgstr ""
+msgstr "Retning"
 
-#: src/frontends/qt4/GuiSymbols.cpp:115
+#: src/frontends/qt4/GuiSymbols.cpp:116
 msgid "Combining Half Marks"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:116
+#: src/frontends/qt4/GuiSymbols.cpp:117
 msgid "CJK Compatibility Forms"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:117
+#: src/frontends/qt4/GuiSymbols.cpp:118
 msgid "Small Form Variants"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:118
+#: src/frontends/qt4/GuiSymbols.cpp:119
+#, fuzzy
 msgid "Arabic Presentation Forms-B"
-msgstr ""
+msgstr "Retning"
 
-#: src/frontends/qt4/GuiSymbols.cpp:119
+#: src/frontends/qt4/GuiSymbols.cpp:120
 msgid "Halfwidth and Fullwidth Forms"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:120
+#: src/frontends/qt4/GuiSymbols.cpp:121
 #, fuzzy
 msgid "Specials"
 msgstr "Spesial post"
 
-#: src/frontends/qt4/GuiSymbols.cpp:121
+#: src/frontends/qt4/GuiSymbols.cpp:122
+#, fuzzy
 msgid "Linear B Syllabary"
-msgstr ""
+msgstr "Korollar"
 
-#: src/frontends/qt4/GuiSymbols.cpp:122
+#: src/frontends/qt4/GuiSymbols.cpp:123
 msgid "Linear B Ideograms"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:123
+#: src/frontends/qt4/GuiSymbols.cpp:124
 #, fuzzy
 msgid "Aegean Numbers"
 msgstr "Sidetal"
 
-#: src/frontends/qt4/GuiSymbols.cpp:124
+#: src/frontends/qt4/GuiSymbols.cpp:125
+#, fuzzy
 msgid "Ancient Greek Numbers"
-msgstr ""
+msgstr "Sidetal"
 
-#: src/frontends/qt4/GuiSymbols.cpp:125
+#: src/frontends/qt4/GuiSymbols.cpp:126
 #, fuzzy
 msgid "Old Italic"
 msgstr "Kursiv"
 
-#: src/frontends/qt4/GuiSymbols.cpp:126
+#: src/frontends/qt4/GuiSymbols.cpp:127
 #, fuzzy
 msgid "Gothic"
 msgstr "coth"
 
-#: src/frontends/qt4/GuiSymbols.cpp:127
+#: src/frontends/qt4/GuiSymbols.cpp:128
 msgid "Ugaritic"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:128
+#: src/frontends/qt4/GuiSymbols.cpp:129
 msgid "Old Persian"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:129
+#: src/frontends/qt4/GuiSymbols.cpp:130
 #, fuzzy
 msgid "Deseret"
 msgstr "Nullstill"
 
-#: src/frontends/qt4/GuiSymbols.cpp:130
+#: src/frontends/qt4/GuiSymbols.cpp:131
 #, fuzzy
 msgid "Shavian"
 msgstr "Latvisk"
 
-#: src/frontends/qt4/GuiSymbols.cpp:131
+#: src/frontends/qt4/GuiSymbols.cpp:132
 msgid "Osmanya"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:132
+#: src/frontends/qt4/GuiSymbols.cpp:133
 #, fuzzy
 msgid "Cypriot Syllabary"
 msgstr "Korollar"
 
-#: src/frontends/qt4/GuiSymbols.cpp:133
+#: src/frontends/qt4/GuiSymbols.cpp:134
 #, fuzzy
 msgid "Kharoshthi"
 msgstr "varnothing"
 
-#: src/frontends/qt4/GuiSymbols.cpp:134
+#: src/frontends/qt4/GuiSymbols.cpp:135
+#, fuzzy
 msgid "Byzantine Musical Symbols"
-msgstr ""
+msgstr "Fonetiske symbol|y"
 
-#: src/frontends/qt4/GuiSymbols.cpp:135
+#: src/frontends/qt4/GuiSymbols.cpp:136
 #, fuzzy
 msgid "Musical Symbols"
 msgstr "Fonetiske symbol|y"
 
-#: src/frontends/qt4/GuiSymbols.cpp:136
+#: src/frontends/qt4/GuiSymbols.cpp:137
 msgid "Ancient Greek Musical Notation"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:137
+#: src/frontends/qt4/GuiSymbols.cpp:138
 msgid "Tai Xuan Jing Symbols"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:138
+#: src/frontends/qt4/GuiSymbols.cpp:139
+#, fuzzy
 msgid "Mathematical Alphanumeric Symbols"
-msgstr ""
+msgstr "Fonetiske symbol|y"
 
-#: src/frontends/qt4/GuiSymbols.cpp:139
+#: src/frontends/qt4/GuiSymbols.cpp:140
 msgid "CJK Unified Ideographs Extension B"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:140
+#: src/frontends/qt4/GuiSymbols.cpp:141
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:141
+#: src/frontends/qt4/GuiSymbols.cpp:142
 #, fuzzy
 msgid "Tags"
 msgstr "Sider"
 
-#: src/frontends/qt4/GuiSymbols.cpp:142
+#: src/frontends/qt4/GuiSymbols.cpp:143
+#, fuzzy
 msgid "Variation Selectors Supplement"
-msgstr ""
+msgstr "Tillegg"
 
-#: src/frontends/qt4/GuiSymbols.cpp:143
+#: src/frontends/qt4/GuiSymbols.cpp:144
 msgid "Supplementary Private Use Area-A"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:144
+#: src/frontends/qt4/GuiSymbols.cpp:145
 msgid "Supplementary Private Use Area-B"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:223
+#: src/frontends/qt4/GuiSymbols.cpp:224
 #, fuzzy
 msgid "Character: "
 msgstr "Teiknsett"
 
-#: src/frontends/qt4/GuiSymbols.cpp:224
+#: src/frontends/qt4/GuiSymbols.cpp:225
 msgid "Code Point: "
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:267
+#: src/frontends/qt4/GuiSymbols.cpp:268
 #, fuzzy
 msgid "Symbols"
 msgstr "Symbol"
 
-#: src/frontends/qt4/GuiTabular.cpp:39
+#: src/frontends/qt4/GuiTabular.cpp:41
 msgid "Table Settings"
 msgstr "Tabellval"
 
@@ -17491,158 +18491,139 @@ msgstr "Set inn tabell"
 msgid "TeX Information"
 msgstr "TeX informasjon"
 
-#: src/frontends/qt4/GuiToc.cpp:47
+#: src/frontends/qt4/GuiToc.cpp:36
 msgid "Outline"
 msgstr "Disposisjon"
 
-#: src/frontends/qt4/GuiToc.cpp:224 src/insets/InsetTOC.cpp:48
-msgid "Table of Contents"
-msgstr "Innhaldsliste"
-
-#: src/frontends/qt4/GuiToc.cpp:226 src/frontends/qt4/Menus.cpp:915
-#, fuzzy
-msgid "Child Documents"
-msgstr "Barnedokumentet"
-
-#: src/frontends/qt4/GuiToc.cpp:230 src/frontends/qt4/Menus.cpp:920
-#, fuzzy
-msgid "List of Graphics"
-msgstr "Liste over tabellar"
-
-#: src/frontends/qt4/GuiToc.cpp:232 src/frontends/qt4/Menus.cpp:922
-#, fuzzy
-msgid "List of Equations"
-msgstr "Liste over kodelister"
-
-#: src/frontends/qt4/GuiToc.cpp:234 src/frontends/qt4/Menus.cpp:937
-#, fuzzy
-msgid "List of Foot notes"
-msgstr "Liste over figurar"
-
-#: src/frontends/qt4/GuiToc.cpp:236
-#, fuzzy
-msgid "List of Listings"
-msgstr "Liste over kodelister"
-
-#: src/frontends/qt4/GuiToc.cpp:238 src/frontends/qt4/Menus.cpp:924
-#, fuzzy
-msgid "List of Indexes"
-msgstr "Liste over tabellar"
+#: src/frontends/qt4/GuiToolbar.cpp:368
+msgid "Filtering layouts with \""
+msgstr ""
 
-#: src/frontends/qt4/GuiToc.cpp:240 src/frontends/qt4/Menus.cpp:933
-#, fuzzy
-msgid "List of Marginal notes"
-msgstr "Liste over tabellar"
+#: src/frontends/qt4/GuiToolbar.cpp:371 src/frontends/qt4/GuiToolbar.cpp:420
+msgid "Enter characters to filter the layout list."
+msgstr ""
 
-#: src/frontends/qt4/GuiToc.cpp:242 src/frontends/qt4/Menus.cpp:935
+#: src/frontends/qt4/GuiToolbar.cpp:537
 #, fuzzy
-msgid "List of Notes"
-msgstr "Liste over tabellar"
+msgid " (unknown)"
+msgstr " ukjent"
 
-#: src/frontends/qt4/GuiToc.cpp:244 src/frontends/qt4/Menus.cpp:941
+#: src/frontends/qt4/GuiToolbar.cpp:945
 #, fuzzy
-msgid "List of Citations"
-msgstr "Liste over kodelister"
+msgid "auto"
+msgstr " (auto)"
 
-#: src/frontends/qt4/GuiToc.cpp:246 src/frontends/qt4/Menus.cpp:939
+#: src/frontends/qt4/GuiToolbar.cpp:950 src/frontends/qt4/GuiToolbar.cpp:959
 #, fuzzy
-msgid "Labels and References"
-msgstr "Litteratur ikkje nytta i teksten"
-
-#: src/frontends/qt4/GuiToolbar.cpp:541
-msgid "Filtering layouts with \""
-msgstr ""
+msgid "off"
+msgstr "Av"
 
-#: src/frontends/qt4/GuiToolbar.cpp:544 src/frontends/qt4/GuiToolbar.cpp:593
-msgid "Enter characters to filter the layout list."
+#: src/frontends/qt4/GuiToolbar.cpp:966
+#, c-format
+msgid "Toolbar \"%1$s\" state set to %2$s"
 msgstr ""
 
 #: src/frontends/qt4/GuiVSpace.cpp:44
 msgid "Vertical Space Settings"
 msgstr "Val for loddrettmellomrom"
 
-#: src/frontends/qt4/GuiView.cpp:117
+#: src/frontends/qt4/GuiView.cpp:118
 #, fuzzy
 msgid "version "
 msgstr "Versjon"
 
-#: src/frontends/qt4/GuiView.cpp:117
+#: src/frontends/qt4/GuiView.cpp:118
 msgid "unknown version"
 msgstr "ukjent versjon"
 
-#: src/frontends/qt4/GuiView.cpp:182
+#: src/frontends/qt4/GuiView.cpp:185
 msgid "Small-sized icons"
 msgstr "Små ikon"
 
-#: src/frontends/qt4/GuiView.cpp:189
+#: src/frontends/qt4/GuiView.cpp:192
 msgid "Normal-sized icons"
 msgstr "Normale ikon"
 
-#: src/frontends/qt4/GuiView.cpp:196
+#: src/frontends/qt4/GuiView.cpp:199
 msgid "Big-sized icons"
 msgstr "Store ikon"
 
-#: src/frontends/qt4/GuiView.cpp:621 src/frontends/qt4/GuiView.cpp:622
-#: src/mathed/MathMacroTemplate.cpp:536
-msgid "LyX"
-msgstr "LyX"
+#: src/frontends/qt4/GuiView.cpp:396
+#, fuzzy, c-format
+msgid "Unknown toolbar \"%1$s\""
+msgstr "Ukjent tabellval '%1$s'"
 
-#: src/frontends/qt4/GuiView.cpp:1122
+#: src/frontends/qt4/GuiView.cpp:1218
 msgid "Select template file"
 msgstr "Vel mal"
 
-#: src/frontends/qt4/GuiView.cpp:1124 src/frontends/qt4/GuiView.cpp:1515
+#: 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:1128 src/frontends/qt4/GuiView.cpp:1187
-#: src/frontends/qt4/GuiView.cpp:1441 src/frontends/qt4/GuiView.cpp:1520
+#: 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:1145
+#: src/frontends/qt4/GuiView.cpp:1240
 msgid "Document not loaded."
 msgstr "Dokumentet er ikkje lasta."
 
-#: src/frontends/qt4/GuiView.cpp:1181
+#: src/frontends/qt4/GuiView.cpp:1276
 msgid "Select document to open"
 msgstr "Vel dokument"
 
-#: src/frontends/qt4/GuiView.cpp:1183 src/frontends/qt4/GuiView.cpp:1316
-#: src/frontends/qt4/GuiView.cpp:1435
+#: 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:1219
+#: 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:1228
+#: src/frontends/qt4/GuiView.cpp:1327
 #, c-format
 msgid "Document %1$s opened."
 msgstr "Dokumentet %1$s er ope."
 
-#: src/frontends/qt4/GuiView.cpp:1230
+#: 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:1259
+#: src/frontends/qt4/GuiView.cpp:1358
 msgid "Couldn't import file"
 msgstr "Kan ikkje importere fila"
 
-#: src/frontends/qt4/GuiView.cpp:1260
+#: 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:1311
+#: 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:1362 src/frontends/qt4/GuiView.cpp:1541
+#: src/frontends/qt4/GuiView.cpp:1461 src/frontends/qt4/GuiView.cpp:1637
 #, fuzzy, c-format
 msgid ""
 "The document %1$s already exists.\n"
@@ -17653,42 +18634,42 @@ msgstr ""
 "\n"
 "Vil du skriva over dokumentet?"
 
-#: src/frontends/qt4/GuiView.cpp:1364 src/frontends/qt4/GuiView.cpp:1545
+#: 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:1373
+#: src/frontends/qt4/GuiView.cpp:1472
 #, c-format
 msgid "Importing %1$s..."
 msgstr "Importerer %1$s..."
 
-#: src/frontends/qt4/GuiView.cpp:1376
+#: src/frontends/qt4/GuiView.cpp:1475
 msgid "imported."
 msgstr "importert."
 
-#: src/frontends/qt4/GuiView.cpp:1378
+#: src/frontends/qt4/GuiView.cpp:1477
 #, fuzzy
 msgid "file not imported!"
 msgstr "Kan ikkje finne fila"
 
-#: src/frontends/qt4/GuiView.cpp:1433
+#: 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:1475
+#: src/frontends/qt4/GuiView.cpp:1573
 msgid "Select file to insert"
 msgstr "Vel fil å setje inn"
 
-#: src/frontends/qt4/GuiView.cpp:1512
+#: src/frontends/qt4/GuiView.cpp:1610
 msgid "Choose a filename to save document as"
 msgstr "Vel eit anna filnamn"
 
-#: src/frontends/qt4/GuiView.cpp:1546 src/frontends/qt4/GuiView.cpp:1591
+#: src/frontends/qt4/GuiView.cpp:1642 src/frontends/qt4/GuiView.cpp:1687
 msgid "&Rename"
 msgstr "End&ra namn"
 
-#: src/frontends/qt4/GuiView.cpp:1587
+#: src/frontends/qt4/GuiView.cpp:1683
 #, c-format
 msgid ""
 "The document %1$s could not be saved.\n"
@@ -17699,16 +18680,16 @@ msgstr ""
 "\n"
 "Vil du prøve å gi dokumentet eit nytt namn?"
 
-#: src/frontends/qt4/GuiView.cpp:1590
+#: src/frontends/qt4/GuiView.cpp:1686
 msgid "Rename and save?"
 msgstr "Gje nytt namn og lagra?"
 
-#: src/frontends/qt4/GuiView.cpp:1591
+#: src/frontends/qt4/GuiView.cpp:1687
 #, fuzzy
 msgid "&Retry"
 msgstr "Gjenopp&rett"
 
-#: src/frontends/qt4/GuiView.cpp:1641
+#: src/frontends/qt4/GuiView.cpp:1737
 #, c-format
 msgid ""
 "The document %1$s has unsaved changes.\n"
@@ -17719,78 +18700,59 @@ msgstr ""
 "\n"
 "Vil du lagra dokumentet eller forkaste endringane?"
 
-#: src/frontends/qt4/GuiView.cpp:1644
+#: src/frontends/qt4/GuiView.cpp:1740
 msgid "&Discard"
 msgstr "&Forkast"
 
-#: src/frontends/qt4/GuiView.cpp:1736
+#: src/frontends/qt4/GuiView.cpp:1844
 #, fuzzy
 msgid "Saving all documents..."
 msgstr "Lagrar %1$s..."
 
-#: src/frontends/qt4/GuiView.cpp:1746
+#: src/frontends/qt4/GuiView.cpp:1854
 #, fuzzy
 msgid "All documents saved."
 msgstr "Dokumentet er ikkje lagra!"
 
-#: src/frontends/qt4/GuiView.cpp:1765
-#, fuzzy, c-format
-msgid "Unknown toolbar \"%1$s\""
-msgstr "Ukjent tabellval '%1$s'"
-
-#: src/frontends/qt4/GuiView.cpp:1772
-#, fuzzy
-msgid "off"
-msgstr "Av"
-
-#: src/frontends/qt4/GuiView.cpp:1774
-#, fuzzy
-msgid "auto"
-msgstr " (auto)"
-
-#: src/frontends/qt4/GuiView.cpp:1776
-#, c-format
-msgid "Toolbar \"%1$s\" state set to %2$s"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:1951
+#: src/frontends/qt4/GuiView.cpp:2054
 #, c-format
 msgid "%1$s unknown command!"
 msgstr ""
 
-#: src/frontends/qt4/GuiViewSource.cpp:92
-#: src/frontends/qt4/GuiViewSource.cpp:164
+#: src/frontends/qt4/GuiViewSource.cpp:94
+#: src/frontends/qt4/GuiViewSource.cpp:176
 msgid "LaTeX Source"
 msgstr "LaTeX kjeldekode"
 
-#: src/frontends/qt4/GuiViewSource.cpp:166
+#: src/frontends/qt4/GuiViewSource.cpp:178
+#, fuzzy
 msgid "DocBook Source"
-msgstr ""
+msgstr "Bokmerke|B"
 
-#: src/frontends/qt4/GuiViewSource.cpp:168
+#: src/frontends/qt4/GuiViewSource.cpp:180
 #, fuzzy
 msgid "Literate Source"
 msgstr "LaTeX kjeldekode"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:1122
+#: src/frontends/qt4/GuiWorkArea.cpp:1150
 msgid " (changed)"
 msgstr " (endra)"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:1126
+#: src/frontends/qt4/GuiWorkArea.cpp:1154
 msgid " (read only)"
 msgstr " (berre lesing)"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:1213
+#: src/frontends/qt4/GuiWorkArea.cpp:1241
 #, fuzzy
 msgid "Close File"
 msgstr "Lat att"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:1413
+#: src/frontends/qt4/GuiWorkArea.cpp:1634
 #, fuzzy
 msgid "Hide tab"
 msgstr "delta"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:1415
+#: src/frontends/qt4/GuiWorkArea.cpp:1636
 #, fuzzy
 msgid "Close tab"
 msgstr "Lat att"
@@ -17804,56 +18766,54 @@ msgstr "Flytarval"
 msgid "Click to detach"
 msgstr ""
 
-#: src/frontends/qt4/Menus.cpp:652
+#: src/frontends/qt4/Menus.cpp:649
+msgid "No Group"
+msgstr ""
+
+#: src/frontends/qt4/Menus.cpp:699
 #, fuzzy
 msgid "No Documents Open!"
 msgstr "Ingen opne dokument!"
 
-#: src/frontends/qt4/Menus.cpp:678 src/frontends/qt4/Menus.cpp:755
-#: src/frontends/qt4/Menus.cpp:775 src/frontends/qt4/Menus.cpp:796
-#: src/frontends/qt4/Menus.cpp:878 src/frontends/qt4/Menus.cpp:1034
+#: 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:719
-msgid "Plain Text"
-msgstr "Rein tekst"
-
-#: src/frontends/qt4/Menus.cpp:721
-msgid "Plain Text, Join Lines"
-msgstr "Rein tekst, knyt saman linjer"
-
-#: src/frontends/qt4/Menus.cpp:893
+#: src/frontends/qt4/Menus.cpp:938
 msgid "Master Document"
 msgstr "Hovuddokumentet"
 
-#: src/frontends/qt4/Menus.cpp:944
-#, fuzzy
-msgid "Other floats: "
-msgstr "Andre flytarar"
-
-#: src/frontends/qt4/Menus.cpp:950
+#: src/frontends/qt4/Menus.cpp:955
 msgid "Open Navigator..."
 msgstr ""
 
-#: src/frontends/qt4/Menus.cpp:971
+#: src/frontends/qt4/Menus.cpp:976
 #, fuzzy
 msgid "Other Lists"
 msgstr "Andre flytarar"
 
-#: src/frontends/qt4/Menus.cpp:981
+#: src/frontends/qt4/Menus.cpp:985
 msgid "No Table of contents"
 msgstr "Inga innhaldsliste"
 
-#: src/frontends/qt4/Menus.cpp:1023
-msgid " (auto)"
-msgstr " (auto)"
+#: src/frontends/qt4/Menus.cpp:1022
+#, fuzzy
+msgid "Other Toolbars"
+msgstr "Verktylinjer|y"
 
-#: src/frontends/qt4/Menus.cpp:1042
+#: src/frontends/qt4/Menus.cpp:1041
 msgid "No Branch in Document!"
 msgstr "Ingen greiner i dokumentet!"
 
-#: src/frontends/qt4/Menus.cpp:1539
+#: 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:1600
 #, fuzzy
 msgid "No action defined!"
 msgstr "Det er ikkje definert noko skrifttype endring."
@@ -17863,8 +18823,8 @@ msgid "space"
 msgstr "mellomrom"
 
 #: src/frontends/qt4/Validator.cpp:175 src/insets/ExternalSupport.cpp:365
-#: src/insets/InsetBibtex.cpp:194 src/insets/InsetGraphics.cpp:615
-#: src/insets/InsetInclude.cpp:447
+#: src/insets/InsetBibtex.cpp:286 src/insets/InsetGraphics.cpp:586
+#: src/insets/InsetInclude.cpp:443
 msgid "Invalid filename"
 msgstr "Ugyldig filnamn"
 
@@ -17874,46 +18834,145 @@ msgid ""
 "characters:\n"
 msgstr "LyX støttar ikkje LaTeX filer med desse teikna i filnamnet:\n"
 
-#: src/frontends/qt4/qt_helpers.cpp:229
+#: 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:230
+#: src/frontends/qt4/qt_helpers.cpp:174
 #, c-format
 msgid "The script `%s' failed."
 msgstr "Køyringa av programmet %s gjekk gale."
 
-#: src/insets/ExternalSupport.cpp:366 src/insets/InsetBibtex.cpp:195
-#: src/insets/InsetGraphics.cpp:616 src/insets/InsetInclude.cpp:448
+#: src/frontends/qt4/qt_helpers.cpp:405
+#, fuzzy
+msgid "All Files "
+msgstr "Alle filer (*)"
+
+#: src/frontends/qt4/qt_helpers.cpp:478 src/insets/InsetTOC.cpp:49
+msgid "Table of Contents"
+msgstr "Innhaldsliste"
+
+#: src/frontends/qt4/qt_helpers.cpp:480
+#, fuzzy
+msgid "Child Documents"
+msgstr "Barnedokumentet"
+
+#: src/frontends/qt4/qt_helpers.cpp:482
+#, fuzzy
+msgid "List of Graphics"
+msgstr "Liste over tabellar"
+
+#: src/frontends/qt4/qt_helpers.cpp:484
+#, fuzzy
+msgid "List of Equations"
+msgstr "Liste over kodelister"
+
+#: src/frontends/qt4/qt_helpers.cpp:486
+#, fuzzy
+msgid "List of Footnotes"
+msgstr "Liste over figurar"
+
+#: src/frontends/qt4/qt_helpers.cpp:488
+#, fuzzy
+msgid "List of Listings"
+msgstr "Liste over kodelister"
+
+#: src/frontends/qt4/qt_helpers.cpp:490
+#, fuzzy
+msgid "List of Indexes"
+msgstr "Liste over tabellar"
+
+#: src/frontends/qt4/qt_helpers.cpp:492
+#, fuzzy
+msgid "List of Marginal notes"
+msgstr "Liste over tabellar"
+
+#: src/frontends/qt4/qt_helpers.cpp:494
+#, fuzzy
+msgid "List of Notes"
+msgstr "Liste over tabellar"
+
+#: src/frontends/qt4/qt_helpers.cpp:496
+#, fuzzy
+msgid "List of Citations"
+msgstr "Liste over kodelister"
+
+#: src/frontends/qt4/qt_helpers.cpp:498
+#, fuzzy
+msgid "Labels and References"
+msgstr "Litteratur ikkje nytta i teksten"
+
+#: 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:444
 msgid ""
 "The following filename is likely to cause trouble when running the exported "
 "file through LaTeX: "
 msgstr ""
 
-#: src/insets/Inset.cpp:313
+#: src/insets/Inset.cpp:333
 msgid "Opened inset"
 msgstr "Opna innskot"
 
-#: src/insets/InsetBibitem.cpp:82
+#: src/insets/InsetBibitem.cpp:87
 msgid "Keys must be unique!"
 msgstr ""
 
-#: src/insets/InsetBibitem.cpp:83
+#: src/insets/InsetBibitem.cpp:88
 #, c-format
 msgid ""
 "The key %1$s already exists,\n"
 "it will be changed to %2$s."
 msgstr ""
 
-#: src/insets/InsetBibtex.cpp:125
-msgid "BibTeX Generated Bibliography"
-msgstr "BibTeX genererte referansar"
+#: src/insets/InsetBibtex.cpp:139
+#, c-format
+msgid ""
+"The BibTeX inset includes %1$s databases.\n"
+"If you proceed, all of them will be opened."
+msgstr ""
+
+#: src/insets/InsetBibtex.cpp:142
+#, fuzzy
+msgid "Open Databases?"
+msgstr "Databa&sar"
+
+#: src/insets/InsetBibtex.cpp:143
+msgid "&Proceed"
+msgstr ""
+
+#: src/insets/InsetBibtex.cpp:161
+msgid "BibTeX Generated Bibliography"
+msgstr "BibTeX genererte referansar"
+
+#: src/insets/InsetBibtex.cpp:168
+#, fuzzy
+msgid "Databases:"
+msgstr "Databa&sar"
+
+#: src/insets/InsetBibtex.cpp:193
+#, fuzzy
+msgid "Style File:"
+msgstr "Lat att"
+
+#: src/insets/InsetBibtex.cpp:200
+#, fuzzy
+msgid "Lists:"
+msgstr "Liste"
+
+#: src/insets/InsetBibtex.cpp:211
+msgid "included in TOC"
+msgstr ""
 
-#: src/insets/InsetBibtex.cpp:213 src/insets/InsetBibtex.cpp:264
+#: src/insets/InsetBibtex.cpp:307 src/insets/InsetBibtex.cpp:358
 msgid "Export Warning!"
 msgstr "Eksport åtvaring!"
 
-#: src/insets/InsetBibtex.cpp:214
+#: src/insets/InsetBibtex.cpp:308
 msgid ""
 "There are spaces in the paths to your BibTeX databases.\n"
 "BibTeX will be unable to find them."
@@ -17921,7 +18980,7 @@ msgstr ""
 "Det er mellomrom i stigen til BibTeX databasane.\n"
 "BibTeX vil derfor ikkje kunne finne dei."
 
-#: src/insets/InsetBibtex.cpp:265
+#: src/insets/InsetBibtex.cpp:359
 msgid ""
 "There are spaces in the path to your BibTeX style file.\n"
 "BibTeX will be unable to find it."
@@ -17940,8 +18999,9 @@ msgid "frameless"
 msgstr "Utan ramme"
 
 #: src/insets/InsetBox.cpp:64
+#, fuzzy
 msgid "simple frame, page breaks"
-msgstr ""
+msgstr "innskot ramme"
 
 #: src/insets/InsetBox.cpp:65
 #, fuzzy
@@ -17971,23 +19031,19 @@ msgstr "dobbel"
 msgid "Opened Box Inset"
 msgstr "Opna ramme innskot"
 
-#: src/insets/InsetBox.cpp:145
-msgid "Box"
-msgstr "Ramme"
-
-#: src/insets/InsetBranch.cpp:54
+#: src/insets/InsetBranch.cpp:55
 msgid "Opened Branch Inset"
 msgstr "Opna grein innskot"
 
-#: src/insets/InsetBranch.cpp:74 src/insets/InsetBranch.cpp:80
+#: src/insets/InsetBranch.cpp:75 src/insets/InsetBranch.cpp:81
 msgid "Branch: "
 msgstr "Grein: "
 
-#: src/insets/InsetBranch.cpp:85
+#: src/insets/InsetBranch.cpp:86
 msgid "Undef: "
 msgstr "Udefin: "
 
-#: src/insets/InsetBranch.cpp:233
+#: src/insets/InsetBranch.cpp:215
 msgid "branch"
 msgstr "Grein"
 
@@ -17995,21 +19051,21 @@ msgstr "Grein"
 msgid "Opened Caption Inset"
 msgstr "Opna figurtekst innskot"
 
-#: src/insets/InsetCaption.cpp:302
+#: src/insets/InsetCaption.cpp:305
 #, c-format
 msgid "Sub-%1$s"
 msgstr ""
 
-#: src/insets/InsetCitation.cpp:217
+#: src/insets/InsetCitation.cpp:190
 #, fuzzy
 msgid "not cited"
 msgstr "vern"
 
-#: src/insets/InsetCollapsable.cpp:117
+#: src/insets/InsetCollapsable.cpp:118 src/insets/InsetFloat.cpp:137
 msgid "Left-click to collapse the inset"
 msgstr ""
 
-#: src/insets/InsetCollapsable.cpp:119
+#: src/insets/InsetCollapsable.cpp:121 src/insets/InsetFloat.cpp:139
 msgid "Left-click to open the inset"
 msgstr ""
 
@@ -18041,7 +19097,7 @@ msgstr "Innskot kommando: "
 msgid "Unknown parameter name: "
 msgstr "Ukjent val: "
 
-#: src/insets/InsetCommandParams.cpp:298 src/insets/InsetInfo.cpp:121
+#: src/insets/InsetCommandParams.cpp:298 src/insets/InsetInfo.cpp:136
 msgid "Missing \\end_inset at this point."
 msgstr "Manglar \\end_inset her."
 
@@ -18049,38 +19105,34 @@ 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:616
+#: 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"
 
-#: src/insets/InsetFloat.cpp:119 src/insets/InsetFloat.cpp:385
-#: src/insets/InsetFloat.cpp:395 src/insets/InsetFloat.cpp:405
+#: src/insets/InsetFloat.cpp:119 src/insets/InsetFloat.cpp:393
+#: src/insets/InsetFloat.cpp:403 src/insets/InsetFloat.cpp:413
 msgid "float: "
 msgstr "flytar"
 
-#: src/insets/InsetFloat.cpp:273
+#: src/insets/InsetFloat.cpp:281
 msgid "Opened Float Inset"
 msgstr "Opna flytar innskot"
 
-#: src/insets/InsetFloat.cpp:344
+#: src/insets/InsetFloat.cpp:352
 msgid "float"
 msgstr "flytar"
 
-#: src/insets/InsetFloat.cpp:397
+#: src/insets/InsetFloat.cpp:405
 msgid " (sideways)"
 msgstr " (rotert)"
 
-#: src/insets/InsetFloat.cpp:407
+#: src/insets/InsetFloat.cpp:415
 #, fuzzy
 msgid "subfloat: "
 msgstr "flytar"
@@ -18094,15 +19146,15 @@ msgstr "FEIL! Ukjent flytar-type!"
 msgid "List of %1$s"
 msgstr "Liste over %1$s"
 
-#: src/insets/InsetFoot.cpp:46
+#: src/insets/InsetFoot.cpp:44
 msgid "Opened Footnote Inset"
 msgstr "Opna botntekst innskot"
 
-#: src/insets/InsetFoot.cpp:121
+#: src/insets/InsetFoot.cpp:113
 msgid "footnote"
 msgstr "botntekst"
 
-#: src/insets/InsetGraphics.cpp:493 src/insets/InsetInclude.cpp:525
+#: src/insets/InsetGraphics.cpp:464 src/insets/InsetInclude.cpp:521
 #, c-format
 msgid ""
 "Could not copy the file\n"
@@ -18113,39 +19165,34 @@ msgstr ""
 "%1$s\n"
 "til den mellombelse katalogen."
 
-#: src/insets/InsetGraphics.cpp:722
+#: src/insets/InsetGraphics.cpp:697
 #, c-format
 msgid "No conversion of %1$s is needed after all"
 msgstr "Ingen konvertering av %1$s var naudsynt likvel"
 
-#: src/insets/InsetGraphics.cpp:816
+#: src/insets/InsetGraphics.cpp:791
 #, c-format
 msgid "Graphics file: %1$s"
 msgstr "Grafikk-fil: %1$s"
 
-#: src/insets/InsetGraphics.cpp:941 src/insets/InsetInclude.cpp:342
-#: src/insets/InsetInclude.cpp:880 src/insets/InsetInclude.cpp:900
-msgid " (embedded)"
-msgstr ""
-
-#: src/insets/InsetInclude.cpp:319
+#: src/insets/InsetInclude.cpp:318
 msgid "Verbatim Input"
 msgstr "Set inn Verbatim"
 
-#: src/insets/InsetInclude.cpp:322
+#: src/insets/InsetInclude.cpp:321
 msgid "Verbatim Input*"
 msgstr "Set inn Verbatim*"
 
-#: src/insets/InsetInclude.cpp:421 src/insets/InsetInclude.cpp:613
+#: src/insets/InsetInclude.cpp:417 src/insets/InsetInclude.cpp:609
 msgid "Recursive input"
 msgstr "Rekursiv"
 
-#: src/insets/InsetInclude.cpp:422 src/insets/InsetInclude.cpp:614
+#: 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:470
+#: src/insets/InsetInclude.cpp:466
 #, c-format
 msgid ""
 "Included file `%1$s'\n"
@@ -18156,11 +19203,11 @@ msgstr ""
 "har tekstklassa %2$s'\n"
 "medan hovuddokumentet har tekstklassa `%3$s'."
 
-#: src/insets/InsetInclude.cpp:476
+#: src/insets/InsetInclude.cpp:472
 msgid "Different textclasses"
 msgstr "Ulike tekstklassar"
 
-#: src/insets/InsetInclude.cpp:491
+#: src/insets/InsetInclude.cpp:487
 #, fuzzy, c-format
 msgid ""
 "Included file `%1$s'\n"
@@ -18171,41 +19218,27 @@ msgstr ""
 "har tekstklassa %2$s'\n"
 "medan hovuddokumentet har tekstklassa `%3$s'."
 
-#: src/insets/InsetInclude.cpp:495
+#: src/insets/InsetInclude.cpp:491
 #, fuzzy
 msgid "Module not found"
 msgstr "Kan ikkje finne fila"
 
-#: src/insets/InsetIndex.cpp:93
-msgid "Index"
-msgstr "Indeks"
-
-#: src/insets/InsetInfo.cpp:66
+#: src/insets/InsetInfo.cpp:81
 #, fuzzy
 msgid "Information regarding "
 msgstr "Veit ikkje korleis ein endrar %1$s"
 
-#: src/insets/InsetInfo.cpp:174
-#, fuzzy
-msgid "Unknown Info: "
-msgstr "Ukjent ord:"
-
-#: src/insets/InsetInfo.cpp:198 src/insets/InsetInfo.cpp:203
+#: src/insets/InsetInfo.cpp:280 src/insets/InsetInfo.cpp:284
 #, fuzzy
 msgid "yes"
 msgstr "Stilar"
 
-#: src/insets/InsetInfo.cpp:198 src/insets/InsetInfo.cpp:203
+#: src/insets/InsetInfo.cpp:280 src/insets/InsetInfo.cpp:284
 #, fuzzy
 msgid "no"
 msgstr "Angre"
 
-#: src/insets/InsetInfo.cpp:211 src/insets/InsetInfo.cpp:216
-#, fuzzy
-msgid "No menu entry for "
-msgstr "Nomenklaturnøkkel|ø"
-
-#: src/insets/InsetInfo.cpp:243
+#: src/insets/InsetInfo.cpp:338
 #, fuzzy
 msgid "Unknown buffer info"
 msgstr "ukjend brukar"
@@ -18225,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"
@@ -18304,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."
@@ -18312,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 "
@@ -18334,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 "
@@ -18345,49 +19409,49 @@ 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"
 
-#: src/insets/InsetMarginal.cpp:37
+#: src/insets/InsetMarginal.cpp:34
 msgid "Opened Marginal Note Inset"
 msgstr "Opna margnotis innskot"
 
-#: src/insets/InsetNewpage.cpp:180 src/insets/InsetNewpage.cpp:192
+#: src/insets/InsetNewpage.cpp:179 src/insets/InsetNewpage.cpp:191
 #, fuzzy
 msgid "New Page"
 msgstr "Klargjer side"
 
-#: src/insets/InsetNewpage.cpp:186
+#: src/insets/InsetNewpage.cpp:185
 msgid "Clear Page"
 msgstr "Klargjer side"
 
-#: src/insets/InsetNewpage.cpp:189
+#: src/insets/InsetNewpage.cpp:188
 msgid "Clear Double Page"
 msgstr "Klargjer dobbelside"
 
@@ -18395,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"
 
@@ -18415,47 +19479,47 @@ msgstr "Opna valfritt argument innskot"
 msgid "BROKEN: "
 msgstr ""
 
-#: src/insets/InsetRef.cpp:171 src/mathed/InsetMathRef.cpp:185
+#: src/insets/InsetRef.cpp:171 src/mathed/InsetMathRef.cpp:187
 msgid "Ref: "
 msgstr "Ref: "
 
-#: src/insets/InsetRef.cpp:172 src/mathed/InsetMathRef.cpp:186
+#: src/insets/InsetRef.cpp:172 src/mathed/InsetMathRef.cpp:188
 msgid "Equation"
 msgstr "Likninga"
 
-#: src/insets/InsetRef.cpp:172 src/mathed/InsetMathRef.cpp:186
+#: src/insets/InsetRef.cpp:172 src/mathed/InsetMathRef.cpp:188
 msgid "EqRef: "
 msgstr "LiknRef: "
 
-#: src/insets/InsetRef.cpp:173 src/mathed/InsetMathRef.cpp:187
+#: src/insets/InsetRef.cpp:173 src/mathed/InsetMathRef.cpp:189
 msgid "Page Number"
 msgstr "Sidetal"
 
-#: src/insets/InsetRef.cpp:173 src/mathed/InsetMathRef.cpp:187
+#: src/insets/InsetRef.cpp:173 src/mathed/InsetMathRef.cpp:189
 msgid "Page: "
 msgstr "Side: "
 
-#: src/insets/InsetRef.cpp:174 src/mathed/InsetMathRef.cpp:188
+#: src/insets/InsetRef.cpp:174 src/mathed/InsetMathRef.cpp:190
 msgid "Textual Page Number"
 msgstr "Sidetal i teksten"
 
-#: src/insets/InsetRef.cpp:174 src/mathed/InsetMathRef.cpp:188
+#: src/insets/InsetRef.cpp:174 src/mathed/InsetMathRef.cpp:190
 msgid "TextPage: "
 msgstr "Tekstside: "
 
-#: src/insets/InsetRef.cpp:175 src/mathed/InsetMathRef.cpp:189
+#: src/insets/InsetRef.cpp:175 src/mathed/InsetMathRef.cpp:191
 msgid "Standard+Textual Page"
 msgstr "Standard+tekstside"
 
-#: src/insets/InsetRef.cpp:175 src/mathed/InsetMathRef.cpp:189
+#: src/insets/InsetRef.cpp:175 src/mathed/InsetMathRef.cpp:191
 msgid "Ref+Text: "
 msgstr "Ref+Tekst: "
 
-#: src/insets/InsetRef.cpp:176 src/mathed/InsetMathRef.cpp:190
+#: src/insets/InsetRef.cpp:176 src/mathed/InsetMathRef.cpp:192
 msgid "PrettyRef"
 msgstr "Pen_ Ref"
 
-#: src/insets/InsetRef.cpp:176 src/mathed/InsetMathRef.cpp:190
+#: src/insets/InsetRef.cpp:176 src/mathed/InsetMathRef.cpp:192
 msgid "FormatRef: "
 msgstr "FormatRef: "
 
@@ -18515,36 +19579,48 @@ msgid "Horizontal Fill (Rule)"
 msgstr "Vassrett fyll"
 
 #: src/insets/InsetSpace.cpp:106
+#, fuzzy
+msgid "Horizontal Fill (Left Arrow)"
+msgstr "Vassrett fyll"
+
+#: src/insets/InsetSpace.cpp:109
+#, fuzzy
+msgid "Horizontal Fill (Right Arrow)"
+msgstr "Vassrett fyll"
+
+#: src/insets/InsetSpace.cpp:112
+#, fuzzy
+msgid "Horizontal Fill (Up Brace)"
+msgstr "Vassrett fyll"
+
+#: src/insets/InsetSpace.cpp:115
+#, fuzzy
+msgid "Horizontal Fill (Down Brace)"
+msgstr "Vassrett fyll"
+
+#: src/insets/InsetSpace.cpp:118
 #, fuzzy, c-format
 msgid "Horizontal Space (%1$s)"
 msgstr "Vassrett linje"
 
-#: src/insets/InsetSpace.cpp:110
+#: src/insets/InsetSpace.cpp:122
 #, fuzzy, c-format
 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:3069
+#: src/insets/InsetTabular.cpp:3054
 msgid "Opened table"
 msgstr "Opna Tabell"
 
-#: src/insets/InsetTabular.cpp:4300
-msgid "Error setting multicolumn"
-msgstr "Feil ved multikolonne"
-
-#: src/insets/InsetTabular.cpp:4301
-msgid "You cannot set multicolumn vertically."
-msgstr "Du kan ikkje bruke multikolonne loddrett."
-
-#: src/insets/InsetText.cpp:203
+#: src/insets/InsetText.cpp:215
 msgid "Opened Text Inset"
 msgstr "Opna tekst innskot"
 
-#: src/insets/InsetVSpace.cpp:128
+#: src/insets/InsetVSpace.cpp:127
 msgid "Vertical Space"
 msgstr "Loddrett avstand"
 
@@ -18560,59 +19636,59 @@ msgstr "Opna tekstbrekking innskot"
 msgid "wrap"
 msgstr "Brekk tekst"
 
-#: src/insets/RenderGraphic.cpp:93 src/insets/RenderGraphic.cpp:97
+#: src/insets/RenderGraphic.cpp:79 src/insets/RenderGraphic.cpp:83
 msgid "Not shown."
 msgstr "Ikkje vist."
 
-#: src/insets/RenderGraphic.cpp:100
+#: src/insets/RenderGraphic.cpp:86
 msgid "Loading..."
 msgstr "Lastar ..."
 
-#: src/insets/RenderGraphic.cpp:103
+#: src/insets/RenderGraphic.cpp:89
 msgid "Converting to loadable format..."
 msgstr "Feil ved konvertering..."
 
-#: src/insets/RenderGraphic.cpp:106
+#: src/insets/RenderGraphic.cpp:92
 msgid "Loaded into memory. Generating pixmap..."
 msgstr "Lasta til minne, Lagar punktgrafikk..."
 
-#: src/insets/RenderGraphic.cpp:109
+#: src/insets/RenderGraphic.cpp:95
 msgid "Scaling etc..."
 msgstr "Storleik etc..."
 
-#: src/insets/RenderGraphic.cpp:112
+#: src/insets/RenderGraphic.cpp:98
 msgid "Ready to display"
 msgstr "Klar til vising"
 
-#: src/insets/RenderGraphic.cpp:115
+#: src/insets/RenderGraphic.cpp:101
 msgid "No file found!"
 msgstr "Fann ikkje fila!"
 
-#: src/insets/RenderGraphic.cpp:118
+#: src/insets/RenderGraphic.cpp:104
 msgid "Error converting to loadable format"
 msgstr "Feil ved konvertering"
 
-#: src/insets/RenderGraphic.cpp:121
+#: src/insets/RenderGraphic.cpp:107
 msgid "Error loading file into memory"
 msgstr "Feil ved lasting til minne"
 
-#: src/insets/RenderGraphic.cpp:124
+#: src/insets/RenderGraphic.cpp:110
 msgid "Error generating the pixmap"
 msgstr "Feil ved lagring av punktgrafikk"
 
-#: src/insets/RenderGraphic.cpp:127
+#: 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"
 
@@ -18696,7 +19772,7 @@ msgstr "Teksten er bytta ut."
 msgid " strings have been replaced."
 msgstr " tekstane har blitt bytta ut."
 
-#: src/mathed/InsetMathAMSArray.cpp:111 src/mathed/InsetMathHull.cpp:1355
+#: 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'"
@@ -18707,59 +19783,59 @@ 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:1345
+#: src/mathed/InsetMathGrid.cpp:1350
 msgid "Only one row"
 msgstr "Berre ei rad"
 
-#: src/mathed/InsetMathGrid.cpp:1351
+#: src/mathed/InsetMathGrid.cpp:1356
 msgid "Only one column"
 msgstr "Berre ei kolonne"
 
-#: src/mathed/InsetMathGrid.cpp:1359
+#: src/mathed/InsetMathGrid.cpp:1364
 msgid "No hline to delete"
 msgstr "Har inga vassrettlinje å slette"
 
-#: src/mathed/InsetMathGrid.cpp:1368
+#: src/mathed/InsetMathGrid.cpp:1373
 msgid "No vline to delete"
 msgstr "Har inga loddrettlinje å slette"
 
-#: src/mathed/InsetMathGrid.cpp:1386
+#: src/mathed/InsetMathGrid.cpp:1391
 #, c-format
 msgid "Unknown tabular feature '%1$s'"
 msgstr "Ukjent tabellval '%1$s'"
 
-#: src/mathed/InsetMathHull.cpp:1153 src/mathed/InsetMathHull.cpp:1161
+#: src/mathed/InsetMathHull.cpp:1166 src/mathed/InsetMathHull.cpp:1174
 msgid "No number"
 msgstr "Ingen nummer"
 
-#: src/mathed/InsetMathHull.cpp:1153 src/mathed/InsetMathHull.cpp:1161
+#: src/mathed/InsetMathHull.cpp:1166 src/mathed/InsetMathHull.cpp:1174
 msgid "Number"
 msgstr "Nummer"
 
-#: src/mathed/InsetMathHull.cpp:1328
+#: 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:1338
+#: 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:1348
+#: 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:945
+#: src/mathed/InsetMathNest.cpp:943
 msgid "create new math text environment ($...$)"
 msgstr "Lag nytt mattemiljø ($...$)"
 
-#: src/mathed/InsetMathNest.cpp:948
+#: src/mathed/InsetMathNest.cpp:946
 msgid "entered math text mode (textrm)"
 msgstr "Nyttar mattemiljø (textrm)"
 
-#: src/mathed/InsetMathRef.cpp:185
+#: src/mathed/InsetMathRef.cpp:187
 msgid "Standard[[mathref]]"
 msgstr ""
 
@@ -18794,39 +19870,33 @@ msgstr "Samandrag: "
 msgid "References: "
 msgstr "Referansar: "
 
-#: src/support/FileFilterList.cpp:102
-#, fuzzy
-msgid "All Files "
-msgstr "Alle filer (*)"
-
-#: src/support/Package.cpp:441
+#: src/support/Package.cpp:435
 msgid "LyX binary not found"
 msgstr "Fann ikkje LyX-programmet"
 
-#: src/support/Package.cpp:442
+#: 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:561
-#, c-format
+#: 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 "
-"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'."
 
-#: src/support/Package.cpp:642 src/support/Package.cpp:669
+#: src/support/Package.cpp:636 src/support/Package.cpp:663
 msgid "File not found"
 msgstr "Kan ikkje finne fila"
 
-#: src/support/Package.cpp:643
+#: src/support/Package.cpp:637
 #, c-format
 msgid ""
 "Invalid %1$s switch.\n"
@@ -18835,7 +19905,7 @@ msgstr ""
 "Ikkje tillate val %1$s\n"
 "Stigen %2$s har ikkje %3$s i seg."
 
-#: src/support/Package.cpp:670
+#: src/support/Package.cpp:664
 #, c-format
 msgid ""
 "Invalid %1$s environment variable.\n"
@@ -18844,7 +19914,7 @@ msgstr ""
 "Ikkje tillate miljøval %1$s\n"
 "Stigen %2$s har ikkje %3$s i seg."
 
-#: src/support/Package.cpp:694
+#: src/support/Package.cpp:688
 #, c-format
 msgid ""
 "Invalid %1$s environment variable.\n"
@@ -18853,127 +19923,136 @@ msgstr ""
 "Ikkje tillate miljøval %1$s\n"
 "%2$s er ikkje ein stig."
 
-#: src/support/Package.cpp:696
+#: src/support/Package.cpp:690
 msgid "Directory not found"
 msgstr "Kan ikkje finne katalogen"
 
-#: src/support/debug.cpp:40
+#: src/support/debug.cpp:38
 msgid "No debugging message"
 msgstr "Inga melding frå avlusinga"
 
-#: src/support/debug.cpp:41
+#: src/support/debug.cpp:39
 msgid "General information"
 msgstr "Generell informasjon"
 
-#: src/support/debug.cpp:42
+#: src/support/debug.cpp:40
 msgid "Program initialisation"
 msgstr "Startar opp programmet"
 
-#: src/support/debug.cpp:43
+#: src/support/debug.cpp:41
 msgid "Keyboard events handling"
 msgstr "Tastatur handtering"
 
-#: src/support/debug.cpp:44
+#: src/support/debug.cpp:42
 msgid "GUI handling"
 msgstr "GUI handtering"
 
-#: src/support/debug.cpp:45
+#: src/support/debug.cpp:43
 msgid "Lyxlex grammar parser"
 msgstr "Lyxlex grammatikk tolk"
 
-#: src/support/debug.cpp:46
+#: src/support/debug.cpp:44
 msgid "Configuration files reading"
 msgstr "Les innstillingar frå fil"
 
-#: src/support/debug.cpp:47
+#: src/support/debug.cpp:45
 msgid "Custom keyboard definition"
 msgstr "Tilpassa tastatur oppsett"
 
-#: src/support/debug.cpp:48
+#: src/support/debug.cpp:46
 msgid "LaTeX generation/execution"
 msgstr "Genererer/Køyrer LaTeX"
 
-#: src/support/debug.cpp:49
+#: src/support/debug.cpp:47
 msgid "Math editor"
 msgstr "Redigere matte"
 
-#: src/support/debug.cpp:50
+#: src/support/debug.cpp:48
 msgid "Font handling"
 msgstr "Handsaming av skrifttyper"
 
-#: src/support/debug.cpp:51
+#: src/support/debug.cpp:49
 msgid "Textclass files reading"
 msgstr "Les tekstklasser"
 
-#: src/support/debug.cpp:52
+#: src/support/debug.cpp:50
 msgid "Version control"
 msgstr "Kontroll av versjonar"
 
-#: src/support/debug.cpp:53
+#: src/support/debug.cpp:51
 msgid "External control interface"
 msgstr "Eksternt kontrollgrensesnitt "
 
-#: src/support/debug.cpp:54
+#: src/support/debug.cpp:52
 msgid "Keep *roff temporary files"
 msgstr "Ikkje slett *roff mellombelse filer"
 
-#: src/support/debug.cpp:55
+#: src/support/debug.cpp:53
 msgid "User commands"
 msgstr "Brukar kommandoar"
 
-#: src/support/debug.cpp:56
+#: src/support/debug.cpp:54
 msgid "The LyX Lexxer"
 msgstr "Lex for LyX"
 
-#: src/support/debug.cpp:57
+#: src/support/debug.cpp:55
 msgid "Dependency information"
 msgstr "Informasjon om bindingar"
 
-#: src/support/debug.cpp:58
+#: src/support/debug.cpp:56
 msgid "LyX Insets"
 msgstr "LyX innskot"
 
-#: src/support/debug.cpp:59
+#: src/support/debug.cpp:57
 msgid "Files used by LyX"
 msgstr "Filer brukt av LyX"
 
-#: src/support/debug.cpp:60
+#: src/support/debug.cpp:58
 msgid "Workarea events"
 msgstr "Hendingar ved arbeidsområde"
 
-#: src/support/debug.cpp:61
+#: src/support/debug.cpp:59
 msgid "Insettext/tabular messages"
 msgstr "Innskot tekst/tabell meldingar"
 
-#: src/support/debug.cpp:62
+#: src/support/debug.cpp:60
 msgid "Graphics conversion and loading"
 msgstr "Grafikk konvertering og lasting"
 
-#: src/support/debug.cpp:63
+#: src/support/debug.cpp:61
 msgid "Change tracking"
 msgstr "Endra sporing"
 
-#: src/support/debug.cpp:64
+#: src/support/debug.cpp:62
 msgid "External template/inset messages"
 msgstr "Eksterne mal/innskot meldingar"
 
-#: src/support/debug.cpp:65
+#: src/support/debug.cpp:63
 msgid "RowPainter profiling"
 msgstr "Profilering av RadMålar"
 
-#: src/support/debug.cpp:66
+#: src/support/debug.cpp:64
 msgid "scrolling debugging"
 msgstr ""
 
-#: src/support/debug.cpp:67
+#: src/support/debug.cpp:65
 #, fuzzy
 msgid "Math macros"
 msgstr "mattemakro"
 
-#: src/support/debug.cpp:68
+#: src/support/debug.cpp:66
 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"
@@ -19023,9 +20102,280 @@ 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"
+
+#~ msgid "Screen display"
+#~ msgstr "Skjerm"
+
+#~ msgid "Monochrome"
+#~ msgstr "Svart/kvit"
+
+#~ msgid "Grayscale"
+#~ msgstr "Gråtonar"
+
+#~ msgid "Preview"
+#~ msgstr "Førehandsvising"
+
+#~ msgid "%"
+#~ msgstr "%"
+
+#~ msgid "&Display:"
+#~ msgstr "&Vis:"
+
+#~ msgid "Sca&le:"
+#~ msgstr "Ska&la:"
+
+#, fuzzy
+#~ msgid "Scr&een Display:"
+#~ msgstr "Skjerm"
+
+#~ msgid "Do not display"
+#~ msgstr "Ikkje vis matte"
+
+#, fuzzy
+#~ msgid "Unknown Info: "
+#~ msgstr "Ukjent ord:"
+
+#, fuzzy
+#~ msgid "Unknown action %1$s"
+#~ msgstr "Ukjend handling"
+
+#, fuzzy
+#~ msgid "No menu entry for action %1$s"
+#~ msgstr "Nomenklaturnøkkel|ø"
+
+#, fuzzy
+#~ msgid "Clear group"
+#~ msgstr "Klargjer side"
+
+#~ msgid " (auto)"
+#~ msgstr " (auto)"
+
+#~ msgid "Plain Text"
+#~ msgstr "Rein tekst"
+
+#, fuzzy
+#~ msgid "Other floats: "
+#~ msgstr "Andre flytarar"
+
+#, fuzzy
+#~ msgid "Toggle tabba&r"
+#~ msgstr "Skru av/på tabellverktylinje"
+
+#~ msgid "Edit the file externally"
+#~ msgstr "Rediger fila eksternt"
+
+#~ msgid "&Edit File..."
+#~ msgstr "&Rediger fil..."
+
+#~ msgid "LyX View"
+#~ msgstr "LyX utsjånad"
+
+#~ msgid "Options"
+#~ msgstr "Val"
+
+#, fuzzy
+#~ msgid "Movie"
+#~ msgstr "Meir"
+
+#~ msgid "<- C&lear"
+#~ msgstr "<-&Tøm"
+
+#~ msgid "A&pply"
+#~ msgstr "&Bruk"
+
+#, fuzzy
+#~ msgid "Clear"
+#~ msgstr "&Fjern"
+
+#, fuzzy
+#~ msgid "EmbeddedFiles"
+#~ msgstr "Innlemma object|m"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "&Legg til"
+
+#, fuzzy
+#~ msgid "Remove"
+#~ msgstr "&Fjern"
+
+#, fuzzy
+#~ msgid "E&mbed"
+#~ msgstr "&Omramma"
+
+#~ msgid "&Center"
+#~ msgstr "&Midten"
+
+#, fuzzy
+#~ msgid "Use &bundled format for new documents"
+#~ msgstr "Kunne ikkje lese dokumentet"
+
+#, fuzzy
+#~ msgid "Failed to read embedded files"
+#~ msgstr "Kan ikkje lese fila"
+
 #, fuzzy
-#~ msgid "Japanese (non-CJK)"
-#~ msgstr "Japansk"
+#~ msgid " writing embedded files."
+#~ msgstr "Kan ikkje lese fila"
+
+#, fuzzy
+#~ msgid " could not write embedded files!"
+#~ msgstr "Kan ikkje lese fila"
+
+#, fuzzy
+#~ msgid "Failed to extract file"
+#~ msgstr "Vel ekstern fil"
+
+#, fuzzy
+#~ msgid "External file %1$s already exists, do you want to overwrite it?"
+#~ msgstr ""
+#~ "Dokumentet %1$s finst frå før.\n"
+#~ "\n"
+#~ "Vil du skrive over dette dokumentet?"
+
+#, fuzzy
+#~ msgid "Copy file failure"
+#~ msgstr "Kan ikkje vise fila"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot create file path '%1$s'.\n"
+#~ "Please check whether the path is writeable."
+#~ msgstr ""
+#~ "LyX klarte ikkje å lage reservekopi %1$s.\n"
+#~ "Er du sikker at stigen eksiterar og du kan skrive til den?"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot copy file %1$s to %2$s.\n"
+#~ "Please check whether the directory exists and is writeable."
+#~ msgstr ""
+#~ "LyX klarte ikkje å lage reservekopi %1$s.\n"
+#~ "Er du sikker at stigen eksiterar og du kan skrive til den?"
+
+#, fuzzy
+#~ msgid "Failed to embed file"
+#~ msgstr "Kan ikkje lese fila"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to embed file %1$s.\n"
+#~ "Please check whether this file exists and is readable."
+#~ msgstr ""
+#~ "LyX klarte ikkje å lage reservekopi %1$s.\n"
+#~ "Er du sikker at stigen eksiterar og du kan skrive til den?"
+
+#, fuzzy
+#~ msgid "Embedded file %1$s already exists, do you want to overwrite it"
+#~ msgstr ""
+#~ "Dokumentet %1$s finst frå før.\n"
+#~ "\n"
+#~ "Vil du skrive over dette dokumentet?"
+
+#, fuzzy
+#~ msgid "Failed to copy embedded file"
+#~ msgstr "Kan ikkje lese fila"
+
+#, fuzzy
+#~ msgid ""
+#~ "Failed to embed file %1$s.\n"
+#~ "Please check whether the source file is available"
+#~ msgstr ""
+#~ "LyX klarte ikkje å lage reservekopi %1$s.\n"
+#~ "Er du sikker at stigen eksiterar og du kan skrive til den?"
+
+#, fuzzy
+#~ msgid "Failed to open file"
+#~ msgstr "Kan ikkje lese fila"
+
+#, fuzzy
+#~ msgid "Sync file failure"
+#~ msgstr "ChkTeX feil"
+
+#, fuzzy
+#~ msgid "Packing all files"
+#~ msgstr "Skriv ut alle sider"
+
+#, fuzzy
+#~ msgid "Failed to write file"
+#~ msgstr "Skriv over dokumentet?"
+
+#, fuzzy
+#~ msgid "Save failure"
+#~ msgstr "Kan ikkje laga reservekopi"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot create file %1$s.\n"
+#~ "Please check whether the directory exists and is writeable."
+#~ msgstr ""
+#~ "LyX klarte ikkje å lage reservekopi %1$s.\n"
+#~ "Er du sikker at stigen eksiterar og du kan skrive til den?"
+
+#, fuzzy
+#~ msgid "Embedded Files"
+#~ msgstr "Innlemma object|m"
+
+#, fuzzy
+#~ msgid "Embedded layout"
+#~ msgstr "Innlemma object|m"
+
+#, fuzzy
+#~ msgid "Extra embedded file"
+#~ msgstr "Innlemma object|m"
+
+#~ msgid "Error setting multicolumn"
+#~ msgstr "Feil ved multikolonne"
+
+#~ msgid "You cannot set multicolumn vertically."
+#~ msgstr "Du kan ikkje bruke multikolonne loddrett."
 
 #, fuzzy
 #~ msgid "Enspace|E"
@@ -19116,9 +20466,6 @@ msgstr "ukjend brukar"
 #~ msgid "Ca&ption:"
 #~ msgstr "&Figur-tekst:"
 
-#~ msgid "Databa&ses"
-#~ msgstr "Databa&sar"
-
 #~ msgid "Show ERT inline"
 #~ msgstr "Vis ERT i teksten"
 
@@ -19137,10 +20484,6 @@ msgstr "ukjend brukar"
 #~ msgid "Paper Size"
 #~ msgstr "Papirstorleik"
 
-#, fuzzy
-#~ msgid "C&enter"
-#~ msgstr "Midten"
-
 #~ msgid "&Colors"
 #~ msgstr "&Fargar"
 
@@ -19326,9 +20669,6 @@ msgstr "ukjend brukar"
 #~ msgid "Serbo-Croatian"
 #~ msgstr "Serbo-Kroatisk"
 
-#~ msgid "Count Words|W"
-#~ msgstr "Tel ord|o"
-
 #, fuzzy
 #~ msgid "Framed|F"
 #~ msgstr "Med ramme"
@@ -19431,9 +20771,6 @@ msgstr "ukjend brukar"
 #~ msgid "Framed"
 #~ msgstr "Med ramme"
 
-#~ msgid "Shaded"
-#~ msgstr "Skuggelagd"
-
 #, fuzzy
 #~ msgid "theorem"
 #~ msgstr "Teorem"
@@ -19448,10 +20785,6 @@ msgstr "ukjend brukar"
 #~ msgid "HtmlUrl: "
 #~ msgstr "HtmlUrl: "
 
-#, fuzzy
-#~ msgid "CharStyle: "
-#~ msgstr "Endring: "
-
 #~ msgid "Default (outer)"
 #~ msgstr "Standard (ytre)"
 
@@ -19516,15 +20849,9 @@ 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 "
 
-#~ msgid "Adapt outp&ut"
-#~ msgstr "S&end skrivar namn"
-
 #~ msgid "To &file:"
 #~ msgstr "Utskrift til &fil:"