Add parameter to xgettext to also parse utf-8 chars. (autotools)

[lyx.git] / po / nn.po

diff --git a/po/nn.po b/po/nn.po
index 5a8b11431a9360a24a9b0c5eec84ed7b6cfbb1eb..6f03be90cc4f9522f683991c74f704533d3f24cb 100644 (file)
--- a/po/nn.po
+++ b/po/nn.po
@@ -34,8 +34,8 @@ msgstr "Versjonen her"
 msgid "Credits"
 msgstr "Bidrag"
 
-#: src/frontends/qt4/ui/AboutUi.ui:84\r lib/layouts/apa.layout:205
-#: lib/layouts/apa6.layout:315\r lib/layouts/agu_stdtitle.inc:81
+#: src/frontends/qt4/ui/AboutUi.ui:84 lib/layouts/apa.layout:205
+#: lib/layouts/apa6.layout:315 lib/layouts/agu_stdtitle.inc:81
 msgid "Copyright"
 msgstr "Opphavsrett"
 
@@ -48,32 +48,32 @@ msgstr "Byggjeinfo"
 msgid "Release Notes"
 msgstr "Tabellnotis"
 
-#: src/frontends/qt4/ui/AboutUi.ui:159\r src/frontends/qt4/ui/CompareUi.ui:163
+#: src/frontends/qt4/ui/AboutUi.ui:159 src/frontends/qt4/ui/CompareUi.ui:163
 #: src/frontends/qt4/ui/DelimiterUi.ui:286
 #: src/frontends/qt4/ui/ErrorListUi.ui:60
 #: src/frontends/qt4/ui/ExternalUi.ui:620
 #: src/frontends/qt4/ui/IncludeUi.ui:250
 #: src/frontends/qt4/ui/InsetParamsUi.ui:138
-#: src/frontends/qt4/ui/LogUi.ui:88\r src/frontends/qt4/ui/ParagraphUi.ui:261
-#: src/frontends/qt4/ui/PrefsUi.ui:90\r src/frontends/qt4/ui/RefUi.ui:343
+#: src/frontends/qt4/ui/LogUi.ui:88 src/frontends/qt4/ui/ParagraphUi.ui:261
+#: src/frontends/qt4/ui/PrefsUi.ui:90 src/frontends/qt4/ui/RefUi.ui:343
 #: src/frontends/qt4/ui/SearchUi.ui:203
 #: src/frontends/qt4/ui/ShowFileUi.ui:55
-#: src/frontends/qt4/ui/SymbolsUi.ui:66\r src/frontends/qt4/ui/TexinfoUi.ui:58
+#: src/frontends/qt4/ui/SymbolsUi.ui:66 src/frontends/qt4/ui/TexinfoUi.ui:58
 #: src/frontends/qt4/ui/ThesaurusUi.ui:138
-#: src/frontends/qt4/ui/WrapUi.ui:173\r src/frontends/qt4/GuiParagraph.cpp:163
+#: src/frontends/qt4/ui/WrapUi.ui:173 src/frontends/qt4/GuiParagraph.cpp:163
 #: src/frontends/qt4/GuiView.cpp:2737
 msgid "&Close"
 msgstr "&Lat att"
 
-#: src/frontends/qt4/ui/BibitemUi.ui:31\r src/frontends/qt4/ui/BibitemUi.ui:64
+#: src/frontends/qt4/ui/BibitemUi.ui:31 src/frontends/qt4/ui/BibitemUi.ui:64
 msgid "The bibliography key"
 msgstr "Litteraturnøkkel"
 
-#: src/frontends/qt4/ui/BibitemUi.ui:44\r src/frontends/qt4/ui/BibitemUi.ui:51
+#: src/frontends/qt4/ui/BibitemUi.ui:44 src/frontends/qt4/ui/BibitemUi.ui:51
 msgid "The label as it appears in the document"
 msgstr "Etiketten slik den er i dokumentet"
 
-#: src/frontends/qt4/ui/BibitemUi.ui:54\r src/frontends/qt4/ui/LabelUi.ui:36
+#: src/frontends/qt4/ui/BibitemUi.ui:54 src/frontends/qt4/ui/LabelUi.ui:36
 #: src/frontends/qt4/ui/RefUi.ui:190
 msgid "&Label:"
 msgstr "&Etikett:"
@@ -148,17 +148,17 @@ msgstr ""
 msgid "Bibliography Generation"
 msgstr "Litteraturliste-generator"
 
-#: src/frontends/qt4/ui/BiblioUi.ui:167\r src/frontends/qt4/ui/IndicesUi.ui:33
+#: src/frontends/qt4/ui/BiblioUi.ui:167 src/frontends/qt4/ui/IndicesUi.ui:33
 #: src/frontends/qt4/ui/PrefLatexUi.ui:85
 msgid "&Processor:"
 msgstr "&handsamar:"
 
-#: src/frontends/qt4/ui/BiblioUi.ui:177\r src/frontends/qt4/ui/IndicesUi.ui:43
+#: src/frontends/qt4/ui/BiblioUi.ui:177 src/frontends/qt4/ui/IndicesUi.ui:43
 msgid "Select a processor"
 msgstr "Vel ein litteraturhandsamer."
 
-#: src/frontends/qt4/ui/BiblioUi.ui:201\r src/frontends/qt4/ui/IndicesUi.ui:54
-#: src/frontends/qt4/ui/PrefLatexUi.ui:98\r src/frontends/qt4/GuiPrefs.cpp:799
+#: src/frontends/qt4/ui/BiblioUi.ui:201 src/frontends/qt4/ui/IndicesUi.ui:54
+#: src/frontends/qt4/ui/PrefLatexUi.ui:98 src/frontends/qt4/GuiPrefs.cpp:799
 #: src/frontends/qt4/GuiPrefs.cpp:892
 msgid "&Options:"
 msgstr "&Val:"
@@ -178,15 +178,15 @@ msgid "Scan for new databases and styles"
 msgstr "Leit etter nye databasar og stilar"
 
 #: src/frontends/qt4/ui/BibtexAddUi.ui:39
-#: src/frontends/qt4/ui/BibtexUi.ui:50\r src/frontends/qt4/ui/TexinfoUi.ui:94
+#: src/frontends/qt4/ui/BibtexUi.ui:50 src/frontends/qt4/ui/TexinfoUi.ui:94
 msgid "&Rescan"
 msgstr "&Frisk opp"
 
 #: src/frontends/qt4/ui/BibtexAddUi.ui:46
-#: src/frontends/qt4/ui/BibtexUi.ui:97\r src/frontends/qt4/ui/CompareUi.ui:50
+#: src/frontends/qt4/ui/BibtexUi.ui:97 src/frontends/qt4/ui/CompareUi.ui:50
 #: src/frontends/qt4/ui/ExternalUi.ui:70
 #: src/frontends/qt4/ui/GraphicsUi.ui:58
-#: src/frontends/qt4/ui/IncludeUi.ui:335\r src/frontends/qt4/ui/LaTeXUi.ui:160
+#: src/frontends/qt4/ui/IncludeUi.ui:335 src/frontends/qt4/ui/LaTeXUi.ui:160
 #: src/frontends/qt4/ui/PrefInputUi.ui:111
 msgid "&Browse..."
 msgstr "&Bla gjennom..."
@@ -198,13 +198,13 @@ msgstr "Vel BibTeXdatabase"
 #: src/frontends/qt4/ui/BibtexAddUi.ui:114
 #: src/frontends/qt4/ui/BranchesUi.ui:113
 #: src/frontends/qt4/ui/CitationUi.ui:84
-#: src/frontends/qt4/ui/IndicesUi.ui:134\r src/CutAndPaste.cpp:369
+#: src/frontends/qt4/ui/IndicesUi.ui:134 src/CutAndPaste.cpp:369
 msgid "&Add"
 msgstr "&Legg til"
 
 #: src/frontends/qt4/ui/BibtexAddUi.ui:127
-#: src/frontends/qt4/ui/BibtexUi.ui:213\r src/frontends/qt4/ui/ChangesUi.ui:91
-#: src/frontends/qt4/ui/SendtoUi.ui:92\r src/frontends/qt4/ui/ShortcutUi.ui:65
+#: src/frontends/qt4/ui/BibtexUi.ui:213 src/frontends/qt4/ui/ChangesUi.ui:91
+#: src/frontends/qt4/ui/SendtoUi.ui:92 src/frontends/qt4/ui/ShortcutUi.ui:65
 #: src/buffer_funcs.cpp:123 src/frontends/qt4/ButtonController.cpp:239
 #: src/frontends/qt4/GuiApplication.cpp:1789
 #: src/frontends/qt4/GuiCompare.cpp:192
@@ -219,11 +219,11 @@ msgstr "BibTeX stil"
 msgid "St&yle"
 msgstr "&Stil"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:94\r src/frontends/qt4/ui/BibtexUi.ui:107
+#: src/frontends/qt4/ui/BibtexUi.ui:94 src/frontends/qt4/ui/BibtexUi.ui:107
 msgid "Choose a style file"
 msgstr "Vel ein stil"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:131\r src/frontends/qt4/ui/BibtexUi.ui:144
+#: src/frontends/qt4/ui/BibtexUi.ui:131 src/frontends/qt4/ui/BibtexUi.ui:144
 msgid "This bibliography section contains..."
 msgstr "Denne delen av litteraturlista inneheld..."
 
@@ -231,16 +231,16 @@ msgstr "Denne delen av litteraturlista inneheld..."
 msgid "&Content:"
 msgstr "&Innhald:"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:148\r src/insets/InsetBibtex.cpp:216
+#: src/frontends/qt4/ui/BibtexUi.ui:148 src/insets/InsetBibtex.cpp:216
 msgid "all cited references"
 msgstr "Litteratur nytta i teksten"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:153\r src/frontends/qt4/GuiBibtex.cpp:328
+#: src/frontends/qt4/ui/BibtexUi.ui:153 src/frontends/qt4/GuiBibtex.cpp:328
 #: src/insets/InsetBibtex.cpp:214
 msgid "all uncited references"
 msgstr "Litteratur ikkje nytta i teksten"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:158\r src/insets/InsetBibtex.cpp:212
+#: src/frontends/qt4/ui/BibtexUi.ui:158 src/insets/InsetBibtex.cpp:212
 msgid "all references"
 msgstr "Tilgjengeleg litteratur"
 
@@ -260,14 +260,14 @@ msgstr "Legg &til innhaldslista"
 #: src/frontends/qt4/ui/DocumentUi.ui:67
 #: src/frontends/qt4/ui/ExternalUi.ui:600
 #: src/frontends/qt4/ui/GraphicsUi.ui:711
-#: src/frontends/qt4/ui/IncludeUi.ui:237\r src/frontends/qt4/ui/IndexUi.ui:41
+#: src/frontends/qt4/ui/IncludeUi.ui:237 src/frontends/qt4/ui/IndexUi.ui:41
 #: src/frontends/qt4/ui/InsetParamsUi.ui:118
 #: src/frontends/qt4/ui/ListingsUi.ui:539
 #: src/frontends/qt4/ui/MathMatrixUi.ui:263
-#: src/frontends/qt4/ui/NoteUi.ui:38\r src/frontends/qt4/ui/ParagraphUi.ui:241
+#: src/frontends/qt4/ui/NoteUi.ui:38 src/frontends/qt4/ui/ParagraphUi.ui:241
 #: src/frontends/qt4/ui/PhantomUi.ui:38
-#: src/frontends/qt4/ui/PrintindexUi.ui:38\r src/frontends/qt4/ui/RefUi.ui:317
-#: src/frontends/qt4/ui/SendtoUi.ui:72\r src/frontends/qt4/ui/ShortcutUi.ui:52
+#: src/frontends/qt4/ui/PrintindexUi.ui:38 src/frontends/qt4/ui/RefUi.ui:317
+#: 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:127
 #: src/frontends/qt4/ui/ToggleWarningUi.ui:90
@@ -324,19 +324,19 @@ msgstr "&Slett"
 msgid "Type and Size"
 msgstr ""
 
-#: src/frontends/qt4/ui/BoxUi.ui:32\r src/frontends/qt4/ui/WrapUi.ui:103
+#: src/frontends/qt4/ui/BoxUi.ui:32 src/frontends/qt4/ui/WrapUi.ui:103
 msgid "Width value"
 msgstr "Breidd"
 
-#: src/frontends/qt4/ui/BoxUi.ui:45\r src/frontends/qt4/ui/ExternalUi.ui:446
+#: src/frontends/qt4/ui/BoxUi.ui:45 src/frontends/qt4/ui/ExternalUi.ui:446
 #: src/frontends/qt4/ui/PageLayoutUi.ui:71
 msgid "&Height:"
 msgstr "&Høgd:"
 
-#: src/frontends/qt4/ui/BoxUi.ui:61\r src/frontends/qt4/ui/ExternalUi.ui:420
+#: src/frontends/qt4/ui/BoxUi.ui:61 src/frontends/qt4/ui/ExternalUi.ui:420
 #: src/frontends/qt4/ui/LineUi.ui:58
 #: src/frontends/qt4/ui/PageLayoutUi.ui:100
-#: src/frontends/qt4/ui/TabularUi.ui:475\r src/frontends/qt4/ui/WrapUi.ui:85
+#: src/frontends/qt4/ui/TabularUi.ui:475 src/frontends/qt4/ui/WrapUi.ui:85
 msgid "&Width:"
 msgstr "&Breidd:"
 
@@ -349,11 +349,11 @@ msgstr "&Indre ramme:"
 msgid "Inner box type"
 msgstr "Set inn ramme"
 
-#: src/frontends/qt4/ui/BoxUi.ui:91\r src/frontends/qt4/ui/HSpaceUi.ui:32
+#: src/frontends/qt4/ui/BoxUi.ui:91 src/frontends/qt4/ui/HSpaceUi.ui:32
 #: src/frontends/qt4/ui/ListingsUi.ui:98
 #: src/frontends/qt4/ui/TabularUi.ui:1199
 #: src/frontends/qt4/ui/TabularUi.ui:1218
-#: src/frontends/qt4/ui/TabularUi.ui:1266\r src/frontends/qt4/GuiBox.cpp:425
+#: src/frontends/qt4/ui/TabularUi.ui:1266 src/frontends/qt4/GuiBox.cpp:425
 #: src/frontends/qt4/GuiBox.cpp:635 src/frontends/qt4/GuiDocument.cpp:120
 #: src/frontends/qt4/GuiGraphics.cpp:582
 #: src/frontends/qt4/GuiMathMatrix.cpp:33 src/frontends/qt4/GuiPrefs.cpp:2180
@@ -361,12 +361,12 @@ msgstr "Set inn ramme"
 msgid "None"
 msgstr "Ingen"
 
-#: src/frontends/qt4/ui/BoxUi.ui:96\r src/frontends/qt4/GuiBox.cpp:427
+#: src/frontends/qt4/ui/BoxUi.ui:96 src/frontends/qt4/GuiBox.cpp:427
 #: src/frontends/qt4/GuiBox.cpp:638 src/insets/InsetBox.cpp:137
 msgid "Parbox"
 msgstr "Avsnittramme"
 
-#: src/frontends/qt4/ui/BoxUi.ui:101\r src/frontends/qt4/GuiBox.cpp:639
+#: src/frontends/qt4/ui/BoxUi.ui:101 src/frontends/qt4/GuiBox.cpp:639
 #: src/insets/InsetBox.cpp:141
 msgid "Minipage"
 msgstr "Miniside"
@@ -389,7 +389,7 @@ msgstr "Høgde"
 msgid "Alignment"
 msgstr "Justering"
 
-#: src/frontends/qt4/ui/BoxUi.ui:148\r src/frontends/qt4/ui/BoxUi.ui:261
+#: src/frontends/qt4/ui/BoxUi.ui:148 src/frontends/qt4/ui/BoxUi.ui:261
 msgid "Horizontal alignment of the content inside the box"
 msgstr "Vassrett justering av innhaldet i ramma"
 
@@ -397,7 +397,7 @@ msgstr "Vassrett justering av innhaldet i ramma"
 msgid "Horizontal"
 msgstr "Vassrett"
 
-#: src/frontends/qt4/ui/BoxUi.ui:158\r src/frontends/qt4/ui/BoxUi.ui:200
+#: src/frontends/qt4/ui/BoxUi.ui:158 src/frontends/qt4/ui/BoxUi.ui:200
 msgid "Vertical alignment of the content inside the box"
 msgstr "Loddrettjustering for innhaldet i ramma"
 
@@ -409,7 +409,7 @@ msgstr "Loddrett"
 msgid "Co&ntent:"
 msgstr "&Innhald:"
 
-#: src/frontends/qt4/ui/BoxUi.ui:178\r src/frontends/qt4/ui/BoxUi.ui:230
+#: src/frontends/qt4/ui/BoxUi.ui:178 src/frontends/qt4/ui/BoxUi.ui:230
 msgid "Vertical alignment of the box (with regard to baseline)"
 msgstr "Loddrettjustering for ramma (i høve til grunnlinja)"
 
@@ -417,39 +417,39 @@ msgstr "Loddrettjustering for ramma (i høve til grunnlinja)"
 msgid "&Box:"
 msgstr "&Ramme:"
 
-#: src/frontends/qt4/ui/BoxUi.ui:204\r src/frontends/qt4/ui/BoxUi.ui:234
+#: src/frontends/qt4/ui/BoxUi.ui:204 src/frontends/qt4/ui/BoxUi.ui:234
 #: src/frontends/qt4/ui/TabularUi.ui:277
-#: src/frontends/qt4/ui/TabularUi.ui:532\r lib/ui/stdcontext.inc:421
+#: src/frontends/qt4/ui/TabularUi.ui:532 lib/ui/stdcontext.inc:421
 #: src/frontends/qt4/GuiMathMatrix.cpp:52
 msgid "Top"
 msgstr "Topp"
 
-#: src/frontends/qt4/ui/BoxUi.ui:209\r src/frontends/qt4/ui/BoxUi.ui:239
+#: src/frontends/qt4/ui/BoxUi.ui:209 src/frontends/qt4/ui/BoxUi.ui:239
 #: src/frontends/qt4/ui/TabularUi.ui:282
-#: src/frontends/qt4/ui/TabularUi.ui:537\r lib/ui/stdcontext.inc:422
+#: src/frontends/qt4/ui/TabularUi.ui:537 lib/ui/stdcontext.inc:422
 #: src/frontends/qt4/GuiMathMatrix.cpp:53 src/frontends/qt4/GuiTabular.cpp:225
 msgid "Middle"
 msgstr "Midten"
 
-#: src/frontends/qt4/ui/BoxUi.ui:214\r src/frontends/qt4/ui/BoxUi.ui:244
+#: src/frontends/qt4/ui/BoxUi.ui:214 src/frontends/qt4/ui/BoxUi.ui:244
 #: src/frontends/qt4/ui/TabularUi.ui:287
-#: src/frontends/qt4/ui/TabularUi.ui:542\r lib/layouts/g-brief2.layout:104
-#: lib/layouts/g-brief2.layout:125\r lib/layouts/g-brief2.layout:145
-#: lib/layouts/g-brief2.layout:165\r lib/layouts/g-brief2.layout:185
-#: lib/layouts/g-brief2.layout:205\r lib/layouts/g-brief2.layout:225
-#: lib/layouts/g-brief2.layout:246\r lib/layouts/g-brief2.layout:267
-#: lib/layouts/g-brief2.layout:287\r lib/layouts/g-brief2.layout:307
-#: lib/layouts/g-brief2.layout:327\r lib/layouts/g-brief2.layout:347
-#: lib/layouts/g-brief2.layout:367\r lib/layouts/g-brief2.layout:388
-#: lib/layouts/g-brief2.layout:408\r lib/layouts/g-brief2.layout:428
-#: lib/layouts/g-brief2.layout:448\r lib/layouts/g-brief2.layout:468
-#: lib/layouts/g-brief2.layout:488\r lib/layouts/g-brief2.layout:509
-#: lib/layouts/g-brief2.layout:529\r lib/layouts/g-brief2.layout:549
-#: lib/layouts/g-brief2.layout:569\r lib/layouts/g-brief2.layout:589
-#: lib/layouts/g-brief2.layout:609\r lib/layouts/g-brief2.layout:630
-#: lib/layouts/g-brief2.layout:650\r lib/layouts/g-brief2.layout:670
-#: lib/layouts/g-brief2.layout:690\r lib/layouts/g-brief2.layout:710
-#: lib/ui/stdcontext.inc:423\r src/frontends/qt4/GuiMathMatrix.cpp:54
+#: src/frontends/qt4/ui/TabularUi.ui:542 lib/layouts/g-brief2.layout:104
+#: lib/layouts/g-brief2.layout:125 lib/layouts/g-brief2.layout:145
+#: lib/layouts/g-brief2.layout:165 lib/layouts/g-brief2.layout:185
+#: lib/layouts/g-brief2.layout:205 lib/layouts/g-brief2.layout:225
+#: lib/layouts/g-brief2.layout:246 lib/layouts/g-brief2.layout:267
+#: lib/layouts/g-brief2.layout:287 lib/layouts/g-brief2.layout:307
+#: lib/layouts/g-brief2.layout:327 lib/layouts/g-brief2.layout:347
+#: lib/layouts/g-brief2.layout:367 lib/layouts/g-brief2.layout:388
+#: lib/layouts/g-brief2.layout:408 lib/layouts/g-brief2.layout:428
+#: lib/layouts/g-brief2.layout:448 lib/layouts/g-brief2.layout:468
+#: lib/layouts/g-brief2.layout:488 lib/layouts/g-brief2.layout:509
+#: lib/layouts/g-brief2.layout:529 lib/layouts/g-brief2.layout:549
+#: lib/layouts/g-brief2.layout:569 lib/layouts/g-brief2.layout:589
+#: lib/layouts/g-brief2.layout:609 lib/layouts/g-brief2.layout:630
+#: lib/layouts/g-brief2.layout:650 lib/layouts/g-brief2.layout:670
+#: lib/layouts/g-brief2.layout:690 lib/layouts/g-brief2.layout:710
+#: lib/ui/stdcontext.inc:423 src/frontends/qt4/GuiMathMatrix.cpp:54
 msgid "Bottom"
 msgstr "Botn"
 
@@ -457,23 +457,23 @@ msgstr "Botn"
 msgid "Stretch"
 msgstr "Strekk"
 
-#: src/frontends/qt4/ui/BoxUi.ui:265\r src/frontends/qt4/ui/ListingsUi.ui:103
+#: src/frontends/qt4/ui/BoxUi.ui:265 src/frontends/qt4/ui/ListingsUi.ui:103
 #: src/frontends/qt4/ui/TabularUi.ui:391
-#: src/frontends/qt4/ui/TabularUi.ui:1549\r src/frontends/qt4/ui/WrapUi.ui:209
+#: src/frontends/qt4/ui/TabularUi.ui:1549 src/frontends/qt4/ui/WrapUi.ui:209
 #: src/frontends/qt4/GuiParagraph.cpp:111 src/frontends/qt4/GuiTabular.cpp:844
 msgid "Left"
 msgstr "Venstre"
 
-#: src/frontends/qt4/ui/BoxUi.ui:270\r src/frontends/qt4/ui/TabularUi.ui:396
+#: src/frontends/qt4/ui/BoxUi.ui:270 src/frontends/qt4/ui/TabularUi.ui:396
 #: src/frontends/qt4/ui/TabularUi.ui:1556
 #: src/frontends/qt4/GuiExternal.cpp:78 src/frontends/qt4/GuiGraphics.cpp:73
 #: src/frontends/qt4/GuiParagraph.cpp:113 src/frontends/qt4/GuiTabular.cpp:845
 msgid "Center"
 msgstr "Sentrert"
 
-#: src/frontends/qt4/ui/BoxUi.ui:275\r src/frontends/qt4/ui/ListingsUi.ui:108
+#: src/frontends/qt4/ui/BoxUi.ui:275 src/frontends/qt4/ui/ListingsUi.ui:108
 #: src/frontends/qt4/ui/TabularUi.ui:401
-#: src/frontends/qt4/ui/TabularUi.ui:1566\r src/frontends/qt4/ui/WrapUi.ui:214
+#: src/frontends/qt4/ui/TabularUi.ui:1566 src/frontends/qt4/ui/WrapUi.ui:214
 #: src/frontends/qt4/GuiParagraph.cpp:112 src/frontends/qt4/GuiTabular.cpp:846
 msgid "Right"
 msgstr "Høgre"
@@ -522,7 +522,7 @@ msgstr "Skriftst&orleik:"
 msgid "Size value"
 msgstr "Breidd"
 
-#: src/frontends/qt4/ui/BoxUi.ui:412\r src/frontends/qt4/GuiBranches.cpp:55
+#: src/frontends/qt4/ui/BoxUi.ui:412 src/frontends/qt4/GuiBranches.cpp:55
 msgid "Color"
 msgstr "Farge"
 
@@ -596,7 +596,7 @@ msgid "Remove the selected branch"
 msgstr "Fjern den valde greina"
 
 #: src/frontends/qt4/ui/BranchesUi.ui:136
-#: src/frontends/qt4/ui/IndicesUi.ui:165\r src/Buffer.cpp:4364
+#: src/frontends/qt4/ui/IndicesUi.ui:165 src/Buffer.cpp:4364
 #: src/Buffer.cpp:4377
 msgid "&Remove"
 msgstr "&Fjern"
@@ -628,9 +628,9 @@ msgstr "Legg til a&lle"
 #: src/frontends/qt4/ui/BranchesUnknownUi.ui:58
 #: src/frontends/qt4/ui/CitationUi.ui:532
 #: src/frontends/qt4/ui/CompareHistoryUi.ui:205
-#: src/frontends/qt4/ui/DocumentUi.ui:84\r src/frontends/qt4/ui/IndexUi.ui:78
+#: src/frontends/qt4/ui/DocumentUi.ui:84 src/frontends/qt4/ui/IndexUi.ui:78
 #: src/frontends/qt4/ui/ListingsUi.ui:559
-#: src/frontends/qt4/ui/PrintindexUi.ui:28\r src/Buffer.cpp:1370
+#: src/frontends/qt4/ui/PrintindexUi.ui:28 src/Buffer.cpp:1370
 #: src/Buffer.cpp:4338 src/Buffer.cpp:4402 src/LyXVC.cpp:108 src/LyXVC.cpp:298
 #: src/buffer_funcs.cpp:78 src/frontends/qt4/GuiBranches.cpp:219
 #: src/frontends/qt4/GuiClipboard.cpp:246
@@ -668,7 +668,7 @@ msgstr "&Storleik:"
 #: src/frontends/qt4/ui/ParagraphUi.ui:116
 #: src/frontends/qt4/ui/TabularUi.ui:1204
 #: src/frontends/qt4/ui/TabularUi.ui:1223
-#: src/frontends/qt4/ui/TabularUi.ui:1271\r lib/ui/stdtoolbars.inc:112
+#: src/frontends/qt4/ui/TabularUi.ui:1271 lib/ui/stdtoolbars.inc:112
 #: src/Font.cpp:180 src/HSpace.cpp:114 src/frontends/qt4/GuiDocument.cpp:116
 #: src/frontends/qt4/GuiDocument.cpp:709 src/frontends/qt4/GuiDocument.cpp:830
 #: src/frontends/qt4/GuiDocument.cpp:835 src/frontends/qt4/GuiDocument.cpp:876
@@ -693,52 +693,52 @@ msgstr "&Storleik:"
 msgid "Default"
 msgstr "Standard"
 
-#: src/frontends/qt4/ui/BulletsUi.ui:71\r src/Font.cpp:71
+#: src/frontends/qt4/ui/BulletsUi.ui:71 src/Font.cpp:71
 #: src/frontends/qt4/GuiCharacter.cpp:63 src/frontends/qt4/GuiListings.cpp:152
 msgid "Tiny"
 msgstr "Svært liten"
 
-#: src/frontends/qt4/ui/BulletsUi.ui:76\r src/Font.cpp:71
+#: src/frontends/qt4/ui/BulletsUi.ui:76 src/Font.cpp:71
 #: src/frontends/qt4/GuiCharacter.cpp:64 src/frontends/qt4/GuiListings.cpp:152
 msgid "Smallest"
 msgstr "Minst"
 
-#: src/frontends/qt4/ui/BulletsUi.ui:81\r src/Font.cpp:71
+#: src/frontends/qt4/ui/BulletsUi.ui:81 src/Font.cpp:71
 #: src/frontends/qt4/GuiCharacter.cpp:65 src/frontends/qt4/GuiListings.cpp:152
 msgid "Smaller"
 msgstr "Mindre"
 
-#: src/frontends/qt4/ui/BulletsUi.ui:86\r src/Font.cpp:71
+#: src/frontends/qt4/ui/BulletsUi.ui:86 src/Font.cpp:71
 #: src/frontends/qt4/GuiCharacter.cpp:66 src/frontends/qt4/GuiListings.cpp:152
 msgid "Small"
 msgstr "Lite"
 
-#: src/frontends/qt4/ui/BulletsUi.ui:91\r src/Font.cpp:71
+#: src/frontends/qt4/ui/BulletsUi.ui:91 src/Font.cpp:71
 #: src/frontends/qt4/GuiCharacter.cpp:67 src/frontends/qt4/GuiListings.cpp:152
 msgid "Normal"
 msgstr "Normal"
 
-#: src/frontends/qt4/ui/BulletsUi.ui:96\r src/Font.cpp:71
+#: src/frontends/qt4/ui/BulletsUi.ui:96 src/Font.cpp:71
 #: src/frontends/qt4/GuiCharacter.cpp:68 src/frontends/qt4/GuiListings.cpp:153
 msgid "Large"
 msgstr "Stor"
 
-#: src/frontends/qt4/ui/BulletsUi.ui:101\r src/Font.cpp:72
+#: src/frontends/qt4/ui/BulletsUi.ui:101 src/Font.cpp:72
 #: src/frontends/qt4/GuiCharacter.cpp:69 src/frontends/qt4/GuiListings.cpp:153
 msgid "Larger"
 msgstr "Større"
 
-#: src/frontends/qt4/ui/BulletsUi.ui:106\r src/Font.cpp:72
+#: src/frontends/qt4/ui/BulletsUi.ui:106 src/Font.cpp:72
 #: src/frontends/qt4/GuiCharacter.cpp:70
 msgid "Largest"
 msgstr "Størst"
 
-#: src/frontends/qt4/ui/BulletsUi.ui:111\r src/Font.cpp:72
+#: src/frontends/qt4/ui/BulletsUi.ui:111 src/Font.cpp:72
 #: src/frontends/qt4/GuiCharacter.cpp:71
 msgid "Huge"
 msgstr "Enorm"
 
-#: src/frontends/qt4/ui/BulletsUi.ui:116\r src/Font.cpp:72
+#: src/frontends/qt4/ui/BulletsUi.ui:116 src/Font.cpp:72
 #: src/frontends/qt4/GuiCharacter.cpp:72
 msgid "Huger"
 msgstr "Gigantisk"
@@ -814,10 +814,10 @@ msgstr "Skriftserie"
 
 #: src/frontends/qt4/ui/CharacterUi.ui:108
 #: src/frontends/qt4/ui/CharacterUi.ui:145
-#: src/frontends/qt4/ui/ListingsUi.ui:339\r lib/layouts/europasscv.layout:339
-#: lib/layouts/europasscv.layout:372\r lib/layouts/europasscv.layout:379
-#: lib/layouts/europecv.layout:242\r lib/layouts/europecv.layout:248
-#: lib/layouts/moderncv.layout:464\r lib/layouts/bicaption.module:15
+#: src/frontends/qt4/ui/ListingsUi.ui:339 lib/layouts/europasscv.layout:339
+#: lib/layouts/europasscv.layout:372 lib/layouts/europasscv.layout:379
+#: lib/layouts/europecv.layout:242 lib/layouts/europecv.layout:248
+#: lib/layouts/moderncv.layout:464 lib/layouts/bicaption.module:15
 #: src/frontends/qt4/GuiDocument.cpp:1411 src/frontends/qt4/GuiPrefs.cpp:2283
 #: src/frontends/qt4/Menus.cpp:893
 msgid "Language"
@@ -888,9 +888,9 @@ msgstr "Bruk endr&ingane med det same"
 #: src/frontends/qt4/ui/InsetParamsUi.ui:128
 #: src/frontends/qt4/ui/ListingsUi.ui:549
 #: src/frontends/qt4/ui/ParagraphUi.ui:251
-#: src/frontends/qt4/ui/PrefsUi.ui:80\r src/frontends/qt4/ui/RefUi.ui:330
-#: src/frontends/qt4/ui/SendtoUi.ui:85\r src/frontends/qt4/ui/SymbolsUi.ui:59
-#: src/frontends/qt4/ui/WrapUi.ui:163\r src/frontends/qt4/GuiDocument.cpp:2220
+#: src/frontends/qt4/ui/PrefsUi.ui:80 src/frontends/qt4/ui/RefUi.ui:330
+#: src/frontends/qt4/ui/SendtoUi.ui:85 src/frontends/qt4/ui/SymbolsUi.ui:59
+#: src/frontends/qt4/ui/WrapUi.ui:163 src/frontends/qt4/GuiDocument.cpp:2220
 #: src/frontends/qt4/GuiDocument.cpp:2413
 #: src/frontends/qt4/GuiDocument.cpp:3600
 msgid "&Apply"
@@ -899,7 +899,7 @@ msgstr "&Bruk"
 #: src/frontends/qt4/ui/CharacterUi.ui:377
 #: src/frontends/qt4/ui/GraphicsUi.ui:753
 #: src/frontends/qt4/ui/MathMatrixUi.ui:270
-#: src/frontends/qt4/ui/NoteUi.ui:28\r src/frontends/qt4/ui/PhantomUi.ui:28
+#: src/frontends/qt4/ui/NoteUi.ui:28 src/frontends/qt4/ui/PhantomUi.ui:28
 #: src/frontends/qt4/ui/TabularCreateUi.ui:134
 #: src/frontends/qt4/ButtonController.cpp:241
 #: src/frontends/qt4/GuiCompare.cpp:190
@@ -1038,7 +1038,7 @@ msgstr "Br&uk storebokstavar"
 #: src/frontends/qt4/ui/GraphicsUi.ui:682
 #: src/frontends/qt4/ui/InsetParamsUi.ui:82
 #: src/frontends/qt4/ui/ParagraphUi.ui:218
-#: src/frontends/qt4/ui/PrefsUi.ui:44\r src/frontends/qt4/ui/WrapUi.ui:121
+#: src/frontends/qt4/ui/PrefsUi.ui:44 src/frontends/qt4/ui/WrapUi.ui:121
 msgid "&Restore"
 msgstr "Gjenopp&rett"
 
@@ -1055,22 +1055,22 @@ msgstr "Farge på skrifta"
 msgid "Main text:"
 msgstr "Hovudtekst:"
 
-#: src/frontends/qt4/ui/ColorUi.ui:54\r src/frontends/qt4/ui/ColorUi.ui:115
-#: src/frontends/qt4/ui/ColorUi.ui:192\r src/frontends/qt4/ui/ColorUi.ui:253
+#: src/frontends/qt4/ui/ColorUi.ui:54 src/frontends/qt4/ui/ColorUi.ui:115
+#: src/frontends/qt4/ui/ColorUi.ui:192 src/frontends/qt4/ui/ColorUi.ui:253
 msgid "Click to change the color"
 msgstr "Vel for å andre fargen"
 
-#: src/frontends/qt4/ui/ColorUi.ui:57\r src/frontends/qt4/ui/ColorUi.ui:195
+#: src/frontends/qt4/ui/ColorUi.ui:57 src/frontends/qt4/ui/ColorUi.ui:195
 msgid "Default..."
 msgstr "Standard..."
 
-#: src/frontends/qt4/ui/ColorUi.ui:70\r src/frontends/qt4/ui/ColorUi.ui:131
-#: src/frontends/qt4/ui/ColorUi.ui:208\r src/frontends/qt4/ui/ColorUi.ui:269
+#: src/frontends/qt4/ui/ColorUi.ui:70 src/frontends/qt4/ui/ColorUi.ui:131
+#: src/frontends/qt4/ui/ColorUi.ui:208 src/frontends/qt4/ui/ColorUi.ui:269
 msgid "Revert the color to the default"
 msgstr "Tilbake til standard fargar"
 
-#: src/frontends/qt4/ui/ColorUi.ui:73\r src/frontends/qt4/ui/ColorUi.ui:134
-#: src/frontends/qt4/ui/ColorUi.ui:211\r src/frontends/qt4/ui/ColorUi.ui:272
+#: src/frontends/qt4/ui/ColorUi.ui:73 src/frontends/qt4/ui/ColorUi.ui:134
+#: src/frontends/qt4/ui/ColorUi.ui:211 src/frontends/qt4/ui/ColorUi.ui:272
 msgid "R&eset"
 msgstr "N&ullstill"
 
@@ -1078,7 +1078,7 @@ msgstr "N&ullstill"
 msgid "Greyed-out notes:"
 msgstr "Gråtekst:"
 
-#: src/frontends/qt4/ui/ColorUi.ui:118\r src/frontends/qt4/ui/ColorUi.ui:256
+#: src/frontends/qt4/ui/ColorUi.ui:118 src/frontends/qt4/ui/ColorUi.ui:256
 #: src/frontends/qt4/GuiDocument.cpp:1643
 #: src/frontends/qt4/GuiDocument.cpp:1673
 msgid "&Change..."
@@ -1089,7 +1089,7 @@ msgstr "&Endre..."
 msgid "Background Colors"
 msgstr "Fargar på bakgrunnen"
 
-#: src/frontends/qt4/ui/ColorUi.ui:176\r lib/layouts/europecv.layout:124
+#: src/frontends/qt4/ui/ColorUi.ui:176 lib/layouts/europecv.layout:124
 msgid "Page:"
 msgstr "Side:"
 
@@ -1125,7 +1125,7 @@ msgstr "&Nytt dokument:"
 msgid "&Old Document:"
 msgstr "Gammalt d&okumentet:"
 
-#: src/frontends/qt4/ui/CompareUi.ui:83\r src/frontends/qt4/ui/PrefUi.ui:50
+#: src/frontends/qt4/ui/CompareUi.ui:83 src/frontends/qt4/ui/PrefUi.ui:50
 msgid "Bro&wse..."
 msgstr "B&la gjennom..."
 
@@ -1195,7 +1195,7 @@ msgstr "Lagra som standardval for dokument i LyX"
 msgid "Save as Document Defaults"
 msgstr "Lagra desse vala som standardval"
 
-#: src/frontends/qt4/ui/ERTUi.ui:28\r src/frontends/qt4/GuiPrefs.cpp:1252
+#: src/frontends/qt4/ui/ERTUi.ui:28 src/frontends/qt4/GuiPrefs.cpp:1252
 msgid "Display"
 msgstr "Vis"
 
@@ -1244,9 +1244,9 @@ msgid "F&ile"
 msgstr "F&il"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:47
-#: src/frontends/qt4/ui/ExternalUi.ui:54\r lib/layouts/aastex.layout:535
-#: lib/layouts/agu_stdclass.inc:82\r lib/layouts/agu_stdclass.inc:84
-#: lib/layouts/db_stdcharstyles.inc:6\r lib/layouts/db_stdcharstyles.inc:8
+#: src/frontends/qt4/ui/ExternalUi.ui:54 lib/layouts/aastex.layout:535
+#: lib/layouts/agu_stdclass.inc:82 lib/layouts/agu_stdclass.inc:84
+#: lib/layouts/db_stdcharstyles.inc:6 lib/layouts/db_stdcharstyles.inc:8
 msgid "Filename"
 msgstr "Filnamn"
 
@@ -1344,7 +1344,7 @@ msgstr "Ori&go:"
 msgid "A&ngle:"
 msgstr "Vi&nkel:"
 
-#: src/frontends/qt4/ui/ExternalUi.ui:376\r lib/layouts/shapepar.module:122
+#: src/frontends/qt4/ui/ExternalUi.ui:376 lib/layouts/shapepar.module:122
 msgid "Scale"
 msgstr "Storleik"
 
@@ -1420,7 +1420,7 @@ msgid "Sear&ch"
 msgstr "&Søk"
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:35
-#: src/frontends/qt4/ui/LogUi.ui:29\r src/frontends/qt4/ui/SearchUi.ui:28
+#: src/frontends/qt4/ui/LogUi.ui:29 src/frontends/qt4/ui/SearchUi.ui:28
 msgid "&Find:"
 msgstr "&Finn:"
 
@@ -1643,7 +1643,7 @@ msgstr "&Start storleik:"
 msgid "LaTe&X font encoding:"
 msgstr "LaTe&X skriftkoding:"
 
-#: src/frontends/qt4/ui/FontUi.ui:90\r src/frontends/qt4/ui/PrefLatexUi.ui:34
+#: src/frontends/qt4/ui/FontUi.ui:90 src/frontends/qt4/ui/PrefLatexUi.ui:34
 msgid "Specify the font encoding (e.g., T1)."
 msgstr "Vel skriftkodinga (t.d. T1)"
 
@@ -1896,19 +1896,19 @@ msgstr "\\-----v-----/"
 msgid "/-----^-----\\"
 msgstr "/-----^-----\\"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:70\r src/frontends/qt4/ui/VSpaceUi.ui:22
+#: src/frontends/qt4/ui/HSpaceUi.ui:70 src/frontends/qt4/ui/VSpaceUi.ui:22
 msgid "&Spacing:"
 msgstr "Mellom&rom:"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:80\r src/frontends/qt4/ui/VSpaceUi.ui:78
+#: src/frontends/qt4/ui/HSpaceUi.ui:80 src/frontends/qt4/ui/VSpaceUi.ui:78
 msgid "Supported spacing types"
 msgstr "Ulike slag mellomrom"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:87\r src/frontends/qt4/ui/VSpaceUi.ui:68
+#: src/frontends/qt4/ui/HSpaceUi.ui:87 src/frontends/qt4/ui/VSpaceUi.ui:68
 msgid "&Value:"
 msgstr "&Verdi:"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:100\r src/frontends/qt4/ui/VSpaceUi.ui:61
+#: src/frontends/qt4/ui/HSpaceUi.ui:100 src/frontends/qt4/ui/VSpaceUi.ui:61
 msgid "Custom value. Needs spacing type \"Custom\"."
 msgstr "Spesialtilpassa verdiar, Treng mellomrom skriv: \"tilpassa\"."
 
@@ -1916,18 +1916,18 @@ msgstr "Spesialtilpassa verdiar, Treng mellomrom skriv: \"tilpassa\"."
 msgid "&Fill Pattern:"
 msgstr "&Fyllstil:"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:123\r src/frontends/qt4/ui/VSpaceUi.ui:45
+#: src/frontends/qt4/ui/HSpaceUi.ui:123 src/frontends/qt4/ui/VSpaceUi.ui:45
 msgid "&Protect:"
 msgstr "Ve&rn:"
 
-#: src/frontends/qt4/ui/HSpaceUi.ui:133\r src/frontends/qt4/GuiHSpace.cpp:224
+#: src/frontends/qt4/ui/HSpaceUi.ui:133 src/frontends/qt4/GuiHSpace.cpp:224
 msgid "Insert the spacing even after a line break"
 msgstr "Set inn mellomrom sjølv etter eit linjeskift"
 
 #: src/frontends/qt4/ui/HyperlinkUi.ui:19
-#: src/frontends/qt4/ui/HyperlinkUi.ui:32\r lib/layouts/scrlttr2.layout:211
-#: lib/layouts/amsdefs.inc:157\r lib/layouts/stdinsets.inc:459
-#: lib/layouts/stdinsets.inc:462\r lib/layouts/minimalistic.module:26
+#: src/frontends/qt4/ui/HyperlinkUi.ui:32 lib/layouts/scrlttr2.layout:211
+#: lib/layouts/amsdefs.inc:157 lib/layouts/stdinsets.inc:459
+#: lib/layouts/stdinsets.inc:462 lib/layouts/minimalistic.module:26
 msgid "URL"
 msgstr "URL"
 
@@ -2030,19 +2030,19 @@ msgstr "Namnet på fila"
 msgid "&Include Type:"
 msgstr "&Filtype:"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:293\r src/insets/InsetInclude.cpp:385
+#: src/frontends/qt4/ui/IncludeUi.ui:293 src/insets/InsetInclude.cpp:385
 msgid "Include"
 msgstr "Underdokument"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:298\r src/insets/InsetInclude.cpp:375
+#: src/frontends/qt4/ui/IncludeUi.ui:298 src/insets/InsetInclude.cpp:375
 msgid "Input"
 msgstr "Tekstfil"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:303\r lib/layouts/stdlayouts.inc:76
+#: src/frontends/qt4/ui/IncludeUi.ui:303 lib/layouts/stdlayouts.inc:76
 msgid "Verbatim"
 msgstr "Verbatim"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:308\r src/insets/InsetInclude.cpp:1206
+#: src/frontends/qt4/ui/IncludeUi.ui:308 src/insets/InsetInclude.cpp:1206
 #: src/insets/InsetInclude.cpp:1212
 msgid "Program Listing"
 msgstr "Kodelister"
@@ -2055,7 +2055,7 @@ msgstr "Endra fila"
 msgid "&Edit"
 msgstr "&Endre"
 
-#: src/frontends/qt4/ui/IndexUi.ui:59\r src/frontends/qt4/ui/IndicesUi.ui:143
+#: src/frontends/qt4/ui/IndexUi.ui:59 src/frontends/qt4/ui/IndicesUi.ui:143
 msgid "A&vailable Indexes:"
 msgstr "T&ilgjengelege indeksar:"
 
@@ -2290,8 +2290,8 @@ msgstr "Val for kodelister"
 msgid "Feedback window"
 msgstr "Tilbakemeldingar"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:13\r lib/layouts/stdinsets.inc:283
-#: lib/layouts/stdinsets.inc:289\r src/insets/InsetCaption.cpp:383
+#: src/frontends/qt4/ui/ListingsUi.ui:13 lib/layouts/stdinsets.inc:283
+#: lib/layouts/stdinsets.inc:289 src/insets/InsetCaption.cpp:383
 #: src/insets/InsetListings.cpp:365 src/insets/InsetListings.cpp:367
 msgid "Listing"
 msgstr "Kodeliste"
@@ -2320,7 +2320,7 @@ msgstr "Vel for flytande kodelister"
 msgid "&Float"
 msgstr "&Flytar"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:55\r src/frontends/qt4/ui/WrapUi.ui:185
+#: src/frontends/qt4/ui/ListingsUi.ui:55 src/frontends/qt4/ui/WrapUi.ui:185
 msgid "&Placement:"
 msgstr "&Plassering:"
 
@@ -2490,7 +2490,7 @@ msgstr "Logg &Type:"
 msgid "Update the display"
 msgstr "Gir deg oppdateringar"
 
-#: src/frontends/qt4/ui/LogUi.ui:78\r src/frontends/qt4/ui/RefUi.ui:294
+#: src/frontends/qt4/ui/LogUi.ui:78 src/frontends/qt4/ui/RefUi.ui:294
 #: src/frontends/qt4/ui/ViewSourceUi.ui:150
 msgid "&Update"
 msgstr "&Oppdater"
@@ -2685,7 +2685,7 @@ msgstr "&Slett"
 msgid "S&elected:"
 msgstr "V&el:"
 
-#: src/frontends/qt4/ui/NomenclUi.ui:13\r src/insets/InsetNomencl.cpp:169
+#: src/frontends/qt4/ui/NomenclUi.ui:13 src/insets/InsetNomencl.cpp:169
 msgid "Nomenclature"
 msgstr "Nomenklatur"
 
@@ -2701,7 +2701,7 @@ msgstr "S&kildring:"
 msgid "&Symbol:"
 msgstr "&Symbol:"
 
-#: src/frontends/qt4/ui/NoteUi.ui:48\r src/frontends/qt4/ui/PhantomUi.ui:48
+#: src/frontends/qt4/ui/NoteUi.ui:48 src/frontends/qt4/ui/PhantomUi.ui:48
 msgid "Type"
 msgstr "Type"
 
@@ -2741,7 +2741,7 @@ msgstr "&Nummerering"
 msgid "Output Format"
 msgstr "Førehandsvisingsformat"
 
-#: src/frontends/qt4/ui/OutputUi.ui:43\r src/frontends/qt4/ui/OutputUi.ui:56
+#: src/frontends/qt4/ui/OutputUi.ui:43 src/frontends/qt4/ui/OutputUi.ui:56
 msgid "Specify the default output format (for view/update)"
 msgstr "Vel standard format for førehandsvising"
 
@@ -2801,8 +2801,8 @@ msgstr "HTML"
 msgid "Images"
 msgstr "Bilete"
 
-#: src/frontends/qt4/ui/OutputUi.ui:173\r lib/layouts/aapaper.layout:63
-#: lib/layouts/egs.layout:639\r lib/languages:95
+#: src/frontends/qt4/ui/OutputUi.ui:173 lib/layouts/aapaper.layout:63
+#: lib/layouts/egs.layout:639 lib/languages:95
 #: src/frontends/qt4/GuiDocument.cpp:1275
 #: src/frontends/qt4/GuiErrorList.cpp:50 src/frontends/qt4/GuiLog.cpp:247
 #: src/frontends/qt4/GuiPrefs.cpp:724
@@ -2988,7 +2988,7 @@ msgstr "&Lengste etikett"
 msgid "Line &spacing"
 msgstr "&Linjeavstand"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:121\r src/Text.cpp:1922
+#: src/frontends/qt4/ui/ParagraphUi.ui:121 src/Text.cpp:1922
 #: src/frontends/qt4/GuiDocument.cpp:716
 msgid "Single"
 msgstr "Enkel"
@@ -2997,7 +2997,7 @@ msgstr "Enkel"
 msgid "1.5"
 msgstr "1.5"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:131\r src/Text.cpp:1928
+#: src/frontends/qt4/ui/ParagraphUi.ui:131 src/Text.cpp:1928
 #: src/frontends/qt4/GuiDocument.cpp:720
 msgid "Double"
 msgstr "Dobbel"
@@ -3007,7 +3007,7 @@ msgstr "Dobbel"
 #: src/frontends/qt4/ui/TabularUi.ui:1209
 #: src/frontends/qt4/ui/TabularUi.ui:1228
 #: src/frontends/qt4/ui/TabularUi.ui:1276
-#: src/frontends/qt4/ui/VSpaceUi.ui:107\r lib/layouts/stdcustom.inc:8
+#: src/frontends/qt4/ui/VSpaceUi.ui:107 lib/layouts/stdcustom.inc:8
 #: src/frontends/qt4/GuiDocument.cpp:710 src/frontends/qt4/GuiDocument.cpp:714
 #: src/frontends/qt4/GuiDocument.cpp:722 src/frontends/qt4/GuiDocument.cpp:836
 #: src/frontends/qt4/GuiDocument.cpp:888
@@ -3140,7 +3140,7 @@ msgid "Cursor i&ndicator"
 msgstr "Skrivemerkei&ndikator"
 
 #: src/frontends/qt4/ui/PrefCompletionUi.ui:119
-#: lib/layouts/hollywood.layout:281\r src/frontends/qt4/GuiPrefs.cpp:388
+#: lib/layouts/hollywood.layout:281 src/frontends/qt4/GuiPrefs.cpp:388
 msgid "General"
 msgstr "Generelt"
 
@@ -3248,7 +3248,7 @@ msgstr "Vis &grafikk"
 msgid "Instant &preview:"
 msgstr "Vis med det &same:"
 
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:62\r src/Font.cpp:76
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:62 src/Font.cpp:76
 #: src/frontends/qt4/GuiDocument.cpp:132
 msgid "Off"
 msgstr "Av"
@@ -3257,7 +3257,7 @@ msgstr "Av"
 msgid "No math"
 msgstr "Ikkje matte"
 
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:72\r src/Font.cpp:76
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:72 src/Font.cpp:76
 msgid "On"
 msgstr "På"
 
@@ -3391,7 +3391,7 @@ msgstr "Skjuler dokumentet"
 msgid "Ask the user"
 msgstr "Spør brukaren"
 
-#: src/frontends/qt4/ui/PrefEditUi.ui:25\r src/frontends/qt4/GuiPrefs.cpp:252
+#: src/frontends/qt4/ui/PrefEditUi.ui:25 src/frontends/qt4/GuiPrefs.cpp:252
 msgid "Editing"
 msgstr "Redigering"
 
@@ -3399,7 +3399,7 @@ msgstr "Redigering"
 msgid "Cursor &follows scrollbar"
 msgstr "Skriv&emerke følgjer rullefelt"
 
-#: src/frontends/qt4/ui/PrefEditUi.ui:46\r src/LyXRC.cpp:2947
+#: src/frontends/qt4/ui/PrefEditUi.ui:46 src/LyXRC.cpp:2947
 msgid ""
 "Configure the width of the text cursor. Automatic zoom-controlled cursor "
 "width used when set to 0."
@@ -3789,7 +3789,7 @@ msgstr "Vel BibTeX kommando og val for pLaTeX (Japansk)"
 msgid "Pr&ocessor:"
 msgstr "Ha&ndsamar:"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:199\r src/frontends/qt4/GuiPrefs.cpp:824
+#: src/frontends/qt4/ui/PrefLatexUi.ui:199 src/frontends/qt4/GuiPrefs.cpp:824
 #: src/frontends/qt4/GuiPrefs.cpp:919
 msgid "Op&tions:"
 msgstr "&Val:"
@@ -3882,7 +3882,7 @@ msgstr "Matte val"
 msgid "Output &line length:"
 msgstr "Linje&lengd:"
 
-#: src/frontends/qt4/ui/PrefOutputUi.ui:186\r src/LyXRC.cpp:2894
+#: src/frontends/qt4/ui/PrefOutputUi.ui:186 src/LyXRC.cpp:2894
 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, "
@@ -3924,7 +3924,7 @@ msgstr "Alle filer"
 msgid "&PATH prefix:"
 msgstr "&Stig-prefiks:"
 
-#: src/frontends/qt4/ui/PrefPathsUi.ui:51\r src/LyXRC.cpp:3130
+#: src/frontends/qt4/ui/PrefPathsUi.ui:51 src/LyXRC.cpp:3130
 msgid ""
 "Specify those directories which should be prepended to the PATH environment "
 "variable.\n"
@@ -3937,7 +3937,7 @@ msgstr ""
 msgid "TEX&INPUTS prefix:"
 msgstr "TEX&INPUTS prefiks:"
 
-#: src/frontends/qt4/ui/PrefPathsUi.ui:68\r src/LyXRC.cpp:3229
+#: src/frontends/qt4/ui/PrefPathsUi.ui:68 src/LyXRC.cpp:3229
 msgid ""
 "Specify those directories which should be prepended to the TEXINPUTS "
 "environment variable.\n"
@@ -4167,7 +4167,7 @@ msgstr "Menyar"
 msgid "&Maximum last files:"
 msgstr "&Kor mange filer skal vere i filer lasta sist:"
 
-#: src/frontends/qt4/ui/PrefsUi.ui:70\r src/frontends/qt4/GuiView.cpp:2932
+#: src/frontends/qt4/ui/PrefsUi.ui:70 src/frontends/qt4/GuiView.cpp:2932
 #: src/frontends/qt4/GuiView.cpp:2939 src/frontends/qt4/GuiView.cpp:3041
 msgid "&Save"
 msgstr "&Lagra"
@@ -4322,7 +4322,7 @@ msgstr "Grupper etikettane etter prefiks: (f.eks. \"bolk:\")"
 msgid "Grou&p"
 msgstr "Gru&pper"
 
-#: src/frontends/qt4/ui/RefUi.ui:181\r src/frontends/qt4/GuiRef.cpp:313
+#: src/frontends/qt4/ui/RefUi.ui:181 src/frontends/qt4/GuiRef.cpp:313
 msgid "&Go to Label"
 msgstr "&Gå til etikett"
 
@@ -4598,7 +4598,7 @@ msgstr "Vassrett tekstjustering i kolonner"
 msgid "Justified"
 msgstr "Justert"
 
-#: src/frontends/qt4/ui/TabularUi.ui:406\r src/frontends/qt4/GuiTabular.cpp:219
+#: src/frontends/qt4/ui/TabularUi.ui:406 src/frontends/qt4/GuiTabular.cpp:219
 #: src/frontends/qt4/GuiTabular.cpp:850
 msgid "At Decimal Separator"
 msgstr "ved desimalteikn"
@@ -4980,8 +4980,8 @@ msgstr ""
 msgid "Update navigation tree"
 msgstr "Oppdater navigasjonstreet"
 
-#: src/frontends/qt4/ui/TocUi.ui:93\r src/frontends/qt4/ui/TocUi.ui:125
-#: src/frontends/qt4/ui/TocUi.ui:144\r src/frontends/qt4/ui/TocUi.ui:163
+#: src/frontends/qt4/ui/TocUi.ui:93 src/frontends/qt4/ui/TocUi.ui:125
+#: src/frontends/qt4/ui/TocUi.ui:144 src/frontends/qt4/ui/TocUi.ui:163
 #: src/frontends/qt4/ui/TocUi.ui:182
 msgid "..."
 msgstr "..."
@@ -5038,15 +5038,15 @@ msgstr "Set inn mellomrom sjølv etter eit sideskift"
 msgid "DefSkip"
 msgstr "Standard avstand"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:87\r src/frontends/qt4/GuiDocument.cpp:711
+#: src/frontends/qt4/ui/VSpaceUi.ui:87 src/frontends/qt4/GuiDocument.cpp:711
 msgid "SmallSkip"
 msgstr "Liten avstand"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:92\r src/frontends/qt4/GuiDocument.cpp:712
+#: src/frontends/qt4/ui/VSpaceUi.ui:92 src/frontends/qt4/GuiDocument.cpp:712
 msgid "MedSkip"
 msgstr "Medium avstand"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:97\r src/frontends/qt4/GuiDocument.cpp:713
+#: src/frontends/qt4/ui/VSpaceUi.ui:97 src/frontends/qt4/GuiDocument.cpp:713
 msgid "BigSkip"
 msgstr "Stor avstand"
 
@@ -5143,129 +5143,129 @@ msgstr "Tillat &flyting"
 msgid "American Economic Association (AEA)"
 msgstr "American Economic Association (AEA)"
 
-#: lib/layouts/AEA.layout:4\r lib/layouts/IEEEtran-CompSoc.layout:4
-#: lib/layouts/IEEEtran-TransMag.layout:4\r lib/layouts/IEEEtran.layout:4
-#: lib/layouts/aa.layout:4\r lib/layouts/aapaper.layout:4
-#: lib/layouts/aastex.layout:4\r lib/layouts/achemso.layout:4
-#: lib/layouts/acm-sigs-alt.layout:4\r lib/layouts/acm-sigs.layout:4
-#: lib/layouts/acmsiggraph.layout:4\r lib/layouts/agums.layout:4
-#: lib/layouts/agutex.layout:4\r lib/layouts/amsart.layout:4
-#: lib/layouts/apa.layout:4\r lib/layouts/apa6.layout:4
-#: lib/layouts/arab-article.layout:4\r lib/layouts/article-beamer.layout:4
-#: lib/layouts/article.layout:4\r lib/layouts/chess.layout:4
-#: lib/layouts/cl2emult.layout:4\r lib/layouts/ctex-article.layout:4
-#: lib/layouts/doublecol-new.layout:4\r lib/layouts/dtk.layout:4
-#: lib/layouts/ectaart.layout:4\r lib/layouts/egs.layout:4
-#: lib/layouts/elsart.layout:4\r lib/layouts/elsarticle.layout:4
-#: lib/layouts/entcs.layout:4\r lib/layouts/extarticle.layout:4
-#: lib/layouts/heb-article.layout:4\r lib/layouts/ijmpc.layout:4
-#: lib/layouts/ijmpd.layout:4\r lib/layouts/iopart.layout:4
-#: lib/layouts/isprs.layout:4\r lib/layouts/iucr.layout:4
-#: lib/layouts/jarticle.layout:4\r lib/layouts/jasatex.layout:4
-#: lib/layouts/jgrga.layout:4\r lib/layouts/jsarticle.layout:4
-#: lib/layouts/jss.layout:4\r lib/layouts/kluwer.layout:4
-#: lib/layouts/latex8.layout:4\r lib/layouts/llncs.layout:4
-#: lib/layouts/ltugboat.layout:4\r lib/layouts/mwart.layout:4
-#: lib/layouts/paper.layout:4\r lib/layouts/revtex.layout:4
-#: lib/layouts/revtex4-1.layout:4\r lib/layouts/revtex4.layout:4
-#: lib/layouts/scrartcl.layout:4\r lib/layouts/scrarticle-beamer.layout:4
-#: lib/layouts/siamltex.layout:4\r lib/layouts/sigplanconf.layout:4
-#: lib/layouts/singlecol-new.layout:4\r lib/layouts/singlecol.layout:4
-#: lib/layouts/spie.layout:4\r lib/layouts/svglobal.layout:4
-#: lib/layouts/svglobal3.layout:4\r lib/layouts/svjog.layout:4
-#: lib/layouts/svprobth.layout:4\r lib/layouts/tarticle.layout:4
+#: lib/layouts/AEA.layout:4 lib/layouts/IEEEtran-CompSoc.layout:4
+#: lib/layouts/IEEEtran-TransMag.layout:4 lib/layouts/IEEEtran.layout:4
+#: lib/layouts/aa.layout:4 lib/layouts/aapaper.layout:4
+#: lib/layouts/aastex.layout:4 lib/layouts/achemso.layout:4
+#: lib/layouts/acm-sigs-alt.layout:4 lib/layouts/acm-sigs.layout:4
+#: lib/layouts/acmsiggraph.layout:4 lib/layouts/agums.layout:4
+#: lib/layouts/agutex.layout:4 lib/layouts/amsart.layout:4
+#: lib/layouts/apa.layout:4 lib/layouts/apa6.layout:4
+#: lib/layouts/arab-article.layout:4 lib/layouts/article-beamer.layout:4
+#: lib/layouts/article.layout:4 lib/layouts/chess.layout:4
+#: lib/layouts/cl2emult.layout:4 lib/layouts/ctex-article.layout:4
+#: lib/layouts/doublecol-new.layout:4 lib/layouts/dtk.layout:4
+#: lib/layouts/ectaart.layout:4 lib/layouts/egs.layout:4
+#: lib/layouts/elsart.layout:4 lib/layouts/elsarticle.layout:4
+#: lib/layouts/entcs.layout:4 lib/layouts/extarticle.layout:4
+#: lib/layouts/heb-article.layout:4 lib/layouts/ijmpc.layout:4
+#: lib/layouts/ijmpd.layout:4 lib/layouts/iopart.layout:4
+#: lib/layouts/isprs.layout:4 lib/layouts/iucr.layout:4
+#: lib/layouts/jarticle.layout:4 lib/layouts/jasatex.layout:4
+#: lib/layouts/jgrga.layout:4 lib/layouts/jsarticle.layout:4
+#: lib/layouts/jss.layout:4 lib/layouts/kluwer.layout:4
+#: lib/layouts/latex8.layout:4 lib/layouts/llncs.layout:4
+#: lib/layouts/ltugboat.layout:4 lib/layouts/mwart.layout:4
+#: lib/layouts/paper.layout:4 lib/layouts/revtex.layout:4
+#: lib/layouts/revtex4-1.layout:4 lib/layouts/revtex4.layout:4
+#: lib/layouts/scrartcl.layout:4 lib/layouts/scrarticle-beamer.layout:4
+#: lib/layouts/siamltex.layout:4 lib/layouts/sigplanconf.layout:4
+#: lib/layouts/singlecol-new.layout:4 lib/layouts/singlecol.layout:4
+#: lib/layouts/spie.layout:4 lib/layouts/svglobal.layout:4
+#: lib/layouts/svglobal3.layout:4 lib/layouts/svjog.layout:4
+#: lib/layouts/svprobth.layout:4 lib/layouts/tarticle.layout:4
 msgid "Articles"
 msgstr "Artiklar"
 
-#: lib/layouts/AEA.layout:50\r lib/layouts/apa.layout:96
+#: lib/layouts/AEA.layout:50 lib/layouts/apa.layout:96
 #: lib/layouts/apa6.layout:51
 msgid "ShortTitle"
 msgstr "Kort_Tittel"
 
-#: lib/layouts/AEA.layout:51\r lib/layouts/AEA.layout:106
+#: lib/layouts/AEA.layout:51 lib/layouts/AEA.layout:106
 #: lib/layouts/IEEEtran-CompSoc.layout:21
 #: lib/layouts/IEEEtran-CompSoc.layout:64
 #: lib/layouts/IEEEtran-TransMag.layout:22
-#: lib/layouts/IEEEtran-TransMag.layout:42\r lib/layouts/IEEEtran.layout:70
-#: lib/layouts/IEEEtran.layout:121\r lib/layouts/IEEEtran.layout:222
-#: lib/layouts/IEEEtran.layout:262\r lib/layouts/IEEEtran.layout:326
-#: lib/layouts/RJournal.layout:64\r lib/layouts/aa.layout:73
-#: lib/layouts/aa.layout:96\r lib/layouts/aa.layout:111
-#: lib/layouts/aa.layout:135\r lib/layouts/aa.layout:265
-#: lib/layouts/aa.layout:325\r lib/layouts/aastex.layout:157
-#: lib/layouts/aastex.layout:174\r lib/layouts/aastex.layout:196
-#: lib/layouts/aastex.layout:215\r lib/layouts/aastex.layout:289
-#: lib/layouts/achemso.layout:56\r lib/layouts/achemso.layout:83
-#: lib/layouts/acmsiggraph.layout:70\r lib/layouts/acmsiggraph.layout:179
-#: lib/layouts/acmsiggraph.layout:198\r lib/layouts/agutex.layout:60
-#: lib/layouts/agutex.layout:77\r lib/layouts/agutex.layout:118
-#: lib/layouts/agutex.layout:141\r lib/layouts/apa.layout:42
-#: lib/layouts/apa.layout:74\r lib/layouts/apa.layout:97
-#: lib/layouts/apa.layout:120\r lib/layouts/apa.layout:136
-#: lib/layouts/apa.layout:144\r lib/layouts/apa.layout:152
-#: lib/layouts/apa.layout:160\r lib/layouts/apa.layout:182
-#: lib/layouts/apa.layout:190\r lib/layouts/apa.layout:198
-#: lib/layouts/apa6.layout:39\r lib/layouts/apa6.layout:52
-#: lib/layouts/apa6.layout:75\r lib/layouts/apa6.layout:91
-#: lib/layouts/apa6.layout:99\r lib/layouts/apa6.layout:107
-#: lib/layouts/apa6.layout:114\r lib/layouts/apa6.layout:121
-#: lib/layouts/apa6.layout:128\r lib/layouts/apa6.layout:150
-#: lib/layouts/apa6.layout:171\r lib/layouts/apa6.layout:178
-#: lib/layouts/apa6.layout:185\r lib/layouts/apa6.layout:192
-#: lib/layouts/apa6.layout:199\r lib/layouts/apa6.layout:207
-#: lib/layouts/apa6.layout:229\r lib/layouts/apa6.layout:251
-#: lib/layouts/apa6.layout:275\r lib/layouts/broadway.layout:190
-#: lib/layouts/broadway.layout:205\r lib/layouts/cl2emult.layout:42
-#: lib/layouts/cl2emult.layout:61\r lib/layouts/cl2emult.layout:74
-#: lib/layouts/ectaart.layout:23\r lib/layouts/ectaart.layout:48
-#: lib/layouts/ectaart.layout:74\r lib/layouts/egs.layout:268
-#: lib/layouts/egs.layout:311\r lib/layouts/egs.layout:505
-#: lib/layouts/elsart.layout:94\r lib/layouts/elsart.layout:116
-#: lib/layouts/elsarticle.layout:61\r lib/layouts/elsarticle.layout:86
-#: lib/layouts/elsarticle.layout:130\r lib/layouts/elsarticle.layout:152
-#: lib/layouts/elsarticle.layout:226\r lib/layouts/elsarticle.layout:261
-#: lib/layouts/elsarticle.layout:290\r lib/layouts/entcs.layout:75
-#: lib/layouts/europasscv.layout:78\r lib/layouts/europecv.layout:35
-#: lib/layouts/europecv.layout:189\r lib/layouts/ijmpc.layout:68
-#: lib/layouts/ijmpc.layout:93\r lib/layouts/ijmpc.layout:111
-#: lib/layouts/ijmpc.layout:129\r lib/layouts/ijmpc.layout:163
-#: lib/layouts/ijmpc.layout:213\r lib/layouts/ijmpd.layout:73
-#: lib/layouts/ijmpd.layout:98\r lib/layouts/ijmpd.layout:116
-#: lib/layouts/ijmpd.layout:134\r lib/layouts/ijmpd.layout:153
-#: lib/layouts/ijmpd.layout:221\r lib/layouts/ijmpd.layout:233
-#: lib/layouts/iopart.layout:62\r lib/layouts/iopart.layout:136
-#: lib/layouts/iopart.layout:155\r lib/layouts/iopart.layout:180
-#: lib/layouts/iopart.layout:209\r lib/layouts/iucr.layout:113
-#: lib/layouts/iucr.layout:178\r lib/layouts/jasatex.layout:64
-#: lib/layouts/jasatex.layout:90\r lib/layouts/jasatex.layout:110
-#: lib/layouts/jasatex.layout:151\r lib/layouts/jasatex.layout:171
-#: lib/layouts/jasatex.layout:200\r lib/layouts/jss.layout:52
-#: lib/layouts/jss.layout:91\r lib/layouts/kluwer.layout:114
-#: lib/layouts/kluwer.layout:169\r lib/layouts/latex8.layout:90
-#: lib/layouts/llncs.layout:109\r lib/layouts/llncs.layout:184
-#: lib/layouts/llncs.layout:221\r lib/layouts/llncs.layout:248
-#: lib/layouts/ltugboat.layout:141\r lib/layouts/ltugboat.layout:161
-#: lib/layouts/moderncv.layout:41\r lib/layouts/moderncv.layout:84
-#: lib/layouts/moderncv.layout:117\r lib/layouts/moderncv.layout:476
-#: lib/layouts/revtex4-1.layout:64\r lib/layouts/revtex4-1.layout:155
-#: lib/layouts/revtex4-1.layout:178\r lib/layouts/revtex4.layout:104
-#: lib/layouts/revtex4.layout:134\r lib/layouts/revtex4.layout:260
-#: lib/layouts/sciposter.layout:41\r lib/layouts/siamltex.layout:288
-#: lib/layouts/siamltex.layout:308\r lib/layouts/sigplanconf.layout:73
-#: lib/layouts/sigplanconf.layout:148\r lib/layouts/sigplanconf.layout:196
-#: lib/layouts/simplecv.layout:134\r lib/layouts/svmult.layout:49
-#: lib/layouts/svmult.layout:99\r lib/layouts/tufte-handout.layout:54
-#: lib/layouts/acm-sigs.inc:11\r lib/layouts/acm-sigs.inc:32
-#: lib/layouts/agu_stdtitle.inc:129\r lib/layouts/amsdefs.inc:25
-#: lib/layouts/amsdefs.inc:52\r lib/layouts/amsdefs.inc:72
-#: lib/layouts/amsdefs.inc:96\r lib/layouts/amsdefs.inc:123
-#: lib/layouts/lyxmacros.inc:45\r lib/layouts/lyxmacros.inc:66
-#: lib/layouts/stdstruct.inc:16\r lib/layouts/stdtitle.inc:17
-#: lib/layouts/stdtitle.inc:38\r lib/layouts/stdtitle.inc:57
-#: lib/layouts/svcommon.inc:353\r lib/layouts/svcommon.inc:377
-#: lib/layouts/svcommon.inc:428\r lib/layouts/svcommon.inc:465
-#: lib/layouts/svcommon.inc:483\r lib/layouts/svcommon.inc:504
-#: lib/layouts/svcommon.inc:531\r lib/layouts/bicaption.module:13
+#: lib/layouts/IEEEtran-TransMag.layout:42 lib/layouts/IEEEtran.layout:70
+#: lib/layouts/IEEEtran.layout:121 lib/layouts/IEEEtran.layout:222
+#: lib/layouts/IEEEtran.layout:262 lib/layouts/IEEEtran.layout:326
+#: lib/layouts/RJournal.layout:64 lib/layouts/aa.layout:73
+#: lib/layouts/aa.layout:96 lib/layouts/aa.layout:111
+#: lib/layouts/aa.layout:135 lib/layouts/aa.layout:265
+#: lib/layouts/aa.layout:325 lib/layouts/aastex.layout:157
+#: lib/layouts/aastex.layout:174 lib/layouts/aastex.layout:196
+#: lib/layouts/aastex.layout:215 lib/layouts/aastex.layout:289
+#: lib/layouts/achemso.layout:56 lib/layouts/achemso.layout:83
+#: lib/layouts/acmsiggraph.layout:70 lib/layouts/acmsiggraph.layout:179
+#: lib/layouts/acmsiggraph.layout:198 lib/layouts/agutex.layout:60
+#: lib/layouts/agutex.layout:77 lib/layouts/agutex.layout:118
+#: lib/layouts/agutex.layout:141 lib/layouts/apa.layout:42
+#: lib/layouts/apa.layout:74 lib/layouts/apa.layout:97
+#: lib/layouts/apa.layout:120 lib/layouts/apa.layout:136
+#: lib/layouts/apa.layout:144 lib/layouts/apa.layout:152
+#: lib/layouts/apa.layout:160 lib/layouts/apa.layout:182
+#: lib/layouts/apa.layout:190 lib/layouts/apa.layout:198
+#: lib/layouts/apa6.layout:39 lib/layouts/apa6.layout:52
+#: lib/layouts/apa6.layout:75 lib/layouts/apa6.layout:91
+#: lib/layouts/apa6.layout:99 lib/layouts/apa6.layout:107
+#: lib/layouts/apa6.layout:114 lib/layouts/apa6.layout:121
+#: lib/layouts/apa6.layout:128 lib/layouts/apa6.layout:150
+#: lib/layouts/apa6.layout:171 lib/layouts/apa6.layout:178
+#: lib/layouts/apa6.layout:185 lib/layouts/apa6.layout:192
+#: lib/layouts/apa6.layout:199 lib/layouts/apa6.layout:207
+#: lib/layouts/apa6.layout:229 lib/layouts/apa6.layout:251
+#: lib/layouts/apa6.layout:275 lib/layouts/broadway.layout:190
+#: lib/layouts/broadway.layout:205 lib/layouts/cl2emult.layout:42
+#: lib/layouts/cl2emult.layout:61 lib/layouts/cl2emult.layout:74
+#: lib/layouts/ectaart.layout:23 lib/layouts/ectaart.layout:48
+#: lib/layouts/ectaart.layout:74 lib/layouts/egs.layout:268
+#: lib/layouts/egs.layout:311 lib/layouts/egs.layout:505
+#: lib/layouts/elsart.layout:94 lib/layouts/elsart.layout:116
+#: lib/layouts/elsarticle.layout:61 lib/layouts/elsarticle.layout:86
+#: lib/layouts/elsarticle.layout:130 lib/layouts/elsarticle.layout:152
+#: lib/layouts/elsarticle.layout:226 lib/layouts/elsarticle.layout:261
+#: lib/layouts/elsarticle.layout:290 lib/layouts/entcs.layout:75
+#: lib/layouts/europasscv.layout:78 lib/layouts/europecv.layout:35
+#: lib/layouts/europecv.layout:189 lib/layouts/ijmpc.layout:68
+#: lib/layouts/ijmpc.layout:93 lib/layouts/ijmpc.layout:111
+#: lib/layouts/ijmpc.layout:129 lib/layouts/ijmpc.layout:163
+#: lib/layouts/ijmpc.layout:213 lib/layouts/ijmpd.layout:73
+#: lib/layouts/ijmpd.layout:98 lib/layouts/ijmpd.layout:116
+#: lib/layouts/ijmpd.layout:134 lib/layouts/ijmpd.layout:153
+#: lib/layouts/ijmpd.layout:221 lib/layouts/ijmpd.layout:233
+#: lib/layouts/iopart.layout:62 lib/layouts/iopart.layout:136
+#: lib/layouts/iopart.layout:155 lib/layouts/iopart.layout:180
+#: lib/layouts/iopart.layout:209 lib/layouts/iucr.layout:113
+#: lib/layouts/iucr.layout:178 lib/layouts/jasatex.layout:64
+#: lib/layouts/jasatex.layout:90 lib/layouts/jasatex.layout:110
+#: lib/layouts/jasatex.layout:151 lib/layouts/jasatex.layout:171
+#: lib/layouts/jasatex.layout:200 lib/layouts/jss.layout:52
+#: lib/layouts/jss.layout:91 lib/layouts/kluwer.layout:114
+#: lib/layouts/kluwer.layout:169 lib/layouts/latex8.layout:90
+#: lib/layouts/llncs.layout:109 lib/layouts/llncs.layout:184
+#: lib/layouts/llncs.layout:221 lib/layouts/llncs.layout:248
+#: lib/layouts/ltugboat.layout:141 lib/layouts/ltugboat.layout:161
+#: lib/layouts/moderncv.layout:41 lib/layouts/moderncv.layout:84
+#: lib/layouts/moderncv.layout:117 lib/layouts/moderncv.layout:476
+#: lib/layouts/revtex4-1.layout:64 lib/layouts/revtex4-1.layout:155
+#: lib/layouts/revtex4-1.layout:178 lib/layouts/revtex4.layout:104
+#: lib/layouts/revtex4.layout:134 lib/layouts/revtex4.layout:260
+#: lib/layouts/sciposter.layout:41 lib/layouts/siamltex.layout:288
+#: lib/layouts/siamltex.layout:308 lib/layouts/sigplanconf.layout:73
+#: lib/layouts/sigplanconf.layout:148 lib/layouts/sigplanconf.layout:196
+#: lib/layouts/simplecv.layout:134 lib/layouts/svmult.layout:49
+#: lib/layouts/svmult.layout:99 lib/layouts/tufte-handout.layout:54
+#: lib/layouts/acm-sigs.inc:11 lib/layouts/acm-sigs.inc:32
+#: lib/layouts/agu_stdtitle.inc:129 lib/layouts/amsdefs.inc:25
+#: lib/layouts/amsdefs.inc:52 lib/layouts/amsdefs.inc:72
+#: lib/layouts/amsdefs.inc:96 lib/layouts/amsdefs.inc:123
+#: lib/layouts/lyxmacros.inc:45 lib/layouts/lyxmacros.inc:66
+#: lib/layouts/stdstruct.inc:16 lib/layouts/stdtitle.inc:17
+#: lib/layouts/stdtitle.inc:38 lib/layouts/stdtitle.inc:57
+#: lib/layouts/svcommon.inc:353 lib/layouts/svcommon.inc:377
+#: lib/layouts/svcommon.inc:428 lib/layouts/svcommon.inc:465
+#: lib/layouts/svcommon.inc:483 lib/layouts/svcommon.inc:504
+#: lib/layouts/svcommon.inc:531 lib/layouts/bicaption.module:13
 msgid "FrontMatter"
 msgstr "Front-ting"
 
@@ -5309,80 +5309,80 @@ msgstr "JEL"
 msgid "JEL:"
 msgstr "JEL:"
 
-#: lib/layouts/AEA.layout:95\r lib/layouts/IEEEtran-CompSoc.layout:55
-#: lib/layouts/IEEEtran-TransMag.layout:33\r lib/layouts/IEEEtran.layout:280
-#: lib/layouts/aa.layout:321\r lib/layouts/aastex.layout:283
-#: lib/layouts/achemso.layout:155\r lib/layouts/acmsiggraph.layout:163
-#: lib/layouts/apa6.layout:250\r lib/layouts/elsart.layout:64
-#: lib/layouts/elsarticle.layout:286\r lib/layouts/ijmpc.layout:222
-#: lib/layouts/ijmpc.layout:226\r lib/layouts/ijmpd.layout:230
-#: lib/layouts/iopart.layout:205\r lib/layouts/isprs.layout:53
-#: lib/layouts/jasatex.layout:196\r lib/layouts/jss.layout:87
-#: lib/layouts/kluwer.layout:286\r lib/layouts/paper.layout:174
-#: lib/layouts/revtex4-1.layout:154\r lib/layouts/revtex4.layout:271
-#: lib/layouts/siamltex.layout:312\r lib/layouts/sigplanconf.layout:185
-#: lib/layouts/spie.layout:42\r lib/layouts/svglobal.layout:111
-#: lib/layouts/svglobal.layout:114\r lib/layouts/svglobal3.layout:57
-#: lib/layouts/svglobal3.layout:60\r lib/layouts/svjog.layout:115
-#: lib/layouts/svjog.layout:118\r lib/layouts/svprobth.layout:145
-#: lib/layouts/svprobth.layout:148\r lib/layouts/acm-sigs.inc:51
-#: lib/layouts/agu_stdtitle.inc:120\r lib/layouts/amsdefs.inc:165
-#: lib/layouts/svcommon.inc:461\r lib/layouts/svcommon.inc:476
+#: lib/layouts/AEA.layout:95 lib/layouts/IEEEtran-CompSoc.layout:55
+#: lib/layouts/IEEEtran-TransMag.layout:33 lib/layouts/IEEEtran.layout:280
+#: lib/layouts/aa.layout:321 lib/layouts/aastex.layout:283
+#: lib/layouts/achemso.layout:155 lib/layouts/acmsiggraph.layout:163
+#: lib/layouts/apa6.layout:250 lib/layouts/elsart.layout:64
+#: lib/layouts/elsarticle.layout:286 lib/layouts/ijmpc.layout:222
+#: lib/layouts/ijmpc.layout:226 lib/layouts/ijmpd.layout:230
+#: lib/layouts/iopart.layout:205 lib/layouts/isprs.layout:53
+#: lib/layouts/jasatex.layout:196 lib/layouts/jss.layout:87
+#: lib/layouts/kluwer.layout:286 lib/layouts/paper.layout:174
+#: lib/layouts/revtex4-1.layout:154 lib/layouts/revtex4.layout:271
+#: lib/layouts/siamltex.layout:312 lib/layouts/sigplanconf.layout:185
+#: lib/layouts/spie.layout:42 lib/layouts/svglobal.layout:111
+#: lib/layouts/svglobal.layout:114 lib/layouts/svglobal3.layout:57
+#: lib/layouts/svglobal3.layout:60 lib/layouts/svjog.layout:115
+#: lib/layouts/svjog.layout:118 lib/layouts/svprobth.layout:145
+#: lib/layouts/svprobth.layout:148 lib/layouts/acm-sigs.inc:51
+#: lib/layouts/agu_stdtitle.inc:120 lib/layouts/amsdefs.inc:165
+#: lib/layouts/svcommon.inc:461 lib/layouts/svcommon.inc:476
 msgid "Keywords"
 msgstr "Stikkord"
 
-#: lib/layouts/AEA.layout:98\r lib/layouts/achemso.layout:158
-#: lib/layouts/acmsiggraph.layout:167\r lib/layouts/apa6.layout:266
-#: lib/layouts/ectaart.layout:127\r lib/layouts/elsarticle.layout:298
-#: lib/layouts/ijmpd.layout:234\r lib/layouts/iopart.layout:216
-#: lib/layouts/jasatex.layout:209\r lib/layouts/jss.layout:100
-#: lib/layouts/kluwer.layout:293\r lib/layouts/paper.layout:177
-#: lib/layouts/revtex4-1.layout:162\r lib/layouts/revtex4.layout:276
-#: lib/layouts/sigplanconf.layout:188\r lib/layouts/spie.layout:49
-#: lib/layouts/acm-sigs.inc:54\r lib/layouts/agu_stdtitle.inc:123
+#: lib/layouts/AEA.layout:98 lib/layouts/achemso.layout:158
+#: lib/layouts/acmsiggraph.layout:167 lib/layouts/apa6.layout:266
+#: lib/layouts/ectaart.layout:127 lib/layouts/elsarticle.layout:298
+#: lib/layouts/ijmpd.layout:234 lib/layouts/iopart.layout:216
+#: lib/layouts/jasatex.layout:209 lib/layouts/jss.layout:100
+#: lib/layouts/kluwer.layout:293 lib/layouts/paper.layout:177
+#: lib/layouts/revtex4-1.layout:162 lib/layouts/revtex4.layout:276
+#: lib/layouts/sigplanconf.layout:188 lib/layouts/spie.layout:49
+#: lib/layouts/acm-sigs.inc:54 lib/layouts/agu_stdtitle.inc:123
 msgid "Keywords:"
 msgstr "Nøkkelord:"
 
-#: lib/layouts/AEA.layout:101\r lib/layouts/IEEEtran-CompSoc.layout:49
-#: lib/layouts/IEEEtran-TransMag.layout:27\r lib/layouts/IEEEtran.layout:258
-#: lib/layouts/RJournal.layout:39\r lib/layouts/aa.layout:291
-#: lib/layouts/aapaper.layout:102\r lib/layouts/aapaper.layout:205
-#: lib/layouts/aastex.layout:241\r lib/layouts/acmsiggraph.layout:194
-#: lib/layouts/acmsiggraph.layout:210\r lib/layouts/agutex.layout:137
-#: lib/layouts/apa.layout:73\r lib/layouts/apa6.layout:228
-#: lib/layouts/cl2emult.layout:85\r lib/layouts/cl2emult.layout:96
-#: lib/layouts/ectaart.layout:43\r lib/layouts/ectaart.layout:56
-#: lib/layouts/egs.layout:504\r lib/layouts/elsart.layout:218
-#: lib/layouts/elsart.layout:233\r lib/layouts/elsarticle.layout:257
-#: lib/layouts/elsarticle.layout:274\r lib/layouts/entcs.layout:86
-#: lib/layouts/foils.layout:149\r lib/layouts/ijmpc.layout:209
-#: lib/layouts/ijmpd.layout:217\r lib/layouts/iopart.layout:176
-#: lib/layouts/iopart.layout:193\r lib/layouts/isprs.layout:26
-#: lib/layouts/jasatex.layout:167\r lib/layouts/jasatex.layout:184
-#: lib/layouts/jss.layout:51\r lib/layouts/jss.layout:68
-#: lib/layouts/kluwer.layout:263\r lib/layouts/latex8.layout:109
-#: lib/layouts/llncs.layout:247\r lib/layouts/ltugboat.layout:177
-#: lib/layouts/ltugboat.layout:191\r lib/layouts/paper.layout:132
-#: lib/layouts/revtex.layout:141\r lib/layouts/revtex4-1.layout:58
-#: lib/layouts/revtex4.layout:233\r lib/layouts/siamltex.layout:260
-#: lib/layouts/sigplanconf.layout:192\r lib/layouts/sigplanconf.layout:208
-#: lib/layouts/spie.layout:76\r lib/layouts/svglobal.layout:147
-#: lib/layouts/svjog.layout:151\r lib/layouts/svmono.layout:23
-#: lib/layouts/svmult.layout:96\r lib/layouts/svmult.layout:100
-#: lib/layouts/svprobth.layout:181\r lib/layouts/tufte-handout.layout:50
-#: lib/layouts/tufte-handout.layout:65\r lib/layouts/agu_stdtitle.inc:194
-#: lib/layouts/amsdefs.inc:95\r lib/layouts/db_stdstruct.inc:11
-#: lib/layouts/scrclass.inc:263\r lib/layouts/stdstruct.inc:12
-#: lib/layouts/stdstruct.inc:28\r lib/layouts/svcommon.inc:427
-#: lib/layouts/svcommon.inc:433\r src/output_plaintext.cpp:141
+#: lib/layouts/AEA.layout:101 lib/layouts/IEEEtran-CompSoc.layout:49
+#: lib/layouts/IEEEtran-TransMag.layout:27 lib/layouts/IEEEtran.layout:258
+#: lib/layouts/RJournal.layout:39 lib/layouts/aa.layout:291
+#: lib/layouts/aapaper.layout:102 lib/layouts/aapaper.layout:205
+#: lib/layouts/aastex.layout:241 lib/layouts/acmsiggraph.layout:194
+#: lib/layouts/acmsiggraph.layout:210 lib/layouts/agutex.layout:137
+#: lib/layouts/apa.layout:73 lib/layouts/apa6.layout:228
+#: lib/layouts/cl2emult.layout:85 lib/layouts/cl2emult.layout:96
+#: lib/layouts/ectaart.layout:43 lib/layouts/ectaart.layout:56
+#: lib/layouts/egs.layout:504 lib/layouts/elsart.layout:218
+#: lib/layouts/elsart.layout:233 lib/layouts/elsarticle.layout:257
+#: lib/layouts/elsarticle.layout:274 lib/layouts/entcs.layout:86
+#: lib/layouts/foils.layout:149 lib/layouts/ijmpc.layout:209
+#: lib/layouts/ijmpd.layout:217 lib/layouts/iopart.layout:176
+#: lib/layouts/iopart.layout:193 lib/layouts/isprs.layout:26
+#: lib/layouts/jasatex.layout:167 lib/layouts/jasatex.layout:184
+#: lib/layouts/jss.layout:51 lib/layouts/jss.layout:68
+#: lib/layouts/kluwer.layout:263 lib/layouts/latex8.layout:109
+#: lib/layouts/llncs.layout:247 lib/layouts/ltugboat.layout:177
+#: lib/layouts/ltugboat.layout:191 lib/layouts/paper.layout:132
+#: lib/layouts/revtex.layout:141 lib/layouts/revtex4-1.layout:58
+#: lib/layouts/revtex4.layout:233 lib/layouts/siamltex.layout:260
+#: lib/layouts/sigplanconf.layout:192 lib/layouts/sigplanconf.layout:208
+#: lib/layouts/spie.layout:76 lib/layouts/svglobal.layout:147
+#: lib/layouts/svjog.layout:151 lib/layouts/svmono.layout:23
+#: lib/layouts/svmult.layout:96 lib/layouts/svmult.layout:100
+#: lib/layouts/svprobth.layout:181 lib/layouts/tufte-handout.layout:50
+#: lib/layouts/tufte-handout.layout:65 lib/layouts/agu_stdtitle.inc:194
+#: lib/layouts/amsdefs.inc:95 lib/layouts/db_stdstruct.inc:11
+#: lib/layouts/scrclass.inc:263 lib/layouts/stdstruct.inc:12
+#: lib/layouts/stdstruct.inc:28 lib/layouts/svcommon.inc:427
+#: lib/layouts/svcommon.inc:433 src/output_plaintext.cpp:141
 msgid "Abstract"
 msgstr "Samandrag"
 
-#: lib/layouts/AEA.layout:105\r lib/layouts/aa.layout:154
-#: lib/layouts/aapaper.layout:105\r lib/layouts/achemso.layout:233
-#: lib/layouts/achemso.layout:240\r lib/layouts/egs.layout:552
-#: lib/layouts/elsart.layout:439\r lib/layouts/svmult.layout:147
-#: lib/layouts/aapaper.inc:80\r lib/layouts/svcommon.inc:543
+#: lib/layouts/AEA.layout:105 lib/layouts/aa.layout:154
+#: lib/layouts/aapaper.layout:105 lib/layouts/achemso.layout:233
+#: lib/layouts/achemso.layout:240 lib/layouts/egs.layout:552
+#: lib/layouts/elsart.layout:439 lib/layouts/svmult.layout:147
+#: lib/layouts/aapaper.inc:80 lib/layouts/svcommon.inc:543
 #: lib/layouts/theorems-ams-extended-bytype.module:307
 #: lib/layouts/theorems-ams-extended-bytype.module:316
 #: lib/layouts/theorems-ams-extended-bytype.module:319
@@ -5396,7 +5396,7 @@ msgstr "Samandrag"
 msgid "Acknowledgement"
 msgstr "Takk til"
 
-#: lib/layouts/AEA.layout:107\r lib/layouts/egs.layout:566
+#: lib/layouts/AEA.layout:107 lib/layouts/egs.layout:566
 #: lib/layouts/theorems-ams-extended-bytype.module:328
 #: lib/layouts/theorems-ams-extended.module:296
 msgid "Acknowledgement."
@@ -5406,45 +5406,45 @@ msgstr "Takk."
 msgid "Figure Notes"
 msgstr "Figurnotis"
 
-#: lib/layouts/AEA.layout:116\r lib/layouts/AEA.layout:302
-#: lib/layouts/IEEEtran.layout:36\r lib/layouts/aa.layout:37
-#: lib/layouts/aapaper.layout:36\r lib/layouts/aastex.layout:56
-#: lib/layouts/achemso.layout:32\r lib/layouts/acmsiggraph.layout:36
-#: lib/layouts/agutex.layout:33\r lib/layouts/amsart.layout:32
-#: lib/layouts/amsbook.layout:33\r lib/layouts/apa.layout:26
-#: lib/layouts/apa6.layout:23\r lib/layouts/beamer.layout:64
-#: lib/layouts/beamer.layout:1092\r lib/layouts/beamer.layout:1118
-#: lib/layouts/beamer.layout:1144\r lib/layouts/beamer.layout:1264
-#: lib/layouts/beamer.layout:1298\r lib/layouts/broadway.layout:177
-#: lib/layouts/cl2emult.layout:132\r lib/layouts/dtk.layout:33
-#: lib/layouts/egs.layout:20\r lib/layouts/elsart.layout:49
-#: lib/layouts/elsarticle.layout:34\r lib/layouts/europasscv.layout:60
-#: lib/layouts/europasscv.layout:215\r lib/layouts/europecv.layout:18
-#: lib/layouts/europecv.layout:157\r lib/layouts/europecv.layout:216
-#: lib/layouts/foils.layout:32\r lib/layouts/g-brief2.layout:32
-#: lib/layouts/hollywood.layout:282\r lib/layouts/ijmpc.layout:24
-#: lib/layouts/ijmpd.layout:29\r lib/layouts/iopart.layout:36
-#: lib/layouts/iucr.layout:21\r lib/layouts/jasatex.layout:37
-#: lib/layouts/kluwer.layout:35\r lib/layouts/llncs.layout:25
-#: lib/layouts/ltugboat.layout:32\r lib/layouts/memoir.layout:33
-#: lib/layouts/memoir.layout:182\r lib/layouts/memoir.layout:264
-#: lib/layouts/moderncv.layout:22\r lib/layouts/paper.layout:15
-#: lib/layouts/powerdot.layout:113\r lib/layouts/powerdot.layout:380
-#: lib/layouts/powerdot.layout:402\r lib/layouts/powerdot.layout:424
-#: lib/layouts/powerdot.layout:444\r lib/layouts/revtex.layout:24
-#: lib/layouts/revtex4.layout:46\r lib/layouts/scrlettr.layout:9
-#: lib/layouts/scrlttr2.layout:12\r lib/layouts/seminar.layout:87
-#: lib/layouts/seminar.layout:122\r lib/layouts/siamltex.layout:38
-#: lib/layouts/sigplanconf.layout:39\r lib/layouts/simplecv.layout:19
-#: lib/layouts/slides.layout:62\r lib/layouts/tufte-book.layout:206
-#: lib/layouts/agu_stdclass.inc:23\r lib/layouts/db_stdclass.inc:23
-#: lib/layouts/lyxmacros.inc:13\r lib/layouts/scrclass.inc:18
-#: lib/layouts/scrclass.inc:326\r lib/layouts/stdclass.inc:29
-#: lib/layouts/stdlayouts.inc:13\r lib/layouts/stdlayouts.inc:35
-#: lib/layouts/stdlayouts.inc:57\r lib/layouts/stdlayouts.inc:77
-#: lib/layouts/stdletter.inc:13\r lib/layouts/svcommon.inc:27
-#: lib/layouts/svcommon.inc:609\r lib/layouts/svcommon.inc:620
-#: lib/layouts/initials.module:27\r lib/layouts/rsphrase.module:43
+#: lib/layouts/AEA.layout:116 lib/layouts/AEA.layout:302
+#: lib/layouts/IEEEtran.layout:36 lib/layouts/aa.layout:37
+#: lib/layouts/aapaper.layout:36 lib/layouts/aastex.layout:56
+#: lib/layouts/achemso.layout:32 lib/layouts/acmsiggraph.layout:36
+#: lib/layouts/agutex.layout:33 lib/layouts/amsart.layout:32
+#: lib/layouts/amsbook.layout:33 lib/layouts/apa.layout:26
+#: lib/layouts/apa6.layout:23 lib/layouts/beamer.layout:64
+#: lib/layouts/beamer.layout:1092 lib/layouts/beamer.layout:1118
+#: lib/layouts/beamer.layout:1144 lib/layouts/beamer.layout:1264
+#: lib/layouts/beamer.layout:1298 lib/layouts/broadway.layout:177
+#: lib/layouts/cl2emult.layout:132 lib/layouts/dtk.layout:33
+#: lib/layouts/egs.layout:20 lib/layouts/elsart.layout:49
+#: lib/layouts/elsarticle.layout:34 lib/layouts/europasscv.layout:60
+#: lib/layouts/europasscv.layout:215 lib/layouts/europecv.layout:18
+#: lib/layouts/europecv.layout:157 lib/layouts/europecv.layout:216
+#: lib/layouts/foils.layout:32 lib/layouts/g-brief2.layout:32
+#: lib/layouts/hollywood.layout:282 lib/layouts/ijmpc.layout:24
+#: lib/layouts/ijmpd.layout:29 lib/layouts/iopart.layout:36
+#: lib/layouts/iucr.layout:21 lib/layouts/jasatex.layout:37
+#: lib/layouts/kluwer.layout:35 lib/layouts/llncs.layout:25
+#: lib/layouts/ltugboat.layout:32 lib/layouts/memoir.layout:33
+#: lib/layouts/memoir.layout:182 lib/layouts/memoir.layout:264
+#: lib/layouts/moderncv.layout:22 lib/layouts/paper.layout:15
+#: lib/layouts/powerdot.layout:113 lib/layouts/powerdot.layout:380
+#: lib/layouts/powerdot.layout:402 lib/layouts/powerdot.layout:424
+#: lib/layouts/powerdot.layout:444 lib/layouts/revtex.layout:24
+#: lib/layouts/revtex4.layout:46 lib/layouts/scrlettr.layout:9
+#: lib/layouts/scrlttr2.layout:12 lib/layouts/seminar.layout:87
+#: lib/layouts/seminar.layout:122 lib/layouts/siamltex.layout:38
+#: lib/layouts/sigplanconf.layout:39 lib/layouts/simplecv.layout:19
+#: lib/layouts/slides.layout:62 lib/layouts/tufte-book.layout:206
+#: lib/layouts/agu_stdclass.inc:23 lib/layouts/db_stdclass.inc:23
+#: lib/layouts/lyxmacros.inc:13 lib/layouts/scrclass.inc:18
+#: lib/layouts/scrclass.inc:326 lib/layouts/stdclass.inc:29
+#: lib/layouts/stdlayouts.inc:13 lib/layouts/stdlayouts.inc:35
+#: lib/layouts/stdlayouts.inc:57 lib/layouts/stdlayouts.inc:77
+#: lib/layouts/stdletter.inc:13 lib/layouts/svcommon.inc:27
+#: lib/layouts/svcommon.inc:609 lib/layouts/svcommon.inc:620
+#: lib/layouts/initials.module:27 lib/layouts/rsphrase.module:43
 msgid "MainText"
 msgstr "Hovudtekst"
 
@@ -5456,8 +5456,8 @@ msgstr "Figurnotis"
 msgid "Text of a note in a figure"
 msgstr "Teksten til notisen i ein figur"
 
-#: lib/layouts/AEA.layout:127\r lib/layouts/apa6.layout:219
-#: lib/layouts/beamer.layout:1310\r lib/layouts/powerdot.layout:219
+#: lib/layouts/AEA.layout:127 lib/layouts/apa6.layout:219
+#: lib/layouts/beamer.layout:1310 lib/layouts/powerdot.layout:219
 msgid "Note:"
 msgstr "Notis:"
 
@@ -5473,22 +5473,22 @@ msgstr "Tabellnotis"
 msgid "Text of a note in a table"
 msgstr "Teksten til tabellnotisen"
 
-#: lib/layouts/AEA.layout:147\r lib/layouts/beamer.layout:1252
-#: lib/layouts/elsart.layout:272\r lib/layouts/foils.layout:220
-#: lib/layouts/heb-article.layout:29\r lib/layouts/ijmpc.layout:351
-#: lib/layouts/ijmpd.layout:357\r lib/layouts/llncs.layout:426
-#: lib/layouts/siamltex.layout:68\r lib/layouts/theorems-ams-bytype.inc:53
+#: lib/layouts/AEA.layout:147 lib/layouts/beamer.layout:1252
+#: lib/layouts/elsart.layout:272 lib/layouts/foils.layout:220
+#: lib/layouts/heb-article.layout:29 lib/layouts/ijmpc.layout:351
+#: lib/layouts/ijmpd.layout:357 lib/layouts/llncs.layout:426
+#: lib/layouts/siamltex.layout:68 lib/layouts/theorems-ams-bytype.inc:53
 #: lib/layouts/theorems-ams-bytype.inc:89
-#: lib/layouts/theorems-ams-bytype.inc:92\r lib/layouts/theorems-ams.inc:25
-#: lib/layouts/theorems-ams.inc:61\r lib/layouts/theorems-ams.inc:64
-#: lib/layouts/theorems-bytype.inc:27\r lib/layouts/theorems-bytype.inc:63
-#: lib/layouts/theorems-bytype.inc:66\r lib/layouts/theorems-order.inc:7
+#: lib/layouts/theorems-ams-bytype.inc:92 lib/layouts/theorems-ams.inc:25
+#: lib/layouts/theorems-ams.inc:61 lib/layouts/theorems-ams.inc:64
+#: lib/layouts/theorems-bytype.inc:27 lib/layouts/theorems-bytype.inc:63
+#: lib/layouts/theorems-bytype.inc:66 lib/layouts/theorems-order.inc:7
 #: lib/layouts/theorems-starred-equivalents.inc:6
-#: lib/layouts/theorems-starred.inc:59\r lib/layouts/theorems-starred.inc:62
+#: lib/layouts/theorems-starred.inc:59 lib/layouts/theorems-starred.inc:62
 #: lib/layouts/theorems-without-preamble.inc:34
 #: lib/layouts/theorems-without-preamble.inc:65
-#: lib/layouts/theorems-without-preamble.inc:68\r lib/layouts/theorems.inc:25
-#: lib/layouts/theorems.inc:61\r lib/layouts/theorems.inc:64
+#: lib/layouts/theorems-without-preamble.inc:68 lib/layouts/theorems.inc:25
+#: lib/layouts/theorems.inc:61 lib/layouts/theorems.inc:64
 #: lib/layouts/theorems-chap-bytype.module:54
 #: lib/layouts/theorems-chap.module:19
 #: lib/layouts/theorems-sec-bytype.module:54
@@ -5496,10 +5496,10 @@ msgstr "Teksten til tabellnotisen"
 msgid "Theorem"
 msgstr "Teorem"
 
-#: lib/layouts/AEA.layout:154\r lib/layouts/elsart.layout:358
-#: lib/layouts/powerdot.layout:538\r lib/layouts/revtex4-1.layout:257
-#: lib/layouts/sciposter.layout:87\r lib/layouts/siamltex.layout:117
-#: lib/layouts/stdfloats.inc:41\r lib/layouts/algorithm2e.module:15
+#: lib/layouts/AEA.layout:154 lib/layouts/elsart.layout:358
+#: lib/layouts/powerdot.layout:538 lib/layouts/revtex4-1.layout:257
+#: lib/layouts/sciposter.layout:87 lib/layouts/siamltex.layout:117
+#: lib/layouts/stdfloats.inc:41 lib/layouts/algorithm2e.module:15
 #: lib/layouts/theorems-ams-extended-bytype.module:97
 #: lib/layouts/theorems-ams-extended-bytype.module:106
 #: lib/layouts/theorems-ams-extended-bytype.module:109
@@ -5527,9 +5527,9 @@ msgstr "Algoritme"
 msgid "Axiom"
 msgstr "Aksiom"
 
-#: lib/layouts/AEA.layout:168\r lib/layouts/elsart.layout:429
-#: lib/layouts/llncs.layout:294\r lib/layouts/theorems-case.inc:27
-#: lib/layouts/theorems-case.inc:70\r lib/layouts/theorems-case.inc:73
+#: lib/layouts/AEA.layout:168 lib/layouts/elsart.layout:429
+#: lib/layouts/llncs.layout:294 lib/layouts/theorems-case.inc:27
+#: lib/layouts/theorems-case.inc:70 lib/layouts/theorems-case.inc:73
 #: lib/layouts/theorems-order.inc:79
 #: lib/layouts/theorems-without-preamble.inc:344
 #: lib/layouts/theorems-without-preamble.inc:351
@@ -5537,27 +5537,27 @@ msgstr "Aksiom"
 msgid "Case"
 msgstr "Tilfelle"
 
-#: lib/layouts/AEA.layout:172\r lib/layouts/theorems-without-preamble.inc:348
+#: lib/layouts/AEA.layout:172 lib/layouts/theorems-without-preamble.inc:348
 msgid "Case \\thecase."
 msgstr "Saka \\thecase."
 
-#: lib/layouts/AEA.layout:178\r lib/layouts/elsart.layout:414
-#: lib/layouts/heb-article.layout:77\r lib/layouts/ijmpc.layout:393
-#: lib/layouts/ijmpd.layout:413\r lib/layouts/llncs.layout:316
-#: lib/layouts/svmono.layout:83\r lib/layouts/theorems-ams-bytype.inc:315
+#: lib/layouts/AEA.layout:178 lib/layouts/elsart.layout:414
+#: lib/layouts/heb-article.layout:77 lib/layouts/ijmpc.layout:393
+#: lib/layouts/ijmpd.layout:413 lib/layouts/llncs.layout:316
+#: lib/layouts/svmono.layout:83 lib/layouts/theorems-ams-bytype.inc:315
 #: lib/layouts/theorems-ams-bytype.inc:325
-#: lib/layouts/theorems-ams-bytype.inc:328\r lib/layouts/theorems-ams.inc:279
-#: lib/layouts/theorems-ams.inc:288\r lib/layouts/theorems-ams.inc:291
-#: lib/layouts/theorems-bytype.inc:289\r lib/layouts/theorems-bytype.inc:299
-#: lib/layouts/theorems-bytype.inc:302\r lib/layouts/theorems-order.inc:73
+#: lib/layouts/theorems-ams-bytype.inc:328 lib/layouts/theorems-ams.inc:279
+#: lib/layouts/theorems-ams.inc:288 lib/layouts/theorems-ams.inc:291
+#: lib/layouts/theorems-bytype.inc:289 lib/layouts/theorems-bytype.inc:299
+#: lib/layouts/theorems-bytype.inc:302 lib/layouts/theorems-order.inc:73
 #: lib/layouts/theorems-starred-equivalents.inc:83
-#: lib/layouts/theorems-starred.inc:280\r lib/layouts/theorems-starred.inc:283
+#: lib/layouts/theorems-starred.inc:280 lib/layouts/theorems-starred.inc:283
 #: lib/layouts/theorems-without-preamble.inc:329
 #: lib/layouts/theorems-without-preamble.inc:332
 #: lib/layouts/theorems-without-preamble.inc:334
 #: lib/layouts/theorems-without-preamble.inc:337
-#: lib/layouts/theorems.inc:279\r lib/layouts/theorems.inc:288
-#: lib/layouts/theorems.inc:291\r lib/layouts/theorems-chap-bytype.module:186
+#: lib/layouts/theorems.inc:279 lib/layouts/theorems.inc:288
+#: lib/layouts/theorems.inc:291 lib/layouts/theorems-chap-bytype.module:186
 #: lib/layouts/theorems-sec-bytype.module:142
 msgid "Claim"
 msgstr "Påstand"
@@ -5590,48 +5590,48 @@ msgstr "Konklusjon"
 msgid "Condition"
 msgstr "Vilkår"
 
-#: lib/layouts/AEA.layout:201\r lib/layouts/elsart.layout:379
-#: lib/layouts/ijmpc.layout:405\r lib/layouts/ijmpd.layout:424
-#: lib/layouts/llncs.layout:323\r lib/layouts/siamltex.layout:108
+#: lib/layouts/AEA.layout:201 lib/layouts/elsart.layout:379
+#: lib/layouts/ijmpc.layout:405 lib/layouts/ijmpd.layout:424
+#: lib/layouts/llncs.layout:323 lib/layouts/siamltex.layout:108
 #: lib/layouts/theorems-ams-bytype.inc:152
 #: lib/layouts/theorems-ams-bytype.inc:161
-#: lib/layouts/theorems-ams-bytype.inc:164\r lib/layouts/theorems-ams.inc:124
-#: lib/layouts/theorems-ams.inc:134\r lib/layouts/theorems-ams.inc:137
-#: lib/layouts/theorems-bytype.inc:126\r lib/layouts/theorems-bytype.inc:135
-#: lib/layouts/theorems-bytype.inc:138\r lib/layouts/theorems-order.inc:31
+#: lib/layouts/theorems-ams-bytype.inc:164 lib/layouts/theorems-ams.inc:124
+#: lib/layouts/theorems-ams.inc:134 lib/layouts/theorems-ams.inc:137
+#: lib/layouts/theorems-bytype.inc:126 lib/layouts/theorems-bytype.inc:135
+#: lib/layouts/theorems-bytype.inc:138 lib/layouts/theorems-order.inc:31
 #: lib/layouts/theorems-starred-equivalents.inc:34
-#: lib/layouts/theorems-starred.inc:128\r lib/layouts/theorems-starred.inc:131
+#: lib/layouts/theorems-starred.inc:128 lib/layouts/theorems-starred.inc:131
 #: lib/layouts/theorems-without-preamble.inc:139
 #: lib/layouts/theorems-without-preamble.inc:152
 #: lib/layouts/theorems-without-preamble.inc:155
-#: lib/layouts/theorems.inc:124\r lib/layouts/theorems.inc:134
-#: lib/layouts/theorems.inc:137\r lib/layouts/theorems-chap-bytype.module:102
+#: lib/layouts/theorems.inc:124 lib/layouts/theorems.inc:134
+#: lib/layouts/theorems.inc:137 lib/layouts/theorems-chap-bytype.module:102
 #: lib/layouts/theorems-sec-bytype.module:86
 msgid "Conjecture"
 msgstr "Konjektur"
 
-#: lib/layouts/AEA.layout:208\r lib/layouts/beamer.layout:1172
-#: lib/layouts/elsart.layout:337\r lib/layouts/foils.layout:253
-#: lib/layouts/heb-article.layout:67\r lib/layouts/ijmpc.layout:370
-#: lib/layouts/ijmpd.layout:382\r lib/layouts/llncs.layout:330
-#: lib/layouts/siamltex.layout:78\r lib/layouts/theorems-ams-bytype.inc:98
+#: lib/layouts/AEA.layout:208 lib/layouts/beamer.layout:1172
+#: lib/layouts/elsart.layout:337 lib/layouts/foils.layout:253
+#: lib/layouts/heb-article.layout:67 lib/layouts/ijmpc.layout:370
+#: lib/layouts/ijmpd.layout:382 lib/layouts/llncs.layout:330
+#: lib/layouts/siamltex.layout:78 lib/layouts/theorems-ams-bytype.inc:98
 #: lib/layouts/theorems-ams-bytype.inc:108
-#: lib/layouts/theorems-ams-bytype.inc:111\r lib/layouts/theorems-ams.inc:70
-#: lib/layouts/theorems-ams.inc:80\r lib/layouts/theorems-ams.inc:83
-#: lib/layouts/theorems-bytype.inc:72\r lib/layouts/theorems-bytype.inc:81
-#: lib/layouts/theorems-bytype.inc:84\r lib/layouts/theorems-order.inc:13
+#: lib/layouts/theorems-ams-bytype.inc:111 lib/layouts/theorems-ams.inc:70
+#: lib/layouts/theorems-ams.inc:80 lib/layouts/theorems-ams.inc:83
+#: lib/layouts/theorems-bytype.inc:72 lib/layouts/theorems-bytype.inc:81
+#: lib/layouts/theorems-bytype.inc:84 lib/layouts/theorems-order.inc:13
 #: lib/layouts/theorems-starred-equivalents.inc:13
-#: lib/layouts/theorems-starred.inc:77\r lib/layouts/theorems-starred.inc:80
+#: lib/layouts/theorems-starred.inc:77 lib/layouts/theorems-starred.inc:80
 #: lib/layouts/theorems-without-preamble.inc:75
 #: lib/layouts/theorems-without-preamble.inc:81
-#: lib/layouts/theorems-without-preamble.inc:84\r lib/layouts/theorems.inc:70
-#: lib/layouts/theorems.inc:80\r lib/layouts/theorems.inc:83
+#: lib/layouts/theorems-without-preamble.inc:84 lib/layouts/theorems.inc:70
+#: lib/layouts/theorems.inc:80 lib/layouts/theorems.inc:83
 #: lib/layouts/theorems-chap-bytype.module:66
 #: lib/layouts/theorems-sec-bytype.module:62
 msgid "Corollary"
 msgstr "Korollar"
 
-#: lib/layouts/AEA.layout:215\r lib/layouts/elsart.layout:351
+#: lib/layouts/AEA.layout:215 lib/layouts/elsart.layout:351
 #: lib/layouts/theorems-ams-extended-bytype.module:63
 #: lib/layouts/theorems-ams-extended-bytype.module:72
 #: lib/layouts/theorems-ams-extended-bytype.module:75
@@ -5645,88 +5645,88 @@ msgstr "Korollar"
 msgid "Criterion"
 msgstr "Kriterium"
 
-#: lib/layouts/AEA.layout:223\r lib/layouts/beamer.layout:1206
-#: lib/layouts/elsart.layout:365\r lib/layouts/foils.layout:267
-#: lib/layouts/heb-article.layout:87\r lib/layouts/llncs.layout:344
-#: lib/layouts/siamltex.layout:127\r lib/layouts/theorems-ams-bytype.inc:188
+#: lib/layouts/AEA.layout:223 lib/layouts/beamer.layout:1206
+#: lib/layouts/elsart.layout:365 lib/layouts/foils.layout:267
+#: lib/layouts/heb-article.layout:87 lib/layouts/llncs.layout:344
+#: lib/layouts/siamltex.layout:127 lib/layouts/theorems-ams-bytype.inc:188
 #: lib/layouts/theorems-ams-bytype.inc:204
-#: lib/layouts/theorems-ams-bytype.inc:207\r lib/layouts/theorems-ams.inc:160
-#: lib/layouts/theorems-ams.inc:177\r lib/layouts/theorems-ams.inc:180
-#: lib/layouts/theorems-bytype.inc:162\r lib/layouts/theorems-bytype.inc:178
-#: lib/layouts/theorems-bytype.inc:181\r lib/layouts/theorems-order.inc:37
+#: lib/layouts/theorems-ams-bytype.inc:207 lib/layouts/theorems-ams.inc:160
+#: lib/layouts/theorems-ams.inc:177 lib/layouts/theorems-ams.inc:180
+#: lib/layouts/theorems-bytype.inc:162 lib/layouts/theorems-bytype.inc:178
+#: lib/layouts/theorems-bytype.inc:181 lib/layouts/theorems-order.inc:37
 #: lib/layouts/theorems-starred-equivalents.inc:41
-#: lib/layouts/theorems-starred.inc:170\r lib/layouts/theorems-starred.inc:173
+#: lib/layouts/theorems-starred.inc:170 lib/layouts/theorems-starred.inc:173
 #: lib/layouts/theorems-without-preamble.inc:178
 #: lib/layouts/theorems-without-preamble.inc:192
 #: lib/layouts/theorems-without-preamble.inc:195
-#: lib/layouts/theorems.inc:160\r lib/layouts/theorems.inc:177
-#: lib/layouts/theorems.inc:180\r lib/layouts/theorems-chap-bytype.module:126
+#: lib/layouts/theorems.inc:160 lib/layouts/theorems.inc:177
+#: lib/layouts/theorems.inc:180 lib/layouts/theorems-chap-bytype.module:126
 #: lib/layouts/theorems-sec-bytype.module:102
 msgid "Definition"
 msgstr "Definisjon"
 
-#: lib/layouts/AEA.layout:230\r lib/layouts/beamer.layout:1218
-#: lib/layouts/elsart.layout:386\r lib/layouts/llncs.layout:351
+#: lib/layouts/AEA.layout:230 lib/layouts/beamer.layout:1218
+#: lib/layouts/elsart.layout:386 lib/layouts/llncs.layout:351
 #: lib/layouts/theorems-ams-bytype.inc:213
 #: lib/layouts/theorems-ams-bytype.inc:223
-#: lib/layouts/theorems-ams-bytype.inc:226\r lib/layouts/theorems-ams.inc:185
-#: lib/layouts/theorems-ams.inc:194\r lib/layouts/theorems-ams.inc:197
-#: lib/layouts/theorems-bytype.inc:187\r lib/layouts/theorems-bytype.inc:197
-#: lib/layouts/theorems-bytype.inc:200\r lib/layouts/theorems-order.inc:43
+#: lib/layouts/theorems-ams-bytype.inc:226 lib/layouts/theorems-ams.inc:185
+#: lib/layouts/theorems-ams.inc:194 lib/layouts/theorems-ams.inc:197
+#: lib/layouts/theorems-bytype.inc:187 lib/layouts/theorems-bytype.inc:197
+#: lib/layouts/theorems-bytype.inc:200 lib/layouts/theorems-order.inc:43
 #: lib/layouts/theorems-starred-equivalents.inc:48
-#: lib/layouts/theorems-starred.inc:187\r lib/layouts/theorems-starred.inc:190
+#: lib/layouts/theorems-starred.inc:187 lib/layouts/theorems-starred.inc:190
 #: lib/layouts/theorems-without-preamble.inc:202
 #: lib/layouts/theorems-without-preamble.inc:209
 #: lib/layouts/theorems-without-preamble.inc:212
-#: lib/layouts/theorems.inc:185\r lib/layouts/theorems.inc:194
-#: lib/layouts/theorems.inc:197\r lib/layouts/theorems-chap-bytype.module:138
+#: lib/layouts/theorems.inc:185 lib/layouts/theorems.inc:194
+#: lib/layouts/theorems.inc:197 lib/layouts/theorems-chap-bytype.module:138
 #: lib/layouts/theorems-sec-bytype.module:110
 #: src/frontends/qt4/GuiDocument.cpp:1099
 msgid "Example"
 msgstr "Døme"
 
-#: lib/layouts/AEA.layout:237\r lib/layouts/llncs.layout:358
+#: lib/layouts/AEA.layout:237 lib/layouts/llncs.layout:358
 #: lib/layouts/theorems-ams-bytype.inc:251
 #: lib/layouts/theorems-ams-bytype.inc:261
-#: lib/layouts/theorems-ams-bytype.inc:264\r lib/layouts/theorems-ams.inc:219
-#: lib/layouts/theorems-ams.inc:228\r lib/layouts/theorems-ams.inc:231
-#: lib/layouts/theorems-bytype.inc:225\r lib/layouts/theorems-bytype.inc:235
-#: lib/layouts/theorems-bytype.inc:238\r lib/layouts/theorems-order.inc:55
+#: lib/layouts/theorems-ams-bytype.inc:264 lib/layouts/theorems-ams.inc:219
+#: lib/layouts/theorems-ams.inc:228 lib/layouts/theorems-ams.inc:231
+#: lib/layouts/theorems-bytype.inc:225 lib/layouts/theorems-bytype.inc:235
+#: lib/layouts/theorems-bytype.inc:238 lib/layouts/theorems-order.inc:55
 #: lib/layouts/theorems-starred-equivalents.inc:69
-#: lib/layouts/theorems-starred.inc:221\r lib/layouts/theorems-starred.inc:224
+#: lib/layouts/theorems-starred.inc:221 lib/layouts/theorems-starred.inc:224
 #: lib/layouts/theorems-without-preamble.inc:221
 #: lib/layouts/theorems-without-preamble.inc:240
 #: lib/layouts/theorems-without-preamble.inc:297
 #: lib/layouts/theorems-without-preamble.inc:304
 #: lib/layouts/theorems-without-preamble.inc:307
-#: lib/layouts/theorems.inc:219\r lib/layouts/theorems.inc:228
-#: lib/layouts/theorems.inc:231\r lib/layouts/theorems-chap-bytype.module:162
+#: lib/layouts/theorems.inc:219 lib/layouts/theorems.inc:228
+#: lib/layouts/theorems.inc:231 lib/layouts/theorems-chap-bytype.module:162
 #: lib/layouts/theorems-sec-bytype.module:126
 msgid "Exercise"
 msgstr "Øving"
 
-#: lib/layouts/AEA.layout:244\r lib/layouts/beamer.layout:1240
-#: lib/layouts/elsart.layout:330\r lib/layouts/foils.layout:246
-#: lib/layouts/heb-article.layout:57\r lib/layouts/ijmpc.layout:374
-#: lib/layouts/ijmpd.layout:389\r lib/layouts/llncs.layout:365
-#: lib/layouts/siamltex.layout:88\r lib/layouts/theorems-ams-bytype.inc:116
+#: lib/layouts/AEA.layout:244 lib/layouts/beamer.layout:1240
+#: lib/layouts/elsart.layout:330 lib/layouts/foils.layout:246
+#: lib/layouts/heb-article.layout:57 lib/layouts/ijmpc.layout:374
+#: lib/layouts/ijmpd.layout:389 lib/layouts/llncs.layout:365
+#: lib/layouts/siamltex.layout:88 lib/layouts/theorems-ams-bytype.inc:116
 #: lib/layouts/theorems-ams-bytype.inc:125
-#: lib/layouts/theorems-ams-bytype.inc:128\r lib/layouts/theorems-ams.inc:88
-#: lib/layouts/theorems-ams.inc:98\r lib/layouts/theorems-ams.inc:101
-#: lib/layouts/theorems-bytype.inc:90\r lib/layouts/theorems-bytype.inc:99
-#: lib/layouts/theorems-bytype.inc:102\r lib/layouts/theorems-order.inc:19
+#: lib/layouts/theorems-ams-bytype.inc:128 lib/layouts/theorems-ams.inc:88
+#: lib/layouts/theorems-ams.inc:98 lib/layouts/theorems-ams.inc:101
+#: lib/layouts/theorems-bytype.inc:90 lib/layouts/theorems-bytype.inc:99
+#: lib/layouts/theorems-bytype.inc:102 lib/layouts/theorems-order.inc:19
 #: lib/layouts/theorems-starred-equivalents.inc:20
-#: lib/layouts/theorems-starred.inc:94\r lib/layouts/theorems-starred.inc:97
+#: lib/layouts/theorems-starred.inc:94 lib/layouts/theorems-starred.inc:97
 #: lib/layouts/theorems-without-preamble.inc:91
 #: lib/layouts/theorems-without-preamble.inc:97
-#: lib/layouts/theorems-without-preamble.inc:100\r lib/layouts/theorems.inc:88
-#: lib/layouts/theorems.inc:98\r lib/layouts/theorems.inc:101
+#: lib/layouts/theorems-without-preamble.inc:100 lib/layouts/theorems.inc:88
+#: lib/layouts/theorems.inc:98 lib/layouts/theorems.inc:101
 #: lib/layouts/theorems-chap-bytype.module:78
 #: lib/layouts/theorems-sec-bytype.module:70
 msgid "Lemma"
 msgstr "Lemma"
 
-#: lib/layouts/AEA.layout:251\r lib/layouts/agutex.layout:164
+#: lib/layouts/AEA.layout:251 lib/layouts/agutex.layout:164
 #: lib/layouts/agutex.layout:176
 #: lib/layouts/theorems-ams-extended-bytype.module:237
 #: lib/layouts/theorems-ams-extended-bytype.module:246
@@ -5741,98 +5741,98 @@ msgstr "Lemma"
 msgid "Notation"
 msgstr "Notasjon"
 
-#: lib/layouts/AEA.layout:259\r lib/layouts/elsart.layout:393
-#: lib/layouts/llncs.layout:378\r lib/layouts/theorems-ams-bytype.inc:232
+#: lib/layouts/AEA.layout:259 lib/layouts/elsart.layout:393
+#: lib/layouts/llncs.layout:378 lib/layouts/theorems-ams-bytype.inc:232
 #: lib/layouts/theorems-ams-bytype.inc:242
-#: lib/layouts/theorems-ams-bytype.inc:245\r lib/layouts/theorems-ams.inc:202
-#: lib/layouts/theorems-ams.inc:211\r lib/layouts/theorems-ams.inc:214
-#: lib/layouts/theorems-bytype.inc:206\r lib/layouts/theorems-bytype.inc:216
-#: lib/layouts/theorems-bytype.inc:219\r lib/layouts/theorems-order.inc:49
+#: lib/layouts/theorems-ams-bytype.inc:245 lib/layouts/theorems-ams.inc:202
+#: lib/layouts/theorems-ams.inc:211 lib/layouts/theorems-ams.inc:214
+#: lib/layouts/theorems-bytype.inc:206 lib/layouts/theorems-bytype.inc:216
+#: lib/layouts/theorems-bytype.inc:219 lib/layouts/theorems-order.inc:49
 #: lib/layouts/theorems-starred-equivalents.inc:62
-#: lib/layouts/theorems-starred.inc:204\r lib/layouts/theorems-starred.inc:207
+#: lib/layouts/theorems-starred.inc:204 lib/layouts/theorems-starred.inc:207
 #: lib/layouts/theorems-without-preamble.inc:219
 #: lib/layouts/theorems-without-preamble.inc:227
 #: lib/layouts/theorems-without-preamble.inc:230
-#: lib/layouts/theorems.inc:202\r lib/layouts/theorems.inc:211
-#: lib/layouts/theorems.inc:214\r lib/layouts/theorems-chap-bytype.module:150
+#: lib/layouts/theorems.inc:202 lib/layouts/theorems.inc:211
+#: lib/layouts/theorems.inc:214 lib/layouts/theorems-chap-bytype.module:150
 #: lib/layouts/theorems-sec-bytype.module:118
 msgid "Problem"
 msgstr "Problem"
 
-#: lib/layouts/AEA.layout:267\r lib/layouts/elsart.layout:344
-#: lib/layouts/foils.layout:260\r lib/layouts/ijmpc.layout:378
-#: lib/layouts/ijmpd.layout:396\r lib/layouts/llncs.layout:399
-#: lib/layouts/siamltex.layout:98\r lib/layouts/theorems-ams-bytype.inc:134
+#: lib/layouts/AEA.layout:267 lib/layouts/elsart.layout:344
+#: lib/layouts/foils.layout:260 lib/layouts/ijmpc.layout:378
+#: lib/layouts/ijmpd.layout:396 lib/layouts/llncs.layout:399
+#: lib/layouts/siamltex.layout:98 lib/layouts/theorems-ams-bytype.inc:134
 #: lib/layouts/theorems-ams-bytype.inc:143
-#: lib/layouts/theorems-ams-bytype.inc:146\r lib/layouts/theorems-ams.inc:106
-#: lib/layouts/theorems-ams.inc:116\r lib/layouts/theorems-ams.inc:119
-#: lib/layouts/theorems-bytype.inc:108\r lib/layouts/theorems-bytype.inc:117
-#: lib/layouts/theorems-bytype.inc:120\r lib/layouts/theorems-order.inc:25
+#: lib/layouts/theorems-ams-bytype.inc:146 lib/layouts/theorems-ams.inc:106
+#: lib/layouts/theorems-ams.inc:116 lib/layouts/theorems-ams.inc:119
+#: lib/layouts/theorems-bytype.inc:108 lib/layouts/theorems-bytype.inc:117
+#: lib/layouts/theorems-bytype.inc:120 lib/layouts/theorems-order.inc:25
 #: lib/layouts/theorems-starred-equivalents.inc:27
-#: lib/layouts/theorems-starred.inc:111\r lib/layouts/theorems-starred.inc:114
+#: lib/layouts/theorems-starred.inc:111 lib/layouts/theorems-starred.inc:114
 #: lib/layouts/theorems-without-preamble.inc:107
 #: lib/layouts/theorems-without-preamble.inc:113
 #: lib/layouts/theorems-without-preamble.inc:116
-#: lib/layouts/theorems.inc:106\r lib/layouts/theorems.inc:116
-#: lib/layouts/theorems.inc:119\r lib/layouts/theorems-chap-bytype.module:90
+#: lib/layouts/theorems.inc:106 lib/layouts/theorems.inc:116
+#: lib/layouts/theorems.inc:119 lib/layouts/theorems-chap-bytype.module:90
 #: lib/layouts/theorems-sec-bytype.module:78
 msgid "Proposition"
 msgstr "Framlegg"
 
-#: lib/layouts/AEA.layout:274\r lib/layouts/elsart.layout:400
-#: lib/layouts/ijmpc.layout:362\r lib/layouts/ijmpd.layout:371
-#: lib/layouts/llncs.layout:412\r lib/layouts/theorems-ams-bytype.inc:289
+#: lib/layouts/AEA.layout:274 lib/layouts/elsart.layout:400
+#: lib/layouts/ijmpc.layout:362 lib/layouts/ijmpd.layout:371
+#: lib/layouts/llncs.layout:412 lib/layouts/theorems-ams-bytype.inc:289
 #: lib/layouts/theorems-ams-bytype.inc:306
-#: lib/layouts/theorems-ams-bytype.inc:309\r lib/layouts/theorems-ams.inc:253
-#: lib/layouts/theorems-ams.inc:271\r lib/layouts/theorems-ams.inc:274
-#: lib/layouts/theorems-bytype.inc:263\r lib/layouts/theorems-bytype.inc:280
-#: lib/layouts/theorems-bytype.inc:283\r lib/layouts/theorems-order.inc:67
+#: lib/layouts/theorems-ams-bytype.inc:309 lib/layouts/theorems-ams.inc:253
+#: lib/layouts/theorems-ams.inc:271 lib/layouts/theorems-ams.inc:274
+#: lib/layouts/theorems-bytype.inc:263 lib/layouts/theorems-bytype.inc:280
+#: lib/layouts/theorems-bytype.inc:283 lib/layouts/theorems-order.inc:67
 #: lib/layouts/theorems-starred-equivalents.inc:76
-#: lib/layouts/theorems-starred.inc:263\r lib/layouts/theorems-starred.inc:266
+#: lib/layouts/theorems-starred.inc:263 lib/layouts/theorems-starred.inc:266
 #: lib/layouts/theorems-without-preamble.inc:314
 #: lib/layouts/theorems-without-preamble.inc:321
 #: lib/layouts/theorems-without-preamble.inc:324
-#: lib/layouts/theorems.inc:253\r lib/layouts/theorems.inc:271
-#: lib/layouts/theorems.inc:274\r lib/layouts/theorems-chap-bytype.module:174
+#: lib/layouts/theorems.inc:253 lib/layouts/theorems.inc:271
+#: lib/layouts/theorems.inc:274 lib/layouts/theorems-chap-bytype.module:174
 #: lib/layouts/theorems-sec-bytype.module:134
 msgid "Remark"
 msgstr "Merknad"
 
-#: lib/layouts/AEA.layout:276\r lib/layouts/ijmpc.layout:363
-#: lib/layouts/ijmpd.layout:372\r lib/layouts/theorems-ams-bytype.inc:292
+#: lib/layouts/AEA.layout:276 lib/layouts/ijmpc.layout:363
+#: lib/layouts/ijmpd.layout:372 lib/layouts/theorems-ams-bytype.inc:292
 #: lib/layouts/theorems-bytype.inc:266
 #: lib/layouts/theorems-without-preamble.inc:318
 msgid "Remark \\theremark."
 msgstr "Merknad \\theremark"
 
-#: lib/layouts/AEA.layout:282\r lib/layouts/llncs.layout:419
-#: lib/layouts/svglobal3.layout:86\r lib/layouts/theorems-ams-bytype.inc:270
+#: lib/layouts/AEA.layout:282 lib/layouts/llncs.layout:419
+#: lib/layouts/svglobal3.layout:86 lib/layouts/theorems-ams-bytype.inc:270
 #: lib/layouts/theorems-ams-bytype.inc:280
-#: lib/layouts/theorems-ams-bytype.inc:283\r lib/layouts/theorems-ams.inc:236
-#: lib/layouts/theorems-ams.inc:245\r lib/layouts/theorems-ams.inc:248
-#: lib/layouts/theorems-bytype.inc:244\r lib/layouts/theorems-bytype.inc:254
-#: lib/layouts/theorems-bytype.inc:257\r lib/layouts/theorems-order.inc:61
+#: lib/layouts/theorems-ams-bytype.inc:283 lib/layouts/theorems-ams.inc:236
+#: lib/layouts/theorems-ams.inc:245 lib/layouts/theorems-ams.inc:248
+#: lib/layouts/theorems-bytype.inc:244 lib/layouts/theorems-bytype.inc:254
+#: lib/layouts/theorems-bytype.inc:257 lib/layouts/theorems-order.inc:61
 #: lib/layouts/theorems-starred-equivalents.inc:55
-#: lib/layouts/theorems-starred.inc:238\r lib/layouts/theorems-starred.inc:241
+#: lib/layouts/theorems-starred.inc:238 lib/layouts/theorems-starred.inc:241
 #: lib/layouts/theorems-without-preamble.inc:267
 #: lib/layouts/theorems-without-preamble.inc:274
 #: lib/layouts/theorems-without-preamble.inc:277
-#: lib/layouts/theorems.inc:236\r lib/layouts/theorems.inc:245
+#: lib/layouts/theorems.inc:236 lib/layouts/theorems.inc:245
 #: lib/layouts/theorems.inc:248
 msgid "Solution"
 msgstr "Løysing"
 
-#: lib/layouts/AEA.layout:286\r lib/layouts/theorems-ams-bytype.inc:273
+#: lib/layouts/AEA.layout:286 lib/layouts/theorems-ams-bytype.inc:273
 #: lib/layouts/theorems-bytype.inc:247
 #: lib/layouts/theorems-without-preamble.inc:271
 msgid "Solution \\thesolution."
 msgstr "Løysinga \\thesolution"
 
-#: lib/layouts/AEA.layout:292\r lib/layouts/elsart.layout:421
-#: lib/layouts/europasscv.layout:223\r lib/layouts/europasscv.layout:259
-#: lib/layouts/europecv.layout:165\r lib/layouts/moderncv.layout:378
-#: lib/layouts/moderncv.layout:379\r lib/layouts/moderncv.layout:400
-#: lib/layouts/moderncv.layout:401\r lib/layouts/fixme.module:145
+#: lib/layouts/AEA.layout:292 lib/layouts/elsart.layout:421
+#: lib/layouts/europasscv.layout:223 lib/layouts/europasscv.layout:259
+#: lib/layouts/europecv.layout:165 lib/layouts/moderncv.layout:378
+#: lib/layouts/moderncv.layout:379 lib/layouts/moderncv.layout:400
+#: lib/layouts/moderncv.layout:401 lib/layouts/fixme.module:145
 #: lib/layouts/fixme.module:186
 #: lib/layouts/theorems-ams-extended-bytype.module:272
 #: lib/layouts/theorems-ams-extended-bytype.module:281
@@ -5847,7 +5847,7 @@ msgstr "Løysinga \\thesolution"
 msgid "Summary"
 msgstr "Samandrag"
 
-#: lib/layouts/AEA.layout:300\r src/frontends/qt4/Menus.cpp:1617
+#: lib/layouts/AEA.layout:300 src/frontends/qt4/Menus.cpp:1617
 #: src/frontends/qt4/Menus.cpp:1646
 msgid "Caption"
 msgstr "Figur/tabell-tekst"
@@ -5856,15 +5856,15 @@ msgstr "Figur/tabell-tekst"
 msgid "Caption: "
 msgstr "Ledetekst: "
 
-#: lib/layouts/AEA.layout:311\r lib/layouts/IEEEtran.layout:407
-#: lib/layouts/beamer.layout:1246\r lib/layouts/elsart.layout:302
-#: lib/layouts/foils.layout:281\r lib/layouts/heb-article.layout:107
-#: lib/layouts/ijmpc.layout:331\r lib/layouts/ijmpd.layout:334
-#: lib/layouts/llncs.layout:385\r lib/layouts/siamltex.layout:156
-#: lib/layouts/svmono.layout:87\r lib/layouts/svcommon.inc:637
-#: lib/layouts/svcommon.inc:652\r lib/layouts/svcommon.inc:655
-#: lib/layouts/theorems-order.inc:82\r lib/layouts/theorems-proof-std.inc:6
-#: lib/layouts/theorems-proof.inc:13\r lib/layouts/theorems-bytype.module:48
+#: lib/layouts/AEA.layout:311 lib/layouts/IEEEtran.layout:407
+#: lib/layouts/beamer.layout:1246 lib/layouts/elsart.layout:302
+#: lib/layouts/foils.layout:281 lib/layouts/heb-article.layout:107
+#: lib/layouts/ijmpc.layout:331 lib/layouts/ijmpd.layout:334
+#: lib/layouts/llncs.layout:385 lib/layouts/siamltex.layout:156
+#: lib/layouts/svmono.layout:87 lib/layouts/svcommon.inc:637
+#: lib/layouts/svcommon.inc:652 lib/layouts/svcommon.inc:655
+#: lib/layouts/theorems-order.inc:82 lib/layouts/theorems-proof-std.inc:6
+#: lib/layouts/theorems-proof.inc:13 lib/layouts/theorems-bytype.module:48
 msgid "Proof"
 msgstr "Prov"
 
@@ -5878,7 +5878,7 @@ msgstr ""
 msgid "Standard in Title"
 msgstr "Standard"
 
-#: lib/layouts/IEEEtran-CompSoc.layout:31\r lib/layouts/iucr.layout:103
+#: lib/layouts/IEEEtran-CompSoc.layout:31 lib/layouts/iucr.layout:103
 #: lib/layouts/iucr.layout:106
 #, fuzzy
 msgid "Author Footnote"
@@ -5908,72 +5908,72 @@ msgstr ""
 msgid "IEEE Transactions"
 msgstr "Overgang"
 
-#: lib/layouts/IEEEtran.layout:35\r lib/layouts/aa.layout:36
-#: lib/layouts/aapaper.layout:35\r lib/layouts/aastex.layout:55
-#: lib/layouts/achemso.layout:31\r lib/layouts/acmsiggraph.layout:35
-#: lib/layouts/agutex.layout:32\r lib/layouts/amsart.layout:31
-#: lib/layouts/amsbook.layout:32\r lib/layouts/apa.layout:25
-#: lib/layouts/apa6.layout:22\r lib/layouts/beamer.layout:63
-#: lib/layouts/broadway.layout:176\r lib/layouts/chess.layout:30
-#: lib/layouts/cl2emult.layout:131\r lib/layouts/dtk.layout:32
-#: lib/layouts/egs.layout:19\r lib/layouts/elsart.layout:48
-#: lib/layouts/elsarticle.layout:33\r lib/layouts/europasscv.layout:59
-#: lib/layouts/europecv.layout:17\r lib/layouts/foils.layout:31
-#: lib/layouts/g-brief2.layout:31\r lib/layouts/hollywood.layout:347
-#: lib/layouts/ijmpc.layout:23\r lib/layouts/ijmpd.layout:28
-#: lib/layouts/iopart.layout:35\r lib/layouts/iucr.layout:20
-#: lib/layouts/jasatex.layout:36\r lib/layouts/kluwer.layout:34
-#: lib/layouts/lettre.layout:31\r lib/layouts/llncs.layout:24
-#: lib/layouts/ltugboat.layout:31\r lib/layouts/memoir.layout:32
-#: lib/layouts/moderncv.layout:21\r lib/layouts/paper.layout:14
-#: lib/layouts/powerdot.layout:112\r lib/layouts/revtex.layout:23
-#: lib/layouts/revtex4.layout:45\r lib/layouts/sciposter.layout:78
-#: lib/layouts/scrlettr.layout:8\r lib/layouts/scrlttr2.layout:11
-#: lib/layouts/siamltex.layout:37\r lib/layouts/sigplanconf.layout:38
-#: lib/layouts/simplecv.layout:18\r lib/layouts/slides.layout:61
-#: lib/layouts/tufte-book.layout:20\r lib/layouts/agu_stdclass.inc:22
-#: lib/layouts/db_stdclass.inc:22\r lib/layouts/scrclass.inc:17
-#: lib/layouts/stdclass.inc:28\r lib/layouts/stdinsets.inc:555
-#: lib/layouts/stdletter.inc:12\r lib/layouts/svcommon.inc:26
-#: lib/ui/stdtoolbars.inc:69\r src/insets/InsetRef.cpp:351
+#: lib/layouts/IEEEtran.layout:35 lib/layouts/aa.layout:36
+#: lib/layouts/aapaper.layout:35 lib/layouts/aastex.layout:55
+#: lib/layouts/achemso.layout:31 lib/layouts/acmsiggraph.layout:35
+#: lib/layouts/agutex.layout:32 lib/layouts/amsart.layout:31
+#: lib/layouts/amsbook.layout:32 lib/layouts/apa.layout:25
+#: lib/layouts/apa6.layout:22 lib/layouts/beamer.layout:63
+#: lib/layouts/broadway.layout:176 lib/layouts/chess.layout:30
+#: lib/layouts/cl2emult.layout:131 lib/layouts/dtk.layout:32
+#: lib/layouts/egs.layout:19 lib/layouts/elsart.layout:48
+#: lib/layouts/elsarticle.layout:33 lib/layouts/europasscv.layout:59
+#: lib/layouts/europecv.layout:17 lib/layouts/foils.layout:31
+#: lib/layouts/g-brief2.layout:31 lib/layouts/hollywood.layout:347
+#: lib/layouts/ijmpc.layout:23 lib/layouts/ijmpd.layout:28
+#: lib/layouts/iopart.layout:35 lib/layouts/iucr.layout:20
+#: lib/layouts/jasatex.layout:36 lib/layouts/kluwer.layout:34
+#: lib/layouts/lettre.layout:31 lib/layouts/llncs.layout:24
+#: lib/layouts/ltugboat.layout:31 lib/layouts/memoir.layout:32
+#: lib/layouts/moderncv.layout:21 lib/layouts/paper.layout:14
+#: lib/layouts/powerdot.layout:112 lib/layouts/revtex.layout:23
+#: lib/layouts/revtex4.layout:45 lib/layouts/sciposter.layout:78
+#: lib/layouts/scrlettr.layout:8 lib/layouts/scrlttr2.layout:11
+#: lib/layouts/siamltex.layout:37 lib/layouts/sigplanconf.layout:38
+#: lib/layouts/simplecv.layout:18 lib/layouts/slides.layout:61
+#: lib/layouts/tufte-book.layout:20 lib/layouts/agu_stdclass.inc:22
+#: lib/layouts/db_stdclass.inc:22 lib/layouts/scrclass.inc:17
+#: lib/layouts/stdclass.inc:28 lib/layouts/stdinsets.inc:555
+#: lib/layouts/stdletter.inc:12 lib/layouts/svcommon.inc:26
+#: lib/ui/stdtoolbars.inc:69 src/insets/InsetRef.cpp:351
 msgid "Standard"
 msgstr "Standard"
 
-#: lib/layouts/IEEEtran.layout:66\r lib/layouts/aa.layout:204
-#: lib/layouts/aapaper.layout:78\r lib/layouts/aapaper.layout:172
-#: lib/layouts/aastex.layout:129\r lib/layouts/achemso.layout:53
-#: lib/layouts/acmsiggraph.layout:141\r lib/layouts/agutex.layout:56
-#: lib/layouts/apa.layout:41\r lib/layouts/apa6.layout:38
-#: lib/layouts/beamer.layout:890\r lib/layouts/beamerposter.layout:21
-#: lib/layouts/broadway.layout:189\r lib/layouts/cl2emult.layout:41
-#: lib/layouts/docbook-book.layout:12\r lib/layouts/docbook-chapter.layout:10
-#: lib/layouts/docbook-section.layout:10\r lib/layouts/ectaart.layout:16
-#: lib/layouts/egs.layout:267\r lib/layouts/elsart.layout:93
-#: lib/layouts/elsarticle.layout:82\r lib/layouts/entcs.layout:40
-#: lib/layouts/foils.layout:127\r lib/layouts/hollywood.layout:333
-#: lib/layouts/ijmpc.layout:107\r lib/layouts/ijmpd.layout:112
-#: lib/layouts/iopart.layout:58\r lib/layouts/isprs.layout:94
-#: lib/layouts/jasatex.layout:60\r lib/layouts/jss.layout:40
-#: lib/layouts/kluwer.layout:113\r lib/layouts/latex8.layout:39
-#: lib/layouts/llncs.layout:108\r lib/layouts/ltugboat.layout:140
-#: lib/layouts/moderncv.layout:114\r lib/layouts/paper.layout:112
-#: lib/layouts/powerdot.layout:44\r lib/layouts/revtex.layout:96
-#: lib/layouts/revtex4-1.layout:197\r lib/layouts/revtex4.layout:116
-#: lib/layouts/scrlettr.layout:193\r lib/layouts/scrlttr2.layout:275
-#: lib/layouts/siamltex.layout:192\r lib/layouts/simplecv.layout:133
-#: lib/layouts/svmult.layout:47\r lib/layouts/svprobth.layout:76
-#: lib/layouts/tufte-book.layout:35\r lib/layouts/agu_stdtitle.inc:247
-#: lib/layouts/amsdefs.inc:24\r lib/layouts/db_stdtitle.inc:13
-#: lib/layouts/scrclass.inc:186\r lib/layouts/stdtitle.inc:14
-#: lib/layouts/svcommon.inc:57\r lib/layouts/svcommon.inc:323
+#: lib/layouts/IEEEtran.layout:66 lib/layouts/aa.layout:204
+#: lib/layouts/aapaper.layout:78 lib/layouts/aapaper.layout:172
+#: lib/layouts/aastex.layout:129 lib/layouts/achemso.layout:53
+#: lib/layouts/acmsiggraph.layout:141 lib/layouts/agutex.layout:56
+#: lib/layouts/apa.layout:41 lib/layouts/apa6.layout:38
+#: lib/layouts/beamer.layout:890 lib/layouts/beamerposter.layout:21
+#: lib/layouts/broadway.layout:189 lib/layouts/cl2emult.layout:41
+#: lib/layouts/docbook-book.layout:12 lib/layouts/docbook-chapter.layout:10
+#: lib/layouts/docbook-section.layout:10 lib/layouts/ectaart.layout:16
+#: lib/layouts/egs.layout:267 lib/layouts/elsart.layout:93
+#: lib/layouts/elsarticle.layout:82 lib/layouts/entcs.layout:40
+#: lib/layouts/foils.layout:127 lib/layouts/hollywood.layout:333
+#: lib/layouts/ijmpc.layout:107 lib/layouts/ijmpd.layout:112
+#: lib/layouts/iopart.layout:58 lib/layouts/isprs.layout:94
+#: lib/layouts/jasatex.layout:60 lib/layouts/jss.layout:40
+#: lib/layouts/kluwer.layout:113 lib/layouts/latex8.layout:39
+#: lib/layouts/llncs.layout:108 lib/layouts/ltugboat.layout:140
+#: lib/layouts/moderncv.layout:114 lib/layouts/paper.layout:112
+#: lib/layouts/powerdot.layout:44 lib/layouts/revtex.layout:96
+#: lib/layouts/revtex4-1.layout:197 lib/layouts/revtex4.layout:116
+#: lib/layouts/scrlettr.layout:193 lib/layouts/scrlttr2.layout:275
+#: lib/layouts/siamltex.layout:192 lib/layouts/simplecv.layout:133
+#: lib/layouts/svmult.layout:47 lib/layouts/svprobth.layout:76
+#: lib/layouts/tufte-book.layout:35 lib/layouts/agu_stdtitle.inc:247
+#: lib/layouts/amsdefs.inc:24 lib/layouts/db_stdtitle.inc:13
+#: lib/layouts/scrclass.inc:186 lib/layouts/stdtitle.inc:14
+#: lib/layouts/svcommon.inc:57 lib/layouts/svcommon.inc:323
 msgid "Title"
 msgstr "Tittel"
 
-#: lib/layouts/IEEEtran.layout:86\r lib/layouts/IEEEtran.layout:91
+#: lib/layouts/IEEEtran.layout:86 lib/layouts/IEEEtran.layout:91
 msgid "IEEE membership"
 msgstr "IEEE-medlemskap"
 
-#: lib/layouts/IEEEtran.layout:107\r lib/layouts/revtex4-1.layout:296
+#: lib/layouts/IEEEtran.layout:107 lib/layouts/revtex4-1.layout:296
 msgid "Lowercase"
 msgstr "Litenskrift"
 
@@ -5981,33 +5981,33 @@ msgstr "Litenskrift"
 msgid "lowercase"
 msgstr "litenskrift"
 
-#: lib/layouts/IEEEtran.layout:118\r lib/layouts/aa.layout:216
-#: lib/layouts/aapaper.layout:84\r lib/layouts/aapaper.layout:183
-#: lib/layouts/aastex.layout:141\r lib/layouts/achemso.layout:80
-#: lib/layouts/acmsiggraph.layout:151\r lib/layouts/apa.layout:119
-#: lib/layouts/apa6.layout:74\r lib/layouts/beamer.layout:948
-#: lib/layouts/beamerposter.layout:31\r lib/layouts/broadway.layout:204
-#: lib/layouts/cl2emult.layout:60\r lib/layouts/ectaart.layout:109
-#: lib/layouts/ectaart.layout:185\r lib/layouts/ectaart.layout:188
-#: lib/layouts/egs.layout:310\r lib/layouts/elsart.layout:115
-#: lib/layouts/elsarticle.layout:149\r lib/layouts/entcs.layout:51
-#: lib/layouts/foils.layout:135\r lib/layouts/hollywood.layout:320
-#: lib/layouts/ijmpc.layout:126\r lib/layouts/ijmpd.layout:131
-#: lib/layouts/iopart.layout:132\r lib/layouts/isprs.layout:77
-#: lib/layouts/jasatex.layout:86\r lib/layouts/jss.layout:47
-#: lib/layouts/kluwer.layout:168\r lib/layouts/llncs.layout:183
-#: lib/layouts/ltugboat.layout:160\r lib/layouts/paper.layout:122
-#: lib/layouts/powerdot.layout:68\r lib/layouts/revtex.layout:104
-#: lib/layouts/siamltex.layout:218\r lib/layouts/sigplanconf.layout:144
-#: lib/layouts/svmult.layout:79\r lib/layouts/svprobth.layout:93
-#: lib/layouts/tufte-book.layout:39\r lib/layouts/agu_stdtitle.inc:168
-#: lib/layouts/amsdefs.inc:51\r lib/layouts/db_stdtitle.inc:21
-#: lib/layouts/scrclass.inc:202\r lib/layouts/stdtitle.inc:35
+#: lib/layouts/IEEEtran.layout:118 lib/layouts/aa.layout:216
+#: lib/layouts/aapaper.layout:84 lib/layouts/aapaper.layout:183
+#: lib/layouts/aastex.layout:141 lib/layouts/achemso.layout:80
+#: lib/layouts/acmsiggraph.layout:151 lib/layouts/apa.layout:119
+#: lib/layouts/apa6.layout:74 lib/layouts/beamer.layout:948
+#: lib/layouts/beamerposter.layout:31 lib/layouts/broadway.layout:204
+#: lib/layouts/cl2emult.layout:60 lib/layouts/ectaart.layout:109
+#: lib/layouts/ectaart.layout:185 lib/layouts/ectaart.layout:188
+#: lib/layouts/egs.layout:310 lib/layouts/elsart.layout:115
+#: lib/layouts/elsarticle.layout:149 lib/layouts/entcs.layout:51
+#: lib/layouts/foils.layout:135 lib/layouts/hollywood.layout:320
+#: lib/layouts/ijmpc.layout:126 lib/layouts/ijmpd.layout:131
+#: lib/layouts/iopart.layout:132 lib/layouts/isprs.layout:77
+#: lib/layouts/jasatex.layout:86 lib/layouts/jss.layout:47
+#: lib/layouts/kluwer.layout:168 lib/layouts/llncs.layout:183
+#: lib/layouts/ltugboat.layout:160 lib/layouts/paper.layout:122
+#: lib/layouts/powerdot.layout:68 lib/layouts/revtex.layout:104
+#: lib/layouts/siamltex.layout:218 lib/layouts/sigplanconf.layout:144
+#: lib/layouts/svmult.layout:79 lib/layouts/svprobth.layout:93
+#: lib/layouts/tufte-book.layout:39 lib/layouts/agu_stdtitle.inc:168
+#: lib/layouts/amsdefs.inc:51 lib/layouts/db_stdtitle.inc:21
+#: lib/layouts/scrclass.inc:202 lib/layouts/stdtitle.inc:35
 #: lib/layouts/svcommon.inc:343
 msgid "Author"
 msgstr "Forfattar"
 
-#: lib/layouts/IEEEtran.layout:124\r lib/layouts/beamer.layout:961
+#: lib/layouts/IEEEtran.layout:124 lib/layouts/beamer.layout:961
 #, fuzzy
 msgid "Short Author|S"
 msgstr "Snøggtastar|S"
@@ -6031,7 +6031,7 @@ msgstr "Forfattarmerke"
 msgid "Author Affiliation"
 msgstr "Forfattar tilknyting"
 
-#: lib/layouts/IEEEtran.layout:163\r lib/layouts/agutex.layout:114
+#: lib/layouts/IEEEtran.layout:163 lib/layouts/agutex.layout:114
 msgid "Author affiliation"
 msgstr "Forfattar tilknyting"
 
@@ -6040,7 +6040,7 @@ msgstr "Forfattar tilknyting"
 msgid "Author Mark"
 msgstr "Forfattarmerke"
 
-#: lib/layouts/IEEEtran.layout:179\r lib/layouts/elsarticle.layout:177
+#: lib/layouts/IEEEtran.layout:179 lib/layouts/elsarticle.layout:177
 msgid "Author mark"
 msgstr "Forfattarmerke"
 
@@ -6065,7 +6065,7 @@ msgstr "Venstre topptekst"
 msgid "Left side of the header line"
 msgstr ""
 
-#: lib/layouts/IEEEtran.layout:243\r lib/layouts/ijmpc.layout:65
+#: lib/layouts/IEEEtran.layout:243 lib/layouts/ijmpc.layout:65
 #: lib/layouts/ijmpd.layout:70
 msgid "MarkBoth"
 msgstr "Markerbegge"
@@ -6082,7 +6082,7 @@ msgstr "Samandrag---"
 msgid "Index Terms---"
 msgstr "Indeksord---"
 
-#: lib/layouts/IEEEtran.layout:287\r lib/layouts/IEEEtran.layout:291
+#: lib/layouts/IEEEtran.layout:287 lib/layouts/IEEEtran.layout:291
 #, fuzzy
 msgid "Paragraph Start"
 msgstr "Avsnittval"
@@ -6096,32 +6096,32 @@ msgstr "Første overskrift:"
 msgid "First character of first word"
 msgstr ""
 
-#: lib/layouts/IEEEtran.layout:305\r lib/layouts/IEEEtran.layout:315
+#: lib/layouts/IEEEtran.layout:305 lib/layouts/IEEEtran.layout:315
 msgid "Appendices"
 msgstr "Vedlegg"
 
-#: lib/layouts/IEEEtran.layout:309\r lib/layouts/IEEEtran.layout:348
-#: lib/layouts/IEEEtran.layout:372\r lib/layouts/aa.layout:158
-#: lib/layouts/aastex.layout:311\r lib/layouts/aastex.layout:375
-#: lib/layouts/aastex.layout:407\r lib/layouts/achemso.layout:236
-#: lib/layouts/acmsiggraph.layout:299\r lib/layouts/agutex.layout:158
-#: lib/layouts/agutex.layout:168\r lib/layouts/agutex.layout:188
-#: lib/layouts/agutex.layout:211\r lib/layouts/apa.layout:213
-#: lib/layouts/beamer.layout:1064\r lib/layouts/egs.layout:527
-#: lib/layouts/egs.layout:578\r lib/layouts/elsarticle.layout:310
-#: lib/layouts/europasscv.layout:424\r lib/layouts/europecv.layout:289
-#: lib/layouts/ijmpc.layout:427\r lib/layouts/ijmpc.layout:451
-#: lib/layouts/ijmpd.layout:440\r lib/layouts/ijmpd.layout:464
-#: lib/layouts/iopart.layout:249\r lib/layouts/iopart.layout:271
-#: lib/layouts/iopart.layout:295\r lib/layouts/isprs.layout:210
-#: lib/layouts/iucr.layout:235\r lib/layouts/iucr.layout:241
-#: lib/layouts/jasatex.layout:233\r lib/layouts/jasatex.layout:273
-#: lib/layouts/kluwer.layout:306\r lib/layouts/llncs.layout:270
-#: lib/layouts/moderncv.layout:497\r lib/layouts/powerdot.layout:357
-#: lib/layouts/revtex4-1.layout:214\r lib/layouts/revtex4.layout:241
-#: lib/layouts/siamltex.layout:327\r lib/layouts/sigplanconf.layout:224
-#: lib/layouts/simplecv.layout:157\r lib/layouts/amsdefs.inc:201
-#: lib/layouts/stdstruct.inc:58\r lib/layouts/svcommon.inc:544
+#: lib/layouts/IEEEtran.layout:309 lib/layouts/IEEEtran.layout:348
+#: lib/layouts/IEEEtran.layout:372 lib/layouts/aa.layout:158
+#: lib/layouts/aastex.layout:311 lib/layouts/aastex.layout:375
+#: lib/layouts/aastex.layout:407 lib/layouts/achemso.layout:236
+#: lib/layouts/acmsiggraph.layout:299 lib/layouts/agutex.layout:158
+#: lib/layouts/agutex.layout:168 lib/layouts/agutex.layout:188
+#: lib/layouts/agutex.layout:211 lib/layouts/apa.layout:213
+#: lib/layouts/beamer.layout:1064 lib/layouts/egs.layout:527
+#: lib/layouts/egs.layout:578 lib/layouts/elsarticle.layout:310
+#: lib/layouts/europasscv.layout:424 lib/layouts/europecv.layout:289
+#: lib/layouts/ijmpc.layout:427 lib/layouts/ijmpc.layout:451
+#: lib/layouts/ijmpd.layout:440 lib/layouts/ijmpd.layout:464
+#: lib/layouts/iopart.layout:249 lib/layouts/iopart.layout:271
+#: lib/layouts/iopart.layout:295 lib/layouts/isprs.layout:210
+#: lib/layouts/iucr.layout:235 lib/layouts/iucr.layout:241
+#: lib/layouts/jasatex.layout:233 lib/layouts/jasatex.layout:273
+#: lib/layouts/kluwer.layout:306 lib/layouts/llncs.layout:270
+#: lib/layouts/moderncv.layout:497 lib/layouts/powerdot.layout:357
+#: lib/layouts/revtex4-1.layout:214 lib/layouts/revtex4.layout:241
+#: lib/layouts/siamltex.layout:327 lib/layouts/sigplanconf.layout:224
+#: lib/layouts/simplecv.layout:157 lib/layouts/amsdefs.inc:201
+#: lib/layouts/stdstruct.inc:58 lib/layouts/svcommon.inc:544
 #: lib/layouts/svcommon.inc:578
 msgid "BackMatter"
 msgstr "Bakstoff"
@@ -6136,14 +6136,14 @@ msgstr "Feil ved førehandsvising"
 msgid "PeerReviewTitle"
 msgstr "Feil ved førehandsvising"
 
-#: lib/layouts/IEEEtran.layout:332\r lib/layouts/IEEEtran.layout:335
-#: lib/layouts/aastex.layout:371\r lib/layouts/ijmpc.layout:424
-#: lib/layouts/ijmpd.layout:437\r lib/layouts/kluwer.layout:326
-#: lib/layouts/kluwer.layout:339\r src/RowPainter.cpp:368
+#: lib/layouts/IEEEtran.layout:332 lib/layouts/IEEEtran.layout:335
+#: lib/layouts/aastex.layout:371 lib/layouts/ijmpc.layout:424
+#: lib/layouts/ijmpd.layout:437 lib/layouts/kluwer.layout:326
+#: lib/layouts/kluwer.layout:339 src/RowPainter.cpp:368
 msgid "Appendix"
 msgstr "Vedlegg"
 
-#: lib/layouts/IEEEtran.layout:337\r lib/layouts/iucr.layout:67
+#: lib/layouts/IEEEtran.layout:337 lib/layouts/iucr.layout:67
 #: lib/layouts/jss.layout:119
 msgid "Short Title"
 msgstr "Kort tittel"
@@ -6152,43 +6152,43 @@ msgstr "Kort tittel"
 msgid "Short title for the appendix"
 msgstr ""
 
-#: lib/layouts/IEEEtran.layout:344\r lib/layouts/aapaper.layout:108
-#: lib/layouts/aapaper.layout:222\r lib/layouts/agutex.layout:207
-#: lib/layouts/beamer.layout:1063\r lib/layouts/book.layout:22
-#: lib/layouts/book.layout:24\r lib/layouts/cl2emult.layout:107
-#: lib/layouts/egs.layout:577\r lib/layouts/elsarticle.layout:306
-#: lib/layouts/foils.layout:212\r lib/layouts/ijmpc.layout:447
-#: lib/layouts/ijmpd.layout:460\r lib/layouts/jasatex.layout:269
-#: lib/layouts/latex8.layout:127\r lib/layouts/llncs.layout:269
-#: lib/layouts/memoir.layout:250\r lib/layouts/memoir.layout:252
-#: lib/layouts/moderncv.layout:496\r lib/layouts/mwbk.layout:23
-#: lib/layouts/mwbk.layout:25\r lib/layouts/mwrep.layout:14
-#: lib/layouts/mwrep.layout:16\r lib/layouts/powerdot.layout:356
-#: lib/layouts/recipebook.layout:47\r lib/layouts/recipebook.layout:49
-#: lib/layouts/report.layout:13\r lib/layouts/report.layout:15
-#: lib/layouts/scrbook.layout:30\r lib/layouts/scrbook.layout:32
-#: lib/layouts/scrreprt.layout:12\r lib/layouts/scrreprt.layout:14
-#: lib/layouts/siamltex.layout:326\r lib/layouts/simplecv.layout:155
-#: lib/layouts/tufte-book.layout:258\r lib/layouts/tufte-book.layout:260
-#: lib/layouts/aguplus.inc:172\r lib/layouts/aguplus.inc:174
-#: lib/layouts/amsdefs.inc:200\r lib/layouts/scrclass.inc:270
-#: lib/layouts/stdstruct.inc:54\r lib/layouts/svcommon.inc:574
+#: lib/layouts/IEEEtran.layout:344 lib/layouts/aapaper.layout:108
+#: lib/layouts/aapaper.layout:222 lib/layouts/agutex.layout:207
+#: lib/layouts/beamer.layout:1063 lib/layouts/book.layout:22
+#: lib/layouts/book.layout:24 lib/layouts/cl2emult.layout:107
+#: lib/layouts/egs.layout:577 lib/layouts/elsarticle.layout:306
+#: lib/layouts/foils.layout:212 lib/layouts/ijmpc.layout:447
+#: lib/layouts/ijmpd.layout:460 lib/layouts/jasatex.layout:269
+#: lib/layouts/latex8.layout:127 lib/layouts/llncs.layout:269
+#: lib/layouts/memoir.layout:250 lib/layouts/memoir.layout:252
+#: lib/layouts/moderncv.layout:496 lib/layouts/mwbk.layout:23
+#: lib/layouts/mwbk.layout:25 lib/layouts/mwrep.layout:14
+#: lib/layouts/mwrep.layout:16 lib/layouts/powerdot.layout:356
+#: lib/layouts/recipebook.layout:47 lib/layouts/recipebook.layout:49
+#: lib/layouts/report.layout:13 lib/layouts/report.layout:15
+#: lib/layouts/scrbook.layout:30 lib/layouts/scrbook.layout:32
+#: lib/layouts/scrreprt.layout:12 lib/layouts/scrreprt.layout:14
+#: lib/layouts/siamltex.layout:326 lib/layouts/simplecv.layout:155
+#: lib/layouts/tufte-book.layout:258 lib/layouts/tufte-book.layout:260
+#: lib/layouts/aguplus.inc:172 lib/layouts/aguplus.inc:174
+#: lib/layouts/amsdefs.inc:200 lib/layouts/scrclass.inc:270
+#: lib/layouts/stdstruct.inc:54 lib/layouts/svcommon.inc:574
 #: src/frontends/qt4/GuiDocument.cpp:1414
 msgid "Bibliography"
 msgstr "Litteratur"
 
-#: lib/layouts/IEEEtran.layout:360\r lib/layouts/aastex.layout:403
-#: lib/layouts/aastex.layout:417\r lib/layouts/agutex.layout:223
-#: lib/layouts/beamer.layout:1078\r lib/layouts/cl2emult.layout:122
-#: lib/layouts/egs.layout:593\r lib/layouts/elsarticle.layout:322
-#: lib/layouts/ijmpc.layout:463\r lib/layouts/ijmpd.layout:476
-#: lib/layouts/iopart.layout:283\r lib/layouts/iopart.layout:298
-#: lib/layouts/iucr.layout:239\r lib/layouts/iucr.layout:246
-#: lib/layouts/jasatex.layout:285\r lib/layouts/kluwer.layout:347
-#: lib/layouts/kluwer.layout:360\r lib/layouts/llncs.layout:285
-#: lib/layouts/moderncv.layout:512\r lib/layouts/siamltex.layout:342
-#: lib/layouts/amsdefs.inc:216\r lib/layouts/stdstruct.inc:70
-#: lib/layouts/svcommon.inc:590\r src/insets/InsetBibtex.cpp:937
+#: lib/layouts/IEEEtran.layout:360 lib/layouts/aastex.layout:403
+#: lib/layouts/aastex.layout:417 lib/layouts/agutex.layout:223
+#: lib/layouts/beamer.layout:1078 lib/layouts/cl2emult.layout:122
+#: lib/layouts/egs.layout:593 lib/layouts/elsarticle.layout:322
+#: lib/layouts/ijmpc.layout:463 lib/layouts/ijmpd.layout:476
+#: lib/layouts/iopart.layout:283 lib/layouts/iopart.layout:298
+#: lib/layouts/iucr.layout:239 lib/layouts/iucr.layout:246
+#: lib/layouts/jasatex.layout:285 lib/layouts/kluwer.layout:347
+#: lib/layouts/kluwer.layout:360 lib/layouts/llncs.layout:285
+#: lib/layouts/moderncv.layout:512 lib/layouts/siamltex.layout:342
+#: lib/layouts/amsdefs.inc:216 lib/layouts/stdstruct.inc:70
+#: lib/layouts/svcommon.inc:590 src/insets/InsetBibtex.cpp:937
 #: src/insets/InsetBibtex.cpp:986 src/output_plaintext.cpp:153
 msgid "References"
 msgstr "Referansar"
@@ -6197,7 +6197,7 @@ msgstr "Referansar"
 msgid "Biography"
 msgstr "Biografi"
 
-#: lib/layouts/IEEEtran.layout:374\r lib/layouts/moderncv.layout:205
+#: lib/layouts/IEEEtran.layout:374 lib/layouts/moderncv.layout:205
 msgid "Photo"
 msgstr ""
 
@@ -6205,21 +6205,21 @@ msgstr ""
 msgid "Optional photo for biography"
 msgstr ""
 
-#: lib/layouts/IEEEtran.layout:380\r lib/layouts/IEEEtran.layout:397
-#: lib/layouts/europasscv.layout:74\r lib/layouts/europecv.layout:31
-#: lib/layouts/g-brief.layout:36\r lib/layouts/g-brief2.layout:44
-#: lib/layouts/g-brief2.layout:83\r lib/layouts/iucr.layout:211
-#: lib/layouts/moderncv.layout:81\r lib/layouts/moderncv.layout:194
-#: lib/layouts/scrlettr.layout:116\r lib/layouts/scrlttr2.layout:148
-#: lib/layouts/sigplanconf.layout:81\r lib/layouts/sigplanconf.layout:158
-#: lib/layouts/agu_stdtitle.inc:185\r lib/layouts/pdfcomment.module:29
-#: lib/layouts/pdfcomment.module:46\r lib/layouts/pdfcomment.module:57
-#: lib/layouts/tcolorbox.module:134\r src/frontends/qt4/GuiIndices.cpp:52
+#: lib/layouts/IEEEtran.layout:380 lib/layouts/IEEEtran.layout:397
+#: lib/layouts/europasscv.layout:74 lib/layouts/europecv.layout:31
+#: lib/layouts/g-brief.layout:36 lib/layouts/g-brief2.layout:44
+#: lib/layouts/g-brief2.layout:83 lib/layouts/iucr.layout:211
+#: lib/layouts/moderncv.layout:81 lib/layouts/moderncv.layout:194
+#: lib/layouts/scrlettr.layout:116 lib/layouts/scrlttr2.layout:148
+#: lib/layouts/sigplanconf.layout:81 lib/layouts/sigplanconf.layout:158
+#: lib/layouts/agu_stdtitle.inc:185 lib/layouts/pdfcomment.module:29
+#: lib/layouts/pdfcomment.module:46 lib/layouts/pdfcomment.module:57
+#: lib/layouts/tcolorbox.module:134 src/frontends/qt4/GuiIndices.cpp:52
 #: src/mathed/MathMacroTemplate.cpp:481
 msgid "Name"
 msgstr "Namn"
 
-#: lib/layouts/IEEEtran.layout:381\r lib/layouts/IEEEtran.layout:398
+#: lib/layouts/IEEEtran.layout:381 lib/layouts/IEEEtran.layout:398
 #: lib/layouts/sigplanconf.layout:159
 #, fuzzy
 msgid "Name of the author"
@@ -6233,37 +6233,37 @@ msgstr "Biografi utan foto"
 msgid "BiographyNoPhoto"
 msgstr "BiografiUtanBilete"
 
-#: lib/layouts/IEEEtran.layout:408\r lib/layouts/beamer.layout:1173
-#: lib/layouts/elsart.layout:273\r lib/layouts/elsart.layout:303
-#: lib/layouts/foils.layout:221\r lib/layouts/heb-article.layout:30
-#: lib/layouts/heb-article.layout:108\r lib/layouts/ijmpc.layout:334
-#: lib/layouts/ijmpd.layout:337\r lib/layouts/llncs.layout:295
-#: lib/layouts/siamltex.layout:118\r lib/layouts/svcommon.inc:638
-#: lib/layouts/theorems-ams-bytype.inc:54\r lib/layouts/theorems-ams.inc:26
-#: lib/layouts/theorems-bytype.inc:28\r lib/layouts/theorems-case.inc:28
-#: lib/layouts/theorems-proof.inc:14\r lib/layouts/theorems-starred.inc:25
-#: lib/layouts/theorems-without-preamble.inc:35\r lib/layouts/theorems.inc:26
+#: lib/layouts/IEEEtran.layout:408 lib/layouts/beamer.layout:1173
+#: lib/layouts/elsart.layout:273 lib/layouts/elsart.layout:303
+#: lib/layouts/foils.layout:221 lib/layouts/heb-article.layout:30
+#: lib/layouts/heb-article.layout:108 lib/layouts/ijmpc.layout:334
+#: lib/layouts/ijmpd.layout:337 lib/layouts/llncs.layout:295
+#: lib/layouts/siamltex.layout:118 lib/layouts/svcommon.inc:638
+#: lib/layouts/theorems-ams-bytype.inc:54 lib/layouts/theorems-ams.inc:26
+#: lib/layouts/theorems-bytype.inc:28 lib/layouts/theorems-case.inc:28
+#: lib/layouts/theorems-proof.inc:14 lib/layouts/theorems-starred.inc:25
+#: lib/layouts/theorems-without-preamble.inc:35 lib/layouts/theorems.inc:26
 #: lib/layouts/theorems-named.module:13
 #, fuzzy
 msgid "Reasoning"
 msgstr "Meining"
 
-#: lib/layouts/IEEEtran.layout:414\r lib/layouts/siamltex.layout:162
+#: lib/layouts/IEEEtran.layout:414 lib/layouts/siamltex.layout:162
 #: lib/layouts/theorems-proof.inc:21
 #, fuzzy
 msgid "Alternative Proof String"
 msgstr "Alternative tilknyting"
 
-#: lib/layouts/IEEEtran.layout:415\r lib/layouts/siamltex.layout:163
+#: lib/layouts/IEEEtran.layout:415 lib/layouts/siamltex.layout:163
 #, fuzzy
 msgid "An alternative proof string"
 msgstr "Alternative tilknyting"
 
-#: lib/layouts/IEEEtran.layout:427\r lib/layouts/beamer.layout:1249
-#: lib/layouts/foils.layout:284\r lib/layouts/llncs.layout:388
-#: lib/layouts/siamltex.layout:175\r lib/layouts/svmono.layout:88
-#: lib/layouts/svmono.layout:92\r lib/layouts/svmono.layout:96
-#: lib/layouts/svcommon.inc:647\r lib/layouts/theorems-proof.inc:34
+#: lib/layouts/IEEEtran.layout:427 lib/layouts/beamer.layout:1249
+#: lib/layouts/foils.layout:284 lib/layouts/llncs.layout:388
+#: lib/layouts/siamltex.layout:175 lib/layouts/svmono.layout:88
+#: lib/layouts/svmono.layout:92 lib/layouts/svmono.layout:96
+#: lib/layouts/svcommon.inc:647 lib/layouts/theorems-proof.inc:34
 msgid "Proof."
 msgstr "Prov."
 
@@ -6272,51 +6272,51 @@ msgstr "Prov."
 msgid "R Journal"
 msgstr "Tidskrift"
 
-#: lib/layouts/RJournal.layout:4\r lib/layouts/ctex-report.layout:4
-#: lib/layouts/extreport.layout:4\r lib/layouts/jreport.layout:4
-#: lib/layouts/mwrep.layout:4\r lib/layouts/report.layout:4
-#: lib/layouts/scrreprt.layout:4\r lib/layouts/treport.layout:4
+#: lib/layouts/RJournal.layout:4 lib/layouts/ctex-report.layout:4
+#: lib/layouts/extreport.layout:4 lib/layouts/jreport.layout:4
+#: lib/layouts/mwrep.layout:4 lib/layouts/report.layout:4
+#: lib/layouts/scrreprt.layout:4 lib/layouts/treport.layout:4
 msgid "Reports"
 msgstr ""
 
-#: lib/layouts/RJournal.layout:52\r lib/layouts/agutex.layout:149
-#: lib/layouts/egs.layout:519\r lib/layouts/kluwer.layout:275
-#: lib/layouts/llncs.layout:262\r lib/layouts/siamltex.layout:273
-#: lib/layouts/svglobal.layout:162\r lib/layouts/svjog.layout:166
-#: lib/layouts/svprobth.layout:196\r lib/layouts/amsdefs.inc:109
+#: lib/layouts/RJournal.layout:52 lib/layouts/agutex.layout:149
+#: lib/layouts/egs.layout:519 lib/layouts/kluwer.layout:275
+#: lib/layouts/llncs.layout:262 lib/layouts/siamltex.layout:273
+#: lib/layouts/svglobal.layout:162 lib/layouts/svjog.layout:166
+#: lib/layouts/svprobth.layout:196 lib/layouts/amsdefs.inc:109
 msgid "Abstract."
 msgstr "Samandrag."
 
-#: lib/layouts/RJournal.layout:63\r lib/layouts/aa.layout:90
-#: lib/layouts/aapaper.layout:87\r lib/layouts/dinbrief.layout:264
-#: lib/layouts/ectaart.layout:63\r lib/layouts/egs.layout:254
-#: lib/layouts/elsarticle.layout:223\r lib/layouts/entcs.layout:61
-#: lib/layouts/europasscv.layout:100\r lib/layouts/europecv.layout:65
-#: lib/layouts/g-brief.layout:182\r lib/layouts/g-brief2.layout:40
-#: lib/layouts/g-brief2.layout:775\r lib/layouts/ijmpc.layout:144
-#: lib/layouts/iopart.layout:151\r lib/layouts/isprs.layout:112
-#: lib/layouts/jss.layout:74\r lib/layouts/kluwer.layout:186
-#: lib/layouts/moderncv.layout:135\r lib/layouts/revtex.layout:122
-#: lib/layouts/revtex4-1.layout:107\r lib/layouts/revtex4.layout:180
-#: lib/layouts/scrlettr.layout:144\r lib/layouts/scrlttr2.layout:49
-#: lib/layouts/siamltex.layout:287\r lib/layouts/aapaper.inc:29
-#: lib/layouts/amsdefs.inc:122\r lib/layouts/lyxmacros.inc:44
+#: lib/layouts/RJournal.layout:63 lib/layouts/aa.layout:90
+#: lib/layouts/aapaper.layout:87 lib/layouts/dinbrief.layout:264
+#: lib/layouts/ectaart.layout:63 lib/layouts/egs.layout:254
+#: lib/layouts/elsarticle.layout:223 lib/layouts/entcs.layout:61
+#: lib/layouts/europasscv.layout:100 lib/layouts/europecv.layout:65
+#: lib/layouts/g-brief.layout:182 lib/layouts/g-brief2.layout:40
+#: lib/layouts/g-brief2.layout:775 lib/layouts/ijmpc.layout:144
+#: lib/layouts/iopart.layout:151 lib/layouts/isprs.layout:112
+#: lib/layouts/jss.layout:74 lib/layouts/kluwer.layout:186
+#: lib/layouts/moderncv.layout:135 lib/layouts/revtex.layout:122
+#: lib/layouts/revtex4-1.layout:107 lib/layouts/revtex4.layout:180
+#: lib/layouts/scrlettr.layout:144 lib/layouts/scrlttr2.layout:49
+#: lib/layouts/siamltex.layout:287 lib/layouts/aapaper.inc:29
+#: lib/layouts/amsdefs.inc:122 lib/layouts/lyxmacros.inc:44
 msgid "Address"
 msgstr "Adresse"
 
-#: lib/layouts/RJournal.layout:76\r lib/layouts/RJournal.layout:77
-#: lib/layouts/aa.layout:374\r lib/layouts/aa.layout:378
-#: lib/layouts/aapaper.layout:90\r lib/layouts/aastex.layout:191
-#: lib/layouts/achemso.layout:93\r lib/layouts/ectaart.layout:73
-#: lib/layouts/elsarticle.layout:243\r lib/layouts/europasscv.layout:122
-#: lib/layouts/europecv.layout:71\r lib/layouts/iopart.layout:166
-#: lib/layouts/iucr.layout:132\r lib/layouts/iucr.layout:133
-#: lib/layouts/jasatex.layout:142\r lib/layouts/latex8.layout:65
-#: lib/layouts/lettre.layout:46\r lib/layouts/lettre.layout:399
-#: lib/layouts/llncs.layout:239\r lib/layouts/moderncv.layout:177
-#: lib/layouts/aapaper.inc:46\r lib/layouts/amsdefs.inc:149
-#: lib/layouts/db_stdcharstyles.inc:76\r lib/layouts/db_stdcharstyles.inc:78
-#: lib/layouts/svcommon.inc:677\r lib/layouts/svcommon.inc:682
+#: lib/layouts/RJournal.layout:76 lib/layouts/RJournal.layout:77
+#: lib/layouts/aa.layout:374 lib/layouts/aa.layout:378
+#: lib/layouts/aapaper.layout:90 lib/layouts/aastex.layout:191
+#: lib/layouts/achemso.layout:93 lib/layouts/ectaart.layout:73
+#: lib/layouts/elsarticle.layout:243 lib/layouts/europasscv.layout:122
+#: lib/layouts/europecv.layout:71 lib/layouts/iopart.layout:166
+#: lib/layouts/iucr.layout:132 lib/layouts/iucr.layout:133
+#: lib/layouts/jasatex.layout:142 lib/layouts/latex8.layout:65
+#: lib/layouts/lettre.layout:46 lib/layouts/lettre.layout:399
+#: lib/layouts/llncs.layout:239 lib/layouts/moderncv.layout:177
+#: lib/layouts/aapaper.inc:46 lib/layouts/amsdefs.inc:149
+#: lib/layouts/db_stdcharstyles.inc:76 lib/layouts/db_stdcharstyles.inc:78
+#: lib/layouts/svcommon.inc:677 lib/layouts/svcommon.inc:682
 msgid "Email"
 msgstr "Epost"
 
@@ -6325,47 +6325,47 @@ msgstr "Epost"
 msgid "A0 Poster"
 msgstr "Post-kommentar"
 
-#: lib/layouts/a0poster.layout:4\r lib/layouts/beamerposter.layout:4
+#: lib/layouts/a0poster.layout:4 lib/layouts/beamerposter.layout:4
 #: lib/layouts/sciposter.layout:4
 #, fuzzy
 msgid "Posters"
 msgstr "Post-kommentar"
 
-#: lib/layouts/a0poster.layout:41\r lib/layouts/a0poster.layout:44
-#: lib/layouts/a0poster.layout:71\r lib/layouts/beamerposter.layout:53
-#: lib/layouts/beamerposter.layout:56\r lib/layouts/beamerposter.layout:83
-#: lib/layouts/sciposter.layout:128\r lib/layouts/sciposter.layout:131
+#: lib/layouts/a0poster.layout:41 lib/layouts/a0poster.layout:44
+#: lib/layouts/a0poster.layout:71 lib/layouts/beamerposter.layout:53
+#: lib/layouts/beamerposter.layout:56 lib/layouts/beamerposter.layout:83
+#: lib/layouts/sciposter.layout:128 lib/layouts/sciposter.layout:131
 #: lib/layouts/sciposter.layout:158
 msgid "Giant"
 msgstr ""
 
-#: lib/layouts/a0poster.layout:57\r lib/layouts/a0poster.layout:60
-#: lib/layouts/a0poster.layout:86\r lib/layouts/beamerposter.layout:69
-#: lib/layouts/beamerposter.layout:72\r lib/layouts/beamerposter.layout:98
-#: lib/layouts/sciposter.layout:144\r lib/layouts/sciposter.layout:147
+#: lib/layouts/a0poster.layout:57 lib/layouts/a0poster.layout:60
+#: lib/layouts/a0poster.layout:86 lib/layouts/beamerposter.layout:69
+#: lib/layouts/beamerposter.layout:72 lib/layouts/beamerposter.layout:98
+#: lib/layouts/sciposter.layout:144 lib/layouts/sciposter.layout:147
 #: lib/layouts/sciposter.layout:173
 msgid "More Giant"
 msgstr ""
 
-#: lib/layouts/a0poster.layout:63\r lib/layouts/a0poster.layout:66
-#: lib/layouts/a0poster.layout:92\r lib/layouts/beamerposter.layout:75
-#: lib/layouts/beamerposter.layout:78\r lib/layouts/beamerposter.layout:104
-#: lib/layouts/sciposter.layout:150\r lib/layouts/sciposter.layout:153
+#: lib/layouts/a0poster.layout:63 lib/layouts/a0poster.layout:66
+#: lib/layouts/a0poster.layout:92 lib/layouts/beamerposter.layout:75
+#: lib/layouts/beamerposter.layout:78 lib/layouts/beamerposter.layout:104
+#: lib/layouts/sciposter.layout:150 lib/layouts/sciposter.layout:153
 #: lib/layouts/sciposter.layout:179
 msgid "Most Giant"
 msgstr ""
 
-#: lib/layouts/a0poster.layout:69\r lib/layouts/beamerposter.layout:81
+#: lib/layouts/a0poster.layout:69 lib/layouts/beamerposter.layout:81
 #: lib/layouts/sciposter.layout:156
 msgid "Giant Snippet"
 msgstr ""
 
-#: lib/layouts/a0poster.layout:84\r lib/layouts/beamerposter.layout:96
+#: lib/layouts/a0poster.layout:84 lib/layouts/beamerposter.layout:96
 #: lib/layouts/sciposter.layout:171
 msgid "More Giant Snippet"
 msgstr ""
 
-#: lib/layouts/a0poster.layout:90\r lib/layouts/beamerposter.layout:102
+#: lib/layouts/a0poster.layout:90 lib/layouts/beamerposter.layout:102
 #: lib/layouts/sciposter.layout:177
 msgid "Most Giant Snippet"
 msgstr ""
@@ -6374,27 +6374,27 @@ msgstr ""
 msgid "Astronomy & Astrophysics"
 msgstr "Astronomi -& Astrofysikk"
 
-#: lib/layouts/aa.layout:68\r lib/layouts/aapaper.layout:81
-#: lib/layouts/beamer.layout:923\r lib/layouts/beamerposter.layout:26
-#: lib/layouts/kluwer.layout:132\r lib/layouts/llncs.layout:131
-#: lib/layouts/sigplanconf.layout:134\r lib/layouts/svprobth.layout:85
-#: lib/layouts/aapaper.inc:9\r lib/layouts/acm-sigs.inc:10
-#: lib/layouts/scrclass.inc:193\r lib/layouts/svcommon.inc:332
-#: lib/layouts/tcolorbox.module:45\r lib/layouts/tcolorbox.module:48
+#: lib/layouts/aa.layout:68 lib/layouts/aapaper.layout:81
+#: lib/layouts/beamer.layout:923 lib/layouts/beamerposter.layout:26
+#: lib/layouts/kluwer.layout:132 lib/layouts/llncs.layout:131
+#: lib/layouts/sigplanconf.layout:134 lib/layouts/svprobth.layout:85
+#: lib/layouts/aapaper.inc:9 lib/layouts/acm-sigs.inc:10
+#: lib/layouts/scrclass.inc:193 lib/layouts/svcommon.inc:332
+#: lib/layouts/tcolorbox.module:45 lib/layouts/tcolorbox.module:48
 msgid "Subtitle"
 msgstr "Undertittel"
 
-#: lib/layouts/aa.layout:108\r lib/layouts/aapaper.layout:93
+#: lib/layouts/aa.layout:108 lib/layouts/aapaper.layout:93
 #: lib/layouts/aapaper.inc:63
 msgid "Offprint"
 msgstr "Ekstratrykk"
 
-#: lib/layouts/aa.layout:117\r lib/layouts/aapaper.inc:71
+#: lib/layouts/aa.layout:117 lib/layouts/aapaper.inc:71
 msgid "Offprint Requests to:"
 msgstr "Send spørsmål om kopiar til:"
 
-#: lib/layouts/aa.layout:131\r lib/layouts/svglobal.layout:131
-#: lib/layouts/svjog.layout:135\r lib/layouts/svprobth.layout:165
+#: lib/layouts/aa.layout:131 lib/layouts/svglobal.layout:131
+#: lib/layouts/svjog.layout:135 lib/layouts/svprobth.layout:165
 msgid "Mail"
 msgstr "E-post"
 
@@ -6402,86 +6402,86 @@ msgstr "E-post"
 msgid "Correspondence to:"
 msgstr "Brevbyt med:"
 
-#: lib/layouts/aa.layout:166\r lib/layouts/egs.layout:541
+#: lib/layouts/aa.layout:166 lib/layouts/egs.layout:541
 msgid "Acknowledgements."
 msgstr "Takk."
 
-#: lib/layouts/aa.layout:178\r lib/layouts/aapaper.layout:66
-#: lib/layouts/aapaper.layout:139\r lib/layouts/aastex.layout:89
-#: lib/layouts/amsart.layout:64\r lib/layouts/amsbook.layout:55
-#: lib/layouts/apa.layout:305\r lib/layouts/apa6.layout:405
-#: lib/layouts/beamer.layout:236\r lib/layouts/egs.layout:32
-#: lib/layouts/europasscv.layout:186\r lib/layouts/europecv.layout:127
-#: lib/layouts/isprs.layout:148\r lib/layouts/iucr.layout:46
-#: lib/layouts/jss.layout:25\r lib/layouts/kluwer.layout:62
-#: lib/layouts/latex8.layout:47\r lib/layouts/llncs.layout:48
-#: lib/layouts/ltugboat.layout:47\r lib/layouts/memoir.layout:87
-#: lib/layouts/moderncv.layout:232\r lib/layouts/paper.layout:60
-#: lib/layouts/powerdot.layout:233\r lib/layouts/revtex.layout:40
-#: lib/layouts/revtex4-1.layout:30\r lib/layouts/revtex4.layout:65
-#: lib/layouts/siamltex.layout:367\r lib/layouts/simplecv.layout:31
-#: lib/layouts/spie.layout:21\r lib/layouts/tufte-book.layout:90
-#: lib/layouts/agu_stdsections.inc:30\r lib/layouts/aguplus.inc:29
-#: lib/layouts/db_stdsections.inc:28\r lib/layouts/numrevtex.inc:6
-#: lib/layouts/scrclass.inc:80\r lib/layouts/stdsections.inc:75
-#: lib/layouts/svcommon.inc:195\r src/frontends/qt4/GuiDocument.cpp:132
+#: lib/layouts/aa.layout:178 lib/layouts/aapaper.layout:66
+#: lib/layouts/aapaper.layout:139 lib/layouts/aastex.layout:89
+#: lib/layouts/amsart.layout:64 lib/layouts/amsbook.layout:55
+#: lib/layouts/apa.layout:305 lib/layouts/apa6.layout:405
+#: lib/layouts/beamer.layout:236 lib/layouts/egs.layout:32
+#: lib/layouts/europasscv.layout:186 lib/layouts/europecv.layout:127
+#: lib/layouts/isprs.layout:148 lib/layouts/iucr.layout:46
+#: lib/layouts/jss.layout:25 lib/layouts/kluwer.layout:62
+#: lib/layouts/latex8.layout:47 lib/layouts/llncs.layout:48
+#: lib/layouts/ltugboat.layout:47 lib/layouts/memoir.layout:87
+#: lib/layouts/moderncv.layout:232 lib/layouts/paper.layout:60
+#: lib/layouts/powerdot.layout:233 lib/layouts/revtex.layout:40
+#: lib/layouts/revtex4-1.layout:30 lib/layouts/revtex4.layout:65
+#: lib/layouts/siamltex.layout:367 lib/layouts/simplecv.layout:31
+#: lib/layouts/spie.layout:21 lib/layouts/tufte-book.layout:90
+#: lib/layouts/agu_stdsections.inc:30 lib/layouts/aguplus.inc:29
+#: lib/layouts/db_stdsections.inc:28 lib/layouts/numrevtex.inc:6
+#: lib/layouts/scrclass.inc:80 lib/layouts/stdsections.inc:75
+#: lib/layouts/svcommon.inc:195 src/frontends/qt4/GuiDocument.cpp:132
 msgid "Section"
 msgstr "Bolk"
 
-#: lib/layouts/aa.layout:186\r lib/layouts/aapaper.layout:70
-#: lib/layouts/aapaper.layout:149\r lib/layouts/aastex.layout:102
-#: lib/layouts/amsart.layout:105\r lib/layouts/amsbook.layout:65
-#: lib/layouts/apa.layout:316\r lib/layouts/apa6.layout:416
-#: lib/layouts/beamer.layout:295\r lib/layouts/egs.layout:55
-#: lib/layouts/isprs.layout:160\r lib/layouts/iucr.layout:52
-#: lib/layouts/jss.layout:29\r lib/layouts/kluwer.layout:71
-#: lib/layouts/latex8.layout:56\r lib/layouts/llncs.layout:57
-#: lib/layouts/ltugboat.layout:68\r lib/layouts/memoir.layout:102
-#: lib/layouts/moderncv.layout:265\r lib/layouts/paper.layout:69
-#: lib/layouts/revtex.layout:52\r lib/layouts/siamltex.layout:378
-#: lib/layouts/simplecv.layout:58\r lib/layouts/tufte-book.layout:118
-#: lib/layouts/agu_stdsections.inc:40\r lib/layouts/aguplus.inc:44
-#: lib/layouts/db_stdsections.inc:36\r lib/layouts/numrevtex.inc:15
-#: lib/layouts/scrclass.inc:88\r lib/layouts/stdsections.inc:105
+#: lib/layouts/aa.layout:186 lib/layouts/aapaper.layout:70
+#: lib/layouts/aapaper.layout:149 lib/layouts/aastex.layout:102
+#: lib/layouts/amsart.layout:105 lib/layouts/amsbook.layout:65
+#: lib/layouts/apa.layout:316 lib/layouts/apa6.layout:416
+#: lib/layouts/beamer.layout:295 lib/layouts/egs.layout:55
+#: lib/layouts/isprs.layout:160 lib/layouts/iucr.layout:52
+#: lib/layouts/jss.layout:29 lib/layouts/kluwer.layout:71
+#: lib/layouts/latex8.layout:56 lib/layouts/llncs.layout:57
+#: lib/layouts/ltugboat.layout:68 lib/layouts/memoir.layout:102
+#: lib/layouts/moderncv.layout:265 lib/layouts/paper.layout:69
+#: lib/layouts/revtex.layout:52 lib/layouts/siamltex.layout:378
+#: lib/layouts/simplecv.layout:58 lib/layouts/tufte-book.layout:118
+#: lib/layouts/agu_stdsections.inc:40 lib/layouts/aguplus.inc:44
+#: lib/layouts/db_stdsections.inc:36 lib/layouts/numrevtex.inc:15
+#: lib/layouts/scrclass.inc:88 lib/layouts/stdsections.inc:105
 #: lib/layouts/svcommon.inc:204
 msgid "Subsection"
 msgstr "Underbolk"
 
-#: lib/layouts/aa.layout:196\r lib/layouts/aapaper.layout:74
-#: lib/layouts/aapaper.layout:161\r lib/layouts/aastex.layout:115
-#: lib/layouts/amsart.layout:128\r lib/layouts/amsbook.layout:74
-#: lib/layouts/apa.layout:326\r lib/layouts/apa6.layout:426
-#: lib/layouts/beamer.layout:354\r lib/layouts/isprs.layout:170
-#: lib/layouts/iucr.layout:60\r lib/layouts/jss.layout:33
-#: lib/layouts/kluwer.layout:81\r lib/layouts/llncs.layout:66
-#: lib/layouts/ltugboat.layout:89\r lib/layouts/memoir.layout:117
-#: lib/layouts/paper.layout:78\r lib/layouts/recipebook.layout:98
-#: lib/layouts/revtex.layout:61\r lib/layouts/revtex4-1.layout:38
-#: lib/layouts/revtex4.layout:74\r lib/layouts/siamltex.layout:387
-#: lib/layouts/agu_stdsections.inc:50\r lib/layouts/db_stdsections.inc:44
-#: lib/layouts/numrevtex.inc:24\r lib/layouts/scrclass.inc:96
-#: lib/layouts/stdsections.inc:121\r lib/layouts/svcommon.inc:213
+#: lib/layouts/aa.layout:196 lib/layouts/aapaper.layout:74
+#: lib/layouts/aapaper.layout:161 lib/layouts/aastex.layout:115
+#: lib/layouts/amsart.layout:128 lib/layouts/amsbook.layout:74
+#: lib/layouts/apa.layout:326 lib/layouts/apa6.layout:426
+#: lib/layouts/beamer.layout:354 lib/layouts/isprs.layout:170
+#: lib/layouts/iucr.layout:60 lib/layouts/jss.layout:33
+#: lib/layouts/kluwer.layout:81 lib/layouts/llncs.layout:66
+#: lib/layouts/ltugboat.layout:89 lib/layouts/memoir.layout:117
+#: lib/layouts/paper.layout:78 lib/layouts/recipebook.layout:98
+#: lib/layouts/revtex.layout:61 lib/layouts/revtex4-1.layout:38
+#: lib/layouts/revtex4.layout:74 lib/layouts/siamltex.layout:387
+#: lib/layouts/agu_stdsections.inc:50 lib/layouts/db_stdsections.inc:44
+#: lib/layouts/numrevtex.inc:24 lib/layouts/scrclass.inc:96
+#: lib/layouts/stdsections.inc:121 lib/layouts/svcommon.inc:213
 msgid "Subsubsection"
 msgstr "Underunderbolk"
 
-#: lib/layouts/aa.layout:227\r lib/layouts/aapaper.layout:99
-#: lib/layouts/aapaper.layout:194\r lib/layouts/aastex.layout:230
-#: lib/layouts/beamer.layout:1015\r lib/layouts/beamerposter.layout:41
-#: lib/layouts/dinbrief.layout:161\r lib/layouts/egs.layout:489
-#: lib/layouts/foils.layout:142\r lib/layouts/frletter.layout:22
-#: lib/layouts/g-brief.layout:191\r lib/layouts/g-brief2.layout:54
-#: lib/layouts/g-brief2.layout:862\r lib/layouts/jasatex.layout:148
-#: lib/layouts/kluwer.layout:152\r lib/layouts/lettre.layout:52
-#: lib/layouts/lettre.layout:214\r lib/layouts/moderncv.layout:548
-#: lib/layouts/powerdot.layout:90\r lib/layouts/revtex.layout:112
-#: lib/layouts/revtex4-1.layout:148\r lib/layouts/revtex4.layout:124
-#: lib/layouts/scrlettr.layout:165\r lib/layouts/scrlttr2.layout:243
-#: lib/layouts/siamltex.layout:237\r lib/layouts/tufte-book.layout:43
-#: lib/layouts/agu_stdtitle.inc:239\r lib/layouts/amsdefs.inc:71
-#: lib/layouts/db_stdtitle.inc:35\r lib/layouts/scrclass.inc:209
-#: lib/layouts/stdtitle.inc:54\r lib/layouts/svcommon.inc:369
-#: lib/ui/stdmenus.inc:389\r lib/external_templates:412
-#: lib/external_templates:413\r lib/external_templates:417
+#: lib/layouts/aa.layout:227 lib/layouts/aapaper.layout:99
+#: lib/layouts/aapaper.layout:194 lib/layouts/aastex.layout:230
+#: lib/layouts/beamer.layout:1015 lib/layouts/beamerposter.layout:41
+#: lib/layouts/dinbrief.layout:161 lib/layouts/egs.layout:489
+#: lib/layouts/foils.layout:142 lib/layouts/frletter.layout:22
+#: lib/layouts/g-brief.layout:191 lib/layouts/g-brief2.layout:54
+#: lib/layouts/g-brief2.layout:862 lib/layouts/jasatex.layout:148
+#: lib/layouts/kluwer.layout:152 lib/layouts/lettre.layout:52
+#: lib/layouts/lettre.layout:214 lib/layouts/moderncv.layout:548
+#: lib/layouts/powerdot.layout:90 lib/layouts/revtex.layout:112
+#: lib/layouts/revtex4-1.layout:148 lib/layouts/revtex4.layout:124
+#: lib/layouts/scrlettr.layout:165 lib/layouts/scrlttr2.layout:243
+#: lib/layouts/siamltex.layout:237 lib/layouts/tufte-book.layout:43
+#: lib/layouts/agu_stdtitle.inc:239 lib/layouts/amsdefs.inc:71
+#: lib/layouts/db_stdtitle.inc:35 lib/layouts/scrclass.inc:209
+#: lib/layouts/stdtitle.inc:54 lib/layouts/svcommon.inc:369
+#: lib/ui/stdmenus.inc:389 lib/external_templates:412
+#: lib/external_templates:413 lib/external_templates:417
 msgid "Date"
 msgstr "Dato"
 
@@ -6489,7 +6489,7 @@ msgstr "Dato"
 msgid "institutemark"
 msgstr "instituttmerke"
 
-#: lib/layouts/aa.layout:243\r lib/layouts/beamer.layout:998
+#: lib/layouts/aa.layout:243 lib/layouts/beamer.layout:998
 msgid "Institute Mark"
 msgstr "Instituttmerke"
 
@@ -6497,7 +6497,7 @@ msgstr "Instituttmerke"
 msgid "Abstract (unstructured)"
 msgstr "Samandrag (ikkje strukturert)"
 
-#: lib/layouts/aa.layout:278\r lib/layouts/spie.layout:81
+#: lib/layouts/aa.layout:278 lib/layouts/spie.layout:81
 msgid "ABSTRACT"
 msgstr "SAMANDRAG"
 
@@ -6541,69 +6541,69 @@ msgstr "Resultata frå arbeidet ditt"
 msgid "Key words."
 msgstr "Nøkkelord."
 
-#: lib/layouts/aa.layout:351\r lib/layouts/beamer.layout:971
-#: lib/layouts/beamerposter.layout:36\r lib/layouts/cl2emult.layout:73
-#: lib/layouts/llncs.layout:220\r lib/layouts/sciposter.layout:24
+#: lib/layouts/aa.layout:351 lib/layouts/beamer.layout:971
+#: lib/layouts/beamerposter.layout:36 lib/layouts/cl2emult.layout:73
+#: lib/layouts/llncs.layout:220 lib/layouts/sciposter.layout:24
 #: lib/layouts/svcommon.inc:352
 msgid "Institute"
 msgstr "Institutt"
 
-#: lib/layouts/aa.layout:362\r lib/layouts/sciposter.layout:29
+#: lib/layouts/aa.layout:362 lib/layouts/sciposter.layout:29
 #: lib/layouts/scrlttr2.layout:203
 msgid "E-Mail"
 msgstr "E-post"
 
-#: lib/layouts/aapaper.layout:3\r lib/layouts/aapaper.layout:14
+#: lib/layouts/aapaper.layout:3 lib/layouts/aapaper.layout:14
 msgid "Astronomy & Astrophysics (V. 4, Obsolete)"
 msgstr "Astronomi og Astrofysikk (V. 4 forelda)"
 
-#: lib/layouts/aapaper.layout:50\r lib/layouts/apa.layout:357
-#: lib/layouts/apa6.layout:457\r lib/layouts/beamer.layout:80
-#: lib/layouts/egs.layout:179\r lib/layouts/powerdot.layout:255
-#: lib/layouts/simplecv.layout:87\r lib/layouts/agu_stdlists.inc:13
-#: lib/layouts/db_stdlists.inc:12\r lib/layouts/stdlists.inc:13
+#: lib/layouts/aapaper.layout:50 lib/layouts/apa.layout:357
+#: lib/layouts/apa6.layout:457 lib/layouts/beamer.layout:80
+#: lib/layouts/egs.layout:179 lib/layouts/powerdot.layout:255
+#: lib/layouts/simplecv.layout:87 lib/layouts/agu_stdlists.inc:13
+#: lib/layouts/db_stdlists.inc:12 lib/layouts/stdlists.inc:13
 msgid "Itemize"
 msgstr "Punktliste"
 
-#: lib/layouts/aapaper.layout:53\r lib/layouts/apa.layout:380
-#: lib/layouts/apa6.layout:481\r lib/layouts/beamer.layout:114
-#: lib/layouts/egs.layout:155\r lib/layouts/powerdot.layout:304
-#: lib/layouts/agu_stdlists.inc:21\r lib/layouts/db_stdlists.inc:19
+#: lib/layouts/aapaper.layout:53 lib/layouts/apa.layout:380
+#: lib/layouts/apa6.layout:481 lib/layouts/beamer.layout:114
+#: lib/layouts/egs.layout:155 lib/layouts/powerdot.layout:304
+#: lib/layouts/agu_stdlists.inc:21 lib/layouts/db_stdlists.inc:19
 #: lib/layouts/stdlists.inc:39
 msgid "Enumerate"
 msgstr "Nummerert"
 
-#: lib/layouts/aapaper.layout:56\r lib/layouts/beamer.layout:154
-#: lib/layouts/egs.layout:202\r lib/layouts/hollywood.layout:130
-#: lib/layouts/paper.layout:103\r lib/layouts/scrlettr.layout:19
-#: lib/layouts/scrlttr2.layout:23\r lib/layouts/agu_stdlists.inc:29
-#: lib/layouts/db_stdlists.inc:26\r lib/layouts/scrclass.inc:45
-#: lib/layouts/stdlists.inc:67\r lib/layouts/svcommon.inc:597
+#: lib/layouts/aapaper.layout:56 lib/layouts/beamer.layout:154
+#: lib/layouts/egs.layout:202 lib/layouts/hollywood.layout:130
+#: lib/layouts/paper.layout:103 lib/layouts/scrlettr.layout:19
+#: lib/layouts/scrlttr2.layout:23 lib/layouts/agu_stdlists.inc:29
+#: lib/layouts/db_stdlists.inc:26 lib/layouts/scrclass.inc:45
+#: lib/layouts/stdlists.inc:67 lib/layouts/svcommon.inc:597
 #: lib/ui/stdtoolbars.inc:116
 msgid "Description"
 msgstr "Skildring"
 
-#: lib/layouts/aapaper.layout:59\r lib/layouts/apa.layout:358
-#: lib/layouts/apa.layout:381\r lib/layouts/apa.layout:406
-#: lib/layouts/apa6.layout:458\r lib/layouts/apa6.layout:482
-#: lib/layouts/apa6.layout:507\r lib/layouts/beamer.layout:81
-#: lib/layouts/beamer.layout:115\r lib/layouts/beamer.layout:155
-#: lib/layouts/egs.layout:138\r lib/layouts/egs.layout:156
-#: lib/layouts/egs.layout:180\r lib/layouts/europasscv.layout:312
-#: lib/layouts/ijmpc.layout:284\r lib/layouts/ijmpc.layout:305
-#: lib/layouts/ijmpd.layout:287\r lib/layouts/ijmpd.layout:308
-#: lib/layouts/powerdot.layout:256\r lib/layouts/powerdot.layout:305
-#: lib/layouts/scrlettr.layout:34\r lib/layouts/scrlttr2.layout:39
-#: lib/layouts/simplecv.layout:88\r lib/layouts/scrclass.inc:52
-#: lib/layouts/stdlists.inc:14\r lib/layouts/stdlists.inc:40
-#: lib/layouts/stdlists.inc:68\r lib/layouts/stdlists.inc:97
-#: lib/layouts/stdlyxlist.inc:7\r lib/layouts/enumitem.module:85
+#: lib/layouts/aapaper.layout:59 lib/layouts/apa.layout:358
+#: lib/layouts/apa.layout:381 lib/layouts/apa.layout:406
+#: lib/layouts/apa6.layout:458 lib/layouts/apa6.layout:482
+#: lib/layouts/apa6.layout:507 lib/layouts/beamer.layout:81
+#: lib/layouts/beamer.layout:115 lib/layouts/beamer.layout:155
+#: lib/layouts/egs.layout:138 lib/layouts/egs.layout:156
+#: lib/layouts/egs.layout:180 lib/layouts/europasscv.layout:312
+#: lib/layouts/ijmpc.layout:284 lib/layouts/ijmpc.layout:305
+#: lib/layouts/ijmpd.layout:287 lib/layouts/ijmpd.layout:308
+#: lib/layouts/powerdot.layout:256 lib/layouts/powerdot.layout:305
+#: lib/layouts/scrlettr.layout:34 lib/layouts/scrlttr2.layout:39
+#: lib/layouts/simplecv.layout:88 lib/layouts/scrclass.inc:52
+#: lib/layouts/stdlists.inc:14 lib/layouts/stdlists.inc:40
+#: lib/layouts/stdlists.inc:68 lib/layouts/stdlists.inc:97
+#: lib/layouts/stdlyxlist.inc:7 lib/layouts/enumitem.module:85
 #: lib/ui/stdtoolbars.inc:115
 msgid "List"
 msgstr "Liste"
 
-#: lib/layouts/aapaper.layout:96\r lib/layouts/aapaper.inc:103
-#: lib/ui/stdtoolbars.inc:139\r src/frontends/qt4/GuiThesaurus.cpp:47
+#: lib/layouts/aapaper.layout:96 lib/layouts/aapaper.inc:103
+#: lib/ui/stdtoolbars.inc:139 src/frontends/qt4/GuiThesaurus.cpp:47
 msgid "Thesaurus"
 msgstr "Synonym ordbok"
 
@@ -6611,13 +6611,13 @@ msgstr "Synonym ordbok"
 msgid "American Astronomical Society (AASTeX)"
 msgstr "American Astronomical Society (AASTeX)"
 
-#: lib/layouts/aastex.layout:153\r lib/layouts/achemso.layout:102
-#: lib/layouts/apa.layout:159\r lib/layouts/apa6.layout:149
-#: lib/layouts/iucr.layout:175\r lib/layouts/jasatex.layout:106
-#: lib/layouts/latex8.layout:89\r lib/layouts/moderncv.layout:344
-#: lib/layouts/moderncv.layout:345\r lib/layouts/revtex4-1.layout:63
-#: lib/layouts/revtex4.layout:133\r lib/layouts/sigplanconf.layout:166
-#: lib/layouts/agu_stdtitle.inc:128\r lib/layouts/aguplus.inc:65
+#: lib/layouts/aastex.layout:153 lib/layouts/achemso.layout:102
+#: lib/layouts/apa.layout:159 lib/layouts/apa6.layout:149
+#: lib/layouts/iucr.layout:175 lib/layouts/jasatex.layout:106
+#: lib/layouts/latex8.layout:89 lib/layouts/moderncv.layout:344
+#: lib/layouts/moderncv.layout:345 lib/layouts/revtex4-1.layout:63
+#: lib/layouts/revtex4.layout:133 lib/layouts/sigplanconf.layout:166
+#: lib/layouts/agu_stdtitle.inc:128 lib/layouts/aguplus.inc:65
 msgid "Affiliation"
 msgstr "Tilknyting"
 
@@ -6625,7 +6625,7 @@ msgstr "Tilknyting"
 msgid "Altaffilation"
 msgstr "Alt tilknyting"
 
-#: lib/layouts/aastex.layout:179\r lib/layouts/agutex.layout:124
+#: lib/layouts/aastex.layout:179 lib/layouts/agutex.layout:124
 #: src/mathed/InsetMathHull.cpp:1551 src/mathed/InsetMathHull.cpp:1560
 msgid "Number"
 msgstr "Nummer"
@@ -6642,7 +6642,7 @@ msgstr "Alternative tilknyting:"
 msgid "And"
 msgstr "Og"
 
-#: lib/layouts/aastex.layout:221\r src/frontends/qt4/GuiDocument.cpp:2338
+#: lib/layouts/aastex.layout:221 src/frontends/qt4/GuiDocument.cpp:2338
 #: src/frontends/qt4/GuiDocument.cpp:2350
 #: src/frontends/qt4/GuiDocument.cpp:2460
 #: src/frontends/qt4/GuiDocument.cpp:2479
@@ -6661,11 +6661,11 @@ msgstr "Alt tilknytingmerke"
 msgid "Subject headings:"
 msgstr "Subjekt overskrifter:"
 
-#: lib/layouts/aastex.layout:310\r lib/layouts/apa.layout:212
-#: lib/layouts/egs.layout:526\r lib/layouts/elsart.layout:445
-#: lib/layouts/isprs.layout:209\r lib/layouts/iucr.layout:230
-#: lib/layouts/kluwer.layout:305\r lib/layouts/kluwer.layout:317
-#: lib/layouts/aapaper.inc:91\r lib/layouts/svcommon.inc:558
+#: lib/layouts/aastex.layout:310 lib/layouts/apa.layout:212
+#: lib/layouts/egs.layout:526 lib/layouts/elsart.layout:445
+#: lib/layouts/isprs.layout:209 lib/layouts/iucr.layout:230
+#: lib/layouts/kluwer.layout:305 lib/layouts/kluwer.layout:317
+#: lib/layouts/aapaper.inc:91 lib/layouts/svcommon.inc:558
 #: lib/layouts/svcommon.inc:569
 msgid "Acknowledgements"
 msgstr "Takk"
@@ -6766,7 +6766,7 @@ msgstr "Objektnamn"
 msgid "Obj:"
 msgstr "Obj:"
 
-#: lib/layouts/aastex.layout:591\r lib/layouts/aastex.layout:621
+#: lib/layouts/aastex.layout:591 lib/layouts/aastex.layout:621
 msgid "Recognized Name"
 msgstr "Gjenkjent namn"
 
@@ -6790,20 +6790,20 @@ msgstr "Skil ut datasett ID frå teksten"
 msgid "American Chemical Society (ACS)"
 msgstr "American Chemical Society (ACS)"
 
-#: lib/layouts/achemso.layout:74\r lib/layouts/apa.layout:257
-#: lib/layouts/apa6.layout:357\r lib/layouts/beamer.layout:209
-#: lib/layouts/beamer.layout:262\r lib/layouts/beamer.layout:321
-#: lib/layouts/beamer.layout:380\r lib/layouts/beamer.layout:904
-#: lib/layouts/europecv.layout:135\r lib/layouts/iopart.layout:65
-#: lib/layouts/jasatex.layout:74\r lib/layouts/memoir.layout:56
-#: lib/layouts/revtex4-1.layout:199\r lib/layouts/siamltex.layout:205
-#: lib/layouts/simplecv.layout:51\r lib/layouts/tufte-book.layout:80
-#: lib/layouts/tufte-book.layout:108\r lib/layouts/tufte-handout.layout:40
-#: lib/layouts/amsdefs.inc:38\r lib/layouts/scrclass.inc:126
-#: lib/layouts/scrclass.inc:137\r lib/layouts/scrclass.inc:148
-#: lib/layouts/scrclass.inc:286\r lib/layouts/scrclass.inc:309
-#: lib/layouts/stdinsets.inc:562\r lib/layouts/stdsections.inc:32
-#: lib/layouts/stdsections.inc:63\r lib/layouts/stdsections.inc:93
+#: lib/layouts/achemso.layout:74 lib/layouts/apa.layout:257
+#: lib/layouts/apa6.layout:357 lib/layouts/beamer.layout:209
+#: lib/layouts/beamer.layout:262 lib/layouts/beamer.layout:321
+#: lib/layouts/beamer.layout:380 lib/layouts/beamer.layout:904
+#: lib/layouts/europecv.layout:135 lib/layouts/iopart.layout:65
+#: lib/layouts/jasatex.layout:74 lib/layouts/memoir.layout:56
+#: lib/layouts/revtex4-1.layout:199 lib/layouts/siamltex.layout:205
+#: lib/layouts/simplecv.layout:51 lib/layouts/tufte-book.layout:80
+#: lib/layouts/tufte-book.layout:108 lib/layouts/tufte-handout.layout:40
+#: lib/layouts/amsdefs.inc:38 lib/layouts/scrclass.inc:126
+#: lib/layouts/scrclass.inc:137 lib/layouts/scrclass.inc:148
+#: lib/layouts/scrclass.inc:286 lib/layouts/scrclass.inc:309
+#: lib/layouts/stdinsets.inc:562 lib/layouts/stdsections.inc:32
+#: lib/layouts/stdsections.inc:63 lib/layouts/stdsections.inc:93
 msgid "Short Title|S"
 msgstr "Kort tittel|K"
 
@@ -6827,25 +6827,25 @@ msgstr "Alt Tilknyting"
 msgid "Also Affiliation"
 msgstr "Også Tilknyta"
 
-#: lib/layouts/achemso.layout:127\r lib/layouts/europasscv.layout:116
-#: lib/layouts/europecv.layout:93\r lib/layouts/lettre.layout:42
-#: lib/layouts/lettre.layout:343\r lib/layouts/moderncv.layout:170
-#: lib/layouts/scrlttr2.layout:195\r lib/configure.py:718
+#: lib/layouts/achemso.layout:127 lib/layouts/europasscv.layout:116
+#: lib/layouts/europecv.layout:93 lib/layouts/lettre.layout:42
+#: lib/layouts/lettre.layout:343 lib/layouts/moderncv.layout:170
+#: lib/layouts/scrlttr2.layout:195 lib/configure.py:718
 msgid "Fax"
 msgstr "Faks"
 
-#: lib/layouts/achemso.layout:133\r lib/layouts/europasscv.layout:119
-#: lib/layouts/europecv.layout:96\r lib/layouts/lettre.layout:356
+#: lib/layouts/achemso.layout:133 lib/layouts/europasscv.layout:119
+#: lib/layouts/europecv.layout:96 lib/layouts/lettre.layout:356
 #: lib/layouts/moderncv.layout:173
 msgid "Fax:"
 msgstr "Faks:"
 
-#: lib/layouts/achemso.layout:136\r lib/layouts/dinbrief.layout:309
-#: lib/layouts/g-brief.layout:119\r lib/layouts/moderncv.layout:153
+#: lib/layouts/achemso.layout:136 lib/layouts/dinbrief.layout:309
+#: lib/layouts/g-brief.layout:119 lib/layouts/moderncv.layout:153
 msgid "Phone"
 msgstr "Telefon"
 
-#: lib/layouts/achemso.layout:139\r lib/layouts/g-brief.layout:122
+#: lib/layouts/achemso.layout:139 lib/layouts/g-brief.layout:122
 #: lib/layouts/moderncv.layout:156
 msgid "Phone:"
 msgstr "Telefon:"
@@ -6858,7 +6858,7 @@ msgstr "Kortform"
 msgid "Abbreviations:"
 msgstr "Kortform:"
 
-#: lib/layouts/achemso.layout:164\r lib/layouts/achemso.layout:176
+#: lib/layouts/achemso.layout:164 lib/layouts/achemso.layout:176
 msgid "Scheme"
 msgstr "Skjema"
 
@@ -6866,7 +6866,7 @@ msgstr "Skjema"
 msgid "List of Schemes"
 msgstr "Liste over skjema"
 
-#: lib/layouts/achemso.layout:186\r lib/layouts/achemso.layout:198
+#: lib/layouts/achemso.layout:186 lib/layouts/achemso.layout:198
 msgid "Chart"
 msgstr "Diagram"
 
@@ -6874,7 +6874,7 @@ msgstr "Diagram"
 msgid "List of Charts"
 msgstr "Liste over diagram"
 
-#: lib/layouts/achemso.layout:210\r lib/layouts/achemso.layout:222
+#: lib/layouts/achemso.layout:210 lib/layouts/achemso.layout:222
 msgid "Graph[[mathematical]]"
 msgstr "Graf"
 
@@ -6914,7 +6914,7 @@ msgstr "Kjemi"
 msgid "chemistry"
 msgstr "kjemi"
 
-#: lib/layouts/achemso.layout:299\r lib/layouts/achemso.layout:302
+#: lib/layouts/achemso.layout:299 lib/layouts/achemso.layout:302
 #: lib/languages:719
 msgid "Latin"
 msgstr "Latin"
@@ -7035,7 +7035,7 @@ msgstr "CR-number"
 msgid "Number of the category"
 msgstr "Talet til kategorien"
 
-#: lib/layouts/acmsiggraph.layout:265\r lib/layouts/acmsiggraph.layout:266
+#: lib/layouts/acmsiggraph.layout:265 lib/layouts/acmsiggraph.layout:266
 msgid "Subcategory"
 msgstr "Underkategori"
 
@@ -7055,24 +7055,24 @@ msgstr "KortRef"
 msgid "Short cite"
 msgstr "Kort referanse"
 
-#: lib/layouts/acmsiggraph.layout:285\r lib/layouts/elsart.layout:201
-#: lib/layouts/revtex4-1.layout:190\r lib/layouts/revtex4.layout:194
+#: lib/layouts/acmsiggraph.layout:285 lib/layouts/elsart.layout:201
+#: lib/layouts/revtex4-1.layout:190 lib/layouts/revtex4.layout:194
 #: lib/layouts/amsdefs.inc:172
 msgid "Thanks"
 msgstr "Takk"
 
-#: lib/layouts/acmsiggraph.layout:289\r lib/layouts/jss.layout:179
+#: lib/layouts/acmsiggraph.layout:289 lib/layouts/jss.layout:179
 #: lib/layouts/jss.layout:181
 msgid "E-mail"
 msgstr "E-post"
 
-#: lib/layouts/acmsiggraph.layout:296\r lib/layouts/acmsiggraph.layout:303
-#: lib/layouts/agutex.layout:184\r lib/layouts/apa.layout:234
-#: lib/layouts/apa6.layout:302\r lib/layouts/iopart.layout:245
-#: lib/layouts/iopart.layout:259\r lib/layouts/jasatex.layout:230
-#: lib/layouts/jasatex.layout:236\r lib/layouts/revtex4-1.layout:212
-#: lib/layouts/revtex4.layout:240\r lib/layouts/revtex4.layout:250
-#: lib/layouts/sigplanconf.layout:220\r lib/layouts/sigplanconf.layout:227
+#: lib/layouts/acmsiggraph.layout:296 lib/layouts/acmsiggraph.layout:303
+#: lib/layouts/agutex.layout:184 lib/layouts/apa.layout:234
+#: lib/layouts/apa6.layout:302 lib/layouts/iopart.layout:245
+#: lib/layouts/iopart.layout:259 lib/layouts/jasatex.layout:230
+#: lib/layouts/jasatex.layout:236 lib/layouts/revtex4-1.layout:212
+#: lib/layouts/revtex4.layout:240 lib/layouts/revtex4.layout:250
+#: lib/layouts/sigplanconf.layout:220 lib/layouts/sigplanconf.layout:227
 #: lib/layouts/spie.layout:91
 msgid "Acknowledgments"
 msgstr "Takk"
@@ -7081,7 +7081,7 @@ msgstr "Takk"
 msgid "American Geophysical Union (AGU, SGML Article)"
 msgstr "American Geophysical Union (AGU, SGML Artikkel)"
 
-#: lib/layouts/agu-dtd.layout:4\r lib/layouts/docbook.layout:4
+#: lib/layouts/agu-dtd.layout:4 lib/layouts/docbook.layout:4
 msgid "Articles (DocBook)"
 msgstr "Artiklar (DocBook)"
 
@@ -7097,7 +7097,7 @@ msgstr "American Geophysical Union (AGUTeX)"
 msgid "Authors"
 msgstr "Forfattarar"
 
-#: lib/layouts/agutex.layout:92\r lib/layouts/agutex.layout:96
+#: lib/layouts/agutex.layout:92 lib/layouts/agutex.layout:96
 msgid "Affiliation Mark"
 msgstr "Tilknytingsmerke"
 
@@ -7109,16 +7109,16 @@ msgstr "Påfølgjande nummer til forfattartilknyting"
 msgid "Author affiliation:"
 msgstr "Forfattar tilknyting:"
 
-#: lib/layouts/agutex.layout:156\r lib/layouts/amsbook.layout:127
-#: lib/layouts/apa.layout:336\r lib/layouts/apa6.layout:436
-#: lib/layouts/egs.layout:75\r lib/layouts/kluwer.layout:91
-#: lib/layouts/llncs.layout:75\r lib/layouts/ltugboat.layout:109
-#: lib/layouts/memoir.layout:132\r lib/layouts/paper.layout:87
-#: lib/layouts/revtex.layout:70\r lib/layouts/revtex4-1.layout:45
-#: lib/layouts/revtex4.layout:82\r lib/layouts/agu_stdsections.inc:60
-#: lib/layouts/aguplus.inc:59\r lib/layouts/db_stdsections.inc:52
-#: lib/layouts/numrevtex.inc:33\r lib/layouts/scrclass.inc:104
-#: lib/layouts/stdsections.inc:136\r lib/layouts/svcommon.inc:222
+#: lib/layouts/agutex.layout:156 lib/layouts/amsbook.layout:127
+#: lib/layouts/apa.layout:336 lib/layouts/apa6.layout:436
+#: lib/layouts/egs.layout:75 lib/layouts/kluwer.layout:91
+#: lib/layouts/llncs.layout:75 lib/layouts/ltugboat.layout:109
+#: lib/layouts/memoir.layout:132 lib/layouts/paper.layout:87
+#: lib/layouts/revtex.layout:70 lib/layouts/revtex4-1.layout:45
+#: lib/layouts/revtex4.layout:82 lib/layouts/agu_stdsections.inc:60
+#: lib/layouts/aguplus.inc:59 lib/layouts/db_stdsections.inc:52
+#: lib/layouts/numrevtex.inc:33 lib/layouts/scrclass.inc:104
+#: lib/layouts/stdsections.inc:136 lib/layouts/svcommon.inc:222
 msgid "Paragraph"
 msgstr "Avsnitt"
 
@@ -7130,11 +7130,11 @@ msgstr "Takk."
 msgid "American Mathematical Society (AMS) Article"
 msgstr "American Mathematical Society (AMS) Artikkel"
 
-#: lib/layouts/amsart.layout:75\r lib/layouts/amsbook.layout:84
-#: lib/layouts/beamer.layout:278\r lib/layouts/egs.layout:603
-#: lib/layouts/isprs.layout:180\r lib/layouts/spie.layout:32
-#: lib/layouts/aguplus.inc:37\r lib/layouts/db_stdstarsections.inc:36
-#: lib/layouts/stdstarsections.inc:35\r lib/layouts/svcommon.inc:254
+#: lib/layouts/amsart.layout:75 lib/layouts/amsbook.layout:84
+#: lib/layouts/beamer.layout:278 lib/layouts/egs.layout:603
+#: lib/layouts/isprs.layout:180 lib/layouts/spie.layout:32
+#: lib/layouts/aguplus.inc:37 lib/layouts/db_stdstarsections.inc:36
+#: lib/layouts/stdstarsections.inc:35 lib/layouts/svcommon.inc:254
 msgid "Section*"
 msgstr "Bolk*"
 
@@ -7146,27 +7146,27 @@ msgstr "Spesialbolk"
 msgid "SpecialSection*"
 msgstr "Spesialbolk"
 
-#: lib/layouts/amsart.layout:96\r lib/layouts/beamer.layout:280
-#: lib/layouts/beamer.layout:339\r lib/layouts/beamer.layout:398
-#: lib/layouts/memoir.layout:236\r lib/layouts/stdstarsections.inc:15
-#: lib/layouts/stdstarsections.inc:26\r lib/layouts/stdstarsections.inc:37
-#: lib/layouts/stdstarsections.inc:48\r lib/layouts/stdstarsections.inc:59
-#: lib/layouts/stdstarsections.inc:70\r lib/layouts/stdstarsections.inc:81
+#: lib/layouts/amsart.layout:96 lib/layouts/beamer.layout:280
+#: lib/layouts/beamer.layout:339 lib/layouts/beamer.layout:398
+#: lib/layouts/memoir.layout:236 lib/layouts/stdstarsections.inc:15
+#: lib/layouts/stdstarsections.inc:26 lib/layouts/stdstarsections.inc:37
+#: lib/layouts/stdstarsections.inc:48 lib/layouts/stdstarsections.inc:59
+#: lib/layouts/stdstarsections.inc:70 lib/layouts/stdstarsections.inc:81
 #: lib/layouts/svcommon.inc:289
 msgid "Unnumbered"
 msgstr "Utan nummer"
 
-#: lib/layouts/amsart.layout:117\r lib/layouts/amsbook.layout:93
-#: lib/layouts/beamer.layout:337\r lib/layouts/egs.layout:623
-#: lib/layouts/isprs.layout:191\r lib/layouts/aguplus.inc:52
-#: lib/layouts/db_stdstarsections.inc:48\r lib/layouts/stdstarsections.inc:46
+#: lib/layouts/amsart.layout:117 lib/layouts/amsbook.layout:93
+#: lib/layouts/beamer.layout:337 lib/layouts/egs.layout:623
+#: lib/layouts/isprs.layout:191 lib/layouts/aguplus.inc:52
+#: lib/layouts/db_stdstarsections.inc:48 lib/layouts/stdstarsections.inc:46
 #: lib/layouts/svcommon.inc:262
 msgid "Subsection*"
 msgstr "Underbolk*"
 
-#: lib/layouts/amsart.layout:138\r lib/layouts/amsbook.layout:101
-#: lib/layouts/beamer.layout:396\r lib/layouts/isprs.layout:200
-#: lib/layouts/db_stdstarsections.inc:60\r lib/layouts/stdstarsections.inc:57
+#: lib/layouts/amsart.layout:138 lib/layouts/amsbook.layout:101
+#: lib/layouts/beamer.layout:396 lib/layouts/isprs.layout:200
+#: lib/layouts/db_stdstarsections.inc:60 lib/layouts/stdstarsections.inc:57
 #: lib/layouts/svcommon.inc:270
 msgid "Subsubsection*"
 msgstr "Underunderbolk*"
@@ -7175,13 +7175,13 @@ msgstr "Underunderbolk*"
 msgid "American Mathematical Society (AMS) Book"
 msgstr "American Mathematical Society (AMS) Bok"
 
-#: lib/layouts/amsbook.layout:4\r lib/layouts/book.layout:4
-#: lib/layouts/ctex-book.layout:4\r lib/layouts/extbook.layout:4
-#: lib/layouts/jbook.layout:4\r lib/layouts/jsbook.layout:4
-#: lib/layouts/memoir.layout:4\r lib/layouts/mwbk.layout:4
-#: lib/layouts/recipebook.layout:4\r lib/layouts/scrbook.layout:4
-#: lib/layouts/svmono.layout:4\r lib/layouts/svmult.layout:4
-#: lib/layouts/tbook.layout:4\r lib/layouts/tufte-book.layout:4
+#: lib/layouts/amsbook.layout:4 lib/layouts/book.layout:4
+#: lib/layouts/ctex-book.layout:4 lib/layouts/extbook.layout:4
+#: lib/layouts/jbook.layout:4 lib/layouts/jsbook.layout:4
+#: lib/layouts/memoir.layout:4 lib/layouts/mwbk.layout:4
+#: lib/layouts/recipebook.layout:4 lib/layouts/scrbook.layout:4
+#: lib/layouts/svmono.layout:4 lib/layouts/svmult.layout:4
+#: lib/layouts/tbook.layout:4 lib/layouts/tufte-book.layout:4
 msgid "Books"
 msgstr "Bøker"
 
@@ -7201,111 +7201,111 @@ msgstr "Høgre_topptekst"
 msgid "Right header:"
 msgstr "Høgre topptekst:"
 
-#: lib/layouts/apa.layout:87\r lib/layouts/apa6.layout:242
+#: lib/layouts/apa.layout:87 lib/layouts/apa6.layout:242
 msgid "Abstract:"
 msgstr "Samandrag:"
 
-#: lib/layouts/apa.layout:105\r lib/layouts/apa6.layout:60
+#: lib/layouts/apa.layout:105 lib/layouts/apa6.layout:60
 msgid "Short title:"
 msgstr "Kort tittel:"
 
-#: lib/layouts/apa.layout:135\r lib/layouts/apa6.layout:90
+#: lib/layouts/apa.layout:135 lib/layouts/apa6.layout:90
 msgid "TwoAuthors"
 msgstr "To_Forfattarar"
 
-#: lib/layouts/apa.layout:143\r lib/layouts/apa6.layout:98
+#: lib/layouts/apa.layout:143 lib/layouts/apa6.layout:98
 msgid "ThreeAuthors"
 msgstr "Tre_Forfattarar"
 
-#: lib/layouts/apa.layout:151\r lib/layouts/apa6.layout:106
+#: lib/layouts/apa.layout:151 lib/layouts/apa6.layout:106
 msgid "FourAuthors"
 msgstr "Fire_Forfattarar"
 
-#: lib/layouts/apa.layout:172\r lib/layouts/apa6.layout:162
-#: lib/layouts/egs.layout:346\r lib/layouts/iucr.layout:179
-#: lib/layouts/jss.layout:78\r lib/layouts/revtex4-1.layout:77
-#: lib/layouts/revtex4.layout:144\r lib/layouts/agu_stdtitle.inc:132
+#: lib/layouts/apa.layout:172 lib/layouts/apa6.layout:162
+#: lib/layouts/egs.layout:346 lib/layouts/iucr.layout:179
+#: lib/layouts/jss.layout:78 lib/layouts/revtex4-1.layout:77
+#: lib/layouts/revtex4.layout:144 lib/layouts/agu_stdtitle.inc:132
 msgid "Affiliation:"
 msgstr "Tilknyting:"
 
-#: lib/layouts/apa.layout:181\r lib/layouts/apa6.layout:170
+#: lib/layouts/apa.layout:181 lib/layouts/apa6.layout:170
 msgid "TwoAffiliations"
 msgstr "To_Tilknytingar"
 
-#: lib/layouts/apa.layout:189\r lib/layouts/apa6.layout:177
+#: lib/layouts/apa.layout:189 lib/layouts/apa6.layout:177
 msgid "ThreeAffiliations"
 msgstr "Tre_Tilknytingar"
 
-#: lib/layouts/apa.layout:197\r lib/layouts/apa6.layout:184
+#: lib/layouts/apa.layout:197 lib/layouts/apa6.layout:184
 msgid "FourAffiliations"
 msgstr "Fire_Tilknytingar"
 
-#: lib/layouts/apa.layout:225\r lib/layouts/iucr.layout:234
+#: lib/layouts/apa.layout:225 lib/layouts/iucr.layout:234
 msgid "Acknowledgements:"
 msgstr "Takk:"
 
-#: lib/layouts/apa.layout:239\r lib/layouts/apa6.layout:339
+#: lib/layouts/apa.layout:239 lib/layouts/apa6.layout:339
 msgid "ThickLine"
 msgstr "Tjukklinje"
 
-#: lib/layouts/apa.layout:250\r lib/layouts/apa6.layout:350
+#: lib/layouts/apa.layout:250 lib/layouts/apa6.layout:350
 msgid "Centered"
 msgstr "Sentrert"
 
-#: lib/layouts/apa.layout:251\r lib/layouts/apa6.layout:351
-#: lib/layouts/stdinsets.inc:556\r src/insets/InsetCaption.cpp:404
+#: lib/layouts/apa.layout:251 lib/layouts/apa6.layout:351
+#: lib/layouts/stdinsets.inc:556 src/insets/InsetCaption.cpp:404
 msgid "standard"
 msgstr "standard"
 
-#: lib/layouts/apa.layout:258\r lib/layouts/apa6.layout:358
-#: lib/layouts/scrclass.inc:287\r lib/layouts/scrclass.inc:310
+#: lib/layouts/apa.layout:258 lib/layouts/apa6.layout:358
+#: lib/layouts/scrclass.inc:287 lib/layouts/scrclass.inc:310
 #: lib/layouts/stdinsets.inc:563
 msgid "The caption as it appears in the list of figures/tables"
 msgstr "Etiketten slik den ser ut i figur-/tabell-lista"
 
-#: lib/layouts/apa.layout:273\r lib/layouts/apa6.layout:373
+#: lib/layouts/apa.layout:273 lib/layouts/apa6.layout:373
 msgid "FitFigure"
 msgstr "Tilpass_Figur"
 
-#: lib/layouts/apa.layout:279\r lib/layouts/apa6.layout:379
+#: lib/layouts/apa.layout:279 lib/layouts/apa6.layout:379
 msgid "FitBitmap"
 msgstr "Tilpass_punktgrafikk"
 
-#: lib/layouts/apa.layout:346\r lib/layouts/apa6.layout:446
-#: lib/layouts/egs.layout:93\r lib/layouts/kluwer.layout:101
-#: lib/layouts/llncs.layout:85\r lib/layouts/memoir.layout:147
-#: lib/layouts/paper.layout:96\r lib/layouts/agu_stdsections.inc:70
-#: lib/layouts/db_stdsections.inc:60\r lib/layouts/scrclass.inc:112
-#: lib/layouts/stdsections.inc:147\r lib/layouts/svcommon.inc:233
+#: lib/layouts/apa.layout:346 lib/layouts/apa6.layout:446
+#: lib/layouts/egs.layout:93 lib/layouts/kluwer.layout:101
+#: lib/layouts/llncs.layout:85 lib/layouts/memoir.layout:147
+#: lib/layouts/paper.layout:96 lib/layouts/agu_stdsections.inc:70
+#: lib/layouts/db_stdsections.inc:60 lib/layouts/scrclass.inc:112
+#: lib/layouts/stdsections.inc:147 lib/layouts/svcommon.inc:233
 msgid "Subparagraph"
 msgstr "Underavsnitt"
 
-#: lib/layouts/apa.layout:374\r lib/layouts/apa.layout:399
-#: lib/layouts/apa6.layout:475\r lib/layouts/apa6.layout:500
-#: lib/layouts/beamer.layout:92\r lib/layouts/beamer.layout:130
-#: lib/layouts/egs.layout:173\r lib/layouts/egs.layout:196
-#: lib/layouts/europasscv.layout:330\r lib/layouts/powerdot.layout:280
-#: lib/layouts/powerdot.layout:332\r lib/layouts/stdlists.inc:33
-#: lib/layouts/stdlists.inc:62\r lib/layouts/theorems-case.inc:53
+#: lib/layouts/apa.layout:374 lib/layouts/apa.layout:399
+#: lib/layouts/apa6.layout:475 lib/layouts/apa6.layout:500
+#: lib/layouts/beamer.layout:92 lib/layouts/beamer.layout:130
+#: lib/layouts/egs.layout:173 lib/layouts/egs.layout:196
+#: lib/layouts/europasscv.layout:330 lib/layouts/powerdot.layout:280
+#: lib/layouts/powerdot.layout:332 lib/layouts/stdlists.inc:33
+#: lib/layouts/stdlists.inc:62 lib/layouts/theorems-case.inc:53
 msgid "Custom Item|s"
 msgstr "Tilpassa element|s"
 
-#: lib/layouts/apa.layout:375\r lib/layouts/apa.layout:400
-#: lib/layouts/apa6.layout:476\r lib/layouts/apa6.layout:501
-#: lib/layouts/beamer.layout:93\r lib/layouts/beamer.layout:131
-#: lib/layouts/egs.layout:174\r lib/layouts/egs.layout:197
-#: lib/layouts/europasscv.layout:331\r lib/layouts/powerdot.layout:281
-#: lib/layouts/powerdot.layout:333\r lib/layouts/stdlists.inc:34
-#: lib/layouts/stdlists.inc:63\r lib/layouts/theorems-case.inc:54
+#: lib/layouts/apa.layout:375 lib/layouts/apa.layout:400
+#: lib/layouts/apa6.layout:476 lib/layouts/apa6.layout:501
+#: lib/layouts/beamer.layout:93 lib/layouts/beamer.layout:131
+#: lib/layouts/egs.layout:174 lib/layouts/egs.layout:197
+#: lib/layouts/europasscv.layout:331 lib/layouts/powerdot.layout:281
+#: lib/layouts/powerdot.layout:333 lib/layouts/stdlists.inc:34
+#: lib/layouts/stdlists.inc:63 lib/layouts/theorems-case.inc:54
 msgid "A customized item string"
 msgstr "Ein tilpassa elementstreng"
 
-#: lib/layouts/apa.layout:405\r lib/layouts/apa6.layout:506
+#: lib/layouts/apa.layout:405 lib/layouts/apa6.layout:506
 msgid "Seriate"
 msgstr "Punkt i teksten"
 
-#: lib/layouts/apa.layout:422\r lib/layouts/apa.layout:423
-#: lib/layouts/apa6.layout:523\r lib/layouts/apa6.layout:524
+#: lib/layouts/apa.layout:422 lib/layouts/apa.layout:423
+#: lib/layouts/apa6.layout:523 lib/layouts/apa6.layout:524
 #: lib/layouts/stdcounters.inc:48
 msgid "(\\alph{enumii})"
 msgstr "(\\alph{enumii})"
@@ -7338,10 +7338,10 @@ msgstr "FemTilknytingar"
 msgid "SixAffiliations"
 msgstr "SeksTilknytingar"
 
-#: lib/layouts/apa6.layout:206\r lib/layouts/beamer.layout:1504
-#: lib/layouts/elsart.layout:407\r lib/layouts/iopart.layout:101
-#: lib/layouts/llncs.layout:371\r lib/layouts/powerdot.layout:206
-#: lib/layouts/slides.layout:169\r lib/layouts/stdinsets.inc:136
+#: lib/layouts/apa6.layout:206 lib/layouts/beamer.layout:1504
+#: lib/layouts/elsart.layout:407 lib/layouts/iopart.layout:101
+#: lib/layouts/llncs.layout:371 lib/layouts/powerdot.layout:206
+#: lib/layouts/slides.layout:169 lib/layouts/stdinsets.inc:136
 #: lib/layouts/theorems-without-preamble.inc:395
 #: lib/layouts/theorems-without-preamble.inc:402
 #: lib/layouts/theorems-without-preamble.inc:405
@@ -7367,12 +7367,12 @@ msgstr "ForfattarNotis"
 msgid "Author Note:"
 msgstr "Forfattarfotnotis:"
 
-#: lib/layouts/apa6.layout:307\r lib/layouts/egs.layout:355
+#: lib/layouts/apa6.layout:307 lib/layouts/egs.layout:355
 msgid "Journal"
 msgstr "Tidskrift"
 
-#: lib/layouts/apa6.layout:308\r lib/layouts/apa6.layout:316
-#: lib/layouts/apa6.layout:325\r lib/layouts/apa6.layout:333
+#: lib/layouts/apa6.layout:308 lib/layouts/apa6.layout:316
+#: lib/layouts/apa6.layout:325 lib/layouts/apa6.layout:333
 msgid "Preamble"
 msgstr "LaTeX fortekst"
 
@@ -7380,7 +7380,7 @@ msgstr "LaTeX fortekst"
 msgid "CopNum"
 msgstr "Serie_num"
 
-#: lib/layouts/apa6.layout:332\r lib/layouts/agu_stdclass.inc:155
+#: lib/layouts/apa6.layout:332 lib/layouts/agu_stdclass.inc:155
 #: lib/layouts/agu_stdclass.inc:157
 msgid "Volume"
 msgstr "Volum"
@@ -7401,19 +7401,19 @@ msgstr "Beamer Artikkel (Standard Klasse)"
 msgid "Article (Standard Class)"
 msgstr "Artikkel (Standard Klasse)"
 
-#: lib/layouts/article.layout:20\r lib/layouts/beamer.layout:196
-#: lib/layouts/beamer.layout:223\r lib/layouts/memoir.layout:54
-#: lib/layouts/mwart.layout:25\r lib/layouts/paper.layout:48
-#: lib/layouts/scrartcl.layout:22\r lib/layouts/svmult.layout:103
-#: lib/layouts/tufte-handout.layout:23\r lib/layouts/agu_stdsections.inc:12
-#: lib/layouts/db_stdsections.inc:12\r lib/layouts/scrclass.inc:61
-#: lib/layouts/stdsections.inc:12\r lib/layouts/svcommon.inc:108
+#: lib/layouts/article.layout:20 lib/layouts/beamer.layout:196
+#: lib/layouts/beamer.layout:223 lib/layouts/memoir.layout:54
+#: lib/layouts/mwart.layout:25 lib/layouts/paper.layout:48
+#: lib/layouts/scrartcl.layout:22 lib/layouts/svmult.layout:103
+#: lib/layouts/tufte-handout.layout:23 lib/layouts/agu_stdsections.inc:12
+#: lib/layouts/db_stdsections.inc:12 lib/layouts/scrclass.inc:61
+#: lib/layouts/stdsections.inc:12 lib/layouts/svcommon.inc:108
 msgid "Part"
 msgstr "Del"
 
-#: lib/layouts/article.layout:31\r lib/layouts/mwart.layout:35
-#: lib/layouts/scrartcl.layout:31\r lib/layouts/db_stdstarsections.inc:13
-#: lib/layouts/stdstarsections.inc:13\r lib/layouts/svcommon.inc:245
+#: lib/layouts/article.layout:31 lib/layouts/mwart.layout:35
+#: lib/layouts/scrartcl.layout:31 lib/layouts/db_stdstarsections.inc:13
+#: lib/layouts/stdstarsections.inc:13 lib/layouts/svcommon.inc:245
 msgid "Part*"
 msgstr "Del*"
 
@@ -7421,46 +7421,46 @@ msgstr "Del*"
 msgid "Beamer"
 msgstr "Beamer"
 
-#: lib/layouts/beamer.layout:4\r lib/layouts/foils.layout:4
-#: lib/layouts/powerdot.layout:4\r lib/layouts/seminar.layout:4
+#: lib/layouts/beamer.layout:4 lib/layouts/foils.layout:4
+#: lib/layouts/powerdot.layout:4 lib/layouts/seminar.layout:4
 #: lib/layouts/slides.layout:4
 msgid "Presentations"
 msgstr "Presentasjonar"
 
-#: lib/layouts/beamer.layout:86\r lib/layouts/beamer.layout:120
-#: lib/layouts/beamer.layout:160\r lib/layouts/beamer.layout:442
-#: lib/layouts/beamer.layout:501\r lib/layouts/beamer.layout:556
-#: lib/layouts/beamer.layout:585\r lib/layouts/beamer.layout:788
-#: lib/layouts/beamer.layout:816\r lib/layouts/beamer.layout:1110
-#: lib/layouts/beamer.layout:1134\r lib/layouts/beamer.layout:1160
+#: lib/layouts/beamer.layout:86 lib/layouts/beamer.layout:120
+#: lib/layouts/beamer.layout:160 lib/layouts/beamer.layout:442
+#: lib/layouts/beamer.layout:501 lib/layouts/beamer.layout:556
+#: lib/layouts/beamer.layout:585 lib/layouts/beamer.layout:788
+#: lib/layouts/beamer.layout:816 lib/layouts/beamer.layout:1110
+#: lib/layouts/beamer.layout:1134 lib/layouts/beamer.layout:1160
 #: lib/layouts/beamer.layout:1318
 msgid "Overlay Specifications|v"
 msgstr "Overliggar spesifikasjonar|v"
 
-#: lib/layouts/beamer.layout:87\r lib/layouts/beamer.layout:121
+#: lib/layouts/beamer.layout:87 lib/layouts/beamer.layout:121
 #: lib/layouts/beamer.layout:161
 msgid "Overlay specifications for this list"
 msgstr "Spesifikasjonar for denne lista"
 
-#: lib/layouts/beamer.layout:96\r lib/layouts/beamer.layout:134
-#: lib/layouts/beamer.layout:170\r lib/layouts/beamer.layout:712
-#: lib/layouts/powerdot.layout:284\r lib/layouts/powerdot.layout:336
+#: lib/layouts/beamer.layout:96 lib/layouts/beamer.layout:134
+#: lib/layouts/beamer.layout:170 lib/layouts/beamer.layout:712
+#: lib/layouts/powerdot.layout:284 lib/layouts/powerdot.layout:336
 msgid "Item Overlay Specifications"
 msgstr "Spesifikasjon for overliggarelementet"
 
-#: lib/layouts/beamer.layout:97\r lib/layouts/beamer.layout:135
-#: lib/layouts/beamer.layout:171\r lib/layouts/beamer.layout:555
-#: lib/layouts/beamer.layout:584\r lib/layouts/beamer.layout:713
-#: lib/layouts/beamer.layout:787\r lib/layouts/beamer.layout:815
-#: lib/layouts/beamer.layout:1109\r lib/layouts/beamer.layout:1133
-#: lib/layouts/beamer.layout:1159\r lib/layouts/beamer.layout:1317
-#: lib/layouts/powerdot.layout:285\r lib/layouts/powerdot.layout:337
+#: lib/layouts/beamer.layout:97 lib/layouts/beamer.layout:135
+#: lib/layouts/beamer.layout:171 lib/layouts/beamer.layout:555
+#: lib/layouts/beamer.layout:584 lib/layouts/beamer.layout:713
+#: lib/layouts/beamer.layout:787 lib/layouts/beamer.layout:815
+#: lib/layouts/beamer.layout:1109 lib/layouts/beamer.layout:1133
+#: lib/layouts/beamer.layout:1159 lib/layouts/beamer.layout:1317
+#: lib/layouts/powerdot.layout:285 lib/layouts/powerdot.layout:337
 msgid "On Slide"
 msgstr "På lysark"
 
-#: lib/layouts/beamer.layout:98\r lib/layouts/beamer.layout:136
-#: lib/layouts/beamer.layout:172\r lib/layouts/beamer.layout:714
-#: lib/layouts/powerdot.layout:286\r lib/layouts/powerdot.layout:338
+#: lib/layouts/beamer.layout:98 lib/layouts/beamer.layout:136
+#: lib/layouts/beamer.layout:172 lib/layouts/beamer.layout:714
+#: lib/layouts/powerdot.layout:286 lib/layouts/powerdot.layout:338
 msgid "Overlay specifications for this item"
 msgstr "Spesifikasjonar for overliggarelementet"
 
@@ -7480,45 +7480,45 @@ msgstr "Lengste etikett|s"
 msgid "The longest label in this list (to determine the indendation width)"
 msgstr "Den lengste etiketten i denne lista (for å avgjere innrykket)"
 
-#: lib/layouts/beamer.layout:197\r lib/layouts/beamer.layout:237
-#: lib/layouts/beamer.layout:296\r lib/layouts/beamer.layout:355
-#: lib/layouts/egs.layout:33\r lib/layouts/egs.layout:56
-#: lib/layouts/europasscv.layout:187\r lib/layouts/europecv.layout:128
-#: lib/layouts/ltugboat.layout:48\r lib/layouts/ltugboat.layout:69
-#: lib/layouts/memoir.layout:207\r lib/layouts/moderncv.layout:233
-#: lib/layouts/powerdot.layout:235\r lib/layouts/simplecv.layout:32
-#: lib/layouts/tufte-book.layout:65\r lib/layouts/tufte-book.layout:91
-#: lib/layouts/tufte-handout.layout:24\r lib/layouts/scrclass.inc:168
-#: lib/layouts/stdsections.inc:13\r lib/layouts/stdsections.inc:46
-#: lib/layouts/stdsections.inc:76\r lib/layouts/svcommon.inc:117
-#: lib/layouts/svcommon.inc:158\r lib/layouts/svcommon.inc:171
-#: lib/layouts/svcommon.inc:183\r lib/layouts/svcommon.inc:415
+#: lib/layouts/beamer.layout:197 lib/layouts/beamer.layout:237
+#: lib/layouts/beamer.layout:296 lib/layouts/beamer.layout:355
+#: lib/layouts/egs.layout:33 lib/layouts/egs.layout:56
+#: lib/layouts/europasscv.layout:187 lib/layouts/europecv.layout:128
+#: lib/layouts/ltugboat.layout:48 lib/layouts/ltugboat.layout:69
+#: lib/layouts/memoir.layout:207 lib/layouts/moderncv.layout:233
+#: lib/layouts/powerdot.layout:235 lib/layouts/simplecv.layout:32
+#: lib/layouts/tufte-book.layout:65 lib/layouts/tufte-book.layout:91
+#: lib/layouts/tufte-handout.layout:24 lib/layouts/scrclass.inc:168
+#: lib/layouts/stdsections.inc:13 lib/layouts/stdsections.inc:46
+#: lib/layouts/stdsections.inc:76 lib/layouts/svcommon.inc:117
+#: lib/layouts/svcommon.inc:158 lib/layouts/svcommon.inc:171
+#: lib/layouts/svcommon.inc:183 lib/layouts/svcommon.inc:415
 msgid "Sectioning"
 msgstr "Bolking"
 
-#: lib/layouts/beamer.layout:202\r lib/layouts/beamer.layout:255
-#: lib/layouts/beamer.layout:286\r lib/layouts/beamer.layout:314
-#: lib/layouts/beamer.layout:345\r lib/layouts/beamer.layout:373
+#: lib/layouts/beamer.layout:202 lib/layouts/beamer.layout:255
+#: lib/layouts/beamer.layout:286 lib/layouts/beamer.layout:314
+#: lib/layouts/beamer.layout:345 lib/layouts/beamer.layout:373
 #: lib/layouts/beamer.layout:404
 msgid "Mode"
 msgstr "Modus"
 
-#: lib/layouts/beamer.layout:203\r lib/layouts/beamer.layout:256
-#: lib/layouts/beamer.layout:287\r lib/layouts/beamer.layout:315
-#: lib/layouts/beamer.layout:346\r lib/layouts/beamer.layout:374
+#: lib/layouts/beamer.layout:203 lib/layouts/beamer.layout:256
+#: lib/layouts/beamer.layout:287 lib/layouts/beamer.layout:315
+#: lib/layouts/beamer.layout:346 lib/layouts/beamer.layout:374
 #: lib/layouts/beamer.layout:405
 msgid "Mode Specification|S"
 msgstr "Spesifikasjonar for modus|S"
 
-#: lib/layouts/beamer.layout:204\r lib/layouts/beamer.layout:257
-#: lib/layouts/beamer.layout:288\r lib/layouts/beamer.layout:316
-#: lib/layouts/beamer.layout:347\r lib/layouts/beamer.layout:375
+#: lib/layouts/beamer.layout:204 lib/layouts/beamer.layout:257
+#: lib/layouts/beamer.layout:288 lib/layouts/beamer.layout:316
+#: lib/layouts/beamer.layout:347 lib/layouts/beamer.layout:375
 #: lib/layouts/beamer.layout:406
 msgid "Specify in which mode (article, presentation etc.) this header appears"
 msgstr "Spesifiser kva modus (artikkel, presentasjon etc) denne topptekst kjem"
 
-#: lib/layouts/beamer.layout:210\r lib/layouts/memoir.layout:57
-#: lib/layouts/tufte-handout.layout:41\r lib/layouts/scrclass.inc:127
+#: lib/layouts/beamer.layout:210 lib/layouts/memoir.layout:57
+#: lib/layouts/tufte-handout.layout:41 lib/layouts/scrclass.inc:127
 #: lib/layouts/stdsections.inc:33
 msgid "The part as it appears in the table of contents/running headers"
 msgstr "Del-namnet i innhaldslista/laupetopptekst"
@@ -7527,13 +7527,13 @@ msgstr "Del-namnet i innhaldslista/laupetopptekst"
 msgid "Section \\arabic{section}"
 msgstr "Section.\\arabic{section}"
 
-#: lib/layouts/beamer.layout:263\r lib/layouts/simplecv.layout:52
-#: lib/layouts/tufte-book.layout:109\r lib/layouts/scrclass.inc:149
+#: lib/layouts/beamer.layout:263 lib/layouts/simplecv.layout:52
+#: lib/layouts/tufte-book.layout:109 lib/layouts/scrclass.inc:149
 #: lib/layouts/stdsections.inc:94
 msgid "The section as it appears in the table of contents/running headers"
 msgstr "Bolk-namnet i innhaldslista/laupetopptekst"
 
-#: lib/layouts/beamer.layout:274\r lib/layouts/powerdot.layout:245
+#: lib/layouts/beamer.layout:274 lib/layouts/powerdot.layout:245
 #: lib/layouts/numarticle.inc:10
 msgid "\\Alph{section}"
 msgstr "\\Alph{section}"
@@ -7565,55 +7565,55 @@ msgstr "Underunderbolk-namnet i innhaldslista/laupetopptekst"
 msgid "\\arabic{section}.\\arabic{subsection}.\\arabic{subsubsection}"
 msgstr "\\arabic{section}.\\arabic{subsection}.\\arabic{subsubsection}"
 
-#: lib/layouts/beamer.layout:418\r lib/layouts/beamer.layout:424
+#: lib/layouts/beamer.layout:418 lib/layouts/beamer.layout:424
 msgid "Frame"
 msgstr "Lysark"
 
-#: lib/layouts/beamer.layout:419\r lib/layouts/beamer.layout:495
-#: lib/layouts/beamer.layout:539\r lib/layouts/beamer.layout:569
+#: lib/layouts/beamer.layout:419 lib/layouts/beamer.layout:495
+#: lib/layouts/beamer.layout:539 lib/layouts/beamer.layout:569
 msgid "Frames"
 msgstr "Lysark"
 
-#: lib/layouts/beamer.layout:441\r lib/layouts/beamer.layout:848
-#: lib/layouts/beamer.layout:1194\r lib/layouts/beamer.layout:1340
-#: lib/layouts/beamer.layout:1358\r lib/layouts/beamer.layout:1376
-#: lib/layouts/beamer.layout:1394\r lib/layouts/beamer.layout:1412
-#: lib/layouts/beamer.layout:1431\r lib/layouts/beamer.layout:1450
-#: lib/layouts/beamer.layout:1469\r lib/layouts/beamer.layout:1488
-#: lib/layouts/beamer.layout:1512\r lib/layouts/pdfform.module:123
+#: lib/layouts/beamer.layout:441 lib/layouts/beamer.layout:848
+#: lib/layouts/beamer.layout:1194 lib/layouts/beamer.layout:1340
+#: lib/layouts/beamer.layout:1358 lib/layouts/beamer.layout:1376
+#: lib/layouts/beamer.layout:1394 lib/layouts/beamer.layout:1412
+#: lib/layouts/beamer.layout:1431 lib/layouts/beamer.layout:1450
+#: lib/layouts/beamer.layout:1469 lib/layouts/beamer.layout:1488
+#: lib/layouts/beamer.layout:1512 lib/layouts/pdfform.module:123
 msgid "Action"
 msgstr "Handling"
 
-#: lib/layouts/beamer.layout:443\r lib/layouts/beamer.layout:502
+#: lib/layouts/beamer.layout:443 lib/layouts/beamer.layout:502
 msgid "Overlay specifications for this frame"
 msgstr "Spesifikasjon for overliggar for dette lysarket"
 
-#: lib/layouts/beamer.layout:448\r lib/layouts/beamer.layout:507
+#: lib/layouts/beamer.layout:448 lib/layouts/beamer.layout:507
 msgid "Default Overlay Specifications"
 msgstr "Standard spesifikasjonar"
 
-#: lib/layouts/beamer.layout:449\r lib/layouts/beamer.layout:508
+#: lib/layouts/beamer.layout:449 lib/layouts/beamer.layout:508
 msgid "Default overlay specifications within this frame"
 msgstr "Standard spesifikasjon for overliggar i dette lysarket"
 
-#: lib/layouts/beamer.layout:454\r lib/layouts/beamer.layout:476
-#: lib/layouts/beamer.layout:487\r lib/layouts/beamer.layout:513
+#: lib/layouts/beamer.layout:454 lib/layouts/beamer.layout:476
+#: lib/layouts/beamer.layout:487 lib/layouts/beamer.layout:513
 msgid "Frame Options"
 msgstr "Ramme val"
 
-#: lib/layouts/beamer.layout:455\r lib/layouts/beamer.layout:477
-#: lib/layouts/beamer.layout:488\r lib/layouts/beamer.layout:514
-#: lib/layouts/beamer.layout:614\r lib/layouts/litinsets.inc:41
-#: lib/layouts/litinsets.inc:42\r lib/layouts/fixme.module:63
-#: lib/layouts/fixme.module:98\r lib/layouts/fixme.module:140
-#: lib/layouts/fixme.module:181\r lib/layouts/initials.module:34
-#: lib/layouts/lilypond.module:36\r lib/layouts/todonotes.module:71
-#: lib/layouts/todonotes.module:83\r lib/layouts/todonotes.module:100
+#: lib/layouts/beamer.layout:455 lib/layouts/beamer.layout:477
+#: lib/layouts/beamer.layout:488 lib/layouts/beamer.layout:514
+#: lib/layouts/beamer.layout:614 lib/layouts/litinsets.inc:41
+#: lib/layouts/litinsets.inc:42 lib/layouts/fixme.module:63
+#: lib/layouts/fixme.module:98 lib/layouts/fixme.module:140
+#: lib/layouts/fixme.module:181 lib/layouts/initials.module:34
+#: lib/layouts/lilypond.module:36 lib/layouts/todonotes.module:71
+#: lib/layouts/todonotes.module:83 lib/layouts/todonotes.module:100
 msgid "Options"
 msgstr "Val"
 
-#: lib/layouts/beamer.layout:456\r lib/layouts/beamer.layout:478
-#: lib/layouts/beamer.layout:489\r lib/layouts/beamer.layout:515
+#: lib/layouts/beamer.layout:456 lib/layouts/beamer.layout:478
+#: lib/layouts/beamer.layout:489 lib/layouts/beamer.layout:515
 msgid "Frame options (see beamer manual)"
 msgstr "Lysark val (sjå Beamermanualen)"
 
@@ -7645,8 +7645,8 @@ msgstr "Lysark (Skjørt)"
 msgid "AgainFrame"
 msgstr "Lysarket igjen"
 
-#: lib/layouts/beamer.layout:500\r lib/layouts/powerdot.layout:126
-#: lib/layouts/seminar.layout:108\r lib/layouts/slides.layout:91
+#: lib/layouts/beamer.layout:500 lib/layouts/powerdot.layout:126
+#: lib/layouts/seminar.layout:108 lib/layouts/slides.layout:91
 #: src/frontends/qt4/GuiDocument.cpp:132
 msgid "Slide"
 msgstr "Lysark"
@@ -7659,16 +7659,16 @@ msgstr "Lysarket igjen med etikett"
 msgid "FrameTitle"
 msgstr "Lysarktittel"
 
-#: lib/layouts/beamer.layout:557\r lib/layouts/beamer.layout:586
-#: lib/layouts/beamer.layout:789\r lib/layouts/beamer.layout:817
-#: lib/layouts/beamer.layout:850\r lib/layouts/beamer.layout:1111
-#: lib/layouts/beamer.layout:1135\r lib/layouts/beamer.layout:1161
-#: lib/layouts/beamer.layout:1196\r lib/layouts/beamer.layout:1319
-#: lib/layouts/beamer.layout:1342\r lib/layouts/beamer.layout:1360
-#: lib/layouts/beamer.layout:1378\r lib/layouts/beamer.layout:1396
-#: lib/layouts/beamer.layout:1414\r lib/layouts/beamer.layout:1433
-#: lib/layouts/beamer.layout:1452\r lib/layouts/beamer.layout:1471
-#: lib/layouts/beamer.layout:1490\r lib/layouts/beamer.layout:1514
+#: lib/layouts/beamer.layout:557 lib/layouts/beamer.layout:586
+#: lib/layouts/beamer.layout:789 lib/layouts/beamer.layout:817
+#: lib/layouts/beamer.layout:850 lib/layouts/beamer.layout:1111
+#: lib/layouts/beamer.layout:1135 lib/layouts/beamer.layout:1161
+#: lib/layouts/beamer.layout:1196 lib/layouts/beamer.layout:1319
+#: lib/layouts/beamer.layout:1342 lib/layouts/beamer.layout:1360
+#: lib/layouts/beamer.layout:1378 lib/layouts/beamer.layout:1396
+#: lib/layouts/beamer.layout:1414 lib/layouts/beamer.layout:1433
+#: lib/layouts/beamer.layout:1452 lib/layouts/beamer.layout:1471
+#: lib/layouts/beamer.layout:1490 lib/layouts/beamer.layout:1514
 msgid "Specify the overlay settings (see beamer manual)"
 msgstr "Spesifiser vala for overliggaren (sjå Beamermanualen) "
 
@@ -7684,14 +7684,14 @@ msgstr "Ein kortversjon av rammetittel, brukt i nokre stilar"
 msgid "FrameSubtitle"
 msgstr "Lysark undertittel"
 
-#: lib/layouts/beamer.layout:597\r lib/layouts/moderncv.layout:303
+#: lib/layouts/beamer.layout:597 lib/layouts/moderncv.layout:303
 #: lib/layouts/moderncv.layout:317
 msgid "Column"
 msgstr "Kolonne"
 
-#: lib/layouts/beamer.layout:598\r lib/layouts/beamer.layout:624
-#: lib/layouts/beamer.layout:625\r lib/layouts/beamer.layout:635
-#: lib/layouts/moderncv.layout:282\r lib/layouts/multicol.module:14
+#: lib/layouts/beamer.layout:598 lib/layouts/beamer.layout:624
+#: lib/layouts/beamer.layout:625 lib/layouts/beamer.layout:635
+#: lib/layouts/moderncv.layout:282 lib/layouts/multicol.module:14
 msgid "Columns"
 msgstr "Start kolonnar"
 
@@ -7699,7 +7699,7 @@ msgstr "Start kolonnar"
 msgid "Start column (increase depth!), width:"
 msgstr "Start kolonne (auk djupne!), innrykk:"
 
-#: lib/layouts/beamer.layout:613\r lib/layouts/powerdot.layout:457
+#: lib/layouts/beamer.layout:613 lib/layouts/powerdot.layout:457
 msgid "Column Options"
 msgstr "Kolonne val"
 
@@ -7731,29 +7731,29 @@ msgstr "Start toppjusterte kolonnar"
 msgid "Columns (top aligned)"
 msgstr "kolonnar (topp kolonnar)"
 
-#: lib/layouts/beamer.layout:672\r lib/layouts/powerdot.layout:471
+#: lib/layouts/beamer.layout:672 lib/layouts/powerdot.layout:471
 msgid "Pause"
 msgstr "Pause"
 
-#: lib/layouts/beamer.layout:673\r lib/layouts/beamer.layout:701
-#: lib/layouts/beamer.layout:736\r lib/layouts/beamer.layout:768
-#: lib/layouts/beamer.layout:796\r lib/layouts/powerdot.layout:472
+#: lib/layouts/beamer.layout:673 lib/layouts/beamer.layout:701
+#: lib/layouts/beamer.layout:736 lib/layouts/beamer.layout:768
+#: lib/layouts/beamer.layout:796 lib/layouts/powerdot.layout:472
 msgid "Overlays"
 msgstr "Overliggar"
 
-#: lib/layouts/beamer.layout:679\r lib/layouts/powerdot.layout:478
+#: lib/layouts/beamer.layout:679 lib/layouts/powerdot.layout:478
 msgid "Pause number"
 msgstr "Pausenummer"
 
-#: lib/layouts/beamer.layout:680\r lib/layouts/powerdot.layout:479
+#: lib/layouts/beamer.layout:680 lib/layouts/powerdot.layout:479
 msgid "Number of slide where the context below the pause gets visible"
 msgstr "Talet på lysbilete før det som står under pause blir synleg"
 
-#: lib/layouts/beamer.layout:691\r lib/layouts/powerdot.layout:490
+#: lib/layouts/beamer.layout:691 lib/layouts/powerdot.layout:490
 msgid "_ _ _ _ _ _ _ _ _ _ _ _ _ _"
 msgstr "_ _ _ _ _ _ _ _ _ _ _ _ _ _"
 
-#: lib/layouts/beamer.layout:700\r lib/layouts/beamer.layout:728
+#: lib/layouts/beamer.layout:700 lib/layouts/beamer.layout:728
 msgid "Overprint"
 msgstr "Skriv over"
 
@@ -7761,9 +7761,9 @@ msgstr "Skriv over"
 msgid "Overprint Area Width"
 msgstr "Bredda på skriv over område"
 
-#: lib/layouts/beamer.layout:708\r lib/layouts/europasscv.layout:175
-#: lib/layouts/moderncv.layout:308\r lib/layouts/graphicboxes.module:48
-#: lib/layouts/sectionbox.module:21\r src/frontends/qt4/GuiBox.cpp:76
+#: lib/layouts/beamer.layout:708 lib/layouts/europasscv.layout:175
+#: lib/layouts/moderncv.layout:308 lib/layouts/graphicboxes.module:48
+#: lib/layouts/sectionbox.module:21 src/frontends/qt4/GuiBox.cpp:76
 msgid "Width"
 msgstr "Breidd"
 
@@ -7791,8 +7791,8 @@ msgstr "Bredda på legg over området"
 msgid "Overlay Area Height"
 msgstr "Høgda området ein på legg over"
 
-#: lib/layouts/beamer.layout:761\r lib/layouts/moderncv.layout:210
-#: lib/layouts/graphicboxes.module:55\r src/frontends/qt4/GuiBox.cpp:75
+#: lib/layouts/beamer.layout:761 lib/layouts/moderncv.layout:210
+#: lib/layouts/graphicboxes.module:55 src/frontends/qt4/GuiBox.cpp:75
 msgid "Height"
 msgstr "Høgd"
 
@@ -7800,8 +7800,8 @@ msgstr "Høgd"
 msgid "The height of the overlay area"
 msgstr "Høgda på området ein skal legge over"
 
-#: lib/layouts/beamer.layout:767\r lib/layouts/beamer.layout:1422
-#: lib/layouts/beamer.layout:1424\r lib/layouts/powerdot.layout:603
+#: lib/layouts/beamer.layout:767 lib/layouts/beamer.layout:1422
+#: lib/layouts/beamer.layout:1424 lib/layouts/powerdot.layout:603
 msgid "Uncover"
 msgstr "Avslør"
 
@@ -7809,8 +7809,8 @@ msgstr "Avslør"
 msgid "Uncovered on slides"
 msgstr "Blir avslørt på lysarka"
 
-#: lib/layouts/beamer.layout:795\r lib/layouts/beamer.layout:1403
-#: lib/layouts/beamer.layout:1405\r lib/layouts/powerdot.layout:609
+#: lib/layouts/beamer.layout:795 lib/layouts/beamer.layout:1403
+#: lib/layouts/beamer.layout:1405 lib/layouts/powerdot.layout:609
 msgid "Only"
 msgstr "Berre i framføring"
 
@@ -7859,9 +7859,9 @@ msgstr "Åtvaring ramme"
 msgid "Alert Block:"
 msgstr "Åtvaring ramme:"
 
-#: lib/layouts/beamer.layout:891\r lib/layouts/beamer.layout:924
-#: lib/layouts/beamer.layout:949\r lib/layouts/beamer.layout:972
-#: lib/layouts/beamer.layout:1016\r lib/layouts/beamer.layout:1039
+#: lib/layouts/beamer.layout:891 lib/layouts/beamer.layout:924
+#: lib/layouts/beamer.layout:949 lib/layouts/beamer.layout:972
+#: lib/layouts/beamer.layout:1016 lib/layouts/beamer.layout:1039
 msgid "Titling"
 msgstr "Titulering"
 
@@ -7908,56 +7908,56 @@ msgstr "Kort tittel|K"
 msgid "Short date which appears in the sidebar/header"
 msgstr ""
 
-#: lib/layouts/beamer.layout:1038\r lib/layouts/beamerposter.layout:46
+#: lib/layouts/beamer.layout:1038 lib/layouts/beamerposter.layout:46
 msgid "TitleGraphic"
 msgstr "Tittelgrafikk"
 
-#: lib/layouts/beamer.layout:1091\r lib/layouts/egs.layout:102
-#: lib/layouts/powerdot.layout:379\r lib/layouts/db_stdlayouts.inc:19
+#: lib/layouts/beamer.layout:1091 lib/layouts/egs.layout:102
+#: lib/layouts/powerdot.layout:379 lib/layouts/db_stdlayouts.inc:19
 #: lib/layouts/stdlayouts.inc:12
 msgid "Quotation"
 msgstr "Avskrift"
 
-#: lib/layouts/beamer.layout:1117\r lib/layouts/egs.layout:121
-#: lib/layouts/moderncv.layout:219\r lib/layouts/powerdot.layout:401
+#: lib/layouts/beamer.layout:1117 lib/layouts/egs.layout:121
+#: lib/layouts/moderncv.layout:219 lib/layouts/powerdot.layout:401
 #: lib/layouts/stdlayouts.inc:34
 msgid "Quote"
 msgstr "Sitere"
 
-#: lib/layouts/beamer.layout:1141\r lib/layouts/egs.layout:224
-#: lib/layouts/powerdot.layout:421\r lib/layouts/stdlayouts.inc:54
+#: lib/layouts/beamer.layout:1141 lib/layouts/egs.layout:224
+#: lib/layouts/powerdot.layout:421 lib/layouts/stdlayouts.inc:54
 msgid "Verse"
 msgstr "Vers"
 
-#: lib/layouts/beamer.layout:1182\r lib/layouts/foils.layout:312
+#: lib/layouts/beamer.layout:1182 lib/layouts/foils.layout:312
 #: lib/layouts/theorems-starred.inc:71
 msgid "Corollary."
 msgstr "Korollar."
 
-#: lib/layouts/beamer.layout:1195\r lib/layouts/beamer.layout:1341
-#: lib/layouts/beamer.layout:1359\r lib/layouts/beamer.layout:1377
-#: lib/layouts/beamer.layout:1395\r lib/layouts/beamer.layout:1413
-#: lib/layouts/beamer.layout:1432\r lib/layouts/beamer.layout:1451
-#: lib/layouts/beamer.layout:1470\r lib/layouts/beamer.layout:1489
+#: lib/layouts/beamer.layout:1195 lib/layouts/beamer.layout:1341
+#: lib/layouts/beamer.layout:1359 lib/layouts/beamer.layout:1377
+#: lib/layouts/beamer.layout:1395 lib/layouts/beamer.layout:1413
+#: lib/layouts/beamer.layout:1432 lib/layouts/beamer.layout:1451
+#: lib/layouts/beamer.layout:1470 lib/layouts/beamer.layout:1489
 #: lib/layouts/beamer.layout:1513
 #, fuzzy
 msgid "Action Specifications|S"
 msgstr "Vel bolken|V"
 
-#: lib/layouts/beamer.layout:1201\r lib/layouts/theorems-ams-bytype.inc:61
-#: lib/layouts/theorems-ams.inc:33\r lib/layouts/theorems-bytype.inc:35
-#: lib/layouts/theorems-starred.inc:34\r lib/layouts/theorems.inc:33
+#: lib/layouts/beamer.layout:1201 lib/layouts/theorems-ams-bytype.inc:61
+#: lib/layouts/theorems-ams.inc:33 lib/layouts/theorems-bytype.inc:35
+#: lib/layouts/theorems-starred.inc:34 lib/layouts/theorems.inc:33
 #, fuzzy
 msgid "Additional Theorem Text"
 msgstr "Andre LaTeX-val"
 
-#: lib/layouts/beamer.layout:1202\r lib/layouts/theorems-ams-bytype.inc:62
-#: lib/layouts/theorems-ams.inc:34\r lib/layouts/theorems-bytype.inc:36
-#: lib/layouts/theorems-starred.inc:35\r lib/layouts/theorems.inc:34
+#: lib/layouts/beamer.layout:1202 lib/layouts/theorems-ams-bytype.inc:62
+#: lib/layouts/theorems-ams.inc:34 lib/layouts/theorems-bytype.inc:36
+#: lib/layouts/theorems-starred.inc:35 lib/layouts/theorems.inc:34
 msgid "Additional text appended to the theorem header"
 msgstr ""
 
-#: lib/layouts/beamer.layout:1209\r lib/layouts/foils.layout:326
+#: lib/layouts/beamer.layout:1209 lib/layouts/foils.layout:326
 #: lib/layouts/theorems-starred.inc:157
 msgid "Definition."
 msgstr "Definisjon."
@@ -7970,7 +7970,7 @@ msgstr "Definisjonar"
 msgid "Definitions."
 msgstr "Definisjonar."
 
-#: lib/layouts/beamer.layout:1221\r lib/layouts/theorems-starred.inc:181
+#: lib/layouts/beamer.layout:1221 lib/layouts/theorems-starred.inc:181
 msgid "Example."
 msgstr "Døme."
 
@@ -7982,38 +7982,38 @@ msgstr "Døme"
 msgid "Examples."
 msgstr "Døme."
 
-#: lib/layouts/beamer.layout:1234\r lib/layouts/theorems-ams-bytype.inc:170
+#: lib/layouts/beamer.layout:1234 lib/layouts/theorems-ams-bytype.inc:170
 #: lib/layouts/theorems-ams-bytype.inc:179
-#: lib/layouts/theorems-ams-bytype.inc:182\r lib/layouts/theorems-ams.inc:142
-#: lib/layouts/theorems-ams.inc:152\r lib/layouts/theorems-ams.inc:155
-#: lib/layouts/theorems-bytype.inc:144\r lib/layouts/theorems-bytype.inc:153
-#: lib/layouts/theorems-bytype.inc:156\r lib/layouts/theorems-starred.inc:145
+#: lib/layouts/theorems-ams-bytype.inc:182 lib/layouts/theorems-ams.inc:142
+#: lib/layouts/theorems-ams.inc:152 lib/layouts/theorems-ams.inc:155
+#: lib/layouts/theorems-bytype.inc:144 lib/layouts/theorems-bytype.inc:153
+#: lib/layouts/theorems-bytype.inc:156 lib/layouts/theorems-starred.inc:145
 #: lib/layouts/theorems-starred.inc:148
 #: lib/layouts/theorems-without-preamble.inc:162
 #: lib/layouts/theorems-without-preamble.inc:168
 #: lib/layouts/theorems-without-preamble.inc:171
-#: lib/layouts/theorems.inc:142\r lib/layouts/theorems.inc:152
-#: lib/layouts/theorems.inc:155\r lib/layouts/theorems-chap-bytype.module:114
+#: lib/layouts/theorems.inc:142 lib/layouts/theorems.inc:152
+#: lib/layouts/theorems.inc:155 lib/layouts/theorems-chap-bytype.module:114
 #: lib/layouts/theorems-sec-bytype.module:94
 msgid "Fact"
 msgstr "Faktum"
 
-#: lib/layouts/beamer.layout:1237\r lib/layouts/theorems-starred.inc:139
+#: lib/layouts/beamer.layout:1237 lib/layouts/theorems-starred.inc:139
 msgid "Fact."
 msgstr "Faktum."
 
-#: lib/layouts/beamer.layout:1243\r lib/layouts/foils.layout:305
+#: lib/layouts/beamer.layout:1243 lib/layouts/foils.layout:305
 #: lib/layouts/theorems-starred.inc:88
 msgid "Lemma."
 msgstr "Lemma."
 
-#: lib/layouts/beamer.layout:1255\r lib/layouts/foils.layout:298
+#: lib/layouts/beamer.layout:1255 lib/layouts/foils.layout:298
 #: lib/layouts/theorems-starred.inc:30
 msgid "Theorem."
 msgstr "Teorem."
 
-#: lib/layouts/beamer.layout:1263\r lib/layouts/egs.layout:657
-#: lib/layouts/db_lyxmacros.inc:19\r lib/layouts/lyxmacros.inc:12
+#: lib/layouts/beamer.layout:1263 lib/layouts/egs.layout:657
+#: lib/layouts/db_lyxmacros.inc:19 lib/layouts/lyxmacros.inc:12
 msgid "LyX-Code"
 msgstr "LyX-Kode"
 
@@ -8021,12 +8021,12 @@ msgstr "LyX-Kode"
 msgid "NoteItem"
 msgstr "Notis"
 
-#: lib/layouts/beamer.layout:1331\r lib/layouts/beamer.layout:1333
+#: lib/layouts/beamer.layout:1331 lib/layouts/beamer.layout:1333
 #: src/Font.cpp:64 src/frontends/qt4/GuiCharacter.cpp:126
 msgid "Bold"
 msgstr "Feit"
 
-#: lib/layouts/beamer.layout:1349\r lib/layouts/ectaart.layout:146
+#: lib/layouts/beamer.layout:1349 lib/layouts/ectaart.layout:146
 msgid "Emphasize"
 msgstr "Utheva skrift"
 
@@ -8035,27 +8035,27 @@ msgstr "Utheva skrift"
 msgid "Emph."
 msgstr "Utheva"
 
-#: lib/layouts/beamer.layout:1367\r lib/layouts/beamer.layout:1369
+#: lib/layouts/beamer.layout:1367 lib/layouts/beamer.layout:1369
 msgid "Alert"
 msgstr "Åtvaring"
 
-#: lib/layouts/beamer.layout:1385\r lib/layouts/beamer.layout:1387
-#: lib/layouts/svcommon.inc:69\r lib/layouts/svcommon.inc:96
+#: lib/layouts/beamer.layout:1385 lib/layouts/beamer.layout:1387
+#: lib/layouts/svcommon.inc:69 lib/layouts/svcommon.inc:96
 #: lib/layouts/svcommon.inc:103
 msgid "Structure"
 msgstr "Struktur"
 
-#: lib/layouts/beamer.layout:1441\r lib/layouts/beamer.layout:1443
+#: lib/layouts/beamer.layout:1441 lib/layouts/beamer.layout:1443
 #: lib/layouts/powerdot.layout:587
 #, fuzzy
 msgid "Visible"
 msgstr "SynlegTekst"
 
-#: lib/layouts/beamer.layout:1460\r lib/layouts/beamer.layout:1462
+#: lib/layouts/beamer.layout:1460 lib/layouts/beamer.layout:1462
 msgid "Invisible"
 msgstr "Usynleg"
 
-#: lib/layouts/beamer.layout:1479\r lib/layouts/beamer.layout:1481
+#: lib/layouts/beamer.layout:1479 lib/layouts/beamer.layout:1481
 #, fuzzy
 msgid "Alternative"
 msgstr "Al&ternative språk:"
@@ -8100,26 +8100,26 @@ msgstr "Presentasjonmodus"
 msgid "Presentation"
 msgstr "Presentasjon"
 
-#: lib/layouts/beamer.layout:1554\r lib/layouts/powerdot.layout:504
-#: lib/layouts/sciposter.layout:116\r lib/layouts/aguplus.inc:206
-#: lib/layouts/stdfloats.inc:11\r lib/ui/stdtoolbars.inc:142
+#: lib/layouts/beamer.layout:1554 lib/layouts/powerdot.layout:504
+#: lib/layouts/sciposter.layout:116 lib/layouts/aguplus.inc:206
+#: lib/layouts/stdfloats.inc:11 lib/ui/stdtoolbars.inc:142
 #: src/insets/Inset.cpp:100
 msgid "Table"
 msgstr "Tabell"
 
-#: lib/layouts/beamer.layout:1559\r lib/layouts/powerdot.layout:511
-#: lib/layouts/sciposter.layout:121\r lib/layouts/tufte-book.layout:236
+#: lib/layouts/beamer.layout:1559 lib/layouts/powerdot.layout:511
+#: lib/layouts/sciposter.layout:121 lib/layouts/tufte-book.layout:236
 #: lib/layouts/stdfloats.inc:16
 msgid "List of Tables"
 msgstr "Liste over tabellar"
 
-#: lib/layouts/beamer.layout:1567\r lib/layouts/powerdot.layout:521
-#: lib/layouts/sciposter.layout:102\r lib/layouts/stdfloats.inc:26
+#: lib/layouts/beamer.layout:1567 lib/layouts/powerdot.layout:521
+#: lib/layouts/sciposter.layout:102 lib/layouts/stdfloats.inc:26
 msgid "Figure"
 msgstr "Figur"
 
-#: lib/layouts/beamer.layout:1572\r lib/layouts/powerdot.layout:528
-#: lib/layouts/sciposter.layout:107\r lib/layouts/tufte-book.layout:252
+#: lib/layouts/beamer.layout:1572 lib/layouts/powerdot.layout:528
+#: lib/layouts/sciposter.layout:107 lib/layouts/tufte-book.layout:252
 #: lib/layouts/stdfloats.inc:31
 msgid "List of Figures"
 msgstr "Liste over figurar"
@@ -8137,16 +8137,16 @@ msgstr ""
 msgid "Broadway"
 msgstr ""
 
-#: lib/layouts/broadway.layout:4\r lib/layouts/hollywood.layout:4
+#: lib/layouts/broadway.layout:4 lib/layouts/hollywood.layout:4
 #, fuzzy
 msgid "Scripts"
 msgstr "Senka skrift"
 
-#: lib/layouts/broadway.layout:34\r lib/layouts/hollywood.layout:41
+#: lib/layouts/broadway.layout:34 lib/layouts/hollywood.layout:41
 msgid "Dialogue"
 msgstr "Dialog"
 
-#: lib/layouts/broadway.layout:45\r lib/layouts/hollywood.layout:209
+#: lib/layouts/broadway.layout:45 lib/layouts/hollywood.layout:209
 msgid "Narrative"
 msgstr "Forteljing"
 
@@ -8158,7 +8158,7 @@ msgstr "AKT"
 msgid "ACT \\arabic{act}"
 msgstr "AKT \\arabic{act}"
 
-#: lib/layouts/broadway.layout:77\r lib/layouts/broadway.layout:104
+#: lib/layouts/broadway.layout:77 lib/layouts/broadway.layout:104
 msgid "SCENE"
 msgstr "SCENE"
 
@@ -8170,32 +8170,32 @@ msgstr "SCENE \\arabic{scene}"
 msgid "SCENE*"
 msgstr "SCENE*"
 
-#: lib/layouts/broadway.layout:108\r lib/layouts/broadway.layout:119
+#: lib/layouts/broadway.layout:108 lib/layouts/broadway.layout:119
 msgid "AT RISE:"
 msgstr "VED_OPPGANG:"
 
-#: lib/layouts/broadway.layout:124\r lib/layouts/hollywood.layout:145
+#: lib/layouts/broadway.layout:124 lib/layouts/hollywood.layout:145
 msgid "Speaker"
 msgstr "Stemme"
 
-#: lib/layouts/broadway.layout:137\r lib/layouts/hollywood.layout:160
+#: lib/layouts/broadway.layout:137 lib/layouts/hollywood.layout:160
 msgid "Parenthetical"
 msgstr "I parentes"
 
-#: lib/layouts/broadway.layout:148\r lib/layouts/hollywood.layout:171
+#: lib/layouts/broadway.layout:148 lib/layouts/hollywood.layout:171
 msgid "("
 msgstr "("
 
-#: lib/layouts/broadway.layout:150\r lib/layouts/hollywood.layout:173
+#: lib/layouts/broadway.layout:150 lib/layouts/hollywood.layout:173
 msgid ")"
 msgstr ")"
 
-#: lib/layouts/broadway.layout:161\r lib/layouts/broadway.layout:171
+#: lib/layouts/broadway.layout:161 lib/layouts/broadway.layout:171
 msgid "CURTAIN"
 msgstr "TEPPE"
 
-#: lib/layouts/broadway.layout:218\r lib/layouts/egs.layout:243
-#: lib/layouts/hollywood.layout:307\r lib/layouts/siamltex.layout:307
+#: lib/layouts/broadway.layout:218 lib/layouts/egs.layout:243
+#: lib/layouts/hollywood.layout:307 lib/layouts/siamltex.layout:307
 #: lib/layouts/lyxmacros.inc:65
 msgid "Right Address"
 msgstr "Frå høgre"
@@ -8332,11 +8332,11 @@ msgstr ""
 msgid "DIN-Brief"
 msgstr "DinBrief"
 
-#: lib/layouts/dinbrief.layout:4\r lib/layouts/extletter.layout:4
-#: lib/layouts/frletter.layout:4\r lib/layouts/g-brief.layout:4
-#: lib/layouts/g-brief2.layout:4\r lib/layouts/heb-letter.layout:4
-#: lib/layouts/letter.layout:4\r lib/layouts/lettre.layout:4
-#: lib/layouts/scrlettr.layout:4\r lib/layouts/scrlttr2.layout:4
+#: lib/layouts/dinbrief.layout:4 lib/layouts/extletter.layout:4
+#: lib/layouts/frletter.layout:4 lib/layouts/g-brief.layout:4
+#: lib/layouts/g-brief2.layout:4 lib/layouts/heb-letter.layout:4
+#: lib/layouts/letter.layout:4 lib/layouts/lettre.layout:4
+#: lib/layouts/scrlettr.layout:4 lib/layouts/scrlttr2.layout:4
 #, fuzzy
 msgid "Letters"
 msgstr "Brev"
@@ -8345,15 +8345,15 @@ msgstr "Brev"
 msgid "DinBrief"
 msgstr "DinBrief"
 
-#: lib/layouts/dinbrief.layout:31\r lib/layouts/dinbrief.layout:359
-#: lib/layouts/g-brief.layout:18\r lib/layouts/g-brief.layout:37
-#: lib/layouts/g-brief.layout:234\r lib/layouts/g-brief2.layout:58
-#: lib/layouts/g-brief2.layout:64\r lib/layouts/iopart.layout:125
-#: lib/layouts/moderncv.layout:486\r lib/layouts/moderncv.layout:493
-#: lib/layouts/moderncv.layout:525\r lib/layouts/scrlettr.layout:42
-#: lib/layouts/scrlettr.layout:43\r lib/layouts/scrlettr.layout:74
-#: lib/layouts/scrlettr.layout:117\r lib/layouts/scrlttr2.layout:97
-#: lib/layouts/scrlttr2.layout:149\r lib/layouts/stdletter.inc:53
+#: lib/layouts/dinbrief.layout:31 lib/layouts/dinbrief.layout:359
+#: lib/layouts/g-brief.layout:18 lib/layouts/g-brief.layout:37
+#: lib/layouts/g-brief.layout:234 lib/layouts/g-brief2.layout:58
+#: lib/layouts/g-brief2.layout:64 lib/layouts/iopart.layout:125
+#: lib/layouts/moderncv.layout:486 lib/layouts/moderncv.layout:493
+#: lib/layouts/moderncv.layout:525 lib/layouts/scrlettr.layout:42
+#: lib/layouts/scrlettr.layout:43 lib/layouts/scrlettr.layout:74
+#: lib/layouts/scrlettr.layout:117 lib/layouts/scrlttr2.layout:97
+#: lib/layouts/scrlttr2.layout:149 lib/layouts/stdletter.inc:53
 msgid "Letter"
 msgstr "Brev"
 
@@ -8362,38 +8362,38 @@ msgstr "Brev"
 msgid "Addresses"
 msgstr "Adresse"
 
-#: lib/layouts/dinbrief.layout:49\r lib/layouts/g-brief2.layout:732
-#: lib/layouts/g-brief2.layout:755\r lib/layouts/g-brief2.layout:777
-#: lib/layouts/lettre.layout:140\r lib/layouts/stdletter.inc:26
+#: lib/layouts/dinbrief.layout:49 lib/layouts/g-brief2.layout:732
+#: lib/layouts/g-brief2.layout:755 lib/layouts/g-brief2.layout:777
+#: lib/layouts/lettre.layout:140 lib/layouts/stdletter.inc:26
 #: lib/layouts/stdletter.inc:38
 #, fuzzy
 msgid "Postal Data"
 msgstr "Post-kommentar  "
 
-#: lib/layouts/dinbrief.layout:55\r lib/layouts/frletter.layout:17
-#: lib/layouts/heb-letter.layout:16\r lib/layouts/lettre.layout:56
-#: lib/layouts/lettre.layout:482\r lib/layouts/stdletter.inc:37
+#: lib/layouts/dinbrief.layout:55 lib/layouts/frletter.layout:17
+#: lib/layouts/heb-letter.layout:16 lib/layouts/lettre.layout:56
+#: lib/layouts/lettre.layout:482 lib/layouts/stdletter.inc:37
 msgid "Send To Address"
 msgstr "Send til adresse"
 
-#: lib/layouts/dinbrief.layout:57\r lib/layouts/ectaart.layout:70
-#: lib/layouts/elsart.layout:146\r lib/layouts/europasscv.layout:103
-#: lib/layouts/europecv.layout:68\r lib/layouts/g-brief.layout:187
-#: lib/layouts/g-brief2.layout:788\r lib/layouts/moderncv.layout:138
-#: lib/layouts/revtex.layout:134\r lib/layouts/revtex4-1.layout:110
-#: lib/layouts/revtex4.layout:183\r lib/layouts/scrlettr.layout:147
-#: lib/layouts/scrlttr2.layout:64\r lib/layouts/siamltex.layout:299
+#: lib/layouts/dinbrief.layout:57 lib/layouts/ectaart.layout:70
+#: lib/layouts/elsart.layout:146 lib/layouts/europasscv.layout:103
+#: lib/layouts/europecv.layout:68 lib/layouts/g-brief.layout:187
+#: lib/layouts/g-brief2.layout:788 lib/layouts/moderncv.layout:138
+#: lib/layouts/revtex.layout:134 lib/layouts/revtex4-1.layout:110
+#: lib/layouts/revtex4.layout:183 lib/layouts/scrlettr.layout:147
+#: lib/layouts/scrlttr2.layout:64 lib/layouts/siamltex.layout:299
 #: lib/layouts/amsdefs.inc:134
 msgid "Address:"
 msgstr "Adresse:"
 
-#: lib/layouts/dinbrief.layout:69\r lib/layouts/frletter.layout:13
-#: lib/layouts/heb-letter.layout:11\r lib/layouts/lettre.layout:34
-#: lib/layouts/lettre.layout:138\r lib/layouts/stdletter.inc:25
+#: lib/layouts/dinbrief.layout:69 lib/layouts/frletter.layout:13
+#: lib/layouts/heb-letter.layout:11 lib/layouts/lettre.layout:34
+#: lib/layouts/lettre.layout:138 lib/layouts/stdletter.inc:25
 msgid "My Address"
 msgstr "Mi adresse"
 
-#: lib/layouts/dinbrief.layout:71\r lib/layouts/scrlttr2.layout:183
+#: lib/layouts/dinbrief.layout:71 lib/layouts/scrlttr2.layout:183
 msgid "Sender Address:"
 msgstr "SendarSinAdresse:"
 
@@ -8401,7 +8401,7 @@ msgstr "SendarSinAdresse:"
 msgid "Return address"
 msgstr "Returadresse"
 
-#: lib/layouts/dinbrief.layout:81\r lib/layouts/scrlettr.layout:175
+#: lib/layouts/dinbrief.layout:81 lib/layouts/scrlettr.layout:175
 #: lib/layouts/scrlttr2.layout:255
 msgid "Backaddress:"
 msgstr "Bakside-adresse:"
@@ -8422,24 +8422,24 @@ msgstr "Handtering"
 msgid "Handling:"
 msgstr "Handtering:"
 
-#: lib/layouts/dinbrief.layout:102\r lib/layouts/g-brief.layout:105
-#: lib/layouts/g-brief2.layout:50\r lib/layouts/g-brief2.layout:819
-#: lib/layouts/lettre.layout:60\r lib/layouts/lettre.layout:451
+#: lib/layouts/dinbrief.layout:102 lib/layouts/g-brief.layout:105
+#: lib/layouts/g-brief2.layout:50 lib/layouts/g-brief2.layout:819
+#: lib/layouts/lettre.layout:60 lib/layouts/lettre.layout:451
 msgid "YourRef"
 msgstr "DinRef"
 
-#: lib/layouts/dinbrief.layout:104\r lib/layouts/scrlettr.layout:211
+#: lib/layouts/dinbrief.layout:104 lib/layouts/scrlettr.layout:211
 #: lib/layouts/scrlttr2.layout:296
 msgid "Your ref.:"
 msgstr "Din ref.:"
 
-#: lib/layouts/dinbrief.layout:108\r lib/layouts/g-brief.layout:98
-#: lib/layouts/g-brief2.layout:48\r lib/layouts/g-brief2.layout:798
-#: lib/layouts/lettre.layout:62\r lib/layouts/lettre.layout:467
+#: lib/layouts/dinbrief.layout:108 lib/layouts/g-brief.layout:98
+#: lib/layouts/g-brief2.layout:48 lib/layouts/g-brief2.layout:798
+#: lib/layouts/lettre.layout:62 lib/layouts/lettre.layout:467
 msgid "MyRef"
 msgstr "MinRef"
 
-#: lib/layouts/dinbrief.layout:110\r lib/layouts/scrlettr.layout:232
+#: lib/layouts/dinbrief.layout:110 lib/layouts/scrlettr.layout:232
 #: lib/layouts/scrlttr2.layout:320
 msgid "Our ref.:"
 msgstr "Din ref.:"
@@ -8452,26 +8452,26 @@ msgstr "Skrivar"
 msgid "Writer:"
 msgstr "Skrivar:"
 
-#: lib/layouts/dinbrief.layout:120\r lib/layouts/frletter.layout:41
-#: lib/layouts/g-brief.layout:56\r lib/layouts/g-brief2.layout:954
-#: lib/layouts/lettre.layout:68\r lib/layouts/lettre.layout:569
-#: lib/layouts/scrlettr.layout:137\r lib/layouts/scrlttr2.layout:171
+#: lib/layouts/dinbrief.layout:120 lib/layouts/frletter.layout:41
+#: lib/layouts/g-brief.layout:56 lib/layouts/g-brief2.layout:954
+#: lib/layouts/lettre.layout:68 lib/layouts/lettre.layout:569
+#: lib/layouts/scrlettr.layout:137 lib/layouts/scrlttr2.layout:171
 #: lib/layouts/stdletter.inc:75
 msgid "Signature"
 msgstr "Signatur"
 
-#: lib/layouts/dinbrief.layout:122\r lib/layouts/dinbrief.layout:202
-#: lib/layouts/dinbrief.layout:214\r lib/layouts/g-brief2.layout:928
-#: lib/layouts/g-brief2.layout:955\r lib/layouts/g-brief2.layout:976
-#: lib/layouts/g-brief2.layout:998\r lib/layouts/lettre.layout:517
-#: lib/layouts/lettre.layout:608\r lib/layouts/lettre.layout:651
+#: lib/layouts/dinbrief.layout:122 lib/layouts/dinbrief.layout:202
+#: lib/layouts/dinbrief.layout:214 lib/layouts/g-brief2.layout:928
+#: lib/layouts/g-brief2.layout:955 lib/layouts/g-brief2.layout:976
+#: lib/layouts/g-brief2.layout:998 lib/layouts/lettre.layout:517
+#: lib/layouts/lettre.layout:608 lib/layouts/lettre.layout:651
 #: lib/layouts/stdletter.inc:76
 msgid "Closings"
 msgstr "Avslutningar"
 
-#: lib/layouts/dinbrief.layout:123\r lib/layouts/g-brief.layout:59
-#: lib/layouts/g-brief2.layout:965\r lib/layouts/lettre.layout:572
-#: lib/layouts/scrlettr.layout:140\r lib/layouts/scrlttr2.layout:175
+#: lib/layouts/dinbrief.layout:123 lib/layouts/g-brief.layout:59
+#: lib/layouts/g-brief2.layout:965 lib/layouts/lettre.layout:572
+#: lib/layouts/scrlettr.layout:140 lib/layouts/scrlttr2.layout:175
 #: lib/layouts/stdletter.inc:88
 msgid "Signature:"
 msgstr "Signatur:"
@@ -8492,77 +8492,77 @@ msgstr "Retningsnummer"
 msgid "Area Code:"
 msgstr "Retningsnummer:"
 
-#: lib/layouts/dinbrief.layout:144\r lib/layouts/europasscv.layout:106
-#: lib/layouts/europecv.layout:77\r lib/layouts/lettre.layout:38
-#: lib/layouts/lettre.layout:287\r lib/layouts/scrlettr.layout:151
-#: lib/layouts/scrlttr2.layout:187\r lib/layouts/stdletter.inc:131
+#: lib/layouts/dinbrief.layout:144 lib/layouts/europasscv.layout:106
+#: lib/layouts/europecv.layout:77 lib/layouts/lettre.layout:38
+#: lib/layouts/lettre.layout:287 lib/layouts/scrlettr.layout:151
+#: lib/layouts/scrlttr2.layout:187 lib/layouts/stdletter.inc:131
 msgid "Telephone"
 msgstr "Telefon"
 
-#: lib/layouts/dinbrief.layout:146\r lib/layouts/europasscv.layout:109
-#: lib/layouts/europecv.layout:80\r lib/layouts/scrlettr.layout:154
+#: lib/layouts/dinbrief.layout:146 lib/layouts/europasscv.layout:109
+#: lib/layouts/europecv.layout:80 lib/layouts/scrlettr.layout:154
 #: lib/layouts/stdletter.inc:134
 msgid "Telephone:"
 msgstr "Telefon:"
 
-#: lib/layouts/dinbrief.layout:151\r lib/layouts/lettre.layout:36
-#: lib/layouts/lettre.layout:257\r lib/layouts/scrlettr.layout:186
-#: lib/layouts/scrlttr2.layout:267\r lib/layouts/stdletter.inc:124
+#: lib/layouts/dinbrief.layout:151 lib/layouts/lettre.layout:36
+#: lib/layouts/lettre.layout:257 lib/layouts/scrlettr.layout:186
+#: lib/layouts/scrlttr2.layout:267 lib/layouts/stdletter.inc:124
 msgid "Location"
 msgstr "Lokalisering"
 
-#: lib/layouts/dinbrief.layout:153\r lib/layouts/scrlettr.layout:189
-#: lib/layouts/scrlttr2.layout:271\r lib/layouts/stdletter.inc:127
+#: lib/layouts/dinbrief.layout:153 lib/layouts/scrlettr.layout:189
+#: lib/layouts/scrlttr2.layout:271 lib/layouts/stdletter.inc:127
 msgid "Location:"
 msgstr "Lokalisering:"
 
-#: lib/layouts/dinbrief.layout:163\r lib/layouts/g-brief.layout:194
-#: lib/layouts/g-brief2.layout:872\r lib/layouts/lettre.layout:227
-#: lib/layouts/revtex.layout:114\r lib/layouts/revtex4-1.layout:150
-#: lib/layouts/revtex4.layout:126\r lib/layouts/scrlettr.layout:168
-#: lib/layouts/scrlttr2.layout:247\r lib/layouts/siamltex.layout:249
+#: lib/layouts/dinbrief.layout:163 lib/layouts/g-brief.layout:194
+#: lib/layouts/g-brief2.layout:872 lib/layouts/lettre.layout:227
+#: lib/layouts/revtex.layout:114 lib/layouts/revtex4-1.layout:150
+#: lib/layouts/revtex4.layout:126 lib/layouts/scrlettr.layout:168
+#: lib/layouts/scrlttr2.layout:247 lib/layouts/siamltex.layout:249
 #: lib/layouts/amsdefs.inc:84
 msgid "Date:"
 msgstr "Dato:"
 
-#: lib/layouts/dinbrief.layout:168\r lib/layouts/lettre.layout:58
-#: lib/layouts/lettre.layout:429\r lib/layouts/scrlettr.layout:201
-#: lib/layouts/scrlttr2.layout:284\r lib/layouts/scrclass.inc:216
+#: lib/layouts/dinbrief.layout:168 lib/layouts/lettre.layout:58
+#: lib/layouts/lettre.layout:429 lib/layouts/scrlettr.layout:201
+#: lib/layouts/scrlttr2.layout:284 lib/layouts/scrclass.inc:216
 msgid "Subject"
 msgstr "Emne"
 
-#: lib/layouts/dinbrief.layout:170\r lib/layouts/lettre.layout:434
-#: lib/layouts/scrlettr.layout:204\r lib/layouts/scrlttr2.layout:288
+#: lib/layouts/dinbrief.layout:170 lib/layouts/lettre.layout:434
+#: lib/layouts/scrlettr.layout:204 lib/layouts/scrlttr2.layout:288
 msgid "Subject:"
 msgstr "Emne:"
 
-#: lib/layouts/dinbrief.layout:184\r lib/layouts/frletter.layout:37
-#: lib/layouts/g-brief.layout:207\r lib/layouts/g-brief2.layout:56
-#: lib/layouts/g-brief2.layout:905\r lib/layouts/lettre.layout:64
-#: lib/layouts/lettre.layout:542\r lib/layouts/moderncv.layout:560
-#: lib/layouts/scrlettr.layout:63\r lib/layouts/scrlttr2.layout:96
+#: lib/layouts/dinbrief.layout:184 lib/layouts/frletter.layout:37
+#: lib/layouts/g-brief.layout:207 lib/layouts/g-brief2.layout:56
+#: lib/layouts/g-brief2.layout:905 lib/layouts/lettre.layout:64
+#: lib/layouts/lettre.layout:542 lib/layouts/moderncv.layout:560
+#: lib/layouts/scrlettr.layout:63 lib/layouts/scrlttr2.layout:96
 #: lib/layouts/stdletter.inc:52
 msgid "Opening"
 msgstr "Opning"
 
-#: lib/layouts/dinbrief.layout:188\r lib/layouts/g-brief.layout:212
-#: lib/layouts/g-brief2.layout:917\r lib/layouts/lettre.layout:546
-#: lib/layouts/scrlttr2.layout:108\r lib/layouts/stdletter.inc:66
+#: lib/layouts/dinbrief.layout:188 lib/layouts/g-brief.layout:212
+#: lib/layouts/g-brief2.layout:917 lib/layouts/lettre.layout:546
+#: lib/layouts/scrlttr2.layout:108 lib/layouts/stdletter.inc:66
 msgid "Opening:"
 msgstr "Opning:"
 
-#: lib/layouts/dinbrief.layout:200\r lib/layouts/frletter.layout:45
-#: lib/layouts/g-brief.layout:233\r lib/layouts/g-brief2.layout:60
-#: lib/layouts/g-brief2.layout:927\r lib/layouts/lettre.layout:66
-#: lib/layouts/lettre.layout:556\r lib/layouts/moderncv.layout:568
-#: lib/layouts/scrlettr.layout:73\r lib/layouts/scrlttr2.layout:117
+#: lib/layouts/dinbrief.layout:200 lib/layouts/frletter.layout:45
+#: lib/layouts/g-brief.layout:233 lib/layouts/g-brief2.layout:60
+#: lib/layouts/g-brief2.layout:927 lib/layouts/lettre.layout:66
+#: lib/layouts/lettre.layout:556 lib/layouts/moderncv.layout:568
+#: lib/layouts/scrlettr.layout:73 lib/layouts/scrlttr2.layout:117
 #: lib/layouts/stdletter.inc:97
 msgid "Closing"
 msgstr "Avslutning"
 
-#: lib/layouts/dinbrief.layout:203\r lib/layouts/g-brief.layout:239
-#: lib/layouts/g-brief2.layout:939\r lib/layouts/lettre.layout:560
-#: lib/layouts/scrlttr2.layout:121\r lib/layouts/stdletter.inc:100
+#: lib/layouts/dinbrief.layout:203 lib/layouts/g-brief.layout:239
+#: lib/layouts/g-brief2.layout:939 lib/layouts/lettre.layout:560
+#: lib/layouts/scrlttr2.layout:121 lib/layouts/stdletter.inc:100
 msgid "Closing:"
 msgstr "Avslutning:"
 
@@ -8575,44 +8575,44 @@ msgstr "Signatur"
 msgid "Here you can insert a signature scan"
 msgstr ""
 
-#: lib/layouts/dinbrief.layout:212\r lib/layouts/lettre.layout:70
-#: lib/layouts/lettre.layout:606\r lib/layouts/stdletter.inc:116
+#: lib/layouts/dinbrief.layout:212 lib/layouts/lettre.layout:70
+#: lib/layouts/lettre.layout:606 lib/layouts/stdletter.inc:116
 msgid "encl"
 msgstr "Vedlegg"
 
-#: lib/layouts/dinbrief.layout:215\r lib/layouts/lettre.layout:611
-#: lib/layouts/scrlettr.layout:112\r lib/layouts/scrlttr2.layout:144
+#: lib/layouts/dinbrief.layout:215 lib/layouts/lettre.layout:611
+#: lib/layouts/scrlettr.layout:112 lib/layouts/scrlttr2.layout:144
 #: lib/layouts/stdletter.inc:119
 msgid "encl:"
 msgstr "Vedlg:"
 
-#: lib/layouts/dinbrief.layout:228\r lib/layouts/g-brief.layout:224
-#: lib/layouts/g-brief2.layout:997\r lib/layouts/lettre.layout:72
-#: lib/layouts/lettre.layout:629\r lib/layouts/stdletter.inc:104
+#: lib/layouts/dinbrief.layout:228 lib/layouts/g-brief.layout:224
+#: lib/layouts/g-brief2.layout:997 lib/layouts/lettre.layout:72
+#: lib/layouts/lettre.layout:629 lib/layouts/stdletter.inc:104
 msgid "cc"
 msgstr "Kopi til"
 
-#: lib/layouts/dinbrief.layout:230\r lib/layouts/g-brief.layout:229
-#: lib/layouts/g-brief2.layout:1009\r lib/layouts/lettre.layout:633
-#: lib/layouts/scrlettr.layout:105\r lib/layouts/scrlttr2.layout:137
+#: lib/layouts/dinbrief.layout:230 lib/layouts/g-brief.layout:229
+#: lib/layouts/g-brief2.layout:1009 lib/layouts/lettre.layout:633
+#: lib/layouts/scrlettr.layout:105 lib/layouts/scrlttr2.layout:137
 #: lib/layouts/stdletter.inc:107
 msgid "cc:"
 msgstr "Kopi til:"
 
-#: lib/layouts/dinbrief.layout:234\r lib/layouts/scrlettr.layout:85
+#: lib/layouts/dinbrief.layout:234 lib/layouts/scrlettr.layout:85
 #: lib/layouts/scrlttr2.layout:125
 msgid "PS"
 msgstr "PS"
 
-#: lib/layouts/dinbrief.layout:236\r lib/layouts/scrlttr2.layout:129
+#: lib/layouts/dinbrief.layout:236 lib/layouts/scrlttr2.layout:129
 msgid "Post Scriptum:"
 msgstr "Post Scriptum:"
 
-#: lib/layouts/dinbrief.layout:249\r lib/layouts/scrlttr2.layout:179
+#: lib/layouts/dinbrief.layout:249 lib/layouts/scrlttr2.layout:179
 msgid "SenderAddress"
 msgstr "SendarSinAdresse"
 
-#: lib/layouts/dinbrief.layout:254\r lib/layouts/scrlettr.layout:172
+#: lib/layouts/dinbrief.layout:254 lib/layouts/scrlettr.layout:172
 #: lib/layouts/scrlttr2.layout:251
 msgid "Backaddress"
 msgstr "Bakside-adresse"
@@ -8637,8 +8637,8 @@ msgstr "Vedlegg"
 msgid "IhrZeichen"
 msgstr "DinReferanse"
 
-#: lib/layouts/dinbrief.layout:289\r lib/layouts/g-brief.layout:112
-#: lib/layouts/g-brief2.layout:52\r lib/layouts/g-brief2.layout:841
+#: lib/layouts/dinbrief.layout:289 lib/layouts/g-brief.layout:112
+#: lib/layouts/g-brief2.layout:52 lib/layouts/g-brief2.layout:841
 msgid "YourMail"
 msgstr "DinAdresse"
 
@@ -8658,8 +8658,8 @@ msgstr "Underskrift"
 msgid "Telefon"
 msgstr "Telefon"
 
-#: lib/layouts/dinbrief.layout:319\r lib/layouts/lettre.layout:48
-#: lib/layouts/lettre.layout:158\r lib/layouts/scrlettr.layout:158
+#: lib/layouts/dinbrief.layout:319 lib/layouts/lettre.layout:48
+#: lib/layouts/lettre.layout:158 lib/layouts/scrlettr.layout:158
 #: lib/layouts/scrlttr2.layout:235
 msgid "Place"
 msgstr "Stad"
@@ -8668,7 +8668,7 @@ msgstr "Stad"
 msgid "Stadt"
 msgstr "Stad"
 
-#: lib/layouts/dinbrief.layout:329\r lib/layouts/g-brief.layout:77
+#: lib/layouts/dinbrief.layout:329 lib/layouts/g-brief.layout:77
 msgid "Town"
 msgstr "Stad"
 
@@ -8680,8 +8680,8 @@ msgstr "Stad"
 msgid "Datum"
 msgstr "Dato"
 
-#: lib/layouts/dinbrief.layout:344\r lib/layouts/g-brief.layout:198
-#: lib/layouts/g-brief2.layout:46\r lib/layouts/g-brief2.layout:882
+#: lib/layouts/dinbrief.layout:344 lib/layouts/g-brief.layout:198
+#: lib/layouts/g-brief2.layout:46 lib/layouts/g-brief2.layout:882
 #: lib/layouts/iucr.layout:256
 msgid "Reference"
 msgstr "Referanse"
@@ -8706,7 +8706,7 @@ msgstr "Helsing"
 msgid "ps"
 msgstr "ps"
 
-#: lib/layouts/dinbrief.layout:378\r lib/layouts/g-brief.layout:216
+#: lib/layouts/dinbrief.layout:378 lib/layouts/g-brief.layout:216
 #: lib/layouts/g-brief2.layout:975
 msgid "Encl."
 msgstr "Vedlgg."
@@ -8715,7 +8715,7 @@ msgstr "Vedlgg."
 msgid "Anlagen"
 msgstr "Grunn"
 
-#: lib/layouts/dinbrief.layout:388\r lib/layouts/scrlettr.layout:95
+#: lib/layouts/dinbrief.layout:388 lib/layouts/scrlettr.layout:95
 #: lib/layouts/scrlttr2.layout:133
 msgid "CC"
 msgstr "Kopi til"
@@ -8729,7 +8729,7 @@ msgstr "Seljar"
 msgid "DocBook Book (SGML)"
 msgstr "DocBook (XML)"
 
-#: lib/layouts/docbook-book.layout:4\r lib/layouts/docbook-chapter.layout:4
+#: lib/layouts/docbook-book.layout:4 lib/layouts/docbook-chapter.layout:4
 #: lib/layouts/docbook-section.layout:4
 #, fuzzy
 msgid "Books (DocBook)"
@@ -8766,7 +8766,7 @@ msgstr ""
 msgid "RunTitle"
 msgstr "Løpetittel"
 
-#: lib/layouts/ectaart.layout:29\r lib/layouts/llncs.layout:166
+#: lib/layouts/ectaart.layout:29 lib/layouts/llncs.layout:166
 msgid "Running Title:"
 msgstr "Laupetittel:"
 
@@ -8778,12 +8778,12 @@ msgstr "Løpeforfattar"
 msgid "Running Author:"
 msgstr "Laupeforfattar:"
 
-#: lib/layouts/ectaart.layout:67\r lib/layouts/elsart.layout:148
+#: lib/layouts/ectaart.layout:67 lib/layouts/elsart.layout:148
 #, fuzzy
 msgid "Address Option"
 msgstr "AdresseForEkstraKopiar:"
 
-#: lib/layouts/ectaart.layout:68\r lib/layouts/elsart.layout:149
+#: lib/layouts/ectaart.layout:68 lib/layouts/elsart.layout:149
 #, fuzzy
 msgid "Optional argument for the address"
 msgstr "Legg valfritt argument som et frå høgre"
@@ -8798,8 +8798,8 @@ msgstr "Matte val"
 msgid "Optional argument for the e-mail"
 msgstr "Legg valfritt argument som et frå høgre"
 
-#: lib/layouts/ectaart.layout:84\r lib/layouts/europasscv.layout:125
-#: lib/layouts/europecv.layout:74\r lib/layouts/latex8.layout:78
+#: lib/layouts/ectaart.layout:84 lib/layouts/europasscv.layout:125
+#: lib/layouts/europecv.layout:74 lib/layouts/latex8.layout:78
 msgid "E-mail:"
 msgstr "E-post:"
 
@@ -8819,9 +8819,9 @@ msgstr "Forfattarramme"
 msgid "Authors Block:"
 msgstr "Forfattarramme:"
 
-#: lib/layouts/ectaart.layout:123\r lib/layouts/ectaart.layout:206
-#: lib/layouts/ectaart.layout:209\r lib/layouts/entcs.layout:101
-#: lib/layouts/iucr.layout:194\r lib/layouts/agu_stdtitle.inc:411
+#: lib/layouts/ectaart.layout:123 lib/layouts/ectaart.layout:206
+#: lib/layouts/ectaart.layout:209 lib/layouts/entcs.layout:101
+#: lib/layouts/iucr.layout:194 lib/layouts/agu_stdtitle.inc:411
 #: lib/layouts/agu_stdtitle.inc:413
 msgid "Keyword"
 msgstr "Nøkkelord"
@@ -8850,7 +8850,7 @@ msgstr "Internettadresse referanse"
 msgid "Internet Addess Ref"
 msgstr "Internettadresse ref"
 
-#: lib/layouts/ectaart.layout:178\r lib/layouts/ectaart.layout:181
+#: lib/layouts/ectaart.layout:178 lib/layouts/ectaart.layout:181
 msgid "Corresponding Author"
 msgstr "Brevbytande forfattar"
 
@@ -8858,7 +8858,7 @@ msgstr "Brevbytande forfattar"
 msgid "Name (First Name)"
 msgstr "namn (Fornamn)"
 
-#: lib/layouts/ectaart.layout:195\r lib/layouts/moderncv.layout:93
+#: lib/layouts/ectaart.layout:195 lib/layouts/moderncv.layout:93
 msgid "First Name"
 msgstr "Fornamn"
 
@@ -8866,11 +8866,11 @@ msgstr "Fornamn"
 msgid "Name (Surname)"
 msgstr "Namn (Etternamn)"
 
-#: lib/layouts/ectaart.layout:202\r lib/layouts/iucr.layout:127
-#: lib/layouts/iucr.layout:128\r lib/layouts/revtex4-1.layout:332
-#: lib/layouts/revtex4-1.layout:334\r lib/layouts/agu_stdclass.inc:66
-#: lib/layouts/agu_stdclass.inc:68\r lib/layouts/db_stdcharstyles.inc:49
-#: lib/layouts/db_stdcharstyles.inc:51\r lib/layouts/db_stdtitle.inc:98
+#: lib/layouts/ectaart.layout:202 lib/layouts/iucr.layout:127
+#: lib/layouts/iucr.layout:128 lib/layouts/revtex4-1.layout:332
+#: lib/layouts/revtex4-1.layout:334 lib/layouts/agu_stdclass.inc:66
+#: lib/layouts/agu_stdclass.inc:68 lib/layouts/db_stdcharstyles.inc:49
+#: lib/layouts/db_stdcharstyles.inc:51 lib/layouts/db_stdtitle.inc:98
 msgid "Surname"
 msgstr "Etternamn"
 
@@ -8886,7 +8886,7 @@ msgstr "ibid"
 msgid "European Geophysical Society (EGS)"
 msgstr ""
 
-#: lib/layouts/egs.layout:151\r lib/layouts/stdlyxlist.inc:20
+#: lib/layouts/egs.layout:151 lib/layouts/stdlyxlist.inc:20
 msgid "00.00.0000"
 msgstr "00.00.0000"
 
@@ -8894,7 +8894,7 @@ msgstr "00.00.0000"
 msgid "LaTeX Title"
 msgstr "LaTeX tittel"
 
-#: lib/layouts/egs.layout:324\r lib/layouts/svmult.layout:83
+#: lib/layouts/egs.layout:324 lib/layouts/svmult.layout:83
 msgid "Author:"
 msgstr "Forfattar:"
 
@@ -8922,24 +8922,24 @@ msgstr "Fyrsteforfattar"
 msgid "1st_author_surname:"
 msgstr "1.forfattar sitt etternamn:"
 
-#: lib/layouts/egs.layout:423\r lib/layouts/ijmpc.layout:173
-#: lib/layouts/ijmpc.layout:177\r lib/layouts/ijmpd.layout:163
-#: lib/layouts/ijmpd.layout:167\r lib/layouts/agu_stdtitle.inc:199
+#: lib/layouts/egs.layout:423 lib/layouts/ijmpc.layout:173
+#: lib/layouts/ijmpc.layout:177 lib/layouts/ijmpd.layout:163
+#: lib/layouts/ijmpd.layout:167 lib/layouts/agu_stdtitle.inc:199
 #: lib/layouts/aguplus.inc:111
 msgid "Received"
 msgstr "Motteke"
 
-#: lib/layouts/egs.layout:436\r lib/layouts/agu_stdtitle.inc:202
+#: lib/layouts/egs.layout:436 lib/layouts/agu_stdtitle.inc:202
 #: lib/layouts/aguplus.inc:115
 msgid "Received:"
 msgstr "Motteke:"
 
-#: lib/layouts/egs.layout:445\r lib/layouts/agu_stdtitle.inc:215
+#: lib/layouts/egs.layout:445 lib/layouts/agu_stdtitle.inc:215
 #: lib/layouts/aguplus.inc:127
 msgid "Accepted"
 msgstr "Akseptert"
 
-#: lib/layouts/egs.layout:458\r lib/layouts/agu_stdtitle.inc:218
+#: lib/layouts/egs.layout:458 lib/layouts/agu_stdtitle.inc:218
 #: lib/layouts/aguplus.inc:131
 msgid "Accepted:"
 msgstr "Akseptert:"
@@ -8970,23 +8970,23 @@ msgstr "Legg valfritt argument som et frå høgre"
 msgid "Author Address"
 msgstr "Forfattar adresse"
 
-#: lib/layouts/elsart.layout:157\r lib/layouts/revtex4-1.layout:114
+#: lib/layouts/elsart.layout:157 lib/layouts/revtex4-1.layout:114
 #: lib/layouts/revtex4.layout:201
 msgid "Author Email"
 msgstr "Forfattar E-post"
 
-#: lib/layouts/elsart.layout:167\r lib/layouts/lettre.layout:405
-#: lib/layouts/llncs.layout:243\r lib/layouts/moderncv.layout:180
+#: lib/layouts/elsart.layout:167 lib/layouts/lettre.layout:405
+#: lib/layouts/llncs.layout:243 lib/layouts/moderncv.layout:180
 msgid "Email:"
 msgstr "Epost:"
 
-#: lib/layouts/elsart.layout:178\r lib/layouts/revtex4-1.layout:129
+#: lib/layouts/elsart.layout:178 lib/layouts/revtex4-1.layout:129
 #: lib/layouts/revtex4.layout:220
 msgid "Author URL"
 msgstr "Forfattar URL"
 
-#: lib/layouts/elsart.layout:189\r lib/layouts/revtex4-1.layout:132
-#: lib/layouts/revtex4.layout:229\r lib/layouts/amsdefs.inc:161
+#: lib/layouts/elsart.layout:189 lib/layouts/revtex4-1.layout:132
+#: lib/layouts/revtex4.layout:229 lib/layouts/amsdefs.inc:161
 msgid "URL:"
 msgstr "URL:"
 
@@ -9108,7 +9108,7 @@ msgstr "fotnoteetikett"
 msgid "Label you refer to in the title"
 msgstr ""
 
-#: lib/layouts/elsarticle.layout:141\r lib/layouts/revtex4-1.layout:193
+#: lib/layouts/elsarticle.layout:141 lib/layouts/revtex4-1.layout:193
 msgid "Title footnote:"
 msgstr "Tittelfotnote:"
 
@@ -9180,7 +9180,7 @@ msgstr ""
 msgid "Electronic Notes in Theor. Comp. Sc. (ENTCS)"
 msgstr ""
 
-#: lib/layouts/entcs.layout:111\r lib/layouts/siamltex.layout:315
+#: lib/layouts/entcs.layout:111 lib/layouts/siamltex.layout:315
 msgid "Key words:"
 msgstr "Nøkkelord:"
 
@@ -9188,18 +9188,18 @@ msgstr "Nøkkelord:"
 msgid "Europass CV (2013)"
 msgstr ""
 
-#: lib/layouts/europasscv.layout:4\r lib/layouts/europecv.layout:4
-#: lib/layouts/moderncv.layout:4\r lib/layouts/simplecv.layout:4
+#: lib/layouts/europasscv.layout:4 lib/layouts/europecv.layout:4
+#: lib/layouts/moderncv.layout:4 lib/layouts/simplecv.layout:4
 msgid "Curricula Vitae"
 msgstr ""
 
-#: lib/layouts/europasscv.layout:84\r lib/layouts/europecv.layout:40
-#: lib/layouts/g-brief.layout:47\r lib/layouts/g-brief2.layout:93
-#: lib/layouts/scrlettr.layout:128\r lib/layouts/agu_stdtitle.inc:189
+#: lib/layouts/europasscv.layout:84 lib/layouts/europecv.layout:40
+#: lib/layouts/g-brief.layout:47 lib/layouts/g-brief2.layout:93
+#: lib/layouts/scrlettr.layout:128 lib/layouts/agu_stdtitle.inc:189
 msgid "Name:"
 msgstr "Namn:"
 
-#: lib/layouts/europasscv.layout:94\r lib/layouts/europecv.layout:47
+#: lib/layouts/europasscv.layout:94 lib/layouts/europecv.layout:47
 #, fuzzy
 msgid "FooterName"
 msgstr "Botntekst:"
@@ -9209,22 +9209,22 @@ msgstr "Botntekst:"
 msgid "Name (footer):"
 msgstr "Siste botntekst:"
 
-#: lib/layouts/europasscv.layout:111\r lib/layouts/moderncv.layout:166
+#: lib/layouts/europasscv.layout:111 lib/layouts/moderncv.layout:166
 #, fuzzy
 msgid "Mobile:"
 msgstr "&Fil:"
 
-#: lib/layouts/europasscv.layout:112\r lib/layouts/europecv.layout:83
+#: lib/layouts/europasscv.layout:112 lib/layouts/europecv.layout:83
 #, fuzzy
 msgid "Mobile phone number"
 msgstr "Linjenummerering"
 
-#: lib/layouts/europasscv.layout:128\r lib/layouts/jasatex.layout:133
+#: lib/layouts/europasscv.layout:128 lib/layouts/jasatex.layout:133
 #: lib/layouts/moderncv.layout:183
 msgid "Homepage"
 msgstr "Heimeside"
 
-#: lib/layouts/europasscv.layout:131\r lib/layouts/moderncv.layout:186
+#: lib/layouts/europasscv.layout:131 lib/layouts/moderncv.layout:186
 #, fuzzy
 msgid "Homepage:"
 msgstr "Heimeside"
@@ -9247,49 +9247,49 @@ msgstr "&Type:"
 msgid "IM Type (e.g., AOL Messenger)"
 msgstr ""
 
-#: lib/layouts/europasscv.layout:146\r lib/layouts/europecv.layout:59
+#: lib/layouts/europasscv.layout:146 lib/layouts/europecv.layout:59
 msgid "Birthday"
 msgstr ""
 
-#: lib/layouts/europasscv.layout:149\r lib/layouts/europecv.layout:62
+#: lib/layouts/europasscv.layout:149 lib/layouts/europecv.layout:62
 #, fuzzy
 msgid "Date of birth:"
 msgstr "&Datoformat:"
 
-#: lib/layouts/europasscv.layout:152\r lib/layouts/europecv.layout:53
+#: lib/layouts/europasscv.layout:152 lib/layouts/europecv.layout:53
 #, fuzzy
 msgid "Nationality"
 msgstr "valfritt"
 
-#: lib/layouts/europasscv.layout:155\r lib/layouts/europecv.layout:56
+#: lib/layouts/europasscv.layout:155 lib/layouts/europecv.layout:56
 #, fuzzy
 msgid "Nationality:"
 msgstr "Fasilitet:"
 
-#: lib/layouts/europasscv.layout:158\r lib/layouts/europecv.layout:87
+#: lib/layouts/europasscv.layout:158 lib/layouts/europecv.layout:87
 msgid "Gender"
 msgstr ""
 
-#: lib/layouts/europasscv.layout:161\r lib/layouts/europecv.layout:90
+#: lib/layouts/europasscv.layout:161 lib/layouts/europecv.layout:90
 #, fuzzy
 msgid "Gender:"
 msgstr "Overskrift:"
 
-#: lib/layouts/europasscv.layout:164\r lib/layouts/europecv.layout:99
+#: lib/layouts/europasscv.layout:164 lib/layouts/europecv.layout:99
 #, fuzzy
 msgid "BeforePicture"
 msgstr "Kontrollbilete"
 
-#: lib/layouts/europasscv.layout:167\r lib/layouts/europecv.layout:102
+#: lib/layouts/europasscv.layout:167 lib/layouts/europecv.layout:102
 msgid "Space before picture:"
 msgstr ""
 
-#: lib/layouts/europasscv.layout:170\r lib/layouts/europecv.layout:105
+#: lib/layouts/europasscv.layout:170 lib/layouts/europecv.layout:105
 #, fuzzy
 msgid "Picture"
 msgstr "Struktur"
 
-#: lib/layouts/europasscv.layout:173\r lib/layouts/europecv.layout:108
+#: lib/layouts/europasscv.layout:173 lib/layouts/europecv.layout:108
 #, fuzzy
 msgid "Picture:"
 msgstr "Signatur:"
@@ -9298,39 +9298,39 @@ msgstr "Signatur:"
 msgid "Resize photo to this width"
 msgstr ""
 
-#: lib/layouts/europasscv.layout:180\r lib/layouts/europecv.layout:115
+#: lib/layouts/europasscv.layout:180 lib/layouts/europecv.layout:115
 #, fuzzy
 msgid "AfterPicture"
 msgstr "Struktur"
 
-#: lib/layouts/europasscv.layout:183\r lib/layouts/europecv.layout:118
+#: lib/layouts/europasscv.layout:183 lib/layouts/europecv.layout:118
 msgid "Space after picture:"
 msgstr ""
 
-#: lib/layouts/europasscv.layout:194\r lib/layouts/europasscv.layout:217
-#: lib/layouts/europasscv.layout:253\r lib/layouts/europecv.layout:159
-#: lib/layouts/europecv.layout:218\r src/insets/Inset.cpp:115
+#: lib/layouts/europasscv.layout:194 lib/layouts/europasscv.layout:217
+#: lib/layouts/europasscv.layout:253 lib/layouts/europecv.layout:159
+#: lib/layouts/europecv.layout:218 src/insets/Inset.cpp:115
 #: src/insets/InsetVSpace.cpp:122
 msgid "Vertical Space"
 msgstr "Loddrettavstand"
 
-#: lib/layouts/europasscv.layout:195\r lib/layouts/europasscv.layout:218
-#: lib/layouts/europasscv.layout:254\r lib/layouts/europecv.layout:160
+#: lib/layouts/europasscv.layout:195 lib/layouts/europasscv.layout:218
+#: lib/layouts/europasscv.layout:254 lib/layouts/europecv.layout:160
 #: lib/layouts/europecv.layout:219
 #, fuzzy
 msgid "Additional vertical space"
 msgstr "Valfri loddrettavstand"
 
-#: lib/layouts/europasscv.layout:211\r lib/layouts/europecv.layout:153
+#: lib/layouts/europasscv.layout:211 lib/layouts/europecv.layout:153
 #: lib/layouts/moderncv.layout:371
 msgid "Item"
 msgstr "Element"
 
-#: lib/layouts/europasscv.layout:224\r lib/layouts/europasscv.layout:260
+#: lib/layouts/europasscv.layout:224 lib/layouts/europasscv.layout:260
 msgid "Summary of the item, can also be the time span"
 msgstr ""
 
-#: lib/layouts/europasscv.layout:230\r lib/layouts/europecv.layout:172
+#: lib/layouts/europasscv.layout:230 lib/layouts/europecv.layout:172
 #: lib/layouts/moderncv.layout:385
 msgid "Item:"
 msgstr "Element:"
@@ -9364,7 +9364,7 @@ msgstr "Tittel"
 msgid "Title level:"
 msgstr "Tittel:"
 
-#: lib/layouts/europasscv.layout:284\r lib/layouts/europasscv.layout:285
+#: lib/layouts/europasscv.layout:284 lib/layouts/europasscv.layout:285
 #, fuzzy
 msgid "Text (right side)"
 msgstr "Lag høgrelinje"
@@ -9403,92 +9403,92 @@ msgstr "Listepunkt:"
 msgid "EcvItemize"
 msgstr "Punktliste"
 
-#: lib/layouts/europasscv.layout:335\r lib/layouts/europecv.layout:212
+#: lib/layouts/europasscv.layout:335 lib/layouts/europecv.layout:212
 msgid "MotherTongue"
 msgstr "Morsmål"
 
-#: lib/layouts/europasscv.layout:344\r lib/layouts/europecv.layout:225
+#: lib/layouts/europasscv.layout:344 lib/layouts/europecv.layout:225
 msgid "Mother Tongue:"
 msgstr "Morsmål:"
 
-#: lib/layouts/europasscv.layout:354\r lib/layouts/europecv.layout:235
+#: lib/layouts/europasscv.layout:354 lib/layouts/europecv.layout:235
 msgid "LangHeader"
 msgstr "Språktittel"
 
-#: lib/layouts/europasscv.layout:358\r lib/layouts/europecv.layout:239
+#: lib/layouts/europasscv.layout:358 lib/layouts/europecv.layout:239
 msgid "Language Header:"
 msgstr "Språk:"
 
-#: lib/layouts/europasscv.layout:375\r lib/layouts/europecv.layout:245
+#: lib/layouts/europasscv.layout:375 lib/layouts/europecv.layout:245
 msgid "Language:"
 msgstr "Språk:"
 
-#: lib/layouts/europasscv.layout:380\r lib/layouts/europecv.layout:249
+#: lib/layouts/europasscv.layout:380 lib/layouts/europecv.layout:249
 #, fuzzy
 msgid "Name of the language"
 msgstr "Ikkje oppgitt språk"
 
-#: lib/layouts/europasscv.layout:385\r lib/layouts/europecv.layout:253
+#: lib/layouts/europasscv.layout:385 lib/layouts/europecv.layout:253
 #, fuzzy
 msgid "Listening"
 msgstr "Kodeliste"
 
-#: lib/layouts/europasscv.layout:386\r lib/layouts/europecv.layout:254
+#: lib/layouts/europasscv.layout:386 lib/layouts/europecv.layout:254
 msgid "Level how good you think you can listen"
 msgstr ""
 
-#: lib/layouts/europasscv.layout:391\r lib/layouts/europecv.layout:258
+#: lib/layouts/europasscv.layout:391 lib/layouts/europecv.layout:258
 #, fuzzy
 msgid "Reading"
 msgstr "Hovud"
 
-#: lib/layouts/europasscv.layout:392\r lib/layouts/europecv.layout:259
+#: lib/layouts/europasscv.layout:392 lib/layouts/europecv.layout:259
 msgid "Level how good you think you can read"
 msgstr ""
 
-#: lib/layouts/europasscv.layout:397\r lib/layouts/europecv.layout:263
+#: lib/layouts/europasscv.layout:397 lib/layouts/europecv.layout:263
 #, fuzzy
 msgid "Interaction"
 msgstr "Introduksjon|I"
 
-#: lib/layouts/europasscv.layout:398\r lib/layouts/europecv.layout:264
+#: lib/layouts/europasscv.layout:398 lib/layouts/europecv.layout:264
 msgid "Level how good you think you can conversate"
 msgstr ""
 
-#: lib/layouts/europasscv.layout:403\r lib/layouts/europecv.layout:268
+#: lib/layouts/europasscv.layout:403 lib/layouts/europecv.layout:268
 #, fuzzy
 msgid "Production"
 msgstr "Introduksjon|I"
 
-#: lib/layouts/europasscv.layout:404\r lib/layouts/europecv.layout:269
+#: lib/layouts/europasscv.layout:404 lib/layouts/europecv.layout:269
 msgid "Level how good you think you can freely talk"
 msgstr ""
 
-#: lib/layouts/europasscv.layout:408\r lib/layouts/europecv.layout:273
+#: lib/layouts/europasscv.layout:408 lib/layouts/europecv.layout:273
 msgid "LastLanguage"
 msgstr "SisteSpråk"
 
-#: lib/layouts/europasscv.layout:411\r lib/layouts/europecv.layout:276
+#: lib/layouts/europasscv.layout:411 lib/layouts/europecv.layout:276
 msgid "Last Language:"
 msgstr "Siste Språk:"
 
-#: lib/layouts/europasscv.layout:414\r lib/layouts/europecv.layout:279
+#: lib/layouts/europasscv.layout:414 lib/layouts/europecv.layout:279
 msgid "LangFooter"
 msgstr "SpråkBotntekst"
 
-#: lib/layouts/europasscv.layout:417\r lib/layouts/europecv.layout:282
+#: lib/layouts/europasscv.layout:417 lib/layouts/europecv.layout:282
 msgid "Language Footer:"
 msgstr "Språk-botntekst:"
 
-#: lib/layouts/europasscv.layout:420\r lib/layouts/europecv.layout:285
+#: lib/layouts/europasscv.layout:420 lib/layouts/europecv.layout:285
 msgid "End"
 msgstr "Slutt"
 
-#: lib/layouts/europasscv.layout:431\r lib/layouts/europecv.layout:296
+#: lib/layouts/europasscv.layout:431 lib/layouts/europecv.layout:296
 msgid "End of CV"
 msgstr "Slutt CV"
 
-#: lib/layouts/europasscv.layout:441\r lib/layouts/europasscv.layout:446
+#: lib/layouts/europasscv.layout:441 lib/layouts/europasscv.layout:446
 #, fuzzy
 msgid "Highlight"
 msgstr "Visfram:"
@@ -9502,7 +9502,7 @@ msgstr ""
 msgid "Footer name:"
 msgstr "Botntekst:"
 
-#: lib/layouts/europecv.layout:82\r lib/layouts/moderncv.layout:163
+#: lib/layouts/europecv.layout:82 lib/layouts/moderncv.layout:163
 #, fuzzy
 msgid "Mobile"
 msgstr "&Fil:"
@@ -9516,7 +9516,7 @@ msgstr "&Storleik:"
 msgid "Size the photo is resized to"
 msgstr ""
 
-#: lib/layouts/europecv.layout:121\r src/frontends/qt4/GuiDocument.cpp:132
+#: lib/layouts/europecv.layout:121 src/frontends/qt4/GuiDocument.cpp:132
 msgid "Page"
 msgstr "Side"
 
@@ -9632,84 +9632,84 @@ msgstr "Avgrensing"
 msgid "Restriction:"
 msgstr "Avgrensing:"
 
-#: lib/layouts/foils.layout:187\r lib/layouts/simplecv.layout:109
-#: lib/layouts/aguplus.inc:80\r lib/layouts/customHeadersFooters.module:11
+#: lib/layouts/foils.layout:187 lib/layouts/simplecv.layout:109
+#: lib/layouts/aguplus.inc:80 lib/layouts/customHeadersFooters.module:11
 msgid "Left Header"
 msgstr "Venstre topptekst"
 
-#: lib/layouts/foils.layout:191\r lib/layouts/aguplus.inc:93
+#: lib/layouts/foils.layout:191 lib/layouts/aguplus.inc:93
 #: lib/layouts/customHeadersFooters.module:18
 msgid "Left Header:"
 msgstr "Venstre topptekst:"
 
-#: lib/layouts/foils.layout:195\r lib/layouts/simplecv.layout:126
-#: lib/layouts/aguplus.inc:103\r lib/layouts/customHeadersFooters.module:39
+#: lib/layouts/foils.layout:195 lib/layouts/simplecv.layout:126
+#: lib/layouts/aguplus.inc:103 lib/layouts/customHeadersFooters.module:39
 msgid "Right Header"
 msgstr "Høgre topptekst"
 
-#: lib/layouts/foils.layout:199\r lib/layouts/aguplus.inc:107
+#: lib/layouts/foils.layout:199 lib/layouts/aguplus.inc:107
 #: lib/layouts/customHeadersFooters.module:42
 msgid "Right Header:"
 msgstr "Høgre topptekst:"
 
-#: lib/layouts/foils.layout:203\r lib/layouts/customHeadersFooters.module:57
+#: lib/layouts/foils.layout:203 lib/layouts/customHeadersFooters.module:57
 msgid "Right Footer"
 msgstr "Høgre botntekst"
 
-#: lib/layouts/foils.layout:207\r lib/layouts/customHeadersFooters.module:60
+#: lib/layouts/foils.layout:207 lib/layouts/customHeadersFooters.module:60
 msgid "Right Footer:"
 msgstr "Høgre botntekst:"
 
-#: lib/layouts/foils.layout:235\r lib/layouts/heb-article.layout:45
+#: lib/layouts/foils.layout:235 lib/layouts/heb-article.layout:45
 #: lib/layouts/llncs.layout:429
 msgid "Theorem #."
 msgstr "Teorem #."
 
-#: lib/layouts/foils.layout:249\r lib/layouts/heb-article.layout:60
+#: lib/layouts/foils.layout:249 lib/layouts/heb-article.layout:60
 #: lib/layouts/llncs.layout:368
 msgid "Lemma #."
 msgstr "Lemma #."
 
-#: lib/layouts/foils.layout:256\r lib/layouts/heb-article.layout:70
+#: lib/layouts/foils.layout:256 lib/layouts/heb-article.layout:70
 #: lib/layouts/llncs.layout:333
 msgid "Corollary #."
 msgstr "Korollar #."
 
-#: lib/layouts/foils.layout:263\r lib/layouts/llncs.layout:402
+#: lib/layouts/foils.layout:263 lib/layouts/llncs.layout:402
 msgid "Proposition #."
 msgstr "Framlegg #."
 
-#: lib/layouts/foils.layout:270\r lib/layouts/heb-article.layout:90
+#: lib/layouts/foils.layout:270 lib/layouts/heb-article.layout:90
 #: lib/layouts/llncs.layout:347
 msgid "Definition #."
 msgstr "Definisjon #."
 
-#: lib/layouts/foils.layout:295\r lib/layouts/siamltex.layout:74
-#: lib/layouts/theorems-order.inc:10\r lib/layouts/theorems-starred.inc:24
+#: lib/layouts/foils.layout:295 lib/layouts/siamltex.layout:74
+#: lib/layouts/theorems-order.inc:10 lib/layouts/theorems-starred.inc:24
 msgid "Theorem*"
 msgstr "Teorem*"
 
-#: lib/layouts/foils.layout:302\r lib/layouts/siamltex.layout:94
-#: lib/layouts/theorems-order.inc:22\r lib/layouts/theorems-starred.inc:85
+#: lib/layouts/foils.layout:302 lib/layouts/siamltex.layout:94
+#: lib/layouts/theorems-order.inc:22 lib/layouts/theorems-starred.inc:85
 msgid "Lemma*"
 msgstr "Lemma*"
 
-#: lib/layouts/foils.layout:309\r lib/layouts/siamltex.layout:84
-#: lib/layouts/theorems-order.inc:16\r lib/layouts/theorems-starred.inc:68
+#: lib/layouts/foils.layout:309 lib/layouts/siamltex.layout:84
+#: lib/layouts/theorems-order.inc:16 lib/layouts/theorems-starred.inc:68
 msgid "Corollary*"
 msgstr "Korollar*"
 
-#: lib/layouts/foils.layout:316\r lib/layouts/siamltex.layout:104
-#: lib/layouts/theorems-order.inc:28\r lib/layouts/theorems-starred.inc:102
+#: lib/layouts/foils.layout:316 lib/layouts/siamltex.layout:104
+#: lib/layouts/theorems-order.inc:28 lib/layouts/theorems-starred.inc:102
 msgid "Proposition*"
 msgstr "Framlegg*"
 
-#: lib/layouts/foils.layout:319\r lib/layouts/theorems-starred.inc:105
+#: lib/layouts/foils.layout:319 lib/layouts/theorems-starred.inc:105
 msgid "Proposition."
 msgstr "Framlegg."
 
-#: lib/layouts/foils.layout:323\r lib/layouts/siamltex.layout:133
-#: lib/layouts/theorems-order.inc:40\r lib/layouts/theorems-starred.inc:153
+#: lib/layouts/foils.layout:323 lib/layouts/siamltex.layout:133
+#: lib/layouts/theorems-order.inc:40 lib/layouts/theorems-starred.inc:153
 msgid "Definition*"
 msgstr "Definisjon*"
 
@@ -9721,11 +9721,11 @@ msgstr ""
 msgid "G-Brief (V. 1, Obsolete)"
 msgstr ""
 
-#: lib/layouts/g-brief.layout:27\r lib/layouts/g-brief2.layout:74
+#: lib/layouts/g-brief.layout:27 lib/layouts/g-brief2.layout:74
 msgid "Letter:"
 msgstr "Brev:"
 
-#: lib/layouts/g-brief.layout:63\r lib/layouts/agu_stdtitle.inc:448
+#: lib/layouts/g-brief.layout:63 lib/layouts/agu_stdtitle.inc:448
 #: lib/layouts/agu_stdtitle.inc:450
 msgid "Street"
 msgstr "Gate"
@@ -9746,7 +9746,7 @@ msgstr "Vedlegg:"
 msgid "Town:"
 msgstr "Stad:"
 
-#: lib/layouts/g-brief.layout:84\r lib/layouts/agu_stdtitle.inc:472
+#: lib/layouts/g-brief.layout:84 lib/layouts/agu_stdtitle.inc:472
 #: lib/layouts/agu_stdtitle.inc:474
 msgid "State"
 msgstr "Stat"
@@ -9755,25 +9755,25 @@ msgstr "Stat"
 msgid "State:"
 msgstr "Stat:"
 
-#: lib/layouts/g-brief.layout:91\r lib/layouts/g-brief2.layout:731
+#: lib/layouts/g-brief.layout:91 lib/layouts/g-brief2.layout:731
 msgid "ReturnAddress"
 msgstr "Returadresse"
 
-#: lib/layouts/g-brief.layout:94\r lib/layouts/g-brief2.layout:743
+#: lib/layouts/g-brief.layout:94 lib/layouts/g-brief2.layout:743
 msgid "ReturnAddress:"
 msgstr "Returadresse:"
 
-#: lib/layouts/g-brief.layout:101\r lib/layouts/g-brief2.layout:809
+#: lib/layouts/g-brief.layout:101 lib/layouts/g-brief2.layout:809
 #: lib/layouts/lettre.layout:473
 msgid "MyRef:"
 msgstr "MinRef:"
 
-#: lib/layouts/g-brief.layout:108\r lib/layouts/g-brief2.layout:830
+#: lib/layouts/g-brief.layout:108 lib/layouts/g-brief2.layout:830
 #: lib/layouts/lettre.layout:457
 msgid "YourRef:"
 msgstr "DinRef:"
 
-#: lib/layouts/g-brief.layout:115\r lib/layouts/g-brief2.layout:851
+#: lib/layouts/g-brief.layout:115 lib/layouts/g-brief2.layout:851
 msgid "YourMail:"
 msgstr "DinAdresse:"
 
@@ -9809,11 +9809,11 @@ msgstr "HTTP"
 msgid "HTTP:"
 msgstr "HTTP:"
 
-#: lib/layouts/g-brief.layout:154\r lib/layouts/scrlttr2.layout:219
+#: lib/layouts/g-brief.layout:154 lib/layouts/scrlttr2.layout:219
 msgid "Bank"
 msgstr "Bank"
 
-#: lib/layouts/g-brief.layout:157\r lib/layouts/scrlttr2.layout:223
+#: lib/layouts/g-brief.layout:157 lib/layouts/scrlttr2.layout:223
 msgid "Bank:"
 msgstr "Bank:"
 
@@ -9833,20 +9833,20 @@ msgstr "Bankkonto"
 msgid "BankAccount:"
 msgstr "Bankkonto:"
 
-#: lib/layouts/g-brief.layout:175\r lib/layouts/g-brief2.layout:42
+#: lib/layouts/g-brief.layout:175 lib/layouts/g-brief2.layout:42
 #: lib/layouts/g-brief2.layout:753
 msgid "PostalComment"
 msgstr "Post-kommentar  "
 
-#: lib/layouts/g-brief.layout:178\r lib/layouts/g-brief2.layout:765
+#: lib/layouts/g-brief.layout:178 lib/layouts/g-brief2.layout:765
 msgid "PostalComment:"
 msgstr "Post-kommentar :"
 
-#: lib/layouts/g-brief.layout:203\r lib/layouts/g-brief2.layout:894
+#: lib/layouts/g-brief.layout:203 lib/layouts/g-brief2.layout:894
 msgid "Reference:"
 msgstr "Referansen:"
 
-#: lib/layouts/g-brief.layout:220\r lib/layouts/g-brief2.layout:987
+#: lib/layouts/g-brief.layout:220 lib/layouts/g-brief2.layout:987
 msgid "Encl.:"
 msgstr "Vedlgg.:"
 
@@ -10119,7 +10119,7 @@ msgstr "Merknader"
 msgid "Remarks #."
 msgstr "Merknader #."
 
-#: lib/layouts/heb-article.layout:123\r lib/layouts/ijmpc.layout:340
+#: lib/layouts/heb-article.layout:123 lib/layouts/ijmpc.layout:340
 #: lib/layouts/ijmpd.layout:343
 msgid "Proof:"
 msgstr "Prov:"
@@ -10141,15 +10141,15 @@ msgstr "Meir"
 msgid "(MORE)"
 msgstr "(MEIR)"
 
-#: lib/layouts/hollywood.layout:80\r lib/layouts/hollywood.layout:91
+#: lib/layouts/hollywood.layout:80 lib/layouts/hollywood.layout:91
 msgid "FADE IN:"
 msgstr "LYS OPP:"
 
-#: lib/layouts/hollywood.layout:100\r lib/layouts/hollywood.layout:110
+#: lib/layouts/hollywood.layout:100 lib/layouts/hollywood.layout:110
 msgid "INT."
 msgstr "INV."
 
-#: lib/layouts/hollywood.layout:114\r lib/layouts/hollywood.layout:124
+#: lib/layouts/hollywood.layout:114 lib/layouts/hollywood.layout:124
 msgid "EXT."
 msgstr "UTV."
 
@@ -10165,7 +10165,7 @@ msgstr "(framhald)"
 msgid "Transition"
 msgstr "Overgang"
 
-#: lib/layouts/hollywood.layout:235\r lib/layouts/hollywood.layout:246
+#: lib/layouts/hollywood.layout:235 lib/layouts/hollywood.layout:246
 msgid "TITLE OVER:"
 msgstr "TITTEL OVER:"
 
@@ -10177,7 +10177,7 @@ msgstr "KROSSKLIPP"
 msgid "INTERCUT WITH:"
 msgstr "KROSSKLIPP MED:"
 
-#: lib/layouts/hollywood.layout:265\r lib/layouts/hollywood.layout:276
+#: lib/layouts/hollywood.layout:265 lib/layouts/hollywood.layout:276
 msgid "FADE OUT"
 msgstr "LYS UT"
 
@@ -10189,28 +10189,28 @@ msgstr "Scene"
 msgid "Int. Journal of Modern Physics C"
 msgstr ""
 
-#: lib/layouts/ijmpc.layout:74\r lib/layouts/ijmpd.layout:79
+#: lib/layouts/ijmpc.layout:74 lib/layouts/ijmpd.layout:79
 #, fuzzy
 msgid "Author Names"
 msgstr "Forfattarfotnotis:"
 
-#: lib/layouts/ijmpc.layout:75\r lib/layouts/ijmpd.layout:80
+#: lib/layouts/ijmpc.layout:75 lib/layouts/ijmpd.layout:80
 msgid "Author names that will appear in the header line"
 msgstr ""
 
-#: lib/layouts/ijmpc.layout:88\r lib/layouts/ijmpc.layout:92
-#: lib/layouts/ijmpc.layout:100\r lib/layouts/ijmpd.layout:93
-#: lib/layouts/ijmpd.layout:97\r lib/layouts/ijmpd.layout:105
+#: lib/layouts/ijmpc.layout:88 lib/layouts/ijmpc.layout:92
+#: lib/layouts/ijmpc.layout:100 lib/layouts/ijmpd.layout:93
+#: lib/layouts/ijmpd.layout:97 lib/layouts/ijmpd.layout:105
 msgid "Catchline"
 msgstr "Slagord"
 
-#: lib/layouts/ijmpc.layout:159\r lib/layouts/ijmpd.layout:149
+#: lib/layouts/ijmpc.layout:159 lib/layouts/ijmpd.layout:149
 msgid "History"
 msgstr "Historie"
 
-#: lib/layouts/ijmpc.layout:191\r lib/layouts/ijmpc.layout:195
-#: lib/layouts/ijmpd.layout:181\r lib/layouts/ijmpd.layout:185
-#: lib/layouts/agu_stdtitle.inc:207\r lib/layouts/aguplus.inc:119
+#: lib/layouts/ijmpc.layout:191 lib/layouts/ijmpc.layout:195
+#: lib/layouts/ijmpd.layout:181 lib/layouts/ijmpd.layout:185
+#: lib/layouts/agu_stdtitle.inc:207 lib/layouts/aguplus.inc:119
 msgid "Revised"
 msgstr "Retta"
 
@@ -10218,70 +10218,70 @@ msgstr "Retta"
 msgid "Classification Codes"
 msgstr "Kodar for klassifikasjon"
 
-#: lib/layouts/ijmpc.layout:247\r lib/layouts/ijmpd.layout:250
+#: lib/layouts/ijmpc.layout:247 lib/layouts/ijmpd.layout:250
 msgid "TableCaption"
 msgstr "TabellTekst"
 
-#: lib/layouts/ijmpc.layout:251\r lib/layouts/ijmpd.layout:254
+#: lib/layouts/ijmpc.layout:251 lib/layouts/ijmpd.layout:254
 msgid "Table caption"
 msgstr "Tabell tekst"
 
-#: lib/layouts/ijmpc.layout:265\r lib/layouts/ijmpd.layout:268
+#: lib/layouts/ijmpc.layout:265 lib/layouts/ijmpd.layout:268
 msgid "Refcite"
 msgstr "Refcite"
 
-#: lib/layouts/ijmpc.layout:269\r lib/layouts/ijmpd.layout:272
+#: lib/layouts/ijmpc.layout:269 lib/layouts/ijmpd.layout:272
 msgid "Cite reference"
 msgstr "Litteratur referanse"
 
-#: lib/layouts/ijmpc.layout:283\r lib/layouts/ijmpd.layout:286
+#: lib/layouts/ijmpc.layout:283 lib/layouts/ijmpd.layout:286
 msgid "ItemList"
 msgstr "Punktliste"
 
-#: lib/layouts/ijmpc.layout:304\r lib/layouts/ijmpd.layout:307
+#: lib/layouts/ijmpc.layout:304 lib/layouts/ijmpd.layout:307
 msgid "RomanList"
 msgstr "Romanskliste"
 
-#: lib/layouts/ijmpc.layout:310\r lib/layouts/ijmpd.layout:313
+#: lib/layouts/ijmpc.layout:310 lib/layouts/ijmpd.layout:313
 #, fuzzy
 msgid "Numbering Scheme"
 msgstr "&Nummerering"
 
-#: lib/layouts/ijmpc.layout:311\r lib/layouts/ijmpd.layout:314
+#: lib/layouts/ijmpc.layout:311 lib/layouts/ijmpd.layout:314
 msgid ""
 "Use the largest item number in your list, e.g. '(iv)' for 4 Roman numbered "
 "items"
 msgstr ""
 
-#: lib/layouts/ijmpc.layout:353\r lib/layouts/ijmpd.layout:359
-#: lib/layouts/theorems-ams-bytype.inc:75\r lib/layouts/theorems-ams.inc:47
+#: lib/layouts/ijmpc.layout:353 lib/layouts/ijmpd.layout:359
+#: lib/layouts/theorems-ams-bytype.inc:75 lib/layouts/theorems-ams.inc:47
 #: lib/layouts/theorems-bytype.inc:49
-#: lib/layouts/theorems-without-preamble.inc:55\r lib/layouts/theorems.inc:47
+#: lib/layouts/theorems-without-preamble.inc:55 lib/layouts/theorems.inc:47
 msgid "Theorem \\thetheorem."
 msgstr "Teorem \\thetheorem"
 
-#: lib/layouts/ijmpc.layout:371\r lib/layouts/ijmpd.layout:383
+#: lib/layouts/ijmpc.layout:371 lib/layouts/ijmpd.layout:383
 #: lib/layouts/theorems-ams-bytype.inc:101
 #: lib/layouts/theorems-bytype.inc:75
 #: lib/layouts/theorems-without-preamble.inc:79
 msgid "Corollary \\thecorollary."
 msgstr "Korollar \\thecorollary"
 
-#: lib/layouts/ijmpc.layout:375\r lib/layouts/ijmpd.layout:390
+#: lib/layouts/ijmpc.layout:375 lib/layouts/ijmpd.layout:390
 #: lib/layouts/theorems-ams-bytype.inc:119
 #: lib/layouts/theorems-bytype.inc:93
 #: lib/layouts/theorems-without-preamble.inc:95
 msgid "Lemma \\thelemma."
 msgstr "Lemma \\thelemma"
 
-#: lib/layouts/ijmpc.layout:379\r lib/layouts/ijmpd.layout:397
+#: lib/layouts/ijmpc.layout:379 lib/layouts/ijmpd.layout:397
 #: lib/layouts/theorems-ams-bytype.inc:137
 #: lib/layouts/theorems-bytype.inc:111
 #: lib/layouts/theorems-without-preamble.inc:111
 msgid "Proposition \\theproposition."
 msgstr "Framlegg \\theproposition"
 
-#: lib/layouts/ijmpc.layout:382\r lib/layouts/ijmpd.layout:403
+#: lib/layouts/ijmpc.layout:382 lib/layouts/ijmpd.layout:403
 #: lib/layouts/llncs.layout:405
 #: lib/layouts/theorems-without-preamble.inc:378
 #: lib/layouts/theorems-without-preamble.inc:385
@@ -10299,19 +10299,19 @@ msgstr "Framlegg \\theproposition"
 msgid "Question"
 msgstr "Spørsmål"
 
-#: lib/layouts/ijmpc.layout:383\r lib/layouts/ijmpd.layout:404
+#: lib/layouts/ijmpc.layout:383 lib/layouts/ijmpd.layout:404
 #: lib/layouts/theorems-without-preamble.inc:382
 #: lib/layouts/theorems-ams-extended-bytype.module:415
 msgid "Question \\thequestion."
 msgstr "Spørsmål \\thequestion."
 
-#: lib/layouts/ijmpc.layout:395\r lib/layouts/ijmpd.layout:415
+#: lib/layouts/ijmpc.layout:395 lib/layouts/ijmpd.layout:415
 #: lib/layouts/theorems-ams-bytype.inc:318
 #: lib/layouts/theorems-bytype.inc:292
 msgid "Claim \\theclaim."
 msgstr "Påstand \\theclaim"
 
-#: lib/layouts/ijmpc.layout:406\r lib/layouts/ijmpd.layout:425
+#: lib/layouts/ijmpc.layout:406 lib/layouts/ijmpd.layout:425
 #: lib/layouts/theorems-ams-bytype.inc:155
 #: lib/layouts/theorems-bytype.inc:129
 #: lib/layouts/theorems-without-preamble.inc:143
@@ -10323,7 +10323,7 @@ msgstr "Konjektur \\theconjecture"
 msgid "Prop"
 msgstr "Framlegg"
 
-#: lib/layouts/ijmpc.layout:435\r lib/layouts/ijmpd.layout:448
+#: lib/layouts/ijmpc.layout:435 lib/layouts/ijmpd.layout:448
 msgid "Appendix \\Alph{appendix}."
 msgstr "Appendix \\Alph{appendix}."
 
@@ -10331,7 +10331,7 @@ msgstr "Appendix \\Alph{appendix}."
 msgid "Int. Journal of Modern Physics D"
 msgstr ""
 
-#: lib/layouts/ijmpd.layout:199\r lib/layouts/ijmpd.layout:203
+#: lib/layouts/ijmpd.layout:199 lib/layouts/ijmpd.layout:203
 msgid "Comby"
 msgstr "Kombinasjon"
 
@@ -10339,7 +10339,7 @@ msgstr "Kombinasjon"
 msgid "Institute of Physics (IOP)"
 msgstr ""
 
-#: lib/layouts/iopart.layout:66\r lib/layouts/jasatex.layout:75
+#: lib/layouts/iopart.layout:66 lib/layouts/jasatex.layout:75
 msgid "Short title that will appear in header line"
 msgstr ""
 
@@ -10351,8 +10351,8 @@ msgstr "Sjå over endringar"
 msgid "Topical"
 msgstr "Sakleg"
 
-#: lib/layouts/iopart.layout:95\r lib/layouts/stdinsets.inc:115
-#: lib/layouts/pdfcomment.module:127\r lib/layouts/pdfcomment.module:164
+#: lib/layouts/iopart.layout:95 lib/layouts/stdinsets.inc:115
+#: lib/layouts/pdfcomment.module:127 lib/layouts/pdfcomment.module:164
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -10368,9 +10368,9 @@ msgstr "Prelim"
 msgid "Rapid"
 msgstr "Rapid"
 
-#: lib/layouts/iopart.layout:224\r lib/layouts/jasatex.layout:217
-#: lib/layouts/revtex4-1.layout:170\r lib/layouts/revtex4.layout:259
-#: lib/layouts/svglobal3.layout:67\r lib/layouts/svglobal3.layout:70
+#: lib/layouts/iopart.layout:224 lib/layouts/jasatex.layout:217
+#: lib/layouts/revtex4-1.layout:170 lib/layouts/revtex4.layout:259
+#: lib/layouts/svglobal3.layout:67 lib/layouts/svglobal3.layout:70
 msgid "PACS"
 msgstr "PACS"
 
@@ -10426,7 +10426,7 @@ msgstr "TAKK"
 msgid "International Union of Crystallography (IUCr)"
 msgstr ""
 
-#: lib/layouts/iucr.layout:47\r lib/layouts/jss.layout:26
+#: lib/layouts/iucr.layout:47 lib/layouts/jss.layout:26
 #, fuzzy
 msgid "\\thesection."
 msgstr "utval"
@@ -10436,7 +10436,7 @@ msgstr "utval"
 msgid "\\thesection"
 msgstr "utval"
 
-#: lib/layouts/iucr.layout:53\r lib/layouts/jss.layout:30
+#: lib/layouts/iucr.layout:53 lib/layouts/jss.layout:30
 #, fuzzy
 msgid "\\thesubsection."
 msgstr "\\Alph{subsection}."
@@ -10446,15 +10446,15 @@ msgstr "\\Alph{subsection}."
 msgid "\\thesubsubsection."
 msgstr "\\alph{subsubsection}."
 
-#: lib/layouts/iucr.layout:75\r lib/layouts/iucr.layout:80
-#: lib/layouts/moderncv.layout:352\r lib/layouts/moderncv.layout:353
-#: lib/layouts/agu_stdtitle.inc:460\r lib/layouts/agu_stdtitle.inc:462
+#: lib/layouts/iucr.layout:75 lib/layouts/iucr.layout:80
+#: lib/layouts/moderncv.layout:352 lib/layouts/moderncv.layout:353
+#: lib/layouts/agu_stdtitle.inc:460 lib/layouts/agu_stdtitle.inc:462
 msgid "City"
 msgstr "By"
 
-#: lib/layouts/iucr.layout:97\r lib/layouts/iucr.layout:100
-#: lib/layouts/moderncv.layout:357\r lib/layouts/moderncv.layout:358
-#: lib/layouts/agu_stdtitle.inc:496\r lib/layouts/agu_stdtitle.inc:498
+#: lib/layouts/iucr.layout:97 lib/layouts/iucr.layout:100
+#: lib/layouts/moderncv.layout:357 lib/layouts/moderncv.layout:358
+#: lib/layouts/agu_stdtitle.inc:496 lib/layouts/agu_stdtitle.inc:498
 msgid "Country"
 msgstr "Land"
 
@@ -10463,7 +10463,7 @@ msgstr "Land"
 msgid "Main Author"
 msgstr "Laupeforfattar"
 
-#: lib/layouts/iucr.layout:117\r lib/layouts/iucr.layout:150
+#: lib/layouts/iucr.layout:117 lib/layouts/iucr.layout:150
 #: lib/layouts/iucr.layout:181
 #, fuzzy
 msgid "Affiliation Key"
@@ -10474,8 +10474,8 @@ msgstr "Tilknyting"
 msgid "Affiliation key of the author"
 msgstr "Namnet på standard skrivaren"
 
-#: lib/layouts/iucr.layout:122\r lib/layouts/iucr.layout:123
-#: lib/layouts/iucr.layout:155\r lib/layouts/iucr.layout:156
+#: lib/layouts/iucr.layout:122 lib/layouts/iucr.layout:123
+#: lib/layouts/iucr.layout:155 lib/layouts/iucr.layout:156
 #, fuzzy
 msgid "Forename"
 msgstr "Fnamn"
@@ -10548,7 +10548,7 @@ msgstr "<referanse>"
 msgid "NDB reference:"
 msgstr "Referansen:"
 
-#: lib/layouts/iucr.layout:222\r lib/layouts/iucr.layout:225
+#: lib/layouts/iucr.layout:222 lib/layouts/iucr.layout:225
 msgid "Synopsis"
 msgstr ""
 
@@ -10573,7 +10573,7 @@ msgstr "Tilknytingsmerke"
 msgid "A prefix like 'Also at '"
 msgstr ""
 
-#: lib/layouts/jasatex.layout:220\r lib/layouts/revtex4-1.layout:173
+#: lib/layouts/jasatex.layout:220 lib/layouts/revtex4-1.layout:173
 msgid "PACS numbers:"
 msgstr "PACS nummer:"
 
@@ -10585,7 +10585,7 @@ msgstr "For-trykk nummer"
 msgid "Preprint number:"
 msgstr "For-trykk nummer:"
 
-#: lib/layouts/jasatex.layout:247\r lib/layouts/jasatex.layout:251
+#: lib/layouts/jasatex.layout:247 lib/layouts/jasatex.layout:251
 msgid "Online citation"
 msgstr "Nettbasert litteratur referanse"
 
@@ -10669,28 +10669,28 @@ msgstr "Program"
 msgid "proglang"
 msgstr ""
 
-#: lib/layouts/jss.layout:171\r lib/layouts/jss.layout:205
-#: lib/layouts/jss.layout:207\r lib/layouts/agu_stdtitle.inc:386
-#: lib/layouts/agu_stdtitle.inc:388\r lib/layouts/db_lyxmacros.inc:11
+#: lib/layouts/jss.layout:171 lib/layouts/jss.layout:205
+#: lib/layouts/jss.layout:207 lib/layouts/agu_stdtitle.inc:386
+#: lib/layouts/agu_stdtitle.inc:388 lib/layouts/db_lyxmacros.inc:11
 #: lib/layouts/logicalmkup.module:63
 msgid "Code"
 msgstr "Kode"
 
-#: lib/layouts/jss.layout:174\r lib/layouts/logicalmkup.module:65
+#: lib/layouts/jss.layout:174 lib/layouts/logicalmkup.module:65
 msgid "code"
 msgstr "kode"
 
-#: lib/layouts/jss.layout:186\r lib/layouts/jss.layout:196
+#: lib/layouts/jss.layout:186 lib/layouts/jss.layout:196
 #, fuzzy
 msgid "Code Chunk"
 msgstr "Blokk"
 
-#: lib/layouts/jss.layout:233\r lib/layouts/jss.layout:236
+#: lib/layouts/jss.layout:233 lib/layouts/jss.layout:236
 #, fuzzy
 msgid "Code Input"
 msgstr "Tekstfil"
 
-#: lib/layouts/jss.layout:239\r lib/layouts/jss.layout:242
+#: lib/layouts/jss.layout:239 lib/layouts/jss.layout:242
 #, fuzzy
 msgid "Code Output"
 msgstr "Eksportvegar"
@@ -10711,7 +10711,7 @@ msgstr "AdresseForEkstraKopiar:"
 msgid "RunningTitle"
 msgstr "Laupetittel"
 
-#: lib/layouts/kluwer.layout:228\r lib/layouts/svcommon.inc:404
+#: lib/layouts/kluwer.layout:228 lib/layouts/svcommon.inc:404
 msgid "Running title:"
 msgstr "Laupetittel:"
 
@@ -10719,7 +10719,7 @@ msgstr "Laupetittel:"
 msgid "RunningAuthor"
 msgstr "Laupeforfattar"
 
-#: lib/layouts/kluwer.layout:249\r lib/layouts/svcommon.inc:410
+#: lib/layouts/kluwer.layout:249 lib/layouts/svcommon.inc:410
 msgid "Running author:"
 msgstr "Laupeforfattar:"
 
@@ -10735,42 +10735,42 @@ msgstr ""
 msgid "French Letter (lettre)"
 msgstr ""
 
-#: lib/layouts/lettre.layout:40\r lib/layouts/lettre.layout:317
+#: lib/layouts/lettre.layout:40 lib/layouts/lettre.layout:317
 msgid "NoTelephone"
 msgstr "UtanTelefon"
 
-#: lib/layouts/lettre.layout:44\r lib/layouts/lettre.layout:373
+#: lib/layouts/lettre.layout:44 lib/layouts/lettre.layout:373
 #: lib/layouts/lettre.layout:381
 msgid "NoFax"
 msgstr "IngenFaks"
 
-#: lib/layouts/lettre.layout:50\r lib/layouts/lettre.layout:188
+#: lib/layouts/lettre.layout:50 lib/layouts/lettre.layout:188
 #: lib/layouts/lettre.layout:195
 msgid "NoPlace"
 msgstr "IngenStad"
 
-#: lib/layouts/lettre.layout:54\r lib/layouts/lettre.layout:237
+#: lib/layouts/lettre.layout:54 lib/layouts/lettre.layout:237
 #: lib/layouts/lettre.layout:245
 msgid "NoDate"
 msgstr "IngenDato"
 
-#: lib/layouts/lettre.layout:74\r lib/layouts/lettre.layout:650
+#: lib/layouts/lettre.layout:74 lib/layouts/lettre.layout:650
 msgid "Post Scriptum"
 msgstr "Post Scriptum"
 
-#: lib/layouts/lettre.layout:76\r lib/layouts/lettre.layout:516
+#: lib/layouts/lettre.layout:76 lib/layouts/lettre.layout:516
 msgid "EndOfMessage"
 msgstr "SluttenAvMeldinga"
 
-#: lib/layouts/lettre.layout:78\r lib/layouts/lettre.layout:536
+#: lib/layouts/lettre.layout:78 lib/layouts/lettre.layout:536
 msgid "EndOfFile"
 msgstr "SluttenPåFila"
 
-#: lib/layouts/lettre.layout:159\r lib/layouts/lettre.layout:189
-#: lib/layouts/lettre.layout:215\r lib/layouts/lettre.layout:238
-#: lib/layouts/lettre.layout:258\r lib/layouts/lettre.layout:288
-#: lib/layouts/lettre.layout:318\r lib/layouts/lettre.layout:344
-#: lib/layouts/lettre.layout:374\r lib/layouts/lettre.layout:400
+#: lib/layouts/lettre.layout:159 lib/layouts/lettre.layout:189
+#: lib/layouts/lettre.layout:215 lib/layouts/lettre.layout:238
+#: lib/layouts/lettre.layout:258 lib/layouts/lettre.layout:288
+#: lib/layouts/lettre.layout:318 lib/layouts/lettre.layout:344
+#: lib/layouts/lettre.layout:374 lib/layouts/lettre.layout:400
 msgid "Headings"
 msgstr "Hovud"
 
@@ -10806,11 +10806,11 @@ msgstr "P.S.:"
 msgid "Lecture Notes in Comp. Science (LNCS)"
 msgstr ""
 
-#: lib/layouts/llncs.layout:41\r lib/layouts/memoir.layout:63
-#: lib/layouts/recipebook.layout:42\r lib/layouts/scrbook.layout:17
-#: lib/layouts/svmult.layout:111\r lib/layouts/tufte-book.layout:63
-#: lib/layouts/agu_stdsections.inc:21\r lib/layouts/db_stdsections.inc:20
-#: lib/layouts/scrclass.inc:68\r lib/layouts/stdsections.inc:44
+#: lib/layouts/llncs.layout:41 lib/layouts/memoir.layout:63
+#: lib/layouts/recipebook.layout:42 lib/layouts/scrbook.layout:17
+#: lib/layouts/svmult.layout:111 lib/layouts/tufte-book.layout:63
+#: lib/layouts/agu_stdsections.inc:21 lib/layouts/db_stdsections.inc:20
+#: lib/layouts/scrclass.inc:68 lib/layouts/stdsections.inc:44
 #: lib/layouts/svcommon.inc:151
 msgid "Chapter"
 msgstr "Kapittel"
@@ -10819,7 +10819,7 @@ msgstr "Kapittel"
 msgid "Running LaTeX Title"
 msgstr "LaTeX laupetittel "
 
-#: lib/layouts/llncs.layout:175\r lib/layouts/svcommon.inc:376
+#: lib/layouts/llncs.layout:175 lib/layouts/svcommon.inc:376
 msgid "TOC Title"
 msgstr "Namn på Innhaldsliste"
 
@@ -10836,7 +10836,7 @@ msgstr "Laupeforfattar"
 msgid "Author Running:"
 msgstr "Laupeforfattar:"
 
-#: lib/layouts/llncs.layout:212\r lib/layouts/svcommon.inc:394
+#: lib/layouts/llncs.layout:212 lib/layouts/svcommon.inc:394
 msgid "TOC Author"
 msgstr "Forfattar på innhaldslista"
 
@@ -10848,7 +10848,7 @@ msgstr "Forfattar på Innhaldslista:"
 msgid "Case #."
 msgstr "Tilfelle #."
 
-#: lib/layouts/llncs.layout:319\r lib/layouts/svmono.layout:84
+#: lib/layouts/llncs.layout:319 lib/layouts/svmono.layout:84
 #: lib/layouts/theorems-starred.inc:274
 msgid "Claim."
 msgstr "Påstand."
@@ -10904,23 +10904,23 @@ msgstr ""
 msgid "Memoir"
 msgstr ""
 
-#: lib/layouts/memoir.layout:65\r lib/layouts/memoir.layout:80
-#: lib/layouts/memoir.layout:89\r lib/layouts/memoir.layout:104
-#: lib/layouts/memoir.layout:119\r lib/layouts/memoir.layout:134
-#: lib/layouts/memoir.layout:149\r lib/layouts/memoir.layout:218
+#: lib/layouts/memoir.layout:65 lib/layouts/memoir.layout:80
+#: lib/layouts/memoir.layout:89 lib/layouts/memoir.layout:104
+#: lib/layouts/memoir.layout:119 lib/layouts/memoir.layout:134
+#: lib/layouts/memoir.layout:149 lib/layouts/memoir.layout:218
 #: lib/layouts/memoir.layout:239
 #, fuzzy
 msgid "Short Title (TOC)|S"
 msgstr "Kort tittel|K"
 
-#: lib/layouts/memoir.layout:66\r lib/layouts/memoir.layout:81
+#: lib/layouts/memoir.layout:66 lib/layouts/memoir.layout:81
 #, fuzzy
 msgid "The chapter as it appears in the table of contents"
 msgstr "Etiketten slik den er i dokumentet"
 
-#: lib/layouts/memoir.layout:70\r lib/layouts/memoir.layout:94
-#: lib/layouts/memoir.layout:109\r lib/layouts/memoir.layout:124
-#: lib/layouts/memoir.layout:139\r lib/layouts/memoir.layout:154
+#: lib/layouts/memoir.layout:70 lib/layouts/memoir.layout:94
+#: lib/layouts/memoir.layout:109 lib/layouts/memoir.layout:124
+#: lib/layouts/memoir.layout:139 lib/layouts/memoir.layout:154
 #: lib/layouts/memoir.layout:223
 #, fuzzy
 msgid "Short Title (Header)"
@@ -10931,8 +10931,8 @@ msgstr "Kort tittel"
 msgid "The chapter as it appears in the running headers"
 msgstr "Etiketten slik den er i dokumentet"
 
-#: lib/layouts/memoir.layout:78\r lib/layouts/db_stdstarsections.inc:24
-#: lib/layouts/stdstarsections.inc:24\r lib/layouts/svcommon.inc:250
+#: lib/layouts/memoir.layout:78 lib/layouts/db_stdstarsections.inc:24
+#: lib/layouts/stdstarsections.inc:24 lib/layouts/svcommon.inc:250
 msgid "Chapter*"
 msgstr "Kapittel*"
 
@@ -11012,7 +11012,7 @@ msgstr ""
 msgid "Poemtitle"
 msgstr "Dikttittel"
 
-#: lib/layouts/memoir.layout:219\r lib/layouts/memoir.layout:240
+#: lib/layouts/memoir.layout:219 lib/layouts/memoir.layout:240
 #, fuzzy
 msgid "The poem title as it appears in the table of contents"
 msgstr "Etiketten slik den er i dokumentet"
@@ -11097,7 +11097,7 @@ msgstr "PDFSider"
 msgid "First name"
 msgstr "Fornamn"
 
-#: lib/layouts/moderncv.layout:99\r lib/layouts/db_stdtitle.inc:94
+#: lib/layouts/moderncv.layout:99 lib/layouts/db_stdtitle.inc:94
 msgid "FirstName"
 msgstr "Fornamn"
 
@@ -11116,7 +11116,7 @@ msgstr "&Familie:"
 msgid "Line 1"
 msgstr "Topp linje| T"
 
-#: lib/layouts/moderncv.layout:143\r lib/layouts/moderncv.layout:148
+#: lib/layouts/moderncv.layout:143 lib/layouts/moderncv.layout:148
 msgid "Optional address line"
 msgstr ""
 
@@ -11198,7 +11198,7 @@ msgstr "&Kolonner:"
 msgid "Optional width"
 msgstr "valfritt"
 
-#: lib/layouts/moderncv.layout:314\r lib/layouts/agu_stdtitle.inc:13
+#: lib/layouts/moderncv.layout:314 lib/layouts/agu_stdtitle.inc:13
 msgid "Header"
 msgstr "Topptekst"
 
@@ -11211,11 +11211,11 @@ msgstr "topp/botn"
 msgid "Entry"
 msgstr "Setelen"
 
-#: lib/layouts/moderncv.layout:331\r lib/layouts/moderncv.layout:332
+#: lib/layouts/moderncv.layout:331 lib/layouts/moderncv.layout:332
 msgid "Time"
 msgstr ""
 
-#: lib/layouts/moderncv.layout:336\r lib/layouts/moderncv.layout:337
+#: lib/layouts/moderncv.layout:336 lib/layouts/moderncv.layout:337
 msgid "What?"
 msgstr ""
 
@@ -11233,7 +11233,7 @@ msgstr "Notis:Kommentar"
 msgid "Item with Comment:"
 msgstr "Notis:Kommentar"
 
-#: lib/layouts/moderncv.layout:405\r lib/layouts/moderncv.layout:406
+#: lib/layouts/moderncv.layout:405 lib/layouts/moderncv.layout:406
 #, fuzzy
 msgid "Text"
 msgstr "»tekst«"
@@ -11358,7 +11358,7 @@ msgstr "Greinnamn"
 msgid "Enclosing"
 msgstr "Avslutning"
 
-#: lib/layouts/moderncv.layout:578\r lib/layouts/svcommon.inc:519
+#: lib/layouts/moderncv.layout:578 lib/layouts/svcommon.inc:519
 #, fuzzy
 msgid "Alternative Name"
 msgstr "Al&ternative språk:"
@@ -11400,14 +11400,14 @@ msgstr "Institutsjon"
 msgid "Powerdot"
 msgstr ""
 
-#: lib/layouts/powerdot.layout:45\r lib/layouts/powerdot.layout:69
+#: lib/layouts/powerdot.layout:45 lib/layouts/powerdot.layout:69
 #: lib/layouts/powerdot.layout:91
 #, fuzzy
 msgid "TitleSlide"
 msgstr "VidtLysark"
 
-#: lib/layouts/powerdot.layout:127\r lib/layouts/powerdot.layout:153
-#: lib/layouts/powerdot.layout:207\r lib/layouts/slides.layout:3
+#: lib/layouts/powerdot.layout:127 lib/layouts/powerdot.layout:153
+#: lib/layouts/powerdot.layout:207 lib/layouts/slides.layout:3
 #, fuzzy
 msgid "Slides"
 msgstr "Lysark"
@@ -11445,7 +11445,7 @@ msgstr "TomtLysark"
 msgid "Empty slide:"
 msgstr "Tomt lysark:"
 
-#: lib/layouts/powerdot.layout:240\r lib/layouts/numarticle.inc:9
+#: lib/layouts/powerdot.layout:240 lib/layouts/numarticle.inc:9
 msgid "\\arabic{section}"
 msgstr "\\arabic{section}"
 
@@ -11458,24 +11458,24 @@ msgstr "Bolking"
 msgid "Optional arguments to the section command (see powerdot manual)"
 msgstr ""
 
-#: lib/layouts/powerdot.layout:272\r lib/layouts/powerdot.layout:295
+#: lib/layouts/powerdot.layout:272 lib/layouts/powerdot.layout:295
 #, fuzzy
 msgid "Itemize Type"
 msgstr "PunktlisteType1"
 
-#: lib/layouts/powerdot.layout:273\r lib/layouts/powerdot.layout:296
+#: lib/layouts/powerdot.layout:273 lib/layouts/powerdot.layout:296
 msgid "Itemize type specification (see powerdot manual)"
 msgstr ""
 
-#: lib/layouts/powerdot.layout:276\r lib/layouts/enumitem.module:56
+#: lib/layouts/powerdot.layout:276 lib/layouts/enumitem.module:56
 #: lib/layouts/paralist.module:27
 #, fuzzy
 msgid "Itemize Options"
 msgstr "Punktliste"
 
-#: lib/layouts/powerdot.layout:277\r lib/layouts/powerdot.layout:328
-#: lib/layouts/enumitem.module:57\r lib/layouts/enumitem.module:65
-#: lib/layouts/enumitem.module:73\r lib/layouts/enumitem.module:110
+#: lib/layouts/powerdot.layout:277 lib/layouts/powerdot.layout:328
+#: lib/layouts/enumitem.module:57 lib/layouts/enumitem.module:65
+#: lib/layouts/enumitem.module:73 lib/layouts/enumitem.module:110
 msgid "Optional arguments for this list (see enumitem manual)"
 msgstr ""
 
@@ -11483,17 +11483,17 @@ msgstr ""
 msgid "ItemizeType1"
 msgstr "PunktlisteType1"
 
-#: lib/layouts/powerdot.layout:323\r lib/layouts/powerdot.layout:347
+#: lib/layouts/powerdot.layout:323 lib/layouts/powerdot.layout:347
 #, fuzzy
 msgid "Enumerate Type"
 msgstr "NummerertlisteType1"
 
-#: lib/layouts/powerdot.layout:324\r lib/layouts/powerdot.layout:348
+#: lib/layouts/powerdot.layout:324 lib/layouts/powerdot.layout:348
 msgid "Enumerate type specification (see powerdot manual)"
 msgstr ""
 
-#: lib/layouts/powerdot.layout:327\r lib/layouts/enumitem.module:64
-#: lib/layouts/enumitem.module:109\r lib/layouts/paralist.module:34
+#: lib/layouts/powerdot.layout:327 lib/layouts/enumitem.module:64
+#: lib/layouts/enumitem.module:109 lib/layouts/paralist.module:34
 #, fuzzy
 msgid "Enumerate Options"
 msgstr "Sweave val"
@@ -11520,8 +11520,8 @@ msgstr "Kolonne"
 msgid "Enter the text of the left column here (right column in main paragraph)"
 msgstr ""
 
-#: lib/layouts/powerdot.layout:545\r lib/layouts/revtex4-1.layout:265
-#: lib/layouts/stdfloats.inc:46\r lib/layouts/algorithm2e.module:22
+#: lib/layouts/powerdot.layout:545 lib/layouts/revtex4-1.layout:265
+#: lib/layouts/stdfloats.inc:46 lib/layouts/algorithm2e.module:22
 msgid "List of Algorithms"
 msgstr "Liste over algoritmer"
 
@@ -11559,7 +11559,7 @@ msgstr "Lysark*"
 msgid "Recipe Book"
 msgstr "Oppskrift"
 
-#: lib/layouts/recipebook.layout:43\r lib/layouts/scrbook.layout:18
+#: lib/layouts/recipebook.layout:43 lib/layouts/scrbook.layout:18
 msgid "\\thechapter"
 msgstr "\\thechapter"
 
@@ -11600,68 +11600,68 @@ msgstr ""
 msgid "REVTeX (V. 4.1)"
 msgstr ""
 
-#: lib/layouts/revtex4-1.layout:85\r lib/layouts/revtex4.layout:152
+#: lib/layouts/revtex4-1.layout:85 lib/layouts/revtex4.layout:152
 #, fuzzy
 msgid "Affiliation (alternate)"
 msgstr "Tilknytingsmerke"
 
-#: lib/layouts/revtex4-1.layout:88\r lib/layouts/revtex4.layout:161
+#: lib/layouts/revtex4-1.layout:88 lib/layouts/revtex4.layout:161
 #, fuzzy
 msgid "Affiliation (alternate):"
 msgstr "Tilknytingsmerke"
 
-#: lib/layouts/revtex4-1.layout:90\r lib/layouts/revtex4.layout:158
+#: lib/layouts/revtex4-1.layout:90 lib/layouts/revtex4.layout:158
 #, fuzzy
 msgid "Alternate Affiliation Option"
 msgstr "Alternative tilknyting"
 
-#: lib/layouts/revtex4-1.layout:91\r lib/layouts/revtex4.layout:159
+#: lib/layouts/revtex4-1.layout:91 lib/layouts/revtex4.layout:159
 msgid "Optional argument to the altaffiliation command"
 msgstr ""
 
-#: lib/layouts/revtex4-1.layout:97\r lib/layouts/revtex4.layout:165
+#: lib/layouts/revtex4-1.layout:97 lib/layouts/revtex4.layout:165
 #, fuzzy
 msgid "Affiliation (none)"
 msgstr "Tilknyting"
 
-#: lib/layouts/revtex4-1.layout:100\r lib/layouts/revtex4.layout:168
+#: lib/layouts/revtex4-1.layout:100 lib/layouts/revtex4.layout:168
 #, fuzzy
 msgid "No affiliation"
 msgstr "Forfattar tilknyting"
 
-#: lib/layouts/revtex4-1.layout:117\r lib/layouts/revtex4.layout:210
+#: lib/layouts/revtex4-1.layout:117 lib/layouts/revtex4.layout:210
 msgid "Electronic Address:"
 msgstr "Elektronisk adresse:"
 
-#: lib/layouts/revtex4-1.layout:119\r lib/layouts/revtex4.layout:207
+#: lib/layouts/revtex4-1.layout:119 lib/layouts/revtex4.layout:207
 #, fuzzy
 msgid "Electronic Address Option|s"
 msgstr "Elektronisk adresse:"
 
-#: lib/layouts/revtex4-1.layout:120\r lib/layouts/revtex4.layout:208
+#: lib/layouts/revtex4-1.layout:120 lib/layouts/revtex4.layout:208
 msgid "Optional argument to the email command"
 msgstr ""
 
-#: lib/layouts/revtex4-1.layout:134\r lib/layouts/revtex4.layout:226
+#: lib/layouts/revtex4-1.layout:134 lib/layouts/revtex4.layout:226
 #, fuzzy
 msgid "Author URL Option"
 msgstr "Forfattar URL"
 
-#: lib/layouts/revtex4-1.layout:135\r lib/layouts/revtex4.layout:227
+#: lib/layouts/revtex4-1.layout:135 lib/layouts/revtex4.layout:227
 msgid "Optional argument to the homepage command"
 msgstr ""
 
-#: lib/layouts/revtex4-1.layout:141\r lib/layouts/revtex4.layout:187
+#: lib/layouts/revtex4-1.layout:141 lib/layouts/revtex4.layout:187
 #, fuzzy
 msgid "Collaboration"
 msgstr "Variasjon"
 
-#: lib/layouts/revtex4-1.layout:144\r lib/layouts/revtex4.layout:190
+#: lib/layouts/revtex4-1.layout:144 lib/layouts/revtex4.layout:190
 #, fuzzy
 msgid "Collaboration:"
 msgstr "Variasjon:"
 
-#: lib/layouts/revtex4-1.layout:177\r lib/layouts/revtex4.layout:103
+#: lib/layouts/revtex4-1.layout:177 lib/layouts/revtex4.layout:103
 msgid "Preprint"
 msgstr "For-trykk"
 
@@ -11679,8 +11679,8 @@ msgstr "takk"
 msgid "Ruled Table"
 msgstr "Plasser_Tabellen"
 
-#: lib/layouts/revtex4-1.layout:233\r lib/layouts/revtex4-1.layout:241
-#: lib/layouts/revtex4-1.layout:249\r src/frontends/qt4/GuiSymbols.cpp:123
+#: lib/layouts/revtex4-1.layout:233 lib/layouts/revtex4-1.layout:241
+#: lib/layouts/revtex4-1.layout:249 src/frontends/qt4/GuiSymbols.cpp:123
 msgid "Specials"
 msgstr "Spesielle"
 
@@ -11745,7 +11745,7 @@ msgstr ""
 msgid "AltAffiliation"
 msgstr "AltTilknyting"
 
-#: lib/layouts/revtex4.layout:197\r lib/layouts/amsdefs.inc:175
+#: lib/layouts/revtex4.layout:197 lib/layouts/amsdefs.inc:175
 msgid "Thanks:"
 msgstr "Takk:"
 
@@ -11758,7 +11758,7 @@ msgstr "PACS nummer:"
 msgid "SciPoster"
 msgstr "Post-kommentar"
 
-#: lib/layouts/sciposter.layout:34\r lib/layouts/sigplanconf.layout:69
+#: lib/layouts/sciposter.layout:34 lib/layouts/sigplanconf.layout:69
 msgid "Conference"
 msgstr "Konferanse"
 
@@ -11820,8 +11820,8 @@ msgstr "\\thechapter.\\arabic{equation}"
 msgid "KOMA-Script Letter (V. 1, Obsolete)"
 msgstr ""
 
-#: lib/layouts/scrlettr.layout:26\r lib/layouts/scrlttr2.layout:30
-#: lib/layouts/scrclass.inc:51\r lib/layouts/stdlyxlist.inc:6
+#: lib/layouts/scrlettr.layout:26 lib/layouts/scrlttr2.layout:30
+#: lib/layouts/scrclass.inc:51 lib/layouts/stdlyxlist.inc:6
 #: lib/layouts/enumitem.module:84
 msgid "Labeling"
 msgstr "Etikettering"
@@ -11834,55 +11834,55 @@ msgstr "B"
 msgid "O"
 msgstr "O"
 
-#: lib/layouts/scrlettr.layout:109\r lib/layouts/scrlttr2.layout:141
+#: lib/layouts/scrlettr.layout:109 lib/layouts/scrlttr2.layout:141
 msgid "Encl"
 msgstr "Vedlegg"
 
-#: lib/layouts/scrlettr.layout:161\r lib/layouts/scrlttr2.layout:239
+#: lib/layouts/scrlettr.layout:161 lib/layouts/scrlttr2.layout:239
 msgid "Place:"
 msgstr "Stad:"
 
-#: lib/layouts/scrlettr.layout:179\r lib/layouts/scrlttr2.layout:259
+#: lib/layouts/scrlettr.layout:179 lib/layouts/scrlttr2.layout:259
 msgid "Specialmail"
 msgstr "Spesial post"
 
-#: lib/layouts/scrlettr.layout:182\r lib/layouts/scrlttr2.layout:263
+#: lib/layouts/scrlettr.layout:182 lib/layouts/scrlttr2.layout:263
 msgid "Specialmail:"
 msgstr "Spesial post:"
 
-#: lib/layouts/scrlettr.layout:196\r lib/layouts/scrlttr2.layout:279
+#: lib/layouts/scrlettr.layout:196 lib/layouts/scrlttr2.layout:279
 msgid "Title:"
 msgstr "Tittel:"
 
-#: lib/layouts/scrlettr.layout:208\r lib/layouts/scrlttr2.layout:292
+#: lib/layouts/scrlettr.layout:208 lib/layouts/scrlttr2.layout:292
 msgid "Yourref"
 msgstr "Dinref"
 
-#: lib/layouts/scrlettr.layout:222\r lib/layouts/scrlttr2.layout:308
+#: lib/layouts/scrlettr.layout:222 lib/layouts/scrlttr2.layout:308
 msgid "Yourmail"
 msgstr "DinAdresse"
 
-#: lib/layouts/scrlettr.layout:225\r lib/layouts/scrlttr2.layout:312
+#: lib/layouts/scrlettr.layout:225 lib/layouts/scrlttr2.layout:312
 msgid "Your letter of:"
 msgstr "Ditt brev den:"
 
-#: lib/layouts/scrlettr.layout:229\r lib/layouts/scrlttr2.layout:316
+#: lib/layouts/scrlettr.layout:229 lib/layouts/scrlttr2.layout:316
 msgid "Myref"
 msgstr "MinRef"
 
-#: lib/layouts/scrlettr.layout:236\r lib/layouts/scrlttr2.layout:324
+#: lib/layouts/scrlettr.layout:236 lib/layouts/scrlttr2.layout:324
 msgid "Customer"
 msgstr "Kunde"
 
-#: lib/layouts/scrlettr.layout:239\r lib/layouts/scrlttr2.layout:328
+#: lib/layouts/scrlettr.layout:239 lib/layouts/scrlttr2.layout:328
 msgid "Customer no.:"
 msgstr "Kunde num.:"
 
-#: lib/layouts/scrlettr.layout:243\r lib/layouts/scrlttr2.layout:332
+#: lib/layouts/scrlettr.layout:243 lib/layouts/scrlttr2.layout:332
 msgid "Invoice"
 msgstr "Faktura"
 
-#: lib/layouts/scrlettr.layout:246\r lib/layouts/scrlttr2.layout:336
+#: lib/layouts/scrlettr.layout:246 lib/layouts/scrlttr2.layout:336
 msgid "Invoice no.:"
 msgstr "Faktura num.:"
 
@@ -11942,7 +11942,7 @@ msgstr ""
 msgid "Seminar"
 msgstr ""
 
-#: lib/layouts/seminar.layout:26\r lib/layouts/seminar.layout:86
+#: lib/layouts/seminar.layout:26 lib/layouts/seminar.layout:86
 msgid "LandscapeSlide"
 msgstr "LiggandeLysark"
 
@@ -11950,7 +11950,7 @@ msgstr "LiggandeLysark"
 msgid "Landscape Slide"
 msgstr "Liggande lysark"
 
-#: lib/layouts/seminar.layout:40\r lib/layouts/seminar.layout:112
+#: lib/layouts/seminar.layout:40 lib/layouts/seminar.layout:112
 msgid "PortraitSlide"
 msgstr "StåandeLysark"
 
@@ -11966,7 +11966,7 @@ msgstr "Lysark_topptekst"
 msgid "SlideSubHeading"
 msgstr "Lysark_underTopptekst"
 
-#: lib/layouts/seminar.layout:60\r lib/layouts/seminar.layout:121
+#: lib/layouts/seminar.layout:60 lib/layouts/seminar.layout:121
 msgid "ListOfSlides"
 msgstr "LysarkListe"
 
@@ -11974,7 +11974,7 @@ msgstr "LysarkListe"
 msgid "List of Slides"
 msgstr "Liste over lysark"
 
-#: lib/layouts/seminar.layout:69\r lib/layouts/seminar.layout:142
+#: lib/layouts/seminar.layout:69 lib/layouts/seminar.layout:142
 msgid "SlideContents"
 msgstr "LysarkInnhald"
 
@@ -11982,7 +11982,7 @@ msgstr "LysarkInnhald"
 msgid "Slide Contents"
 msgstr "LysarkInnhald"
 
-#: lib/layouts/seminar.layout:75\r lib/layouts/seminar.layout:148
+#: lib/layouts/seminar.layout:75 lib/layouts/seminar.layout:148
 msgid "ProgressContents"
 msgstr "ProgresjonInnhald"
 
@@ -12018,7 +12018,7 @@ msgstr "[Innhaldet i progresjonen]"
 msgid "Society for Industrial and Applied Mathematics (SIAM)"
 msgstr ""
 
-#: lib/layouts/siamltex.layout:113\r lib/layouts/theorems-order.inc:34
+#: lib/layouts/siamltex.layout:113 lib/layouts/theorems-order.inc:34
 #: lib/layouts/theorems-starred.inc:119
 msgid "Conjecture*"
 msgstr "Konjektur*"
@@ -12038,7 +12038,7 @@ msgstr "AMS"
 msgid "The title as it appears in the running headers"
 msgstr "Etiketten slik den er i dokumentet"
 
-#: lib/layouts/siamltex.layout:319\r lib/layouts/amsdefs.inc:193
+#: lib/layouts/siamltex.layout:319 lib/layouts/amsdefs.inc:193
 msgid "Subjectclass"
 msgstr "Subjekt klassifikasjon"
 
@@ -12108,7 +12108,7 @@ msgstr ""
 msgid "Affiliation and/or address of the author"
 msgstr ""
 
-#: lib/layouts/sigplanconf.layout:177\r lib/layouts/acm-sigs.inc:31
+#: lib/layouts/sigplanconf.layout:177 lib/layouts/acm-sigs.inc:31
 msgid "Terms"
 msgstr "Vilkår"
 
@@ -12185,55 +12185,55 @@ msgstr "TAKK"
 msgid "Springer SV Global (Obsolete Version)"
 msgstr ""
 
-#: lib/layouts/svglobal.layout:67\r lib/layouts/svjog.layout:71
+#: lib/layouts/svglobal.layout:67 lib/layouts/svjog.layout:71
 #: lib/layouts/svprobth.layout:101
 msgid "Headnote"
 msgstr "Topptekst"
 
-#: lib/layouts/svglobal.layout:81\r lib/layouts/svjog.layout:85
+#: lib/layouts/svglobal.layout:81 lib/layouts/svjog.layout:85
 #: lib/layouts/svprobth.layout:115
 msgid "Headnote (optional):"
 msgstr "Topptekst (frivillig):"
 
-#: lib/layouts/svglobal.layout:90\r lib/layouts/svglobal.layout:92
-#: lib/layouts/svjog.layout:94\r lib/layouts/svjog.layout:96
-#: lib/layouts/svprobth.layout:124\r lib/layouts/svprobth.layout:126
+#: lib/layouts/svglobal.layout:90 lib/layouts/svglobal.layout:92
+#: lib/layouts/svjog.layout:94 lib/layouts/svjog.layout:96
+#: lib/layouts/svprobth.layout:124 lib/layouts/svprobth.layout:126
 #, fuzzy
 msgid "thanks"
 msgstr "Takk:"
 
-#: lib/layouts/svglobal.layout:103\r lib/layouts/svjog.layout:107
+#: lib/layouts/svglobal.layout:103 lib/layouts/svjog.layout:107
 #: lib/layouts/svprobth.layout:137
 msgid "Inst"
 msgstr "inst"
 
-#: lib/layouts/svglobal.layout:106\r lib/layouts/svjog.layout:110
+#: lib/layouts/svglobal.layout:106 lib/layouts/svjog.layout:110
 #: lib/layouts/svprobth.layout:140
 msgid "Institute #"
 msgstr "Institutt #"
 
-#: lib/layouts/svglobal.layout:123\r lib/layouts/svjog.layout:127
-#: lib/layouts/svmult.layout:135\r lib/layouts/svprobth.layout:157
-#: lib/layouts/scrclass.inc:228\r lib/layouts/svcommon.inc:482
+#: lib/layouts/svglobal.layout:123 lib/layouts/svjog.layout:127
+#: lib/layouts/svmult.layout:135 lib/layouts/svprobth.layout:157
+#: lib/layouts/scrclass.inc:228 lib/layouts/svcommon.inc:482
 msgid "Dedication"
 msgstr "Dedikasjon"
 
-#: lib/layouts/svglobal.layout:127\r lib/layouts/svjog.layout:131
-#: lib/layouts/svprobth.layout:161\r lib/layouts/amsdefs.inc:182
+#: lib/layouts/svglobal.layout:127 lib/layouts/svjog.layout:131
+#: lib/layouts/svprobth.layout:161 lib/layouts/amsdefs.inc:182
 msgid "Dedication:"
 msgstr "Dedisering:"
 
-#: lib/layouts/svglobal.layout:135\r lib/layouts/svjog.layout:139
+#: lib/layouts/svglobal.layout:135 lib/layouts/svjog.layout:139
 #: lib/layouts/svprobth.layout:169
 msgid "Corr Author:"
 msgstr "Brevbytande forfattar:"
 
-#: lib/layouts/svglobal.layout:139\r lib/layouts/svjog.layout:143
+#: lib/layouts/svglobal.layout:139 lib/layouts/svjog.layout:143
 #: lib/layouts/svprobth.layout:173
 msgid "Offprints"
 msgstr "Ekstra_kopiar"
 
-#: lib/layouts/svglobal.layout:143\r lib/layouts/svjog.layout:147
+#: lib/layouts/svglobal.layout:143 lib/layouts/svjog.layout:147
 #: lib/layouts/svprobth.layout:177
 msgid "Offprints:"
 msgstr "Ekstra_kopiar:"
@@ -12270,11 +12270,11 @@ msgstr ""
 msgid "Springer SV Mono"
 msgstr ""
 
-#: lib/layouts/svmono.layout:91\r lib/layouts/svcommon.inc:659
+#: lib/layouts/svmono.layout:91 lib/layouts/svcommon.inc:659
 msgid "Proof(QED)"
 msgstr "Prov(QED)"
 
-#: lib/layouts/svmono.layout:95\r lib/layouts/svcommon.inc:668
+#: lib/layouts/svmono.layout:95 lib/layouts/svcommon.inc:668
 msgid "Proof(smartQED)"
 msgstr "Prov(smartQED)"
 
@@ -12290,7 +12290,7 @@ msgstr "Tittel*"
 msgid "Title*: "
 msgstr "Tittel*: "
 
-#: lib/layouts/svmult.layout:66\r lib/layouts/svmult.layout:151
+#: lib/layouts/svmult.layout:66 lib/layouts/svmult.layout:151
 msgid "Contributors"
 msgstr "Bidragsytarar"
 
@@ -12302,51 +12302,51 @@ msgstr "Liste over bidragsytarar"
 msgid "Contributor List"
 msgstr "Liste over bidragsytarar"
 
-#: lib/layouts/svmult.layout:104\r lib/layouts/svmult.layout:108
-#: lib/layouts/svmult.layout:112\r lib/layouts/svmult.layout:116
-#: lib/layouts/svmult.layout:120\r lib/layouts/svmult.layout:124
-#: lib/layouts/svmult.layout:128\r lib/layouts/svmult.layout:132
-#: lib/layouts/svmult.layout:136\r lib/layouts/svmult.layout:140
-#: lib/layouts/svmult.layout:144\r lib/layouts/svmult.layout:148
-#: lib/layouts/svmult.layout:152\r lib/layouts/svmult.layout:156
+#: lib/layouts/svmult.layout:104 lib/layouts/svmult.layout:108
+#: lib/layouts/svmult.layout:112 lib/layouts/svmult.layout:116
+#: lib/layouts/svmult.layout:120 lib/layouts/svmult.layout:124
+#: lib/layouts/svmult.layout:128 lib/layouts/svmult.layout:132
+#: lib/layouts/svmult.layout:136 lib/layouts/svmult.layout:140
+#: lib/layouts/svmult.layout:144 lib/layouts/svmult.layout:148
+#: lib/layouts/svmult.layout:152 lib/layouts/svmult.layout:156
 msgid "For editors"
 msgstr "For redaktørane"
 
-#: lib/layouts/svmult.layout:107\r lib/layouts/svcommon.inc:116
+#: lib/layouts/svmult.layout:107 lib/layouts/svcommon.inc:116
 msgid "PartBacktext"
 msgstr "Del-baktekst"
 
-#: lib/layouts/svmult.layout:115\r lib/layouts/svcommon.inc:413
+#: lib/layouts/svmult.layout:115 lib/layouts/svcommon.inc:413
 msgid "Running Chapter"
 msgstr "Laupekapittel"
 
-#: lib/layouts/svmult.layout:119\r lib/layouts/svcommon.inc:168
+#: lib/layouts/svmult.layout:119 lib/layouts/svcommon.inc:168
 msgid "ChapAuthor"
 msgstr "KapForfattar"
 
-#: lib/layouts/svmult.layout:123\r lib/layouts/svcommon.inc:155
+#: lib/layouts/svmult.layout:123 lib/layouts/svcommon.inc:155
 msgid "ChapSubtitle"
 msgstr "KapUndertittel"
 
-#: lib/layouts/svmult.layout:127\r lib/layouts/svcommon.inc:318
+#: lib/layouts/svmult.layout:127 lib/layouts/svcommon.inc:318
 msgid "extrachap"
 msgstr "ekstrakap"
 
-#: lib/layouts/svmult.layout:131\r lib/layouts/svcommon.inc:313
+#: lib/layouts/svmult.layout:131 lib/layouts/svcommon.inc:313
 msgid "Extrachap"
 msgstr "EkstraKap"
 
-#: lib/layouts/svmult.layout:139\r lib/layouts/svcommon.inc:502
+#: lib/layouts/svmult.layout:139 lib/layouts/svcommon.inc:502
 #: lib/layouts/svcommon.inc:506
 msgid "Foreword"
 msgstr "Forord"
 
-#: lib/layouts/svmult.layout:143\r lib/layouts/svcommon.inc:529
-#: lib/layouts/svcommon.inc:538\r lib/layouts/multicol.module:25
+#: lib/layouts/svmult.layout:143 lib/layouts/svcommon.inc:529
+#: lib/layouts/svcommon.inc:538 lib/layouts/multicol.module:25
 msgid "Preface"
 msgstr "Forord"
 
-#: lib/layouts/svmult.layout:155\r lib/layouts/svcommon.inc:180
+#: lib/layouts/svmult.layout:155 lib/layouts/svcommon.inc:180
 msgid "ChapMotto"
 msgstr "KapMotto"
 
@@ -12370,7 +12370,7 @@ msgstr ""
 msgid "Tufte Book"
 msgstr ""
 
-#: lib/layouts/tufte-book.layout:81\r lib/layouts/scrclass.inc:138
+#: lib/layouts/tufte-book.layout:81 lib/layouts/scrclass.inc:138
 #: lib/layouts/stdsections.inc:64
 #, fuzzy
 msgid "The chapter as it appears in the table of contents/running headers"
@@ -12449,56 +12449,56 @@ msgstr "Synonymordbok ikkje støtta i dei siste A&A:"
 msgid "General terms:"
 msgstr "Generelt"
 
-#: lib/layouts/agu_stdclass.inc:35\r lib/layouts/agu_stdclass.inc:37
-#: lib/layouts/db_stdcharstyles.inc:37\r lib/layouts/db_stdcharstyles.inc:39
+#: lib/layouts/agu_stdclass.inc:35 lib/layouts/agu_stdclass.inc:37
+#: lib/layouts/db_stdcharstyles.inc:37 lib/layouts/db_stdcharstyles.inc:39
 msgid "Firstname"
 msgstr "Fornamn"
 
-#: lib/layouts/agu_stdclass.inc:50\r lib/layouts/agu_stdclass.inc:52
+#: lib/layouts/agu_stdclass.inc:50 lib/layouts/agu_stdclass.inc:52
 msgid "Fname"
 msgstr "Fnamn"
 
-#: lib/layouts/agu_stdclass.inc:98\r lib/layouts/agu_stdclass.inc:100
-#: lib/layouts/db_stdcharstyles.inc:61\r lib/layouts/db_stdcharstyles.inc:63
+#: lib/layouts/agu_stdclass.inc:98 lib/layouts/agu_stdclass.inc:100
+#: lib/layouts/db_stdcharstyles.inc:61 lib/layouts/db_stdcharstyles.inc:63
 #: lib/layouts/db_stdlayouts.inc:11
 msgid "Literal"
 msgstr "Ordrett"
 
-#: lib/layouts/agu_stdclass.inc:114\r lib/layouts/agu_stdclass.inc:116
-#: lib/layouts/logicalmkup.module:32\r src/frontends/qt4/GuiCharacter.cpp:84
+#: lib/layouts/agu_stdclass.inc:114 lib/layouts/agu_stdclass.inc:116
+#: lib/layouts/logicalmkup.module:32 src/frontends/qt4/GuiCharacter.cpp:84
 msgid "Emph"
 msgstr "Utheva"
 
-#: lib/layouts/agu_stdclass.inc:131\r lib/layouts/agu_stdclass.inc:133
+#: lib/layouts/agu_stdclass.inc:131 lib/layouts/agu_stdclass.inc:133
 msgid "Abbrev"
 msgstr "Kortform"
 
-#: lib/layouts/agu_stdclass.inc:143\r lib/layouts/agu_stdclass.inc:145
+#: lib/layouts/agu_stdclass.inc:143 lib/layouts/agu_stdclass.inc:145
 #: lib/layouts/agu_stdtitle.inc:56
 msgid "Citation-number"
 msgstr "Litteraturnummer"
 
-#: lib/layouts/agu_stdclass.inc:167\r lib/layouts/agu_stdclass.inc:169
+#: lib/layouts/agu_stdclass.inc:167 lib/layouts/agu_stdclass.inc:169
 msgid "Day"
 msgstr "Dag"
 
-#: lib/layouts/agu_stdclass.inc:179\r lib/layouts/agu_stdclass.inc:181
+#: lib/layouts/agu_stdclass.inc:179 lib/layouts/agu_stdclass.inc:181
 msgid "Month"
 msgstr "Månad"
 
-#: lib/layouts/agu_stdclass.inc:191\r lib/layouts/agu_stdclass.inc:193
+#: lib/layouts/agu_stdclass.inc:191 lib/layouts/agu_stdclass.inc:193
 msgid "Year"
 msgstr "År"
 
-#: lib/layouts/agu_stdclass.inc:203\r lib/layouts/agu_stdclass.inc:205
+#: lib/layouts/agu_stdclass.inc:203 lib/layouts/agu_stdclass.inc:205
 msgid "Issue-number"
 msgstr "Utgjevingnummer"
 
-#: lib/layouts/agu_stdclass.inc:215\r lib/layouts/agu_stdclass.inc:217
+#: lib/layouts/agu_stdclass.inc:215 lib/layouts/agu_stdclass.inc:217
 msgid "Issue-day"
 msgstr "Utgjevingsdag"
 
-#: lib/layouts/agu_stdclass.inc:227\r lib/layouts/agu_stdclass.inc:229
+#: lib/layouts/agu_stdclass.inc:227 lib/layouts/agu_stdclass.inc:229
 msgid "Issue-months"
 msgstr "Utgjevingsmånad"
 
@@ -12598,7 +12598,7 @@ msgstr "Vis til ein annan"
 msgid "Cite-other:"
 msgstr "Vis til ein annan:"
 
-#: lib/layouts/agu_stdtitle.inc:210\r lib/layouts/aguplus.inc:123
+#: lib/layouts/agu_stdtitle.inc:210 lib/layouts/aguplus.inc:123
 msgid "Revised:"
 msgstr "Retta:"
 
@@ -12622,7 +12622,7 @@ msgstr "Topptekst:"
 msgid "Published-online:"
 msgstr "Nettpublikasjon:"
 
-#: lib/layouts/agu_stdtitle.inc:264\r src/frontends/qt4/GuiCitation.cpp:90
+#: lib/layouts/agu_stdtitle.inc:264 src/frontends/qt4/GuiCitation.cpp:90
 msgid "Citation"
 msgstr "Litteratur"
 
@@ -12678,44 +12678,44 @@ msgstr "Datasett"
 msgid "Datasets:"
 msgstr "Datasett:"
 
-#: lib/layouts/agu_stdtitle.inc:322\r lib/layouts/agu_stdtitle.inc:324
+#: lib/layouts/agu_stdtitle.inc:322 lib/layouts/agu_stdtitle.inc:324
 msgid "ISSN"
 msgstr "ISSN"
 
-#: lib/layouts/agu_stdtitle.inc:334\r lib/layouts/agu_stdtitle.inc:336
+#: lib/layouts/agu_stdtitle.inc:334 lib/layouts/agu_stdtitle.inc:336
 msgid "CODEN"
 msgstr "CODEN"
 
-#: lib/layouts/agu_stdtitle.inc:347\r lib/layouts/agu_stdtitle.inc:349
+#: lib/layouts/agu_stdtitle.inc:347 lib/layouts/agu_stdtitle.inc:349
 msgid "SS-Code"
 msgstr "SS-Kode"
 
-#: lib/layouts/agu_stdtitle.inc:359\r lib/layouts/agu_stdtitle.inc:361
+#: lib/layouts/agu_stdtitle.inc:359 lib/layouts/agu_stdtitle.inc:361
 msgid "SS-Title"
 msgstr "SS-Tittel"
 
-#: lib/layouts/agu_stdtitle.inc:372\r lib/layouts/agu_stdtitle.inc:374
+#: lib/layouts/agu_stdtitle.inc:372 lib/layouts/agu_stdtitle.inc:374
 msgid "CCC-Code"
 msgstr "CCC Kode"
 
-#: lib/layouts/agu_stdtitle.inc:398\r lib/layouts/agu_stdtitle.inc:400
+#: lib/layouts/agu_stdtitle.inc:398 lib/layouts/agu_stdtitle.inc:400
 msgid "Dscr"
 msgstr "Omtale"
 
-#: lib/layouts/agu_stdtitle.inc:424\r lib/layouts/agu_stdtitle.inc:426
+#: lib/layouts/agu_stdtitle.inc:424 lib/layouts/agu_stdtitle.inc:426
 msgid "Orgdiv"
 msgstr "Orgdiv"
 
-#: lib/layouts/agu_stdtitle.inc:436\r lib/layouts/agu_stdtitle.inc:438
+#: lib/layouts/agu_stdtitle.inc:436 lib/layouts/agu_stdtitle.inc:438
 msgid "Orgname"
 msgstr "Orgnamn"
 
-#: lib/layouts/agu_stdtitle.inc:484\r lib/layouts/agu_stdtitle.inc:486
+#: lib/layouts/agu_stdtitle.inc:484 lib/layouts/agu_stdtitle.inc:486
 msgid "Postcode"
 msgstr "Postnummmer"
 
-#: lib/layouts/aguplus.inc:71\r lib/layouts/db_stdstarsections.inc:72
-#: lib/layouts/stdstarsections.inc:68\r lib/layouts/svcommon.inc:278
+#: lib/layouts/aguplus.inc:71 lib/layouts/db_stdstarsections.inc:72
+#: lib/layouts/stdstarsections.inc:68 lib/layouts/svcommon.inc:278
 msgid "Paragraph*"
 msgstr "Avsnitt*"
 
@@ -12800,31 +12800,31 @@ msgstr "Oversetter:"
 msgid "2000 Mathematics Subject Classification:"
 msgstr "2000 Matematikk subjektklassifikasjon:"
 
-#: lib/layouts/db_stdcharstyles.inc:21\r lib/layouts/db_stdcharstyles.inc:23
+#: lib/layouts/db_stdcharstyles.inc:21 lib/layouts/db_stdcharstyles.inc:23
 msgid "Directory"
 msgstr "Katalog"
 
-#: lib/layouts/db_stdcharstyles.inc:91\r lib/layouts/db_stdcharstyles.inc:93
+#: lib/layouts/db_stdcharstyles.inc:91 lib/layouts/db_stdcharstyles.inc:93
 msgid "KeyCombo"
 msgstr "Tastaturkombinasjon"
 
-#: lib/layouts/db_stdcharstyles.inc:106\r lib/layouts/db_stdcharstyles.inc:108
+#: lib/layouts/db_stdcharstyles.inc:106 lib/layouts/db_stdcharstyles.inc:108
 msgid "KeyCap"
 msgstr "Tastaturknapp"
 
-#: lib/layouts/db_stdcharstyles.inc:121\r lib/layouts/db_stdcharstyles.inc:123
+#: lib/layouts/db_stdcharstyles.inc:121 lib/layouts/db_stdcharstyles.inc:123
 msgid "GuiMenu"
 msgstr "GuiMeny"
 
-#: lib/layouts/db_stdcharstyles.inc:136\r lib/layouts/db_stdcharstyles.inc:138
+#: lib/layouts/db_stdcharstyles.inc:136 lib/layouts/db_stdcharstyles.inc:138
 msgid "GuiMenuItem"
 msgstr "GuiMenyEining"
 
-#: lib/layouts/db_stdcharstyles.inc:151\r lib/layouts/db_stdcharstyles.inc:153
+#: lib/layouts/db_stdcharstyles.inc:151 lib/layouts/db_stdcharstyles.inc:153
 msgid "GuiButton"
 msgstr "GuiKnapp"
 
-#: lib/layouts/db_stdcharstyles.inc:166\r lib/layouts/db_stdcharstyles.inc:168
+#: lib/layouts/db_stdcharstyles.inc:166 lib/layouts/db_stdcharstyles.inc:168
 msgid "MenuChoice"
 msgstr "MenyVal"
 
@@ -12832,7 +12832,7 @@ msgstr "MenyVal"
 msgid "SGML"
 msgstr "SGML"
 
-#: lib/layouts/db_stdstarsections.inc:84\r lib/layouts/stdstarsections.inc:79
+#: lib/layouts/db_stdstarsections.inc:84 lib/layouts/stdstarsections.inc:79
 msgid "Subparagraph*"
 msgstr "Underavsnitt*"
 
@@ -12861,7 +12861,7 @@ msgstr "RevisjonsMerknad"
 msgid "Chunk ##"
 msgstr "Blokk"
 
-#: lib/layouts/litinsets.inc:15\r lib/layouts/litinsets.inc:16
+#: lib/layouts/litinsets.inc:15 lib/layouts/litinsets.inc:16
 msgid "Chunk"
 msgstr "Blokk"
 
@@ -12901,7 +12901,7 @@ msgstr "\\arabic{subsubsection}."
 msgid "\\alph{subsubsection}."
 msgstr "\\alph{subsubsection}."
 
-#: lib/layouts/numrevtex.inc:36\r lib/layouts/numrevtex.inc:37
+#: lib/layouts/numrevtex.inc:36 lib/layouts/numrevtex.inc:37
 msgid "\\alph{paragraph}."
 msgstr "\\alph{paragraph}."
 
@@ -12983,7 +12983,7 @@ msgstr "Fyrsteforfattar"
 msgid "The author of this dictum"
 msgstr ""
 
-#: lib/layouts/stdcharstyles.inc:10\r lib/layouts/stdcustom.inc:10
+#: lib/layouts/stdcharstyles.inc:10 lib/layouts/stdcustom.inc:10
 msgid "UNDEFINED"
 msgstr "UDEFINERT"
 
@@ -13019,12 +13019,12 @@ msgstr "Del \\Roman{part}"
 msgid "Chapter ##"
 msgstr "Kapittel ##"
 
-#: lib/layouts/stdcounters.inc:19\r lib/layouts/stdcounters.inc:24
+#: lib/layouts/stdcounters.inc:19 lib/layouts/stdcounters.inc:24
 #: lib/layouts/stdcounters.inc:29
 msgid "Section ##"
 msgstr "Bolk ##"
 
-#: lib/layouts/stdcounters.inc:34\r lib/layouts/stdcounters.inc:39
+#: lib/layouts/stdcounters.inc:34 lib/layouts/stdcounters.inc:39
 msgid "Paragraph ##"
 msgstr "Avsnitt ##"
 
@@ -13044,7 +13044,7 @@ msgstr "\\Alph{enumiv}."
 msgid "Equation ##"
 msgstr "Likning ##"
 
-#: lib/layouts/stdcounters.inc:72\r lib/layouts/stdcounters.inc:76
+#: lib/layouts/stdcounters.inc:72 lib/layouts/stdcounters.inc:76
 msgid "Footnote ##"
 msgstr "Fotnote ##"
 
@@ -13052,7 +13052,7 @@ msgstr "Fotnote ##"
 msgid "\\fnsymbol{thanks}"
 msgstr ""
 
-#: lib/layouts/stdinsets.inc:12\r src/insets/InsetMarginal.cpp:35
+#: lib/layouts/stdinsets.inc:12 src/insets/InsetMarginal.cpp:35
 msgid "margin"
 msgstr "margin"
 
@@ -13064,16 +13064,16 @@ msgstr "fot"
 msgid "Greyedout"
 msgstr "Gråtekst"
 
-#: lib/layouts/stdinsets.inc:177\r src/insets/InsetERT.cpp:147
+#: lib/layouts/stdinsets.inc:177 src/insets/InsetERT.cpp:147
 #: src/insets/InsetERT.cpp:149
 msgid "ERT"
 msgstr "ERT"
 
-#: lib/layouts/stdinsets.inc:262\r lib/layouts/stdinsets.inc:268
+#: lib/layouts/stdinsets.inc:262 lib/layouts/stdinsets.inc:268
 msgid "Listings[[List of Listings]]"
 msgstr "Liste over kodelister"
 
-#: lib/layouts/stdinsets.inc:296\r src/frontends/qt4/GuiDocument.cpp:1419
+#: lib/layouts/stdinsets.inc:296 src/frontends/qt4/GuiDocument.cpp:1419
 msgid "Listings[[inset]]"
 msgstr "Kodeliste"
 
@@ -13103,7 +13103,7 @@ msgstr "Førehandsvising"
 msgid "Verbatim*"
 msgstr "Verbatim"
 
-#: lib/layouts/stdsections.inc:15\r lib/layouts/svcommon.inc:119
+#: lib/layouts/stdsections.inc:15 lib/layouts/svcommon.inc:119
 msgid "Part \\thepart"
 msgstr "Del \\thepart"
 
@@ -13115,31 +13115,31 @@ msgstr "Kapittel \\thechapter"
 msgid "Appendix \\thechapter"
 msgstr "Appendiks \\thechapter"
 
-#: lib/layouts/stdspecialchars.inc:8\r lib/ui/stdmenus.inc:427
+#: lib/layouts/stdspecialchars.inc:8 lib/ui/stdmenus.inc:427
 msgid "Ligature Break|k"
 msgstr "Halvt mellomrom|r"
 
-#: lib/layouts/stdspecialchars.inc:17\r lib/ui/stdmenus.inc:396
+#: lib/layouts/stdspecialchars.inc:17 lib/ui/stdmenus.inc:396
 msgid "End of Sentence|E"
 msgstr "Slutt på setning|p"
 
-#: lib/layouts/stdspecialchars.inc:26\r lib/ui/stdmenus.inc:395
+#: lib/layouts/stdspecialchars.inc:26 lib/ui/stdmenus.inc:395
 msgid "Ellipsis|i"
 msgstr "Ellipsis|i"
 
-#: lib/layouts/stdspecialchars.inc:36\r lib/ui/stdmenus.inc:402
+#: lib/layouts/stdspecialchars.inc:36 lib/ui/stdmenus.inc:402
 msgid "Menu Separator|M"
 msgstr "Meny delar|M"
 
-#: lib/layouts/stdspecialchars.inc:49\r lib/ui/stdmenus.inc:426
+#: lib/layouts/stdspecialchars.inc:49 lib/ui/stdmenus.inc:426
 msgid "Hyphenation Point|H"
 msgstr "Orddelingspunkt|p"
 
-#: lib/layouts/stdspecialchars.inc:56\r lib/ui/stdmenus.inc:400
+#: lib/layouts/stdspecialchars.inc:56 lib/ui/stdmenus.inc:400
 msgid "Breakable Slash|a"
 msgstr "Brytande skråstrek|a"
 
-#: lib/layouts/stdspecialchars.inc:65\r lib/ui/stdmenus.inc:399
+#: lib/layouts/stdspecialchars.inc:65 lib/ui/stdmenus.inc:399
 msgid "Protected Hyphen|y"
 msgstr "Vern bindestrek|k"
 
@@ -13278,52 +13278,52 @@ msgstr " Problem \\theproblem."
 msgid "Exercise \\theexercise."
 msgstr "Øving \\ theexercise."
 
-#: lib/layouts/theorems-ams.inc:74\r lib/layouts/theorems.inc:74
+#: lib/layouts/theorems-ams.inc:74 lib/layouts/theorems.inc:74
 msgid "Corollary \\thetheorem."
 msgstr "Korollar \\thetheorem."
 
-#: lib/layouts/theorems-ams.inc:92\r lib/layouts/theorems.inc:92
+#: lib/layouts/theorems-ams.inc:92 lib/layouts/theorems.inc:92
 msgid "Lemma \\thetheorem."
 msgstr "Lemma \\thetheorem"
 
-#: lib/layouts/theorems-ams.inc:110\r lib/layouts/theorems.inc:110
+#: lib/layouts/theorems-ams.inc:110 lib/layouts/theorems.inc:110
 msgid "Proposition \\thetheorem."
 msgstr "Framlegg \\thetheorem"
 
-#: lib/layouts/theorems-ams.inc:128\r lib/layouts/theorems.inc:128
+#: lib/layouts/theorems-ams.inc:128 lib/layouts/theorems.inc:128
 msgid "Conjecture \\thetheorem."
 msgstr "Konjektur \\thetheorem"
 
-#: lib/layouts/theorems-ams.inc:146\r lib/layouts/theorems.inc:146
+#: lib/layouts/theorems-ams.inc:146 lib/layouts/theorems.inc:146
 msgid "Fact \\thetheorem."
 msgstr "Fakta \\thetheorem."
 
-#: lib/layouts/theorems-ams.inc:164\r lib/layouts/theorems.inc:164
+#: lib/layouts/theorems-ams.inc:164 lib/layouts/theorems.inc:164
 msgid "Definition \\thetheorem."
 msgstr "Definisjon \\thetheorem"
 
-#: lib/layouts/theorems-ams.inc:188\r lib/layouts/theorems.inc:188
+#: lib/layouts/theorems-ams.inc:188 lib/layouts/theorems.inc:188
 msgid "Example \\thetheorem."
 msgstr "Døme \\thetheorem"
 
-#: lib/layouts/theorems-ams.inc:205\r lib/layouts/theorems.inc:205
+#: lib/layouts/theorems-ams.inc:205 lib/layouts/theorems.inc:205
 msgid "Problem \\thetheorem."
 msgstr "Problem \\thetheorem."
 
-#: lib/layouts/theorems-ams.inc:222\r lib/layouts/theorems.inc:222
+#: lib/layouts/theorems-ams.inc:222 lib/layouts/theorems.inc:222
 msgid "Exercise \\thetheorem."
 msgstr "Øving \\thetheorem."
 
-#: lib/layouts/theorems-ams.inc:239\r lib/layouts/theorems.inc:239
+#: lib/layouts/theorems-ams.inc:239 lib/layouts/theorems.inc:239
 #, fuzzy
 msgid "Solution \\thetheorem."
 msgstr "Konklusjon.\\thetheorem."
 
-#: lib/layouts/theorems-ams.inc:257\r lib/layouts/theorems.inc:257
+#: lib/layouts/theorems-ams.inc:257 lib/layouts/theorems.inc:257
 msgid "Remark \\thetheorem."
 msgstr "Merknad \\thetheorem."
 
-#: lib/layouts/theorems-ams.inc:282\r lib/layouts/theorems.inc:282
+#: lib/layouts/theorems-ams.inc:282 lib/layouts/theorems.inc:282
 msgid "Claim \\thetheorem."
 msgstr "Påstand \\thetheorem"
 
@@ -13343,28 +13343,28 @@ msgstr "Tilfellet \\alph{caseiii}."
 msgid "Case \\arabic{caseiv}."
 msgstr "Tilfelle \\arabic{caseiv}."
 
-#: lib/layouts/theorems-order.inc:46\r lib/layouts/theorems-starred.inc:178
+#: lib/layouts/theorems-order.inc:46 lib/layouts/theorems-starred.inc:178
 msgid "Example*"
 msgstr "Døme*"
 
-#: lib/layouts/theorems-order.inc:52\r lib/layouts/theorems-starred.inc:195
+#: lib/layouts/theorems-order.inc:52 lib/layouts/theorems-starred.inc:195
 msgid "Problem*"
 msgstr "Problem*"
 
-#: lib/layouts/theorems-order.inc:58\r lib/layouts/theorems-starred.inc:212
+#: lib/layouts/theorems-order.inc:58 lib/layouts/theorems-starred.inc:212
 msgid "Exercise*"
 msgstr "Øving*"
 
-#: lib/layouts/theorems-order.inc:64\r lib/layouts/theorems-starred.inc:229
+#: lib/layouts/theorems-order.inc:64 lib/layouts/theorems-starred.inc:229
 #, fuzzy
 msgid "Solution*"
 msgstr "Løysing"
 
-#: lib/layouts/theorems-order.inc:70\r lib/layouts/theorems-starred.inc:246
+#: lib/layouts/theorems-order.inc:70 lib/layouts/theorems-starred.inc:246
 msgid "Remark*"
 msgstr "Merknad*"
 
-#: lib/layouts/theorems-order.inc:76\r lib/layouts/theorems-starred.inc:271
+#: lib/layouts/theorems-order.inc:76 lib/layouts/theorems-starred.inc:271
 msgid "Claim*"
 msgstr "Påstand*"
 
@@ -13461,18 +13461,18 @@ msgstr ""
 msgid "Default (basic)"
 msgstr "Standard avstand"
 
-#: lib/layouts/basic.module:6\r lib/layouts/jurabib.module:8
+#: lib/layouts/basic.module:6 lib/layouts/jurabib.module:8
 #: lib/layouts/natbib.module:9
 #, fuzzy
 msgid "Citation engine"
 msgstr "Litteratur"
 
-#: lib/layouts/basic.module:22\r lib/layouts/jurabib.module:49
+#: lib/layouts/basic.module:22 lib/layouts/jurabib.module:49
 #: lib/layouts/natbib.module:44
 msgid "not cited"
 msgstr "ikkje nytta"
 
-#: lib/layouts/basic.module:23\r lib/layouts/jurabib.module:50
+#: lib/layouts/basic.module:23 lib/layouts/jurabib.module:50
 #: lib/layouts/natbib.module:45
 msgid "Add to bibliography only."
 msgstr "Legg berre til litteratur."
@@ -13558,7 +13558,7 @@ msgstr ""
 msgid "Braille (default)"
 msgstr "Blindeskrift (standard)"
 
-#: lib/layouts/braille.module:36\r lib/layouts/braille.module:59
+#: lib/layouts/braille.module:36 lib/layouts/braille.module:59
 msgid "Braille:"
 msgstr "Blindeskrift:"
 
@@ -13667,7 +13667,7 @@ msgstr "Midtstilt botnekst"
 msgid "Center Footer:"
 msgstr "Midtstilt botnekst:"
 
-#: lib/layouts/endnotes.module:2\r lib/layouts/endnotes.module:13
+#: lib/layouts/endnotes.module:2 lib/layouts/endnotes.module:13
 msgid "Endnote"
 msgstr "Sluttnotar"
 
@@ -13804,14 +13804,14 @@ msgstr "Figurnotis"
 msgid "Fixme"
 msgstr ""
 
-#: lib/layouts/fixme.module:64\r lib/layouts/fixme.module:99
-#: lib/layouts/fixme.module:141\r lib/layouts/fixme.module:182
+#: lib/layouts/fixme.module:64 lib/layouts/fixme.module:99
+#: lib/layouts/fixme.module:141 lib/layouts/fixme.module:182
 #, fuzzy
 msgid "Fixme Note Options|s"
 msgstr "Matte val"
 
-#: lib/layouts/fixme.module:65\r lib/layouts/fixme.module:100
-#: lib/layouts/fixme.module:142\r lib/layouts/fixme.module:183
+#: lib/layouts/fixme.module:65 lib/layouts/fixme.module:100
+#: lib/layouts/fixme.module:142 lib/layouts/fixme.module:183
 msgid "Consult the fixme package documentation for options"
 msgstr ""
 
@@ -13830,7 +13830,7 @@ msgstr "Åtvaring!"
 msgid "Fixme Error"
 msgstr "Feil på filnamn"
 
-#: lib/layouts/fixme.module:78\r src/frontends/qt4/GuiCompare.cpp:198
+#: lib/layouts/fixme.module:78 src/frontends/qt4/GuiCompare.cpp:198
 #: src/frontends/qt4/GuiDocument.cpp:2157
 #: src/frontends/qt4/GuiDocument.cpp:2231
 #: src/frontends/qt4/GuiDocument.cpp:3608
@@ -13896,12 +13896,12 @@ msgstr ""
 msgid "Fixme (Multipar)"
 msgstr ""
 
-#: lib/layouts/fixme.module:147\r lib/layouts/fixme.module:188
+#: lib/layouts/fixme.module:147 lib/layouts/fixme.module:188
 #, fuzzy
 msgid "Fixme Summary"
 msgstr "Samandrag"
 
-#: lib/layouts/fixme.module:148\r lib/layouts/fixme.module:189
+#: lib/layouts/fixme.module:148 lib/layouts/fixme.module:189
 msgid "Insert a summary of the FIXME note here"
 msgstr ""
 
@@ -14036,12 +14036,12 @@ msgstr "Grafikk"
 msgid "Boxes to scale and rotate its contents"
 msgstr ""
 
-#: lib/layouts/graphicboxes.module:11\r lib/layouts/graphicboxes.module:14
+#: lib/layouts/graphicboxes.module:11 lib/layouts/graphicboxes.module:14
 #, fuzzy
 msgid "Reflectbox"
 msgstr "utval"
 
-#: lib/layouts/graphicboxes.module:26\r lib/layouts/graphicboxes.module:28
+#: lib/layouts/graphicboxes.module:26 lib/layouts/graphicboxes.module:28
 #, fuzzy
 msgid "Scalebox"
 msgstr "Storleik"
@@ -14064,7 +14064,7 @@ msgstr "Faktum"
 msgid "Insert vertical scale factor (1 = 100%)"
 msgstr ""
 
-#: lib/layouts/graphicboxes.module:43\r lib/layouts/graphicboxes.module:45
+#: lib/layouts/graphicboxes.module:43 lib/layouts/graphicboxes.module:45
 msgid "Resizebox"
 msgstr ""
 
@@ -14077,7 +14077,7 @@ msgstr "Fast breidd på kolonna"
 msgid "Height of the box, can also be '!' to keep aspect ratio"
 msgstr ""
 
-#: lib/layouts/graphicboxes.module:63\r lib/layouts/graphicboxes.module:65
+#: lib/layouts/graphicboxes.module:63 lib/layouts/graphicboxes.module:65
 #, fuzzy
 msgid "Rotatebox"
 msgstr "Roter"
@@ -14100,7 +14100,7 @@ msgstr "Vi&nkel:"
 msgid "Rotation angle in degrees (counterclockwise)"
 msgstr ""
 
-#: lib/layouts/hanging.module:2\r lib/layouts/hanging.module:16
+#: lib/layouts/hanging.module:2 lib/layouts/hanging.module:16
 msgid "Hanging"
 msgstr "Hengande"
 
@@ -14124,12 +14124,12 @@ msgid ""
 "in LyX's examples folder."
 msgstr ""
 
-#: lib/layouts/hpstatement.module:11\r lib/layouts/hpstatement.module:16
+#: lib/layouts/hpstatement.module:11 lib/layouts/hpstatement.module:16
 #, fuzzy
 msgid "H-P number"
 msgstr "Ingen nummer"
 
-#: lib/layouts/hpstatement.module:35\r lib/layouts/hpstatement.module:38
+#: lib/layouts/hpstatement.module:35 lib/layouts/hpstatement.module:38
 #, fuzzy
 msgid "H-P statement"
 msgstr "Plassering"
@@ -14155,8 +14155,8 @@ msgstr ""
 "Definer ein stil for avsnitt med initial. Sjå Innlemma objekt manualen for "
 "tealjert skildring."
 
-#: lib/layouts/initials.module:14\r lib/layouts/initials.module:16
-#: lib/layouts/initials.module:26\r lib/layouts/initials.module:32
+#: lib/layouts/initials.module:14 lib/layouts/initials.module:16
+#: lib/layouts/initials.module:26 lib/layouts/initials.module:32
 #: lib/layouts/initials.module:39
 msgid "Initial"
 msgstr "Forbokstav"
@@ -14203,7 +14203,7 @@ msgstr "Tekst før"
 msgid "short title"
 msgstr "Kort tittel:"
 
-#: lib/layouts/knitr.module:2\r lib/configure.py:640
+#: lib/layouts/knitr.module:2 lib/configure.py:640
 msgid "Rnw (knitr)"
 msgstr "Rnw (knitr)"
 
@@ -14217,24 +14217,24 @@ msgstr ""
 "vere installert for at modulen skal virke: install.packages(\"knitr\").Merk "
 "at den er avhengig av R >= 2.14.1. For meir info sjå http://yihui.name/knitr"
 
-#: lib/layouts/knitr.module:6\r lib/layouts/noweb.module:5
+#: lib/layouts/knitr.module:6 lib/layouts/noweb.module:5
 #: lib/layouts/sweave.module:6
 msgid "literate"
 msgstr "Litterært"
 
-#: lib/layouts/knitr.module:20\r lib/layouts/sweave.module:30
+#: lib/layouts/knitr.module:20 lib/layouts/sweave.module:30
 msgid "Sweave Options"
 msgstr "Sweave val"
 
-#: lib/layouts/knitr.module:21\r lib/layouts/sweave.module:31
+#: lib/layouts/knitr.module:21 lib/layouts/sweave.module:31
 msgid "Sweave opts"
 msgstr "Sweave val"
 
-#: lib/layouts/knitr.module:42\r lib/layouts/sweave.module:52
+#: lib/layouts/knitr.module:42 lib/layouts/sweave.module:52
 msgid "S/R expression"
 msgstr "S/R uttrykk"
 
-#: lib/layouts/knitr.module:43\r lib/layouts/sweave.module:53
+#: lib/layouts/knitr.module:43 lib/layouts/sweave.module:53
 msgid "S/R expr"
 msgstr "S/R uttrykk"
 
@@ -14250,7 +14250,7 @@ msgstr ""
 "Denne modulen legg til mogelegheita å leggje inn LilyPond i LyX. Det vil bli "
 "handsama saman med dokumentet. Sjå lilypond.lyx eksempelfil."
 
-#: lib/layouts/lilypond.module:13\r lib/layouts/lilypond.module:14
+#: lib/layouts/lilypond.module:13 lib/layouts/lilypond.module:14
 #: lib/external_templates:320
 msgid "LilyPond"
 msgstr "LilyPond"
@@ -14266,7 +14266,7 @@ msgid ""
 "options)."
 msgstr ""
 
-#: lib/layouts/linguistics.module:2\r lib/layouts/linguistics.module:33
+#: lib/layouts/linguistics.module:2 lib/layouts/linguistics.module:33
 msgid "Linguistics"
 msgstr "Lingvistikk"
 
@@ -14313,26 +14313,26 @@ msgstr "Underdøme"
 msgid "Subexample:"
 msgstr "Underdøme:"
 
-#: lib/layouts/linguistics.module:68\r lib/layouts/linguistics.module:70
+#: lib/layouts/linguistics.module:68 lib/layouts/linguistics.module:70
 msgid "Glosse"
 msgstr "Glose"
 
-#: lib/layouts/linguistics.module:95\r lib/layouts/linguistics.module:130
+#: lib/layouts/linguistics.module:95 lib/layouts/linguistics.module:130
 #, fuzzy
 msgid "Translation"
 msgstr "Oversetter"
 
-#: lib/layouts/linguistics.module:96\r lib/layouts/linguistics.module:131
+#: lib/layouts/linguistics.module:96 lib/layouts/linguistics.module:131
 #, fuzzy
 msgid "Glosse Translation|s"
 msgstr "Overgang"
 
-#: lib/layouts/linguistics.module:97\r lib/layouts/linguistics.module:132
+#: lib/layouts/linguistics.module:97 lib/layouts/linguistics.module:132
 #, fuzzy
 msgid "Add a translation for the glosse"
 msgstr "Legg til ei ny indeks til lista"
 
-#: lib/layouts/linguistics.module:103\r lib/layouts/linguistics.module:105
+#: lib/layouts/linguistics.module:103 lib/layouts/linguistics.module:105
 msgid "Tri-Glosse"
 msgstr "Tri-glosse"
 
@@ -14402,7 +14402,7 @@ msgstr ""
 msgid "charstyles"
 msgstr "Teiknstilar"
 
-#: lib/layouts/logicalmkup.module:11\r src/frontends/qt4/GuiCharacter.cpp:89
+#: lib/layouts/logicalmkup.module:11 src/frontends/qt4/GuiCharacter.cpp:89
 msgid "Noun"
 msgstr "Kapitel"
 
@@ -14430,7 +14430,7 @@ msgstr "Minimalistisk"
 msgid "Redefines several insets (Index, Branch, URL) as being Minimalistic."
 msgstr "Omgjer fleire innskot  (Indeks, Grein, URL) til minimalistiske."
 
-#: lib/layouts/multicol.module:2\r lib/layouts/multicol.module:11
+#: lib/layouts/multicol.module:2 lib/layouts/multicol.module:11
 #, fuzzy
 msgid "Multiple Columns"
 msgstr "&Multikolonne"
@@ -14511,11 +14511,11 @@ msgid ""
 "extended to use a similar optional argument."
 msgstr ""
 
-#: lib/layouts/paralist.module:28\r lib/layouts/paralist.module:35
-#: lib/layouts/paralist.module:50\r lib/layouts/paralist.module:59
-#: lib/layouts/paralist.module:71\r lib/layouts/paralist.module:80
-#: lib/layouts/paralist.module:89\r lib/layouts/paralist.module:101
-#: lib/layouts/paralist.module:110\r lib/layouts/paralist.module:119
+#: lib/layouts/paralist.module:28 lib/layouts/paralist.module:35
+#: lib/layouts/paralist.module:50 lib/layouts/paralist.module:59
+#: lib/layouts/paralist.module:71 lib/layouts/paralist.module:80
+#: lib/layouts/paralist.module:89 lib/layouts/paralist.module:101
+#: lib/layouts/paralist.module:110 lib/layouts/paralist.module:119
 #: lib/layouts/paralist.module:131
 #, fuzzy
 msgid "Optional arguments for this list (see paralist manual)"
@@ -14690,7 +14690,7 @@ msgstr "PDF (XeTeX)"
 msgid "PDF-Comment setup options"
 msgstr "Dokumentval"
 
-#: lib/layouts/pdfcomment.module:83\r lib/layouts/pdfcomment.module:106
+#: lib/layouts/pdfcomment.module:83 lib/layouts/pdfcomment.module:106
 #: lib/layouts/pdfcomment.module:222
 msgid "Opts"
 msgstr ""
@@ -14704,7 +14704,7 @@ msgstr ""
 msgid "PDF-Annotation"
 msgstr "Notasjon"
 
-#: lib/layouts/pdfcomment.module:97\r src/frontends/qt4/GuiClipboard.cpp:174
+#: lib/layouts/pdfcomment.module:97 src/frontends/qt4/GuiClipboard.cpp:174
 msgid "PDF"
 msgstr "PDF"
 
@@ -14858,7 +14858,7 @@ msgid ""
 "documentation of hyperref for details."
 msgstr ""
 
-#: lib/layouts/pdfform.module:15\r lib/layouts/pdfform.module:26
+#: lib/layouts/pdfform.module:15 lib/layouts/pdfform.module:26
 msgid "Begin PDF Form"
 msgstr ""
 
@@ -14867,21 +14867,21 @@ msgstr ""
 msgid "PDF form"
 msgstr "PDF forfattar"
 
-#: lib/layouts/pdfform.module:28\r lib/layouts/pdfform.module:65
+#: lib/layouts/pdfform.module:28 lib/layouts/pdfform.module:65
 #, fuzzy
 msgid "PDF Form Parameters"
 msgstr "Fleire val"
 
-#: lib/layouts/pdfform.module:29\r lib/layouts/pdfform.module:66
+#: lib/layouts/pdfform.module:29 lib/layouts/pdfform.module:66
 msgid "Params"
 msgstr ""
 
-#: lib/layouts/pdfform.module:30\r lib/layouts/pdfform.module:67
+#: lib/layouts/pdfform.module:30 lib/layouts/pdfform.module:67
 #, fuzzy
 msgid "Insert PDF form parameters here"
 msgstr "Kan ikkje endre talet på kolonner i '%1$s'"
 
-#: lib/layouts/pdfform.module:40\r lib/layouts/pdfform.module:43
+#: lib/layouts/pdfform.module:40 lib/layouts/pdfform.module:43
 msgid "End PDF Form"
 msgstr ""
 
@@ -14895,17 +14895,17 @@ msgstr "PDF (XeTeX)"
 msgid "PDF link setup"
 msgstr "PDF (XeTeX)"
 
-#: lib/layouts/pdfform.module:58\r lib/layouts/pdfform.module:63
+#: lib/layouts/pdfform.module:58 lib/layouts/pdfform.module:63
 #, fuzzy
 msgid "TextField"
 msgstr "»tekst«"
 
-#: lib/layouts/pdfform.module:78\r lib/layouts/pdfform.module:81
+#: lib/layouts/pdfform.module:78 lib/layouts/pdfform.module:81
 #, fuzzy
 msgid "CheckBox"
 msgstr "Sjekk"
 
-#: lib/layouts/pdfform.module:84\r lib/layouts/pdfform.module:87
+#: lib/layouts/pdfform.module:84 lib/layouts/pdfform.module:87
 #, fuzzy
 msgid "ChoiceMenu"
 msgstr "MenyVal"
@@ -14919,22 +14919,22 @@ msgstr "Etikett"
 msgid "Insert the label here"
 msgstr "Kan ikkje endre talet på kolonner i '%1$s'"
 
-#: lib/layouts/pdfform.module:96\r lib/layouts/pdfform.module:99
+#: lib/layouts/pdfform.module:96 lib/layouts/pdfform.module:99
 #, fuzzy
 msgid "PushButton"
 msgstr "GuiKnapp"
 
-#: lib/layouts/pdfform.module:102\r lib/layouts/pdfform.module:105
+#: lib/layouts/pdfform.module:102 lib/layouts/pdfform.module:105
 #, fuzzy
 msgid "SubmitButton"
 msgstr "GuiKnapp"
 
-#: lib/layouts/pdfform.module:108\r lib/layouts/pdfform.module:111
+#: lib/layouts/pdfform.module:108 lib/layouts/pdfform.module:111
 #, fuzzy
 msgid "ResetButton"
 msgstr "Element:GuiKnapp"
 
-#: lib/layouts/pdfform.module:118\r lib/layouts/pdfform.module:121
+#: lib/layouts/pdfform.module:118 lib/layouts/pdfform.module:121
 #, fuzzy
 msgid "PDFAction"
 msgstr "Handling"
@@ -15044,12 +15044,12 @@ msgid ""
 "statements.lyx in LyX's examples folder."
 msgstr ""
 
-#: lib/layouts/rsphrase.module:11\r lib/layouts/rsphrase.module:16
+#: lib/layouts/rsphrase.module:11 lib/layouts/rsphrase.module:16
 #, fuzzy
 msgid "R-S number"
 msgstr "Ingen nummer"
 
-#: lib/layouts/rsphrase.module:33\r lib/layouts/rsphrase.module:36
+#: lib/layouts/rsphrase.module:33 lib/layouts/rsphrase.module:36
 msgid "R-S phrase"
 msgstr ""
 
@@ -15100,7 +15100,7 @@ msgstr "Utval|U"
 msgid "Width of the section Box"
 msgstr "Breidde i ferdig dokument"
 
-#: lib/layouts/sectionbox.module:26\r lib/layouts/todonotes.module:41
+#: lib/layouts/sectionbox.module:26 lib/layouts/todonotes.module:41
 #, fuzzy
 msgid "Heading"
 msgstr "Hovud"
@@ -15157,7 +15157,7 @@ msgstr "URL-Etikett"
 msgid "ShapedParagraphs"
 msgstr "Avsnitt"
 
-#: lib/layouts/shapepar.module:39\r lib/ui/stdtoolbars.inc:818
+#: lib/layouts/shapepar.module:39 lib/ui/stdtoolbars.inc:818
 #, fuzzy
 msgid "Circle"
 msgstr "circledS"
@@ -15179,7 +15179,7 @@ msgstr ""
 msgid "Nut"
 msgstr "Klipp"
 
-#: lib/layouts/shapepar.module:64\r lib/ui/stdtoolbars.inc:769
+#: lib/layouts/shapepar.module:64 lib/ui/stdtoolbars.inc:769
 #, fuzzy
 msgid "Square"
 msgstr "square"
@@ -15202,7 +15202,7 @@ msgstr "Kastar skugge"
 msgid "Drop up"
 msgstr ""
 
-#: lib/layouts/shapepar.module:91\r src/mathed/MathMacroTemplate.cpp:532
+#: lib/layouts/shapepar.module:91 src/mathed/MathMacroTemplate.cpp:532
 msgid "TeX"
 msgstr "TeX"
 
@@ -15248,7 +15248,7 @@ msgstr ""
 msgid "Shapepar"
 msgstr "&Form:"
 
-#: lib/layouts/sweave.module:2\r lib/configure.py:638
+#: lib/layouts/sweave.module:2 lib/configure.py:638
 msgid "Sweave"
 msgstr "Sweave"
 
@@ -15260,7 +15260,7 @@ msgstr ""
 "Tillet bruk av statistiskverkty slik som S eller R til litterær "
 "programmering gjennom Sweave pakken. Sjå sweave.lyx for meir informasjon."
 
-#: lib/layouts/sweave.module:74\r lib/layouts/sweave.module:75
+#: lib/layouts/sweave.module:74 lib/layouts/sweave.module:75
 msgid "Sweave Input File"
 msgstr "Sweave innfil"
 
@@ -15286,7 +15286,7 @@ msgid ""
 "the tcolorbox documentation for details."
 msgstr ""
 
-#: lib/layouts/tcolorbox.module:11\r lib/layouts/tcolorbox.module:14
+#: lib/layouts/tcolorbox.module:11 lib/layouts/tcolorbox.module:14
 #, fuzzy
 msgid "Color Box"
 msgstr "Farge"
@@ -15317,7 +15317,7 @@ msgstr "Farge på skrifta"
 msgid "Color Box (Fit Contents)"
 msgstr ""
 
-#: lib/layouts/tcolorbox.module:39\r lib/layouts/tcolorbox.module:41
+#: lib/layouts/tcolorbox.module:39 lib/layouts/tcolorbox.module:41
 #, fuzzy
 msgid "Raster Color Box"
 msgstr "Farge på skrifta"
@@ -15337,7 +15337,7 @@ msgstr "Kan ikkje endre talet på kolonner i '%1$s'"
 msgid "Color Box Separator"
 msgstr "Separator"
 
-#: lib/layouts/tcolorbox.module:57\r lib/layouts/tcolorbox.module:91
+#: lib/layouts/tcolorbox.module:57 lib/layouts/tcolorbox.module:91
 #, fuzzy
 msgid "Color Boxes"
 msgstr "Fargar"
@@ -15351,11 +15351,11 @@ msgstr ""
 msgid "Color Box Line"
 msgstr "Farga lenk&jer"
 
-#: lib/layouts/tcolorbox.module:90\r lib/layouts/tcolorbox.module:105
+#: lib/layouts/tcolorbox.module:90 lib/layouts/tcolorbox.module:105
 msgid "Color Box Setup"
 msgstr ""
 
-#: lib/layouts/tcolorbox.module:118\r lib/layouts/tcolorbox.module:121
+#: lib/layouts/tcolorbox.module:118 lib/layouts/tcolorbox.module:121
 #, fuzzy
 msgid "New Color Box Type"
 msgstr "Fargar"
@@ -15392,7 +15392,7 @@ msgstr "standard|t"
 msgid "Default value for argument (keep empty!)"
 msgstr ""
 
-#: lib/layouts/tcolorbox.module:153\r lib/layouts/tcolorbox.module:155
+#: lib/layouts/tcolorbox.module:153 lib/layouts/tcolorbox.module:155
 #, fuzzy
 msgid "Custom Color Box 1"
 msgstr "Farge på skrifta"
@@ -15407,22 +15407,22 @@ msgstr "Kolonne val"
 msgid "Insert more color box options here"
 msgstr "Kan ikkje endre talet på kolonner i '%1$s'"
 
-#: lib/layouts/tcolorbox.module:164\r lib/layouts/tcolorbox.module:166
+#: lib/layouts/tcolorbox.module:164 lib/layouts/tcolorbox.module:166
 #, fuzzy
 msgid "Custom Color Box 2"
 msgstr "Farge på skrifta"
 
-#: lib/layouts/tcolorbox.module:170\r lib/layouts/tcolorbox.module:172
+#: lib/layouts/tcolorbox.module:170 lib/layouts/tcolorbox.module:172
 #, fuzzy
 msgid "Custom Color Box 3"
 msgstr "Farge på skrifta"
 
-#: lib/layouts/tcolorbox.module:176\r lib/layouts/tcolorbox.module:178
+#: lib/layouts/tcolorbox.module:176 lib/layouts/tcolorbox.module:178
 #, fuzzy
 msgid "Custom Color Box 4"
 msgstr "Farge på skrifta"
 
-#: lib/layouts/tcolorbox.module:182\r lib/layouts/tcolorbox.module:184
+#: lib/layouts/tcolorbox.module:182 lib/layouts/tcolorbox.module:184
 #, fuzzy
 msgid "Custom Color Box 5"
 msgstr "Farge på skrifta"
@@ -15636,8 +15636,8 @@ msgstr ""
 "Fakta, Føresetnad, Kasus og Spørsmål. Både nummererte og unummererte."
 
 #: lib/layouts/theorems-ams-extended.module:10
-#: lib/layouts/theorems-ams.module:9\r lib/layouts/theorems-chap.module:9
-#: lib/layouts/theorems-sec.module:8\r lib/layouts/theorems-starred.module:7
+#: lib/layouts/theorems-ams.module:9 lib/layouts/theorems-chap.module:9
+#: lib/layouts/theorems-sec.module:8 lib/layouts/theorems-starred.module:7
 #: lib/layouts/theorems-std.module:8
 msgid "theorems"
 msgstr "Teorem"
@@ -15863,12 +15863,12 @@ msgstr ""
 msgid "TODO (Margin)"
 msgstr ""
 
-#: lib/layouts/todonotes.module:72\r lib/layouts/todonotes.module:84
+#: lib/layouts/todonotes.module:72 lib/layouts/todonotes.module:84
 #, fuzzy
 msgid "TODO Note Options|s"
 msgstr "Matte val"
 
-#: lib/layouts/todonotes.module:73\r lib/layouts/todonotes.module:102
+#: lib/layouts/todonotes.module:73 lib/layouts/todonotes.module:102
 msgid "See the todonotes manual for possible options"
 msgstr ""
 
@@ -15881,7 +15881,7 @@ msgstr ""
 msgid "TODO (Inline)"
 msgstr "TOG online ID"
 
-#: lib/layouts/todonotes.module:94\r lib/layouts/todonotes.module:96
+#: lib/layouts/todonotes.module:94 lib/layouts/todonotes.module:96
 #, fuzzy
 msgid "Missing Figure"
 msgstr "Fila manglar"
@@ -15950,7 +15950,7 @@ msgstr "Etikettbreidd"
 msgid "Maximum width (default: \\linewidth)"
 msgstr ""
 
-#: lib/languages:87\r src/Font.cpp:61 src/Font.cpp:64 src/Font.cpp:68
+#: lib/languages:87 src/Font.cpp:61 src/Font.cpp:64 src/Font.cpp:68
 #: src/Font.cpp:73 src/Font.cpp:76
 msgid "Ignore"
 msgstr "Ignorer"
@@ -15980,7 +15980,7 @@ msgstr "Arabisk (ArabTeX)"
 msgid "Arabic (Arabi)"
 msgstr "Arabisk (Arabi)"
 
-#: lib/languages:176\r src/frontends/qt4/GuiSymbols.cpp:63
+#: lib/languages:176 src/frontends/qt4/GuiSymbols.cpp:63
 msgid "Armenian"
 msgstr "Armensk"
 
@@ -16101,7 +16101,7 @@ msgstr "Fransk"
 msgid "Galician"
 msgstr "Gælisk"
 
-#: lib/languages:497\r src/frontends/qt4/GuiSymbols.cpp:78
+#: lib/languages:497 src/frontends/qt4/GuiSymbols.cpp:78
 msgid "Georgian"
 msgstr "Georgis"
 
@@ -16122,7 +16122,7 @@ msgstr "Tysk (Sveits)"
 msgid "German (Switzerland, old spelling)"
 msgstr "Tysk (Østerisk, gammal rettskriving)"
 
-#: lib/languages:558\r lib/ui/stdtoolbars.inc:305\r lib/ui/stdtoolbars.inc:594
+#: lib/languages:558 lib/ui/stdtoolbars.inc:305 lib/ui/stdtoolbars.inc:594
 #: src/frontends/qt4/GuiSymbols.cpp:61
 msgid "Greek"
 msgstr "Gresk"
@@ -16131,7 +16131,7 @@ msgstr "Gresk"
 msgid "Greek (polytonic)"
 msgstr "Gresk (polytonisk)"
 
-#: lib/languages:582\r src/frontends/qt4/GuiSymbols.cpp:64
+#: lib/languages:582 src/frontends/qt4/GuiSymbols.cpp:64
 msgid "Hebrew"
 msgstr "Hebraisk"
 
@@ -16176,7 +16176,7 @@ msgstr "Koreansk"
 msgid "Kurmanji"
 msgstr "DinAdresse"
 
-#: lib/languages:710\r src/frontends/qt4/GuiSymbols.cpp:76
+#: lib/languages:710 src/frontends/qt4/GuiSymbols.cpp:76
 msgid "Lao"
 msgstr "Lao"
 
@@ -16279,19 +16279,19 @@ msgstr "Spansk (meksikansk)"
 msgid "Swedish"
 msgstr "Svensk"
 
-#: lib/languages:995\r src/frontends/qt4/GuiSymbols.cpp:71
+#: lib/languages:995 src/frontends/qt4/GuiSymbols.cpp:71
 msgid "Tamil"
 msgstr "Tamil"
 
-#: lib/languages:1003\r src/frontends/qt4/GuiSymbols.cpp:72
+#: lib/languages:1003 src/frontends/qt4/GuiSymbols.cpp:72
 msgid "Telugu"
 msgstr "Telugu"
 
-#: lib/languages:1010\r src/frontends/qt4/GuiSymbols.cpp:75
+#: lib/languages:1010 src/frontends/qt4/GuiSymbols.cpp:75
 msgid "Thai"
 msgstr "Thailandsk"
 
-#: lib/languages:1024\r src/frontends/qt4/GuiSymbols.cpp:77
+#: lib/languages:1024 src/frontends/qt4/GuiSymbols.cpp:77
 msgid "Tibetan"
 msgstr "Tibetansk"
 
@@ -16323,7 +16323,7 @@ msgstr "Walisisk"
 msgid "AE (Almost European)"
 msgstr "AE (mestA Europeisk)"
 
-#: lib/latexfonts:90\r lib/latexfonts:98
+#: lib/latexfonts:90 lib/latexfonts:98
 msgid "Bera Serif"
 msgstr "Bera Serif"
 
@@ -16348,32 +16348,32 @@ msgstr "Bitstream Charter"
 msgid "Computer Modern Roman"
 msgstr "Computer Modern Romansk"
 
-#: lib/latexfonts:140\r lib/latexfonts:149
+#: lib/latexfonts:140 lib/latexfonts:149
 msgid "URW Garamond"
 msgstr ""
 
-#: lib/latexfonts:156\r lib/latexfonts:165\r lib/latexfonts:173
+#: lib/latexfonts:156 lib/latexfonts:165 lib/latexfonts:173
 msgid "Libertine"
 msgstr ""
 
-#: lib/latexfonts:180\r lib/latexfonts:187
+#: lib/latexfonts:180 lib/latexfonts:187
 msgid "Latin Modern Roman"
 msgstr "Latin Modern Romansk"
 
-#: lib/latexfonts:194\r lib/latexfonts:207
+#: lib/latexfonts:194 lib/latexfonts:207
 #, fuzzy
 msgid "Bitstream Charter (Mathdesign)"
 msgstr "Bitstream Charter"
 
-#: lib/latexfonts:214\r lib/latexfonts:227
+#: lib/latexfonts:214 lib/latexfonts:227
 msgid "Utopia (Mathdesign)"
 msgstr ""
 
-#: lib/latexfonts:234\r lib/latexfonts:247
+#: lib/latexfonts:234 lib/latexfonts:247
 msgid "URW Garamond (Mathdesign)"
 msgstr ""
 
-#: lib/latexfonts:254\r lib/latexfonts:264
+#: lib/latexfonts:254 lib/latexfonts:264
 msgid "Minion Pro"
 msgstr ""
 
@@ -16381,12 +16381,12 @@ msgstr ""
 msgid "New Century Schoolbook"
 msgstr "New Century Schoolbook"
 
-#: lib/latexfonts:279\r lib/latexfonts:291\r lib/latexfonts:298
-#: lib/latexfonts:304\r lib/latexfonts:311
+#: lib/latexfonts:279 lib/latexfonts:291 lib/latexfonts:298
+#: lib/latexfonts:304 lib/latexfonts:311
 msgid "Palatino"
 msgstr "Palatino"
 
-#: lib/latexfonts:317\r lib/latexfonts:326\r lib/latexfonts:333
+#: lib/latexfonts:317 lib/latexfonts:326 lib/latexfonts:333
 #: lib/latexfonts:339
 msgid "Times Roman"
 msgstr "Times-Romansk"
@@ -16411,7 +16411,7 @@ msgstr ""
 msgid "TeX Gyre Termes"
 msgstr ""
 
-#: lib/latexfonts:377\r lib/latexfonts:388\r lib/latexfonts:394
+#: lib/latexfonts:377 lib/latexfonts:388 lib/latexfonts:394
 #: lib/latexfonts:401
 msgid "Utopia (Fourier)"
 msgstr ""
@@ -16424,7 +16424,7 @@ msgstr "Avant Garde"
 msgid "Bera Sans"
 msgstr "Bera Sans"
 
-#: lib/latexfonts:426\r lib/latexfonts:436
+#: lib/latexfonts:426 lib/latexfonts:436
 msgid "Biolinum"
 msgstr ""
 
@@ -16769,71 +16769,71 @@ msgstr "Unicode (XeTeX) (utf8)"
 msgid "ASCII"
 msgstr "ASCII"
 
-#: lib/ui/stdcontext.inc:30\r lib/ui/stdmenus.inc:450
+#: lib/ui/stdcontext.inc:30 lib/ui/stdmenus.inc:450
 msgid "Array Environment|y"
 msgstr "Likningsmiljø|k"
 
-#: lib/ui/stdcontext.inc:31\r lib/ui/stdmenus.inc:451
+#: lib/ui/stdcontext.inc:31 lib/ui/stdmenus.inc:451
 msgid "Cases Environment|C"
 msgstr "Alternativ-miljø|n"
 
-#: lib/ui/stdcontext.inc:32\r lib/ui/stdmenus.inc:452
+#: lib/ui/stdcontext.inc:32 lib/ui/stdmenus.inc:452
 msgid "Aligned Environment|l"
 msgstr "Ved sida av miljø|V"
 
-#: lib/ui/stdcontext.inc:33\r lib/ui/stdmenus.inc:453
+#: lib/ui/stdcontext.inc:33 lib/ui/stdmenus.inc:453
 msgid "AlignedAt Environment|v"
 msgstr "Spesifisert ved sidan av miljø|i"
 
-#: lib/ui/stdcontext.inc:34\r lib/ui/stdmenus.inc:454
+#: lib/ui/stdcontext.inc:34 lib/ui/stdmenus.inc:454
 msgid "Gathered Environment|h"
 msgstr "Samla miljø|ø"
 
-#: lib/ui/stdcontext.inc:35\r lib/ui/stdmenus.inc:455
+#: lib/ui/stdcontext.inc:35 lib/ui/stdmenus.inc:455
 msgid "Split Environment|S"
 msgstr "Delt miljø|m"
 
-#: lib/ui/stdcontext.inc:37\r lib/ui/stdmenus.inc:457
+#: lib/ui/stdcontext.inc:37 lib/ui/stdmenus.inc:457
 msgid "Delimiters...|r"
 msgstr "Skiljeteikn...|i"
 
-#: lib/ui/stdcontext.inc:38\r lib/ui/stdmenus.inc:458
+#: lib/ui/stdcontext.inc:38 lib/ui/stdmenus.inc:458
 msgid "Matrix...|x"
 msgstr "Matriser...|r"
 
-#: lib/ui/stdcontext.inc:39\r lib/ui/stdmenus.inc:459
+#: lib/ui/stdcontext.inc:39 lib/ui/stdmenus.inc:459
 msgid "Macro|o"
 msgstr "Makro|o"
 
-#: lib/ui/stdcontext.inc:43\r lib/ui/stdmenus.inc:320\r lib/ui/stdmenus.inc:443
+#: lib/ui/stdcontext.inc:43 lib/ui/stdmenus.inc:320 lib/ui/stdmenus.inc:443
 msgid "AMS align Environment|a"
 msgstr "AMS ved sida av miljø|A"
 
-#: lib/ui/stdcontext.inc:44\r lib/ui/stdmenus.inc:321\r lib/ui/stdmenus.inc:444
+#: lib/ui/stdcontext.inc:44 lib/ui/stdmenus.inc:321 lib/ui/stdmenus.inc:444
 msgid "AMS alignat Environment|t"
 msgstr "AMS spesifisert ved sidan av miljø|t"
 
-#: lib/ui/stdcontext.inc:45\r lib/ui/stdmenus.inc:322\r lib/ui/stdmenus.inc:445
+#: lib/ui/stdcontext.inc:45 lib/ui/stdmenus.inc:322 lib/ui/stdmenus.inc:445
 msgid "AMS flalign Environment|f"
 msgstr "AMS Brei ved sida av miljø|B"
 
-#: lib/ui/stdcontext.inc:46\r lib/ui/stdmenus.inc:323\r lib/ui/stdmenus.inc:446
+#: lib/ui/stdcontext.inc:46 lib/ui/stdmenus.inc:323 lib/ui/stdmenus.inc:446
 msgid "AMS gather Environment|g"
 msgstr "AMS samla miljø|ø"
 
-#: lib/ui/stdcontext.inc:47\r lib/ui/stdmenus.inc:324\r lib/ui/stdmenus.inc:447
+#: lib/ui/stdcontext.inc:47 lib/ui/stdmenus.inc:324 lib/ui/stdmenus.inc:447
 msgid "AMS multline Environment|m"
 msgstr "AMS multilinje miljø|u"
 
-#: lib/ui/stdcontext.inc:51\r lib/ui/stdmenus.inc:317\r lib/ui/stdmenus.inc:439
+#: lib/ui/stdcontext.inc:51 lib/ui/stdmenus.inc:317 lib/ui/stdmenus.inc:439
 msgid "Inline Formula|I"
 msgstr "Formel i teksten|m"
 
-#: lib/ui/stdcontext.inc:52\r lib/ui/stdmenus.inc:318
+#: lib/ui/stdcontext.inc:52 lib/ui/stdmenus.inc:318
 msgid "Displayed Formula|D"
 msgstr "Eigen formel|E"
 
-#: lib/ui/stdcontext.inc:53\r lib/ui/stdmenus.inc:319\r lib/ui/stdmenus.inc:442
+#: lib/ui/stdcontext.inc:53 lib/ui/stdmenus.inc:319 lib/ui/stdmenus.inc:442
 msgid "Eqnarray Environment|E"
 msgstr "Sett med likningar|l"
 
@@ -16841,11 +16841,11 @@ msgstr "Sett med likningar|l"
 msgid "AMS Environment|A"
 msgstr "AMSmiljø|A"
 
-#: lib/ui/stdcontext.inc:56\r lib/ui/stdmenus.inc:235
+#: lib/ui/stdcontext.inc:56 lib/ui/stdmenus.inc:235
 msgid "Number Whole Formula|N"
 msgstr "Nummerer heile formenl|N"
 
-#: lib/ui/stdcontext.inc:57\r lib/ui/stdmenus.inc:236
+#: lib/ui/stdcontext.inc:57 lib/ui/stdmenus.inc:236
 msgid "Number This Line|u"
 msgstr "Nummerer denne linja||u"
 
@@ -16857,7 +16857,7 @@ msgstr "Etikett på likninga|g"
 msgid "Copy as Reference|R"
 msgstr "Kopier som referanse|r"
 
-#: lib/ui/stdcontext.inc:61\r lib/ui/stdmenus.inc:246
+#: lib/ui/stdcontext.inc:61 lib/ui/stdmenus.inc:246
 msgid "Split Cell|C"
 msgstr "Del cella|c"
 
@@ -16869,7 +16869,7 @@ msgstr "Set inn|S"
 msgid "Add Line Above|o"
 msgstr "Ny linje over|o"
 
-#: lib/ui/stdcontext.inc:66\r lib/ui/stdmenus.inc:249
+#: lib/ui/stdcontext.inc:66 lib/ui/stdmenus.inc:249
 msgid "Add Line Below|B"
 msgstr "Ny linje under|j"
 
@@ -16881,19 +16881,19 @@ msgstr "Fjern linja over|v"
 msgid "Delete Line Below|w"
 msgstr "Fjern linja under|F"
 
-#: lib/ui/stdcontext.inc:70\r lib/ui/stdmenus.inc:253
+#: lib/ui/stdcontext.inc:70 lib/ui/stdmenus.inc:253
 msgid "Add Line to Left"
 msgstr "Ny linje til venstre"
 
-#: lib/ui/stdcontext.inc:71\r lib/ui/stdmenus.inc:254
+#: lib/ui/stdcontext.inc:71 lib/ui/stdmenus.inc:254
 msgid "Add Line to Right"
 msgstr "Ny linje til høgre"
 
-#: lib/ui/stdcontext.inc:72\r lib/ui/stdmenus.inc:255
+#: lib/ui/stdcontext.inc:72 lib/ui/stdmenus.inc:255
 msgid "Delete Line to Left"
 msgstr "Fjern linja til venstre"
 
-#: lib/ui/stdcontext.inc:73\r lib/ui/stdmenus.inc:256
+#: lib/ui/stdcontext.inc:73 lib/ui/stdmenus.inc:256
 msgid "Delete Line to Right"
 msgstr "Fjern linja til høgre"
 
@@ -16913,7 +16913,7 @@ msgstr "Skru av/på tabellverktylinje"
 msgid "Use Computer Algebra System|m"
 msgstr "Bruk Datamaskin Algebra System|m"
 
-#: lib/ui/stdcontext.inc:87\r lib/ui/stdcontext.inc:105
+#: lib/ui/stdcontext.inc:87 lib/ui/stdcontext.inc:105
 msgid "Next Cross-Reference|N"
 msgstr "Neste kryssreferanse|N"
 
@@ -16949,19 +16949,19 @@ msgstr "Formatert referanse|t"
 msgid "Textual Reference|x"
 msgstr "Tekstuell referanse|s"
 
-#: lib/ui/stdcontext.inc:98\r lib/ui/stdcontext.inc:110
-#: lib/ui/stdcontext.inc:120\r lib/ui/stdcontext.inc:128
-#: lib/ui/stdcontext.inc:137\r lib/ui/stdcontext.inc:148
-#: lib/ui/stdcontext.inc:155\r lib/ui/stdcontext.inc:236
-#: lib/ui/stdcontext.inc:254\r lib/ui/stdcontext.inc:281
-#: lib/ui/stdcontext.inc:386\r lib/ui/stdcontext.inc:399
-#: lib/ui/stdcontext.inc:451\r lib/ui/stdcontext.inc:476
-#: lib/ui/stdcontext.inc:499\r lib/ui/stdcontext.inc:510
-#: lib/ui/stdcontext.inc:518\r lib/ui/stdcontext.inc:528
-#: lib/ui/stdcontext.inc:536\r lib/ui/stdcontext.inc:544
-#: lib/ui/stdcontext.inc:552\r lib/ui/stdcontext.inc:565
-#: lib/ui/stdcontext.inc:575\r lib/ui/stdcontext.inc:596
-#: lib/ui/stdcontext.inc:604\r lib/ui/stdcontext.inc:650
+#: lib/ui/stdcontext.inc:98 lib/ui/stdcontext.inc:110
+#: lib/ui/stdcontext.inc:120 lib/ui/stdcontext.inc:128
+#: lib/ui/stdcontext.inc:137 lib/ui/stdcontext.inc:148
+#: lib/ui/stdcontext.inc:155 lib/ui/stdcontext.inc:236
+#: lib/ui/stdcontext.inc:254 lib/ui/stdcontext.inc:281
+#: lib/ui/stdcontext.inc:386 lib/ui/stdcontext.inc:399
+#: lib/ui/stdcontext.inc:451 lib/ui/stdcontext.inc:476
+#: lib/ui/stdcontext.inc:499 lib/ui/stdcontext.inc:510
+#: lib/ui/stdcontext.inc:518 lib/ui/stdcontext.inc:528
+#: lib/ui/stdcontext.inc:536 lib/ui/stdcontext.inc:544
+#: lib/ui/stdcontext.inc:552 lib/ui/stdcontext.inc:565
+#: lib/ui/stdcontext.inc:575 lib/ui/stdcontext.inc:596
+#: lib/ui/stdcontext.inc:604 lib/ui/stdcontext.inc:650
 #: lib/ui/stdmenus.inc:536
 msgid "Settings...|S"
 msgstr "Val...|l"
@@ -16970,7 +16970,7 @@ msgstr "Val...|l"
 msgid "Go Back|G"
 msgstr "Gå tilbake|G"
 
-#: lib/ui/stdcontext.inc:108\r lib/ui/stdcontext.inc:496
+#: lib/ui/stdcontext.inc:108 lib/ui/stdcontext.inc:496
 msgid "Copy as Reference|C"
 msgstr "Kopier som referanse|r"
 
@@ -16986,7 +16986,7 @@ msgstr "Opna innskot|O"
 msgid "Close Inset|C"
 msgstr "Lat att innskot|L"
 
-#: lib/ui/stdcontext.inc:147\r lib/ui/stdcontext.inc:153
+#: lib/ui/stdcontext.inc:147 lib/ui/stdcontext.inc:153
 #: lib/ui/stdcontext.inc:612
 msgid "Dissolve Inset|D"
 msgstr "Løys opp innskot|k"
@@ -16995,11 +16995,11 @@ msgstr "Løys opp innskot|k"
 msgid "Show Label|L"
 msgstr "Vis etikett|V"
 
-#: lib/ui/stdcontext.inc:171\r lib/ui/stdmenus.inc:488
+#: lib/ui/stdcontext.inc:171 lib/ui/stdmenus.inc:488
 msgid "Frameless|l"
 msgstr "Utan ramme|U"
 
-#: lib/ui/stdcontext.inc:172\r lib/ui/stdmenus.inc:489
+#: lib/ui/stdcontext.inc:172 lib/ui/stdmenus.inc:489
 msgid "Simple Frame|F"
 msgstr "Enkel ramme|E"
 
@@ -17007,27 +17007,27 @@ msgstr "Enkel ramme|E"
 msgid "Simple Frame, Page Breaks|P"
 msgstr "Enkel ramme, sideskift|s"
 
-#: lib/ui/stdcontext.inc:174\r lib/ui/stdmenus.inc:490
+#: lib/ui/stdcontext.inc:174 lib/ui/stdmenus.inc:490
 msgid "Oval, Thin|a"
 msgstr "Tynn, oval|a"
 
-#: lib/ui/stdcontext.inc:175\r lib/ui/stdmenus.inc:491
+#: lib/ui/stdcontext.inc:175 lib/ui/stdmenus.inc:491
 msgid "Oval, Thick|v"
 msgstr "Tjukk oval|v"
 
-#: lib/ui/stdcontext.inc:176\r lib/ui/stdmenus.inc:492
+#: lib/ui/stdcontext.inc:176 lib/ui/stdmenus.inc:492
 msgid "Drop Shadow|w"
 msgstr "Kastar skugge|g"
 
-#: lib/ui/stdcontext.inc:177\r lib/ui/stdmenus.inc:493
+#: lib/ui/stdcontext.inc:177 lib/ui/stdmenus.inc:493
 msgid "Shaded Background|B"
 msgstr "skuggelagd bakgrunn|b"
 
-#: lib/ui/stdcontext.inc:178\r lib/ui/stdmenus.inc:494
+#: lib/ui/stdcontext.inc:178 lib/ui/stdmenus.inc:494
 msgid "Double Frame|u"
 msgstr "dobbel ramme|o"
 
-#: lib/ui/stdcontext.inc:195\r lib/ui/stdmenus.inc:498
+#: lib/ui/stdcontext.inc:195 lib/ui/stdmenus.inc:498
 msgid "LyX Note|N"
 msgstr "LyX notis|n"
 
@@ -17035,7 +17035,7 @@ msgstr "LyX notis|n"
 msgid "Comment|m"
 msgstr "Kommentar|K"
 
-#: lib/ui/stdcontext.inc:197\r lib/ui/stdmenus.inc:500
+#: lib/ui/stdcontext.inc:197 lib/ui/stdmenus.inc:500
 msgid "Greyed Out|G"
 msgstr "Som Grå-tekst|G"
 
@@ -17047,19 +17047,19 @@ msgstr "Opna alle notisar|i"
 msgid "Close All Notes|l"
 msgstr "Lat att alle notisar|o"
 
-#: lib/ui/stdcontext.inc:208\r lib/ui/stdmenus.inc:510
+#: lib/ui/stdcontext.inc:208 lib/ui/stdmenus.inc:510
 msgid "Phantom|P"
 msgstr "Fantom|F"
 
-#: lib/ui/stdcontext.inc:209\r lib/ui/stdmenus.inc:511
+#: lib/ui/stdcontext.inc:209 lib/ui/stdmenus.inc:511
 msgid "Horizontal Phantom|H"
 msgstr "Vassrettfantom|V"
 
-#: lib/ui/stdcontext.inc:210\r lib/ui/stdmenus.inc:512
+#: lib/ui/stdcontext.inc:210 lib/ui/stdmenus.inc:512
 msgid "Vertical Phantom|V"
 msgstr "Loddrettfantom|L"
 
-#: lib/ui/stdcontext.inc:217\r lib/ui/stdmenus.inc:419
+#: lib/ui/stdcontext.inc:217 lib/ui/stdmenus.inc:419
 msgid "Interword Space|w"
 msgstr "Rom mellom bokstavar|o"
 
@@ -17072,16 +17072,16 @@ msgstr "Verna mellomrom|e"
 msgid "Visible Space|a"
 msgstr "Loddrettavstand"
 
-#: lib/ui/stdcontext.inc:220\r lib/ui/stdcontext.inc:243
+#: lib/ui/stdcontext.inc:220 lib/ui/stdcontext.inc:243
 #: lib/ui/stdmenus.inc:420
 msgid "Thin Space|T"
 msgstr "Lite mellomrom|t"
 
-#: lib/ui/stdcontext.inc:221\r lib/ui/stdcontext.inc:246
+#: lib/ui/stdcontext.inc:221 lib/ui/stdcontext.inc:246
 msgid "Negative Thin Space|N"
 msgstr "Negativt lite mellomrom|N"
 
-#: lib/ui/stdcontext.inc:222\r lib/ui/stdcontext.inc:249
+#: lib/ui/stdcontext.inc:222 lib/ui/stdcontext.inc:249
 msgid "Half Quad Space (Enskip)|k"
 msgstr "Halvgefirt mellomrom|H"
 
@@ -17089,11 +17089,11 @@ msgstr "Halvgefirt mellomrom|H"
 msgid "Protected Half Quad Space (Enspace)|E"
 msgstr "Verna en-mellomrom|e"
 
-#: lib/ui/stdcontext.inc:224\r lib/ui/stdcontext.inc:250
+#: lib/ui/stdcontext.inc:224 lib/ui/stdcontext.inc:250
 msgid "Quad Space|Q"
 msgstr "Gefirt mellomrom|G"
 
-#: lib/ui/stdcontext.inc:225\r lib/ui/stdcontext.inc:251
+#: lib/ui/stdcontext.inc:225 lib/ui/stdcontext.inc:251
 msgid "Double Quad Space|u"
 msgstr "Dobbel-gefirt mellomrom|o"
 
@@ -17129,7 +17129,7 @@ msgstr "Vassrettfyll (Opp klamme)|O"
 msgid "Horizontal Fill (Down Brace)|B"
 msgstr "Vassrettfyll (Ned klamme)|N"
 
-#: lib/ui/stdcontext.inc:234\r lib/ui/stdcontext.inc:252
+#: lib/ui/stdcontext.inc:234 lib/ui/stdcontext.inc:252
 msgid "Custom Length|C"
 msgstr "Tilpassa lengde|T"
 
@@ -17177,51 +17177,51 @@ msgstr "Tilpassa|T"
 msgid "Settings...|e"
 msgstr "Val...|V"
 
-#: lib/ui/stdcontext.inc:275\r lib/ui/stdcontext.inc:559
+#: lib/ui/stdcontext.inc:275 lib/ui/stdcontext.inc:559
 msgid "Include|c"
 msgstr "Underdokument|U"
 
-#: lib/ui/stdcontext.inc:276\r lib/ui/stdcontext.inc:560
+#: lib/ui/stdcontext.inc:276 lib/ui/stdcontext.inc:560
 msgid "Input|p"
 msgstr "Tekstfil|T"
 
-#: lib/ui/stdcontext.inc:277\r lib/ui/stdcontext.inc:561
+#: lib/ui/stdcontext.inc:277 lib/ui/stdcontext.inc:561
 msgid "Verbatim|V"
 msgstr "Verbatim|V"
 
-#: lib/ui/stdcontext.inc:278\r lib/ui/stdcontext.inc:562
+#: lib/ui/stdcontext.inc:278 lib/ui/stdcontext.inc:562
 msgid "Verbatim (marked blanks)|b"
 msgstr "Verbatim (marker mellomrom)|e"
 
-#: lib/ui/stdcontext.inc:279\r lib/ui/stdcontext.inc:563
+#: lib/ui/stdcontext.inc:279 lib/ui/stdcontext.inc:563
 msgid "Listing|L"
 msgstr "Kodeliste|l"
 
-#: lib/ui/stdcontext.inc:283\r lib/ui/stdcontext.inc:567
+#: lib/ui/stdcontext.inc:283 lib/ui/stdcontext.inc:567
 msgid "Edit Included File...|E"
 msgstr "Endra underdokument...|u"
 
-#: lib/ui/stdcontext.inc:290\r lib/ui/stdmenus.inc:431
+#: lib/ui/stdcontext.inc:290 lib/ui/stdmenus.inc:431
 msgid "New Page|N"
 msgstr "Ny side|y"
 
-#: lib/ui/stdcontext.inc:291\r lib/ui/stdmenus.inc:432
+#: lib/ui/stdcontext.inc:291 lib/ui/stdmenus.inc:432
 msgid "Page Break|a"
 msgstr "Sideskift|e"
 
-#: lib/ui/stdcontext.inc:292\r lib/ui/stdmenus.inc:433
+#: lib/ui/stdcontext.inc:292 lib/ui/stdmenus.inc:433
 msgid "Clear Page|C"
 msgstr "Klargjer sida|g"
 
-#: lib/ui/stdcontext.inc:293\r lib/ui/stdmenus.inc:434
+#: lib/ui/stdcontext.inc:293 lib/ui/stdmenus.inc:434
 msgid "Clear Double Page|D"
 msgstr "Klargjer dobbelside|d"
 
-#: lib/ui/stdcontext.inc:300\r lib/ui/stdmenus.inc:428
+#: lib/ui/stdcontext.inc:300 lib/ui/stdmenus.inc:428
 msgid "Ragged Line Break|R"
 msgstr "Ujamn lineskift|U"
 
-#: lib/ui/stdcontext.inc:301\r lib/ui/stdmenus.inc:429
+#: lib/ui/stdcontext.inc:301 lib/ui/stdmenus.inc:429
 msgid "Justified Line Break|J"
 msgstr "Jamt linjeskift|J"
 
@@ -17235,25 +17235,25 @@ msgstr "Meny delar|M"
 msgid "Paragraph Break|B"
 msgstr "Avsnitt"
 
-#: lib/ui/stdcontext.inc:318\r lib/ui/stdmenus.inc:104
-#: lib/ui/stdtoolbars.inc:80\r src/Text3.cpp:1368
+#: lib/ui/stdcontext.inc:318 lib/ui/stdmenus.inc:104
+#: lib/ui/stdtoolbars.inc:80 src/Text3.cpp:1368
 #: src/mathed/InsetMathNest.cpp:602
 msgid "Cut"
 msgstr "Klipp"
 
-#: lib/ui/stdcontext.inc:319\r lib/ui/stdmenus.inc:105
-#: lib/ui/stdtoolbars.inc:81\r src/Text3.cpp:1373
+#: lib/ui/stdcontext.inc:319 lib/ui/stdmenus.inc:105
+#: lib/ui/stdtoolbars.inc:81 src/Text3.cpp:1373
 #: src/mathed/InsetMathNest.cpp:611
 msgid "Copy"
 msgstr "Kopier"
 
-#: lib/ui/stdcontext.inc:320\r lib/ui/stdmenus.inc:106
-#: lib/ui/stdtoolbars.inc:82\r src/Text3.cpp:1314
+#: lib/ui/stdcontext.inc:320 lib/ui/stdmenus.inc:106
+#: lib/ui/stdtoolbars.inc:82 src/Text3.cpp:1314
 #: src/mathed/InsetMathGrid.cpp:1579 src/mathed/InsetMathNest.cpp:581
 msgid "Paste"
 msgstr "Lim inn"
 
-#: lib/ui/stdcontext.inc:321\r lib/ui/stdmenus.inc:107
+#: lib/ui/stdcontext.inc:321 lib/ui/stdmenus.inc:107
 msgid "Paste Recent|e"
 msgstr "Lim inn nyleg brukte|m"
 
@@ -17261,16 +17261,16 @@ msgstr "Lim inn nyleg brukte|m"
 msgid "Jump Back to Saved Bookmark|B"
 msgstr "Hopp tilbake til sist lagra bokmerke|L"
 
-#: lib/ui/stdcontext.inc:324\r lib/ui/stdmenus.inc:558
+#: lib/ui/stdcontext.inc:324 lib/ui/stdmenus.inc:558
 #, fuzzy
 msgid "Forward Search|F"
 msgstr "Leit framover|f"
 
-#: lib/ui/stdcontext.inc:326\r lib/ui/stdmenus.inc:116
+#: lib/ui/stdcontext.inc:326 lib/ui/stdmenus.inc:116
 msgid "Move Paragraph Up|o"
 msgstr "Flytt Avsnitt opp|o"
 
-#: lib/ui/stdcontext.inc:327\r lib/ui/stdmenus.inc:117
+#: lib/ui/stdcontext.inc:327 lib/ui/stdmenus.inc:117
 msgid "Move Paragraph Down|v"
 msgstr "Flytt Avsnitt ned|v"
 
@@ -17286,15 +17286,15 @@ msgstr "senk bolken|n"
 msgid "Move Section Down|D"
 msgstr "Flytt bolken nedover|d"
 
-#: lib/ui/stdcontext.inc:334\r lib/ui/stdcontext.inc:632
+#: lib/ui/stdcontext.inc:334 lib/ui/stdcontext.inc:632
 msgid "Move Section Up|U"
 msgstr "Flytt bolken oppover|o"
 
-#: lib/ui/stdcontext.inc:336\r lib/ui/stdmenus.inc:371
+#: lib/ui/stdcontext.inc:336 lib/ui/stdmenus.inc:371
 msgid "Insert Regular Expression"
 msgstr "Bruk regulære uttrykk"
 
-#: lib/ui/stdcontext.inc:338\r lib/ui/stdcontext.inc:621
+#: lib/ui/stdcontext.inc:338 lib/ui/stdcontext.inc:621
 msgid "Accept Change|c"
 msgstr "Godta endring|G"
 
@@ -17310,7 +17310,7 @@ msgstr "Bruk førre tekststil|k"
 msgid "Text Style|x"
 msgstr "Tekststil|s"
 
-#: lib/ui/stdcontext.inc:343\r lib/ui/stdmenus.inc:121
+#: lib/ui/stdcontext.inc:343 lib/ui/stdmenus.inc:121
 msgid "Paragraph Settings...|P"
 msgstr "Avsnittval...|n"
 
@@ -17343,11 +17343,11 @@ msgstr "Kva som helst nummer|n"
 msgid "User Defined|U"
 msgstr "Brukar vald Skrivar|u"
 
-#: lib/ui/stdcontext.inc:368\r lib/ui/stdmenus.inc:260
+#: lib/ui/stdcontext.inc:368 lib/ui/stdmenus.inc:260
 msgid "Append Argument"
 msgstr "Legg til argument"
 
-#: lib/ui/stdcontext.inc:369\r lib/ui/stdmenus.inc:261
+#: lib/ui/stdcontext.inc:369 lib/ui/stdmenus.inc:261
 msgid "Remove Last Argument"
 msgstr "Fjern førre argument"
 
@@ -17359,23 +17359,23 @@ msgstr "Lag første ikkje-valfri til eit valfritt argument"
 msgid "Make Last Optional Into Non-Optional Argument"
 msgstr "Gjer siste valfri  til ikkje-valfri argument"
 
-#: lib/ui/stdcontext.inc:373\r lib/ui/stdmenus.inc:265
+#: lib/ui/stdcontext.inc:373 lib/ui/stdmenus.inc:265
 msgid "Insert Optional Argument"
 msgstr "Set inn valfritt argument"
 
-#: lib/ui/stdcontext.inc:374\r lib/ui/stdmenus.inc:266
+#: lib/ui/stdcontext.inc:374 lib/ui/stdmenus.inc:266
 msgid "Remove Optional Argument"
 msgstr "Fjern valfritt argument"
 
-#: lib/ui/stdcontext.inc:376\r lib/ui/stdmenus.inc:268
+#: lib/ui/stdcontext.inc:376 lib/ui/stdmenus.inc:268
 msgid "Append Argument Eating From the Right"
 msgstr "Legg argument som et frå høgre"
 
-#: lib/ui/stdcontext.inc:377\r lib/ui/stdmenus.inc:269
+#: lib/ui/stdcontext.inc:377 lib/ui/stdmenus.inc:269
 msgid "Append Optional Argument Eating From the Right"
 msgstr "Legg valfritt argument som et frå høgre"
 
-#: lib/ui/stdcontext.inc:378\r lib/ui/stdmenus.inc:270
+#: lib/ui/stdcontext.inc:378 lib/ui/stdmenus.inc:270
 msgid "Remove Last Argument Spitting Out to the Right"
 msgstr "Fjern siste argument som skyt ut til høgre"
 
@@ -17383,24 +17383,24 @@ msgstr "Fjern siste argument som skyt ut til høgre"
 msgid "Reload|R"
 msgstr "Last på nytt|L"
 
-#: lib/ui/stdcontext.inc:389\r lib/ui/stdcontext.inc:401
+#: lib/ui/stdcontext.inc:389 lib/ui/stdcontext.inc:401
 #: lib/ui/stdcontext.inc:520
 msgid "Edit Externally...|x"
 msgstr "Endre eksternt...|k"
 
-#: lib/ui/stdcontext.inc:409\r lib/ui/stdmenus.inc:215
+#: lib/ui/stdcontext.inc:409 lib/ui/stdmenus.inc:215
 msgid "Top|T"
 msgstr "Topp|T"
 
-#: lib/ui/stdcontext.inc:410\r lib/ui/stdmenus.inc:217
+#: lib/ui/stdcontext.inc:410 lib/ui/stdmenus.inc:217
 msgid "Bottom|B"
 msgstr "Botn|n"
 
-#: lib/ui/stdcontext.inc:411\r lib/ui/stdmenus.inc:211
+#: lib/ui/stdcontext.inc:411 lib/ui/stdmenus.inc:211
 msgid "Left|L"
 msgstr "Venstre|V"
 
-#: lib/ui/stdcontext.inc:412\r lib/ui/stdmenus.inc:213
+#: lib/ui/stdcontext.inc:412 lib/ui/stdmenus.inc:213
 msgid "Right|R"
 msgstr "Høgre|H"
 
@@ -17408,7 +17408,7 @@ msgstr "Høgre|H"
 msgid "Left|f"
 msgstr "Venstre|V"
 
-#: lib/ui/stdcontext.inc:417\r lib/ui/stdmenus.inc:212
+#: lib/ui/stdcontext.inc:417 lib/ui/stdmenus.inc:212
 msgid "Center|C"
 msgstr "Sentrert|S"
 
@@ -17432,20 +17432,20 @@ msgstr "Multirad|l"
 msgid "Append Row|A"
 msgstr "Legg til rad|L"
 
-#: lib/ui/stdcontext.inc:431\r lib/ui/stdmenus.inc:220
+#: lib/ui/stdcontext.inc:431 lib/ui/stdmenus.inc:220
 msgid "Delete Row|D"
 msgstr "Fjern rad|F"
 
-#: lib/ui/stdcontext.inc:432\r lib/ui/stdmenus.inc:221
+#: lib/ui/stdcontext.inc:432 lib/ui/stdmenus.inc:221
 msgid "Copy Row|o"
 msgstr "Kopier rad|o"
 
-#: lib/ui/stdcontext.inc:433\r lib/ui/stdmenus.inc:222
+#: lib/ui/stdcontext.inc:433 lib/ui/stdmenus.inc:222
 #, fuzzy
 msgid "Move Row Up"
 msgstr "Flytt bolken oppover|o"
 
-#: lib/ui/stdcontext.inc:434\r lib/ui/stdmenus.inc:223
+#: lib/ui/stdcontext.inc:434 lib/ui/stdmenus.inc:223
 #, fuzzy
 msgid "Move Row Down"
 msgstr "Flytt bolken nedover|d"
@@ -17454,7 +17454,7 @@ msgstr "Flytt bolken nedover|d"
 msgid "Append Column|p"
 msgstr "Legg til kolonne|k"
 
-#: lib/ui/stdcontext.inc:437\r lib/ui/stdmenus.inc:227
+#: lib/ui/stdcontext.inc:437 lib/ui/stdmenus.inc:227
 msgid "Delete Column|e"
 msgstr "Fjern kolonne|j"
 
@@ -17462,15 +17462,15 @@ msgstr "Fjern kolonne|j"
 msgid "Copy Column|y"
 msgstr "Kopier kolonne|p"
 
-#: lib/ui/stdcontext.inc:439\r lib/ui/stdmenus.inc:229
+#: lib/ui/stdcontext.inc:439 lib/ui/stdmenus.inc:229
 msgid "Move Column Right|v"
 msgstr ""
 
-#: lib/ui/stdcontext.inc:440\r lib/ui/stdmenus.inc:230
+#: lib/ui/stdcontext.inc:440 lib/ui/stdmenus.inc:230
 msgid "Move Column Left"
 msgstr ""
 
-#: lib/ui/stdcontext.inc:444\r lib/ui/stdmenus.inc:194
+#: lib/ui/stdcontext.inc:444 lib/ui/stdmenus.inc:194
 #, fuzzy
 msgid "Multi-page Table|g"
 msgstr "Plasser_Tabellen"
@@ -17494,7 +17494,7 @@ msgstr "Justering|J"
 msgid "Columns/Rows|C"
 msgstr "Start kolonnar"
 
-#: lib/ui/stdcontext.inc:459\r lib/ui/stdmenus.inc:30
+#: lib/ui/stdcontext.inc:459 lib/ui/stdmenus.inc:30
 msgid "File|F"
 msgstr "Fil|F"
 
@@ -17538,11 +17538,11 @@ msgstr "Dokument info|D"
 msgid "Copy Text|o"
 msgstr "Kopier tekst|o"
 
-#: lib/ui/stdcontext.inc:484\r lib/ui/stdcontext.inc:507
+#: lib/ui/stdcontext.inc:484 lib/ui/stdcontext.inc:507
 msgid "Activate Branch|A"
 msgstr "Aktiver Grein|A"
 
-#: lib/ui/stdcontext.inc:485\r lib/ui/stdcontext.inc:508
+#: lib/ui/stdcontext.inc:485 lib/ui/stdcontext.inc:508
 msgid "Deactivate Branch|e"
 msgstr "Deaktiver Grein|e"
 
@@ -17573,7 +17573,7 @@ msgstr "Alle indeksar|A"
 msgid "Subindex|b"
 msgstr "Underindeks|d"
 
-#: lib/ui/stdcontext.inc:622\r lib/ui/stdmenus.inc:543
+#: lib/ui/stdcontext.inc:622 lib/ui/stdmenus.inc:543
 msgid "Reject Change|R"
 msgstr "Ikkje godta endring|I"
 
@@ -17785,7 +17785,7 @@ msgstr "Tekststil|k"
 msgid "Table|T"
 msgstr "Tabell|T"
 
-#: lib/ui/stdmenus.inc:125\r lib/ui/stdmenus.inc:603
+#: lib/ui/stdmenus.inc:125 lib/ui/stdmenus.inc:603
 msgid "Math|M"
 msgstr "Matte|M"
 
@@ -18257,7 +18257,7 @@ msgstr "Fotnote|o"
 msgid "Marginal Note|M"
 msgstr "Margnotis|a"
 
-#: lib/ui/stdmenus.inc:387\r src/insets/Inset.cpp:91
+#: lib/ui/stdmenus.inc:387 src/insets/Inset.cpp:91
 msgid "TeX Code"
 msgstr "TeX"
 
@@ -18638,7 +18638,7 @@ msgstr "Kommentar"
 msgid "Hazard and Precautionary Statements|H"
 msgstr ""
 
-#: lib/ui/stdmenus.inc:625\r lib/configure.py:638
+#: lib/ui/stdmenus.inc:625 lib/configure.py:638
 msgid "Sweave|S"
 msgstr "Sweave|S"
 
@@ -18668,11 +18668,11 @@ msgstr "Sjekk rettskriving"
 msgid "Spellcheck continuously"
 msgstr "K&ontinuerleg stavekontroll"
 
-#: lib/ui/stdtoolbars.inc:78\r src/BufferView.cpp:1347
+#: lib/ui/stdtoolbars.inc:78 src/BufferView.cpp:1347
 msgid "Undo"
 msgstr "Angra"
 
-#: lib/ui/stdtoolbars.inc:79\r src/BufferView.cpp:1357
+#: lib/ui/stdtoolbars.inc:79 src/BufferView.cpp:1357
 msgid "Redo"
 msgstr "Gjer om"
 
@@ -18845,19 +18845,19 @@ msgstr "Tekststil"
 msgid "Paragraph settings"
 msgstr "avsnittval"
 
-#: lib/ui/stdtoolbars.inc:143\r lib/ui/stdtoolbars.inc:194
+#: lib/ui/stdtoolbars.inc:143 lib/ui/stdtoolbars.inc:194
 msgid "Add row"
 msgstr "Legg til rad"
 
-#: lib/ui/stdtoolbars.inc:144\r lib/ui/stdtoolbars.inc:195
+#: lib/ui/stdtoolbars.inc:144 lib/ui/stdtoolbars.inc:195
 msgid "Add column"
 msgstr "Legg til kolonne"
 
-#: lib/ui/stdtoolbars.inc:145\r lib/ui/stdtoolbars.inc:196
+#: lib/ui/stdtoolbars.inc:145 lib/ui/stdtoolbars.inc:196
 msgid "Delete row"
 msgstr "Fjern rad"
 
-#: lib/ui/stdtoolbars.inc:146\r lib/ui/stdtoolbars.inc:197
+#: lib/ui/stdtoolbars.inc:146 lib/ui/stdtoolbars.inc:197
 msgid "Delete column"
 msgstr "Fjern kolonne"
 
@@ -18961,11 +18961,11 @@ msgstr "Matte"
 msgid "Set display mode"
 msgstr "Byt matte modus"
 
-#: lib/ui/stdtoolbars.inc:178\r src/insets/InsetScript.cpp:63
+#: lib/ui/stdtoolbars.inc:178 src/insets/InsetScript.cpp:63
 msgid "Subscript"
 msgstr "Senka skrift"
 
-#: lib/ui/stdtoolbars.inc:179\r src/insets/InsetScript.cpp:64
+#: lib/ui/stdtoolbars.inc:179 src/insets/InsetScript.cpp:64
 msgid "Superscript"
 msgstr "Heva skrift"
 
@@ -19066,32 +19066,32 @@ msgstr "Legg valfritt argument som et frå høgre"
 msgid "Phonetic Symbols"
 msgstr "Fonetiske symbol|y"
 
-#: lib/ui/stdtoolbars.inc:218\r lib/ui/stdtoolbars.inc:1264
+#: lib/ui/stdtoolbars.inc:218 lib/ui/stdtoolbars.inc:1264
 msgid "IPA Pulmonic Consonants"
 msgstr ""
 
-#: lib/ui/stdtoolbars.inc:219\r lib/ui/stdtoolbars.inc:1326
+#: lib/ui/stdtoolbars.inc:219 lib/ui/stdtoolbars.inc:1326
 msgid "IPA Non-Pulmonic Consonants"
 msgstr ""
 
-#: lib/ui/stdtoolbars.inc:220\r lib/ui/stdtoolbars.inc:1340
+#: lib/ui/stdtoolbars.inc:220 lib/ui/stdtoolbars.inc:1340
 msgid "IPA Vowels"
 msgstr ""
 
-#: lib/ui/stdtoolbars.inc:221\r lib/ui/stdtoolbars.inc:1371
+#: lib/ui/stdtoolbars.inc:221 lib/ui/stdtoolbars.inc:1371
 #, fuzzy
 msgid "IPA Other Symbols"
 msgstr "Fonetiske symbol|y"
 
-#: lib/ui/stdtoolbars.inc:222\r lib/ui/stdtoolbars.inc:1386
+#: lib/ui/stdtoolbars.inc:222 lib/ui/stdtoolbars.inc:1386
 msgid "IPA Suprasegmentals"
 msgstr ""
 
-#: lib/ui/stdtoolbars.inc:223\r lib/ui/stdtoolbars.inc:1398
+#: lib/ui/stdtoolbars.inc:223 lib/ui/stdtoolbars.inc:1398
 msgid "IPA Diacritics"
 msgstr ""
 
-#: lib/ui/stdtoolbars.inc:224\r lib/ui/stdtoolbars.inc:1433
+#: lib/ui/stdtoolbars.inc:224 lib/ui/stdtoolbars.inc:1433
 msgid "IPA Tones and Word Accents"
 msgstr ""
 
@@ -19148,7 +19148,7 @@ msgstr "Neste notis"
 msgid "LyX Documentation Tools"
 msgstr "LyX Dokument (*.lyx)"
 
-#: lib/ui/stdtoolbars.inc:248\r src/insets/Inset.cpp:118
+#: lib/ui/stdtoolbars.inc:248 src/insets/Inset.cpp:118
 msgid "Info"
 msgstr "Info"
 
@@ -19185,7 +19185,7 @@ msgstr "Vis andre format"
 msgid "Update Other Formats"
 msgstr "Oppdater andre format"
 
-#: lib/ui/stdtoolbars.inc:281\r src/frontends/qt4/GuiLog.cpp:264
+#: lib/ui/stdtoolbars.inc:281 src/frontends/qt4/GuiLog.cpp:264
 msgid "Version Control"
 msgstr "Versjonkontroll"
 
@@ -19237,20 +19237,20 @@ msgstr "Matte dialogar"
 msgid "Math spacings"
 msgstr "Matte-mellomrom"
 
-#: lib/ui/stdtoolbars.inc:298\r lib/ui/stdtoolbars.inc:377
+#: lib/ui/stdtoolbars.inc:298 lib/ui/stdtoolbars.inc:377
 msgid "Styles"
 msgstr "Stilar"
 
-#: lib/ui/stdtoolbars.inc:299\r lib/ui/stdtoolbars.inc:384
+#: lib/ui/stdtoolbars.inc:299 lib/ui/stdtoolbars.inc:384
 msgid "Fractions"
 msgstr "Brøkar"
 
-#: lib/ui/stdtoolbars.inc:300\r lib/ui/stdtoolbars.inc:401
+#: lib/ui/stdtoolbars.inc:300 lib/ui/stdtoolbars.inc:401
 #: src/frontends/qt4/GuiDocument.cpp:1407
 msgid "Fonts"
 msgstr "Skrifttypar"
 
-#: lib/ui/stdtoolbars.inc:301\r lib/ui/stdtoolbars.inc:318
+#: lib/ui/stdtoolbars.inc:301 lib/ui/stdtoolbars.inc:318
 msgid "Functions"
 msgstr "Funksjonar"
 
@@ -19262,34 +19262,34 @@ msgstr "Rammedekorasjon"
 msgid "Big operators"
 msgstr "Store operatorar"
 
-#: lib/ui/stdtoolbars.inc:304\r lib/ui/stdtoolbars.inc:648
+#: lib/ui/stdtoolbars.inc:304 lib/ui/stdtoolbars.inc:648
 msgid "Miscellaneous"
 msgstr "Ymse"
 
-#: lib/ui/stdtoolbars.inc:306\r lib/ui/stdtoolbars.inc:473
+#: lib/ui/stdtoolbars.inc:306 lib/ui/stdtoolbars.inc:473
 #: src/frontends/qt4/GuiSymbols.cpp:89
 msgid "Arrows"
 msgstr "Piler"
 
-#: lib/ui/stdtoolbars.inc:307\r lib/ui/stdtoolbars.inc:900
+#: lib/ui/stdtoolbars.inc:307 lib/ui/stdtoolbars.inc:900
 #, fuzzy
 msgid "Arrows (extended)"
 msgstr "Teorem (AMS Utvida)"
 
-#: lib/ui/stdtoolbars.inc:308\r lib/ui/stdtoolbars.inc:511
+#: lib/ui/stdtoolbars.inc:308 lib/ui/stdtoolbars.inc:511
 msgid "Operators"
 msgstr "Operatorar"
 
-#: lib/ui/stdtoolbars.inc:309\r lib/ui/stdtoolbars.inc:1164
+#: lib/ui/stdtoolbars.inc:309 lib/ui/stdtoolbars.inc:1164
 #, fuzzy
 msgid "Operators (extended)"
 msgstr "Teorem (AMS Utvida)"
 
-#: lib/ui/stdtoolbars.inc:310\r lib/ui/stdtoolbars.inc:547
+#: lib/ui/stdtoolbars.inc:310 lib/ui/stdtoolbars.inc:547
 msgid "Relations"
 msgstr "Relasjonar"
 
-#: lib/ui/stdtoolbars.inc:311\r lib/ui/stdtoolbars.inc:978
+#: lib/ui/stdtoolbars.inc:311 lib/ui/stdtoolbars.inc:978
 #, fuzzy
 msgid "Relations (extended)"
 msgstr "Latin utviding-A"
@@ -19299,15 +19299,15 @@ msgstr "Latin utviding-A"
 msgid "Negative relations (extended)"
 msgstr "AMS negerte relasjonar"
 
-#: lib/ui/stdtoolbars.inc:313\r lib/ui/stdtoolbars.inc:415
+#: lib/ui/stdtoolbars.inc:313 lib/ui/stdtoolbars.inc:415
 msgid "Dots"
 msgstr "Prikkar"
 
-#: lib/ui/stdtoolbars.inc:314\r lib/ui/stdtoolbars.inc:1237
+#: lib/ui/stdtoolbars.inc:314 lib/ui/stdtoolbars.inc:1237
 msgid "Delimiters (fixed size)"
 msgstr ""
 
-#: lib/ui/stdtoolbars.inc:315\r lib/ui/stdtoolbars.inc:753
+#: lib/ui/stdtoolbars.inc:315 lib/ui/stdtoolbars.inc:753
 #, fuzzy
 msgid "Miscellaneous (extended)"
 msgstr "Ymse"
@@ -19941,7 +19941,7 @@ msgstr "swarrow"
 msgid "searrow"
 msgstr "searrow"
 
-#: lib/ui/stdtoolbars.inc:506\r lib/ui/stdtoolbars.inc:930
+#: lib/ui/stdtoolbars.inc:506 lib/ui/stdtoolbars.inc:930
 msgid "rightleftharpoons"
 msgstr "Høgre-venstreharpun"
 
@@ -20503,7 +20503,7 @@ msgstr "aleph"
 msgid "wp"
 msgstr "wp"
 
-#: lib/ui/stdtoolbars.inc:663\r lib/ui/stdtoolbars.inc:763
+#: lib/ui/stdtoolbars.inc:663 lib/ui/stdtoolbars.inc:763
 msgid "hbar"
 msgstr "hbar"
 
@@ -20915,7 +20915,7 @@ msgstr "square"
 msgid "CheckedBox"
 msgstr ""
 
-#: lib/ui/stdtoolbars.inc:771\r lib/ui/stdtoolbars.inc:845
+#: lib/ui/stdtoolbars.inc:771 lib/ui/stdtoolbars.inc:845
 msgid "XBox"
 msgstr ""
 
@@ -23167,12 +23167,12 @@ msgstr ""
 msgid "Simultaneous voiceless postalveolar and velar fricative"
 msgstr ""
 
-#: lib/ui/stdtoolbars.inc:1382\r src/insets/InsetIPAMacro.cpp:54
+#: lib/ui/stdtoolbars.inc:1382 src/insets/InsetIPAMacro.cpp:54
 #, fuzzy
 msgid "Top tie bar"
 msgstr "Øvst midtpå"
 
-#: lib/ui/stdtoolbars.inc:1383\r src/insets/InsetIPAMacro.cpp:55
+#: lib/ui/stdtoolbars.inc:1383 src/insets/InsetIPAMacro.cpp:55
 #, fuzzy
 msgid "Bottom tie bar"
 msgstr "Nedst midtpå"
@@ -23460,7 +23460,7 @@ msgstr "Global senking"
 msgid "GnumericSpreadsheet"
 msgstr "GnumericRekneark"
 
-#: lib/external_templates:41\r lib/external_templates:48
+#: lib/external_templates:41 lib/external_templates:48
 msgid "Spreadsheet"
 msgstr "Rekneark"
 
@@ -23482,7 +23482,7 @@ msgstr ""
 msgid "RasterImage"
 msgstr "Rasterbilete"
 
-#: lib/external_templates:83\r lib/external_templates:90
+#: lib/external_templates:83 lib/external_templates:90
 msgid "Raster image"
 msgstr "Rasterbilete"
 
@@ -23497,7 +23497,7 @@ msgstr ""
 msgid "VectorGraphics"
 msgstr "Grafikk"
 
-#: lib/external_templates:153\r lib/external_templates:162
+#: lib/external_templates:153 lib/external_templates:162
 #, fuzzy
 msgid "Vector graphics"
 msgstr "Vektor&grafikkformat"
@@ -23517,7 +23517,7 @@ msgstr ""
 msgid "XFig"
 msgstr "XFig"
 
-#: lib/external_templates:218\r lib/external_templates:221
+#: lib/external_templates:218 lib/external_templates:221
 msgid "Xfig figure"
 msgstr "XFig figur"
 
@@ -23529,7 +23529,7 @@ msgstr "Ein XFig figur.\n"
 msgid "ChessDiagram"
 msgstr "Sjakkbrett"
 
-#: lib/external_templates:271\r lib/external_templates:290
+#: lib/external_templates:271 lib/external_templates:290
 msgid "Chess diagram"
 msgstr "Sjakkbrett"
 
@@ -23570,7 +23570,7 @@ msgstr ""
 "kan finne dei, og du må installere \n"
 "skak pakken frå CTAN\n"
 
-#: lib/external_templates:321\r lib/external_templates:327
+#: lib/external_templates:321 lib/external_templates:327
 msgid "Lilypond typeset music"
 msgstr "Lilypond for musikknotasjon"
 
@@ -23590,7 +23590,7 @@ msgstr ""
 msgid "PDFPages"
 msgstr "PDFSider"
 
-#: lib/external_templates:370\r lib/external_templates:384
+#: lib/external_templates:370 lib/external_templates:384
 msgid "PDF pages"
 msgstr "PDFSider"
 
@@ -23634,7 +23634,7 @@ msgstr ""
 msgid "Dia"
 msgstr "Dia"
 
-#: lib/external_templates:445\r lib/external_templates:448
+#: lib/external_templates:445 lib/external_templates:448
 msgid "Dia diagram"
 msgstr "Dia diagram"
 
@@ -23707,7 +23707,7 @@ msgstr "PBM"
 msgid "PGM"
 msgstr "PGM"
 
-#: lib/configure.py:616\r src/frontends/qt4/GuiClipboard.cpp:175
+#: lib/configure.py:616 src/frontends/qt4/GuiClipboard.cpp:175
 msgid "PNG"
 msgstr "PNG"
 
@@ -23743,7 +23743,7 @@ msgstr "Rein tekst (Xfig)"
 msgid "date (output)"
 msgstr "Dato"
 
-#: lib/configure.py:632\r src/frontends/qt4/GuiDocument.cpp:1275
+#: lib/configure.py:632 src/frontends/qt4/GuiDocument.cpp:1275
 #: src/frontends/qt4/GuiErrorList.cpp:44
 msgid "DocBook"
 msgstr "DocBook"
@@ -23862,7 +23862,7 @@ msgstr "LyXHTML"
 msgid "LyXHTML|y"
 msgstr "LyXHTML|y"
 
-#: lib/configure.py:669\r src/frontends/qt4/GuiLog.cpp:251
+#: lib/configure.py:669 src/frontends/qt4/GuiLog.cpp:251
 msgid "BibTeX"
 msgstr "BibTeX"
 
@@ -23959,11 +23959,11 @@ msgstr "DVI (LuaTeX)|V"
 msgid "DraftDVI"
 msgstr "DraftDVI"
 
-#: lib/configure.py:699\r lib/configure.py:735
+#: lib/configure.py:699 lib/configure.py:735
 msgid "htm"
 msgstr "htm"
 
-#: lib/configure.py:699\r lib/configure.py:735
+#: lib/configure.py:699 lib/configure.py:735
 msgid "htm|HTML"
 msgstr "htm|HTML"
 
@@ -24018,7 +24018,7 @@ msgstr "Dato kommando"
 msgid "Table (CSV)"
 msgstr "Tabell (CSV)"
 
-#: lib/configure.py:719\r src/frontends/qt4/GuiView.cpp:1317
+#: lib/configure.py:719 src/frontends/qt4/GuiView.cpp:1317
 #: src/frontends/qt4/GuiView.cpp:1318 src/mathed/MathMacroTemplate.cpp:537
 msgid "LyX"
 msgstr "LyX"
@@ -24076,11 +24076,11 @@ msgstr "Program"
 msgid "PSTEX"
 msgstr "PSTEX"
 
-#: lib/configure.py:733\r src/frontends/qt4/GuiClipboard.cpp:172
+#: lib/configure.py:733 src/frontends/qt4/GuiClipboard.cpp:172
 msgid "Windows Metafile"
 msgstr "Windows Metafile"
 
-#: lib/configure.py:734\r src/frontends/qt4/GuiClipboard.cpp:171
+#: lib/configure.py:734 src/frontends/qt4/GuiClipboard.cpp:171
 msgid "Enhanced Metafile"
 msgstr "Enhanced Metafile"