Change converter and format definitons for OpenDocument format.

[lyx.git] / po / nb.po

diff --git a/po/nb.po b/po/nb.po
index f8d9108fcd21d5c649a17e0ea5425084d4cb60e9..15c76bcc9ce40d9e361c1a9ad93550a998fbd4f9 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lyx 1.4.0\n"
 "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-05-13 14:36-0500\n"
+"POT-Creation-Date: 2007-05-18 00:09+0100\n"
 "PO-Revision-Date: 2007-02-26 23:42+0100\n"
 "Last-Translator: Lars Gullik Bjønnes <larsbj@lyx.org>\n"
 "Language-Team: norsk <no@li.org>\n"
@@ -36,7 +36,7 @@ msgstr "Copyright"
 #: src/frontends/qt4/ui/DelimiterUi.ui:107
 #: src/frontends/qt4/ui/ErrorListUi.ui:62
 #: src/frontends/qt4/ui/ExternalUi.ui:705 src/frontends/qt4/ui/FloatUi.ui:85
-#: src/frontends/qt4/ui/IncludeUi.ui:327 src/frontends/qt4/ui/LogUi.ui:71
+#: src/frontends/qt4/ui/IncludeUi.ui:237 src/frontends/qt4/ui/LogUi.ui:71
 #: src/frontends/qt4/ui/ParagraphUi.ui:99 src/frontends/qt4/ui/PrefsUi.ui:96
 #: src/frontends/qt4/ui/RefUi.ui:100 src/frontends/qt4/ui/SearchUi.ui:210
 #: src/frontends/qt4/ui/ShowFileUi.ui:58
@@ -63,7 +63,7 @@ msgstr "&Dummy"
 #: src/frontends/qt4/ui/DocumentUi.ui:135 src/frontends/qt4/ui/ERTUi.ui:100
 #: src/frontends/qt4/ui/ExternalUi.ui:685 src/frontends/qt4/ui/FloatUi.ui:68
 #: src/frontends/qt4/ui/GraphicsUi.ui:702
-#: src/frontends/qt4/ui/IncludeUi.ui:317 src/frontends/qt4/ui/IndexUi.ui:82
+#: src/frontends/qt4/ui/IncludeUi.ui:227 src/frontends/qt4/ui/IndexUi.ui:82
 #: src/frontends/qt4/ui/MathMatrixUi.ui:170
 #: src/frontends/qt4/ui/NomenclUi.ui:92 src/frontends/qt4/ui/NoteUi.ui:31
 #: src/frontends/qt4/ui/ParagraphUi.ui:76 src/frontends/qt4/ui/RefUi.ui:80
@@ -155,7 +155,7 @@ msgstr "Legg til"
 
 #: src/frontends/qt4/ui/BibtexAddUi.ui:83 src/frontends/qt4/ui/BibtexUi.ui:229
 #: src/frontends/qt4/ui/ChangesUi.ui:78 src/frontends/qt4/ui/IndexUi.ui:92
-#: src/frontends/qt4/ui/ListingsUi.ui:819
+#: src/frontends/qt4/ui/ListingsUi.ui:534
 #: src/frontends/qt4/ui/NomenclUi.ui:105 src/frontends/qt4/ui/SendtoUi.ui:95
 #: src/BufferView.cpp:264 src/LyXFunc.cpp:851 src/frontends/qt4/Qt2BC.h:36
 msgid "Cancel"
@@ -167,7 +167,7 @@ msgstr "Velg en BibTeX database som skal legges til"
 
 #: src/frontends/qt4/ui/BibtexAddUi.ui:126
 #: src/frontends/qt4/ui/BibtexUi.ui:106 src/frontends/qt4/ui/ExternalUi.ui:99
-#: src/frontends/qt4/ui/GraphicsUi.ui:71 src/frontends/qt4/ui/IncludeUi.ui:147
+#: src/frontends/qt4/ui/GraphicsUi.ui:71 src/frontends/qt4/ui/IncludeUi.ui:319
 #: src/frontends/qt4/ui/PrintUi.ui:316
 msgid "&Browse..."
 msgstr "&Se igjennom..."
@@ -444,8 +444,8 @@ msgstr "St
 #: src/Font.cpp:521 src/frontends/controllers/ControlDocument.cpp:48
 #: src/frontends/controllers/ControlExternal.cpp:234
 #: src/frontends/controllers/ControlGraphics.cpp:170
-#: src/frontends/qt4/QDocument.cpp:67 src/frontends/qt4/QDocument.cpp:78
-#: src/frontends/qt4/QDocument.cpp:88 src/frontends/qt4/QDocument.cpp:270
+#: src/frontends/qt4/QDocument.cpp:71 src/frontends/qt4/QDocument.cpp:82
+#: src/frontends/qt4/QDocument.cpp:92 src/frontends/qt4/QDocument.cpp:336
 msgid "Default"
 msgstr "Standard"
 
@@ -560,9 +560,9 @@ msgstr "Font serier"
 
 #: src/frontends/qt4/ui/CharacterUi.ui:114
 #: src/frontends/qt4/ui/CharacterUi.ui:160
-#: src/frontends/qt4/ui/ListingsUi.ui:47 lib/layouts/europecv.layout:144
-#: lib/layouts/moderncv.layout:129 src/frontends/qt4/QDocument.cpp:508
-#: src/frontends/qt4/QPrefs.cpp:1578
+#: src/frontends/qt4/ui/ListingsUi.ui:105 lib/layouts/europecv.layout:144
+#: lib/layouts/moderncv.layout:129 src/frontends/qt4/QDocument.cpp:570
+#: src/frontends/qt4/QPrefs.cpp:1587
 msgid "Language"
 msgstr "Språk"
 
@@ -590,8 +590,6 @@ msgstr "Flippes ikke"
 
 #: src/frontends/qt4/ui/CharacterUi.ui:224
 #: src/frontends/qt4/ui/CharacterUi.ui:245
-#: src/frontends/qt4/ui/ListingsUi.ui:253
-#: src/frontends/qt4/ui/ListingsUi.ui:430
 msgid "Font size"
 msgstr "Fontstørrelse"
 
@@ -779,7 +777,7 @@ msgstr "Lagre innstillinger som LyXs dokumentstandard"
 msgid "Save as Document Defaults"
 msgstr "Lagre som dokumentstandard"
 
-#: src/frontends/qt4/ui/ERTUi.ui:31 src/frontends/qt4/ui/ListingsUi.ui:581
+#: src/frontends/qt4/ui/ERTUi.ui:31
 msgid "Display"
 msgstr "Visning"
 
@@ -823,7 +821,7 @@ msgstr "Rediger filen eksternt"
 msgid "&Edit File..."
 msgstr "Rediger fil..."
 
-#: src/frontends/qt4/ui/ExternalUi.ui:96 src/frontends/qt4/ui/IncludeUi.ui:144
+#: src/frontends/qt4/ui/ExternalUi.ui:96 src/frontends/qt4/ui/IncludeUi.ui:316
 msgid "Select a file"
 msgstr "Velg en fil"
 
@@ -833,7 +831,7 @@ msgid "Filename"
 msgstr "Filnavn"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:109
-#: src/frontends/qt4/ui/GraphicsUi.ui:88 src/frontends/qt4/ui/IncludeUi.ui:55
+#: src/frontends/qt4/ui/GraphicsUi.ui:88 src/frontends/qt4/ui/IncludeUi.ui:249
 #: src/frontends/qt4/ui/PrintUi.ui:296
 msgid "&File:"
 msgstr "&Fil:"
@@ -1108,7 +1106,7 @@ msgid "Select an image file"
 msgstr "Velg en bildefil"
 
 #: src/frontends/qt4/ui/GraphicsUi.ui:78 src/frontends/qt4/ui/GraphicsUi.ui:85
-#: src/frontends/qt4/ui/ListingsUi.ui:214
+#: src/frontends/qt4/ui/ListingsUi.ui:165
 msgid "File name of image"
 msgstr "Filnavn for bildet"
 
@@ -1219,63 +1217,73 @@ msgstr "&Vis i LyX"
 msgid "Sca&le on Screen (%):"
 msgstr "Størrelse på skjermen (%):"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:65
+#: src/frontends/qt4/ui/IncludeUi.ui:36
+msgid "Listing Params"
+msgstr ""
+
+#: src/frontends/qt4/ui/IncludeUi.ui:76
+#, fuzzy
+msgid "C&aption:"
+msgstr "&Bildetekst:"
+
+#: src/frontends/qt4/ui/IncludeUi.ui:89
+#, fuzzy
+msgid "La&bel:"
+msgstr "&Merke:"
+
+#: src/frontends/qt4/ui/IncludeUi.ui:99
+msgid "Mo&re parameters"
+msgstr ""
+
+#: src/frontends/qt4/ui/IncludeUi.ui:173
+msgid "Underline spaces in generated output"
+msgstr "Understrek blanke tegn i utskrift"
+
+#: src/frontends/qt4/ui/IncludeUi.ui:176
+msgid "&Mark spaces in output"
+msgstr "&Vis mellomrom i utskrift"
+
+#: src/frontends/qt4/ui/IncludeUi.ui:191
+msgid "Show LaTeX preview"
+msgstr "Vis LaTeX forhåndsvisning"
+
+#: src/frontends/qt4/ui/IncludeUi.ui:194
+msgid "&Show preview"
+msgstr "&Forhåndsvisning"
+
+#: src/frontends/qt4/ui/IncludeUi.ui:259
 msgid "File name to include"
 msgstr "Velg dokument som skal settes inn"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:82
+#: src/frontends/qt4/ui/IncludeUi.ui:266
 msgid "&Include Type:"
 msgstr "&Innkluderingsform:"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:93 src/insets/InsetInclude.cpp:322
+#: src/frontends/qt4/ui/IncludeUi.ui:277 src/insets/InsetInclude.cpp:322
 msgid "Include"
 msgstr "Inkluder"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:98 src/insets/InsetInclude.cpp:313
+#: src/frontends/qt4/ui/IncludeUi.ui:282 src/insets/InsetInclude.cpp:313
 msgid "Input"
 msgstr ""
 
-#: src/frontends/qt4/ui/IncludeUi.ui:103 lib/layouts/manpage.layout:122
+#: src/frontends/qt4/ui/IncludeUi.ui:287 lib/layouts/manpage.layout:122
 msgid "Verbatim"
 msgstr ""
 
-#: src/frontends/qt4/ui/IncludeUi.ui:108 src/insets/InsetListings.cpp:222
+#: src/frontends/qt4/ui/IncludeUi.ui:292 src/insets/InsetListings.cpp:238
 #, fuzzy
 msgid "Listings"
 msgstr "Liste"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:154 src/frontends/qt4/ui/IncludeUi.ui:276
+#: src/frontends/qt4/ui/IncludeUi.ui:326
 msgid "Load the file"
 msgstr "Les inn filen"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:157
+#: src/frontends/qt4/ui/IncludeUi.ui:329
 msgid "&Load"
 msgstr "&Les inn"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:184
-msgid "Underline spaces in generated output"
-msgstr "Understrek blanke tegn i utskrift"
-
-#: src/frontends/qt4/ui/IncludeUi.ui:187
-msgid "&Mark spaces in output"
-msgstr "&Vis mellomrom i utskrift"
-
-#: src/frontends/qt4/ui/IncludeUi.ui:202
-msgid "Show LaTeX preview"
-msgstr "Vis LaTeX forhåndsvisning"
-
-#: src/frontends/qt4/ui/IncludeUi.ui:205
-msgid "&Show preview"
-msgstr "&Forhåndsvisning"
-
-#: src/frontends/qt4/ui/IncludeUi.ui:222
-msgid "Listing Params"
-msgstr ""
-
-#: src/frontends/qt4/ui/IncludeUi.ui:279
-msgid "&Edit parameters"
-msgstr ""
-
 #: src/frontends/qt4/ui/LaTeXUi.ui:58
 msgid "Document &class:"
 msgstr "Dokument&klasse:"
@@ -1305,144 +1313,128 @@ msgstr "Siteringsstil:"
 msgid "Listing"
 msgstr "Liste"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:65
-#: src/frontends/qt4/ui/ListingsUi.ui:120
+#: src/frontends/qt4/ui/ListingsUi.ui:35
+#, fuzzy
+msgid "Main Settings"
+msgstr "Gren-innstillinger"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:63
 #, fuzzy
 msgid "Placement"
 msgstr "&Plassering:"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:77
-msgid "Inline listing"
-msgstr ""
+#: src/frontends/qt4/ui/ListingsUi.ui:78
+#, fuzzy
+msgid "Placement:"
+msgstr "&Plassering:"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:84
+#: src/frontends/qt4/ui/ListingsUi.ui:88
 #, fuzzy
 msgid "Float"
 msgstr "Flytende (Float)|a"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:158
-#, fuzzy
-msgid "Number style"
-msgstr "Nummerert liste"
-
-#: src/frontends/qt4/ui/ListingsUi.ui:178
-msgid "enable for numbers on the leftside"
+#: src/frontends/qt4/ui/ListingsUi.ui:95
+msgid "Inline listing"
 msgstr ""
 
-#: src/frontends/qt4/ui/ListingsUi.ui:181
-#: src/frontends/qt4/ui/ParagraphUi.ui:285
+#: src/frontends/qt4/ui/ListingsUi.ui:133
 #, fuzzy
-msgid "&Left"
-msgstr "Venstre"
-
-#: src/frontends/qt4/ui/ListingsUi.ui:194
-msgid "enable for numbers on the right side"
-msgstr ""
+msgid "Line numbering"
+msgstr "Nummerering"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:197
-#: src/frontends/qt4/ui/ParagraphUi.ui:292
+#: src/frontends/qt4/ui/ListingsUi.ui:145
 #, fuzzy
-msgid "&Right"
-msgstr "Høyre"
-
-#: src/frontends/qt4/ui/ListingsUi.ui:217 lib/layouts/ijmpc.layout:161
-#: lib/layouts/ijmpd.layout:158
-msgid "Step"
-msgstr ""
+msgid "Side: "
+msgstr "Lysark"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:230
-#: src/frontends/qt4/ui/ListingsUi.ui:318
-#: src/frontends/qt4/ui/ListingsUi.ui:354
+#: src/frontends/qt4/ui/ListingsUi.ui:152
+#: src/frontends/qt4/ui/ListingsUi.ui:249
+#: src/frontends/qt4/ui/ListingsUi.ui:262
 msgid "Differenz between two numbered lines"
 msgstr ""
 
-#: src/frontends/qt4/ui/ListingsUi.ui:266
-#: src/frontends/qt4/ui/ListingsUi.ui:443
+#: src/frontends/qt4/ui/ListingsUi.ui:168
+#, fuzzy
+msgid "Step:"
+msgstr "Stat:"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:181
+#: src/frontends/qt4/ui/ListingsUi.ui:384
+#, fuzzy
+msgid "Font size:"
+msgstr "Fontstørrelse"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:202
+#: src/frontends/qt4/ui/ListingsUi.ui:405
 #, fuzzy
 msgid "Choose the Font Size"
 msgstr "Velg en stilfil"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:305
+#: src/frontends/qt4/ui/ListingsUi.ui:224
 #, fuzzy
-msgid "First line"
+msgid "Range"
+msgstr "Enkel"
+
+#: src/frontends/qt4/ui/ListingsUi.ui:236
+#, fuzzy
+msgid "First line:"
 msgstr "Fornavn"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:341
+#: src/frontends/qt4/ui/ListingsUi.ui:275
 #, fuzzy
-msgid "Last line"
+msgid "Last line:"
 msgstr "matte linje"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:403
+#: src/frontends/qt4/ui/ListingsUi.ui:293
 #: src/frontends/qt4/ui/TabularUi.ui:301
 msgid "Style"
 msgstr "Stil"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:415
-#, fuzzy
-msgid "Basic style"
-msgstr "Natbib-&stil:"
-
-#: src/frontends/qt4/ui/ListingsUi.ui:469
-#, fuzzy
-msgid "Font style"
-msgstr "Fontstørrelse"
-
-#: src/frontends/qt4/ui/ListingsUi.ui:482
-msgid "Choose the Font Style"
-msgstr ""
-
-#: src/frontends/qt4/ui/ListingsUi.ui:513
+#: src/frontends/qt4/ui/ListingsUi.ui:305
 msgid "Breaking lines longer than the linewidth"
 msgstr ""
 
-#: src/frontends/qt4/ui/ListingsUi.ui:516
+#: src/frontends/qt4/ui/ListingsUi.ui:308
 #, fuzzy
 msgid "&Break long lines"
 msgstr "&Bruk lang tabell"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:526
+#: src/frontends/qt4/ui/ListingsUi.ui:318
 msgid "Insert a special symbol for a space"
 msgstr ""
 
-#: src/frontends/qt4/ui/ListingsUi.ui:529
+#: src/frontends/qt4/ui/ListingsUi.ui:321
 msgid "&Space as Symbol"
 msgstr ""
 
-#: src/frontends/qt4/ui/ListingsUi.ui:542
+#: src/frontends/qt4/ui/ListingsUi.ui:334
 #, fuzzy
 msgid "Use extended character table"
 msgstr "Udefinert tekststil"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:545
+#: src/frontends/qt4/ui/ListingsUi.ui:337
 #, fuzzy
 msgid "&Extended Chars"
 msgstr "Utvidede egenskaper|U"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:593
+#: src/frontends/qt4/ui/ListingsUi.ui:347
 #, fuzzy
-msgid "&Caption"
-msgstr "Bildetekst"
-
-#: src/frontends/qt4/ui/ListingsUi.ui:620
-#, fuzzy
-msgid "A caption for the List of Listings"
-msgstr "Bildetekst for sub-figuren"
+msgid "Font style:"
+msgstr "Fontstørrelse"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:645
-#, fuzzy
-msgid "&Label"
-msgstr "&Merke:"
+#: src/frontends/qt4/ui/ListingsUi.ui:368
+msgid "Choose the Font Style"
+msgstr ""
 
-#: src/frontends/qt4/ui/ListingsUi.ui:672
-#, fuzzy
-msgid "A Label for the caption"
-msgstr "Tabelltittel"
+#: src/frontends/qt4/ui/ListingsUi.ui:427
+msgid "Advanced"
+msgstr ""
 
-#: src/frontends/qt4/ui/ListingsUi.ui:734
+#: src/frontends/qt4/ui/ListingsUi.ui:447
 msgid "More Parameters"
 msgstr ""
 
-#: src/frontends/qt4/ui/ListingsUi.ui:809
+#: src/frontends/qt4/ui/ListingsUi.ui:524
 #, fuzzy
 msgid "OK"
 msgstr "&OK"
@@ -1675,8 +1667,8 @@ msgstr "Rykk inn avsnitt"
 msgid "L&ine spacing:"
 msgstr "L&injeavstand:"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:219 src/Text.cpp:1737
-#: src/frontends/qt4/QDocument.cpp:164
+#: src/frontends/qt4/ui/ParagraphUi.ui:219 src/Text.cpp:1773
+#: src/frontends/qt4/QDocument.cpp:230
 msgid "Single"
 msgstr "Enkel"
 
@@ -1684,15 +1676,15 @@ msgstr "Enkel"
 msgid "1.5"
 msgstr "1.5"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:229 src/Text.cpp:1743
-#: src/frontends/qt4/QDocument.cpp:168
+#: src/frontends/qt4/ui/ParagraphUi.ui:229 src/Text.cpp:1779
+#: src/frontends/qt4/QDocument.cpp:234
 msgid "Double"
 msgstr "Dobbel"
 
 #: src/frontends/qt4/ui/ParagraphUi.ui:234
 #: src/frontends/qt4/ui/TabularUi.ui:712 src/frontends/qt4/ui/TabularUi.ui:731
 #: src/frontends/qt4/ui/TabularUi.ui:779 src/frontends/qt4/ui/VSpaceUi.ui:110
-#: src/frontends/qt4/QDocument.cpp:170 src/frontends/qt4/QDocument.cpp:271
+#: src/frontends/qt4/QDocument.cpp:236 src/frontends/qt4/QDocument.cpp:337
 msgid "Custom"
 msgstr "Brukerdefinert"
 
@@ -1706,6 +1698,16 @@ msgstr "Standard"
 msgid "&Justified"
 msgstr "Justert"
 
+#: src/frontends/qt4/ui/ParagraphUi.ui:285
+#, fuzzy
+msgid "&Left"
+msgstr "Venstre"
+
+#: src/frontends/qt4/ui/ParagraphUi.ui:292
+#, fuzzy
+msgid "&Right"
+msgstr "Høyre"
+
 #: src/frontends/qt4/ui/ParagraphUi.ui:299
 #, fuzzy
 msgid "&Center"
@@ -1962,31 +1964,31 @@ msgstr "Standard arkst
 msgid "Te&X encoding:"
 msgstr "Te&X tegnkoding"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:83 src/frontends/qt4/QDocument.cpp:272
+#: src/frontends/qt4/ui/PrefLatexUi.ui:83 src/frontends/qt4/QDocument.cpp:338
 msgid "US letter"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:88 src/frontends/qt4/QDocument.cpp:273
+#: src/frontends/qt4/ui/PrefLatexUi.ui:88 src/frontends/qt4/QDocument.cpp:339
 msgid "US legal"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:93 src/frontends/qt4/QDocument.cpp:274
+#: src/frontends/qt4/ui/PrefLatexUi.ui:93 src/frontends/qt4/QDocument.cpp:340
 msgid "US executive"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:98 src/frontends/qt4/QDocument.cpp:275
+#: src/frontends/qt4/ui/PrefLatexUi.ui:98 src/frontends/qt4/QDocument.cpp:341
 msgid "A3"
 msgstr "A3"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:103 src/frontends/qt4/QDocument.cpp:276
+#: src/frontends/qt4/ui/PrefLatexUi.ui:103 src/frontends/qt4/QDocument.cpp:342
 msgid "A4"
 msgstr "A4"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:108 src/frontends/qt4/QDocument.cpp:277
+#: src/frontends/qt4/ui/PrefLatexUi.ui:108 src/frontends/qt4/QDocument.cpp:343
 msgid "A5"
 msgstr "A5"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:113 src/frontends/qt4/QDocument.cpp:280
+#: src/frontends/qt4/ui/PrefLatexUi.ui:113 src/frontends/qt4/QDocument.cpp:346
 msgid "B5"
 msgstr "B5"
 
@@ -2474,7 +2476,7 @@ msgstr "Oppdater referanselisten"
 msgid "Jump to the label"
 msgstr "Flytt markøren til referansen"
 
-#: src/frontends/qt4/ui/RefUi.ui:253 src/frontends/qt4/QRef.cpp:292
+#: src/frontends/qt4/ui/RefUi.ui:253 src/frontends/qt4/QRef.cpp:293
 msgid "&Go to Label"
 msgstr "&Gå til merket"
 
@@ -3006,15 +3008,15 @@ msgstr "Typer vertikalt mellomrom"
 msgid "DefSkip"
 msgstr "Standard avstand"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:90 src/frontends/qt4/QDocument.cpp:157
+#: src/frontends/qt4/ui/VSpaceUi.ui:90 src/frontends/qt4/QDocument.cpp:223
 msgid "SmallSkip"
 msgstr "Liten avstand"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:95 src/frontends/qt4/QDocument.cpp:158
+#: src/frontends/qt4/ui/VSpaceUi.ui:95 src/frontends/qt4/QDocument.cpp:224
 msgid "MedSkip"
 msgstr "Medium avstand"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:100 src/frontends/qt4/QDocument.cpp:159
+#: src/frontends/qt4/ui/VSpaceUi.ui:100 src/frontends/qt4/QDocument.cpp:225
 msgid "BigSkip"
 msgstr "Stor avstand"
 
@@ -3053,7 +3055,7 @@ msgstr "&Enhet:"
 #: lib/layouts/IEEEtran.layout:18 lib/layouts/aa.layout:22
 #: lib/layouts/aapaper.layout:34 lib/layouts/aastex.layout:49
 #: lib/layouts/amsart.layout:21 lib/layouts/amsbook.layout:22
-#: lib/layouts/apa.layout:24 lib/layouts/beamer.layout:29
+#: lib/layouts/apa.layout:24 lib/layouts/beamer.layout:37
 #: lib/layouts/broadway.layout:183 lib/layouts/chess.layout:27
 #: lib/layouts/cl2emult.layout:125 lib/layouts/dtk.layout:31
 #: lib/layouts/egs.layout:18 lib/layouts/elsart.layout:49
@@ -3078,7 +3080,7 @@ msgstr "Standard"
 msgid "TheoremTemplate"
 msgstr ""
 
-#: lib/layouts/IEEEtran.layout:63 lib/layouts/beamer.layout:925
+#: lib/layouts/IEEEtran.layout:63 lib/layouts/beamer.layout:948
 #: lib/layouts/elsart.layout:291 lib/layouts/foils.layout:283
 #: lib/layouts/heb-article.layout:95 lib/layouts/ijmpc.layout:227
 #: lib/layouts/ijmpd.layout:227 lib/layouts/llncs.layout:374
@@ -3092,7 +3094,7 @@ msgid "Proof:"
 msgstr "Bevis:"
 
 #: lib/layouts/IEEEtran.layout:71 lib/layouts/amsart-plain.layout:26
-#: lib/layouts/amsart-seq.layout:137 lib/layouts/beamer.layout:1003
+#: lib/layouts/amsart-seq.layout:137 lib/layouts/beamer.layout:954
 #: lib/layouts/elsart.layout:262 lib/layouts/foils.layout:223
 #: lib/layouts/heb-article.layout:18 lib/layouts/ijmpc.layout:205
 #: lib/layouts/ijmpd.layout:208 lib/layouts/llncs.layout:415
@@ -3121,7 +3123,7 @@ msgid "Lemma #:"
 msgstr "Lemma #:"
 
 #: lib/layouts/IEEEtran.layout:91 lib/layouts/amsart-plain.layout:31
-#: lib/layouts/amsart-seq.layout:143 lib/layouts/beamer.layout:489
+#: lib/layouts/amsart-seq.layout:143 lib/layouts/beamer.layout:885
 #: lib/layouts/elsart.layout:325 lib/layouts/foils.layout:255
 #: lib/layouts/heb-article.layout:55 lib/layouts/ijmpc.layout:247
 #: lib/layouts/ijmpd.layout:248 lib/layouts/llncs.layout:319
@@ -3173,7 +3175,7 @@ msgid "Criterion #:"
 msgstr "Kriterie #:"
 
 #: lib/layouts/IEEEtran.layout:131 lib/layouts/amsart-plain.layout:67
-#: lib/layouts/amsart-seq.layout:179 lib/layouts/beamer.layout:710
+#: lib/layouts/amsart-seq.layout:179 lib/layouts/beamer.layout:942
 #: lib/layouts/amsmaths-plain.inc:103 lib/layouts/amsmaths-seq.inc:88
 #: lib/layouts/amsmaths.inc:213
 msgid "Fact"
@@ -3194,7 +3196,7 @@ msgid "Axiom #:"
 msgstr "Aksiom #:"
 
 #: lib/layouts/IEEEtran.layout:151 lib/layouts/amsart-plain.layout:79
-#: lib/layouts/amsart-seq.layout:191 lib/layouts/beamer.layout:652
+#: lib/layouts/amsart-seq.layout:191 lib/layouts/beamer.layout:912
 #: lib/layouts/elsart.layout:353 lib/layouts/foils.layout:269
 #: lib/layouts/heb-article.layout:75 lib/layouts/ijmpc.layout:140
 #: lib/layouts/ijmpd.layout:137 lib/layouts/llncs.layout:333
@@ -3209,12 +3211,12 @@ msgid "Definition #:"
 msgstr "Definisjon #:"
 
 #: lib/layouts/IEEEtran.layout:161 lib/layouts/amsart-plain.layout:85
-#: lib/layouts/amsart-seq.layout:197 lib/layouts/beamer.layout:664
+#: lib/layouts/amsart-seq.layout:197 lib/layouts/beamer.layout:924
 #: lib/layouts/elsart.layout:374 lib/layouts/ijmpc.layout:175
 #: lib/layouts/ijmpd.layout:172 lib/layouts/llncs.layout:340
 #: lib/layouts/amsmaths-plain.inc:133 lib/layouts/amsmaths-seq.inc:112
 #: lib/layouts/amsmaths.inc:276 lib/layouts/svjour.inc:397
-#: src/frontends/qt4/QDocument.cpp:408
+#: src/frontends/qt4/QDocument.cpp:474
 msgid "Example"
 msgstr "Eksempel"
 
@@ -3321,7 +3323,7 @@ msgstr ""
 #: lib/layouts/aapaper.layout:129 lib/layouts/aastex.layout:64
 #: lib/layouts/aastex.layout:166 lib/layouts/amsart.layout:61
 #: lib/layouts/amsbook.layout:47 lib/layouts/amsbook.layout:95
-#: lib/layouts/beamer.layout:265 lib/layouts/egs.layout:30
+#: lib/layouts/beamer.layout:140 lib/layouts/egs.layout:30
 #: lib/layouts/europecv.layout:28 lib/layouts/ijmpc.layout:99
 #: lib/layouts/ijmpd.layout:95 lib/layouts/isprs.layout:157
 #: lib/layouts/kluwer.layout:57 lib/layouts/latex8.layout:41
@@ -3342,7 +3344,7 @@ msgstr "Seksjon"
 #: lib/layouts/aa.layout:226 lib/layouts/aapaper.layout:67
 #: lib/layouts/aapaper.layout:138 lib/layouts/aastex.layout:67
 #: lib/layouts/aastex.layout:179 lib/layouts/amsart.layout:72
-#: lib/layouts/amsbook.layout:58 lib/layouts/beamer.layout:306
+#: lib/layouts/amsbook.layout:58 lib/layouts/beamer.layout:181
 #: lib/layouts/egs.layout:51 lib/layouts/ijmpc.layout:115
 #: lib/layouts/ijmpd.layout:111 lib/layouts/isprs.layout:168
 #: lib/layouts/kluwer.layout:66 lib/layouts/latex8.layout:49
@@ -3374,7 +3376,7 @@ msgstr "Underseksjon"
 msgid "Subsubsection"
 msgstr "UnderUnderSeksjon"
 
-#: lib/layouts/IEEEtran.layout:295 lib/layouts/beamer.layout:297
+#: lib/layouts/IEEEtran.layout:295 lib/layouts/beamer.layout:172
 #: lib/layouts/egs.layout:587 lib/layouts/ijmpc.layout:107
 #: lib/layouts/ijmpd.layout:103 lib/layouts/isprs.layout:186
 #: lib/layouts/siamltex.layout:81 lib/layouts/spie.layout:29
@@ -3383,7 +3385,7 @@ msgstr "UnderUnderSeksjon"
 msgid "Section*"
 msgstr "Seksjon*"
 
-#: lib/layouts/IEEEtran.layout:305 lib/layouts/beamer.layout:339
+#: lib/layouts/IEEEtran.layout:305 lib/layouts/beamer.layout:214
 #: lib/layouts/egs.layout:607 lib/layouts/isprs.layout:197
 #: lib/layouts/siamltex.layout:88 lib/layouts/aguplus.inc:48
 #: lib/layouts/db_stdstarsections.inc:48 lib/layouts/stdstarsections.inc:39
@@ -3440,7 +3442,7 @@ msgstr ""
 
 #: lib/layouts/IEEEtran.layout:371 lib/layouts/aa.layout:86
 #: lib/layouts/aa.layout:314 lib/layouts/aapaper.layout:103
-#: lib/layouts/aapaper.layout:209 lib/layouts/beamer.layout:440
+#: lib/layouts/aapaper.layout:209 lib/layouts/beamer.layout:836
 #: lib/layouts/book.layout:21 lib/layouts/book.layout:23
 #: lib/layouts/cl2emult.layout:102 lib/layouts/egs.layout:563
 #: lib/layouts/foils.layout:215 lib/layouts/ijmpc.layout:358
@@ -3456,7 +3458,7 @@ msgstr ""
 #: lib/layouts/aguplus.inc:168 lib/layouts/aguplus.inc:170
 #: lib/layouts/amsdefs.inc:229 lib/layouts/scrclass.inc:223
 #: lib/layouts/stdstruct.inc:39 lib/layouts/svjour.inc:326
-#: src/frontends/qt4/QDocument.cpp:510
+#: src/frontends/qt4/QDocument.cpp:572
 msgid "Bibliography"
 msgstr "Referanseliste"
 
@@ -3490,7 +3492,7 @@ msgstr ""
 
 #: lib/layouts/aa.layout:46 lib/layouts/aapaper.layout:48
 #: lib/layouts/aastex.layout:76 lib/layouts/apa.layout:308
-#: lib/layouts/beamer.layout:41 lib/layouts/egs.layout:163
+#: lib/layouts/beamer.layout:50 lib/layouts/egs.layout:163
 #: lib/layouts/manpage.layout:82 lib/layouts/simplecv.layout:77
 #: lib/layouts/agu_stdlists.inc:13 lib/layouts/db_stdlists.inc:12
 #: lib/layouts/stdlists.inc:11
@@ -3499,14 +3501,14 @@ msgstr "Punktliste"
 
 #: lib/layouts/aa.layout:49 lib/layouts/aapaper.layout:51
 #: lib/layouts/aastex.layout:79 lib/layouts/apa.layout:326
-#: lib/layouts/beamer.layout:59 lib/layouts/egs.layout:145
+#: lib/layouts/beamer.layout:68 lib/layouts/egs.layout:145
 #: lib/layouts/manpage.layout:65 lib/layouts/agu_stdlists.inc:21
 #: lib/layouts/db_stdlists.inc:19 lib/layouts/stdlists.inc:29
 msgid "Enumerate"
 msgstr "Nummerert liste"
 
 #: lib/layouts/aa.layout:52 lib/layouts/aapaper.layout:54
-#: lib/layouts/aastex.layout:82 lib/layouts/beamer.layout:77
+#: lib/layouts/aastex.layout:82 lib/layouts/beamer.layout:86
 #: lib/layouts/egs.layout:181 lib/layouts/hollywood.layout:134
 #: lib/layouts/manpage.layout:100 lib/layouts/paper.layout:103
 #: lib/layouts/scrlettr.layout:17 lib/layouts/scrlttr2.layout:18
@@ -3527,7 +3529,7 @@ msgstr "Liste"
 #: lib/layouts/aa.layout:59 lib/layouts/aa.layout:248
 #: lib/layouts/aapaper.layout:73 lib/layouts/aapaper.layout:159
 #: lib/layouts/aastex.layout:88 lib/layouts/aastex.layout:206
-#: lib/layouts/apa.layout:39 lib/layouts/beamer.layout:956
+#: lib/layouts/apa.layout:39 lib/layouts/beamer.layout:717
 #: lib/layouts/broadway.layout:195 lib/layouts/cl2emult.layout:39
 #: lib/layouts/docbook-book.layout:11 lib/layouts/docbook-chapter.layout:9
 #: lib/layouts/docbook-section.layout:9 lib/layouts/egs.layout:247
@@ -3548,7 +3550,7 @@ msgid "Title"
 msgstr "Tittel"
 
 #: lib/layouts/aa.layout:62 lib/layouts/aa.layout:106
-#: lib/layouts/aapaper.layout:76 lib/layouts/beamer.layout:1009
+#: lib/layouts/aapaper.layout:76 lib/layouts/beamer.layout:741
 #: lib/layouts/kluwer.layout:122 lib/layouts/llncs.layout:122
 #: lib/layouts/svprobth.layout:44 lib/layouts/aapaper.inc:9
 #: lib/layouts/svjour.inc:152
@@ -3558,7 +3560,7 @@ msgstr "Undertittel"
 #: lib/layouts/aa.layout:65 lib/layouts/aa.layout:260
 #: lib/layouts/aapaper.layout:79 lib/layouts/aapaper.layout:170
 #: lib/layouts/aastex.layout:91 lib/layouts/aastex.layout:219
-#: lib/layouts/apa.layout:114 lib/layouts/beamer.layout:416
+#: lib/layouts/apa.layout:114 lib/layouts/beamer.layout:766
 #: lib/layouts/broadway.layout:208 lib/layouts/cl2emult.layout:56
 #: lib/layouts/egs.layout:290 lib/layouts/elsart.layout:112
 #: lib/layouts/entcs.layout:47 lib/layouts/foils.layout:137
@@ -3599,7 +3601,7 @@ msgstr ""
 #: lib/layouts/aa.layout:77 lib/layouts/aa.layout:272
 #: lib/layouts/aapaper.layout:94 lib/layouts/aapaper.layout:181
 #: lib/layouts/aastex.layout:103 lib/layouts/aastex.layout:232
-#: lib/layouts/beamer.layout:630 lib/layouts/egs.layout:476
+#: lib/layouts/beamer.layout:812 lib/layouts/egs.layout:476
 #: lib/layouts/foils.layout:144 lib/layouts/g-brief-en.layout:188
 #: lib/layouts/g-brief2.layout:800 lib/layouts/kluwer.layout:143
 #: lib/layouts/revtex.layout:106 lib/layouts/revtex4.layout:123
@@ -3634,7 +3636,7 @@ msgid "Acknowledgements."
 msgstr ""
 
 #: lib/layouts/aapaper.layout:61 lib/layouts/egs.layout:623
-#: src/frontends/qt4/QPrefs.cpp:302
+#: src/frontends/qt4/QPrefs.cpp:303
 msgid "LaTeX"
 msgstr "LaTeX"
 
@@ -3683,7 +3685,7 @@ msgid "Acknowledgements"
 msgstr ""
 
 #: lib/layouts/aastex.layout:118 lib/layouts/aastex.layout:441
-#: lib/layouts/aastex.layout:453 lib/layouts/beamer.layout:454
+#: lib/layouts/aastex.layout:453 lib/layouts/beamer.layout:850
 #: lib/layouts/cl2emult.layout:116 lib/layouts/egs.layout:577
 #: lib/layouts/kluwer.layout:344 lib/layouts/kluwer.layout:356
 #: lib/layouts/llncs.layout:275 lib/layouts/moderncv.layout:207
@@ -4100,7 +4102,7 @@ msgstr ""
 msgid "FitBitmap"
 msgstr ""
 
-#: lib/layouts/apa.layout:322 lib/layouts/beamer.layout:55
+#: lib/layouts/apa.layout:322 lib/layouts/beamer.layout:64
 #: lib/layouts/egs.layout:177 lib/layouts/manpage.layout:96
 #: lib/layouts/simplecv.layout:91 lib/layouts/stdlists.inc:25
 msgid "*"
@@ -4111,7 +4113,7 @@ msgid "Seriate"
 msgstr ""
 
 #: lib/layouts/apa.layout:360 lib/layouts/apa.layout:361
-#: src/buffer_funcs.cpp:524
+#: src/buffer_funcs.cpp:526
 msgid "(\\alph{enumii})"
 msgstr "(\\alph{enumii})"
 
@@ -4135,7 +4137,7 @@ msgstr "Latvisk"
 msgid "Latin off"
 msgstr "Latvisk"
 
-#: lib/layouts/article.layout:18 lib/layouts/beamer.layout:897
+#: lib/layouts/article.layout:18 lib/layouts/beamer.layout:111
 #: lib/layouts/mwart.layout:23 lib/layouts/paper.layout:31
 #: lib/layouts/scrartcl.layout:20 lib/layouts/seminar.layout:24
 #: lib/layouts/agu_stdsections.inc:12 lib/layouts/db_stdsections.inc:12
@@ -4150,247 +4152,258 @@ msgstr "Del"
 msgid "Part*"
 msgstr "Del*"
 
-#: lib/layouts/beamer.layout:92 lib/layouts/egs.layout:196
+#: lib/layouts/beamer.layout:101 lib/layouts/egs.layout:196
 #: lib/layouts/manpage.layout:115 lib/layouts/stdlists.inc:62
 msgid "MM"
 msgstr "MM"
 
-#: lib/layouts/beamer.layout:100
-msgid "BeginFrame"
-msgstr "Begynn ramme"
-
-#: lib/layouts/beamer.layout:115
-msgid "Frame   "
-msgstr ""
-
-#: lib/layouts/beamer.layout:141
-msgid "BeginPlainFrame"
-msgstr ""
-
-#: lib/layouts/beamer.layout:156
-msgid "Frame (no head/foot/sidebars)  "
-msgstr ""
-
-#: lib/layouts/beamer.layout:179
-msgid "EndFrame"
-msgstr "Slutt ramme"
-
-#: lib/layouts/beamer.layout:193
-msgid "________________________________ "
-msgstr ""
-
-#: lib/layouts/beamer.layout:207
-msgid "Pause"
-msgstr "Pause"
-
-#: lib/layouts/beamer.layout:222
-msgid "_ _ _ _ _ _ _ _ _ _ _ _ _ _"
-msgstr ""
+#: lib/layouts/beamer.layout:125
+msgid "Part "
+msgstr "Del "
 
-#: lib/layouts/beamer.layout:280
+#: lib/layouts/beamer.layout:155
 msgid "Section \\arabic{section}"
 msgstr ""
 
-#: lib/layouts/beamer.layout:292 lib/layouts/numarticle.inc:17
+#: lib/layouts/beamer.layout:167 lib/layouts/numarticle.inc:17
 msgid "\\Alph{section}"
 msgstr "\\Alph{section}"
 
-#: lib/layouts/beamer.layout:321
+#: lib/layouts/beamer.layout:196
 msgid "Subsection \\arabic{section}.\\arabic{subsection}"
 msgstr ""
 
-#: lib/layouts/beamer.layout:334
+#: lib/layouts/beamer.layout:209
 msgid "\\arabic{section}.\\arabic{subsection}"
 msgstr ""
 
-#: lib/layouts/beamer.layout:347
-msgid "AgainFrame"
+#: lib/layouts/beamer.layout:223
+msgid "BeginFrame"
+msgstr "Begynn ramme"
+
+#: lib/layouts/beamer.layout:238
+#, fuzzy
+msgid "Frame "
+msgstr "Innrammet"
+
+#: lib/layouts/beamer.layout:264
+msgid "BeginPlainFrame"
 msgstr ""
 
-#: lib/layouts/beamer.layout:362
-msgid "Again frame with label   "
+#: lib/layouts/beamer.layout:279
+msgid "Frame (no head/foot/sidebars)__"
 msgstr ""
 
-#: lib/layouts/beamer.layout:386
-msgid "AlertBlock"
+#: lib/layouts/beamer.layout:302
+msgid "AgainFrame"
 msgstr ""
 
-#: lib/layouts/beamer.layout:396
-msgid "block with alerted text "
+#: lib/layouts/beamer.layout:317
+msgid "Again frame with label__"
 msgstr ""
 
-#: lib/layouts/beamer.layout:464
-msgid "Block"
-msgstr "Blokk"
+#: lib/layouts/beamer.layout:341
+msgid "EndFrame"
+msgstr "Slutt ramme"
 
-#: lib/layouts/beamer.layout:474
-msgid "block "
-msgstr "blokk"
+#: lib/layouts/beamer.layout:355
+msgid "________________________________ "
+msgstr ""
 
-#: lib/layouts/beamer.layout:499
-msgid "Corollary.  "
-msgstr "Korollar."
+#: lib/layouts/beamer.layout:370
+msgid "FrameSubtitle"
+msgstr ""
 
-#: lib/layouts/beamer.layout:516
+#: lib/layouts/beamer.layout:393
 msgid "Column"
 msgstr "Kolonne"
 
-#: lib/layouts/beamer.layout:527
-msgid "start column of width:  "
+#: lib/layouts/beamer.layout:405
+msgid "start column (increase depth!), width: "
 msgstr ""
 
-#: lib/layouts/beamer.layout:539
+#: lib/layouts/beamer.layout:417
 msgid "Columns"
 msgstr "Kolonner"
 
-#: lib/layouts/beamer.layout:551
+#: lib/layouts/beamer.layout:429
 msgid "columns "
 msgstr "kolonner "
 
-#: lib/layouts/beamer.layout:568
+#: lib/layouts/beamer.layout:446
 msgid "ColumnsCenterAligned"
 msgstr ""
 
-#: lib/layouts/beamer.layout:579
+#: lib/layouts/beamer.layout:457
 msgid "columns (center aligned) "
 msgstr ""
 
-#: lib/layouts/beamer.layout:598
+#: lib/layouts/beamer.layout:476
 msgid "ColumnsTopAligned"
 msgstr ""
 
-#: lib/layouts/beamer.layout:609
+#: lib/layouts/beamer.layout:487
 msgid "columns (top aligned) "
 msgstr ""
 
-#: lib/layouts/beamer.layout:655
-msgid "Definition.  "
-msgstr "Definisjon.  "
+#: lib/layouts/beamer.layout:507
+msgid "Pause"
+msgstr "Pause"
 
-#: lib/layouts/beamer.layout:658
-msgid "Definitions"
-msgstr "Definisjoner"
+#: lib/layouts/beamer.layout:522
+msgid "_ _ _ _ _ _ _ _ _ _ _ _ _ _"
+msgstr ""
 
-#: lib/layouts/beamer.layout:661
-msgid "Definitions.  "
-msgstr "Definisjoner.  "
+#: lib/layouts/beamer.layout:532
+msgid "Overprint"
+msgstr ""
 
-#: lib/layouts/beamer.layout:667
-msgid "Example.  "
-msgstr "Eksempel.  "
+#: lib/layouts/beamer.layout:542
+msgid "overprint "
+msgstr ""
 
-#: lib/layouts/beamer.layout:675
-msgid "Examples"
-msgstr "Eksempler"
+#: lib/layouts/beamer.layout:558
+msgid "OverlayArea"
+msgstr ""
 
-#: lib/layouts/beamer.layout:678
-msgid "Examples.  "
-msgstr "Eksempler.  "
+#: lib/layouts/beamer.layout:568
+#, fuzzy
+msgid "overlayarea"
+msgstr "Slovensk"
+
+#: lib/layouts/beamer.layout:583
+msgid "Uncover"
+msgstr ""
+
+#: lib/layouts/beamer.layout:592
+msgid "uncovered on slides  "
+msgstr ""
+
+#: lib/layouts/beamer.layout:607
+msgid "Only"
+msgstr "Bare"
+
+#: lib/layouts/beamer.layout:616
+msgid "only on slides_"
+msgstr ""
+
+#: lib/layouts/beamer.layout:632
+msgid "Block"
+msgstr "Blokk"
+
+#: lib/layouts/beamer.layout:642
+msgid "block ( ERT[{title}] body ): "
+msgstr ""
 
-#: lib/layouts/beamer.layout:681
+#: lib/layouts/beamer.layout:657
 msgid "ExampleBlock"
 msgstr ""
 
-#: lib/layouts/beamer.layout:691
-msgid "block showing an example "
+#: lib/layouts/beamer.layout:667
+msgid "block ( ERT[{title}] example text ): "
 msgstr ""
 
-#: lib/layouts/beamer.layout:713
-msgid "Fact.  "
-msgstr "Faktum.  "
+#: lib/layouts/beamer.layout:686
+msgid "AlertBlock"
+msgstr ""
 
-#: lib/layouts/beamer.layout:716
-msgid "FrameSubtitle"
+#: lib/layouts/beamer.layout:696
+msgid "block ( ERT[{title}] alert text ): "
 msgstr ""
 
-#: lib/layouts/beamer.layout:739 lib/layouts/cl2emult.layout:68
+#: lib/layouts/beamer.layout:789 lib/layouts/cl2emult.layout:68
 #: lib/layouts/llncs.layout:213 lib/layouts/svjour.inc:211
 msgid "Institute"
 msgstr "Institutt"
 
-#: lib/layouts/beamer.layout:761 lib/layouts/egs.layout:641
-#: lib/layouts/db_lyxmacros.inc:18 lib/layouts/lyxmacros.inc:12
-msgid "LyX-Code"
-msgstr "LyX-Kode"
-
-#: lib/layouts/beamer.layout:798
-msgid "NoteItem"
-msgstr ""
+#: lib/layouts/beamer.layout:860
+msgid "TitleGraphic"
+msgstr "Tittelgrafikk"
 
-#: lib/layouts/beamer.layout:809
-msgid "note:  "
-msgstr "notis:  "
+#: lib/layouts/beamer.layout:895
+#, fuzzy
+msgid "Corollary_"
+msgstr "Korollar"
 
-#: lib/layouts/beamer.layout:821
-msgid "Only"
-msgstr "Bare"
+#: lib/layouts/beamer.layout:915
+#, fuzzy
+msgid "Definition. "
+msgstr "Definisjon.  "
 
-#: lib/layouts/beamer.layout:830
-msgid "only on slides  "
-msgstr ""
+#: lib/layouts/beamer.layout:918
+msgid "Definitions"
+msgstr "Definisjoner"
 
-#: lib/layouts/beamer.layout:845
-msgid "Overprint"
-msgstr ""
+#: lib/layouts/beamer.layout:921
+#, fuzzy
+msgid "Definitions. "
+msgstr "Definisjoner.  "
 
-#: lib/layouts/beamer.layout:855
-msgid "overprint "
-msgstr ""
+#: lib/layouts/beamer.layout:927
+#, fuzzy
+msgid "Example. "
+msgstr "Eksempel.  "
 
-#: lib/layouts/beamer.layout:871
-msgid "OverlayArea"
-msgstr ""
+#: lib/layouts/beamer.layout:935
+msgid "Examples"
+msgstr "Eksempler"
 
-#: lib/layouts/beamer.layout:881
-msgid "overlayarea "
-msgstr ""
+#: lib/layouts/beamer.layout:938
+#, fuzzy
+msgid "Examples. "
+msgstr "Eksempler.  "
 
-#: lib/layouts/beamer.layout:911
-msgid "Part "
-msgstr "Del "
+#: lib/layouts/beamer.layout:945
+#, fuzzy
+msgid "Fact. "
+msgstr "Faktum.  "
 
-#: lib/layouts/beamer.layout:928
-msgid "Proof.  "
+#: lib/layouts/beamer.layout:951
+#, fuzzy
+msgid "Proof. "
 msgstr "Bevis.  "
 
-#: lib/layouts/beamer.layout:932
+#: lib/layouts/beamer.layout:957
+#, fuzzy
+msgid "Theorem. "
+msgstr "Teorem.  "
+
+#: lib/layouts/beamer.layout:962
 msgid "Separator"
 msgstr "Separator"
 
-#: lib/layouts/beamer.layout:945
+#: lib/layouts/beamer.layout:975
 msgid "___"
 msgstr "___"
 
-#: lib/layouts/beamer.layout:980
-msgid "TitleGraphic"
-msgstr "Tittelgrafikk"
-
-#: lib/layouts/beamer.layout:1006
-msgid "Theorem.  "
-msgstr "Teorem.  "
+#: lib/layouts/beamer.layout:985 lib/layouts/egs.layout:641
+#: lib/layouts/db_lyxmacros.inc:18 lib/layouts/lyxmacros.inc:12
+msgid "LyX-Code"
+msgstr "LyX-Kode"
 
-#: lib/layouts/beamer.layout:1034
-msgid "Uncover"
+#: lib/layouts/beamer.layout:1022
+msgid "NoteItem"
 msgstr ""
 
-#: lib/layouts/beamer.layout:1043
-msgid "uncovered on slides  "
-msgstr ""
+#: lib/layouts/beamer.layout:1033
+#, fuzzy
+msgid "note: "
+msgstr "notis:  "
 
-#: lib/layouts/beamer.layout:1065 lib/layouts/stdfloats.inc:10
+#: lib/layouts/beamer.layout:1069 lib/layouts/stdfloats.inc:10
 #: lib/ui/stdtoolbars.inc:110
 msgid "Table"
 msgstr "Tabell"
 
-#: lib/layouts/beamer.layout:1070 lib/layouts/stdfloats.inc:15
+#: lib/layouts/beamer.layout:1074 lib/layouts/stdfloats.inc:15
 msgid "List of Tables"
 msgstr "Liste over tabeller"
 
-#: lib/layouts/beamer.layout:1076 lib/layouts/stdfloats.inc:22
+#: lib/layouts/beamer.layout:1080 lib/layouts/stdfloats.inc:22
 msgid "Figure"
 msgstr "Figur"
 
-#: lib/layouts/beamer.layout:1081 lib/layouts/stdfloats.inc:27
+#: lib/layouts/beamer.layout:1085 lib/layouts/stdfloats.inc:27
 msgid "List of Figures"
 msgstr "Liste over figurer"
 
@@ -5759,6 +5772,10 @@ msgstr "N
 msgid "Classification Codes"
 msgstr ""
 
+#: lib/layouts/ijmpc.layout:161 lib/layouts/ijmpd.layout:158
+msgid "Step"
+msgstr ""
+
 #: lib/layouts/ijmpc.layout:165 lib/layouts/ijmpd.layout:162
 msgid "Step \\arabic{step}."
 msgstr ""
@@ -8132,17 +8149,17 @@ msgstr "Steng vindu|d"
 msgid "Redo|R"
 msgstr "Gjør om|G"
 
-#: lib/ui/stdmenus.inc:87 lib/ui/stdtoolbars.inc:66 src/Text3.cpp:835
+#: lib/ui/stdmenus.inc:87 lib/ui/stdtoolbars.inc:66 src/Text3.cpp:836
 #: src/mathed/InsetMathNest.cpp:447
 msgid "Cut"
 msgstr "Klipp"
 
-#: lib/ui/stdmenus.inc:88 lib/ui/stdtoolbars.inc:67 src/Text3.cpp:840
+#: lib/ui/stdmenus.inc:88 lib/ui/stdtoolbars.inc:67 src/Text3.cpp:841
 #: src/mathed/InsetMathNest.cpp:455
 msgid "Copy"
 msgstr "Kopier"
 
-#: lib/ui/stdmenus.inc:89 lib/ui/stdtoolbars.inc:68 src/Text3.cpp:816
+#: lib/ui/stdmenus.inc:89 lib/ui/stdtoolbars.inc:68 src/Text3.cpp:817
 #: src/mathed/InsetMathGrid.cpp:1167 src/mathed/InsetMathNest.cpp:426
 msgid "Paste"
 msgstr "Lim inn"
@@ -8992,7 +9009,7 @@ msgid "Fractions"
 msgstr "LyX: Brøker"
 
 #: lib/ui/stdtoolbars.inc:195 lib/ui/stdtoolbars.inc:278
-#: src/frontends/qt4/QDocument.cpp:504
+#: src/frontends/qt4/QDocument.cpp:566
 msgid "Fonts"
 msgstr "Fonter"
 
@@ -11336,58 +11353,58 @@ msgstr "Sentrert"
 msgid "intercal"
 msgstr "Skriver"
 
-#: src/Buffer.cpp:229
+#: src/Buffer.cpp:230
 msgid "Could not remove temporary directory"
 msgstr "Kunne ikke fjerne midlertidig mappe"
 
-#: src/Buffer.cpp:230
+#: src/Buffer.cpp:231
 #, c-format
 msgid "Could not remove the temporary directory %1$s"
 msgstr "Kunne ikke fjerne den midlertidige mappa %1$s"
 
-#: src/Buffer.cpp:401
+#: src/Buffer.cpp:402
 msgid "Unknown document class"
 msgstr "Ukjent dokumentklasse"
 
-#: src/Buffer.cpp:402
+#: src/Buffer.cpp:403
 #, c-format
 msgid "Using the default document class, because the class %1$s is unknown."
 msgstr "Bruker standard dokumentklasse, fordi klassen %1$s er ukjent."
 
-#: src/Buffer.cpp:461 src/Text.cpp:293
+#: src/Buffer.cpp:462 src/Text.cpp:293
 #, c-format
 msgid "Unknown token: %1$s %2$s\n"
 msgstr "Ukjent symbol: %1$s %2$s\n"
 
-#: src/Buffer.cpp:465 src/Buffer.cpp:472 src/Buffer.cpp:492
+#: src/Buffer.cpp:466 src/Buffer.cpp:473 src/Buffer.cpp:493
 msgid "Document header error"
 msgstr ""
 
-#: src/Buffer.cpp:471
+#: src/Buffer.cpp:472
 msgid "\\begin_header is missing"
 msgstr "\\begin_header mangler"
 
-#: src/Buffer.cpp:491
+#: src/Buffer.cpp:492
 msgid "\\begin_document is missing"
 msgstr "\\begin_document mangler"
 
-#: src/Buffer.cpp:502
+#: src/Buffer.cpp:503
 msgid "Can't load document class"
 msgstr "Kan ikke laste inn dokumentklasse"
 
-#: src/Buffer.cpp:503
+#: src/Buffer.cpp:504
 #, c-format
 msgid ""
 "Using the default document class, because the class %1$s could not be loaded."
 msgstr ""
 "Bruker standard dokumentklasse, fordi klassen %1$s ikke kunne lastes inn."
 
-#: src/Buffer.cpp:514 src/Buffer.cpp:520 src/BufferView.cpp:899
+#: src/Buffer.cpp:515 src/Buffer.cpp:521 src/BufferView.cpp:899
 #: src/BufferView.cpp:905
 msgid "Changes not shown in LaTeX output"
 msgstr ""
 
-#: src/Buffer.cpp:515 src/BufferView.cpp:900
+#: src/Buffer.cpp:516 src/BufferView.cpp:900
 msgid ""
 "Changes will not be highlighted in LaTeX output, because neither dvipost nor "
 "xcolor/soul are installed.\n"
@@ -11395,7 +11412,7 @@ msgid ""
 "LaTeX preamble."
 msgstr ""
 
-#: src/Buffer.cpp:521 src/BufferView.cpp:906
+#: src/Buffer.cpp:522 src/BufferView.cpp:906
 msgid ""
 "Changes will not be highlighted in LaTeX output when using pdflatex, because "
 "xcolor and soul are not installed.\n"
@@ -11403,29 +11420,29 @@ msgid ""
 "LaTeX preamble."
 msgstr ""
 
-#: src/Buffer.cpp:656 src/Buffer.cpp:665
+#: src/Buffer.cpp:657 src/Buffer.cpp:666
 msgid "Document could not be read"
 msgstr "Dokumentet lot seg ikke lese"
 
-#: src/Buffer.cpp:657 src/Buffer.cpp:666
+#: src/Buffer.cpp:658 src/Buffer.cpp:667
 #, c-format
 msgid "%1$s could not be read."
 msgstr "%1$s var uleselig"
 
-#: src/Buffer.cpp:674 src/Buffer.cpp:746
+#: src/Buffer.cpp:675 src/Buffer.cpp:747
 msgid "Document format failure"
 msgstr "Feil med dokumentformatet"
 
-#: src/Buffer.cpp:675
+#: src/Buffer.cpp:676
 #, c-format
 msgid "%1$s is not a LyX document."
 msgstr "%1$s er ikke et LyX-dokument."
 
-#: src/Buffer.cpp:699
+#: src/Buffer.cpp:700
 msgid "Conversion failed"
 msgstr "Kunne ikke konvertere"
 
-#: src/Buffer.cpp:700
+#: src/Buffer.cpp:701
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but a temporary file for converting "
@@ -11434,11 +11451,11 @@ msgstr ""
 "%1$s ble laget med en annen versjon av LyX, men en midlertidig fil for "
 "konvertering kunne ikke bli laget."
 
-#: src/Buffer.cpp:709
+#: src/Buffer.cpp:710
 msgid "Conversion script not found"
 msgstr "Fant ikke konverteringsscriptet"
 
-#: src/Buffer.cpp:710
+#: src/Buffer.cpp:711
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but the conversion script lyx2lyx "
@@ -11447,11 +11464,11 @@ msgstr ""
 "%1$s er fra en annen versjon av LyX, men konverteringsskriptet lyx2lyx var "
 "ikke å finne."
 
-#: src/Buffer.cpp:731
+#: src/Buffer.cpp:732
 msgid "Conversion script failed"
 msgstr "Konverteringsscriptet mislyktes"
 
-#: src/Buffer.cpp:732
+#: src/Buffer.cpp:733
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but the lyx2lyx script failed to "
@@ -11460,16 +11477,16 @@ msgstr ""
 "%1$s er fra en annen versjon av LyX, men konverteringsscriptet lyx2lyx "
 "mislyktes med konverteringen."
 
-#: src/Buffer.cpp:747
+#: src/Buffer.cpp:748
 #, c-format
 msgid "%1$s ended unexpectedly, which means that it is probably corrupted."
 msgstr "%1$s tok uventet slutt, filen er sannsynligvis korrupt."
 
-#: src/Buffer.cpp:783
+#: src/Buffer.cpp:784
 msgid "Backup failure"
 msgstr "Sikkerhetskopi mislyktes"
 
-#: src/Buffer.cpp:784
+#: src/Buffer.cpp:785
 #, c-format
 msgid ""
 "Cannot create backup file %1$s.\n"
@@ -11478,45 +11495,30 @@ msgstr ""
 "Kan ikke lage sikkerhetskopien %1$s.\n"
 "Vennligst sjekk at mappen fins og er skrivbar."
 
-#: src/Buffer.cpp:896
+#: src/Buffer.cpp:918
 msgid "Encoding error"
 msgstr "Feil med tegnkoding"
 
-#: src/Buffer.cpp:897
+#: src/Buffer.cpp:919
+#, fuzzy
 msgid ""
-"Some characters of your document are not representable in the chosen "
-"encoding.\n"
+"Some characters of your document are probably not representable in the "
+"chosen encoding.\n"
 "Changing the document encoding to utf8 could help."
 msgstr ""
 "Noen tegn i dokumentet ditt kan ikke representeres med den valgte "
 "tegnkodingen.\n"
 "Å forandre tegnkodingen for dokumentet til utf8 burde hjelpe."
 
-#: src/Buffer.cpp:906
-msgid "Error closing file"
-msgstr "Mislyktes med å lukke fil"
-
-#: src/Buffer.cpp:907
-msgid ""
-"The output file could not be closed properly.\n"
-" Probably some characters of your document are not representable in the "
-"chosen encoding.\n"
-"Changing the document encoding to utf8 could help."
-msgstr ""
-"Filen kunne ikke lukkes ordentlig.\n"
-" Antagelig er det noen tegn som ikke kan representeres i den valgte "
-"tegnkodingen.\n"
-"Å forandre dokumentets tegnkoding til utf8 kan hjelpe."
-
-#: src/Buffer.cpp:1186
+#: src/Buffer.cpp:1197
 msgid "Running chktex..."
 msgstr "Kjører chktex..."
 
-#: src/Buffer.cpp:1199
+#: src/Buffer.cpp:1210
 msgid "chktex failure"
 msgstr "chktex mislyktes"
 
-#: src/Buffer.cpp:1200
+#: src/Buffer.cpp:1211
 msgid "Could not run chktex successfully."
 msgstr "Mislyktes med chktex."
 
@@ -12017,7 +12019,7 @@ msgstr "Ingen utdata"
 msgid "An empty output file was generated."
 msgstr "Det ble produsert en tom fil"
 
-#: src/CutAndPaste.cpp:436
+#: src/CutAndPaste.cpp:441
 #, c-format
 msgid ""
 "Layout had to be changed from\n"
@@ -12030,11 +12032,11 @@ msgstr ""
 "som en følge av bytte av dokumentklasse\n"
 "fra %3$s til %4$s."
 
-#: src/CutAndPaste.cpp:441
+#: src/CutAndPaste.cpp:446
 msgid "Changed Layout"
 msgstr "Endret stil"
 
-#: src/CutAndPaste.cpp:460
+#: src/CutAndPaste.cpp:465
 #, c-format
 msgid ""
 "Character style %1$s is undefined because of class conversion from\n"
@@ -12043,7 +12045,7 @@ msgstr ""
 "Tekststilen %1$s er udefinert på grunn av konvertering fra\n"
 "%2$s til %3$s"
 
-#: src/CutAndPaste.cpp:467
+#: src/CutAndPaste.cpp:472
 msgid "Undefined character style"
 msgstr "Udefinert tekststil"
 
@@ -12594,7 +12596,7 @@ msgstr ""
 msgid "Exiting."
 msgstr "Avslutter."
 
-#: src/LyXFunc.cpp:1115 src/Text3.cpp:1313
+#: src/LyXFunc.cpp:1115 src/Text3.cpp:1314
 msgid "Missing argument"
 msgstr "Mangler argument"
 
@@ -13200,61 +13202,61 @@ msgid "You cannot type two spaces this way. Please read the Tutorial."
 msgstr ""
 "Det er ikke mulig å bruke to mellomrom på denne måten. Les 'Innføring.'"
 
-#: src/Text.cpp:1703
+#: src/Text.cpp:1739
 msgid "[Change Tracking] "
 msgstr "[Endringssporing] "
 
-#: src/Text.cpp:1709
+#: src/Text.cpp:1745
 msgid "Change: "
 msgstr "Endring: "
 
-#: src/Text.cpp:1713
+#: src/Text.cpp:1749
 msgid " at "
 msgstr ""
 
-#: src/Text.cpp:1723
+#: src/Text.cpp:1759
 #, c-format
 msgid "Font: %1$s"
 msgstr "Font: %1$s"
 
-#: src/Text.cpp:1728
+#: src/Text.cpp:1764
 #, c-format
 msgid ", Depth: %1$d"
 msgstr ", Dybde: %1$d"
 
-#: src/Text.cpp:1734
+#: src/Text.cpp:1770
 msgid ", Spacing: "
 msgstr ", Linjeavstand: "
 
-#: src/Text.cpp:1740 src/frontends/qt4/QDocument.cpp:166
+#: src/Text.cpp:1776 src/frontends/qt4/QDocument.cpp:232
 msgid "OneHalf"
 msgstr "Halvannen"
 
-#: src/Text.cpp:1746
+#: src/Text.cpp:1782
 msgid "Other ("
 msgstr "Annet ("
 
-#: src/Text.cpp:1755
+#: src/Text.cpp:1791
 msgid ", Inset: "
 msgstr ""
 
-#: src/Text.cpp:1756
+#: src/Text.cpp:1792
 msgid ", Paragraph: "
 msgstr ", Avsnitt: "
 
-#: src/Text.cpp:1757
+#: src/Text.cpp:1793
 msgid ", Id: "
 msgstr ", Id: "
 
-#: src/Text.cpp:1758
+#: src/Text.cpp:1794
 msgid ", Position: "
 msgstr ", Posisjon : "
 
-#: src/Text.cpp:1764
+#: src/Text.cpp:1800
 msgid ", Char: 0x"
 msgstr ""
 
-#: src/Text.cpp:1766
+#: src/Text.cpp:1802
 msgid ", Boundary: "
 msgstr ""
 
@@ -13275,23 +13277,23 @@ msgstr "Kan ikke indeksere mer enn ett avsnitt!"
 msgid "Math editor mode"
 msgstr "Matte editerings modus"
 
-#: src/Text3.cpp:721
+#: src/Text3.cpp:722
 msgid "Unknown spacing argument: "
 msgstr "Ukjent argument til linjeavstand: "
 
-#: src/Text3.cpp:894
+#: src/Text3.cpp:895
 msgid "Layout "
 msgstr "Stil "
 
-#: src/Text3.cpp:895
+#: src/Text3.cpp:896
 msgid " not known"
 msgstr " ukjent"
 
-#: src/Text3.cpp:1418 src/Text3.cpp:1430
+#: src/Text3.cpp:1419 src/Text3.cpp:1431
 msgid "Character set"
 msgstr "Tegnsett"
 
-#: src/Text3.cpp:1561
+#: src/Text3.cpp:1565
 msgid "Paragraph layout set"
 msgstr "Avsnittstil satt"
 
@@ -13406,15 +13408,15 @@ msgstr ""
 msgid "Could not read template"
 msgstr "Uleselig mal"
 
-#: src/buffer_funcs.cpp:521
+#: src/buffer_funcs.cpp:523
 msgid "\\arabic{enumi}."
 msgstr "\\arabic{enumi}."
 
-#: src/buffer_funcs.cpp:527
+#: src/buffer_funcs.cpp:529
 msgid "\\roman{enumiii}."
 msgstr "\\roman{enumiii}."
 
-#: src/buffer_funcs.cpp:530
+#: src/buffer_funcs.cpp:532
 msgid "\\Alph{enumiv}."
 msgstr "\\Alph{enumiv}."
 
@@ -13492,19 +13494,32 @@ msgstr ""
 msgid "Could not open file"
 msgstr "Kan ikke åpne fil"
 
-#: src/callback.cpp:411
+#: src/callback.cpp:404
+msgid "Reading not UTF-8 encoded file"
+msgstr ""
+
+#: src/callback.cpp:405
+msgid ""
+"The file is not UTF-8 encoded.\n"
+"It will be read as local 8Bit-encoded.\n"
+"If this does not give the correct result\n"
+"then please change the encoding of the file\n"
+"to UTF-8 with a program other than LyX.\n"
+msgstr ""
+
+#: src/callback.cpp:422
 msgid "Running configure..."
 msgstr "Kjører \"configure\"..."
 
-#: src/callback.cpp:420
+#: src/callback.cpp:431
 msgid "Reloading configuration..."
 msgstr "Leser konfigurasjon om igjen..."
 
-#: src/callback.cpp:425
+#: src/callback.cpp:436
 msgid "System reconfigured"
 msgstr "Systemed har blitt rekonfigurert."
 
-#: src/callback.cpp:426
+#: src/callback.cpp:437
 msgid ""
 "The system has been reconfigured.\n"
 "You need to restart LyX to make use of any\n"
@@ -13933,7 +13948,7 @@ msgstr "Ett ord kontrollert."
 msgid "Spelling check completed"
 msgstr "Stavekontroll fullført"
 
-#: src/frontends/controllers/ControlToc.cpp:135 src/insets/InsetTOC.cpp:46
+#: src/frontends/controllers/ControlToc.cpp:137 src/insets/InsetTOC.cpp:46
 msgid "Table of Contents"
 msgstr "Innholdsfortegnelse"
 
@@ -14101,7 +14116,7 @@ msgstr "Store ikoner"
 msgid "LyX"
 msgstr "LyX"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:467
+#: src/frontends/qt4/GuiWorkArea.cpp:477
 msgid "unknown version"
 msgstr "ukjent versjon"
 
@@ -14130,11 +14145,11 @@ msgid "Activated"
 msgstr "Aktivert"
 
 #: src/frontends/qt4/QBranches.cpp:73 src/frontends/qt4/QBranches.cpp:145
-#: src/frontends/qt4/QDocument.cpp:751
+#: src/frontends/qt4/QDocument.cpp:813
 msgid "Yes"
 msgstr "Ja"
 
-#: src/frontends/qt4/QBranches.cpp:73 src/frontends/qt4/QDocument.cpp:750
+#: src/frontends/qt4/QBranches.cpp:73 src/frontends/qt4/QDocument.cpp:812
 msgid "No"
 msgstr "Nei"
 
@@ -14201,242 +14216,242 @@ msgstr "(Ingen)"
 msgid "Variable"
 msgstr "Variabel"
 
-#: src/frontends/qt4/QDocument.cpp:67
+#: src/frontends/qt4/QDocument.cpp:71
 msgid "Computer Modern Roman"
 msgstr "Computer Modern Roman"
 
-#: src/frontends/qt4/QDocument.cpp:67
+#: src/frontends/qt4/QDocument.cpp:71
 msgid "Latin Modern Roman"
 msgstr "Latin Modern Roman"
 
-#: src/frontends/qt4/QDocument.cpp:68
+#: src/frontends/qt4/QDocument.cpp:72
 msgid "AE (Almost European)"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:68
+#: src/frontends/qt4/QDocument.cpp:72
 msgid "Times Roman"
 msgstr "Times Roman"
 
-#: src/frontends/qt4/QDocument.cpp:68
+#: src/frontends/qt4/QDocument.cpp:72
 msgid "Palatino"
 msgstr "Palatino"
 
-#: src/frontends/qt4/QDocument.cpp:68
+#: src/frontends/qt4/QDocument.cpp:72
 msgid "Bitstream Charter"
 msgstr "Bitstream Charter"
 
-#: src/frontends/qt4/QDocument.cpp:69
+#: src/frontends/qt4/QDocument.cpp:73
 msgid "New Century Schoolbook"
 msgstr "New Century Schoolbook"
 
-#: src/frontends/qt4/QDocument.cpp:69
+#: src/frontends/qt4/QDocument.cpp:73
 msgid "Bookman"
 msgstr "Bookman"
 
-#: src/frontends/qt4/QDocument.cpp:69
+#: src/frontends/qt4/QDocument.cpp:73
 msgid "Utopia"
 msgstr "Utopia"
 
-#: src/frontends/qt4/QDocument.cpp:69
+#: src/frontends/qt4/QDocument.cpp:73
 msgid "Bera Serif"
 msgstr "Bera Serif"
 
-#: src/frontends/qt4/QDocument.cpp:70
+#: src/frontends/qt4/QDocument.cpp:74
 msgid "Concrete Roman"
 msgstr "Concrete Roman"
 
-#: src/frontends/qt4/QDocument.cpp:70
+#: src/frontends/qt4/QDocument.cpp:74
 msgid "Zapf Chancery"
 msgstr "Zapf Chancery"
 
-#: src/frontends/qt4/QDocument.cpp:78
+#: src/frontends/qt4/QDocument.cpp:82
 msgid "Computer Modern Sans"
 msgstr "Computer Modern Sans"
 
-#: src/frontends/qt4/QDocument.cpp:78
+#: src/frontends/qt4/QDocument.cpp:82
 msgid "Latin Modern Sans"
 msgstr "Latin Modern Sans"
 
-#: src/frontends/qt4/QDocument.cpp:79
+#: src/frontends/qt4/QDocument.cpp:83
 msgid "Helvetica"
 msgstr "Helvetica"
 
-#: src/frontends/qt4/QDocument.cpp:79
+#: src/frontends/qt4/QDocument.cpp:83
 msgid "Avant Garde"
 msgstr "Avant Garde"
 
-#: src/frontends/qt4/QDocument.cpp:79
+#: src/frontends/qt4/QDocument.cpp:83
 msgid "Bera Sans"
 msgstr "Bera Sans"
 
-#: src/frontends/qt4/QDocument.cpp:79
+#: src/frontends/qt4/QDocument.cpp:83
 msgid "CM Bright"
 msgstr "CM Bright"
 
-#: src/frontends/qt4/QDocument.cpp:88
+#: src/frontends/qt4/QDocument.cpp:92
 msgid "Computer Modern Typewriter"
 msgstr "Computer Modern Typewriter"
 
-#: src/frontends/qt4/QDocument.cpp:89
+#: src/frontends/qt4/QDocument.cpp:93
 msgid "Latin Modern Typewriter"
 msgstr "Latin Modern Typewriter"
 
-#: src/frontends/qt4/QDocument.cpp:89
+#: src/frontends/qt4/QDocument.cpp:93
 msgid "Courier"
 msgstr "Courier"
 
-#: src/frontends/qt4/QDocument.cpp:89
+#: src/frontends/qt4/QDocument.cpp:93
 msgid "Bera Mono"
 msgstr "Bera Mono"
 
-#: src/frontends/qt4/QDocument.cpp:89
+#: src/frontends/qt4/QDocument.cpp:93
 msgid "LuxiMono"
 msgstr "LuxiMono"
 
-#: src/frontends/qt4/QDocument.cpp:90
+#: src/frontends/qt4/QDocument.cpp:94
 msgid "CM Typewriter Light"
 msgstr "CM Typewriter Light"
 
-#: src/frontends/qt4/QDocument.cpp:160
+#: src/frontends/qt4/QDocument.cpp:226
 msgid "Length"
 msgstr "Lengde"
 
-#: src/frontends/qt4/QDocument.cpp:205 src/frontends/qt4/QDocument.cpp:211
-#: src/frontends/qt4/QDocument.cpp:217
+#: src/frontends/qt4/QDocument.cpp:271 src/frontends/qt4/QDocument.cpp:277
+#: src/frontends/qt4/QDocument.cpp:283
 msgid " (not installed)"
 msgstr " (ikke installert)"
 
-#: src/frontends/qt4/QDocument.cpp:221 src/frontends/qt4/QDocument.cpp:258
-#: src/frontends/qt4/QDocument.cpp:660
+#: src/frontends/qt4/QDocument.cpp:287 src/frontends/qt4/QDocument.cpp:324
+#: src/frontends/qt4/QDocument.cpp:722
 msgid "default"
 msgstr "standard"
 
-#: src/frontends/qt4/QDocument.cpp:222
+#: src/frontends/qt4/QDocument.cpp:288
 msgid "10"
 msgstr "10"
 
-#: src/frontends/qt4/QDocument.cpp:223
+#: src/frontends/qt4/QDocument.cpp:289
 msgid "11"
 msgstr "11"
 
-#: src/frontends/qt4/QDocument.cpp:224
+#: src/frontends/qt4/QDocument.cpp:290
 msgid "12"
 msgstr "12"
 
-#: src/frontends/qt4/QDocument.cpp:259
+#: src/frontends/qt4/QDocument.cpp:325
 msgid "empty"
 msgstr "tom"
 
-#: src/frontends/qt4/QDocument.cpp:260
+#: src/frontends/qt4/QDocument.cpp:326
 msgid "plain"
 msgstr "enkel"
 
-#: src/frontends/qt4/QDocument.cpp:261
+#: src/frontends/qt4/QDocument.cpp:327
 msgid "headings"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:262
+#: src/frontends/qt4/QDocument.cpp:328
 msgid "fancy"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:278
+#: src/frontends/qt4/QDocument.cpp:344
 msgid "B3"
 msgstr "B3"
 
-#: src/frontends/qt4/QDocument.cpp:279
+#: src/frontends/qt4/QDocument.cpp:345
 msgid "B4"
 msgstr "B4"
 
-#: src/frontends/qt4/QDocument.cpp:382
+#: src/frontends/qt4/QDocument.cpp:448
 msgid "LaTeX default"
 msgstr "LaTeX standard"
 
-#: src/frontends/qt4/QDocument.cpp:388
+#: src/frontends/qt4/QDocument.cpp:454
 msgid "``text''"
 msgstr "``tekst''"
 
-#: src/frontends/qt4/QDocument.cpp:389
+#: src/frontends/qt4/QDocument.cpp:455
 msgid "''text''"
 msgstr "''tekst''"
 
-#: src/frontends/qt4/QDocument.cpp:390
+#: src/frontends/qt4/QDocument.cpp:456
 msgid ",,text``"
 msgstr ",,tekst``"
 
-#: src/frontends/qt4/QDocument.cpp:391
+#: src/frontends/qt4/QDocument.cpp:457
 msgid ",,text''"
 msgstr ",,tekst''"
 
-#: src/frontends/qt4/QDocument.cpp:392
+#: src/frontends/qt4/QDocument.cpp:458
 msgid "<<text>>"
 msgstr "<<tekst>>"
 
-#: src/frontends/qt4/QDocument.cpp:393
+#: src/frontends/qt4/QDocument.cpp:459
 msgid ">>text<<"
 msgstr ">>tekst<<"
 
-#: src/frontends/qt4/QDocument.cpp:409
+#: src/frontends/qt4/QDocument.cpp:475
 msgid "Numbered"
 msgstr "Nummerert"
 
-#: src/frontends/qt4/QDocument.cpp:410
+#: src/frontends/qt4/QDocument.cpp:476
 msgid "Appears in TOC"
 msgstr "I innholdsliste"
 
-#: src/frontends/qt4/QDocument.cpp:430
+#: src/frontends/qt4/QDocument.cpp:496
 msgid "Author-year"
 msgstr "Forfatter-år"
 
-#: src/frontends/qt4/QDocument.cpp:431
+#: src/frontends/qt4/QDocument.cpp:497
 msgid "Numerical"
 msgstr "Numerisk"
 
-#: src/frontends/qt4/QDocument.cpp:473
+#: src/frontends/qt4/QDocument.cpp:539
 #, c-format
 msgid "Unavailable: %1$s"
 msgstr "Utilgjengelig: %1$s"
 
-#: src/frontends/qt4/QDocument.cpp:503 src/frontends/qt4/QDocument.cpp:516
+#: src/frontends/qt4/QDocument.cpp:565 src/frontends/qt4/QDocument.cpp:578
 msgid "Document Class"
 msgstr "Dokumentklasse"
 
-#: src/frontends/qt4/QDocument.cpp:505
+#: src/frontends/qt4/QDocument.cpp:567
 msgid "Text Layout"
 msgstr "Tekststil"
 
-#: src/frontends/qt4/QDocument.cpp:506
+#: src/frontends/qt4/QDocument.cpp:568
 msgid "Page Layout"
 msgstr "Sidestil"
 
-#: src/frontends/qt4/QDocument.cpp:507
+#: src/frontends/qt4/QDocument.cpp:569
 msgid "Page Margins"
 msgstr "Tekstmarger"
 
-#: src/frontends/qt4/QDocument.cpp:509
+#: src/frontends/qt4/QDocument.cpp:571
 msgid "Numbering & TOC"
 msgstr "Seksjonsnumre"
 
-#: src/frontends/qt4/QDocument.cpp:511
+#: src/frontends/qt4/QDocument.cpp:573
 msgid "Math Options"
 msgstr "Matte-innstillinger"
 
-#: src/frontends/qt4/QDocument.cpp:512
+#: src/frontends/qt4/QDocument.cpp:574
 msgid "Float Placement"
 msgstr "\"Float\"-plassering"
 
-#: src/frontends/qt4/QDocument.cpp:513
+#: src/frontends/qt4/QDocument.cpp:575
 msgid "Bullets"
 msgstr "Bomber"
 
-#: src/frontends/qt4/QDocument.cpp:514
+#: src/frontends/qt4/QDocument.cpp:576
 msgid "Branches"
 msgstr "Dokumentgrener"
 
-#: src/frontends/qt4/QDocument.cpp:515 src/frontends/qt4/QDocument.cpp:527
+#: src/frontends/qt4/QDocument.cpp:577 src/frontends/qt4/QDocument.cpp:589
 msgid "LaTeX Preamble"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:1306
+#: src/frontends/qt4/QDocument.cpp:1364
 msgid "Document Settings"
 msgstr "Dokumentinnstillinger"
 
@@ -14444,11 +14459,11 @@ msgstr "Dokumentinnstillinger"
 msgid "TeX Code Settings"
 msgstr "TeX innstillinger"
 
-#: src/frontends/qt4/QExternal.cpp:495
+#: src/frontends/qt4/QExternal.cpp:497
 msgid "External Material"
 msgstr "Eksternt materiale"
 
-#: src/frontends/qt4/QExternal.cpp:555
+#: src/frontends/qt4/QExternal.cpp:557
 msgid "Scale%"
 msgstr "Skaler%"
 
@@ -14456,15 +14471,15 @@ msgstr "Skaler%"
 msgid "Float Settings"
 msgstr "\"Float\" innstillinger"
 
-#: src/frontends/qt4/QGraphics.cpp:63 src/frontends/qt4/QPrefs.cpp:634
+#: src/frontends/qt4/QGraphics.cpp:63 src/frontends/qt4/QPrefs.cpp:635
 msgid "Graphics"
 msgstr "Grafikk"
 
-#: src/frontends/qt4/QInclude.cpp:185
+#: src/frontends/qt4/QInclude.cpp:171
 msgid "Child Document"
 msgstr "Underdokument"
 
-#: src/frontends/qt4/QListings.cpp:195
+#: src/frontends/qt4/QListings.cpp:183
 #, fuzzy
 msgid "Program Listings Settings"
 msgstr "Avsnittinnstillinger"
@@ -14494,121 +14509,121 @@ msgstr ""
 msgid "Paragraph Settings"
 msgstr "Innstillinger for avsnitt"
 
-#: src/frontends/qt4/QPrefs.cpp:73
+#: src/frontends/qt4/QPrefs.cpp:74
 msgid "Look and feel"
 msgstr "Utseende"
 
-#: src/frontends/qt4/QPrefs.cpp:74
+#: src/frontends/qt4/QPrefs.cpp:75
 msgid "Language settings"
 msgstr "Språkinnstillinger"
 
-#: src/frontends/qt4/QPrefs.cpp:75
+#: src/frontends/qt4/QPrefs.cpp:76
 msgid "Outputs"
 msgstr "Utdata"
 
-#: src/frontends/qt4/QPrefs.cpp:173
+#: src/frontends/qt4/QPrefs.cpp:174
 msgid "Plain text"
 msgstr "Ren tekst"
 
-#: src/frontends/qt4/QPrefs.cpp:204
+#: src/frontends/qt4/QPrefs.cpp:205
 msgid "Date format"
 msgstr "Datoformat"
 
-#: src/frontends/qt4/QPrefs.cpp:231
+#: src/frontends/qt4/QPrefs.cpp:232
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: src/frontends/qt4/QPrefs.cpp:355
+#: src/frontends/qt4/QPrefs.cpp:356
 msgid "Screen fonts"
 msgstr "Skjermfonter"
 
-#: src/frontends/qt4/QPrefs.cpp:513
+#: src/frontends/qt4/QPrefs.cpp:514
 msgid "Colors"
 msgstr "Farger"
 
-#: src/frontends/qt4/QPrefs.cpp:608 src/frontends/qt4/QPrefs.cpp:707
+#: src/frontends/qt4/QPrefs.cpp:609 src/frontends/qt4/QPrefs.cpp:708
 msgid "Paths"
 msgstr "Mapper"
 
-#: src/frontends/qt4/QPrefs.cpp:758
+#: src/frontends/qt4/QPrefs.cpp:759
 msgid "Select a document templates directory"
 msgstr "Velg folder for dokument maler"
 
-#: src/frontends/qt4/QPrefs.cpp:768
+#: src/frontends/qt4/QPrefs.cpp:769
 msgid "Select a temporary directory"
 msgstr "Velg en temporær folder"
 
-#: src/frontends/qt4/QPrefs.cpp:778
+#: src/frontends/qt4/QPrefs.cpp:779
 msgid "Select a backups directory"
 msgstr "Velg folder for sikkerhetskopier"
 
-#: src/frontends/qt4/QPrefs.cpp:788
+#: src/frontends/qt4/QPrefs.cpp:789
 msgid "Select a document directory"
 msgstr "Velg folder for dokumenter"
 
-#: src/frontends/qt4/QPrefs.cpp:798
+#: src/frontends/qt4/QPrefs.cpp:799
 msgid "Give a filename for the LyX server pipe"
 msgstr ""
 
-#: src/frontends/qt4/QPrefs.cpp:811 src/frontends/qt4/QSpellchecker.cpp:135
+#: src/frontends/qt4/QPrefs.cpp:812 src/frontends/qt4/QSpellchecker.cpp:135
 msgid "Spellchecker"
 msgstr "Stavekontroll"
 
-#: src/frontends/qt4/QPrefs.cpp:833
+#: src/frontends/qt4/QPrefs.cpp:834
 msgid "ispell"
 msgstr "ispell"
 
-#: src/frontends/qt4/QPrefs.cpp:834
+#: src/frontends/qt4/QPrefs.cpp:835
 msgid "aspell"
 msgstr "aspell"
 
-#: src/frontends/qt4/QPrefs.cpp:835
+#: src/frontends/qt4/QPrefs.cpp:836
 msgid "hspell"
 msgstr "hspell"
 
-#: src/frontends/qt4/QPrefs.cpp:837
+#: src/frontends/qt4/QPrefs.cpp:838
 msgid "pspell (library)"
 msgstr "pspell (bibliotek)"
 
-#: src/frontends/qt4/QPrefs.cpp:840
+#: src/frontends/qt4/QPrefs.cpp:841
 msgid "aspell (library)"
 msgstr "aspell (bibliotek)"
 
-#: src/frontends/qt4/QPrefs.cpp:921
+#: src/frontends/qt4/QPrefs.cpp:922
 msgid "Converters"
 msgstr "Konvertere"
 
-#: src/frontends/qt4/QPrefs.cpp:1111
+#: src/frontends/qt4/QPrefs.cpp:1120
 msgid "Copiers"
 msgstr "Kopi-programmer"
 
-#: src/frontends/qt4/QPrefs.cpp:1364
+#: src/frontends/qt4/QPrefs.cpp:1373
 msgid "File formats"
 msgstr "Filformater"
 
-#: src/frontends/qt4/QPrefs.cpp:1556
+#: src/frontends/qt4/QPrefs.cpp:1565
 msgid "Format in use"
 msgstr "Formater i bruk"
 
-#: src/frontends/qt4/QPrefs.cpp:1557
+#: src/frontends/qt4/QPrefs.cpp:1566
 msgid "Cannot remove a Format used by a Converter. Remove the converter first."
 msgstr ""
 "Kan ikke fjerne et format som brukes av en konverter. Fjern konverteren "
 "først."
 
-#: src/frontends/qt4/QPrefs.cpp:1658
+#: src/frontends/qt4/QPrefs.cpp:1667
 msgid "Printer"
 msgstr "Skriver"
 
-#: src/frontends/qt4/QPrefs.cpp:1756 src/frontends/qt4/QPrefs.cpp:1950
+#: src/frontends/qt4/QPrefs.cpp:1765 src/frontends/qt4/QPrefs.cpp:1959
 msgid "User interface"
 msgstr "Brukergrensesnitt"
 
-#: src/frontends/qt4/QPrefs.cpp:1874
+#: src/frontends/qt4/QPrefs.cpp:1883
 msgid "Identity"
 msgstr "Identitet"
 
-#: src/frontends/qt4/QPrefs.cpp:2016
+#: src/frontends/qt4/QPrefs.cpp:2025
 msgid "Preferences"
 msgstr "Preferanser"
 
@@ -14616,19 +14631,19 @@ msgstr "Preferanser"
 msgid "Print Document"
 msgstr "Skriv ut dokumentet"
 
-#: src/frontends/qt4/QRef.cpp:188
+#: src/frontends/qt4/QRef.cpp:189
 msgid "Cross-reference"
 msgstr "Kryssreferanse"
 
-#: src/frontends/qt4/QRef.cpp:284
+#: src/frontends/qt4/QRef.cpp:285
 msgid "&Go Back"
 msgstr "&Tilbake"
 
-#: src/frontends/qt4/QRef.cpp:286
+#: src/frontends/qt4/QRef.cpp:287
 msgid "Jump back"
 msgstr "Gå tilbake igjen"
 
-#: src/frontends/qt4/QRef.cpp:294
+#: src/frontends/qt4/QRef.cpp:295
 msgid "Jump to label"
 msgstr "Gå til referanse"
 
@@ -14762,7 +14777,7 @@ msgstr ""
 msgid "Opened Caption Inset"
 msgstr ""
 
-#: src/insets/InsetCaption.cpp:284
+#: src/insets/InsetCaption.cpp:298
 msgid "Senseless!!! "
 msgstr "Gir ikke mening!"
 
@@ -14904,7 +14919,7 @@ msgstr "N
 msgid "Index"
 msgstr "Register"
 
-#: src/insets/InsetListings.cpp:126
+#: src/insets/InsetListings.cpp:128
 #, fuzzy
 msgid "Opened Listings Inset"
 msgstr "Åpnet text inset"
@@ -15028,6 +15043,15 @@ msgstr "Multikolonne kan ikke brukes vertikalt."
 msgid "Opened Text Inset"
 msgstr "Åpnet text inset"
 
+#: src/insets/InsetTheorem.cpp:41
+msgid "theorem"
+msgstr "teorem"
+
+#: src/insets/InsetTheorem.cpp:91
+#, fuzzy
+msgid "Opened Theorem Inset"
+msgstr "Åpnet text inset"
+
 #: src/insets/InsetUrl.cpp:42
 msgid "Url: "
 msgstr "Url: "
@@ -15188,6 +15212,11 @@ msgstr "En streng har blitt erstattet."
 msgid " strings have been replaced."
 msgstr " strenger har blitt erstattet."
 
+#: src/mathed/InsetFormulaMacro.cpp:124 src/mathed/MathMacroTemplate.cpp:109
+#, c-format
+msgid " Macro: %1$s: "
+msgstr " Makro: %1$s: "
+
 #: src/mathed/InsetMathAMSArray.cpp:112 src/mathed/InsetMathHull.cpp:1249
 #: src/mathed/InsetMathSplit.cpp:76 src/mathed/InsetMathSubstack.cpp:75
 #, c-format
@@ -15251,11 +15280,6 @@ msgstr ""
 msgid "entered math text mode (textrm)"
 msgstr ""
 
-#: src/mathed/MathMacroTemplate.cpp:109
-#, c-format
-msgid " Macro: %1$s: "
-msgstr " Makro: %1$s: "
-
 #: src/mathed/MathMacroTemplate.cpp:241
 msgid "math macro"
 msgstr ""
@@ -15353,6 +15377,50 @@ msgstr ""
 msgid "Unknown user"
 msgstr "Ukjent bruker"
 
+#, fuzzy
+#~ msgid "Number style"
+#~ msgstr "Nummerert liste"
+
+#~ msgid "Error closing file"
+#~ msgstr "Mislyktes med å lukke fil"
+
+#~ msgid ""
+#~ "The output file could not be closed properly.\n"
+#~ " Probably some characters of your document are not representable in the "
+#~ "chosen encoding.\n"
+#~ "Changing the document encoding to utf8 could help."
+#~ msgstr ""
+#~ "Filen kunne ikke lukkes ordentlig.\n"
+#~ " Antagelig er det noen tegn som ikke kan representeres i den valgte "
+#~ "tegnkodingen.\n"
+#~ "Å forandre dokumentets tegnkoding til utf8 kan hjelpe."
+
+#~ msgid "block "
+#~ msgstr "blokk"
+
+#~ msgid "Corollary.  "
+#~ msgstr "Korollar."
+
+#, fuzzy
+#~ msgid "Basic style"
+#~ msgstr "Natbib-&stil:"
+
+#, fuzzy
+#~ msgid "&Caption"
+#~ msgstr "Bildetekst"
+
+#, fuzzy
+#~ msgid "A caption for the List of Listings"
+#~ msgstr "Bildetekst for sub-figuren"
+
+#, fuzzy
+#~ msgid "&Label"
+#~ msgstr "&Merke:"
+
+#, fuzzy
+#~ msgid "A Label for the caption"
+#~ msgstr "Tabelltittel"
+
 #, fuzzy
 #~ msgid "<- P&romote"
 #~ msgstr "<- &Forfremme"
@@ -15414,9 +15482,6 @@ msgstr "Ukjent bruker"
 #~ msgid "Glossary"
 #~ msgstr "Glossar"
 
-#~ msgid "theorem"
-#~ msgstr "teorem"
-
 #, fuzzy
 #~ msgid "TeX Code:"
 #~ msgstr "TeX-kode|X"