mainly cosmetics

[lyx.git] / po / fi.po

diff --git a/po/fi.po b/po/fi.po
index d7f6afd85a42d1bed51f403dd660823bf11f2023..6affeb5a435857f10933a459496f7ef15d2d25db 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,14 +2,14 @@
 # Copyright (C) 1997-2001 The LyX Team
 #       Originally modified by Martin.Vermeer@fgi.fi
 #       Pauli Virtanen <pauli.virtanen@hut.fi>
-#      Martin Vermeer <martin.vermeer@tkk.fi>
+#      Martin Vermeer <martin.vermeer@tkk.fi>
 #
 # Translations:
 #
 #      collapse = laskostua
 #      minibuffer = tilarivi
-#      branch = haara
-#      bullet = ransk. viiva
+#      branch = haara
+#      bullet = ransk. viiva
 #
 # LaTeX terminology: (please tell me if I have got something wrong!)
 #
@@ -35,8 +35,8 @@
 #      citation = lainaus
 #
 #      float = kelluva upote
-#      wrap = tykö?
-#      theorem = väittämä
+#      wrap = tykö?
+#      theorem = väittämä
 #       encoding = merkistö
 #
 #
@@ -69,7 +69,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lyx\n"
 "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2007-08-05 15:31+0200\n"
+"POT-Creation-Date: 2007-08-31 20:14+0200\n"
 "PO-Revision-Date: 2007-07-14 11:00+0300\n"
 "Last-Translator: Martin Vermeer <martin.vermeer@tkk.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -99,14 +99,14 @@ msgstr "Copyright"
 #: src/frontends/qt4/ui/DelimiterUi.ui:107
 #: src/frontends/qt4/ui/ErrorListUi.ui:62
 #: src/frontends/qt4/ui/ExternalUi.ui:705 src/frontends/qt4/ui/FloatUi.ui:85
-#: src/frontends/qt4/ui/IncludeUi.ui:247 src/frontends/qt4/ui/LogUi.ui:71
-#: src/frontends/qt4/ui/ParagraphUi.ui:99 src/frontends/qt4/ui/PrefsUi.ui:96
-#: src/frontends/qt4/ui/RefUi.ui:100 src/frontends/qt4/ui/SearchUi.ui:210
-#: src/frontends/qt4/ui/ShowFileUi.ui:58
-#: src/frontends/qt4/ui/SpellcheckerUi.ui:31
+#: src/frontends/qt4/ui/IncludeUi.ui:247 src/frontends/qt4/ui/LogUi.ui:68
+#: src/frontends/qt4/ui/ParagraphUi.ui:99 src/frontends/qt4/ui/PrefsUi.ui:93
+#: src/frontends/qt4/ui/RefUi.ui:97 src/frontends/qt4/ui/SearchUi.ui:207
+#: src/frontends/qt4/ui/ShowFileUi.ui:55
+#: src/frontends/qt4/ui/SpellcheckerUi.ui:28
 #: src/frontends/qt4/ui/TexinfoUi.ui:58
-#: src/frontends/qt4/ui/ThesaurusUi.ui:144 src/frontends/qt4/ui/URLUi.ui:115
-#: src/frontends/qt4/ui/VSpaceUi.ui:168 src/frontends/qt4/ui/WrapUi.ui:216
+#: src/frontends/qt4/ui/ThesaurusUi.ui:141 src/frontends/qt4/ui/URLUi.ui:112
+#: src/frontends/qt4/ui/VSpaceUi.ui:168 src/frontends/qt4/ui/WrapUi.ui:213
 msgid "&Close"
 msgstr "&Sulje"
 
@@ -122,30 +122,30 @@ msgstr "&Testi"
 #: src/frontends/qt4/ui/BibitemUi.ui:111 src/frontends/qt4/ui/BibtexUi.ui:216
 #: src/frontends/qt4/ui/BoxUi.ui:325 src/frontends/qt4/ui/BranchUi.ui:31
 #: src/frontends/qt4/ui/CharacterUi.ui:370
-#: src/frontends/qt4/ui/CitationUi.ui:303
-#: src/frontends/qt4/ui/DocumentUi.ui:135 src/frontends/qt4/ui/ERTUi.ui:100
+#: src/frontends/qt4/ui/CitationUi.ui:405
+#: src/frontends/qt4/ui/DocumentUi.ui:135 src/frontends/qt4/ui/ERTUi.ui:90
 #: src/frontends/qt4/ui/ExternalUi.ui:685 src/frontends/qt4/ui/FloatUi.ui:68
 #: src/frontends/qt4/ui/GraphicsUi.ui:738
 #: src/frontends/qt4/ui/IncludeUi.ui:237 src/frontends/qt4/ui/IndexUi.ui:82
 #: src/frontends/qt4/ui/ListingsUi.ui:609
-#: src/frontends/qt4/ui/MathMatrixUi.ui:170
-#: src/frontends/qt4/ui/NomenclUi.ui:92 src/frontends/qt4/ui/NoteUi.ui:31
-#: src/frontends/qt4/ui/ParagraphUi.ui:76 src/frontends/qt4/ui/RefUi.ui:80
-#: src/frontends/qt4/ui/SendtoUi.ui:75
-#: src/frontends/qt4/ui/TabularCreateUi.ui:68
-#: src/frontends/qt4/ui/URLUi.ui:105 src/frontends/qt4/ui/VSpaceUi.ui:145
-#: src/frontends/qt4/ui/WrapUi.ui:193
+#: src/frontends/qt4/ui/MathMatrixUi.ui:167
+#: src/frontends/qt4/ui/NomenclUi.ui:92 src/frontends/qt4/ui/NoteUi.ui:28
+#: src/frontends/qt4/ui/ParagraphUi.ui:76 src/frontends/qt4/ui/RefUi.ui:77
+#: src/frontends/qt4/ui/SendtoUi.ui:72
+#: src/frontends/qt4/ui/TabularCreateUi.ui:65
+#: src/frontends/qt4/ui/URLUi.ui:102 src/frontends/qt4/ui/VSpaceUi.ui:145
+#: src/frontends/qt4/ui/WrapUi.ui:190
 msgid "&OK"
 msgstr "&OK"
 
 #: src/frontends/qt4/ui/AskForTextUi.ui:94
-#: src/frontends/qt4/ui/CitationUi.ui:323
+#: src/frontends/qt4/ui/CitationUi.ui:425
 #: src/frontends/qt4/ui/DocumentUi.ui:152
-#: src/frontends/qt4/ui/ListingsUi.ui:629 src/BufferList.cpp:113
-#: src/BufferList.cpp:221 src/LyXFunc.cpp:743 src/LyXFunc.cpp:916
-#: src/LyXFunc.cpp:1087 src/LyXFunc.cpp:2096 src/LyXVC.cpp:175
-#: src/buffer_funcs.cpp:101 src/buffer_funcs.cpp:128 src/buffer_funcs.cpp:169
-#: src/callback.cpp:115 src/callback.cpp:168
+#: src/frontends/qt4/ui/ListingsUi.ui:629 src/Buffer.cpp:863
+#: src/BufferList.cpp:113 src/BufferList.cpp:221 src/LyXFunc.cpp:786
+#: src/LyXFunc.cpp:984 src/LyXFunc.cpp:1155 src/LyXFunc.cpp:2195
+#: src/LyXVC.cpp:175 src/buffer_funcs.cpp:104 src/buffer_funcs.cpp:131
+#: src/buffer_funcs.cpp:172 src/callback.cpp:116 src/callback.cpp:187
 msgid "&Cancel"
 msgstr "&Peru"
 
@@ -157,8 +157,8 @@ msgstr "L
 msgid "The label as it appears in the document"
 msgstr "Nimike sellaisena kuin se näkyy asiakirjassa."
 
-#: src/frontends/qt4/ui/BibitemUi.ui:64 src/frontends/qt4/ui/RefUi.ui:145
-#: src/frontends/qt4/Dialogs.cpp:236
+#: src/frontends/qt4/ui/BibitemUi.ui:64 src/frontends/qt4/ui/RefUi.ui:142
+#: src/frontends/qt4/Dialogs.cpp:243
 msgid "&Label:"
 msgstr "&Nimike:"
 
@@ -211,8 +211,7 @@ msgid "LyX: Add BibTeX Database"
 msgstr "LyX: Lisää BiBTeX-tietokanta"
 
 #: src/frontends/qt4/ui/BibtexAddUi.ui:70
-#: src/frontends/qt4/ui/BranchesUi.ui:50
-#: src/frontends/qt4/ui/CitationUi.ui:116
+#: src/frontends/qt4/ui/BranchesUi.ui:50 src/frontends/qt4/ui/CitationUi.ui:98
 #: src/frontends/qt4/ui/PrefCopiersUi.ui:85
 #: src/frontends/qt4/ui/PrefFileformatsUi.ui:54
 msgid "&Add"
@@ -220,8 +219,8 @@ msgstr "&Lis
 
 #: src/frontends/qt4/ui/BibtexAddUi.ui:83 src/frontends/qt4/ui/BibtexUi.ui:229
 #: src/frontends/qt4/ui/ChangesUi.ui:78 src/frontends/qt4/ui/IndexUi.ui:92
-#: src/frontends/qt4/ui/NomenclUi.ui:105 src/frontends/qt4/ui/SendtoUi.ui:95
-#: src/LyXFunc.cpp:859 src/buffer_funcs.cpp:218 src/frontends/qt4/Qt2BC.h:36
+#: src/frontends/qt4/ui/NomenclUi.ui:105 src/frontends/qt4/ui/SendtoUi.ui:92
+#: src/LyXFunc.cpp:901 src/buffer_funcs.cpp:230 src/frontends/qt4/Qt2BC.h:36
 msgid "Cancel"
 msgstr "Peru"
 
@@ -232,7 +231,7 @@ msgstr "K
 #: src/frontends/qt4/ui/BibtexAddUi.ui:126
 #: src/frontends/qt4/ui/BibtexUi.ui:106 src/frontends/qt4/ui/ExternalUi.ui:99
 #: src/frontends/qt4/ui/GraphicsUi.ui:71 src/frontends/qt4/ui/IncludeUi.ui:329
-#: src/frontends/qt4/ui/PrintUi.ui:316
+#: src/frontends/qt4/ui/PrintUi.ui:313
 msgid "&Browse..."
 msgstr "&Selaa..."
 
@@ -305,22 +304,22 @@ msgid "Inner box -- needed for fixed width & line breaks"
 msgstr "Sisälaatikko -- tarvitaan kiinteaa leveyttä ja rivinvaihtoja varten"
 
 #: src/frontends/qt4/ui/BoxUi.ui:38 src/frontends/qt4/ui/ListingsUi.ui:270
-#: src/frontends/qt4/ui/TabularUi.ui:702 src/frontends/qt4/ui/TabularUi.ui:721
-#: src/frontends/qt4/ui/TabularUi.ui:769
-#: src/frontends/controllers/ControlBox.cpp:79 src/frontends/qt4/QBox.cpp:100
-#: src/frontends/qt4/QBox.cpp:268 src/frontends/qt4/QBox.cpp:384
-#: src/frontends/qt4/QDocument.cpp:68
+#: src/frontends/qt4/ui/TabularUi.ui:699 src/frontends/qt4/ui/TabularUi.ui:718
+#: src/frontends/qt4/ui/TabularUi.ui:766
+#: src/frontends/controllers/ControlBox.cpp:79
+#: src/frontends/qt4/GuiBox.cpp:100 src/frontends/qt4/GuiBox.cpp:268
+#: src/frontends/qt4/GuiBox.cpp:384 src/frontends/qt4/GuiDocument.cpp:68
 msgid "None"
 msgstr "Ei mikään"
 
-#: src/frontends/qt4/ui/BoxUi.ui:43 src/frontends/qt4/QBox.cpp:270
-#: src/frontends/qt4/QBox.cpp:377 src/frontends/qt4/QBox.cpp:385
-#: src/insets/InsetBox.cpp:156
+#: src/frontends/qt4/ui/BoxUi.ui:43 src/frontends/qt4/GuiBox.cpp:270
+#: src/frontends/qt4/GuiBox.cpp:377 src/frontends/qt4/GuiBox.cpp:385
+#: src/insets/InsetBox.cpp:155
 msgid "Parbox"
 msgstr "Parbox-tyyppinen laatikko"
 
-#: src/frontends/qt4/ui/BoxUi.ui:48 src/frontends/qt4/QBox.cpp:378
-#: src/frontends/qt4/QBox.cpp:386 src/insets/InsetBox.cpp:158
+#: src/frontends/qt4/ui/BoxUi.ui:48 src/frontends/qt4/GuiBox.cpp:378
+#: src/frontends/qt4/GuiBox.cpp:386 src/insets/InsetBox.cpp:157
 msgid "Minipage"
 msgstr "Pienoissivu"
 
@@ -341,22 +340,22 @@ msgid "Height value"
 msgstr "Korkeusarvo"
 
 #: src/frontends/qt4/ui/BoxUi.ui:112 src/frontends/qt4/ui/BoxUi.ui:135
-#: src/frontends/qt4/ui/WrapUi.ui:118
+#: src/frontends/qt4/ui/WrapUi.ui:115
 msgid "Width value"
 msgstr "Leveysarvo"
 
 #: src/frontends/qt4/ui/BoxUi.ui:122 src/frontends/qt4/ui/ExternalUi.ui:507
-#: src/frontends/qt4/ui/PageLayoutUi.ui:43
+#: src/frontends/qt4/ui/PageLayoutUi.ui:40
 msgid "&Height:"
 msgstr "&Korkeus:"
 
 #: src/frontends/qt4/ui/BoxUi.ui:138 src/frontends/qt4/ui/ExternalUi.ui:484
-#: src/frontends/qt4/ui/PageLayoutUi.ui:56
-#: src/frontends/qt4/ui/TabularUi.ui:103 src/frontends/qt4/ui/WrapUi.ui:39
+#: src/frontends/qt4/ui/PageLayoutUi.ui:53
+#: src/frontends/qt4/ui/TabularUi.ui:100 src/frontends/qt4/ui/WrapUi.ui:36
 msgid "&Width:"
 msgstr "&Leveys:"
 
-#: src/frontends/qt4/ui/BoxUi.ui:148 src/frontends/qt4/ui/MathMatrixUi.ui:202
+#: src/frontends/qt4/ui/BoxUi.ui:148 src/frontends/qt4/ui/MathMatrixUi.ui:199
 #: src/frontends/qt4/ui/ParagraphUi.ui:178
 msgid "Alignment"
 msgstr "Tasaus"
@@ -366,21 +365,21 @@ msgid "Horizontal alignment of the content inside the box"
 msgstr "Laatikon sisällön vaakatasaus"
 
 #: src/frontends/qt4/ui/BoxUi.ui:164 src/frontends/qt4/ui/ListingsUi.ui:275
-#: src/frontends/qt4/ui/TabularUi.ui:145 src/frontends/qt4/ui/WrapUi.ui:58
-#: src/frontends/qt4/QParagraph.cpp:88 src/frontends/qt4/QTabular.cpp:743
+#: src/frontends/qt4/ui/TabularUi.ui:142 src/frontends/qt4/ui/WrapUi.ui:55
+#: src/frontends/qt4/GuiParagraph.cpp:88 src/frontends/qt4/GuiTabular.cpp:743
 msgid "Left"
 msgstr "Vasen"
 
-#: src/frontends/qt4/ui/BoxUi.ui:169 src/frontends/qt4/ui/TabularUi.ui:150
+#: src/frontends/qt4/ui/BoxUi.ui:169 src/frontends/qt4/ui/TabularUi.ui:147
 #: src/frontends/controllers/ControlExternal.cpp:236
 #: src/frontends/controllers/ControlGraphics.cpp:172
-#: src/frontends/qt4/QParagraph.cpp:90 src/frontends/qt4/QTabular.cpp:744
+#: src/frontends/qt4/GuiParagraph.cpp:90 src/frontends/qt4/GuiTabular.cpp:744
 msgid "Center"
 msgstr "Keskellä"
 
 #: src/frontends/qt4/ui/BoxUi.ui:174 src/frontends/qt4/ui/ListingsUi.ui:280
-#: src/frontends/qt4/ui/TabularUi.ui:155 src/frontends/qt4/ui/WrapUi.ui:63
-#: src/frontends/qt4/QParagraph.cpp:89 src/frontends/qt4/QTabular.cpp:745
+#: src/frontends/qt4/ui/TabularUi.ui:152 src/frontends/qt4/ui/WrapUi.ui:60
+#: src/frontends/qt4/GuiParagraph.cpp:89 src/frontends/qt4/GuiTabular.cpp:745
 msgid "Right"
 msgstr "Oikea"
 
@@ -397,20 +396,20 @@ msgid "Vertical alignment of the box (with regard to baseline)"
 msgstr "Laatikon pystytasaus (perusviivan suhteen)"
 
 #: src/frontends/qt4/ui/BoxUi.ui:201 src/frontends/qt4/ui/BoxUi.ui:246
-#: src/frontends/qt4/ui/MathMatrixUi.ui:218
-#: src/frontends/qt4/ui/TabularUi.ui:85
+#: src/frontends/qt4/ui/MathMatrixUi.ui:215
+#: src/frontends/qt4/ui/TabularUi.ui:82
 msgid "Top"
 msgstr "Yläreuna"
 
 #: src/frontends/qt4/ui/BoxUi.ui:206 src/frontends/qt4/ui/BoxUi.ui:251
-#: src/frontends/qt4/ui/MathMatrixUi.ui:223
-#: src/frontends/qt4/ui/TabularUi.ui:90
+#: src/frontends/qt4/ui/MathMatrixUi.ui:220
+#: src/frontends/qt4/ui/TabularUi.ui:87
 msgid "Middle"
 msgstr "Keski"
 
 #: src/frontends/qt4/ui/BoxUi.ui:211 src/frontends/qt4/ui/BoxUi.ui:256
-#: src/frontends/qt4/ui/MathMatrixUi.ui:228
-#: src/frontends/qt4/ui/TabularUi.ui:95
+#: src/frontends/qt4/ui/MathMatrixUi.ui:225
+#: src/frontends/qt4/ui/TabularUi.ui:92
 msgid "Bottom"
 msgstr "Alareuna"
 
@@ -430,11 +429,11 @@ msgstr "Laatikon sis
 msgid "Vertical"
 msgstr "&Pysty"
 
-#: src/frontends/qt4/ui/BoxUi.ui:293 src/frontends/qt4/ui/CitationUi.ui:283
+#: src/frontends/qt4/ui/BoxUi.ui:293 src/frontends/qt4/ui/CitationUi.ui:385
 #: src/frontends/qt4/ui/DocumentUi.ui:112 src/frontends/qt4/ui/FloatUi.ui:42
 #: src/frontends/qt4/ui/GraphicsUi.ui:709
-#: src/frontends/qt4/ui/ParagraphUi.ui:50 src/frontends/qt4/ui/PrefsUi.ui:50
-#: src/frontends/qt4/ui/WrapUi.ui:164
+#: src/frontends/qt4/ui/ParagraphUi.ui:50 src/frontends/qt4/ui/PrefsUi.ui:47
+#: src/frontends/qt4/ui/WrapUi.ui:161
 msgid "&Restore"
 msgstr "Pala&uta"
 
@@ -443,9 +442,9 @@ msgstr "Pala&uta"
 #: src/frontends/qt4/ui/ExternalUi.ui:695 src/frontends/qt4/ui/FloatUi.ui:78
 #: src/frontends/qt4/ui/GraphicsUi.ui:759
 #: src/frontends/qt4/ui/ListingsUi.ui:619
-#: src/frontends/qt4/ui/ParagraphUi.ui:89 src/frontends/qt4/ui/PrefsUi.ui:86
-#: src/frontends/qt4/ui/RefUi.ui:90 src/frontends/qt4/ui/SendtoUi.ui:88
-#: src/frontends/qt4/ui/VSpaceUi.ui:158 src/frontends/qt4/ui/WrapUi.ui:206
+#: src/frontends/qt4/ui/ParagraphUi.ui:89 src/frontends/qt4/ui/PrefsUi.ui:83
+#: src/frontends/qt4/ui/RefUi.ui:87 src/frontends/qt4/ui/SendtoUi.ui:85
+#: src/frontends/qt4/ui/VSpaceUi.ui:158 src/frontends/qt4/ui/WrapUi.ui:203
 msgid "&Apply"
 msgstr "&Toteuta"
 
@@ -507,75 +506,75 @@ msgstr "K&oko:"
 #: src/frontends/qt4/ui/BulletsUi.ui:66 src/frontends/qt4/ui/ExternalUi.ui:192
 #: src/frontends/qt4/ui/GraphicsUi.ui:620
 #: src/frontends/qt4/ui/ParagraphUi.ui:255
-#: src/frontends/qt4/ui/PrefLatexUi.ui:78
-#: src/frontends/qt4/ui/TabularUi.ui:707 src/frontends/qt4/ui/TabularUi.ui:726
-#: src/frontends/qt4/ui/TabularUi.ui:774 lib/ui/stdtoolbars.inc:85
+#: src/frontends/qt4/ui/PrefLatexUi.ui:75
+#: src/frontends/qt4/ui/TabularUi.ui:704 src/frontends/qt4/ui/TabularUi.ui:723
+#: src/frontends/qt4/ui/TabularUi.ui:771 lib/ui/stdtoolbars.inc:85
 #: src/Font.cpp:522 src/frontends/controllers/ControlDocument.cpp:48
 #: src/frontends/controllers/ControlExternal.cpp:234
 #: src/frontends/controllers/ControlGraphics.cpp:170
-#: src/frontends/qt4/QDocument.cpp:67 src/frontends/qt4/QDocument.cpp:77
-#: src/frontends/qt4/QDocument.cpp:88 src/frontends/qt4/QDocument.cpp:98
-#: src/frontends/qt4/QDocument.cpp:302 src/frontends/qt4/QDocument.cpp:339
-#: src/frontends/qt4/QDocument.cpp:351 src/frontends/qt4/QDocument.cpp:755
-#: src/frontends/qt4/QDocument.cpp:803 src/frontends/qt4/QListings.cpp:155
-#: src/frontends/qt4/QListings.cpp:162
+#: src/frontends/qt4/GuiDocument.cpp:67 src/frontends/qt4/GuiDocument.cpp:77
+#: src/frontends/qt4/GuiDocument.cpp:88 src/frontends/qt4/GuiDocument.cpp:98
+#: src/frontends/qt4/GuiDocument.cpp:302 src/frontends/qt4/GuiDocument.cpp:339
+#: src/frontends/qt4/GuiDocument.cpp:351 src/frontends/qt4/GuiDocument.cpp:755
+#: src/frontends/qt4/GuiDocument.cpp:803 src/frontends/qt4/GuiListings.cpp:155
+#: src/frontends/qt4/GuiListings.cpp:162
 msgid "Default"
 msgstr "Oletus"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:71 src/Font.cpp:68
-#: src/frontends/controllers/frontend_helpers.cpp:962
-#: src/frontends/qt4/QListings.cpp:155
+#: src/frontends/controllers/frontend_helpers.cpp:153
+#: src/frontends/qt4/GuiListings.cpp:155
 msgid "Tiny"
 msgstr "Pikkuruinen"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:76 src/Font.cpp:68
-#: src/frontends/controllers/frontend_helpers.cpp:966
-#: src/frontends/qt4/QListings.cpp:155
+#: src/frontends/controllers/frontend_helpers.cpp:157
+#: src/frontends/qt4/GuiListings.cpp:155
 msgid "Smallest"
 msgstr "Pienin"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:81 src/Font.cpp:68
-#: src/frontends/controllers/frontend_helpers.cpp:970
-#: src/frontends/qt4/QListings.cpp:155
+#: src/frontends/controllers/frontend_helpers.cpp:161
+#: src/frontends/qt4/GuiListings.cpp:155
 msgid "Smaller"
 msgstr "Pienempi"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:86 src/Font.cpp:68
-#: src/frontends/controllers/frontend_helpers.cpp:974
-#: src/frontends/qt4/QListings.cpp:155
+#: src/frontends/controllers/frontend_helpers.cpp:165
+#: src/frontends/qt4/GuiListings.cpp:155
 msgid "Small"
 msgstr "Pieni"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:91 src/Font.cpp:68
-#: src/frontends/controllers/frontend_helpers.cpp:978
-#: src/frontends/qt4/QListings.cpp:155
+#: src/frontends/controllers/frontend_helpers.cpp:169
+#: src/frontends/qt4/GuiListings.cpp:155
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:96 src/Font.cpp:68
-#: src/frontends/controllers/frontend_helpers.cpp:982
-#: src/frontends/qt4/QListings.cpp:156
+#: src/frontends/controllers/frontend_helpers.cpp:173
+#: src/frontends/qt4/GuiListings.cpp:156
 msgid "Large"
 msgstr "Suuri"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:101 src/Font.cpp:69
-#: src/frontends/controllers/frontend_helpers.cpp:986
-#: src/frontends/qt4/QListings.cpp:156
+#: src/frontends/controllers/frontend_helpers.cpp:177
+#: src/frontends/qt4/GuiListings.cpp:156
 msgid "Larger"
 msgstr "Suurempi"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:106 src/Font.cpp:69
-#: src/frontends/controllers/frontend_helpers.cpp:990
+#: src/frontends/controllers/frontend_helpers.cpp:181
 msgid "Largest"
 msgstr "Suurin"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:111 src/Font.cpp:69
-#: src/frontends/controllers/frontend_helpers.cpp:994
+#: src/frontends/controllers/frontend_helpers.cpp:185
 msgid "Huge"
 msgstr "Valtava"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:116 src/Font.cpp:69
-#: src/frontends/controllers/frontend_helpers.cpp:998
+#: src/frontends/controllers/frontend_helpers.cpp:189
 msgid "Huger"
 msgstr "Valtavin"
 
@@ -641,8 +640,8 @@ msgstr "Kirjasinsarja"
 #: src/frontends/qt4/ui/CharacterUi.ui:114
 #: src/frontends/qt4/ui/CharacterUi.ui:160
 #: src/frontends/qt4/ui/ListingsUi.ui:370 lib/layouts/europecv.layout:117
-#: lib/layouts/moderncv.layout:111 src/frontends/qt4/QDocument.cpp:585
-#: src/frontends/qt4/QPrefs.cpp:1593
+#: lib/layouts/moderncv.layout:111 src/frontends/qt4/GuiDocument.cpp:585
+#: src/frontends/qt4/GuiPrefs.cpp:1586
 msgid "Language"
 msgstr "Kieli"
 
@@ -702,111 +701,132 @@ msgstr "Ota kukin muutos k
 msgid "Apply changes immediately"
 msgstr "Ota muutos käyttöön heti"
 
-#: src/frontends/qt4/ui/CharacterUi.ui:390 src/frontends/qt4/ui/ERTUi.ui:110
+#: src/frontends/qt4/ui/CharacterUi.ui:390 src/frontends/qt4/ui/ERTUi.ui:100
 #: src/frontends/qt4/ui/GraphicsUi.ui:780
-#: src/frontends/qt4/ui/MathMatrixUi.ui:177 src/frontends/qt4/ui/NoteUi.ui:41
-#: src/frontends/qt4/ui/PrintUi.ui:246
-#: src/frontends/qt4/ui/TabularCreateUi.ui:75
-#: src/frontends/qt4/ui/TabularUi.ui:1131 src/frontends/qt4/Qt2BC.h:37
+#: src/frontends/qt4/ui/MathMatrixUi.ui:174 src/frontends/qt4/ui/NoteUi.ui:38
+#: src/frontends/qt4/ui/PrintUi.ui:243
+#: src/frontends/qt4/ui/TabularCreateUi.ui:72
+#: src/frontends/qt4/ui/TabularUi.ui:1128 src/frontends/qt4/Qt2BC.h:37
 msgid "Close"
 msgstr "Sulje"
 
-#: src/frontends/qt4/ui/CitationUi.ui:52
+#: src/frontends/qt4/ui/CitationUi.ui:36
 msgid "Move the selected citation up"
 msgstr "Siirrä valittua lähdeviitettä ylös"
 
-#: src/frontends/qt4/ui/CitationUi.ui:55
+#: src/frontends/qt4/ui/CitationUi.ui:39
 msgid "&Up"
 msgstr "Ylös"
 
-#: src/frontends/qt4/ui/CitationUi.ui:73
+#: src/frontends/qt4/ui/CitationUi.ui:55
 msgid "Move the selected citation down"
 msgstr "Siirrä valittua lähdeviitettä alas"
 
-#: src/frontends/qt4/ui/CitationUi.ui:76
+#: src/frontends/qt4/ui/CitationUi.ui:58
 msgid "&Down"
 msgstr "Alas"
 
-#: src/frontends/qt4/ui/CitationUi.ui:99
+#: src/frontends/qt4/ui/CitationUi.ui:81
 msgid "D&elete"
 msgstr "P&oista"
 
-#: src/frontends/qt4/ui/CitationUi.ui:126
+#: src/frontends/qt4/ui/CitationUi.ui:108
 msgid "&Selected Citations:"
 msgstr "&Valitut lähdeviitteet:"
 
-#: src/frontends/qt4/ui/CitationUi.ui:136
+#: src/frontends/qt4/ui/CitationUi.ui:118
 msgid "A&vailable Citations:"
 msgstr "Mahdolliset viitteet:"
 
-#: src/frontends/qt4/ui/CitationUi.ui:162
+#: src/frontends/qt4/ui/CitationUi.ui:144
+msgid "Search Citation"
+msgstr "Etsi lähdeviite"
+
+#: src/frontends/qt4/ui/CitationUi.ui:153
+msgid "F&ind:"
+msgstr "&Etsi:"
+
+#: src/frontends/qt4/ui/CitationUi.ui:176
+msgid "<- C&lear"
+msgstr "&Tyhjennä"
+
+#: src/frontends/qt4/ui/CitationUi.ui:183
+#, fuzzy
+msgid "Search Field:"
+msgstr "Etsi"
+
+#: src/frontends/qt4/ui/CitationUi.ui:203
+#: src/frontends/qt4/GuiCitationDialog.cpp:296
+#, fuzzy
+msgid "All Fields"
+msgstr "Kaikki tiedostot (*)"
+
+#: src/frontends/qt4/ui/CitationUi.ui:224
+msgid "Regular E&xpression"
+msgstr "Jokerikortti-ilmaisu"
+
+#: src/frontends/qt4/ui/CitationUi.ui:231
+#, fuzzy
+msgid "Entry Types:"
+msgstr "Kohta:"
+
+#: src/frontends/qt4/ui/CitationUi.ui:248
+#: src/frontends/qt4/GuiCitationDialog.cpp:311
+msgid "All Entry Types"
+msgstr ""
+
+#: src/frontends/qt4/ui/CitationUi.ui:269
+msgid "Case Se&nsitive"
+msgstr "Sa&ma kirjainkoko"
+
+#: src/frontends/qt4/ui/CitationUi.ui:279
 msgid "Formatting"
 msgstr "Muotoilu"
 
-#: src/frontends/qt4/ui/CitationUi.ui:185
+#: src/frontends/qt4/ui/CitationUi.ui:294
 msgid "Natbib citation style to use"
 msgstr "Käytettävä natbib-lähdeviitetyyli"
 
-#: src/frontends/qt4/ui/CitationUi.ui:192
+#: src/frontends/qt4/ui/CitationUi.ui:301
 msgid "Citation st&yle:"
 msgstr "Lähdeviitetyyli:"
 
-#: src/frontends/qt4/ui/CitationUi.ui:202
+#: src/frontends/qt4/ui/CitationUi.ui:311
 msgid "List all authors"
 msgstr "Luettele kaikki tekijät"
 
-#: src/frontends/qt4/ui/CitationUi.ui:205
+#: src/frontends/qt4/ui/CitationUi.ui:314
 msgid "Full aut&hor list"
 msgstr "Täydellinen tekijä&luettelo"
 
-#: src/frontends/qt4/ui/CitationUi.ui:212
+#: src/frontends/qt4/ui/CitationUi.ui:321
 msgid "Force upper case in citation"
 msgstr "Pakota iso kirjain lainaukseen"
 
-#: src/frontends/qt4/ui/CitationUi.ui:215
+#: src/frontends/qt4/ui/CitationUi.ui:324
 msgid "&Force upper case"
 msgstr "Pakota &iso kirjain"
 
-#: src/frontends/qt4/ui/CitationUi.ui:222
+#: src/frontends/qt4/ui/CitationUi.ui:331
 msgid "&Text after:"
 msgstr "Seuraava teksti:"
 
-#: src/frontends/qt4/ui/CitationUi.ui:240
+#: src/frontends/qt4/ui/CitationUi.ui:347
 msgid "Text to place after citation"
 msgstr "Lainauksen jälkeen tuleva teksti"
 
-#: src/frontends/qt4/ui/CitationUi.ui:247
+#: src/frontends/qt4/ui/CitationUi.ui:354
 msgid "Text &before:"
 msgstr "Edeltävä teksti:"
 
-#: src/frontends/qt4/ui/CitationUi.ui:265
+#: src/frontends/qt4/ui/CitationUi.ui:370
 msgid "Text to place before citation"
 msgstr "Lainausta edeltävä teksti"
 
-#: src/frontends/qt4/ui/CitationUi.ui:316
+#: src/frontends/qt4/ui/CitationUi.ui:418
 msgid "A&pply"
 msgstr "&Toteuta"
 
-#: src/frontends/qt4/ui/CitationUi.ui:335
-msgid "Search Citation"
-msgstr "Etsi lähdeviite"
-
-#: src/frontends/qt4/ui/CitationUi.ui:358
-msgid "Case Se&nsitive"
-msgstr "Sa&ma kirjainkoko"
-
-#: src/frontends/qt4/ui/CitationUi.ui:365
-msgid "Regular E&xpression"
-msgstr "Jokerikortti-ilmaisu"
-
-#: src/frontends/qt4/ui/CitationUi.ui:377
-msgid "<- C&lear"
-msgstr "&Tyhjennä"
-
-#: src/frontends/qt4/ui/CitationUi.ui:391
-msgid "F&ind:"
-msgstr "&Etsi:"
-
 #: src/frontends/qt4/ui/DelimiterUi.ui:89
 msgid "Insert the delimiters"
 msgstr "Lisää erottimet"
@@ -820,7 +840,7 @@ msgid "&Size:"
 msgstr "K&oko:"
 
 #: src/frontends/qt4/ui/DelimiterUi.ui:180
-#: src/frontends/qt4/QDelimiterDialog.cpp:190
+#: src/frontends/qt4/GuiDelimiterDialog.cpp:190
 msgid "TeX Code: "
 msgstr "TeX-koodi: "
 
@@ -853,29 +873,74 @@ msgid "Display"
 msgstr "Näyttö"
 
 #: src/frontends/qt4/ui/ERTUi.ui:43
-msgid "Show ERT inline"
-msgstr "Näytä ERT-upote ilman painiketta"
-
-#: src/frontends/qt4/ui/ERTUi.ui:46
-msgid "&Inline"
-msgstr "Ilman painiketta"
-
-#: src/frontends/qt4/ui/ERTUi.ui:53
 msgid "Show ERT button only"
 msgstr "Näytä vain ERT-kehyksen painike"
 
-#: src/frontends/qt4/ui/ERTUi.ui:56
+#: src/frontends/qt4/ui/ERTUi.ui:46
 msgid "&Collapsed"
 msgstr "Suljettuna"
 
-#: src/frontends/qt4/ui/ERTUi.ui:63
+#: src/frontends/qt4/ui/ERTUi.ui:53
 msgid "Show ERT contents"
 msgstr "Näytä ERT-kehyksen sisältö"
 
-#: src/frontends/qt4/ui/ERTUi.ui:66
+#: src/frontends/qt4/ui/ERTUi.ui:56
 msgid "O&pen"
 msgstr "&Auki"
 
+#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:28
+#, fuzzy
+msgid "Enable embedding"
+msgstr "Rivinumerointi"
+
+#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:35
+#, fuzzy
+msgid "List of embedded files"
+msgstr "Luettelo: "
+
+#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:48
+#, fuzzy
+msgid "External FIle Name:"
+msgstr "Ulkoinen aineisto"
+
+#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:58
+#: src/frontends/qt4/ui/TabularUi.ui:846
+msgid "Status"
+msgstr "Tila"
+
+#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:70
+#, fuzzy
+msgid "Automatic inclusion"
+msgstr "Automaattinen päivitys"
+
+#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:73
+#, fuzzy
+msgid "Automatic"
+msgstr "Automaattinen päivitys"
+
+#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:83
+#, fuzzy
+msgid "Embedded"
+msgstr "Numerointi"
+
+#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:93
+#, fuzzy
+msgid "External"
+msgstr "Lisä"
+
+#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:114
+msgid "Actions to perform"
+msgstr ""
+
+#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:124
+msgid "Extract this file to disk"
+msgstr ""
+
+#: src/frontends/qt4/ui/EmbeddedFilesUi.ui:127
+#, fuzzy
+msgid "Action!"
+msgstr "Kappale"
+
 #: src/frontends/qt4/ui/ExternalUi.ui:51
 msgid "File"
 msgstr "Tiedosto"
@@ -897,13 +962,14 @@ msgid "Select a file"
 msgstr "Valitse tiedosto"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:106
-#: src/frontends/qt4/ui/ExternalUi.ui:119
+#: src/frontends/qt4/ui/ExternalUi.ui:119 lib/layouts/agu_stdclass.inc:81
+#: lib/layouts/db_stdcharstyles.inc:8
 msgid "Filename"
 msgstr "Tiedostonimi"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:109
 #: src/frontends/qt4/ui/GraphicsUi.ui:88 src/frontends/qt4/ui/IncludeUi.ui:259
-#: src/frontends/qt4/ui/PrintUi.ui:296
+#: src/frontends/qt4/ui/PrintUi.ui:293
 msgid "&File:"
 msgstr "Tie&dosto:"
 
@@ -928,19 +994,20 @@ msgstr "N
 
 #: src/frontends/qt4/ui/ExternalUi.ui:197
 #: src/frontends/qt4/ui/GraphicsUi.ui:625
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:66
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:63
 msgid "Monochrome"
 msgstr "Mustavalkoinen"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:202
 #: src/frontends/qt4/ui/GraphicsUi.ui:630
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:71
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:68
 msgid "Grayscale"
 msgstr "Harmaasävyinen"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:207
 #: src/frontends/qt4/ui/GraphicsUi.ui:635
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:76 src/frontends/qt4/QBranches.cpp:44
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:73
+#: src/frontends/qt4/GuiBranches.cpp:44
 msgid "Color"
 msgstr "Väri"
 
@@ -1136,7 +1203,7 @@ msgid "&Typewriter:"
 msgstr "&Kirjoituskone:"
 
 #: src/frontends/qt4/ui/FontUi.ui:90
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:114
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:111
 msgid "&Roman:"
 msgstr "A&ntiikva:"
 
@@ -1168,7 +1235,7 @@ msgstr "Perusk&oko:"
 msgid "&Graphics"
 msgstr "&Kuva"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:55
+#: src/frontends/qt4/ui/GraphicsUi.ui:55 src/frontends/qt4/ui/IncludeUi.ui:339
 msgid "&Edit"
 msgstr "&Muokkaa"
 
@@ -1342,11 +1409,11 @@ msgstr "Valitse sis
 msgid "&Include Type:"
 msgstr "&Sisällytystyyppi:"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:287 src/insets/InsetInclude.cpp:348
+#: src/frontends/qt4/ui/IncludeUi.ui:287 src/insets/InsetInclude.cpp:347
 msgid "Include"
 msgstr "Sisällytä"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:292 src/insets/InsetInclude.cpp:339
+#: src/frontends/qt4/ui/IncludeUi.ui:292 src/insets/InsetInclude.cpp:338
 msgid "Input"
 msgstr "Syötä"
 
@@ -1354,19 +1421,15 @@ msgstr "Sy
 msgid "Verbatim"
 msgstr "Sinänsä"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:302 src/frontends/qt4/ui/ListingsUi.ui:16
-#: src/insets/InsetListings.cpp:251
-msgid "Listing"
-msgstr "Listaus"
+#: src/frontends/qt4/ui/IncludeUi.ui:302 src/insets/InsetInclude.cpp:955
+msgid "Program Listing"
+msgstr "Ohjelmalistaus"
 
 #: src/frontends/qt4/ui/IncludeUi.ui:336
-msgid "Load the file"
+#, fuzzy
+msgid "Edit the file"
 msgstr "Lataa tiedosto"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:339
-msgid "&Load"
-msgstr "&Lataa"
-
 #: src/frontends/qt4/ui/LaTeXUi.ui:58
 msgid "Document &class:"
 msgstr "Asiakirja&luokka:"
@@ -1391,11 +1454,16 @@ msgstr "&Merkist
 msgid "&Quote Style:"
 msgstr "Lainausmerkkien tyyli"
 
+#: src/frontends/qt4/ui/ListingsUi.ui:16 src/insets/InsetCaption.cpp:300
+#: src/insets/InsetListings.cpp:267
+msgid "Listing"
+msgstr "Listaus"
+
 #: src/frontends/qt4/ui/ListingsUi.ui:43
 msgid "&Main Settings"
 msgstr "Pääasetukset"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:55 src/frontends/qt4/ui/TabularUi.ui:301
+#: src/frontends/qt4/ui/ListingsUi.ui:55 src/frontends/qt4/ui/TabularUi.ui:298
 msgid "Style"
 msgstr "Tyyli"
 
@@ -1471,7 +1539,7 @@ msgstr "Tarkista onko tekstin seassa olevia listauksia"
 msgid "&Inline listing"
 msgstr "Tekstin &seassa"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:238 src/frontends/qt4/ui/WrapUi.ui:76
+#: src/frontends/qt4/ui/ListingsUi.ui:238 src/frontends/qt4/ui/WrapUi.ui:73
 msgid "&Placement:"
 msgstr "Si&joittelu:"
 
@@ -1555,11 +1623,11 @@ msgstr "Palauteikkuna"
 msgid "Input listing parameters here. Enter ? for a list of parameters."
 msgstr "Syötä listauksen parametrit. Syötä ? jos haluat niiden lista."
 
-#: src/frontends/qt4/ui/LogUi.ui:58
+#: src/frontends/qt4/ui/LogUi.ui:55
 msgid "Update the display"
 msgstr "Päivitä näyttö"
 
-#: src/frontends/qt4/ui/LogUi.ui:61 src/frontends/qt4/ui/RefUi.ui:235
+#: src/frontends/qt4/ui/LogUi.ui:58 src/frontends/qt4/ui/RefUi.ui:232
 #: src/frontends/qt4/ui/ViewSourceUi.ui:56
 msgid "&Update"
 msgstr "Päi&vitä"
@@ -1600,63 +1668,63 @@ msgstr "Sivuo&ts. kork.:"
 msgid "&Foot skip:"
 msgstr "Alav&iiteväli:"
 
-#: src/frontends/qt4/ui/MathMatrixUi.ui:39
-#: src/frontends/qt4/ui/MathMatrixUi.ui:52
-#: src/frontends/qt4/ui/TabularCreateUi.ui:84
-#: src/frontends/qt4/ui/TabularCreateUi.ui:126
+#: src/frontends/qt4/ui/MathMatrixUi.ui:36
+#: src/frontends/qt4/ui/MathMatrixUi.ui:49
+#: src/frontends/qt4/ui/TabularCreateUi.ui:81
+#: src/frontends/qt4/ui/TabularCreateUi.ui:123
 msgid "Number of rows"
 msgstr "Rivien määrä"
 
-#: src/frontends/qt4/ui/MathMatrixUi.ui:42
-#: src/frontends/qt4/ui/TabularCreateUi.ui:87
+#: src/frontends/qt4/ui/MathMatrixUi.ui:39
+#: src/frontends/qt4/ui/TabularCreateUi.ui:84
 msgid "&Rows:"
 msgstr "&Rivejä:"
 
-#: src/frontends/qt4/ui/MathMatrixUi.ui:68
-#: src/frontends/qt4/ui/MathMatrixUi.ui:81
-#: src/frontends/qt4/ui/TabularCreateUi.ui:113
-#: src/frontends/qt4/ui/TabularCreateUi.ui:142
+#: src/frontends/qt4/ui/MathMatrixUi.ui:65
+#: src/frontends/qt4/ui/MathMatrixUi.ui:78
+#: src/frontends/qt4/ui/TabularCreateUi.ui:110
+#: src/frontends/qt4/ui/TabularCreateUi.ui:139
 msgid "Number of columns"
 msgstr "Sarakkeiden määrä"
 
-#: src/frontends/qt4/ui/MathMatrixUi.ui:71
-#: src/frontends/qt4/ui/TabularCreateUi.ui:116
+#: src/frontends/qt4/ui/MathMatrixUi.ui:68
+#: src/frontends/qt4/ui/TabularCreateUi.ui:113
 msgid "&Columns:"
 msgstr "&Sarakkeita:"
 
-#: src/frontends/qt4/ui/MathMatrixUi.ui:139
+#: src/frontends/qt4/ui/MathMatrixUi.ui:136
 msgid "Resize this to the correct table dimensions"
 msgstr "Muuta tämän koko oikeita taulukon mittoja vastaavaksi"
 
-#: src/frontends/qt4/ui/MathMatrixUi.ui:214 src/frontends/qt4/ui/WrapUi.ui:49
+#: src/frontends/qt4/ui/MathMatrixUi.ui:211 src/frontends/qt4/ui/WrapUi.ui:46
 msgid "Vertical alignment"
 msgstr "Pystytasaus"
 
-#: src/frontends/qt4/ui/MathMatrixUi.ui:236
+#: src/frontends/qt4/ui/MathMatrixUi.ui:233
 msgid "&Vertical:"
 msgstr "&Pysty:"
 
-#: src/frontends/qt4/ui/MathMatrixUi.ui:257
+#: src/frontends/qt4/ui/MathMatrixUi.ui:254
 msgid "Horizontal alignment per column (l,c,r)"
 msgstr "Sarakkeiden vaakatasaukset (l,c,r)"
 
-#: src/frontends/qt4/ui/MathMatrixUi.ui:264
+#: src/frontends/qt4/ui/MathMatrixUi.ui:261
 msgid "&Horizontal:"
 msgstr "&Vaaka:"
 
-#: src/frontends/qt4/ui/MathsUi.ui:28
+#: src/frontends/qt4/ui/MathsUi.ui:25
 msgid "&Use AMS math package automatically"
 msgstr "Ota AMS math -pakkaus käyttöön automaattisesti"
 
-#: src/frontends/qt4/ui/MathsUi.ui:38
+#: src/frontends/qt4/ui/MathsUi.ui:35
 msgid "Use AMS &math package"
 msgstr "Käytä AMS-&Mathia"
 
-#: src/frontends/qt4/ui/MathsUi.ui:45
+#: src/frontends/qt4/ui/MathsUi.ui:42
 msgid "Use esint package &automatically"
 msgstr "Ota sint -pakkaus käyttöön automaattisesti"
 
-#: src/frontends/qt4/ui/MathsUi.ui:55
+#: src/frontends/qt4/ui/MathsUi.ui:52
 msgid "Use &esint package"
 msgstr "Käytä esintia"
 
@@ -1672,91 +1740,91 @@ msgstr "Kuvausluettelo"
 msgid "&Symbol:"
 msgstr "Symboli"
 
-#: src/frontends/qt4/ui/NoteUi.ui:51
+#: src/frontends/qt4/ui/NoteUi.ui:48
 msgid "Type"
 msgstr "&Tyyppi"
 
-#: src/frontends/qt4/ui/NoteUi.ui:63
+#: src/frontends/qt4/ui/NoteUi.ui:60
 msgid "LyX internal only"
 msgstr "Vain LyXin sisällä"
 
-#: src/frontends/qt4/ui/NoteUi.ui:66
+#: src/frontends/qt4/ui/NoteUi.ui:63
 msgid "LyX &Note"
 msgstr "Muistiinpano"
 
-#: src/frontends/qt4/ui/NoteUi.ui:73
+#: src/frontends/qt4/ui/NoteUi.ui:70
 msgid "Export to LaTeX/Docbook but don't print"
 msgstr "Vie LaTeXiin/Docbookiin, ei tulostu"
 
-#: src/frontends/qt4/ui/NoteUi.ui:76
+#: src/frontends/qt4/ui/NoteUi.ui:73
 msgid "&Comment"
 msgstr "Huomautus"
 
-#: src/frontends/qt4/ui/NoteUi.ui:83
+#: src/frontends/qt4/ui/NoteUi.ui:80
 msgid "Print as grey text"
 msgstr "Tulosta harmaana tekstina"
 
-#: src/frontends/qt4/ui/NoteUi.ui:86
+#: src/frontends/qt4/ui/NoteUi.ui:83
 msgid "&Greyed out"
 msgstr "Harmaana"
 
-#: src/frontends/qt4/ui/NoteUi.ui:93
+#: src/frontends/qt4/ui/NoteUi.ui:90
 msgid "Framed in box"
 msgstr "Kehyksessä"
 
-#: src/frontends/qt4/ui/NoteUi.ui:96
+#: src/frontends/qt4/ui/NoteUi.ui:93
 msgid "&Framed"
 msgstr "Kehyksessä"
 
-#: src/frontends/qt4/ui/NoteUi.ui:103
+#: src/frontends/qt4/ui/NoteUi.ui:100
 msgid "Box with shaded background"
 msgstr "Kehys varjostetulla taustalla"
 
-#: src/frontends/qt4/ui/NoteUi.ui:106
+#: src/frontends/qt4/ui/NoteUi.ui:103
 msgid "&Shaded"
 msgstr "Varjostettu"
 
-#: src/frontends/qt4/ui/NumberingUi.ui:63
+#: src/frontends/qt4/ui/NumberingUi.ui:60
 msgid "&List in Table of Contents"
 msgstr "Sisällä Sisällysluetteloon"
 
-#: src/frontends/qt4/ui/NumberingUi.ui:73
+#: src/frontends/qt4/ui/NumberingUi.ui:70
 msgid "&Numbering"
 msgstr "Numerointi"
 
-#: src/frontends/qt4/ui/PageLayoutUi.ui:28
+#: src/frontends/qt4/ui/PageLayoutUi.ui:25
 msgid "Paper Size"
 msgstr "Paperikoko"
 
-#: src/frontends/qt4/ui/PageLayoutUi.ui:74
+#: src/frontends/qt4/ui/PageLayoutUi.ui:71
 msgid "Choose a particular paper size, or set your own with \"Custom\""
 msgstr "Valitse tietty paperikoko, tai aseta omasi: \"Määr. oma\""
 
-#: src/frontends/qt4/ui/PageLayoutUi.ui:128
+#: src/frontends/qt4/ui/PageLayoutUi.ui:125
 msgid "Orientation"
 msgstr "Asento"
 
-#: src/frontends/qt4/ui/PageLayoutUi.ui:140
+#: src/frontends/qt4/ui/PageLayoutUi.ui:137
 msgid "&Portrait"
 msgstr "&Pysty"
 
-#: src/frontends/qt4/ui/PageLayoutUi.ui:150
+#: src/frontends/qt4/ui/PageLayoutUi.ui:147
 msgid "&Landscape"
 msgstr "&Vaaka"
 
-#: src/frontends/qt4/ui/PageLayoutUi.ui:168
+#: src/frontends/qt4/ui/PageLayoutUi.ui:165
 msgid "Page &style:"
 msgstr "&Sivutyyli:"
 
-#: src/frontends/qt4/ui/PageLayoutUi.ui:186
+#: src/frontends/qt4/ui/PageLayoutUi.ui:183
 msgid "Style used for the page header and footer"
 msgstr "Sivuotsikoissa käytetty tyyli"
 
-#: src/frontends/qt4/ui/PageLayoutUi.ui:195
+#: src/frontends/qt4/ui/PageLayoutUi.ui:192
 msgid "Lay out the page for double-sided printing"
 msgstr "Sivun asettelu molemminpuolista tulostusta varten"
 
-#: src/frontends/qt4/ui/PageLayoutUi.ui:198
+#: src/frontends/qt4/ui/PageLayoutUi.ui:195
 msgid "&Two-sided document"
 msgstr "Kaksipu&olinen asiakirja"
 
@@ -1777,7 +1845,8 @@ msgstr "&Pisin nimike"
 msgid "Use the default alignment for this paragraph, whatever it is."
 msgstr "Käytä tämän kappaleen oletustasaus, mikä lieneekään."
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:198 src/frontends/qt4/QParagraph.cpp:86
+#: src/frontends/qt4/ui/ParagraphUi.ui:198
+#: src/frontends/qt4/GuiParagraph.cpp:86
 msgid "Use Paragraph's Default Alignment"
 msgstr "Käytä kappaleen oletustasaus"
 
@@ -1801,8 +1870,8 @@ msgstr "Tasattu"
 msgid "L&ine spacing:"
 msgstr "Rivi&välit:"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:260 src/Text.cpp:1856
-#: src/frontends/qt4/QDocument.cpp:245
+#: src/frontends/qt4/ui/ParagraphUi.ui:260 src/Text.cpp:1640
+#: src/frontends/qt4/GuiDocument.cpp:245
 msgid "Single"
 msgstr "Yksink."
 
@@ -1810,15 +1879,15 @@ msgstr "Yksink."
 msgid "1.5"
 msgstr "1.5"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:270 src/Text.cpp:1862
-#: src/frontends/qt4/QDocument.cpp:249
+#: src/frontends/qt4/ui/ParagraphUi.ui:270 src/Text.cpp:1646
+#: src/frontends/qt4/GuiDocument.cpp:249
 msgid "Double"
 msgstr "Kaksink."
 
 #: src/frontends/qt4/ui/ParagraphUi.ui:275
-#: src/frontends/qt4/ui/TabularUi.ui:712 src/frontends/qt4/ui/TabularUi.ui:731
-#: src/frontends/qt4/ui/TabularUi.ui:779 src/frontends/qt4/ui/VSpaceUi.ui:110
-#: src/frontends/qt4/QDocument.cpp:251 src/frontends/qt4/QDocument.cpp:352
+#: src/frontends/qt4/ui/TabularUi.ui:709 src/frontends/qt4/ui/TabularUi.ui:728
+#: src/frontends/qt4/ui/TabularUi.ui:776 src/frontends/qt4/ui/VSpaceUi.ui:110
+#: src/frontends/qt4/GuiDocument.cpp:251 src/frontends/qt4/GuiDocument.cpp:352
 msgid "Custom"
 msgstr "Määr. oma"
 
@@ -1851,7 +1920,7 @@ msgid "&To format:"
 msgstr "Muotoon:"
 
 #: src/frontends/qt4/ui/PrefConvertersUi.ui:187
-#: src/frontends/qt4/ui/SpellcheckerUi.ui:61
+#: src/frontends/qt4/ui/SpellcheckerUi.ui:58
 msgid "A&dd"
 msgstr "&Lisää"
 
@@ -1881,7 +1950,7 @@ msgstr "P
 msgid "&Maximum Age (in days):"
 msgstr "Maksimi-ikä (päivissä):"
 
-#: src/frontends/qt4/ui/PrefCopiersUi.ui:38 src/frontends/qt4/ui/RefUi.ui:132
+#: src/frontends/qt4/ui/PrefCopiersUi.ui:38 src/frontends/qt4/ui/RefUi.ui:129
 msgid "&Format:"
 msgstr "&Muoto:"
 
@@ -1900,42 +1969,41 @@ msgid ""
 "rather than the Cygwin teTeX."
 msgstr ""
 "Valitse tuottaako LyX Windows-tyylisiä polkunimiä vai Posix-tyylisiä. Tämä "
-"on hyödyllistä jos käytät Windowsin natiivi-MikTeXiä CygWin teTeXin "
-"sijaan."
+"on hyödyllistä jos käytät Windowsin natiivi-MikTeXiä CygWin teTeXin sijaan."
 
 #: src/frontends/qt4/ui/PrefCygwinPathUi.ui:47
 msgid "&Use Windows-style paths in LaTeX files"
 msgstr "&Käytä Windows-tyylisiä polkuja LaTeX -tiedostoissa"
 
-#: src/frontends/qt4/ui/PrefDateUi.ui:36
+#: src/frontends/qt4/ui/PrefDateUi.ui:33
 msgid "&Date format:"
 msgstr "&Päiväysmuoto:"
 
-#: src/frontends/qt4/ui/PrefDateUi.ui:46
+#: src/frontends/qt4/ui/PrefDateUi.ui:43
 msgid "Date format for strftime output"
 msgstr "Päiväysmuoto (strftime)"
 
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:36
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:33
 msgid "Display &Graphics:"
 msgstr "Kuvien &näyttäminen:"
 
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:47 src/Font.cpp:73
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:44 src/Font.cpp:73
 msgid "Off"
 msgstr "Pois päältä"
 
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:52
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:49
 msgid "No math"
 msgstr "Ei matematiikka"
 
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:57 src/Font.cpp:73
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:54 src/Font.cpp:73
 msgid "On"
 msgstr "Päällä"
 
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:81
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:78
 msgid "Do not display"
 msgstr "Älä näytä"
 
-#: src/frontends/qt4/ui/PrefDisplayUi.ui:89
+#: src/frontends/qt4/ui/PrefDisplayUi.ui:86
 msgid "Instant &Preview:"
 msgstr "&Esikatselu heti"
 
@@ -1975,20 +2043,20 @@ msgstr "P
 msgid "Ed&itor:"
 msgstr "Editori:"
 
-#: src/frontends/qt4/ui/PrefIdentityUi.ui:36
+#: src/frontends/qt4/ui/PrefIdentityUi.ui:33
 msgid "&E-mail:"
 msgstr "Sähköposti"
 
-#: src/frontends/qt4/ui/PrefIdentityUi.ui:46
+#: src/frontends/qt4/ui/PrefIdentityUi.ui:43
 msgid "Your name"
 msgstr "Nimesi"
 
-#: src/frontends/qt4/ui/PrefIdentityUi.ui:53 src/frontends/qt4/ui/RefUi.ui:119
-#: src/frontends/qt4/ui/URLUi.ui:47
+#: src/frontends/qt4/ui/PrefIdentityUi.ui:50 src/frontends/qt4/ui/RefUi.ui:116
+#: src/frontends/qt4/ui/URLUi.ui:44
 msgid "&Name:"
 msgstr "&Nimi:"
 
-#: src/frontends/qt4/ui/PrefIdentityUi.ui:63
+#: src/frontends/qt4/ui/PrefIdentityUi.ui:60
 msgid "Your E-mail address"
 msgstr "Sähköpostiosoite"
 
@@ -2006,7 +2074,7 @@ msgid "&First:"
 msgstr "&Ensimmäinen:"
 
 #: src/frontends/qt4/ui/PrefKeyboardUi.ui:97
-#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:82
+#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:79
 msgid "Br&owse..."
 msgstr "Se&laa..."
 
@@ -2014,177 +2082,183 @@ msgstr "Se&laa..."
 msgid "Use &keyboard map"
 msgstr "Käytä &näppäinkarttaa"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:28
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:25
 msgid "Command s&tart:"
 msgstr "Ko&mennon alku:"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:50
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:47
 msgid "&Default language:"
 msgstr "&Oletuskieli:"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:60
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:57
 msgid "Command e&nd:"
 msgstr "Kome&nnon loppu:"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:70
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:67
 msgid "Language pac&kage:"
 msgstr "Kieli&paketti:"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:80
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:77
 msgid "Auto &begin"
 msgstr "Automaattinen al&ku"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:87
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:84
 msgid "Use b&abel"
 msgstr "Käytä &Babelia"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:110
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:107
 msgid "&Global"
 msgstr "&Yleinen"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:117
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:114
 msgid "&Right-to-left language support"
 msgstr "O-V-kir&joitussuuntatuki"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:124
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:121
 msgid "Auto &end"
 msgstr "Automaatt&inen loppu"
 
-#: src/frontends/qt4/ui/PrefLanguageUi.ui:131
+#: src/frontends/qt4/ui/PrefLanguageUi.ui:128
 msgid "Mark &foreign languages"
 msgstr "Merkitse &vieraat kielet"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:28
+#: src/frontends/qt4/ui/PrefLatexUi.ui:25
 msgid "Set class options to default on class change"
 msgstr "Aseta asiakirjaluokan asetukset oletusarvoisiksi, kun luokka vaihtuu"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:31
+#: src/frontends/qt4/ui/PrefLatexUi.ui:28
 msgid "&Reset class options when document class changes"
 msgstr "&Palauta luokan oletukset, kun asiakirjaluokka vaihtuu"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:54
+#: src/frontends/qt4/ui/PrefLatexUi.ui:51
 msgid "Default paper si&ze:"
 msgstr "Oletuspaperi&koko:"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:64
+#: src/frontends/qt4/ui/PrefLatexUi.ui:61
 msgid "Te&X encoding:"
 msgstr "Te&X-merkistö:"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:83 src/frontends/qt4/QDocument.cpp:353
+#: src/frontends/qt4/ui/PrefLatexUi.ui:80
+#: src/frontends/qt4/GuiDocument.cpp:353
 msgid "US letter"
 msgstr "US letter"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:88 src/frontends/qt4/QDocument.cpp:354
+#: src/frontends/qt4/ui/PrefLatexUi.ui:85
+#: src/frontends/qt4/GuiDocument.cpp:354
 msgid "US legal"
 msgstr "US legal"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:93 src/frontends/qt4/QDocument.cpp:355
+#: src/frontends/qt4/ui/PrefLatexUi.ui:90
+#: src/frontends/qt4/GuiDocument.cpp:355
 msgid "US executive"
 msgstr "US executive"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:98 src/frontends/qt4/QDocument.cpp:356
+#: src/frontends/qt4/ui/PrefLatexUi.ui:95
+#: src/frontends/qt4/GuiDocument.cpp:356
 msgid "A3"
 msgstr "A3"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:103 src/frontends/qt4/QDocument.cpp:357
+#: src/frontends/qt4/ui/PrefLatexUi.ui:100
+#: src/frontends/qt4/GuiDocument.cpp:357
 msgid "A4"
 msgstr "A4"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:108 src/frontends/qt4/QDocument.cpp:358
+#: src/frontends/qt4/ui/PrefLatexUi.ui:105
+#: src/frontends/qt4/GuiDocument.cpp:358
 msgid "A5"
 msgstr "A5"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:113 src/frontends/qt4/QDocument.cpp:361
+#: src/frontends/qt4/ui/PrefLatexUi.ui:110
+#: src/frontends/qt4/GuiDocument.cpp:361
 msgid "B5"
 msgstr "B5"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:137
+#: src/frontends/qt4/ui/PrefLatexUi.ui:134
 msgid "External Applications"
 msgstr "Erilliset ohjelmat"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:149
+#: src/frontends/qt4/ui/PrefLatexUi.ui:146
 msgid "CheckTeX start options and flags"
 msgstr "CheckTeXin käynnistysasetukset ja valitsimet"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:156
+#: src/frontends/qt4/ui/PrefLatexUi.ui:153
 msgid "Chec&kTeX command:"
 msgstr "&CheckTeX-komento:"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:166
+#: src/frontends/qt4/ui/PrefLatexUi.ui:163
 msgid "BibTeX command and options"
 msgstr "BibTeX-komento ja optiot"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:173
+#: src/frontends/qt4/ui/PrefLatexUi.ui:170
 msgid "&BibTeX command:"
 msgstr "BibTeX-komento:"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:183
+#: src/frontends/qt4/ui/PrefLatexUi.ui:180
 msgid "Index command and options (makeindex, xindy)"
 msgstr "Hakemistokomento ja optiot (makeindex, xindy)"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:190
+#: src/frontends/qt4/ui/PrefLatexUi.ui:187
 msgid "Index command:"
 msgstr "Luo hakemisto -komento:"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:200
+#: src/frontends/qt4/ui/PrefLatexUi.ui:197
 msgid "DVI viewer paper size options:"
 msgstr "DVI-katselimen paperikokovalitsimet:"
 
-#: src/frontends/qt4/ui/PrefLatexUi.ui:210
+#: src/frontends/qt4/ui/PrefLatexUi.ui:207
 msgid "Optional paper size flag (-paper) for some DVI viewers"
 msgstr "Valinnainen paperikokovalitsin (-paper) joitakin DVI-katselimia varten"
 
-#: src/frontends/qt4/ui/PrefPathsUi.ui:28
+#: src/frontends/qt4/ui/PrefPathsUi.ui:25
 msgid "Ly&XServer pipe:"
 msgstr "Ly&X-palvelimen putki:"
 
-#: src/frontends/qt4/ui/PrefPathsUi.ui:38
-#: src/frontends/qt4/ui/PrefPathsUi.ui:51
-#: src/frontends/qt4/ui/PrefPathsUi.ui:61
-#: src/frontends/qt4/ui/PrefPathsUi.ui:77
-#: src/frontends/qt4/ui/PrefPathsUi.ui:123
+#: src/frontends/qt4/ui/PrefPathsUi.ui:35
+#: src/frontends/qt4/ui/PrefPathsUi.ui:48
+#: src/frontends/qt4/ui/PrefPathsUi.ui:58
+#: src/frontends/qt4/ui/PrefPathsUi.ui:74
+#: src/frontends/qt4/ui/PrefPathsUi.ui:120
 msgid "Browse..."
 msgstr "Selaa..."
 
-#: src/frontends/qt4/ui/PrefPathsUi.ui:87
+#: src/frontends/qt4/ui/PrefPathsUi.ui:84
 msgid "&PATH prefix:"
 msgstr "&PATH-etuliite:"
 
-#: src/frontends/qt4/ui/PrefPathsUi.ui:97
+#: src/frontends/qt4/ui/PrefPathsUi.ui:94
 msgid "&Temporary directory:"
 msgstr "Väliaikaishakemistoa:"
 
-#: src/frontends/qt4/ui/PrefPathsUi.ui:107
+#: src/frontends/qt4/ui/PrefPathsUi.ui:104
 msgid "&Backup directory:"
 msgstr "&Varmuuskopiohakemisto:"
 
-#: src/frontends/qt4/ui/PrefPathsUi.ui:133
+#: src/frontends/qt4/ui/PrefPathsUi.ui:130
 msgid "&Working directory:"
 msgstr "&Työhakemisto:"
 
-#: src/frontends/qt4/ui/PrefPathsUi.ui:143
+#: src/frontends/qt4/ui/PrefPathsUi.ui:140
 msgid "&Document templates:"
 msgstr "&Malliasiakirjat:"
 
-#: src/frontends/qt4/ui/PrefPlaintextUi.ui:36
+#: src/frontends/qt4/ui/PrefPlaintextUi.ui:33
 msgid "&roff command:"
 msgstr "&roff-komento:"
 
-#: src/frontends/qt4/ui/PrefPlaintextUi.ui:54 src/LyXRC.cpp:2097
+#: src/frontends/qt4/ui/PrefPlaintextUi.ui:51 src/LyXRC.cpp:2097
 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, "
 "paragraphs are separated by a blank line."
 msgstr ""
-"Vietyjen teksti/LaTeX/SGML tiedostojen maksimirivinpituus. Jos 0,"
-"kappaleet tulostetaan yhtenä rivinä; jos > 0, kappaleiden välillä"
-"on tyhjä rivi."
+"Vietyjen teksti/LaTeX/SGML tiedostojen maksimirivinpituus. Jos 0,kappaleet "
+"tulostetaan yhtenä rivinä; jos > 0, kappaleiden välilläon tyhjä rivi."
 
-#: src/frontends/qt4/ui/PrefPlaintextUi.ui:82
+#: src/frontends/qt4/ui/PrefPlaintextUi.ui:79
 msgid "Output &line length:"
 msgstr "Tuotettava rivi&pituus:"
 
-#: src/frontends/qt4/ui/PrefPlaintextUi.ui:92
+#: src/frontends/qt4/ui/PrefPlaintextUi.ui:89
 msgid "External app for formating tables in plain text output"
 msgstr "Erillinen ohjelma taulukoiden muotoilemista perustekstimuotoon"
 
@@ -2229,8 +2303,9 @@ msgstr "&Jonotuskirjoitin:"
 msgid ""
 "Setting causes printer command to print to file and then use this actually "
 "to print."
-msgstr "Jos tämä on päällä, tulostetaan ensin tiedostoon ja sitten "
-"tulostetaan oikeasti."
+msgstr ""
+"Jos tämä on päällä, tulostetaan ensin tiedostoon ja sitten tulostetaan "
+"oikeasti."
 
 #: src/frontends/qt4/ui/PrefPrinterUi.ui:133
 msgid "Spool &command:"
@@ -2306,8 +2381,8 @@ msgid ""
 "printer command and you have config.<printer> files installed for all your "
 "printers."
 msgstr ""
-"Tavallisesti vain päällä, jos tulostat dvips-komennon avulla ja olet"
-"installoinut config.<tulostin> -tiedostot kaikille tulostimillesi."
+"Tavallisesti vain päällä, jos tulostat dvips-komennon avulla ja "
+"oletinstalloinut config.<tulostin> -tiedostot kaikille tulostimillesi."
 
 #: src/frontends/qt4/ui/PrefPrinterUi.ui:314
 msgid "Adapt output to printer"
@@ -2325,101 +2400,101 @@ msgstr "Oletusarvoisen tulostimen nimi"
 msgid "Printer co&mmand:"
 msgstr "Tu&lostuskomento:"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:69
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:66
 msgid "Sa&ns Serif:"
 msgstr "Sans seri&f:"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:104
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:101
 msgid "T&ypewriter:"
 msgstr "&Kirjoituskone:"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:163
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:160
 msgid "Screen &DPI:"
 msgstr "Näytön &DPI:"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:180
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:177
 msgid "&Zoom %:"
 msgstr "&Suurennos-%:"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:217
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:214
 msgid "Font Sizes"
 msgstr "Kirjasinkoot"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:256
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:253
 msgid "Larger:"
 msgstr "Suurempi:"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:266
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:263
 msgid "Largest:"
 msgstr "Suurin:"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:279
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:276
 msgid "Huge:"
 msgstr "Valtava:"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:289
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:286
 msgid "Hugest:"
 msgstr "Valtavampi:"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:299
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:296
 msgid "Smallest:"
 msgstr "Pienin:"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:309
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:306
 msgid "Smaller:"
 msgstr "Pienempi:"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:319
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:316
 msgid "Small:"
 msgstr "Pieni:"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:329
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:326
 msgid "Normal:"
 msgstr "Tavallinen:"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:339
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:336
 msgid "Tiny:"
 msgstr "Pikkuruinen:"
 
-#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:349
+#: src/frontends/qt4/ui/PrefScreenFontsUi.ui:346
 msgid "Large:"
 msgstr "Suuri:"
 
-#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:36
+#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:33
 msgid "Spellchec&ker executable:"
 msgstr "&Oikolukuohjelman binääri:"
 
-#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:65
+#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:62
 msgid "Override the language used for the spellchecker"
 msgstr "Pakota toinen kieli oikolukuohjelman käyttöön"
 
-#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:72
+#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:69
 msgid "Al&ternative language:"
 msgstr "&Vaihtoehtoinen kieli:"
 
-#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:89
+#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:86
 msgid "Escape cha&racters:"
 msgstr "Poikkeamamerkit:"
 
-#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:115
+#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:112
 msgid "Specify a personal dictionary file other than the default"
 msgstr ""
 "Anna vaihtoehtoinen henkilökohtainen sanasto. Esimerkiksi \".ispell_english"
 "\"."
 
-#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:122
+#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:119
 msgid "Personal &dictionary:"
 msgstr "Oma sa&nasto:"
 
-#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:153
+#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:150
 msgid "Accept words such as \"diskdrive\""
 msgstr "Hyväksi sanat tyyppi \"saippuakauppias\""
 
-#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:156
+#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:153
 msgid "Accept compound &words"
 msgstr "Hyväksy &yhdyssanat"
 
-#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:163
+#: src/frontends/qt4/ui/PrefSpellcheckerUi.ui:160
 msgid "Use input encod&ing"
 msgstr "Käytä syötteen &merkistöä"
 
@@ -2468,14 +2543,14 @@ msgid "Save/restore window position"
 msgstr "Muista ikkunan sijainti"
 
 #: src/frontends/qt4/ui/PrefUi.ui:221
-#: src/frontends/controllers/ControlBox.cpp:83 src/frontends/qt4/QBox.cpp:292
-#: src/frontends/qt4/QBox.cpp:326
+#: src/frontends/controllers/ControlBox.cpp:83
+#: src/frontends/qt4/GuiBox.cpp:292 src/frontends/qt4/GuiBox.cpp:326
 msgid "Width"
 msgstr "Leveys"
 
 #: src/frontends/qt4/ui/PrefUi.ui:247
-#: src/frontends/controllers/ControlBox.cpp:80 src/frontends/qt4/QBox.cpp:283
-#: src/frontends/qt4/QBox.cpp:317
+#: src/frontends/controllers/ControlBox.cpp:80
+#: src/frontends/qt4/GuiBox.cpp:283 src/frontends/qt4/GuiBox.cpp:317
 msgid "Height"
 msgstr "&Korkeus"
 
@@ -2499,476 +2574,471 @@ msgstr "minuutti"
 msgid "&Maximum last files:"
 msgstr "Vii&meisimpiä enintään:"
 
-#: src/frontends/qt4/ui/PrefsUi.ui:76 src/BufferList.cpp:113
-#: src/BufferList.cpp:221 src/LyXFunc.cpp:742
+#: src/frontends/qt4/ui/PrefsUi.ui:73 src/BufferList.cpp:113
+#: src/BufferList.cpp:221 src/LyXFunc.cpp:785
 msgid "&Save"
 msgstr "Ta&llenna"
 
-#: src/frontends/qt4/ui/PrintUi.ui:31
+#: src/frontends/qt4/ui/PrintUi.ui:28
 msgid "Pages"
 msgstr "Sivut"
 
-#: src/frontends/qt4/ui/PrintUi.ui:62
+#: src/frontends/qt4/ui/PrintUi.ui:59
 msgid "Page number to print from"
 msgstr "Sivu, josta tulostus alkaa"
 
-#: src/frontends/qt4/ui/PrintUi.ui:69
+#: src/frontends/qt4/ui/PrintUi.ui:66
 msgid "&To:[[as in 'From page x to page y']]"
 msgstr "Sivu, johon tulostus loppuu"
 
-#: src/frontends/qt4/ui/PrintUi.ui:82
+#: src/frontends/qt4/ui/PrintUi.ui:79
 msgid "Page number to print to"
 msgstr "Sivu, johon asti tulostetaan"
 
-#: src/frontends/qt4/ui/PrintUi.ui:91 src/frontends/qt4/ui/PrintUi.ui:104
+#: src/frontends/qt4/ui/PrintUi.ui:88 src/frontends/qt4/ui/PrintUi.ui:101
 msgid "Print all pages"
 msgstr "Tulosta joka sivu"
 
-#: src/frontends/qt4/ui/PrintUi.ui:94
+#: src/frontends/qt4/ui/PrintUi.ui:91
 msgid "Fro&m"
 msgstr "Sivusta"
 
-#: src/frontends/qt4/ui/PrintUi.ui:107
+#: src/frontends/qt4/ui/PrintUi.ui:104
 msgid "&All"
 msgstr "&Kaikki"
 
-#: src/frontends/qt4/ui/PrintUi.ui:119
+#: src/frontends/qt4/ui/PrintUi.ui:116
 msgid "Print &odd-numbered pages"
 msgstr "Tulosta &parittomat sivut"
 
-#: src/frontends/qt4/ui/PrintUi.ui:129
+#: src/frontends/qt4/ui/PrintUi.ui:126
 msgid "Print &even-numbered pages"
 msgstr "Tulosta p&arilliset sivut"
 
-#: src/frontends/qt4/ui/PrintUi.ui:139
+#: src/frontends/qt4/ui/PrintUi.ui:136
 msgid "Print in reverse order"
 msgstr "Tulosta käänteisessä järjestyksessä"
 
-#: src/frontends/qt4/ui/PrintUi.ui:142
+#: src/frontends/qt4/ui/PrintUi.ui:139
 msgid "Re&verse order"
 msgstr "Käänteinen &järjestys"
 
-#: src/frontends/qt4/ui/PrintUi.ui:152
+#: src/frontends/qt4/ui/PrintUi.ui:149
 msgid "Copies"
 msgstr "Kopiot"
 
-#: src/frontends/qt4/ui/PrintUi.ui:164
+#: src/frontends/qt4/ui/PrintUi.ui:161
 msgid "Number of copies"
 msgstr "Kopioiden määrä"
 
-#: src/frontends/qt4/ui/PrintUi.ui:180
+#: src/frontends/qt4/ui/PrintUi.ui:177
 msgid "Collate copies"
 msgstr "Kopiot sidontajärjestykseen"
 
-#: src/frontends/qt4/ui/PrintUi.ui:183
+#: src/frontends/qt4/ui/PrintUi.ui:180
 msgid "&Collate"
 msgstr "Sidontajärjestykseen"
 
-#: src/frontends/qt4/ui/PrintUi.ui:233
+#: src/frontends/qt4/ui/PrintUi.ui:230
 msgid "&Print"
 msgstr "&Tulosta"
 
-#: src/frontends/qt4/ui/PrintUi.ui:261
+#: src/frontends/qt4/ui/PrintUi.ui:258
 msgid "Print Destination"
 msgstr "Tulosteen kohde"
 
-#: src/frontends/qt4/ui/PrintUi.ui:273
+#: src/frontends/qt4/ui/PrintUi.ui:270
 msgid "Send output to the printer"
 msgstr "Syötä tuloste tulostimelle"
 
-#: src/frontends/qt4/ui/PrintUi.ui:276
+#: src/frontends/qt4/ui/PrintUi.ui:273
 msgid "P&rinter:"
 msgstr "T&ulostin:"
 
-#: src/frontends/qt4/ui/PrintUi.ui:286
+#: src/frontends/qt4/ui/PrintUi.ui:283
 msgid "Send output to the given printer"
 msgstr "Syötä tuloste annetulle tulostimelle"
 
-#: src/frontends/qt4/ui/PrintUi.ui:293 src/frontends/qt4/ui/PrintUi.ui:306
+#: src/frontends/qt4/ui/PrintUi.ui:290 src/frontends/qt4/ui/PrintUi.ui:303
 msgid "Send output to a file"
 msgstr "Syötä tuloste tiedostoon"
 
-#: src/frontends/qt4/ui/RefUi.ui:46
+#: src/frontends/qt4/ui/RefUi.ui:43
 #, fuzzy
 msgid "La&bels in:"
 msgstr "Otsikoitu kappale"
 
-#: src/frontends/qt4/ui/RefUi.ui:166
+#: src/frontends/qt4/ui/RefUi.ui:163
 msgid "Cross-reference as it appears in output"
 msgstr "Viite sellaisena kuin se on tulosteessa"
 
-#: src/frontends/qt4/ui/RefUi.ui:170
+#: src/frontends/qt4/ui/RefUi.ui:167
 msgid "<reference>"
 msgstr "<viite>"
 
-#: src/frontends/qt4/ui/RefUi.ui:175
+#: src/frontends/qt4/ui/RefUi.ui:172
 msgid "(<reference>)"
 msgstr "(<viite>)"
 
-#: src/frontends/qt4/ui/RefUi.ui:180
+#: src/frontends/qt4/ui/RefUi.ui:177
 msgid "<page>"
 msgstr "<sivu>"
 
-#: src/frontends/qt4/ui/RefUi.ui:185
+#: src/frontends/qt4/ui/RefUi.ui:182
 msgid "on page <page>"
 msgstr "sivulla <sivu>"
 
-#: src/frontends/qt4/ui/RefUi.ui:190
+#: src/frontends/qt4/ui/RefUi.ui:187
 msgid "<reference> on page <page>"
 msgstr "<viite> sivulla <sivu>"
 
-#: src/frontends/qt4/ui/RefUi.ui:195
+#: src/frontends/qt4/ui/RefUi.ui:192
 msgid "Formatted reference"
 msgstr "Muotoiltu viittaus"
 
-#: src/frontends/qt4/ui/RefUi.ui:206
+#: src/frontends/qt4/ui/RefUi.ui:203
 msgid "Sort labels in alphabetical order"
 msgstr "Järjestä nimikkeet aakkosjärjestykseen"
 
-#: src/frontends/qt4/ui/RefUi.ui:209
+#: src/frontends/qt4/ui/RefUi.ui:206
 msgid "&Sort"
 msgstr "Järjestä"
 
-#: src/frontends/qt4/ui/RefUi.ui:232
+#: src/frontends/qt4/ui/RefUi.ui:229
 msgid "Update the label list"
 msgstr "Päivitä nimikeluettelo"
 
-#: src/frontends/qt4/ui/RefUi.ui:250
+#: src/frontends/qt4/ui/RefUi.ui:247
 msgid "Jump to the label"
 msgstr "Siirry nimikkeeseen"
 
-#: src/frontends/qt4/ui/RefUi.ui:253 src/frontends/qt4/QRef.cpp:293
+#: src/frontends/qt4/ui/RefUi.ui:250 src/frontends/qt4/GuiRef.cpp:293
 msgid "&Go to Label"
 msgstr "Siirry nimikkeeseen"
 
-#: src/frontends/qt4/ui/SearchUi.ui:31
+#: src/frontends/qt4/ui/SearchUi.ui:28
 msgid "&Find:"
 msgstr "&Etsi:"
 
-#: src/frontends/qt4/ui/SearchUi.ui:71
+#: src/frontends/qt4/ui/SearchUi.ui:68
 msgid "Replace &with:"
 msgstr "K&orvaava teksti:"
 
-#: src/frontends/qt4/ui/SearchUi.ui:108
+#: src/frontends/qt4/ui/SearchUi.ui:105
 msgid "Case &sensitive"
 msgstr "Sa&ma kirjainkoko"
 
-#: src/frontends/qt4/ui/SearchUi.ui:115
+#: src/frontends/qt4/ui/SearchUi.ui:112
 msgid "Match whole words onl&y"
 msgstr "Löydä &vain kokonaiset sanat"
 
-#: src/frontends/qt4/ui/SearchUi.ui:173
+#: src/frontends/qt4/ui/SearchUi.ui:170
 msgid "Find &Next"
 msgstr "Etsi &seuraava"
 
-#: src/frontends/qt4/ui/SearchUi.ui:186
-#: src/frontends/qt4/ui/SpellcheckerUi.ui:51
-#: src/frontends/qt4/ui/ThesaurusUi.ui:111
+#: src/frontends/qt4/ui/SearchUi.ui:183
+#: src/frontends/qt4/ui/SpellcheckerUi.ui:48
+#: src/frontends/qt4/ui/ThesaurusUi.ui:108
 msgid "&Replace"
 msgstr "Ko&rvaa"
 
-#: src/frontends/qt4/ui/SearchUi.ui:196
+#: src/frontends/qt4/ui/SearchUi.ui:193
 msgid "Replace &All"
 msgstr "Korvaa k&aikki"
 
-#: src/frontends/qt4/ui/SearchUi.ui:203
+#: src/frontends/qt4/ui/SearchUi.ui:200
 msgid "Search &backwards"
 msgstr "Etsi e&dellinen"
 
-#: src/frontends/qt4/ui/SendtoUi.ui:45
+#: src/frontends/qt4/ui/SendtoUi.ui:42
 msgid "Process the converted file with this command ($$FName = file name)"
 msgstr ""
 "Käsittele muunnettu tiedosto tällä komennolla ($$FName on tiedoston nimi)"
 
-#: src/frontends/qt4/ui/SendtoUi.ui:104
+#: src/frontends/qt4/ui/SendtoUi.ui:101
 msgid "&Export formats:"
 msgstr "&Vientimuodot:"
 
-#: src/frontends/qt4/ui/SendtoUi.ui:114
+#: src/frontends/qt4/ui/SendtoUi.ui:111
 msgid "&Command:"
 msgstr "&Komento:"
 
-#: src/frontends/qt4/ui/SpellcheckerUi.ui:38
+#: src/frontends/qt4/ui/SpellcheckerUi.ui:35
 msgid "Suggestions:"
 msgstr "Ehdotukset:"
 
-#: src/frontends/qt4/ui/SpellcheckerUi.ui:48
+#: src/frontends/qt4/ui/SpellcheckerUi.ui:45
 msgid "Replace word with current choice"
 msgstr "Haluatko korvata sanan nykyisellä valinnalla"
 
-#: src/frontends/qt4/ui/SpellcheckerUi.ui:58
+#: src/frontends/qt4/ui/SpellcheckerUi.ui:55
 msgid "Add the word to your personal dictionary"
 msgstr "Lisää sana käyttäjän sanastoon"
 
-#: src/frontends/qt4/ui/SpellcheckerUi.ui:68
+#: src/frontends/qt4/ui/SpellcheckerUi.ui:65
 msgid "Ignore this word"
 msgstr "Ohita tämä sana"
 
-#: src/frontends/qt4/ui/SpellcheckerUi.ui:71
+#: src/frontends/qt4/ui/SpellcheckerUi.ui:68
 msgid "&Ignore"
 msgstr "&Ohita"
 
-#: src/frontends/qt4/ui/SpellcheckerUi.ui:78
+#: src/frontends/qt4/ui/SpellcheckerUi.ui:75
 msgid "Ignore this word throughout this session"
 msgstr "Hyväksy sana tässä istunnossa"
 
-#: src/frontends/qt4/ui/SpellcheckerUi.ui:81
+#: src/frontends/qt4/ui/SpellcheckerUi.ui:78
 msgid "I&gnore All"
 msgstr "Ohita k&aikki"
 
-#: src/frontends/qt4/ui/SpellcheckerUi.ui:104
+#: src/frontends/qt4/ui/SpellcheckerUi.ui:101
 msgid "Replacement:"
 msgstr "Korvaava:"
 
-#: src/frontends/qt4/ui/SpellcheckerUi.ui:114
+#: src/frontends/qt4/ui/SpellcheckerUi.ui:111
 msgid "Current word"
 msgstr "Nykyinen sana"
 
-#: src/frontends/qt4/ui/SpellcheckerUi.ui:121
+#: src/frontends/qt4/ui/SpellcheckerUi.ui:118
 msgid "Unknown word:"
 msgstr "Tuntematon sana:"
 
-#: src/frontends/qt4/ui/SpellcheckerUi.ui:142
+#: src/frontends/qt4/ui/SpellcheckerUi.ui:139
 msgid "Replace with selected word"
 msgstr "Korvaa valitulla sanalla"
 
-#: src/frontends/qt4/ui/TabularUi.ui:41
+#: src/frontends/qt4/ui/TabularUi.ui:38
 msgid "&Table Settings"
 msgstr "&Taulukkoasetukset"
 
-#: src/frontends/qt4/ui/TabularUi.ui:53
+#: src/frontends/qt4/ui/TabularUi.ui:50
 msgid "Column Width"
 msgstr "Sarakkeen leveys"
 
-#: src/frontends/qt4/ui/TabularUi.ui:71
+#: src/frontends/qt4/ui/TabularUi.ui:68
 msgid "Fixed width of the column"
 msgstr "Sarakkeen vakioleveys"
 
-#: src/frontends/qt4/ui/TabularUi.ui:81
+#: src/frontends/qt4/ui/TabularUi.ui:78
 msgid "Vertical alignment for fixed width columns"
 msgstr "Vakiolevyisten sarakkeiden pystytasaus"
 
-#: src/frontends/qt4/ui/TabularUi.ui:113
+#: src/frontends/qt4/ui/TabularUi.ui:110
 msgid "&Vertical alignment:"
 msgstr "&Pystytasaus:"
 
-#: src/frontends/qt4/ui/TabularUi.ui:126
+#: src/frontends/qt4/ui/TabularUi.ui:123
 msgid "&Horizontal alignment:"
 msgstr "&Vaakatasaus:"
 
-#: src/frontends/qt4/ui/TabularUi.ui:136
+#: src/frontends/qt4/ui/TabularUi.ui:133
 msgid "Horizontal alignment in column"
 msgstr "Sarakkeiden vaakatasaus"
 
-#: src/frontends/qt4/ui/TabularUi.ui:140 src/frontends/qt4/QParagraph.cpp:87
-#: src/frontends/qt4/QTabular.cpp:747
+#: src/frontends/qt4/ui/TabularUi.ui:137 src/frontends/qt4/GuiParagraph.cpp:87
+#: src/frontends/qt4/GuiTabular.cpp:747
 msgid "Justified"
 msgstr "Tasattu"
 
-#: src/frontends/qt4/ui/TabularUi.ui:182
+#: src/frontends/qt4/ui/TabularUi.ui:179
 msgid "Rotate the table by 90 degrees"
 msgstr "Kierrä taulukkoa 90 astetta"
 
-#: src/frontends/qt4/ui/TabularUi.ui:185
+#: src/frontends/qt4/ui/TabularUi.ui:182
 msgid "&Rotate table 90 degrees"
 msgstr "Kierrä taulukkoa 90 astetta"
 
-#: src/frontends/qt4/ui/TabularUi.ui:192
+#: src/frontends/qt4/ui/TabularUi.ui:189
 msgid "Rotate this cell by 90 degrees"
 msgstr "Kierrä tätä solua 90 astetta"
 
-#: src/frontends/qt4/ui/TabularUi.ui:195
+#: src/frontends/qt4/ui/TabularUi.ui:192
 msgid "Rotate &cell 90 degrees"
 msgstr "Kierrä tätä solua 90 astetta"
 
-#: src/frontends/qt4/ui/TabularUi.ui:202
+#: src/frontends/qt4/ui/TabularUi.ui:199
 msgid "Merge cells"
 msgstr "Yhdistä solut"
 
-#: src/frontends/qt4/ui/TabularUi.ui:205
+#: src/frontends/qt4/ui/TabularUi.ui:202
 msgid "&Multicolumn"
 msgstr "&Yhdistetyt sarakkeet"
 
-#: src/frontends/qt4/ui/TabularUi.ui:212
+#: src/frontends/qt4/ui/TabularUi.ui:209
 msgid "LaTe&X argument:"
 msgstr "LaTe&X-parametri:"
 
-#: src/frontends/qt4/ui/TabularUi.ui:222
+#: src/frontends/qt4/ui/TabularUi.ui:219
 msgid "Custom column format (LaTeX)"
 msgstr "Muu sarakemuoto (LaTeX)"
 
-#: src/frontends/qt4/ui/TabularUi.ui:230
+#: src/frontends/qt4/ui/TabularUi.ui:227
 msgid "&Borders"
 msgstr "&Reunukset"
 
-#: src/frontends/qt4/ui/TabularUi.ui:250
+#: src/frontends/qt4/ui/TabularUi.ui:247
 msgid "All Borders"
 msgstr "Kaikki reunukset"
 
-#: src/frontends/qt4/ui/TabularUi.ui:262
+#: src/frontends/qt4/ui/TabularUi.ui:259
 msgid "Set all borders of the current (selected) cell(s)"
 msgstr "Valittujen solujen kaikki reunukset päälle"
 
-#: src/frontends/qt4/ui/TabularUi.ui:265
+#: src/frontends/qt4/ui/TabularUi.ui:262
 msgid "&Set"
 msgstr "Päälle"
 
-#: src/frontends/qt4/ui/TabularUi.ui:272
+#: src/frontends/qt4/ui/TabularUi.ui:269
 msgid "Unset all borders of the current (selected) cell(s)"
 msgstr "Valittujen solujen kaikki reunukset pois päältä"
 
-#: src/frontends/qt4/ui/TabularUi.ui:275
+#: src/frontends/qt4/ui/TabularUi.ui:272
 msgid "C&lear"
 msgstr "&Tyhjennä"
 
-#: src/frontends/qt4/ui/TabularUi.ui:313
+#: src/frontends/qt4/ui/TabularUi.ui:310
 msgid "Use formal (a.k.a. booktabs) border style (no vertical borders)"
 msgstr "Käytä ns. booktabs -reunustyyli (ei pystyreunuksia)"
 
-#: src/frontends/qt4/ui/TabularUi.ui:316
+#: src/frontends/qt4/ui/TabularUi.ui:313
 msgid "Fo&rmal"
 msgstr "booktabs-tyyli"
 
-#: src/frontends/qt4/ui/TabularUi.ui:326
+#: src/frontends/qt4/ui/TabularUi.ui:323
 msgid "Use default (grid-like) border style"
 msgstr "Käytä oletus (hila) -reunustyyli"
 
-#: src/frontends/qt4/ui/TabularUi.ui:329
+#: src/frontends/qt4/ui/TabularUi.ui:326
 msgid "De&fault"
 msgstr "Oletus"
 
-#: src/frontends/qt4/ui/TabularUi.ui:352
+#: src/frontends/qt4/ui/TabularUi.ui:349
 msgid "Set Borders"
 msgstr "Aseta reunukset"
 
-#: src/frontends/qt4/ui/TabularUi.ui:660
+#: src/frontends/qt4/ui/TabularUi.ui:657
 msgid "Set borders of the current (selected) cell(s)"
 msgstr "Valittujen solujen reunukset päälle"
 
-#: src/frontends/qt4/ui/TabularUi.ui:673
+#: src/frontends/qt4/ui/TabularUi.ui:670
 msgid "Additional Space"
 msgstr "Lisää valkoista"
 
-#: src/frontends/qt4/ui/TabularUi.ui:685
+#: src/frontends/qt4/ui/TabularUi.ui:682
 msgid "T&op of row:"
 msgstr "Rivin yläreuna"
 
-#: src/frontends/qt4/ui/TabularUi.ui:745
+#: src/frontends/qt4/ui/TabularUi.ui:742
 msgid "Botto&m of row:"
 msgstr "Rivin alareuna"
 
-#: src/frontends/qt4/ui/TabularUi.ui:758
+#: src/frontends/qt4/ui/TabularUi.ui:755
 msgid "Bet&ween rows:"
 msgstr "Rivien välillä"
 
-#: src/frontends/qt4/ui/TabularUi.ui:796
+#: src/frontends/qt4/ui/TabularUi.ui:793
 msgid "&Longtable"
 msgstr "Pitkä &taulukko"
 
-#: src/frontends/qt4/ui/TabularUi.ui:824
+#: src/frontends/qt4/ui/TabularUi.ui:821
 msgid "Set a page break on the current row"
 msgstr "Aseta rivinvaihto nykyiselle riville"
 
-#: src/frontends/qt4/ui/TabularUi.ui:827
+#: src/frontends/qt4/ui/TabularUi.ui:824
 msgid "Page &break on current row"
 msgstr "Rivinvaihto nykyisellä &rivillä"
 
-#: src/frontends/qt4/ui/TabularUi.ui:837
+#: src/frontends/qt4/ui/TabularUi.ui:834
 msgid "Settings"
 msgstr "Asetukset"
 
-#: src/frontends/qt4/ui/TabularUi.ui:849
-msgid "Status"
-msgstr "Tila"
-
-#: src/frontends/qt4/ui/TabularUi.ui:856
+#: src/frontends/qt4/ui/TabularUi.ui:853
 msgid "Header:"
 msgstr "Ylätunniste:"
 
-#: src/frontends/qt4/ui/TabularUi.ui:863
+#: src/frontends/qt4/ui/TabularUi.ui:860
 msgid "Footer:"
 msgstr "Alatunniste:"
 
-#: src/frontends/qt4/ui/TabularUi.ui:870
+#: src/frontends/qt4/ui/TabularUi.ui:867
 msgid "First header:"
 msgstr "1. yläotsikko:"
 
-#: src/frontends/qt4/ui/TabularUi.ui:877
+#: src/frontends/qt4/ui/TabularUi.ui:874
 msgid "Last footer:"
 msgstr "Viim. alaotsikko:"
 
-#: src/frontends/qt4/ui/TabularUi.ui:884
+#: src/frontends/qt4/ui/TabularUi.ui:881
 msgid "Contents"
 msgstr "Sisältö"
 
-#: src/frontends/qt4/ui/TabularUi.ui:891
+#: src/frontends/qt4/ui/TabularUi.ui:888
 msgid "Border above"
 msgstr "Reuna yllä"
 
-#: src/frontends/qt4/ui/TabularUi.ui:898
+#: src/frontends/qt4/ui/TabularUi.ui:895
 msgid "Border below"
 msgstr "Reuna alla"
 
-#: src/frontends/qt4/ui/TabularUi.ui:905
+#: src/frontends/qt4/ui/TabularUi.ui:902
 msgid "Repeat this row as header on every (except the first) page"
 msgstr ""
 
-#: src/frontends/qt4/ui/TabularUi.ui:908 src/frontends/qt4/ui/TabularUi.ui:921
-#: src/frontends/qt4/ui/TabularUi.ui:931 src/frontends/qt4/ui/TabularUi.ui:941
-#: src/LyXFunc.cpp:1798
+#: src/frontends/qt4/ui/TabularUi.ui:905 src/frontends/qt4/ui/TabularUi.ui:918
+#: src/frontends/qt4/ui/TabularUi.ui:928 src/frontends/qt4/ui/TabularUi.ui:938
+#: src/LyXFunc.cpp:1896
 msgid "on"
 msgstr "päällä"
 
-#: src/frontends/qt4/ui/TabularUi.ui:915
+#: src/frontends/qt4/ui/TabularUi.ui:912
 msgid "This row is the header of the first page"
 msgstr "Tämä rivi on ensimmäisen sivun yläotsikko"
 
-#: src/frontends/qt4/ui/TabularUi.ui:928
+#: src/frontends/qt4/ui/TabularUi.ui:925
 msgid "Repeat this row as footer on every (except the last) page"
 msgstr "Toista tämä rivi alaotsikkona jokaisella paitsi viimeisellä sivulla"
 
-#: src/frontends/qt4/ui/TabularUi.ui:938
+#: src/frontends/qt4/ui/TabularUi.ui:935
 msgid "This row is the footer of the last page"
 msgstr "Tämä rivi on viimeisen sivun alaotsikko"
 
-#: src/frontends/qt4/ui/TabularUi.ui:951 src/frontends/qt4/ui/TabularUi.ui:958
-#: src/frontends/qt4/ui/TabularUi.ui:965 src/frontends/qt4/ui/TabularUi.ui:972
-#: src/frontends/qt4/ui/TabularUi.ui:979 src/frontends/qt4/ui/TabularUi.ui:986
-#: src/frontends/qt4/ui/TabularUi.ui:993
-#: src/frontends/qt4/ui/TabularUi.ui:1000
+#: src/frontends/qt4/ui/TabularUi.ui:948 src/frontends/qt4/ui/TabularUi.ui:955
+#: src/frontends/qt4/ui/TabularUi.ui:962 src/frontends/qt4/ui/TabularUi.ui:969
+#: src/frontends/qt4/ui/TabularUi.ui:976 src/frontends/qt4/ui/TabularUi.ui:983
+#: src/frontends/qt4/ui/TabularUi.ui:990 src/frontends/qt4/ui/TabularUi.ui:997
 msgid "double"
 msgstr "kaksinkertainen"
 
-#: src/frontends/qt4/ui/TabularUi.ui:1007
+#: src/frontends/qt4/ui/TabularUi.ui:1004
 msgid "Don't output the last footer"
 msgstr "Älä tulosta viimeinen alaotsikko"
 
-#: src/frontends/qt4/ui/TabularUi.ui:1010
-#: src/frontends/qt4/ui/TabularUi.ui:1020
+#: src/frontends/qt4/ui/TabularUi.ui:1007
+#: src/frontends/qt4/ui/TabularUi.ui:1017
 msgid "is empty"
 msgstr "on tyhjä"
 
-#: src/frontends/qt4/ui/TabularUi.ui:1017
+#: src/frontends/qt4/ui/TabularUi.ui:1014
 msgid "Don't output the first header"
 msgstr "Älä tulosta ensimmäinen yläotsikko"
 
-#: src/frontends/qt4/ui/TabularUi.ui:1030
+#: src/frontends/qt4/ui/TabularUi.ui:1027
 msgid "Select for tables that span multiple pages"
 msgstr "Valitse, jos taulukko on usean sivun mittainen"
 
-#: src/frontends/qt4/ui/TabularUi.ui:1033
+#: src/frontends/qt4/ui/TabularUi.ui:1030
 msgid "&Use long table"
 msgstr "Käytä &pitkää taulukkoa"
 
-#: src/frontends/qt4/ui/TabularUi.ui:1052
+#: src/frontends/qt4/ui/TabularUi.ui:1049
 msgid "Current cell:"
 msgstr "Nykyinen solu:"
 
-#: src/frontends/qt4/ui/TabularUi.ui:1076
+#: src/frontends/qt4/ui/TabularUi.ui:1073
 msgid "Current row position"
 msgstr "Nykyisen rivin sijainti"
 
-#: src/frontends/qt4/ui/TabularUi.ui:1100
+#: src/frontends/qt4/ui/TabularUi.ui:1097
 msgid "Current column position"
 msgstr "Nykyisen sarakkeen sijainti"
 
@@ -3056,28 +3126,28 @@ msgstr "Kaksi&palstainen asiakirja"
 msgid "Listing settings"
 msgstr "Listausasetukset"
 
-#: src/frontends/qt4/ui/ThesaurusUi.ui:42
+#: src/frontends/qt4/ui/ThesaurusUi.ui:39
 msgid "Index entry"
 msgstr "Hakemistoviite"
 
-#: src/frontends/qt4/ui/ThesaurusUi.ui:45 src/frontends/qt4/Dialogs.cpp:226
+#: src/frontends/qt4/ui/ThesaurusUi.ui:42 src/frontends/qt4/Dialogs.cpp:233
 msgid "&Keyword:"
 msgstr "&Avainsana:"
 
-#: src/frontends/qt4/ui/ThesaurusUi.ui:55 lib/layouts/moderncv.layout:61
+#: src/frontends/qt4/ui/ThesaurusUi.ui:52 lib/layouts/moderncv.layout:61
 msgid "Entry"
 msgstr "Kohta"
 
-#: src/frontends/qt4/ui/ThesaurusUi.ui:88
-#: src/frontends/qt4/ui/ThesaurusUi.ui:101
+#: src/frontends/qt4/ui/ThesaurusUi.ui:85
+#: src/frontends/qt4/ui/ThesaurusUi.ui:98
 msgid "The selected entry"
 msgstr "Valittu kohta"
 
-#: src/frontends/qt4/ui/ThesaurusUi.ui:91
+#: src/frontends/qt4/ui/ThesaurusUi.ui:88
 msgid "&Selection:"
 msgstr "&Valinta:"
 
-#: src/frontends/qt4/ui/ThesaurusUi.ui:108
+#: src/frontends/qt4/ui/ThesaurusUi.ui:105
 msgid "Replace the entry with the selection"
 msgstr "Korvaa kohta valinnalla"
 
@@ -3112,32 +3182,31 @@ msgid ""
 "Switch between table of contents, list of figures or list of tables, if "
 "available"
 msgstr ""
-"Vaihda välillä sisällys- , kuvien ja taulukoiden luetteloja, mikäli niitä "
-"on"
+"Vaihda välillä sisällys- , kuvien ja taulukoiden luetteloja, mikäli niitä on"
 
 #: src/frontends/qt4/ui/TocUi.ui:181
 msgid "Adjust the depth of the navigation tree"
 msgstr "Viritä oikeaksi hakemistopuun syyvyyttä"
 
-#: src/frontends/qt4/ui/URLUi.ui:31 src/frontends/qt4/ui/URLUi.ui:64
+#: src/frontends/qt4/ui/URLUi.ui:28 src/frontends/qt4/ui/URLUi.ui:61
 #: lib/layouts/scrlttr2.layout:207 lib/layouts/amsdefs.inc:187
 #: src/frontends/qt4/UrlView.cpp:33
 msgid "URL"
 msgstr "URL"
 
-#: src/frontends/qt4/ui/URLUi.ui:34
+#: src/frontends/qt4/ui/URLUi.ui:31
 msgid "&URL:"
 msgstr "&URL:"
 
-#: src/frontends/qt4/ui/URLUi.ui:44 src/frontends/qt4/ui/URLUi.ui:57
+#: src/frontends/qt4/ui/URLUi.ui:41 src/frontends/qt4/ui/URLUi.ui:54
 msgid "Name associated with the URL"
 msgstr "URL:ään liittyvä nimi"
 
-#: src/frontends/qt4/ui/URLUi.ui:79
+#: src/frontends/qt4/ui/URLUi.ui:76
 msgid "Output as a hyperlink ?"
 msgstr "Tuota hyperlinkki?"
 
-#: src/frontends/qt4/ui/URLUi.ui:82
+#: src/frontends/qt4/ui/URLUi.ui:79
 msgid "&Generate hyperlink"
 msgstr "&Luo hyperlinkki"
 
@@ -3169,15 +3238,15 @@ msgstr "Tuetut v
 msgid "DefSkip"
 msgstr "Oletusväli"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:90 src/frontends/qt4/QDocument.cpp:238
+#: src/frontends/qt4/ui/VSpaceUi.ui:90 src/frontends/qt4/GuiDocument.cpp:238
 msgid "SmallSkip"
 msgstr "Pieni väli"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:95 src/frontends/qt4/QDocument.cpp:239
+#: src/frontends/qt4/ui/VSpaceUi.ui:95 src/frontends/qt4/GuiDocument.cpp:239
 msgid "MedSkip"
 msgstr "Keskisuuri väli"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:100 src/frontends/qt4/QDocument.cpp:240
+#: src/frontends/qt4/ui/VSpaceUi.ui:100 src/frontends/qt4/GuiDocument.cpp:240
 msgid "BigSkip"
 msgstr "Suuri väli"
 
@@ -3193,27 +3262,27 @@ msgstr "Koko l
 msgid "Automatic update"
 msgstr "Automaattinen päivitys"
 
-#: src/frontends/qt4/ui/WrapUi.ui:53
+#: src/frontends/qt4/ui/WrapUi.ui:50
 msgid "Default (outer)"
 msgstr "Oletus (ulko)"
 
-#: src/frontends/qt4/ui/WrapUi.ui:68
+#: src/frontends/qt4/ui/WrapUi.ui:65
 msgid "Outer"
 msgstr "Ulko"
 
-#: src/frontends/qt4/ui/WrapUi.ui:103
+#: src/frontends/qt4/ui/WrapUi.ui:100
 msgid "Units of width value"
 msgstr "Leveysarvon yksiköt"
 
-#: src/frontends/qt4/ui/WrapUi.ui:125
+#: src/frontends/qt4/ui/WrapUi.ui:122
 msgid "&Units:"
 msgstr "&Yksiköt:"
 
 #: lib/layouts/IEEEtran.layout:18 lib/layouts/aa.layout:22
 #: lib/layouts/aapaper.layout:34 lib/layouts/aastex.layout:49
 #: lib/layouts/amsart.layout:21 lib/layouts/amsbook.layout:22
-#: lib/layouts/apa.layout:24 lib/layouts/beamer.layout:37
-#: lib/layouts/broadway.layout:183 lib/layouts/chess.layout:27
+#: lib/layouts/apa.layout:24 lib/layouts/beamer.layout:38
+#: lib/layouts/broadway.layout:184 lib/layouts/chess.layout:27
 #: lib/layouts/cl2emult.layout:125 lib/layouts/dtk.layout:31
 #: lib/layouts/egs.layout:18 lib/layouts/elsart.layout:49
 #: lib/layouts/europecv.layout:16 lib/layouts/foils.layout:30
@@ -3229,433 +3298,445 @@ msgstr "&Yksik
 #: lib/layouts/agu_stdclass.inc:22 lib/layouts/db_stdclass.inc:22
 #: lib/layouts/scrclass.inc:15 lib/layouts/stdclass.inc:28
 #: lib/layouts/stdletter.inc:12 lib/layouts/svjour.inc:27
-#: lib/ui/stdtoolbars.inc:55 src/frontends/qt4/BulletsModule.cpp:46
-#: src/insets/InsetRef.cpp:147 src/mathed/InsetMathRef.cpp:187
+#: lib/ui/stdtoolbars.inc:55 src/insets/InsetRef.cpp:147
 msgid "Standard"
 msgstr "Perusteksti"
 
-#: lib/layouts/IEEEtran.layout:48
+#: lib/layouts/IEEEtran.layout:49
 msgid "TheoremTemplate"
 msgstr "Lausemalli"
 
-#: lib/layouts/IEEEtran.layout:64 lib/layouts/beamer.layout:956
-#: lib/layouts/elsart.layout:291 lib/layouts/foils.layout:283
+#: lib/layouts/IEEEtran.layout:65 lib/layouts/beamer.layout:957
+#: lib/layouts/elsart.layout:292 lib/layouts/foils.layout:283
 #: lib/layouts/heb-article.layout:95 lib/layouts/ijmpc.layout:227
-#: lib/layouts/ijmpd.layout:227 lib/layouts/llncs.layout:374
-#: lib/layouts/siamltex.layout:252 lib/layouts/amsdefs.inc:28
-#: lib/layouts/svjour.inc:436
+#: lib/layouts/ijmpd.layout:227 lib/layouts/llncs.layout:375
+#: lib/layouts/siamltex.layout:253 lib/layouts/amsdefs.inc:28
+#: lib/layouts/svjour.inc:437 lib/layouts/theorems-ams.inc:470
 msgid "Proof"
 msgstr "Todistus"
 
-#: lib/layouts/IEEEtran.layout:67 lib/layouts/heb-article.layout:110
+#: lib/layouts/IEEEtran.layout:68 lib/layouts/heb-article.layout:110
 msgid "Proof:"
 msgstr "Todistus:"
 
-#: lib/layouts/IEEEtran.layout:72 lib/layouts/amsart-plain.layout:26
-#: lib/layouts/amsart-seq.layout:137 lib/layouts/beamer.layout:962
-#: lib/layouts/elsart.layout:262 lib/layouts/foils.layout:223
+#: lib/layouts/IEEEtran.layout:73 lib/layouts/amsart-plain.layout:26
+#: lib/layouts/amsart-seq.layout:137 lib/layouts/beamer.layout:963
+#: lib/layouts/elsart.layout:263 lib/layouts/foils.layout:223
 #: lib/layouts/heb-article.layout:18 lib/layouts/ijmpc.layout:205
-#: lib/layouts/ijmpd.layout:208 lib/layouts/llncs.layout:415
-#: lib/layouts/siamltex.layout:202 lib/layouts/amsmaths-plain.inc:33
+#: lib/layouts/ijmpd.layout:208 lib/layouts/llncs.layout:416
+#: lib/layouts/siamltex.layout:203 lib/layouts/amsmaths-plain.inc:33
 #: lib/layouts/amsmaths-seq.inc:32 lib/layouts/amsmaths.inc:62
-#: lib/layouts/svjour.inc:478
+#: lib/layouts/svjour.inc:479 lib/layouts/theorems-ams.inc:4
+#: lib/layouts/theorems.inc:20
 msgid "Theorem"
 msgstr "Lause"
 
-#: lib/layouts/IEEEtran.layout:75
+#: lib/layouts/IEEEtran.layout:76
 msgid "Theorem #:"
 msgstr "Lause #:"
 
-#: lib/layouts/IEEEtran.layout:82 lib/layouts/amsart-plain.layout:37
-#: lib/layouts/amsart-seq.layout:149 lib/layouts/elsart.layout:318
+#: lib/layouts/IEEEtran.layout:83 lib/layouts/amsart-plain.layout:37
+#: lib/layouts/amsart-seq.layout:149 lib/layouts/elsart.layout:319
 #: lib/layouts/foils.layout:248 lib/layouts/heb-article.layout:45
 #: lib/layouts/ijmpc.layout:257 lib/layouts/ijmpd.layout:262
-#: lib/layouts/llncs.layout:354 lib/layouts/siamltex.layout:217
+#: lib/layouts/llncs.layout:355 lib/layouts/siamltex.layout:218
 #: lib/layouts/amsmaths-plain.inc:53 lib/layouts/amsmaths-seq.inc:48
-#: lib/layouts/amsmaths.inc:125 lib/layouts/svjour.inc:415
+#: lib/layouts/amsmaths.inc:125 lib/layouts/svjour.inc:416
+#: lib/layouts/theorems-ams.inc:67 lib/layouts/theorems.inc:59
 msgid "Lemma"
 msgstr "Lemma"
 
-#: lib/layouts/IEEEtran.layout:85
+#: lib/layouts/IEEEtran.layout:86
 msgid "Lemma #:"
 msgstr "Lemma #:"
 
-#: lib/layouts/IEEEtran.layout:92 lib/layouts/amsart-plain.layout:31
-#: lib/layouts/amsart-seq.layout:143 lib/layouts/beamer.layout:893
-#: lib/layouts/elsart.layout:325 lib/layouts/foils.layout:255
+#: lib/layouts/IEEEtran.layout:93 lib/layouts/amsart-plain.layout:31
+#: lib/layouts/amsart-seq.layout:143 lib/layouts/beamer.layout:894
+#: lib/layouts/elsart.layout:326 lib/layouts/foils.layout:255
 #: lib/layouts/heb-article.layout:55 lib/layouts/ijmpc.layout:247
-#: lib/layouts/ijmpd.layout:248 lib/layouts/llncs.layout:319
-#: lib/layouts/siamltex.layout:224 lib/layouts/amsmaths-plain.inc:43
+#: lib/layouts/ijmpd.layout:248 lib/layouts/llncs.layout:320
+#: lib/layouts/siamltex.layout:225 lib/layouts/amsmaths-plain.inc:43
 #: lib/layouts/amsmaths-seq.inc:40 lib/layouts/amsmaths.inc:103
-#: lib/layouts/svjour.inc:376
+#: lib/layouts/svjour.inc:377 lib/layouts/theorems-ams.inc:45
+#: lib/layouts/theorems.inc:50
 msgid "Corollary"
 msgstr "Seurauslause"
 
-#: lib/layouts/IEEEtran.layout:95
+#: lib/layouts/IEEEtran.layout:96
 msgid "Corollary #:"
 msgstr "Seurauslause #:"
 
-#: lib/layouts/IEEEtran.layout:102 lib/layouts/amsart-plain.layout:43
-#: lib/layouts/amsart-seq.layout:155 lib/layouts/elsart.layout:332
+#: lib/layouts/IEEEtran.layout:103 lib/layouts/amsart-plain.layout:43
+#: lib/layouts/amsart-seq.layout:155 lib/layouts/elsart.layout:333
 #: lib/layouts/foils.layout:262 lib/layouts/ijmpc.layout:267
-#: lib/layouts/ijmpd.layout:273 lib/layouts/llncs.layout:388
-#: lib/layouts/siamltex.layout:231 lib/layouts/amsmaths-plain.inc:63
+#: lib/layouts/ijmpd.layout:273 lib/layouts/llncs.layout:389
+#: lib/layouts/siamltex.layout:232 lib/layouts/amsmaths-plain.inc:63
 #: lib/layouts/amsmaths-seq.inc:56 lib/layouts/amsmaths.inc:147
-#: lib/layouts/svjour.inc:450
+#: lib/layouts/svjour.inc:451 lib/layouts/theorems-ams.inc:89
+#: lib/layouts/theorems.inc:68
 msgid "Proposition"
 msgstr "Väittämä"
 
-#: lib/layouts/IEEEtran.layout:105
+#: lib/layouts/IEEEtran.layout:106
 msgid "Proposition #:"
 msgstr "Väittämä #:"
 
-#: lib/layouts/IEEEtran.layout:112 lib/layouts/amsart-plain.layout:49
-#: lib/layouts/amsart-seq.layout:161 lib/layouts/elsart.layout:367
+#: lib/layouts/IEEEtran.layout:113 lib/layouts/amsart-plain.layout:49
+#: lib/layouts/amsart-seq.layout:161 lib/layouts/elsart.layout:368
 #: lib/layouts/ijmpc.layout:307 lib/layouts/ijmpd.layout:317
-#: lib/layouts/llncs.layout:312 lib/layouts/amsmaths-plain.inc:73
+#: lib/layouts/llncs.layout:313 lib/layouts/amsmaths-plain.inc:73
 #: lib/layouts/amsmaths-seq.inc:64 lib/layouts/amsmaths.inc:169
-#: lib/layouts/svjour.inc:369
+#: lib/layouts/svjour.inc:370 lib/layouts/theorems-ams.inc:111
+#: lib/layouts/theorems.inc:77
 msgid "Conjecture"
 msgstr "Otaksuma"
 
-#: lib/layouts/IEEEtran.layout:115
+#: lib/layouts/IEEEtran.layout:116
 msgid "Conjecture #:"
 msgstr "Otaksuma #:"
 
-#: lib/layouts/IEEEtran.layout:122 lib/layouts/amsart-plain.layout:55
-#: lib/layouts/amsart-seq.layout:167 lib/layouts/elsart.layout:339
+#: lib/layouts/IEEEtran.layout:123 lib/layouts/amsart-plain.layout:55
+#: lib/layouts/amsart-seq.layout:167 lib/layouts/elsart.layout:340
 #: lib/layouts/amsmaths-plain.inc:83 lib/layouts/amsmaths-seq.inc:72
-#: lib/layouts/amsmaths.inc:191
+#: lib/layouts/amsmaths.inc:191 lib/layouts/theorems-ams.inc:133
 msgid "Criterion"
 msgstr "Kriteeri"
 
-#: lib/layouts/IEEEtran.layout:125
+#: lib/layouts/IEEEtran.layout:126
 msgid "Criterion #:"
 msgstr "Kriteeri #:"
 
-#: lib/layouts/IEEEtran.layout:132 lib/layouts/amsart-plain.layout:67
-#: lib/layouts/amsart-seq.layout:179 lib/layouts/beamer.layout:950
+#: lib/layouts/IEEEtran.layout:133 lib/layouts/amsart-plain.layout:67
+#: lib/layouts/amsart-seq.layout:179 lib/layouts/beamer.layout:951
 #: lib/layouts/amsmaths-plain.inc:103 lib/layouts/amsmaths-seq.inc:88
-#: lib/layouts/amsmaths.inc:213
+#: lib/layouts/amsmaths.inc:213 lib/layouts/theorems-ams.inc:155
+#: lib/layouts/theorems.inc:86
 msgid "Fact"
 msgstr "Fakta"
 
-#: lib/layouts/IEEEtran.layout:135
+#: lib/layouts/IEEEtran.layout:136
 msgid "Fact #:"
 msgstr "Fakta #:"
 
-#: lib/layouts/IEEEtran.layout:142 lib/layouts/amsart-plain.layout:73
+#: lib/layouts/IEEEtran.layout:143 lib/layouts/amsart-plain.layout:73
 #: lib/layouts/amsart-seq.layout:185 lib/layouts/amsmaths-plain.inc:113
 #: lib/layouts/amsmaths-seq.inc:96 lib/layouts/amsmaths.inc:235
+#: lib/layouts/theorems-ams.inc:177
 msgid "Axiom"
 msgstr "Aksiooma"
 
-#: lib/layouts/IEEEtran.layout:145
+#: lib/layouts/IEEEtran.layout:146
 msgid "Axiom #:"
 msgstr "Aksiooma #:"
 
-#: lib/layouts/IEEEtran.layout:152 lib/layouts/amsart-plain.layout:79
-#: lib/layouts/amsart-seq.layout:191 lib/layouts/beamer.layout:920
-#: lib/layouts/elsart.layout:353 lib/layouts/foils.layout:269
+#: lib/layouts/IEEEtran.layout:153 lib/layouts/amsart-plain.layout:79
+#: lib/layouts/amsart-seq.layout:191 lib/layouts/beamer.layout:921
+#: lib/layouts/elsart.layout:354 lib/layouts/foils.layout:269
 #: lib/layouts/heb-article.layout:75 lib/layouts/ijmpc.layout:140
-#: lib/layouts/ijmpd.layout:137 lib/layouts/llncs.layout:333
-#: lib/layouts/siamltex.layout:238 lib/layouts/amsmaths-plain.inc:123
+#: lib/layouts/ijmpd.layout:137 lib/layouts/llncs.layout:334
+#: lib/layouts/siamltex.layout:239 lib/layouts/amsmaths-plain.inc:123
 #: lib/layouts/amsmaths-seq.inc:104 lib/layouts/amsmaths.inc:246
-#: lib/layouts/svjour.inc:390
+#: lib/layouts/svjour.inc:391 lib/layouts/theorems-ams.inc:188
+#: lib/layouts/theorems.inc:95
 msgid "Definition"
 msgstr "Määritelmä"
 
-#: lib/layouts/IEEEtran.layout:155
+#: lib/layouts/IEEEtran.layout:156
 msgid "Definition #:"
 msgstr "Määritelmä #"
 
-#: lib/layouts/IEEEtran.layout:162 lib/layouts/amsart-plain.layout:85
-#: lib/layouts/amsart-seq.layout:197 lib/layouts/beamer.layout:932
-#: lib/layouts/elsart.layout:374 lib/layouts/ijmpc.layout:175
-#: lib/layouts/ijmpd.layout:172 lib/layouts/llncs.layout:340
+#: lib/layouts/IEEEtran.layout:163 lib/layouts/amsart-plain.layout:85
+#: lib/layouts/amsart-seq.layout:197 lib/layouts/beamer.layout:933
+#: lib/layouts/elsart.layout:375 lib/layouts/ijmpc.layout:175
+#: lib/layouts/ijmpd.layout:172 lib/layouts/llncs.layout:341
 #: lib/layouts/amsmaths-plain.inc:133 lib/layouts/amsmaths-seq.inc:112
-#: lib/layouts/amsmaths.inc:276 lib/layouts/svjour.inc:397
-#: src/frontends/qt4/QDocument.cpp:489
+#: lib/layouts/amsmaths.inc:276 lib/layouts/svjour.inc:398
+#: lib/layouts/theorems-ams.inc:218 lib/layouts/theorems.inc:112
+#: src/frontends/qt4/GuiDocument.cpp:489
 msgid "Example"
 msgstr "Esimerkki"
 
-#: lib/layouts/IEEEtran.layout:165
+#: lib/layouts/IEEEtran.layout:166
 msgid "Example #:"
 msgstr "Esimerkki #:"
 
-#: lib/layouts/IEEEtran.layout:172 lib/layouts/amsart-plain.layout:91
+#: lib/layouts/IEEEtran.layout:173 lib/layouts/amsart-plain.layout:91
 #: lib/layouts/amsart-seq.layout:203 lib/layouts/amsmaths-plain.inc:143
 #: lib/layouts/amsmaths-seq.inc:120 lib/layouts/amsmaths.inc:298
+#: lib/layouts/theorems-ams.inc:240
 msgid "Condition"
 msgstr "Ehto"
 
-#: lib/layouts/IEEEtran.layout:175
+#: lib/layouts/IEEEtran.layout:176
 msgid "Condition #:"
 msgstr "Ehto #:"
 
-#: lib/layouts/IEEEtran.layout:182 lib/layouts/amsart-plain.layout:97
-#: lib/layouts/amsart-seq.layout:209 lib/layouts/elsart.layout:381
-#: lib/layouts/llncs.layout:367 lib/layouts/amsmaths-plain.inc:153
+#: lib/layouts/IEEEtran.layout:183 lib/layouts/amsart-plain.layout:97
+#: lib/layouts/amsart-seq.layout:209 lib/layouts/elsart.layout:382
+#: lib/layouts/llncs.layout:368 lib/layouts/amsmaths-plain.inc:153
 #: lib/layouts/amsmaths-seq.inc:128 lib/layouts/amsmaths.inc:320
-#: lib/layouts/svjour.inc:429
+#: lib/layouts/svjour.inc:430 lib/layouts/theorems-ams.inc:262
 msgid "Problem"
 msgstr "Ongelma"
 
-#: lib/layouts/IEEEtran.layout:185
+#: lib/layouts/IEEEtran.layout:186
 msgid "Problem #:"
 msgstr "Ongelma #:"
 
-#: lib/layouts/IEEEtran.layout:192 lib/layouts/amsart-plain.layout:103
-#: lib/layouts/amsart-seq.layout:215 lib/layouts/llncs.layout:347
+#: lib/layouts/IEEEtran.layout:193 lib/layouts/amsart-plain.layout:103
+#: lib/layouts/amsart-seq.layout:215 lib/layouts/llncs.layout:348
 #: lib/layouts/amsmaths-plain.inc:163 lib/layouts/amsmaths-seq.inc:136
-#: lib/layouts/amsmaths.inc:342 lib/layouts/svjour.inc:404
+#: lib/layouts/amsmaths.inc:342 lib/layouts/svjour.inc:405
+#: lib/layouts/theorems-ams.inc:284 lib/layouts/theorems.inc:122
 msgid "Exercise"
 msgstr "Harjoitus"
 
-#: lib/layouts/IEEEtran.layout:195
+#: lib/layouts/IEEEtran.layout:196
 msgid "Exercise #:"
 msgstr "Harjoitus #:"
 
-#: lib/layouts/IEEEtran.layout:202 lib/layouts/amsart-plain.layout:109
-#: lib/layouts/amsart-seq.layout:221 lib/layouts/elsart.layout:388
+#: lib/layouts/IEEEtran.layout:203 lib/layouts/amsart-plain.layout:109
+#: lib/layouts/amsart-seq.layout:221 lib/layouts/elsart.layout:389
 #: lib/layouts/ijmpc.layout:185 lib/layouts/ijmpd.layout:183
-#: lib/layouts/llncs.layout:401 lib/layouts/amsmaths-plain.inc:173
+#: lib/layouts/llncs.layout:402 lib/layouts/amsmaths-plain.inc:173
 #: lib/layouts/amsmaths-seq.inc:144 lib/layouts/amsmaths.inc:365
-#: lib/layouts/svjour.inc:464
+#: lib/layouts/svjour.inc:465 lib/layouts/theorems-ams.inc:307
+#: lib/layouts/theorems.inc:132
 msgid "Remark"
 msgstr "Huomautus"
 
-#: lib/layouts/IEEEtran.layout:205
+#: lib/layouts/IEEEtran.layout:206
 msgid "Remark #:"
 msgstr "Huomautus #:"
 
-#: lib/layouts/IEEEtran.layout:212 lib/layouts/amsart-plain.layout:115
-#: lib/layouts/amsart-seq.layout:227 lib/layouts/elsart.layout:402
+#: lib/layouts/IEEEtran.layout:213 lib/layouts/amsart-plain.layout:115
+#: lib/layouts/amsart-seq.layout:227 lib/layouts/elsart.layout:403
 #: lib/layouts/heb-article.layout:65 lib/layouts/ijmpc.layout:297
-#: lib/layouts/ijmpd.layout:306 lib/layouts/llncs.layout:305
+#: lib/layouts/ijmpd.layout:306 lib/layouts/llncs.layout:306
 #: lib/layouts/amsmaths-plain.inc:183 lib/layouts/amsmaths-seq.inc:152
-#: lib/layouts/amsmaths.inc:396 lib/layouts/svjour.inc:348
+#: lib/layouts/amsmaths.inc:396 lib/layouts/svjour.inc:349
+#: lib/layouts/theorems-ams.inc:338 lib/layouts/theorems.inc:150
 msgid "Claim"
 msgstr "Väite"
 
-#: lib/layouts/IEEEtran.layout:215
+#: lib/layouts/IEEEtran.layout:216
 msgid "Claim #:"
 msgstr "Väite #:"
 
-#: lib/layouts/IEEEtran.layout:222 lib/layouts/amsart-plain.layout:121
+#: lib/layouts/IEEEtran.layout:223 lib/layouts/amsart-plain.layout:121
 #: lib/layouts/amsart-seq.layout:233 lib/layouts/apa.layout:213
-#: lib/layouts/elsart.layout:395 lib/layouts/iopart.layout:91
-#: lib/layouts/llncs.layout:360 lib/layouts/powerdot.layout:195
-#: lib/layouts/slides.layout:167 lib/layouts/amsmaths-plain.inc:193
+#: lib/layouts/elsart.layout:396 lib/layouts/iopart.layout:91
+#: lib/layouts/llncs.layout:361 lib/layouts/powerdot.layout:195
+#: lib/layouts/slides.layout:168 lib/layouts/amsmaths-plain.inc:193
 #: lib/layouts/amsmaths-seq.inc:160 lib/layouts/amsmaths.inc:418
-#: lib/layouts/svjour.inc:422 src/insets/InsetNote.cpp:64
+#: lib/layouts/svjour.inc:423 lib/layouts/theorems-ams.inc:360
+#: src/insets/InsetNote.cpp:66
 msgid "Note"
 msgstr "Muistiinpano"
 
-#: lib/layouts/IEEEtran.layout:225
+#: lib/layouts/IEEEtran.layout:226
 msgid "Note #:"
 msgstr "Muistiinpano #:"
 
-#: lib/layouts/IEEEtran.layout:232 lib/layouts/amsart-plain.layout:127
+#: lib/layouts/IEEEtran.layout:233 lib/layouts/amsart-plain.layout:127
 #: lib/layouts/amsart-seq.layout:239 lib/layouts/ijmpc.layout:195
 #: lib/layouts/ijmpd.layout:194 lib/layouts/amsmaths-plain.inc:203
 #: lib/layouts/amsmaths-seq.inc:168 lib/layouts/amsmaths.inc:440
+#: lib/layouts/theorems-ams.inc:382
 msgid "Notation"
 msgstr "Merkintätapa"
 
-#: lib/layouts/IEEEtran.layout:235
+#: lib/layouts/IEEEtran.layout:236
 msgid "Notation #:"
 msgstr "Merkintätapa #:"
 
-#: lib/layouts/IEEEtran.layout:242 lib/layouts/amsart-plain.layout:145
-#: lib/layouts/amsart-seq.layout:257 lib/layouts/elsart.layout:417
-#: lib/layouts/llncs.layout:284 lib/layouts/amsmaths-plain.inc:233
+#: lib/layouts/IEEEtran.layout:243 lib/layouts/amsart-plain.layout:145
+#: lib/layouts/amsart-seq.layout:257 lib/layouts/elsart.layout:418
+#: lib/layouts/llncs.layout:285 lib/layouts/amsmaths-plain.inc:233
 #: lib/layouts/amsmaths-seq.inc:192 lib/layouts/amsmaths.inc:495
+#: lib/layouts/theorems-ams.inc:437 lib/layouts/theorems.inc:159
 msgid "Case"
 msgstr "Tapaus"
 
-#: lib/layouts/IEEEtran.layout:245
+#: lib/layouts/IEEEtran.layout:246
 msgid "Case #:"
 msgstr "Tapaus #:"
 
-#: lib/layouts/IEEEtran.layout:270 lib/layouts/aa.layout:37
-#: lib/layouts/aa.layout:216 lib/layouts/aapaper.layout:64
-#: lib/layouts/aapaper.layout:129 lib/layouts/aastex.layout:64
-#: lib/layouts/aastex.layout:166 lib/layouts/amsart.layout:61
-#: lib/layouts/amsbook.layout:47 lib/layouts/amsbook.layout:95
-#: lib/layouts/beamer.layout:144 lib/layouts/egs.layout:30
+#: lib/layouts/IEEEtran.layout:271 lib/layouts/aa.layout:37
+#: lib/layouts/aa.layout:217 lib/layouts/aapaper.layout:64
+#: lib/layouts/aapaper.layout:130 lib/layouts/aastex.layout:64
+#: lib/layouts/aastex.layout:167 lib/layouts/amsart.layout:62
+#: lib/layouts/amsbook.layout:48 lib/layouts/amsbook.layout:96
+#: lib/layouts/beamer.layout:145 lib/layouts/egs.layout:30
 #: lib/layouts/europecv.layout:28 lib/layouts/ijmpc.layout:99
 #: lib/layouts/ijmpd.layout:95 lib/layouts/isprs.layout:157
-#: lib/layouts/kluwer.layout:57 lib/layouts/latex8.layout:41
-#: lib/layouts/llncs.layout:44 lib/layouts/ltugboat.layout:45
-#: lib/layouts/manpage.layout:41 lib/layouts/memoir.layout:51
-#: lib/layouts/moderncv.layout:29 lib/layouts/paper.layout:44
+#: lib/layouts/kluwer.layout:58 lib/layouts/latex8.layout:41
+#: lib/layouts/llncs.layout:45 lib/layouts/ltugboat.layout:45
+#: lib/layouts/manpage.layout:41 lib/layouts/memoir.layout:52
+#: lib/layouts/moderncv.layout:29 lib/layouts/paper.layout:45
 #: lib/layouts/powerdot.layout:212 lib/layouts/revtex.layout:38
-#: lib/layouts/revtex4.layout:44 lib/layouts/siamltex.layout:41
+#: lib/layouts/revtex4.layout:45 lib/layouts/siamltex.layout:42
 #: lib/layouts/simplecv.layout:27 lib/layouts/spie.layout:19
 #: lib/layouts/agu_stdsections.inc:30 lib/layouts/aguplus.inc:27
-#: lib/layouts/db_stdsections.inc:28 lib/layouts/numarticle.inc:13
-#: lib/layouts/numreport.inc:21 lib/layouts/numrevtex.inc:6
-#: lib/layouts/scrclass.inc:61 lib/layouts/stdsections.inc:51
-#: lib/layouts/svjour.inc:52
+#: lib/layouts/db_stdsections.inc:28 lib/layouts/numrevtex.inc:6
+#: lib/layouts/scrclass.inc:62 lib/layouts/stdsections.inc:60
+#: lib/layouts/svjour.inc:53
 msgid "Section"
 msgstr "Kappale"
 
-#: lib/layouts/IEEEtran.layout:280 lib/layouts/aa.layout:40
-#: lib/layouts/aa.layout:226 lib/layouts/aapaper.layout:67
-#: lib/layouts/aapaper.layout:138 lib/layouts/aastex.layout:67
-#: lib/layouts/aastex.layout:179 lib/layouts/amsart.layout:72
-#: lib/layouts/amsbook.layout:58 lib/layouts/beamer.layout:185
+#: lib/layouts/IEEEtran.layout:281 lib/layouts/aa.layout:40
+#: lib/layouts/aa.layout:227 lib/layouts/aapaper.layout:67
+#: lib/layouts/aapaper.layout:139 lib/layouts/aastex.layout:67
+#: lib/layouts/aastex.layout:180 lib/layouts/amsart.layout:73
+#: lib/layouts/amsbook.layout:59 lib/layouts/beamer.layout:186
 #: lib/layouts/egs.layout:51 lib/layouts/ijmpc.layout:115
 #: lib/layouts/ijmpd.layout:111 lib/layouts/isprs.layout:168
-#: lib/layouts/kluwer.layout:66 lib/layouts/latex8.layout:49
-#: lib/layouts/llncs.layout:52 lib/layouts/ltugboat.layout:65
-#: lib/layouts/memoir.layout:56 lib/layouts/moderncv.layout:49
-#: lib/layouts/paper.layout:53 lib/layouts/revtex.layout:49
-#: lib/layouts/revtex4.layout:55 lib/layouts/siamltex.layout:59
+#: lib/layouts/kluwer.layout:67 lib/layouts/latex8.layout:49
+#: lib/layouts/llncs.layout:53 lib/layouts/ltugboat.layout:65
+#: lib/layouts/memoir.layout:57 lib/layouts/moderncv.layout:49
+#: lib/layouts/paper.layout:54 lib/layouts/revtex.layout:49
+#: lib/layouts/revtex4.layout:56 lib/layouts/siamltex.layout:60
 #: lib/layouts/simplecv.layout:48 lib/layouts/agu_stdsections.inc:40
 #: lib/layouts/aguplus.inc:41 lib/layouts/db_stdsections.inc:36
-#: lib/layouts/numarticle.inc:22 lib/layouts/numrevtex.inc:15
-#: lib/layouts/scrclass.inc:68 lib/layouts/stdsections.inc:72
-#: lib/layouts/svjour.inc:61
+#: lib/layouts/numrevtex.inc:15 lib/layouts/scrclass.inc:69
+#: lib/layouts/stdsections.inc:84 lib/layouts/svjour.inc:62
 msgid "Subsection"
 msgstr "Alikappale"
 
-#: lib/layouts/IEEEtran.layout:288 lib/layouts/aa.layout:43
-#: lib/layouts/aa.layout:238 lib/layouts/aapaper.layout:70
-#: lib/layouts/aapaper.layout:149 lib/layouts/aastex.layout:70
-#: lib/layouts/aastex.layout:192 lib/layouts/amsart.layout:80
-#: lib/layouts/amsbook.layout:66 lib/layouts/ijmpc.layout:124
+#: lib/layouts/IEEEtran.layout:289 lib/layouts/aa.layout:43
+#: lib/layouts/aa.layout:239 lib/layouts/aapaper.layout:70
+#: lib/layouts/aapaper.layout:150 lib/layouts/aastex.layout:70
+#: lib/layouts/aastex.layout:193 lib/layouts/amsart.layout:81
+#: lib/layouts/amsbook.layout:67 lib/layouts/ijmpc.layout:124
 #: lib/layouts/ijmpd.layout:120 lib/layouts/isprs.layout:177
-#: lib/layouts/kluwer.layout:75 lib/layouts/llncs.layout:60
-#: lib/layouts/ltugboat.layout:85 lib/layouts/memoir.layout:61
-#: lib/layouts/paper.layout:62 lib/layouts/revtex.layout:57
-#: lib/layouts/revtex4.layout:63 lib/layouts/siamltex.layout:65
+#: lib/layouts/kluwer.layout:76 lib/layouts/llncs.layout:61
+#: lib/layouts/ltugboat.layout:85 lib/layouts/memoir.layout:62
+#: lib/layouts/paper.layout:63 lib/layouts/revtex.layout:57
+#: lib/layouts/revtex4.layout:64 lib/layouts/siamltex.layout:66
 #: lib/layouts/agu_stdsections.inc:50 lib/layouts/db_stdsections.inc:44
-#: lib/layouts/numarticle.inc:31 lib/layouts/numrevtex.inc:24
-#: lib/layouts/scrclass.inc:75 lib/layouts/stdsections.inc:85
-#: lib/layouts/svjour.inc:70
+#: lib/layouts/numrevtex.inc:24 lib/layouts/scrclass.inc:76
+#: lib/layouts/stdsections.inc:99 lib/layouts/svjour.inc:71
 msgid "Subsubsection"
 msgstr "Alialikappale"
 
-#: lib/layouts/IEEEtran.layout:296 lib/layouts/beamer.layout:176
+#: lib/layouts/IEEEtran.layout:297 lib/layouts/beamer.layout:177
 #: lib/layouts/egs.layout:587 lib/layouts/ijmpc.layout:107
 #: lib/layouts/ijmpd.layout:103 lib/layouts/isprs.layout:186
-#: lib/layouts/siamltex.layout:81 lib/layouts/spie.layout:29
+#: lib/layouts/siamltex.layout:82 lib/layouts/spie.layout:29
 #: lib/layouts/aguplus.inc:34 lib/layouts/db_stdstarsections.inc:36
-#: lib/layouts/stdstarsections.inc:30
+#: lib/layouts/stdstarsections.inc:32
 msgid "Section*"
 msgstr "Kappale*"
 
-#: lib/layouts/IEEEtran.layout:306 lib/layouts/beamer.layout:218
+#: lib/layouts/IEEEtran.layout:307 lib/layouts/beamer.layout:219
 #: lib/layouts/egs.layout:607 lib/layouts/isprs.layout:197
-#: lib/layouts/siamltex.layout:88 lib/layouts/aguplus.inc:48
-#: lib/layouts/db_stdstarsections.inc:48 lib/layouts/stdstarsections.inc:39
+#: lib/layouts/siamltex.layout:89 lib/layouts/aguplus.inc:48
+#: lib/layouts/db_stdstarsections.inc:48 lib/layouts/stdstarsections.inc:42
 msgid "Subsection*"
 msgstr "Alikappale*"
 
-#: lib/layouts/IEEEtran.layout:314 lib/layouts/isprs.layout:206
-#: lib/layouts/siamltex.layout:95 lib/layouts/db_stdstarsections.inc:60
-#: lib/layouts/stdstarsections.inc:48
+#: lib/layouts/IEEEtran.layout:315 lib/layouts/isprs.layout:206
+#: lib/layouts/siamltex.layout:96 lib/layouts/db_stdstarsections.inc:60
+#: lib/layouts/stdstarsections.inc:52
 msgid "Subsubsection*"
 msgstr "Alialikappale*"
 
-#: lib/layouts/IEEEtran.layout:329 lib/layouts/aa.layout:80
-#: lib/layouts/aa.layout:284 lib/layouts/aa.layout:300
-#: lib/layouts/aapaper.layout:97 lib/layouts/aapaper.layout:192
-#: lib/layouts/aastex.layout:106 lib/layouts/aastex.layout:244
+#: lib/layouts/IEEEtran.layout:330 lib/layouts/aa.layout:80
+#: lib/layouts/aa.layout:285 lib/layouts/aa.layout:301
+#: lib/layouts/aapaper.layout:97 lib/layouts/aapaper.layout:193
+#: lib/layouts/aastex.layout:106 lib/layouts/aastex.layout:245
 #: lib/layouts/apa.layout:70 lib/layouts/cl2emult.layout:79
 #: lib/layouts/cl2emult.layout:91 lib/layouts/egs.layout:492
-#: lib/layouts/elsart.layout:206 lib/layouts/elsart.layout:222
+#: lib/layouts/elsart.layout:207 lib/layouts/elsart.layout:223
 #: lib/layouts/entcs.layout:83 lib/layouts/foils.layout:151
 #: lib/layouts/ijmpc.layout:66 lib/layouts/ijmpd.layout:69
 #: lib/layouts/iopart.layout:166 lib/layouts/iopart.layout:182
-#: lib/layouts/isprs.layout:24 lib/layouts/kluwer.layout:258
-#: lib/layouts/latex8.layout:100 lib/layouts/llncs.layout:240
+#: lib/layouts/isprs.layout:24 lib/layouts/kluwer.layout:259
+#: lib/layouts/latex8.layout:100 lib/layouts/llncs.layout:241
 #: lib/layouts/ltugboat.layout:171 lib/layouts/ltugboat.layout:186
-#: lib/layouts/paper.layout:135 lib/layouts/revtex.layout:135
-#: lib/layouts/revtex4.layout:202 lib/layouts/siamltex.layout:143
+#: lib/layouts/paper.layout:136 lib/layouts/revtex.layout:135
+#: lib/layouts/revtex4.layout:203 lib/layouts/siamltex.layout:144
 #: lib/layouts/spie.layout:73 lib/layouts/svglobal.layout:29
 #: lib/layouts/svjog.layout:34 lib/layouts/agu_stdtitle.inc:193
 #: lib/layouts/amsdefs.inc:126 lib/layouts/db_stdstruct.inc:11
-#: lib/layouts/scrclass.inc:216 lib/layouts/stdstruct.inc:12
-#: lib/layouts/stdstruct.inc:27 lib/layouts/svjour.inc:252
+#: lib/layouts/scrclass.inc:217 lib/layouts/stdstruct.inc:12
+#: lib/layouts/stdstruct.inc:27 lib/layouts/svjour.inc:253
 #: src/output_plaintext.cpp:145
 msgid "Abstract"
 msgstr "Tiivistelmä"
 
-#: lib/layouts/IEEEtran.layout:335
+#: lib/layouts/IEEEtran.layout:336
 msgid "Abstract---"
 msgstr "Tiivistelmä---"
 
-#: lib/layouts/IEEEtran.layout:349 lib/layouts/aastex.layout:109
-#: lib/layouts/aastex.layout:281 lib/layouts/elsart.layout:64
+#: lib/layouts/IEEEtran.layout:350 lib/layouts/aastex.layout:109
+#: lib/layouts/aastex.layout:282 lib/layouts/elsart.layout:64
 #: lib/layouts/ijmpc.layout:77 lib/layouts/ijmpd.layout:80
 #: lib/layouts/iopart.layout:194 lib/layouts/isprs.layout:52
-#: lib/layouts/kluwer.layout:282 lib/layouts/paper.layout:174
-#: lib/layouts/revtex4.layout:241 lib/layouts/siamltex.layout:169
+#: lib/layouts/kluwer.layout:283 lib/layouts/paper.layout:175
+#: lib/layouts/revtex4.layout:242 lib/layouts/siamltex.layout:170
 #: lib/layouts/spie.layout:39 lib/layouts/agu_stdtitle.inc:120
-#: lib/layouts/amsdefs.inc:195 lib/layouts/svjour.inc:273
+#: lib/layouts/amsdefs.inc:195 lib/layouts/svjour.inc:274
 msgid "Keywords"
 msgstr "Avainsanat"
 
-#: lib/layouts/IEEEtran.layout:360
+#: lib/layouts/IEEEtran.layout:361
 msgid "Index Terms---"
 msgstr "Hakemistoviitteet---"
 
-#: lib/layouts/IEEEtran.layout:372 lib/layouts/aa.layout:86
-#: lib/layouts/aa.layout:314 lib/layouts/aapaper.layout:103
-#: lib/layouts/aapaper.layout:209 lib/layouts/beamer.layout:844
+#: lib/layouts/IEEEtran.layout:373 lib/layouts/aa.layout:86
+#: lib/layouts/aa.layout:315 lib/layouts/aapaper.layout:103
+#: lib/layouts/aapaper.layout:210 lib/layouts/beamer.layout:845
 #: lib/layouts/book.layout:21 lib/layouts/book.layout:23
 #: lib/layouts/cl2emult.layout:102 lib/layouts/egs.layout:563
 #: lib/layouts/foils.layout:215 lib/layouts/ijmpc.layout:358
 #: lib/layouts/ijmpd.layout:369 lib/layouts/latex8.layout:118
-#: lib/layouts/llncs.layout:261 lib/layouts/memoir.layout:138
-#: lib/layouts/memoir.layout:140 lib/layouts/moderncv.layout:145
+#: lib/layouts/llncs.layout:262 lib/layouts/memoir.layout:139
+#: lib/layouts/memoir.layout:141 lib/layouts/moderncv.layout:145
 #: lib/layouts/mwbk.layout:21 lib/layouts/mwbk.layout:23
 #: lib/layouts/mwrep.layout:12 lib/layouts/mwrep.layout:14
 #: lib/layouts/powerdot.layout:279 lib/layouts/report.layout:12
-#: lib/layouts/report.layout:14 lib/layouts/scrbook.layout:22
-#: lib/layouts/scrbook.layout:24 lib/layouts/scrreprt.layout:11
-#: lib/layouts/scrreprt.layout:13 lib/layouts/siamltex.layout:183
+#: lib/layouts/report.layout:14 lib/layouts/scrbook.layout:21
+#: lib/layouts/scrbook.layout:23 lib/layouts/scrreprt.layout:11
+#: lib/layouts/scrreprt.layout:13 lib/layouts/siamltex.layout:184
 #: lib/layouts/simplecv.layout:140 lib/layouts/aguplus.inc:168
 #: lib/layouts/aguplus.inc:170 lib/layouts/amsdefs.inc:230
-#: lib/layouts/scrclass.inc:223 lib/layouts/stdstruct.inc:39
-#: lib/layouts/svjour.inc:326 src/frontends/qt4/QDocument.cpp:587
+#: lib/layouts/scrclass.inc:224 lib/layouts/stdstruct.inc:39
+#: lib/layouts/svjour.inc:327 src/frontends/qt4/GuiDocument.cpp:587
 msgid "Bibliography"
 msgstr "Viitteet"
 
-#: lib/layouts/IEEEtran.layout:381 lib/layouts/IEEEtran.layout:392
-#: lib/layouts/aastex.layout:115 lib/layouts/aastex.layout:408
+#: lib/layouts/IEEEtran.layout:382 lib/layouts/IEEEtran.layout:393
+#: lib/layouts/aastex.layout:115 lib/layouts/aastex.layout:409
 #: lib/layouts/ijmpc.layout:335 lib/layouts/ijmpd.layout:346
-#: lib/layouts/kluwer.layout:323 lib/layouts/kluwer.layout:336
-#: src/rowpainter.cpp:541
+#: lib/layouts/kluwer.layout:324 lib/layouts/kluwer.layout:337
+#: src/rowpainter.cpp:469
 msgid "Appendix"
 msgstr "Liite"
 
-#: lib/layouts/IEEEtran.layout:404 lib/layouts/IEEEtran.layout:407
+#: lib/layouts/IEEEtran.layout:405 lib/layouts/IEEEtran.layout:408
 msgid "Appendices"
 msgstr "Liitteet"
 
-#: lib/layouts/IEEEtran.layout:411
+#: lib/layouts/IEEEtran.layout:412
 msgid "Biography"
 msgstr "Elämäkerta"
 
-#: lib/layouts/IEEEtran.layout:422
+#: lib/layouts/IEEEtran.layout:423
 msgid "BiographyNoPhoto"
 msgstr "ElämäkertaIlmanKuvaa"
 
-#: lib/layouts/IEEEtran.layout:442 lib/layouts/IEEEtran.layout:453
+#: lib/layouts/IEEEtran.layout:443 lib/layouts/IEEEtran.layout:454
 msgid "Footernote"
 msgstr "Alareunamuistiinpano"
 
-#: lib/layouts/IEEEtran.layout:465
+#: lib/layouts/IEEEtran.layout:466
 msgid "MarkBoth"
 msgstr "Merkitse molemmat"
 
 #: lib/layouts/aa.layout:46 lib/layouts/aapaper.layout:48
-#: lib/layouts/aastex.layout:76 lib/layouts/apa.layout:308
-#: lib/layouts/beamer.layout:50 lib/layouts/egs.layout:163
+#: lib/layouts/aastex.layout:76 lib/layouts/apa.layout:309
+#: lib/layouts/beamer.layout:51 lib/layouts/egs.layout:163
 #: lib/layouts/manpage.layout:82 lib/layouts/powerdot.layout:229
 #: lib/layouts/simplecv.layout:77 lib/layouts/agu_stdlists.inc:13
 #: lib/layouts/db_stdlists.inc:12 lib/layouts/stdlists.inc:11
@@ -3663,8 +3744,8 @@ msgid "Itemize"
 msgstr "Luettelo"
 
 #: lib/layouts/aa.layout:49 lib/layouts/aapaper.layout:51
-#: lib/layouts/aastex.layout:79 lib/layouts/apa.layout:326
-#: lib/layouts/beamer.layout:69 lib/layouts/egs.layout:145
+#: lib/layouts/aastex.layout:79 lib/layouts/apa.layout:327
+#: lib/layouts/beamer.layout:70 lib/layouts/egs.layout:145
 #: lib/layouts/manpage.layout:65 lib/layouts/powerdot.layout:254
 #: lib/layouts/agu_stdlists.inc:21 lib/layouts/db_stdlists.inc:19
 #: lib/layouts/stdlists.inc:29
@@ -3672,12 +3753,12 @@ msgid "Enumerate"
 msgstr "Numeroitu luettelo"
 
 #: lib/layouts/aa.layout:52 lib/layouts/aapaper.layout:54
-#: lib/layouts/aastex.layout:82 lib/layouts/beamer.layout:88
+#: lib/layouts/aastex.layout:82 lib/layouts/beamer.layout:89
 #: lib/layouts/egs.layout:181 lib/layouts/hollywood.layout:134
-#: lib/layouts/manpage.layout:100 lib/layouts/paper.layout:103
+#: lib/layouts/manpage.layout:100 lib/layouts/paper.layout:104
 #: lib/layouts/scrlettr.layout:17 lib/layouts/scrlttr2.layout:18
 #: lib/layouts/agu_stdlists.inc:29 lib/layouts/db_stdlists.inc:26
-#: lib/layouts/scrclass.inc:26 lib/layouts/stdlists.inc:47
+#: lib/layouts/scrclass.inc:27 lib/layouts/stdlists.inc:47
 #: lib/ui/stdtoolbars.inc:89
 msgid "Description"
 msgstr "Kuvausluettelo"
@@ -3685,305 +3766,307 @@ msgstr "Kuvausluettelo"
 #: lib/layouts/aa.layout:55 lib/layouts/aapaper.layout:57
 #: lib/layouts/aastex.layout:85 lib/layouts/egs.layout:128
 #: lib/layouts/scrlettr.layout:32 lib/layouts/scrlttr2.layout:33
-#: lib/layouts/scrclass.inc:40 lib/layouts/stdlists.inc:69
+#: lib/layouts/scrclass.inc:41 lib/layouts/stdlists.inc:69
 #: lib/ui/stdtoolbars.inc:88
 msgid "List"
 msgstr "Lista"
 
-#: lib/layouts/aa.layout:59 lib/layouts/aa.layout:248
-#: lib/layouts/aapaper.layout:73 lib/layouts/aapaper.layout:159
-#: lib/layouts/aastex.layout:88 lib/layouts/aastex.layout:206
-#: lib/layouts/apa.layout:39 lib/layouts/beamer.layout:728
-#: lib/layouts/broadway.layout:195 lib/layouts/cl2emult.layout:39
+#: lib/layouts/aa.layout:59 lib/layouts/aa.layout:249
+#: lib/layouts/aapaper.layout:73 lib/layouts/aapaper.layout:160
+#: lib/layouts/aastex.layout:88 lib/layouts/aastex.layout:207
+#: lib/layouts/apa.layout:39 lib/layouts/beamer.layout:729
+#: lib/layouts/broadway.layout:196 lib/layouts/cl2emult.layout:39
 #: lib/layouts/docbook-book.layout:11 lib/layouts/docbook-chapter.layout:9
 #: lib/layouts/docbook-section.layout:9 lib/layouts/egs.layout:247
-#: lib/layouts/elsart.layout:92 lib/layouts/entcs.layout:37
+#: lib/layouts/elsart.layout:93 lib/layouts/entcs.layout:37
 #: lib/layouts/foils.layout:129 lib/layouts/hollywood.layout:346
 #: lib/layouts/ijmpc.layout:33 lib/layouts/ijmpd.layout:36
 #: lib/layouts/iopart.layout:53 lib/layouts/isprs.layout:94
-#: lib/layouts/kluwer.layout:104 lib/layouts/latex8.layout:33
-#: lib/layouts/llncs.layout:99 lib/layouts/ltugboat.layout:134
-#: lib/layouts/paper.layout:112 lib/layouts/powerdot.layout:36
-#: lib/layouts/revtex.layout:90 lib/layouts/revtex4.layout:107
+#: lib/layouts/kluwer.layout:105 lib/layouts/latex8.layout:33
+#: lib/layouts/llncs.layout:100 lib/layouts/ltugboat.layout:134
+#: lib/layouts/paper.layout:113 lib/layouts/powerdot.layout:36
+#: lib/layouts/revtex.layout:90 lib/layouts/revtex4.layout:108
 #: lib/layouts/scrlettr.layout:193 lib/layouts/scrlttr2.layout:271
-#: lib/layouts/siamltex.layout:109 lib/layouts/simplecv.layout:119
+#: lib/layouts/siamltex.layout:110 lib/layouts/simplecv.layout:119
 #: lib/layouts/svprobth.layout:35 lib/layouts/agu_stdtitle.inc:246
 #: lib/layouts/amsdefs.inc:60 lib/layouts/db_stdtitle.inc:13
-#: lib/layouts/scrclass.inc:146 lib/layouts/stdtitle.inc:12
-#: lib/layouts/svjour.inc:129
+#: lib/layouts/scrclass.inc:147 lib/layouts/stdtitle.inc:12
+#: lib/layouts/svjour.inc:130
 msgid "Title"
 msgstr "Teoksen nimi"
 
-#: lib/layouts/aa.layout:62 lib/layouts/aa.layout:106
-#: lib/layouts/aapaper.layout:76 lib/layouts/beamer.layout:752
-#: lib/layouts/kluwer.layout:122 lib/layouts/llncs.layout:122
+#: lib/layouts/aa.layout:62 lib/layouts/aa.layout:107
+#: lib/layouts/aapaper.layout:76 lib/layouts/beamer.layout:753
+#: lib/layouts/kluwer.layout:123 lib/layouts/llncs.layout:123
 #: lib/layouts/svprobth.layout:44 lib/layouts/aapaper.inc:9
-#: lib/layouts/svjour.inc:152
+#: lib/layouts/svjour.inc:153
 msgid "Subtitle"
 msgstr "Alaotsikko"
 
-#: lib/layouts/aa.layout:65 lib/layouts/aa.layout:260
-#: lib/layouts/aapaper.layout:79 lib/layouts/aapaper.layout:170
-#: lib/layouts/aastex.layout:91 lib/layouts/aastex.layout:219
-#: lib/layouts/apa.layout:114 lib/layouts/beamer.layout:777
-#: lib/layouts/broadway.layout:208 lib/layouts/cl2emult.layout:56
-#: lib/layouts/egs.layout:290 lib/layouts/elsart.layout:112
+#: lib/layouts/aa.layout:65 lib/layouts/aa.layout:261
+#: lib/layouts/aapaper.layout:79 lib/layouts/aapaper.layout:171
+#: lib/layouts/aastex.layout:91 lib/layouts/aastex.layout:220
+#: lib/layouts/apa.layout:114 lib/layouts/beamer.layout:778
+#: lib/layouts/broadway.layout:209 lib/layouts/cl2emult.layout:56
+#: lib/layouts/egs.layout:290 lib/layouts/elsart.layout:113
 #: lib/layouts/entcs.layout:47 lib/layouts/foils.layout:137
 #: lib/layouts/hollywood.layout:333 lib/layouts/ijmpc.layout:41
 #: lib/layouts/ijmpd.layout:44 lib/layouts/iopart.layout:122
-#: lib/layouts/isprs.layout:76 lib/layouts/kluwer.layout:160
-#: lib/layouts/llncs.layout:176 lib/layouts/ltugboat.layout:154
-#: lib/layouts/paper.layout:123 lib/layouts/powerdot.layout:60
-#: lib/layouts/revtex.layout:98 lib/layouts/revtex4.layout:115
-#: lib/layouts/siamltex.layout:126 lib/layouts/svprobth.layout:52
+#: lib/layouts/isprs.layout:76 lib/layouts/kluwer.layout:161
+#: lib/layouts/llncs.layout:177 lib/layouts/ltugboat.layout:154
+#: lib/layouts/paper.layout:124 lib/layouts/powerdot.layout:60
+#: lib/layouts/revtex.layout:98 lib/layouts/revtex4.layout:116
+#: lib/layouts/siamltex.layout:127 lib/layouts/svprobth.layout:52
 #: lib/layouts/agu_stdtitle.inc:167 lib/layouts/amsdefs.inc:82
-#: lib/layouts/db_stdtitle.inc:21 lib/layouts/scrclass.inc:154
-#: lib/layouts/stdtitle.inc:31 lib/layouts/svjour.inc:182
+#: lib/layouts/db_stdtitle.inc:21 lib/layouts/scrclass.inc:155
+#: lib/layouts/stdtitle.inc:31 lib/layouts/svjour.inc:183
 msgid "Author"
 msgstr "Tekijä"
 
-#: lib/layouts/aa.layout:68 lib/layouts/aa.layout:127
+#: lib/layouts/aa.layout:68 lib/layouts/aa.layout:128
 #: lib/layouts/aapaper.layout:82 lib/layouts/egs.layout:234
-#: lib/layouts/entcs.layout:57 lib/layouts/g-brief-en.layout:179
+#: lib/layouts/entcs.layout:57 lib/layouts/g-brief-en.layout:180
 #: lib/layouts/g-brief2.layout:715 lib/layouts/ijmpc.layout:50
 #: lib/layouts/ijmpd.layout:53 lib/layouts/iopart.layout:141
-#: lib/layouts/isprs.layout:115 lib/layouts/kluwer.layout:178
-#: lib/layouts/revtex.layout:116 lib/layouts/revtex4.layout:164
+#: lib/layouts/isprs.layout:115 lib/layouts/kluwer.layout:179
+#: lib/layouts/revtex.layout:116 lib/layouts/revtex4.layout:165
 #: lib/layouts/scrlettr.layout:144 lib/layouts/scrlttr2.layout:39
 #: lib/layouts/aapaper.inc:30 lib/layouts/amsdefs.inc:153
 #: lib/layouts/lyxmacros.inc:43
 msgid "Address"
 msgstr "Osoite"
 
-#: lib/layouts/aa.layout:71 lib/layouts/aa.layout:144
+#: lib/layouts/aa.layout:71 lib/layouts/aa.layout:145
 #: lib/layouts/aapaper.layout:88 lib/layouts/aapaper.inc:65
 msgid "Offprint"
 msgstr "Eripainos"
 
-#: lib/layouts/aa.layout:74 lib/layouts/aa.layout:167
-#: lib/layouts/svjour.inc:236
+#: lib/layouts/aa.layout:74 lib/layouts/aa.layout:168
+#: lib/layouts/svjour.inc:237
 msgid "Mail"
 msgstr "Posti"
 
-#: lib/layouts/aa.layout:77 lib/layouts/aa.layout:272
-#: lib/layouts/aapaper.layout:94 lib/layouts/aapaper.layout:181
-#: lib/layouts/aastex.layout:103 lib/layouts/aastex.layout:232
-#: lib/layouts/beamer.layout:821 lib/layouts/egs.layout:476
-#: lib/layouts/foils.layout:144 lib/layouts/g-brief-en.layout:188
-#: lib/layouts/g-brief2.layout:800 lib/layouts/kluwer.layout:143
+#: lib/layouts/aa.layout:77 lib/layouts/aa.layout:273
+#: lib/layouts/aapaper.layout:94 lib/layouts/aapaper.layout:182
+#: lib/layouts/aastex.layout:103 lib/layouts/aastex.layout:233
+#: lib/layouts/beamer.layout:822 lib/layouts/egs.layout:476
+#: lib/layouts/foils.layout:144 lib/layouts/g-brief-en.layout:189
+#: lib/layouts/g-brief2.layout:800 lib/layouts/kluwer.layout:144
 #: lib/layouts/powerdot.layout:83 lib/layouts/revtex.layout:106
-#: lib/layouts/revtex4.layout:123 lib/layouts/scrlettr.layout:165
-#: lib/layouts/scrlttr2.layout:239 lib/layouts/siamltex.layout:137
+#: lib/layouts/revtex4.layout:124 lib/layouts/scrlettr.layout:165
+#: lib/layouts/scrlttr2.layout:239 lib/layouts/siamltex.layout:138
 #: lib/layouts/agu_stdtitle.inc:238 lib/layouts/amsdefs.inc:102
-#: lib/layouts/db_stdtitle.inc:35 lib/layouts/scrclass.inc:161
-#: lib/layouts/stdtitle.inc:50 lib/layouts/svjour.inc:230
-#: lib/ui/stdmenus.inc:315 lib/external_templates:248
+#: lib/layouts/db_stdtitle.inc:35 lib/layouts/scrclass.inc:162
+#: lib/layouts/stdtitle.inc:50 lib/layouts/svjour.inc:231
+#: lib/ui/stdmenus.inc:317 lib/external_templates:248
 #: lib/external_templates:249 lib/external_templates:253
 msgid "Date"
 msgstr "Päiväys"
 
-#: lib/layouts/aa.layout:83 lib/layouts/aa.layout:190
+#: lib/layouts/aa.layout:83 lib/layouts/aa.layout:191
 #: lib/layouts/aapaper.layout:100 lib/layouts/amsart-plain.layout:139
 #: lib/layouts/amsart-seq.layout:251 lib/layouts/egs.layout:538
-#: lib/layouts/elsart.layout:427 lib/layouts/aapaper.inc:83
+#: lib/layouts/elsart.layout:428 lib/layouts/aapaper.inc:83
 #: lib/layouts/amsmaths-plain.inc:223 lib/layouts/amsmaths-seq.inc:184
-#: lib/layouts/amsmaths.inc:473 lib/layouts/svjour.inc:319
+#: lib/layouts/amsmaths.inc:473 lib/layouts/svjour.inc:320
+#: lib/layouts/theorems-ams.inc:415
 msgid "Acknowledgement"
 msgstr "Kiitos"
 
-#: lib/layouts/aa.layout:153 lib/layouts/aapaper.inc:74
+#: lib/layouts/aa.layout:154 lib/layouts/aapaper.inc:74
 msgid "Offprint Requests to:"
 msgstr "Eripainokset:"
 
-#: lib/layouts/aa.layout:176
+#: lib/layouts/aa.layout:177
 msgid "Correspondence to:"
 msgstr "Kirjeenvaihto:"
 
-#: lib/layouts/aa.layout:202 lib/layouts/egs.layout:527
-#: lib/layouts/svjour.inc:308
+#: lib/layouts/aa.layout:203 lib/layouts/egs.layout:527
+#: lib/layouts/svjour.inc:309
 msgid "Acknowledgements."
 msgstr "Kiitokset."
 
 #: lib/layouts/aapaper.layout:61 lib/layouts/egs.layout:623
-#: src/frontends/qt4/QPrefs.cpp:303
+#: src/frontends/qt4/GuiPrefs.cpp:298
 msgid "LaTeX"
 msgstr "LaTeX"
 
 #: lib/layouts/aapaper.layout:85 lib/layouts/aastex.layout:97
-#: lib/layouts/aastex.layout:307 lib/layouts/iopart.layout:153
-#: lib/layouts/latex8.layout:57 lib/layouts/llncs.layout:232
+#: lib/layouts/aastex.layout:308 lib/layouts/iopart.layout:153
+#: lib/layouts/latex8.layout:57 lib/layouts/llncs.layout:233
 #: lib/layouts/aapaper.inc:47 lib/layouts/amsdefs.inc:179
+#: lib/layouts/db_stdcharstyles.inc:73
 msgid "Email"
 msgstr "Sähköposti"
 
 #: lib/layouts/aapaper.layout:91 lib/layouts/aapaper.inc:107
-#: lib/ui/stdtoolbars.inc:110 src/frontends/qt4/QThesaurus.cpp:148
+#: lib/ui/stdtoolbars.inc:110 src/frontends/qt4/GuiThesaurus.cpp:148
 msgid "Thesaurus"
 msgstr "Synonyymit"
 
-#: lib/layouts/aastex.layout:73 lib/layouts/amsbook.layout:101
-#: lib/layouts/egs.layout:69 lib/layouts/kluwer.layout:84
-#: lib/layouts/llncs.layout:68 lib/layouts/ltugboat.layout:105
-#: lib/layouts/memoir.layout:66 lib/layouts/paper.layout:71
-#: lib/layouts/revtex.layout:65 lib/layouts/revtex4.layout:71
-#: lib/layouts/siamltex.layout:71 lib/layouts/agu_stdsections.inc:60
+#: lib/layouts/aastex.layout:73 lib/layouts/amsbook.layout:102
+#: lib/layouts/egs.layout:69 lib/layouts/kluwer.layout:85
+#: lib/layouts/llncs.layout:69 lib/layouts/ltugboat.layout:105
+#: lib/layouts/memoir.layout:67 lib/layouts/paper.layout:72
+#: lib/layouts/revtex.layout:65 lib/layouts/revtex4.layout:72
+#: lib/layouts/siamltex.layout:72 lib/layouts/agu_stdsections.inc:60
 #: lib/layouts/aguplus.inc:55 lib/layouts/db_stdsections.inc:52
-#: lib/layouts/numarticle.inc:40 lib/layouts/numrevtex.inc:33
-#: lib/layouts/scrclass.inc:82 lib/layouts/stdsections.inc:97
-#: lib/layouts/svjour.inc:79
+#: lib/layouts/numrevtex.inc:33 lib/layouts/scrclass.inc:83
+#: lib/layouts/stdsections.inc:113 lib/layouts/svjour.inc:80
 msgid "Paragraph"
 msgstr "Osakappale"
 
-#: lib/layouts/aastex.layout:94 lib/layouts/aastex.layout:263
+#: lib/layouts/aastex.layout:94 lib/layouts/aastex.layout:264
 #: lib/layouts/apa.layout:150 lib/layouts/latex8.layout:81
-#: lib/layouts/revtex4.layout:133 lib/layouts/agu_stdtitle.inc:128
+#: lib/layouts/revtex4.layout:134 lib/layouts/agu_stdtitle.inc:128
 #: lib/layouts/aguplus.inc:60
 msgid "Affiliation"
 msgstr "Järjestö"
 
-#: lib/layouts/aastex.layout:100 lib/layouts/aastex.layout:346
+#: lib/layouts/aastex.layout:100 lib/layouts/aastex.layout:347
 msgid "And"
 msgstr "Ja"
 
-#: lib/layouts/aastex.layout:112 lib/layouts/aastex.layout:325
+#: lib/layouts/aastex.layout:112 lib/layouts/aastex.layout:326
 #: lib/layouts/apa.layout:222 lib/layouts/egs.layout:513
-#: lib/layouts/elsart.layout:433 lib/layouts/isprs.layout:215
-#: lib/layouts/kluwer.layout:302 lib/layouts/kluwer.layout:314
-#: lib/layouts/aapaper.inc:95 lib/layouts/svjour.inc:294
+#: lib/layouts/elsart.layout:434 lib/layouts/isprs.layout:215
+#: lib/layouts/kluwer.layout:303 lib/layouts/kluwer.layout:315
+#: lib/layouts/aapaper.inc:95 lib/layouts/svjour.inc:295
 msgid "Acknowledgements"
 msgstr "Kiitokset"
 
-#: lib/layouts/aastex.layout:118 lib/layouts/aastex.layout:441
-#: lib/layouts/aastex.layout:453 lib/layouts/beamer.layout:858
+#: lib/layouts/aastex.layout:118 lib/layouts/aastex.layout:442
+#: lib/layouts/aastex.layout:454 lib/layouts/beamer.layout:859
 #: lib/layouts/cl2emult.layout:116 lib/layouts/egs.layout:577
 #: lib/layouts/iopart.layout:269 lib/layouts/iopart.layout:283
-#: lib/layouts/kluwer.layout:344 lib/layouts/kluwer.layout:356
-#: lib/layouts/llncs.layout:275 lib/layouts/moderncv.layout:159
-#: lib/layouts/siamltex.layout:194 lib/layouts/amsdefs.inc:244
-#: lib/layouts/stdstruct.inc:53 lib/layouts/svjour.inc:340
+#: lib/layouts/kluwer.layout:345 lib/layouts/kluwer.layout:357
+#: lib/layouts/llncs.layout:276 lib/layouts/moderncv.layout:159
+#: lib/layouts/siamltex.layout:195 lib/layouts/amsdefs.inc:244
+#: lib/layouts/stdstruct.inc:53 lib/layouts/svjour.inc:341
 #: src/output_plaintext.cpp:157
 msgid "References"
 msgstr "Viitteet"
 
-#: lib/layouts/aastex.layout:121 lib/layouts/aastex.layout:366
+#: lib/layouts/aastex.layout:121 lib/layouts/aastex.layout:367
 msgid "PlaceFigure"
 msgstr "Kuvan paikka"
 
-#: lib/layouts/aastex.layout:124 lib/layouts/aastex.layout:387
+#: lib/layouts/aastex.layout:124 lib/layouts/aastex.layout:388
 msgid "PlaceTable"
 msgstr "Taulukon paikka"
 
-#: lib/layouts/aastex.layout:127 lib/layouts/aastex.layout:508
+#: lib/layouts/aastex.layout:127 lib/layouts/aastex.layout:509
 msgid "TableComments"
 msgstr "Huomautusluettelo"
 
-#: lib/layouts/aastex.layout:130 lib/layouts/aastex.layout:488
+#: lib/layouts/aastex.layout:130 lib/layouts/aastex.layout:489
 msgid "TableRefs"
 msgstr "Viiteluettelo"
 
-#: lib/layouts/aastex.layout:134 lib/layouts/aastex.layout:429
+#: lib/layouts/aastex.layout:134 lib/layouts/aastex.layout:430
 msgid "MathLetters"
 msgstr "Matematiikkakirjaimet"
 
-#: lib/layouts/aastex.layout:137 lib/layouts/aastex.layout:467
+#: lib/layouts/aastex.layout:137 lib/layouts/aastex.layout:468
 msgid "NoteToEditor"
 msgstr "Huomautus toimittajalle"
 
-#: lib/layouts/aastex.layout:140 lib/layouts/aastex.layout:545
+#: lib/layouts/aastex.layout:140 lib/layouts/aastex.layout:546
 msgid "Facility"
 msgstr ""
 
-#: lib/layouts/aastex.layout:143 lib/layouts/aastex.layout:571
+#: lib/layouts/aastex.layout:143 lib/layouts/aastex.layout:572
 msgid "Objectname"
 msgstr "Kohteen nimi"
 
-#: lib/layouts/aastex.layout:146 lib/layouts/aastex.layout:598
+#: lib/layouts/aastex.layout:146 lib/layouts/aastex.layout:599
 msgid "Dataset"
 msgstr "Datajoukko"
 
-#: lib/layouts/aastex.layout:293
+#: lib/layouts/aastex.layout:294
 msgid "Subject headings:"
 msgstr "Aiheotsikot:"
 
-#: lib/layouts/aastex.layout:336
+#: lib/layouts/aastex.layout:337
 msgid "[Acknowledgements]"
 msgstr "[Kiitokset]"
 
-#: lib/layouts/aastex.layout:357
+#: lib/layouts/aastex.layout:358
 msgid "and"
 msgstr "ja"
 
-#: lib/layouts/aastex.layout:378
+#: lib/layouts/aastex.layout:379
 msgid "Place Figure here:"
 msgstr "Kuvan paikka:"
 
-#: lib/layouts/aastex.layout:399
+#: lib/layouts/aastex.layout:400
 msgid "Place Table here:"
 msgstr "Taulukon paikka:"
 
-#: lib/layouts/aastex.layout:419
+#: lib/layouts/aastex.layout:420
 msgid "[Appendix]"
 msgstr "[Liite]"
 
-#: lib/layouts/aastex.layout:479
+#: lib/layouts/aastex.layout:480
 msgid "Note to Editor:"
 msgstr "Huomautus toimittajalle:"
 
-#: lib/layouts/aastex.layout:500
+#: lib/layouts/aastex.layout:501
 msgid "References. ---"
 msgstr "Viitteet. ---"
 
-#: lib/layouts/aastex.layout:520
+#: lib/layouts/aastex.layout:521
 msgid "Note. ---"
 msgstr "Muistiinpano. ---"
 
-#: lib/layouts/aastex.layout:530
+#: lib/layouts/aastex.layout:531
 msgid "FigCaption"
 msgstr "Kuvateksti"
 
-#: lib/layouts/aastex.layout:540
+#: lib/layouts/aastex.layout:541
 msgid "Fig. ---"
 msgstr "Kuva ---"
 
-#: lib/layouts/aastex.layout:557
-#, fuzzy
+#: lib/layouts/aastex.layout:558
 msgid "Facility:"
 msgstr ""
 
-#: lib/layouts/aastex.layout:583
+#: lib/layouts/aastex.layout:584
 msgid "Obj:"
 msgstr ""
 
-#: lib/layouts/aastex.layout:610
+#: lib/layouts/aastex.layout:611
 msgid "Dataset:"
 msgstr "Datajoukko:"
 
-#: lib/layouts/amsart-plain.layout:27 lib/layouts/beamer.layout:965
-#: lib/layouts/foils.layout:300 lib/layouts/siamltex.layout:270
+#: lib/layouts/amsart-plain.layout:27 lib/layouts/beamer.layout:966
+#: lib/layouts/foils.layout:300 lib/layouts/siamltex.layout:271
 #: lib/layouts/amsmaths-plain.inc:35 lib/layouts/amsmaths.inc:95
+#: lib/layouts/theorems-ams.inc:37
 msgid "Theorem."
 msgstr "Lause."
 
-#: lib/layouts/amsart-plain.layout:33 lib/layouts/beamer.layout:903
-#: lib/layouts/foils.layout:314 lib/layouts/siamltex.layout:284
+#: lib/layouts/amsart-plain.layout:33 lib/layouts/beamer.layout:904
+#: lib/layouts/foils.layout:314 lib/layouts/siamltex.layout:285
 #: lib/layouts/amsmaths-plain.inc:45 lib/layouts/amsmaths.inc:117
+#: lib/layouts/theorems-ams.inc:59
 msgid "Corollary."
 msgstr "Seurauslause."
 
 #: lib/layouts/amsart-plain.layout:39 lib/layouts/foils.layout:307
-#: lib/layouts/siamltex.layout:277 lib/layouts/amsmaths-plain.inc:55
-#: lib/layouts/amsmaths.inc:139
+#: lib/layouts/siamltex.layout:278 lib/layouts/amsmaths-plain.inc:55
+#: lib/layouts/amsmaths.inc:139 lib/layouts/theorems-ams.inc:81
 msgid "Lemma."
 msgstr "Lemma."
 
 #: lib/layouts/amsart-plain.layout:45 lib/layouts/foils.layout:321
-#: lib/layouts/siamltex.layout:291 lib/layouts/amsmaths-plain.inc:65
-#: lib/layouts/amsmaths.inc:161
+#: lib/layouts/siamltex.layout:292 lib/layouts/amsmaths-plain.inc:65
+#: lib/layouts/amsmaths.inc:161 lib/layouts/theorems-ams.inc:103
 msgid "Proposition."
 msgstr "Väittämä."
 
 #: lib/layouts/amsart-plain.layout:51 lib/layouts/amsmaths-plain.inc:75
-#: lib/layouts/amsmaths.inc:183
+#: lib/layouts/amsmaths.inc:183 lib/layouts/theorems-ams.inc:125
 msgid "Conjecture."
 msgstr "Otaksuma."
 
@@ -3992,9 +4075,10 @@ msgid "Criterion."
 msgstr "Kriteeri."
 
 #: lib/layouts/amsart-plain.layout:61 lib/layouts/amsart-seq.layout:173
-#: lib/layouts/elsart.layout:346 lib/layouts/powerdot.layout:385
+#: lib/layouts/elsart.layout:347 lib/layouts/powerdot.layout:385
 #: lib/layouts/amsmaths-plain.inc:93 lib/layouts/amsmaths-seq.inc:80
 #: lib/layouts/amsmaths.inc:202 lib/layouts/stdfloats.inc:34
+#: lib/layouts/theorems-ams.inc:144
 msgid "Algorithm"
 msgstr "Algoritmi"
 
@@ -4002,8 +4086,9 @@ msgstr "Algoritmi"
 msgid "Algorithm."
 msgstr "Algoritmi."
 
-#: lib/layouts/amsart-plain.layout:69 lib/layouts/beamer.layout:953
+#: lib/layouts/amsart-plain.layout:69 lib/layouts/beamer.layout:954
 #: lib/layouts/amsmaths-plain.inc:105 lib/layouts/amsmaths.inc:227
+#: lib/layouts/theorems-ams.inc:169
 msgid "Fact."
 msgstr "Fakta."
 
@@ -4011,56 +4096,59 @@ msgstr "Fakta."
 msgid "Axiom."
 msgstr "Aksiooma."
 
-#: lib/layouts/amsart-plain.layout:81 lib/layouts/beamer.layout:923
-#: lib/layouts/foils.layout:328 lib/layouts/siamltex.layout:297
+#: lib/layouts/amsart-plain.layout:81 lib/layouts/beamer.layout:924
+#: lib/layouts/foils.layout:328 lib/layouts/siamltex.layout:298
 #: lib/layouts/amsmaths-plain.inc:125 lib/layouts/amsmaths.inc:268
+#: lib/layouts/theorems-ams.inc:210
 msgid "Definition."
 msgstr "Määritelmä."
 
-#: lib/layouts/amsart-plain.layout:87 lib/layouts/beamer.layout:935
+#: lib/layouts/amsart-plain.layout:87 lib/layouts/beamer.layout:936
 #: lib/layouts/amsmaths-plain.inc:135 lib/layouts/amsmaths.inc:290
+#: lib/layouts/theorems-ams.inc:232
 msgid "Example."
 msgstr "Esimerkki."
 
 #: lib/layouts/amsart-plain.layout:93 lib/layouts/amsmaths-plain.inc:145
-#: lib/layouts/amsmaths.inc:312
+#: lib/layouts/amsmaths.inc:312 lib/layouts/theorems-ams.inc:254
 msgid "Condition."
 msgstr "Ehto."
 
 #: lib/layouts/amsart-plain.layout:99 lib/layouts/amsmaths-plain.inc:155
-#: lib/layouts/amsmaths.inc:334
+#: lib/layouts/amsmaths.inc:334 lib/layouts/theorems-ams.inc:276
 msgid "Problem."
 msgstr "Ongelma."
 
 #: lib/layouts/amsart-plain.layout:105 lib/layouts/amsmaths-plain.inc:165
-#: lib/layouts/amsmaths.inc:357
+#: lib/layouts/amsmaths.inc:357 lib/layouts/theorems-ams.inc:299
 msgid "Exercise."
 msgstr "Harjoitus."
 
 #: lib/layouts/amsart-plain.layout:111 lib/layouts/amsmaths-plain.inc:175
-#: lib/layouts/amsmaths.inc:388
+#: lib/layouts/amsmaths.inc:388 lib/layouts/theorems-ams.inc:330
 msgid "Remark."
 msgstr "Huomautus."
 
-#: lib/layouts/amsart-plain.layout:117 lib/layouts/llncs.layout:308
+#: lib/layouts/amsart-plain.layout:117 lib/layouts/llncs.layout:309
 #: lib/layouts/amsmaths-plain.inc:185 lib/layouts/amsmaths.inc:410
-#: lib/layouts/svjour.inc:362
+#: lib/layouts/svjour.inc:363 lib/layouts/theorems-ams.inc:352
 msgid "Claim."
 msgstr "Väite."
 
 #: lib/layouts/amsart-plain.layout:123 lib/layouts/amsmaths-plain.inc:195
-#: lib/layouts/amsmaths.inc:432
+#: lib/layouts/amsmaths.inc:432 lib/layouts/theorems-ams.inc:374
 msgid "Note."
 msgstr "Muistiinpano."
 
 #: lib/layouts/amsart-plain.layout:129 lib/layouts/amsmaths-plain.inc:205
-#: lib/layouts/amsmaths.inc:454
+#: lib/layouts/amsmaths.inc:454 lib/layouts/theorems-ams.inc:396
 msgid "Notation."
 msgstr "Merkintätapa."
 
 #: lib/layouts/amsart-plain.layout:133 lib/layouts/amsart-seq.layout:245
-#: lib/layouts/elsart.layout:409 lib/layouts/amsmaths-plain.inc:213
+#: lib/layouts/elsart.layout:410 lib/layouts/amsmaths-plain.inc:213
 #: lib/layouts/amsmaths-seq.inc:176 lib/layouts/amsmaths.inc:462
+#: lib/layouts/theorems-ams.inc:404
 msgid "Summary"
 msgstr "Yhteenveto"
 
@@ -4070,7 +4158,7 @@ msgstr "Yhteenveto."
 
 #: lib/layouts/amsart-plain.layout:141 lib/layouts/egs.layout:552
 #: lib/layouts/amsmaths-plain.inc:225 lib/layouts/amsmaths.inc:487
-#: lib/layouts/svjour.inc:322
+#: lib/layouts/svjour.inc:323 lib/layouts/theorems-ams.inc:429
 msgid "Acknowledgement."
 msgstr "Kiitos."
 
@@ -4080,16 +4168,18 @@ msgstr "Tapaus."
 
 #: lib/layouts/amsart-plain.layout:151 lib/layouts/amsart-seq.layout:263
 #: lib/layouts/amsmaths-plain.inc:243 lib/layouts/amsmaths-seq.inc:200
-#: lib/layouts/amsmaths.inc:506
+#: lib/layouts/amsmaths.inc:506 lib/layouts/theorems-ams.inc:448
+#: lib/layouts/theorems.inc:169
 msgid "Conclusion"
 msgstr "Päätelmä"
 
 #: lib/layouts/amsart-plain.layout:153 lib/layouts/amsmaths-plain.inc:245
-#: lib/layouts/amsmaths.inc:520
+#: lib/layouts/amsmaths.inc:520 lib/layouts/theorems-ams.inc:462
 msgid "Conclusion."
 msgstr "Päätelmä."
 
 #: lib/layouts/amsart-seq.layout:139 lib/layouts/ijmpc.layout:216
+#: lib/layouts/theorems.inc:36
 msgid "Theorem \\arabic{theorem}."
 msgstr "Väittämä \\arabic{theorem}."
 
@@ -4177,12 +4267,12 @@ msgstr "Tapaus \\arabic{case}."
 msgid "Conclusion \\arabic{conclusion}."
 msgstr "Päätelmä \\arabic{conclusion}."
 
-#: lib/layouts/amsbook.layout:96 lib/layouts/amsbook.layout:97
-#: lib/layouts/powerdot.layout:217 lib/layouts/numarticle.inc:16
+#: lib/layouts/amsbook.layout:97 lib/layouts/amsbook.layout:98
+#: lib/layouts/powerdot.layout:217 lib/layouts/numarticle.inc:10
 msgid "\\arabic{section}"
 msgstr ""
 
-#: lib/layouts/amsbook.layout:109
+#: lib/layouts/amsbook.layout:110
 msgid "Chapter Exercises"
 msgstr "Harjoitusluku"
 
@@ -4218,7 +4308,7 @@ msgstr "Kolme tekij
 msgid "FourAuthors"
 msgstr "Neljä tekijää"
 
-#: lib/layouts/apa.layout:162 lib/layouts/revtex4.layout:145
+#: lib/layouts/apa.layout:162 lib/layouts/revtex4.layout:146
 #: lib/layouts/agu_stdtitle.inc:131
 msgid "Affiliation:"
 msgstr "Järjestö:"
@@ -4248,7 +4338,7 @@ msgid "Acknowledgements:"
 msgstr "Kiitokset:"
 
 #: lib/layouts/apa.layout:243 lib/layouts/iopart.layout:233
-#: lib/layouts/iopart.layout:247 lib/layouts/revtex4.layout:212
+#: lib/layouts/iopart.layout:247 lib/layouts/revtex4.layout:213
 #: lib/layouts/spie.layout:88
 msgid "Acknowledgments"
 msgstr "Kiitokset"
@@ -4261,8 +4351,8 @@ msgstr "Paksu viiva"
 msgid "CenteredCaption"
 msgstr "Keskitetty_kuvateksti"
 
-#: lib/layouts/apa.layout:269 lib/layouts/scrclass.inc:242
-#: lib/layouts/scrclass.inc:262
+#: lib/layouts/apa.layout:269 lib/layouts/scrclass.inc:243
+#: lib/layouts/scrclass.inc:263
 msgid "Senseless!"
 msgstr "Järjetöntä!"
 
@@ -4274,19 +4364,19 @@ msgstr "Sovita kuva"
 msgid "FitBitmap"
 msgstr "Sovita bittikartta"
 
-#: lib/layouts/apa.layout:322 lib/layouts/beamer.layout:65
+#: lib/layouts/apa.layout:323 lib/layouts/beamer.layout:66
 #: lib/layouts/egs.layout:177 lib/layouts/manpage.layout:96
 #: lib/layouts/powerdot.layout:243 lib/layouts/simplecv.layout:91
 #: lib/layouts/stdlists.inc:25
 msgid "*"
 msgstr "*"
 
-#: lib/layouts/apa.layout:344
+#: lib/layouts/apa.layout:345
 msgid "Seriate"
 msgstr "Luetelma"
 
-#: lib/layouts/apa.layout:360 lib/layouts/apa.layout:361
-#: src/buffer_funcs.cpp:568
+#: lib/layouts/apa.layout:361 lib/layouts/apa.layout:362
+#: src/buffer_funcs.cpp:505
 msgid "(\\alph{enumii})"
 msgstr ""
 
@@ -4306,13 +4396,12 @@ msgstr "Latinalaiset pois"
 msgid "Latin off"
 msgstr "Latinalaiset pois"
 
-#: lib/layouts/article.layout:18 lib/layouts/beamer.layout:114
-#: lib/layouts/beamer.layout:129 lib/layouts/mwart.layout:23
-#: lib/layouts/paper.layout:31 lib/layouts/scrartcl.layout:20
+#: lib/layouts/article.layout:18 lib/layouts/beamer.layout:115
+#: lib/layouts/beamer.layout:130 lib/layouts/mwart.layout:23
+#: lib/layouts/paper.layout:32 lib/layouts/scrartcl.layout:20
 #: lib/layouts/seminar.layout:24 lib/layouts/agu_stdsections.inc:12
-#: lib/layouts/db_stdsections.inc:12 lib/layouts/numarticle.inc:5
-#: lib/layouts/numreport.inc:7 lib/layouts/scrclass.inc:46
-#: lib/layouts/stdsections.inc:11
+#: lib/layouts/db_stdsections.inc:12 lib/layouts/numreport.inc:6
+#: lib/layouts/scrclass.inc:47 lib/layouts/stdsections.inc:11
 msgid "Part"
 msgstr "Osa"
 
@@ -4322,292 +4411,302 @@ msgstr "Osa"
 msgid "Part*"
 msgstr "Osa*"
 
-#: lib/layouts/beamer.layout:104 lib/layouts/egs.layout:196
+#: lib/layouts/beamer.layout:105 lib/layouts/egs.layout:196
 #: lib/layouts/manpage.layout:115 lib/layouts/stdlists.inc:62
 msgid "MM"
 msgstr ""
 
-#: lib/layouts/beamer.layout:159
+#: lib/layouts/beamer.layout:160
 #, fuzzy
 msgid "Section \\arabic{section}"
 msgstr "Alikappale"
 
-#: lib/layouts/beamer.layout:171 lib/layouts/powerdot.layout:223
-#: lib/layouts/numarticle.inc:17
+#: lib/layouts/beamer.layout:172 lib/layouts/powerdot.layout:223
+#: lib/layouts/numarticle.inc:11
 #, fuzzy
 msgid "\\Alph{section}"
 msgstr "valinta"
 
-#: lib/layouts/beamer.layout:200
+#: lib/layouts/beamer.layout:201
 #, fuzzy
 msgid "Subsection \\arabic{section}.\\arabic{subsection}"
 msgstr "Alialikappale"
 
-#: lib/layouts/beamer.layout:213
+#: lib/layouts/beamer.layout:214
 #, fuzzy
 msgid "\\arabic{section}.\\arabic{subsection}"
 msgstr "Alialikappale"
 
-#: lib/layouts/beamer.layout:227
+#: lib/layouts/beamer.layout:228
 msgid "BeginFrame"
 msgstr ""
 
-#: lib/layouts/beamer.layout:244
+#: lib/layouts/beamer.layout:245
 #, fuzzy
 msgid "Frame"
 msgstr "Parametrit"
 
-#: lib/layouts/beamer.layout:270
+#: lib/layouts/beamer.layout:271
 msgid "BeginPlainFrame"
 msgstr ""
 
-#: lib/layouts/beamer.layout:286
+#: lib/layouts/beamer.layout:287
 msgid "Frame (no head/foot/sidebars)"
 msgstr ""
 
-#: lib/layouts/beamer.layout:309
+#: lib/layouts/beamer.layout:310
 #, fuzzy
 msgid "AgainFrame"
 msgstr "ToistaRuutu"
 
-#: lib/layouts/beamer.layout:326
+#: lib/layouts/beamer.layout:327
 msgid "Again frame with label"
 msgstr ""
 
-#: lib/layouts/beamer.layout:350
+#: lib/layouts/beamer.layout:351
 #, fuzzy
 msgid "EndFrame"
 msgstr "Tulostimen &nimi:"
 
-#: lib/layouts/beamer.layout:364
+#: lib/layouts/beamer.layout:365
 msgid "________________________________"
 msgstr ""
 
-#: lib/layouts/beamer.layout:379
+#: lib/layouts/beamer.layout:380
 #, fuzzy
 msgid "FrameSubtitle"
 msgstr "Alaotsikko"
 
-#: lib/layouts/beamer.layout:402
+#: lib/layouts/beamer.layout:403
 #, fuzzy
 msgid "Column"
 msgstr "Palstoja"
 
-#: lib/layouts/beamer.layout:414
+#: lib/layouts/beamer.layout:415
 msgid "Start column (increase depth!), width:"
 msgstr ""
 
-#: lib/layouts/beamer.layout:426 lib/layouts/beamer.layout:437
+#: lib/layouts/beamer.layout:427 lib/layouts/beamer.layout:438
 msgid "Columns"
 msgstr "Palstoja"
 
-#: lib/layouts/beamer.layout:454
+#: lib/layouts/beamer.layout:455
 msgid "ColumnsCenterAligned"
 msgstr ""
 
-#: lib/layouts/beamer.layout:465
+#: lib/layouts/beamer.layout:466
 msgid "Columns (center aligned)"
 msgstr ""
 
-#: lib/layouts/beamer.layout:484
+#: lib/layouts/beamer.layout:485
 msgid "ColumnsTopAligned"
 msgstr ""
 
-#: lib/layouts/beamer.layout:495
+#: lib/layouts/beamer.layout:496
 msgid "Columns (top aligned)"
 msgstr ""
 
-#: lib/layouts/beamer.layout:515
+#: lib/layouts/beamer.layout:516
 msgid "Pause"
 msgstr "Tauko"
 
-#: lib/layouts/beamer.layout:531
+#: lib/layouts/beamer.layout:532
 msgid "_ _ _ _ _ _ _ _ _ _ _ _ _ _"
 msgstr ""
 
-#: lib/layouts/beamer.layout:541 lib/layouts/beamer.layout:551
+#: lib/layouts/beamer.layout:542 lib/layouts/beamer.layout:552
 msgid "Overprint"
 msgstr "Päälletulostus"
 
-#: lib/layouts/beamer.layout:567
+#: lib/layouts/beamer.layout:568
 msgid "OverlayArea"
 msgstr "KalvoKerros"
 
-#: lib/layouts/beamer.layout:577
+#: lib/layouts/beamer.layout:578
 msgid "Overlayarea"
 msgstr "Kalvokerros"
 
-#: lib/layouts/beamer.layout:592
+#: lib/layouts/beamer.layout:593
 msgid "Uncover"
 msgstr "Tuo näkyviin"
 
-#: lib/layouts/beamer.layout:602
+#: lib/layouts/beamer.layout:603
 msgid "Uncovered on slides"
 msgstr "Näkyvä kalvoissa"
 
-#: lib/layouts/beamer.layout:617
+#: lib/layouts/beamer.layout:618
 msgid "Only"
 msgstr "Vain"
 
-#: lib/layouts/beamer.layout:627
+#: lib/layouts/beamer.layout:628
 msgid "Only on slides"
 msgstr "Vain kalvoissa"
 
-#: lib/layouts/beamer.layout:643
+#: lib/layouts/beamer.layout:644
 msgid "Block"
 msgstr "Lohko"
 
-#: lib/layouts/beamer.layout:653
+#: lib/layouts/beamer.layout:654
 msgid "Block ( ERT[{title}] body ):"
 msgstr "Lohko ( ERT[{nimi}] sisältö ):"
 
-#: lib/layouts/beamer.layout:668
+#: lib/layouts/beamer.layout:669
 msgid "ExampleBlock"
 msgstr "EsimerkkiLohko"
 
-#: lib/layouts/beamer.layout:678
+#: lib/layouts/beamer.layout:679
 msgid "Block ( ERT[{title}] example text ):"
 msgstr "Lohko ( ERT[{nimi}] esimerkki teksti ):"
 
-#: lib/layouts/beamer.layout:697
+#: lib/layouts/beamer.layout:698
 msgid "AlertBlock"
 msgstr "HuomioLohko"
 
-#: lib/layouts/beamer.layout:707
+#: lib/layouts/beamer.layout:708
 msgid "Block ( ERT[{title}] alert text ):"
 msgstr "Lohko ( ERT[{nimi}] huomio teksti ):"
 
-#: lib/layouts/beamer.layout:799 lib/layouts/cl2emult.layout:68
-#: lib/layouts/llncs.layout:213 lib/layouts/svjour.inc:211
+#: lib/layouts/beamer.layout:800 lib/layouts/cl2emult.layout:68
+#: lib/layouts/llncs.layout:214 lib/layouts/svjour.inc:212
 msgid "Institute"
 msgstr "Laitos"
 
-#: lib/layouts/beamer.layout:868
+#: lib/layouts/beamer.layout:869
 #, fuzzy
 msgid "TitleGraphic"
 msgstr "Kuva"
 
-#: lib/layouts/beamer.layout:926
+#: lib/layouts/beamer.layout:927
 msgid "Definitions"
 msgstr "Määritelmät"
 
-#: lib/layouts/beamer.layout:929
+#: lib/layouts/beamer.layout:930
 msgid "Definitions."
 msgstr "Määritelmät."
 
-#: lib/layouts/beamer.layout:943
+#: lib/layouts/beamer.layout:944
 msgid "Examples"
 msgstr "Esimerkit"
 
-#: lib/layouts/beamer.layout:946
+#: lib/layouts/beamer.layout:947
 msgid "Examples."
 msgstr "Esimerkit."
 
-#: lib/layouts/beamer.layout:959 lib/layouts/foils.layout:286
+#: lib/layouts/beamer.layout:960 lib/layouts/foils.layout:286
 #: lib/layouts/ijmpc.layout:236 lib/layouts/ijmpd.layout:236
-#: lib/layouts/llncs.layout:377 lib/layouts/siamltex.layout:255
-#: lib/layouts/amsdefs.inc:43 lib/layouts/svjour.inc:439
+#: lib/layouts/llncs.layout:378 lib/layouts/siamltex.layout:256
+#: lib/layouts/amsdefs.inc:43 lib/layouts/svjour.inc:440
+#: lib/layouts/theorems-ams.inc:485
 msgid "Proof."
 msgstr "Todistus."
 
-#: lib/layouts/beamer.layout:970
+#: lib/layouts/beamer.layout:971
 msgid "Separator"
 msgstr "Kappaleväli"
 
-#: lib/layouts/beamer.layout:983
+#: lib/layouts/beamer.layout:984
 msgid "___"
 msgstr ""
 
-#: lib/layouts/beamer.layout:993 lib/layouts/egs.layout:641
+#: lib/layouts/beamer.layout:994 lib/layouts/egs.layout:641
 #: lib/layouts/db_lyxmacros.inc:18 lib/layouts/lyxmacros.inc:12
 msgid "LyX-Code"
 msgstr "LyX-koodi"
 
-#: lib/layouts/beamer.layout:1030
+#: lib/layouts/beamer.layout:1031
 #, fuzzy
 msgid "NoteItem"
 msgstr "Uusi kohta"
 
-#: lib/layouts/beamer.layout:1041 lib/layouts/powerdot.layout:199
+#: lib/layouts/beamer.layout:1042 lib/layouts/powerdot.layout:199
 #, fuzzy
 msgid "Note:"
 msgstr "Muistiinpano"
 
-#: lib/layouts/beamer.layout:1077 lib/layouts/powerdot.layout:365
+#: lib/layouts/beamer.layout:1060
+#, fuzzy
+msgid "Alert"
+msgstr "HuomioLohko"
+
+#: lib/layouts/beamer.layout:1071
+msgid "Structure"
+msgstr ""
+
+#: lib/layouts/beamer.layout:1082 lib/layouts/powerdot.layout:365
 #: lib/layouts/stdfloats.inc:10 lib/ui/stdtoolbars.inc:113
 msgid "Table"
 msgstr "Taulukko"
 
-#: lib/layouts/beamer.layout:1082 lib/layouts/powerdot.layout:369
+#: lib/layouts/beamer.layout:1087 lib/layouts/powerdot.layout:369
 #: lib/layouts/stdfloats.inc:15
 #, fuzzy
 msgid "List of Tables"
 msgstr "Luettelo: "
 
-#: lib/layouts/beamer.layout:1088 lib/layouts/powerdot.layout:375
+#: lib/layouts/beamer.layout:1093 lib/layouts/powerdot.layout:375
 #: lib/layouts/stdfloats.inc:22
 msgid "Figure"
 msgstr "Kuva"
 
-#: lib/layouts/beamer.layout:1093 lib/layouts/powerdot.layout:379
+#: lib/layouts/beamer.layout:1098 lib/layouts/powerdot.layout:379
 #: lib/layouts/stdfloats.inc:27
 #, fuzzy
 msgid "List of Figures"
 msgstr "Luettelo: "
 
-#: lib/layouts/broadway.layout:32 lib/layouts/hollywood.layout:40
+#: lib/layouts/broadway.layout:33 lib/layouts/hollywood.layout:40
 msgid "Dialogue"
 msgstr "Vuoropuhelu"
 
-#: lib/layouts/broadway.layout:44 lib/layouts/hollywood.layout:217
+#: lib/layouts/broadway.layout:45 lib/layouts/hollywood.layout:217
 msgid "Narrative"
 msgstr "Kerronta"
 
-#: lib/layouts/broadway.layout:61
+#: lib/layouts/broadway.layout:62
 msgid "ACT"
 msgstr "NÄYTÖS"
 
-#: lib/layouts/broadway.layout:74
+#: lib/layouts/broadway.layout:75
 msgid "ACT \\arabic{act}"
 msgstr ""
 
-#: lib/layouts/broadway.layout:78 lib/layouts/broadway.layout:107
+#: lib/layouts/broadway.layout:79 lib/layouts/broadway.layout:108
 msgid "SCENE"
 msgstr "KOHTAUS"
 
-#: lib/layouts/broadway.layout:91
+#: lib/layouts/broadway.layout:92
 msgid "SCENE \\arabic{scene}"
 msgstr ""
 
-#: lib/layouts/broadway.layout:95
+#: lib/layouts/broadway.layout:96
 msgid "SCENE*"
 msgstr "KOHTAUS*"
 
-#: lib/layouts/broadway.layout:111 lib/layouts/broadway.layout:123
+#: lib/layouts/broadway.layout:112 lib/layouts/broadway.layout:124
 msgid "AT RISE:"
 msgstr "NOUSTESSA:"
 
-#: lib/layouts/broadway.layout:128 lib/layouts/hollywood.layout:150
+#: lib/layouts/broadway.layout:129 lib/layouts/hollywood.layout:150
 msgid "Speaker"
 msgstr "Puhuja"
 
-#: lib/layouts/broadway.layout:142 lib/layouts/hollywood.layout:166
+#: lib/layouts/broadway.layout:143 lib/layouts/hollywood.layout:166
 msgid "Parenthetical"
 msgstr "Sulkeissa"
 
-#: lib/layouts/broadway.layout:154 lib/layouts/hollywood.layout:178
+#: lib/layouts/broadway.layout:155 lib/layouts/hollywood.layout:178
 msgid "("
 msgstr ""
 
-#: lib/layouts/broadway.layout:156 lib/layouts/hollywood.layout:180
+#: lib/layouts/broadway.layout:157 lib/layouts/hollywood.layout:180
 msgid ")"
 msgstr ""
 
-#: lib/layouts/broadway.layout:167 lib/layouts/broadway.layout:178
+#: lib/layouts/broadway.layout:168 lib/layouts/broadway.layout:179
 msgid "CURTAIN"
 msgstr "ESIRIPPU"
 
-#: lib/layouts/broadway.layout:221 lib/layouts/egs.layout:222
+#: lib/layouts/broadway.layout:222 lib/layouts/egs.layout:222
 #: lib/layouts/hollywood.layout:320 lib/layouts/lyxmacros.inc:63
 msgid "Right Address"
 msgstr "Oikea osoite"
@@ -4742,40 +4841,40 @@ msgstr ""
 msgid "Send To Address"
 msgstr "Lähetysosoite"
 
-#: lib/layouts/dinbrief.layout:34 lib/layouts/g-brief-de.layout:184
+#: lib/layouts/dinbrief.layout:34 lib/layouts/g-brief-de.layout:185
 #, fuzzy
 msgid "Adresse:"
 msgstr "Osoite"
 
-#: lib/layouts/dinbrief.layout:46 lib/layouts/g-brief-en.layout:204
+#: lib/layouts/dinbrief.layout:46 lib/layouts/g-brief-en.layout:205
 #: lib/layouts/g-brief2.layout:843 lib/layouts/scrlettr.layout:61
 #: lib/layouts/scrlttr2.layout:91 lib/layouts/stdletter.inc:50
 msgid "Opening"
 msgstr "Aloitus"
 
-#: lib/layouts/dinbrief.layout:48 lib/layouts/g-brief-de.layout:209
+#: lib/layouts/dinbrief.layout:48 lib/layouts/g-brief-de.layout:210
 #, fuzzy
 msgid "Anrede:"
 msgstr "Puhuttelu"
 
-#: lib/layouts/dinbrief.layout:59 lib/layouts/g-brief-en.layout:53
+#: lib/layouts/dinbrief.layout:59 lib/layouts/g-brief-en.layout:54
 #: lib/layouts/g-brief2.layout:891 lib/layouts/scrlettr.layout:137
 #: lib/layouts/scrlttr2.layout:167 lib/layouts/stdletter.inc:72
 msgid "Signature"
 msgstr "Allekirjoitus"
 
-#: lib/layouts/dinbrief.layout:61 lib/layouts/g-brief-de.layout:56
+#: lib/layouts/dinbrief.layout:61 lib/layouts/g-brief-de.layout:57
 #, fuzzy
 msgid "Unterschrift:"
 msgstr "Allekirjoitus"
 
-#: lib/layouts/dinbrief.layout:72 lib/layouts/g-brief-en.layout:230
+#: lib/layouts/dinbrief.layout:72 lib/layouts/g-brief-en.layout:231
 #: lib/layouts/g-brief2.layout:865 lib/layouts/scrlettr.layout:71
 #: lib/layouts/scrlttr2.layout:113 lib/layouts/stdletter.inc:93
 msgid "Closing"
 msgstr "Lopuksi"
 
-#: lib/layouts/dinbrief.layout:74 lib/layouts/g-brief-de.layout:235
+#: lib/layouts/dinbrief.layout:74 lib/layouts/g-brief-de.layout:236
 #, fuzzy
 msgid "Gruss:"
 msgstr "Lopuksi"
@@ -4784,7 +4883,7 @@ msgstr "Lopuksi"
 msgid "encl"
 msgstr "liitteet"
 
-#: lib/layouts/dinbrief.layout:86 lib/layouts/g-brief-de.layout:217
+#: lib/layouts/dinbrief.layout:86 lib/layouts/g-brief-de.layout:218
 #, fuzzy
 msgid "Anlagen:"
 msgstr "Laitos"
@@ -4798,22 +4897,22 @@ msgstr "ps"
 msgid "PS:"
 msgstr "PS"
 
-#: lib/layouts/dinbrief.layout:120 lib/layouts/g-brief-en.layout:221
+#: lib/layouts/dinbrief.layout:120 lib/layouts/g-brief-en.layout:222
 #: lib/layouts/g-brief2.layout:932 lib/layouts/stdletter.inc:101
 #: src/lengthcommon.cpp:38
 msgid "cc"
 msgstr "jakelu"
 
-#: lib/layouts/dinbrief.layout:121 lib/layouts/g-brief-de.layout:226
+#: lib/layouts/dinbrief.layout:121 lib/layouts/g-brief-de.layout:227
 #, fuzzy
 msgid "Verteiler:"
 msgstr "Jakelija"
 
-#: lib/layouts/dinbrief.layout:133 lib/layouts/g-brief-de.layout:195
+#: lib/layouts/dinbrief.layout:133 lib/layouts/g-brief-de.layout:196
 msgid "Betreff"
 msgstr "Aihe"
 
-#: lib/layouts/dinbrief.layout:146 lib/layouts/g-brief-de.layout:200
+#: lib/layouts/dinbrief.layout:146 lib/layouts/g-brief-de.layout:201
 #, fuzzy
 msgid "Betreff:"
 msgstr "Aihe"
@@ -4827,21 +4926,20 @@ msgstr "Kaupunki"
 msgid "Stadt:"
 msgstr "Kaupunki"
 
-#: lib/layouts/dinbrief.layout:178 lib/layouts/g-brief-de.layout:188
+#: lib/layouts/dinbrief.layout:178 lib/layouts/g-brief-de.layout:189
 msgid "Datum"
 msgstr "Päiväys"
 
-#: lib/layouts/dinbrief.layout:189 lib/layouts/g-brief-de.layout:191
+#: lib/layouts/dinbrief.layout:189 lib/layouts/g-brief-de.layout:192
 #, fuzzy
 msgid "Datum:"
 msgstr "Päiväys"
 
-#: lib/layouts/egs.layout:86 lib/layouts/kluwer.layout:93
-#: lib/layouts/llncs.layout:77 lib/layouts/memoir.layout:71
-#: lib/layouts/paper.layout:80 lib/layouts/agu_stdsections.inc:70
-#: lib/layouts/db_stdsections.inc:60 lib/layouts/numarticle.inc:49
-#: lib/layouts/scrclass.inc:89 lib/layouts/stdsections.inc:105
-#: lib/layouts/svjour.inc:88
+#: lib/layouts/egs.layout:86 lib/layouts/kluwer.layout:94
+#: lib/layouts/llncs.layout:78 lib/layouts/memoir.layout:72
+#: lib/layouts/paper.layout:81 lib/layouts/agu_stdsections.inc:70
+#: lib/layouts/db_stdsections.inc:60 lib/layouts/scrclass.inc:90
+#: lib/layouts/stdsections.inc:123 lib/layouts/svjour.inc:89
 msgid "Subparagraph"
 msgstr "Aliosakappale"
 
@@ -4935,111 +5033,111 @@ msgstr "Uusintapainosten v
 msgid "reprint_reqs_to:"
 msgstr ""
 
-#: lib/layouts/egs.layout:506 lib/layouts/kluwer.layout:271
-#: lib/layouts/llncs.layout:254 lib/layouts/siamltex.layout:156
+#: lib/layouts/egs.layout:506 lib/layouts/kluwer.layout:272
+#: lib/layouts/llncs.layout:255 lib/layouts/siamltex.layout:157
 #: lib/layouts/svglobal.layout:44 lib/layouts/svjog.layout:49
-#: lib/layouts/amsdefs.inc:140 lib/layouts/svjour.inc:266
+#: lib/layouts/amsdefs.inc:140 lib/layouts/svjour.inc:267
 #, fuzzy
 msgid "Abstract."
 msgstr "Tiivistelmä"
 
-#: lib/layouts/elsart.layout:132
+#: lib/layouts/elsart.layout:133
 msgid "Author Address"
 msgstr "Tekijän osoite"
 
-#: lib/layouts/elsart.layout:141 lib/layouts/g-brief-en.layout:184
+#: lib/layouts/elsart.layout:142 lib/layouts/g-brief-en.layout:185
 #: lib/layouts/g-brief2.layout:726 lib/layouts/revtex.layout:128
-#: lib/layouts/revtex4.layout:167 lib/layouts/scrlettr.layout:147
+#: lib/layouts/revtex4.layout:168 lib/layouts/scrlettr.layout:147
 #: lib/layouts/scrlttr2.layout:56 lib/layouts/amsdefs.inc:164
 #, fuzzy
 msgid "Address:"
 msgstr "Osoite"
 
-#: lib/layouts/elsart.layout:149 lib/layouts/revtex4.layout:178
+#: lib/layouts/elsart.layout:150 lib/layouts/revtex4.layout:179
 msgid "Author Email"
 msgstr "Tekijän sähköposti"
 
-#: lib/layouts/elsart.layout:159 lib/layouts/llncs.layout:236
+#: lib/layouts/elsart.layout:160 lib/layouts/llncs.layout:237
 #, fuzzy
 msgid "Email:"
 msgstr "Sähköposti"
 
-#: lib/layouts/elsart.layout:170 lib/layouts/revtex4.layout:193
+#: lib/layouts/elsart.layout:171 lib/layouts/revtex4.layout:194
 msgid "Author URL"
 msgstr "Tekijän URL"
 
-#: lib/layouts/elsart.layout:181 lib/layouts/revtex4.layout:198
+#: lib/layouts/elsart.layout:182 lib/layouts/revtex4.layout:199
 #: lib/layouts/amsdefs.inc:191
 #, fuzzy
 msgid "URL:"
 msgstr "&URL:"
 
-#: lib/layouts/elsart.layout:193 lib/layouts/revtex4.layout:171
+#: lib/layouts/elsart.layout:194 lib/layouts/revtex4.layout:172
 #: lib/layouts/amsdefs.inc:202
 msgid "Thanks"
 msgstr "Kiitokset"
 
-#: lib/layouts/elsart.layout:278
+#: lib/layouts/elsart.layout:279
 msgid "Theorem \\arabic{theorem}"
 msgstr ""
 
-#: lib/layouts/elsart.layout:307
+#: lib/layouts/elsart.layout:308
 msgid "PROOF."
 msgstr ""
 
-#: lib/layouts/elsart.layout:321
+#: lib/layouts/elsart.layout:322
 msgid "Lemma \\arabic{theorem}"
 msgstr ""
 
-#: lib/layouts/elsart.layout:328
+#: lib/layouts/elsart.layout:329
 msgid "Corollary \\arabic{theorem}"
 msgstr "Seurauslause \\arabic{theorem}"
 
-#: lib/layouts/elsart.layout:335
+#: lib/layouts/elsart.layout:336
 msgid "Proposition \\arabic{theorem}"
 msgstr "Väittämä \\arabic{theorem}."
 
-#: lib/layouts/elsart.layout:342
+#: lib/layouts/elsart.layout:343
 msgid "Criterion \\arabic{theorem}"
 msgstr "Kriteeri \\arabic{theorem]."
 
-#: lib/layouts/elsart.layout:349
+#: lib/layouts/elsart.layout:350
 msgid "Algorithm \\arabic{theorem}"
 msgstr ""
 
-#: lib/layouts/elsart.layout:356
+#: lib/layouts/elsart.layout:357
 msgid "Definition \\arabic{theorem}"
 msgstr "Määritelmä \\arabic{theorem}"
 
-#: lib/layouts/elsart.layout:370
+#: lib/layouts/elsart.layout:371
 msgid "Conjecture \\arabic{theorem}"
 msgstr "Otaksuma \\arabic{theorem}"
 
-#: lib/layouts/elsart.layout:377
+#: lib/layouts/elsart.layout:378
 msgid "Example \\arabic{theorem}"
 msgstr "Esimerkki \\arabic{theorem}"
 
-#: lib/layouts/elsart.layout:384
+#: lib/layouts/elsart.layout:385
 msgid "Problem \\arabic{theorem}"
 msgstr "Ongelma \\arabic{theorem}"
 
-#: lib/layouts/elsart.layout:391
+#: lib/layouts/elsart.layout:392
 msgid "Remark \\arabic{theorem}"
 msgstr "Huomautus \\arabic{theorem}"
 
-#: lib/layouts/elsart.layout:398
+#: lib/layouts/elsart.layout:399
 msgid "Note \\arabic{theorem}"
 msgstr ""
 
-#: lib/layouts/elsart.layout:405
+#: lib/layouts/elsart.layout:406
 msgid "Claim \\arabic{theorem}"
 msgstr ""
 
-#: lib/layouts/elsart.layout:413
+#: lib/layouts/elsart.layout:414
 msgid "Summary \\arabic{summ}"
 msgstr "Yhteenveto \\arabic{summ}"
 
-#: lib/layouts/elsart.layout:421
+#: lib/layouts/elsart.layout:422
 msgid "Case \\arabic{case}"
 msgstr ""
 
@@ -5047,11 +5145,11 @@ msgstr ""
 msgid "FrontMatter"
 msgstr "Etuteksti"
 
-#: lib/layouts/entcs.layout:98
+#: lib/layouts/entcs.layout:98 lib/layouts/agu_stdtitle.inc:405
 msgid "Keyword"
 msgstr "Avainsana"
 
-#: lib/layouts/entcs.layout:109 lib/layouts/svjour.inc:287
+#: lib/layouts/entcs.layout:109 lib/layouts/svjour.inc:288
 msgid "Key words:"
 msgstr "Avainsanat:"
 
@@ -5215,388 +5313,387 @@ msgid "Right Footer:"
 msgstr "Oikea alaotsikko:"
 
 #: lib/layouts/foils.layout:237 lib/layouts/heb-article.layout:33
-#: lib/layouts/llncs.layout:418 lib/layouts/siamltex.layout:206
-#: lib/layouts/svjour.inc:481
+#: lib/layouts/llncs.layout:419 lib/layouts/siamltex.layout:207
+#: lib/layouts/svjour.inc:482
 msgid "Theorem #."
 msgstr "Lause #."
 
 #: lib/layouts/foils.layout:251 lib/layouts/heb-article.layout:48
-#: lib/layouts/llncs.layout:357 lib/layouts/siamltex.layout:220
-#: lib/layouts/svjour.inc:418
+#: lib/layouts/llncs.layout:358 lib/layouts/siamltex.layout:221
+#: lib/layouts/svjour.inc:419
 msgid "Lemma #."
 msgstr "Lemma #."
 
 #: lib/layouts/foils.layout:258 lib/layouts/heb-article.layout:58
-#: lib/layouts/llncs.layout:322 lib/layouts/siamltex.layout:227
-#: lib/layouts/svjour.inc:379
+#: lib/layouts/llncs.layout:323 lib/layouts/siamltex.layout:228
+#: lib/layouts/svjour.inc:380
 msgid "Corollary #."
 msgstr "Seurauslause #."
 
-#: lib/layouts/foils.layout:265 lib/layouts/llncs.layout:391
-#: lib/layouts/siamltex.layout:234 lib/layouts/svjour.inc:453
+#: lib/layouts/foils.layout:265 lib/layouts/llncs.layout:392
+#: lib/layouts/siamltex.layout:235 lib/layouts/svjour.inc:454
 msgid "Proposition #."
 msgstr "Väittämä #."
 
 #: lib/layouts/foils.layout:272 lib/layouts/heb-article.layout:78
-#: lib/layouts/llncs.layout:336 lib/layouts/siamltex.layout:241
-#: lib/layouts/svjour.inc:393
+#: lib/layouts/llncs.layout:337 lib/layouts/siamltex.layout:242
+#: lib/layouts/svjour.inc:394
 msgid "Definition #."
 msgstr "Määritelmä #."
 
-#: lib/layouts/foils.layout:297 lib/layouts/siamltex.layout:267
-#: lib/layouts/amsmaths.inc:91
+#: lib/layouts/foils.layout:297 lib/layouts/siamltex.layout:268
+#: lib/layouts/amsmaths.inc:91 lib/layouts/theorems-ams.inc:33
 msgid "Theorem*"
 msgstr "Lause*"
 
-#: lib/layouts/foils.layout:304 lib/layouts/siamltex.layout:274
-#: lib/layouts/amsmaths.inc:136
+#: lib/layouts/foils.layout:304 lib/layouts/siamltex.layout:275
+#: lib/layouts/amsmaths.inc:136 lib/layouts/theorems-ams.inc:78
 msgid "Lemma*"
 msgstr "Lemma*"
 
-#: lib/layouts/foils.layout:311 lib/layouts/siamltex.layout:281
-#: lib/layouts/amsmaths.inc:114
+#: lib/layouts/foils.layout:311 lib/layouts/siamltex.layout:282
+#: lib/layouts/amsmaths.inc:114 lib/layouts/theorems-ams.inc:56
 msgid "Corollary*"
 msgstr "Seurauslause*"
 
-#: lib/layouts/foils.layout:318 lib/layouts/siamltex.layout:288
-#: lib/layouts/amsmaths.inc:158
+#: lib/layouts/foils.layout:318 lib/layouts/siamltex.layout:289
+#: lib/layouts/amsmaths.inc:158 lib/layouts/theorems-ams.inc:100
 msgid "Proposition*"
 msgstr "Väittämä*"
 
-#: lib/layouts/foils.layout:325 lib/layouts/siamltex.layout:294
-#: lib/layouts/amsmaths.inc:264
+#: lib/layouts/foils.layout:325 lib/layouts/siamltex.layout:295
+#: lib/layouts/amsmaths.inc:264 lib/layouts/theorems-ams.inc:206
 msgid "Definition*"
 msgstr "Määritelmä*"
 
-#: lib/layouts/g-brief-de.layout:16
+#: lib/layouts/g-brief-de.layout:17
 msgid "Brieftext"
 msgstr "Kirjeteksti"
 
-#: lib/layouts/g-brief-de.layout:25
+#: lib/layouts/g-brief-de.layout:26
 msgid "Text:"
 msgstr "Teksti:"
 
-#: lib/layouts/g-brief-de.layout:34 lib/layouts/g-brief-en.layout:34
+#: lib/layouts/g-brief-de.layout:35 lib/layouts/g-brief-en.layout:35
 #: lib/layouts/g-brief2.layout:57 lib/layouts/scrlettr.layout:116
 #: lib/layouts/scrlttr2.layout:144 lib/layouts/agu_stdtitle.inc:184
 msgid "Name"
 msgstr "Nimi"
 
-#: lib/layouts/g-brief-de.layout:44 lib/layouts/g-brief-en.layout:44
+#: lib/layouts/g-brief-de.layout:45 lib/layouts/g-brief-en.layout:45
 #: lib/layouts/g-brief2.layout:67 lib/layouts/scrlettr.layout:128
 #: lib/layouts/agu_stdtitle.inc:188
 msgid "Name:"
 msgstr "Nimi:"
 
-#: lib/layouts/g-brief-de.layout:53
+#: lib/layouts/g-brief-de.layout:54
 msgid "Unterschrift"
 msgstr "Allekirjoitus"
 
-#: lib/layouts/g-brief-de.layout:60
+#: lib/layouts/g-brief-de.layout:61
 msgid "Strasse"
 msgstr "Katu"
 
-#: lib/layouts/g-brief-de.layout:63
+#: lib/layouts/g-brief-de.layout:64
 msgid "Strasse:"
 msgstr "Katu:"
 
-#: lib/layouts/g-brief-de.layout:67
+#: lib/layouts/g-brief-de.layout:68
 msgid "Zusatz"
 msgstr "Lisäys"
 
-#: lib/layouts/g-brief-de.layout:70
+#: lib/layouts/g-brief-de.layout:71
 msgid "Zusatz:"
 msgstr "Lisäys:"
 
-#: lib/layouts/g-brief-de.layout:74
+#: lib/layouts/g-brief-de.layout:75
 msgid "Ort"
 msgstr "Postitoimipaikka"
 
-#: lib/layouts/g-brief-de.layout:77
+#: lib/layouts/g-brief-de.layout:78
 msgid "Ort:"
 msgstr "Postitoimipaikka:"
 
-#: lib/layouts/g-brief-de.layout:81
+#: lib/layouts/g-brief-de.layout:82
 msgid "Land"
 msgstr "Maa"
 
-#: lib/layouts/g-brief-de.layout:84
+#: lib/layouts/g-brief-de.layout:85
 msgid "Land:"
 msgstr "Maa:"
 
-#: lib/layouts/g-brief-de.layout:88
+#: lib/layouts/g-brief-de.layout:89
 msgid "RetourAdresse"
 msgstr "Palautusosoite"
 
-#: lib/layouts/g-brief-de.layout:91
+#: lib/layouts/g-brief-de.layout:92
 msgid "RetourAdresse:"
 msgstr "Palautusosoite:"
 
-#: lib/layouts/g-brief-de.layout:95
+#: lib/layouts/g-brief-de.layout:96
 msgid "MeinZeichen"
 msgstr "Merkintöni"
 
-#: lib/layouts/g-brief-de.layout:98
+#: lib/layouts/g-brief-de.layout:99
 msgid "MeinZeichen:"
 msgstr "Merkintöni:"
 
-#: lib/layouts/g-brief-de.layout:102
+#: lib/layouts/g-brief-de.layout:103
 msgid "IhrZeichen"
 msgstr "Merkintönne"
 
-#: lib/layouts/g-brief-de.layout:105
+#: lib/layouts/g-brief-de.layout:106
 msgid "IhrZeichen:"
 msgstr "Merkintönne:"
 
-#: lib/layouts/g-brief-de.layout:109
+#: lib/layouts/g-brief-de.layout:110
 msgid "IhrSchreiben"
 msgstr "Kirjoituksenne"
 
-#: lib/layouts/g-brief-de.layout:112
+#: lib/layouts/g-brief-de.layout:113
 msgid "IhrSchreiben:"
 msgstr "Kirjoituksenne:"
 
-#: lib/layouts/g-brief-de.layout:116
+#: lib/layouts/g-brief-de.layout:117
 msgid "Telefon"
 msgstr "Puhelin"
 
-#: lib/layouts/g-brief-de.layout:119
+#: lib/layouts/g-brief-de.layout:120
 msgid "Telefon:"
 msgstr "Puhelin:"
 
-#: lib/layouts/g-brief-de.layout:123 lib/layouts/g-brief-en.layout:123
+#: lib/layouts/g-brief-de.layout:124 lib/layouts/g-brief-en.layout:124
 msgid "Telefax"
 msgstr "Faksi"
 
-#: lib/layouts/g-brief-de.layout:126 lib/layouts/g-brief-en.layout:126
+#: lib/layouts/g-brief-de.layout:127 lib/layouts/g-brief-en.layout:127
 msgid "Telefax:"
 msgstr "Faksi:"
 
-#: lib/layouts/g-brief-de.layout:130 lib/layouts/g-brief-en.layout:130
+#: lib/layouts/g-brief-de.layout:131 lib/layouts/g-brief-en.layout:131
 msgid "Telex"
 msgstr "Telex"
 
-#: lib/layouts/g-brief-de.layout:133 lib/layouts/g-brief-en.layout:133
+#: lib/layouts/g-brief-de.layout:134 lib/layouts/g-brief-en.layout:134
 msgid "Telex:"
 msgstr "Telex:"
 
-#: lib/layouts/g-brief-de.layout:137 lib/layouts/g-brief-en.layout:137
+#: lib/layouts/g-brief-de.layout:138 lib/layouts/g-brief-en.layout:138
 msgid "EMail"
 msgstr "Sähköposti"
 
-#: lib/layouts/g-brief-de.layout:140 lib/layouts/g-brief-en.layout:140
+#: lib/layouts/g-brief-de.layout:141 lib/layouts/g-brief-en.layout:141
 msgid "EMail:"
 msgstr "Sähköposti:"
 
-#: lib/layouts/g-brief-de.layout:144 lib/layouts/g-brief-en.layout:144
+#: lib/layouts/g-brief-de.layout:145 lib/layouts/g-brief-en.layout:145
 msgid "HTTP"
 msgstr "HTTP"
 
-#: lib/layouts/g-brief-de.layout:147 lib/layouts/g-brief-en.layout:147
+#: lib/layouts/g-brief-de.layout:148 lib/layouts/g-brief-en.layout:148
 msgid "HTTP:"
 msgstr "HTTP:"
 
-#: lib/layouts/g-brief-de.layout:151 lib/layouts/g-brief-en.layout:151
+#: lib/layouts/g-brief-de.layout:152 lib/layouts/g-brief-en.layout:152
 #: lib/layouts/scrlttr2.layout:215
 msgid "Bank"
 msgstr "Pankki"
 
-#: lib/layouts/g-brief-de.layout:154 lib/layouts/g-brief-en.layout:154
+#: lib/layouts/g-brief-de.layout:155 lib/layouts/g-brief-en.layout:155
 #: lib/layouts/scrlttr2.layout:219
 msgid "Bank:"
 msgstr "Pankki:"
 
-#: lib/layouts/g-brief-de.layout:158
+#: lib/layouts/g-brief-de.layout:159
 msgid "BLZ"
 msgstr ""
 
-#: lib/layouts/g-brief-de.layout:161
-#, fuzzy
+#: lib/layouts/g-brief-de.layout:162
 msgid "BLZ:"
 msgstr ""
 
-#: lib/layouts/g-brief-de.layout:165
+#: lib/layouts/g-brief-de.layout:166
 msgid "Konto"
 msgstr "Tili"
 
-#: lib/layouts/g-brief-de.layout:168
+#: lib/layouts/g-brief-de.layout:169
 msgid "Konto:"
 msgstr "Tili:"
 
-#: lib/layouts/g-brief-de.layout:172
+#: lib/layouts/g-brief-de.layout:173
 msgid "Postvermerk"
 msgstr "Postimerkintä"
 
-#: lib/layouts/g-brief-de.layout:175
+#: lib/layouts/g-brief-de.layout:176
 msgid "Postvermerk:"
 msgstr "Postimerkintä:"
 
-#: lib/layouts/g-brief-de.layout:179
+#: lib/layouts/g-brief-de.layout:180
 msgid "Adresse"
 msgstr "Osoite"
 
-#: lib/layouts/g-brief-de.layout:204
+#: lib/layouts/g-brief-de.layout:205
 msgid "Anrede"
 msgstr "Puhuttelu"
 
-#: lib/layouts/g-brief-de.layout:213
+#: lib/layouts/g-brief-de.layout:214
 msgid "Anlagen"
 msgstr ""
 
-#: lib/layouts/g-brief-de.layout:221
+#: lib/layouts/g-brief-de.layout:222
 msgid "Verteiler"
 msgstr "Jakelija"
 
-#: lib/layouts/g-brief-de.layout:230
+#: lib/layouts/g-brief-de.layout:231
 msgid "Gruss"
 msgstr "Lopuksi"
 
-#: lib/layouts/g-brief-en.layout:16 lib/layouts/g-brief2.layout:38
+#: lib/layouts/g-brief-en.layout:17 lib/layouts/g-brief2.layout:38
 #: lib/layouts/iopart.layout:115 lib/layouts/scrlettr.layout:40
 msgid "Letter"
 msgstr "Kirje"
 
-#: lib/layouts/g-brief-en.layout:25 lib/layouts/g-brief2.layout:48
+#: lib/layouts/g-brief-en.layout:26 lib/layouts/g-brief2.layout:48
 msgid "Letter:"
 msgstr "Kirje:"
 
-#: lib/layouts/g-brief-en.layout:56 lib/layouts/g-brief2.layout:901
+#: lib/layouts/g-brief-en.layout:57 lib/layouts/g-brief2.layout:901
 #: lib/layouts/scrlettr.layout:140 lib/layouts/scrlttr2.layout:171
 #: lib/layouts/stdletter.inc:84
 msgid "Signature:"
 msgstr "Allekirjoitus:"
 
-#: lib/layouts/g-brief-en.layout:60
+#: lib/layouts/g-brief-en.layout:61 lib/layouts/agu_stdtitle.inc:439
 msgid "Street"
 msgstr "Katu"
 
-#: lib/layouts/g-brief-en.layout:63
+#: lib/layouts/g-brief-en.layout:64
 msgid "Street:"
 msgstr "Katu:"
 
-#: lib/layouts/g-brief-en.layout:67
+#: lib/layouts/g-brief-en.layout:68
 msgid "Addition"
 msgstr "Lisäys"
 
-#: lib/layouts/g-brief-en.layout:70
+#: lib/layouts/g-brief-en.layout:71
 msgid "Addition:"
 msgstr "Lisäys:"
 
-#: lib/layouts/g-brief-en.layout:74
+#: lib/layouts/g-brief-en.layout:75
 msgid "Town"
 msgstr "Kaupunki"
 
-#: lib/layouts/g-brief-en.layout:77
+#: lib/layouts/g-brief-en.layout:78
 msgid "Town:"
 msgstr "Kaupunki:"
 
-#: lib/layouts/g-brief-en.layout:81
+#: lib/layouts/g-brief-en.layout:82 lib/layouts/agu_stdtitle.inc:461
 msgid "State"
 msgstr "Maa"
 
-#: lib/layouts/g-brief-en.layout:84
+#: lib/layouts/g-brief-en.layout:85
 msgid "State:"
 msgstr "Maa:"
 
-#: lib/layouts/g-brief-en.layout:88 lib/layouts/g-brief2.layout:674
+#: lib/layouts/g-brief-en.layout:89 lib/layouts/g-brief2.layout:674
 msgid "ReturnAddress"
 msgstr "Palautusosoite"
 
-#: lib/layouts/g-brief-en.layout:91 lib/layouts/g-brief2.layout:685
+#: lib/layouts/g-brief-en.layout:92 lib/layouts/g-brief2.layout:685
 msgid "ReturnAddress:"
 msgstr "Palautusosoite:"
 
-#: lib/layouts/g-brief-en.layout:95 lib/layouts/g-brief2.layout:736
+#: lib/layouts/g-brief-en.layout:96 lib/layouts/g-brief2.layout:736
 msgid "MyRef"
 msgstr "Viitteeni"
 
-#: lib/layouts/g-brief-en.layout:98 lib/layouts/g-brief2.layout:747
+#: lib/layouts/g-brief-en.layout:99 lib/layouts/g-brief2.layout:747
 msgid "MyRef:"
 msgstr "Viitteeni:"
 
-#: lib/layouts/g-brief-en.layout:102 lib/layouts/g-brief2.layout:757
+#: lib/layouts/g-brief-en.layout:103 lib/layouts/g-brief2.layout:757
 msgid "YourRef"
 msgstr "Viitteesi"
 
-#: lib/layouts/g-brief-en.layout:105 lib/layouts/g-brief2.layout:768
+#: lib/layouts/g-brief-en.layout:106 lib/layouts/g-brief2.layout:768
 msgid "YourRef:"
 msgstr "Viitteesi:"
 
-#: lib/layouts/g-brief-en.layout:109 lib/layouts/g-brief2.layout:779
+#: lib/layouts/g-brief-en.layout:110 lib/layouts/g-brief2.layout:779
 msgid "YourMail"
 msgstr "Vastaanottajan osoite"
 
-#: lib/layouts/g-brief-en.layout:112 lib/layouts/g-brief2.layout:789
+#: lib/layouts/g-brief-en.layout:113 lib/layouts/g-brief2.layout:789
 msgid "YourMail:"
 msgstr "Vastaanottajan osoite:"
 
-#: lib/layouts/g-brief-en.layout:116
+#: lib/layouts/g-brief-en.layout:117
 msgid "Phone"
 msgstr "Puhelin"
 
-#: lib/layouts/g-brief-en.layout:119
+#: lib/layouts/g-brief-en.layout:120
 msgid "Phone:"
 msgstr "Puhelin:"
 
-#: lib/layouts/g-brief-en.layout:158
+#: lib/layouts/g-brief-en.layout:159
 msgid "BankCode"
 msgstr "Pankkikoodi"
 
-#: lib/layouts/g-brief-en.layout:161
+#: lib/layouts/g-brief-en.layout:162
 msgid "BankCode:"
 msgstr "Pankkikoodi:"
 
-#: lib/layouts/g-brief-en.layout:165
+#: lib/layouts/g-brief-en.layout:166
 msgid "BankAccount"
 msgstr "Pankkitili"
 
-#: lib/layouts/g-brief-en.layout:168
+#: lib/layouts/g-brief-en.layout:169
 msgid "BankAccount:"
 msgstr "Pankkitili:"
 
-#: lib/layouts/g-brief-en.layout:172 lib/layouts/g-brief2.layout:695
+#: lib/layouts/g-brief-en.layout:173 lib/layouts/g-brief2.layout:695
 msgid "PostalComment"
 msgstr "Postihuomautus"
 
-#: lib/layouts/g-brief-en.layout:175 lib/layouts/g-brief2.layout:705
+#: lib/layouts/g-brief-en.layout:176 lib/layouts/g-brief2.layout:705
 msgid "PostalComment:"
 msgstr "Postihuomautus:"
 
-#: lib/layouts/g-brief-en.layout:191 lib/layouts/g-brief2.layout:810
-#: lib/layouts/revtex.layout:108 lib/layouts/revtex4.layout:125
+#: lib/layouts/g-brief-en.layout:192 lib/layouts/g-brief2.layout:810
+#: lib/layouts/revtex.layout:108 lib/layouts/revtex4.layout:126
 #: lib/layouts/scrlettr.layout:168 lib/layouts/scrlttr2.layout:243
 #: lib/layouts/amsdefs.inc:115
 msgid "Date:"
 msgstr "Päiväys:"
 
-#: lib/layouts/g-brief-en.layout:195 lib/layouts/g-brief2.layout:820
+#: lib/layouts/g-brief-en.layout:196 lib/layouts/g-brief2.layout:820
 msgid "Reference"
 msgstr "Viite"
 
-#: lib/layouts/g-brief-en.layout:200 lib/layouts/g-brief2.layout:832
+#: lib/layouts/g-brief-en.layout:201 lib/layouts/g-brief2.layout:832
 msgid "Reference:"
 msgstr "Viite:"
 
-#: lib/layouts/g-brief-en.layout:209 lib/layouts/g-brief2.layout:855
+#: lib/layouts/g-brief-en.layout:210 lib/layouts/g-brief2.layout:855
 #: lib/layouts/scrlttr2.layout:103 lib/layouts/stdletter.inc:63
 msgid "Opening:"
 msgstr "Aloitus:"
 
-#: lib/layouts/g-brief-en.layout:213 lib/layouts/g-brief2.layout:911
+#: lib/layouts/g-brief-en.layout:214 lib/layouts/g-brief2.layout:911
 msgid "Encl."
 msgstr "Liitteet"
 
-#: lib/layouts/g-brief-en.layout:217 lib/layouts/g-brief2.layout:922
+#: lib/layouts/g-brief-en.layout:218 lib/layouts/g-brief2.layout:922
 msgid "Encl.:"
 msgstr "Liitteet:"
 
-#: lib/layouts/g-brief-en.layout:226 lib/layouts/g-brief2.layout:943
+#: lib/layouts/g-brief-en.layout:227 lib/layouts/g-brief2.layout:943
 #: lib/layouts/scrlettr.layout:105 lib/layouts/scrlttr2.layout:133
 #: lib/layouts/stdletter.inc:114
 msgid "cc:"
 msgstr "jakelu:"
 
-#: lib/layouts/g-brief-en.layout:235 lib/layouts/g-brief2.layout:876
+#: lib/layouts/g-brief-en.layout:236 lib/layouts/g-brief2.layout:876
 #: lib/layouts/scrlttr2.layout:117 lib/layouts/stdletter.inc:97
 msgid "Closing:"
 msgstr "Lopuksi:"
@@ -5920,8 +6017,8 @@ msgid "Scene"
 msgstr "Kohtaus"
 
 #: lib/layouts/ijmpc.layout:83 lib/layouts/ijmpd.layout:86
-#: lib/layouts/iopart.layout:204 lib/layouts/kluwer.layout:290
-#: lib/layouts/paper.layout:177 lib/layouts/revtex4.layout:246
+#: lib/layouts/iopart.layout:204 lib/layouts/kluwer.layout:291
+#: lib/layouts/paper.layout:178 lib/layouts/revtex4.layout:247
 #: lib/layouts/spie.layout:46 lib/layouts/agu_stdtitle.inc:123
 msgid "Keywords:"
 msgstr "Avainsanat:"
@@ -5948,7 +6045,7 @@ msgid "Prop \\arabic{prop}."
 msgstr ""
 
 #: lib/layouts/ijmpc.layout:287 lib/layouts/ijmpd.layout:295
-#: lib/layouts/llncs.layout:394 lib/layouts/svjour.inc:457
+#: lib/layouts/llncs.layout:395 lib/layouts/svjour.inc:458
 msgid "Question"
 msgstr "Kysymys"
 
@@ -5974,7 +6071,7 @@ msgstr "M
 
 #: lib/layouts/ijmpd.layout:176
 msgid "Example @Section@.\\arabic{example}."
-msgstr "Esimerkki @Section@.\arabic{example}."
+msgstr "Esimerkki @Section@.\\arabic{example}."
 
 #: lib/layouts/ijmpd.layout:187
 msgid "Remark @Section@.\\arabic{remark}."
@@ -5984,7 +6081,7 @@ msgstr "Huomautus @Section@.\\arabic{remark}."
 msgid "Notation @Section@.\\arabic{notation}."
 msgstr "Merkintätapa @Section@.\\arabic{notation}."
 
-#: lib/layouts/ijmpd.layout:219 lib/layouts/amsmaths.inc:79
+#: lib/layouts/ijmpd.layout:219
 msgid "Theorem @Section@.\\arabic{theorem}."
 msgstr "Väittämä @Section@.\\arabic{theorem}."
 
@@ -6026,7 +6123,7 @@ msgstr "Esikatselu|#E"
 msgid "Topical"
 msgstr "Aihe"
 
-#: lib/layouts/iopart.layout:85 src/insets/InsetNote.cpp:65
+#: lib/layouts/iopart.layout:85 src/insets/InsetNote.cpp:67
 msgid "Comment"
 msgstr "Huomautus"
 
@@ -6044,7 +6141,7 @@ msgstr "V
 msgid "Rapid"
 msgstr ""
 
-#: lib/layouts/iopart.layout:212 lib/layouts/revtex4.layout:230
+#: lib/layouts/iopart.layout:212 lib/layouts/revtex4.layout:231
 msgid "PACS"
 msgstr ""
 
@@ -6087,7 +6184,6 @@ msgid "KEY WORDS:"
 msgstr "AVAINSANAT:"
 
 #: lib/layouts/isprs.layout:135
-#, fuzzy
 msgid "Commission"
 msgstr ""
 
@@ -6095,28 +6191,28 @@ msgstr ""
 msgid "ACKNOWLEDGEMENTS"
 msgstr "KIITOKSET"
 
-#: lib/layouts/kluwer.layout:194
+#: lib/layouts/kluwer.layout:195
 msgid "AddressForOffprints"
 msgstr "Eripainososoite"
 
-#: lib/layouts/kluwer.layout:203
+#: lib/layouts/kluwer.layout:204
 msgid "Address for Offprints:"
 msgstr "Eripainososoite:"
 
-#: lib/layouts/kluwer.layout:213
+#: lib/layouts/kluwer.layout:214
 msgid "RunningTitle"
 msgstr "Teoksen nimi (jatko)"
 
-#: lib/layouts/kluwer.layout:222 lib/layouts/llncs.layout:159
-#: lib/layouts/svjour.inc:178
+#: lib/layouts/kluwer.layout:223 lib/layouts/llncs.layout:160
+#: lib/layouts/svjour.inc:179
 msgid "Running title:"
 msgstr "Teoksen nimi (jatko):"
 
-#: lib/layouts/kluwer.layout:236
+#: lib/layouts/kluwer.layout:237
 msgid "RunningAuthor"
 msgstr "Tekijä (jatko)"
 
-#: lib/layouts/kluwer.layout:244
+#: lib/layouts/kluwer.layout:245
 msgid "Running author:"
 msgstr "Tekijä (jatko):"
 
@@ -6124,90 +6220,91 @@ msgstr "Tekij
 msgid "E-mail:"
 msgstr "Sähköposti:"
 
-#: lib/layouts/llncs.layout:38 lib/layouts/memoir.layout:46
+#: lib/layouts/llncs.layout:39 lib/layouts/memoir.layout:47
 #: lib/layouts/scrbook.layout:16 lib/layouts/agu_stdsections.inc:21
-#: lib/layouts/db_stdsections.inc:20 lib/layouts/numreport.inc:12
-#: lib/layouts/scrclass.inc:53 lib/layouts/stdsections.inc:31
+#: lib/layouts/db_stdsections.inc:20 lib/layouts/scrclass.inc:54
+#: lib/layouts/stdsections.inc:35
 msgid "Chapter"
 msgstr "Luku"
 
-#: lib/layouts/llncs.layout:144 lib/layouts/svjour.inc:174
+#: lib/layouts/llncs.layout:145 lib/layouts/svjour.inc:175
 msgid "Running LaTeX Title"
 msgstr "LaTeX-teoksen nimi (jatko)"
 
-#: lib/layouts/llncs.layout:168
+#: lib/layouts/llncs.layout:169
 msgid "TOC Title"
 msgstr "SIS Otsikko"
 
-#: lib/layouts/llncs.layout:172
+#: lib/layouts/llncs.layout:173
 msgid "TOC title:"
 msgstr "SIS Otsikko:"
 
-#: lib/layouts/llncs.layout:197 lib/layouts/svjour.inc:203
+#: lib/layouts/llncs.layout:198 lib/layouts/svjour.inc:204
 msgid "Author Running"
 msgstr "Tekijä (jatko)"
 
-#: lib/layouts/llncs.layout:201 lib/layouts/svjour.inc:207
+#: lib/layouts/llncs.layout:202 lib/layouts/svjour.inc:208
 msgid "Author Running:"
 msgstr "Tekijä (jatko):"
 
-#: lib/layouts/llncs.layout:205
+#: lib/layouts/llncs.layout:206
 msgid "TOC Author"
 msgstr "SIS Tekijä"
 
-#: lib/layouts/llncs.layout:209
+#: lib/layouts/llncs.layout:210
 msgid "TOC Author:"
 msgstr "SIS Tekijä:"
 
-#: lib/layouts/llncs.layout:298
+#: lib/layouts/llncs.layout:299
 msgid "Case #."
 msgstr "Tapaus #."
 
-#: lib/layouts/llncs.layout:315 lib/layouts/svjour.inc:372
+#: lib/layouts/llncs.layout:316 lib/layouts/svjour.inc:373
 msgid "Conjecture #."
 msgstr "Otaksuma #."
 
-#: lib/layouts/llncs.layout:343 lib/layouts/svjour.inc:400
+#: lib/layouts/llncs.layout:344 lib/layouts/svjour.inc:401
 msgid "Example #."
 msgstr "Esimerkki #."
 
-#: lib/layouts/llncs.layout:350 lib/layouts/svjour.inc:407
+#: lib/layouts/llncs.layout:351 lib/layouts/svjour.inc:408
 msgid "Exercise #."
 msgstr "Harjoitus #."
 
-#: lib/layouts/llncs.layout:363 lib/layouts/svjour.inc:425
+#: lib/layouts/llncs.layout:364 lib/layouts/svjour.inc:426
 msgid "Note #."
 msgstr "Muistiinpano #"
 
-#: lib/layouts/llncs.layout:370 lib/layouts/svjour.inc:432
+#: lib/layouts/llncs.layout:371 lib/layouts/svjour.inc:433
 msgid "Problem #."
 msgstr "Ongelma #."
 
-#: lib/layouts/llncs.layout:381 lib/layouts/svjour.inc:443
+#: lib/layouts/llncs.layout:382 lib/layouts/svjour.inc:444
 msgid "Property"
 msgstr "Ominaisuus"
 
-#: lib/layouts/llncs.layout:384 lib/layouts/svjour.inc:446
+#: lib/layouts/llncs.layout:385 lib/layouts/svjour.inc:447
 msgid "Property #."
 msgstr "Ominaisuus #."
 
-#: lib/layouts/llncs.layout:397 lib/layouts/svjour.inc:460
+#: lib/layouts/llncs.layout:398 lib/layouts/svjour.inc:461
 msgid "Question #."
 msgstr "Kysymys #."
 
-#: lib/layouts/llncs.layout:404 lib/layouts/svjour.inc:467
+#: lib/layouts/llncs.layout:405 lib/layouts/svjour.inc:468
 msgid "Remark #."
 msgstr "Huomautus #."
 
-#: lib/layouts/llncs.layout:408 lib/layouts/svjour.inc:471
+#: lib/layouts/llncs.layout:409 lib/layouts/svjour.inc:472
 msgid "Solution"
 msgstr "Ratkaisu"
 
-#: lib/layouts/llncs.layout:411 lib/layouts/svjour.inc:474
+#: lib/layouts/llncs.layout:412 lib/layouts/svjour.inc:475
 msgid "Solution #."
 msgstr "Ratkaisu #."
 
-#: lib/layouts/manpage.layout:145 lib/layouts/db_lyxmacros.inc:11
+#: lib/layouts/manpage.layout:145 lib/layouts/agu_stdtitle.inc:382
+#: lib/layouts/db_lyxmacros.inc:11
 msgid "Code"
 msgstr "Koodi"
 
@@ -6215,23 +6312,23 @@ msgstr "Koodi"
 msgid "SGML"
 msgstr "SGML"
 
-#: lib/layouts/memoir.layout:76
+#: lib/layouts/memoir.layout:77
 msgid "Chapterprecis"
 msgstr "Selostekappale"
 
-#: lib/layouts/memoir.layout:97
+#: lib/layouts/memoir.layout:98
 msgid "Epigraph"
 msgstr "Alkulainaus"
 
-#: lib/layouts/memoir.layout:109
+#: lib/layouts/memoir.layout:110
 msgid "Poemtitle"
 msgstr "Runon otsikko"
 
-#: lib/layouts/memoir.layout:127
+#: lib/layouts/memoir.layout:128
 msgid "Poemtitle*"
 msgstr "Runon otsikko*"
 
-#: lib/layouts/memoir.layout:151
+#: lib/layouts/memoir.layout:152
 msgid "Legend"
 msgstr "Legenda"
 
@@ -6287,16 +6384,16 @@ msgstr "SuljeKappale"
 msgid "Close Section"
 msgstr "Sulje kappale"
 
-#: lib/layouts/paper.layout:152
+#: lib/layouts/paper.layout:153
 msgid "SubTitle"
 msgstr "Alaotsikko"
 
-#: lib/layouts/paper.layout:163
+#: lib/layouts/paper.layout:164
 msgid "Institution"
 msgstr "Laitos"
 
 #: lib/layouts/powerdot.layout:119 lib/layouts/seminar.layout:67
-#: lib/layouts/slides.layout:88
+#: lib/layouts/slides.layout:89
 msgid "Slide"
 msgstr "Kalvo"
 
@@ -6336,40 +6433,37 @@ msgstr "NumeroituluetteloTyyppi1"
 msgid "List of Algorithms"
 msgstr "Algoritmien taulukko"
 
-#: lib/layouts/revtex4.layout:94
+#: lib/layouts/revtex4.layout:95
 msgid "Preprint"
 msgstr "Esipainos"
 
-#: lib/layouts/revtex4.layout:153 lib/layouts/revtex4.layout:158
+#: lib/layouts/revtex4.layout:154 lib/layouts/revtex4.layout:159
 msgid "AltAffiliation"
 msgstr "Vaiht. järjestö"
 
-#: lib/layouts/revtex4.layout:174 lib/layouts/amsdefs.inc:205
+#: lib/layouts/revtex4.layout:175 lib/layouts/amsdefs.inc:205
 msgid "Thanks:"
 msgstr "Kiitokset:"
 
-#: lib/layouts/revtex4.layout:183
+#: lib/layouts/revtex4.layout:184
 msgid "Electronic Address:"
 msgstr "S-postiosoite"
 
-#: lib/layouts/revtex4.layout:220
+#: lib/layouts/revtex4.layout:221
 msgid "acknowledgments"
 msgstr "Kiitokset"
 
-#: lib/layouts/revtex4.layout:237
+#: lib/layouts/revtex4.layout:238
 msgid "PACS number:"
 msgstr "PACS-sivunumero:"
 
 #: lib/layouts/scrbook.layout:17
-msgid "\\arabic{chapter}"
-msgstr ""
-
-#: lib/layouts/scrbook.layout:18
-msgid "\\Alph{chapter}"
-msgstr ""
+#, fuzzy
+msgid "\\thechapter"
+msgstr "Luku"
 
 #: lib/layouts/scrlettr.layout:24 lib/layouts/scrlttr2.layout:25
-#: lib/layouts/scrclass.inc:32
+#: lib/layouts/scrclass.inc:33
 msgid "Labeling"
 msgstr "Nimekkeet"
 
@@ -6446,7 +6540,7 @@ msgid "Title:"
 msgstr "Teoksen nimi:"
 
 #: lib/layouts/scrlettr.layout:200 lib/layouts/scrlttr2.layout:279
-#: lib/layouts/scrclass.inc:168
+#: lib/layouts/scrclass.inc:169
 msgid "Subject"
 msgstr "Aihe"
 
@@ -6602,24 +6696,24 @@ msgstr "Esityksen etenemisluettelo"
 msgid "Progress Contents"
 msgstr "Esityksen etenemisluettelo"
 
-#: lib/layouts/siamltex.layout:52
+#: lib/layouts/siamltex.layout:53
 msgid "."
 msgstr ""
 
-#: lib/layouts/siamltex.layout:102 lib/layouts/aguplus.inc:66
-#: lib/layouts/db_stdstarsections.inc:72 lib/layouts/stdstarsections.inc:57
+#: lib/layouts/siamltex.layout:103 lib/layouts/aguplus.inc:66
+#: lib/layouts/db_stdstarsections.inc:72 lib/layouts/stdstarsections.inc:62
 msgid "Paragraph*"
 msgstr "Osakappale*"
 
-#: lib/layouts/siamltex.layout:172
+#: lib/layouts/siamltex.layout:173
 msgid "Key words."
 msgstr "Avainsanat."
 
-#: lib/layouts/siamltex.layout:176
+#: lib/layouts/siamltex.layout:177
 msgid "AMS"
 msgstr "AMS"
 
-#: lib/layouts/siamltex.layout:179
+#: lib/layouts/siamltex.layout:180
 msgid "AMS subject classifications."
 msgstr "AMS aihekategoriat."
 
@@ -6631,35 +6725,35 @@ msgstr "Aihe"
 msgid "MMMMM"
 msgstr ""
 
-#: lib/layouts/slides.layout:104
+#: lib/layouts/slides.layout:105
 msgid "New Slide:"
 msgstr "Uusi kalvo"
 
-#: lib/layouts/slides.layout:126
+#: lib/layouts/slides.layout:127
 msgid "Overlay"
 msgstr "Kalvokerros"
 
-#: lib/layouts/slides.layout:142
+#: lib/layouts/slides.layout:143
 msgid "New Overlay:"
 msgstr "uusi kalvokerros"
 
-#: lib/layouts/slides.layout:183
+#: lib/layouts/slides.layout:184
 msgid "New Note:"
 msgstr "Uusi muistiinpano:"
 
-#: lib/layouts/slides.layout:208
+#: lib/layouts/slides.layout:209
 msgid "InvisibleText"
 msgstr "Näkymätön_teksti"
 
-#: lib/layouts/slides.layout:216
+#: lib/layouts/slides.layout:217
 msgid "<Invisible Text Follows>"
 msgstr "<Näkymätön teksti seuraa>"
 
-#: lib/layouts/slides.layout:233
+#: lib/layouts/slides.layout:234
 msgid "VisibleText"
 msgstr "Näkyvä teksti"
 
-#: lib/layouts/slides.layout:241
+#: lib/layouts/slides.layout:242
 msgid "<Visible Text Follows>"
 msgstr "<Näkyvä teksti seuraa>"
 
@@ -6687,6 +6781,73 @@ msgstr "S
 msgid "Thesaurus not supported in recent A&A:"
 msgstr "Thesaurusta ei tueta uusimmassa A&A:ssa:"
 
+#: lib/layouts/agu_stdclass.inc:37 lib/layouts/db_stdcharstyles.inc:37
+#, fuzzy
+msgid "Firstname"
+msgstr "Etunimi"
+
+#: lib/layouts/agu_stdclass.inc:51
+#, fuzzy
+msgid "Fname"
+msgstr "Parametrit"
+
+#: lib/layouts/agu_stdclass.inc:66 lib/layouts/db_stdcharstyles.inc:48
+#: lib/layouts/db_stdtitle.inc:101
+msgid "Surname"
+msgstr "Sukunimi"
+
+#: lib/layouts/agu_stdclass.inc:96 lib/layouts/db_stdcharstyles.inc:59
+#: lib/layouts/db_stdlayouts.inc:11
+msgid "Literal"
+msgstr "Sanatarkasti"
+
+#: lib/layouts/agu_stdclass.inc:111
+#: src/frontends/controllers/frontend_helpers.cpp:219
+msgid "Emph"
+msgstr "Korostus"
+
+#: lib/layouts/agu_stdclass.inc:127
+#, fuzzy
+msgid "Abbrev"
+msgstr "Esikatselu|#E"
+
+#: lib/layouts/agu_stdclass.inc:138 lib/layouts/agu_stdtitle.inc:56
+msgid "Citation-number"
+msgstr "Lähdeviitteen nro"
+
+#: lib/layouts/agu_stdclass.inc:149
+#, fuzzy
+msgid "Volume"
+msgstr "Palstoja"
+
+#: lib/layouts/agu_stdclass.inc:160
+#, fuzzy
+msgid "Day"
+msgstr "Näyttö"
+
+#: lib/layouts/agu_stdclass.inc:171
+#, fuzzy
+msgid "Month"
+msgstr "Matematiikka"
+
+#: lib/layouts/agu_stdclass.inc:182
+#, fuzzy
+msgid "Year"
+msgstr "&Tyhjennä"
+
+#: lib/layouts/agu_stdclass.inc:193
+#, fuzzy
+msgid "Issue-number"
+msgstr "msnumero"
+
+#: lib/layouts/agu_stdclass.inc:204
+msgid "Issue-day"
+msgstr ""
+
+#: lib/layouts/agu_stdclass.inc:215
+msgid "Issue-months"
+msgstr ""
+
 #: lib/layouts/agu_stdsections.inc:79
 msgid "Subsubparagraph"
 msgstr "Alialiosakappale"
@@ -6715,10 +6876,6 @@ msgstr "AGU-lehti"
 msgid "AGU-journal:"
 msgstr "AGU-lehti:"
 
-#: lib/layouts/agu_stdtitle.inc:56
-msgid "Citation-number"
-msgstr "Lähdeviitteen nro"
-
 #: lib/layouts/agu_stdtitle.inc:59
 msgid "Citation-number:"
 msgstr "Lähdeviitteen nro:"
@@ -6828,7 +6985,7 @@ msgstr "Juokseva otsikko:"
 msgid "Published-online:"
 msgstr "Julkaistu-verkkoon:"
 
-#: lib/layouts/agu_stdtitle.inc:263 src/frontends/qt4/QCitationDialog.cpp:41
+#: lib/layouts/agu_stdtitle.inc:263 src/frontends/qt4/GuiCitationDialog.cpp:47
 msgid "Citation"
 msgstr "Lähdeviite"
 
@@ -6884,6 +7041,58 @@ msgstr "Datajoukot"
 msgid "Datasets:"
 msgstr "Datajoukot:"
 
+#: lib/layouts/agu_stdtitle.inc:323
+msgid "ISSN"
+msgstr ""
+
+#: lib/layouts/agu_stdtitle.inc:334
+#, fuzzy
+msgid "CODEN"
+msgstr "KOHTAUS"
+
+#: lib/layouts/agu_stdtitle.inc:346
+#, fuzzy
+msgid "SS-Code"
+msgstr "Koodi"
+
+#: lib/layouts/agu_stdtitle.inc:357
+#, fuzzy
+msgid "SS-Title"
+msgstr "Teoksen nimi"
+
+#: lib/layouts/agu_stdtitle.inc:369
+#, fuzzy
+msgid "CCC-Code"
+msgstr "CCC-koodi:"
+
+#: lib/layouts/agu_stdtitle.inc:393
+msgid "Dscr"
+msgstr ""
+
+#: lib/layouts/agu_stdtitle.inc:417
+msgid "Orgdiv"
+msgstr ""
+
+#: lib/layouts/agu_stdtitle.inc:428
+#, fuzzy
+msgid "Orgname"
+msgstr "Sukunimi"
+
+#: lib/layouts/agu_stdtitle.inc:450
+#, fuzzy
+msgid "City"
+msgstr "Pikkuruinen"
+
+#: lib/layouts/agu_stdtitle.inc:472
+#, fuzzy
+msgid "Postcode"
+msgstr "Liitä"
+
+#: lib/layouts/agu_stdtitle.inc:483
+#, fuzzy
+msgid "Country"
+msgstr "Kohta"
+
 #: lib/layouts/aguplus.inc:131
 msgid "CCC"
 msgstr "CCC"
@@ -6953,7 +7162,7 @@ msgstr "Avainsanat ja -virkkeet:"
 msgid "Dedicatory"
 msgstr "Omistuskirjoitus"
 
-#: lib/layouts/amsdefs.inc:212 lib/layouts/svjour.inc:125
+#: lib/layouts/amsdefs.inc:212 lib/layouts/svjour.inc:126
 msgid "Dedication:"
 msgstr "Omistuskirjoitus:"
 
@@ -6977,148 +7186,207 @@ msgstr "1991 Matematiikan aihekategoriat:"
 msgid "Algorithm #."
 msgstr "Algoritmi #."
 
-#: lib/layouts/amsmaths.inc:106
-msgid "Corollary @Section@.\\arabic{theorem}."
-msgstr "Seurauslause @Section@.\\arabic{theorem}."
-
-#: lib/layouts/amsmaths.inc:128
-msgid "Lemma @Section@.\\arabic{theorem}."
+#: lib/layouts/amsmaths.inc:79 lib/layouts/theorems-ams.inc:21
+#, fuzzy
+msgid "Theorem \\thetheorem."
+msgstr "Väittämä \\arabic{theorem}."
+
+#: lib/layouts/amsmaths.inc:106 lib/layouts/theorems-ams.inc:48
+#: lib/layouts/theorems.inc:53
+#, fuzzy
+msgid "Corollary \\thetheorem."
+msgstr "Seurauslause \\arabic{theorem}"
+
+#: lib/layouts/amsmaths.inc:128 lib/layouts/theorems-ams.inc:70
+#: lib/layouts/theorems.inc:62
+msgid "Lemma \\thetheorem."
 msgstr ""
 
-#: lib/layouts/amsmaths.inc:150
-msgid "Proposition @Section@.\\arabic{theorem}."
-msgstr "Väittämä @Section@.\arabic{theorem}."
+#: lib/layouts/amsmaths.inc:150 lib/layouts/theorems-ams.inc:92
+#: lib/layouts/theorems.inc:71
+#, fuzzy
+msgid "Proposition \\thetheorem."
+msgstr "Väittämä \\arabic{theorem}."
 
-#: lib/layouts/amsmaths.inc:172
-msgid "Conjecture @Section@.\\arabic{theorem}."
-msgstr "Otaksuma @Section@.\\arabic{theorem}."
+#: lib/layouts/amsmaths.inc:172 lib/layouts/theorems-ams.inc:114
+#: lib/layouts/theorems.inc:80
+#, fuzzy
+msgid "Conjecture \\thetheorem."
+msgstr "Otaksuma \\arabic{theorem}"
 
-#: lib/layouts/amsmaths.inc:180
+#: lib/layouts/amsmaths.inc:180 lib/layouts/theorems-ams.inc:122
 msgid "Conjecture*"
 msgstr "Otaksuma*"
 
-#: lib/layouts/amsmaths.inc:194
-msgid "Criterion @Section@.\\arabic{theorem}."
-msgstr "Kriteeri @Section@.\\arabic{theorem}"
+#: lib/layouts/amsmaths.inc:194 lib/layouts/theorems-ams.inc:136
+#, fuzzy
+msgid "Criterion \\thetheorem."
+msgstr "Kriteeri \\arabic{theorem]."
+
+#: lib/layouts/amsmaths.inc:205 lib/layouts/theorems-ams.inc:147
+#, fuzzy
+msgid "Algorithm \\thetheorem."
+msgstr "Algoritmi #."
 
-#: lib/layouts/amsmaths.inc:205
-msgid "Algorithm @Section@.\\arabic{theorem}."
+#: lib/layouts/amsmaths.inc:216 lib/layouts/theorems-ams.inc:158
+#: lib/layouts/theorems.inc:89
+msgid "Fact \\thetheorem."
 msgstr ""
 
-#: lib/layouts/amsmaths.inc:216
-msgid "Fact @Section@.\\arabic{theorem}."
-msgstr "Fakta @Section@.\\arabic{theorem}."
-
-#: lib/layouts/amsmaths.inc:224
+#: lib/layouts/amsmaths.inc:224 lib/layouts/theorems-ams.inc:166
 msgid "Fact*"
 msgstr "Fakta*"
 
-#: lib/layouts/amsmaths.inc:238
-msgid "Axiom @Section@.\\arabic{theorem}."
-msgstr "Aksiooma @Section@.\\arabic{theorem}."
+#: lib/layouts/amsmaths.inc:238 lib/layouts/theorems-ams.inc:180
+msgid "Axiom \\thetheorem."
+msgstr ""
 
-#: lib/layouts/amsmaths.inc:249
-msgid "Definition @Section@.\\arabic{theorem}."
-msgstr "Määritelmä @Section@.\\arabic{theorem}."
+#: lib/layouts/amsmaths.inc:249 lib/layouts/theorems-ams.inc:191
+#: lib/layouts/theorems.inc:98
+#, fuzzy
+msgid "Definition \\thetheorem."
+msgstr "Määritelmä \\arabic{theorem}"
 
-#: lib/layouts/amsmaths.inc:279
-msgid "Example @Section@.\\arabic{theorem}."
-msgstr "Esimerkki @Section@.\\arabic{theorem}."
+#: lib/layouts/amsmaths.inc:279 lib/layouts/theorems-ams.inc:221
+#: lib/layouts/theorems.inc:115
+#, fuzzy
+msgid "Example \\thetheorem."
+msgstr "Esimerkki \\arabic{theorem}"
 
-#: lib/layouts/amsmaths.inc:287
+#: lib/layouts/amsmaths.inc:287 lib/layouts/theorems-ams.inc:229
 msgid "Example*"
 msgstr "Esimerkki*"
 
-#: lib/layouts/amsmaths.inc:301
-msgid "Condition @Section@.\\arabic{theorem}."
-msgstr ""
+#: lib/layouts/amsmaths.inc:301 lib/layouts/theorems-ams.inc:243
+#, fuzzy
+msgid "Condition \\thetheorem."
+msgstr "Ehto."
 
-#: lib/layouts/amsmaths.inc:309
+#: lib/layouts/amsmaths.inc:309 lib/layouts/theorems-ams.inc:251
 msgid "Condition*"
 msgstr "Ehto*"
 
-#: lib/layouts/amsmaths.inc:323
-msgid "Problem @Section@.\\arabic{theorem}."
-msgstr ""
+#: lib/layouts/amsmaths.inc:323 lib/layouts/theorems-ams.inc:265
+#, fuzzy
+msgid "Problem \\thetheorem."
+msgstr "Ongelma \\arabic{theorem}"
 
-#: lib/layouts/amsmaths.inc:331
+#: lib/layouts/amsmaths.inc:331 lib/layouts/theorems-ams.inc:273
 msgid "Problem*"
 msgstr "Ongelma*"
 
-#: lib/layouts/amsmaths.inc:345
-msgid "Exercise @Section@.\\arabic{theorem}."
-msgstr ""
+#: lib/layouts/amsmaths.inc:345 lib/layouts/theorems-ams.inc:287
+#: lib/layouts/theorems.inc:125
+#, fuzzy
+msgid "Exercise \\thetheorem."
+msgstr "Harjoitus \\arabic{exercise}."
 
-#: lib/layouts/amsmaths.inc:354
+#: lib/layouts/amsmaths.inc:354 lib/layouts/theorems-ams.inc:296
 #, fuzzy
 msgid "Exercise*"
 msgstr "Harjoitus"
 
-#: lib/layouts/amsmaths.inc:368
-msgid "Remark @Section@.\\arabic{theorem}."
-msgstr ""
+#: lib/layouts/amsmaths.inc:368 lib/layouts/theorems-ams.inc:310
+#: lib/layouts/theorems.inc:135
+#, fuzzy
+msgid "Remark \\thetheorem."
+msgstr "Huomautus \\arabic{theorem}"
 
-#: lib/layouts/amsmaths.inc:384
+#: lib/layouts/amsmaths.inc:384 lib/layouts/theorems-ams.inc:326
 msgid "Remark*"
 msgstr "Huomautus*"
 
-#: lib/layouts/amsmaths.inc:399
-msgid "Claim @Section@.\\arabic{theorem}."
+#: lib/layouts/amsmaths.inc:399 lib/layouts/theorems-ams.inc:341
+#: lib/layouts/theorems.inc:153
+msgid "Claim \\thetheorem."
 msgstr ""
 
-#: lib/layouts/amsmaths.inc:407
+#: lib/layouts/amsmaths.inc:407 lib/layouts/theorems-ams.inc:349
 msgid "Claim*"
 msgstr "Väite*"
 
-#: lib/layouts/amsmaths.inc:421
-msgid "Note @Section@.\\arabic{theorem}."
+#: lib/layouts/amsmaths.inc:421 lib/layouts/theorems-ams.inc:363
+msgid "Note \\thetheorem."
 msgstr ""
 
-#: lib/layouts/amsmaths.inc:429
+#: lib/layouts/amsmaths.inc:429 lib/layouts/theorems-ams.inc:371
 msgid "Note*"
 msgstr "Muistiinpano*"
 
-#: lib/layouts/amsmaths.inc:443
-msgid "Notation @Section@.\\arabic{theorem}."
+#: lib/layouts/amsmaths.inc:443 lib/layouts/theorems-ams.inc:385
+#, fuzzy
+msgid "Notation \\thetheorem."
 msgstr "Merkintätapa @Section@.\\arabic{theorem}."
 
-#: lib/layouts/amsmaths.inc:451
+#: lib/layouts/amsmaths.inc:451 lib/layouts/theorems-ams.inc:393
 msgid "Notation*"
 msgstr "Merkintätapa*"
 
-#: lib/layouts/amsmaths.inc:465
-msgid "Summary @Section@.\\arabic{theorem}."
+#: lib/layouts/amsmaths.inc:465 lib/layouts/theorems-ams.inc:407
+#, fuzzy
+msgid "Summary \\thetheorem."
 msgstr "Yhteenveto @Section@.\\arabic{theorem}."
 
-#: lib/layouts/amsmaths.inc:476
-msgid "Acknowledgement @Section@.\\arabic{theorem}."
-msgstr "Kiitos @Section@.\\arabic{theorem}."
+#: lib/layouts/amsmaths.inc:476 lib/layouts/theorems-ams.inc:418
+#, fuzzy
+msgid "Acknowledgement \\thetheorem."
+msgstr "Kiitos"
 
-#: lib/layouts/amsmaths.inc:484
+#: lib/layouts/amsmaths.inc:484 lib/layouts/theorems-ams.inc:426
 msgid "Acknowledgement*"
 msgstr "Kiitos*"
 
-#: lib/layouts/amsmaths.inc:498
-msgid "Case @Section@.\\arabic{theorem}."
-msgstr "Tapaus @Section@.\\arabic{theorem}."
+#: lib/layouts/amsmaths.inc:498 lib/layouts/theorems-ams.inc:440
+#: lib/layouts/theorems.inc:162
+msgid "Case \\thetheorem."
+msgstr ""
 
-#: lib/layouts/amsmaths.inc:509
-msgid "Conclusion @Section@.\\arabic{theorem}."
+#: lib/layouts/amsmaths.inc:509 lib/layouts/theorems-ams.inc:451
+#: lib/layouts/theorems.inc:172
+#, fuzzy
+msgid "Conclusion \\thetheorem."
 msgstr "Päätelmä @Section@.\\arabic{theorem}."
 
-#: lib/layouts/amsmaths.inc:517
+#: lib/layouts/amsmaths.inc:517 lib/layouts/theorems-ams.inc:459
 msgid "Conclusion*"
 msgstr "Päätelmä*"
 
-#: lib/layouts/db_stdlayouts.inc:11
-msgid "Literal"
-msgstr "Sanatarkasti"
+#: lib/layouts/db_stdcharstyles.inc:22
+#, fuzzy
+msgid "Directory"
+msgstr "Hakemistot"
 
-#: lib/layouts/db_stdstarsections.inc:24 lib/layouts/stdstarsections.inc:21
+#: lib/layouts/db_stdcharstyles.inc:87
+#, fuzzy
+msgid "KeyCombo"
+msgstr "Näppäimistö"
+
+#: lib/layouts/db_stdcharstyles.inc:101
+#, fuzzy
+msgid "KeyCap"
+msgstr "Kuvateksti"
+
+#: lib/layouts/db_stdcharstyles.inc:115
+msgid "GuiMenu"
+msgstr ""
+
+#: lib/layouts/db_stdcharstyles.inc:129
+msgid "GuiMenuItem"
+msgstr ""
+
+#: lib/layouts/db_stdcharstyles.inc:143
+msgid "GuiButton"
+msgstr ""
+
+#: lib/layouts/db_stdcharstyles.inc:157
+msgid "MenuChoice"
+msgstr ""
+
+#: lib/layouts/db_stdstarsections.inc:24 lib/layouts/stdstarsections.inc:22
 msgid "Chapter*"
 msgstr "Luku*"
 
-#: lib/layouts/db_stdstarsections.inc:84 lib/layouts/stdstarsections.inc:66
+#: lib/layouts/db_stdstarsections.inc:84 lib/layouts/stdstarsections.inc:72
 msgid "Subparagraph*"
 msgstr "Aliosakappale*"
 
@@ -7146,49 +7414,22 @@ msgstr "Versiohuomautus"
 msgid "FirstName"
 msgstr "Etunimi"
 
-#: lib/layouts/db_stdtitle.inc:101
-msgid "Surname"
-msgstr "Sukunimi"
-
 #: lib/layouts/literate-scrap.inc:12
 msgid "Scrap"
 msgstr "Koodinpätkä"
 
-#: lib/layouts/numarticle.inc:8
-msgid "Part \\Roman{part}"
-msgstr ""
-
-#: lib/layouts/numarticle.inc:25 lib/layouts/numarticle.inc:26
-msgid "@Section@.\\arabic{subsection}"
-msgstr ""
-
-#: lib/layouts/numarticle.inc:34 lib/layouts/numarticle.inc:35
-msgid "@Subsection@.\\arabic{subsubsection}"
-msgstr ""
-
-#: lib/layouts/numarticle.inc:43 lib/layouts/numarticle.inc:44
-msgid "@Subsubsection@.\\arabic{paragraph}"
-msgstr ""
-
-#: lib/layouts/numarticle.inc:52 lib/layouts/numarticle.inc:53
-msgid "@Paragraph@.\\arabic{subparagraph}"
-msgstr ""
-
-#: lib/layouts/numreport.inc:15
-msgid "Chapter \\arabic{chapter}"
-msgstr ""
-
-#: lib/layouts/numreport.inc:16
-msgid "Appendix \\Alph{chapter}"
+#: lib/layouts/numreport.inc:13
+msgid "\\arabic{chapter}"
 msgstr ""
 
-#: lib/layouts/numreport.inc:22
-msgid "\\arabic{chapter}.\\arabic{section}"
+#: lib/layouts/numreport.inc:14
+msgid "\\Alph{chapter}"
 msgstr ""
 
-#: lib/layouts/numreport.inc:23
-msgid "\\Alph{chapter}.\\arabic{section}"
-msgstr ""
+#: lib/layouts/numreport.inc:48
+#, fuzzy
+msgid "\\arabic{footnote}"
+msgstr "Muistiinpano \\arabic{note}."
 
 #: lib/layouts/numrevtex.inc:9
 msgid "\\Roman{section}."
@@ -7218,66 +7459,136 @@ msgstr ""
 msgid "\\alph{paragraph}."
 msgstr ""
 
-#: lib/layouts/scrclass.inc:98
+#: lib/layouts/scrclass.inc:99
 msgid "Addpart"
 msgstr "Lisäosa"
 
-#: lib/layouts/scrclass.inc:104
+#: lib/layouts/scrclass.inc:105
 msgid "Addchap"
 msgstr "Lisäluku"
 
-#: lib/layouts/scrclass.inc:110
+#: lib/layouts/scrclass.inc:111
 msgid "Addsec"
 msgstr "Lisäkappale"
 
-#: lib/layouts/scrclass.inc:116
+#: lib/layouts/scrclass.inc:117
 msgid "Addchap*"
 msgstr "Lisäluku*"
 
-#: lib/layouts/scrclass.inc:122
+#: lib/layouts/scrclass.inc:123
 msgid "Addsec*"
 msgstr "Lisäkappale*"
 
-#: lib/layouts/scrclass.inc:128
+#: lib/layouts/scrclass.inc:129
 msgid "Minisec"
 msgstr "Pienoiskappale"
 
-#: lib/layouts/scrclass.inc:174
+#: lib/layouts/scrclass.inc:175
 msgid "Publishers"
 msgstr "Julkaisijat"
 
-#: lib/layouts/scrclass.inc:180 lib/layouts/svjour.inc:121
+#: lib/layouts/scrclass.inc:181 lib/layouts/svjour.inc:122
 msgid "Dedication"
 msgstr "Omistuskirjoitus"
 
-#: lib/layouts/scrclass.inc:186
+#: lib/layouts/scrclass.inc:187
 msgid "Titlehead"
 msgstr "Nimisivun ylätunniste"
 
-#: lib/layouts/scrclass.inc:197
+#: lib/layouts/scrclass.inc:198
 msgid "Uppertitleback"
 msgstr "Ylätunnisteteksti"
 
-#: lib/layouts/scrclass.inc:203
+#: lib/layouts/scrclass.inc:204
 msgid "Lowertitleback"
 msgstr "Alatunnisteteksti"
 
-#: lib/layouts/scrclass.inc:209
+#: lib/layouts/scrclass.inc:210
 msgid "Extratitle"
 msgstr "Lisäotsikko"
 
-#: lib/layouts/scrclass.inc:231
+#: lib/layouts/scrclass.inc:232
 msgid "Captionabove"
 msgstr "Kuvateksti yllä"
 
-#: lib/layouts/scrclass.inc:251
+#: lib/layouts/scrclass.inc:252
 msgid "Captionbelow"
 msgstr "Kuvateksti alla"
 
-#: lib/layouts/scrclass.inc:271
+#: lib/layouts/scrclass.inc:272
 msgid "Dictum"
 msgstr "Lausunto"
 
+#: lib/layouts/stdcharstyles.inc:8
+#, fuzzy
+msgid "noun"
+msgstr "ei mikään"
+
+#: lib/layouts/stdcharstyles.inc:22
+#, fuzzy
+msgid "emph"
+msgstr "Korostus"
+
+#: lib/layouts/stdcharstyles.inc:33
+#, fuzzy
+msgid "strong"
+msgstr "Listaus"
+
+#: lib/layouts/stdcharstyles.inc:47
+#, fuzzy
+msgid "code"
+msgstr "Koodi"
+
+#: lib/layouts/stdcharstyles.inc:62
+msgid "UNDEFINED"
+msgstr ""
+
+#: lib/layouts/stdcounters.inc:10
+#, fuzzy
+msgid "\\Roman{part}"
+msgstr "romania"
+
+#: lib/layouts/stdcustom.inc:15
+#, fuzzy
+msgid "endnote"
+msgstr "Yläreunamuistiinpano"
+
+#: lib/layouts/stdinsets.inc:8 src/insets/InsetMarginal.cpp:63
+msgid "margin"
+msgstr "reunahuomautus"
+
+#: lib/layouts/stdinsets.inc:18
+msgid "foot"
+msgstr "alaviite"
+
+#: lib/layouts/stdinsets.inc:28 src/Color.cpp:174
+#, fuzzy
+msgid "comment"
+msgstr "Huomautus"
+
+#: lib/layouts/stdinsets.inc:40 src/Color.cpp:172 src/insets/InsetNote.cpp:290
+msgid "note"
+msgstr "muistiinpano"
+
+#: lib/layouts/stdinsets.inc:51
+#, fuzzy
+msgid "greyedout"
+msgstr "Harmaana"
+
+#: lib/layouts/stdinsets.inc:62
+#, fuzzy
+msgid "framed"
+msgstr "Parametrit"
+
+#: lib/layouts/stdinsets.inc:73
+#, fuzzy
+msgid "shaded"
+msgstr "&Muoto:"
+
+#: lib/layouts/stdinsets.inc:84 src/insets/InsetERT.cpp:384
+msgid "ERT"
+msgstr "ERT"
+
 #: lib/layouts/stdlayouts.inc:64
 msgid "--Separator--"
 msgstr "--Kappaleväli--"
@@ -7286,23 +7597,37 @@ msgstr "--Kappalev
 msgid "--- Separate Environment ---"
 msgstr "--- Koontiympäristö ---"
 
-#: lib/layouts/svjour.inc:97
+#: lib/layouts/stdsections.inc:13
+msgid "Part \\thepart"
+msgstr ""
+
+#: lib/layouts/stdsections.inc:37
+#, fuzzy
+msgid "Chapter \\thechapter"
+msgstr "Harjoitusluku"
+
+#: lib/layouts/stdsections.inc:38
+#, fuzzy
+msgid "Appendix \\thechapter"
+msgstr "Liite \\Alph{section}:"
+
+#: lib/layouts/svjour.inc:98
 msgid "Headnote"
 msgstr "Yläreunamuistiinpano"
 
-#: lib/layouts/svjour.inc:112
+#: lib/layouts/svjour.inc:113
 msgid "Headnote (optional):"
 msgstr "Yläreunamuistiinpano (valinnainen):"
 
-#: lib/layouts/svjour.inc:240
+#: lib/layouts/svjour.inc:241
 msgid "Corr Author:"
 msgstr "Kirjeenvaihtajatekijä:"
 
-#: lib/layouts/svjour.inc:244
+#: lib/layouts/svjour.inc:245
 msgid "Offprints"
 msgstr "Eripainokset"
 
-#: lib/layouts/svjour.inc:248
+#: lib/layouts/svjour.inc:249
 msgid "Offprints:"
 msgstr "Eripainokset:"
 
@@ -7608,63 +7933,63 @@ msgstr "Tallenna|T"
 msgid "Save As...|A"
 msgstr "Tallenna nimellä...|n"
 
-#: lib/ui/classic.ui:54 lib/ui/stdmenus.inc:43
+#: lib/ui/classic.ui:54
 msgid "Revert|R"
 msgstr "Hylkää muutokset|y"
 
-#: lib/ui/classic.ui:55 lib/ui/stdmenus.inc:44
+#: lib/ui/classic.ui:55 lib/ui/stdmenus.inc:45
 msgid "Version Control|V"
 msgstr "Versiohallinta|r"
 
-#: lib/ui/classic.ui:57 lib/ui/stdmenus.inc:46
+#: lib/ui/classic.ui:57 lib/ui/stdmenus.inc:47
 msgid "Import|I"
 msgstr "Tuo|o"
 
-#: lib/ui/classic.ui:58 lib/ui/stdmenus.inc:47
+#: lib/ui/classic.ui:58 lib/ui/stdmenus.inc:48
 msgid "Export|E"
 msgstr "Vie|V"
 
-#: lib/ui/classic.ui:59 lib/ui/stdmenus.inc:48
+#: lib/ui/classic.ui:59 lib/ui/stdmenus.inc:49
 msgid "Print...|P"
 msgstr "Tulosta...|l"
 
-#: lib/ui/classic.ui:60 lib/ui/stdmenus.inc:49
+#: lib/ui/classic.ui:60 lib/ui/stdmenus.inc:50
 msgid "Fax...|F"
 msgstr "Faksaa...|F"
 
-#: lib/ui/classic.ui:62 lib/ui/stdmenus.inc:54
+#: lib/ui/classic.ui:62 lib/ui/stdmenus.inc:55
 msgid "Exit|x"
 msgstr "Lopeta|e"
 
-#: lib/ui/classic.ui:68 lib/ui/stdmenus.inc:62
+#: lib/ui/classic.ui:68 lib/ui/stdmenus.inc:63
 msgid "Register...|R"
 msgstr "Rekisteröi...|R"
 
-#: lib/ui/classic.ui:69 lib/ui/stdmenus.inc:63
+#: lib/ui/classic.ui:69 lib/ui/stdmenus.inc:64
 msgid "Check In Changes...|I"
 msgstr "Kirjaa muutokset...|K"
 
-#: lib/ui/classic.ui:70 lib/ui/stdmenus.inc:64
+#: lib/ui/classic.ui:70 lib/ui/stdmenus.inc:65
 msgid "Check Out for Edit|O"
 msgstr "Kirjaa ulos muokattavaksi|u"
 
-#: lib/ui/classic.ui:71 lib/ui/stdmenus.inc:65
+#: lib/ui/classic.ui:71 lib/ui/stdmenus.inc:66
 msgid "Revert to Last Version|L"
 msgstr "Palauta viimeisin versio|v"
 
-#: lib/ui/classic.ui:72 lib/ui/stdmenus.inc:66
+#: lib/ui/classic.ui:72 lib/ui/stdmenus.inc:67
 msgid "Undo Last Check In|U"
 msgstr "Peru viimeisin kirjaaminen|P"
 
-#: lib/ui/classic.ui:73 lib/ui/stdmenus.inc:67
+#: lib/ui/classic.ui:73 lib/ui/stdmenus.inc:68
 msgid "Show History|H"
 msgstr "Näytä historia|h"
 
-#: lib/ui/classic.ui:82 lib/ui/stdmenus.inc:76
+#: lib/ui/classic.ui:82 lib/ui/stdmenus.inc:77
 msgid "Custom...|C"
 msgstr "Muu...|M"
 
-#: lib/ui/classic.ui:90 lib/ui/stdmenus.inc:84
+#: lib/ui/classic.ui:90 lib/ui/stdmenus.inc:85
 msgid "Undo|U"
 msgstr "Kumoa|u"
 
@@ -7688,7 +8013,7 @@ msgstr "Liit
 msgid "Paste External Selection|x"
 msgstr "Liitä ulkoinen valinta|v"
 
-#: lib/ui/classic.ui:98 lib/ui/stdmenus.inc:95
+#: lib/ui/classic.ui:98 lib/ui/stdmenus.inc:96
 msgid "Find & Replace...|F"
 msgstr "Etsi tai korvaa...|E"
 
@@ -7696,11 +8021,11 @@ msgstr "Etsi tai korvaa...|E"
 msgid "Tabular|T"
 msgstr "Taulukko|T"
 
-#: lib/ui/classic.ui:101 lib/ui/stdmenus.inc:105
+#: lib/ui/classic.ui:101 lib/ui/stdmenus.inc:106
 msgid "Math|M"
 msgstr "Matematiikka|M"
 
-#: lib/ui/classic.ui:104 lib/ui/stdmenus.inc:460
+#: lib/ui/classic.ui:104 lib/ui/stdmenus.inc:467
 msgid "Spellchecker...|S"
 msgstr "Oikoluku...|O"
 
@@ -7708,12 +8033,12 @@ msgstr "Oikoluku...|O"
 msgid "Thesaurus..."
 msgstr "Synonyymit..."
 
-#: lib/ui/classic.ui:106 lib/ui/stdmenus.inc:462
+#: lib/ui/classic.ui:106 lib/ui/stdmenus.inc:469
 #, fuzzy
 msgid "Count Words|W"
 msgstr "Nykyinen sana"
 
-#: lib/ui/classic.ui:107 lib/ui/stdmenus.inc:463
+#: lib/ui/classic.ui:107 lib/ui/stdmenus.inc:470
 msgid "Check TeX|h"
 msgstr "Tarkista TeX|X"
 
@@ -7722,11 +8047,11 @@ msgstr "Tarkista TeX|X"
 msgid "Change Tracking|g"
 msgstr "Vaihda kieli"
 
-#: lib/ui/classic.ui:110 lib/ui/stdmenus.inc:470
+#: lib/ui/classic.ui:110 lib/ui/stdmenus.inc:477
 msgid "Preferences...|P"
 msgstr "Asetukset...|A"
 
-#: lib/ui/classic.ui:111 lib/ui/stdmenus.inc:469
+#: lib/ui/classic.ui:111 lib/ui/stdmenus.inc:476
 msgid "Reconfigure|R"
 msgstr "Konfiguroi uudelleen|n"
 
@@ -7738,7 +8063,7 @@ msgstr "Rivein
 msgid "Selection as Paragraphs|P"
 msgstr "Kappaleina|K"
 
-#: lib/ui/classic.ui:120 lib/ui/stdmenus.inc:153
+#: lib/ui/classic.ui:120 lib/ui/stdmenus.inc:154
 msgid "Multicolumn|M"
 msgstr "Yhdistetyt sarakkeet|Y"
 
@@ -7762,7 +8087,7 @@ msgstr "Viiva oikealla|o"
 msgid "Alignment|i"
 msgstr "Tasaus|T"
 
-#: lib/ui/classic.ui:129 lib/ui/stdmenus.inc:171
+#: lib/ui/classic.ui:129 lib/ui/stdmenus.inc:172
 msgid "Add Row|A"
 msgstr "Lisää rivi|L"
 
@@ -7778,7 +8103,7 @@ msgstr "Kopioi rivi"
 msgid "Swap Rows"
 msgstr "Vaihda rivit"
 
-#: lib/ui/classic.ui:134 lib/ui/stdmenus.inc:176
+#: lib/ui/classic.ui:134 lib/ui/stdmenus.inc:177
 msgid "Add Column|u"
 msgstr "Lisää sarake|ä"
 
@@ -7794,53 +8119,53 @@ msgstr "Kopioi sarake"
 msgid "Swap Columns"
 msgstr "Vaihda sarakkeet"
 
-#: lib/ui/classic.ui:141 lib/ui/stdmenus.inc:163
+#: lib/ui/classic.ui:141 lib/ui/stdmenus.inc:164
 #, fuzzy
 msgid "Left|L"
 msgstr "Vasen|#V"
 
-#: lib/ui/classic.ui:142 lib/ui/stdmenus.inc:164
+#: lib/ui/classic.ui:142 lib/ui/stdmenus.inc:165
 #, fuzzy
 msgid "Center|C"
 msgstr "Keskellä"
 
-#: lib/ui/classic.ui:143 lib/ui/stdmenus.inc:165
+#: lib/ui/classic.ui:143 lib/ui/stdmenus.inc:166
 #, fuzzy
 msgid "Right|R"
 msgstr "Oikea|#O"
 
-#: lib/ui/classic.ui:145 lib/ui/stdmenus.inc:167
+#: lib/ui/classic.ui:145 lib/ui/stdmenus.inc:168
 #, fuzzy
 msgid "Top|T"
 msgstr "Yläreuna|#ä"
 
-#: lib/ui/classic.ui:146 lib/ui/stdmenus.inc:168
+#: lib/ui/classic.ui:146 lib/ui/stdmenus.inc:169
 #, fuzzy
 msgid "Middle|M"
 msgstr "Keski"
 
-#: lib/ui/classic.ui:147 lib/ui/stdmenus.inc:169
+#: lib/ui/classic.ui:147 lib/ui/stdmenus.inc:170
 #, fuzzy
 msgid "Bottom|B"
 msgstr "Alareuna|#A"
 
-#: lib/ui/classic.ui:159 lib/ui/stdmenus.inc:183
+#: lib/ui/classic.ui:159 lib/ui/stdmenus.inc:184
 msgid "Toggle Numbering|N"
 msgstr "Numerointi pois/päälle|N"
 
-#: lib/ui/classic.ui:160 lib/ui/stdmenus.inc:184
+#: lib/ui/classic.ui:160 lib/ui/stdmenus.inc:185
 msgid "Toggle Numbering of Line|u"
 msgstr "Rivin numerointi pois/päälle|r"
 
-#: lib/ui/classic.ui:162 lib/ui/stdmenus.inc:185
+#: lib/ui/classic.ui:162 lib/ui/stdmenus.inc:186
 msgid "Change Limits Type|L"
 msgstr "Muuta rajatyyppiä|j"
 
-#: lib/ui/classic.ui:164 lib/ui/stdmenus.inc:187
+#: lib/ui/classic.ui:164 lib/ui/stdmenus.inc:188
 msgid "Change Formula Type|F"
 msgstr "Muuta kaavan tyyppiä...|t"
 
-#: lib/ui/classic.ui:166 lib/ui/stdmenus.inc:191
+#: lib/ui/classic.ui:166 lib/ui/stdmenus.inc:192
 msgid "Use Computer Algebra System|S"
 msgstr "Käytä matematiikkaohjelmaa|m"
 
@@ -7852,7 +8177,7 @@ msgstr "Tasaus|T"
 msgid "Add Row|R"
 msgstr "Lisää rivi|L"
 
-#: lib/ui/classic.ui:171 lib/ui/stdmenus.inc:172
+#: lib/ui/classic.ui:171 lib/ui/stdmenus.inc:173
 msgid "Delete Row|D"
 msgstr "Poista rivi|r"
 
@@ -7860,19 +8185,19 @@ msgstr "Poista rivi|r"
 msgid "Add Column|C"
 msgstr "Lisää sarake|ä"
 
-#: lib/ui/classic.ui:176 lib/ui/stdmenus.inc:177
+#: lib/ui/classic.ui:176 lib/ui/stdmenus.inc:178
 msgid "Delete Column|e"
 msgstr "Poista sarake|e"
 
-#: lib/ui/classic.ui:182 lib/ui/stdmenus.inc:207
+#: lib/ui/classic.ui:182 lib/ui/stdmenus.inc:208
 msgid "Default|t"
 msgstr "Oletus|l"
 
-#: lib/ui/classic.ui:183 lib/ui/stdmenus.inc:208
+#: lib/ui/classic.ui:183 lib/ui/stdmenus.inc:209
 msgid "Display|D"
 msgstr "Esitys|E"
 
-#: lib/ui/classic.ui:184 lib/ui/stdmenus.inc:209
+#: lib/ui/classic.ui:184 lib/ui/stdmenus.inc:210
 msgid "Inline|I"
 msgstr "Tekstin seassa|s"
 
@@ -7904,12 +8229,12 @@ msgstr "Maple, evalm"
 msgid "Maple, evalf"
 msgstr "Maple, evalf"
 
-#: lib/ui/classic.ui:199 lib/ui/classic.ui:261 lib/ui/stdmenus.inc:249
-#: lib/ui/stdmenus.inc:348
+#: lib/ui/classic.ui:199 lib/ui/classic.ui:261 lib/ui/stdmenus.inc:250
+#: lib/ui/stdmenus.inc:350
 msgid "Inline Formula|I"
 msgstr "Kaava tekstissä|K"
 
-#: lib/ui/classic.ui:200 lib/ui/stdmenus.inc:250
+#: lib/ui/classic.ui:200 lib/ui/stdmenus.inc:251
 msgid "Displayed Formula|D"
 msgstr "Kaavaesitys|i"
 
@@ -7937,7 +8262,7 @@ msgstr "Koontiymp
 msgid "Multline Environment"
 msgstr "Moniriviympäristö"
 
-#: lib/ui/classic.ui:214 lib/ui/stdmenus.inc:290
+#: lib/ui/classic.ui:214 lib/ui/stdmenus.inc:291
 msgid "Math|h"
 msgstr "Matematiikka|M"
 
@@ -7945,7 +8270,7 @@ msgstr "Matematiikka|M"
 msgid "Special Character|S"
 msgstr "Erikoismerkki|E"
 
-#: lib/ui/classic.ui:217 lib/ui/stdmenus.inc:300
+#: lib/ui/classic.ui:217 lib/ui/stdmenus.inc:302
 msgid "Citation...|C"
 msgstr "Lähdeviite...|L"
 
@@ -7953,15 +8278,15 @@ msgstr "L
 msgid "Cross-reference...|r"
 msgstr "Viittaus...|V"
 
-#: lib/ui/classic.ui:219 lib/ui/stdmenus.inc:302
+#: lib/ui/classic.ui:219 lib/ui/stdmenus.inc:304
 msgid "Label...|L"
 msgstr "Nimike...|N"
 
-#: lib/ui/classic.ui:220 lib/ui/stdmenus.inc:310
+#: lib/ui/classic.ui:220 lib/ui/stdmenus.inc:312
 msgid "Footnote|F"
 msgstr "Alaviite|A"
 
-#: lib/ui/classic.ui:221 lib/ui/stdmenus.inc:311
+#: lib/ui/classic.ui:221 lib/ui/stdmenus.inc:313
 msgid "Marginal Note|M"
 msgstr "Reunahuomautus|R"
 
@@ -7973,15 +8298,15 @@ msgstr "Lyhyt teoksen nimi"
 msgid "Index Entry|I"
 msgstr "Hakemistoviite...|H"
 
-#: lib/ui/classic.ui:224 src/frontends/qt4/Dialogs.cpp:230
+#: lib/ui/classic.ui:224 src/frontends/qt4/Dialogs.cpp:237
 msgid "Nomenclature Entry"
 msgstr "Termistöviite"
 
-#: lib/ui/classic.ui:225 lib/ui/stdmenus.inc:309
+#: lib/ui/classic.ui:225 lib/ui/stdmenus.inc:311
 msgid "URL...|U"
 msgstr "URL...|U"
 
-#: lib/ui/classic.ui:226 lib/ui/stdmenus.inc:295
+#: lib/ui/classic.ui:226 lib/ui/stdmenus.inc:296
 msgid "Note|N"
 msgstr "Muistiinpano|i"
 
@@ -7997,7 +8322,7 @@ msgstr "TeX-koodi"
 msgid "Minipage|p"
 msgstr "Pienoissivu|P"
 
-#: lib/ui/classic.ui:231 lib/ui/stdmenus.inc:308
+#: lib/ui/classic.ui:231 lib/ui/stdmenus.inc:310
 msgid "Graphics...|G"
 msgstr "Grafiikka...|G"
 
@@ -8021,11 +8346,11 @@ msgstr "Lis
 msgid "External Material...|x"
 msgstr "Ulkoinen aineisto...|k"
 
-#: lib/ui/classic.ui:241 lib/ui/stdmenus.inc:328
+#: lib/ui/classic.ui:241 lib/ui/stdmenus.inc:330
 msgid "Superscript|S"
 msgstr "Yläindeksi|Y"
 
-#: lib/ui/classic.ui:242 lib/ui/stdmenus.inc:329
+#: lib/ui/classic.ui:242 lib/ui/stdmenus.inc:331
 msgid "Subscript|u"
 msgstr "Alaindeksi|A"
 
@@ -8037,7 +8362,7 @@ msgstr "Vaakatasaus:|#V"
 msgid "Hyphenation Point|P"
 msgstr "Tavutuskohta|T"
 
-#: lib/ui/classic.ui:245 lib/ui/stdmenus.inc:339
+#: lib/ui/classic.ui:245 lib/ui/stdmenus.inc:341
 msgid "Ligature Break|k"
 msgstr "Yhdyskirjasinkatko|h"
 
@@ -8045,11 +8370,11 @@ msgstr "Yhdyskirjasinkatko|h"
 msgid "Protected Space|r"
 msgstr "Kova välilyönti|K"
 
-#: lib/ui/classic.ui:247 lib/ui/stdmenus.inc:332
+#: lib/ui/classic.ui:247 lib/ui/stdmenus.inc:334
 msgid "Inter-word Space|w"
 msgstr ""
 
-#: lib/ui/classic.ui:248 lib/ui/stdmenus.inc:333
+#: lib/ui/classic.ui:248 lib/ui/stdmenus.inc:335
 #, fuzzy
 msgid "Thin Space|T"
 msgstr "Ohut väli\t\\,"
@@ -8064,11 +8389,11 @@ msgstr "Pystyv
 msgid "Line Break|L"
 msgstr "Rivinvaihto|R"
 
-#: lib/ui/classic.ui:251 lib/ui/stdmenus.inc:319
+#: lib/ui/classic.ui:251 lib/ui/stdmenus.inc:321
 msgid "Ellipsis|i"
 msgstr "Ellipsis (...)|E"
 
-#: lib/ui/classic.ui:252 lib/ui/stdmenus.inc:320
+#: lib/ui/classic.ui:252 lib/ui/stdmenus.inc:322
 msgid "End of Sentence|E"
 msgstr "Virkkeen lopun piste|p"
 
@@ -8081,7 +8406,7 @@ msgstr "Tavallinen lainausmerkki (\")|l"
 msgid "Ordinary Quote|O"
 msgstr "Tavallinen lainausmerkki (\")|l"
 
-#: lib/ui/classic.ui:255 lib/ui/stdmenus.inc:323
+#: lib/ui/classic.ui:255 lib/ui/stdmenus.inc:325
 msgid "Menu Separator|M"
 msgstr "Valikkoerotinmerkki|m"
 
@@ -8094,46 +8419,46 @@ msgstr "Vaakaviiva"
 msgid "Page Break"
 msgstr "Sivunvaihto"
 
-#: lib/ui/classic.ui:262 lib/ui/stdmenus.inc:349
+#: lib/ui/classic.ui:262 lib/ui/stdmenus.inc:351
 msgid "Display Formula|D"
 msgstr "Kaavaesitys|e"
 
-#: lib/ui/classic.ui:263 lib/ui/stdmenus.inc:251 lib/ui/stdmenus.inc:351
+#: lib/ui/classic.ui:263 lib/ui/stdmenus.inc:252 lib/ui/stdmenus.inc:353
 msgid "Eqnarray Environment|E"
 msgstr "Yhtälötaulukkoympäristö|Y"
 
-#: lib/ui/classic.ui:264 lib/ui/stdmenus.inc:252 lib/ui/stdmenus.inc:352
+#: lib/ui/classic.ui:264 lib/ui/stdmenus.inc:253 lib/ui/stdmenus.inc:354
 #, fuzzy
 msgid "AMS align Environment|a"
 msgstr "AMS-tasausympäristö|t"
 
-#: lib/ui/classic.ui:265 lib/ui/stdmenus.inc:253 lib/ui/stdmenus.inc:353
+#: lib/ui/classic.ui:265 lib/ui/stdmenus.inc:254 lib/ui/stdmenus.inc:355
 msgid "AMS alignat Environment|t"
 msgstr "AMS-tasausympäristö (alignat)|a"
 
-#: lib/ui/classic.ui:266 lib/ui/stdmenus.inc:254 lib/ui/stdmenus.inc:354
+#: lib/ui/classic.ui:266 lib/ui/stdmenus.inc:255 lib/ui/stdmenus.inc:356
 msgid "AMS flalign Environment|f"
 msgstr "AMS-tasausympäristö (flalign)|t"
 
-#: lib/ui/classic.ui:269 lib/ui/stdmenus.inc:255 lib/ui/stdmenus.inc:355
+#: lib/ui/classic.ui:269 lib/ui/stdmenus.inc:256 lib/ui/stdmenus.inc:357
 #, fuzzy
 msgid "AMS gather Environment|g"
 msgstr "AMS-koontiympäristö"
 
-#: lib/ui/classic.ui:270 lib/ui/stdmenus.inc:256 lib/ui/stdmenus.inc:356
+#: lib/ui/classic.ui:270 lib/ui/stdmenus.inc:257 lib/ui/stdmenus.inc:358
 #, fuzzy
 msgid "AMS multline Environment|m"
 msgstr "AMS-moniriviympäristö"
 
-#: lib/ui/classic.ui:272 lib/ui/stdmenus.inc:358
+#: lib/ui/classic.ui:272 lib/ui/stdmenus.inc:360
 msgid "Array Environment|y"
 msgstr "Taulukkoympäristö|u"
 
-#: lib/ui/classic.ui:273 lib/ui/stdmenus.inc:359
+#: lib/ui/classic.ui:273 lib/ui/stdmenus.inc:361
 msgid "Cases Environment|C"
 msgstr "Tapausympäristö|p"
 
-#: lib/ui/classic.ui:274 lib/ui/stdmenus.inc:363
+#: lib/ui/classic.ui:274 lib/ui/stdmenus.inc:365
 #, fuzzy
 msgid "Split Environment|S"
 msgstr "Tasausympäristö|T"
@@ -8178,47 +8503,47 @@ msgstr "Matem. lihava kirjasinsarja"
 msgid "Text Normal Font"
 msgstr "Tekstin tavallinen kirjasin"
 
-#: lib/ui/classic.ui:291 lib/ui/stdmenus.inc:224
+#: lib/ui/classic.ui:291 lib/ui/stdmenus.inc:225
 #, fuzzy
 msgid "Text Roman Family"
 msgstr "Tekstin pysty kirjasinperhe"
 
-#: lib/ui/classic.ui:292 lib/ui/stdmenus.inc:225
+#: lib/ui/classic.ui:292 lib/ui/stdmenus.inc:226
 #, fuzzy
 msgid "Text Sans Serif Family"
 msgstr "Tekstin sans serif -kirjasinperhe"
 
-#: lib/ui/classic.ui:293 lib/ui/stdmenus.inc:226
+#: lib/ui/classic.ui:293 lib/ui/stdmenus.inc:227
 #, fuzzy
 msgid "Text Typewriter Family"
 msgstr "Tekstin kirjoituskone-kirjasinperhe"
 
-#: lib/ui/classic.ui:295 lib/ui/stdmenus.inc:228
+#: lib/ui/classic.ui:295 lib/ui/stdmenus.inc:229
 #, fuzzy
 msgid "Text Bold Series"
 msgstr "Tekstin lihava kirjasinsarja"
 
-#: lib/ui/classic.ui:296 lib/ui/stdmenus.inc:229
+#: lib/ui/classic.ui:296 lib/ui/stdmenus.inc:230
 #, fuzzy
 msgid "Text Medium Series"
 msgstr "Tekstin keskivahva kirjasinsarja"
 
-#: lib/ui/classic.ui:298 lib/ui/stdmenus.inc:231
+#: lib/ui/classic.ui:298 lib/ui/stdmenus.inc:232
 #, fuzzy
 msgid "Text Italic Shape"
 msgstr "Tekstin kursiivi kirjasinmuoto"
 
-#: lib/ui/classic.ui:299 lib/ui/stdmenus.inc:232
+#: lib/ui/classic.ui:299 lib/ui/stdmenus.inc:233
 #, fuzzy
 msgid "Text Small Caps Shape"
 msgstr "Tekstin kapiteeli kirjasinmuoto"
 
-#: lib/ui/classic.ui:300 lib/ui/stdmenus.inc:233
+#: lib/ui/classic.ui:300 lib/ui/stdmenus.inc:234
 #, fuzzy
 msgid "Text Slanted Shape"
 msgstr "Tekstin vino kirjasinmuoto"
 
-#: lib/ui/classic.ui:301 lib/ui/stdmenus.inc:234
+#: lib/ui/classic.ui:301 lib/ui/stdmenus.inc:235
 #, fuzzy
 msgid "Text Upright Shape"
 msgstr "Tekstin pysty kirjasinmuoto"
@@ -8227,43 +8552,43 @@ msgstr "Tekstin pysty kirjasinmuoto"
 msgid "Floatflt Figure"
 msgstr "Kelluva kuva (floatflt)"
 
-#: lib/ui/classic.ui:310 lib/ui/stdmenus.inc:378
+#: lib/ui/classic.ui:310 lib/ui/stdmenus.inc:380
 msgid "Table of Contents|C"
 msgstr "Sisällysluettelo|S"
 
-#: lib/ui/classic.ui:312 lib/ui/stdmenus.inc:380
+#: lib/ui/classic.ui:312 lib/ui/stdmenus.inc:382
 msgid "Index List|I"
 msgstr "Hakemisto|H"
 
-#: lib/ui/classic.ui:313 lib/ui/stdmenus.inc:381
+#: lib/ui/classic.ui:313 lib/ui/stdmenus.inc:383
 #, fuzzy
 msgid "Nomenclature|N"
 msgstr "Muistiinpano|i"
 
-#: lib/ui/classic.ui:314 lib/ui/stdmenus.inc:382
+#: lib/ui/classic.ui:314 lib/ui/stdmenus.inc:384
 msgid "BibTeX Bibliography...|B"
 msgstr "BibTeX-lähdeviitteet...|B"
 
-#: lib/ui/classic.ui:318 lib/ui/stdmenus.inc:386
+#: lib/ui/classic.ui:318 lib/ui/stdmenus.inc:388
 msgid "LyX Document...|X"
 msgstr "LyX-asiakirja...|a"
 
-#: lib/ui/classic.ui:319 lib/ui/stdmenus.inc:387
+#: lib/ui/classic.ui:319 lib/ui/stdmenus.inc:389
 #, fuzzy
 msgid "Plain Text...|T"
 msgstr "Etsi seuraava"
 
-#: lib/ui/classic.ui:320 lib/ui/stdmenus.inc:388
+#: lib/ui/classic.ui:320 lib/ui/stdmenus.inc:390
 #, fuzzy
 msgid "Plain Text, Join Lines...|J"
 msgstr "Ascii-teksti riveinä...|r"
 
-#: lib/ui/classic.ui:324 lib/ui/stdmenus.inc:422
+#: lib/ui/classic.ui:324 lib/ui/stdmenus.inc:429
 #, fuzzy
 msgid "Track Changes|T"
 msgstr "Kirjaa muutokset...|K"
 
-#: lib/ui/classic.ui:325 lib/ui/stdmenus.inc:423
+#: lib/ui/classic.ui:325 lib/ui/stdmenus.inc:430
 #, fuzzy
 msgid "Merge Changes...|M"
 msgstr "Kirjaa muutokset...|K"
@@ -8276,7 +8601,7 @@ msgstr ""
 msgid "Reject All Changes|R"
 msgstr ""
 
-#: lib/ui/classic.ui:328 lib/ui/stdmenus.inc:428
+#: lib/ui/classic.ui:328 lib/ui/stdmenus.inc:435
 #, fuzzy
 msgid "Show Changes in Output|S"
 msgstr "Kuvan leveys tulosteessa"
@@ -8321,20 +8646,20 @@ msgstr "Kasvata ymp
 msgid "Start Appendix Here|S"
 msgstr "Aloita liite tästä|i"
 
-#: lib/ui/classic.ui:356 lib/ui/stdmenus.inc:412
+#: lib/ui/classic.ui:356 lib/ui/stdmenus.inc:418
 msgid "Build Program|B"
 msgstr "Käännä ohjelma|K"
 
-#: lib/ui/classic.ui:357 lib/ui/stdmenus.inc:268
+#: lib/ui/classic.ui:357 lib/ui/stdmenus.inc:269
 msgid "Update|U"
 msgstr "Päivitä|v"
 
-#: lib/ui/classic.ui:359 lib/ui/stdmenus.inc:413
+#: lib/ui/classic.ui:359 lib/ui/stdmenus.inc:419
 #, fuzzy
 msgid "LaTeX Log|L"
 msgstr "LaTeX-lokitiedosto"
 
-#: lib/ui/classic.ui:360 lib/ui/stdmenus.inc:414
+#: lib/ui/classic.ui:360 lib/ui/stdmenus.inc:420
 msgid "Outline|O"
 msgstr ""
 
@@ -8342,38 +8667,38 @@ msgstr ""
 msgid "TeX Information|X"
 msgstr "TeX-tietoja|X"
 
-#: lib/ui/classic.ui:374 lib/ui/stdmenus.inc:436
+#: lib/ui/classic.ui:374 lib/ui/stdmenus.inc:443
 #, fuzzy
 msgid "Next Note|N"
 msgstr "Muistiinpano|i"
 
-#: lib/ui/classic.ui:375 lib/ui/stdmenus.inc:439
+#: lib/ui/classic.ui:375 lib/ui/stdmenus.inc:446
 #, fuzzy
 msgid "Go to Label|L"
 msgstr "Siirry nimikkeeseen"
 
-#: lib/ui/classic.ui:376 lib/ui/stdmenus.inc:435
+#: lib/ui/classic.ui:376 lib/ui/stdmenus.inc:442
 msgid "Bookmarks|B"
 msgstr "Kirjanmerkit|#m"
 
-#: lib/ui/classic.ui:380 lib/ui/stdmenus.inc:445
+#: lib/ui/classic.ui:380 lib/ui/stdmenus.inc:452
 msgid "Save Bookmark 1|S"
 msgstr "Tallenna kirjanmerkki 1|T"
 
-#: lib/ui/classic.ui:381 lib/ui/stdmenus.inc:446
+#: lib/ui/classic.ui:381 lib/ui/stdmenus.inc:453
 msgid "Save Bookmark 2"
 msgstr "Tallenna kirjanmerkki 2"
 
-#: lib/ui/classic.ui:382 lib/ui/stdmenus.inc:447
+#: lib/ui/classic.ui:382 lib/ui/stdmenus.inc:454
 msgid "Save Bookmark 3"
 msgstr "Tallenna kirjanmerkki 3"
 
-#: lib/ui/classic.ui:383 lib/ui/stdmenus.inc:448
+#: lib/ui/classic.ui:383 lib/ui/stdmenus.inc:455
 #, fuzzy
 msgid "Save Bookmark 4"
 msgstr "Tallenna kirjanmerkki 2"
 
-#: lib/ui/classic.ui:384 lib/ui/stdmenus.inc:449
+#: lib/ui/classic.ui:384 lib/ui/stdmenus.inc:456
 #, fuzzy
 msgid "Save Bookmark 5"
 msgstr "Tallenna kirjanmerkki 2"
@@ -8403,47 +8728,47 @@ msgstr "Siirry kirjanmerkille 3|3"
 msgid "Go to Bookmark 5|5"
 msgstr "Siirry kirjanmerkille 3|3"
 
-#: lib/ui/classic.ui:405 lib/ui/stdmenus.inc:477
+#: lib/ui/classic.ui:405 lib/ui/stdmenus.inc:484
 msgid "Introduction|I"
 msgstr "Johdanto|J"
 
-#: lib/ui/classic.ui:406 lib/ui/stdmenus.inc:478
+#: lib/ui/classic.ui:406 lib/ui/stdmenus.inc:485
 msgid "Tutorial|T"
 msgstr "Opastus|O"
 
-#: lib/ui/classic.ui:407 lib/ui/stdmenus.inc:479
+#: lib/ui/classic.ui:407 lib/ui/stdmenus.inc:486
 msgid "User's Guide|U"
 msgstr "Käyttöopas|K"
 
-#: lib/ui/classic.ui:408 lib/ui/stdmenus.inc:480
+#: lib/ui/classic.ui:408 lib/ui/stdmenus.inc:487
 msgid "Extended Features|E"
 msgstr "Lisäominaisuudet|L"
 
-#: lib/ui/classic.ui:409 lib/ui/stdmenus.inc:481
+#: lib/ui/classic.ui:409 lib/ui/stdmenus.inc:488
 msgid "Embedded Objects|m"
 msgstr ""
 
-#: lib/ui/classic.ui:410 lib/ui/stdmenus.inc:482
+#: lib/ui/classic.ui:410 lib/ui/stdmenus.inc:489
 msgid "Customization|C"
 msgstr "Mukauttaminen|M"
 
-#: lib/ui/classic.ui:412 lib/ui/stdmenus.inc:483
+#: lib/ui/classic.ui:412 lib/ui/stdmenus.inc:490
 msgid "FAQ|F"
 msgstr "Usein kysytyt kysymykset|U"
 
-#: lib/ui/classic.ui:413 lib/ui/stdmenus.inc:484
+#: lib/ui/classic.ui:413 lib/ui/stdmenus.inc:491
 msgid "Table of Contents|a"
 msgstr "Sisällysluettelo|S"
 
-#: lib/ui/classic.ui:414 lib/ui/stdmenus.inc:485
+#: lib/ui/classic.ui:414 lib/ui/stdmenus.inc:492
 msgid "LaTeX Configuration|L"
 msgstr "LaTeX-asetukset|X"
 
-#: lib/ui/classic.ui:416 lib/ui/stdmenus.inc:487
+#: lib/ui/classic.ui:416 lib/ui/stdmenus.inc:494
 msgid "About LyX|X"
 msgstr "LyXistä|y"
 
-#: lib/ui/classic.ui:424 src/frontends/qt4/QAbout.cpp:44
+#: lib/ui/classic.ui:424 src/frontends/qt4/GuiAbout.cpp:44
 msgid "About LyX"
 msgstr "LyXistä"
 
@@ -8477,534 +8802,555 @@ msgstr "Uusi mallin mukaan...|m"
 msgid "Open Recent|t"
 msgstr "Asiakirja avautuu: "
 
-#: lib/ui/stdmenus.inc:51
+#: lib/ui/stdmenus.inc:43
+#, fuzzy
+msgid "Save All|l"
+msgstr "Tallenna nimellä...|n"
+
+#: lib/ui/stdmenus.inc:44
+#, fuzzy
+msgid "Revert to Saved|R"
+msgstr "Peru kaikki muokkaukset"
+
+#: lib/ui/stdmenus.inc:52
 msgid "New Window|W"
 msgstr ""
 
-#: lib/ui/stdmenus.inc:52
+#: lib/ui/stdmenus.inc:53
 msgid "Close Window|d"
 msgstr ""
 
-#: lib/ui/stdmenus.inc:85
+#: lib/ui/stdmenus.inc:86
 #, fuzzy
 msgid "Redo|R"
 msgstr "Tee uudelleen|d"
 
-#: lib/ui/stdmenus.inc:87 lib/ui/stdtoolbars.inc:66 src/Text3.cpp:839
-#: src/mathed/InsetMathNest.cpp:469
+#: lib/ui/stdmenus.inc:88 lib/ui/stdtoolbars.inc:66 src/Text3.cpp:838
+#: src/mathed/InsetMathNest.cpp:467
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: lib/ui/stdmenus.inc:88 lib/ui/stdtoolbars.inc:67 src/Text3.cpp:844
-#: src/mathed/InsetMathNest.cpp:477
+#: lib/ui/stdmenus.inc:89 lib/ui/stdtoolbars.inc:67 src/Text3.cpp:843
+#: src/mathed/InsetMathNest.cpp:475
 msgid "Copy"
 msgstr "Kopioi"
 
-#: lib/ui/stdmenus.inc:89 lib/ui/stdtoolbars.inc:68 src/Text3.cpp:821
-#: src/mathed/InsetMathGrid.cpp:1167 src/mathed/InsetMathNest.cpp:449
+#: lib/ui/stdmenus.inc:90 lib/ui/stdtoolbars.inc:68 src/Text3.cpp:820
+#: src/mathed/InsetMathGrid.cpp:1256 src/mathed/InsetMathNest.cpp:447
 msgid "Paste"
 msgstr "Liitä"
 
-#: lib/ui/stdmenus.inc:90
+#: lib/ui/stdmenus.inc:91
 #, fuzzy
 msgid "Paste Recent|e"
 msgstr "Keskitä|K"
 
-#: lib/ui/stdmenus.inc:91
+#: lib/ui/stdmenus.inc:92
 #, fuzzy
 msgid "Paste Special"
 msgstr "Liitä|i"
 
-#: lib/ui/stdmenus.inc:93
+#: lib/ui/stdmenus.inc:94
 #, fuzzy
 msgid "Select All"
 msgstr "Valitse tiedosto"
 
-#: lib/ui/stdmenus.inc:97
+#: lib/ui/stdmenus.inc:98
 #, fuzzy
 msgid "Move Paragraph Up|o"
 msgstr ", kappale: "
 
-#: lib/ui/stdmenus.inc:98
+#: lib/ui/stdmenus.inc:99
 #, fuzzy
 msgid "Move Paragraph Down|v"
 msgstr ", kappale: "
 
-#: lib/ui/stdmenus.inc:100
+#: lib/ui/stdmenus.inc:101
 #, fuzzy
 msgid "Text Style|S"
 msgstr "Asiakirjan tyyli"
 
-#: lib/ui/stdmenus.inc:101
+#: lib/ui/stdmenus.inc:102
 #, fuzzy
 msgid "Paragraph Settings...|P"
 msgstr "Kappale...|K"
 
-#: lib/ui/stdmenus.inc:104
+#: lib/ui/stdmenus.inc:105
 #, fuzzy
 msgid "Table|T"
 msgstr "Taulukko"
 
-#: lib/ui/stdmenus.inc:106
+#: lib/ui/stdmenus.inc:107
 #, fuzzy
 msgid "Rows & Columns|C"
 msgstr "Vaihda sarakkeet"
 
-#: lib/ui/stdmenus.inc:113
+#: lib/ui/stdmenus.inc:114
 #, fuzzy
 msgid "Increase List Depth|I"
 msgstr "Kasvata ympäristösyvyyttä|v"
 
-#: lib/ui/stdmenus.inc:114
+#: lib/ui/stdmenus.inc:115
 #, fuzzy
 msgid "Decrease List Depth|D"
 msgstr "Pienennä ympäristösyvyyttä|P"
 
-#: lib/ui/stdmenus.inc:115
+#: lib/ui/stdmenus.inc:116
 msgid "Dissolve Inset|l"
 msgstr ""
 
-#: lib/ui/stdmenus.inc:116
+#: lib/ui/stdmenus.inc:117
 #, fuzzy
 msgid "TeX Code Settings...|C"
 msgstr "TeX-koodiasetukset"
 
-#: lib/ui/stdmenus.inc:118
+#: lib/ui/stdmenus.inc:119
 msgid "Float Settings...|a"
 msgstr "Kelluvien asetukset..."
 
-#: lib/ui/stdmenus.inc:119
+#: lib/ui/stdmenus.inc:120
 msgid "Text Wrap Settings...|W"
 msgstr "Tyköupotteiden asetukset..."
 
-#: lib/ui/stdmenus.inc:120
+#: lib/ui/stdmenus.inc:121
 msgid "Note Settings...|N"
 msgstr "Huomautusten asetukset..."
 
-#: lib/ui/stdmenus.inc:121
+#: lib/ui/stdmenus.inc:122
 msgid "Branch Settings...|B"
 msgstr "Haarojen asetukset..."
 
-#: lib/ui/stdmenus.inc:122
+#: lib/ui/stdmenus.inc:123
 msgid "Box Settings...|x"
 msgstr "Laatikoiden asetukset..."
 
-#: lib/ui/stdmenus.inc:126
+#: lib/ui/stdmenus.inc:127
 msgid "Table Settings...|a"
 msgstr "Taulukkoasetukset..."
 
-#: lib/ui/stdmenus.inc:130
+#: lib/ui/stdmenus.inc:131
 msgid "Plain Text|T"
 msgstr "Perusteksti"
 
-#: lib/ui/stdmenus.inc:131
+#: lib/ui/stdmenus.inc:132
 msgid "Plain Text, Join Lines|J"
 msgstr "Perusteksti, yhd. rivejä"
 
-#: lib/ui/stdmenus.inc:133
+#: lib/ui/stdmenus.inc:134
 msgid "Selection|S"
 msgstr "&Valinta"
 
-#: lib/ui/stdmenus.inc:134
+#: lib/ui/stdmenus.inc:135
 msgid "Selection, Join Lines|i"
 msgstr "Valinta, yhd. Rivejä|R"
 
-#: lib/ui/stdmenus.inc:144
+#: lib/ui/stdmenus.inc:145
 msgid "Customized...|C"
 msgstr "Räätälöity...|M"
 
-#: lib/ui/stdmenus.inc:146
+#: lib/ui/stdmenus.inc:147
 msgid "Capitalize|a"
 msgstr "Iso alkukirjain"
 
-#: lib/ui/stdmenus.inc:147
+#: lib/ui/stdmenus.inc:148
 msgid "Uppercase|U"
 msgstr "Versaalit"
 
-#: lib/ui/stdmenus.inc:148
+#: lib/ui/stdmenus.inc:149
 msgid "Lowercase|L"
 msgstr "Pienet"
 
-#: lib/ui/stdmenus.inc:155
+#: lib/ui/stdmenus.inc:156
 msgid "Top Line|T"
 msgstr "Yläreuna|#ä"
 
-#: lib/ui/stdmenus.inc:156
+#: lib/ui/stdmenus.inc:157
 msgid "Bottom Line|B"
 msgstr "Alareuna|#A"
 
-#: lib/ui/stdmenus.inc:157
+#: lib/ui/stdmenus.inc:158
 msgid "Left Line|L"
 msgstr "Vasen reuna"
 
-#: lib/ui/stdmenus.inc:158
+#: lib/ui/stdmenus.inc:159
 msgid "Right Line|R"
 msgstr "Oikea reuna|#O"
 
-#: lib/ui/stdmenus.inc:173
+#: lib/ui/stdmenus.inc:174
 msgid "Copy Row|o"
 msgstr "Kopioi rivi"
 
-#: lib/ui/stdmenus.inc:174
+#: lib/ui/stdmenus.inc:175
 msgid "Swap Rows|S"
 msgstr "Vaihda rivit"
 
-#: lib/ui/stdmenus.inc:178
+#: lib/ui/stdmenus.inc:179
 msgid "Copy Column|p"
 msgstr "Kopioi sarake"
 
-#: lib/ui/stdmenus.inc:179
+#: lib/ui/stdmenus.inc:180
 msgid "Swap Columns|w"
 msgstr "Vaihda sarakkeet"
 
-#: lib/ui/stdmenus.inc:189
+#: lib/ui/stdmenus.inc:190
 msgid "Text Style|T"
 msgstr "Tekstityyli"
 
-#: lib/ui/stdmenus.inc:193
+#: lib/ui/stdmenus.inc:194
 msgid "Split Cell|C"
 msgstr "Jaa solu"
 
-#: lib/ui/stdmenus.inc:195
+#: lib/ui/stdmenus.inc:196
 msgid "Add Line Above|A"
 msgstr "Viiva yllä"
 
-#: lib/ui/stdmenus.inc:196
+#: lib/ui/stdmenus.inc:197
 msgid "Add Line Below|B"
 msgstr "Viiva alla"
 
-#: lib/ui/stdmenus.inc:197
+#: lib/ui/stdmenus.inc:198
 #, fuzzy
 msgid "Delete Line Above|D"
 msgstr "Poista viiva yllä"
 
-#: lib/ui/stdmenus.inc:198
+#: lib/ui/stdmenus.inc:199
 #, fuzzy
 msgid "Delete Line Below|e"
 msgstr "Poista viiva alla"
 
-#: lib/ui/stdmenus.inc:200
+#: lib/ui/stdmenus.inc:201
 #, fuzzy
 msgid "Add Line to Left"
 msgstr "Viiva vasemmalla|i"
 
-#: lib/ui/stdmenus.inc:201
+#: lib/ui/stdmenus.inc:202
 #, fuzzy
 msgid "Add Line to Right"
 msgstr "Viiva oikealla|o"
 
-#: lib/ui/stdmenus.inc:202
+#: lib/ui/stdmenus.inc:203
 #, fuzzy
 msgid "Delete Line to Left"
 msgstr "Poista viiva vasemmalla"
 
-#: lib/ui/stdmenus.inc:203
+#: lib/ui/stdmenus.inc:204
 msgid "Delete Line to Right"
 msgstr "Poista viiva oikealla"
 
-#: lib/ui/stdmenus.inc:213
+#: lib/ui/stdmenus.inc:214
 msgid "Math Normal Font|N"
 msgstr "Tavalliset matem. kirjasimet"
 
-#: lib/ui/stdmenus.inc:215
+#: lib/ui/stdmenus.inc:216
 msgid "Math Calligraphic Family|C"
 msgstr "Matem. kaunokirjasinperhe"
 
-#: lib/ui/stdmenus.inc:216
+#: lib/ui/stdmenus.inc:217
 msgid "Math Fraktur Family|F"
 msgstr "Matem. fraktuura-kirjasinperhe"
 
-#: lib/ui/stdmenus.inc:217
+#: lib/ui/stdmenus.inc:218
 msgid "Math Roman Family|R"
 msgstr "Matem. antiikva-kirjasinperhe"
 
-#: lib/ui/stdmenus.inc:218
+#: lib/ui/stdmenus.inc:219
 msgid "Math Sans Serif Family|S"
 msgstr "Matem. sans serif -kirjasinperhe"
 
-#: lib/ui/stdmenus.inc:220
+#: lib/ui/stdmenus.inc:221
 msgid "Math Bold Series|B"
 msgstr "Matem. lihava kirjasinsarja"
 
-#: lib/ui/stdmenus.inc:222
+#: lib/ui/stdmenus.inc:223
 msgid "Text Normal Font|T"
 msgstr "Tekstin tavallinen kirjasin"
 
-#: lib/ui/stdmenus.inc:238
+#: lib/ui/stdmenus.inc:239
 msgid "Octave|O"
 msgstr "Octave"
 
-#: lib/ui/stdmenus.inc:239
+#: lib/ui/stdmenus.inc:240
 msgid "Maxima|M"
 msgstr "Maxima"
 
-#: lib/ui/stdmenus.inc:240
+#: lib/ui/stdmenus.inc:241
 msgid "Mathematica|a"
 msgstr "Mathematica"
 
-#: lib/ui/stdmenus.inc:242
+#: lib/ui/stdmenus.inc:243
 msgid "Maple, simplify|s"
 msgstr "Maple, simplify"
 
-#: lib/ui/stdmenus.inc:243
+#: lib/ui/stdmenus.inc:244
 msgid "Maple, factor|f"
 msgstr "Maple, factor"
 
-#: lib/ui/stdmenus.inc:244
+#: lib/ui/stdmenus.inc:245
 msgid "Maple, evalm|e"
 msgstr "Maple, evalm"
 
-#: lib/ui/stdmenus.inc:245
+#: lib/ui/stdmenus.inc:246
 msgid "Maple, evalf|v"
 msgstr "Maple, evalf"
 
-#: lib/ui/stdmenus.inc:264
+#: lib/ui/stdmenus.inc:265
 #, fuzzy
 msgid "Open All Insets|O"
 msgstr "Avaa kaikki upotteet"
 
-#: lib/ui/stdmenus.inc:265
+#: lib/ui/stdmenus.inc:266
 msgid "Close All Insets|C"
 msgstr "Sulje kaikki upotteet"
 
-#: lib/ui/stdmenus.inc:267
+#: lib/ui/stdmenus.inc:268
 msgid "View Source|S"
 msgstr "Näytä lähdekoodi"
 
-#: lib/ui/stdmenus.inc:271
+#: lib/ui/stdmenus.inc:272
 msgid "Toolbars|b"
 msgstr "Työkalupalkit"
 
-#: lib/ui/stdmenus.inc:291
+#: lib/ui/stdmenus.inc:292
 msgid "Special Character|p"
 msgstr "Erikoismerkki|E"
 
-#: lib/ui/stdmenus.inc:292
+#: lib/ui/stdmenus.inc:293
 msgid "Formatting|o"
 msgstr "Muotoilu"
 
-#: lib/ui/stdmenus.inc:293
+#: lib/ui/stdmenus.inc:294
 msgid "List / TOC|i"
 msgstr "Luettelo/sisältö|o"
 
-#: lib/ui/stdmenus.inc:294
+#: lib/ui/stdmenus.inc:295
 #, fuzzy
 msgid "Float|a"
 msgstr "Kelluva upote"
 
-#: lib/ui/stdmenus.inc:296
+#: lib/ui/stdmenus.inc:297
 msgid "Branch|B"
 msgstr "Haara"
 
-#: lib/ui/stdmenus.inc:297
+#: lib/ui/stdmenus.inc:298
+#, fuzzy
+msgid "Custom insets"
+msgstr "Asiakas"
+
+#: lib/ui/stdmenus.inc:299
 msgid "File|e"
 msgstr "Tiedosto|T"
 
-#: lib/ui/stdmenus.inc:298 src/insets/InsetBox.cpp:152
+#: lib/ui/stdmenus.inc:300 src/insets/InsetBox.cpp:151
 msgid "Box"
 msgstr "Laatikko"
 
-#: lib/ui/stdmenus.inc:301
+#: lib/ui/stdmenus.inc:303
 msgid "Cross-Reference...|R"
 msgstr "Viittaus...|V"
 
-#: lib/ui/stdmenus.inc:303
+#: lib/ui/stdmenus.inc:305
 msgid "Caption"
 msgstr "Kuvateksti"
 
-#: lib/ui/stdmenus.inc:304
+#: lib/ui/stdmenus.inc:306
 msgid "Index Entry|d"
 msgstr "Hakemistoviite"
 
-#: lib/ui/stdmenus.inc:305
+#: lib/ui/stdmenus.inc:307
 #, fuzzy
 msgid "Nomenclature Entry...|y"
 msgstr "Lisää hakemistoviite"
 
-#: lib/ui/stdmenus.inc:307
+#: lib/ui/stdmenus.inc:309
 msgid "Table...|T"
 msgstr "Taulukko...|T"
 
-#: lib/ui/stdmenus.inc:312
+#: lib/ui/stdmenus.inc:314
 msgid "Short Title|S"
 msgstr "Lyhyt otsikko"
 
-#: lib/ui/stdmenus.inc:313
+#: lib/ui/stdmenus.inc:315
 msgid "TeX Code|X"
 msgstr "TeX-koodi"
 
-#: lib/ui/stdmenus.inc:314 src/insets/InsetInclude.cpp:354
-msgid "Program Listing"
+#: lib/ui/stdmenus.inc:316
+#, fuzzy
+msgid "Program Listing[[Menu]]"
 msgstr "Ohjelmalistaus"
 
-#: lib/ui/stdmenus.inc:321
+#: lib/ui/stdmenus.inc:323
 msgid "Ordinary Quote|Q"
 msgstr "Tavallinen lainausmerkki (\")|l"
 
-#: lib/ui/stdmenus.inc:322
+#: lib/ui/stdmenus.inc:324
 msgid "Single Quote|S"
 msgstr "Yksink.|#Y"
 
-#: lib/ui/stdmenus.inc:324
+#: lib/ui/stdmenus.inc:326
 msgid "Phonetic Symbols|y"
 msgstr "Foneettiset merkit"
 
-#: lib/ui/stdmenus.inc:331
+#: lib/ui/stdmenus.inc:333
 msgid "Protected Space|P"
 msgstr "Kova välilyönti|K"
 
-#: lib/ui/stdmenus.inc:334
+#: lib/ui/stdmenus.inc:336
 msgid "Horizontal Fill|F"
 msgstr "Vaakatäyte:|#V"
 
-#: lib/ui/stdmenus.inc:335
+#: lib/ui/stdmenus.inc:337
 #, fuzzy
 msgid "Horizontal Line|L"
 msgstr "&Vaakaviiva:"
 
-#: lib/ui/stdmenus.inc:336
+#: lib/ui/stdmenus.inc:338
 #, fuzzy
 msgid "Vertical Space...|V"
 msgstr "Pystyväli...|#P"
 
-#: lib/ui/stdmenus.inc:338
+#: lib/ui/stdmenus.inc:340
 msgid "Hyphenation Point|H"
 msgstr "Tavutuskohta|T"
 
-#: lib/ui/stdmenus.inc:340
+#: lib/ui/stdmenus.inc:342
 msgid "Line Break|B"
 msgstr "Rivinvaihto|R"
 
-#: lib/ui/stdmenus.inc:342
+#: lib/ui/stdmenus.inc:344
 msgid "Page Break|a"
 msgstr "&Sivunvaihto"
 
-#: lib/ui/stdmenus.inc:343
+#: lib/ui/stdmenus.inc:345
 msgid "Clear Page|C"
 msgstr "Uusi sivu"
 
-#: lib/ui/stdmenus.inc:344
+#: lib/ui/stdmenus.inc:346
 msgid "Clear Double Page|D"
 msgstr "Uusi sivupari"
 
-#: lib/ui/stdmenus.inc:350
+#: lib/ui/stdmenus.inc:352
 msgid "Numbered Formula|N"
 msgstr "Numeroitu kaava"
 
-#: lib/ui/stdmenus.inc:360
+#: lib/ui/stdmenus.inc:362
 msgid "Aligned Environment|l"
 msgstr "Aligned-ympäristö|T"
 
-#: lib/ui/stdmenus.inc:361
+#: lib/ui/stdmenus.inc:363
 msgid "AlignedAt Environment|v"
 msgstr "AlignedAt-ympäristö"
 
-#: lib/ui/stdmenus.inc:362
+#: lib/ui/stdmenus.inc:364
 msgid "Gathered Environment|h"
 msgstr "Gatheredympäristö"
 
-#: lib/ui/stdmenus.inc:365
+#: lib/ui/stdmenus.inc:367
 msgid "Delimiters|r"
 msgstr "Erottimet"
 
-#: lib/ui/stdmenus.inc:366
+#: lib/ui/stdmenus.inc:368
 #, fuzzy
 msgid "Matrix|x"
 msgstr "Matriisi"
 
-#: lib/ui/stdmenus.inc:368 lib/ui/stdtoolbars.inc:163
+#: lib/ui/stdmenus.inc:370 lib/ui/stdtoolbars.inc:163
 msgid "Toggle Math Panels"
 msgstr "Matematiikkapaneeli pois/päälle"
 
-#: lib/ui/stdmenus.inc:374
+#: lib/ui/stdmenus.inc:376
 msgid "Text Wrap Float|W"
 msgstr "Tekstin tykö -upote"
 
-#: lib/ui/stdmenus.inc:390
+#: lib/ui/stdmenus.inc:392
 msgid "External Material...|M"
 msgstr "Ulkoinen aineisto...|k"
 
-#: lib/ui/stdmenus.inc:391
+#: lib/ui/stdmenus.inc:393
 msgid "Child Document...|d"
 msgstr "Aliasiakirja...|A"
 
-#: lib/ui/stdmenus.inc:395
+#: lib/ui/stdmenus.inc:397
 msgid "LyX Note|N"
 msgstr "Muistiinpano|i"
 
-#: lib/ui/stdmenus.inc:396
+#: lib/ui/stdmenus.inc:398
 msgid "Comment|C"
 msgstr "Huomautus"
 
-#: lib/ui/stdmenus.inc:397
+#: lib/ui/stdmenus.inc:399
 msgid "Framed|F"
 msgstr "Kehyksellinen"
 
-#: lib/ui/stdmenus.inc:398
+#: lib/ui/stdmenus.inc:400
 msgid "Greyed Out|G"
 msgstr "Harmaa teksti"
 
-#: lib/ui/stdmenus.inc:399
+#: lib/ui/stdmenus.inc:401
 msgid "Shaded|S"
 msgstr "Varjostettu"
 
-#: lib/ui/stdmenus.inc:411
+#: lib/ui/stdmenus.inc:417
 msgid "Change Tracking|C"
 msgstr "Muutosten seurantai"
 
-#: lib/ui/stdmenus.inc:415
+#: lib/ui/stdmenus.inc:421
 #, fuzzy
 msgid "Start Appendix Here|A"
 msgstr "Aloita liite tästä|i"
 
-#: lib/ui/stdmenus.inc:417
+#: lib/ui/stdmenus.inc:423
+#, fuzzy
+msgid "Embedded Files|E"
+msgstr "Lisäominaisuudet|L"
+
+#: lib/ui/stdmenus.inc:424
 msgid "Compressed|m"
 msgstr "Zipattu"
 
-#: lib/ui/stdmenus.inc:418
+#: lib/ui/stdmenus.inc:425
 msgid "Settings...|S"
 msgstr "Asetukset..."
 
-#: lib/ui/stdmenus.inc:424
+#: lib/ui/stdmenus.inc:431
 #, fuzzy
 msgid "Accept Change|A"
 msgstr "Kirjasimen vaihto|v"
 
-#: lib/ui/stdmenus.inc:425
+#: lib/ui/stdmenus.inc:432
 #, fuzzy
 msgid "Reject Change|R"
 msgstr "Päivitä|#P"
 
-#: lib/ui/stdmenus.inc:426
+#: lib/ui/stdmenus.inc:433
 msgid "Accept All Changes|c"
 msgstr ""
 
-#: lib/ui/stdmenus.inc:427
+#: lib/ui/stdmenus.inc:434
 #, fuzzy
 msgid "Reject All Changes|e"
 msgstr "Päivitä|#P"
 
-#: lib/ui/stdmenus.inc:437
+#: lib/ui/stdmenus.inc:444
 #, fuzzy
 msgid "Next Change|C"
 msgstr "Ei muutosta"
 
-#: lib/ui/stdmenus.inc:438
+#: lib/ui/stdmenus.inc:445
 #, fuzzy
 msgid "Next Cross-Reference|R"
 msgstr "Viite"
 
-#: lib/ui/stdmenus.inc:450
+#: lib/ui/stdmenus.inc:457
 #, fuzzy
 msgid "Clear Bookmarks|C"
 msgstr "Kirjanmerkit|#m"
 
-#: lib/ui/stdmenus.inc:461
+#: lib/ui/stdmenus.inc:468
 #, fuzzy
 msgid "Thesaurus...|T"
 msgstr "Synonyymit..."
 
-#: lib/ui/stdmenus.inc:464
+#: lib/ui/stdmenus.inc:471
 #, fuzzy
 msgid "TeX Information|I"
 msgstr "TeX-tietoja|X"
@@ -9033,11 +9379,11 @@ msgstr "Tuo asiakirja"
 msgid "Check spelling"
 msgstr "Tarkista TeX"
 
-#: lib/ui/stdtoolbars.inc:64 src/BufferView.cpp:715
+#: lib/ui/stdtoolbars.inc:64 src/BufferView.cpp:624
 msgid "Undo"
 msgstr "Kumoa"
 
-#: lib/ui/stdtoolbars.inc:65 src/BufferView.cpp:724
+#: lib/ui/stdtoolbars.inc:65 src/BufferView.cpp:633
 msgid "Redo"
 msgstr "Tee uudelleen"
 
@@ -9425,7 +9771,7 @@ msgid "Fractions"
 msgstr "LyX: Matematiikkapaneeli"
 
 #: lib/ui/stdtoolbars.inc:199 lib/ui/stdtoolbars.inc:282
-#: src/frontends/qt4/QDocument.cpp:581
+#: src/frontends/qt4/GuiDocument.cpp:581
 #, fuzzy
 msgid "Fonts"
 msgstr "Kirjasin: "
@@ -9538,7 +9884,6 @@ msgid "ln"
 msgstr ""
 
 #: lib/ui/stdtoolbars.inc:240
-#, fuzzy
 msgid "log"
 msgstr ""
 
@@ -10867,12 +11212,10 @@ msgid "varkappa"
 msgstr ""
 
 #: lib/ui/stdtoolbars.inc:568
-#, fuzzy
 msgid "beth"
 msgstr ""
 
 #: lib/ui/stdtoolbars.inc:569
-#, fuzzy
 msgid "daleth"
 msgstr ""
 
@@ -10889,7 +11232,6 @@ msgid "urcorner"
 msgstr ""
 
 #: lib/ui/stdtoolbars.inc:573
-#, fuzzy
 msgid "llcorner"
 msgstr ""
 
@@ -10910,7 +11252,6 @@ msgid "triangledown"
 msgstr ""
 
 #: lib/ui/stdtoolbars.inc:579
-#, fuzzy
 msgid "square"
 msgstr ""
 
@@ -11842,61 +12183,80 @@ msgid ""
 "Read 'info date' for more information.\n"
 msgstr ""
 
-#: src/Buffer.cpp:229
+#: src/BiblioInfo.cpp:125
+#, c-format
+msgid "%1$s and %2$s"
+msgstr "%1$s ja %2$s"
+
+#: src/BiblioInfo.cpp:128
+#, c-format
+msgid "%1$s et al."
+msgstr "%1$s ym."
+
+#: src/BiblioInfo.cpp:140
+msgid "No year"
+msgstr "Ei vuotta"
+
+#: src/BiblioInfo.cpp:374
+#, fuzzy
+msgid "before"
+msgstr "Edeltävä teksti:"
+
+#: src/Buffer.cpp:246
 #, fuzzy
 msgid "Could not remove temporary directory"
 msgstr "Väliaikaisen hakemiston luominen epäonnistui"
 
-#: src/Buffer.cpp:230
+#: src/Buffer.cpp:247
 #, fuzzy, c-format
 msgid "Could not remove the temporary directory %1$s"
 msgstr "Väliaikaisen hakemiston luominen epäonnistui"
 
-#: src/Buffer.cpp:401
+#: src/Buffer.cpp:432
 #, fuzzy
 msgid "Unknown document class"
 msgstr "valituksi asiakirjaluokaksi"
 
-#: src/Buffer.cpp:402
+#: src/Buffer.cpp:433
 #, c-format
 msgid "Using the default document class, because the class %1$s is unknown."
 msgstr ""
 
-#: src/Buffer.cpp:462 src/Text.cpp:295
+#: src/Buffer.cpp:495 src/Text.cpp:294
 #, c-format
 msgid "Unknown token: %1$s %2$s\n"
 msgstr "Tuntematon merkintä: %1$s %2$s\n"
 
-#: src/Buffer.cpp:466 src/Buffer.cpp:473 src/Buffer.cpp:493
+#: src/Buffer.cpp:499 src/Buffer.cpp:506 src/Buffer.cpp:526
 #, fuzzy
 msgid "Document header error"
 msgstr "Asiakirja nimetty uudelleen: '"
 
-#: src/Buffer.cpp:472
+#: src/Buffer.cpp:505
 msgid "\\begin_header is missing"
 msgstr ""
 
-#: src/Buffer.cpp:492
+#: src/Buffer.cpp:525
 msgid "\\begin_document is missing"
 msgstr ""
 
-#: src/Buffer.cpp:503
+#: src/Buffer.cpp:536
 #, fuzzy
 msgid "Can't load document class"
 msgstr "Tekstiluokkaa ei voi ladata "
 
-#: src/Buffer.cpp:504
+#: src/Buffer.cpp:537
 #, c-format
 msgid ""
 "Using the default document class, because the class %1$s could not be loaded."
 msgstr ""
 
-#: src/Buffer.cpp:515 src/Buffer.cpp:521 src/BufferView.cpp:848
-#: src/BufferView.cpp:854
+#: src/Buffer.cpp:548 src/Buffer.cpp:554 src/BufferView.cpp:759
+#: src/BufferView.cpp:765
 msgid "Changes not shown in LaTeX output"
 msgstr ""
 
-#: src/Buffer.cpp:516 src/BufferView.cpp:849
+#: src/Buffer.cpp:549 src/BufferView.cpp:760
 msgid ""
 "Changes will not be highlighted in LaTeX output, because neither dvipost nor "
 "xcolor/soul are installed.\n"
@@ -11904,7 +12264,7 @@ msgid ""
 "LaTeX preamble."
 msgstr ""
 
-#: src/Buffer.cpp:522 src/BufferView.cpp:855
+#: src/Buffer.cpp:555 src/BufferView.cpp:766
 msgid ""
 "Changes will not be highlighted in LaTeX output when using pdflatex, because "
 "xcolor and soul are not installed.\n"
@@ -11912,32 +12272,32 @@ msgid ""
 "LaTeX preamble."
 msgstr ""
 
-#: src/Buffer.cpp:657 src/Buffer.cpp:666
+#: src/Buffer.cpp:714 src/Buffer.cpp:723
 #, fuzzy
 msgid "Document could not be read"
 msgstr "Asiakirjan tallentaminen epäonnistui!"
 
-#: src/Buffer.cpp:658 src/Buffer.cpp:667
+#: src/Buffer.cpp:715 src/Buffer.cpp:724
 #, fuzzy, c-format
 msgid "%1$s could not be read."
 msgstr "%1$s kappaletta ei muuntunut"
 
-#: src/Buffer.cpp:675 src/Buffer.cpp:747
+#: src/Buffer.cpp:732 src/Buffer.cpp:812
 #, fuzzy
 msgid "Document format failure"
 msgstr "Asiakirjan tyyli"
 
-#: src/Buffer.cpp:676
+#: src/Buffer.cpp:733
 #, fuzzy, c-format
 msgid "%1$s is not a LyX document."
 msgstr "LyXissä käytettävä avainsana."
 
-#: src/Buffer.cpp:700
+#: src/Buffer.cpp:765
 #, fuzzy
 msgid "Conversion failed"
 msgstr "Muuntaminen"
 
-#: src/Buffer.cpp:701
+#: src/Buffer.cpp:766
 #, fuzzy, c-format
 msgid ""
 "%1$s is from a different version of LyX, but a temporary file for converting "
@@ -11945,12 +12305,12 @@ msgid ""
 msgstr ""
 "Tiedosto on tehty aiemmalla LyXin versiolla, mikä aiheuttanee ongelmia."
 
-#: src/Buffer.cpp:710
+#: src/Buffer.cpp:775
 #, fuzzy
 msgid "Conversion script not found"
 msgstr "Versionhallintalokitiedostoa ei löytynyt"
 
-#: src/Buffer.cpp:711
+#: src/Buffer.cpp:776
 #, fuzzy, c-format
 msgid ""
 "%1$s is from a different version of LyX, but the conversion script lyx2lyx "
@@ -11958,12 +12318,12 @@ msgid ""
 msgstr ""
 "Tiedosto on tehty aiemmalla LyXin versiolla, mikä aiheuttanee ongelmia."
 
-#: src/Buffer.cpp:732
+#: src/Buffer.cpp:797
 #, fuzzy
 msgid "Conversion script failed"
 msgstr "Muunnoskriptiä ei löydy."
 
-#: src/Buffer.cpp:733
+#: src/Buffer.cpp:798
 #, fuzzy, c-format
 msgid ""
 "%1$s is from a different version of LyX, but the lyx2lyx script failed to "
@@ -11971,59 +12331,77 @@ msgid ""
 msgstr ""
 "Tiedosto on tehty aiemmalla LyXin versiolla, mikä aiheuttanee ongelmia."
 
-#: src/Buffer.cpp:748
+#: src/Buffer.cpp:813
 #, c-format
 msgid "%1$s ended unexpectedly, which means that it is probably corrupted."
 msgstr ""
 
-#: src/Buffer.cpp:784
+#: src/Buffer.cpp:849
 #, fuzzy
 msgid "Backup failure"
 msgstr "Varmuuskopiot"
 
-#: src/Buffer.cpp:785
+#: src/Buffer.cpp:850
 #, c-format
 msgid ""
 "Cannot create backup file %1$s.\n"
 "Please check whether the directory exists and is writeable."
 msgstr ""
 
-#: src/Buffer.cpp:931
+#: src/Buffer.cpp:860
+#, c-format
+msgid ""
+"Document %1$s has been externally modified. Are you sure you want to "
+"overwrite this file?"
+msgstr ""
+
+#: src/Buffer.cpp:862
+#, fuzzy
+msgid "Overwrite modified file?"
+msgstr "Katsele tiedostoa"
+
+#: src/Buffer.cpp:863 src/Exporter.cpp:87 src/LyXFunc.cpp:1155
+#: src/LyXFunc.cpp:2195 src/callback.cpp:187
+#, fuzzy
+msgid "&Overwrite"
+msgstr "&Kirjoituskone:"
+
+#: src/Buffer.cpp:1026
 #, fuzzy
 msgid "Encoding error"
 msgstr "&Merkistö:"
 
-#: src/Buffer.cpp:932
+#: src/Buffer.cpp:1027
 msgid ""
 "Some characters of your document are probably not representable in the "
 "chosen encoding.\n"
 "Changing the document encoding to utf8 could help."
 msgstr ""
 
-#: src/Buffer.cpp:1210
+#: src/Buffer.cpp:1308
 msgid "Running chktex..."
 msgstr "chktex on käynnissä..."
 
-#: src/Buffer.cpp:1223
+#: src/Buffer.cpp:1321
 msgid "chktex failure"
 msgstr ""
 
-#: src/Buffer.cpp:1224
+#: src/Buffer.cpp:1322
 #, fuzzy
 msgid "Could not run chktex successfully."
 msgstr "Chktex-ajo onnistui"
 
-#: src/Buffer.cpp:1759
+#: src/Buffer.cpp:1826
 #, fuzzy
 msgid "Preview source code"
 msgstr "Esikatselu|#E"
 
-#: src/Buffer.cpp:1770
-#, c-format
-msgid "Preview source code for paragraph %1$s"
-msgstr ""
+#: src/Buffer.cpp:1839
+#, fuzzy, c-format
+msgid "Preview source code for paragraph %1$d"
+msgstr "Esikatselu|#E"
 
-#: src/Buffer.cpp:1774
+#: src/Buffer.cpp:1843
 #, c-format
 msgid "Preview source code from paragraph %1$s to %2$s"
 msgstr ""
@@ -12036,7 +12414,7 @@ msgid ""
 "Do you want to save the document or discard the changes?"
 msgstr ""
 
-#: src/BufferList.cpp:112 src/BufferList.cpp:220 src/LyXFunc.cpp:741
+#: src/BufferList.cpp:112 src/BufferList.cpp:220 src/LyXFunc.cpp:784
 #, fuzzy
 msgid "Save changed document?"
 msgstr "Haluatko tallentaa asiakirjan?"
@@ -12045,24 +12423,24 @@ msgstr "Haluatko tallentaa asiakirjan?"
 msgid "&Discard"
 msgstr ""
 
-#: src/BufferList.cpp:347
+#: src/BufferList.cpp:343
 #, c-format
 msgid "LyX: Attempting to save document %1$s"
 msgstr "LyX yrittää tallentaa asiakirjaa %1$s"
 
-#: src/BufferList.cpp:358 src/BufferList.cpp:371 src/BufferList.cpp:385
+#: src/BufferList.cpp:354 src/BufferList.cpp:367 src/BufferList.cpp:381
 msgid "  Save seems successful. Phew."
 msgstr "  Tallennus ilmeisesti onnistui. Huh."
 
-#: src/BufferList.cpp:361 src/BufferList.cpp:375
+#: src/BufferList.cpp:357 src/BufferList.cpp:371
 msgid "  Save failed! Trying..."
 msgstr "  Tallennus epäonnistui! Yrittää..."
 
-#: src/BufferList.cpp:388
+#: src/BufferList.cpp:384
 msgid "  Save failed! Bummer. Document is lost."
 msgstr "  Tallennus epäonnistui! Asiakirja on hävinnyt."
 
-#: src/BufferParams.cpp:476
+#: src/BufferParams.cpp:472
 #, c-format
 msgid ""
 "The layout file requested by this document,\n"
@@ -12073,75 +12451,94 @@ msgid ""
 "for more information.\n"
 msgstr ""
 
-#: src/BufferParams.cpp:482
+#: src/BufferParams.cpp:478
 #, fuzzy
 msgid "Document class not available"
 msgstr "Asiakirjan tallentaminen epäonnistui!"
 
-#: src/BufferParams.cpp:483
+#: src/BufferParams.cpp:479
 msgid "LyX will not be able to produce output."
 msgstr "LyX ei voi tuottaa tulostetta."
 
-#: src/BufferView.cpp:519
+#: src/BufferParams.cpp:1258
+#, c-format
+msgid ""
+"The module %1$s has been requested by\n"
+"this document but has not been found in the list of\n"
+"available modules. If you recently installed it, you\n"
+"probalby need to reconfigure LyX.\n"
+msgstr ""
+
+#: src/BufferParams.cpp:1262
+#, fuzzy
+msgid "Module not available"
+msgstr "Asiakirjan tallentaminen epäonnistui!"
+
+#: src/BufferParams.cpp:1263
+#, fuzzy
+msgid "Some layouts may not be available."
+msgstr "Asiakirjan tallentaminen epäonnistui!"
+
+#: src/BufferView.cpp:408
 #, fuzzy
 msgid "Save bookmark"
 msgstr "Tallenna kirjanmerkki 2"
 
-#: src/BufferView.cpp:718
+#: src/BufferView.cpp:627
 msgid "No further undo information"
 msgstr "Ei enää muuta kumottavaa"
 
-#: src/BufferView.cpp:727
+#: src/BufferView.cpp:636
 msgid "No further redo information"
 msgstr "Ei muuta uudelleen tehtävää"
 
-#: src/BufferView.cpp:914
+#: src/BufferView.cpp:825
 msgid "Mark off"
 msgstr "Merkintä pois päältä"
 
-#: src/BufferView.cpp:921
+#: src/BufferView.cpp:832
 msgid "Mark on"
 msgstr "Merkintä päälle"
 
-#: src/BufferView.cpp:928
+#: src/BufferView.cpp:839
 msgid "Mark removed"
 msgstr "Merkintä poistettu"
 
-#: src/BufferView.cpp:931
+#: src/BufferView.cpp:842
 msgid "Mark set"
 msgstr "Merkintä asetettu"
 
-#: src/BufferView.cpp:977
+#: src/BufferView.cpp:888
 #, fuzzy, c-format
 msgid "%1$d words in selection."
 msgstr "%1$d sanaa tarkastettu."
 
-#: src/BufferView.cpp:980
+#: src/BufferView.cpp:891
 #, fuzzy, c-format
 msgid "%1$d words in document."
 msgstr "%1$d sanaa tarkastettu."
 
-#: src/BufferView.cpp:985
+#: src/BufferView.cpp:896
 #, fuzzy
 msgid "One word in selection."
 msgstr "Yksi sana tarkastettu."
 
-#: src/BufferView.cpp:987
+#: src/BufferView.cpp:898
 #, fuzzy
 msgid "One word in document."
 msgstr "Lisätään asiakirja "
 
-#: src/BufferView.cpp:990
+#: src/BufferView.cpp:901
 #, fuzzy
 msgid "Count words"
 msgstr "Nykyinen sana"
 
-#: src/BufferView.cpp:1579
+#: src/BufferView.cpp:1478
 msgid "Select LyX document to insert"
 msgstr "Valitse lisättävä LyX-asiakirja"
 
-#: src/BufferView.cpp:1581 src/LyXFunc.cpp:1935 src/LyXFunc.cpp:1974
-#: src/LyXFunc.cpp:2047 src/callback.cpp:134
+#: src/BufferView.cpp:1480 src/LyXFunc.cpp:2032 src/LyXFunc.cpp:2069
+#: src/LyXFunc.cpp:2146 src/callback.cpp:149
 #: src/frontends/controllers/ControlBibtex.cpp:52
 #: src/frontends/controllers/ControlBibtex.cpp:64
 #: src/frontends/controllers/ControlExternal.cpp:169
@@ -12150,32 +12547,32 @@ msgstr "Valitse lis
 msgid "Documents|#o#O"
 msgstr "Asiakirjat|#A#a"
 
-#: src/BufferView.cpp:1582 src/LyXFunc.cpp:1975 src/LyXFunc.cpp:2048
+#: src/BufferView.cpp:1481 src/LyXFunc.cpp:2070 src/LyXFunc.cpp:2147
 msgid "Examples|#E#e"
 msgstr "Esimerkit|#E#e"
 
-#: src/BufferView.cpp:1588 src/LyXFunc.cpp:1940 src/LyXFunc.cpp:1979
-#: src/callback.cpp:140
+#: src/BufferView.cpp:1487 src/LyXFunc.cpp:2037 src/LyXFunc.cpp:2074
+#: src/callback.cpp:157
 #, fuzzy
 msgid "LyX Documents (*.lyx)"
 msgstr "*.lyx| LyX-asiakirjat (*.lyx)"
 
-#: src/BufferView.cpp:1600 src/LyXFunc.cpp:1989 src/LyXFunc.cpp:2069
-#: src/LyXFunc.cpp:2083 src/LyXFunc.cpp:2099
+#: src/BufferView.cpp:1499 src/LyXFunc.cpp:2084 src/LyXFunc.cpp:2168
+#: src/LyXFunc.cpp:2182 src/LyXFunc.cpp:2198
 msgid "Canceled."
 msgstr "Peruttu."
 
-#: src/BufferView.cpp:1611
+#: src/BufferView.cpp:1510
 #, c-format
 msgid "Inserting document %1$s..."
 msgstr "Lisätään asiakirja %1$s..."
 
-#: src/BufferView.cpp:1622
+#: src/BufferView.cpp:1521
 #, c-format
 msgid "Document %1$s inserted."
 msgstr "Asiakirja %1$s lisätty."
 
-#: src/BufferView.cpp:1624
+#: src/BufferView.cpp:1523
 #, c-format
 msgid "Could not insert document %1$s"
 msgstr "Asiakirjaa %1$s ei voi lisätä"
@@ -12189,242 +12586,233 @@ msgstr "ChkTeXin varoitus n:o # %1$d"
 msgid "ChkTeX warning id # "
 msgstr "ChkTeXin varoitus n:o #"
 
-#: src/Color.cpp:268
+#: src/Color.cpp:157
 msgid "none"
 msgstr "ei mikään"
 
-#: src/Color.cpp:269
+#: src/Color.cpp:158
 msgid "black"
 msgstr "musta"
 
-#: src/Color.cpp:270
+#: src/Color.cpp:159
 msgid "white"
 msgstr "valkoinen"
 
-#: src/Color.cpp:271
+#: src/Color.cpp:160
 msgid "red"
 msgstr "punainen"
 
-#: src/Color.cpp:272
+#: src/Color.cpp:161
 msgid "green"
 msgstr "vihreä"
 
-#: src/Color.cpp:273
+#: src/Color.cpp:162
 msgid "blue"
 msgstr "sininen"
 
-#: src/Color.cpp:274
+#: src/Color.cpp:163
 msgid "cyan"
 msgstr "syaani"
 
-#: src/Color.cpp:275
+#: src/Color.cpp:164
 msgid "magenta"
 msgstr "magenta"
 
-#: src/Color.cpp:276
+#: src/Color.cpp:165
 msgid "yellow"
 msgstr "keltainen"
 
-#: src/Color.cpp:277
+#: src/Color.cpp:166
 msgid "cursor"
 msgstr "kohdistin"
 
-#: src/Color.cpp:278
+#: src/Color.cpp:167
 msgid "background"
 msgstr "tausta"
 
-#: src/Color.cpp:279
+#: src/Color.cpp:168
 msgid "text"
 msgstr "teksti"
 
-#: src/Color.cpp:280
+#: src/Color.cpp:169
 msgid "selection"
 msgstr "valinta"
 
-#: src/Color.cpp:281
+#: src/Color.cpp:170
 msgid "LaTeX text"
 msgstr "LaTeX-teksti"
 
-#: src/Color.cpp:282
+#: src/Color.cpp:171
 msgid "previewed snippet"
 msgstr "esikatselupalanen"
 
-#: src/Color.cpp:283 src/insets/InsetNote.cpp:342
-msgid "note"
-msgstr "muistiinpano"
-
-#: src/Color.cpp:284
+#: src/Color.cpp:173
 msgid "note background"
 msgstr "muistiinpanon tausta"
 
-#: src/Color.cpp:285
-#, fuzzy
-msgid "comment"
-msgstr "Huomautus"
-
-#: src/Color.cpp:286
+#: src/Color.cpp:175
 #, fuzzy
 msgid "comment background"
 msgstr "komento-upotteen tausta"
 
-#: src/Color.cpp:287
+#: src/Color.cpp:176
 msgid "greyedout inset"
 msgstr "harmaa-teksti upote"
 
-#: src/Color.cpp:288
+#: src/Color.cpp:177
 msgid "greyedout inset background"
 msgstr "harmaa-teksti upotteen tausta"
 
-#: src/Color.cpp:289
+#: src/Color.cpp:178
 msgid "shaded box"
 msgstr "varjollinen laatikko"
 
-#: src/Color.cpp:290
+#: src/Color.cpp:179
 msgid "depth bar"
 msgstr "syvyyspalkki"
 
-#: src/Color.cpp:291
+#: src/Color.cpp:180
 msgid "language"
 msgstr "kieli"
 
-#: src/Color.cpp:292
+#: src/Color.cpp:181
 msgid "command inset"
 msgstr "komento-upote"
 
-#: src/Color.cpp:293
+#: src/Color.cpp:182
 msgid "command inset background"
 msgstr "komento-upotteen tausta"
 
-#: src/Color.cpp:294
+#: src/Color.cpp:183
 msgid "command inset frame"
 msgstr "komento-upotteen kehys"
 
-#: src/Color.cpp:295
+#: src/Color.cpp:184
 msgid "special character"
 msgstr "erikoismerkki"
 
-#: src/Color.cpp:296
+#: src/Color.cpp:185
 msgid "math"
 msgstr "matematiikka"
 
-#: src/Color.cpp:297
+#: src/Color.cpp:186
 msgid "math background"
 msgstr "matematiikan tausta"
 
-#: src/Color.cpp:298
+#: src/Color.cpp:187
 msgid "graphics background"
 msgstr "grafiikan tausta"
 
-#: src/Color.cpp:299
+#: src/Color.cpp:188
 msgid "Math macro background"
 msgstr "Matematiikkamakron tausta"
 
-#: src/Color.cpp:300
+#: src/Color.cpp:189
 msgid "math frame"
 msgstr "matematiikkakehys"
 
-#: src/Color.cpp:301
+#: src/Color.cpp:190
 #, fuzzy
 msgid "math corners"
 msgstr "matematiikkarivi"
 
-#: src/Color.cpp:302
+#: src/Color.cpp:191
 msgid "math line"
 msgstr "matematiikkarivi"
 
-#: src/Color.cpp:303
+#: src/Color.cpp:192
 msgid "caption frame"
 msgstr "kuvatekstin kehys"
 
-#: src/Color.cpp:304
+#: src/Color.cpp:193
 msgid "collapsable inset text"
 msgstr "laskostuvan upotteen teksti"
 
-#: src/Color.cpp:305
+#: src/Color.cpp:194
 msgid "collapsable inset frame"
 msgstr "laskostuvan upotteen kehys"
 
-#: src/Color.cpp:306
+#: src/Color.cpp:195
 msgid "inset background"
 msgstr "upotteen tausta"
 
-#: src/Color.cpp:307
+#: src/Color.cpp:196
 msgid "inset frame"
 msgstr "upotteen kehys"
 
-#: src/Color.cpp:308
+#: src/Color.cpp:197
 msgid "LaTeX error"
 msgstr "LaTeX-virhe"
 
-#: src/Color.cpp:309
+#: src/Color.cpp:198
 msgid "end-of-line marker"
 msgstr "rivin lopun merkki"
 
-#: src/Color.cpp:310
+#: src/Color.cpp:199
 #, fuzzy
 msgid "appendix marker"
 msgstr "liiterivi"
 
-#: src/Color.cpp:311
+#: src/Color.cpp:200
 #, fuzzy
 msgid "change bar"
 msgstr "Ei muutosta"
 
-#: src/Color.cpp:312
+#: src/Color.cpp:201
 #, fuzzy
 msgid "Deleted text"
 msgstr "P&oista"
 
-#: src/Color.cpp:313
+#: src/Color.cpp:202
 #, fuzzy
 msgid "Added text"
 msgstr "LaTeX-teksti"
 
-#: src/Color.cpp:314
+#: src/Color.cpp:203
 msgid "added space markers"
 msgstr "lisävälin merkit"
 
-#: src/Color.cpp:315
+#: src/Color.cpp:204
 msgid "top/bottom line"
 msgstr "ylä/alarivi"
 
-#: src/Color.cpp:316
+#: src/Color.cpp:205
 #, fuzzy
 msgid "table line"
 msgstr "taulukkorivi"
 
-#: src/Color.cpp:317
+#: src/Color.cpp:206
 #, fuzzy
 msgid "table on/off line"
 msgstr "taulukkokäyttörivi"
 
-#: src/Color.cpp:319
+#: src/Color.cpp:208
 msgid "bottom area"
 msgstr "alaosa"
 
-#: src/Color.cpp:320
+#: src/Color.cpp:209
 msgid "page break"
 msgstr "sivunvaihto"
 
-#: src/Color.cpp:321
+#: src/Color.cpp:210
 #, fuzzy
 msgid "frame of button"
 msgstr "painikkeen vasen puoli"
 
-#: src/Color.cpp:322
+#: src/Color.cpp:211
 msgid "button background"
 msgstr "painikkeen tausta"
 
-#: src/Color.cpp:323
+#: src/Color.cpp:212
 #, fuzzy
 msgid "button background under focus"
 msgstr "painikkeen tausta"
 
-#: src/Color.cpp:324
+#: src/Color.cpp:213
 msgid "inherit"
 msgstr "peri"
 
-#: src/Color.cpp:325
+#: src/Color.cpp:214
 msgid "ignore"
 msgstr "ohita"
 
@@ -12453,14 +12841,17 @@ msgid "There were errors during the build process."
 msgstr "Käännösprosessin aikana tapahtui virheitä."
 
 #: src/Converter.cpp:479 src/Format.cpp:327 src/Format.cpp:386
+#, c-format
 msgid "An error occurred whilst running %1$s"
 msgstr "Muunnosskriptin %1$s suorittaminen epäonnistui."
 
 #: src/Converter.cpp:502
+#, fuzzy, c-format
 msgid "Could not move a temporary directory from %1$s to %2$s."
 msgstr "Väliaikaisen hakemiston siiro paikasta %1$s paikkaan %1$s epäonnistui."
 
 #: src/Converter.cpp:548
+#, c-format
 msgid "Could not copy a temporary file from %1$s to %2$s."
 msgstr "Väliaikaisen tiedoston kopiointi paikasta %1$s paikkaan %2$s."
 
@@ -12494,7 +12885,7 @@ msgstr "on tyhj
 msgid "An empty output file was generated."
 msgstr ""
 
-#: src/CutAndPaste.cpp:439
+#: src/CutAndPaste.cpp:431
 #, c-format
 msgid ""
 "Layout had to be changed from\n"
@@ -12507,12 +12898,12 @@ msgstr ""
 "koska luokka muuttui\n"
 "luokasta %3$s luokaksi %4$s"
 
-#: src/CutAndPaste.cpp:444
+#: src/CutAndPaste.cpp:436
 #, fuzzy
 msgid "Changed Layout"
 msgstr "Merkkiasettelu"
 
-#: src/CutAndPaste.cpp:463
+#: src/CutAndPaste.cpp:455
 #, fuzzy, c-format
 msgid ""
 "Character style %1$s is undefined because of class conversion from\n"
@@ -12523,11 +12914,23 @@ msgstr ""
 "koska luokka muuttui\n"
 "luokasta %3$s luokaksi %4$s"
 
-#: src/CutAndPaste.cpp:470
+#: src/CutAndPaste.cpp:462
 msgid "Undefined character style"
 msgstr ""
 
-#: src/Exporter.cpp:82 src/LyXFunc.cpp:1083
+#: src/EmbeddedFiles.cpp:214
+#, fuzzy
+msgid "Save failure"
+msgstr "Varmuuskopiot"
+
+#: src/EmbeddedFiles.cpp:215
+#, c-format
+msgid ""
+"Cannot create file %1$s.\n"
+"Please check whether the directory exists and is writeable."
+msgstr ""
+
+#: src/Exporter.cpp:82 src/LyXFunc.cpp:1151
 #, c-format
 msgid ""
 "The file %1$s already exists.\n"
@@ -12535,17 +12938,11 @@ msgid ""
 "Do you want to overwrite that file?"
 msgstr ""
 
-#: src/Exporter.cpp:85 src/LyXFunc.cpp:1086
+#: src/Exporter.cpp:85 src/LyXFunc.cpp:1154
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Katsele tiedostoa"
 
-#: src/Exporter.cpp:87 src/LyXFunc.cpp:1087 src/LyXFunc.cpp:2096
-#: src/callback.cpp:168
-#, fuzzy
-msgid "&Overwrite"
-msgstr "&Kirjoituskone:"
-
 #: src/Exporter.cpp:87
 #, fuzzy
 msgid "Overwrite &all"
@@ -12602,20 +12999,20 @@ msgid "Document exported as %1$s"
 msgstr "Asiakirja viety nimellä "
 
 #: src/Font.cpp:56 src/frontends/controllers/ControlDocument.cpp:48
-#: src/frontends/controllers/frontend_helpers.cpp:872
-#: src/frontends/qt4/QListings.cpp:162
+#: src/frontends/controllers/frontend_helpers.cpp:63
+#: src/frontends/qt4/GuiListings.cpp:162
 msgid "Roman"
 msgstr "Antiikva"
 
 #: src/Font.cpp:56 src/frontends/controllers/ControlDocument.cpp:48
-#: src/frontends/controllers/frontend_helpers.cpp:876
-#: src/frontends/qt4/QListings.cpp:162
+#: src/frontends/controllers/frontend_helpers.cpp:67
+#: src/frontends/qt4/GuiListings.cpp:162
 msgid "Sans Serif"
 msgstr "Sans serif"
 
 #: src/Font.cpp:56 src/frontends/controllers/ControlDocument.cpp:48
-#: src/frontends/controllers/frontend_helpers.cpp:880
-#: src/frontends/qt4/QListings.cpp:162
+#: src/frontends/controllers/frontend_helpers.cpp:71
+#: src/frontends/qt4/GuiListings.cpp:162
 msgid "Typewriter"
 msgstr "Kirjoituskone"
 
@@ -12633,23 +13030,23 @@ msgstr "Peri"
 msgid "Ignore"
 msgstr "Ohita"
 
-#: src/Font.cpp:61 src/frontends/controllers/frontend_helpers.cpp:902
+#: src/Font.cpp:61 src/frontends/controllers/frontend_helpers.cpp:93
 msgid "Medium"
 msgstr "Keskivahva"
 
-#: src/Font.cpp:61 src/frontends/controllers/frontend_helpers.cpp:906
+#: src/Font.cpp:61 src/frontends/controllers/frontend_helpers.cpp:97
 msgid "Bold"
 msgstr "Lihavoitu"
 
-#: src/Font.cpp:64 src/frontends/controllers/frontend_helpers.cpp:928
+#: src/Font.cpp:64 src/frontends/controllers/frontend_helpers.cpp:119
 msgid "Upright"
 msgstr "Pysty"
 
-#: src/Font.cpp:64 src/frontends/controllers/frontend_helpers.cpp:932
+#: src/Font.cpp:64 src/frontends/controllers/frontend_helpers.cpp:123
 msgid "Italic"
 msgstr "Kursiivi"
 
-#: src/Font.cpp:64 src/frontends/controllers/frontend_helpers.cpp:936
+#: src/Font.cpp:64 src/frontends/controllers/frontend_helpers.cpp:127
 msgid "Slanted"
 msgstr "Kalteva"
 
@@ -12657,11 +13054,11 @@ msgstr "Kalteva"
 msgid "Smallcaps"
 msgstr "Kapiteeli"
 
-#: src/Font.cpp:69 src/frontends/controllers/frontend_helpers.cpp:1002
+#: src/Font.cpp:69 src/frontends/controllers/frontend_helpers.cpp:193
 msgid "Increase"
 msgstr "Suurenna"
 
-#: src/Font.cpp:69 src/frontends/controllers/frontend_helpers.cpp:1006
+#: src/Font.cpp:69 src/frontends/controllers/frontend_helpers.cpp:197
 msgid "Decrease"
 msgstr "Pienennä"
 
@@ -12779,22 +13176,27 @@ msgid ""
 "2$s'."
 msgstr ""
 
-#: src/Importer.cpp:47
+#: src/Importer.cpp:48
 #, c-format
 msgid "Importing %1$s..."
 msgstr "Tuo: %1$s..."
 
-#: src/Importer.cpp:68
+#: src/Importer.cpp:69
 #, fuzzy
 msgid "Couldn't import file"
 msgstr "Ei voi tuoda tiedostoa"
 
-#: src/Importer.cpp:69
+#: src/Importer.cpp:70
 #, fuzzy, c-format
 msgid "No information for importing the format %1$s."
 msgstr "Ei tietoa, miten tuoda muodosta %1$s"
 
-#: src/Importer.cpp:95
+#: src/Importer.cpp:83
+#, fuzzy
+msgid "file not imported!"
+msgstr "Merkkijonoa ei löydy!"
+
+#: src/Importer.cpp:104
 msgid "imported."
 msgstr "tuotu."
 
@@ -12820,12 +13222,12 @@ msgstr "BibTeX on k
 msgid "Running MakeIndex for nomencl."
 msgstr "MakeIndex on käynnissä."
 
-#: src/LyX.cpp:131
+#: src/LyX.cpp:134
 #, fuzzy
 msgid "Could not read configuration file"
 msgstr "Ohjelma ei voinut käsitellä tiedostoa:"
 
-#: src/LyX.cpp:132
+#: src/LyX.cpp:135
 #, c-format
 msgid ""
 "Error while reading the configuration file\n"
@@ -12833,38 +13235,38 @@ msgid ""
 "Please check your installation."
 msgstr ""
 
-#: src/LyX.cpp:141
+#: src/LyX.cpp:144
 msgid "LyX: reconfiguring user directory"
 msgstr "LyX: Käyttäjän hakemisto konfiguroituu uudelleen"
 
-#: src/LyX.cpp:145
+#: src/LyX.cpp:148
 msgid "Done!"
 msgstr "Valmis!"
 
-#: src/LyX.cpp:505
+#: src/LyX.cpp:513
 #, fuzzy, c-format
 msgid "Unable to remove the temporary directory %1$s"
 msgstr "Väliaikaisen hakemiston luominen epäonnistui"
 
-#: src/LyX.cpp:507
+#: src/LyX.cpp:515
 #, fuzzy
 msgid "Unable to remove temporary directory"
 msgstr "Valitse väliaikaishakemisto"
 
-#: src/LyX.cpp:543
+#: src/LyX.cpp:551
 #, c-format
 msgid "Wrong command line option `%1$s'. Exiting."
 msgstr "Virheellinen valitsin \"%1$s\". Ohjelma sulkeutuu."
 
-#: src/LyX.cpp:811
+#: src/LyX.cpp:831
 msgid "LyX: "
 msgstr "LyX: "
 
-#: src/LyX.cpp:940
+#: src/LyX.cpp:962
 msgid "Could not create temporary directory"
 msgstr "Väliaikaisen hakemiston luominen epäonnistui"
 
-#: src/LyX.cpp:941
+#: src/LyX.cpp:963
 #, c-format
 msgid ""
 "Could not create a temporary directory in\n"
@@ -12875,51 +13277,51 @@ msgstr ""
 "%1$s epäonnistui. Varmista, että hakemisto on\n"
 "olemassa ja sinne voi kirjoittaa, ja yritä uudelleen."
 
-#: src/LyX.cpp:1108
+#: src/LyX.cpp:1131
 #, fuzzy
 msgid "Missing user LyX directory"
 msgstr "Käyttäjän LyX-hakemistoa ei ole. Sulkeutuu."
 
-#: src/LyX.cpp:1109
+#: src/LyX.cpp:1132
 #, fuzzy, c-format
 msgid ""
 "You have specified a non-existent user LyX directory, %1$s.\n"
 "It is needed to keep your own configuration."
 msgstr "Kirjoitit käyttäjän LyX-hakemiston, joka ei ole olemassa."
 
-#: src/LyX.cpp:1114
+#: src/LyX.cpp:1137
 #, fuzzy
 msgid "&Create directory"
 msgstr "LyX: Luo hakemiston "
 
-#: src/LyX.cpp:1115
+#: src/LyX.cpp:1138
 #, fuzzy
 msgid "&Exit LyX"
 msgstr "Lopeta"
 
-#: src/LyX.cpp:1116
+#: src/LyX.cpp:1139
 msgid "No user LyX directory. Exiting."
 msgstr "Käyttäjän LyX-hakemistoa ei ole. Sulkeutuu."
 
-#: src/LyX.cpp:1120
+#: src/LyX.cpp:1143
 #, c-format
 msgid "LyX: Creating directory %1$s"
 msgstr "LyX: Luo hakemiston %1$s"
 
-#: src/LyX.cpp:1126
+#: src/LyX.cpp:1149
 msgid "Failed to create directory. Exiting."
 msgstr "Hakemiston luominen epäonnistui. Sulkeutuu."
 
-#: src/LyX.cpp:1299
+#: src/LyX.cpp:1322
 msgid "List of supported debug flags:"
 msgstr "Luettelo mahdollisista virheilmoitusasetuksista:"
 
-#: src/LyX.cpp:1303
+#: src/LyX.cpp:1326
 #, c-format
 msgid "Setting debug level to %1$s"
 msgstr "Virheilmoitustaso on nyt %1$s"
 
-#: src/LyX.cpp:1314
+#: src/LyX.cpp:1337
 #, fuzzy
 msgid ""
 "Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
@@ -12962,76 +13364,76 @@ msgstr ""
 "        -version           näytä yhteenveto versio- ja käännöstiedoista\n"
 "Katso lisätietoja LyXin manuaalisivulta."
 
-#: src/LyX.cpp:1350 src/support/Package.cpp.in:568
+#: src/LyX.cpp:1373
 #, fuzzy
 msgid "No system directory"
 msgstr "Käyttäjän hakemisto: "
 
-#: src/LyX.cpp:1351
+#: src/LyX.cpp:1374
 msgid "Missing directory for -sysdir switch"
 msgstr "Komento puuttuu -sysdir-valitsimelta"
 
-#: src/LyX.cpp:1361
+#: src/LyX.cpp:1384
 #, fuzzy
 msgid "No user directory"
 msgstr "Käyttäjän hakemisto: "
 
-#: src/LyX.cpp:1362
+#: src/LyX.cpp:1385
 msgid "Missing directory for -userdir switch"
 msgstr "Komento puuttuu -userdir-valitsimelta"
 
-#: src/LyX.cpp:1372
+#: src/LyX.cpp:1395
 #, fuzzy
 msgid "Incomplete command"
 msgstr "Seuraava komento"
 
-#: src/LyX.cpp:1373
+#: src/LyX.cpp:1396
 msgid "Missing command string after --execute switch"
 msgstr "Komento puuttuu --execute-valitsimelta"
 
-#: src/LyX.cpp:1383
+#: src/LyX.cpp:1406
 msgid "Missing file type [eg latex, ps...] after --export switch"
 msgstr ""
 "Tiedostotyyppi [esim. latex, ps...] puuttuu --export-valitsimen jäljestä"
 
-#: src/LyX.cpp:1395
+#: src/LyX.cpp:1418
 msgid "Missing file type [eg latex, ps...] after --import switch"
 msgstr ""
 "Tiedostotyyppi [esim. latex, ps...] puuttuu --import-valitsimen jäljestä"
 
-#: src/LyX.cpp:1400
+#: src/LyX.cpp:1423
 msgid "Missing filename for --import"
 msgstr "Valitsimelle --import ei annettu tiedostoa"
 
-#: src/LyXFunc.cpp:369
+#: src/LyXFunc.cpp:380
 msgid "Unknown function."
 msgstr "Tuntematon funktio."
 
-#: src/LyXFunc.cpp:408
+#: src/LyXFunc.cpp:425
 msgid "Nothing to do"
 msgstr "Ei mitään tehtävää"
 
-#: src/LyXFunc.cpp:427
+#: src/LyXFunc.cpp:444
 msgid "Unknown action"
 msgstr "Tuntematon toiminto"
 
-#: src/LyXFunc.cpp:433 src/LyXFunc.cpp:725
+#: src/LyXFunc.cpp:450 src/LyXFunc.cpp:768
 msgid "Command disabled"
 msgstr "Komento ei käytössä"
 
-#: src/LyXFunc.cpp:440
+#: src/LyXFunc.cpp:457
 msgid "Command not allowed without any document open"
 msgstr "Komento ei toimi ilman avoinna olevaa asiakirjaa"
 
-#: src/LyXFunc.cpp:711
+#: src/LyXFunc.cpp:754
 msgid "Document is read-only"
 msgstr "Asiakirja on kirjoitussuojattu"
 
-#: src/LyXFunc.cpp:719
+#: src/LyXFunc.cpp:762
 msgid "This portion of the document is deleted."
 msgstr ""
 
-#: src/LyXFunc.cpp:738
+#: src/LyXFunc.cpp:781
 #, c-format
 msgid ""
 "The document %1$s has unsaved changes.\n"
@@ -13039,147 +13441,161 @@ msgid ""
 "Do you want to save the document?"
 msgstr ""
 
-#: src/LyXFunc.cpp:756
+#: src/LyXFunc.cpp:799
 #, c-format
 msgid ""
 "Could not print the document %1$s.\n"
 "Check that your printer is set up correctly."
 msgstr ""
 
-#: src/LyXFunc.cpp:759
+#: src/LyXFunc.cpp:802
 #, fuzzy
 msgid "Print document failed"
 msgstr "Tulosta tiedostoon"
 
-#: src/LyXFunc.cpp:778
+#: src/LyXFunc.cpp:821
 #, fuzzy, c-format
-msgid ""
-"The document could not be converted\n"
-"into the document class %1$s."
-msgstr "Asiakirja käyttää tuntematonta tekstiluokkaa \"%1$s\"."
+msgid "The document class %1$s.could not be loaded."
+msgstr "Asiakirjan tallentaminen epäonnistui!"
 
-#: src/LyXFunc.cpp:781
-msgid "Could not change class"
-msgstr ""
+#: src/LyXFunc.cpp:824
+#, fuzzy
+msgid "Could not load class"
+msgstr "Ohjelma ei voinut käsitellä tiedostoa:"
 
-#: src/LyXFunc.cpp:893
+#: src/LyXFunc.cpp:937
 #, c-format
 msgid "Saving document %1$s..."
 msgstr "Asiakirja %1$s tallentuu..."
 
-#: src/LyXFunc.cpp:897
+#: src/LyXFunc.cpp:941
 msgid " done."
 msgstr " valmis."
 
-#: src/LyXFunc.cpp:913
+#: src/LyXFunc.cpp:958
+#, fuzzy
+msgid "Saving all documents..."
+msgstr "Asiakirja %1$s tallentuu..."
+
+#: src/LyXFunc.cpp:971
+#, fuzzy
+msgid "All documents saved."
+msgstr "Asiakirjan tallentaminen epäonnistui!"
+
+#: src/LyXFunc.cpp:981
 #, c-format
 msgid ""
 "Any changes will be lost. Are you sure you want to revert to the saved "
 "version of the document %1$s?"
 msgstr ""
 
-#: src/LyXFunc.cpp:915 src/buffer_funcs.cpp:192
+#: src/LyXFunc.cpp:983
 #, fuzzy
 msgid "Revert to saved document?"
 msgstr "Peru kaikki muokkaukset"
 
-#: src/LyXFunc.cpp:916 src/LyXVC.cpp:175 src/buffer_funcs.cpp:193
+#: src/LyXFunc.cpp:984 src/LyXVC.cpp:175
 #, fuzzy
 msgid "&Revert"
 msgstr "Hylkää muutokset|y"
 
-#: src/LyXFunc.cpp:1110
+#: src/LyXFunc.cpp:1178
 #, fuzzy
 msgid "Exiting."
 msgstr "Lopeta|e"
 
-#: src/LyXFunc.cpp:1128 src/Text3.cpp:1337
+#: src/LyXFunc.cpp:1196 src/Text3.cpp:1340
 msgid "Missing argument"
 msgstr "Argumentti puuttuu"
 
-#: src/LyXFunc.cpp:1137
+#: src/LyXFunc.cpp:1205
 #, c-format
 msgid "Opening help file %1$s..."
 msgstr "Ohjetiedosto %1$s avautuu..."
 
-#: src/LyXFunc.cpp:1532
+#: src/LyXFunc.cpp:1520
+#, fuzzy, c-format
+msgid "Opening child document %1$s..."
+msgstr "Asiakirja %1$s avautuu..."
+
+#: src/LyXFunc.cpp:1616
 msgid "Syntax: set-color <lyx_name> <x11_name>"
 msgstr "Syntaksi: set-color <lyx_nimi> <x11_nimi>"
 
-#: src/LyXFunc.cpp:1543
+#: src/LyXFunc.cpp:1627
 #, c-format
 msgid "Set-color \"%1$s\" failed - color is undefined or may not be redefined"
 msgstr ""
 "Värin \"%1$s\" asetus epäonnistui: väri on määrittelemätön, tai sitä ei voi "
 "määritellä uudelleen."
 
-#: src/LyXFunc.cpp:1657
+#: src/LyXFunc.cpp:1739
 #, fuzzy, c-format
 msgid "Document defaults saved in %1$s"
 msgstr "Asiakirjan oletus|#o"
 
-#: src/LyXFunc.cpp:1660
+#: src/LyXFunc.cpp:1742
 #, fuzzy
 msgid "Unable to save document defaults"
 msgstr "Tallenna asiakirjan oletukseksi"
 
-#: src/LyXFunc.cpp:1716
+#: src/LyXFunc.cpp:1811
 msgid "Converting document to new document class..."
 msgstr "Asiakirja muuntuu toiseen asiakirjaluokkaan sopivaksi..."
 
-#: src/LyXFunc.cpp:1792
+#: src/LyXFunc.cpp:1890
 #, fuzzy, c-format
 msgid "Unknown toolbar \"%1$s\""
 msgstr "Taulukon ominaisuudet"
 
-#: src/LyXFunc.cpp:1800
+#: src/LyXFunc.cpp:1898
 #, fuzzy
 msgid "off"
 msgstr "Pois päältä"
 
-#: src/LyXFunc.cpp:1802
+#: src/LyXFunc.cpp:1900
 #, fuzzy
 msgid "auto"
 msgstr "Päiväys"
 
-#: src/LyXFunc.cpp:1804
+#: src/LyXFunc.cpp:1902
 #, c-format
 msgid "Toolbar \"%1$s\" state set to %2$s"
 msgstr ""
 
-#: src/LyXFunc.cpp:1933
+#: src/LyXFunc.cpp:2030
 msgid "Select template file"
 msgstr "Valitse mallitiedosto"
 
-#: src/LyXFunc.cpp:1936 src/callback.cpp:135
+#: src/LyXFunc.cpp:2033 src/callback.cpp:151
 msgid "Templates|#T#t"
 msgstr "Mallipohjat|#o#O"
 
-#: src/LyXFunc.cpp:1972
+#: src/LyXFunc.cpp:2067
 msgid "Select document to open"
 msgstr "Valitse avattava asiakirja"
 
-#: src/LyXFunc.cpp:2011
+#: src/LyXFunc.cpp:2106
 #, c-format
 msgid "Opening document %1$s..."
 msgstr "Asiakirja %1$s avautuu..."
 
-#: src/LyXFunc.cpp:2015
+#: src/LyXFunc.cpp:2114
 #, c-format
 msgid "Document %1$s opened."
 msgstr "Asiakirja %1$s avautui."
 
-#: src/LyXFunc.cpp:2017
+#: src/LyXFunc.cpp:2116
 #, c-format
 msgid "Could not open document %1$s"
 msgstr "Asiakirjan %1$s avaaminen epäonnistui"
 
-#: src/LyXFunc.cpp:2042
+#: src/LyXFunc.cpp:2141
 #, c-format
 msgid "Select %1$s file to import"
 msgstr "Valitse tuotava %1$s-tiedosto"
 
-#: src/LyXFunc.cpp:2093 src/callback.cpp:165
+#: src/LyXFunc.cpp:2192 src/callback.cpp:182
 #, c-format
 msgid ""
 "The document %1$s already exists.\n"
@@ -13187,12 +13603,22 @@ msgid ""
 "Do you want to overwrite that document?"
 msgstr ""
 
-#: src/LyXFunc.cpp:2095 src/callback.cpp:167
+#: src/LyXFunc.cpp:2194 src/callback.cpp:186
 #, fuzzy
 msgid "Overwrite document?"
 msgstr "Haluatko tallentaa asiakirjan?"
 
-#: src/LyXFunc.cpp:2158
+#: src/LyXFunc.cpp:2230
+#, fuzzy, c-format
+msgid "Document %1$s reloaded."
+msgstr "Asiakirja %1$s avautui."
+
+#: src/LyXFunc.cpp:2232
+#, fuzzy, c-format
+msgid "Could not reload document %1$s"
+msgstr "Asiakirjan avaaminen epäonnistui: "
+
+#: src/LyXFunc.cpp:2269
 msgid "Welcome to LyX!"
 msgstr "Tervetuloa LyXiin!"
 
@@ -13710,60 +14136,64 @@ msgstr ""
 msgid "Revert to stored version of document?"
 msgstr "Valitse alue asiakirjan loppuun saakka"
 
-#: src/MenuBackend.cpp:463 src/MenuBackend.cpp:500 src/MenuBackend.cpp:572
-#: src/MenuBackend.cpp:594 src/MenuBackend.cpp:617 src/MenuBackend.cpp:703
-#: src/MenuBackend.cpp:818
+#: src/MenuBackend.cpp:482
+#, fuzzy
+msgid "No Documents Open!"
+msgstr "Avoimia asiakirjoja ei ole!"
+
+#: src/MenuBackend.cpp:509 src/MenuBackend.cpp:581 src/MenuBackend.cpp:603
+#: src/MenuBackend.cpp:626 src/MenuBackend.cpp:713 src/MenuBackend.cpp:828
 #, fuzzy
 msgid "No Document Open!"
 msgstr "Avoimia asiakirjoja ei ole!"
 
-#: src/MenuBackend.cpp:540
+#: src/MenuBackend.cpp:549
 #, fuzzy
 msgid "Plain Text"
 msgstr "Etsi seuraava"
 
-#: src/MenuBackend.cpp:542
+#: src/MenuBackend.cpp:551
 #, fuzzy
 msgid "Plain Text, Join Lines"
 msgstr "ASCII-teksti riveinä"
 
-#: src/MenuBackend.cpp:718
+#: src/MenuBackend.cpp:728
 #, fuzzy
 msgid "Master Document"
 msgstr "Haluatko tallentaa asiakirjan?"
 
-#: src/MenuBackend.cpp:747
+#: src/MenuBackend.cpp:757
 #, fuzzy
 msgid "List of listings"
 msgstr "Luettelo: "
 
-#: src/MenuBackend.cpp:751
+#: src/MenuBackend.cpp:761
 #, fuzzy
 msgid "Other floats"
 msgstr "Muut kirjasinasetukset"
 
-#: src/MenuBackend.cpp:761
+#: src/MenuBackend.cpp:771
 msgid "No Table of contents"
 msgstr "Ei sisällysluetteloa"
 
-#: src/MenuBackend.cpp:807
+#: src/MenuBackend.cpp:817
 msgid " (auto)"
 msgstr ""
 
-#: src/MenuBackend.cpp:826
+#: src/MenuBackend.cpp:836
 #, fuzzy
 msgid "No Branch in Document!"
 msgstr "Asiakirja"
 
-#: src/Paragraph.cpp:1632 src/frontends/qt4/QParagraph.cpp:237
+#: src/Paragraph.cpp:1625 src/frontends/qt4/GuiParagraph.cpp:233
 msgid "Senseless with this layout!"
 msgstr "Järjetöntä tällä kappaletyylillä!"
 
-#: src/Paragraph.cpp:1692
+#: src/Paragraph.cpp:1689
 msgid "Alignment not permitted"
 msgstr ""
 
-#: src/Paragraph.cpp:1693
+#: src/Paragraph.cpp:1690
 msgid ""
 "The new layout does not permit the alignment previously used.\n"
 "Setting to default."
@@ -13774,151 +14204,151 @@ msgstr ""
 msgid "Native OS API not yet supported."
 msgstr "Ei vielä tuettu"
 
-#: src/Text.cpp:135
+#: src/Text.cpp:134
 #, fuzzy
 msgid "Unknown layout"
 msgstr "Tuntematon toiminto"
 
-#: src/Text.cpp:136
+#: src/Text.cpp:135
 #, c-format
 msgid ""
 "Layout '%1$s' does not exist in textclass '%2$s'\n"
 "Trying to use the default instead.\n"
 msgstr ""
 
-#: src/Text.cpp:167
+#: src/Text.cpp:166
 #, fuzzy
 msgid "Unknown Inset"
 msgstr "Tuntematon luettelo sisällyksistä"
 
-#: src/Text.cpp:273 src/Text.cpp:286
+#: src/Text.cpp:272 src/Text.cpp:285
 #, fuzzy
 msgid "Change tracking error"
 msgstr "Vaihda kieli"
 
-#: src/Text.cpp:274
+#: src/Text.cpp:273
 #, c-format
 msgid "Unknown author index for insertion: %1$d\n"
 msgstr ""
 
-#: src/Text.cpp:287
+#: src/Text.cpp:286
 #, c-format
 msgid "Unknown author index for deletion: %1$d\n"
 msgstr ""
 
-#: src/Text.cpp:294
+#: src/Text.cpp:293
 #, fuzzy
 msgid "Unknown token"
 msgstr "Tuntematon merkintä: "
 
-#: src/Text.cpp:769
+#: src/Text.cpp:722
 msgid ""
 "You cannot insert a space at the beginning of a paragraph. Please read the "
 "Tutorial."
 msgstr "Kappaleen alkuun ei voi lisätä välilyöntiä. Ks. Opastus."
 
-#: src/Text.cpp:780
+#: src/Text.cpp:733
 msgid "You cannot type two spaces this way. Please read the Tutorial."
 msgstr "Kahta perättäistä välilyöntiä ei voi lisätä näin. Ks. Opastus."
 
-#: src/Text.cpp:1822
+#: src/Text.cpp:1606
 #, fuzzy
 msgid "[Change Tracking] "
 msgstr "Vaihda kieli"
 
-#: src/Text.cpp:1828
+#: src/Text.cpp:1612
 #, fuzzy
 msgid "Change: "
 msgstr "Sivu: "
 
 # FIXME: Cannot translate properly!
-#: src/Text.cpp:1832
+#: src/Text.cpp:1616
 #, fuzzy
 msgid " at "
 msgstr " -> "
 
-#: src/Text.cpp:1842
+#: src/Text.cpp:1626
 #, c-format
 msgid "Font: %1$s"
 msgstr "Kirjasin: %1$s"
 
-#: src/Text.cpp:1847
+#: src/Text.cpp:1631
 #, c-format
 msgid ", Depth: %1$d"
 msgstr ", Syvyys: %1$d"
 
-#: src/Text.cpp:1853
+#: src/Text.cpp:1637
 msgid ", Spacing: "
 msgstr ", Välit: "
 
-#: src/Text.cpp:1859 src/frontends/qt4/QDocument.cpp:247
+#: src/Text.cpp:1643 src/frontends/qt4/GuiDocument.cpp:247
 msgid "OneHalf"
 msgstr "Puolikas"
 
-#: src/Text.cpp:1865
+#: src/Text.cpp:1649
 msgid "Other ("
 msgstr "Muu ("
 
-#: src/Text.cpp:1874
+#: src/Text.cpp:1658
 #, fuzzy
 msgid ", Inset: "
 msgstr ", Syvyys: "
 
-#: src/Text.cpp:1875
+#: src/Text.cpp:1659
 msgid ", Paragraph: "
 msgstr ", kappale: "
 
-#: src/Text.cpp:1876
+#: src/Text.cpp:1660
 msgid ", Id: "
 msgstr ""
 
-#: src/Text.cpp:1877
+#: src/Text.cpp:1661
 #, fuzzy
 msgid ", Position: "
 msgstr "Väittämä"
 
-#: src/Text.cpp:1883
+#: src/Text.cpp:1667
 msgid ", Char: 0x"
 msgstr ""
 
-#: src/Text.cpp:1885
+#: src/Text.cpp:1669
 msgid ", Boundary: "
 msgstr ""
 
-#: src/Text2.cpp:584
+#: src/Text2.cpp:574
 #, fuzzy
 msgid "No font change defined."
 msgstr "Siirry seuraavaan virheeseen"
 
-#: src/Text2.cpp:625
+#: src/Text2.cpp:615
 msgid "Nothing to index!"
 msgstr "Ei mitään hakemistossa!"
 
-#: src/Text2.cpp:627
+#: src/Text2.cpp:617
 msgid "Cannot index more than one paragraph!"
 msgstr "Hakemistoon voi lisätä vain yhden kappaleen!"
 
-#: src/Text3.cpp:178 src/mathed/InsetMathHull.cpp:1336
+#: src/Text3.cpp:177 src/mathed/InsetMathHull.cpp:1330
 msgid "Math editor mode"
 msgstr "Matematiikkaeditoritila"
 
-#: src/Text3.cpp:724
+#: src/Text3.cpp:723
 msgid "Unknown spacing argument: "
 msgstr "Tuntematon väliparametri: "
 
-#: src/Text3.cpp:898
+#: src/Text3.cpp:897
 msgid "Layout "
 msgstr "Muotoilu "
 
-#: src/Text3.cpp:899
+#: src/Text3.cpp:898
 msgid " not known"
 msgstr " tuntematon"
 
-#: src/Text3.cpp:1448 src/Text3.cpp:1460
+#: src/Text3.cpp:1451 src/Text3.cpp:1463
 msgid "Character set"
 msgstr "Merkistö"
 
-#: src/Text3.cpp:1583
+#: src/Text3.cpp:1580 src/Text3.cpp:1591
 msgid "Paragraph layout set"
 msgstr "Kappaletyyli asetettu"
 
@@ -13965,7 +14395,7 @@ msgstr "&Pysty:"
 msgid "protected"
 msgstr "Kova välilyönti|K"
 
-#: src/buffer_funcs.cpp:81
+#: src/buffer_funcs.cpp:84
 #, c-format
 msgid ""
 "The specified document\n"
@@ -13973,12 +14403,12 @@ msgid ""
 "could not be read."
 msgstr ""
 
-#: src/buffer_funcs.cpp:83
+#: src/buffer_funcs.cpp:86
 #, fuzzy
 msgid "Could not read document"
 msgstr "Asiakirjan avaaminen epäonnistui: "
 
-#: src/buffer_funcs.cpp:96
+#: src/buffer_funcs.cpp:99
 #, fuzzy, c-format
 msgid ""
 "An emergency save of the document %1$s exists.\n"
@@ -13986,20 +14416,20 @@ msgid ""
 "Recover emergency save?"
 msgstr "Asiakirjasta on olemassa hätätallennusversio!"
 
-#: src/buffer_funcs.cpp:99
+#: src/buffer_funcs.cpp:102
 msgid "Load emergency save?"
 msgstr ""
 
-#: src/buffer_funcs.cpp:100
+#: src/buffer_funcs.cpp:103
 #, fuzzy
 msgid "&Recover"
 msgstr "&Poista"
 
-#: src/buffer_funcs.cpp:100
+#: src/buffer_funcs.cpp:103
 msgid "&Load Original"
 msgstr ""
 
-#: src/buffer_funcs.cpp:123
+#: src/buffer_funcs.cpp:126
 #, c-format
 msgid ""
 "The backup of the document %1$s is newer.\n"
@@ -14007,49 +14437,58 @@ msgid ""
 "Load the backup instead?"
 msgstr ""
 
-#: src/buffer_funcs.cpp:126
+#: src/buffer_funcs.cpp:129
 #, fuzzy
 msgid "Load backup?"
 msgstr "Palaa"
 
-#: src/buffer_funcs.cpp:127
+#: src/buffer_funcs.cpp:130
 #, fuzzy
 msgid "&Load backup"
 msgstr "&Palaa"
 
-#: src/buffer_funcs.cpp:127
+#: src/buffer_funcs.cpp:130
 msgid "Load &original"
 msgstr ""
 
-#: src/buffer_funcs.cpp:166
+#: src/buffer_funcs.cpp:169
 #, fuzzy, c-format
 msgid "Do you want to retrieve the document %1$s from version control?"
 msgstr "Haluatko palauttaa asiakirjan versionhallinnasta?"
 
-#: src/buffer_funcs.cpp:168
+#: src/buffer_funcs.cpp:171
 #, fuzzy
 msgid "Retrieve from version control?"
 msgstr "Haluatko palauttaa asiakirjan versionhallinnasta?"
 
-#: src/buffer_funcs.cpp:169
+#: src/buffer_funcs.cpp:172
 #, fuzzy
 msgid "&Retrieve"
 msgstr "Pala&uta"
 
-#: src/buffer_funcs.cpp:189
+#: src/buffer_funcs.cpp:202
 #, c-format
 msgid ""
-"The document %1$s is already loaded.\n"
-"\n"
-"Do you want to revert to the saved version?"
+"The document %1$s is already loaded and has unsaved changes.\n"
+"Do you want to abandon your changes and reload the version on disk?"
 msgstr ""
 
-#: src/buffer_funcs.cpp:193
+#: src/buffer_funcs.cpp:204
+#, fuzzy
+msgid "Reload saved document?"
+msgstr "Peru kaikki muokkaukset"
+
+#: src/buffer_funcs.cpp:205
+#, fuzzy
+msgid "&Reload"
+msgstr "&Lataa"
+
+#: src/buffer_funcs.cpp:205
 #, fuzzy
-msgid "&Switch to document"
-msgstr "Vaihda avoimeen asiakirjaan"
+msgid "&Keep Changes"
+msgstr "Yhdistä sarakkeet"
 
-#: src/buffer_funcs.cpp:214
+#: src/buffer_funcs.cpp:226
 #, c-format
 msgid ""
 "The document %1$s does not yet exist.\n"
@@ -14057,17 +14496,17 @@ msgid ""
 "Do you want to create a new document?"
 msgstr ""
 
-#: src/buffer_funcs.cpp:217
+#: src/buffer_funcs.cpp:229
 #, fuzzy
 msgid "Create new document?"
 msgstr "Luodaanko uusi tämän niminen asiakirja?"
 
-#: src/buffer_funcs.cpp:218
+#: src/buffer_funcs.cpp:230
 #, fuzzy
 msgid "&Create"
 msgstr "Jä&rjestä"
 
-#: src/buffer_funcs.cpp:243
+#: src/buffer_funcs.cpp:255
 #, c-format
 msgid ""
 "The specified document template\n"
@@ -14075,23 +14514,28 @@ msgid ""
 "could not be read."
 msgstr ""
 
-#: src/buffer_funcs.cpp:245
+#: src/buffer_funcs.cpp:257
 #, fuzzy
 msgid "Could not read template"
 msgstr "Väliaikaisen hakemiston luominen epäonnistui"
 
-#: src/buffer_funcs.cpp:565
+#: src/buffer_funcs.cpp:502
 msgid "\\arabic{enumi}."
 msgstr ""
 
-#: src/buffer_funcs.cpp:571
+#: src/buffer_funcs.cpp:508
 msgid "\\roman{enumiii}."
 msgstr ""
 
-#: src/buffer_funcs.cpp:574
+#: src/buffer_funcs.cpp:511
 msgid "\\Alph{enumiv}."
 msgstr ""
 
+#: src/buffer_funcs.cpp:528 src/insets/InsetCaption.cpp:294
+#, fuzzy
+msgid "Senseless!!! "
+msgstr "Järjetöntä: "
+
 #: src/bufferview_funcs.cpp:332
 msgid "No more insets"
 msgstr "Ei muita muistiinpanoja"
@@ -14104,37 +14548,37 @@ msgid ""
 "Do you want to rename the document and try again?"
 msgstr ""
 
-#: src/callback.cpp:114
+#: src/callback.cpp:115
 msgid "Rename and save?"
 msgstr ""
 
-#: src/callback.cpp:115
+#: src/callback.cpp:116
 #, fuzzy
 msgid "&Rename"
 msgstr "&Poista"
 
-#: src/callback.cpp:132
+#: src/callback.cpp:147
 msgid "Choose a filename to save document as"
 msgstr "Valitse tiedostonimi, joksi asiakirja tallennetaan:"
 
-#: src/callback.cpp:216
+#: src/callback.cpp:235
 #, c-format
 msgid "Auto-saving %1$s"
 msgstr "%1$s tallentuu itsestään"
 
-#: src/callback.cpp:256
+#: src/callback.cpp:276
 msgid "Autosave failed!"
 msgstr "Automaattinen tallennus epäonnistui!"
 
-#: src/callback.cpp:283
+#: src/callback.cpp:300
 msgid "Autosaving current document..."
 msgstr "Asiakirjan automaattinen tallennus käynnissä..."
 
-#: src/callback.cpp:347
+#: src/callback.cpp:363
 msgid "Select file to insert"
 msgstr "Valitse lisättävä tiedosto"
 
-#: src/callback.cpp:366
+#: src/callback.cpp:385
 #, c-format
 msgid ""
 "Could not read the specified document\n"
@@ -14142,12 +14586,12 @@ msgid ""
 "due to the error: %2$s"
 msgstr ""
 
-#: src/callback.cpp:368
+#: src/callback.cpp:387
 #, fuzzy
 msgid "Could not read file"
 msgstr "Ohjelma ei voinut käsitellä tiedostoa:"
 
-#: src/callback.cpp:376
+#: src/callback.cpp:396
 #, c-format
 msgid ""
 "Could not open the specified document\n"
@@ -14155,16 +14599,16 @@ msgid ""
 "due to the error: %2$s"
 msgstr ""
 
-#: src/callback.cpp:378 src/output.cpp:41
+#: src/callback.cpp:398 src/output.cpp:41
 #, fuzzy
 msgid "Could not open file"
 msgstr "Ei voi avata tiedostoa"
 
-#: src/callback.cpp:402
+#: src/callback.cpp:422
 msgid "Reading not UTF-8 encoded file"
 msgstr ""
 
-#: src/callback.cpp:403
+#: src/callback.cpp:423
 msgid ""
 "The file is not UTF-8 encoded.\n"
 "It will be read as local 8Bit-encoded.\n"
@@ -14173,20 +14617,20 @@ msgid ""
 "to UTF-8 with a program other than LyX.\n"
 msgstr ""
 
-#: src/callback.cpp:420
+#: src/callback.cpp:440
 msgid "Running configure..."
 msgstr "\"configure\" käynnissä..."
 
-#: src/callback.cpp:429
+#: src/callback.cpp:449
 msgid "Reloading configuration..."
 msgstr "Asetustiedot latautuvat uudelleen..."
 
-#: src/callback.cpp:434
+#: src/callback.cpp:454
 #, fuzzy
 msgid "System reconfigured"
 msgstr "Kokoonpanoasetukset päivittyivät."
 
-#: src/callback.cpp:435
+#: src/callback.cpp:455
 msgid ""
 "The system has been reconfigured.\n"
 "You need to restart LyX to make use of any\n"
@@ -14313,28 +14757,19 @@ msgstr "Erilliset ohjelmat"
 msgid "RowPainter profiling"
 msgstr ""
 
-#: src/frontends/LyXView.cpp:212
+#: src/frontends/LyXView.cpp:136
 #, fuzzy
 msgid "Document not loaded."
 msgstr "Asiakirjan tallentaminen epäonnistui!"
 
-#: src/frontends/LyXView.cpp:224
-#, fuzzy, c-format
-msgid "Opening child document %1$s..."
-msgstr "Asiakirja %1$s avautuu..."
-
-#: src/frontends/LyXView.cpp:498
+#: src/frontends/LyXView.cpp:386
 msgid " (changed)"
 msgstr " (muutettu)"
 
-#: src/frontends/LyXView.cpp:502
+#: src/frontends/LyXView.cpp:390
 msgid " (read only)"
 msgstr " (kirjoitussuojattu)"
 
-#: src/frontends/WorkArea.cpp:247
-msgid "Formatting document..."
-msgstr "Asiakirja muotoutuu..."
-
 #: src/frontends/controllers/ControlAboutlyx.cpp:58
 msgid "ERROR: LyX wasn't able to read CREDITS file\n"
 msgstr "VIRHE: LyX ei voinut lukea CREDITS-tiedostoa\n"
@@ -14437,15 +14872,15 @@ msgstr ""
 msgid "Double box"
 msgstr "Kaksink."
 
-#: src/frontends/controllers/ControlBox.cpp:81 src/frontends/qt4/QBox.cpp:286
-#: src/frontends/qt4/QBox.cpp:320
+#: src/frontends/controllers/ControlBox.cpp:81
+#: src/frontends/qt4/GuiBox.cpp:286 src/frontends/qt4/GuiBox.cpp:320
 #, fuzzy
 msgid "Depth"
 msgstr ", Syvyys: "
 
-#: src/frontends/controllers/ControlBox.cpp:82 src/frontends/qt4/QBox.cpp:133
-#: src/frontends/qt4/QBox.cpp:289 src/frontends/qt4/QBox.cpp:323
-#: src/frontends/qt4/QBox.cpp:356
+#: src/frontends/controllers/ControlBox.cpp:82
+#: src/frontends/qt4/GuiBox.cpp:133 src/frontends/qt4/GuiBox.cpp:289
+#: src/frontends/qt4/GuiBox.cpp:323 src/frontends/qt4/GuiBox.cpp:356
 #, fuzzy
 msgid "Total Height"
 msgstr "Yläoikealla"
@@ -14656,117 +15091,98 @@ msgstr "Oikoluku on valmis"
 msgid "Table of Contents"
 msgstr "Sisällysluettelo"
 
-#: src/frontends/controllers/frontend_helpers.cpp:246
-#, c-format
-msgid "%1$s and %2$s"
-msgstr "%1$s ja %2$s"
-
-#: src/frontends/controllers/frontend_helpers.cpp:250
-#, c-format
-msgid "%1$s et al."
-msgstr "%1$s ym."
-
-#: src/frontends/controllers/frontend_helpers.cpp:287
-msgid "No year"
-msgstr "Ei vuotta"
-
-#: src/frontends/controllers/frontend_helpers.cpp:820
-#, fuzzy
-msgid "before"
-msgstr "Edeltävä teksti:"
-
-#: src/frontends/controllers/frontend_helpers.cpp:868
-#: src/frontends/controllers/frontend_helpers.cpp:898
-#: src/frontends/controllers/frontend_helpers.cpp:924
-#: src/frontends/controllers/frontend_helpers.cpp:958
-#: src/frontends/controllers/frontend_helpers.cpp:1024
-#: src/frontends/controllers/frontend_helpers.cpp:1054
-#: src/frontends/controllers/frontend_helpers.cpp:1137
+#: src/frontends/controllers/frontend_helpers.cpp:59
+#: src/frontends/controllers/frontend_helpers.cpp:89
+#: src/frontends/controllers/frontend_helpers.cpp:115
+#: src/frontends/controllers/frontend_helpers.cpp:149
+#: src/frontends/controllers/frontend_helpers.cpp:215
+#: src/frontends/controllers/frontend_helpers.cpp:245
+#: src/frontends/controllers/frontend_helpers.cpp:328
 msgid "No change"
 msgstr "Ei muutosta"
 
-#: src/frontends/controllers/frontend_helpers.cpp:884
-#: src/frontends/controllers/frontend_helpers.cpp:910
-#: src/frontends/controllers/frontend_helpers.cpp:944
-#: src/frontends/controllers/frontend_helpers.cpp:1010
-#: src/frontends/controllers/frontend_helpers.cpp:1040
-#: src/frontends/controllers/frontend_helpers.cpp:1094
-#: src/frontends/controllers/frontend_helpers.cpp:1139
+#: src/frontends/controllers/frontend_helpers.cpp:75
+#: src/frontends/controllers/frontend_helpers.cpp:101
+#: src/frontends/controllers/frontend_helpers.cpp:135
+#: src/frontends/controllers/frontend_helpers.cpp:201
+#: src/frontends/controllers/frontend_helpers.cpp:231
+#: src/frontends/controllers/frontend_helpers.cpp:285
+#: src/frontends/controllers/frontend_helpers.cpp:330
 msgid "Reset"
 msgstr "Palauta"
 
-#: src/frontends/controllers/frontend_helpers.cpp:940
+#: src/frontends/controllers/frontend_helpers.cpp:131
 msgid "Small Caps"
 msgstr "Kapiteeli"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1028
-msgid "Emph"
-msgstr "Korostus"
-
-#: src/frontends/controllers/frontend_helpers.cpp:1032
+#: src/frontends/controllers/frontend_helpers.cpp:223
 msgid "Underbar"
 msgstr "Alleviivaus"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1036
+#: src/frontends/controllers/frontend_helpers.cpp:227
 msgid "Noun"
 msgstr "Nimityyli"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1058
+#: src/frontends/controllers/frontend_helpers.cpp:249
 msgid "No color"
 msgstr "Ei väriä"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1062
+#: src/frontends/controllers/frontend_helpers.cpp:253
 msgid "Black"
 msgstr "Musta"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1066
+#: src/frontends/controllers/frontend_helpers.cpp:257
 msgid "White"
 msgstr "Valkoinen"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1070
+#: src/frontends/controllers/frontend_helpers.cpp:261
 msgid "Red"
 msgstr "Punainen"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1074
+#: src/frontends/controllers/frontend_helpers.cpp:265
 msgid "Green"
 msgstr "Vihreä"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1078
+#: src/frontends/controllers/frontend_helpers.cpp:269
 msgid "Blue"
 msgstr "Sininen"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1082
+#: src/frontends/controllers/frontend_helpers.cpp:273
 msgid "Cyan"
 msgstr "Syaani"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1086
+#: src/frontends/controllers/frontend_helpers.cpp:277
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1090
+#: src/frontends/controllers/frontend_helpers.cpp:281
 msgid "Yellow"
 msgstr "Keltainen"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1240
+#: src/frontends/controllers/frontend_helpers.cpp:431
 #, fuzzy
 msgid "System files|#S#s"
 msgstr "Järj. PN.|#J#j"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1243
+#: src/frontends/controllers/frontend_helpers.cpp:434
 #, fuzzy
 msgid "User files|#U#u"
 msgstr "Käytt. PN|#y#Y"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1326
+#: src/frontends/controllers/frontend_helpers.cpp:517
 #, fuzzy
 msgid "Could not update TeX information"
 msgstr "Ei muuta uudelleen tehtävää"
 
-#: src/frontends/controllers/frontend_helpers.cpp:1327
+#: src/frontends/controllers/frontend_helpers.cpp:518
 #, fuzzy, c-format
 msgid "The script `%s' failed."
 msgstr "Oikoluku epäonnistui"
 
+#: src/frontends/qt4/BulletsModule.cpp:46
+msgid "Standard[[Bullets]]"
+msgstr ""
+
 #: src/frontends/qt4/BulletsModule.cpp:47
 #, fuzzy
 msgid "Maths"
@@ -14792,22 +15208,26 @@ msgstr "Ding 3|#n"
 msgid "Dings 4"
 msgstr "Ding 4|#g"
 
-#: src/frontends/qt4/Dialogs.cpp:225
+#: src/frontends/qt4/Dialogs.cpp:195
+msgid "Embedded Files"
+msgstr ""
+
+#: src/frontends/qt4/Dialogs.cpp:232
 #, fuzzy
 msgid "Index Entry"
 msgstr "Hakemistoviite"
 
-#: src/frontends/qt4/Dialogs.cpp:235
+#: src/frontends/qt4/Dialogs.cpp:242
 #, fuzzy
 msgid "Label"
 msgstr "&Nimike:"
 
-#: src/frontends/qt4/Dialogs.cpp:247
+#: src/frontends/qt4/Dialogs.cpp:254
 #, fuzzy
 msgid "LaTeX Source"
 msgstr "Näkyvä väli|#v"
 
-#: src/frontends/qt4/Dialogs.cpp:311 src/frontends/qt4/Dialogs.cpp:314
+#: src/frontends/qt4/Dialogs.cpp:318 src/frontends/qt4/Dialogs.cpp:321
 #, fuzzy
 msgid "Outline"
 msgstr "Ulko"
@@ -14816,456 +15236,456 @@ msgstr "Ulko"
 msgid "Directories"
 msgstr "Hakemistot"
 
-#: src/frontends/qt4/GuiView.cpp:172
-msgid "Small-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:178
-msgid "Normal-sized icons"
-msgstr ""
-
-#: src/frontends/qt4/GuiView.cpp:184
-msgid "Big-sized icons"
-msgstr ""
+#: src/frontends/qt4/GuiApplication.cpp:390
+#, fuzzy
+msgid "About %1"
+msgstr "LyXistä"
 
-#: src/frontends/qt4/GuiView.cpp:729
-msgid "LyX"
-msgstr "LyX"
+#: src/frontends/qt4/GuiApplication.cpp:390
+#: src/frontends/qt4/GuiPrefs.cpp:2021
+msgid "Preferences"
+msgstr "Asetukset"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:515
+#: src/frontends/qt4/GuiApplication.cpp:391
 #, fuzzy
-msgid "unknown version"
-msgstr "Tuntematon toiminto"
+msgid "Reconfigure"
+msgstr "Konfiguroi uudelleen|n"
 
-#: src/frontends/qt4/IconPalette.cpp:40
-msgid "Click to detach"
-msgstr ""
+#: src/frontends/qt4/GuiApplication.cpp:391
+#, fuzzy
+msgid "Quit %1"
+msgstr "LyXistä"
 
-#: src/frontends/qt4/QBibitem.cpp:69
+#: src/frontends/qt4/GuiBibitem.cpp:69
 #, fuzzy
 msgid "Bibliography Entry Settings"
 msgstr "Kirjallisuusviitteiden asetukset"
 
-#: src/frontends/qt4/QBibtex.cpp:259
+#: src/frontends/qt4/GuiBibtex.cpp:259
 msgid "BibTeX Bibliography"
 msgstr "BibTeX-lähdeviitteet"
 
-#: src/frontends/qt4/QBox.cpp:148
+#: src/frontends/qt4/GuiBox.cpp:148
 #, fuzzy
 msgid "Box Settings"
 msgstr "Asetukset"
 
-#: src/frontends/qt4/QBranch.cpp:71
+#: src/frontends/qt4/GuiBranch.cpp:71
 #, fuzzy
 msgid "Branch Settings"
 msgstr "Kirjallisuusviitteiden asetukset"
 
-#: src/frontends/qt4/QBranches.cpp:42
+#: src/frontends/qt4/GuiBranches.cpp:42
 #, fuzzy
 msgid "Branch"
 msgstr "Varmuuskopiohak.:|#k"
 
-#: src/frontends/qt4/QBranches.cpp:43
+#: src/frontends/qt4/GuiBranches.cpp:43
 msgid "Activated"
 msgstr ""
 
-#: src/frontends/qt4/QBranches.cpp:73 src/frontends/qt4/QBranches.cpp:145
-#: src/frontends/qt4/QDocument.cpp:858
+#: src/frontends/qt4/GuiBranches.cpp:73 src/frontends/qt4/GuiBranches.cpp:145
+#: src/frontends/qt4/GuiDocument.cpp:858
 #, fuzzy
 msgid "Yes"
 msgstr "&Kyllä"
 
-#: src/frontends/qt4/QBranches.cpp:73 src/frontends/qt4/QDocument.cpp:857
+#: src/frontends/qt4/GuiBranches.cpp:73 src/frontends/qt4/GuiDocument.cpp:857
 #, fuzzy
 msgid "No"
 msgstr "&Ei"
 
-#: src/frontends/qt4/QChanges.cpp:85
+#: src/frontends/qt4/GuiChanges.cpp:85
 #, fuzzy
 msgid "Merge Changes"
 msgstr "Yhdistä sarakkeet"
 
-#: src/frontends/qt4/QChanges.cpp:107
+#: src/frontends/qt4/GuiChanges.cpp:107
 #, c-format
 msgid ""
 "Change by %1$s\n"
 "\n"
 msgstr ""
 
-#: src/frontends/qt4/QChanges.cpp:109
+#: src/frontends/qt4/GuiChanges.cpp:109
 #, c-format
 msgid "Change made at %1$s\n"
 msgstr ""
 
-#: src/frontends/qt4/QCharacter.cpp:92
+#: src/frontends/qt4/GuiCharacter.cpp:92
 #, fuzzy
 msgid "Text Style"
 msgstr "Asiakirjan tyyli"
 
-#: src/frontends/qt4/QCommandBuffer.cpp:91
+#: src/frontends/qt4/GuiCitationDialog.cpp:297
+#, fuzzy
+msgid "Keys"
+msgstr "&Avain:"
+
+#: src/frontends/qt4/GuiCommandBuffer.cpp:89
 msgid "Previous command"
 msgstr "Edellinen komento"
 
-#: src/frontends/qt4/QCommandBuffer.cpp:94
+#: src/frontends/qt4/GuiCommandBuffer.cpp:92
 msgid "Next command"
 msgstr "Seuraava komento"
 
-#: src/frontends/qt4/QDelimiterDialog.cpp:46
+#: src/frontends/qt4/GuiDelimiterDialog.cpp:46
 msgid "big[[delimiter size]]"
 msgstr ""
 
-#: src/frontends/qt4/QDelimiterDialog.cpp:46
+#: src/frontends/qt4/GuiDelimiterDialog.cpp:46
 msgid "Big[[delimiter size]]"
 msgstr ""
 
-#: src/frontends/qt4/QDelimiterDialog.cpp:47
+#: src/frontends/qt4/GuiDelimiterDialog.cpp:47
 msgid "bigg[[delimiter size]]"
 msgstr ""
 
-#: src/frontends/qt4/QDelimiterDialog.cpp:47
+#: src/frontends/qt4/GuiDelimiterDialog.cpp:47
 msgid "Bigg[[delimiter size]]"
 msgstr ""
 
-#: src/frontends/qt4/QDelimiterDialog.cpp:69
+#: src/frontends/qt4/GuiDelimiterDialog.cpp:69
 #, fuzzy
 msgid "Math Delimiter"
 msgstr "Matematiikkaerottimet"
 
-#: src/frontends/qt4/QDelimiterDialog.cpp:112
+#: src/frontends/qt4/GuiDelimiterDialog.cpp:112
 msgid "LyX: Delimiters"
 msgstr "LyX: Erottimet"
 
-#: src/frontends/qt4/QDelimiterDialog.cpp:144
-#: src/frontends/qt4/QDelimiterDialog.cpp:145
+#: src/frontends/qt4/GuiDelimiterDialog.cpp:144
+#: src/frontends/qt4/GuiDelimiterDialog.cpp:145
 #, fuzzy
 msgid "(None)"
 msgstr "Ei mikään"
 
-#: src/frontends/qt4/QDelimiterDialog.cpp:147
+#: src/frontends/qt4/GuiDelimiterDialog.cpp:147
 #, fuzzy
 msgid "Variable"
 msgstr "taulukkorivi"
 
-#: src/frontends/qt4/QDocument.cpp:77
+#: src/frontends/qt4/GuiDocument.cpp:77
 msgid "Computer Modern Roman"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:77
+#: src/frontends/qt4/GuiDocument.cpp:77
 msgid "Latin Modern Roman"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:78
+#: src/frontends/qt4/GuiDocument.cpp:78
 msgid "AE (Almost European)"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:78
+#: src/frontends/qt4/GuiDocument.cpp:78
 #, fuzzy
 msgid "Times Roman"
 msgstr "Antiikva"
 
-#: src/frontends/qt4/QDocument.cpp:78
+#: src/frontends/qt4/GuiDocument.cpp:78
 #, fuzzy
 msgid "Palatino"
 msgstr "tavallinen"
 
-#: src/frontends/qt4/QDocument.cpp:78
+#: src/frontends/qt4/GuiDocument.cpp:78
 msgid "Bitstream Charter"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:79
+#: src/frontends/qt4/GuiDocument.cpp:79
 msgid "New Century Schoolbook"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:79
+#: src/frontends/qt4/GuiDocument.cpp:79
 #, fuzzy
 msgid "Bookman"
 msgstr "Antiikva"
 
-#: src/frontends/qt4/QDocument.cpp:79
+#: src/frontends/qt4/GuiDocument.cpp:79
 msgid "Utopia"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:79
+#: src/frontends/qt4/GuiDocument.cpp:79
 #, fuzzy
 msgid "Bera Serif"
 msgstr "Sans serif"
 
-#: src/frontends/qt4/QDocument.cpp:80
+#: src/frontends/qt4/GuiDocument.cpp:80
 msgid "Concrete Roman"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:80
+#: src/frontends/qt4/GuiDocument.cpp:80
 msgid "Zapf Chancery"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:88
+#: src/frontends/qt4/GuiDocument.cpp:88
 msgid "Computer Modern Sans"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:88
+#: src/frontends/qt4/GuiDocument.cpp:88
 msgid "Latin Modern Sans"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:89
+#: src/frontends/qt4/GuiDocument.cpp:89
 msgid "Helvetica"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:89
+#: src/frontends/qt4/GuiDocument.cpp:89
 msgid "Avant Garde"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:89
+#: src/frontends/qt4/GuiDocument.cpp:89
 msgid "Bera Sans"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:89
+#: src/frontends/qt4/GuiDocument.cpp:89
 #, fuzzy
 msgid "CM Bright"
 msgstr "Yläoikealla"
 
-#: src/frontends/qt4/QDocument.cpp:98
+#: src/frontends/qt4/GuiDocument.cpp:98
 msgid "Computer Modern Typewriter"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:99
+#: src/frontends/qt4/GuiDocument.cpp:99
 #, fuzzy
 msgid "Latin Modern Typewriter"
 msgstr "Kirjoituskone"
 
-#: src/frontends/qt4/QDocument.cpp:99
+#: src/frontends/qt4/GuiDocument.cpp:99
 #, fuzzy
 msgid "Courier"
 msgstr "Kopiot"
 
-#: src/frontends/qt4/QDocument.cpp:99
+#: src/frontends/qt4/GuiDocument.cpp:99
 msgid "Bera Mono"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:99
+#: src/frontends/qt4/GuiDocument.cpp:99
 msgid "LuxiMono"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:100
+#: src/frontends/qt4/GuiDocument.cpp:100
 #, fuzzy
 msgid "CM Typewriter Light"
 msgstr "Kirjoituskone"
 
-#: src/frontends/qt4/QDocument.cpp:232 src/frontends/qt4/QDocument.cpp:655
+#: src/frontends/qt4/GuiDocument.cpp:232 src/frontends/qt4/GuiDocument.cpp:655
 msgid ""
 "Input listings parameters on the right. Enter ? for a list of parameters."
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:241
+#: src/frontends/qt4/GuiDocument.cpp:241
 msgid "Length"
 msgstr "Pituus"
 
-#: src/frontends/qt4/QDocument.cpp:286 src/frontends/qt4/QDocument.cpp:292
-#: src/frontends/qt4/QDocument.cpp:298
+#: src/frontends/qt4/GuiDocument.cpp:286 src/frontends/qt4/GuiDocument.cpp:292
+#: src/frontends/qt4/GuiDocument.cpp:298
 msgid " (not installed)"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:303
+#: src/frontends/qt4/GuiDocument.cpp:303
 msgid "10"
 msgstr "10"
 
-#: src/frontends/qt4/QDocument.cpp:304
+#: src/frontends/qt4/GuiDocument.cpp:304
 msgid "11"
 msgstr "11"
 
-#: src/frontends/qt4/QDocument.cpp:305
+#: src/frontends/qt4/GuiDocument.cpp:305
 msgid "12"
 msgstr "12"
 
-#: src/frontends/qt4/QDocument.cpp:340
+#: src/frontends/qt4/GuiDocument.cpp:340
 msgid "empty"
 msgstr "tyhjä"
 
-#: src/frontends/qt4/QDocument.cpp:341
+#: src/frontends/qt4/GuiDocument.cpp:341
 msgid "plain"
 msgstr "tavallinen"
 
-#: src/frontends/qt4/QDocument.cpp:342
+#: src/frontends/qt4/GuiDocument.cpp:342
 msgid "headings"
 msgstr "yläotsikot"
 
-#: src/frontends/qt4/QDocument.cpp:343
+#: src/frontends/qt4/GuiDocument.cpp:343
 msgid "fancy"
 msgstr "hienot"
 
-#: src/frontends/qt4/QDocument.cpp:359
+#: src/frontends/qt4/GuiDocument.cpp:359
 msgid "B3"
 msgstr "B3"
 
-#: src/frontends/qt4/QDocument.cpp:360
+#: src/frontends/qt4/GuiDocument.cpp:360
 msgid "B4"
 msgstr "B4"
 
-#: src/frontends/qt4/QDocument.cpp:463
+#: src/frontends/qt4/GuiDocument.cpp:463
 #, fuzzy
 msgid "LaTeX default"
 msgstr "LaTeX-teoksen nimi"
 
-#: src/frontends/qt4/QDocument.cpp:469
+#: src/frontends/qt4/GuiDocument.cpp:469
 msgid "``text''"
 msgstr "``teksti''"
 
-#: src/frontends/qt4/QDocument.cpp:470
+#: src/frontends/qt4/GuiDocument.cpp:470
 msgid "''text''"
 msgstr "''teksti''"
 
-#: src/frontends/qt4/QDocument.cpp:471
+#: src/frontends/qt4/GuiDocument.cpp:471
 msgid ",,text``"
 msgstr ",,teksti``"
 
-#: src/frontends/qt4/QDocument.cpp:472
+#: src/frontends/qt4/GuiDocument.cpp:472
 msgid ",,text''"
 msgstr ",,teksti''"
 
-#: src/frontends/qt4/QDocument.cpp:473
+#: src/frontends/qt4/GuiDocument.cpp:473
 msgid "<<text>>"
 msgstr "«teksti»"
 
-#: src/frontends/qt4/QDocument.cpp:474
+#: src/frontends/qt4/GuiDocument.cpp:474
 msgid ">>text<<"
 msgstr "»teksti«"
 
-#: src/frontends/qt4/QDocument.cpp:490
+#: src/frontends/qt4/GuiDocument.cpp:490
 #, fuzzy
 msgid "Numbered"
 msgstr "Numerointi"
 
-#: src/frontends/qt4/QDocument.cpp:491
+#: src/frontends/qt4/GuiDocument.cpp:491
 msgid "Appears in TOC"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:511
+#: src/frontends/qt4/GuiDocument.cpp:511
 msgid "Author-year"
 msgstr "Tekijä ja vuosi"
 
-#: src/frontends/qt4/QDocument.cpp:512
+#: src/frontends/qt4/GuiDocument.cpp:512
 msgid "Numerical"
 msgstr "Numerot"
 
-#: src/frontends/qt4/QDocument.cpp:554
+#: src/frontends/qt4/GuiDocument.cpp:554
 #, fuzzy, c-format
 msgid "Unavailable: %1$s"
 msgstr "Mahdolliset"
 
-#: src/frontends/qt4/QDocument.cpp:580 src/frontends/qt4/QDocument.cpp:593
+#: src/frontends/qt4/GuiDocument.cpp:580 src/frontends/qt4/GuiDocument.cpp:593
 #, fuzzy
 msgid "Document Class"
 msgstr "Asiakirja&luokka:"
 
-#: src/frontends/qt4/QDocument.cpp:582
+#: src/frontends/qt4/GuiDocument.cpp:582
 #, fuzzy
 msgid "Text Layout"
 msgstr "Muotoilu"
 
-#: src/frontends/qt4/QDocument.cpp:583
+#: src/frontends/qt4/GuiDocument.cpp:583
 #, fuzzy
 msgid "Page Layout"
 msgstr "Kappaleen tyyli"
 
-#: src/frontends/qt4/QDocument.cpp:584
+#: src/frontends/qt4/GuiDocument.cpp:584
 #, fuzzy
 msgid "Page Margins"
 msgstr "Reunukset"
 
-#: src/frontends/qt4/QDocument.cpp:586
+#: src/frontends/qt4/GuiDocument.cpp:586
 #, fuzzy
 msgid "Numbering & TOC"
 msgstr "Numerointi"
 
-#: src/frontends/qt4/QDocument.cpp:588
+#: src/frontends/qt4/GuiDocument.cpp:588
 #, fuzzy
 msgid "Math Options"
 msgstr "Irrallisten asetukset"
 
-#: src/frontends/qt4/QDocument.cpp:589
+#: src/frontends/qt4/GuiDocument.cpp:589
 #, fuzzy
 msgid "Float Placement"
 msgstr "Irrallisten sijoitus:|#s"
 
-#: src/frontends/qt4/QDocument.cpp:590
+#: src/frontends/qt4/GuiDocument.cpp:590
 msgid "Bullets"
 msgstr "Merkit"
 
-#: src/frontends/qt4/QDocument.cpp:591
+#: src/frontends/qt4/GuiDocument.cpp:591
 msgid "Branches"
 msgstr ""
 
-#: src/frontends/qt4/QDocument.cpp:592 src/frontends/qt4/QDocument.cpp:604
+#: src/frontends/qt4/GuiDocument.cpp:592 src/frontends/qt4/GuiDocument.cpp:604
 msgid "LaTeX Preamble"
 msgstr "LaTeX-aloitusosa"
 
-#: src/frontends/qt4/QDocument.cpp:1412
+#: src/frontends/qt4/GuiDocument.cpp:1411
 msgid "Document Settings"
 msgstr "Asiakirjan asetukset"
 
-#: src/frontends/qt4/QERT.cpp:68
+#: src/frontends/qt4/GuiERT.cpp:67
 #, fuzzy
 msgid "TeX Code Settings"
 msgstr "LaTeX-asetukset"
 
-#: src/frontends/qt4/QExternal.cpp:496
+#: src/frontends/qt4/GuiExternal.cpp:496
 msgid "External Material"
 msgstr "Ulkoinen aineisto"
 
-#: src/frontends/qt4/QExternal.cpp:556
+#: src/frontends/qt4/GuiExternal.cpp:556
 msgid "Scale%"
 msgstr "Skaalaus%"
 
-#: src/frontends/qt4/QFloat.cpp:31
+#: src/frontends/qt4/GuiFloat.cpp:31
 msgid "Float Settings"
 msgstr "Irrallisten asetukset"
 
-#: src/frontends/qt4/QGraphics.cpp:62 src/frontends/qt4/QPrefs.cpp:641
+#: src/frontends/qt4/GuiGraphics.cpp:62 src/frontends/qt4/GuiPrefs.cpp:636
 msgid "Graphics"
 msgstr "Kuva"
 
-#: src/frontends/qt4/QInclude.cpp:115 src/frontends/qt4/QInclude.cpp:229
-#: src/frontends/qt4/QListings.cpp:350 src/frontends/qt4/QListings.cpp:427
-#: src/frontends/qt4/QListings.cpp:459
+#: src/frontends/qt4/GuiInclude.cpp:115 src/frontends/qt4/GuiInclude.cpp:229
+#: src/frontends/qt4/GuiListings.cpp:350 src/frontends/qt4/GuiListings.cpp:427
+#: src/frontends/qt4/GuiListings.cpp:459
 msgid ""
 "Input listing parameters on the right. Enter ? for a list of parameters."
 msgstr ""
 
-#: src/frontends/qt4/QInclude.cpp:194
+#: src/frontends/qt4/GuiInclude.cpp:194
 #, fuzzy
 msgid "Child Document"
 msgstr "Asiakirja"
 
-#: src/frontends/qt4/QListings.cpp:63
+#: src/frontends/qt4/GuiListings.cpp:63
 #, fuzzy
 msgid "No language"
 msgstr "kieli"
 
-#: src/frontends/qt4/QListings.cpp:389
+#: src/frontends/qt4/GuiListings.cpp:389
 #, fuzzy
 msgid "No dialect"
 msgstr "Ei kuvaa"
 
-#: src/frontends/qt4/QListings.cpp:414
+#: src/frontends/qt4/GuiListings.cpp:414
 #, fuzzy
 msgid "Program Listing Settings"
 msgstr "Tulostusasetukset"
 
-#: src/frontends/qt4/QMathMatrixDialog.cpp:46
+#: src/frontends/qt4/GuiMathMatrixDialog.cpp:46
 #, fuzzy
 msgid "Math Matrix"
 msgstr "Matriisi"
 
-#: src/frontends/qt4/QMathMatrixDialog.cpp:61
+#: src/frontends/qt4/GuiMathMatrixDialog.cpp:61
 #, fuzzy
 msgid "LyX: Insert Matrix"
 msgstr "LyX: Lisää matriisi"
 
-#: src/frontends/qt4/QNote.cpp:70
+#: src/frontends/qt4/GuiNote.cpp:70
 #, fuzzy
 msgid "Note Settings"
 msgstr "Irrallisten asetukset"
 
-#: src/frontends/qt4/QParagraph.cpp:70
+#: src/frontends/qt4/GuiParagraph.cpp:70
 msgid ""
 "As described in the User Guide, the width of this text determines the width "
 "of the label part of each item in environments like List and Description.\n"
@@ -15274,204 +15694,212 @@ msgid ""
 "the items is used."
 msgstr ""
 
-#: src/frontends/qt4/QParagraph.cpp:175
+#: src/frontends/qt4/GuiParagraph.cpp:171
 #, fuzzy
 msgid "Paragraph Settings"
 msgstr "Kirjallisuusviitteiden asetukset"
 
-#: src/frontends/qt4/QPrefs.cpp:74
-msgid "Look and feel"
-msgstr ""
-
-#: src/frontends/qt4/QPrefs.cpp:75
-#, fuzzy
-msgid "Language settings"
-msgstr "Tulostusasetukset"
-
-#: src/frontends/qt4/QPrefs.cpp:76
-#, fuzzy
-msgid "Outputs"
-msgstr "Tuloste"
-
-#: src/frontends/qt4/QPrefs.cpp:174
+#: src/frontends/qt4/GuiPrefs.cpp:169
 #, fuzzy
 msgid "Plain text"
 msgstr "Etsi seuraava"
 
-#: src/frontends/qt4/QPrefs.cpp:205
+#: src/frontends/qt4/GuiPrefs.cpp:200
 msgid "Date format"
 msgstr "Päiväysmuoto"
 
-#: src/frontends/qt4/QPrefs.cpp:232
+#: src/frontends/qt4/GuiPrefs.cpp:227
 msgid "Keyboard"
 msgstr "Näppäimistö"
 
-#: src/frontends/qt4/QPrefs.cpp:356
+#: src/frontends/qt4/GuiPrefs.cpp:351
 msgid "Screen fonts"
 msgstr "Näyttökirjasimet"
 
-#: src/frontends/qt4/QPrefs.cpp:514
+#: src/frontends/qt4/GuiPrefs.cpp:509
 msgid "Colors"
 msgstr "Värit"
 
-#: src/frontends/qt4/QPrefs.cpp:615 src/frontends/qt4/QPrefs.cpp:714
+#: src/frontends/qt4/GuiPrefs.cpp:610 src/frontends/qt4/GuiPrefs.cpp:707
 msgid "Paths"
 msgstr "Polut"
 
-#: src/frontends/qt4/QPrefs.cpp:765
+#: src/frontends/qt4/GuiPrefs.cpp:758
 msgid "Select a document templates directory"
 msgstr "Valitse asiakirjamallien hakemisto"
 
-#: src/frontends/qt4/QPrefs.cpp:775
+#: src/frontends/qt4/GuiPrefs.cpp:768
 msgid "Select a temporary directory"
 msgstr "Valitse väliaikaishakemisto"
 
-#: src/frontends/qt4/QPrefs.cpp:785
+#: src/frontends/qt4/GuiPrefs.cpp:778
 msgid "Select a backups directory"
 msgstr "Valitse varmuuskopiohakemisto"
 
-#: src/frontends/qt4/QPrefs.cpp:795
+#: src/frontends/qt4/GuiPrefs.cpp:788
 msgid "Select a document directory"
 msgstr "Valitse asiakirjahakemisto"
 
-#: src/frontends/qt4/QPrefs.cpp:805
+#: src/frontends/qt4/GuiPrefs.cpp:798
 msgid "Give a filename for the LyX server pipe"
 msgstr "Anna tiedostonimi LyX-palvelinputkelle"
 
-#: src/frontends/qt4/QPrefs.cpp:818 src/frontends/qt4/QSpellchecker.cpp:135
+#: src/frontends/qt4/GuiPrefs.cpp:811
+#: src/frontends/qt4/GuiSpellchecker.cpp:135
 msgid "Spellchecker"
 msgstr "Oikoluku"
 
-#: src/frontends/qt4/QPrefs.cpp:840
+#: src/frontends/qt4/GuiPrefs.cpp:833
 msgid "ispell"
 msgstr "Ispell"
 
-#: src/frontends/qt4/QPrefs.cpp:841
+#: src/frontends/qt4/GuiPrefs.cpp:834
 msgid "aspell"
 msgstr "Aspell"
 
-#: src/frontends/qt4/QPrefs.cpp:842
+#: src/frontends/qt4/GuiPrefs.cpp:835
 msgid "hspell"
 msgstr "Hspell"
 
-#: src/frontends/qt4/QPrefs.cpp:844
+#: src/frontends/qt4/GuiPrefs.cpp:837
 msgid "pspell (library)"
 msgstr ""
 
-#: src/frontends/qt4/QPrefs.cpp:847
+#: src/frontends/qt4/GuiPrefs.cpp:840
 msgid "aspell (library)"
 msgstr ""
 
-#: src/frontends/qt4/QPrefs.cpp:928
+#: src/frontends/qt4/GuiPrefs.cpp:921
 msgid "Converters"
 msgstr "Muuntimet"
 
-#: src/frontends/qt4/QPrefs.cpp:1126
+#: src/frontends/qt4/GuiPrefs.cpp:1119
 #, fuzzy
 msgid "Copiers"
 msgstr "Kopiot"
 
-#: src/frontends/qt4/QPrefs.cpp:1379
+#: src/frontends/qt4/GuiPrefs.cpp:1372
 msgid "File formats"
 msgstr "Tiedostomuodot"
 
-#: src/frontends/qt4/QPrefs.cpp:1571
+#: src/frontends/qt4/GuiPrefs.cpp:1564
 #, fuzzy
 msgid "Format in use"
 msgstr "Muodot"
 
-#: src/frontends/qt4/QPrefs.cpp:1572
+#: src/frontends/qt4/GuiPrefs.cpp:1565
 msgid "Cannot remove a Format used by a Converter. Remove the converter first."
 msgstr ""
 "Tämän muuntimen käyttämän tiedostomuodon poistaminen epäonnistui. Poista "
 "muunnin ensin."
 
-#: src/frontends/qt4/QPrefs.cpp:1673
+#: src/frontends/qt4/GuiPrefs.cpp:1666
 msgid "Printer"
 msgstr "Tulostin"
 
-#: src/frontends/qt4/QPrefs.cpp:1771 src/frontends/qt4/QPrefs.cpp:1965
+#: src/frontends/qt4/GuiPrefs.cpp:1764 src/frontends/qt4/GuiPrefs.cpp:1958
 msgid "User interface"
 msgstr "Käyttöliittymä"
 
-#: src/frontends/qt4/QPrefs.cpp:1889
+#: src/frontends/qt4/GuiPrefs.cpp:1882
 #, fuzzy
 msgid "Identity"
 msgstr "Sise&nnys"
 
-#: src/frontends/qt4/QPrefs.cpp:2031
-msgid "Preferences"
-msgstr "Asetukset"
-
-#: src/frontends/qt4/QPrint.cpp:40
+#: src/frontends/qt4/GuiPrint.cpp:40
 #, fuzzy
 msgid "Print Document"
 msgstr "Asiakirja"
 
-#: src/frontends/qt4/QRef.cpp:189
+#: src/frontends/qt4/GuiRef.cpp:189
 #, fuzzy
 msgid "Cross-reference"
 msgstr "Viittaus"
 
-#: src/frontends/qt4/QRef.cpp:285
+#: src/frontends/qt4/GuiRef.cpp:285
 #, fuzzy
 msgid "&Go Back"
 msgstr "&Palaa"
 
-#: src/frontends/qt4/QRef.cpp:287
+#: src/frontends/qt4/GuiRef.cpp:287
 #, fuzzy
 msgid "Jump back"
 msgstr "Palaa"
 
-#: src/frontends/qt4/QRef.cpp:295
+#: src/frontends/qt4/GuiRef.cpp:295
 #, fuzzy
 msgid "Jump to label"
 msgstr "Siirry nimikkeeseen"
 
-#: src/frontends/qt4/QSearch.cpp:138
+#: src/frontends/qt4/GuiSearch.cpp:139
 msgid "Find and Replace"
 msgstr "Etsi ja korvaa"
 
-#: src/frontends/qt4/QSendto.cpp:84
+#: src/frontends/qt4/GuiSendto.cpp:84
 #, fuzzy
 msgid "Send Document to Command"
 msgstr "Lähetä asiakirja komentoon"
 
-#: src/frontends/qt4/QShowFile.cpp:57
+#: src/frontends/qt4/GuiShowFile.cpp:57
 msgid "Show File"
 msgstr "Näytä tiedosto"
 
-#: src/frontends/qt4/QTabular.cpp:523
+#: src/frontends/qt4/GuiTabular.cpp:523
 msgid "Table Settings"
 msgstr "Taulukkoasetukset"
 
-#: src/frontends/qt4/QTabularCreate.cpp:73
+#: src/frontends/qt4/GuiTabularCreate.cpp:72
 msgid "Insert Table"
 msgstr "Lisää taulukko"
 
-#: src/frontends/qt4/QTexinfo.cpp:127
+#: src/frontends/qt4/GuiTexinfo.cpp:128
 #, fuzzy
 msgid "TeX Information"
 msgstr "TeX-tietoja|X"
 
-#: src/frontends/qt4/QVSpace.cpp:188
+#: src/frontends/qt4/GuiVSpace.cpp:188
 #, fuzzy
 msgid "Vertical Space Settings"
 msgstr "Pystyväli:|#y"
 
-#: src/frontends/qt4/QWrap.cpp:83
+#: src/frontends/qt4/GuiView.cpp:161
+msgid "Small-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:167
+msgid "Normal-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:173
+msgid "Big-sized icons"
+msgstr ""
+
+#: src/frontends/qt4/GuiView.cpp:194
+#, fuzzy
+msgid "unknown version"
+msgstr "Tuntematon toiminto"
+
+#: src/frontends/qt4/GuiView.cpp:756
+msgid "LyX"
+msgstr "LyX"
+
+#: src/frontends/qt4/GuiWrap.cpp:83
 #, fuzzy
 msgid "Text Wrap Settings"
 msgstr "Taulukkoasetukset"
 
+#: src/frontends/qt4/IconPalette.cpp:39
+msgid "Click to detach"
+msgstr ""
+
 #: src/frontends/qt4/Validator.cpp:153
 #, fuzzy
 msgid "space"
 msgstr "Ko&rvaa"
 
-#: src/frontends/qt4/Validator.cpp:180 src/insets/ExternalSupport.cpp:380
-#: src/insets/InsetBibtex.cpp:194 src/insets/InsetGraphics.cpp:613
-#: src/insets/InsetInclude.cpp:474
+#: src/frontends/qt4/Validator.cpp:180 src/insets/ExternalSupport.cpp:382
+#: src/insets/InsetBibtex.cpp:195 src/insets/InsetGraphics.cpp:621
+#: src/insets/InsetInclude.cpp:463
 #, fuzzy
 msgid "Invalid filename"
 msgstr "Virheellinen "
@@ -15490,66 +15918,66 @@ msgstr "Tiedostonimi ei voi sis
 msgid "LyX: %1$s"
 msgstr "LyX: %1$s"
 
-#: src/insets/ExternalSupport.cpp:381 src/insets/InsetBibtex.cpp:195
-#: src/insets/InsetGraphics.cpp:614 src/insets/InsetInclude.cpp:475
+#: src/insets/ExternalSupport.cpp:383 src/insets/InsetBibtex.cpp:196
+#: src/insets/InsetGraphics.cpp:622 src/insets/InsetInclude.cpp:464
 msgid ""
 "The following filename is likely to cause trouble when running the exported "
 "file through LaTeX: "
 msgstr ""
 
-#: src/insets/Inset.cpp:255
+#: src/insets/Inset.cpp:249
 msgid "Opened inset"
 msgstr "Osio avattiin"
 
-#: src/insets/InsetBibtex.cpp:110
+#: src/insets/InsetBibtex.cpp:111
 msgid "BibTeX Generated Bibliography"
 msgstr "BibTeXin luomat lähdeviitteet"
 
-#: src/insets/InsetBibtex.cpp:213 src/insets/InsetBibtex.cpp:266
+#: src/insets/InsetBibtex.cpp:214 src/insets/InsetBibtex.cpp:267
 #, fuzzy
 msgid "Export Warning!"
 msgstr "Varoitus!"
 
-#: src/insets/InsetBibtex.cpp:214
+#: src/insets/InsetBibtex.cpp:215
 msgid ""
 "There are spaces in the paths to your BibTeX databases.\n"
 "BibTeX will be unable to find them."
 msgstr ""
 
-#: src/insets/InsetBibtex.cpp:267
+#: src/insets/InsetBibtex.cpp:268
 msgid ""
 "There are spaces in the path to your BibTeX style file.\n"
 "BibTeX will be unable to find it."
 msgstr ""
 
-#: src/insets/InsetBox.cpp:64
+#: src/insets/InsetBox.cpp:63
 #, fuzzy
 msgid "Boxed"
 msgstr "Lihavoitu"
 
-#: src/insets/InsetBox.cpp:65
+#: src/insets/InsetBox.cpp:64
 #, fuzzy
 msgid "Frameless"
 msgstr "Parametrit"
 
-#: src/insets/InsetBox.cpp:66
+#: src/insets/InsetBox.cpp:65
 msgid "ovalbox"
 msgstr ""
 
-#: src/insets/InsetBox.cpp:67
+#: src/insets/InsetBox.cpp:66
 msgid "Ovalbox"
 msgstr ""
 
-#: src/insets/InsetBox.cpp:68
+#: src/insets/InsetBox.cpp:67
 msgid "Shadowbox"
 msgstr ""
 
-#: src/insets/InsetBox.cpp:69
+#: src/insets/InsetBox.cpp:68
 #, fuzzy
 msgid "Doublebox"
 msgstr "Kaksink."
 
-#: src/insets/InsetBox.cpp:124
+#: src/insets/InsetBox.cpp:123
 msgid "Opened Box Inset"
 msgstr "Laatikko-upote avattu"
 
@@ -15562,29 +15990,23 @@ msgstr "Haara-upote avattu"
 msgid "Branch: "
 msgstr "Haara: "
 
-#: src/insets/InsetBranch.cpp:104 src/insets/InsetCharStyle.cpp:162
-#: src/insets/InsetCharStyle.cpp:211
+#: src/insets/InsetBranch.cpp:104
 msgid "Undef: "
 msgstr "Ei määr.:"
 
-#: src/insets/InsetBranch.cpp:248
+#: src/insets/InsetBranch.cpp:261
 msgid "branch"
 msgstr "haara"
 
-#: src/insets/InsetCaption.cpp:95
+#: src/insets/InsetCaption.cpp:92
 msgid "Opened Caption Inset"
 msgstr "Kuvatekstiupote avattu"
 
-#: src/insets/InsetCaption.cpp:298
-#, fuzzy
-msgid "Senseless!!! "
-msgstr "Järjetöntä: "
-
-#: src/insets/InsetCharStyle.cpp:122
+#: src/insets/InsetCharStyle.cpp:88
 msgid "Opened CharStyle Inset"
 msgstr "Merkkityyliupote avattu"
 
-#: src/insets/InsetCommand.cpp:99
+#: src/insets/InsetCommand.cpp:98
 msgid "LaTeX Command: "
 msgstr "LaTeX-komento:"
 
@@ -15607,38 +16029,34 @@ msgstr "Tuntematon v
 msgid "Missing \\end_inset at this point."
 msgstr ""
 
-#: src/insets/InsetERT.cpp:140
+#: src/insets/InsetERT.cpp:136
 msgid "Opened ERT Inset"
 msgstr "ERT-upote avattiin"
 
-#: src/insets/InsetERT.cpp:387
-msgid "ERT"
-msgstr "ERT"
-
-#: src/insets/InsetEnvironment.cpp:64
+#: src/insets/InsetEnvironment.cpp:60
 msgid "Opened Environment Inset: "
 msgstr "Ympäristöupote avattu"
 
-#: src/insets/InsetExternal.cpp:583
+#: src/insets/InsetExternal.cpp:588
 #, c-format
 msgid "External template %1$s is not installed"
 msgstr ""
 
-#: src/insets/InsetFloat.cpp:118 src/insets/InsetFloat.cpp:369
-#: src/insets/InsetFloat.cpp:379
+#: src/insets/InsetFloat.cpp:116 src/insets/InsetFloat.cpp:382
+#: src/insets/InsetFloat.cpp:392
 msgid "float: "
 msgstr "irrallinen: "
 
-#: src/insets/InsetFloat.cpp:274
+#: src/insets/InsetFloat.cpp:287
 msgid "Opened Float Inset"
 msgstr "Irrallinen avattu"
 
-#: src/insets/InsetFloat.cpp:330
+#: src/insets/InsetFloat.cpp:343
 #, fuzzy
 msgid "float"
 msgstr "irrallinen: "
 
-#: src/insets/InsetFloat.cpp:381
+#: src/insets/InsetFloat.cpp:394
 msgid " (sideways)"
 msgstr ""
 
@@ -15651,67 +16069,59 @@ msgstr "VIRHE: Olematon irrallistyyppi!"
 msgid "List of %1$s"
 msgstr "Luettelo: %1$s"
 
-#: src/insets/InsetFoot.cpp:35 src/insets/InsetFoot.cpp:42
-msgid "foot"
-msgstr "alaviite"
-
-#: src/insets/InsetFoot.cpp:54
+#: src/insets/InsetFoot.cpp:56
 msgid "Opened Footnote Inset"
 msgstr "Alaviiteupote avattiin"
 
-#: src/insets/InsetFoot.cpp:83
+#: src/insets/InsetFoot.cpp:103
 msgid "footnote"
 msgstr "alaviite"
 
-#: src/insets/InsetGraphics.cpp:484 src/insets/InsetInclude.cpp:535
+#: src/insets/InsetGraphics.cpp:492 src/insets/InsetInclude.cpp:542
 #, fuzzy, c-format
 msgid ""
 "Could not copy the file\n"
 "%1$s\n"
 "into the temporary directory."
-msgstr "Tiedoston \n"
+msgstr ""
+"Tiedoston \n"
 "%1$s\n"
 "kopiointi väliaikaisen\n"
 "hakemistoon epäonnistui"
 
-#: src/insets/InsetGraphics.cpp:729
+#: src/insets/InsetGraphics.cpp:737
 #, c-format
 msgid "No conversion of %1$s is needed after all"
 msgstr ""
 
-#: src/insets/InsetGraphics.cpp:841
+#: src/insets/InsetGraphics.cpp:849
 #, c-format
 msgid "Graphics file: %1$s"
 msgstr "Kuvatiedosto: %1$s"
 
-#: src/insets/InsetHFill.cpp:48
+#: src/insets/InsetHFill.cpp:46
 #, fuzzy
 msgid "Horizontal Fill"
 msgstr "Vaakatasaus:|#V"
 
-#: src/insets/InsetInclude.cpp:342
+#: src/insets/InsetInclude.cpp:341
 msgid "Verbatim Input"
 msgstr "Sinänsä"
 
-#: src/insets/InsetInclude.cpp:345
+#: src/insets/InsetInclude.cpp:344
 msgid "Verbatim Input*"
 msgstr "Sinänsä*"
 
-#: src/insets/InsetInclude.cpp:352
-#, fuzzy
-msgid "Program Listing "
-msgstr "Ohjelman käynnistys"
-
-#: src/insets/InsetInclude.cpp:448 src/insets/InsetInclude.cpp:628
+#: src/insets/InsetInclude.cpp:437 src/insets/InsetInclude.cpp:635
 msgid "Recursive input"
 msgstr ""
 
-#: src/insets/InsetInclude.cpp:449 src/insets/InsetInclude.cpp:629
+#: src/insets/InsetInclude.cpp:438 src/insets/InsetInclude.cpp:636
 #, c-format
 msgid "Attempted to include file %1$s in itself! Ignoring inclusion."
 msgstr ""
 
-#: src/insets/InsetInclude.cpp:497
+#: src/insets/InsetInclude.cpp:486
 #, c-format
 msgid ""
 "Included file `%1$s'\n"
@@ -15719,162 +16129,175 @@ msgid ""
 "while parent file has textclass `%3$s'."
 msgstr ""
 
-#: src/insets/InsetInclude.cpp:503
+#: src/insets/InsetInclude.cpp:492
 msgid "Different textclasses"
 msgstr ""
 
-#: src/insets/InsetIndex.cpp:42
+#: src/insets/InsetInclude.cpp:508
+#, c-format
+msgid ""
+"Included file `%1$s'\n"
+"uses module `%2$s'\n"
+"which is not used in parent file."
+msgstr ""
+
+#: src/insets/InsetInclude.cpp:512
+#, fuzzy
+msgid "Module not found"
+msgstr "Merkkijonoa ei löydy!"
+
+#: src/insets/InsetInclude.cpp:953
+#, fuzzy
+msgid "Program Listing "
+msgstr "Ohjelman käynnistys"
+
+#: src/insets/InsetIndex.cpp:37
 msgid "Idx"
 msgstr "Hakusana"
 
-#: src/insets/InsetIndex.cpp:75
+#: src/insets/InsetIndex.cpp:65
 msgid "Index"
 msgstr "Hakemisto"
 
-#: src/insets/InsetListings.cpp:127
+#: src/insets/InsetListings.cpp:145
 msgid "Opened Listing Inset"
 msgstr "Ohjelmalistausupote avattu"
 
-#: src/insets/InsetListingsParams.cpp:130
+#: src/insets/InsetListingsParams.cpp:129
 msgid "A value is expected."
 msgstr "Arvoa tarvitaan."
 
-#: src/insets/InsetListingsParams.cpp:133
-#: src/insets/InsetListingsParams.cpp:146
-#: src/insets/InsetListingsParams.cpp:159
-#: src/insets/InsetListingsParams.cpp:172
-#: src/insets/InsetListingsParams.cpp:199
-#: src/insets/InsetListingsParams.cpp:232
+#: src/insets/InsetListingsParams.cpp:132
+#: src/insets/InsetListingsParams.cpp:145
+#: src/insets/InsetListingsParams.cpp:158
+#: src/insets/InsetListingsParams.cpp:171
+#: src/insets/InsetListingsParams.cpp:198
+#: src/insets/InsetListingsParams.cpp:231
 msgid "Unbalanced braces!"
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:141
+#: src/insets/InsetListingsParams.cpp:140
 msgid "Please specify true or false."
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:144
+#: src/insets/InsetListingsParams.cpp:143
 msgid "Only true or false is allowed."
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:154
+#: src/insets/InsetListingsParams.cpp:153
 msgid "Please specify an integer value."
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:157
+#: src/insets/InsetListingsParams.cpp:156
 msgid "An integer is expected."
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:167
+#: src/insets/InsetListingsParams.cpp:166
 msgid "Please specify a LaTeX length expression."
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:170
+#: src/insets/InsetListingsParams.cpp:169
 msgid "Invalid LaTeX length expression."
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:180
+#: src/insets/InsetListingsParams.cpp:179
 #, c-format
 msgid "Please specify one of %1$s."
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:214
+#: src/insets/InsetListingsParams.cpp:213
 #, c-format
 msgid "Try one of %1$s."
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:216
+#: src/insets/InsetListingsParams.cpp:215
 #, c-format
 msgid "I guess you mean %1$s."
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:224
+#: src/insets/InsetListingsParams.cpp:223
 #, c-format
 msgid "Please specify one or more of '%1$s'."
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:229
+#: src/insets/InsetListingsParams.cpp:228
 #, c-format
 msgid "Should be composed of one or more of %1$s."
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:292
+#: src/insets/InsetListingsParams.cpp:291
 msgid ""
 "Use \\footnotesize, \\small, \\itshape, \\ttfamily or something like that"
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:294
+#: src/insets/InsetListingsParams.cpp:293
 msgid ""
 "none, leftline, topline, bottomline, lines, single, shadowbox or subset of "
 "trblTRBL"
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:296
+#: src/insets/InsetListingsParams.cpp:295
 msgid ""
 "Enter four letters (either t = round or f = square) for top right, bottom "
 "right, bottom left and top left corner."
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:299
+#: src/insets/InsetListingsParams.cpp:298
 msgid "Enter something like \\color{white}"
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:327
+#: src/insets/InsetListingsParams.cpp:326
 msgid "Expect a number with an optional * before it"
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:411
+#: src/insets/InsetListingsParams.cpp:410
 msgid "auto, last or a number"
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:421
+#: src/insets/InsetListingsParams.cpp:420
 msgid ""
 "This parameter should not be entered here. Please use the caption edit box "
 "(when using the child document dialog) or menu Insert->Caption (when "
 "defining a listing inset)"
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:427
+#: src/insets/InsetListingsParams.cpp:426
 msgid ""
 "This parameter should not be entered here. Please use the label edit box "
 "(when using the child document dialog) or menu Insert->Label (when defining "
 "a listing inset)"
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:630
+#: src/insets/InsetListingsParams.cpp:629
 msgid "Invalid (empty) listing parameter name."
 msgstr ""
 
-#: src/insets/InsetListingsParams.cpp:646
+#: src/insets/InsetListingsParams.cpp:645
 #, fuzzy, c-format
 msgid "Available listing parameters are %1$s"
 msgstr "Tuntematon väliparametri: "
 
-#: src/insets/InsetListingsParams.cpp:649
+#: src/insets/InsetListingsParams.cpp:648
 #, fuzzy, c-format
 msgid "Available listings parameters containing string \"%1$s\" are %2$s"
 msgstr "Tuntematon väliparametri: "
 
-#: src/insets/InsetListingsParams.cpp:660
+#: src/insets/InsetListingsParams.cpp:659
 #, fuzzy, c-format
 msgid "Parameter %1$s: "
 msgstr " Makro: %s: "
 
-#: src/insets/InsetListingsParams.cpp:673
+#: src/insets/InsetListingsParams.cpp:672
 #, fuzzy, c-format
 msgid "Unknown listing parameter name: %1$s"
 msgstr "Tuntematon väliparametri: "
 
-#: src/insets/InsetListingsParams.cpp:676
+#: src/insets/InsetListingsParams.cpp:675
 #, c-format
 msgid "Parameters starting with '%1$s': %2$s"
 msgstr ""
 
-#: src/insets/InsetMarginal.cpp:33 src/insets/InsetMarginal.cpp:40
-#: src/insets/InsetMarginal.cpp:69
-msgid "margin"
-msgstr "reunahuomautus"
-
-#: src/insets/InsetMarginal.cpp:52
+#: src/insets/InsetMarginal.cpp:46
 msgid "Opened Marginal Note Inset"
 msgstr "Reunahuomautusupote avattu"
 
@@ -15888,29 +16311,29 @@ msgstr "&Ei"
 msgid "Nomenclature"
 msgstr "Otaksuma"
 
-#: src/insets/InsetNote.cpp:66
+#: src/insets/InsetNote.cpp:68
 msgid "Greyed out"
 msgstr ""
 
-#: src/insets/InsetNote.cpp:67
+#: src/insets/InsetNote.cpp:69
 #, fuzzy
 msgid "Framed"
 msgstr "Parametrit"
 
-#: src/insets/InsetNote.cpp:68
+#: src/insets/InsetNote.cpp:70
 #, fuzzy
 msgid "Shaded"
 msgstr "&Muoto:"
 
-#: src/insets/InsetNote.cpp:147
+#: src/insets/InsetNote.cpp:144
 msgid "Opened Note Inset"
 msgstr "Muistiinpanoupote avattu"
 
-#: src/insets/InsetOptArg.cpp:32 src/insets/InsetOptArg.cpp:42
+#: src/insets/InsetOptArg.cpp:28 src/insets/InsetOptArg.cpp:38
 msgid "opt"
 msgstr "valinn"
 
-#: src/insets/InsetOptArg.cpp:54
+#: src/insets/InsetOptArg.cpp:50
 msgid "Opened Optional Argument Inset"
 msgstr "Valinnaisen parametrin upote avattu"
 
@@ -15923,49 +16346,49 @@ msgstr "&Tyhjenn
 msgid "Clear Double Page"
 msgstr ""
 
-#: src/insets/InsetRef.cpp:147 src/mathed/InsetMathRef.cpp:187
+#: src/insets/InsetRef.cpp:147 src/mathed/InsetMathRef.cpp:186
 msgid "Ref: "
 msgstr "Viite: "
 
-#: src/insets/InsetRef.cpp:148 src/mathed/InsetMathRef.cpp:188
+#: src/insets/InsetRef.cpp:148 src/mathed/InsetMathRef.cpp:187
 #, fuzzy
 msgid "Equation"
 msgstr "Sitaatti"
 
-#: src/insets/InsetRef.cpp:148 src/mathed/InsetMathRef.cpp:188
+#: src/insets/InsetRef.cpp:148 src/mathed/InsetMathRef.cpp:187
 #, fuzzy
 msgid "EqRef: "
 msgstr "Viite: "
 
-#: src/insets/InsetRef.cpp:149 src/mathed/InsetMathRef.cpp:189
+#: src/insets/InsetRef.cpp:149 src/mathed/InsetMathRef.cpp:188
 msgid "Page Number"
 msgstr "Sivunumero"
 
-#: src/insets/InsetRef.cpp:149 src/mathed/InsetMathRef.cpp:189
+#: src/insets/InsetRef.cpp:149 src/mathed/InsetMathRef.cpp:188
 msgid "Page: "
 msgstr "Sivu: "
 
-#: src/insets/InsetRef.cpp:150 src/mathed/InsetMathRef.cpp:190
+#: src/insets/InsetRef.cpp:150 src/mathed/InsetMathRef.cpp:189
 msgid "Textual Page Number"
 msgstr "Sivunumero tekstinä"
 
-#: src/insets/InsetRef.cpp:150 src/mathed/InsetMathRef.cpp:190
+#: src/insets/InsetRef.cpp:150 src/mathed/InsetMathRef.cpp:189
 msgid "TextPage: "
 msgstr "Tekstisivu: "
 
-#: src/insets/InsetRef.cpp:151 src/mathed/InsetMathRef.cpp:191
+#: src/insets/InsetRef.cpp:151 src/mathed/InsetMathRef.cpp:190
 msgid "Standard+Textual Page"
 msgstr "Tavallinen+sivu tekstinä"
 
-#: src/insets/InsetRef.cpp:151 src/mathed/InsetMathRef.cpp:191
+#: src/insets/InsetRef.cpp:151 src/mathed/InsetMathRef.cpp:190
 msgid "Ref+Text: "
 msgstr "Viite+teksti: "
 
-#: src/insets/InsetRef.cpp:152 src/mathed/InsetMathRef.cpp:192
+#: src/insets/InsetRef.cpp:152 src/mathed/InsetMathRef.cpp:191
 msgid "PrettyRef"
 msgstr "Sanallinen viite"
 
-#: src/insets/InsetRef.cpp:152 src/mathed/InsetMathRef.cpp:192
+#: src/insets/InsetRef.cpp:152 src/mathed/InsetMathRef.cpp:191
 #, fuzzy
 msgid "FormatRef: "
 msgstr "&Muoto:"
@@ -15975,23 +16398,31 @@ msgstr "&Muoto:"
 msgid "Unknown TOC type"
 msgstr "Tuntematon merkintä: "
 
-#: src/insets/InsetTabular.cpp:3150
+#: src/insets/InsetTabular.cpp:3163
 #, fuzzy
 msgid "Opened table"
 msgstr "Avaa tiedosto"
 
-#: src/insets/InsetTabular.cpp:4290
+#: src/insets/InsetTabular.cpp:4299
 msgid "Error setting multicolumn"
 msgstr ""
 
-#: src/insets/InsetTabular.cpp:4291
+#: src/insets/InsetTabular.cpp:4300
 msgid "You cannot set multicolumn vertically."
 msgstr ""
 
-#: src/insets/InsetText.cpp:237
+#: src/insets/InsetText.cpp:212
 msgid "Opened Text Inset"
 msgstr "Tekstiupote avattiin"
 
+#: src/insets/InsetTheorem.cpp:41
+msgid "theorem"
+msgstr "lause"
+
+#: src/insets/InsetTheorem.cpp:89
+msgid "Opened Theorem Inset"
+msgstr "Väittämäupote avattiin"
+
 #: src/insets/InsetUrl.cpp:42
 msgid "Url: "
 msgstr "URL: "
@@ -16009,69 +16440,69 @@ msgstr "Pystyv
 msgid "wrap: "
 msgstr "tykö: "
 
-#: src/insets/InsetWrap.cpp:176
+#: src/insets/InsetWrap.cpp:191
 msgid "Opened Wrap Inset"
 msgstr "Tykö-upote avattu"
 
-#: src/insets/InsetWrap.cpp:196
+#: src/insets/InsetWrap.cpp:211
 msgid "wrap"
 msgstr "tykö"
 
-#: src/insets/RenderGraphic.cpp:90 src/insets/RenderGraphic.cpp:94
+#: src/insets/RenderGraphic.cpp:89 src/insets/RenderGraphic.cpp:93
 msgid "Not shown."
 msgstr "Ei näy."
 
-#: src/insets/RenderGraphic.cpp:97
+#: src/insets/RenderGraphic.cpp:96
 msgid "Loading..."
 msgstr "Latautuu..."
 
-#: src/insets/RenderGraphic.cpp:100
+#: src/insets/RenderGraphic.cpp:99
 msgid "Converting to loadable format..."
 msgstr "Muuntuu ladattavaan muotoon..."
 
-#: src/insets/RenderGraphic.cpp:103
+#: src/insets/RenderGraphic.cpp:102
 #, fuzzy
 msgid "Loaded into memory. Generating pixmap..."
 msgstr "Latautui muistiin. Pixmap täytyy muodostaa nyt."
 
-#: src/insets/RenderGraphic.cpp:106
+#: src/insets/RenderGraphic.cpp:105
 msgid "Scaling etc..."
 msgstr "Skaalautuu ym..."
 
-#: src/insets/RenderGraphic.cpp:109
+#: src/insets/RenderGraphic.cpp:108
 msgid "Ready to display"
 msgstr "Valmis näkymään"
 
-#: src/insets/RenderGraphic.cpp:112
+#: src/insets/RenderGraphic.cpp:111
 msgid "No file found!"
 msgstr "Ei tiedostoa!"
 
-#: src/insets/RenderGraphic.cpp:115
+#: src/insets/RenderGraphic.cpp:114
 msgid "Error converting to loadable format"
 msgstr "Virhe muuntaessa ladattavaan muotoon"
 
-#: src/insets/RenderGraphic.cpp:118
+#: src/insets/RenderGraphic.cpp:117
 msgid "Error loading file into memory"
 msgstr "Virhe ladatessa tiedostoa muistiin."
 
-#: src/insets/RenderGraphic.cpp:121
+#: src/insets/RenderGraphic.cpp:120
 msgid "Error generating the pixmap"
 msgstr "Virhe pixmapin luomisessa"
 
-#: src/insets/RenderGraphic.cpp:124
+#: src/insets/RenderGraphic.cpp:123
 msgid "No image"
 msgstr "Ei kuvaa"
 
-#: src/insets/RenderPreview.cpp:92
+#: src/insets/RenderPreview.cpp:98
 msgid "Preview loading"
 msgstr ""
 
-#: src/insets/RenderPreview.cpp:95
+#: src/insets/RenderPreview.cpp:101
 #, fuzzy
 msgid "Preview ready"
 msgstr "Esikatselu|#E"
 
-#: src/insets/RenderPreview.cpp:98
+#: src/insets/RenderPreview.cpp:104
 #, fuzzy
 msgid "Preview failed"
 msgstr "Automaattinen tallennus epäonnistui!"
@@ -16152,91 +16583,95 @@ msgstr "Etsi"
 msgid "Search string is empty"
 msgstr "Tulostiedosto on tyhjä"
 
-#: src/lyxfind.cpp:297 src/lyxfind.cpp:329 src/lyxfind.cpp:349
+#: src/lyxfind.cpp:297 src/lyxfind.cpp:328 src/lyxfind.cpp:348
 msgid "String not found!"
 msgstr "Merkkijonoa ei löydy!"
 
-#: src/lyxfind.cpp:333
+#: src/lyxfind.cpp:332
 msgid "String has been replaced."
 msgstr "Merkkijono korvattu."
 
-#: src/lyxfind.cpp:336
+#: src/lyxfind.cpp:335
 msgid " strings have been replaced."
 msgstr " merkkijonoa korvattu"
 
-#: src/mathed/InsetMathAMSArray.cpp:112 src/mathed/InsetMathHull.cpp:1247
-#: src/mathed/InsetMathSplit.cpp:76 src/mathed/InsetMathSubstack.cpp:75
+#: src/mathed/InsetFormulaMacro.cpp:123 src/mathed/MathMacroTemplate.cpp:108
+#, fuzzy, c-format
+msgid " Macro: %1$s: "
+msgstr " Makro: %s: "
+
+#: src/mathed/InsetMathAMSArray.cpp:111 src/mathed/InsetMathHull.cpp:1241
+#: src/mathed/InsetMathSplit.cpp:75 src/mathed/InsetMathSubstack.cpp:73
 #, c-format
 msgid "Can't add vertical grid lines in '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathCases.cpp:98
+#: src/mathed/InsetMathCases.cpp:94
 #, c-format
-msgid "No vertical grid lines in '%1$s'"
+msgid "No vertical grid lines in 'cases': feature %1$s"
 msgstr ""
 
-#: src/mathed/InsetMathGrid.cpp:1272
+#: src/mathed/InsetMathGrid.cpp:1361
 msgid "Only one row"
 msgstr ""
 
-#: src/mathed/InsetMathGrid.cpp:1278
+#: src/mathed/InsetMathGrid.cpp:1367
 msgid "Only one column"
 msgstr ""
 
-#: src/mathed/InsetMathGrid.cpp:1286
+#: src/mathed/InsetMathGrid.cpp:1375
 #, fuzzy
 msgid "No hline to delete"
 msgstr "Ei mitään tehtävää"
 
-#: src/mathed/InsetMathGrid.cpp:1295
+#: src/mathed/InsetMathGrid.cpp:1384
 msgid "No vline to delete"
 msgstr ""
 
-#: src/mathed/InsetMathGrid.cpp:1313
+#: src/mathed/InsetMathGrid.cpp:1402
 #, fuzzy, c-format
 msgid "Unknown tabular feature '%1$s'"
 msgstr "Taulukon ominaisuudet"
 
-#: src/mathed/InsetMathHull.cpp:1086 src/mathed/InsetMathHull.cpp:1095
+#: src/mathed/InsetMathHull.cpp:1080 src/mathed/InsetMathHull.cpp:1089
 #, fuzzy
 msgid "No number"
 msgstr "msnumero"
 
-#: src/mathed/InsetMathHull.cpp:1086 src/mathed/InsetMathHull.cpp:1095
+#: src/mathed/InsetMathHull.cpp:1080 src/mathed/InsetMathHull.cpp:1089
 #, fuzzy
 msgid "Number"
 msgstr "Numerointi"
 
-#: src/mathed/InsetMathHull.cpp:1220
+#: src/mathed/InsetMathHull.cpp:1214
 #, c-format
 msgid "Can't change number of rows in '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathHull.cpp:1230
+#: src/mathed/InsetMathHull.cpp:1224
 #, c-format
 msgid "Can't change number of columns in '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathHull.cpp:1240
+#: src/mathed/InsetMathHull.cpp:1234
 #, c-format
 msgid "Can't add horizontal grid lines in '%1$s'"
 msgstr ""
 
-#: src/mathed/InsetMathNest.cpp:859
+#: src/mathed/InsetMathNest.cpp:865
 msgid "create new math text environment ($...$)"
 msgstr ""
 
-#: src/mathed/InsetMathNest.cpp:862
+#: src/mathed/InsetMathNest.cpp:868
 #, fuzzy
 msgid "entered math text mode (textrm)"
 msgstr "Tavallinen teksti\t\\textrm"
 
-#: src/mathed/MathMacroTemplate.cpp:109
-#, fuzzy, c-format
-msgid " Macro: %1$s: "
-msgstr " Makro: %s: "
+#: src/mathed/InsetMathRef.cpp:186
+msgid "Standard[[mathref]]"
+msgstr ""
 
-#: src/mathed/MathMacroTemplate.cpp:241
+#: src/mathed/MathMacroTemplate.cpp:238
 #, fuzzy
 msgid "math macro"
 msgstr "matematiikan tausta"
@@ -16260,70 +16695,9 @@ msgstr "Viitteet: "
 msgid "All files (*)"
 msgstr "Kaikki tiedostot (*)"
 
-#: src/support/Package.cpp.in:448
-#, fuzzy
-msgid "LyX binary not found"
-msgstr "Merkkijonoa ei löydy!"
-
-#: src/support/Package.cpp.in:449
-#, fuzzy, c-format
-msgid ""
-"Unable to determine the path to the LyX binary from the command line %1$s"
-msgstr ""
-"LyX-ohjelmatiedoston sijainnin päättely ei onnistunut komentorivin %1% "
-"perusteella"
-
-#: src/support/Package.cpp.in:569
-#, fuzzy, c-format
-msgid ""
-"Unable to determine the system directory having searched\n"
-"\t%1$s\n"
-"Use the '-sysdir' command line parameter or set the environment variable "
-"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
-msgstr ""
-"Järjestelmähakemiston sijainnin määritys ei onnistunut, vaikka\n"
-"käytiin läpi hakemistot\n"
-"\t%1%\n"
-"Käytä \"--sysdir\"-valitsinta tai aseta ympäristömuuttuja LYX_DIR_15x "
-"osoittamaan LyXin järjestelmähakemistoon, jossa on tiedosto \"chkconfig.ltx"
-"\"."
-
-#: src/support/Package.cpp.in:654 src/support/Package.cpp.in:681
-#, fuzzy
-msgid "File not found"
-msgstr "Merkkijonoa ei löydy!"
-
-#: src/support/Package.cpp.in:655
-#, fuzzy, c-format
-msgid ""
-"Invalid %1$s switch.\n"
-"Directory %2$s does not contain %3$s."
-msgstr ""
-"Virheellinen %1%-valitsin.\n"
-"Hakemistossa %2% ei ole kohdetta %3%."
-
-#: src/support/Package.cpp.in:682
-#, fuzzy, c-format
-msgid ""
-"Invalid %1$s environment variable.\n"
-"Directory %2$s does not contain %3$s."
-msgstr ""
-"Virheellinen %1%-ympäristömuuttuja.\n"
-"Hakemistossa %2% ei ole kohdetta %3%."
-
-#: src/support/Package.cpp.in:707
-#, fuzzy, c-format
-msgid ""
-"Invalid %1$s environment variable.\n"
-"%2$s is not a directory."
-msgstr ""
-"Virheellinen %1%-ympäristömuuttuja.\n"
-"%2% ei ole hakemisto."
-
-#: src/support/Package.cpp.in:709
-#, fuzzy
-msgid "Directory not found"
-msgstr "Merkkijonoa ei löydy!"
+#: src/support/filetools.cpp:348
+msgid "[[Replace with the code of your language]]"
+msgstr "fi"
 
 #: src/support/os_win32.cpp:340
 #, fuzzy
@@ -16352,9 +16726,116 @@ msgstr ""
 msgid "Unknown user"
 msgstr "Tuntematon sana:"
 
+#~ msgid "Show ERT inline"
+#~ msgstr "Näytä ERT-upote ilman painiketta"
+
+#~ msgid "&Inline"
+#~ msgstr "Ilman painiketta"
+
+#~ msgid "Corollary @Section@.\\arabic{theorem}."
+#~ msgstr "Seurauslause @Section@.\\arabic{theorem}."
+
+#~ msgid "Proposition @Section@.\\arabic{theorem}."
+#~ msgstr "Väittämä @Section@.\arabic{theorem}."
+
+#~ msgid "Conjecture @Section@.\\arabic{theorem}."
+#~ msgstr "Otaksuma @Section@.\\arabic{theorem}."
+
+#~ msgid "Criterion @Section@.\\arabic{theorem}."
+#~ msgstr "Kriteeri @Section@.\\arabic{theorem}"
+
+#~ msgid "Fact @Section@.\\arabic{theorem}."
+#~ msgstr "Fakta @Section@.\\arabic{theorem}."
+
+#~ msgid "Axiom @Section@.\\arabic{theorem}."
+#~ msgstr "Aksiooma @Section@.\\arabic{theorem}."
+
+#~ msgid "Definition @Section@.\\arabic{theorem}."
+#~ msgstr "Määritelmä @Section@.\\arabic{theorem}."
+
+#~ msgid "Example @Section@.\\arabic{theorem}."
+#~ msgstr "Esimerkki @Section@.\\arabic{theorem}."
+
+#~ msgid "Acknowledgement @Section@.\\arabic{theorem}."
+#~ msgstr "Kiitos @Section@.\\arabic{theorem}."
+
+#~ msgid "Case @Section@.\\arabic{theorem}."
+#~ msgstr "Tapaus @Section@.\\arabic{theorem}."
+
+#, fuzzy
+#~ msgid ""
+#~ "The document could not be converted\n"
+#~ "into the document class %1$s."
+#~ msgstr "Asiakirja käyttää tuntematonta tekstiluokkaa \"%1$s\"."
+
+#, fuzzy
+#~ msgid "&Switch to document"
+#~ msgstr "Vaihda avoimeen asiakirjaan"
+
+#~ msgid "Formatting document..."
+#~ msgstr "Asiakirja muotoutuu..."
+
+#, fuzzy
+#~ msgid "Language settings"
+#~ msgstr "Tulostusasetukset"
+
+#, fuzzy
+#~ msgid "Outputs"
+#~ msgstr "Tuloste"
+
+#, fuzzy
+#~ msgid "LyX binary not found"
+#~ msgstr "Merkkijonoa ei löydy!"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to determine the path to the LyX binary from the command line %1$s"
+#~ msgstr ""
+#~ "LyX-ohjelmatiedoston sijainnin päättely ei onnistunut komentorivin %1% "
+#~ "perusteella"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to determine the system directory having searched\n"
+#~ "\t%1$s\n"
+#~ "Use the '-sysdir' command line parameter or set the environment variable "
+#~ "LYX_DIR_15x to the LyX system directory containing the file `chkconfig."
+#~ "ltx'."
+#~ msgstr ""
+#~ "Järjestelmähakemiston sijainnin määritys ei onnistunut, vaikka\n"
+#~ "käytiin läpi hakemistot\n"
+#~ "\t%1%\n"
+#~ "Käytä \"--sysdir\"-valitsinta tai aseta ympäristömuuttuja LYX_DIR_15x "
+#~ "osoittamaan LyXin järjestelmähakemistoon, jossa on tiedosto \"chkconfig."
+#~ "ltx\"."
+
+#, fuzzy
+#~ msgid ""
+#~ "Invalid %1$s switch.\n"
+#~ "Directory %2$s does not contain %3$s."
+#~ msgstr ""
+#~ "Virheellinen %1%-valitsin.\n"
+#~ "Hakemistossa %2% ei ole kohdetta %3%."
+
+#, fuzzy
+#~ msgid ""
+#~ "Invalid %1$s environment variable.\n"
+#~ "Directory %2$s does not contain %3$s."
+#~ msgstr ""
+#~ "Virheellinen %1%-ympäristömuuttuja.\n"
+#~ "Hakemistossa %2% ei ole kohdetta %3%."
+
+#, fuzzy
+#~ msgid ""
+#~ "Invalid %1$s environment variable.\n"
+#~ "%2$s is not a directory."
+#~ msgstr ""
+#~ "Virheellinen %1%-ympäristömuuttuja.\n"
+#~ "%2% ei ole hakemisto."
+
 #, fuzzy
-#~ msgid "Acknowledgement \\arabic{theorem}"
-#~ msgstr "Kiitos"
+#~ msgid "Directory not found"
+#~ msgstr "Merkkijonoa ei löydy!"
 
 #, fuzzy
 #~ msgid "&Default"
@@ -16482,12 +16963,6 @@ msgstr "Tuntematon sana:"
 #~ msgid "Table of contents"
 #~ msgstr "Sisällysluettelo"
 
-#~ msgid "theorem"
-#~ msgstr "lause"
-
-#~ msgid "Opened Theorem Inset"
-#~ msgstr "Väittämäupote avattiin"
-
 #, fuzzy
 #~ msgid "Number style"
 #~ msgstr "  Numero "
@@ -16675,6 +17150,3 @@ msgstr "Tuntematon sana:"
 #, fuzzy
 #~ msgid "Insets|n"
 #~ msgstr "Lisää|L"
-
-msgid "[[Replace with the code of your language]]"
-msgstr "fi"