remove unused variable

[lyx.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index ddb084519d9266678ab93b7ed670b35ea1b7d318..33eb6ccecee6378975d70b19270038ff12f2bc8e 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2007 LyX Developers
 # This file is distributed under the same license as the LyX package.
 # Bo Peng <ben.bob@gmail.com>, 2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: LyX 1.5.0svn\n"
 "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2008-02-26 19:12+0100\n"
+"POT-Creation-Date: 2008-03-09 17:26+0100\n"
 "PO-Revision-Date: 2007-07-18 12:08Central Daylight Time\n"
 "Last-Translator: Bo Peng <ben.bob@gmail.com>\n"
 "Language-Team: English <en@translate.freefriends.org>\n"
@@ -64,7 +64,7 @@ msgstr "虚构(&D)"
 #: 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:676 src/frontends/qt4/ui/FloatUi.ui:68
-#: src/frontends/qt4/ui/GraphicsUi.ui:745
+#: src/frontends/qt4/ui/GraphicsUi.ui:690
 #: src/frontends/qt4/ui/HyperlinkUi.ui:140
 #: src/frontends/qt4/ui/IncludeUi.ui:237 src/frontends/qt4/ui/LabelUi.ui:82
 #: src/frontends/qt4/ui/ListingsUi.ui:609
@@ -80,13 +80,14 @@ msgstr "确认(&O)"
 #: src/frontends/qt4/ui/AskForTextUi.ui:94
 #: src/frontends/qt4/ui/CitationUi.ui:425
 #: src/frontends/qt4/ui/DocumentUi.ui:152
-#: src/frontends/qt4/ui/ListingsUi.ui:629 src/Buffer.cpp:864
-#: src/Buffer.cpp:2571 src/Buffer.cpp:2595 src/Buffer.cpp:2630
-#: src/EmbeddedFiles.cpp:164 src/EmbeddedFiles.cpp:226 src/LyXFunc.cpp:697
-#: src/LyXFunc.cpp:846 src/LyXFunc.cpp:1024 src/LyXVC.cpp:160
-#: src/frontends/qt4/GuiClipboard.cpp:277 src/frontends/qt4/GuiView.cpp:1364
-#: src/frontends/qt4/GuiView.cpp:1546 src/frontends/qt4/GuiView.cpp:1591
-#: src/frontends/qt4/GuiView.cpp:1633
+#: src/frontends/qt4/ui/ListingsUi.ui:629 src/Buffer.cpp:868
+#: src/Buffer.cpp:2548 src/Buffer.cpp:2572 src/Buffer.cpp:2607
+#: src/EmbeddedFiles.cpp:173 src/EmbeddedFiles.cpp:235 src/LyXFunc.cpp:690
+#: src/LyXFunc.cpp:836 src/LyXFunc.cpp:1014 src/LyXVC.cpp:160
+#: src/frontends/qt4/GuiClipboard.cpp:277
+#: src/frontends/qt4/GuiDocument.cpp:1238 src/frontends/qt4/GuiView.cpp:1326
+#: src/frontends/qt4/GuiView.cpp:1507 src/frontends/qt4/GuiView.cpp:1552
+#: src/frontends/qt4/GuiView.cpp:1603
 msgid "&Cancel"
 msgstr "取消(&C)"
 
@@ -160,8 +161,8 @@ msgstr "添加(&A)"
 #: src/frontends/qt4/ui/BibtexAddUi.ui:83 src/frontends/qt4/ui/BibtexUi.ui:229
 #: src/frontends/qt4/ui/ChangesUi.ui:78 src/frontends/qt4/ui/LabelUi.ui:92
 #: src/frontends/qt4/ui/NomenclUi.ui:105 src/frontends/qt4/ui/SendtoUi.ui:92
-#: src/frontends/qt4/ui/ShortcutUi.ui:112 src/LyXFunc.cpp:806
-#: src/buffer_funcs.cpp:106 src/frontends/qt4/ButtonController.cpp:123
+#: src/frontends/qt4/ui/ShortcutUi.ui:112 src/LyXFunc.cpp:796
+#: src/buffer_funcs.cpp:103 src/frontends/qt4/ButtonController.cpp:123
 msgid "Cancel"
 msgstr "取消"
 
@@ -197,7 +198,7 @@ msgstr "内容(&C):"
 msgid "all cited references"
 msgstr "所有引用的文献"
 
-#: src/frontends/qt4/ui/BibtexUi.ui:74 src/frontends/qt4/GuiBibtex.cpp:322
+#: src/frontends/qt4/ui/BibtexUi.ui:74 src/frontends/qt4/GuiBibtex.cpp:318
 msgid "all uncited references"
 msgstr "使用未引用的文献"
 
@@ -286,7 +287,7 @@ msgid "Left"
 msgstr "左"
 
 #: src/frontends/qt4/ui/BoxUi.ui:70 src/frontends/qt4/ui/TabularUi.ui:147
-#: src/frontends/qt4/GuiExternal.cpp:83 src/frontends/qt4/GuiGraphics.cpp:815
+#: src/frontends/qt4/GuiExternal.cpp:83 src/frontends/qt4/GuiGraphics.cpp:804
 #: src/frontends/qt4/GuiParagraph.cpp:94 src/frontends/qt4/GuiTabular.cpp:705
 msgid "Center"
 msgstr "居中"
@@ -345,7 +346,7 @@ msgstr "水平"
 
 #: src/frontends/qt4/ui/BoxUi.ui:202 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:716
+#: src/frontends/qt4/ui/GraphicsUi.ui:661
 #: src/frontends/qt4/ui/ParagraphUi.ui:205 src/frontends/qt4/ui/PrefsUi.ui:47
 #: src/frontends/qt4/ui/WrapUi.ui:121
 msgid "&Restore"
@@ -354,13 +355,13 @@ msgstr "恢复(&R)"
 #: src/frontends/qt4/ui/BoxUi.ui:247 src/frontends/qt4/ui/CharacterUi.ui:380
 #: src/frontends/qt4/ui/DocumentUi.ui:145
 #: src/frontends/qt4/ui/ExternalUi.ui:686 src/frontends/qt4/ui/FloatUi.ui:78
-#: src/frontends/qt4/ui/GraphicsUi.ui:766
+#: src/frontends/qt4/ui/GraphicsUi.ui:711
 #: src/frontends/qt4/ui/ListingsUi.ui:619
 #: src/frontends/qt4/ui/ParagraphUi.ui:238 src/frontends/qt4/ui/PrefsUi.ui:83
 #: src/frontends/qt4/ui/RefUi.ui:87 src/frontends/qt4/ui/SendtoUi.ui:85
 #: src/frontends/qt4/ui/SymbolsUi.ui:161 src/frontends/qt4/ui/VSpaceUi.ui:158
-#: src/frontends/qt4/ui/WrapUi.ui:163 src/frontends/qt4/GuiDocument.cpp:1222
-#: src/frontends/qt4/GuiDocument.cpp:2039
+#: src/frontends/qt4/ui/WrapUi.ui:163 src/frontends/qt4/GuiDocument.cpp:1254
+#: src/frontends/qt4/GuiDocument.cpp:2072
 msgid "&Apply"
 msgstr "应用(&A)"
 
@@ -397,20 +398,20 @@ msgstr "内框--固定长度和换行"
 
 #: src/frontends/qt4/ui/BoxUi.ui:361 src/frontends/qt4/ui/ListingsUi.ui:270
 #: src/frontends/qt4/ui/TabularUi.ui:699 src/frontends/qt4/ui/TabularUi.ui:718
-#: src/frontends/qt4/ui/TabularUi.ui:766 src/frontends/qt4/GuiBox.cpp:66
-#: src/frontends/qt4/GuiBox.cpp:154 src/frontends/qt4/GuiBox.cpp:312
-#: src/frontends/qt4/GuiBox.cpp:437 src/frontends/qt4/GuiDocument.cpp:86
+#: src/frontends/qt4/ui/TabularUi.ui:766 src/frontends/qt4/GuiBox.cpp:69
+#: src/frontends/qt4/GuiBox.cpp:156 src/frontends/qt4/GuiBox.cpp:316
+#: src/frontends/qt4/GuiBox.cpp:444 src/frontends/qt4/GuiDocument.cpp:74
 msgid "None"
 msgstr "无"
 
-#: src/frontends/qt4/ui/BoxUi.ui:366 src/frontends/qt4/GuiBox.cpp:313
-#: src/frontends/qt4/GuiBox.cpp:427 src/frontends/qt4/GuiBox.cpp:438
-#: src/insets/InsetBox.cpp:152
+#: src/frontends/qt4/ui/BoxUi.ui:366 src/frontends/qt4/GuiBox.cpp:317
+#: src/frontends/qt4/GuiBox.cpp:434 src/frontends/qt4/GuiBox.cpp:445
+#: src/insets/InsetBox.cpp:141
 msgid "Parbox"
 msgstr "Parbox"
 
-#: src/frontends/qt4/ui/BoxUi.ui:371 src/frontends/qt4/GuiBox.cpp:428
-#: src/frontends/qt4/GuiBox.cpp:439 src/insets/InsetBox.cpp:154
+#: src/frontends/qt4/ui/BoxUi.ui:371 src/frontends/qt4/GuiBox.cpp:435
+#: src/frontends/qt4/GuiBox.cpp:446 src/insets/InsetBox.cpp:143
 msgid "Minipage"
 msgstr "Minipage"
 
@@ -479,65 +480,65 @@ msgstr "大小(&z)"
 #: src/frontends/qt4/ui/PrefLatexUi.ui:178
 #: src/frontends/qt4/ui/TabularUi.ui:704 src/frontends/qt4/ui/TabularUi.ui:723
 #: src/frontends/qt4/ui/TabularUi.ui:771 lib/ui/stdtoolbars.inc:85
-#: src/Font.cpp:179 src/frontends/qt4/GuiDocument.cpp:85
-#: src/frontends/qt4/GuiDocument.cpp:100 src/frontends/qt4/GuiDocument.cpp:116
-#: src/frontends/qt4/GuiDocument.cpp:129 src/frontends/qt4/GuiDocument.cpp:620
-#: src/frontends/qt4/GuiDocument.cpp:657 src/frontends/qt4/GuiDocument.cpp:669
-#: src/frontends/qt4/GuiDocument.cpp:1142
-#: src/frontends/qt4/GuiDocument.cpp:1187
-#: src/frontends/qt4/GuiDocument.cpp:2064 src/frontends/qt4/GuiExternal.cpp:81
-#: src/frontends/qt4/GuiGraphics.cpp:813 src/frontends/qt4/GuiListings.cpp:151
+#: src/Font.cpp:179 src/frontends/qt4/GuiDocument.cpp:73
+#: src/frontends/qt4/GuiDocument.cpp:88 src/frontends/qt4/GuiDocument.cpp:104
+#: src/frontends/qt4/GuiDocument.cpp:117 src/frontends/qt4/GuiDocument.cpp:633
+#: src/frontends/qt4/GuiDocument.cpp:670 src/frontends/qt4/GuiDocument.cpp:682
+#: src/frontends/qt4/GuiDocument.cpp:1154
+#: src/frontends/qt4/GuiDocument.cpp:1199
+#: src/frontends/qt4/GuiDocument.cpp:2113 src/frontends/qt4/GuiExternal.cpp:81
+#: src/frontends/qt4/GuiGraphics.cpp:802 src/frontends/qt4/GuiListings.cpp:151
 #: src/frontends/qt4/GuiListings.cpp:158
 msgid "Default"
 msgstr "默认"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:71 src/Font.cpp:60
-#: src/frontends/qt4/GuiCharacter.cpp:74 src/frontends/qt4/GuiListings.cpp:151
+#: src/frontends/qt4/GuiCharacter.cpp:47 src/frontends/qt4/GuiListings.cpp:151
 msgid "Tiny"
 msgstr "极小"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:76 src/Font.cpp:60
-#: src/frontends/qt4/GuiCharacter.cpp:78 src/frontends/qt4/GuiListings.cpp:151
+#: src/frontends/qt4/GuiCharacter.cpp:48 src/frontends/qt4/GuiListings.cpp:151
 msgid "Smallest"
 msgstr "最小"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:81 src/Font.cpp:60
-#: src/frontends/qt4/GuiCharacter.cpp:82 src/frontends/qt4/GuiListings.cpp:151
+#: src/frontends/qt4/GuiCharacter.cpp:49 src/frontends/qt4/GuiListings.cpp:151
 msgid "Smaller"
 msgstr "较小"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:86 src/Font.cpp:60
-#: src/frontends/qt4/GuiCharacter.cpp:86 src/frontends/qt4/GuiListings.cpp:151
+#: src/frontends/qt4/GuiCharacter.cpp:50 src/frontends/qt4/GuiListings.cpp:151
 msgid "Small"
 msgstr "小"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:91 src/Font.cpp:60
-#: src/frontends/qt4/GuiCharacter.cpp:90 src/frontends/qt4/GuiListings.cpp:151
+#: src/frontends/qt4/GuiCharacter.cpp:51 src/frontends/qt4/GuiListings.cpp:151
 msgid "Normal"
 msgstr "正常"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:96 src/Font.cpp:60
-#: src/frontends/qt4/GuiCharacter.cpp:94 src/frontends/qt4/GuiListings.cpp:152
+#: src/frontends/qt4/GuiCharacter.cpp:52 src/frontends/qt4/GuiListings.cpp:152
 msgid "Large"
 msgstr "大"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:101 src/Font.cpp:61
-#: src/frontends/qt4/GuiCharacter.cpp:98 src/frontends/qt4/GuiListings.cpp:152
+#: src/frontends/qt4/GuiCharacter.cpp:53 src/frontends/qt4/GuiListings.cpp:152
 msgid "Larger"
 msgstr "较大"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:106 src/Font.cpp:61
-#: src/frontends/qt4/GuiCharacter.cpp:102
+#: src/frontends/qt4/GuiCharacter.cpp:54
 msgid "Largest"
 msgstr "最大"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:111 src/Font.cpp:61
-#: src/frontends/qt4/GuiCharacter.cpp:106
+#: src/frontends/qt4/GuiCharacter.cpp:55
 msgid "Huge"
 msgstr "巨大"
 
 #: src/frontends/qt4/ui/BulletsUi.ui:116 src/Font.cpp:61
-#: src/frontends/qt4/GuiCharacter.cpp:110
+#: src/frontends/qt4/GuiCharacter.cpp:56
 msgid "Huger"
 msgstr "超大"
 
@@ -604,8 +605,8 @@ msgstr "字体系列"
 #: src/frontends/qt4/ui/CharacterUi.ui:114
 #: src/frontends/qt4/ui/CharacterUi.ui:160
 #: src/frontends/qt4/ui/ListingsUi.ui:370 lib/layouts/europecv.layout:118
-#: lib/layouts/moderncv.layout:114 src/frontends/qt4/GuiDocument.cpp:965
-#: src/frontends/qt4/GuiPrefs.cpp:1469
+#: lib/layouts/moderncv.layout:114 src/frontends/qt4/GuiDocument.cpp:977
+#: src/frontends/qt4/GuiPrefs.cpp:1593
 msgid "Language"
 msgstr "语言"
 
@@ -666,7 +667,7 @@ msgid "Apply changes immediately"
 msgstr "立即改变字体"
 
 #: src/frontends/qt4/ui/CharacterUi.ui:390 src/frontends/qt4/ui/ERTUi.ui:100
-#: src/frontends/qt4/ui/GraphicsUi.ui:787
+#: src/frontends/qt4/ui/GraphicsUi.ui:732
 #: src/frontends/qt4/ui/MathMatrixUi.ui:174 src/frontends/qt4/ui/NoteUi.ui:28
 #: src/frontends/qt4/ui/PrintUi.ui:243
 #: src/frontends/qt4/ui/TabularCreateUi.ui:72
@@ -866,9 +867,8 @@ msgid "Add"
 msgstr "添加(&A)"
 
 #: src/frontends/qt4/ui/EmbeddedFilesUi.ui:55
-#, fuzzy
 msgid "Extra embedded files:"
-msgstr "嵌入项(m)|m"
+msgstr ""
 
 #: src/frontends/qt4/ui/EmbeddedFilesUi.ui:65
 #, fuzzy
@@ -892,7 +892,7 @@ msgstr "草稿(&D)"
 #: src/frontends/qt4/ui/IncludeUi.ui:326
 #, fuzzy
 msgid "E&mbed"
-msgstr "编号的"
+msgstr "边框(&F)"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:77
 msgid "Edit the file externally"
@@ -1293,19 +1293,6 @@ msgstr "草稿方式"
 msgid "&Draft mode"
 msgstr "草稿方式(&D)"
 
-#: src/frontends/qt4/ui/GraphicsUi.ui:652
-msgid "S&ubfigure"
-msgstr "子图像(&u)"
-
-#: src/frontends/qt4/ui/GraphicsUi.ui:673
-#: src/frontends/qt4/ui/GraphicsUi.ui:694
-msgid "The caption for the sub-figure"
-msgstr "子图像标题"
-
-#: src/frontends/qt4/ui/GraphicsUi.ui:676
-msgid "Ca&ption:"
-msgstr "标题(&p)"
-
 #: src/frontends/qt4/ui/HyperlinkUi.ui:28
 #, fuzzy
 msgid "Specify the link target"
@@ -1345,7 +1332,7 @@ msgstr "文件(&F):"
 
 #: src/frontends/qt4/ui/HyperlinkUi.ui:76
 #: src/frontends/qt4/ui/HyperlinkUi.ui:90 lib/layouts/scrlttr2.layout:205
-#: lib/layouts/amsdefs.inc:153 lib/layouts/stdinsets.inc:251
+#: lib/layouts/amsdefs.inc:158 lib/layouts/stdinsets.inc:251
 #: lib/layouts/minimalistic.module:39 lib/ui/stdmenus.inc:340
 msgid "URL"
 msgstr "网址"
@@ -1415,11 +1402,11 @@ msgstr "包含的文件名"
 msgid "&Include Type:"
 msgstr "包含类别(&I)"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:287 src/insets/InsetInclude.cpp:273
+#: src/frontends/qt4/ui/IncludeUi.ui:287 src/insets/InsetInclude.cpp:327
 msgid "Include"
 msgstr "包含"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:292 src/insets/InsetInclude.cpp:264
+#: src/frontends/qt4/ui/IncludeUi.ui:292 src/insets/InsetInclude.cpp:318
 msgid "Input"
 msgstr "输入"
 
@@ -1427,7 +1414,7 @@ msgstr "输入"
 msgid "Verbatim"
 msgstr "Verbatim"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:302 src/insets/InsetInclude.cpp:908
+#: src/frontends/qt4/ui/IncludeUi.ui:302 src/insets/InsetInclude.cpp:917
 msgid "Program Listing"
 msgstr "程序列表"
 
@@ -1483,8 +1470,8 @@ msgstr "Language Header:"
 msgid "&Quote Style:"
 msgstr "引号风格(&Q):"
 
-#: src/frontends/qt4/ui/ListingsUi.ui:16 src/insets/InsetCaption.cpp:293
-#: src/insets/InsetListings.cpp:255 src/insets/InsetListings.cpp:257
+#: src/frontends/qt4/ui/ListingsUi.ui:16 src/insets/InsetCaption.cpp:286
+#: src/insets/InsetListings.cpp:243 src/insets/InsetListings.cpp:245
 msgid "Listing"
 msgstr "程序列表"
 
@@ -1815,7 +1802,7 @@ msgid "&Numbering"
 msgstr "编号(&N)"
 
 #: src/frontends/qt4/ui/PageLayoutUi.ui:33
-#: src/frontends/qt4/GuiDocument.cpp:963
+#: src/frontends/qt4/GuiDocument.cpp:975
 msgid "Page Layout"
 msgstr "页面布局"
 
@@ -1914,8 +1901,8 @@ msgstr "右"
 msgid "Line &spacing"
 msgstr "行距(&i):"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:171 src/Text.cpp:1270
-#: src/frontends/qt4/GuiDocument.cpp:563
+#: src/frontends/qt4/ui/ParagraphUi.ui:171 src/Text.cpp:1267
+#: src/frontends/qt4/GuiDocument.cpp:576
 msgid "Single"
 msgstr "单一"
 
@@ -1923,15 +1910,15 @@ msgstr "单一"
 msgid "1.5"
 msgstr "1.5"
 
-#: src/frontends/qt4/ui/ParagraphUi.ui:181 src/Text.cpp:1276
-#: src/frontends/qt4/GuiDocument.cpp:567
+#: src/frontends/qt4/ui/ParagraphUi.ui:181 src/Text.cpp:1273
+#: src/frontends/qt4/GuiDocument.cpp:580
 msgid "Double"
 msgstr "双重"
 
 #: src/frontends/qt4/ui/ParagraphUi.ui:186
 #: src/frontends/qt4/ui/TabularUi.ui:709 src/frontends/qt4/ui/TabularUi.ui:728
 #: src/frontends/qt4/ui/TabularUi.ui:776 src/frontends/qt4/ui/VSpaceUi.ui:110
-#: src/frontends/qt4/GuiDocument.cpp:569 src/frontends/qt4/GuiDocument.cpp:670
+#: src/frontends/qt4/GuiDocument.cpp:582 src/frontends/qt4/GuiDocument.cpp:683
 msgid "Custom"
 msgstr "自定义"
 
@@ -2216,16 +2203,18 @@ msgstr "标题"
 
 #: src/frontends/qt4/ui/PrefInputUi.ui:119
 #, fuzzy
-msgid "Popup"
-msgstr "Prop"
+msgid "In Text"
+msgstr "纯文本"
 
 #: src/frontends/qt4/ui/PrefInputUi.ui:128
-msgid "Show the popup in math mode after the delay."
+msgid ""
+"Show the grey inline completion behind the cursor in text mode after the "
+"delay."
 msgstr ""
 
 #: src/frontends/qt4/ui/PrefInputUi.ui:131
-#: src/frontends/qt4/ui/PrefInputUi.ui:217
-msgid "Automatically show in math mode"
+#: src/frontends/qt4/ui/PrefInputUi.ui:163
+msgid "Automatic inline completion"
 msgstr ""
 
 #: src/frontends/qt4/ui/PrefInputUi.ui:138
@@ -2233,79 +2222,78 @@ msgid "Show the popup after the set delay in text mode."
 msgstr ""
 
 #: src/frontends/qt4/ui/PrefInputUi.ui:141
-#: src/frontends/qt4/ui/PrefInputUi.ui:227
-msgid "Automatically show in text mode"
-msgstr ""
+#: src/frontends/qt4/ui/PrefInputUi.ui:173
+#, fuzzy
+msgid "Automatic popup"
+msgstr "自动更新"
+
+#: src/frontends/qt4/ui/PrefInputUi.ui:151
+#, fuzzy
+msgid "In Math"
+msgstr "数学"
 
-#: src/frontends/qt4/ui/PrefInputUi.ui:148
+#: src/frontends/qt4/ui/PrefInputUi.ui:160
 msgid ""
-"When the TAB completion is not unique, there won't be a delay of the popup. "
-"It will be shown right away."
+"Show the grey inline completion behind the cursor in math mode after the "
+"delay."
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefInputUi.ui:151
-msgid "Show without delay for non-unique completions"
+#: src/frontends/qt4/ui/PrefInputUi.ui:170
+msgid "Show the popup in math mode after the delay."
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefInputUi.ui:160
-#: src/frontends/qt4/ui/PrefInputUi.ui:246
-#, fuzzy
-msgid "Delay"
-msgstr "Delta"
+#: src/frontends/qt4/ui/PrefInputUi.ui:183 lib/layouts/hollywood.layout:280
+msgid "General"
+msgstr "常规"
 
-#: src/frontends/qt4/ui/PrefInputUi.ui:167
+#: src/frontends/qt4/ui/PrefInputUi.ui:191
 msgid ""
-"After the cursor has not moved for this time, the completion popup is shown "
+"After the cursor has not moved for this time, the inline completion is shown "
 "if it is available."
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefInputUi.ui:180
-#: src/frontends/qt4/ui/PrefInputUi.ui:266
-#, fuzzy
-msgid "s"
-msgstr "ps"
-
-#: src/frontends/qt4/ui/PrefInputUi.ui:205
-#, fuzzy
-msgid "Inline"
-msgstr "内联(&I)"
+#: src/frontends/qt4/ui/PrefInputUi.ui:204
+msgid "s inline completion delay"
+msgstr ""
 
-#: src/frontends/qt4/ui/PrefInputUi.ui:214
+#: src/frontends/qt4/ui/PrefInputUi.ui:228
 msgid ""
-"Show the grey inline completion behind the cursor in math mode after the "
-"delay."
+"After the cursor has not moved for this time, the completion popup is shown "
+"if it is available."
+msgstr ""
+
+#: src/frontends/qt4/ui/PrefInputUi.ui:241
+msgid "s popup delay"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefInputUi.ui:224
+#: src/frontends/qt4/ui/PrefInputUi.ui:263
 msgid ""
-"Show the grey inline completion behind the cursor in text mode after the "
-"delay."
+"When the TAB completion is not unique, there won't be a delay of the popup. "
+"It will be shown right away."
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefInputUi.ui:234
-msgid "Long completions are cut-off and shown with \"...\"."
+#: src/frontends/qt4/ui/PrefInputUi.ui:266
+msgid "Show popup without delay for non-unique completions"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefInputUi.ui:237
-msgid "Use \"...\" to shorten long completions"
+#: src/frontends/qt4/ui/PrefInputUi.ui:273
+msgid "Long completions are cut-off and shown with \"...\"."
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefInputUi.ui:253
-msgid ""
-"After the cursor has not moved for this time, the inline completion is shown "
-"if it is available."
+#: src/frontends/qt4/ui/PrefInputUi.ui:276
+msgid "Use \"...\" to shorten long completions"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefInputUi.ui:294
+#: src/frontends/qt4/ui/PrefInputUi.ui:289
 #, fuzzy
 msgid "Mouse"
-msgstr "中间"
+msgstr "更多"
 
-#: src/frontends/qt4/ui/PrefInputUi.ui:306
+#: src/frontends/qt4/ui/PrefInputUi.ui:301
 msgid "Wheel scrolling speed:"
 msgstr ""
 
-#: src/frontends/qt4/ui/PrefInputUi.ui:316
+#: src/frontends/qt4/ui/PrefInputUi.ui:311
 msgid ""
 "1.0 is the standard scrolling speed with the mouse wheel. Higher values will "
 "speed it up, low values slow it down."
@@ -2435,37 +2423,37 @@ msgid "Index command and options (makeindex, xindy)"
 msgstr "Index命令和选项(makeindex, xindy)"
 
 #: src/frontends/qt4/ui/PrefLatexUi.ui:183
-#: src/frontends/qt4/GuiDocument.cpp:671
+#: src/frontends/qt4/GuiDocument.cpp:684
 msgid "US letter"
 msgstr "US letter"
 
 #: src/frontends/qt4/ui/PrefLatexUi.ui:188
-#: src/frontends/qt4/GuiDocument.cpp:672
+#: src/frontends/qt4/GuiDocument.cpp:685
 msgid "US legal"
 msgstr "US legal"
 
 #: src/frontends/qt4/ui/PrefLatexUi.ui:193
-#: src/frontends/qt4/GuiDocument.cpp:673
+#: src/frontends/qt4/GuiDocument.cpp:686
 msgid "US executive"
 msgstr "US executive"
 
 #: src/frontends/qt4/ui/PrefLatexUi.ui:198
-#: src/frontends/qt4/GuiDocument.cpp:674
+#: src/frontends/qt4/GuiDocument.cpp:687
 msgid "A3"
 msgstr "A3"
 
 #: src/frontends/qt4/ui/PrefLatexUi.ui:203
-#: src/frontends/qt4/GuiDocument.cpp:675
+#: src/frontends/qt4/GuiDocument.cpp:688
 msgid "A4"
 msgstr "A4"
 
 #: src/frontends/qt4/ui/PrefLatexUi.ui:208
-#: src/frontends/qt4/GuiDocument.cpp:676
+#: src/frontends/qt4/GuiDocument.cpp:689
 msgid "A5"
 msgstr "A5"
 
 #: src/frontends/qt4/ui/PrefLatexUi.ui:213
-#: src/frontends/qt4/GuiDocument.cpp:679
+#: src/frontends/qt4/GuiDocument.cpp:692
 msgid "B5"
 msgstr "B5"
 
@@ -2899,8 +2887,8 @@ msgstr ""
 msgid "&User interface file:"
 msgstr "用户界面文件(&U):"
 
-#: src/frontends/qt4/ui/PrefsUi.ui:73 src/LyXFunc.cpp:696
-#: src/frontends/qt4/GuiView.cpp:1633
+#: src/frontends/qt4/ui/PrefsUi.ui:73 src/LyXFunc.cpp:689
+#: src/frontends/qt4/GuiView.cpp:1603
 msgid "&Save"
 msgstr "保存(&S)"
 
@@ -3102,7 +3090,7 @@ msgstr "清除(&l)"
 msgid "Function:"
 msgstr "函数"
 
-#: src/frontends/qt4/ui/ShortcutUi.ui:68 src/frontends/qt4/GuiPrefs.cpp:1784
+#: src/frontends/qt4/ui/ShortcutUi.ui:68 src/frontends/qt4/GuiPrefs.cpp:1904
 #, fuzzy
 msgid "Shortcut"
 msgstr "快捷键(&h)"
@@ -3348,7 +3336,7 @@ msgstr "在每页重复此行为表头"
 
 #: src/frontends/qt4/ui/TabularUi.ui:905 src/frontends/qt4/ui/TabularUi.ui:918
 #: src/frontends/qt4/ui/TabularUi.ui:928 src/frontends/qt4/ui/TabularUi.ui:938
-#: src/frontends/qt4/GuiView.cpp:1774
+#: src/frontends/qt4/GuiView.cpp:1733
 msgid "on"
 msgstr "打开"
 
@@ -3576,15 +3564,15 @@ msgstr "支持的间隔类型"
 msgid "DefSkip"
 msgstr "DefSkip"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:90 src/frontends/qt4/GuiDocument.cpp:556
+#: src/frontends/qt4/ui/VSpaceUi.ui:90 src/frontends/qt4/GuiDocument.cpp:569
 msgid "SmallSkip"
 msgstr "SmallSkip"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:95 src/frontends/qt4/GuiDocument.cpp:557
+#: src/frontends/qt4/ui/VSpaceUi.ui:95 src/frontends/qt4/GuiDocument.cpp:570
 msgid "MedSkip"
 msgstr "MedSkip"
 
-#: src/frontends/qt4/ui/VSpaceUi.ui:100 src/frontends/qt4/GuiDocument.cpp:558
+#: src/frontends/qt4/ui/VSpaceUi.ui:100 src/frontends/qt4/GuiDocument.cpp:571
 msgid "BigSkip"
 msgstr "BigSkip"
 
@@ -3600,26 +3588,26 @@ msgstr "完整源程序"
 msgid "Automatic update"
 msgstr "自动更新"
 
-#: src/frontends/qt4/ui/WrapUi.ui:44
+#: src/frontends/qt4/ui/WrapUi.ui:45
+#, fuzzy
+msgid "Unit of width value"
+msgstr "宽度单位"
+
+#: src/frontends/qt4/ui/WrapUi.ui:68
 #, fuzzy
 msgid "number of needed lines"
 msgstr "份数"
 
-#: src/frontends/qt4/ui/WrapUi.ui:51
+#: src/frontends/qt4/ui/WrapUi.ui:75
 #, fuzzy
 msgid "use number of lines"
 msgstr "份数"
 
-#: src/frontends/qt4/ui/WrapUi.ui:54
+#: src/frontends/qt4/ui/WrapUi.ui:78
 #, fuzzy
 msgid "&Line span:"
 msgstr "行间距(&L)："
 
-#: src/frontends/qt4/ui/WrapUi.ui:78
-#, fuzzy
-msgid "Unit of width value"
-msgstr "宽度单位"
-
 #: src/frontends/qt4/ui/WrapUi.ui:199
 #, fuzzy
 msgid "Outer (default)"
@@ -3648,6 +3636,14 @@ msgstr "高度"
 msgid "Unit of overhang value"
 msgstr "宽度单位"
 
+#: src/frontends/qt4/ui/WrapUi.ui:280
+msgid "Check this to allow flexible placement"
+msgstr ""
+
+#: src/frontends/qt4/ui/WrapUi.ui:283
+msgid "Allow &floating"
+msgstr ""
+
 #: lib/layouts/IEEEtran.layout:18 lib/layouts/aa.layout:22
 #: lib/layouts/aapaper.layout:34 lib/layouts/aastex.layout:49
 #: lib/layouts/amsart.layout:23 lib/layouts/amsbook.layout:24
@@ -3668,7 +3664,7 @@ msgstr "宽度单位"
 #: 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/insets/InsetRef.cpp:168
+#: lib/ui/stdtoolbars.inc:55 src/insets/InsetRef.cpp:180
 msgid "Standard"
 msgstr "标准"
 
@@ -3710,8 +3706,8 @@ msgstr "定理 #:"
 #: lib/layouts/foils.layout:243 lib/layouts/heb-article.layout:45
 #: lib/layouts/ijmpc.layout:246 lib/layouts/ijmpd.layout:251
 #: lib/layouts/llncs.layout:351 lib/layouts/siamltex.layout:215
-#: lib/layouts/svjour.inc:412 lib/layouts/theorems.inc:67
-#: lib/layouts/theorems-ams.inc:69 lib/layouts/theorems-order.inc:19
+#: lib/layouts/svjour.inc:412 lib/layouts/theorems.inc:69
+#: lib/layouts/theorems-ams.inc:71 lib/layouts/theorems-order.inc:19
 #: lib/layouts/theorems-starred-equivalents.inc:14
 msgid "Lemma"
 msgstr "引理"
@@ -3725,7 +3721,7 @@ msgstr "引理 #:"
 #: lib/layouts/heb-article.layout:55 lib/layouts/ijmpc.layout:236
 #: lib/layouts/ijmpd.layout:237 lib/layouts/llncs.layout:316
 #: lib/layouts/siamltex.layout:222 lib/layouts/svjour.inc:373
-#: lib/layouts/theorems.inc:56 lib/layouts/theorems-ams.inc:57
+#: lib/layouts/theorems.inc:58 lib/layouts/theorems-ams.inc:59
 #: lib/layouts/theorems-order.inc:13
 #: lib/layouts/theorems-starred-equivalents.inc:10
 msgid "Corollary"
@@ -3739,7 +3735,7 @@ msgstr "Corollary #:"
 #: lib/layouts/foils.layout:257 lib/layouts/ijmpc.layout:256
 #: lib/layouts/ijmpd.layout:262 lib/layouts/llncs.layout:385
 #: lib/layouts/siamltex.layout:229 lib/layouts/svjour.inc:447
-#: lib/layouts/theorems.inc:78 lib/layouts/theorems-ams.inc:81
+#: lib/layouts/theorems.inc:80 lib/layouts/theorems-ams.inc:83
 #: lib/layouts/theorems-order.inc:25
 #: lib/layouts/theorems-starred-equivalents.inc:18
 msgid "Proposition"
@@ -3752,7 +3748,7 @@ msgstr "Proposition #:"
 #: lib/layouts/IEEEtran.layout:113 lib/layouts/elsart.layout:363
 #: lib/layouts/ijmpc.layout:296 lib/layouts/ijmpd.layout:306
 #: lib/layouts/llncs.layout:309 lib/layouts/svjour.inc:366
-#: lib/layouts/theorems.inc:89 lib/layouts/theorems-ams.inc:93
+#: lib/layouts/theorems.inc:91 lib/layouts/theorems-ams.inc:95
 #: lib/layouts/theorems-order.inc:31
 #: lib/layouts/theorems-starred-equivalents.inc:22
 msgid "Conjecture"
@@ -3772,7 +3768,7 @@ msgid "Criterion #:"
 msgstr "Criterion #:"
 
 #: lib/layouts/IEEEtran.layout:133 lib/layouts/beamer.layout:943
-#: lib/layouts/theorems.inc:100 lib/layouts/theorems-ams.inc:105
+#: lib/layouts/theorems.inc:102 lib/layouts/theorems-ams.inc:107
 msgid "Fact"
 msgstr "Fact"
 
@@ -3793,7 +3789,7 @@ msgstr "Axiom #:"
 #: lib/layouts/heb-article.layout:75 lib/layouts/ijmpc.layout:132
 #: lib/layouts/ijmpd.layout:129 lib/layouts/llncs.layout:330
 #: lib/layouts/siamltex.layout:236 lib/layouts/svjour.inc:387
-#: lib/layouts/theorems.inc:111 lib/layouts/theorems-ams.inc:117
+#: lib/layouts/theorems.inc:113 lib/layouts/theorems-ams.inc:119
 #: lib/layouts/theorems-order.inc:37
 #: lib/layouts/theorems-starred-equivalents.inc:26
 msgid "Definition"
@@ -3806,10 +3802,10 @@ msgstr "定义 #:"
 #: lib/layouts/IEEEtran.layout:163 lib/layouts/beamer.layout:925
 #: lib/layouts/elsart.layout:370 lib/layouts/ijmpc.layout:166
 #: lib/layouts/ijmpd.layout:163 lib/layouts/llncs.layout:337
-#: lib/layouts/svjour.inc:394 lib/layouts/theorems.inc:130
-#: lib/layouts/theorems-ams.inc:136 lib/layouts/theorems-order.inc:43
+#: lib/layouts/svjour.inc:394 lib/layouts/theorems.inc:132
+#: lib/layouts/theorems-ams.inc:138 lib/layouts/theorems-order.inc:43
 #: lib/layouts/theorems-starred-equivalents.inc:30
-#: src/frontends/qt4/GuiDocument.cpp:810
+#: src/frontends/qt4/GuiDocument.cpp:821
 msgid "Example"
 msgstr "示例"
 
@@ -3828,7 +3824,7 @@ msgstr "条件 #:"
 
 #: lib/layouts/IEEEtran.layout:183 lib/layouts/elsart.layout:377
 #: lib/layouts/llncs.layout:364 lib/layouts/svjour.inc:426
-#: lib/layouts/theorems.inc:141 lib/layouts/theorems-ams.inc:147
+#: lib/layouts/theorems.inc:144 lib/layouts/theorems-ams.inc:150
 #: lib/layouts/theorems-order.inc:49
 #: lib/layouts/theorems-starred-equivalents.inc:34
 msgid "Problem"
@@ -3839,8 +3835,8 @@ msgid "Problem #:"
 msgstr "问题 #:"
 
 #: lib/layouts/IEEEtran.layout:193 lib/layouts/llncs.layout:344
-#: lib/layouts/svjour.inc:401 lib/layouts/theorems.inc:152
-#: lib/layouts/theorems-ams.inc:158 lib/layouts/theorems-order.inc:55
+#: lib/layouts/svjour.inc:401 lib/layouts/theorems.inc:156
+#: lib/layouts/theorems-ams.inc:162 lib/layouts/theorems-order.inc:55
 #: lib/layouts/theorems-starred-equivalents.inc:38
 msgid "Exercise"
 msgstr "练习"
@@ -3852,7 +3848,7 @@ msgstr "练习 #:"
 #: lib/layouts/IEEEtran.layout:203 lib/layouts/elsart.layout:384
 #: lib/layouts/ijmpc.layout:176 lib/layouts/ijmpd.layout:174
 #: lib/layouts/llncs.layout:398 lib/layouts/svjour.inc:461
-#: lib/layouts/theorems.inc:163 lib/layouts/theorems-ams.inc:169
+#: lib/layouts/theorems.inc:168 lib/layouts/theorems-ams.inc:174
 #: lib/layouts/theorems-order.inc:61
 #: lib/layouts/theorems-starred-equivalents.inc:42
 msgid "Remark"
@@ -3865,8 +3861,8 @@ msgstr "Remark #:"
 #: lib/layouts/IEEEtran.layout:213 lib/layouts/elsart.layout:398
 #: lib/layouts/heb-article.layout:65 lib/layouts/ijmpc.layout:286
 #: lib/layouts/ijmpd.layout:295 lib/layouts/llncs.layout:302
-#: lib/layouts/svjour.inc:345 lib/layouts/theorems.inc:183
-#: lib/layouts/theorems-ams.inc:189 lib/layouts/theorems-order.inc:67
+#: lib/layouts/svjour.inc:345 lib/layouts/theorems.inc:188
+#: lib/layouts/theorems-ams.inc:194 lib/layouts/theorems-order.inc:67
 #: lib/layouts/theorems-starred-equivalents.inc:46
 msgid "Claim"
 msgstr "Claim"
@@ -3897,21 +3893,21 @@ msgid "Notation #:"
 msgstr "Notation #:"
 
 #: lib/layouts/IEEEtran.layout:243 lib/layouts/elsart.layout:413
-#: lib/layouts/llncs.layout:281 lib/layouts/theorems.inc:195
-#: lib/layouts/theorems-ams.inc:201 lib/layouts/theorems-order.inc:73
+#: lib/layouts/llncs.layout:281 lib/layouts/theorems.inc:201
+#: lib/layouts/theorems-ams.inc:207 lib/layouts/theorems-order.inc:73
 msgid "Case"
 msgstr "Case"
 
-#: lib/layouts/IEEEtran.layout:246 lib/layouts/theorems.inc:200
-#: lib/layouts/theorems-ams.inc:206
+#: lib/layouts/IEEEtran.layout:246 lib/layouts/theorems.inc:207
+#: lib/layouts/theorems-ams.inc:213
 msgid "Case #:"
 msgstr "Case #:"
 
 #: lib/layouts/IEEEtran.layout:272 lib/layouts/aa.layout:37
 #: lib/layouts/aa.layout:214 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:88
+#: lib/layouts/aastex.layout:167 lib/layouts/amsart.layout:63
+#: lib/layouts/amsbook.layout:49 lib/layouts/amsbook.layout:89
 #: lib/layouts/beamer.layout:142 lib/layouts/egs.layout:30
 #: lib/layouts/europecv.layout:29 lib/layouts/ijmpc.layout:95
 #: lib/layouts/ijmpd.layout:91 lib/layouts/isprs.layout:155
@@ -3924,7 +3920,7 @@ msgstr "Case #:"
 #: lib/layouts/simplecv.layout:28 lib/layouts/spie.layout:19
 #: lib/layouts/agu_stdsections.inc:30 lib/layouts/aguplus.inc:27
 #: lib/layouts/db_stdsections.inc:28 lib/layouts/numrevtex.inc:6
-#: lib/layouts/scrclass.inc:62 lib/layouts/stdsections.inc:59
+#: lib/layouts/scrclass.inc:62 lib/layouts/stdsections.inc:61
 #: lib/layouts/svjour.inc:53
 msgid "Section"
 msgstr "章节"
@@ -3932,8 +3928,8 @@ msgstr "章节"
 #: lib/layouts/IEEEtran.layout:282 lib/layouts/aa.layout:40
 #: lib/layouts/aa.layout:224 lib/layouts/aapaper.layout:67
 #: lib/layouts/aapaper.layout:139 lib/layouts/aastex.layout:67
-#: lib/layouts/aastex.layout:179 lib/layouts/amsart.layout:72
-#: lib/layouts/amsbook.layout:58 lib/layouts/beamer.layout:182
+#: lib/layouts/aastex.layout:179 lib/layouts/amsart.layout:73
+#: lib/layouts/amsbook.layout:59 lib/layouts/beamer.layout:182
 #: lib/layouts/egs.layout:51 lib/layouts/ijmpc.layout:109
 #: lib/layouts/ijmpd.layout:105 lib/layouts/isprs.layout:166
 #: lib/layouts/kluwer.layout:66 lib/layouts/latex8.layout:49
@@ -3944,15 +3940,15 @@ msgstr "章节"
 #: lib/layouts/simplecv.layout:48 lib/layouts/agu_stdsections.inc:40
 #: lib/layouts/aguplus.inc:41 lib/layouts/db_stdsections.inc:36
 #: lib/layouts/numrevtex.inc:15 lib/layouts/scrclass.inc:69
-#: lib/layouts/stdsections.inc:82 lib/layouts/svjour.inc:62
+#: lib/layouts/stdsections.inc:85 lib/layouts/svjour.inc:62
 msgid "Subsection"
 msgstr "子段"
 
 #: lib/layouts/IEEEtran.layout:290 lib/layouts/aa.layout:43
 #: lib/layouts/aa.layout:236 lib/layouts/aapaper.layout:70
 #: lib/layouts/aapaper.layout:150 lib/layouts/aastex.layout:70
-#: lib/layouts/aastex.layout:191 lib/layouts/amsart.layout:80
-#: lib/layouts/amsbook.layout:66 lib/layouts/ijmpc.layout:117
+#: lib/layouts/aastex.layout:191 lib/layouts/amsart.layout:81
+#: lib/layouts/amsbook.layout:67 lib/layouts/ijmpc.layout:117
 #: lib/layouts/ijmpd.layout:113 lib/layouts/isprs.layout:175
 #: lib/layouts/kluwer.layout:75 lib/layouts/llncs.layout:61
 #: lib/layouts/ltugboat.layout:83 lib/layouts/memoir.layout:66
@@ -3960,7 +3956,7 @@ msgstr "子段"
 #: lib/layouts/revtex4.layout:64 lib/layouts/siamltex.layout:65
 #: lib/layouts/agu_stdsections.inc:50 lib/layouts/db_stdsections.inc:44
 #: lib/layouts/numrevtex.inc:24 lib/layouts/scrclass.inc:76
-#: lib/layouts/stdsections.inc:97 lib/layouts/svjour.inc:71
+#: lib/layouts/stdsections.inc:100 lib/layouts/svjour.inc:71
 msgid "Subsubsection"
 msgstr "Subsubsection"
 
@@ -3969,20 +3965,20 @@ msgstr "Subsubsection"
 #: lib/layouts/ijmpd.layout:98 lib/layouts/isprs.layout:184
 #: lib/layouts/siamltex.layout:81 lib/layouts/spie.layout:29
 #: lib/layouts/aguplus.inc:34 lib/layouts/db_stdstarsections.inc:36
-#: lib/layouts/stdstarsections.inc:32
+#: lib/layouts/stdstarsections.inc:34
 msgid "Section*"
 msgstr "Section*"
 
 #: lib/layouts/IEEEtran.layout:308 lib/layouts/beamer.layout:214
 #: lib/layouts/egs.layout:596 lib/layouts/isprs.layout:195
 #: lib/layouts/siamltex.layout:88 lib/layouts/aguplus.inc:48
-#: lib/layouts/db_stdstarsections.inc:48 lib/layouts/stdstarsections.inc:42
+#: lib/layouts/db_stdstarsections.inc:48 lib/layouts/stdstarsections.inc:45
 msgid "Subsection*"
 msgstr "Subsection*"
 
 #: lib/layouts/IEEEtran.layout:316 lib/layouts/isprs.layout:204
 #: lib/layouts/siamltex.layout:95 lib/layouts/db_stdstarsections.inc:60
-#: lib/layouts/stdstarsections.inc:52
+#: lib/layouts/stdstarsections.inc:56
 msgid "Subsubsection*"
 msgstr "Subsubsection*"
 
@@ -4003,10 +3999,10 @@ msgstr "Subsubsection*"
 #: lib/layouts/revtex4.layout:202 lib/layouts/siamltex.layout:142
 #: 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:93 lib/layouts/db_stdstruct.inc:11
+#: lib/layouts/amsdefs.inc:96 lib/layouts/db_stdstruct.inc:11
 #: lib/layouts/scrclass.inc:216 lib/layouts/stdstruct.inc:12
-#: lib/layouts/stdstruct.inc:26 lib/layouts/svjour.inc:249
-#: src/output_plaintext.cpp:138
+#: lib/layouts/stdstruct.inc:27 lib/layouts/svjour.inc:249
+#: src/output_plaintext.cpp:133
 msgid "Abstract"
 msgstr "摘要"
 
@@ -4021,7 +4017,7 @@ msgstr "摘要---"
 #: lib/layouts/kluwer.layout:274 lib/layouts/paper.layout:171
 #: lib/layouts/revtex4.layout:241 lib/layouts/siamltex.layout:167
 #: lib/layouts/spie.layout:39 lib/layouts/agu_stdtitle.inc:120
-#: lib/layouts/amsdefs.inc:161 lib/layouts/svjour.inc:270
+#: lib/layouts/amsdefs.inc:166 lib/layouts/svjour.inc:270
 msgid "Keywords"
 msgstr "关键字"
 
@@ -4045,9 +4041,9 @@ msgstr "Index Terms---"
 #: lib/layouts/scrbook.layout:23 lib/layouts/scrreprt.layout:11
 #: lib/layouts/scrreprt.layout:13 lib/layouts/siamltex.layout:181
 #: lib/layouts/simplecv.layout:139 lib/layouts/aguplus.inc:167
-#: lib/layouts/aguplus.inc:169 lib/layouts/amsdefs.inc:196
-#: lib/layouts/scrclass.inc:223 lib/layouts/stdstruct.inc:38
-#: lib/layouts/svjour.inc:323 src/frontends/qt4/GuiDocument.cpp:967
+#: lib/layouts/aguplus.inc:169 lib/layouts/amsdefs.inc:201
+#: lib/layouts/scrclass.inc:223 lib/layouts/stdstruct.inc:39
+#: lib/layouts/svjour.inc:323 src/frontends/qt4/GuiDocument.cpp:979
 msgid "Bibliography"
 msgstr "参考书目"
 
@@ -4093,7 +4089,7 @@ msgstr "列表"
 #: lib/layouts/beamer.layout:70 lib/layouts/egs.layout:145
 #: lib/layouts/manpage.layout:64 lib/layouts/powerdot.layout:266
 #: lib/layouts/agu_stdlists.inc:21 lib/layouts/db_stdlists.inc:19
-#: lib/layouts/stdlists.inc:29
+#: lib/layouts/stdlists.inc:30
 msgid "Enumerate"
 msgstr "编号列表"
 
@@ -4103,7 +4099,7 @@ msgstr "编号列表"
 #: lib/layouts/manpage.layout:99 lib/layouts/paper.layout:103
 #: lib/layouts/scrlettr.layout:17 lib/layouts/scrlttr2.layout:19
 #: lib/layouts/agu_stdlists.inc:29 lib/layouts/db_stdlists.inc:26
-#: lib/layouts/scrclass.inc:27 lib/layouts/stdlists.inc:47
+#: lib/layouts/scrclass.inc:27 lib/layouts/stdlists.inc:49
 #: lib/ui/stdtoolbars.inc:89
 msgid "Description"
 msgstr "描述"
@@ -4111,7 +4107,7 @@ msgstr "描述"
 #: lib/layouts/aa.layout:55 lib/layouts/aapaper.layout:57
 #: lib/layouts/aastex.layout:85 lib/layouts/egs.layout:128
 #: lib/layouts/scrlettr.layout:32 lib/layouts/scrlttr2.layout:35
-#: lib/layouts/scrclass.inc:41 lib/layouts/stdlists.inc:69
+#: lib/layouts/scrclass.inc:41 lib/layouts/stdlists.inc:72
 #: lib/ui/stdtoolbars.inc:88
 msgid "List"
 msgstr "列表"
@@ -4162,9 +4158,9 @@ msgstr "副标题"
 #: lib/layouts/paper.layout:122 lib/layouts/powerdot.layout:62
 #: lib/layouts/revtex.layout:98 lib/layouts/revtex4.layout:115
 #: lib/layouts/siamltex.layout:125 lib/layouts/svprobth.layout:52
-#: lib/layouts/agu_stdtitle.inc:167 lib/layouts/amsdefs.inc:51
+#: lib/layouts/agu_stdtitle.inc:167 lib/layouts/amsdefs.inc:52
 #: lib/layouts/db_stdtitle.inc:21 lib/layouts/scrclass.inc:155
-#: lib/layouts/stdtitle.inc:30 lib/layouts/svjour.inc:181
+#: lib/layouts/stdtitle.inc:31 lib/layouts/svjour.inc:181
 msgid "Author"
 msgstr "作者"
 
@@ -4176,8 +4172,8 @@ msgstr "作者"
 #: lib/layouts/isprs.layout:113 lib/layouts/kluwer.layout:174
 #: lib/layouts/revtex.layout:116 lib/layouts/revtex4.layout:164
 #: lib/layouts/scrlettr.layout:139 lib/layouts/scrlttr2.layout:45
-#: lib/layouts/aapaper.inc:29 lib/layouts/amsdefs.inc:119
-#: lib/layouts/lyxmacros.inc:43
+#: lib/layouts/aapaper.inc:29 lib/layouts/amsdefs.inc:123
+#: lib/layouts/lyxmacros.inc:44
 msgid "Address"
 msgstr "地址"
 
@@ -4200,9 +4196,9 @@ msgstr "邮件"
 #: lib/layouts/powerdot.layout:84 lib/layouts/revtex.layout:106
 #: lib/layouts/revtex4.layout:123 lib/layouts/scrlettr.layout:160
 #: lib/layouts/scrlttr2.layout:237 lib/layouts/siamltex.layout:136
-#: lib/layouts/agu_stdtitle.inc:238 lib/layouts/amsdefs.inc:70
+#: lib/layouts/agu_stdtitle.inc:238 lib/layouts/amsdefs.inc:72
 #: lib/layouts/db_stdtitle.inc:35 lib/layouts/scrclass.inc:162
-#: lib/layouts/stdtitle.inc:48 lib/layouts/svjour.inc:227
+#: lib/layouts/stdtitle.inc:50 lib/layouts/svjour.inc:227
 #: lib/ui/stdmenus.inc:347 lib/external_templates:248
 #: lib/external_templates:249 lib/external_templates:253
 msgid "Date"
@@ -4229,14 +4225,14 @@ msgid "Acknowledgements."
 msgstr "Acknowledgements."
 
 #: lib/layouts/aapaper.layout:61 lib/layouts/egs.layout:612
-#: src/frontends/qt4/GuiPrefs.cpp:361
+#: src/frontends/qt4/GuiPrefs.cpp:491
 msgid "LaTeX"
 msgstr "LaTeX"
 
 #: lib/layouts/aapaper.layout:85 lib/layouts/aastex.layout:97
 #: lib/layouts/aastex.layout:302 lib/layouts/iopart.layout:153
 #: lib/layouts/latex8.layout:57 lib/layouts/llncs.layout:229
-#: lib/layouts/aapaper.inc:46 lib/layouts/amsdefs.inc:145
+#: lib/layouts/aapaper.inc:46 lib/layouts/amsdefs.inc:150
 #: lib/layouts/db_stdcharstyles.inc:73
 msgid "Email"
 msgstr "电子邮件"
@@ -4246,7 +4242,7 @@ msgstr "电子邮件"
 msgid "Thesaurus"
 msgstr "Thesaurus"
 
-#: lib/layouts/aastex.layout:73 lib/layouts/amsbook.layout:94
+#: lib/layouts/aastex.layout:73 lib/layouts/amsbook.layout:95
 #: lib/layouts/egs.layout:69 lib/layouts/kluwer.layout:84
 #: lib/layouts/llncs.layout:69 lib/layouts/ltugboat.layout:102
 #: lib/layouts/memoir.layout:71 lib/layouts/paper.layout:71
@@ -4254,7 +4250,7 @@ msgstr "Thesaurus"
 #: lib/layouts/siamltex.layout:71 lib/layouts/agu_stdsections.inc:60
 #: lib/layouts/aguplus.inc:55 lib/layouts/db_stdsections.inc:52
 #: lib/layouts/numrevtex.inc:33 lib/layouts/scrclass.inc:83
-#: lib/layouts/stdsections.inc:111 lib/layouts/svjour.inc:80
+#: lib/layouts/stdsections.inc:114 lib/layouts/svjour.inc:80
 msgid "Paragraph"
 msgstr "段落"
 
@@ -4283,9 +4279,9 @@ msgstr "致谢"
 #: lib/layouts/iopart.layout:267 lib/layouts/iopart.layout:281
 #: lib/layouts/kluwer.layout:334 lib/layouts/kluwer.layout:346
 #: lib/layouts/llncs.layout:272 lib/layouts/moderncv.layout:162
-#: lib/layouts/siamltex.layout:192 lib/layouts/amsdefs.inc:210
-#: lib/layouts/stdstruct.inc:52 lib/layouts/svjour.inc:337
-#: src/output_plaintext.cpp:150
+#: lib/layouts/siamltex.layout:192 lib/layouts/amsdefs.inc:215
+#: lib/layouts/stdstruct.inc:54 lib/layouts/svjour.inc:337
+#: src/output_plaintext.cpp:145
 msgid "References"
 msgstr "引用"
 
@@ -4333,10 +4329,10 @@ msgstr "Subject headings:"
 msgid "[Acknowledgements]"
 msgstr "[致谢]"
 
-#: lib/layouts/aastex.layout:350 src/frontends/qt4/GuiDocument.cpp:1245
-#: src/frontends/qt4/GuiDocument.cpp:1255
-#: src/frontends/qt4/GuiDocument.cpp:1295
-#: src/frontends/qt4/GuiDocument.cpp:1314
+#: lib/layouts/aastex.layout:350 src/frontends/qt4/GuiDocument.cpp:1277
+#: src/frontends/qt4/GuiDocument.cpp:1287
+#: src/frontends/qt4/GuiDocument.cpp:1327
+#: src/frontends/qt4/GuiDocument.cpp:1346
 msgid "and"
 msgstr "和"
 
@@ -4384,12 +4380,12 @@ msgstr "Obj:"
 msgid "Dataset:"
 msgstr "Dataset:"
 
-#: lib/layouts/amsbook.layout:89 lib/layouts/amsbook.layout:90
+#: lib/layouts/amsbook.layout:90 lib/layouts/amsbook.layout:91
 #: lib/layouts/powerdot.layout:229 lib/layouts/numarticle.inc:10
 msgid "\\arabic{section}"
 msgstr "\\arabic{section}"
 
-#: lib/layouts/amsbook.layout:102
+#: lib/layouts/amsbook.layout:103
 msgid "Chapter Exercises"
 msgstr "Chapter Exercises"
 
@@ -4484,7 +4480,7 @@ msgstr "FitBitmap"
 #: lib/layouts/apa.layout:319 lib/layouts/beamer.layout:66
 #: lib/layouts/egs.layout:177 lib/layouts/manpage.layout:95
 #: lib/layouts/powerdot.layout:255 lib/layouts/simplecv.layout:91
-#: lib/layouts/stdlists.inc:25
+#: lib/layouts/stdlists.inc:26
 msgid "*"
 msgstr "*"
 
@@ -4493,7 +4489,7 @@ msgid "Seriate"
 msgstr "Seriate"
 
 #: lib/layouts/apa.layout:357 lib/layouts/apa.layout:358
-#: src/buffer_funcs.cpp:391
+#: src/buffer_funcs.cpp:388
 msgid "(\\alph{enumii})"
 msgstr "(\\alph{enumii})"
 
@@ -4529,7 +4525,7 @@ msgid "Part*"
 msgstr "Part*"
 
 #: lib/layouts/beamer.layout:103 lib/layouts/egs.layout:196
-#: lib/layouts/manpage.layout:114 lib/layouts/stdlists.inc:62
+#: lib/layouts/manpage.layout:114 lib/layouts/stdlists.inc:65
 msgid "MM"
 msgstr "MM"
 
@@ -4689,12 +4685,12 @@ msgid "TitleGraphic"
 msgstr "TitleGraphic"
 
 #: lib/layouts/beamer.layout:896 lib/layouts/foils.layout:309
-#: lib/layouts/siamltex.layout:282 lib/layouts/theorems-starred.inc:58
+#: lib/layouts/siamltex.layout:282 lib/layouts/theorems-starred.inc:60
 msgid "Corollary."
 msgstr "Corollary."
 
 #: lib/layouts/beamer.layout:916 lib/layouts/foils.layout:323
-#: lib/layouts/siamltex.layout:295 lib/layouts/theorems-starred.inc:114
+#: lib/layouts/siamltex.layout:295 lib/layouts/theorems-starred.inc:121
 msgid "Definition."
 msgstr "定义."
 
@@ -4706,7 +4702,7 @@ msgstr "定义"
 msgid "Definitions."
 msgstr "定义"
 
-#: lib/layouts/beamer.layout:928 lib/layouts/theorems-starred.inc:132
+#: lib/layouts/beamer.layout:928 lib/layouts/theorems-starred.inc:140
 msgid "Example."
 msgstr "示例."
 
@@ -4718,19 +4714,19 @@ msgstr "例子"
 msgid "Examples."
 msgstr "例子"
 
-#: lib/layouts/beamer.layout:946 lib/layouts/theorems-starred.inc:102
+#: lib/layouts/beamer.layout:946 lib/layouts/theorems-starred.inc:108
 msgid "Fact."
 msgstr "Fact."
 
 #: lib/layouts/beamer.layout:952 lib/layouts/foils.layout:281
 #: lib/layouts/ijmpc.layout:225 lib/layouts/ijmpd.layout:225
 #: lib/layouts/llncs.layout:374 lib/layouts/siamltex.layout:253
-#: lib/layouts/svjour.inc:436 lib/layouts/theorems-proof.inc:29
+#: lib/layouts/svjour.inc:436 lib/layouts/theorems-proof.inc:30
 msgid "Proof."
 msgstr "证明."
 
 #: lib/layouts/beamer.layout:958 lib/layouts/foils.layout:295
-#: lib/layouts/siamltex.layout:268 lib/layouts/theorems-starred.inc:28
+#: lib/layouts/siamltex.layout:268 lib/layouts/theorems-starred.inc:29
 msgid "Theorem."
 msgstr "定理."
 
@@ -4838,7 +4834,7 @@ msgid "CURTAIN"
 msgstr "CURTAIN"
 
 #: lib/layouts/broadway.layout:213 lib/layouts/egs.layout:222
-#: lib/layouts/hollywood.layout:305 lib/layouts/lyxmacros.inc:63
+#: lib/layouts/hollywood.layout:305 lib/layouts/lyxmacros.inc:64
 msgid "Right Address"
 msgstr "Right Address"
 
@@ -5047,7 +5043,7 @@ msgstr "Datum:"
 #: lib/layouts/llncs.layout:78 lib/layouts/memoir.layout:76
 #: lib/layouts/paper.layout:80 lib/layouts/agu_stdsections.inc:70
 #: lib/layouts/db_stdsections.inc:60 lib/layouts/scrclass.inc:90
-#: lib/layouts/stdsections.inc:121 lib/layouts/svjour.inc:89
+#: lib/layouts/stdsections.inc:124 lib/layouts/svjour.inc:89
 msgid "Subparagraph"
 msgstr "Subparagraph"
 
@@ -5057,16 +5053,16 @@ msgid "Quotation"
 msgstr "Quotation"
 
 #: lib/layouts/egs.layout:112 lib/layouts/manpage.layout:29
-#: lib/layouts/powerdot.layout:332 lib/layouts/stdlayouts.inc:29
+#: lib/layouts/powerdot.layout:332 lib/layouts/stdlayouts.inc:30
 msgid "Quote"
 msgstr "引号(')"
 
-#: lib/layouts/egs.layout:141 lib/layouts/stdlists.inc:82
+#: lib/layouts/egs.layout:141 lib/layouts/stdlists.inc:86
 msgid "00.00.0000"
 msgstr "00.00.0000"
 
 #: lib/layouts/egs.layout:203 lib/layouts/powerdot.layout:350
-#: lib/layouts/stdlayouts.inc:45
+#: lib/layouts/stdlayouts.inc:47
 msgid "Verse"
 msgstr "Verse"
 
@@ -5137,7 +5133,7 @@ msgstr "reprint_reqs_to:"
 #: lib/layouts/egs.layout:495 lib/layouts/kluwer.layout:263
 #: lib/layouts/llncs.layout:251 lib/layouts/siamltex.layout:154
 #: lib/layouts/svglobal.layout:44 lib/layouts/svjog.layout:49
-#: lib/layouts/amsdefs.inc:106 lib/layouts/svjour.inc:263
+#: lib/layouts/amsdefs.inc:110 lib/layouts/svjour.inc:263
 msgid "Abstract."
 msgstr "摘要."
 
@@ -5153,7 +5149,7 @@ msgstr "作者地址"
 #: lib/layouts/elsart.layout:140 lib/layouts/g-brief-en.layout:185
 #: lib/layouts/g-brief2.layout:727 lib/layouts/revtex.layout:128
 #: lib/layouts/revtex4.layout:167 lib/layouts/scrlettr.layout:142
-#: lib/layouts/scrlttr2.layout:60 lib/layouts/amsdefs.inc:130
+#: lib/layouts/scrlttr2.layout:60 lib/layouts/amsdefs.inc:135
 msgid "Address:"
 msgstr "地址："
 
@@ -5170,12 +5166,12 @@ msgid "Author URL"
 msgstr "作者网址"
 
 #: lib/layouts/elsart.layout:178 lib/layouts/revtex4.layout:198
-#: lib/layouts/amsdefs.inc:157
+#: lib/layouts/amsdefs.inc:162
 msgid "URL:"
 msgstr "网址："
 
 #: lib/layouts/elsart.layout:190 lib/layouts/revtex4.layout:171
-#: lib/layouts/amsdefs.inc:168
+#: lib/layouts/amsdefs.inc:173
 msgid "Thanks"
 msgstr "致谢"
 
@@ -5450,32 +5446,32 @@ msgid "Theorem*"
 msgstr "Theorem*"
 
 #: lib/layouts/foils.layout:299 lib/layouts/siamltex.layout:272
-#: lib/layouts/theorems-order.inc:22 lib/layouts/theorems-starred.inc:66
+#: lib/layouts/theorems-order.inc:22 lib/layouts/theorems-starred.inc:69
 msgid "Lemma*"
 msgstr "Lemma*"
 
 #: lib/layouts/foils.layout:302 lib/layouts/siamltex.layout:275
-#: lib/layouts/theorems-starred.inc:69
+#: lib/layouts/theorems-starred.inc:72
 msgid "Lemma."
 msgstr "Lemma."
 
 #: lib/layouts/foils.layout:306 lib/layouts/siamltex.layout:279
-#: lib/layouts/theorems-order.inc:16 lib/layouts/theorems-starred.inc:55
+#: lib/layouts/theorems-order.inc:16 lib/layouts/theorems-starred.inc:57
 msgid "Corollary*"
 msgstr "Corollary*"
 
 #: lib/layouts/foils.layout:313 lib/layouts/siamltex.layout:286
-#: lib/layouts/theorems-order.inc:28 lib/layouts/theorems-starred.inc:77
+#: lib/layouts/theorems-order.inc:28 lib/layouts/theorems-starred.inc:81
 msgid "Proposition*"
 msgstr "Proposition*"
 
 #: lib/layouts/foils.layout:316 lib/layouts/siamltex.layout:289
-#: lib/layouts/theorems-starred.inc:80
+#: lib/layouts/theorems-starred.inc:84
 msgid "Proposition."
 msgstr "Proposition."
 
 #: lib/layouts/foils.layout:320 lib/layouts/siamltex.layout:292
-#: lib/layouts/theorems-order.inc:40 lib/layouts/theorems-starred.inc:110
+#: lib/layouts/theorems-order.inc:40 lib/layouts/theorems-starred.inc:117
 msgid "Definition*"
 msgstr "Definition*"
 
@@ -5490,7 +5486,7 @@ msgstr "文字："
 #: lib/layouts/g-brief-de.layout:35 lib/layouts/g-brief-en.layout:35
 #: lib/layouts/g-brief2.layout:58 lib/layouts/scrlettr.layout:112
 #: lib/layouts/scrlttr2.layout:143 lib/layouts/agu_stdtitle.inc:184
-#: src/mathed/MathMacroTemplate.cpp:424
+#: src/mathed/MathMacroTemplate.cpp:480
 msgid "Name"
 msgstr "名字"
 
@@ -5776,7 +5772,7 @@ msgstr "PostalComment:"
 #: lib/layouts/g-brief-en.layout:192 lib/layouts/g-brief2.layout:811
 #: lib/layouts/revtex.layout:108 lib/layouts/revtex4.layout:125
 #: lib/layouts/scrlettr.layout:163 lib/layouts/scrlttr2.layout:241
-#: lib/layouts/amsdefs.inc:82
+#: lib/layouts/amsdefs.inc:85
 msgid "Date:"
 msgstr "日期："
 
@@ -6120,10 +6116,6 @@ msgstr "INTERCUT WITH:"
 msgid "FADE OUT"
 msgstr "FADE OUT"
 
-#: lib/layouts/hollywood.layout:280
-msgid "General"
-msgstr "常规"
-
 #: lib/layouts/hollywood.layout:293
 msgid "Scene"
 msgstr "Scene"
@@ -6161,7 +6153,7 @@ msgstr "Example \\arabic{example}."
 #: lib/layouts/ijmpc.layout:180 lib/layouts/ijmpd.layout:178
 #, fuzzy
 msgid "Remark \\theremark."
-msgstr "Remark \\arabic{theorem}"
+msgstr "Remark \\arabic{remark}."
 
 #: lib/layouts/ijmpc.layout:190 lib/layouts/ijmpd.layout:189
 #, fuzzy
@@ -6169,7 +6161,7 @@ msgid "Notation \\thenotation."
 msgstr "Notation \\arabic{notation}."
 
 #: lib/layouts/ijmpc.layout:206 lib/layouts/ijmpd.layout:209
-#: lib/layouts/theorems.inc:41 lib/layouts/theorems-ams.inc:41
+#: lib/layouts/theorems.inc:42 lib/layouts/theorems-ams.inc:42
 #, fuzzy
 msgid "Theorem \\thetheorem."
 msgstr "Theorem \\arabic{theorem}."
@@ -6182,7 +6174,7 @@ msgstr "Corollary \\arabic{corollary}."
 #: lib/layouts/ijmpc.layout:250 lib/layouts/ijmpd.layout:255
 #, fuzzy
 msgid "Lemma \\thelemma."
-msgstr "Lemma \\arabic{theorem}"
+msgstr "Lemma \\arabic{lemma}."
 
 #: lib/layouts/ijmpc.layout:260 lib/layouts/ijmpd.layout:266
 #, fuzzy
@@ -6211,7 +6203,7 @@ msgstr "Question \\arabic{question}."
 #: lib/layouts/ijmpc.layout:290 lib/layouts/ijmpd.layout:299
 #, fuzzy
 msgid "Claim \\theclaim."
-msgstr "Claim \\arabic{theorem}"
+msgstr "Claim \\arabic{claim}."
 
 #: lib/layouts/ijmpc.layout:300 lib/layouts/ijmpd.layout:310
 #, fuzzy
@@ -6334,7 +6326,7 @@ msgstr "电子邮件:"
 #: lib/layouts/llncs.layout:39 lib/layouts/memoir.layout:51
 #: lib/layouts/scrbook.layout:16 lib/layouts/agu_stdsections.inc:21
 #: lib/layouts/db_stdsections.inc:20 lib/layouts/scrclass.inc:54
-#: lib/layouts/stdsections.inc:35
+#: lib/layouts/stdsections.inc:36
 msgid "Chapter"
 msgstr "章"
 
@@ -6371,7 +6363,7 @@ msgid "Case #."
 msgstr "Case #."
 
 #: lib/layouts/llncs.layout:305 lib/layouts/svjour.inc:359
-#: lib/layouts/theorems-starred.inc:184
+#: lib/layouts/theorems-starred.inc:196
 msgid "Claim."
 msgstr "Claim."
 
@@ -6557,7 +6549,7 @@ msgstr "Preprint"
 msgid "AltAffiliation"
 msgstr "AltAffiliation"
 
-#: lib/layouts/revtex4.layout:174 lib/layouts/amsdefs.inc:171
+#: lib/layouts/revtex4.layout:174 lib/layouts/amsdefs.inc:176
 msgid "Thanks:"
 msgstr "鸣谢:"
 
@@ -6827,7 +6819,7 @@ msgid "."
 msgstr "."
 
 #: lib/layouts/siamltex.layout:102 lib/layouts/aguplus.inc:66
-#: lib/layouts/db_stdstarsections.inc:72 lib/layouts/stdstarsections.inc:62
+#: lib/layouts/db_stdstarsections.inc:72 lib/layouts/stdstarsections.inc:67
 msgid "Paragraph*"
 msgstr "段落*"
 
@@ -6927,7 +6919,7 @@ msgstr "姓"
 msgid "Literal"
 msgstr "Literal"
 
-#: lib/layouts/agu_stdclass.inc:110 src/frontends/qt4/GuiCharacter.cpp:140
+#: lib/layouts/agu_stdclass.inc:110 src/frontends/qt4/GuiCharacter.cpp:68
 msgid "Emph"
 msgstr "强调"
 
@@ -7259,43 +7251,43 @@ msgstr "Table Caption"
 msgid "TableCaption"
 msgstr "TableCaption"
 
-#: lib/layouts/amsdefs.inc:138
+#: lib/layouts/amsdefs.inc:143
 msgid "Current Address"
 msgstr "Current Address"
 
-#: lib/layouts/amsdefs.inc:141
+#: lib/layouts/amsdefs.inc:146
 msgid "Current address:"
 msgstr "Current address:"
 
-#: lib/layouts/amsdefs.inc:149
+#: lib/layouts/amsdefs.inc:154
 msgid "E-mail address:"
 msgstr "电子邮件地址："
 
-#: lib/layouts/amsdefs.inc:164
+#: lib/layouts/amsdefs.inc:169
 msgid "Key words and phrases:"
 msgstr "Key words and phrases:"
 
-#: lib/layouts/amsdefs.inc:175
+#: lib/layouts/amsdefs.inc:180
 msgid "Dedicatory"
 msgstr "Dedicatory"
 
-#: lib/layouts/amsdefs.inc:178 lib/layouts/svjour.inc:125
+#: lib/layouts/amsdefs.inc:183 lib/layouts/svjour.inc:125
 msgid "Dedication:"
 msgstr "Dedication:"
 
-#: lib/layouts/amsdefs.inc:182
+#: lib/layouts/amsdefs.inc:187
 msgid "Translator"
 msgstr "翻译者"
 
-#: lib/layouts/amsdefs.inc:185
+#: lib/layouts/amsdefs.inc:190
 msgid "Translator:"
 msgstr "翻译人员："
 
-#: lib/layouts/amsdefs.inc:189
+#: lib/layouts/amsdefs.inc:194
 msgid "Subjectclass"
 msgstr "Subjectclass"
 
-#: lib/layouts/amsdefs.inc:192
+#: lib/layouts/amsdefs.inc:197
 #, fuzzy
 msgid "2000 Mathematics Subject Classification:"
 msgstr "1991 Mathematics Subject Classification:"
@@ -7331,11 +7323,11 @@ msgstr ""
 msgid "MenuChoice"
 msgstr ""
 
-#: lib/layouts/db_stdstarsections.inc:24 lib/layouts/stdstarsections.inc:22
+#: lib/layouts/db_stdstarsections.inc:24 lib/layouts/stdstarsections.inc:23
 msgid "Chapter*"
 msgstr "Chapter*"
 
-#: lib/layouts/db_stdstarsections.inc:84 lib/layouts/stdstarsections.inc:72
+#: lib/layouts/db_stdstarsections.inc:84 lib/layouts/stdstarsections.inc:78
 msgid "Subparagraph*"
 msgstr "Subparagraph*"
 
@@ -7469,7 +7461,7 @@ msgid "Dictum"
 msgstr "Dictum"
 
 #: lib/layouts/stdcharstyles.inc:10 lib/layouts/stdcustom.inc:10
-#: src/insets/InsetCollapsable.cpp:140
+#: src/insets/InsetCollapsable.cpp:134
 msgid "UNDEFINED"
 msgstr ""
 
@@ -7478,7 +7470,7 @@ msgstr ""
 msgid "\\Roman{part}"
 msgstr "Part \\Roman{part}"
 
-#: lib/layouts/stdinsets.inc:55 src/insets/InsetMarginal.cpp:63
+#: lib/layouts/stdinsets.inc:55 src/insets/InsetMarginal.cpp:51
 msgid "margin"
 msgstr "边框"
 
@@ -7486,12 +7478,11 @@ msgstr "边框"
 msgid "foot"
 msgstr "脚注"
 
-#: lib/layouts/stdinsets.inc:97 src/Color.cpp:113
+#: lib/layouts/stdinsets.inc:97
 msgid "comment"
 msgstr "注释"
 
-#: lib/layouts/stdinsets.inc:110 src/Color.cpp:111
-#: src/insets/InsetNote.cpp:296
+#: lib/layouts/stdinsets.inc:110 src/insets/InsetNote.cpp:289
 msgid "note"
 msgstr "记事"
 
@@ -7500,8 +7491,8 @@ msgstr "记事"
 msgid "greyedout"
 msgstr "灰度"
 
-#: lib/layouts/stdinsets.inc:134 src/insets/InsetERT.cpp:193
-#: src/insets/InsetERT.cpp:195
+#: lib/layouts/stdinsets.inc:134 src/insets/InsetERT.cpp:178
+#: src/insets/InsetERT.cpp:180
 msgid "ERT"
 msgstr "ERT"
 
@@ -7511,6 +7502,7 @@ msgid "Listings"
 msgstr "程序列表"
 
 #: lib/layouts/stdinsets.inc:180 lib/layouts/minimalistic.module:10
+#, fuzzy
 msgid "Idx"
 msgstr "Idx"
 
@@ -7518,25 +7510,25 @@ msgstr "Idx"
 msgid "opt"
 msgstr "选项"
 
-#: lib/layouts/stdlayouts.inc:64
+#: lib/layouts/stdlayouts.inc:67
 msgid "--Separator--"
 msgstr "分隔符："
 
-#: lib/layouts/stdlayouts.inc:72
+#: lib/layouts/stdlayouts.inc:76
 msgid "--- Separate Environment ---"
 msgstr "环境变量(&V)"
 
-#: lib/layouts/stdsections.inc:13
+#: lib/layouts/stdsections.inc:14
 #, fuzzy
 msgid "Part \\thepart"
 msgstr "Part \\Roman{part}"
 
-#: lib/layouts/stdsections.inc:37
+#: lib/layouts/stdsections.inc:39
 #, fuzzy
 msgid "Chapter \\thechapter"
 msgstr "Chapter \\arabic{chapter}"
 
-#: lib/layouts/stdsections.inc:38
+#: lib/layouts/stdsections.inc:40
 #, fuzzy
 msgid "Appendix \\thechapter"
 msgstr "Appendix \\Alph{chapter}"
@@ -7561,101 +7553,101 @@ msgstr "Offprints"
 msgid "Offprints:"
 msgstr "Offprints:"
 
-#: lib/layouts/theorems.inc:60 lib/layouts/theorems-ams.inc:61
+#: lib/layouts/theorems.inc:62 lib/layouts/theorems-ams.inc:63
 #, fuzzy
 msgid "Corollary \\thetheorem."
 msgstr "Corollary \\arabic{theorem}"
 
-#: lib/layouts/theorems.inc:71 lib/layouts/theorems-ams.inc:73
+#: lib/layouts/theorems.inc:73 lib/layouts/theorems-ams.inc:75
 #, fuzzy
 msgid "Lemma \\thetheorem."
 msgstr "Lemma \\arabic{theorem}"
 
-#: lib/layouts/theorems.inc:82 lib/layouts/theorems-ams.inc:85
+#: lib/layouts/theorems.inc:84 lib/layouts/theorems-ams.inc:87
 #, fuzzy
 msgid "Proposition \\thetheorem."
 msgstr "Proposition \\arabic{theorem}"
 
-#: lib/layouts/theorems.inc:93 lib/layouts/theorems-ams.inc:97
+#: lib/layouts/theorems.inc:95 lib/layouts/theorems-ams.inc:99
 #, fuzzy
 msgid "Conjecture \\thetheorem."
 msgstr "Conjecture \\arabic{theorem}"
 
-#: lib/layouts/theorems.inc:104 lib/layouts/theorems-ams.inc:109
+#: lib/layouts/theorems.inc:106 lib/layouts/theorems-ams.inc:111
 msgid "Fact \\thetheorem."
 msgstr ""
 
-#: lib/layouts/theorems.inc:115 lib/layouts/theorems-ams.inc:121
+#: lib/layouts/theorems.inc:117 lib/layouts/theorems-ams.inc:123
 #, fuzzy
 msgid "Definition \\thetheorem."
 msgstr "Definition \\arabic{theorem}"
 
-#: lib/layouts/theorems.inc:133 lib/layouts/theorems-ams.inc:139
+#: lib/layouts/theorems.inc:135 lib/layouts/theorems-ams.inc:141
 #, fuzzy
 msgid "Example \\thetheorem."
 msgstr "Example \\arabic{theorem}"
 
-#: lib/layouts/theorems.inc:144 lib/layouts/theorems-ams.inc:150
+#: lib/layouts/theorems.inc:147 lib/layouts/theorems-ams.inc:153
 #, fuzzy
 msgid "Problem \\thetheorem."
 msgstr "Problem \\arabic{theorem}"
 
-#: lib/layouts/theorems.inc:155 lib/layouts/theorems-ams.inc:161
+#: lib/layouts/theorems.inc:159 lib/layouts/theorems-ams.inc:165
 #, fuzzy
 msgid "Exercise \\thetheorem."
 msgstr "Exercise @Section@.\\arabic{theorem}."
 
-#: lib/layouts/theorems.inc:167 lib/layouts/theorems-ams.inc:173
+#: lib/layouts/theorems.inc:172 lib/layouts/theorems-ams.inc:178
 #, fuzzy
 msgid "Remark \\thetheorem."
 msgstr "Remark \\arabic{theorem}"
 
-#: lib/layouts/theorems.inc:186 lib/layouts/theorems-ams.inc:192
+#: lib/layouts/theorems.inc:191 lib/layouts/theorems-ams.inc:197
 #, fuzzy
 msgid "Claim \\thetheorem."
 msgstr "Claim \\arabic{theorem}"
 
-#: lib/layouts/theorems-order.inc:34 lib/layouts/theorems-starred.inc:88
+#: lib/layouts/theorems-order.inc:34 lib/layouts/theorems-starred.inc:93
 msgid "Conjecture*"
 msgstr "Conjecture*"
 
-#: lib/layouts/theorems-order.inc:46 lib/layouts/theorems-starred.inc:129
+#: lib/layouts/theorems-order.inc:46 lib/layouts/theorems-starred.inc:137
 msgid "Example*"
 msgstr "Example*"
 
-#: lib/layouts/theorems-order.inc:52 lib/layouts/theorems-starred.inc:140
+#: lib/layouts/theorems-order.inc:52 lib/layouts/theorems-starred.inc:149
 msgid "Problem*"
 msgstr "问题*"
 
-#: lib/layouts/theorems-order.inc:58 lib/layouts/theorems-starred.inc:151
+#: lib/layouts/theorems-order.inc:58 lib/layouts/theorems-starred.inc:161
 msgid "Exercise*"
 msgstr "练习*"
 
-#: lib/layouts/theorems-order.inc:64 lib/layouts/theorems-starred.inc:162
+#: lib/layouts/theorems-order.inc:64 lib/layouts/theorems-starred.inc:173
 msgid "Remark*"
 msgstr "Remark*"
 
-#: lib/layouts/theorems-order.inc:70 lib/layouts/theorems-starred.inc:181
+#: lib/layouts/theorems-order.inc:70 lib/layouts/theorems-starred.inc:193
 msgid "Claim*"
 msgstr "Claim*"
 
-#: lib/layouts/theorems-starred.inc:91
+#: lib/layouts/theorems-starred.inc:96
 msgid "Conjecture."
 msgstr "Conjecture."
 
-#: lib/layouts/theorems-starred.inc:99
+#: lib/layouts/theorems-starred.inc:105
 msgid "Fact*"
 msgstr "Fact*"
 
-#: lib/layouts/theorems-starred.inc:143
+#: lib/layouts/theorems-starred.inc:152
 msgid "Problem."
 msgstr "问题."
 
-#: lib/layouts/theorems-starred.inc:154
+#: lib/layouts/theorems-starred.inc:164
 msgid "Exercise."
 msgstr "练习."
 
-#: lib/layouts/theorems-starred.inc:165
+#: lib/layouts/theorems-starred.inc:176
 msgid "Remark."
 msgstr "Remark."
 
@@ -7676,7 +7668,7 @@ msgstr "LaTeX缺省设置"
 #: lib/layouts/braille.module:34 lib/layouts/braille.module:56
 #, fuzzy
 msgid "Braille:"
-msgstr "现有分支(&A)"
+msgstr "较小"
 
 #: lib/layouts/braille.module:42
 msgid "Braille (textsize)"
@@ -7717,7 +7709,7 @@ msgstr ""
 #: lib/layouts/endnotes.module:2
 #, fuzzy
 msgid "Endnote"
-msgstr "Headnote"
+msgstr "记事"
 
 #: lib/layouts/endnotes.module:6
 msgid ""
@@ -7752,9 +7744,8 @@ msgid "Adds an environment for hanging paragraphs."
 msgstr "无法索引多于一段落"
 
 #: lib/layouts/linguistics.module:2
-#, fuzzy
 msgid "Linguistics"
-msgstr "程序列表"
+msgstr ""
 
 #: lib/layouts/linguistics.module:6
 msgid ""
@@ -7993,7 +7984,7 @@ msgstr ""
 #: lib/layouts/theorems-ams-extended.module:237
 #, fuzzy
 msgid "Assumption \\thetheorem."
-msgstr "Notation @Section@.\\arabic{theorem}."
+msgstr "Axiom @Section@.\\arabic{theorem}."
 
 #: lib/layouts/theorems-ams-extended.module:245
 msgid "Assumption*"
@@ -8077,7 +8068,7 @@ msgstr "A-M|阿拉伯语(埃及)"
 msgid "Arabic (Arabi)"
 msgstr "A-M|阿拉伯语(埃及)"
 
-#: lib/languages:8 src/frontends/qt4/GuiSymbols.cpp:58
+#: lib/languages:8 src/frontends/qt4/GuiSymbols.cpp:59
 msgid "Armenian"
 msgstr "亚美尼亚语"
 
@@ -8194,11 +8185,11 @@ msgid "German (new spelling)"
 msgstr "德语 (新拼写)"
 
 #: lib/languages:40 lib/ui/stdtoolbars.inc:461
-#: src/frontends/qt4/GuiSymbols.cpp:56
+#: src/frontends/qt4/GuiSymbols.cpp:57
 msgid "Greek"
 msgstr "希腊文"
 
-#: lib/languages:41 src/frontends/qt4/GuiSymbols.cpp:59
+#: lib/languages:41 src/frontends/qt4/GuiSymbols.cpp:60
 msgid "Hebrew"
 msgstr "希伯来文"
 
@@ -8316,7 +8307,7 @@ msgstr "西班牙语"
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: lib/languages:75 src/frontends/qt4/GuiSymbols.cpp:70
+#: lib/languages:75 src/frontends/qt4/GuiSymbols.cpp:71
 msgid "Thai"
 msgstr "泰文"
 
@@ -8500,7 +8491,7 @@ msgstr "同义词..."
 #: lib/ui/classic.ui:106
 #, fuzzy
 msgid "Statistics...|i"
-msgstr "首选项(S)...|S"
+msgstr "状态"
 
 #: lib/ui/classic.ui:107 lib/ui/stdmenus.inc:505
 msgid "Check TeX|h"
@@ -8886,7 +8877,7 @@ msgstr "菜单分隔(M)|M"
 msgid "Horizontal Line"
 msgstr "水平线"
 
-#: lib/ui/classic.ui:261 src/insets/InsetNewpage.h:67
+#: lib/ui/classic.ui:261 src/insets/InsetNewpage.h:61
 msgid "Page Break"
 msgstr "换页"
 
@@ -9252,18 +9243,18 @@ msgstr "关闭窗口(d)|d"
 msgid "Redo|R"
 msgstr "重作(R)|R"
 
-#: lib/ui/stdmenus.inc:88 lib/ui/stdtoolbars.inc:66 src/Text3.cpp:968
-#: src/mathed/InsetMathNest.cpp:471
+#: lib/ui/stdmenus.inc:88 lib/ui/stdtoolbars.inc:66 src/Text3.cpp:944
+#: src/mathed/InsetMathNest.cpp:470
 msgid "Cut"
 msgstr "剪切"
 
-#: lib/ui/stdmenus.inc:89 lib/ui/stdtoolbars.inc:67 src/Text3.cpp:973
-#: src/mathed/InsetMathNest.cpp:479
+#: lib/ui/stdmenus.inc:89 lib/ui/stdtoolbars.inc:67 src/Text3.cpp:949
+#: src/mathed/InsetMathNest.cpp:478
 msgid "Copy"
 msgstr "复制"
 
-#: lib/ui/stdmenus.inc:90 lib/ui/stdtoolbars.inc:68 src/Text3.cpp:928
-#: src/mathed/InsetMathGrid.cpp:1247 src/mathed/InsetMathNest.cpp:451
+#: lib/ui/stdmenus.inc:90 lib/ui/stdtoolbars.inc:68 src/Text3.cpp:904
+#: src/mathed/InsetMathGrid.cpp:1247 src/mathed/InsetMathNest.cpp:450
 msgid "Paste"
 msgstr "粘贴"
 
@@ -9866,7 +9857,7 @@ msgstr "同义词(T)...|T"
 #: lib/ui/stdmenus.inc:504
 #, fuzzy
 msgid "Statistics...|a"
-msgstr "首选项(S)...|S"
+msgstr "状态"
 
 #: lib/ui/stdmenus.inc:506
 msgid "TeX Information|I"
@@ -9877,6 +9868,30 @@ msgstr "TeX信息"
 msgid "Shortcuts|S"
 msgstr "快捷键(&h)"
 
+#: lib/ui/stdmenus.inc:538
+#, fuzzy
+msgid "Equation Label|L"
+msgstr "跳至标记(L)|L"
+
+#: lib/ui/stdmenus.inc:539
+#, fuzzy
+msgid "Toggle Labeling/Numbering|T"
+msgstr "加减公式数字(N)|N"
+
+#: lib/ui/stdmenus.inc:547 lib/ui/stdmenus.inc:555
+#, fuzzy
+msgid "Next Cross-Reference|N"
+msgstr "下一交叉引用(R)|R"
+
+#: lib/ui/stdmenus.inc:548
+#, fuzzy
+msgid "Go to Label|G"
+msgstr "跳至标记(L)|L"
+
+#: lib/ui/stdmenus.inc:556
+msgid "Go back to Reference|G"
+msgstr ""
+
 #: lib/ui/stdtoolbars.inc:57
 msgid "New document"
 msgstr "新建文档"
@@ -9897,11 +9912,11 @@ msgstr "打印文档"
 msgid "Check spelling"
 msgstr "拼写检查"
 
-#: lib/ui/stdtoolbars.inc:64 src/BufferView.cpp:981
+#: lib/ui/stdtoolbars.inc:64 src/BufferView.cpp:988
 msgid "Undo"
 msgstr "撤消"
 
-#: lib/ui/stdtoolbars.inc:65 src/BufferView.cpp:990
+#: lib/ui/stdtoolbars.inc:65 src/BufferView.cpp:997
 msgid "Redo"
 msgstr "重做"
 
@@ -10270,7 +10285,7 @@ msgid "Fractions"
 msgstr "分数"
 
 #: lib/ui/stdtoolbars.inc:216 lib/ui/stdtoolbars.inc:308
-#: src/frontends/qt4/GuiDocument.cpp:961
+#: src/frontends/qt4/GuiDocument.cpp:973
 msgid "Fonts"
 msgstr "字体"
 
@@ -10503,12 +10518,12 @@ msgstr ""
 #: lib/ui/stdtoolbars.inc:299
 #, fuzzy
 msgid "Unit fraction (km/h)\t\\unitfrac"
-msgstr "Text frac (amsmath)\t\\tfrac"
+msgstr "Nice\t\\nicefrac"
 
 #: lib/ui/stdtoolbars.inc:300
 #, fuzzy
 msgid "Unit fraction (20 km/h)\t\\unitfrac"
-msgstr "Text frac (amsmath)\t\\tfrac"
+msgstr "Nice\t\\nicefrac"
 
 #: lib/ui/stdtoolbars.inc:301
 #, fuzzy
@@ -10693,7 +10708,7 @@ msgstr "underleftrightarrow"
 msgid "underset"
 msgstr "underset"
 
-#: lib/ui/stdtoolbars.inc:355 src/frontends/qt4/GuiSymbols.cpp:84
+#: lib/ui/stdtoolbars.inc:355 src/frontends/qt4/GuiSymbols.cpp:85
 msgid "Arrows"
 msgstr "Fletxes"
 
@@ -12523,7 +12538,7 @@ msgstr ""
 "今天的日期.\n"
 "详情请参阅 'info date'\n"
 
-#: src/BiblioInfo.cpp:122 src/frontends/qt4/GuiDocument.cpp:1244
+#: src/BiblioInfo.cpp:122 src/frontends/qt4/GuiDocument.cpp:1276
 #, c-format
 msgid "%1$s and %2$s"
 msgstr "%1$s 和 %2$s"
@@ -12546,11 +12561,11 @@ msgstr "添加文献引用到目录(&T)"
 msgid "before"
 msgstr "之前"
 
-#: src/Buffer.cpp:220
+#: src/Buffer.cpp:225
 msgid "Disk Error: "
 msgstr ""
 
-#: src/Buffer.cpp:221
+#: src/Buffer.cpp:226
 #, fuzzy, c-format
 msgid ""
 "LyX could not create the temporary directory '%1$s' (Disk is full maybe?)"
@@ -12591,12 +12606,12 @@ msgstr "\\begin_header 缺失"
 msgid "\\begin_document is missing"
 msgstr "\\begin_document 缺失"
 
-#: src/Buffer.cpp:557 src/Buffer.cpp:563 src/BufferView.cpp:1079
-#: src/BufferView.cpp:1085
+#: src/Buffer.cpp:557 src/Buffer.cpp:563 src/BufferView.cpp:1086
+#: src/BufferView.cpp:1092
 msgid "Changes not shown in LaTeX output"
 msgstr "改变项没有输出至LaTeX输出"
 
-#: src/Buffer.cpp:558 src/BufferView.cpp:1080
+#: src/Buffer.cpp:558 src/BufferView.cpp:1087
 msgid ""
 "Changes will not be highlighted in LaTeX output, because neither dvipost nor "
 "xcolor/soul are installed.\n"
@@ -12608,7 +12623,7 @@ msgstr ""
 "Please install these packages or redefine \\lyxadded and \\lyxdeleted in the "
 "LaTeX preamble."
 
-#: src/Buffer.cpp:564 src/BufferView.cpp:1086
+#: src/Buffer.cpp:564 src/BufferView.cpp:1093
 msgid ""
 "Changes will not be highlighted in LaTeX output when using pdflatex, because "
 "xcolor and soul are not installed.\n"
@@ -12620,29 +12635,29 @@ msgstr ""
 "Please install both packages or redefine \\lyxadded and \\lyxdeleted in the "
 "LaTeX preamble."
 
-#: src/Buffer.cpp:715 src/Buffer.cpp:724
+#: src/Buffer.cpp:719 src/Buffer.cpp:728
 msgid "Document could not be read"
 msgstr "无法读取文件"
 
-#: src/Buffer.cpp:716 src/Buffer.cpp:725
+#: src/Buffer.cpp:720 src/Buffer.cpp:729
 #, c-format
 msgid "%1$s could not be read."
 msgstr "无法读取 %1$s"
 
-#: src/Buffer.cpp:733 src/Buffer.cpp:816
+#: src/Buffer.cpp:737 src/Buffer.cpp:820
 msgid "Document format failure"
 msgstr "文档格式错误"
 
-#: src/Buffer.cpp:734
+#: src/Buffer.cpp:738
 #, c-format
 msgid "%1$s is not a LyX document."
 msgstr "%1$s 不是LyX文档"
 
-#: src/Buffer.cpp:771
+#: src/Buffer.cpp:775
 msgid "Conversion failed"
 msgstr "转换出错"
 
-#: src/Buffer.cpp:772
+#: src/Buffer.cpp:776
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but a temporary file for converting "
@@ -12651,11 +12666,11 @@ msgstr ""
 "%1$s is from a different version of LyX, but a temporary file for converting "
 "it could not be created."
 
-#: src/Buffer.cpp:781
+#: src/Buffer.cpp:785
 msgid "Conversion script not found"
 msgstr "未找到转换脚本"
 
-#: src/Buffer.cpp:782
+#: src/Buffer.cpp:786
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but the conversion script lyx2lyx "
@@ -12664,11 +12679,11 @@ msgstr ""
 "%1$s is from a different version of LyX, but the conversion script lyx2lyx "
 "could not be found."
 
-#: src/Buffer.cpp:801
+#: src/Buffer.cpp:805
 msgid "Conversion script failed"
 msgstr "转换脚本执行出错"
 
-#: src/Buffer.cpp:802
+#: src/Buffer.cpp:806
 #, c-format
 msgid ""
 "%1$s is from a different version of LyX, but the lyx2lyx script failed to "
@@ -12677,16 +12692,16 @@ msgstr ""
 "%1$s is from a different version of LyX, but the lyx2lyx script failed to "
 "convert it."
 
-#: src/Buffer.cpp:817
+#: src/Buffer.cpp:821
 #, c-format
 msgid "%1$s ended unexpectedly, which means that it is probably corrupted."
 msgstr "%1$s 非正常结束，它可能是无效的"
 
-#: src/Buffer.cpp:850
+#: src/Buffer.cpp:854
 msgid "Backup failure"
 msgstr "备份失败"
 
-#: src/Buffer.cpp:851
+#: src/Buffer.cpp:855
 #, c-format
 msgid ""
 "Cannot create backup file %1$s.\n"
@@ -12695,7 +12710,7 @@ msgstr ""
 "Cannot create backup file %1$s.\n"
 "Please check whether the directory exists and is writeable."
 
-#: src/Buffer.cpp:861
+#: src/Buffer.cpp:865
 #, fuzzy, c-format
 msgid ""
 "Document %1$s has been externally modified. Are you sure you want to "
@@ -12704,59 +12719,58 @@ msgstr ""
 "文件 %1 已经存在\n"
 "您要覆盖它吗？"
 
-#: src/Buffer.cpp:863
+#: src/Buffer.cpp:867
 #, fuzzy
 msgid "Overwrite modified file?"
 msgstr "覆盖文件吗？"
 
-#: src/Buffer.cpp:864 src/EmbeddedFiles.cpp:164 src/EmbeddedFiles.cpp:226
-#: src/Exporter.cpp:49 src/LyXFunc.cpp:1024
-#: src/frontends/qt4/GuiClipboard.cpp:277 src/frontends/qt4/GuiView.cpp:1364
-#: src/frontends/qt4/GuiView.cpp:1546
+#: src/Buffer.cpp:868 src/EmbeddedFiles.cpp:173 src/EmbeddedFiles.cpp:235
+#: src/Exporter.cpp:49 src/LyXFunc.cpp:1014
+#: src/frontends/qt4/GuiClipboard.cpp:277 src/frontends/qt4/GuiView.cpp:1326
+#: src/frontends/qt4/GuiView.cpp:1507
 msgid "&Overwrite"
 msgstr "覆盖(&O)"
 
-#: src/Buffer.cpp:895
+#: src/Buffer.cpp:899
 #, c-format
 msgid "Saving document %1$s..."
 msgstr "保存文件 %1$s..."
 
-#: src/Buffer.cpp:908
+#: src/Buffer.cpp:912
 #, fuzzy
 msgid " could not write file!."
 msgstr "无法读取文件"
 
-#: src/Buffer.cpp:915
-#, fuzzy
+#: src/Buffer.cpp:919
 msgid " writing embedded files!."
-msgstr "表格列表"
+msgstr ""
 
-#: src/Buffer.cpp:919
+#: src/Buffer.cpp:923
 #, fuzzy
 msgid " could not write embedded files!."
 msgstr "无法读取文件"
 
-#: src/Buffer.cpp:924
+#: src/Buffer.cpp:928
 msgid " done."
 msgstr "完成。"
 
-#: src/Buffer.cpp:1003
+#: src/Buffer.cpp:1007
 msgid "Iconv software exception Detected"
 msgstr ""
 
-#: src/Buffer.cpp:1003
+#: src/Buffer.cpp:1007
 #, c-format
 msgid ""
 "Please verify that the support software for your encoding (%1$s) is properly "
 "installed"
 msgstr ""
 
-#: src/Buffer.cpp:1025
+#: src/Buffer.cpp:1029
 #, c-format
 msgid "Could not find LaTeX command for character '%1$s' (code point %2$s)"
 msgstr ""
 
-#: src/Buffer.cpp:1028
+#: src/Buffer.cpp:1032
 msgid ""
 "Some characters of your document are probably not representable in the "
 "chosen encoding.\n"
@@ -12766,87 +12780,87 @@ msgstr ""
 "chosen encoding.\n"
 "Changing the document encoding to utf8 could help."
 
-#: src/Buffer.cpp:1035
+#: src/Buffer.cpp:1039
 #, fuzzy
 msgid "iconv conversion failed"
 msgstr "转换出错"
 
-#: src/Buffer.cpp:1040
+#: src/Buffer.cpp:1044
 #, fuzzy
 msgid "conversion failed"
 msgstr "转换出错"
 
-#: src/Buffer.cpp:1309
+#: src/Buffer.cpp:1313
 msgid "Running chktex..."
 msgstr "执行 chktex..."
 
-#: src/Buffer.cpp:1322
+#: src/Buffer.cpp:1326
 msgid "chktex failure"
 msgstr "chktex执行出错"
 
-#: src/Buffer.cpp:1323
+#: src/Buffer.cpp:1327
 msgid "Could not run chktex successfully."
 msgstr "无法正确执行chktex"
 
-#: src/Buffer.cpp:2115
+#: src/Buffer.cpp:2139
 msgid "Preview source code"
 msgstr "预览源文件"
 
-#: src/Buffer.cpp:2128
+#: src/Buffer.cpp:2151
 #, fuzzy, c-format
 msgid "Preview source code for paragraph %1$d"
 msgstr "预览段落 %1$s 之源代码"
 
-#: src/Buffer.cpp:2132
+#: src/Buffer.cpp:2155
 #, c-format
 msgid "Preview source code from paragraph %1$s to %2$s"
 msgstr "预览段落  %1$s 至  %2$s 段落之源代码"
 
-#: src/Buffer.cpp:2231
+#: src/Buffer.cpp:2254
 #, c-format
 msgid "Auto-saving %1$s"
 msgstr "自动保存 %1$s"
 
-#: src/Buffer.cpp:2275
+#: src/Buffer.cpp:2298
 msgid "Autosave failed!"
 msgstr "自动保存失败!"
 
-#: src/Buffer.cpp:2298
+#: src/Buffer.cpp:2321
 msgid "Autosaving current document..."
 msgstr "自动保存当前文档..."
 
-#: src/Buffer.cpp:2392
+#: src/Buffer.cpp:2369
 msgid "Couldn't export file"
 msgstr "无法导出文件"
 
-#: src/Buffer.cpp:2393
+#: src/Buffer.cpp:2370
 #, c-format
 msgid "No information for exporting the format %1$s."
 msgstr "无导出格式 %1$s 的信息."
 
-#: src/Buffer.cpp:2430
+#: src/Buffer.cpp:2407
 msgid "File name error"
 msgstr "文件名出错"
 
-#: src/Buffer.cpp:2431
+#: src/Buffer.cpp:2408
 msgid "The directory path to the document cannot contain spaces."
 msgstr "文档路径不能有空格"
 
-#: src/Buffer.cpp:2472
+#: src/Buffer.cpp:2449
 msgid "Document export cancelled."
 msgstr "取消导出文档"
 
-#: src/Buffer.cpp:2478
+#: src/Buffer.cpp:2455
 #, c-format
 msgid "Document exported as %1$s to file `%2$s'"
 msgstr "文档 %1$s 导出为 `%2$s'"
 
-#: src/Buffer.cpp:2484
+#: src/Buffer.cpp:2461
 #, c-format
 msgid "Document exported as %1$s"
 msgstr "文档导出为 %1$s"
 
-#: src/Buffer.cpp:2554
+#: src/Buffer.cpp:2531
 #, c-format
 msgid ""
 "The specified document\n"
@@ -12857,11 +12871,11 @@ msgstr ""
 "%1$s\n"
 "could not be read."
 
-#: src/Buffer.cpp:2556
+#: src/Buffer.cpp:2533
 msgid "Could not read document"
 msgstr "无法读取文档"
 
-#: src/Buffer.cpp:2566
+#: src/Buffer.cpp:2543
 #, c-format
 msgid ""
 "An emergency save of the document %1$s exists.\n"
@@ -12872,19 +12886,19 @@ msgstr ""
 "\n"
 "使用此紧急版本吧?"
 
-#: src/Buffer.cpp:2569
+#: src/Buffer.cpp:2546
 msgid "Load emergency save?"
 msgstr "读入紧急保存的版本吗"
 
-#: src/Buffer.cpp:2570
+#: src/Buffer.cpp:2547
 msgid "&Recover"
 msgstr "恢复(&R)"
 
-#: src/Buffer.cpp:2570
+#: src/Buffer.cpp:2547
 msgid "&Load Original"
 msgstr "读取原版本(&L)"
 
-#: src/Buffer.cpp:2590
+#: src/Buffer.cpp:2567
 #, c-format
 msgid ""
 "The backup of the document %1$s is newer.\n"
@@ -12895,49 +12909,56 @@ msgstr ""
 "\n"
 "读取备份版本?"
 
-#: src/Buffer.cpp:2593
+#: src/Buffer.cpp:2570
 msgid "Load backup?"
 msgstr "读取备份版本?"
 
-#: src/Buffer.cpp:2594
+#: src/Buffer.cpp:2571
 msgid "&Load backup"
 msgstr "读取备份(&L)"
 
-#: src/Buffer.cpp:2594
+#: src/Buffer.cpp:2571
 msgid "Load &original"
 msgstr "读取原版本(&o)"
 
-#: src/Buffer.cpp:2627
+#: src/Buffer.cpp:2604
 #, c-format
 msgid "Do you want to retrieve the document %1$s from version control?"
 msgstr "您希望从版本控制程序中读取文档 %1$s 吗?"
 
-#: src/Buffer.cpp:2629
+#: src/Buffer.cpp:2606
 msgid "Retrieve from version control?"
 msgstr "从版本控制程序中读取文档?"
 
-#: src/Buffer.cpp:2630
+#: src/Buffer.cpp:2607
 msgid "&Retrieve"
 msgstr "获取(&R)"
 
+#: src/BufferList.cpp:218
+#, fuzzy
+msgid "No file open!"
+msgstr "未找到文件!"
+
 #: src/BufferList.cpp:228
-#, c-format
-msgid "LyX: Attempting to save document %1$s"
+#, fuzzy, c-format
+msgid "LyX: Attempting to save document %1$s\n"
 msgstr "LyX: 试图保存文档  %1$s"
 
-#: src/BufferList.cpp:239 src/BufferList.cpp:252 src/BufferList.cpp:266
-msgid "  Save seems successful. Phew."
+#: src/BufferList.cpp:238 src/BufferList.cpp:251 src/BufferList.cpp:265
+#, fuzzy
+msgid "  Save seems successful. Phew.\n"
 msgstr " 成功保存文档。"
 
-#: src/BufferList.cpp:242 src/BufferList.cpp:256
-msgid "  Save failed! Trying..."
+#: src/BufferList.cpp:241 src/BufferList.cpp:255
+#, fuzzy
+msgid "  Save failed! Trying...\n"
 msgstr "  保存文档失败! 努力中..."
 
 #: src/BufferList.cpp:269
 msgid "  Save failed! Bummer. Document is lost."
 msgstr "  保存文件失败! 文档丢失."
 
-#: src/BufferParams.cpp:488
+#: src/BufferParams.cpp:484
 #, c-format
 msgid ""
 "The layout file requested by this document,\n"
@@ -12954,15 +12975,28 @@ msgstr ""
 "available. See the Customization documentation\n"
 "for more information.\n"
 
-#: src/BufferParams.cpp:494
+#: src/BufferParams.cpp:490
 msgid "Document class not available"
 msgstr "未知文档类"
 
-#: src/BufferParams.cpp:495
+#: src/BufferParams.cpp:491
 msgid "LyX will not be able to produce output."
 msgstr "LyX将不能产生输出"
 
-#: src/BufferParams.cpp:1398
+#: src/BufferParams.cpp:1393
+#, fuzzy, c-format
+msgid "The document class %1$s could not be found."
+msgstr ""
+"The specified document\n"
+"%1$s\n"
+"could not be read."
+
+#: src/BufferParams.cpp:1395
+#, fuzzy
+msgid "Class not found"
+msgstr "文件没有找到"
+
+#: src/BufferParams.cpp:1405
 #, fuzzy, c-format
 msgid "The document class %1$s could not be loaded."
 msgstr ""
@@ -12970,12 +13004,12 @@ msgstr ""
 "%1$s\n"
 "could not be read."
 
-#: src/BufferParams.cpp:1400 src/LyXFunc.cpp:735
+#: src/BufferParams.cpp:1407 src/LyXFunc.cpp:723
 #, fuzzy
 msgid "Could not load class"
 msgstr "无法改变文档类"
 
-#: src/BufferParams.cpp:1424
+#: src/BufferParams.cpp:1443
 #, c-format
 msgid ""
 "The module %1$s has been requested by\n"
@@ -12984,17 +13018,17 @@ msgid ""
 "probably need to reconfigure LyX.\n"
 msgstr ""
 
-#: src/BufferParams.cpp:1428
+#: src/BufferParams.cpp:1447
 #, fuzzy
 msgid "Module not available"
 msgstr "未知文档类"
 
-#: src/BufferParams.cpp:1429
+#: src/BufferParams.cpp:1448
 #, fuzzy
 msgid "Some layouts may not be available."
 msgstr "未知文档类"
 
-#: src/BufferParams.cpp:1437
+#: src/BufferParams.cpp:1456
 #, c-format
 msgid ""
 "The module %1$s requires a package that is\n"
@@ -13002,115 +13036,115 @@ msgid ""
 "may not be possible.\n"
 msgstr ""
 
-#: src/BufferParams.cpp:1440
+#: src/BufferParams.cpp:1459
 #, fuzzy
 msgid "Package not available"
 msgstr "未知文档类"
 
-#: src/BufferParams.cpp:1445
+#: src/BufferParams.cpp:1464
 #, c-format
 msgid "Error reading module %1$s\n"
 msgstr ""
 
-#: src/BufferParams.cpp:1446
+#: src/BufferParams.cpp:1465
 #, fuzzy
 msgid "Read Error"
 msgstr "搜索出错"
 
-#: src/BufferView.cpp:174
+#: src/BufferView.cpp:175
 msgid "No more insets"
 msgstr "无嵌入项"
 
-#: src/BufferView.cpp:651
+#: src/BufferView.cpp:663
 msgid "Save bookmark"
 msgstr "保存书签"
 
-#: src/BufferView.cpp:984
+#: src/BufferView.cpp:991
 msgid "No further undo information"
 msgstr "无进一步恢复信息"
 
-#: src/BufferView.cpp:993
+#: src/BufferView.cpp:1000
 msgid "No further redo information"
 msgstr "无进一步重做信息"
 
-#: src/BufferView.cpp:1126 src/lyxfind.cpp:295 src/lyxfind.cpp:313
+#: src/BufferView.cpp:1133 src/lyxfind.cpp:295 src/lyxfind.cpp:313
 msgid "String not found!"
 msgstr "未找到搜索词"
 
-#: src/BufferView.cpp:1148
+#: src/BufferView.cpp:1155
 msgid "Mark off"
 msgstr "Mark off"
 
-#: src/BufferView.cpp:1155
+#: src/BufferView.cpp:1162
 msgid "Mark on"
 msgstr "Mark on"
 
-#: src/BufferView.cpp:1162
+#: src/BufferView.cpp:1169
 msgid "Mark removed"
 msgstr "Mark removed"
 
-#: src/BufferView.cpp:1165
+#: src/BufferView.cpp:1172
 msgid "Mark set"
 msgstr "Mark set"
 
-#: src/BufferView.cpp:1212
+#: src/BufferView.cpp:1219
 msgid "Statistics for the selection:"
 msgstr ""
 
-#: src/BufferView.cpp:1214
+#: src/BufferView.cpp:1221
 #, fuzzy
 msgid "Statistics for the document:"
 msgstr "切换至已读取文档(&S)"
 
-#: src/BufferView.cpp:1217
+#: src/BufferView.cpp:1224
 #, fuzzy, c-format
 msgid "%1$d words"
 msgstr "已检查 %1$d 单词."
 
-#: src/BufferView.cpp:1219
+#: src/BufferView.cpp:1226
 #, fuzzy
 msgid "One word"
 msgstr "密码"
 
-#: src/BufferView.cpp:1222
+#: src/BufferView.cpp:1229
 #, c-format
 msgid "%1$d characters (including blanks)"
 msgstr ""
 
-#: src/BufferView.cpp:1225
+#: src/BufferView.cpp:1232
 msgid "One character (including blanks)"
 msgstr ""
 
-#: src/BufferView.cpp:1228
+#: src/BufferView.cpp:1235
 #, c-format
 msgid "%1$d characters (excluding blanks)"
 msgstr ""
 
-#: src/BufferView.cpp:1231
+#: src/BufferView.cpp:1238
 msgid "One character (excluding blanks)"
 msgstr ""
 
-#: src/BufferView.cpp:1233
+#: src/BufferView.cpp:1240
 #, fuzzy
 msgid "Statistics"
 msgstr "状态"
 
-#: src/BufferView.cpp:1880
+#: src/BufferView.cpp:1902
 #, c-format
 msgid "Inserting document %1$s..."
 msgstr "插入文档 %1$s..."
 
-#: src/BufferView.cpp:1891
+#: src/BufferView.cpp:1913
 #, c-format
 msgid "Document %1$s inserted."
 msgstr "文档 %1$s 已插入"
 
-#: src/BufferView.cpp:1893
+#: src/BufferView.cpp:1915
 #, c-format
 msgid "Could not insert document %1$s"
 msgstr "无法插入文档 %1$s"
 
-#: src/BufferView.cpp:2119
+#: src/BufferView.cpp:2141
 #, c-format
 msgid ""
 "Could not read the specified document\n"
@@ -13121,26 +13155,26 @@ msgstr ""
 "%1$s\n"
 "错误信息: %2$s"
 
-#: src/BufferView.cpp:2121
+#: src/BufferView.cpp:2143
 msgid "Could not read file"
 msgstr "无法读取文件"
 
-#: src/BufferView.cpp:2128
+#: src/BufferView.cpp:2150
 #, fuzzy, c-format
 msgid ""
 "%1$s\n"
 " is not readable."
 msgstr "无法读取 %1$s"
 
-#: src/BufferView.cpp:2129 src/output.cpp:39
+#: src/BufferView.cpp:2151 src/output.cpp:39
 msgid "Could not open file"
 msgstr "无法打开文件"
 
-#: src/BufferView.cpp:2136
+#: src/BufferView.cpp:2158
 msgid "Reading not UTF-8 encoded file"
 msgstr "读入非UTF-8编码的文件"
 
-#: src/BufferView.cpp:2137
+#: src/BufferView.cpp:2159
 msgid ""
 "The file is not UTF-8 encoded.\n"
 "It will be read as local 8Bit-encoded.\n"
@@ -13232,16 +13266,27 @@ msgstr ""
 msgid "previewed snippet"
 msgstr "预览图"
 
+#: src/Color.cpp:111
+#, fuzzy
+msgid "note label"
+msgstr "脚注"
+
 #: src/Color.cpp:112
 msgid "note background"
 msgstr "记事项背景"
 
+#: src/Color.cpp:113
+#, fuzzy
+msgid "comment label"
+msgstr "注释"
+
 #: src/Color.cpp:114
 msgid "comment background"
 msgstr "注释背景"
 
 #: src/Color.cpp:115
-msgid "greyedout inset"
+#, fuzzy
+msgid "greyedout inset label"
 msgstr "灰度(greyedout)嵌入项"
 
 #: src/Color.cpp:116
@@ -13355,96 +13400,106 @@ msgid "Math macro blended out"
 msgstr "数学宏背景"
 
 #: src/Color.cpp:142
+#, fuzzy
+msgid "Math macro old parameter"
+msgstr "公式边框"
+
+#: src/Color.cpp:143
+#, fuzzy
+msgid "Math macro new parameter"
+msgstr "公式边框"
+
+#: src/Color.cpp:144
 msgid "caption frame"
 msgstr "标题框"
 
-#: src/Color.cpp:143
+#: src/Color.cpp:145
 msgid "collapsable inset text"
 msgstr "可折叠嵌入项文本"
 
-#: src/Color.cpp:144
+#: src/Color.cpp:146
 msgid "collapsable inset frame"
 msgstr "可折叠嵌入项边框"
 
-#: src/Color.cpp:145
+#: src/Color.cpp:147
 msgid "inset background"
 msgstr "嵌入项背景"
 
-#: src/Color.cpp:146
+#: src/Color.cpp:148
 msgid "inset frame"
 msgstr "嵌入项边框"
 
-#: src/Color.cpp:147
+#: src/Color.cpp:149
 msgid "LaTeX error"
 msgstr "LaTeX出错"
 
-#: src/Color.cpp:148
+#: src/Color.cpp:150
 msgid "end-of-line marker"
 msgstr "行尾标记"
 
-#: src/Color.cpp:149
+#: src/Color.cpp:151
 msgid "appendix marker"
 msgstr "附录标记"
 
-#: src/Color.cpp:150
+#: src/Color.cpp:152
 msgid "change bar"
 msgstr "change bar"
 
-#: src/Color.cpp:151
+#: src/Color.cpp:153
 msgid "Deleted text"
 msgstr "删除的文本"
 
-#: src/Color.cpp:152
+#: src/Color.cpp:154
 msgid "Added text"
 msgstr "添加的文本"
 
-#: src/Color.cpp:153
+#: src/Color.cpp:155
 msgid "added space markers"
 msgstr "added space markers"
 
-#: src/Color.cpp:154
+#: src/Color.cpp:156
 msgid "top/bottom line"
 msgstr "顶/底部边框"
 
-#: src/Color.cpp:155
+#: src/Color.cpp:157
 msgid "table line"
 msgstr "表格边框"
 
-#: src/Color.cpp:156
+#: src/Color.cpp:158
 msgid "table on/off line"
 msgstr "表格 on/off 边框"
 
-#: src/Color.cpp:158
+#: src/Color.cpp:160
 msgid "bottom area"
 msgstr "底部"
 
-#: src/Color.cpp:159
+#: src/Color.cpp:161
 #, fuzzy
 msgid "new page"
 msgstr "在页<页>"
 
-#: src/Color.cpp:160
+#: src/Color.cpp:162
 #, fuzzy
 msgid "page break / line break"
 msgstr "换页"
 
-#: src/Color.cpp:161
+#: src/Color.cpp:163
 msgid "frame of button"
 msgstr "按钮边框"
 
-#: src/Color.cpp:162
+#: src/Color.cpp:164
 msgid "button background"
 msgstr "按钮背景"
 
-#: src/Color.cpp:163
+#: src/Color.cpp:165
 msgid "button background under focus"
 msgstr "选中按钮背景"
 
-#: src/Color.cpp:164
+#: src/Color.cpp:166
 msgid "inherit"
 msgstr "inherit"
 
-#: src/Color.cpp:165
+#: src/Color.cpp:167
 msgid "ignore"
 msgstr "忽略"
 
@@ -13519,7 +13574,7 @@ msgstr "空白输出"
 msgid "An empty output file was generated."
 msgstr "产生了空白输出"
 
-#: src/CutAndPaste.cpp:420
+#: src/CutAndPaste.cpp:464
 #, c-format
 msgid ""
 "Layout had to be changed from\n"
@@ -13532,11 +13587,11 @@ msgstr ""
 "because of class conversion from\n"
 "%3$s to %4$s"
 
-#: src/CutAndPaste.cpp:425
+#: src/CutAndPaste.cpp:469
 msgid "Changed Layout"
 msgstr "改变的布局"
 
-#: src/CutAndPaste.cpp:445
+#: src/CutAndPaste.cpp:489
 #, fuzzy, c-format
 msgid ""
 "Flex inset %1$s is undefined because of class conversion from\n"
@@ -13545,42 +13600,42 @@ msgstr ""
 "Character style %1$s is undefined because of class conversion from\n"
 "%2$s to %3$s"
 
-#: src/CutAndPaste.cpp:452
+#: src/CutAndPaste.cpp:496
 #, fuzzy
 msgid "Undefined flex inset"
 msgstr "打开的文本嵌入项"
 
-#: src/EmbeddedFiles.cpp:149
+#: src/EmbeddedFiles.cpp:158
 #, fuzzy
 msgid "Failed to extract file"
 msgstr "选择外部文件"
 
-#: src/EmbeddedFiles.cpp:150
+#: src/EmbeddedFiles.cpp:159
 #, c-format
 msgid ""
 "Cannot extract file '%1$s'.\n"
 "Source file %2$s does not exist"
 msgstr ""
 
-#: src/EmbeddedFiles.cpp:162 src/frontends/qt4/GuiClipboard.cpp:275
+#: src/EmbeddedFiles.cpp:171 src/frontends/qt4/GuiClipboard.cpp:275
 #, fuzzy
 msgid "Overwrite external file?"
 msgstr "覆盖文件吗？"
 
-#: src/EmbeddedFiles.cpp:163
+#: src/EmbeddedFiles.cpp:172
 #, fuzzy, c-format
 msgid "External file %1$s already exists, do you want to overwrite it"
 msgstr ""
 "文件 %1 已经存在\n"
 "您要覆盖它吗？"
 
-#: src/EmbeddedFiles.cpp:175 src/EmbeddedFiles.cpp:187
-#: src/EmbeddedFiles.cpp:240
+#: src/EmbeddedFiles.cpp:184 src/EmbeddedFiles.cpp:196
+#: src/EmbeddedFiles.cpp:249
 #, fuzzy
 msgid "Copy file failure"
-msgstr "备份失败"
+msgstr "无法预览文件"
 
-#: src/EmbeddedFiles.cpp:176 src/EmbeddedFiles.cpp:340
+#: src/EmbeddedFiles.cpp:185 src/EmbeddedFiles.cpp:349
 #, fuzzy, c-format
 msgid ""
 "Cannot create file path '%1$s'.\n"
@@ -13589,8 +13644,8 @@ msgstr ""
 "Cannot create backup file %1$s.\n"
 "Please check whether the directory exists and is writeable."
 
-#: src/EmbeddedFiles.cpp:188 src/EmbeddedFiles.cpp:241
-#: src/EmbeddedFiles.cpp:353
+#: src/EmbeddedFiles.cpp:197 src/EmbeddedFiles.cpp:250
+#: src/EmbeddedFiles.cpp:362
 #, fuzzy, c-format
 msgid ""
 "Cannot copy file %1$s to %2$s.\n"
@@ -13599,12 +13654,12 @@ msgstr ""
 "Cannot create backup file %1$s.\n"
 "Please check whether the directory exists and is writeable."
 
-#: src/EmbeddedFiles.cpp:211
+#: src/EmbeddedFiles.cpp:220
 #, fuzzy
 msgid "Failed to embed file"
-msgstr "表格列表"
+msgstr "无法读取文件"
 
-#: src/EmbeddedFiles.cpp:212
+#: src/EmbeddedFiles.cpp:221
 #, fuzzy, c-format
 msgid ""
 "Failed to embed file %1$s.\n"
@@ -13613,76 +13668,73 @@ msgstr ""
 "Cannot create backup file %1$s.\n"
 "Please check whether the directory exists and is writeable."
 
-#: src/EmbeddedFiles.cpp:224
-#, fuzzy
+#: src/EmbeddedFiles.cpp:233
 msgid "Update embedded file?"
-msgstr "表格列表"
+msgstr ""
 
-#: src/EmbeddedFiles.cpp:225
+#: src/EmbeddedFiles.cpp:234
 #, fuzzy, c-format
 msgid "Embedded file %1$s already exists, do you want to overwrite it"
 msgstr ""
 "文件 %1 已经存在\n"
 "您要覆盖它吗？"
 
-#: src/EmbeddedFiles.cpp:339 src/EmbeddedFiles.cpp:352
+#: src/EmbeddedFiles.cpp:348 src/EmbeddedFiles.cpp:361
 #, fuzzy
 msgid "Sync file failure"
-msgstr "备份失败"
+msgstr "chktex执行出错"
 
-#: src/EmbeddedFiles.cpp:403
+#: src/EmbeddedFiles.cpp:412
 #, c-format
 msgid ""
 "%1$d external files are ignored.\n"
 "%2$d embeddable files are embedded.\n"
 msgstr ""
 
-#: src/EmbeddedFiles.cpp:405
+#: src/EmbeddedFiles.cpp:414
 #, fuzzy
 msgid "Packing all files"
 msgstr "打印所有页"
 
-#: src/EmbeddedFiles.cpp:407
+#: src/EmbeddedFiles.cpp:416
 #, c-format
 msgid ""
 "%1$d external files are ignored.\n"
 "%2$d embedded files are extracted.\n"
 msgstr ""
 
-#: src/EmbeddedFiles.cpp:409
+#: src/EmbeddedFiles.cpp:418
 msgid "Unpacking all files"
 msgstr ""
 
-#: src/EmbeddedFiles.cpp:426
+#: src/EmbeddedFiles.cpp:434
 msgid "Wrong embedding status."
 msgstr ""
 
-#: src/EmbeddedFiles.cpp:427
+#: src/EmbeddedFiles.cpp:435
 #, c-format
 msgid ""
 "File %1$s is included in more than one insets, but with different embedding "
 "status. Assuming embedding status."
 msgstr ""
 
-#: src/EmbeddedFiles.cpp:469
+#: src/EmbeddedFiles.cpp:477
 #, fuzzy
 msgid "Failed to write file"
-msgstr "无法读取文件"
+msgstr "覆盖文件吗？"
 
-#: src/EmbeddedFiles.cpp:470
-#, fuzzy, c-format
+#: src/EmbeddedFiles.cpp:478
+#, c-format
 msgid ""
 "Embedded file %1$s does not exist. Did you tamper lyx temporary directory?"
 msgstr ""
-"文件 %1 已经存在\n"
-"您要覆盖它吗？"
 
-#: src/EmbeddedFiles.cpp:486
+#: src/EmbeddedFiles.cpp:494
 #, fuzzy
 msgid "Save failure"
 msgstr "备份失败"
 
-#: src/EmbeddedFiles.cpp:487
+#: src/EmbeddedFiles.cpp:495
 #, fuzzy, c-format
 msgid ""
 "Cannot create file %1$s.\n"
@@ -13691,7 +13743,7 @@ msgstr ""
 "Cannot create backup file %1$s.\n"
 "Please check whether the directory exists and is writeable."
 
-#: src/Exporter.cpp:44 src/LyXFunc.cpp:1020
+#: src/Exporter.cpp:44 src/LyXFunc.cpp:1010
 #, fuzzy, c-format
 msgid ""
 "The file %1$s already exists.\n"
@@ -13701,7 +13753,7 @@ msgstr ""
 "文件 %1 已经存在\n"
 "您要覆盖它吗？"
 
-#: src/Exporter.cpp:47 src/LyXFunc.cpp:1023
+#: src/Exporter.cpp:47 src/LyXFunc.cpp:1013
 msgid "Overwrite file?"
 msgstr "覆盖文件吗？"
 
@@ -13722,20 +13774,20 @@ msgstr "无法复制文件"
 msgid "Copying %1$s to %2$s failed."
 msgstr "不能从 %1$s 复制到 %2$s."
 
-#: src/Font.cpp:48 src/frontends/qt4/GuiCharacter.cpp:250
-#: src/frontends/qt4/GuiDocument.cpp:2064
+#: src/Font.cpp:48 src/frontends/qt4/GuiCharacter.cpp:109
+#: src/frontends/qt4/GuiDocument.cpp:2113
 #: src/frontends/qt4/GuiListings.cpp:158
 msgid "Roman"
 msgstr "正体"
 
-#: src/Font.cpp:48 src/frontends/qt4/GuiCharacter.cpp:254
-#: src/frontends/qt4/GuiDocument.cpp:2064
+#: src/Font.cpp:48 src/frontends/qt4/GuiCharacter.cpp:110
+#: src/frontends/qt4/GuiDocument.cpp:2113
 #: src/frontends/qt4/GuiListings.cpp:158
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: src/Font.cpp:48 src/frontends/qt4/GuiCharacter.cpp:258
-#: src/frontends/qt4/GuiDocument.cpp:2064
+#: src/Font.cpp:48 src/frontends/qt4/GuiCharacter.cpp:111
+#: src/frontends/qt4/GuiDocument.cpp:2113
 #: src/frontends/qt4/GuiListings.cpp:158
 msgid "Typewriter"
 msgstr "Typewriter"
@@ -13754,23 +13806,23 @@ msgstr "继承"
 msgid "Ignore"
 msgstr "忽略"
 
-#: src/Font.cpp:53 src/frontends/qt4/GuiCharacter.cpp:224
+#: src/Font.cpp:53 src/frontends/qt4/GuiCharacter.cpp:98
 msgid "Medium"
 msgstr "中度"
 
-#: src/Font.cpp:53 src/frontends/qt4/GuiCharacter.cpp:228
+#: src/Font.cpp:53 src/frontends/qt4/GuiCharacter.cpp:99
 msgid "Bold"
 msgstr "粗体"
 
-#: src/Font.cpp:56 src/frontends/qt4/GuiCharacter.cpp:40
+#: src/Font.cpp:56 src/frontends/qt4/GuiCharacter.cpp:34
 msgid "Upright"
 msgstr "正体"
 
-#: src/Font.cpp:56 src/frontends/qt4/GuiCharacter.cpp:44
+#: src/Font.cpp:56 src/frontends/qt4/GuiCharacter.cpp:35
 msgid "Italic"
 msgstr "斜体"
 
-#: src/Font.cpp:56 src/frontends/qt4/GuiCharacter.cpp:48
+#: src/Font.cpp:56 src/frontends/qt4/GuiCharacter.cpp:36
 msgid "Slanted"
 msgstr "倾斜"
 
@@ -13778,11 +13830,11 @@ msgstr "倾斜"
 msgid "Smallcaps"
 msgstr "小号大写"
 
-#: src/Font.cpp:61 src/frontends/qt4/GuiCharacter.cpp:114
+#: src/Font.cpp:61 src/frontends/qt4/GuiCharacter.cpp:57
 msgid "Increase"
 msgstr "增大字体"
 
-#: src/Font.cpp:61 src/frontends/qt4/GuiCharacter.cpp:118
+#: src/Font.cpp:61 src/frontends/qt4/GuiCharacter.cpp:58
 msgid "Decrease"
 msgstr "减小字体"
 
@@ -13923,11 +13975,11 @@ msgstr "执行BibTeX"
 msgid "Running MakeIndex for nomencl."
 msgstr "Running MakeIndex for nomencl."
 
-#: src/LyX.cpp:101
+#: src/LyX.cpp:99
 msgid "Could not read configuration file"
 msgstr "无法读取配置文件"
 
-#: src/LyX.cpp:102
+#: src/LyX.cpp:100
 #, c-format
 msgid ""
 "Error while reading the configuration file\n"
@@ -13938,61 +13990,61 @@ msgstr ""
 "%1$s.\n"
 "请检查您的安装过程."
 
-#: src/LyX.cpp:111
+#: src/LyX.cpp:109
 msgid "LyX: reconfiguring user directory"
 msgstr "LyX: 重新配置用户目录"
 
-#: src/LyX.cpp:115
+#: src/LyX.cpp:113
 msgid "Done!"
 msgstr "完成！"
 
-#: src/LyX.cpp:484
+#: src/LyX.cpp:478
 #, c-format
 msgid "Unable to remove the temporary directory %1$s"
 msgstr "无法删除临时目录 %1$s"
 
-#: src/LyX.cpp:486
+#: src/LyX.cpp:480
 msgid "Unable to remove temporary directory"
 msgstr "无法删除临时目录"
 
-#: src/LyX.cpp:514
+#: src/LyX.cpp:508
 #, c-format
 msgid "Wrong command line option `%1$s'. Exiting."
 msgstr "未知命令行选项 `%1$s'. 退出."
 
-#: src/LyX.cpp:587
+#: src/LyX.cpp:581
 msgid "No textclass is found"
 msgstr ""
 
-#: src/LyX.cpp:588
+#: src/LyX.cpp:582
 msgid ""
 "LyX cannot continue because no textclass is found. You can either "
 "reconfigure normally, or reconfigure using default textclasses, or quit LyX."
 msgstr ""
 
-#: src/LyX.cpp:592
+#: src/LyX.cpp:586
 #, fuzzy
 msgid "&Reconfigure"
 msgstr "重配置(R)|R"
 
-#: src/LyX.cpp:593
+#: src/LyX.cpp:587
 #, fuzzy
 msgid "&Use Default"
 msgstr "&Default"
 
-#: src/LyX.cpp:594 src/LyX.cpp:981
+#: src/LyX.cpp:588 src/LyX.cpp:975
 msgid "&Exit LyX"
 msgstr "退出 LyX (&E)"
 
-#: src/LyX.cpp:738 src/frontends/qt4/GuiView.cpp:547
+#: src/LyX.cpp:732 src/frontends/qt4/GuiView.cpp:510
 msgid "LyX: "
 msgstr "LyX: "
 
-#: src/LyX.cpp:864
+#: src/LyX.cpp:858
 msgid "Could not create temporary directory"
 msgstr "无法创建临时目录"
 
-#: src/LyX.cpp:865
+#: src/LyX.cpp:859
 #, c-format
 msgid ""
 "Could not create a temporary directory in\n"
@@ -14003,11 +14055,11 @@ msgstr ""
 "%1$s. 请确定此\n"
 "目录存在而且可写，然后重新尝试."
 
-#: src/LyX.cpp:974
+#: src/LyX.cpp:968
 msgid "Missing user LyX directory"
 msgstr "缺失LyX用户目录"
 
-#: src/LyX.cpp:975
+#: src/LyX.cpp:969
 #, c-format
 msgid ""
 "You have specified a non-existent user LyX directory, %1$s.\n"
@@ -14016,33 +14068,33 @@ msgstr ""
 "您指定了一不存在用户目录, %1$s.\n"
 "用来保存您的配置信息."
 
-#: src/LyX.cpp:980
+#: src/LyX.cpp:974
 msgid "&Create directory"
 msgstr "创建目录 (&C)"
 
-#: src/LyX.cpp:982
+#: src/LyX.cpp:976
 msgid "No user LyX directory. Exiting."
 msgstr "无用户 LyX 目录。退出。"
 
-#: src/LyX.cpp:986
+#: src/LyX.cpp:980
 #, c-format
 msgid "LyX: Creating directory %1$s"
 msgstr "LyX: 创建目录 %1$s"
 
-#: src/LyX.cpp:991
+#: src/LyX.cpp:985
 msgid "Failed to create directory. Exiting."
 msgstr "未能创建目录。退出。"
 
-#: src/LyX.cpp:1159
+#: src/LyX.cpp:1153
 msgid "List of supported debug flags:"
 msgstr "支持的调试符号"
 
-#: src/LyX.cpp:1163
+#: src/LyX.cpp:1157
 #, c-format
 msgid "Setting debug level to %1$s"
 msgstr "设置调试级别至 %1$s"
 
-#: src/LyX.cpp:1174
+#: src/LyX.cpp:1168
 #, fuzzy
 msgid ""
 "Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
@@ -14085,39 +14137,39 @@ msgstr ""
 "\t-version        版本和编译信息\n"
 "详细使用方法请参阅 LyX 手册."
 
-#: src/LyX.cpp:1214 src/support/Package.cpp:560
+#: src/LyX.cpp:1208 src/support/Package.cpp:560
 msgid "No system directory"
 msgstr "无系统目录"
 
-#: src/LyX.cpp:1215
+#: src/LyX.cpp:1209
 msgid "Missing directory for -sysdir switch"
 msgstr "-sysdir 参数后缺省目录名"
 
-#: src/LyX.cpp:1226
+#: src/LyX.cpp:1220
 msgid "No user directory"
 msgstr "无用户目录"
 
-#: src/LyX.cpp:1227
+#: src/LyX.cpp:1221
 msgid "Missing directory for -userdir switch"
 msgstr "-userdir 参数后缺失目录名"
 
-#: src/LyX.cpp:1238
+#: src/LyX.cpp:1232
 msgid "Incomplete command"
 msgstr "不完整命令"
 
-#: src/LyX.cpp:1239
+#: src/LyX.cpp:1233
 msgid "Missing command string after --execute switch"
 msgstr "--execute 参数后缺失命令"
 
-#: src/LyX.cpp:1250
+#: src/LyX.cpp:1244
 msgid "Missing file type [eg latex, ps...] after --export switch"
 msgstr "--import 参数后缺失文件类型 （例如 latex, ps...）"
 
-#: src/LyX.cpp:1263
+#: src/LyX.cpp:1257
 msgid "Missing file type [eg latex, ps...] after --import switch"
 msgstr "--import 参数后缺失文件类型 （例如 latex, ps...）"
 
-#: src/LyX.cpp:1268
+#: src/LyX.cpp:1262
 msgid "Missing filename for --import"
 msgstr "--import 参数缺失文件名"
 
@@ -14155,35 +14207,35 @@ msgstr ""
 "您必须重启动LyX\n"
 "以便使用更新的文档类列表."
 
-#: src/LyXFunc.cpp:357
+#: src/LyXFunc.cpp:358
 msgid "Unknown function."
 msgstr "未知函数"
 
-#: src/LyXFunc.cpp:397
+#: src/LyXFunc.cpp:390
 msgid "Nothing to do"
 msgstr "无操作"
 
-#: src/LyXFunc.cpp:416
+#: src/LyXFunc.cpp:409
 msgid "Unknown action"
 msgstr "未知操作"
 
-#: src/LyXFunc.cpp:422 src/LyXFunc.cpp:679
+#: src/LyXFunc.cpp:415 src/LyXFunc.cpp:672
 msgid "Command disabled"
 msgstr "被禁止命令"
 
-#: src/LyXFunc.cpp:429
+#: src/LyXFunc.cpp:422
 msgid "Command not allowed without any document open"
 msgstr "此命令在没有任何打开文档下不能执行"
 
-#: src/LyXFunc.cpp:664
+#: src/LyXFunc.cpp:657
 msgid "Document is read-only"
 msgstr "文档只读"
 
-#: src/LyXFunc.cpp:673
+#: src/LyXFunc.cpp:666
 msgid "This portion of the document is deleted."
 msgstr "此段文档已被删除"
 
-#: src/LyXFunc.cpp:692
+#: src/LyXFunc.cpp:685
 #, c-format
 msgid ""
 "The document %1$s has unsaved changes.\n"
@@ -14194,11 +14246,11 @@ msgstr ""
 "\n"
 "您希望保存文档吗?"
 
-#: src/LyXFunc.cpp:695 src/frontends/qt4/GuiView.cpp:1632
+#: src/LyXFunc.cpp:688 src/frontends/qt4/GuiView.cpp:1602
 msgid "Save changed document?"
 msgstr "保存改变的文档?"
 
-#: src/LyXFunc.cpp:710
+#: src/LyXFunc.cpp:703
 #, c-format
 msgid ""
 "Could not print the document %1$s.\n"
@@ -14207,11 +14259,11 @@ msgstr ""
 "无法打印文档 %1$s.\n"
 "请检查打印机是否设置正确."
 
-#: src/LyXFunc.cpp:713
+#: src/LyXFunc.cpp:706
 msgid "Print document failed"
 msgstr "打印文件失败"
 
-#: src/LyXFunc.cpp:732
+#: src/LyXFunc.cpp:721
 #, fuzzy, c-format
 msgid "The document class %1$s.could not be loaded."
 msgstr ""
@@ -14219,68 +14271,68 @@ msgstr ""
 "%1$s\n"
 "could not be read."
 
-#: src/LyXFunc.cpp:843
+#: src/LyXFunc.cpp:833
 #, 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 "任何改变将被遗失. 您确定希望恢复 文件 %1$s 到磁盘上保存的版本吗?"
 
-#: src/LyXFunc.cpp:845
+#: src/LyXFunc.cpp:835
 msgid "Revert to saved document?"
 msgstr "使用磁盘上文档?"
 
-#: src/LyXFunc.cpp:846 src/LyXVC.cpp:160
+#: src/LyXFunc.cpp:836 src/LyXVC.cpp:160
 msgid "&Revert"
 msgstr "还原(&R)"
 
-#: src/LyXFunc.cpp:1061 src/Text3.cpp:1475
+#: src/LyXFunc.cpp:1051 src/Text3.cpp:1450
 msgid "Missing argument"
 msgstr "缺失参数"
 
-#: src/LyXFunc.cpp:1070
+#: src/LyXFunc.cpp:1060
 #, c-format
 msgid "Opening help file %1$s..."
 msgstr "打开帮助文件 %1$s..."
 
-#: src/LyXFunc.cpp:1313
+#: src/LyXFunc.cpp:1303
 #, c-format
 msgid "Opening child document %1$s..."
 msgstr "打开子文档 %1$s..."
 
-#: src/LyXFunc.cpp:1422
+#: src/LyXFunc.cpp:1412
 msgid "Syntax: set-color <lyx_name> <x11_name>"
 msgstr "语法: set-color <lyx_name> <x11_name>"
 
-#: src/LyXFunc.cpp:1433
+#: src/LyXFunc.cpp:1423
 #, c-format
 msgid "Set-color \"%1$s\" failed - color is undefined or may not be redefined"
 msgstr "设置颜色 \"%1$s\" 失败 - 未定义或不能重定义颜色"
 
-#: src/LyXFunc.cpp:1527
+#: src/LyXFunc.cpp:1517
 #, c-format
 msgid "Document defaults saved in %1$s"
 msgstr "文档缺省设置保存至 %1$s"
 
-#: src/LyXFunc.cpp:1530
+#: src/LyXFunc.cpp:1520
 msgid "Unable to save document defaults"
 msgstr "无法保存文档缺省设置"
 
-#: src/LyXFunc.cpp:1820
+#: src/LyXFunc.cpp:1788
 #, fuzzy, c-format
 msgid "Document %1$s reloaded."
 msgstr "文档 %1$s 已打开"
 
-#: src/LyXFunc.cpp:1822
+#: src/LyXFunc.cpp:1790
 #, fuzzy, c-format
 msgid "Could not reload document %1$s"
 msgstr "无法读取文档"
 
-#: src/LyXFunc.cpp:1859
+#: src/LyXFunc.cpp:1827
 msgid "Welcome to LyX!"
 msgstr "欢迎使用LyX!"
 
-#: src/LyXFunc.cpp:1880
+#: src/LyXFunc.cpp:1848
 msgid "Converting document to new document class..."
 msgstr "转换文档至新文档类..."
 
@@ -14857,96 +14909,28 @@ msgstr ""
 msgid "Revert to stored version of document?"
 msgstr "使用保存的版本吗?"
 
-#: src/MenuBackend.cpp:492
-#, fuzzy
-msgid "No Documents Open!"
-msgstr "无打开文档!"
-
-#: src/MenuBackend.cpp:518 src/MenuBackend.cpp:596 src/MenuBackend.cpp:617
-#: src/MenuBackend.cpp:639 src/MenuBackend.cpp:726 src/MenuBackend.cpp:851
-msgid "No Document Open!"
-msgstr "无打开文档!"
-
-#: src/MenuBackend.cpp:559
-msgid "Plain Text"
-msgstr "纯文本"
+#: src/Paragraph.cpp:1503 src/frontends/qt4/GuiParagraph.cpp:216
+msgid "Senseless with this layout!"
+msgstr "在此显示布局下无意义"
 
-#: src/MenuBackend.cpp:561
-msgid "Plain Text, Join Lines"
-msgstr "纯文本, 连接段落"
+#: src/Paragraph.cpp:1569
+msgid "Alignment not permitted"
+msgstr "无效对齐方式"
 
-#: src/MenuBackend.cpp:741
-msgid "Master Document"
-msgstr "主文档"
+#: src/Paragraph.cpp:1570
+msgid ""
+"The new layout does not permit the alignment previously used.\n"
+"Setting to default."
+msgstr ""
+"The new layout does not permit the alignment previously used.\n"
+"Setting to default."
 
-#: src/MenuBackend.cpp:770 src/frontends/qt4/GuiToc.cpp:225
-#, fuzzy
-msgid "List of Equations"
-msgstr "程序列表列表"
-
-#: src/MenuBackend.cpp:772 src/frontends/qt4/GuiToc.cpp:231
-#, fuzzy
-msgid "List of Indexes"
-msgstr "表格列表"
-
-#: src/MenuBackend.cpp:774 src/frontends/qt4/GuiToc.cpp:229
-#, fuzzy
-msgid "List of Listings"
-msgstr "程序列表列表"
-
-#: src/MenuBackend.cpp:776 src/frontends/qt4/GuiToc.cpp:233
-#, fuzzy
-msgid "List of Marginal notes"
-msgstr "表格列表"
-
-#: src/MenuBackend.cpp:778 src/frontends/qt4/GuiToc.cpp:235
-#, fuzzy
-msgid "List of Notes"
-msgstr "表格列表"
-
-#: src/MenuBackend.cpp:780 src/frontends/qt4/GuiToc.cpp:227
-#, fuzzy
-msgid "List of Foot notes"
-msgstr "图像列表"
-
-#: src/MenuBackend.cpp:784
-msgid "Other floats"
-msgstr "其他浮动项"
-
-#: src/MenuBackend.cpp:794
-msgid "No Table of contents"
-msgstr "无目录"
-
-#: src/MenuBackend.cpp:840
-msgid " (auto)"
-msgstr " (自动)"
-
-#: src/MenuBackend.cpp:859
-msgid "No Branch in Document!"
-msgstr "文档中无分支!"
-
-#: src/Paragraph.cpp:1499 src/frontends/qt4/GuiParagraph.cpp:216
-msgid "Senseless with this layout!"
-msgstr "在此显示布局下无意义"
-
-#: src/Paragraph.cpp:1565
-msgid "Alignment not permitted"
-msgstr "无效对齐方式"
-
-#: src/Paragraph.cpp:1566
-msgid ""
-"The new layout does not permit the alignment previously used.\n"
-"Setting to default."
-msgstr ""
-"The new layout does not permit the alignment previously used.\n"
-"Setting to default."
-
-#: src/Paragraph.cpp:2034 src/frontends/qt4/LaTeXHighlighter.cpp:108
+#: src/Paragraph.cpp:2029 src/frontends/qt4/LaTeXHighlighter.cpp:108
 #, fuzzy
 msgid "LyX Warning: "
 msgstr "LyX版本"
 
-#: src/Paragraph.cpp:2035
+#: src/Paragraph.cpp:2030
 #, fuzzy
 msgid "uncodable character"
 msgstr "特殊字符"
@@ -15000,61 +14984,61 @@ msgstr "您不能在段首输入空格。请参阅功能简介。"
 msgid "You cannot type two spaces this way. Please read the Tutorial."
 msgstr "您不能如此输入两个空格。请参阅功能简介。"
 
-#: src/Text.cpp:1236
+#: src/Text.cpp:1233
 msgid "[Change Tracking] "
 msgstr "[追踪改变] "
 
-#: src/Text.cpp:1242
+#: src/Text.cpp:1239
 msgid "Change: "
 msgstr "改变: "
 
-#: src/Text.cpp:1246
+#: src/Text.cpp:1243
 msgid " at "
 msgstr "在"
 
-#: src/Text.cpp:1256
+#: src/Text.cpp:1253
 #, c-format
 msgid "Font: %1$s"
 msgstr "字体: %1$s"
 
-#: src/Text.cpp:1261
+#: src/Text.cpp:1258
 #, c-format
 msgid ", Depth: %1$d"
 msgstr ", 深度: %1$d"
 
-#: src/Text.cpp:1267
+#: src/Text.cpp:1264
 msgid ", Spacing: "
 msgstr ", 间隔: "
 
-#: src/Text.cpp:1273 src/frontends/qt4/GuiDocument.cpp:565
+#: src/Text.cpp:1270 src/frontends/qt4/GuiDocument.cpp:578
 msgid "OneHalf"
 msgstr "OneHalf"
 
-#: src/Text.cpp:1279
+#: src/Text.cpp:1276
 msgid "Other ("
 msgstr "其他 ("
 
-#: src/Text.cpp:1288
+#: src/Text.cpp:1285
 msgid ", Inset: "
 msgstr ", 嵌入项: "
 
-#: src/Text.cpp:1289
+#: src/Text.cpp:1286
 msgid ", Paragraph: "
 msgstr ", 段落: "
 
-#: src/Text.cpp:1290
+#: src/Text.cpp:1287
 msgid ", Id: "
 msgstr ", Id:"
 
-#: src/Text.cpp:1291
+#: src/Text.cpp:1288
 msgid ", Position: "
 msgstr ", 位置:　"
 
-#: src/Text.cpp:1297
+#: src/Text.cpp:1294
 msgid ", Char: 0x"
 msgstr ", Char: 0x"
 
-#: src/Text.cpp:1299
+#: src/Text.cpp:1296
 msgid ", Boundary: "
 msgstr ", 边界: "
 
@@ -15070,50 +15054,50 @@ msgstr "无索引项!"
 msgid "Cannot index more than one paragraph!"
 msgstr "无法索引多于一段落"
 
-#: src/Text3.cpp:169 src/mathed/InsetMathHull.cpp:1346
+#: src/Text3.cpp:169 src/mathed/InsetMathHull.cpp:1416
 msgid "Math editor mode"
 msgstr "Math editor mode"
 
-#: src/Text3.cpp:828
+#: src/Text3.cpp:804
 msgid "Unknown spacing argument: "
 msgstr "未知间隔参数: "
 
-#: src/Text3.cpp:1042
+#: src/Text3.cpp:1018
 msgid "Layout "
 msgstr "显示布局 "
 
-#: src/Text3.cpp:1043
+#: src/Text3.cpp:1019
 msgid " not known"
 msgstr "未知"
 
-#: src/Text3.cpp:1582 src/Text3.cpp:1594
+#: src/Text3.cpp:1557 src/Text3.cpp:1569
 msgid "Character set"
 msgstr "字符集"
 
-#: src/Text3.cpp:1735 src/Text3.cpp:1746
+#: src/Text3.cpp:1710 src/Text3.cpp:1721
 msgid "Paragraph layout set"
 msgstr "段落布局"
 
-#: src/TextClass.cpp:129
+#: src/TextClass.cpp:134
 #, fuzzy
 msgid "PlainLayout"
 msgstr "页面布局"
 
-#: src/TextClass.cpp:530
+#: src/TextClass.cpp:523
 #, fuzzy
 msgid "Missing File"
 msgstr "缺失参数"
 
-#: src/TextClass.cpp:531
+#: src/TextClass.cpp:524
 msgid "Could not find stdinsets.inc! This may lead to data loss!"
 msgstr ""
 
-#: src/TextClass.cpp:534
+#: src/TextClass.cpp:527
 #, fuzzy
 msgid "Corrupt File"
 msgstr "短标题"
 
-#: src/TextClass.cpp:535
+#: src/TextClass.cpp:528
 msgid "Could not read stdinsets.inc! This may lead to data loss!"
 msgstr ""
 
@@ -15156,7 +15140,7 @@ msgstr "竖直间隔"
 msgid "protected"
 msgstr "被保护"
 
-#: src/buffer_funcs.cpp:71
+#: src/buffer_funcs.cpp:68
 #, fuzzy, c-format
 msgid ""
 "The document %1$s is already loaded and has unsaved changes.\n"
@@ -15166,32 +15150,32 @@ msgstr ""
 "\n"
 "您希望恢复至磁盘上保存的版本吗?"
 
-#: src/buffer_funcs.cpp:73
+#: src/buffer_funcs.cpp:70
 #, fuzzy
 msgid "Reload saved document?"
 msgstr "使用磁盘上文档?"
 
-#: src/buffer_funcs.cpp:74
+#: src/buffer_funcs.cpp:71
 #, fuzzy
 msgid "&Reload"
-msgstr "装入(&L)"
+msgstr "替换(&R)"
 
-#: src/buffer_funcs.cpp:74
+#: src/buffer_funcs.cpp:71
 #, fuzzy
 msgid "&Keep Changes"
 msgstr "合并改变"
 
-#: src/buffer_funcs.cpp:85
+#: src/buffer_funcs.cpp:82
 #, c-format
 msgid "The file %1$s exists but is not readable by the current user."
 msgstr ""
 
-#: src/buffer_funcs.cpp:88
+#: src/buffer_funcs.cpp:85
 #, fuzzy
 msgid "File not readable!"
-msgstr "无法读取 %1$s"
+msgstr "无法读取文件"
 
-#: src/buffer_funcs.cpp:102
+#: src/buffer_funcs.cpp:99
 #, c-format
 msgid ""
 "The document %1$s does not yet exist.\n"
@@ -15202,15 +15186,15 @@ msgstr ""
 "\n"
 "您希望创建一个新文档吗?"
 
-#: src/buffer_funcs.cpp:105
+#: src/buffer_funcs.cpp:102
 msgid "Create new document?"
 msgstr "创建新文档?"
 
-#: src/buffer_funcs.cpp:106
+#: src/buffer_funcs.cpp:103
 msgid "&Create"
 msgstr "创建(&C)"
 
-#: src/buffer_funcs.cpp:134
+#: src/buffer_funcs.cpp:131
 #, c-format
 msgid ""
 "The specified document template\n"
@@ -15221,23 +15205,23 @@ msgstr ""
 "%1$s\n"
 "无法被读取."
 
-#: src/buffer_funcs.cpp:136
+#: src/buffer_funcs.cpp:133
 msgid "Could not read template"
 msgstr "无法读取文档模板"
 
-#: src/buffer_funcs.cpp:388
+#: src/buffer_funcs.cpp:385
 msgid "\\arabic{enumi}."
 msgstr "\\arabic{enumi}."
 
-#: src/buffer_funcs.cpp:394
+#: src/buffer_funcs.cpp:391
 msgid "\\roman{enumiii}."
 msgstr "\\roman{enumiii}."
 
-#: src/buffer_funcs.cpp:397
+#: src/buffer_funcs.cpp:394
 msgid "\\Alph{enumiv}."
 msgstr "\\Alph{enumiv}."
 
-#: src/buffer_funcs.cpp:414 src/insets/InsetCaption.cpp:287
+#: src/buffer_funcs.cpp:411 src/insets/InsetCaption.cpp:280
 msgid "Senseless!!! "
 msgstr "无意义!!!"
 
@@ -15286,7 +15270,7 @@ msgstr "Dings 3"
 msgid "Dings 4"
 msgstr "Dings 4"
 
-#: src/frontends/qt4/FileDialog.cpp:178
+#: src/frontends/qt4/FileDialog.cpp:176
 msgid "Directories"
 msgstr "目录"
 
@@ -15365,7 +15349,7 @@ msgid "About %1"
 msgstr "关于LyX"
 
 #: src/frontends/qt4/GuiApplication.cpp:116
-#: src/frontends/qt4/GuiPrefs.cpp:2206
+#: src/frontends/qt4/GuiPrefs.cpp:2324
 msgid "Preferences"
 msgstr "首选项"
 
@@ -15379,11 +15363,18 @@ msgstr "重配置(R)|R"
 msgid "Quit %1"
 msgstr "退出LyX"
 
-#: src/frontends/qt4/GuiApplication.cpp:263
+#: src/frontends/qt4/GuiApplication.cpp:265
 msgid "Exiting."
 msgstr "退出."
 
-#: src/frontends/qt4/GuiApplication.cpp:477
+#: src/frontends/qt4/GuiApplication.cpp:488
+#, fuzzy
+msgid ""
+"\n"
+"The current document was closed."
+msgstr "打印文件失败"
+
+#: src/frontends/qt4/GuiApplication.cpp:498
 msgid ""
 "LyX has caught an exception, it will now attempt to save all unsaved "
 "documents and exit.\n"
@@ -15391,12 +15382,12 @@ msgid ""
 "Exception: "
 msgstr ""
 
-#: src/frontends/qt4/GuiApplication.cpp:481
-#: src/frontends/qt4/GuiApplication.cpp:487
+#: src/frontends/qt4/GuiApplication.cpp:502
+#: src/frontends/qt4/GuiApplication.cpp:508
 msgid "Software exception Detected"
 msgstr ""
 
-#: src/frontends/qt4/GuiApplication.cpp:485
+#: src/frontends/qt4/GuiApplication.cpp:506
 msgid ""
 "LyX has caught some really weird exception, it will now attempt to save all "
 "unsaved documents and exit."
@@ -15410,92 +15401,92 @@ msgstr "文献引用项设定"
 msgid "BibTeX Bibliography"
 msgstr "BibTeX文献"
 
-#: src/frontends/qt4/GuiBibtex.cpp:363 src/frontends/qt4/GuiBibtex.cpp:370
+#: src/frontends/qt4/GuiBibtex.cpp:357 src/frontends/qt4/GuiBibtex.cpp:364
 #: src/frontends/qt4/GuiInclude.cpp:243
 #, fuzzy
 msgid "true"
 msgstr "街道"
 
-#: src/frontends/qt4/GuiBibtex.cpp:363 src/frontends/qt4/GuiBibtex.cpp:370
-#: src/frontends/qt4/GuiInclude.cpp:243 src/insets/InsetInclude.cpp:212
+#: src/frontends/qt4/GuiBibtex.cpp:357 src/frontends/qt4/GuiBibtex.cpp:364
+#: src/frontends/qt4/GuiInclude.cpp:243 src/insets/InsetInclude.cpp:272
 #, fuzzy
 msgid "false"
 msgstr "Case"
 
-#: src/frontends/qt4/GuiBibtex.cpp:433 src/frontends/qt4/GuiBibtex.cpp:444
-#: src/frontends/qt4/GuiExternal.cpp:781 src/frontends/qt4/GuiGraphics.cpp:747
-#: src/frontends/qt4/GuiInclude.cpp:327 src/frontends/qt4/GuiView.cpp:1118
-#: src/frontends/qt4/GuiView.cpp:1178 src/frontends/qt4/GuiView.cpp:1312
-#: src/frontends/qt4/GuiView.cpp:1433 src/frontends/qt4/GuiView.cpp:1514
+#: src/frontends/qt4/GuiBibtex.cpp:426 src/frontends/qt4/GuiBibtex.cpp:436
+#: src/frontends/qt4/GuiExternal.cpp:780 src/frontends/qt4/GuiGraphics.cpp:736
+#: src/frontends/qt4/GuiInclude.cpp:327 src/frontends/qt4/GuiView.cpp:1085
+#: src/frontends/qt4/GuiView.cpp:1144 src/frontends/qt4/GuiView.cpp:1276
+#: src/frontends/qt4/GuiView.cpp:1395 src/frontends/qt4/GuiView.cpp:1475
 msgid "Documents|#o#O"
 msgstr "文档|#o#O"
 
-#: src/frontends/qt4/GuiBibtex.cpp:435
+#: src/frontends/qt4/GuiBibtex.cpp:428
 msgid "BibTeX Databases (*.bib)"
 msgstr "BibTeX数据库(*.bib)"
 
-#: src/frontends/qt4/GuiBibtex.cpp:437
+#: src/frontends/qt4/GuiBibtex.cpp:430
 msgid "Select a BibTeX database to add"
 msgstr "选择一个BibTeX数据库"
 
-#: src/frontends/qt4/GuiBibtex.cpp:446
+#: src/frontends/qt4/GuiBibtex.cpp:438
 msgid "BibTeX Styles (*.bst)"
 msgstr "BibTeX 式样 (*.bst)"
 
-#: src/frontends/qt4/GuiBibtex.cpp:448
+#: src/frontends/qt4/GuiBibtex.cpp:440
 msgid "Select a BibTeX style"
 msgstr "选择一个BibTeX式样"
 
-#: src/frontends/qt4/GuiBox.cpp:47
+#: src/frontends/qt4/GuiBox.cpp:53
 #, fuzzy
 msgid "No frame"
 msgstr "无边框"
 
-#: src/frontends/qt4/GuiBox.cpp:48
+#: src/frontends/qt4/GuiBox.cpp:53
 msgid "Simple rectangular frame"
 msgstr ""
 
-#: src/frontends/qt4/GuiBox.cpp:49
+#: src/frontends/qt4/GuiBox.cpp:54
 #, fuzzy
 msgid "Oval frame, thin"
 msgstr "细椭圆框"
 
-#: src/frontends/qt4/GuiBox.cpp:50
+#: src/frontends/qt4/GuiBox.cpp:54
 #, fuzzy
 msgid "Oval frame, thick"
 msgstr "粗椭圆框"
 
-#: src/frontends/qt4/GuiBox.cpp:51
+#: src/frontends/qt4/GuiBox.cpp:55
 msgid "Drop shadow"
 msgstr ""
 
-#: src/frontends/qt4/GuiBox.cpp:52
+#: src/frontends/qt4/GuiBox.cpp:55
 #, fuzzy
 msgid "Shaded background"
 msgstr "记事项背景"
 
-#: src/frontends/qt4/GuiBox.cpp:53
+#: src/frontends/qt4/GuiBox.cpp:56
 msgid "Double rectangular frame"
 msgstr ""
 
-#: src/frontends/qt4/GuiBox.cpp:67 src/frontends/qt4/GuiBox.cpp:323
-#: src/frontends/qt4/GuiBox.cpp:358
+#: src/frontends/qt4/GuiBox.cpp:69 src/frontends/qt4/GuiBox.cpp:327
+#: src/frontends/qt4/GuiBox.cpp:362
 msgid "Height"
 msgstr "高度"
 
-#: src/frontends/qt4/GuiBox.cpp:68 src/frontends/qt4/GuiBox.cpp:326
-#: src/frontends/qt4/GuiBox.cpp:361
+#: src/frontends/qt4/GuiBox.cpp:69 src/frontends/qt4/GuiBox.cpp:330
+#: src/frontends/qt4/GuiBox.cpp:365
 msgid "Depth"
 msgstr "深度"
 
-#: src/frontends/qt4/GuiBox.cpp:69 src/frontends/qt4/GuiBox.cpp:195
-#: src/frontends/qt4/GuiBox.cpp:329 src/frontends/qt4/GuiBox.cpp:364
-#: src/frontends/qt4/GuiBox.cpp:406
+#: src/frontends/qt4/GuiBox.cpp:70 src/frontends/qt4/GuiBox.cpp:197
+#: src/frontends/qt4/GuiBox.cpp:333 src/frontends/qt4/GuiBox.cpp:368
+#: src/frontends/qt4/GuiBox.cpp:413
 msgid "Total Height"
 msgstr "总高度"
 
-#: src/frontends/qt4/GuiBox.cpp:70 src/frontends/qt4/GuiBox.cpp:332
-#: src/frontends/qt4/GuiBox.cpp:367
+#: src/frontends/qt4/GuiBox.cpp:70 src/frontends/qt4/GuiBox.cpp:336
+#: src/frontends/qt4/GuiBox.cpp:371
 msgid "Width"
 msgstr "宽度"
 
@@ -15516,11 +15507,11 @@ msgid "Activated"
 msgstr "已激活"
 
 #: src/frontends/qt4/GuiBranches.cpp:71 src/frontends/qt4/GuiBranches.cpp:145
-#: src/frontends/qt4/GuiDocument.cpp:1365
+#: src/frontends/qt4/GuiDocument.cpp:1397
 msgid "Yes"
 msgstr "是"
 
-#: src/frontends/qt4/GuiBranches.cpp:71 src/frontends/qt4/GuiDocument.cpp:1364
+#: src/frontends/qt4/GuiBranches.cpp:71 src/frontends/qt4/GuiDocument.cpp:1396
 msgid "No"
 msgstr "否"
 
@@ -15542,72 +15533,69 @@ msgstr ""
 msgid "Change made at %1$s\n"
 msgstr "修改于 %1$s\n"
 
-#: src/frontends/qt4/GuiCharacter.cpp:36 src/frontends/qt4/GuiCharacter.cpp:70
-#: src/frontends/qt4/GuiCharacter.cpp:136
-#: src/frontends/qt4/GuiCharacter.cpp:166
-#: src/frontends/qt4/GuiCharacter.cpp:220
-#: src/frontends/qt4/GuiCharacter.cpp:246 src/frontends/qt4/qt_helpers.cpp:186
+#: src/frontends/qt4/GuiCharacter.cpp:33 src/frontends/qt4/GuiCharacter.cpp:46
+#: src/frontends/qt4/GuiCharacter.cpp:67 src/frontends/qt4/GuiCharacter.cpp:79
+#: src/frontends/qt4/GuiCharacter.cpp:97
+#: src/frontends/qt4/GuiCharacter.cpp:108 src/frontends/qt4/qt_helpers.cpp:194
 msgid "No change"
 msgstr "无改变"
 
-#: src/frontends/qt4/GuiCharacter.cpp:52
+#: src/frontends/qt4/GuiCharacter.cpp:37
 msgid "Small Caps"
 msgstr "小号大写字体"
 
-#: src/frontends/qt4/GuiCharacter.cpp:56
-#: src/frontends/qt4/GuiCharacter.cpp:122
-#: src/frontends/qt4/GuiCharacter.cpp:152
-#: src/frontends/qt4/GuiCharacter.cpp:206
-#: src/frontends/qt4/GuiCharacter.cpp:232
-#: src/frontends/qt4/GuiCharacter.cpp:262 src/frontends/qt4/qt_helpers.cpp:188
+#: src/frontends/qt4/GuiCharacter.cpp:38 src/frontends/qt4/GuiCharacter.cpp:59
+#: src/frontends/qt4/GuiCharacter.cpp:71 src/frontends/qt4/GuiCharacter.cpp:89
+#: src/frontends/qt4/GuiCharacter.cpp:100
+#: src/frontends/qt4/GuiCharacter.cpp:112 src/frontends/qt4/qt_helpers.cpp:196
 msgid "Reset"
 msgstr "重置"
 
-#: src/frontends/qt4/GuiCharacter.cpp:144
+#: src/frontends/qt4/GuiCharacter.cpp:69
 msgid "Underbar"
 msgstr "下划线"
 
-#: src/frontends/qt4/GuiCharacter.cpp:148
+#: src/frontends/qt4/GuiCharacter.cpp:70
 msgid "Noun"
 msgstr "名词"
 
-#: src/frontends/qt4/GuiCharacter.cpp:170
+#: src/frontends/qt4/GuiCharacter.cpp:80
 msgid "No color"
 msgstr "无颜色"
 
-#: src/frontends/qt4/GuiCharacter.cpp:174
+#: src/frontends/qt4/GuiCharacter.cpp:81
 msgid "Black"
 msgstr "黑"
 
-#: src/frontends/qt4/GuiCharacter.cpp:178
+#: src/frontends/qt4/GuiCharacter.cpp:82
 msgid "White"
 msgstr "白色"
 
-#: src/frontends/qt4/GuiCharacter.cpp:182
+#: src/frontends/qt4/GuiCharacter.cpp:83
 msgid "Red"
 msgstr "红"
 
-#: src/frontends/qt4/GuiCharacter.cpp:186
+#: src/frontends/qt4/GuiCharacter.cpp:84
 msgid "Green"
 msgstr "绿"
 
-#: src/frontends/qt4/GuiCharacter.cpp:190
+#: src/frontends/qt4/GuiCharacter.cpp:85
 msgid "Blue"
 msgstr "蓝"
 
-#: src/frontends/qt4/GuiCharacter.cpp:194
+#: src/frontends/qt4/GuiCharacter.cpp:86
 msgid "Cyan"
 msgstr "青"
 
-#: src/frontends/qt4/GuiCharacter.cpp:198
+#: src/frontends/qt4/GuiCharacter.cpp:87
 msgid "Magenta"
 msgstr "品红"
 
-#: src/frontends/qt4/GuiCharacter.cpp:202
+#: src/frontends/qt4/GuiCharacter.cpp:88
 msgid "Yellow"
 msgstr "黄"
 
-#: src/frontends/qt4/GuiCharacter.cpp:271
+#: src/frontends/qt4/GuiCharacter.cpp:118
 msgid "Text Style"
 msgstr "文本格式"
 
@@ -15616,19 +15604,19 @@ msgstr "文本格式"
 msgid "Keys"
 msgstr "关键字(&K)"
 
-#: src/frontends/qt4/GuiClipboard.cpp:203
+#: src/frontends/qt4/GuiClipboard.cpp:204
 msgid "LinkBack PDF"
 msgstr ""
 
-#: src/frontends/qt4/GuiClipboard.cpp:204
+#: src/frontends/qt4/GuiClipboard.cpp:205
 msgid "PDF"
 msgstr ""
 
-#: src/frontends/qt4/GuiClipboard.cpp:205
+#: src/frontends/qt4/GuiClipboard.cpp:206
 msgid "PNG"
 msgstr ""
 
-#: src/frontends/qt4/GuiClipboard.cpp:206
+#: src/frontends/qt4/GuiClipboard.cpp:207
 msgid "JPEG"
 msgstr ""
 
@@ -15638,19 +15626,19 @@ msgid "pasted"
 msgstr "粘贴"
 
 #: src/frontends/qt4/GuiClipboard.cpp:225
-#, fuzzy, c-format
+#, c-format
 msgid "%1$s Files"
-msgstr "%1$s 和 %2$s"
+msgstr ""
 
 #: src/frontends/qt4/GuiClipboard.cpp:235
 #, fuzzy
 msgid "Choose a filename to save the pasted graphic as"
 msgstr "选择另存为文件名"
 
-#: src/frontends/qt4/GuiClipboard.cpp:245 src/frontends/qt4/GuiView.cpp:1194
-#: src/frontends/qt4/GuiView.cpp:1334 src/frontends/qt4/GuiView.cpp:1350
-#: src/frontends/qt4/GuiView.cpp:1367 src/frontends/qt4/GuiView.cpp:1452
-#: src/frontends/qt4/GuiView.cpp:1490
+#: src/frontends/qt4/GuiClipboard.cpp:245 src/frontends/qt4/GuiView.cpp:1158
+#: src/frontends/qt4/GuiView.cpp:1296 src/frontends/qt4/GuiView.cpp:1312
+#: src/frontends/qt4/GuiView.cpp:1329 src/frontends/qt4/GuiView.cpp:1413
+#: src/frontends/qt4/GuiView.cpp:1451
 msgid "Canceled."
 msgstr "已取消。"
 
@@ -15694,309 +15682,348 @@ msgstr "(无)"
 msgid "Variable"
 msgstr "变量"
 
-#: src/frontends/qt4/GuiDocument.cpp:100
+#: src/frontends/qt4/GuiDocument.cpp:88
 msgid "Computer Modern Roman"
 msgstr "Computer Modern Roman"
 
-#: src/frontends/qt4/GuiDocument.cpp:100
+#: src/frontends/qt4/GuiDocument.cpp:88
 msgid "Latin Modern Roman"
 msgstr "Latin Modern Roman"
 
-#: src/frontends/qt4/GuiDocument.cpp:101
+#: src/frontends/qt4/GuiDocument.cpp:89
 msgid "AE (Almost European)"
 msgstr "AE (Almost European)"
 
-#: src/frontends/qt4/GuiDocument.cpp:101
+#: src/frontends/qt4/GuiDocument.cpp:89
 msgid "Times Roman"
 msgstr "Times Roman"
 
-#: src/frontends/qt4/GuiDocument.cpp:101
+#: src/frontends/qt4/GuiDocument.cpp:89
 msgid "Palatino"
 msgstr "Palatino"
 
-#: src/frontends/qt4/GuiDocument.cpp:102
+#: src/frontends/qt4/GuiDocument.cpp:90
 msgid "Bitstream Charter"
 msgstr "Bitstream Charter"
 
-#: src/frontends/qt4/GuiDocument.cpp:102
+#: src/frontends/qt4/GuiDocument.cpp:90
 msgid "New Century Schoolbook"
 msgstr "New Century Schoolbook"
 
-#: src/frontends/qt4/GuiDocument.cpp:102
+#: src/frontends/qt4/GuiDocument.cpp:90
 msgid "Bookman"
 msgstr "Bookman"
 
-#: src/frontends/qt4/GuiDocument.cpp:103
+#: src/frontends/qt4/GuiDocument.cpp:91
 msgid "Utopia"
 msgstr "Utopia"
 
-#: src/frontends/qt4/GuiDocument.cpp:103
+#: src/frontends/qt4/GuiDocument.cpp:91
 msgid "Bera Serif"
 msgstr "Bera Serif"
 
-#: src/frontends/qt4/GuiDocument.cpp:103
+#: src/frontends/qt4/GuiDocument.cpp:91
 msgid "Concrete Roman"
 msgstr "Concrete Roman"
 
-#: src/frontends/qt4/GuiDocument.cpp:103
+#: src/frontends/qt4/GuiDocument.cpp:91
 msgid "Zapf Chancery"
 msgstr "Zapf Chancery"
 
-#: src/frontends/qt4/GuiDocument.cpp:116
+#: src/frontends/qt4/GuiDocument.cpp:104
 msgid "Computer Modern Sans"
 msgstr "Computer Modern Sans"
 
-#: src/frontends/qt4/GuiDocument.cpp:116
+#: src/frontends/qt4/GuiDocument.cpp:104
 msgid "Latin Modern Sans"
 msgstr "Latin Modern Sans"
 
-#: src/frontends/qt4/GuiDocument.cpp:117
+#: src/frontends/qt4/GuiDocument.cpp:105
 msgid "Helvetica"
 msgstr "Helvetica"
 
-#: src/frontends/qt4/GuiDocument.cpp:117
+#: src/frontends/qt4/GuiDocument.cpp:105
 msgid "Avant Garde"
 msgstr "Avant Garde"
 
-#: src/frontends/qt4/GuiDocument.cpp:117
+#: src/frontends/qt4/GuiDocument.cpp:105
 msgid "Bera Sans"
 msgstr "Bera Sans"
 
-#: src/frontends/qt4/GuiDocument.cpp:117
+#: src/frontends/qt4/GuiDocument.cpp:105
 msgid "CM Bright"
 msgstr "CM Bright"
 
-#: src/frontends/qt4/GuiDocument.cpp:129
+#: src/frontends/qt4/GuiDocument.cpp:117
 msgid "Computer Modern Typewriter"
 msgstr "Computer Modern Typewriter"
 
-#: src/frontends/qt4/GuiDocument.cpp:130
+#: src/frontends/qt4/GuiDocument.cpp:118
 msgid "Latin Modern Typewriter"
 msgstr "Latin Modern Typewriter"
 
-#: src/frontends/qt4/GuiDocument.cpp:130
+#: src/frontends/qt4/GuiDocument.cpp:118
 msgid "Courier"
 msgstr "Courier"
 
-#: src/frontends/qt4/GuiDocument.cpp:130
+#: src/frontends/qt4/GuiDocument.cpp:118
 msgid "Bera Mono"
 msgstr "Bera Mono"
 
-#: src/frontends/qt4/GuiDocument.cpp:131
+#: src/frontends/qt4/GuiDocument.cpp:119
 msgid "LuxiMono"
 msgstr "LuxiMono"
 
-#: src/frontends/qt4/GuiDocument.cpp:131
+#: src/frontends/qt4/GuiDocument.cpp:119
 msgid "CM Typewriter Light"
 msgstr "CM Typewriter Light"
 
-#: src/frontends/qt4/GuiDocument.cpp:177
+#: src/frontends/qt4/GuiDocument.cpp:189
 #, fuzzy
 msgid "Module not found!"
 msgstr "文件没有找到"
 
-#: src/frontends/qt4/GuiDocument.cpp:494
+#: src/frontends/qt4/GuiDocument.cpp:505
 msgid "Document Settings"
 msgstr "文本设置"
 
-#: src/frontends/qt4/GuiDocument.cpp:550
-#: src/frontends/qt4/GuiDocument.cpp:1037
+#: src/frontends/qt4/GuiDocument.cpp:563
+#: src/frontends/qt4/GuiDocument.cpp:1049
 msgid ""
 "Input listings parameters on the right. Enter ? for a list of parameters."
 msgstr "在右边输入listings参数. 输入 ? 显示所有参数."
 
-#: src/frontends/qt4/GuiDocument.cpp:559
+#: src/frontends/qt4/GuiDocument.cpp:572
 msgid "Length"
 msgstr "长度"
 
-#: src/frontends/qt4/GuiDocument.cpp:604 src/frontends/qt4/GuiDocument.cpp:610
-#: src/frontends/qt4/GuiDocument.cpp:616
+#: src/frontends/qt4/GuiDocument.cpp:617 src/frontends/qt4/GuiDocument.cpp:623
+#: src/frontends/qt4/GuiDocument.cpp:629
 msgid " (not installed)"
 msgstr " (没有安装)"
 
-#: src/frontends/qt4/GuiDocument.cpp:621
+#: src/frontends/qt4/GuiDocument.cpp:634
 msgid "10"
 msgstr "十"
 
-#: src/frontends/qt4/GuiDocument.cpp:622
+#: src/frontends/qt4/GuiDocument.cpp:635
 msgid "11"
 msgstr "十一"
 
-#: src/frontends/qt4/GuiDocument.cpp:623
+#: src/frontends/qt4/GuiDocument.cpp:636
 msgid "12"
 msgstr "十二"
 
-#: src/frontends/qt4/GuiDocument.cpp:658
+#: src/frontends/qt4/GuiDocument.cpp:671
 msgid "empty"
 msgstr "空"
 
-#: src/frontends/qt4/GuiDocument.cpp:659
+#: src/frontends/qt4/GuiDocument.cpp:672
 msgid "plain"
 msgstr "plain"
 
-#: src/frontends/qt4/GuiDocument.cpp:660
+#: src/frontends/qt4/GuiDocument.cpp:673
 msgid "headings"
 msgstr "headings"
 
-#: src/frontends/qt4/GuiDocument.cpp:661
+#: src/frontends/qt4/GuiDocument.cpp:674
 msgid "fancy"
 msgstr "fancy"
 
-#: src/frontends/qt4/GuiDocument.cpp:677
+#: src/frontends/qt4/GuiDocument.cpp:690
 msgid "B3"
 msgstr "B3"
 
-#: src/frontends/qt4/GuiDocument.cpp:678
+#: src/frontends/qt4/GuiDocument.cpp:691
 msgid "B4"
 msgstr "B4"
 
-#: src/frontends/qt4/GuiDocument.cpp:784
+#: src/frontends/qt4/GuiDocument.cpp:796
 msgid "LaTeX default"
 msgstr "LaTeX缺省设置"
 
-#: src/frontends/qt4/GuiDocument.cpp:790
+#: src/frontends/qt4/GuiDocument.cpp:802
 msgid "``text''"
 msgstr "``文本''"
 
-#: src/frontends/qt4/GuiDocument.cpp:791
+#: src/frontends/qt4/GuiDocument.cpp:803
 msgid "''text''"
 msgstr "''文本''"
 
-#: src/frontends/qt4/GuiDocument.cpp:792
+#: src/frontends/qt4/GuiDocument.cpp:804
 msgid ",,text``"
 msgstr ",,文本``"
 
-#: src/frontends/qt4/GuiDocument.cpp:793
+#: src/frontends/qt4/GuiDocument.cpp:805
 msgid ",,text''"
 msgstr ",,文本''"
 
-#: src/frontends/qt4/GuiDocument.cpp:794
+#: src/frontends/qt4/GuiDocument.cpp:806
 msgid "<<text>>"
 msgstr "<<文本>>"
 
-#: src/frontends/qt4/GuiDocument.cpp:795
+#: src/frontends/qt4/GuiDocument.cpp:807
 msgid ">>text<<"
 msgstr ">>文本<<"
 
-#: src/frontends/qt4/GuiDocument.cpp:811
+#: src/frontends/qt4/GuiDocument.cpp:822
 msgid "Numbered"
 msgstr "编号的"
 
-#: src/frontends/qt4/GuiDocument.cpp:812
+#: src/frontends/qt4/GuiDocument.cpp:823
 msgid "Appears in TOC"
 msgstr "显示于目录"
 
-#: src/frontends/qt4/GuiDocument.cpp:832
+#: src/frontends/qt4/GuiDocument.cpp:843
 msgid "Author-year"
 msgstr "作者－年份"
 
-#: src/frontends/qt4/GuiDocument.cpp:833
+#: src/frontends/qt4/GuiDocument.cpp:844
 msgid "Numerical"
 msgstr "数值"
 
-#: src/frontends/qt4/GuiDocument.cpp:888
+#: src/frontends/qt4/GuiDocument.cpp:901
 #, c-format
 msgid "Unavailable: %1$s"
 msgstr "不存在： %1$s"
 
-#: src/frontends/qt4/GuiDocument.cpp:960 src/frontends/qt4/GuiDocument.cpp:975
+#: src/frontends/qt4/GuiDocument.cpp:972 src/frontends/qt4/GuiDocument.cpp:987
 msgid "Document Class"
 msgstr "文档Class"
 
-#: src/frontends/qt4/GuiDocument.cpp:962
+#: src/frontends/qt4/GuiDocument.cpp:974
 msgid "Text Layout"
 msgstr "Text Layout"
 
-#: src/frontends/qt4/GuiDocument.cpp:964
+#: src/frontends/qt4/GuiDocument.cpp:976
 msgid "Page Margins"
 msgstr "页边距"
 
-#: src/frontends/qt4/GuiDocument.cpp:966
+#: src/frontends/qt4/GuiDocument.cpp:978
 msgid "Numbering & TOC"
 msgstr "Numbering & TOC"
 
-#: src/frontends/qt4/GuiDocument.cpp:968
+#: src/frontends/qt4/GuiDocument.cpp:980
 #, fuzzy
 msgid "PDF Properties"
 msgstr "属性"
 
-#: src/frontends/qt4/GuiDocument.cpp:969
+#: src/frontends/qt4/GuiDocument.cpp:981
 msgid "Math Options"
 msgstr "Math Options"
 
-#: src/frontends/qt4/GuiDocument.cpp:970
+#: src/frontends/qt4/GuiDocument.cpp:982
 msgid "Float Placement"
 msgstr "浮动项放置方式"
 
-#: src/frontends/qt4/GuiDocument.cpp:971
+#: src/frontends/qt4/GuiDocument.cpp:983
 msgid "Bullets"
 msgstr "Bullets"
 
-#: src/frontends/qt4/GuiDocument.cpp:972
+#: src/frontends/qt4/GuiDocument.cpp:984
 msgid "Branches"
 msgstr "分支"
 
-#: src/frontends/qt4/GuiDocument.cpp:973
+#: src/frontends/qt4/GuiDocument.cpp:985
 #, fuzzy
 msgid "Embedded Files"
 msgstr "嵌入项(m)|m"
 
-#: src/frontends/qt4/GuiDocument.cpp:974 src/frontends/qt4/GuiDocument.cpp:986
+#: src/frontends/qt4/GuiDocument.cpp:986 src/frontends/qt4/GuiDocument.cpp:998
 msgid "LaTeX Preamble"
 msgstr "LaTeX序"
 
-#: src/frontends/qt4/GuiDocument.cpp:1219
-#: src/frontends/qt4/GuiDocument.cpp:2036
+#: src/frontends/qt4/GuiDocument.cpp:1233
+msgid "Local layout file"
+msgstr ""
+
+#: src/frontends/qt4/GuiDocument.cpp:1234
+msgid ""
+"The layout file you have selected is a local layout\n"
+"file, not one in the system or user directory. Your\n"
+"document may not work with this layout if you do not\n"
+"keep the layout file in the same directory."
+msgstr ""
+
+#: src/frontends/qt4/GuiDocument.cpp:1238
+#, fuzzy
+msgid "&Set Layout"
+msgstr "Text Layout"
+
+#: src/frontends/qt4/GuiDocument.cpp:1246
+#: src/frontends/qt4/GuiDocument.cpp:2080
+#, fuzzy
+msgid "Error"
+msgstr "箭头"
+
+#: src/frontends/qt4/GuiDocument.cpp:1246
+#: src/frontends/qt4/GuiDocument.cpp:2080
+#, fuzzy
+msgid "Unable to set document class."
+msgstr "无法保存文档缺省设置"
+
+#: src/frontends/qt4/GuiDocument.cpp:1251
+#: src/frontends/qt4/GuiDocument.cpp:2069
 #, fuzzy
 msgid "Unapplied changes"
 msgstr "跟踪变化"
 
-#: src/frontends/qt4/GuiDocument.cpp:1220
-#: src/frontends/qt4/GuiDocument.cpp:2037
+#: src/frontends/qt4/GuiDocument.cpp:1252
+#: src/frontends/qt4/GuiDocument.cpp:2070
 msgid ""
-"Some changes in the dialog were not yet applied.If you do not apply now, "
-"they will be lost after this action."
+"Some changes in the dialog were not yet applied.\n"
+"If you do not apply now, they will be lost after this action."
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1222
-#: src/frontends/qt4/GuiDocument.cpp:2039
+#: src/frontends/qt4/GuiDocument.cpp:1254
+#: src/frontends/qt4/GuiDocument.cpp:2072
 msgid "&Dismiss"
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1249
+#: src/frontends/qt4/GuiDocument.cpp:1281
 #, fuzzy, c-format
 msgid "%1$s, %2$s"
 msgstr "%1$s 和 %2$s"
 
-#: src/frontends/qt4/GuiDocument.cpp:1254
+#: src/frontends/qt4/GuiDocument.cpp:1286
 #, fuzzy, c-format
 msgid "%1$s, %2$s, and %3$s"
 msgstr "%1$s 和 %2$s"
 
-#: src/frontends/qt4/GuiDocument.cpp:1299
+#: src/frontends/qt4/GuiDocument.cpp:1331
 #, c-format
 msgid "Package(s) required: %1$s."
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1305
+#: src/frontends/qt4/GuiDocument.cpp:1337
 #, fuzzy
 msgid "or"
 msgstr "表单"
 
-#: src/frontends/qt4/GuiDocument.cpp:1308
+#: src/frontends/qt4/GuiDocument.cpp:1340
 #, c-format
 msgid "Module required: %1$s."
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1317
+#: src/frontends/qt4/GuiDocument.cpp:1349
 #, c-format
 msgid "Modules excluded: %1$s."
 msgstr ""
 
-#: src/frontends/qt4/GuiDocument.cpp:1323
+#: src/frontends/qt4/GuiDocument.cpp:1355
 msgid "WARNING: Some packages are unavailable!"
 msgstr ""
 
+#: src/frontends/qt4/GuiDocument.cpp:2092
+#, fuzzy
+msgid "Can't set layout!"
+msgstr "改变的布局"
+
+#: src/frontends/qt4/GuiDocument.cpp:2093
+#, fuzzy, c-format
+msgid "Unable to set layout for ID: %1$s"
+msgstr "无法保存文档缺省设置"
+
 #: src/frontends/qt4/GuiERT.cpp:28
 msgid "TeX Code Settings"
 msgstr "TeX Code Settings"
@@ -16011,39 +16038,39 @@ msgstr "程序列表"
 msgid "%1$s Errors (%2$s)"
 msgstr "%1$s 错误 (%2$s)"
 
-#: src/frontends/qt4/GuiExternal.cpp:82 src/frontends/qt4/GuiGraphics.cpp:814
+#: src/frontends/qt4/GuiExternal.cpp:82 src/frontends/qt4/GuiGraphics.cpp:803
 msgid "Top left"
 msgstr "顶边偏左"
 
-#: src/frontends/qt4/GuiExternal.cpp:82 src/frontends/qt4/GuiGraphics.cpp:814
+#: src/frontends/qt4/GuiExternal.cpp:82 src/frontends/qt4/GuiGraphics.cpp:803
 msgid "Bottom left"
 msgstr "下边偏左"
 
-#: src/frontends/qt4/GuiExternal.cpp:82 src/frontends/qt4/GuiGraphics.cpp:814
+#: src/frontends/qt4/GuiExternal.cpp:82 src/frontends/qt4/GuiGraphics.cpp:803
 msgid "Baseline left"
 msgstr "底部偏左"
 
-#: src/frontends/qt4/GuiExternal.cpp:83 src/frontends/qt4/GuiGraphics.cpp:815
+#: src/frontends/qt4/GuiExternal.cpp:83 src/frontends/qt4/GuiGraphics.cpp:804
 msgid "Top center"
 msgstr "顶边中间"
 
-#: src/frontends/qt4/GuiExternal.cpp:83 src/frontends/qt4/GuiGraphics.cpp:815
+#: src/frontends/qt4/GuiExternal.cpp:83 src/frontends/qt4/GuiGraphics.cpp:804
 msgid "Bottom center"
 msgstr "下边中间"
 
-#: src/frontends/qt4/GuiExternal.cpp:83 src/frontends/qt4/GuiGraphics.cpp:815
+#: src/frontends/qt4/GuiExternal.cpp:83 src/frontends/qt4/GuiGraphics.cpp:804
 msgid "Baseline center"
 msgstr "底部中间"
 
-#: src/frontends/qt4/GuiExternal.cpp:84 src/frontends/qt4/GuiGraphics.cpp:816
+#: src/frontends/qt4/GuiExternal.cpp:84 src/frontends/qt4/GuiGraphics.cpp:805
 msgid "Top right"
 msgstr "顶边偏右"
 
-#: src/frontends/qt4/GuiExternal.cpp:84 src/frontends/qt4/GuiGraphics.cpp:816
+#: src/frontends/qt4/GuiExternal.cpp:84 src/frontends/qt4/GuiGraphics.cpp:805
 msgid "Bottom right"
 msgstr "下边偏右"
 
-#: src/frontends/qt4/GuiExternal.cpp:84 src/frontends/qt4/GuiGraphics.cpp:816
+#: src/frontends/qt4/GuiExternal.cpp:84 src/frontends/qt4/GuiGraphics.cpp:805
 msgid "Baseline right"
 msgstr "底部偏右"
 
@@ -16063,15 +16090,15 @@ msgstr "选择外部文件"
 msgid "Float Settings"
 msgstr "浮动项设置"
 
-#: src/frontends/qt4/GuiGraphics.cpp:115 src/frontends/qt4/GuiPrefs.cpp:700
+#: src/frontends/qt4/GuiGraphics.cpp:115 src/frontends/qt4/GuiPrefs.cpp:831
 msgid "Graphics"
 msgstr "图形"
 
-#: src/frontends/qt4/GuiGraphics.cpp:734
+#: src/frontends/qt4/GuiGraphics.cpp:723
 msgid "Select graphics file"
 msgstr "选择图形文件"
 
-#: src/frontends/qt4/GuiGraphics.cpp:746
+#: src/frontends/qt4/GuiGraphics.cpp:735
 msgid "Clipart|#C#c"
 msgstr "图|#C#c"
 
@@ -16150,7 +16177,7 @@ msgstr "无法找到版本控制记录"
 msgid "Math Matrix"
 msgstr "矩阵"
 
-#: src/frontends/qt4/GuiNomencl.cpp:32 src/insets/InsetNomencl.cpp:103
+#: src/frontends/qt4/GuiNomencl.cpp:32 src/insets/InsetNomencl.cpp:114
 msgid "Nomenclature"
 msgstr "术语"
 
@@ -16176,176 +16203,184 @@ msgstr ""
 " Normally, you won't need to set this, since the largest label width of all "
 "the items is used."
 
-#: src/frontends/qt4/GuiPrefs.cpp:195
+#: src/frontends/qt4/GuiPrefs.cpp:127
+msgid "System files|#S#s"
+msgstr "系统文件|#S#s"
+
+#: src/frontends/qt4/GuiPrefs.cpp:131
+msgid "User files|#U#u"
+msgstr "用户文件|#U#u"
+
+#: src/frontends/qt4/GuiPrefs.cpp:325
 msgid "Plain text"
 msgstr "存文本"
 
-#: src/frontends/qt4/GuiPrefs.cpp:226
+#: src/frontends/qt4/GuiPrefs.cpp:356
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/frontends/qt4/GuiPrefs.cpp:253
+#: src/frontends/qt4/GuiPrefs.cpp:383
 #, fuzzy
 msgid "Keyboard/Mouse"
 msgstr "键盘"
 
-#: src/frontends/qt4/GuiPrefs.cpp:428
+#: src/frontends/qt4/GuiPrefs.cpp:558
 msgid "Screen fonts"
 msgstr "显示字体"
 
-#: src/frontends/qt4/GuiPrefs.cpp:602
+#: src/frontends/qt4/GuiPrefs.cpp:732
 msgid "Colors"
 msgstr "颜色"
 
-#: src/frontends/qt4/GuiPrefs.cpp:771
+#: src/frontends/qt4/GuiPrefs.cpp:902
 msgid "Paths"
 msgstr "路径"
 
-#: src/frontends/qt4/GuiPrefs.cpp:827
+#: src/frontends/qt4/GuiPrefs.cpp:957
 #, fuzzy
 msgid "Select directory for example files"
 msgstr "选择模板文件"
 
-#: src/frontends/qt4/GuiPrefs.cpp:837
+#: src/frontends/qt4/GuiPrefs.cpp:966
 msgid "Select a document templates directory"
 msgstr "选择一个文本模版目录"
 
-#: src/frontends/qt4/GuiPrefs.cpp:847
+#: src/frontends/qt4/GuiPrefs.cpp:975
 msgid "Select a temporary directory"
 msgstr "选择一个临时目录"
 
-#: src/frontends/qt4/GuiPrefs.cpp:857
+#: src/frontends/qt4/GuiPrefs.cpp:984
 msgid "Select a backups directory"
 msgstr "选择一个备份目录"
 
-#: src/frontends/qt4/GuiPrefs.cpp:867
+#: src/frontends/qt4/GuiPrefs.cpp:993
 msgid "Select a document directory"
 msgstr "选择一个文件目录"
 
-#: src/frontends/qt4/GuiPrefs.cpp:877
+#: src/frontends/qt4/GuiPrefs.cpp:1002
 msgid "Give a filename for the LyX server pipe"
 msgstr "提供一个LyX服务器管道文件名"
 
-#: src/frontends/qt4/GuiPrefs.cpp:890 src/frontends/qt4/GuiSpellchecker.cpp:57
+#: src/frontends/qt4/GuiPrefs.cpp:1015
+#: src/frontends/qt4/GuiSpellchecker.cpp:57
 msgid "Spellchecker"
 msgstr "拼写检查器"
 
-#: src/frontends/qt4/GuiPrefs.cpp:912
+#: src/frontends/qt4/GuiPrefs.cpp:1037
 msgid "ispell"
 msgstr "ispell"
 
-#: src/frontends/qt4/GuiPrefs.cpp:913
+#: src/frontends/qt4/GuiPrefs.cpp:1038
 msgid "aspell"
 msgstr "aspell"
 
-#: src/frontends/qt4/GuiPrefs.cpp:914
+#: src/frontends/qt4/GuiPrefs.cpp:1039
 msgid "hspell"
 msgstr "hspell"
 
-#: src/frontends/qt4/GuiPrefs.cpp:916
+#: src/frontends/qt4/GuiPrefs.cpp:1041
 msgid "pspell (library)"
 msgstr "pspell (库)"
 
-#: src/frontends/qt4/GuiPrefs.cpp:919
+#: src/frontends/qt4/GuiPrefs.cpp:1044
 msgid "aspell (library)"
 msgstr "aspell (库)"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1000
+#: src/frontends/qt4/GuiPrefs.cpp:1124
 msgid "Converters"
 msgstr "转换器"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1270
+#: src/frontends/qt4/GuiPrefs.cpp:1394
 msgid "File formats"
 msgstr "文件格式"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1448
+#: src/frontends/qt4/GuiPrefs.cpp:1572
 msgid "Format in use"
 msgstr "使用中格式"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1449
+#: src/frontends/qt4/GuiPrefs.cpp:1573
 msgid "Cannot remove a Format used by a Converter. Remove the converter first."
 msgstr "不能删除一个正被使用的格式。请先删除此转换器。"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1558
+#: src/frontends/qt4/GuiPrefs.cpp:1680
 msgid "Printer"
 msgstr "打印机"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1656 src/frontends/qt4/GuiPrefs.cpp:2243
+#: src/frontends/qt4/GuiPrefs.cpp:1778 src/frontends/qt4/GuiPrefs.cpp:2361
 msgid "User interface"
 msgstr "用户界面"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1778
+#: src/frontends/qt4/GuiPrefs.cpp:1898
 #, fuzzy
 msgid "Shortcuts"
 msgstr "快捷键(&h)"
 
-#: src/frontends/qt4/GuiPrefs.cpp:1783
+#: src/frontends/qt4/GuiPrefs.cpp:1903
 #, fuzzy
 msgid "Function"
 msgstr "函数"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2126 src/frontends/qt4/GuiPrefs.cpp:2133
-#: src/frontends/qt4/GuiPrefs.cpp:2140 src/frontends/qt4/GuiPrefs.cpp:2152
+#: src/frontends/qt4/GuiPrefs.cpp:2244 src/frontends/qt4/GuiPrefs.cpp:2251
+#: src/frontends/qt4/GuiPrefs.cpp:2258 src/frontends/qt4/GuiPrefs.cpp:2270
 #, fuzzy
 msgid "Failed to create shortcut"
 msgstr "未能创建目录。退出。"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2127
+#: src/frontends/qt4/GuiPrefs.cpp:2245
 #, fuzzy
 msgid "Unknown or invalid LyX function"
 msgstr "未知函数"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2134
-#, fuzzy
+#: src/frontends/qt4/GuiPrefs.cpp:2252
 msgid "Invalid or empty key sequence"
-msgstr "无效文件名"
+msgstr ""
 
-#: src/frontends/qt4/GuiPrefs.cpp:2141
+#: src/frontends/qt4/GuiPrefs.cpp:2259
 msgid "Shortcut is already defined"
 msgstr ""
 
-#: src/frontends/qt4/GuiPrefs.cpp:2153
+#: src/frontends/qt4/GuiPrefs.cpp:2271
 #, fuzzy
 msgid "Can not insert shortcut to the list"
 msgstr "添加分支"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2173
+#: src/frontends/qt4/GuiPrefs.cpp:2291
 msgid "Identity"
 msgstr "身份"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2364
+#: src/frontends/qt4/GuiPrefs.cpp:2481
 msgid "Choose bind file"
 msgstr "选择快捷键文件"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2365
+#: src/frontends/qt4/GuiPrefs.cpp:2482
 msgid "LyX bind files (*.bind)"
 msgstr "LyX快捷键文件 (*.bind)"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2372
+#: src/frontends/qt4/GuiPrefs.cpp:2488
 msgid "Choose UI file"
 msgstr "选择用户界面文件"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2373
+#: src/frontends/qt4/GuiPrefs.cpp:2489
 msgid "LyX UI files (*.ui)"
 msgstr "LyX用户界面文件 (*.ui)"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2380
+#: src/frontends/qt4/GuiPrefs.cpp:2495
 msgid "Choose keyboard map"
 msgstr "选择键盘映射"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2381
+#: src/frontends/qt4/GuiPrefs.cpp:2496
 msgid "LyX keyboard maps (*.kmap)"
 msgstr "LyX键盘映射 (*.kmap)"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2389 src/frontends/qt4/GuiPrefs.cpp:2393
+#: src/frontends/qt4/GuiPrefs.cpp:2502
 msgid "Choose personal dictionary"
 msgstr "选择用户目录"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2390
+#: src/frontends/qt4/GuiPrefs.cpp:2503
 msgid "*.pws"
 msgstr "*.pws"
 
-#: src/frontends/qt4/GuiPrefs.cpp:2394
+#: src/frontends/qt4/GuiPrefs.cpp:2503
 msgid "*.ispell"
 msgstr "*.ispell"
 
@@ -16353,11 +16388,11 @@ msgstr "*.ispell"
 msgid "Print Document"
 msgstr "打印文件"
 
-#: src/frontends/qt4/GuiPrint.cpp:89
+#: src/frontends/qt4/GuiPrint.cpp:88
 msgid "Print to file"
 msgstr "打印到文件"
 
-#: src/frontends/qt4/GuiPrint.cpp:90
+#: src/frontends/qt4/GuiPrint.cpp:89
 msgid "PostScript files (*.ps)"
 msgstr "PostScript文件 (*.ps)"
 
@@ -16431,410 +16466,409 @@ msgstr "已检查一个单词."
 msgid "Spelling check completed"
 msgstr "拼写检查结束"
 
-#: src/frontends/qt4/GuiSymbols.cpp:49
+#: src/frontends/qt4/GuiSymbols.cpp:50
 #, fuzzy
 msgid "Basic Latin"
-msgstr "LatinOn"
+msgstr "Variation"
 
-#: src/frontends/qt4/GuiSymbols.cpp:50
+#: src/frontends/qt4/GuiSymbols.cpp:51
 #, fuzzy
 msgid "Latin-1 Supplement"
 msgstr "Supplementary"
 
-#: src/frontends/qt4/GuiSymbols.cpp:51
+#: src/frontends/qt4/GuiSymbols.cpp:52
 msgid "Latin Extended-A"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:52
+#: src/frontends/qt4/GuiSymbols.cpp:53
 msgid "Latin Extended-B"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:53
+#: src/frontends/qt4/GuiSymbols.cpp:54
 #, fuzzy
 msgid "IPA Extensions"
 msgstr "后缀(&x):"
 
-#: src/frontends/qt4/GuiSymbols.cpp:54
+#: src/frontends/qt4/GuiSymbols.cpp:55
 msgid "Spacing Modifier Letters"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:55
+#: src/frontends/qt4/GuiSymbols.cpp:56
 msgid "Combining Diacritical Marks"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:57
+#: src/frontends/qt4/GuiSymbols.cpp:58
 msgid "Cyrillic"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:60
+#: src/frontends/qt4/GuiSymbols.cpp:61
 #, fuzzy
 msgid "Arabic"
 msgstr "A-M|阿拉伯语(埃及)"
 
-#: src/frontends/qt4/GuiSymbols.cpp:61
+#: src/frontends/qt4/GuiSymbols.cpp:62
 msgid "Devanagari"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:62
+#: src/frontends/qt4/GuiSymbols.cpp:63
 #, fuzzy
 msgid "Bengali"
 msgstr "开始"
 
-#: src/frontends/qt4/GuiSymbols.cpp:63
+#: src/frontends/qt4/GuiSymbols.cpp:64
 msgid "Gurmukhi"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:64
+#: src/frontends/qt4/GuiSymbols.cpp:65
 #, fuzzy
 msgid "Gujarati"
 msgstr "SubVariation"
 
-#: src/frontends/qt4/GuiSymbols.cpp:65
+#: src/frontends/qt4/GuiSymbols.cpp:66
 msgid "Oriya"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:66
+#: src/frontends/qt4/GuiSymbols.cpp:67
 #, fuzzy
 msgid "Tamil"
 msgstr "邮件"
 
-#: src/frontends/qt4/GuiSymbols.cpp:67
+#: src/frontends/qt4/GuiSymbols.cpp:68
 msgid "Telugu"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:68
+#: src/frontends/qt4/GuiSymbols.cpp:69
 #, fuzzy
 msgid "Kannada"
 msgstr "加拿大语"
 
-#: src/frontends/qt4/GuiSymbols.cpp:69
+#: src/frontends/qt4/GuiSymbols.cpp:70
 msgid "Malayalam"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:71
+#: src/frontends/qt4/GuiSymbols.cpp:72
 #, fuzzy
 msgid "Lao"
 msgstr "显示布局 "
 
-#: src/frontends/qt4/GuiSymbols.cpp:72
+#: src/frontends/qt4/GuiSymbols.cpp:73
 #, fuzzy
 msgid "Tibetan"
 msgstr "beta"
 
-#: src/frontends/qt4/GuiSymbols.cpp:73
+#: src/frontends/qt4/GuiSymbols.cpp:74
 #, fuzzy
 msgid "Georgian"
 msgstr "德语"
 
-#: src/frontends/qt4/GuiSymbols.cpp:74
+#: src/frontends/qt4/GuiSymbols.cpp:75
 msgid "Hangul Jamo"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:75
+#: src/frontends/qt4/GuiSymbols.cpp:76
 #, fuzzy
 msgid "Phonetic Extensions"
 msgstr "后缀(&x):"
 
-#: src/frontends/qt4/GuiSymbols.cpp:76
+#: src/frontends/qt4/GuiSymbols.cpp:77
 msgid "Latin Extended Additional"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:77
+#: src/frontends/qt4/GuiSymbols.cpp:78
 msgid "Greek Extended"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:78
+#: src/frontends/qt4/GuiSymbols.cpp:79
 #, fuzzy
 msgid "General Punctuation"
 msgstr "通用信息"
 
-#: src/frontends/qt4/GuiSymbols.cpp:79
+#: src/frontends/qt4/GuiSymbols.cpp:80
 #, fuzzy
 msgid "Superscripts and Subscripts"
 msgstr "上标(S)|S"
 
-#: src/frontends/qt4/GuiSymbols.cpp:80
+#: src/frontends/qt4/GuiSymbols.cpp:81
 msgid "Currency Symbols"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:81
+#: src/frontends/qt4/GuiSymbols.cpp:82
 msgid "Combining Diacritical Marks for Symbols"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:82
+#: src/frontends/qt4/GuiSymbols.cpp:83
 #, fuzzy
 msgid "Letterlike Symbols"
 msgstr "音标(y)|y"
 
-#: src/frontends/qt4/GuiSymbols.cpp:83
+#: src/frontends/qt4/GuiSymbols.cpp:84
 #, fuzzy
 msgid "Number Forms"
 msgstr "行数"
 
-#: src/frontends/qt4/GuiSymbols.cpp:85
+#: src/frontends/qt4/GuiSymbols.cpp:86
 #, fuzzy
 msgid "Mathematical Operators"
 msgstr "Mathematica|a"
 
-#: src/frontends/qt4/GuiSymbols.cpp:86
+#: src/frontends/qt4/GuiSymbols.cpp:87
 #, fuzzy
 msgid "Miscellaneous Technical"
 msgstr "Miscel·lània"
 
-#: src/frontends/qt4/GuiSymbols.cpp:87
+#: src/frontends/qt4/GuiSymbols.cpp:88
 #, fuzzy
 msgid "Control Pictures"
 msgstr "猜想"
 
-#: src/frontends/qt4/GuiSymbols.cpp:88
+#: src/frontends/qt4/GuiSymbols.cpp:89
 msgid "Optical Character Recognition"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:89
+#: src/frontends/qt4/GuiSymbols.cpp:90
 msgid "Enclosed Alphanumerics"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:90
+#: src/frontends/qt4/GuiSymbols.cpp:91
 #, fuzzy
 msgid "Box Drawing"
 msgstr "边框设定"
 
-#: src/frontends/qt4/GuiSymbols.cpp:91
+#: src/frontends/qt4/GuiSymbols.cpp:92
 #, fuzzy
 msgid "Block Elements"
 msgstr "致谢"
 
-#: src/frontends/qt4/GuiSymbols.cpp:92
+#: src/frontends/qt4/GuiSymbols.cpp:93
 #, fuzzy
 msgid "Geometric Shapes"
 msgstr "斜字体文本"
 
-#: src/frontends/qt4/GuiSymbols.cpp:93
+#: src/frontends/qt4/GuiSymbols.cpp:94
 #, fuzzy
 msgid "Miscellaneous Symbols"
 msgstr "Miscel·lània"
 
-#: src/frontends/qt4/GuiSymbols.cpp:94
+#: src/frontends/qt4/GuiSymbols.cpp:95
 #, fuzzy
 msgid "Dingbats"
 msgstr "Dings 1"
 
-#: src/frontends/qt4/GuiSymbols.cpp:95
+#: src/frontends/qt4/GuiSymbols.cpp:96
 msgid "Miscellaneous Mathematical Symbols-A"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:96
+#: src/frontends/qt4/GuiSymbols.cpp:97
 msgid "CJK Symbols and Punctuation"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:97
+#: src/frontends/qt4/GuiSymbols.cpp:98
 msgid "Hiragana"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:98
+#: src/frontends/qt4/GuiSymbols.cpp:99
 #, fuzzy
 msgid "Katakana"
 msgstr "加泰罗尼亚语"
 
-#: src/frontends/qt4/GuiSymbols.cpp:99
+#: src/frontends/qt4/GuiSymbols.cpp:100
 #, fuzzy
 msgid "Bopomofo"
 msgstr "行下(&m)"
 
-#: src/frontends/qt4/GuiSymbols.cpp:100
+#: src/frontends/qt4/GuiSymbols.cpp:101
 msgid "Hangul Compatibility Jamo"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:101
-#, fuzzy
+#: src/frontends/qt4/GuiSymbols.cpp:102
 msgid "Kanbun"
-msgstr "无"
+msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:102
+#: src/frontends/qt4/GuiSymbols.cpp:103
 msgid "Enclosed CJK Letters and Months"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:103
+#: src/frontends/qt4/GuiSymbols.cpp:104
 msgid "CJK Compatibility"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:104
+#: src/frontends/qt4/GuiSymbols.cpp:105
 msgid "CJK Unified Ideographs"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:105
+#: src/frontends/qt4/GuiSymbols.cpp:106
 msgid "Hangul Syllables"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:106
+#: src/frontends/qt4/GuiSymbols.cpp:107
 msgid "High Surrogates"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:107
+#: src/frontends/qt4/GuiSymbols.cpp:108
 msgid "Private Use High Surrogates"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:108
+#: src/frontends/qt4/GuiSymbols.cpp:109
 msgid "Low Surrogates"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:109
+#: src/frontends/qt4/GuiSymbols.cpp:110
 msgid "Private Use Area"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:110
+#: src/frontends/qt4/GuiSymbols.cpp:111
 msgid "CJK Compatibility Ideographs"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:111
+#: src/frontends/qt4/GuiSymbols.cpp:112
 msgid "Alphabetic Presentation Forms"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:112
+#: src/frontends/qt4/GuiSymbols.cpp:113
 msgid "Arabic Presentation Forms-A"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:113
+#: src/frontends/qt4/GuiSymbols.cpp:114
 msgid "Combining Half Marks"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:114
+#: src/frontends/qt4/GuiSymbols.cpp:115
 msgid "CJK Compatibility Forms"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:115
+#: src/frontends/qt4/GuiSymbols.cpp:116
 msgid "Small Form Variants"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:116
+#: src/frontends/qt4/GuiSymbols.cpp:117
 msgid "Arabic Presentation Forms-B"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:117
+#: src/frontends/qt4/GuiSymbols.cpp:118
 msgid "Halfwidth and Fullwidth Forms"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:118
+#: src/frontends/qt4/GuiSymbols.cpp:119
 #, fuzzy
 msgid "Specials"
 msgstr "调试邮件"
 
-#: src/frontends/qt4/GuiSymbols.cpp:119
+#: src/frontends/qt4/GuiSymbols.cpp:120
 msgid "Linear B Syllabary"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:120
+#: src/frontends/qt4/GuiSymbols.cpp:121
 msgid "Linear B Ideograms"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:121
+#: src/frontends/qt4/GuiSymbols.cpp:122
 #, fuzzy
 msgid "Aegean Numbers"
 msgstr "页码"
 
-#: src/frontends/qt4/GuiSymbols.cpp:122
+#: src/frontends/qt4/GuiSymbols.cpp:123
 msgid "Ancient Greek Numbers"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:123
+#: src/frontends/qt4/GuiSymbols.cpp:124
 #, fuzzy
 msgid "Old Italic"
 msgstr "斜体"
 
-#: src/frontends/qt4/GuiSymbols.cpp:124
+#: src/frontends/qt4/GuiSymbols.cpp:125
 #, fuzzy
 msgid "Gothic"
 msgstr "coth"
 
-#: src/frontends/qt4/GuiSymbols.cpp:125
+#: src/frontends/qt4/GuiSymbols.cpp:126
 msgid "Ugaritic"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:126
+#: src/frontends/qt4/GuiSymbols.cpp:127
 msgid "Old Persian"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:127
+#: src/frontends/qt4/GuiSymbols.cpp:128
 #, fuzzy
 msgid "Deseret"
 msgstr "重置"
 
-#: src/frontends/qt4/GuiSymbols.cpp:128
+#: src/frontends/qt4/GuiSymbols.cpp:129
 #, fuzzy
 msgid "Shavian"
 msgstr "拉脱维亚语"
 
-#: src/frontends/qt4/GuiSymbols.cpp:129
+#: src/frontends/qt4/GuiSymbols.cpp:130
 msgid "Osmanya"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:130
+#: src/frontends/qt4/GuiSymbols.cpp:131
 #, fuzzy
 msgid "Cypriot Syllabary"
 msgstr "Corollary"
 
-#: src/frontends/qt4/GuiSymbols.cpp:131
+#: src/frontends/qt4/GuiSymbols.cpp:132
 #, fuzzy
 msgid "Kharoshthi"
 msgstr "varnothing"
 
-#: src/frontends/qt4/GuiSymbols.cpp:132
+#: src/frontends/qt4/GuiSymbols.cpp:133
 msgid "Byzantine Musical Symbols"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:133
+#: src/frontends/qt4/GuiSymbols.cpp:134
 #, fuzzy
 msgid "Musical Symbols"
 msgstr "音标(y)|y"
 
-#: src/frontends/qt4/GuiSymbols.cpp:134
+#: src/frontends/qt4/GuiSymbols.cpp:135
 msgid "Ancient Greek Musical Notation"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:135
+#: src/frontends/qt4/GuiSymbols.cpp:136
 msgid "Tai Xuan Jing Symbols"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:136
+#: src/frontends/qt4/GuiSymbols.cpp:137
 msgid "Mathematical Alphanumeric Symbols"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:137
+#: src/frontends/qt4/GuiSymbols.cpp:138
 msgid "CJK Unified Ideographs Extension B"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:138
+#: src/frontends/qt4/GuiSymbols.cpp:139
 msgid "CJK Compatibility Ideographs Supplement"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:139
+#: src/frontends/qt4/GuiSymbols.cpp:140
 #, fuzzy
 msgid "Tags"
 msgstr "页面"
 
-#: src/frontends/qt4/GuiSymbols.cpp:140
+#: src/frontends/qt4/GuiSymbols.cpp:141
 msgid "Variation Selectors Supplement"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:141
+#: src/frontends/qt4/GuiSymbols.cpp:142
 msgid "Supplementary Private Use Area-A"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:142
+#: src/frontends/qt4/GuiSymbols.cpp:143
 msgid "Supplementary Private Use Area-B"
 msgstr ""
 
-#: src/frontends/qt4/GuiSymbols.cpp:161
+#: src/frontends/qt4/GuiSymbols.cpp:162
 #, fuzzy
 msgid "Symbols"
 msgstr "符号"
 
-#: src/frontends/qt4/GuiSymbols.cpp:324
+#: src/frontends/qt4/GuiSymbols.cpp:325
 #, fuzzy
 msgid "Character: "
 msgstr "字符集"
 
-#: src/frontends/qt4/GuiSymbols.cpp:325
+#: src/frontends/qt4/GuiSymbols.cpp:326
 msgid "Code Point: "
 msgstr ""
 
@@ -16846,7 +16880,7 @@ msgstr "表格设置"
 msgid "Insert Table"
 msgstr "插入表格"
 
-#: src/frontends/qt4/GuiTexinfo.cpp:81
+#: src/frontends/qt4/GuiTexinfo.cpp:51
 msgid "TeX Information"
 msgstr "TeX信息"
 
@@ -16854,91 +16888,135 @@ msgstr "TeX信息"
 msgid "Outline"
 msgstr "概要"
 
-#: src/frontends/qt4/GuiToc.cpp:223 src/insets/InsetTOC.cpp:54
+#: src/frontends/qt4/GuiToc.cpp:223 src/insets/InsetTOC.cpp:48
 msgid "Table of Contents"
 msgstr "目录"
 
+#: src/frontends/qt4/GuiToc.cpp:225 src/frontends/qt4/Menus.cpp:1002
+#, fuzzy
+msgid "List of Equations"
+msgstr "程序列表列表"
+
+#: src/frontends/qt4/GuiToc.cpp:227 src/frontends/qt4/Menus.cpp:1012
+#, fuzzy
+msgid "List of Foot notes"
+msgstr "图像列表"
+
+#: src/frontends/qt4/GuiToc.cpp:229 src/frontends/qt4/Menus.cpp:1006
+#, fuzzy
+msgid "List of Listings"
+msgstr "程序列表列表"
+
+#: src/frontends/qt4/GuiToc.cpp:231 src/frontends/qt4/Menus.cpp:1004
+#, fuzzy
+msgid "List of Indexes"
+msgstr "表格列表"
+
+#: src/frontends/qt4/GuiToc.cpp:233 src/frontends/qt4/Menus.cpp:1008
+#, fuzzy
+msgid "List of Marginal notes"
+msgstr "表格列表"
+
+#: src/frontends/qt4/GuiToc.cpp:235 src/frontends/qt4/Menus.cpp:1010
+#, fuzzy
+msgid "List of Notes"
+msgstr "表格列表"
+
+#: src/frontends/qt4/GuiToc.cpp:237 src/frontends/qt4/Menus.cpp:1016
+#, fuzzy
+msgid "List of Citations"
+msgstr "程序列表列表"
+
+#: src/frontends/qt4/GuiToc.cpp:239 src/frontends/qt4/Menus.cpp:1014
+#, fuzzy
+msgid "Labels and References"
+msgstr "使用未引用的文献"
+
+#: src/frontends/qt4/GuiToolbar.cpp:492
+msgid "Enter characters to filter the layout list."
+msgstr ""
+
 #: src/frontends/qt4/GuiVSpace.cpp:43
 msgid "Vertical Space Settings"
 msgstr "纵向距离设置"
 
-#: src/frontends/qt4/GuiView.cpp:114
+#: src/frontends/qt4/GuiView.cpp:115
 msgid "unknown version"
 msgstr "未知的版本"
 
-#: src/frontends/qt4/GuiView.cpp:179
+#: src/frontends/qt4/GuiView.cpp:180
 msgid "Small-sized icons"
 msgstr "小图标"
 
-#: src/frontends/qt4/GuiView.cpp:186
+#: src/frontends/qt4/GuiView.cpp:187
 msgid "Normal-sized icons"
 msgstr "中图标"
 
-#: src/frontends/qt4/GuiView.cpp:193
+#: src/frontends/qt4/GuiView.cpp:194
 msgid "Big-sized icons"
 msgstr "大图标"
 
-#: src/frontends/qt4/GuiView.cpp:623 src/frontends/qt4/GuiView.cpp:624
-#: src/mathed/MathMacroTemplate.cpp:460
+#: src/frontends/qt4/GuiView.cpp:590 src/frontends/qt4/GuiView.cpp:591
+#: src/mathed/MathMacroTemplate.cpp:536
 msgid "LyX"
 msgstr "LyX"
 
-#: src/frontends/qt4/GuiView.cpp:1117
+#: src/frontends/qt4/GuiView.cpp:1084
 msgid "Select template file"
 msgstr "选择模板文件"
 
-#: src/frontends/qt4/GuiView.cpp:1119 src/frontends/qt4/GuiView.cpp:1515
+#: src/frontends/qt4/GuiView.cpp:1086 src/frontends/qt4/GuiView.cpp:1476
 msgid "Templates|#T#t"
 msgstr "模板|#T#t"
 
-#: src/frontends/qt4/GuiView.cpp:1123 src/frontends/qt4/GuiView.cpp:1184
-#: src/frontends/qt4/GuiView.cpp:1440 src/frontends/qt4/GuiView.cpp:1520
+#: src/frontends/qt4/GuiView.cpp:1090 src/frontends/qt4/GuiView.cpp:1149
+#: src/frontends/qt4/GuiView.cpp:1402 src/frontends/qt4/GuiView.cpp:1481
 msgid "LyX Documents (*.lyx)"
 msgstr "LyX 文档 (*.lyx)"
 
-#: src/frontends/qt4/GuiView.cpp:1141
+#: src/frontends/qt4/GuiView.cpp:1107
 msgid "Document not loaded."
 msgstr "文档未读入"
 
-#: src/frontends/qt4/GuiView.cpp:1177
+#: src/frontends/qt4/GuiView.cpp:1143
 msgid "Select document to open"
 msgstr "选择要打开的文档"
 
-#: src/frontends/qt4/GuiView.cpp:1179 src/frontends/qt4/GuiView.cpp:1313
-#: src/frontends/qt4/GuiView.cpp:1434
+#: src/frontends/qt4/GuiView.cpp:1145 src/frontends/qt4/GuiView.cpp:1277
+#: src/frontends/qt4/GuiView.cpp:1396
 msgid "Examples|#E#e"
 msgstr "示例|#E#e"
 
-#: src/frontends/qt4/GuiView.cpp:1217
+#: src/frontends/qt4/GuiView.cpp:1181
 #, c-format
 msgid "Opening document %1$s..."
 msgstr "打开文档 %1$s ..."
 
-#: src/frontends/qt4/GuiView.cpp:1225
+#: src/frontends/qt4/GuiView.cpp:1189
 #, c-format
 msgid "Document %1$s opened."
 msgstr "文档 %1$s 已打开"
 
-#: src/frontends/qt4/GuiView.cpp:1227
+#: src/frontends/qt4/GuiView.cpp:1191
 #, c-format
 msgid "Could not open document %1$s"
 msgstr "无法打开文档 %1$s"
 
-#: src/frontends/qt4/GuiView.cpp:1256
+#: src/frontends/qt4/GuiView.cpp:1220
 msgid "Couldn't import file"
 msgstr "无法导入文件"
 
-#: src/frontends/qt4/GuiView.cpp:1257
+#: src/frontends/qt4/GuiView.cpp:1221
 #, c-format
 msgid "No information for importing the format %1$s."
 msgstr "无格式 %1$s 的导入信息."
 
-#: src/frontends/qt4/GuiView.cpp:1308
+#: src/frontends/qt4/GuiView.cpp:1272
 #, c-format
 msgid "Select %1$s file to import"
 msgstr "选择导入文件 %1$s "
 
-#: src/frontends/qt4/GuiView.cpp:1361 src/frontends/qt4/GuiView.cpp:1541
+#: src/frontends/qt4/GuiView.cpp:1323 src/frontends/qt4/GuiView.cpp:1502
 #, fuzzy, c-format
 msgid ""
 "The document %1$s already exists.\n"
@@ -16948,41 +17026,41 @@ msgstr ""
 "文件 %1 已经存在\n"
 "您要覆盖它吗？"
 
-#: src/frontends/qt4/GuiView.cpp:1363 src/frontends/qt4/GuiView.cpp:1545
+#: src/frontends/qt4/GuiView.cpp:1325 src/frontends/qt4/GuiView.cpp:1506
 msgid "Overwrite document?"
 msgstr "覆盖文件?"
 
-#: src/frontends/qt4/GuiView.cpp:1372
+#: src/frontends/qt4/GuiView.cpp:1334
 #, c-format
 msgid "Importing %1$s..."
 msgstr "导入 %1$s..."
 
-#: src/frontends/qt4/GuiView.cpp:1375
+#: src/frontends/qt4/GuiView.cpp:1337
 msgid "imported."
 msgstr "导入的。"
 
-#: src/frontends/qt4/GuiView.cpp:1377
+#: src/frontends/qt4/GuiView.cpp:1339
 #, fuzzy
 msgid "file not imported!"
 msgstr "文件没有找到"
 
-#: src/frontends/qt4/GuiView.cpp:1432
+#: src/frontends/qt4/GuiView.cpp:1394
 msgid "Select LyX document to insert"
 msgstr "选择插入的LyX文档"
 
-#: src/frontends/qt4/GuiView.cpp:1475
+#: src/frontends/qt4/GuiView.cpp:1436
 msgid "Select file to insert"
 msgstr "选择插入文件"
 
-#: src/frontends/qt4/GuiView.cpp:1512
+#: src/frontends/qt4/GuiView.cpp:1473
 msgid "Choose a filename to save document as"
 msgstr "选择另存为文件名"
 
-#: src/frontends/qt4/GuiView.cpp:1546 src/frontends/qt4/GuiView.cpp:1591
+#: src/frontends/qt4/GuiView.cpp:1507 src/frontends/qt4/GuiView.cpp:1552
 msgid "&Rename"
 msgstr "重命名(&R)"
 
-#: src/frontends/qt4/GuiView.cpp:1587
+#: src/frontends/qt4/GuiView.cpp:1548
 #, c-format
 msgid ""
 "The document %1$s could not be saved.\n"
@@ -16993,16 +17071,16 @@ msgstr ""
 "\n"
 "Do you want to rename the document and try again?"
 
-#: src/frontends/qt4/GuiView.cpp:1590
+#: src/frontends/qt4/GuiView.cpp:1551
 msgid "Rename and save?"
 msgstr "改名并保存?"
 
-#: src/frontends/qt4/GuiView.cpp:1591
+#: src/frontends/qt4/GuiView.cpp:1552
 #, fuzzy
 msgid "&Retry"
 msgstr "恢复(&R)"
 
-#: src/frontends/qt4/GuiView.cpp:1630
+#: src/frontends/qt4/GuiView.cpp:1600
 #, c-format
 msgid ""
 "The document %1$s has unsaved changes.\n"
@@ -17013,39 +17091,39 @@ msgstr ""
 "\n"
 "您希望保存或取消这些变化?"
 
-#: src/frontends/qt4/GuiView.cpp:1633
+#: src/frontends/qt4/GuiView.cpp:1603
 msgid "&Discard"
 msgstr "放弃(&D)"
 
-#: src/frontends/qt4/GuiView.cpp:1740
+#: src/frontends/qt4/GuiView.cpp:1699
 #, fuzzy
 msgid "Saving all documents..."
 msgstr "保存文件 %1$s..."
 
-#: src/frontends/qt4/GuiView.cpp:1750
+#: src/frontends/qt4/GuiView.cpp:1709
 #, fuzzy
 msgid "All documents saved."
 msgstr "未保存文档"
 
-#: src/frontends/qt4/GuiView.cpp:1769
+#: src/frontends/qt4/GuiView.cpp:1728
 #, c-format
 msgid "Unknown toolbar \"%1$s\""
 msgstr "未知工具条 \"%1$s\""
 
-#: src/frontends/qt4/GuiView.cpp:1776
+#: src/frontends/qt4/GuiView.cpp:1735
 msgid "off"
 msgstr "关闭"
 
-#: src/frontends/qt4/GuiView.cpp:1778
+#: src/frontends/qt4/GuiView.cpp:1737
 msgid "auto"
 msgstr "自动"
 
-#: src/frontends/qt4/GuiView.cpp:1780
+#: src/frontends/qt4/GuiView.cpp:1739
 #, c-format
 msgid "Toolbar \"%1$s\" state set to %2$s"
 msgstr "工具条 \"%1$s\" 状态设置为 %2$s"
 
-#: src/frontends/qt4/GuiView.cpp:1958
+#: src/frontends/qt4/GuiView.cpp:1914
 #, c-format
 msgid "LFUN_UI_TOGGLE %1$s unknown command!"
 msgstr ""
@@ -17064,20 +17142,20 @@ msgstr ""
 msgid "Literate Source"
 msgstr "LaTeX源程序"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:1031
+#: src/frontends/qt4/GuiWorkArea.cpp:1103
 msgid " (changed)"
 msgstr " (改变)"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:1035
+#: src/frontends/qt4/GuiWorkArea.cpp:1107
 msgid " (read only)"
 msgstr " (只读)"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:1083
+#: src/frontends/qt4/GuiWorkArea.cpp:1193
 #, fuzzy
 msgid "Close File"
 msgstr "关闭"
 
-#: src/frontends/qt4/GuiWorkArea.cpp:1095
+#: src/frontends/qt4/GuiWorkArea.cpp:1205
 #, fuzzy
 msgid "Hide tab"
 msgstr "delta"
@@ -17091,13 +17169,57 @@ msgstr "浮动项设置"
 msgid "Click to detach"
 msgstr "单击"
 
+#: src/frontends/qt4/Menus.cpp:733
+#, fuzzy
+msgid "No Documents Open!"
+msgstr "无打开文档!"
+
+#: src/frontends/qt4/Menus.cpp:759 src/frontends/qt4/Menus.cpp:836
+#: src/frontends/qt4/Menus.cpp:856 src/frontends/qt4/Menus.cpp:877
+#: src/frontends/qt4/Menus.cpp:959 src/frontends/qt4/Menus.cpp:1083
+msgid "No Document Open!"
+msgstr "无打开文档!"
+
+#: src/frontends/qt4/Menus.cpp:800
+msgid "Plain Text"
+msgstr "纯文本"
+
+#: src/frontends/qt4/Menus.cpp:802
+msgid "Plain Text, Join Lines"
+msgstr "纯文本, 连接段落"
+
+#: src/frontends/qt4/Menus.cpp:974
+msgid "Master Document"
+msgstr "主文档"
+
+#: src/frontends/qt4/Menus.cpp:1020
+msgid "Other floats"
+msgstr "其他浮动项"
+
+#: src/frontends/qt4/Menus.cpp:1030
+msgid "No Table of contents"
+msgstr "无目录"
+
+#: src/frontends/qt4/Menus.cpp:1072
+msgid " (auto)"
+msgstr " (自动)"
+
+#: src/frontends/qt4/Menus.cpp:1091
+msgid "No Branch in Document!"
+msgstr "文档中无分支!"
+
+#: src/frontends/qt4/Menus.cpp:1493
+#, fuzzy
+msgid "No action defined!"
+msgstr "No font change defined."
+
 #: src/frontends/qt4/Validator.cpp:148
 msgid "space"
 msgstr "空格"
 
 #: src/frontends/qt4/Validator.cpp:175 src/insets/ExternalSupport.cpp:365
-#: src/insets/InsetBibtex.cpp:225 src/insets/InsetGraphics.cpp:614
-#: src/insets/InsetInclude.cpp:424
+#: src/insets/InsetBibtex.cpp:182 src/insets/InsetGraphics.cpp:599
+#: src/insets/InsetInclude.cpp:449
 msgid "Invalid filename"
 msgstr "无效文件名"
 
@@ -17107,43 +17229,46 @@ msgid ""
 "characters:\n"
 msgstr "LyX不能处理包含以下字符的文件名:\n"
 
-#: src/frontends/qt4/qt_helpers.cpp:259
-msgid "System files|#S#s"
-msgstr "系统文件|#S#s"
-
-#: src/frontends/qt4/qt_helpers.cpp:263
-msgid "User files|#U#u"
-msgstr "用户文件|#U#u"
-
-#: src/frontends/qt4/qt_helpers.cpp:318
+#: src/frontends/qt4/qt_helpers.cpp:229
 msgid "Could not update TeX information"
 msgstr "无法更新TeX信息"
 
-#: src/frontends/qt4/qt_helpers.cpp:319
+#: src/frontends/qt4/qt_helpers.cpp:230
 #, c-format
 msgid "The script `%s' failed."
 msgstr "脚本 `%s' 执行失败."
 
-#: src/insets/ExternalSupport.cpp:366 src/insets/InsetBibtex.cpp:226
-#: src/insets/InsetGraphics.cpp:615 src/insets/InsetInclude.cpp:425
+#: src/insets/ExternalSupport.cpp:366 src/insets/InsetBibtex.cpp:183
+#: src/insets/InsetGraphics.cpp:600 src/insets/InsetInclude.cpp:450
 msgid ""
 "The following filename is likely to cause trouble when running the exported "
 "file through LaTeX: "
 msgstr "以下文件名可能导致LaTeX错误"
 
-#: src/insets/Inset.cpp:276
+#: src/insets/Inset.cpp:302
 msgid "Opened inset"
 msgstr "打开的嵌入项"
 
-#: src/insets/InsetBibtex.cpp:151
+#: src/insets/InsetBibitem.cpp:81
+msgid "Keys must be unique!"
+msgstr ""
+
+#: src/insets/InsetBibitem.cpp:82
+#, c-format
+msgid ""
+"The key %1$s already exists,\n"
+"it will be changed to %2$s."
+msgstr ""
+
+#: src/insets/InsetBibtex.cpp:113
 msgid "BibTeX Generated Bibliography"
 msgstr "BibTeX Generated Bibliography"
 
-#: src/insets/InsetBibtex.cpp:244 src/insets/InsetBibtex.cpp:294
+#: src/insets/InsetBibtex.cpp:201 src/insets/InsetBibtex.cpp:252
 msgid "Export Warning!"
 msgstr "导出警告!"
 
-#: src/insets/InsetBibtex.cpp:245
+#: src/insets/InsetBibtex.cpp:202
 msgid ""
 "There are spaces in the paths to your BibTeX databases.\n"
 "BibTeX will be unable to find them."
@@ -17151,7 +17276,7 @@ msgstr ""
 "您BibTeX数据库文件名中有空格.\n"
 "BibTeX将不能找到此文件."
 
-#: src/insets/InsetBibtex.cpp:295
+#: src/insets/InsetBibtex.cpp:253
 msgid ""
 "There are spaces in the path to your BibTeX style file.\n"
 "BibTeX will be unable to find it."
@@ -17197,48 +17322,53 @@ msgstr "边框加背景阴影"
 msgid "double frame"
 msgstr "双"
 
-#: src/insets/InsetBox.cpp:115
+#: src/insets/InsetBox.cpp:104
 msgid "Opened Box Inset"
 msgstr "Opened Box Inset"
 
-#: src/insets/InsetBox.cpp:148
+#: src/insets/InsetBox.cpp:137
 msgid "Box"
 msgstr "外框"
 
-#: src/insets/InsetBranch.cpp:61
+#: src/insets/InsetBranch.cpp:49
 msgid "Opened Branch Inset"
 msgstr "Opened Branch Inset"
 
-#: src/insets/InsetBranch.cpp:81 src/insets/InsetBranch.cpp:87
+#: src/insets/InsetBranch.cpp:69 src/insets/InsetBranch.cpp:75
 msgid "Branch: "
 msgstr "分支:"
 
-#: src/insets/InsetBranch.cpp:92
+#: src/insets/InsetBranch.cpp:80
 msgid "Undef: "
 msgstr "Undef: "
 
-#: src/insets/InsetBranch.cpp:250
+#: src/insets/InsetBranch.cpp:235
 msgid "branch"
 msgstr "branch"
 
-#: src/insets/InsetCaption.cpp:95
+#: src/insets/InsetCaption.cpp:85
 msgid "Opened Caption Inset"
 msgstr "Opened Caption Inset"
 
-#: src/insets/InsetCitation.cpp:215
+#: src/insets/InsetCaption.cpp:292
+#, c-format
+msgid "Sub-%1$s"
+msgstr ""
+
+#: src/insets/InsetCitation.cpp:217
 #, fuzzy
 msgid "not cited"
 msgstr "被保护"
 
-#: src/insets/InsetCollapsable.cpp:118
+#: src/insets/InsetCollapsable.cpp:113
 msgid "Left-click to collapse the inset"
 msgstr ""
 
-#: src/insets/InsetCollapsable.cpp:120
+#: src/insets/InsetCollapsable.cpp:115
 msgid "Left-click to open the inset"
 msgstr ""
 
-#: src/insets/InsetCommand.cpp:93
+#: src/insets/InsetCommand.cpp:86
 msgid "LaTeX Command: "
 msgstr "LaTeX命令: "
 
@@ -17279,63 +17409,68 @@ msgstr "命令项: "
 msgid "Unknown parameter name: "
 msgstr "未知参数名: "
 
-#: src/insets/InsetCommandParams.cpp:307 src/insets/InsetInfo.cpp:123
+#: src/insets/InsetCommandParams.cpp:307 src/insets/InsetInfo.cpp:121
 msgid "Missing \\end_inset at this point."
 msgstr "Missing \\end_inset at this point."
 
-#: src/insets/InsetERT.cpp:77
+#: src/insets/InsetERT.cpp:66
 msgid "Opened ERT Inset"
 msgstr "Opened ERT Inset"
 
-#: src/insets/InsetEnvironment.cpp:63
+#: src/insets/InsetEnvironment.cpp:53
 msgid "Opened Environment Inset: "
 msgstr "Opened Environment Inset: "
 
-#: src/insets/InsetExternal.cpp:612
+#: src/insets/InsetExternal.cpp:598
 #, c-format
 msgid "External template %1$s is not installed"
 msgstr "External template %1$s is not installed"
 
-#: src/insets/InsetFlex.cpp:66
+#: src/insets/InsetFlex.cpp:60
 #, fuzzy
 msgid "Opened Flex Inset"
 msgstr "打开的文本嵌入项"
 
-#: src/insets/InsetFloat.cpp:113 src/insets/InsetFloat.cpp:374
-#: src/insets/InsetFloat.cpp:384
+#: src/insets/InsetFloat.cpp:117 src/insets/InsetFloat.cpp:403
+#: src/insets/InsetFloat.cpp:413 src/insets/InsetFloat.cpp:423
 msgid "float: "
 msgstr "浮动项: "
 
-#: src/insets/InsetFloat.cpp:279
+#: src/insets/InsetFloat.cpp:292
 msgid "Opened Float Inset"
 msgstr "打开的浮动项"
 
-#: src/insets/InsetFloat.cpp:335
+#: src/insets/InsetFloat.cpp:363
 msgid "float"
 msgstr "浮动项"
 
-#: src/insets/InsetFloat.cpp:386
+#: src/insets/InsetFloat.cpp:415
 msgid " (sideways)"
 msgstr " (横向)"
 
+#: src/insets/InsetFloat.cpp:425
+#, fuzzy
+msgid "subfloat: "
+msgstr "浮动项: "
+
 #: src/insets/InsetFloatList.cpp:76
 msgid "ERROR: Nonexistent float type!"
 msgstr "错误：未知浮动项类型!"
 
-#: src/insets/InsetFloatList.cpp:137
+#: src/insets/InsetFloatList.cpp:136
 #, c-format
 msgid "List of %1$s"
 msgstr "%1$s 列表"
 
-#: src/insets/InsetFoot.cpp:56
+#: src/insets/InsetFoot.cpp:45
 msgid "Opened Footnote Inset"
 msgstr "打开的尾注项"
 
-#: src/insets/InsetFoot.cpp:117
+#: src/insets/InsetFoot.cpp:103
 msgid "footnote"
 msgstr "脚注"
 
-#: src/insets/InsetGraphics.cpp:491 src/insets/InsetInclude.cpp:503
+#: src/insets/InsetGraphics.cpp:477 src/insets/InsetInclude.cpp:528
 #, c-format
 msgid ""
 "Could not copy the file\n"
@@ -17346,42 +17481,42 @@ msgstr ""
 "%1$s\n"
 "至临时目录."
 
-#: src/insets/InsetGraphics.cpp:721
+#: src/insets/InsetGraphics.cpp:706
 #, c-format
 msgid "No conversion of %1$s is needed after all"
 msgstr "No conversion of %1$s is needed after all"
 
-#: src/insets/InsetGraphics.cpp:823
+#: src/insets/InsetGraphics.cpp:800
 #, c-format
 msgid "Graphics file: %1$s"
 msgstr "图形文件: %1$s"
 
-#: src/insets/InsetHFill.cpp:71
+#: src/insets/InsetHFill.cpp:65
 msgid "Horizontal Fill"
 msgstr "Horizontal Fill"
 
-#: src/insets/InsetInclude.cpp:267
+#: src/insets/InsetInclude.cpp:321
 msgid "Verbatim Input"
 msgstr "Verbatim Input"
 
-#: src/insets/InsetInclude.cpp:270
+#: src/insets/InsetInclude.cpp:324
 msgid "Verbatim Input*"
 msgstr "Verbatim Input*"
 
-#: src/insets/InsetInclude.cpp:290
+#: src/insets/InsetInclude.cpp:344
 msgid " (embedded)"
 msgstr ""
 
-#: src/insets/InsetInclude.cpp:398 src/insets/InsetInclude.cpp:593
+#: src/insets/InsetInclude.cpp:423 src/insets/InsetInclude.cpp:616
 msgid "Recursive input"
 msgstr "迭代输入"
 
-#: src/insets/InsetInclude.cpp:399 src/insets/InsetInclude.cpp:594
+#: src/insets/InsetInclude.cpp:424 src/insets/InsetInclude.cpp:617
 #, c-format
 msgid "Attempted to include file %1$s in itself! Ignoring inclusion."
 msgstr "试图包含文件 %1$s 本身! 忽略包含."
 
-#: src/insets/InsetInclude.cpp:447
+#: src/insets/InsetInclude.cpp:472
 #, c-format
 msgid ""
 "Included file `%1$s'\n"
@@ -17392,11 +17527,11 @@ msgstr ""
 "has textclass `%2$s'\n"
 "while parent file has textclass `%3$s'."
 
-#: src/insets/InsetInclude.cpp:453
+#: src/insets/InsetInclude.cpp:478
 msgid "Different textclasses"
 msgstr "不同文档类"
 
-#: src/insets/InsetInclude.cpp:469
+#: src/insets/InsetInclude.cpp:494
 #, fuzzy, c-format
 msgid ""
 "Included file `%1$s'\n"
@@ -17407,50 +17542,65 @@ msgstr ""
 "has textclass `%2$s'\n"
 "while parent file has textclass `%3$s'."
 
-#: src/insets/InsetInclude.cpp:473
+#: src/insets/InsetInclude.cpp:498
 #, fuzzy
 msgid "Module not found"
 msgstr "文件没有找到"
 
-#: src/insets/InsetIndex.cpp:95
+#: src/insets/InsetIndex.cpp:93
 msgid "Index"
 msgstr "索引"
 
-#: src/insets/InsetInfo.cpp:68
+#: src/insets/InsetInfo.cpp:66
 #, fuzzy
 msgid "Information regarding "
 msgstr "无编辑 %1$s 的信息"
 
-#: src/insets/InsetInfo.cpp:70
+#: src/insets/InsetInfo.cpp:68
 msgid " "
 msgstr ""
 
-#: src/insets/InsetInfo.cpp:176
+#: src/insets/InsetInfo.cpp:174
 #, fuzzy
 msgid "Unknown Info: "
 msgstr "未知单词："
 
-#: src/insets/InsetInfo.cpp:200 src/insets/InsetInfo.cpp:206
+#: src/insets/InsetInfo.cpp:198 src/insets/InsetInfo.cpp:203
 #, fuzzy
 msgid "yes"
 msgstr "样式"
 
-#: src/insets/InsetInfo.cpp:200 src/insets/InsetInfo.cpp:206
+#: src/insets/InsetInfo.cpp:198 src/insets/InsetInfo.cpp:203
 #, fuzzy
 msgid "no"
-msgstr "æ\97 "
+msgstr "æ\92¤æ¶\88"
 
-#: src/insets/InsetInfo.cpp:214 src/insets/InsetInfo.cpp:220
+#: src/insets/InsetInfo.cpp:211 src/insets/InsetInfo.cpp:216
 #, fuzzy
 msgid "No menu entry for "
 msgstr "术语索引"
 
-#: src/insets/InsetInfo.cpp:246
+#: src/insets/InsetInfo.cpp:243
 #, fuzzy
 msgid "Unknown buffer info"
 msgstr "未知用户"
 
-#: src/insets/InsetListings.cpp:127
+#: src/insets/InsetLabel.cpp:64
+msgid "Label names must be unique!"
+msgstr ""
+
+#: src/insets/InsetLabel.cpp:65
+#, c-format
+msgid ""
+"The label %1$s already exists,\n"
+"it will be changed to %2$s."
+msgstr ""
+
+#: src/insets/InsetLabel.cpp:106
+msgid "DUPLICATE: "
+msgstr ""
+
+#: src/insets/InsetListings.cpp:116
 msgid "Opened Listing Inset"
 msgstr "打开的Listing嵌入项"
 
@@ -17594,29 +17744,29 @@ msgstr "未知listing参数名: %1$s"
 msgid "Parameters starting with '%1$s': %2$s"
 msgstr "以 '%1$s' 开头的参数有:  %2$s"
 
-#: src/insets/InsetMarginal.cpp:46
+#: src/insets/InsetMarginal.cpp:35
 msgid "Opened Marginal Note Inset"
 msgstr "打开的边注嵌入项"
 
-#: src/insets/InsetNewline.h:67
+#: src/insets/InsetNewline.h:64
 #, fuzzy
 msgid "line break"
 msgstr "换行(L)|L"
 
-#: src/insets/InsetNewpage.h:49
+#: src/insets/InsetNewpage.h:46
 #, fuzzy
 msgid "New Page"
 msgstr "清除页面"
 
-#: src/insets/InsetNewpage.h:85
+#: src/insets/InsetNewpage.h:76
 msgid "Clear Page"
 msgstr "清除页面"
 
-#: src/insets/InsetNewpage.h:101
+#: src/insets/InsetNewpage.h:89
 msgid "Clear Double Page"
 msgstr "Clear Double Page"
 
-#: src/insets/InsetNomencl.cpp:52
+#: src/insets/InsetNomencl.cpp:58
 msgid "Nom"
 msgstr "Nom"
 
@@ -17628,91 +17778,95 @@ msgstr ""
 msgid "Greyed out"
 msgstr "灰度"
 
-#: src/insets/InsetNote.cpp:135
+#: src/insets/InsetNote.cpp:130
 msgid "Opened Note Inset"
 msgstr "打开的注解项"
 
-#: src/insets/InsetOptArg.cpp:42
+#: src/insets/InsetOptArg.cpp:31
 msgid "Opened Optional Argument Inset"
 msgstr "打开的可选参数项"
 
-#: src/insets/InsetRef.cpp:168 src/mathed/InsetMathRef.cpp:186
+#: src/insets/InsetRef.cpp:162
+msgid "BROKEN: "
+msgstr ""
+
+#: src/insets/InsetRef.cpp:180 src/mathed/InsetMathRef.cpp:185
 msgid "Ref: "
 msgstr "引用: "
 
-#: src/insets/InsetRef.cpp:169 src/mathed/InsetMathRef.cpp:187
+#: src/insets/InsetRef.cpp:181 src/mathed/InsetMathRef.cpp:186
 msgid "Equation"
 msgstr "方程"
 
-#: src/insets/InsetRef.cpp:169 src/mathed/InsetMathRef.cpp:187
+#: src/insets/InsetRef.cpp:181 src/mathed/InsetMathRef.cpp:186
 msgid "EqRef: "
 msgstr "公式引用: "
 
-#: src/insets/InsetRef.cpp:170 src/mathed/InsetMathRef.cpp:188
+#: src/insets/InsetRef.cpp:182 src/mathed/InsetMathRef.cpp:187
 msgid "Page Number"
 msgstr "页码"
 
-#: src/insets/InsetRef.cpp:170 src/mathed/InsetMathRef.cpp:188
+#: src/insets/InsetRef.cpp:182 src/mathed/InsetMathRef.cpp:187
 msgid "Page: "
 msgstr "页: "
 
-#: src/insets/InsetRef.cpp:171 src/mathed/InsetMathRef.cpp:189
+#: src/insets/InsetRef.cpp:183 src/mathed/InsetMathRef.cpp:188
 msgid "Textual Page Number"
 msgstr "Textual Page Number"
 
-#: src/insets/InsetRef.cpp:171 src/mathed/InsetMathRef.cpp:189
+#: src/insets/InsetRef.cpp:183 src/mathed/InsetMathRef.cpp:188
 msgid "TextPage: "
 msgstr "TextPage: "
 
-#: src/insets/InsetRef.cpp:172 src/mathed/InsetMathRef.cpp:190
+#: src/insets/InsetRef.cpp:184 src/mathed/InsetMathRef.cpp:189
 msgid "Standard+Textual Page"
 msgstr "Standard+Textual Page"
 
-#: src/insets/InsetRef.cpp:172 src/mathed/InsetMathRef.cpp:190
+#: src/insets/InsetRef.cpp:184 src/mathed/InsetMathRef.cpp:189
 msgid "Ref+Text: "
 msgstr "Ref+Text: "
 
-#: src/insets/InsetRef.cpp:173 src/mathed/InsetMathRef.cpp:191
+#: src/insets/InsetRef.cpp:185 src/mathed/InsetMathRef.cpp:190
 msgid "PrettyRef"
 msgstr "PrettyRef"
 
-#: src/insets/InsetRef.cpp:173 src/mathed/InsetMathRef.cpp:191
+#: src/insets/InsetRef.cpp:185 src/mathed/InsetMathRef.cpp:190
 msgid "FormatRef: "
 msgstr "FormatRef: "
 
-#: src/insets/InsetTOC.cpp:55
+#: src/insets/InsetTOC.cpp:49
 msgid "Unknown TOC type"
 msgstr "未知目录项"
 
-#: src/insets/InsetTabular.cpp:3146
+#: src/insets/InsetTabular.cpp:3138
 msgid "Opened table"
 msgstr "打开的表格"
 
-#: src/insets/InsetTabular.cpp:4320
+#: src/insets/InsetTabular.cpp:4300
 msgid "Error setting multicolumn"
 msgstr "设置多列出错"
 
-#: src/insets/InsetTabular.cpp:4321
+#: src/insets/InsetTabular.cpp:4301
 msgid "You cannot set multicolumn vertically."
 msgstr "不能竖向设置多列表格"
 
-#: src/insets/InsetText.cpp:233
+#: src/insets/InsetText.cpp:235
 msgid "Opened Text Inset"
 msgstr "打开的文本嵌入项"
 
-#: src/insets/InsetVSpace.cpp:105
+#: src/insets/InsetVSpace.cpp:99
 msgid "Vertical Space"
 msgstr "竖向间隔"
 
-#: src/insets/InsetWrap.cpp:45
+#: src/insets/InsetWrap.cpp:45 src/insets/InsetWrap.cpp:110
 msgid "wrap: "
 msgstr "折行: "
 
-#: src/insets/InsetWrap.cpp:210
+#: src/insets/InsetWrap.cpp:205
 msgid "Opened Wrap Inset"
 msgstr "打开的折行项"
 
-#: src/insets/InsetWrap.cpp:236
+#: src/insets/InsetWrap.cpp:229
 msgid "wrap"
 msgstr "折行"
 
@@ -17852,7 +18006,7 @@ msgstr "词语已被更新。"
 msgid " strings have been replaced."
 msgstr "词语已被更新。"
 
-#: src/mathed/InsetMathAMSArray.cpp:119 src/mathed/InsetMathHull.cpp:1255
+#: src/mathed/InsetMathAMSArray.cpp:119 src/mathed/InsetMathHull.cpp:1325
 #: src/mathed/InsetMathSplit.cpp:76 src/mathed/InsetMathSubstack.cpp:71
 #, c-format
 msgid "Can't add vertical grid lines in '%1$s'"
@@ -17884,52 +18038,52 @@ msgstr "没有vline"
 msgid "Unknown tabular feature '%1$s'"
 msgstr "未知表格功能 '%1$s'"
 
-#: src/mathed/InsetMathHull.cpp:1079 src/mathed/InsetMathHull.cpp:1087
+#: src/mathed/InsetMathHull.cpp:1143 src/mathed/InsetMathHull.cpp:1151
 msgid "No number"
 msgstr "无编号"
 
-#: src/mathed/InsetMathHull.cpp:1079 src/mathed/InsetMathHull.cpp:1087
+#: src/mathed/InsetMathHull.cpp:1143 src/mathed/InsetMathHull.cpp:1151
 msgid "Number"
 msgstr "编号"
 
-#: src/mathed/InsetMathHull.cpp:1228
+#: src/mathed/InsetMathHull.cpp:1298
 #, c-format
 msgid "Can't change number of rows in '%1$s'"
 msgstr "无法改变行数至 '%1$s'"
 
-#: src/mathed/InsetMathHull.cpp:1238
+#: src/mathed/InsetMathHull.cpp:1308
 #, c-format
 msgid "Can't change number of columns in '%1$s'"
 msgstr "无法改变列数至 '%1$s'"
 
-#: src/mathed/InsetMathHull.cpp:1248
+#: src/mathed/InsetMathHull.cpp:1318
 #, c-format
 msgid "Can't add horizontal grid lines in '%1$s'"
 msgstr "无法向 '%1$s'添加水平网格线"
 
-#: src/mathed/InsetMathNest.cpp:889
+#: src/mathed/InsetMathNest.cpp:878
 msgid "create new math text environment ($...$)"
 msgstr "创建新数学文本环境 ($...$)"
 
-#: src/mathed/InsetMathNest.cpp:892
+#: src/mathed/InsetMathNest.cpp:881
 msgid "entered math text mode (textrm)"
 msgstr "entered math text mode (textrm)"
 
-#: src/mathed/InsetMathRef.cpp:186
+#: src/mathed/InsetMathRef.cpp:185
 msgid "Standard[[mathref]]"
 msgstr ""
 
-#: src/mathed/MathMacroTemplate.cpp:431
+#: src/mathed/MathMacroTemplate.cpp:487
 #, fuzzy
 msgid "optional"
 msgstr "水平"
 
-#: src/mathed/MathMacroTemplate.cpp:455
+#: src/mathed/MathMacroTemplate.cpp:531
 #, fuzzy
 msgid "TeX"
 msgstr "LaTeX"
 
-#: src/mathed/MathMacroTemplate.cpp:1010
+#: src/mathed/MathMacroTemplate.cpp:1174
 msgid "math macro"
 msgstr "数学宏"
 
@@ -17942,11 +18096,11 @@ msgstr ""
 "无法打开指定文件\n"
 "%1$s."
 
-#: src/output_plaintext.cpp:141
+#: src/output_plaintext.cpp:136
 msgid "Abstract: "
 msgstr "摘要"
 
-#: src/output_plaintext.cpp:153
+#: src/output_plaintext.cpp:148
 msgid "References: "
 msgstr "引用: "
 
@@ -17978,7 +18132,6 @@ msgstr ""
 "LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
 
 #: src/support/Package.cpp:642 src/support/Package.cpp:669
-#, fuzzy
 msgid "File not found"
 msgstr "文件没有找到"
 
@@ -18154,33 +18307,126 @@ msgstr ""
 msgid "Unknown user"
 msgstr "未知用户"
 
-#~ msgid "Index Entry"
-#~ msgstr "索引项"
+#, fuzzy
+#~ msgid "&float"
+#~ msgstr "浮动项"
 
-#~ msgid "Unknown inset name: "
-#~ msgstr "未知嵌入项名: "
+#, fuzzy
+#~ msgid "Float"
+#~ msgstr "浮动(&F)"
 
-#~ msgid "Program Listing "
-#~ msgstr "程序列表"
+#~ msgid "S&ubfigure"
+#~ msgstr "子图像(&u)"
+
+#~ msgid "The caption for the sub-figure"
+#~ msgstr "子图像标题"
+
+#~ msgid "Ca&ption:"
+#~ msgstr "标题(&p)"
 
 #~ msgid "Databa&ses"
 #~ msgstr "数据库(&s)"
 
+#~ msgid "Show ERT inline"
+#~ msgstr "文中显示ERT"
+
+#~ msgid "&Inline"
+#~ msgstr "内联(&I)"
+
+#~ msgid "&Use language's default encoding"
+#~ msgstr "使用语言的缺省编码(&U)"
+
+#~ msgid "Framed in box"
+#~ msgstr "有边框"
+
+#~ msgid "&Shaded"
+#~ msgstr "阴影(&S)"
+
+#~ msgid "Paper Size"
+#~ msgstr "纸张大小"
+
 #, fuzzy
-#~ msgid "Theorem \\arabic{thm}."
-#~ msgstr "Theorem \\arabic{theorem}."
+#~ msgid "C&enter"
+#~ msgstr "居中"
+
+#~ msgid "&Colors"
+#~ msgstr "颜色(&C)"
+
+#~ msgid "C&opiers"
+#~ msgstr "复制命令(&o)"
+
+#~ msgid "&File formats"
+#~ msgstr "文件格式(&F)"
+
+#~ msgid "F&ormat:"
+#~ msgstr "格式(&o)"
+
+#~ msgid "&GUI name:"
+#~ msgstr "用户界面名字(&G):"
+
+#~ msgid "External Applications"
+#~ msgstr "外部程序"
+
+#~ msgid "Save/restore window size, or use fixed size"
+#~ msgstr "保存/读入窗口大小，或使用固定大小"
+
+#~ msgid "Save/restore window position"
+#~ msgstr "保存/读入窗口位置"
+
+#~ msgid " every"
+#~ msgstr "所有的"
+
+#~ msgid "Scrolling"
+#~ msgstr "滚动"
+
+#~ msgid "&URL:"
+#~ msgstr "网址(&U)："
+
+#~ msgid "Output as a hyperlink ?"
+#~ msgstr "以链接输出"
+
+#~ msgid "&Units:"
+#~ msgstr "单位(&U)"
+
+#~ msgid "Definition @Section@.\\arabic{definition}."
+#~ msgstr "Definition @Section@.\\arabic{definition}."
+
+#~ msgid "Example @Section@.\\arabic{example}."
+#~ msgstr "Example @Section@.\\arabic{example}."
+
+#~ msgid "Remark @Section@.\\arabic{remark}."
+#~ msgstr "Remark @Section@.\\arabic{remark}."
+
+#~ msgid "Notation @Section@.\\arabic{notation}."
+#~ msgstr "Notation @Section@.\\arabic{notation}."
 
-#~ msgid "Corollary \\arabic{corollary}."
-#~ msgstr "Corollary \\arabic{corollary}."
+#~ msgid "Theorem @Section@.\\arabic{theorem}."
+#~ msgstr "Theorem @Section@.\\arabic{theorem}."
+
+#~ msgid "Corollary @Section@.\\arabic{corollary}."
+#~ msgstr "Corollary @Section@.\\arabic{corollary}."
+
+#~ msgid "Lemma @Section@.\\arabic{lemma}."
+#~ msgstr "Lemma @Section@.\\arabic{lemma}."
+
+#~ msgid "Proposition @Section@.\\arabic{proposition}."
+#~ msgstr "Proposition @Section@.\\arabic{proposition}."
+
+#~ msgid "Prop @Section@.\\arabic{prop}."
+#~ msgstr "Prop @Section@.\\arabic{prop}."
+
+#~ msgid "Question @Section@.\\arabic{question}."
+#~ msgstr "Question @Section@.\\arabic{question}."
 
-#~ msgid "Lemma \\arabic{lemma}."
-#~ msgstr "Lemma \\arabic{lemma}."
+#~ msgid "Claim @Section@.\\arabic{claim}."
+#~ msgstr "Claim @Section@.\\arabic{claim}."
 
-#~ msgid "Proposition \\arabic{proposition}."
-#~ msgstr "Proposition \\arabic{proposition}."
+#~ msgid "Conjecture @Section@.\\arabic{conjecture}."
+#~ msgstr "Conjecture @Section@.\\arabic{conjecture}."
 
-#~ msgid "Conjecture \\arabic{conjecture}."
-#~ msgstr "Conjecture \\arabic{conjecture}."
+#, fuzzy
+#~ msgid "Theorem \\arabic{thm}."
+#~ msgstr "Theorem \\arabic{theorem}."
 
 #~ msgid "Criterion \\arabic{criterion}."
 #~ msgstr "Criterion \\arabic{criterion}."
@@ -18194,12 +18440,6 @@ msgstr "未知用户"
 #~ msgid "Axiom \\arabic{axiom}."
 #~ msgstr "Axiom \\arabic{axiom}."
 
-#~ msgid "Definition \\arabic{definition}."
-#~ msgstr "Definition \\arabic{definition}."
-
-#~ msgid "Example \\arabic{example}."
-#~ msgstr "Example \\arabic{example}."
-
 #~ msgid "Condition \\arabic{condition}."
 #~ msgstr "Condition \\arabic{condition}."
 
@@ -18209,18 +18449,6 @@ msgstr "未知用户"
 #~ msgid "Exercise \\arabic{exercise}."
 #~ msgstr "Exercise \\arabic{exercise}."
 
-#~ msgid "Remark \\arabic{remark}."
-#~ msgstr "Remark \\arabic{remark}."
-
-#~ msgid "Claim \\arabic{claim}."
-#~ msgstr "Claim \\arabic{claim}."
-
-#~ msgid "Note \\arabic{note}."
-#~ msgstr "Note \\arabic{note}."
-
-#~ msgid "Notation \\arabic{notation}."
-#~ msgstr "Notation \\arabic{notation}."
-
 #~ msgid "Summary \\arabic{summary}."
 #~ msgstr "Summary \\arabic{summary}."
 
@@ -18234,106 +18462,109 @@ msgstr "未知用户"
 #~ msgid "Assumption \\arabic{assumption}."
 #~ msgstr "Question \\arabic{question}."
 
-#~ msgid "Theorem \\arabic{theorem}."
-#~ msgstr "Theorem \\arabic{theorem}."
-
-#~ msgid "Count Words|W"
-#~ msgstr "字数(W)|W"
+#~ msgid "Corollary @Section@.\\arabic{theorem}."
+#~ msgstr "Corollary @Section@.\\arabic{theorem}."
 
-#~ msgid "Can't load document class"
-#~ msgstr "无法读入文档类"
+#~ msgid "Lemma @Section@.\\arabic{theorem}."
+#~ msgstr "Lemma @Section@.\\arabic{theorem}."
 
-#~ msgid ""
-#~ "Using the default document class, because the class %1$s could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "Using the default document class, because the class %1$s could not be "
-#~ "loaded."
+#~ msgid "Proposition @Section@.\\arabic{theorem}."
+#~ msgstr "Proposition @Section@.\\arabic{theorem}."
 
-#~ msgid "Encoding error"
-#~ msgstr "编码出错"
+#~ msgid "Conjecture @Section@.\\arabic{theorem}."
+#~ msgstr "Conjecture @Section@.\\arabic{theorem}."
 
-#~ msgid "%1$d words in selection."
-#~ msgstr "选中了 %1$d 词"
+#~ msgid "Criterion @Section@.\\arabic{theorem}."
+#~ msgstr "Criterion @Section@.\\arabic{theorem}."
 
-#~ msgid "%1$d words in document."
-#~ msgstr "文档有 %1$d 词"
+#~ msgid "Algorithm @Section@.\\arabic{theorem}."
+#~ msgstr "Algorithm @Section@.\\arabic{theorem}."
 
-#~ msgid "One word in selection."
-#~ msgstr "选中一个词"
+#~ msgid "Fact @Section@.\\arabic{theorem}."
+#~ msgstr "Fact @Section@.\\arabic{theorem}."
 
-#~ msgid "One word in document."
-#~ msgstr "文档有一个词"
+#~ msgid "Axiom @Section@.\\arabic{theorem}."
+#~ msgstr "Axiom @Section@.\\arabic{theorem}."
 
-#~ msgid "Count words"
-#~ msgstr "统计字数"
+#~ msgid "Definition @Section@.\\arabic{theorem}."
+#~ msgstr "Definition @Section@.\\arabic{theorem}."
 
-#~ msgid "&URL:"
-#~ msgstr "网址(&U)："
+#~ msgid "Example @Section@.\\arabic{theorem}."
+#~ msgstr "Example @Section@.\\arabic{theorem}."
 
-#~ msgid "Framed in box"
-#~ msgstr "有边框"
+#~ msgid "Problem @Section@.\\arabic{theorem}."
+#~ msgstr "Problem @Section@.\\arabic{theorem}."
+
+#~ msgid "Remark @Section@.\\arabic{theorem}."
+#~ msgstr "Remark @Section@.\\arabic{theorem}."
 
-#~ msgid "&Framed"
-#~ msgstr "边框(&F)"
+#~ msgid "Claim @Section@.\\arabic{theorem}."
+#~ msgstr "Claim @Section@.\\arabic{theorem}."
 
-#~ msgid "&Shaded"
-#~ msgstr "阴影(&S)"
+#~ msgid "Note @Section@.\\arabic{theorem}."
+#~ msgstr "Note @Section@.\\arabic{theorem}."
 
-#, fuzzy
-#~ msgid "Shortcuts:"
-#~ msgstr "快捷键(&h)"
+#~ msgid "Acknowledgement @Section@.\\arabic{theorem}."
+#~ msgstr "Acknowledgement @Section@.\\arabic{theorem}."
 
-#, fuzzy
-#~ msgid "Search"
-#~ msgstr "搜索出错"
+#~ msgid "@Section@.\\arabic{subsection}"
+#~ msgstr "@Section@.\\arabic{subsection}"
 
-#~ msgid "Scrolling"
-#~ msgstr "滚动"
+#~ msgid "@Subsection@.\\arabic{subsubsection}"
+#~ msgstr "@Subsection@.\\arabic{subsubsection}"
 
-#~ msgid "Save/restore window size, or use fixed size"
-#~ msgstr "保存/读入窗口大小，或使用固定大小"
+#~ msgid "@Subsubsection@.\\arabic{paragraph}"
+#~ msgstr "@Subsubsection@.\\arabic{paragraph}"
 
-#~ msgid "Save/restore window position"
-#~ msgstr "保存/读入窗口位置"
+#~ msgid "@Paragraph@.\\arabic{subparagraph}"
+#~ msgstr "@Paragraph@.\\arabic{subparagraph}"
 
-#, fuzzy
-#~ msgid "framed"
-#~ msgstr "边框"
+#~ msgid "\\arabic{chapter}.\\arabic{section}"
+#~ msgstr "\\arabic{chapter}.\\arabic{section}"
 
-#, fuzzy
-#~ msgid "shaded"
-#~ msgstr "阴影"
+#~ msgid "\\Alph{chapter}.\\arabic{section}"
+#~ msgstr "\\Alph{chapter}.\\arabic{section}"
 
 #~ msgid "Bahasa"
 #~ msgstr "Bahasa"
 
+#~ msgid "Magyar"
+#~ msgstr "Magyar"
+
 #~ msgid "Serbo-Croatian"
 #~ msgstr "克罗地亚语"
 
+#~ msgid "Count Words|W"
+#~ msgstr "字数(W)|W"
+
 #~ msgid "Framed|F"
 #~ msgstr "外框(F)|F"
 
 #~ msgid "Shaded|S"
 #~ msgstr "阴影(S)|S"
 
-#~ msgid "phantom"
-#~ msgstr "phantom"
+#~ msgid "Insert URL"
+#~ msgstr "插入网址"
 
-#~ msgid "vphantom"
-#~ msgstr "vphantom"
+#~ msgid "Can't load document class"
+#~ msgstr "无法读入文档类"
 
-#~ msgid "hphantom"
-#~ msgstr "hphantom"
+#~ msgid ""
+#~ "Using the default document class, because the class %1$s could not be "
+#~ "loaded."
+#~ msgstr ""
+#~ "Using the default document class, because the class %1$s could not be "
+#~ "loaded."
+
+#~ msgid "Undefined character style"
+#~ msgstr "未定义字符样式"
 
 #~ msgid ""
-#~ "Could not open the specified document\n"
-#~ "%1$s\n"
-#~ "due to the error: %2$s"
+#~ "The document could not be converted\n"
+#~ "into the document class %1$s."
 #~ msgstr ""
-#~ "无法打开指定文档\n"
-#~ "%1$s\n"
-#~ "出错信息: %2$s"
+#~ "此文档无法改变到\n"
+#~ "文档类 %1$s."
 
 #~ msgid ""
 #~ "Specify geometry of the main view in width x height (values from last "
@@ -18342,6 +18573,21 @@ msgstr "未知用户"
 #~ "Specify geometry of the main view in width x height (values from last "
 #~ "session will not be used if non-zero values are specified)."
 
+#~ msgid "&Switch to document"
+#~ msgstr "切换至已读取文档(&S)"
+
+#~ msgid ""
+#~ "Could not open the specified document\n"
+#~ "%1$s\n"
+#~ "due to the error: %2$s"
+#~ msgstr ""
+#~ "无法打开指定文档\n"
+#~ "%1$s\n"
+#~ "出错信息: %2$s"
+
+#~ msgid "Formatting document..."
+#~ msgstr "格式化文档..."
+
 #~ msgid "Rectangular box"
 #~ msgstr "方框"
 
@@ -18351,6 +18597,30 @@ msgstr "未知用户"
 #~ msgid "Double box"
 #~ msgstr "双线框"
 
+#~ msgid "Index Entry"
+#~ msgstr "索引项"
+
+#~ msgid "Previous command"
+#~ msgstr "上一命令"
+
+#~ msgid "LyX: Delimiters"
+#~ msgstr "LyX: Delimiters"
+
+#~ msgid "LyX: Insert Matrix"
+#~ msgstr "LyX: 插入矩阵"
+
+#~ msgid "Look and feel"
+#~ msgstr "显示"
+
+#~ msgid "Language settings"
+#~ msgstr "语言设置"
+
+#~ msgid "Outputs"
+#~ msgstr "输出"
+
+#~ msgid "Copiers"
+#~ msgstr "复制器"
+
 #~ msgid "Boxed"
 #~ msgstr "边框"
 
@@ -18366,153 +18636,21 @@ msgstr "未知用户"
 #~ msgid "Doublebox"
 #~ msgstr "Doublebox"
 
+#~ msgid "Opened CharStyle Inset"
+#~ msgstr "打开的字符样式项"
+
+#~ msgid "Unknown inset name: "
+#~ msgstr "未知嵌入项名: "
+
+#~ msgid "Program Listing "
+#~ msgstr "程序列表"
+
 #~ msgid "Framed"
 #~ msgstr "边框"
 
 #~ msgid "Shaded"
 #~ msgstr "阴影"
 
-#~ msgid " Macro: %1$s: "
-#~ msgstr "宏：%1$s: "
-
-#, fuzzy
-#~ msgid "Enable embedding"
-#~ msgstr "行编号"
-
-#, fuzzy
-#~ msgid "External FIle Name:"
-#~ msgstr "外部材料"
-
-#, fuzzy
-#~ msgid "Automatic inclusion"
-#~ msgstr "自动更新"
-
-#, fuzzy
-#~ msgid "External"
-#~ msgstr "其他"
-
-#, fuzzy
-#~ msgid "Action!"
-#~ msgstr "章节"
-
-#~ msgid "&Use language's default encoding"
-#~ msgstr "使用语言的缺省编码(&U)"
-
-#~ msgid "Paper Size"
-#~ msgstr "纸张大小"
-
-#~ msgid "&Right"
-#~ msgstr "右(&R)"
-
-#~ msgid "&Colors"
-#~ msgstr "颜色(&C)"
-
-#~ msgid "C&opiers"
-#~ msgstr "复制命令(&o)"
-
-#~ msgid "&File formats"
-#~ msgstr "文件格式(&F)"
-
-#~ msgid "F&ormat:"
-#~ msgstr "格式(&o)"
-
-#~ msgid "&GUI name:"
-#~ msgstr "用户界面名字(&G):"
-
-#~ msgid "External Applications"
-#~ msgstr "外部程序"
-
-#~ msgid " every"
-#~ msgstr "所有的"
-
-#~ msgid "Output as a hyperlink ?"
-#~ msgstr "以链接输出"
-
-#~ msgid "Default (outer)"
-#~ msgstr "缺省(外部)"
-
-#~ msgid "Outer"
-#~ msgstr "外部"
-
-#~ msgid "&Units:"
-#~ msgstr "单位(&U)"
-
-#~ msgid "Case."
-#~ msgstr "Case."
-
-#~ msgid "Case \\arabic{case}."
-#~ msgstr "Case \\arabic{case}."
-
-#~ msgid "Definition @Section@.\\arabic{definition}."
-#~ msgstr "Definition @Section@.\\arabic{definition}."
-
-#~ msgid "Example @Section@.\\arabic{example}."
-#~ msgstr "Example @Section@.\\arabic{example}."
-
-#~ msgid "Remark @Section@.\\arabic{remark}."
-#~ msgstr "Remark @Section@.\\arabic{remark}."
-
-#~ msgid "Notation @Section@.\\arabic{notation}."
-#~ msgstr "Notation @Section@.\\arabic{notation}."
-
-#~ msgid "Theorem @Section@.\\arabic{theorem}."
-#~ msgstr "Theorem @Section@.\\arabic{theorem}."
-
-#~ msgid "Corollary @Section@.\\arabic{corollary}."
-#~ msgstr "Corollary @Section@.\\arabic{corollary}."
-
-#~ msgid "Lemma @Section@.\\arabic{lemma}."
-#~ msgstr "Lemma @Section@.\\arabic{lemma}."
-
-#~ msgid "Proposition @Section@.\\arabic{proposition}."
-#~ msgstr "Proposition @Section@.\\arabic{proposition}."
-
-#~ msgid "Prop @Section@.\\arabic{prop}."
-#~ msgstr "Prop @Section@.\\arabic{prop}."
-
-#~ msgid "Question @Section@.\\arabic{question}."
-#~ msgstr "Question @Section@.\\arabic{question}."
-
-#~ msgid "Claim @Section@.\\arabic{claim}."
-#~ msgstr "Claim @Section@.\\arabic{claim}."
-
-#~ msgid "Conjecture @Section@.\\arabic{conjecture}."
-#~ msgstr "Conjecture @Section@.\\arabic{conjecture}."
-
-#~ msgid "Algorithm #."
-#~ msgstr "Algorithm #."
-
-#~ msgid "Magyar"
-#~ msgstr "Magyar"
-
-#, fuzzy
-#~ msgid "Embedded Files|E"
-#~ msgstr "嵌入项(m)|m"
-
-#~ msgid "Insert URL"
-#~ msgstr "插入网址"
-
-#~ msgid "Undefined character style"
-#~ msgstr "未定义字符样式"
-
-#~ msgid "Previous command"
-#~ msgstr "上一命令"
-
-#~ msgid "LyX: Delimiters"
-#~ msgstr "LyX: Delimiters"
-
-#~ msgid "LyX: Insert Matrix"
-#~ msgstr "LyX: 插入矩阵"
-
-#~ msgid "Copiers"
-#~ msgstr "复制器"
-
-#~ msgid "Text Wrap Settings"
-#~ msgstr "文本换行设置"
-
-#~ msgid "Opened CharStyle Inset"
-#~ msgstr "打开的字符样式项"
-
 #, fuzzy
 #~ msgid "theorem"
 #~ msgstr "定理"
@@ -18527,93 +18665,67 @@ msgstr "未知用户"
 #~ msgid "HtmlUrl: "
 #~ msgstr "Html网址"
 
-#~ msgid "Show ERT inline"
-#~ msgstr "文中显示ERT"
-
-#~ msgid "Corollary @Section@.\\arabic{theorem}."
-#~ msgstr "Corollary @Section@.\\arabic{theorem}."
-
-#~ msgid "Lemma @Section@.\\arabic{theorem}."
-#~ msgstr "Lemma @Section@.\\arabic{theorem}."
-
-#~ msgid "Proposition @Section@.\\arabic{theorem}."
-#~ msgstr "Proposition @Section@.\\arabic{theorem}."
-
-#~ msgid "Conjecture @Section@.\\arabic{theorem}."
-#~ msgstr "Conjecture @Section@.\\arabic{theorem}."
-
-#~ msgid "Criterion @Section@.\\arabic{theorem}."
-#~ msgstr "Criterion @Section@.\\arabic{theorem}."
-
-#~ msgid "Algorithm @Section@.\\arabic{theorem}."
-#~ msgstr "Algorithm @Section@.\\arabic{theorem}."
-
-#~ msgid "Fact @Section@.\\arabic{theorem}."
-#~ msgstr "Fact @Section@.\\arabic{theorem}."
-
-#~ msgid "Axiom @Section@.\\arabic{theorem}."
-#~ msgstr "Axiom @Section@.\\arabic{theorem}."
+#~ msgid " Macro: %1$s: "
+#~ msgstr "宏：%1$s: "
 
-#~ msgid "Definition @Section@.\\arabic{theorem}."
-#~ msgstr "Definition @Section@.\\arabic{theorem}."
+#, fuzzy
+#~ msgid "CharStyle: "
+#~ msgstr "改变: "
 
-#~ msgid "Example @Section@.\\arabic{theorem}."
-#~ msgstr "Example @Section@.\\arabic{theorem}."
+#~ msgid "Default (outer)"
+#~ msgstr "缺省(外部)"
 
-#~ msgid "Problem @Section@.\\arabic{theorem}."
-#~ msgstr "Problem @Section@.\\arabic{theorem}."
+#~ msgid "Outer"
+#~ msgstr "外部"
 
-#~ msgid "Remark @Section@.\\arabic{theorem}."
-#~ msgstr "Remark @Section@.\\arabic{theorem}."
+#~ msgid "Text Wrap Settings"
+#~ msgstr "文本换行设置"
 
-#~ msgid "Claim @Section@.\\arabic{theorem}."
-#~ msgstr "Claim @Section@.\\arabic{theorem}."
+#~ msgid "%1$d words in selection."
+#~ msgstr "选中了 %1$d 词"
 
-#~ msgid "Note @Section@.\\arabic{theorem}."
-#~ msgstr "Note @Section@.\\arabic{theorem}."
+#~ msgid "%1$d words in document."
+#~ msgstr "文档有 %1$d 词"
 
-#~ msgid "Acknowledgement @Section@.\\arabic{theorem}."
-#~ msgstr "Acknowledgement @Section@.\\arabic{theorem}."
+#~ msgid "One word in selection."
+#~ msgstr "选中一个词"
 
-#~ msgid "Case @Section@.\\arabic{theorem}."
-#~ msgstr "Case @Section@.\\arabic{theorem}."
+#~ msgid "One word in document."
+#~ msgstr "文档有一个词"
 
-#~ msgid "@Section@.\\arabic{subsection}"
-#~ msgstr "@Section@.\\arabic{subsection}"
+#~ msgid "Count words"
+#~ msgstr "统计字数"
 
-#~ msgid "@Subsection@.\\arabic{subsubsection}"
-#~ msgstr "@Subsection@.\\arabic{subsubsection}"
+#~ msgid "Encoding error"
+#~ msgstr "编码出错"
 
-#~ msgid "@Subsubsection@.\\arabic{paragraph}"
-#~ msgstr "@Subsubsection@.\\arabic{paragraph}"
+#, fuzzy
+#~ msgid "Placeholders"
+#~ msgstr "PlaceTable"
 
-#~ msgid "@Paragraph@.\\arabic{subparagraph}"
-#~ msgstr "@Paragraph@.\\arabic{subparagraph}"
+#~ msgid "phantom"
+#~ msgstr "phantom"
 
-#~ msgid "\\arabic{chapter}.\\arabic{section}"
-#~ msgstr "\\arabic{chapter}.\\arabic{section}"
+#~ msgid "vphantom"
+#~ msgstr "vphantom"
 
-#~ msgid "\\Alph{chapter}.\\arabic{section}"
-#~ msgstr "\\Alph{chapter}.\\arabic{section}"
+#~ msgid "hphantom"
+#~ msgstr "hphantom"
 
-#~ msgid ""
-#~ "The document could not be converted\n"
-#~ "into the document class %1$s."
-#~ msgstr ""
-#~ "此文档无法改变到\n"
-#~ "文档类 %1$s."
+#~ msgid "&Right"
+#~ msgstr "右(&R)"
 
-#~ msgid "Formatting document..."
-#~ msgstr "格式化文档..."
+#~ msgid "Case."
+#~ msgstr "Case."
 
-#~ msgid "Look and feel"
-#~ msgstr "显示"
+#~ msgid "Case \\arabic{case}."
+#~ msgstr "Case \\arabic{case}."
 
-#~ msgid "Language settings"
-#~ msgstr "语言设置"
+#~ msgid "Algorithm #."
+#~ msgstr "Algorithm #."
 
-#~ msgid "Outputs"
-#~ msgstr "输出"
+#~ msgid "Case @Section@.\\arabic{theorem}."
+#~ msgstr "Case @Section@.\\arabic{theorem}."
 
 #~ msgid "&Load"
 #~ msgstr "装入(&L)"