Merge remote-tracking branch 'origin/master' into sheet

[pspp] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7c25b3729ce3f04f46ab0a93add01f0a69e18c19..f4dfde4e95b2b31668720bc72128f183c3cc44b1 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,17 +5,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pspp 0.8.5\n"
+"Project-Id-Version: pspp 0.10.0\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"PO-Revision-Date: 2015-08-10 16:46+0800\n"
+"POT-Creation-Date: 2015-06-19 20:56-0700\n"
+"PO-Revision-Date: 2016-03-28 11:18+0800\n"
 "Last-Translator: Shulin Yang <shulin.yang.9@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Poedit 1.8.4\n"
 
 #: src/ui/gui/helper.c:203
 msgid "Sorry. The help system hasn't yet been implemented."
@@ -47,28 +49,19 @@ msgstr "%s %s的宽度为%d，而%s要求的宽度范围介于%d到%d间。"
 #: src/data/format.c:357
 #, c-format
 msgid "%s %s specifies %d decimal place, but %s does not allow any decimals."
-msgid_plural ""
-"%s %s specifies %d decimal places, but %s does not allow any decimals."
+msgid_plural "%s %s specifies %d decimal places, but %s does not allow any decimals."
 msgstr[0] "%s %s具有%d的小数位数，而%s不允许使用小数。"
 
 #: src/data/format.c:368
 #, c-format
-msgid ""
-"%s %s specifies %d decimal place, but the given width allows at most %d "
-"decimals."
-msgid_plural ""
-"%s %s specifies %d decimal places, but the given width allows at most %d "
-"decimals."
+msgid "%s %s specifies %d decimal place, but the given width allows at most %d decimals."
+msgid_plural "%s %s specifies %d decimal places, but the given width allows at most %d decimals."
 msgstr[0] "%s %s 含有 %d 位小数，但其宽度最多能容纳 %d 位小数。"
 
 #: src/data/format.c:375
 #, c-format
-msgid ""
-"%s %s specifies %d decimal place, but the given width does not allow for any "
-"decimals."
-msgid_plural ""
-"%s %s specifies %d decimal places, but the given width does not allow for "
-"any decimals."
+msgid "%s %s specifies %d decimal place, but the given width does not allow for any decimals."
+msgid_plural "%s %s specifies %d decimal places, but the given width does not allow for any decimals."
 msgstr[0] "%s %s 含有 %d 位小数，但其宽度不允许包含小数。"
 
 #: src/data/format.c:414
@@ -86,8 +79,8 @@ msgstr "字符串"
 msgid "Numeric"
 msgstr "数字"
 
-#: src/data/format.c:416 src/data/sys-file-reader.c:2180
-#: src/data/sys-file-reader.c:2182 src/language/xforms/recode.c:512
+#: src/data/format.c:416 src/data/sys-file-reader.c:2196
+#: src/data/sys-file-reader.c:2198 src/language/xforms/recode.c:512
 #: src/language/xforms/recode.c:513 src/language/xforms/recode.c:525
 #: src/language/xforms/recode.c:526
 #: src/language/dictionary/apply-dictionary.c:77
@@ -95,8 +88,8 @@ msgstr "数字"
 msgid "numeric"
 msgstr "数字"
 
-#: src/data/format.c:416 src/data/sys-file-reader.c:2180
-#: src/data/sys-file-reader.c:2182 src/language/xforms/recode.c:512
+#: src/data/format.c:416 src/data/sys-file-reader.c:2196
+#: src/data/sys-file-reader.c:2198 src/language/xforms/recode.c:512
 #: src/language/xforms/recode.c:513 src/language/xforms/recode.c:525
 #: src/language/xforms/recode.c:526
 #: src/language/dictionary/apply-dictionary.c:77
@@ -135,63 +128,62 @@ msgstr "自定义"
 
 #: src/ui/gui/psppire-acr.c:266
 msgid "Add"
-msgstr ""
+msgstr "添加"
 
 #: src/ui/gui/psppire-acr.c:267
-#, fuzzy
 msgid "Edit"
-msgstr "编辑(_E)"
+msgstr "编辑"
 
 #: src/ui/gui/psppire-acr.c:268
 msgid "Remove"
-msgstr ""
+msgstr "移除"
 
 #: src/ui/gui/psppire-buttonbox.c:326
 msgid "OK"
-msgstr ""
+msgstr "确定"
 
 #: src/ui/gui/psppire-buttonbox.c:334
 msgid "Go To"
-msgstr ""
+msgstr "转到"
 
 #: src/ui/gui/psppire-buttonbox.c:342
 msgid "Continue"
 msgstr "继续"
 
-#: src/ui/gui/psppire-buttonbox.c:354 src/ui/gui/page-assistant.c:87
+#: src/ui/gui/psppire-buttonbox.c:354
+#: src/ui/gui/psppire-import-assistant.c:938
 msgid "Paste"
-msgstr ""
-
-#: src/ui/gui/psppire-buttonbox.c:360 src/ui/gui/aggregate-dialog.c:158
-#: src/ui/gui/psppire-data-window.c:496 src/ui/gui/psppire-data-window.c:624
-#: src/ui/gui/psppire-output-window.c:355
-#: src/ui/gui/psppire-syntax-window.c:568 src/ui/gui/psppire-window.c:523
-#: src/ui/gui/psppire-window.c:702 src/ui/gui/page-file.c:205
-#, fuzzy
+msgstr "粘贴"
+
+#: src/ui/gui/psppire-buttonbox.c:360 src/ui/gui/psppire-data-window.c:490
+#: src/ui/gui/psppire-data-window.c:618
+#: src/ui/gui/psppire-dialog-action-aggregate.c:216
+#: src/ui/gui/psppire-output-window.c:356
+#: src/ui/gui/psppire-syntax-window.c:568 src/ui/gui/psppire-window.c:473
+#: src/ui/gui/psppire-window.c:652
 msgid "Cancel"
-msgstr "å\8d\8fæ\96¹å·®"
+msgstr "å\8f\96æ¶\88"
 
 #: src/ui/gui/psppire-buttonbox.c:366
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
-#: src/ui/gui/psppire-buttonbox.c:373 src/ui/gui/page-assistant.c:90
-#, fuzzy
+#: src/ui/gui/psppire-buttonbox.c:373
+#: src/ui/gui/psppire-import-assistant.c:939
 msgid "Reset"
-msgstr "重置(_R)"
+msgstr "重置"
 
 #: src/ui/gui/psppire-buttonbox.c:380
-#, fuzzy
 msgid "Help"
-msgstr "帮助(_H)"
+msgstr "帮助"
 
 #: src/ui/gui/psppire-dictview.c:545 src/language/dictionary/split-file.c:82
-#: src/language/dictionary/sys-file-info.c:236
-#: src/language/dictionary/sys-file-info.c:435
-#: src/language/dictionary/sys-file-info.c:733
+#: src/language/dictionary/sys-file-info.c:240
+#: src/language/dictionary/sys-file-info.c:440
+#: src/language/dictionary/sys-file-info.c:738
 #: src/language/stats/descriptives.c:1018
-#: src/language/data-io/data-parser.c:682
-#: src/language/data-io/data-parser.c:721 src/language/data-io/print.c:446
+#: src/language/data-io/data-parser.c:654
+#: src/language/data-io/data-parser.c:693 src/language/data-io/print.c:446
 #: src/ui/gui/psppire-var-sheet.c:1249
 msgid "Variable"
 msgstr "变量"
@@ -212,12 +204,12 @@ msgstr "按名称排序"
 msgid "Sort by label"
 msgstr "按标签排序"
 
-#: src/ui/gui/psppire-var-view.c:189
+#: src/ui/gui/psppire-var-view.c:190
 #, c-format
 msgid "Var%d"
 msgstr "Var%d"
 
-#: src/ui/gui/psppire-checkbox-treeview.c:103 src/language/stats/examine.c:806
+#: src/ui/gui/psppire-checkbox-treeview.c:103 src/language/stats/examine.c:808
 #: src/language/stats/crosstabs.q:1271 src/language/stats/crosstabs.q:1301
 #: src/language/stats/crosstabs.q:1325 src/language/stats/crosstabs.q:1350
 msgid "Statistic"
@@ -276,9 +268,7 @@ msgstr "此处不能使用内联文件。"
 
 #: src/data/any-reader.c:201
 #, c-format
-msgid ""
-"Cannot read from dataset %s because no dictionary or data has been written "
-"to it yet."
+msgid "Cannot read from dataset %s because no dictionary or data has been written to it yet."
 msgstr "数字集%s未包含字典或数据，无法读取数据。"
 
 #: src/data/any-reader.c:256 src/language/data-io/dataset.c:257
@@ -301,9 +291,7 @@ msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15."
 msgstr "日期%04d-%d-%d早于系统可接受最早日期1582年10月15日。"
 
 #: src/data/casereader-filter.c:221
-msgid ""
-"At least one case in the data read had a weight value that was user-missing, "
-"system-missing, zero, or negative.  These case(s) were ignored."
+msgid "At least one case in the data read had a weight value that was user-missing, system-missing, zero, or negative.  These case(s) were ignored."
 msgstr "读取的数据中至少有一个个案因其权重值缺失或小于等于零而被忽略。"
 
 #. TRANSLATORS: this fragment will be interpolated into messages in fh_lock()
@@ -385,11 +373,8 @@ msgid "Delimiter expected between fields in date."
 msgstr "日期字段间须有分隔符。"
 
 #: src/data/data-in.c:898
-msgid ""
-"Unrecognized month format.  Months may be specified as Arabic or Roman "
-"numerals or as at least 3 letters of their English names."
-msgstr ""
-"无法识别月份。可用阿拉伯数字、罗马数字或月份英文名称的至少前3个字母表示。"
+msgid "Unrecognized month format.  Months may be specified as Arabic or Roman numerals or as at least 3 letters of their English names."
+msgstr "无法识别月份。可用阿拉伯数字、罗马数字或月份英文名称的至少前3个字母表示。"
 
 #: src/data/data-in.c:925
 #, c-format
@@ -430,9 +415,7 @@ msgid "Minute (%ld) must be between 0 and 59."
 msgstr "分钟(%ld) 的范围为0到59."
 
 #: src/data/data-in.c:1067
-msgid ""
-"Unrecognized weekday name.  At least the first two letters of an English "
-"weekday name must be specified."
+msgid "Unrecognized weekday name.  At least the first two letters of an English weekday name must be specified."
 msgstr "无法识别平日名称。用平日的英文至少前两位字母来表示该平日。"
 
 #: src/data/data-in.c:1197
@@ -469,9 +452,7 @@ msgid "scratch"
 msgstr "草稿"
 
 #: src/data/dictionary.c:1014
-msgid ""
-"At least one case in the data file had a weight value that was user-missing, "
-"system-missing, zero, or negative.  These case(s) were ignored."
+msgid "At least one case in the data file had a weight value that was user-missing, system-missing, zero, or negative.  These case(s) were ignored."
 msgstr "数据文件中至少有一个个案因其权重值缺失或小于等于零而被忽略。"
 
 #: src/data/dictionary.c:1343
@@ -513,30 +494,27 @@ msgstr "已设置%s，将不打开管道文件`%s'。"
 msgid "Support for %s files was not compiled into this installation of PSPP"
 msgstr "兼容%s类型文件的PSPP模块未安装。"
 
-#: src/data/gnumeric-reader.c:491 src/data/ods-reader.c:519
+#: src/data/gnumeric-reader.c:494 src/data/ods-reader.c:519
 #, c-format
 msgid "Cannot convert the value in the spreadsheet cell %s to format (%s): %s"
 msgstr "无法将表中单元格%s的值转换为(%s): %s格式。"
 
-#: src/data/gnumeric-reader.c:514 src/data/ods-reader.c:574
+#: src/data/gnumeric-reader.c:517 src/data/ods-reader.c:574
 #, c-format
-msgid ""
-"There was a problem whilst reading the %s file `%s' (near line %d): `%s'"
+msgid "There was a problem whilst reading the %s file `%s' (near line %d): `%s'"
 msgstr "读取%s文件`%s'在行%d附近出现错误：`%s'"
 
-#: src/data/gnumeric-reader.c:609
+#: src/data/gnumeric-reader.c:612
 #, c-format
-msgid ""
-"The gnumeric file `%s' is encoded as %s instead of the usual UTF-8 encoding. "
-"Any non-ascii characters will be incorrectly imported."
+msgid "The gnumeric file `%s' is encoded as %s instead of the usual UTF-8 encoding. Any non-ascii characters will be incorrectly imported."
 msgstr "Gnumeric文件%s的为%s编码而不是UTF-8编码，非ASCII字符可能无法正确导入。"
 
-#: src/data/gnumeric-reader.c:653 src/data/ods-reader.c:705
+#: src/data/gnumeric-reader.c:656 src/data/ods-reader.c:705
 #, c-format
 msgid "Invalid cell range `%s'"
 msgstr "数据格范围`%s'无效"
 
-#: src/data/gnumeric-reader.c:825 src/data/ods-reader.c:733
+#: src/data/gnumeric-reader.c:828 src/data/ods-reader.c:733
 #: src/data/ods-reader.c:866
 #, c-format
 msgid "Selected sheet or range of spreadsheet `%s' is empty."
@@ -558,15 +536,12 @@ msgstr "`%s'为系统保留字，不能作为识别符使用。"
 
 #: src/data/identifier2.c:103
 #, c-format
-msgid ""
-"`%s' may not be used as an identifier because it contains ill-formed UTF-8 "
-"at byte offset %tu."
+msgid "`%s' may not be used as an identifier because it contains ill-formed UTF-8 at byte offset %tu."
 msgstr "`%s'在%tu字节处与UTF-8编码不符，不能作为识别符使用。"
 
 #: src/data/identifier2.c:114
 #, c-format
-msgid ""
-"Character %s (in `%s') may not appear as the first character in a identifier."
+msgid "Character %s (in `%s') may not appear as the first character in a identifier."
 msgstr "不能使用`%s'中的字符%s作为识别符的第一个字符。"
 
 #: src/data/identifier2.c:126
@@ -611,9 +586,7 @@ msgstr "移除%s: %s。"
 
 #: src/data/mrset.c:83
 #, c-format
-msgid ""
-"%s is not a valid name for a multiple response set.  Multiple response set "
-"names must begin with `$'."
+msgid "%s is not a valid name for a multiple response set.  Multiple response set names must begin with `$'."
 msgstr "多重响应集名称%s不符合要求，多重响应集名称必须以`$'开头。"
 
 #: src/data/ods-reader.c:626
@@ -632,7 +605,7 @@ msgstr "SPSS/PC+系统文件"
 msgid "Error opening `%s' for reading as an SPSS/PC+ system file: %s."
 msgstr "打开SPSS/PC+系统文件`%s'时出现错误：%s。"
 
-#: src/data/pc+-file-reader.c:224 src/data/sys-file-reader.c:3474
+#: src/data/pc+-file-reader.c:224 src/data/sys-file-reader.c:3490
 #, c-format
 msgid "%s: stat failed (%s)."
 msgstr "%s: 状态统计失败 (%s)."
@@ -644,9 +617,7 @@ msgstr "%s：文件太大。"
 
 #: src/data/pc+-file-reader.c:257
 #, c-format
-msgid ""
-"Directory entry is for a %u-byte record starting at offset %u but file is "
-"only %u bytes long."
+msgid "Directory entry is for a %u-byte record starting at offset %u but file is only %u bytes long."
 msgstr "目录项为%u-字节记录，从偏移量%u处开始，但文件长度仅%u字节。"
 
 #: src/data/pc+-file-reader.c:275
@@ -654,12 +625,12 @@ msgstr "目录项为%u-字节记录，从偏移量%u处开始，但文件长度
 msgid "Directory fields have unexpected values (%u,%u)."
 msgstr "目录字段含有预期范围之外的值(%u, %u)。"
 
-#: src/data/pc+-file-reader.c:372 src/data/sys-file-reader.c:665
+#: src/data/pc+-file-reader.c:372 src/data/sys-file-reader.c:680
 #, c-format
 msgid "Variable %zu"
 msgstr "变量 %zu"
 
-#: src/data/pc+-file-reader.c:380 src/data/sys-file-reader.c:673
+#: src/data/pc+-file-reader.c:380 src/data/sys-file-reader.c:688
 #, c-format
 msgid "Variable %zu Label"
 msgstr "变量 %zu 标签"
@@ -669,33 +640,28 @@ msgstr "变量 %zu 标签"
 msgid "Variable %zu Value Label %zu"
 msgstr "变量 %zu 值标签%zu"
 
-#: src/data/pc+-file-reader.c:388 src/data/sys-file-reader.c:683
+#: src/data/pc+-file-reader.c:388 src/data/sys-file-reader.c:698
 msgid "Creation Date"
 msgstr "创建日期"
 
-#: src/data/pc+-file-reader.c:389 src/data/sys-file-reader.c:684
+#: src/data/pc+-file-reader.c:389 src/data/sys-file-reader.c:699
 msgid "Creation Time"
 msgstr "创建时间"
 
-#: src/data/pc+-file-reader.c:390 src/data/sys-file-reader.c:685
+#: src/data/pc+-file-reader.c:390 src/data/sys-file-reader.c:700
 msgid "Product"
 msgstr "产品"
 
-#: src/data/pc+-file-reader.c:391 src/data/sys-file-reader.c:686
+#: src/data/pc+-file-reader.c:391 src/data/sys-file-reader.c:701
 msgid "File Label"
 msgstr "文件标签"
 
 #: src/data/pc+-file-reader.c:427
 #, c-format
-msgid ""
-"Using default encoding %s to read this SPSS/PC+ system file.  For best "
-"results, specify an encoding explicitly.  Use SYSFILE INFO with ENCODING="
-"\"DETECT\" to analyze the possible encodings."
-msgstr ""
-"将使用默认的编码%s来打开SPSS/PC+系统文件。为得到最佳处理结果，请指定一个编"
-"码。可以使用含ENCODING=\"DETECT\"的SYSFILE INFO命令来分析文件可能使用的编码。"
+msgid "Using default encoding %s to read this SPSS/PC+ system file.  For best results, specify an encoding explicitly.  Use SYSFILE INFO with ENCODING=\"DETECT\" to analyze the possible encodings."
+msgstr "将使用默认的编码%s来打开SPSS/PC+系统文件。为得到最佳处理结果，请指定一个编码。可以使用含ENCODING=\"DETECT\"的SYSFILE INFO命令来分析文件可能使用的编码。"
 
-#: src/data/pc+-file-reader.c:483 src/data/sys-file-reader.c:899
+#: src/data/pc+-file-reader.c:483 src/data/sys-file-reader.c:914
 #, c-format
 msgid "Error closing system file `%s': %s."
 msgstr "关闭系统文件时出现错误`%s': %s。"
@@ -731,131 +697,113 @@ msgstr "不支持压缩类型%u。"
 
 #: src/data/pc+-file-reader.c:596
 #, c-format
-msgid ""
-"Record 0 claims %u cases with %u values per case (requiring at least %zu "
-"bytes) but data record is only %u bytes long."
-msgstr ""
-"记录0应该包含%u个案，每个案%u个值（需至少%zu字节），但数据记录长度仅为%u字"
-"节。"
+msgid "Record 0 claims %u cases with %u values per case (requiring at least %zu bytes) but data record is only %u bytes long."
+msgstr "记录0应该包含%u个案，每个案%u个值（需至少%zu字节），但数据记录长度仅为%u字节。"
 
 #: src/data/pc+-file-reader.c:618
 #, c-format
-msgid ""
-"Value labels claimed to end at offset %u in labels record but labels record "
-"is only %u bytes."
+msgid "Value labels claimed to end at offset %u in labels record but labels record is only %u bytes."
 msgstr "值标签在标签记录中应结束于偏移量%u处，但标签记录仅为%u字节。"
 
 #: src/data/pc+-file-reader.c:629
 #, c-format
-msgid ""
-"Value labels claimed to be at offset %u with length %u but file size is only "
-"%u bytes."
+msgid "Value labels claimed to be at offset %u with length %u but file size is only %u bytes."
 msgstr "值标签应位于偏移%u处，长度为%u，但文件大小仅为%u字节。"
 
-#: src/data/pc+-file-reader.c:655
+#: src/data/pc+-file-reader.c:656
 #, c-format
-msgid ""
-"Value labels end with partial label (%u bytes left in record, label length "
-"%<PRIu8>)."
+msgid "Value labels end with partial label (%u bytes left in record, label length %<PRIu8>)."
 msgstr "值标签的末尾标签值不完整(记录尚剩余%u字节，标签长度为%<PRIu8>)"
 
-#: src/data/pc+-file-reader.c:668
+#: src/data/pc+-file-reader.c:669
 #, c-format
 msgid "%u leftover bytes following value labels."
 msgstr "值标签后有%u字节空间。"
 
-#: src/data/pc+-file-reader.c:684
+#: src/data/pc+-file-reader.c:685
 #, c-format
-msgid ""
-"Variable label claimed to start at offset %u in labels record but labels "
-"record is only %u bytes."
+msgid "Variable label claimed to start at offset %u in labels record but labels record is only %u bytes."
 msgstr "变量标签在标签记录中应于偏移量%u处开始，但标签记录仅%u字节。"
 
-#: src/data/pc+-file-reader.c:696
+#: src/data/pc+-file-reader.c:697
 #, c-format
-msgid ""
-"Variable label with length %u starting at offset %u in labels record "
-"overruns end of %u-byte labels record."
+msgid "Variable label with length %u starting at offset %u in labels record overruns end of %u-byte labels record."
 msgstr "变量标签长度为%u（开始于偏移量%u处）大于标签记录的长度%u。"
 
-#: src/data/pc+-file-reader.c:718
+#: src/data/pc+-file-reader.c:719
 #, c-format
 msgid "Record 1 has length %u (expected %u)."
 msgstr "记录1长度为%u（要求为%u）。"
 
-#: src/data/pc+-file-reader.c:750
+#: src/data/pc+-file-reader.c:751
 #, c-format
 msgid "Variable %u has invalid type %<PRIu8>."
 msgstr "变量%u的类型%<PRIu8>有误。"
 
-#: src/data/pc+-file-reader.c:786
+#: src/data/pc+-file-reader.c:787
 #, c-format
 msgid "Invalid weight index %u."
 msgstr "加权指数%u不符要求。"
 
-#: src/data/pc+-file-reader.c:856 src/data/sys-file-reader.c:1423
+#: src/data/pc+-file-reader.c:857 src/data/sys-file-reader.c:1438
 #, c-format
 msgid "Invalid variable name `%s'."
 msgstr "变量名称有误`%s'。"
 
-#: src/data/pc+-file-reader.c:864 src/data/sys-file-reader.c:1438
+#: src/data/pc+-file-reader.c:865 src/data/sys-file-reader.c:1453
 #, c-format
 msgid "Renaming variable with duplicate name `%s' to `%s'."
 msgstr "将重复的变量名称`%s'重命名为`%s'。"
 
-#: src/data/pc+-file-reader.c:876
+#: src/data/pc+-file-reader.c:877
 #, c-format
 msgid "Cannot weight by string variable `%s'."
 msgstr "字符串变量 `%s'不能用于加权操作。"
 
-#: src/data/pc+-file-reader.c:974 src/data/sys-file-reader.c:2697
+#: src/data/pc+-file-reader.c:975 src/data/sys-file-reader.c:2713
 msgid "File ends in partial case."
 msgstr "文件结束于不完整个案。"
 
-#: src/data/pc+-file-reader.c:980
+#: src/data/pc+-file-reader.c:981
 #, c-format
-msgid ""
-"Case beginning at offset 0x%08x extends past end of data record at offset 0x"
-"%08x."
+msgid "Case beginning at offset 0x%08x extends past end of data record at offset 0x%08x."
 msgstr "始于0x%08x处的个案长度超过数据记录末尾的偏移量0x%08x。"
 
-#: src/data/pc+-file-reader.c:999 src/data/sys-file-reader.c:2705
+#: src/data/pc+-file-reader.c:1000 src/data/sys-file-reader.c:2721
 #, c-format
 msgid "Error reading case from file %s."
 msgstr "从文件%s读取个案时出现错误。"
 
-#: src/data/pc+-file-reader.c:1115 src/data/sys-file-reader.c:2868
+#: src/data/pc+-file-reader.c:1116 src/data/sys-file-reader.c:2884
 #, c-format
-msgid ""
-"Possible compressed data corruption: string contains compressed integer "
-"(opcode %d)."
+msgid "Possible compressed data corruption: string contains compressed integer (opcode %d)."
 msgstr "压缩数据可能已损坏：字符串含有压缩过整数(操作 %d)。"
 
-#: src/data/pc+-file-reader.c:1159 src/data/sys-file-reader.c:3163
+#: src/data/pc+-file-reader.c:1160 src/data/sys-file-reader.c:3179
 #, c-format
 msgid "`%s' near offset 0x%llx: "
 msgstr "`%s'位于偏移量0x%llx附近:"
 
-#: src/data/pc+-file-reader.c:1162 src/data/sys-file-reader.c:3166
+#: src/data/pc+-file-reader.c:1163 src/data/sys-file-reader.c:3182
 #, c-format
 msgid "`%s': "
 msgstr "`%s': "
 
-#: src/data/pc+-file-reader.c:1218 src/data/sys-file-reader.c:3221
+#: src/data/pc+-file-reader.c:1219 src/data/sys-file-reader.c:3237
 #, c-format
 msgid "System error: %s."
 msgstr "系统错误：%s。"
 
-#: src/data/pc+-file-reader.c:1223 src/data/sys-file-reader.c:3226
+#: src/data/pc+-file-reader.c:1224 src/data/sys-file-reader.c:3242
 msgid "Unexpected end of file."
 msgstr "文件意外结束"
 
-#: src/data/pc+-file-reader.c:1308 src/data/sys-file-reader.c:3451
+#: src/data/pc+-file-reader.c:1309 src/data/sys-file-reader.c:3467
 #, c-format
 msgid "%s: seek failed (%s)."
 msgstr "%s: 查找失败 (%s)."
 
-#: src/data/pc+-file-reader.c:1358
+#: src/data/pc+-file-reader.c:1359
 msgid "SPSS/PC+ System File"
 msgstr "SPSS/PC+ 系统文件"
 
@@ -886,8 +834,7 @@ msgstr "便携格式文件"
 
 #: src/data/por-file-reader.c:294
 #, c-format
-msgid ""
-"An error occurred while opening `%s' for reading as a portable file: %s."
+msgid "An error occurred while opening `%s' for reading as a portable file: %s."
 msgstr "打开便携格式`%s'时出错：%s。"
 
 #: src/data/por-file-reader.c:315
@@ -933,9 +880,7 @@ msgstr "时间字串长度有误%zu。"
 
 #: src/data/por-file-reader.c:641
 #, c-format
-msgid ""
-"%s: Bad format specifier byte (%d).  Variable will be assigned a default "
-"format."
+msgid "%s: Bad format specifier byte (%d).  Variable will be assigned a default format."
 msgstr "%s：指定格式字节(%d)有误，变量将使用默认格式。"
 
 #: src/data/por-file-reader.c:662
@@ -976,7 +921,7 @@ msgstr "变量宽度%d有误。"
 msgid "Invalid variable name `%s' in position %d."
 msgstr "变量名称`%s' 在位置%d处有错误。"
 
-#: src/data/por-file-reader.c:734 src/data/sys-file-reader.c:1430
+#: src/data/por-file-reader.c:734 src/data/sys-file-reader.c:1445
 #, c-format
 msgid "Bad width %d for variable %s."
 msgstr "变量宽度%d（变量%s）有误。"
@@ -998,8 +943,7 @@ msgstr "变量%s在标签值中不存在。"
 
 #: src/data/por-file-reader.c:844
 #, c-format
-msgid ""
-"Cannot assign value labels to %s and %s, which have different variable types."
+msgid "Cannot assign value labels to %s and %s, which have different variable types."
 msgstr "由于变量类型不同，不能将标签值赋与%s和%s。"
 
 #: src/data/por-file-reader.c:983
@@ -1022,9 +966,7 @@ msgid "An I/O error occurred writing portable file `%s'."
 msgstr "写入便携格式时出现I/O错误：`%s' 。"
 
 #: src/data/psql-reader.c:48
-msgid ""
-"Support for reading postgres databases was not compiled into this "
-"installation of PSPP"
+msgid "Support for reading postgres databases was not compiled into this installation of PSPP"
 msgstr "PSPP没有安装Postgres数据库读取模块。"
 
 #: src/data/psql-reader.c:242
@@ -1038,15 +980,11 @@ msgstr "打开psql源时出现错误：%s。"
 
 #: src/data/psql-reader.c:263
 #, c-format
-msgid ""
-"Postgres server is version %s. Reading from versions earlier than 8.0 is not "
-"supported."
+msgid "Postgres server is version %s. Reading from versions earlier than 8.0 is not supported."
 msgstr "Postgres服务器版本为%s，不支持从8.0以前版本读取数据。"
 
 #: src/data/psql-reader.c:283
-msgid ""
-"Connection is unencrypted, but unencrypted connections have not been "
-"permitted."
+msgid "Connection is unencrypted, but unencrypted connections have not been permitted."
 msgstr "不允许未加密的连接。"
 
 #: src/data/psql-reader.c:319 src/data/psql-reader.c:344
@@ -1061,552 +999,492 @@ msgid "Unsupported OID %d.  SYSMIS values will be inserted."
 msgstr "未支持的OID值%d。将使用SYSMIS值来代替。"
 
 #: src/data/settings.c:391
-msgid ""
-"MXWARNS set to zero.  No further warnings will be given even when "
-"potentially problematic situations are encountered."
+msgid "MXWARNS set to zero.  No further warnings will be given even when potentially problematic situations are encountered."
 msgstr "MXWARNS设置为零。当出现问题时将不再提示警告信息。"
 
 #: src/data/settings.c:398
 #, c-format
-msgid ""
-"Warnings re-enabled. %d warnings will be issued before aborting syntax "
-"processing."
+msgid "Warnings re-enabled. %d warnings will be issued before aborting syntax processing."
 msgstr "警告信息已激活，在放弃语法处理前将提示%d警告信息。"
 
 #: src/data/settings.c:618
 #, c-format
-msgid ""
-"%s: Custom currency string `%s' does not contain exactly three periods or "
-"commas (or it contains both)."
-msgstr ""
-"%s: 自定义货币字符 `%s' 未包含正好三个句号或逗号（或同时含有句号和逗号）。"
+msgid "%s: Custom currency string `%s' does not contain exactly three periods or commas (or it contains both)."
+msgstr "%s: 自定义货币字符 `%s' 未包含正好三个句号或逗号（或同时含有句号和逗号）。"
 
 #. TRANSLATORS: this fragment will be interpolated into
 #. messages in fh_lock() that identify types of files.
-#: src/data/sys-file-reader.c:407 src/data/sys-file-writer.c:245
+#: src/data/sys-file-reader.c:411 src/data/sys-file-writer.c:245
 msgid "system file"
 msgstr "系统文件"
 
-#: src/data/sys-file-reader.c:414
+#: src/data/sys-file-reader.c:418
 #, c-format
 msgid "Error opening `%s' for reading as a system file: %s."
 msgstr "打开系统文件`%s'时出现错误：%s。"
 
-#: src/data/sys-file-reader.c:491
+#: src/data/sys-file-reader.c:495
 msgid "Misplaced type 4 record."
 msgstr "类型4记录错位。"
 
-#: src/data/sys-file-reader.c:497
+#: src/data/sys-file-reader.c:501
 msgid "Duplicate type 6 (document) record."
 msgstr "类型6（文档）记录重复。"
 
-#: src/data/sys-file-reader.c:510 src/data/sys-file-reader.c:1348
-#, fuzzy, c-format
-msgid ""
-"Unrecognized record type 7, subtype %d.  For help, please send this file to "
-"%s and mention that you were using %s."
-msgstr "类型7记录无法识别，子类型%d。请将这个文件及创建该文件的语法发送到%s。"
+#: src/data/sys-file-reader.c:514 src/data/sys-file-reader.c:1363
+#, c-format
+msgid "Unrecognized record type 7, subtype %d.  For help, please send this file to %s and mention that you were using %s."
+msgstr "记录类型7无法识别，子类型为%d。若需帮助，请将这个文件发送到%s并注明您在使用%s。"
 
-#: src/data/sys-file-reader.c:519
-#, fuzzy, c-format
-msgid ""
-"Record type 7, subtype %d found here has the same type as the record found "
-"near offset 0x%llx.  For help, please send this file to %s and mention that "
-"you were using %s."
-msgstr ""
-"\"此处子类型为%d的类型7记录与偏移量0x%llx处记录的类型相同。请将这个文件及创建"
-"该文件的语法发送到%s。"
+#: src/data/sys-file-reader.c:534
+#, c-format
+msgid "Record type 7, subtype %d found here has the same type as the record found near offset 0x%llx.  For help, please send this file to %s and mention that you were using %s."
+msgstr "此处子类型%d的记录类型7与偏移量 0x%llx处的记录为同一类型。若需帮助，请将这个文件发送到%s并注明您在使用%s。"
 
-#: src/data/sys-file-reader.c:531
+#: src/data/sys-file-reader.c:546
 #, c-format
 msgid "Unrecognized record type %d."
 msgstr "记录类型%d无法识别。"
 
-#: src/data/sys-file-reader.c:681
+#: src/data/sys-file-reader.c:696
 #, c-format
 msgid "Value Label %zu"
 msgstr "变量标签 %zu"
 
-#: src/data/sys-file-reader.c:690
+#: src/data/sys-file-reader.c:705
 msgid "Extra Product Info"
 msgstr "更多产品信息"
 
-#: src/data/sys-file-reader.c:703
+#: src/data/sys-file-reader.c:718
 #, c-format
 msgid "Document Line %zu"
 msgstr "文件行%zu"
 
-#: src/data/sys-file-reader.c:711
+#: src/data/sys-file-reader.c:726
 #, c-format
 msgid "MRSET %zu"
 msgstr "多重响应集（MRSET） %zu"
 
-#: src/data/sys-file-reader.c:713
+#: src/data/sys-file-reader.c:728
 #, c-format
 msgid "MRSET %zu Label"
 msgstr "多重响应集（MRSET） %zu 标签"
 
-#: src/data/sys-file-reader.c:718
+#: src/data/sys-file-reader.c:733
 #, c-format
 msgid "MRSET %zu Counted Value"
 msgstr "多重响应集（MRSET）%zu 数量"
 
-#: src/data/sys-file-reader.c:758
+#: src/data/sys-file-reader.c:772
 #, c-format
-msgid ""
-"This system file does not indicate its own character encoding.  Using "
-"default encoding %s.  For best results, specify an encoding explicitly.  Use "
-"SYSFILE INFO with ENCODING=\"DETECT\" to analyze the possible encodings."
-msgstr ""
-"该系统文件没有字符编码信息。将使用默认的编码%s。为得到最佳处理结果，请指定一"
-"个编码。可以使用含ENCODING=\"DETECT\"的SYSFILE INFO命令来分析文件可能使用的编"
-"码。"
+msgid "This system file does not indicate its own character encoding.  Using default encoding %s.  For best results, specify an encoding explicitly.  Use SYSFILE INFO with ENCODING=\"DETECT\" to analyze the possible encodings."
+msgstr "该系统文件没有字符编码信息。将使用默认的编码%s。为得到最佳处理结果，请指定一个编码。可以使用含ENCODING=\"DETECT\"的SYSFILE INFO命令来分析文件可能使用的编码。"
 
-#: src/data/sys-file-reader.c:812
+#: src/data/sys-file-reader.c:826
 #, c-format
 msgid "Ignoring string variable `%s' set as weighting variable."
 msgstr "忽略作为权重变量的字符串变量`%s'。"
 
-#: src/data/sys-file-reader.c:854
+#: src/data/sys-file-reader.c:869
 #, c-format
 msgid "File header claims %d variable positions but %zu were read from file."
 msgstr "文件头指定%d变量位置，而文件中实际读取到%zu。"
 
-#: src/data/sys-file-reader.c:965 src/data/sys-file-reader.c:979
+#: src/data/sys-file-reader.c:980 src/data/sys-file-reader.c:994
 msgid "This is not an SPSS system file."
 msgstr "该文件不是SPSS系统文件。"
 
-#: src/data/sys-file-reader.c:1034
-msgid ""
-"Compression bias is not the usual value of 100, or system file uses "
-"unrecognized floating-point format."
+#: src/data/sys-file-reader.c:1049
+msgid "Compression bias is not the usual value of 100, or system file uses unrecognized floating-point format."
 msgstr "压缩偏值不是常用的100，系统文件可能使用了无法识别的浮点格式。"
 
-#: src/data/sys-file-reader.c:1109
+#: src/data/sys-file-reader.c:1124
 msgid "Variable label indicator field is not 0 or 1."
 msgstr "变量标签指示字段值非0或1。"
 
-#: src/data/sys-file-reader.c:1122
+#: src/data/sys-file-reader.c:1137
 msgid "Numeric missing value indicator field is not -3, -2, 0, 1, 2, or 3."
 msgstr "数字缺失指示字段值不在下列值中： -3, -2, 0, 1, 2, 3。"
 
-#: src/data/sys-file-reader.c:1132
+#: src/data/sys-file-reader.c:1147
 msgid "String missing value indicator field is not 0, 1, 2, or 3."
 msgstr "字符串缺失值提示字段不等于下列任一值：0, 1, 2, 3。"
 
-#: src/data/sys-file-reader.c:1159
+#: src/data/sys-file-reader.c:1174
 #, c-format
 msgid "Invalid number of labels %u."
 msgstr "标签数量有误%u。"
 
-#: src/data/sys-file-reader.c:1192
-msgid ""
-"Variable index record (type 4) does not immediately follow value label "
-"record (type 3) as it should."
+#: src/data/sys-file-reader.c:1207
+msgid "Variable index record (type 4) does not immediately follow value label record (type 3) as it should."
 msgstr "变量索引记录（类型4）没有按照要求紧接于变量值的标签记录（类型3）之后。"
 
-#: src/data/sys-file-reader.c:1204
+#: src/data/sys-file-reader.c:1219
 #, c-format
-msgid ""
-"Number of variables associated with a value label (%u) is not between 1 and "
-"the number of variables (%zu)."
+msgid "Number of variables associated with a value label (%u) is not between 1 and the number of variables (%zu)."
 msgstr "与变量值标签(%u)相对应的变量数量没有处于范围1和变量数目(%zu)之间。"
 
-#: src/data/sys-file-reader.c:1233
+#: src/data/sys-file-reader.c:1248
 #, c-format
 msgid "Number of document lines (%d) must be greater than 0 and less than %d."
 msgstr "文件的行数(%d)必须大于0且小于%d。"
 
-#: src/data/sys-file-reader.c:1322
+#: src/data/sys-file-reader.c:1337
 #, c-format
 msgid "Record type 7, subtype %d has bad size %u (expected %d)."
 msgstr "变量类型7的亚类型%d大小%u有误（要求为%d）。"
 
-#: src/data/sys-file-reader.c:1326
+#: src/data/sys-file-reader.c:1341
 #, c-format
 msgid "Record type 7, subtype %d has bad count %u (expected %d)."
 msgstr "变量类型7的亚类型%d数量%u有误（要求%d）。"
 
-#: src/data/sys-file-reader.c:1510
+#: src/data/sys-file-reader.c:1525
 msgid "Missing string continuation record."
 msgstr "缺少字符串连续记录。"
 
-#: src/data/sys-file-reader.c:1556
+#: src/data/sys-file-reader.c:1571
 #, c-format
 msgid "Variable %s with width %d has invalid print format 0x%x."
 msgstr "变量%s（宽度%d）输出格式有误0x%x。"
 
-#: src/data/sys-file-reader.c:1560
+#: src/data/sys-file-reader.c:1575
 #, c-format
 msgid "Variable %s with width %d has invalid write format 0x%x."
 msgstr "变量%s(宽度为%d)的写入格式有误0x%x。"
 
-#: src/data/sys-file-reader.c:1565
+#: src/data/sys-file-reader.c:1580
 msgid "Suppressing further invalid format warnings."
 msgstr "不再提示错误格式。"
 
-#: src/data/sys-file-reader.c:1619
+#: src/data/sys-file-reader.c:1634
 #, c-format
-msgid ""
-"Floating-point representation indicated by system file (%d) differs from "
-"expected (%d)."
+msgid "Floating-point representation indicated by system file (%d) differs from expected (%d)."
 msgstr "系统文件(%d)提供的浮点格式与要求的格式(%d)不同。"
 
-#: src/data/sys-file-reader.c:1635
+#: src/data/sys-file-reader.c:1650
 #, c-format
-msgid ""
-"Integer format indicated by system file (%d) differs from expected (%d)."
+msgid "Integer format indicated by system file (%d) differs from expected (%d)."
 msgstr "系统文件(%d)提供的整数格式与要求的格式(%d)不同。"
 
-#: src/data/sys-file-reader.c:1653 src/data/sys-file-reader.c:1659
+#: src/data/sys-file-reader.c:1668 src/data/sys-file-reader.c:1674
 #, c-format
 msgid "File specifies unexpected value %g (%a) as %s, instead of %g (%a)."
 msgstr "文件指定的值%g (%a)为%s，与要求的%g (%a)不一致。"
 
-#: src/data/sys-file-reader.c:1668
+#: src/data/sys-file-reader.c:1683
 #, c-format
-msgid ""
-"File specifies unexpected value %g (%a) as %s, instead of %g (%a) or %g (%a)."
+msgid "File specifies unexpected value %g (%a) as %s, instead of %g (%a) or %g (%a)."
 msgstr "文件指定的值%g (%a)为%s，与要求的%g (%a)或%g (%a)不一致。"
 
-#: src/data/sys-file-reader.c:1720 src/data/sys-file-reader.c:1739
+#: src/data/sys-file-reader.c:1735 src/data/sys-file-reader.c:1754
 #, c-format
 msgid "Missing space following `%c' at offset %zu in MRSETS record."
 msgstr "多重响应数据集(MRSETS)在`%c'后 缺少空格，该处的偏移量为%zu。"
 
-#: src/data/sys-file-reader.c:1749
+#: src/data/sys-file-reader.c:1764
 #, c-format
-msgid ""
-"Unexpected label source value following `E' at offset %zu in MRSETS record."
+msgid "Unexpected label source value following `E' at offset %zu in MRSETS record."
 msgstr "多重响应数据集(MRSETS)的`E'之后标签源值与要求不符，该处的偏移量为%zu。"
 
-#: src/data/sys-file-reader.c:1756
+#: src/data/sys-file-reader.c:1771
 #, c-format
 msgid "Missing `C', `D', or `E' at offset %zu in MRSETS record."
 msgstr "多重响应数据集(MRSETS)缺少`C', `D' 或 `E'，该处的偏移量为%zu。"
 
-#: src/data/sys-file-reader.c:1783
+#: src/data/sys-file-reader.c:1798
 #, c-format
 msgid "Missing new-line parsing variable names at offset %zu in MRSETS record."
 msgstr "多重响应数据集(MRSETS)在偏移量%zu处缺少换行解析变量名称。"
 
-#: src/data/sys-file-reader.c:1818
+#: src/data/sys-file-reader.c:1833
 #, c-format
 msgid "Multiple response set name `%s' does not begin with `$'."
 msgstr "多重响应数据集(MRSETS)名称 `%s' 应该以 `$'开头。"
 
-#: src/data/sys-file-reader.c:1852
+#: src/data/sys-file-reader.c:1867
 #, c-format
 msgid "MRSET %s contains duplicate variable name %s."
 msgstr "多重响应数据集(MRSETS)%s含有重复的变量名称%s。"
 
-#: src/data/sys-file-reader.c:1867
+#: src/data/sys-file-reader.c:1882
 #, c-format
 msgid "MRSET %s contains both string and numeric variables."
 msgstr "多重响应数据集(MRSETS)%s同时含有字符串变量和数字变量。"
 
-#: src/data/sys-file-reader.c:1879
+#: src/data/sys-file-reader.c:1894
 #, c-format
 msgid "MRSET %s has no variables."
 msgstr "多重响应数据集(MRSETS)%s中没有变量。"
 
-#: src/data/sys-file-reader.c:1881
+#: src/data/sys-file-reader.c:1896
 #, c-format
 msgid "MRSET %s has only one variable."
 msgstr "多重响应数据集(MRSETS)%s只有一个变量。"
 
-#: src/data/sys-file-reader.c:1925
+#: src/data/sys-file-reader.c:1940
 #, c-format
 msgid "Extension 11 has bad count %u (for %zu variables)."
 msgstr "扩展11数量%u有误(共%zu个变量)。"
 
-#: src/data/sys-file-reader.c:1958
+#: src/data/sys-file-reader.c:1973
 #, c-format
-msgid ""
-"Invalid variable display parameters for variable %zu (%s).  Default "
-"parameters substituted."
+msgid "Invalid variable display parameters for variable %zu (%s).  Default parameters substituted."
 msgstr "变量 %zu (%s)的显示参数有误，使用默认参数代替。"
 
-#: src/data/sys-file-reader.c:2052
+#: src/data/sys-file-reader.c:2068
 #, c-format
 msgid "Long variable mapping from %s to invalid variable name `%s'."
 msgstr "将%s用长变量映射为不合语法的`%s'。"
 
-#: src/data/sys-file-reader.c:2063
+#: src/data/sys-file-reader.c:2079
 #, c-format
 msgid "Duplicate long variable name `%s'."
 msgstr "长变量名`%s'重复。"
 
-#: src/data/sys-file-reader.c:2096
+#: src/data/sys-file-reader.c:2112
 #, c-format
 msgid "%s listed as string of invalid length %s in very long string record."
 msgstr "超长字符串记录中的字符串%s的长度%s有误。"
 
-#: src/data/sys-file-reader.c:2107
+#: src/data/sys-file-reader.c:2123
 #, c-format
-msgid ""
-"%s listed in very long string record with width %s, which requires only one "
-"segment."
+msgid "%s listed in very long string record with width %s, which requires only one segment."
 msgstr "%s作为宽度为%s的非常长字符串记录列出，而该宽度仅需一个节段。"
 
-#: src/data/sys-file-reader.c:2115
+#: src/data/sys-file-reader.c:2131
 #, c-format
 msgid "Very long string %s overflows dictionary."
 msgstr "长字符串%s溢出字典。"
 
-#: src/data/sys-file-reader.c:2133
+#: src/data/sys-file-reader.c:2149
 #, c-format
-msgid ""
-"Very long string with width %ld has segment %d of width %d (expected %d)."
+msgid "Very long string with width %ld has segment %d of width %d (expected %d)."
 msgstr "宽度%ld的长字符串具节段%d，宽度为%d（预期为%d）。"
 
-#: src/data/sys-file-reader.c:2176
+#: src/data/sys-file-reader.c:2192
 #, c-format
-msgid ""
-"Variables associated with value label are not all of identical type.  "
-"Variable %s is %s, but variable %s is %s."
+msgid "Variables associated with value label are not all of identical type.  Variable %s is %s, but variable %s is %s."
 msgstr "变量与相应的标签值类型不一致。变量%s为%s，而变量%s为%s。"
 
-#: src/data/sys-file-reader.c:2196
+#: src/data/sys-file-reader.c:2212
 #, c-format
-msgid ""
-"Value labels may not be added to long string variables (e.g. %s) using "
-"records types 3 and 4."
+msgid "Value labels may not be added to long string variables (e.g. %s) using records types 3 and 4."
 msgstr "值标签可能无法使用记录类型3和4添加到长字串变量(例如：%s)中。"
 
-#: src/data/sys-file-reader.c:2217
+#: src/data/sys-file-reader.c:2233
 #, c-format
 msgid "Duplicate value label for %g on %s."
 msgstr "值标签%g于%s上重复。"
 
-#: src/data/sys-file-reader.c:2221 src/data/sys-file-reader.c:2534
+#: src/data/sys-file-reader.c:2237 src/data/sys-file-reader.c:2550
 #, c-format
 msgid "Duplicate value label for `%.*s' on %s."
 msgstr "值标签`%.*s'于%s上重复。"
 
-#: src/data/sys-file-reader.c:2248
+#: src/data/sys-file-reader.c:2264
 #, c-format
 msgid "Variable index %d not in valid range 1...%zu."
 msgstr "变量索引%d的超出有效范围1...%zu"
 
-#: src/data/sys-file-reader.c:2257
+#: src/data/sys-file-reader.c:2273
 #, c-format
 msgid "Variable index %d refers to long string continuation."
 msgstr "变量索引%d指向长字符串连续性。"
 
-#: src/data/sys-file-reader.c:2293
+#: src/data/sys-file-reader.c:2309
 #, c-format
 msgid "Error parsing attribute value %s[%d]."
 msgstr "特征值解析错误%s[%d]。"
 
-#: src/data/sys-file-reader.c:2307
+#: src/data/sys-file-reader.c:2323
 #, c-format
 msgid "Attribute value %s[%d] is not quoted: %s."
 msgstr "特征值%s[%d]没有被引用：%s。"
 
-#: src/data/sys-file-reader.c:2397
+#: src/data/sys-file-reader.c:2413
 #, c-format
 msgid "Invalid role for variable %s."
 msgstr "变量%s角色错误。"
 
-#: src/data/sys-file-reader.c:2406
+#: src/data/sys-file-reader.c:2422
 #, c-format
 msgid "%zu other variables had invalid roles."
 msgstr "%zu的其他变量角色无效。"
 
-#: src/data/sys-file-reader.c:2419
+#: src/data/sys-file-reader.c:2435
 #, c-format
 msgid "Extension record subtype %d ends unexpectedly."
 msgstr "扩展变量子类型%d意外结束。"
 
-#: src/data/sys-file-reader.c:2464
+#: src/data/sys-file-reader.c:2480
 #, c-format
 msgid "Ignoring long string value label record for unknown variable %s."
 msgstr "未知变量%s，忽略长字串值标签记录。"
 
-#: src/data/sys-file-reader.c:2469
+#: src/data/sys-file-reader.c:2485
 #, c-format
 msgid "Ignoring long string value label record for numeric variable %s."
 msgstr "忽略数字变量%s的长字串值标签记录。"
 
-#: src/data/sys-file-reader.c:2476
+#: src/data/sys-file-reader.c:2492
 #, c-format
-msgid ""
-"Ignoring long string value label record for variable %s because the record's "
-"width (%d) does not match the variable's width (%d)."
+msgid "Ignoring long string value label record for variable %s because the record's width (%d) does not match the variable's width (%d)."
 msgstr "忽略变量%s的长字串值标签记录，因其宽度(%d)与变量宽度(%d)不符。"
 
-#: src/data/sys-file-reader.c:2507
+#: src/data/sys-file-reader.c:2523
 #, c-format
-msgid ""
-"Ignoring long string value label %zu for variable %s, with width %d, that "
-"has bad value width %zu."
+msgid "Ignoring long string value label %zu for variable %s, with width %d, that has bad value width %zu."
 msgstr "忽略长字串值标签%zu，因变量%s(宽度%d)变量宽度%zu不正确。"
 
-#: src/data/sys-file-reader.c:2580
+#: src/data/sys-file-reader.c:2596
 #, c-format
-msgid ""
-"Long string missing values record says variable %s has %d missing values, "
-"but only 1 to 3 missing values are allowed."
+msgid "Long string missing values record says variable %s has %d missing values, but only 1 to 3 missing values are allowed."
 msgstr "长字符串缺失值记录显示变量%s有%d个缺失值，而系统只允许1至3个缺失值。"
 
-#: src/data/sys-file-reader.c:2590
+#: src/data/sys-file-reader.c:2606
 #, c-format
 msgid "Ignoring long string missing value record for unknown variable %s."
 msgstr "忽略未知变量%s的长字符串缺失值记录。"
 
-#: src/data/sys-file-reader.c:2595
+#: src/data/sys-file-reader.c:2611
 #, c-format
 msgid "Ignoring long string missing value record for numeric variable %s."
 msgstr "忽略数字变量%s的长字符串缺失值记录。"
 
-#: src/data/sys-file-reader.c:2620
+#: src/data/sys-file-reader.c:2636
 #, c-format
-msgid ""
-"Ignoring long string missing value %zu for variable %s, with width %d, that "
-"has bad value width %zu."
+msgid "Ignoring long string missing value %zu for variable %s, with width %d, that has bad value width %zu."
 msgstr "忽略长字串值标签%zu，因变量%s(宽度%d)变量宽度%zu不正确。"
 
-#: src/data/sys-file-reader.c:2675
+#: src/data/sys-file-reader.c:2691
 msgid "File ends in partial string value."
 msgstr "文件结束于不完整字符串值。"
 
-#: src/data/sys-file-reader.c:2814
-msgid ""
-"Possible compressed data corruption: compressed spaces appear in numeric "
-"field."
+#: src/data/sys-file-reader.c:2830
+msgid "Possible compressed data corruption: compressed spaces appear in numeric field."
 msgstr "压缩的数据可能已损坏：压缩空间出现于数字字段。"
 
-#: src/data/sys-file-reader.c:2965
+#: src/data/sys-file-reader.c:2981
 #, c-format
 msgid "Suppressed %d additional related warnings."
 msgstr "%d的相关警告没有显示。"
 
-#: src/data/sys-file-reader.c:3011 src/data/sys-file-reader.c:3028
+#: src/data/sys-file-reader.c:3027 src/data/sys-file-reader.c:3044
 #, c-format
 msgid "Dictionary record refers to unknown variable %s."
 msgstr "字典记录指向未知变量%s。"
 
-#: src/data/sys-file-reader.c:3090
+#: src/data/sys-file-reader.c:3106
 #, c-format
 msgid "Expecting digit at offset %zu in MRSETS record."
 msgstr "多重响应记录在偏移量%zu处应为数字。"
 
-#: src/data/sys-file-reader.c:3098
+#: src/data/sys-file-reader.c:3114
 #, c-format
 msgid "Expecting space at offset %zu in MRSETS record."
 msgstr "多重响应记录在偏移量%zu处应为空格。"
 
-#: src/data/sys-file-reader.c:3106
+#: src/data/sys-file-reader.c:3122
 #, c-format
 msgid "%zu-byte string starting at offset %zu exceeds record length %zu."
 msgstr "%zu字节的字符串从偏移量%zu开始处超过记录长度%zu。"
 
-#: src/data/sys-file-reader.c:3116
+#: src/data/sys-file-reader.c:3132
 #, c-format
 msgid "Expecting space at offset %zu following %zu-byte string."
 msgstr "偏移量%zu处应为紧接于%zu-字节字符串后的空格。"
 
-#: src/data/sys-file-reader.c:3409
+#: src/data/sys-file-reader.c:3425
 #, c-format
 msgid "Wrong ZLIB data header offset %#llx (expected %#llx)."
 msgstr "ZLIB数据头偏移错误%#llx(应为%#llx)."
 
-#: src/data/sys-file-reader.c:3417
+#: src/data/sys-file-reader.c:3433
 #, c-format
 msgid "Impossible ZLIB trailer offset 0x%llx."
 msgstr "错误的ZLIB尾端偏移0x%llx."
 
-#: src/data/sys-file-reader.c:3424
+#: src/data/sys-file-reader.c:3440
 #, c-format
 msgid "Invalid ZLIB trailer length %lld."
 msgstr "ZLIB尾端长度错误%lld."
 
-#: src/data/sys-file-reader.c:3488
+#: src/data/sys-file-reader.c:3504
 #, c-format
 msgid "End of ZLIB trailer (0x%llx) is not file size (0x%llx)."
 msgstr "ZLIB尾端(0x%llx)结束处不是文件大小(0x%llx)."
 
-#: src/data/sys-file-reader.c:3498
+#: src/data/sys-file-reader.c:3514
 #, c-format
 msgid "ZLIB trailer bias (%lld) differs from file header bias (%.2f)."
 msgstr "ZLIB尾端偏量(%lld)与文件头偏量(%.2f)不符。"
 
-#: src/data/sys-file-reader.c:3508
+#: src/data/sys-file-reader.c:3524
 #, c-format
 msgid "ZLIB trailer \"zero\" field has nonzero value %lld."
 msgstr "ZLIB尾端\"zero\"字段含有非零值%lld。"
 
-#: src/data/sys-file-reader.c:3514
+#: src/data/sys-file-reader.c:3530
 #, c-format
 msgid "ZLIB trailer specifies unexpected %u-byte block size."
 msgstr "ZLIB尾端含有不符合要求的%u字节块。"
 
-#: src/data/sys-file-reader.c:3522
+#: src/data/sys-file-reader.c:3538
 #, c-format
 msgid "%lld-byte ZLIB trailer specifies %u data blocks (expected %lld)."
 msgstr "ZLIB尾端%lld-字节含有%u数据块（应该为%lld）。"
 
-#: src/data/sys-file-reader.c:3547
+#: src/data/sys-file-reader.c:3563
 #, c-format
-msgid ""
-"ZLIB block descriptor %u reported uncompressed data offset %#llx, when %#llx "
-"was expected."
+msgid "ZLIB block descriptor %u reported uncompressed data offset %#llx, when %#llx was expected."
 msgstr "ZLIB块描述%u发现%#llx的未压缩数据偏移，应该为%#llx。"
 
-#: src/data/sys-file-reader.c:3556
+#: src/data/sys-file-reader.c:3572
 #, c-format
-msgid ""
-"ZLIB block descriptor %u reported compressed data offset %#llx, when %#llx "
-"was expected."
+msgid "ZLIB block descriptor %u reported compressed data offset %#llx, when %#llx was expected."
 msgstr "ZLIB块描述%u发现%#llx的压缩数据偏移，应该为%#llx。"
 
-#: src/data/sys-file-reader.c:3566
+#: src/data/sys-file-reader.c:3582
 #, c-format
-msgid ""
-"ZLIB block descriptor %u reported block size %#x, when %#x was expected."
+msgid "ZLIB block descriptor %u reported block size %#x, when %#x was expected."
 msgstr "ZLIB块描述%u的区块尺寸为%#x，应该为%#x。"
 
-#: src/data/sys-file-reader.c:3574
+#: src/data/sys-file-reader.c:3590
 #, c-format
-msgid ""
-"ZLIB block descriptor %u reported block size %#x, when at most %#x was "
-"expected."
+msgid "ZLIB block descriptor %u reported block size %#x, when at most %#x was expected."
 msgstr "ZLIB块描述%u的区块尺寸为%#x，而最大值为%#x。"
 
-#: src/data/sys-file-reader.c:3586
+#: src/data/sys-file-reader.c:3602
 #, c-format
-msgid ""
-"ZLIB block descriptor %u reports compressed size %u and uncompressed size %u."
+msgid "ZLIB block descriptor %u reports compressed size %u and uncompressed size %u."
 msgstr "ZLIB块描述%u中的压缩尺寸为%u，未压缩尺寸为%u。"
 
-#: src/data/sys-file-reader.c:3598
+#: src/data/sys-file-reader.c:3614
 #, c-format
-msgid ""
-"ZLIB trailer is at offset %#llx but %#llx would be expected from block "
-"descriptors."
+msgid "ZLIB trailer is at offset %#llx but %#llx would be expected from block descriptors."
 msgstr "ZLIB尾端位于偏移量%#llx处，根据区块描述其大小应为%#llx。"
 
-#: src/data/sys-file-reader.c:3617
+#: src/data/sys-file-reader.c:3633
 #, c-format
 msgid "ZLIB initialization failed (%s)."
 msgstr "ZLIB初始化失败(%s)。"
 
-#: src/data/sys-file-reader.c:3632
+#: src/data/sys-file-reader.c:3648
 #, c-format
 msgid "Inconsistency at end of ZLIB stream (%s)."
 msgstr "ZLIB流结束处数据前后矛盾(%s)。"
 
-#: src/data/sys-file-reader.c:3691
+#: src/data/sys-file-reader.c:3707
 #, c-format
 msgid "ZLIB stream inconsistency (%s)."
 msgstr "ZLIB流数据前后矛盾(%s)。"
 
-#: src/data/sys-file-reader.c:3715
+#: src/data/sys-file-reader.c:3731
 msgid "Unexpected end of ZLIB compressed data."
 msgstr "ZLIB压缩数据结束处不符要求。"
 
-#: src/data/sys-file-reader.c:3753
+#: src/data/sys-file-reader.c:3769
 msgid "SPSS System File"
 msgstr "SPSS系统文件"
 
@@ -1630,12 +1508,12 @@ msgstr "ZLIB压缩初始化失败(%s)。"
 msgid "Failed to complete ZLIB stream compression (%s)."
 msgstr "无法完成ZLIB流压缩(%s)。"
 
-#: src/data/sys-file-writer.c:1455
+#: src/data/sys-file-writer.c:1456
 #, c-format
 msgid "ZLIB stream compression failed (%s)."
 msgstr "ZLIB流压缩失败(%s)。"
 
-#: src/data/sys-file-writer.c:1497
+#: src/data/sys-file-writer.c:1498
 #, c-format
 msgid "%s: Seek failed (%s)."
 msgstr "%s: 查找失败(%s)。"
@@ -1662,7 +1540,7 @@ msgid "Input"
 msgstr "输入"
 
 #. TRANSLATORS: This will form a filename.  Please avoid whitespace.
-#: src/data/variable.c:877 src/ui/gui/psppire-output-window.c:535
+#: src/data/variable.c:877 src/ui/gui/psppire-output-window.c:526
 msgid "Output"
 msgstr "输出"
 
@@ -1670,7 +1548,7 @@ msgstr "输出"
 msgid "Both"
 msgstr "同时"
 
-#: src/data/variable.c:883 src/language/dictionary/sys-file-info.c:225
+#: src/data/variable.c:883 src/language/dictionary/sys-file-info.c:229
 #: src/ui/gui/psppire-dialog-action-crosstabs.c:84
 #: src/ui/gui/psppire-dialog-action-crosstabs.c:96
 #: src/ui/gui/psppire-dialog-action-crosstabs.c:131
@@ -1699,13 +1577,13 @@ msgstr "右"
 msgid "Center"
 msgstr "中心"
 
-#: src/language/command.c:207 src/language/stats/graph.c:683
-#: src/language/stats/graph.c:689 src/language/stats/graph.c:723
-#: src/language/stats/graph.c:728 src/language/stats/graph.c:733
-#: src/language/stats/graph.c:785 src/language/stats/graph.c:790
-#: src/language/stats/graph.c:795 src/language/stats/graph.c:800
-#: src/language/stats/graph.c:805 src/language/stats/graph.c:810
-#: src/language/stats/graph.c:815 src/language/utilities/set.q:237
+#: src/language/command.c:207 src/language/stats/graph.c:691
+#: src/language/stats/graph.c:697 src/language/stats/graph.c:731
+#: src/language/stats/graph.c:736 src/language/stats/graph.c:741
+#: src/language/stats/graph.c:794 src/language/stats/graph.c:799
+#: src/language/stats/graph.c:804 src/language/stats/graph.c:809
+#: src/language/stats/graph.c:814 src/language/stats/graph.c:819
+#: src/language/stats/graph.c:824 src/language/utilities/set.q:236
 #, c-format
 msgid "%s is not yet implemented."
 msgstr "%s尚未实现。"
@@ -1746,14 +1624,12 @@ msgstr "%s操作仅可在%s内进行。"
 
 #: src/language/command.c:400 src/language/command.c:404
 #, c-format
-msgid ""
-"%s is allowed only before the active dataset has been defined or inside %s."
+msgid "%s is allowed only before the active dataset has been defined or inside %s."
 msgstr "%s操作仅可在选定数据集之前或%s内进行。"
 
 #: src/language/command.c:408 src/language/command.c:412
 #, c-format
-msgid ""
-"%s is allowed only after the active dataset has been defined or inside %s."
+msgid "%s is allowed only after the active dataset has been defined or inside %s."
 msgstr "%s操作仅可在选定数据集之后或%s内进行。"
 
 #: src/language/command.c:416
@@ -1763,16 +1639,12 @@ msgstr "%s操作仅可在%s或%s内进行。"
 
 #: src/language/command.c:422
 #, c-format
-msgid ""
-"%s is allowed only after the active dataset has been defined, inside INPUT "
-"PROGRAM, or inside FILE TYPE."
+msgid "%s is allowed only after the active dataset has been defined, inside INPUT PROGRAM, or inside FILE TYPE."
 msgstr "%s操作仅可在选定数据集之后或INPUT PROGRAM、FILE TYPE之内进行。"
 
 #: src/language/command.c:427
 #, c-format
-msgid ""
-"%s is allowed only before the active dataset has been defined, inside INPUT "
-"PROGRAM, or inside FILE TYPE."
+msgid "%s is allowed only before the active dataset has been defined, inside INPUT PROGRAM, or inside FILE TYPE."
 msgstr "%s操作仅可在选定数据集之前或INPUT PROGRAM、FILE TYPE之内进行。"
 
 #: src/language/command.c:445 src/language/command.c:448
@@ -1902,9 +1774,7 @@ msgstr "`%c'不是有效的16进制数字"
 
 #: src/language/lexer/lexer.c:1458
 #, c-format
-msgid ""
-"Unicode string contains %d bytes, which is not in the valid range of 1 to 8 "
-"bytes"
+msgid "Unicode string contains %d bytes, which is not in the valid range of 1 to 8 bytes"
 msgstr "%d字节的Unicode字符串超出1到8字节的有效范围。"
 
 #: src/language/lexer/lexer.c:1464
@@ -1950,8 +1820,8 @@ msgid "expecting valid format specifier"
 msgstr "要求有效的格式设定"
 
 #: src/language/lexer/format-parser.c:116
-#: src/language/lexer/format-parser.c:143 src/language/utilities/output.c:148
-#: src/language/data-io/data-list.c:438 src/language/data-io/get-data.c:646
+#: src/language/lexer/format-parser.c:143 src/language/utilities/output.c:149
+#: src/language/data-io/data-list.c:453 src/language/data-io/get-data.c:641
 #: src/language/data-io/placement-parser.c:236
 #, c-format
 msgid "Unknown format type `%s'."
@@ -1968,9 +1838,7 @@ msgstr "要求格式类型"
 
 #: src/language/lexer/value-parser.c:66
 #, c-format
-msgid ""
-"The high end of the range (%.*g) is below the low end (%.*g).  The range "
-"will be treated as if reversed."
+msgid "The high end of the range (%.*g) is below the low end (%.*g).  The range will be treated as if reversed."
 msgstr "区间上界值(%.*g)低于下界值(%.*g)，视为反转区间处理。"
 
 #: src/language/lexer/value-parser.c:74
@@ -2002,14 +1870,12 @@ msgstr "%s不是有效的变量名。"
 
 #: src/language/lexer/variable-parser.c:183
 #, c-format
-msgid ""
-"%s is not a numeric variable.  It will not be included in the variable list."
+msgid "%s is not a numeric variable.  It will not be included in the variable list."
 msgstr "%s不是数字变量，将不包括在变量列表中。"
 
 #: src/language/lexer/variable-parser.c:186
 #, c-format
-msgid ""
-"%s is not a string variable.  It will not be included in the variable list."
+msgid "%s is not a string variable.  It will not be included in the variable list."
 msgstr "%s不是字符串变量，将不包括在变量列表中。"
 
 #: src/language/lexer/variable-parser.c:190
@@ -2019,16 +1885,12 @@ msgstr "不允许使用临时变量(如%s)。"
 
 #: src/language/lexer/variable-parser.c:194
 #, c-format
-msgid ""
-"%s and %s are not the same type.  All variables in this variable list must "
-"be of the same type.  %s will be omitted from the list."
+msgid "%s and %s are not the same type.  All variables in this variable list must be of the same type.  %s will be omitted from the list."
 msgstr "%s和%s类型不同。变量列表中的变量须为同一类型。%s将被忽略。"
 
 #: src/language/lexer/variable-parser.c:200
 #, c-format
-msgid ""
-"%s and %s are string variables with different widths.  All variables in this "
-"variable list must have the same width.  %s will be omitted from the list."
+msgid "%s and %s are string variables with different widths.  All variables in this variable list must have the same width.  %s will be omitted from the list."
 msgstr "%s和%s字符串变量宽度不同。变量列表中的变量具有相同宽度。%s将被忽略。"
 
 #: src/language/lexer/variable-parser.c:205
@@ -2044,13 +1906,8 @@ msgstr "%s到%s不符合语法，字典中%s先于%s出现。"
 
 #: src/language/lexer/variable-parser.c:326
 #, c-format
-msgid ""
-"When using the TO keyword to specify several variables, both variables must "
-"be from the same variable dictionaries, of either ordinary, scratch, or "
-"system variables.  %s is a %s variable, whereas %s is %s."
-msgstr ""
-"使用关键字TO指定多个变量时，这些变量必需出自相同的普通变量、临时变量或系统变"
-"量表。%s是%s变量，而%s是%s。"
+msgid "When using the TO keyword to specify several variables, both variables must be from the same variable dictionaries, of either ordinary, scratch, or system variables.  %s is a %s variable, whereas %s is %s."
+msgstr "使用关键字TO指定多个变量时，这些变量必需出自相同的普通变量、临时变量或系统变量表。%s是%s变量，而%s是%s。"
 
 #: src/language/lexer/variable-parser.c:384
 #, c-format
@@ -2076,15 +1933,12 @@ msgstr "边界不符合TO规范。"
 
 #: src/language/xforms/compute.c:150 src/language/xforms/compute.c:205
 #, c-format
-msgid ""
-"When executing COMPUTE: SYSMIS is not a valid value as an index into vector "
-"%s."
+msgid "When executing COMPUTE: SYSMIS is not a valid value as an index into vector %s."
 msgstr "执行COMPUTE命令时：SYSMIS的值不能作为向量%s的有效索引值。"
 
 #: src/language/xforms/compute.c:154 src/language/xforms/compute.c:212
 #, c-format
-msgid ""
-"When executing COMPUTE: %.*g is not a valid value as an index into vector %s."
+msgid "When executing COMPUTE: %.*g is not a valid value as an index into vector %s."
 msgstr "执行COMPUTE命令时：%.*g的值不能作为向量%s的有效索引值。"
 
 #: src/language/xforms/compute.c:356
@@ -2106,9 +1960,7 @@ msgid "Cannot sample %d observations from a population of %d."
 msgstr "%d的样本量无法自%d的种群中获取。"
 
 #: src/language/xforms/recode.c:261
-msgid ""
-"Inconsistent target variable types.  Target variables must be all numeric or "
-"all string."
+msgid "Inconsistent target variable types.  Target variables must be all numeric or all string."
 msgstr "目标变量不一致。目标变量必须全部为数字型或全部为字符串型。"
 
 #: src/language/xforms/recode.c:282
@@ -2126,19 +1978,13 @@ msgstr "要求输出值"
 
 #: src/language/xforms/recode.c:479
 #, c-format
-msgid ""
-"%zu variable(s) cannot be recoded into %zu variable(s).  Specify the same "
-"number of variables as source and target variables."
+msgid "%zu variable(s) cannot be recoded into %zu variable(s).  Specify the same number of variables as source and target variables."
 msgstr "变量%zu不能重新编码为变量%zu。请指定同样数量的源变量及目标变量。"
 
 #: src/language/xforms/recode.c:494
 #, c-format
-msgid ""
-"There is no variable named %s.  (All string variables specified on INTO must "
-"already exist.  Use the STRING command to create a string variable.)"
-msgstr ""
-"变量%s不存在。（所有INTO语句中的字符串变量必须为已创建变量。使用STRING可以创"
-"建字符串变量）"
+msgid "There is no variable named %s.  (All string variables specified on INTO must already exist.  Use the STRING command to create a string variable.)"
+msgstr "变量%s不存在。（所有INTO语句中的字符串变量必须为已创建变量。使用STRING可以创建字符串变量）"
 
 #: src/language/xforms/recode.c:510
 #, c-format
@@ -2152,11 +1998,8 @@ msgstr "类型不匹配。不能将%s数据存放于%s变量%s中。"
 
 #: src/language/xforms/recode.c:566
 #, c-format
-msgid ""
-"Cannot recode because the variable %s would require a width of %d bytes or "
-"greater, but it has a width of only %d bytes."
-msgstr ""
-"无法进行重编码，因为变量%s要求宽度等于或大于%d字节，而其宽度仅为%d字节。"
+msgid "Cannot recode because the variable %s would require a width of %d bytes or greater, but it has a width of only %d bytes."
+msgstr "无法进行重编码，因为变量%s要求宽度等于或大于%d字节，而其宽度仅为%d字节。"
 
 #: src/language/xforms/select-if.c:100
 msgid "Syntax error expecting OFF or BY.  Turning off case filtering."
@@ -2206,9 +2049,7 @@ msgstr "虚拟变量名`%s'重复指定。"
 
 #: src/language/control/repeat.c:165
 #, c-format
-msgid ""
-"Dummy variable `%s' had %zu substitutions, so `%s' must also, but %zu were "
-"specified."
+msgid "Dummy variable `%s' had %zu substitutions, so `%s' must also, but %zu were specified."
 msgstr "虚拟变量`%s'具有%zu个替代值，`%s'应具相同设置，但%zu已经被指定。"
 
 #: src/language/control/repeat.c:377
@@ -2226,9 +2067,7 @@ msgid "No matching %s."
 msgstr "找不到%s。"
 
 #: src/language/control/temporary.c:45
-msgid ""
-"This command may only appear once between procedures and procedure-like "
-"commands."
+msgid "This command may only appear once between procedures and procedure-like commands."
 msgstr "该指令在过程与类过程中间仅可使用一次。"
 
 #: src/language/dictionary/attributes.c:104
@@ -2248,31 +2087,33 @@ msgstr "在源文件和目标文件中找不到要匹配的变量。"
 #: src/language/dictionary/modify-variables.c:92
 #: src/language/dictionary/rename-variables.c:48
 #, c-format
-msgid ""
-"%s may not be used after %s.  Temporary transformations will be made "
-"permanent."
+msgid "%s may not be used after %s.  Temporary transformations will be made permanent."
 msgstr "%s不能用于%s之后。临时变换将被永久保存。"
 
 #: src/language/dictionary/delete-variables.c:48
 #, c-format
-msgid ""
-"%s may not be used to delete all variables from the active dataset "
-"dictionary.  Use %s instead."
+msgid "%s may not be used to delete all variables from the active dataset dictionary.  Use %s instead."
 msgstr "%s不能用于从当前数据集字典中删除所有变量。使用%s来完成操作。"
 
 #: src/language/dictionary/missing-values.c:70
 #, c-format
-msgid ""
-"Cannot mix numeric variables (e.g. %s) and string variables (e.g. %s) within "
-"a single list."
+msgid "Cannot mix numeric variables (e.g. %s) and string variables (e.g. %s) within a single list."
 msgstr "同一个列表中数字型变量（如%s）和字符串变量（如%s)不能混合使用。"
 
-#: src/language/dictionary/missing-values.c:123
+#: src/language/dictionary/missing-values.c:91
+msgid "Too many numeric missing values.  At most three individual values or one value and one range are allowed."
+msgstr "缺失值过多。最多允许三个单个值缺失或一个值及一个范围缺失。"
+
+#: src/language/dictionary/missing-values.c:126
 #, c-format
 msgid "Truncating missing value to maximum acceptable length (%d bytes)."
 msgstr "将缺失值减少到可接受的最大长度（%d字节）。"
 
-#: src/language/dictionary/missing-values.c:146
+#: src/language/dictionary/missing-values.c:137
+msgid "Too many string missing values.  At most three individual values are allowed."
+msgstr "字符串缺失值过多。 最多允许三个缺失值。"
+
+#: src/language/dictionary/missing-values.c:154
 #, c-format
 msgid "Missing values provided are too long to assign to variable of width %d."
 msgstr "指定的缺失值长度过长而不能赋于宽度为%d的变量。"
@@ -2284,17 +2125,13 @@ msgstr "设定一组变量之后不能再设置为ALL。"
 #: src/language/dictionary/modify-variables.c:207
 #: src/language/dictionary/rename-variables.c:71
 #, c-format
-msgid ""
-"Differing number of variables in old name list (%zu) and in new name list "
-"(%zu)."
+msgid "Differing number of variables in old name list (%zu) and in new name list (%zu)."
 msgstr "区分旧名称列表(%zu)和新名称列表(%zu)的变量数量。"
 
 #: src/language/dictionary/modify-variables.c:232
 #: src/language/dictionary/modify-variables.c:276
 #, c-format
-msgid ""
-"%s subcommand may be given at most once.  It may not be given in conjunction "
-"with the %s subcommand."
+msgid "%s subcommand may be given at most once.  It may not be given in conjunction with the %s subcommand."
 msgstr "子命令%s只可使用一次。不能与子命令%s联合使用。"
 
 #: src/language/dictionary/modify-variables.c:304
@@ -2308,9 +2145,7 @@ msgstr "要求子命令名称。"
 
 #: src/language/dictionary/mrsets.c:116
 #, c-format
-msgid ""
-"VARIABLES specified only variable %s on %s, but at least two variables are "
-"required."
+msgid "VARIABLES specified only variable %s on %s, but at least two variables are required."
 msgstr "VARIABLES里列举了变量%s于%s上，但要求至少列出2个变量。"
 
 #: src/language/dictionary/mrsets.c:149
@@ -2319,78 +2154,43 @@ msgstr "数值型值VALUE必需为整数。"
 
 #: src/language/dictionary/mrsets.c:229 src/language/dictionary/mrsets.c:267
 #, c-format
-msgid ""
-"MDGROUP subcommand for group %s specifies a string VALUE, but the variables "
-"specified for this group are numeric."
+msgid "MDGROUP subcommand for group %s specifies a string VALUE, but the variables specified for this group are numeric."
 msgstr "组%s的MDGROUP子命令给出一个字符串VALUE，而该组要求变量为数字型。"
 
 #: src/language/dictionary/mrsets.c:253
 #, c-format
-msgid ""
-"VALUE string on MDGROUP subcommand for group %s is %d bytes long, but it "
-"must be no longer than the narrowest variable in the group, which is %s with "
-"a width of %d bytes."
-msgstr ""
-"组%s的MDGROUP子命令的VALUE字符串长度为%d字节，但系统要求不能超过组内最短的变"
-"量的长度，即变量%s的%d字节。"
+msgid "VALUE string on MDGROUP subcommand for group %s is %d bytes long, but it must be no longer than the narrowest variable in the group, which is %s with a width of %d bytes."
+msgstr "组%s的MDGROUP子命令的VALUE字符串长度为%d字节，但系统要求不能超过组内最短的变量的长度，即变量%s的%d字节。"
 
 #: src/language/dictionary/mrsets.c:279
 #, c-format
-msgid ""
-"MDGROUP subcommand for group %s specifies LABELSOURCE=VARLABEL but not "
-"CATEGORYLABELS=COUNTEDVALUES.  Ignoring LABELSOURCE."
-msgstr ""
-"组%s的MDGROUP子命令设定LABELSOURCE=VARLABEL，而非"
-"CATEGORYLABELS=COUNTEDVALUES.  LABELSOURCE将被忽略。"
+msgid "MDGROUP subcommand for group %s specifies LABELSOURCE=VARLABEL but not CATEGORYLABELS=COUNTEDVALUES.  Ignoring LABELSOURCE."
+msgstr "组%s的MDGROUP子命令设定LABELSOURCE=VARLABEL，而非CATEGORYLABELS=COUNTEDVALUES.  LABELSOURCE将被忽略。"
 
 #: src/language/dictionary/mrsets.c:285
 #, c-format
-msgid ""
-"MDGROUP subcommand for group %s specifies both LABEL and LABELSOURCE, but "
-"only one of these subcommands may be used at a time.  Ignoring LABELSOURCE."
-msgstr ""
-"组%s的MDGROUP子命令同时设定了LABEL和LABELSOURCE，但这些子命令一次只能使用一"
-"个。LABELSOURCE将被忽略。"
+msgid "MDGROUP subcommand for group %s specifies both LABEL and LABELSOURCE, but only one of these subcommands may be used at a time.  Ignoring LABELSOURCE."
+msgstr "组%s的MDGROUP子命令同时设定了LABEL和LABELSOURCE，但这些子命令一次只能使用一个。LABELSOURCE将被忽略。"
 
 #: src/language/dictionary/mrsets.c:325
 #, c-format
-msgid ""
-"Variables %s and %s specified as part of multiple dichotomy group %s have "
-"the same variable label.  Categories represented by these variables will not "
-"be distinguishable in output."
-msgstr ""
-"变量%s和%s所在的多重二分组%s具有相同的变量标签。输出将无法区分出这些变量所代"
-"表的类别。"
+msgid "Variables %s and %s specified as part of multiple dichotomy group %s have the same variable label.  Categories represented by these variables will not be distinguishable in output."
+msgstr "变量%s和%s所在的多重二分组%s具有相同的变量标签。输出将无法区分出这些变量所代表的类别。"
 
 #: src/language/dictionary/mrsets.c:355
 #, c-format
-msgid ""
-"Variable %s specified as part of multiple dichotomy group %s (which has "
-"CATEGORYLABELS=COUNTEDVALUES) has no value label for its counted value.  "
-"This category will not be distinguishable in output."
-msgstr ""
-"变量%s所在的多重二分组%s(设置了CATEGORYLABELS=COUNTEDVALUES)没有为计数值指定"
-"值标签。输出中无法区分该类别。"
+msgid "Variable %s specified as part of multiple dichotomy group %s (which has CATEGORYLABELS=COUNTEDVALUES) has no value label for its counted value.  This category will not be distinguishable in output."
+msgstr "变量%s所在的多重二分组%s(设置了CATEGORYLABELS=COUNTEDVALUES)没有为计数值指定值标签。输出中无法区分该类别。"
 
 #: src/language/dictionary/mrsets.c:368
 #, c-format
-msgid ""
-"Variables %s and %s specified as part of multiple dichotomy group %s (which "
-"has CATEGORYLABELS=COUNTEDVALUES) have the same value label for the group's "
-"counted value.  These categories will not be distinguishable in output."
-msgstr ""
-"变量%s和%s所在的多重二分组%s（设置了CATEGORYLABELS=COUNTEDVALUES）的计数值具"
-"有相同的值标签。输出将无法区分出这些类别。"
+msgid "Variables %s and %s specified as part of multiple dichotomy group %s (which has CATEGORYLABELS=COUNTEDVALUES) have the same value label for the group's counted value.  These categories will not be distinguishable in output."
+msgstr "变量%s和%s所在的多重二分组%s（设置了CATEGORYLABELS=COUNTEDVALUES）的计数值具有相同的值标签。输出将无法区分出这些类别。"
 
 #: src/language/dictionary/mrsets.c:425
 #, c-format
-msgid ""
-"Variables specified on MCGROUP should have the same categories, but %s and "
-"%s (and possibly others) in multiple category group %s have different value "
-"labels for value %s."
-msgstr ""
-"MCGROUP指定的变量必须具有相同的类别，但%s和%s（可能还有其他）在多类别组%s中的"
-"值%s含有不同的值标签。"
+msgid "Variables specified on MCGROUP should have the same categories, but %s and %s (and possibly others) in multiple category group %s have different value labels for value %s."
+msgstr "MCGROUP指定的变量必须具有相同的类别，但%s和%s（可能还有其他）在多类别组%s中的值%s含有不同的值标签。"
 
 #: src/language/dictionary/mrsets.c:483
 #, c-format
@@ -2398,8 +2198,7 @@ msgid "No multiple response set named %s."
 msgstr "没有找到名称为%s的多重响应集。"
 
 #: src/language/dictionary/mrsets.c:537
-msgid ""
-"The active dataset dictionary does not contain any multiple response sets."
+msgid "The active dataset dictionary does not contain any multiple response sets."
 msgstr "活动数据集的字典没有包含任何多重响应集。"
 
 #: src/language/dictionary/mrsets.c:547
@@ -2428,9 +2227,9 @@ msgstr "多重类别集"
 
 #: src/language/dictionary/mrsets.c:567
 #: src/language/dictionary/split-file.c:84
-#: src/language/dictionary/sys-file-info.c:439
-#: src/language/dictionary/sys-file-info.c:538
-#: src/ui/gui/psppire-var-sheet.c:1381 src/ui/gui/compute.ui:480
+#: src/language/dictionary/sys-file-info.c:444
+#: src/language/dictionary/sys-file-info.c:543
+#: src/ui/gui/psppire-var-sheet.c:1381 src/ui/gui/compute.ui:141
 msgid "Label"
 msgstr "标签"
 
@@ -2483,9 +2282,9 @@ msgid "Renaming would duplicate variable name %s."
 msgstr "重命名的新变量名称%s已经存在。"
 
 #: src/language/dictionary/split-file.c:83
-#: src/language/dictionary/sys-file-info.c:486
-#: src/language/dictionary/sys-file-info.c:537
-#: src/language/stats/cochran.c:172 src/language/stats/examine.c:1133
+#: src/language/dictionary/sys-file-info.c:491
+#: src/language/dictionary/sys-file-info.c:542
+#: src/language/stats/cochran.c:172 src/language/stats/examine.c:1135
 #: src/language/stats/frequencies.c:293 src/language/stats/reliability.c:802
 #: src/language/stats/reliability.c:811 src/language/stats/crosstabs.q:1272
 #: src/language/stats/crosstabs.q:1302 src/language/stats/crosstabs.q:1326
@@ -2493,237 +2292,230 @@ msgstr "重命名的新变量名称%s已经存在。"
 msgid "Value"
 msgstr "值"
 
-#: src/language/dictionary/sys-file-info.c:166
+#: src/language/dictionary/sys-file-info.c:170
 msgid "File:"
 msgstr "文件："
 
-#: src/language/dictionary/sys-file-info.c:169
+#: src/language/dictionary/sys-file-info.c:173
 msgid "Label:"
 msgstr "标签："
 
-#: src/language/dictionary/sys-file-info.c:173
+#: src/language/dictionary/sys-file-info.c:177
 msgid "No label."
 msgstr "没有标签。"
 
-#: src/language/dictionary/sys-file-info.c:177
+#: src/language/dictionary/sys-file-info.c:181
 msgid "Created:"
 msgstr "创建："
 
-#: src/language/dictionary/sys-file-info.c:183
+#: src/language/dictionary/sys-file-info.c:187
 msgid "Product:"
 msgstr "产品："
 
-#: src/language/dictionary/sys-file-info.c:187
+#: src/language/dictionary/sys-file-info.c:191
 msgid "Integer Format:"
 msgstr "整数格式："
 
-#: src/language/dictionary/sys-file-info.c:189
+#: src/language/dictionary/sys-file-info.c:193
 msgid "Big Endian"
 msgstr "大端序（Big Endian）"
 
-#: src/language/dictionary/sys-file-info.c:190
+#: src/language/dictionary/sys-file-info.c:194
 msgid "Little Endian"
 msgstr "小端序（Little Endian）"
 
-#: src/language/dictionary/sys-file-info.c:191
-#: src/language/dictionary/sys-file-info.c:200
-#: src/language/dictionary/sys-file-info.c:207
-#: src/language/utilities/set.q:943
+#: src/language/dictionary/sys-file-info.c:195
+#: src/language/dictionary/sys-file-info.c:204
+#: src/language/dictionary/sys-file-info.c:211
+#: src/language/utilities/set.q:942
 msgid "Unknown"
 msgstr "未知"
 
-#: src/language/dictionary/sys-file-info.c:193
+#: src/language/dictionary/sys-file-info.c:197
 msgid "Real Format:"
 msgstr "实数格式："
 
-#: src/language/dictionary/sys-file-info.c:195
+#: src/language/dictionary/sys-file-info.c:199
 msgid "IEEE 754 LE."
 msgstr "IEEE 754 标准小端序。"
 
-#: src/language/dictionary/sys-file-info.c:196
+#: src/language/dictionary/sys-file-info.c:200
 msgid "IEEE 754 BE."
 msgstr "IEEE 754 标准大端序。"
 
-#: src/language/dictionary/sys-file-info.c:197
+#: src/language/dictionary/sys-file-info.c:201
 msgid "VAX D."
 msgstr "VAX D."
 
-#: src/language/dictionary/sys-file-info.c:198
+#: src/language/dictionary/sys-file-info.c:202
 msgid "VAX G."
 msgstr "VAX G."
 
-#: src/language/dictionary/sys-file-info.c:199
+#: src/language/dictionary/sys-file-info.c:203
 msgid "IBM 390 Hex Long."
 msgstr "IBM 390 16进制长格式。"
 
-#: src/language/dictionary/sys-file-info.c:202
+#: src/language/dictionary/sys-file-info.c:206
 msgid "Variables:"
 msgstr "变量："
 
-#: src/language/dictionary/sys-file-info.c:205
+#: src/language/dictionary/sys-file-info.c:209
 msgid "Cases:"
 msgstr "个案："
 
-#: src/language/dictionary/sys-file-info.c:212
+#: src/language/dictionary/sys-file-info.c:216
 msgid "Type:"
 msgstr "类型："
 
-#: src/language/dictionary/sys-file-info.c:215
+#: src/language/dictionary/sys-file-info.c:219
 msgid "Weight:"
 msgstr "权重："
 
-#: src/language/dictionary/sys-file-info.c:220
+#: src/language/dictionary/sys-file-info.c:224
 msgid "Not weighted."
 msgstr "没有加权。"
 
-#: src/language/dictionary/sys-file-info.c:223
+#: src/language/dictionary/sys-file-info.c:227
 msgid "Compression:"
 msgstr "压缩："
 
-#: src/language/dictionary/sys-file-info.c:229
+#: src/language/dictionary/sys-file-info.c:233
 msgid "Encoding:"
 msgstr "编码："
 
-#: src/language/dictionary/sys-file-info.c:237
-#: src/language/dictionary/sys-file-info.c:439
+#: src/language/dictionary/sys-file-info.c:241
+#: src/language/dictionary/sys-file-info.c:444
 msgid "Description"
 msgstr "描述"
 
-#: src/language/dictionary/sys-file-info.c:238
-#: src/language/dictionary/sys-file-info.c:442
-#: src/language/dictionary/sys-file-info.c:732
+#: src/language/dictionary/sys-file-info.c:242
+#: src/language/dictionary/sys-file-info.c:447
+#: src/language/dictionary/sys-file-info.c:737
 msgid "Position"
 msgstr "位置"
 
-#: src/language/dictionary/sys-file-info.c:289
+#: src/language/dictionary/sys-file-info.c:294
 msgid "The active dataset does not have a file label."
 msgstr "活动数据集没有包含文件标签。"
 
-#: src/language/dictionary/sys-file-info.c:291
+#: src/language/dictionary/sys-file-info.c:296
 #, c-format
 msgid "File label: %s"
 msgstr "文件标签：%s"
 
-#: src/language/dictionary/sys-file-info.c:366
+#: src/language/dictionary/sys-file-info.c:371
 msgid "No variables to display."
 msgstr "没有可用于显示的变量。"
 
-#: src/language/dictionary/sys-file-info.c:380
+#: src/language/dictionary/sys-file-info.c:385
 msgid "Macros not supported."
 msgstr "不支持的宏。"
 
-#: src/language/dictionary/sys-file-info.c:389
+#: src/language/dictionary/sys-file-info.c:394
 msgid "The active dataset dictionary does not contain any documents."
 msgstr "活动数据集字典没有包含任何文件。"
 
-#: src/language/dictionary/sys-file-info.c:396
+#: src/language/dictionary/sys-file-info.c:401
 msgid "Documents in the active dataset:"
 msgstr "活动数据集中的文件："
 
-#: src/language/dictionary/sys-file-info.c:485
+#: src/language/dictionary/sys-file-info.c:490
 msgid "Attribute"
 msgstr "特征"
 
-#: src/language/dictionary/sys-file-info.c:521
+#: src/language/dictionary/sys-file-info.c:526
 msgid "Custom data file attributes."
 msgstr "自定义数据文件特征。"
 
-#: src/language/dictionary/sys-file-info.c:568
+#: src/language/dictionary/sys-file-info.c:573
 #, c-format
 msgid "Label: %s\n"
 msgstr "标签：%s\n"
 
-#: src/language/dictionary/sys-file-info.c:581
+#: src/language/dictionary/sys-file-info.c:586
 #, c-format
 msgid "Format: %s\n"
 msgstr "格式：%s\n"
 
-#: src/language/dictionary/sys-file-info.c:584
+#: src/language/dictionary/sys-file-info.c:589
 #, c-format
 msgid "Print Format: %s\n"
 msgstr "打印格式：%s\n"
 
-#: src/language/dictionary/sys-file-info.c:586
+#: src/language/dictionary/sys-file-info.c:591
 #, c-format
 msgid "Write Format: %s\n"
 msgstr "写入格式：%s\n"
 
-#: src/language/dictionary/sys-file-info.c:593
+#: src/language/dictionary/sys-file-info.c:598
 #, c-format
 msgid "Measure: %s\n"
 msgstr "衡量：%s\n"
 
-#: src/language/dictionary/sys-file-info.c:597
+#: src/language/dictionary/sys-file-info.c:602
 #, c-format
 msgid "Role: %s\n"
 msgstr "角色：%s\n"
 
-#: src/language/dictionary/sys-file-info.c:601
+#: src/language/dictionary/sys-file-info.c:606
 #, c-format
 msgid "Display Alignment: %s\n"
 msgstr "显示对齐：%s\n"
 
-#: src/language/dictionary/sys-file-info.c:605
+#: src/language/dictionary/sys-file-info.c:610
 #, c-format
 msgid "Display Width: %d\n"
 msgstr "显示宽度：%d\n"
 
-#: src/language/dictionary/sys-file-info.c:614
+#: src/language/dictionary/sys-file-info.c:619
 msgid "Missing Values: "
 msgstr "缺失值："
 
-#: src/language/dictionary/sys-file-info.c:712
+#: src/language/dictionary/sys-file-info.c:717
 msgid "No vectors defined."
 msgstr "没有定义向量。"
 
-#: src/language/dictionary/sys-file-info.c:731
+#: src/language/dictionary/sys-file-info.c:736
 msgid "Vector"
 msgstr "向量"
 
-#: src/language/dictionary/sys-file-info.c:734
+#: src/language/dictionary/sys-file-info.c:739
 msgid "Print Format"
 msgstr "打印格式"
 
-#: src/language/dictionary/sys-file-info.c:998
+#: src/language/dictionary/sys-file-info.c:1003
 msgid "No valid encodings found."
 msgstr "没有找到有效的编码。"
 
-#: src/language/dictionary/sys-file-info.c:1003
+#: src/language/dictionary/sys-file-info.c:1008
 #, c-format
 msgid "Usable encodings for %s."
 msgstr "可用于%s的编码。"
 
-#: src/language/dictionary/sys-file-info.c:1004
+#: src/language/dictionary/sys-file-info.c:1009
 #, c-format
-msgid ""
-"Encodings that can successfully read %s (by specifying the encoding name on "
-"the GET command's ENCODING subcommand).  Encodings that yield identical text "
-"are listed together."
-msgstr ""
-"能顺利读取%s的编码（通过GET指令下的ENCODING指定的编码）。将读取出相同文本的编"
-"码一并列出。"
+msgid "Encodings that can successfully read %s (by specifying the encoding name on the GET command's ENCODING subcommand).  Encodings that yield identical text are listed together."
+msgstr "能顺利读取%s的编码（通过GET指令下的ENCODING指定的编码）。将读取出相同文本的编码一并列出。"
 
-#: src/language/dictionary/sys-file-info.c:1012
+#: src/language/dictionary/sys-file-info.c:1017
 msgid "Encodings"
 msgstr "编码"
 
-#: src/language/dictionary/sys-file-info.c:1037
+#: src/language/dictionary/sys-file-info.c:1042
 #, c-format
 msgid "%s encoded text strings."
 msgstr "%s已编码文字字符串。"
 
-#: src/language/dictionary/sys-file-info.c:1038
-msgid ""
-"Text strings in the file dictionary that the previously listed encodings "
-"interpret differently, along with the interpretations."
+#: src/language/dictionary/sys-file-info.c:1043
+msgid "Text strings in the file dictionary that the previously listed encodings interpret differently, along with the interpretations."
 msgstr "文件字典为先前的编码转码结果有异的文本字符串以及转码结果。"
 
-#: src/language/dictionary/sys-file-info.c:1045
+#: src/language/dictionary/sys-file-info.c:1050
 msgid "Purpose"
 msgstr "目标"
 
-#: src/language/dictionary/sys-file-info.c:1047
-#: src/ui/gui/page-first-line.c:144
+#: src/language/dictionary/sys-file-info.c:1052
+#: src/ui/gui/psppire-import-assistant.c:1038
 msgid "Text"
 msgstr "文本"
 
@@ -2813,7 +2605,7 @@ msgstr "   (输入为%s)"
 msgid "Can't find `%s' in include file search path."
 msgstr "在包含文件路径中找不到`%s'。"
 
-#: src/language/utilities/output.c:120
+#: src/language/utilities/output.c:121
 msgid "Unknown TABLECELLS class"
 msgstr "未知的TABLECELLS类"
 
@@ -2910,12 +2702,8 @@ msgid "Last non-missing value"
 msgstr "最后一个非缺失值"
 
 #: src/language/stats/aggregate.c:258
-msgid ""
-"When PRESORTED is specified, specifying sorting directions with (A) or (D) "
-"has no effect.  Output data will be sorted the same way as the input data."
-msgstr ""
-"设定PRESORTED(预排序)时，使用(A)和(D)设定排序方向 不进行排序。输出数据将按输"
-"入数据的排序方式排序"
+msgid "When PRESORTED is specified, specifying sorting directions with (A) or (D) has no effect.  Output data will be sorted the same way as the input data."
+msgstr "设定PRESORTED(预排序)时，使用(A)和(D)设定排序方向 不进行排序。输出数据将按输入数据的排序方式排序"
 
 #: src/language/stats/aggregate.c:448
 msgid "expecting aggregation function"
@@ -2938,23 +2726,17 @@ msgstr "传递到%s的参数必须与源变量类型相同。"
 
 #: src/language/stats/aggregate.c:542
 #, c-format
-msgid ""
-"Number of source variables (%zu) does not match number of target variables "
-"(%zu)."
+msgid "Number of source variables (%zu) does not match number of target variables (%zu)."
 msgstr "源变量数量(%zu)与目标变量数量(%zu)不符。"
 
 #: src/language/stats/aggregate.c:558
 #, c-format
-msgid ""
-"The value arguments passed to the %s function are out-of-order.  They will "
-"be treated as if they had been specified in the correct order."
+msgid "The value arguments passed to the %s function are out-of-order.  They will be treated as if they had been specified in the correct order."
 msgstr "传递到%s函数的值参数顺序混乱。将被视作已正确排序处理。"
 
 #: src/language/stats/aggregate.c:632
 #, c-format
-msgid ""
-"Variable name %s is not unique within the aggregate file dictionary, which "
-"contains the aggregate variables and the break variables."
+msgid "Variable name %s is not unique within the aggregate file dictionary, which contains the aggregate variables and the break variables."
 msgstr "变量名称%s在包含汇总变量和中断变量的汇总文件字典中非唯一。"
 
 #: src/language/stats/autorecode.c:164
@@ -2985,13 +2767,13 @@ msgid "Group2"
 msgstr "第2组"
 
 #: src/language/stats/binomial.c:222 src/language/stats/chisquare.c:184
-#: src/language/stats/chisquare.c:246 src/language/stats/examine.c:1339
+#: src/language/stats/chisquare.c:246 src/language/stats/examine.c:1341
 #: src/language/stats/factor.c:1746 src/language/stats/frequencies.c:352
-#: src/language/stats/glm.c:850 src/language/stats/kruskal-wallis.c:325
-#: src/language/stats/logistic.c:1409 src/language/stats/mann-whitney.c:188
-#: src/language/stats/means.c:1079 src/language/stats/oneway.c:999
-#: src/language/stats/oneway.c:1171 src/language/stats/reliability.c:583
-#: src/language/stats/regression.c:950 src/language/stats/sign.c:96
+#: src/language/stats/glm.c:854 src/language/stats/kruskal-wallis.c:325
+#: src/language/stats/logistic.c:1409 src/language/stats/mann-whitney.c:215
+#: src/language/stats/means.c:1079 src/language/stats/oneway.c:1001
+#: src/language/stats/oneway.c:1173 src/language/stats/reliability.c:583
+#: src/language/stats/regression.c:953 src/language/stats/sign.c:96
 #: src/language/stats/wilcoxon.c:256
 #: src/ui/gui/psppire-dialog-action-crosstabs.c:91
 #: src/language/stats/crosstabs.q:868 src/language/stats/crosstabs.q:1213
@@ -3006,14 +2788,14 @@ msgstr "类别"
 
 #: src/language/stats/binomial.c:256 src/language/stats/cochran.c:218
 #: src/language/stats/correlations.c:120 src/language/stats/correlations.c:231
-#: src/language/stats/examine.c:1344 src/language/stats/frequencies.c:1561
+#: src/language/stats/examine.c:1346 src/language/stats/frequencies.c:1580
 #: src/language/stats/friedman.c:276 src/language/stats/kruskal-wallis.c:273
 #: src/language/stats/ks-one-sample.c:293 src/language/stats/logistic.c:1403
 #: src/language/stats/jonckheere-terpstra.c:381
-#: src/language/stats/mann-whitney.c:190 src/language/stats/means.c:408
+#: src/language/stats/mann-whitney.c:217 src/language/stats/means.c:408
 #: src/language/stats/means.c:1088 src/language/stats/mcnemar.c:262
 #: src/language/stats/median.c:419 src/language/stats/npar-summary.c:123
-#: src/language/stats/oneway.c:1070 src/language/stats/reliability.c:586
+#: src/language/stats/oneway.c:1072 src/language/stats/reliability.c:586
 #: src/language/stats/sign.c:75 src/language/stats/t-test-indep.c:211
 #: src/language/stats/t-test-one-sample.c:159
 #: src/language/stats/t-test-paired.c:179
@@ -3038,9 +2820,7 @@ msgstr "精确显著性(%d-尾)"
 
 #: src/language/stats/chisquare.c:155
 #, c-format
-msgid ""
-"CHISQUARE test specified %d expected values, but %d distinct values were "
-"encountered in variable %s."
+msgid "CHISQUARE test specified %d expected values, but %d distinct values were encountered in variable %s."
 msgstr "卡方检验指定%d的期望值，但%d不同的值存在于变量%s中。"
 
 #: src/language/stats/chisquare.c:168 src/language/stats/chisquare.c:211
@@ -3052,20 +2832,20 @@ msgid "Expected N"
 msgstr "期望 N"
 
 #: src/language/stats/chisquare.c:170 src/language/stats/chisquare.c:213
-#: src/language/stats/regression.c:949
+#: src/language/stats/regression.c:952
 #: src/ui/gui/psppire-dialog-action-crosstabs.c:93
 msgid "Residual"
 msgstr "残差"
 
 #: src/language/stats/chisquare.c:206 src/language/stats/cochran.c:161
 #: src/language/stats/median.c:320 src/language/stats/sign.c:63
-#: src/ui/gui/frequencies.ui:655
+#: src/ui/gui/frequencies.ui:656
 msgid "Frequencies"
 msgstr "频率"
 
 #: src/language/stats/chisquare.c:259 src/language/stats/cochran.c:215
 #: src/language/stats/friedman.c:273 src/language/stats/kruskal-wallis.c:343
-#: src/language/stats/mann-whitney.c:251 src/language/stats/mcnemar.c:242
+#: src/language/stats/mann-whitney.c:278 src/language/stats/mcnemar.c:242
 #: src/language/stats/median.c:409 src/language/stats/sign.c:115
 #: src/language/stats/wilcoxon.c:305
 msgid "Test Statistics"
@@ -3078,10 +2858,10 @@ msgstr "卡方"
 
 #: src/language/stats/chisquare.c:274 src/language/stats/cochran.c:224
 #: src/language/stats/factor.c:2182 src/language/stats/friedman.c:286
-#: src/language/stats/glm.c:751 src/language/stats/kruskal-wallis.c:349
+#: src/language/stats/glm.c:750 src/language/stats/kruskal-wallis.c:349
 #: src/language/stats/logistic.c:1223 src/language/stats/median.c:428
-#: src/language/stats/oneway.c:976 src/language/stats/oneway.c:1383
-#: src/language/stats/regression.c:943 src/language/stats/t-test-indep.c:293
+#: src/language/stats/oneway.c:978 src/language/stats/oneway.c:1385
+#: src/language/stats/regression.c:946 src/language/stats/t-test-indep.c:293
 #: src/language/stats/t-test-one-sample.c:96
 #: src/language/stats/t-test-paired.c:306 src/language/stats/crosstabs.q:1273
 msgid "df"
@@ -3117,10 +2897,10 @@ msgid "Descriptive Statistics"
 msgstr "描述性统计"
 
 #: src/language/stats/correlations.c:118 src/language/stats/descriptives.c:108
-#: src/language/stats/examine.c:888 src/language/stats/factor.c:2108
+#: src/language/stats/examine.c:890 src/language/stats/factor.c:2108
 #: src/language/stats/frequencies.c:141 src/language/stats/graph.c:212
 #: src/language/stats/ks-one-sample.c:302 src/language/stats/means.c:407
-#: src/language/stats/npar-summary.c:126 src/language/stats/oneway.c:1071
+#: src/language/stats/npar-summary.c:126 src/language/stats/oneway.c:1073
 #: src/language/stats/t-test-indep.c:212
 #: src/language/stats/t-test-one-sample.c:160
 #: src/language/stats/t-test-paired.c:180
@@ -3130,10 +2910,10 @@ msgstr "描述性统计"
 msgid "Mean"
 msgstr "均值"
 
-#: src/language/stats/correlations.c:119 src/language/stats/examine.c:980
+#: src/language/stats/correlations.c:119 src/language/stats/examine.c:982
 #: src/language/stats/factor.c:2109 src/language/stats/ks-one-sample.c:304
 #: src/language/stats/means.c:409 src/language/stats/npar-summary.c:129
-#: src/language/stats/oneway.c:1072 src/language/stats/t-test-indep.c:213
+#: src/language/stats/oneway.c:1074 src/language/stats/t-test-indep.c:213
 #: src/language/stats/t-test-one-sample.c:161
 #: src/language/stats/t-test-paired.c:181
 #: src/language/stats/t-test-paired.c:309
@@ -3148,7 +2928,7 @@ msgstr "相关"
 msgid "Pearson Correlation"
 msgstr "皮尔森相关"
 
-#: src/language/stats/correlations.c:222 src/language/stats/oneway.c:1384
+#: src/language/stats/correlations.c:222 src/language/stats/oneway.c:1386
 #: src/language/stats/t-test-indep.c:294
 #: src/language/stats/t-test-one-sample.c:97
 #: src/language/stats/t-test-paired.c:307
@@ -3168,7 +2948,7 @@ msgid "Covariance"
 msgstr "协方差"
 
 #: src/language/stats/correlations.c:461 src/language/stats/descriptives.c:373
-#: src/language/data-io/list.c:167
+#: src/language/data-io/list.c:168
 msgid "No variables specified."
 msgstr "没有指定变量。"
 
@@ -3183,14 +2963,14 @@ msgstr "均值标准误"
 msgid "Std Dev"
 msgstr "标准差"
 
-#: src/language/stats/descriptives.c:111 src/language/stats/examine.c:968
+#: src/language/stats/descriptives.c:111 src/language/stats/examine.c:970
 #: src/language/stats/frequencies.c:146 src/language/stats/means.c:419
 #: src/ui/gui/psppire-dialog-action-descriptives.c:46
 #: src/ui/gui/psppire-dialog-action-frequencies.c:45
 msgid "Variance"
 msgstr "方差"
 
-#: src/language/stats/descriptives.c:112 src/language/stats/examine.c:1070
+#: src/language/stats/descriptives.c:112 src/language/stats/examine.c:1072
 #: src/language/stats/frequencies.c:147 src/language/stats/means.c:420
 #: src/ui/gui/psppire-dialog-action-descriptives.c:47
 #: src/ui/gui/psppire-dialog-action-frequencies.c:50
@@ -3202,7 +2982,7 @@ msgstr "峰度"
 msgid "S.E. Kurt"
 msgstr "峰度标准误"
 
-#: src/language/stats/descriptives.c:114 src/language/stats/examine.c:1053
+#: src/language/stats/descriptives.c:114 src/language/stats/examine.c:1055
 #: src/language/stats/frequencies.c:149 src/language/stats/means.c:422
 #: src/ui/gui/psppire-dialog-action-descriptives.c:48
 #: src/ui/gui/psppire-dialog-action-frequencies.c:46
@@ -3214,26 +2994,26 @@ msgstr "偏斜度"
 msgid "S.E. Skew"
 msgstr "偏斜度标准误"
 
-#: src/language/stats/descriptives.c:116 src/language/stats/examine.c:1020
+#: src/language/stats/descriptives.c:116 src/language/stats/examine.c:1022
 #: src/language/stats/frequencies.c:151 src/language/stats/means.c:418
 #: src/ui/gui/psppire-dialog-action-descriptives.c:43
 #: src/ui/gui/psppire-dialog-action-frequencies.c:48
 msgid "Range"
 msgstr "极差"
 
-#: src/language/stats/descriptives.c:117 src/language/stats/examine.c:992
+#: src/language/stats/descriptives.c:117 src/language/stats/examine.c:994
 #: src/language/stats/frequencies.c:152 src/language/stats/graph.c:215
 #: src/language/stats/ks-one-sample.c:311
-#: src/language/stats/npar-summary.c:132 src/language/stats/oneway.c:1085
+#: src/language/stats/npar-summary.c:132 src/language/stats/oneway.c:1087
 #: src/ui/gui/psppire-dialog-action-descriptives.c:41
 #: src/ui/gui/psppire-dialog-action-frequencies.c:42
 msgid "Minimum"
 msgstr "最小值"
 
-#: src/language/stats/descriptives.c:118 src/language/stats/examine.c:1006
+#: src/language/stats/descriptives.c:118 src/language/stats/examine.c:1008
 #: src/language/stats/frequencies.c:153 src/language/stats/graph.c:214
 #: src/language/stats/ks-one-sample.c:313
-#: src/language/stats/npar-summary.c:135 src/language/stats/oneway.c:1086
+#: src/language/stats/npar-summary.c:135 src/language/stats/oneway.c:1088
 #: src/ui/gui/psppire-dialog-action-descriptives.c:42
 #: src/ui/gui/psppire-dialog-action-frequencies.c:43
 msgid "Maximum"
@@ -3252,9 +3032,7 @@ msgid "Z-score variable name %s would be a duplicate variable name."
 msgstr "Z-分数变量名称%s与现有变量名称冲突。"
 
 #: src/language/stats/descriptives.c:406
-msgid ""
-"DESCRIPTIVES with Z scores ignores TEMPORARY.  Temporary transformations "
-"will be made permanent."
+msgid "DESCRIPTIVES with Z scores ignores TEMPORARY.  Temporary transformations will be made permanent."
 msgstr "带Z分数的DESCRIPTIVES忽略TEMPORARY，临时变换将被保存。"
 
 #: src/language/stats/descriptives.c:483
@@ -3262,18 +3040,14 @@ msgid "expecting statistic name: reverting to default"
 msgstr "要求统计量名称：恢复到默认设置"
 
 #: src/language/stats/descriptives.c:566
-msgid ""
-"Ran out of generic names for Z-score variables.  There are only 126 generic "
-"names: ZSC001-ZSC0999, STDZ01-STDZ09, ZZZZ01-ZZZZ09, ZQZQ01-ZQZQ09."
-msgstr ""
-"通用Z-分数变量名称不足。共有126个通用变量Z-分数变量名称：ZSC001-ZSC0999, "
-"STDZ01-STDZ09, ZZZZ01-ZZZZ09, ZQZQ01-ZQZQ09。"
+msgid "Ran out of generic names for Z-score variables.  There are only 126 generic names: ZSC001-ZSC0999, STDZ01-STDZ09, ZZZZ01-ZZZZ09, ZQZQ01-ZQZQ09."
+msgstr "通用Z-分数变量名称不足。共有126个通用变量Z-分数变量名称：ZSC001-ZSC0999, STDZ01-STDZ09, ZZZZ01-ZZZZ09, ZQZQ01-ZQZQ09。"
 
 #: src/language/stats/descriptives.c:595
 msgid "Mapping of variables to corresponding Z-scores."
 msgstr "将变量映射到对应的Z-分数。"
 
-#: src/language/stats/descriptives.c:599 src/language/stats/glm.c:745
+#: src/language/stats/descriptives.c:599 src/language/stats/glm.c:744
 msgid "Source"
 msgstr "源"
 
@@ -3312,134 +3086,134 @@ msgstr " (缺失)"
 msgid "Boxplot of %s vs. %s"
 msgstr "%s对%s箱线图"
 
-#: src/language/stats/examine.c:275 src/language/stats/examine.c:381
+#: src/language/stats/examine.c:275 src/language/stats/examine.c:382
 #, c-format
 msgid "Boxplot of %s"
 msgstr "%s的箱线图"
 
-#: src/language/stats/examine.c:364
+#: src/language/stats/examine.c:365
 msgid "Boxplot"
 msgstr "箱线图"
 
-#: src/language/stats/examine.c:460
+#: src/language/stats/examine.c:462
 msgid "Not creating NP plot because data set is empty."
 msgstr "因数据为空，不能绘制NP图。"
 
-#: src/language/stats/examine.c:520
+#: src/language/stats/examine.c:522
 #, c-format
 msgid "Not creating spreadlevel chart for %s"
 msgstr "将不绘制%s的变异水平图"
 
-#: src/language/stats/examine.c:609 src/language/stats/examine.c:627
-#: src/language/stats/frequencies.c:1577 src/language/stats/npar-summary.c:142
+#: src/language/stats/examine.c:611 src/language/stats/examine.c:629
+#: src/language/stats/frequencies.c:1596 src/language/stats/npar-summary.c:142
 msgid "Percentiles"
 msgstr "百分位"
 
-#: src/language/stats/examine.c:637
+#: src/language/stats/examine.c:639
 #, c-format
 msgid "%g"
 msgstr "%g"
 
-#: src/language/stats/examine.c:760
+#: src/language/stats/examine.c:762
 msgid "Tukey's Hinges"
 msgstr "Tukey值域法"
 
-#: src/language/stats/examine.c:789 src/language/stats/oneway.c:1088
+#: src/language/stats/examine.c:791 src/language/stats/oneway.c:1090
 #: src/ui/gui/descriptives.ui:9
 msgid "Descriptives"
 msgstr "描述统计"
 
-#: src/language/stats/examine.c:809 src/language/stats/oneway.c:1073
-#: src/language/stats/oneway.c:1381 src/language/stats/oneway.c:1590
-#: src/language/stats/roc.c:978 src/language/stats/regression.c:833
+#: src/language/stats/examine.c:811 src/language/stats/oneway.c:1075
+#: src/language/stats/oneway.c:1383 src/language/stats/oneway.c:1594
+#: src/language/stats/roc.c:982 src/language/stats/regression.c:836
 msgid "Std. Error"
 msgstr "标准误"
 
-#: src/language/stats/examine.c:905 src/language/stats/oneway.c:1079
+#: src/language/stats/examine.c:907 src/language/stats/oneway.c:1081
 #, c-format
 msgid "%g%% Confidence Interval for Mean"
 msgstr "均值的%g%%置信区间"
 
-#: src/language/stats/examine.c:913 src/language/stats/oneway.c:1082
-#: src/language/stats/oneway.c:1597 src/language/stats/roc.c:981
-#: src/language/stats/regression.c:851
+#: src/language/stats/examine.c:915 src/language/stats/oneway.c:1084
+#: src/language/stats/oneway.c:1601 src/language/stats/roc.c:985
+#: src/language/stats/regression.c:854
 msgid "Lower Bound"
 msgstr "下限"
 
-#: src/language/stats/examine.c:926 src/language/stats/oneway.c:1083
-#: src/language/stats/oneway.c:1598 src/language/stats/roc.c:982
-#: src/language/stats/regression.c:852
+#: src/language/stats/examine.c:928 src/language/stats/oneway.c:1085
+#: src/language/stats/oneway.c:1602 src/language/stats/roc.c:986
+#: src/language/stats/regression.c:855
 msgid "Upper Bound"
 msgstr "上限"
 
-#: src/language/stats/examine.c:939
+#: src/language/stats/examine.c:941
 msgid "5% Trimmed Mean"
 msgstr "去除两端5%数据后的均值"
 
-#: src/language/stats/examine.c:953 src/language/stats/frequencies.c:143
+#: src/language/stats/examine.c:955 src/language/stats/frequencies.c:143
 #: src/language/stats/means.c:411 src/language/stats/median.c:422
 #: src/ui/gui/psppire-dialog-action-frequencies.c:52
 msgid "Median"
 msgstr "中位数"
 
-#: src/language/stats/examine.c:1034
+#: src/language/stats/examine.c:1036
 msgid "Interquartile Range"
 msgstr "分区数区间"
 
-#: src/language/stats/examine.c:1109
+#: src/language/stats/examine.c:1111
 msgid "Extreme Values"
 msgstr "极值"
 
-#: src/language/stats/examine.c:1130 src/language/stats/quick-cluster.c:591
+#: src/language/stats/examine.c:1132 src/language/stats/quick-cluster.c:591
 #: src/language/data-io/list.c:114
 msgid "Case Number"
 msgstr "个案数"
 
-#: src/language/stats/examine.c:1205
+#: src/language/stats/examine.c:1207
 msgid "Highest"
 msgstr "最高"
 
-#: src/language/stats/examine.c:1216
+#: src/language/stats/examine.c:1218
 msgid "Lowest"
 msgstr "最低"
 
-#: src/language/stats/examine.c:1309 src/language/stats/logistic.c:1393
+#: src/language/stats/examine.c:1311 src/language/stats/logistic.c:1393
 #: src/language/stats/means.c:1064 src/language/stats/reliability.c:551
 msgid "Case Processing Summary"
 msgstr "个案处理总结"
 
-#: src/language/stats/examine.c:1325 src/language/stats/means.c:1075
+#: src/language/stats/examine.c:1327 src/language/stats/means.c:1075
 #: src/language/stats/reliability.c:574 src/language/stats/crosstabs.q:865
 msgid "Cases"
 msgstr "个案"
 
-#: src/language/stats/examine.c:1329 src/language/stats/frequencies.c:1562
+#: src/language/stats/examine.c:1331 src/language/stats/frequencies.c:1581
 #: src/language/stats/quick-cluster.c:641 src/language/stats/reliability.c:577
 #: src/language/stats/crosstabs.q:866
 msgid "Valid"
 msgstr "有效"
 
-#: src/language/stats/examine.c:1334 src/language/stats/frequencies.c:345
-#: src/language/stats/frequencies.c:1563 src/language/stats/crosstabs.q:867
+#: src/language/stats/examine.c:1336 src/language/stats/frequencies.c:345
+#: src/language/stats/frequencies.c:1582 src/language/stats/crosstabs.q:867
 msgid "Missing"
 msgstr "缺失"
 
-#: src/language/stats/examine.c:1346 src/language/stats/frequencies.c:295
-#: src/language/stats/frequencies.c:1462 src/language/stats/logistic.c:1404
+#: src/language/stats/examine.c:1348 src/language/stats/frequencies.c:295
+#: src/language/stats/frequencies.c:1480 src/language/stats/logistic.c:1404
 #: src/language/stats/means.c:1090 src/language/stats/crosstabs.q:876
 msgid "Percent"
 msgstr "百分比"
 
-#: src/language/stats/examine.c:1984
+#: src/language/stats/examine.c:2008
 #, c-format
 msgid "%s may not be negative. Using default value (%g)."
 msgstr "%s可能非负，使用默认值(%g)。"
 
-#: src/language/stats/examine.c:2021
+#: src/language/stats/examine.c:2045
 msgid "Percentiles must lie in the range (0, 100)"
 msgstr "百分位必须处于区间(0, 100)"
 
-#: src/language/stats/examine.c:2215
+#: src/language/stats/examine.c:2239
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s与%s互斥"
@@ -3527,8 +3301,7 @@ msgid "Determinant"
 msgstr "行列式"
 
 #: src/language/stats/factor.c:2038
-msgid ""
-"The dataset contains no complete observations. No analysis will be performed."
+msgid "The dataset contains no complete observations. No analysis will be performed."
 msgstr "数据集没有包含完整的观测值。将不进行数据分析。"
 
 #: src/language/stats/factor.c:2110
@@ -3551,10 +3324,10 @@ msgstr "巴特莱特(Bartlett)球性检验"
 msgid "Approx. Chi-Square"
 msgstr "卡方估计值"
 
-#: src/language/stats/factor.c:2183 src/language/stats/glm.c:754
-#: src/language/stats/logistic.c:1224 src/language/stats/oneway.c:979
-#: src/language/stats/oneway.c:1227 src/language/stats/oneway.c:1591
-#: src/language/stats/regression.c:837 src/language/stats/regression.c:946
+#: src/language/stats/factor.c:2183 src/language/stats/glm.c:753
+#: src/language/stats/logistic.c:1224 src/language/stats/oneway.c:981
+#: src/language/stats/oneway.c:1229 src/language/stats/oneway.c:1595
+#: src/language/stats/regression.c:840 src/language/stats/regression.c:949
 #: src/language/stats/t-test-indep.c:291
 #: src/language/stats/t-test-paired.c:235
 msgid "Sig."
@@ -3562,18 +3335,13 @@ msgstr "显著性"
 
 #: src/language/stats/factor.c:2224
 #, c-format
-msgid ""
-"The %s criteria result in zero factors extracted. Therefore no analysis will "
-"be performed."
+msgid "The %s criteria result in zero factors extracted. Therefore no analysis will be performed."
 msgstr "按%s标准可提取因子数为零。将不继续分析。"
 
 #: src/language/stats/factor.c:2231
 #, c-format
-msgid ""
-"The %s criteria result in more factors than variables, which is not "
-"meaningful. No analysis will be performed."
-msgstr ""
-"按%s标准提取的因子数多于变量数，导致无意义的结果。不再往下进行分析操作。"
+msgid "The %s criteria result in more factors than variables, which is not meaningful. No analysis will be performed."
+msgstr "按%s标准提取的因子数多于变量数，导致无意义的结果。不再往下进行分析操作。"
 
 #: src/language/stats/factor.c:2323
 msgid "Component Matrix"
@@ -3604,52 +3372,52 @@ msgstr "旋转因子矩阵"
 msgid "%s ignores %s.  Temporary transformations will be made permanent."
 msgstr "%s忽略%s。 临时变换将被保存。"
 
-#: src/language/stats/flip.c:151
+#: src/language/stats/flip.c:153
 #, c-format
 msgid "Could not create temporary file for %s."
 msgstr "无法为%s创建临时文件。"
 
-#: src/language/stats/flip.c:333
+#: src/language/stats/flip.c:335
 #, c-format
 msgid "Error rewinding %s file: %s."
 msgstr "无法撤消对文件%s的操作：%s。"
 
-#: src/language/stats/flip.c:340
+#: src/language/stats/flip.c:342
 #, c-format
 msgid "Error creating %s source file."
 msgstr "创建源文件%s时出错。"
 
-#: src/language/stats/flip.c:353
+#: src/language/stats/flip.c:355
 #, c-format
 msgid "Error reading %s file: %s."
 msgstr "读取文件%s时出错：%s。"
 
-#: src/language/stats/flip.c:355
+#: src/language/stats/flip.c:357
 #, c-format
 msgid "Unexpected end of file reading %s file."
 msgstr "记取文件%s时文件意外结束。"
 
-#: src/language/stats/flip.c:371
+#: src/language/stats/flip.c:373
 #, c-format
 msgid "Error seeking %s source file: %s."
 msgstr "源文件%s查找时出错：%s。"
 
-#: src/language/stats/flip.c:379
+#: src/language/stats/flip.c:381
 #, c-format
 msgid "Error writing %s source file: %s."
 msgstr "写入源文件%s时出错：%s。"
 
-#: src/language/stats/flip.c:394
+#: src/language/stats/flip.c:396
 #, c-format
 msgid "Error rewinding %s source file: %s."
 msgstr "撤消源文件%s操作时出错：%s。"
 
-#: src/language/stats/flip.c:425
+#: src/language/stats/flip.c:427
 #, c-format
 msgid "Error reading %s temporary file: %s."
 msgstr "读取临时文件%s时出错：%s。"
 
-#: src/language/stats/flip.c:428
+#: src/language/stats/flip.c:430
 #, c-format
 msgid "Unexpected end of file reading %s temporary file."
 msgstr "读取临时文件%s时文件意外结束。"
@@ -3686,49 +3454,41 @@ msgstr "直方图百分比必须大于零。"
 
 #: src/language/stats/frequencies.c:1132
 #, c-format
-msgid ""
-"%s for histogram must be greater than or equal to %s, but %s was specified "
-"as %.15g and %s as %.15g.  %s and %s will be ignored."
-msgstr ""
-"直方图的%s必须大于或等于%s，但设定是：%s 为 %.15g 和 %s 为 %.15g。%s和%s将被"
-"忽略。"
+msgid "%s for histogram must be greater than or equal to %s, but %s was specified as %.15g and %s as %.15g.  %s and %s will be ignored."
+msgstr "直方图的%s必须大于或等于%s，但设定是：%s 为 %.15g 和 %s 为 %.15g。%s和%s将被忽略。"
 
 #: src/language/stats/frequencies.c:1177
 #, c-format
-msgid ""
-"%s for pie chart must be greater than or equal to %s, but %s was specified "
-"as %.15g and %s as %.15g.  %s and %s will be ignored."
-msgstr ""
-"饼状图的%s必须大于或等于%s，但设定是：%s 为 %.15g 和 %s 为 %.15g。%s和%s将被"
-"忽略。"
+msgid "%s for pie chart must be greater than or equal to %s, but %s was specified as %.15g and %s as %.15g.  %s and %s will be ignored."
+msgstr "饼状图的%s必须大于或等于%s，但设定是：%s 为 %.15g 和 %s 为 %.15g。%s和%s将被忽略。"
 
-#: src/language/stats/frequencies.c:1442
+#: src/language/stats/frequencies.c:1460
 #, c-format
 msgid "Omitting pie chart for %s, which has only %d unique values."
 msgstr "饼状图将忽略%s，原因为其仅具有%d个唯一值。"
 
-#: src/language/stats/frequencies.c:1445
+#: src/language/stats/frequencies.c:1463
 #, c-format
 msgid "Omitting pie chart for %s, which has over 50 unique values."
 msgstr "饼状图将忽略%s，原因为其具有超过50个唯一值。"
 
-#: src/language/stats/frequencies.c:1462 src/language/stats/graph.c:207
+#: src/language/stats/frequencies.c:1480 src/language/stats/graph.c:207
 #: src/ui/gui/psppire-dialog-action-crosstabs.c:88
 #: src/language/stats/crosstabs.q:723
 msgid "Count"
 msgstr "计数"
 
-#: src/language/stats/frequencies.c:1588
+#: src/language/stats/frequencies.c:1607
 msgid "50 (Median)"
 msgstr "50 (中位数)"
 
 #: src/language/stats/friedman.c:227 src/language/stats/kruskal-wallis.c:258
-#: src/language/stats/mann-whitney.c:171 src/language/stats/wilcoxon.c:226
+#: src/language/stats/mann-whitney.c:198 src/language/stats/wilcoxon.c:226
 msgid "Ranks"
 msgstr "次序"
 
 #: src/language/stats/friedman.c:238 src/language/stats/kruskal-wallis.c:272
-#: src/language/stats/mann-whitney.c:196 src/language/stats/wilcoxon.c:240
+#: src/language/stats/mann-whitney.c:223 src/language/stats/wilcoxon.c:240
 msgid "Mean Rank"
 msgstr "均值次序"
 
@@ -3744,99 +3504,91 @@ msgstr "不包含多元分析"
 msgid "Only types 1, 2 & 3 sums of squares are currently implemented"
 msgstr "仅支持平方和类型1，2和3"
 
-#: src/language/stats/glm.c:736
+#: src/language/stats/glm.c:735
 msgid "Tests of Between-Subjects Effects"
 msgstr "组间效应检验"
 
-#: src/language/stats/glm.c:749
+#: src/language/stats/glm.c:748
 #, c-format
 msgid "Type %s Sum of Squares"
 msgstr "类型%s的平方和"
 
-#: src/language/stats/glm.c:752 src/language/stats/oneway.c:977
-#: src/language/stats/regression.c:944
+#: src/language/stats/glm.c:751 src/language/stats/oneway.c:979
+#: src/language/stats/regression.c:947
 msgid "Mean Square"
 msgstr "均方"
 
-#: src/language/stats/glm.c:753 src/language/stats/oneway.c:978
-#: src/language/stats/regression.c:945 src/language/stats/t-test-indep.c:290
+#: src/language/stats/glm.c:752 src/language/stats/oneway.c:980
+#: src/language/stats/regression.c:948 src/language/stats/t-test-indep.c:290
 msgid "F"
 msgstr "F"
 
-#: src/language/stats/glm.c:762
+#: src/language/stats/glm.c:761
 msgid "Corrected Model"
 msgstr "校正后模型"
 
-#: src/language/stats/glm.c:764 src/language/stats/regression.c:997
+#: src/language/stats/glm.c:763 src/language/stats/regression.c:1000
 msgid "Model"
 msgstr "模型"
 
-#: src/language/stats/glm.c:777
+#: src/language/stats/glm.c:776
 msgid "Intercept"
 msgstr "截距"
 
-#: src/language/stats/glm.c:843
+#: src/language/stats/glm.c:847
 msgid "Error"
 msgstr "错误"
 
-#: src/language/stats/glm.c:859
+#: src/language/stats/glm.c:863
 msgid "Corrected Total"
 msgstr "校正后总变异"
 
 #: src/language/stats/graph.c:208
-#, fuzzy
 msgid "Percentage"
-msgstr "百分比(_P)"
+msgstr "百分比"
 
 #: src/language/stats/graph.c:209
-#, fuzzy
 msgid "Cumulative Count"
-msgstr "累积百分比"
+msgstr "累积数量"
 
 #: src/language/stats/graph.c:210
-#, fuzzy
 msgid "Cumulative Percent"
 msgstr "累积百分比"
 
-#: src/language/stats/graph.c:295
+#: src/language/stats/graph.c:297
 #, c-format
 msgid "%s vs. %s by %s"
 msgstr "%s 对 %s by %s"
 
-#: src/language/stats/graph.c:302
+#: src/language/stats/graph.c:304
 #, c-format
 msgid "%s vs. %s"
 msgstr "%s 对 %s"
 
-#: src/language/stats/graph.c:320
-#, fuzzy
-msgid ""
-"Maximum number of scatterplot categories reached. Your BY variable has too "
-"many distinct values. The coloring of the plot will not be correct."
-msgstr ""
-"散点图类别数大于系统最大值。BY变量含有过多的独特值。图像显示的颜色可能不正"
-"确。"
+#: src/language/stats/graph.c:322
+msgid "Maximum number of scatterplot categories reached. Your BY variable has too many distinct values. The coloring of the plot will not be correct."
+msgstr "散点图类别数达到系统最大值。BY变量含有过多的独特值。图像的颜色显示可能不正确。"
 
-#: src/language/stats/graph.c:485 src/language/stats/rank.c:636
+#: src/language/stats/graph.c:493 src/language/stats/rank.c:637
 #, c-format
 msgid "%s of %s"
 msgstr "%s源于%s"
 
-#: src/language/stats/graph.c:632 src/language/stats/graph.c:663
-#: src/language/stats/graph.c:711
+#: src/language/stats/graph.c:640 src/language/stats/graph.c:671
+#: src/language/stats/graph.c:719
 msgid "Only one chart type is allowed."
 msgstr "只能选择一种图表类型。"
 
-#: src/language/stats/graph.c:655 src/language/stats/graph.c:754
-#: src/language/stats/graph.c:768
+#: src/language/stats/graph.c:663 src/language/stats/graph.c:762
+#: src/language/stats/graph.c:776
 msgid "Only one variable is allowed."
 msgstr "只允许一个变量。"
 
-#: src/language/stats/graph.c:777
+#: src/language/stats/graph.c:785
 msgid "Variable expected"
 msgstr "要求为变量。"
 
-#: src/language/stats/graph.c:816
+#: src/language/stats/graph.c:825
 msgid "FOOTNOTE is not implemented yet for GRAPH"
 msgstr "GRAPH命令中暂不支持FOOTNOTE子命令。"
 
@@ -3874,11 +3626,11 @@ msgstr "最大极值差异"
 msgid "Absolute"
 msgstr "绝对"
 
-#: src/language/stats/ks-one-sample.c:390 src/language/stats/roc.c:1079
+#: src/language/stats/ks-one-sample.c:390 src/language/stats/roc.c:1083
 msgid "Positive"
 msgstr "正"
 
-#: src/language/stats/ks-one-sample.c:393 src/language/stats/roc.c:1080
+#: src/language/stats/ks-one-sample.c:393 src/language/stats/roc.c:1084
 msgid "Negative"
 msgstr "负"
 
@@ -3888,7 +3640,7 @@ msgstr "Kolmogorov-Smirnov Z"
 
 #: src/language/stats/ks-one-sample.c:399
 #: src/language/stats/jonckheere-terpstra.c:386
-#: src/language/stats/mann-whitney.c:267 src/language/stats/runs.c:402
+#: src/language/stats/mann-whitney.c:294 src/language/stats/runs.c:402
 #: src/language/stats/wilcoxon.c:319 src/language/stats/crosstabs.q:1275
 msgid "Asymp. Sig. (2-tailed)"
 msgstr "渐进显著度(双尾)"
@@ -3903,30 +3655,22 @@ msgstr "因变量的值不是二分型"
 
 #: src/language/stats/logistic.c:614
 #, c-format
-msgid ""
-"Category %s does not have at least two distinct values. Logistic regression "
-"will not be run."
+msgid "Category %s does not have at least two distinct values. Logistic regression will not be run."
 msgstr "类别%s不包含至少两个明显区别的值。不进行逻辑斯蒂回归分析。"
 
 #: src/language/stats/logistic.c:674
 #, c-format
-msgid ""
-"Estimation terminated at iteration number %d because parameter estimates "
-"changed by less than %g"
+msgid "Estimation terminated at iteration number %d because parameter estimates changed by less than %g"
 msgstr "估计在迭代%d时终止，原因是参数估计的变化少于%g"
 
 #: src/language/stats/logistic.c:686
 #, c-format
-msgid ""
-"Estimation terminated at iteration number %d because Log Likelihood "
-"decreased by less than %g%%"
+msgid "Estimation terminated at iteration number %d because Log Likelihood decreased by less than %g%%"
 msgstr "估计在迭代%d时终止，原因是对数似然下降小于%g%%"
 
 #: src/language/stats/logistic.c:701
 #, c-format
-msgid ""
-"Estimation terminated at iteration number %d because maximum iterations has "
-"been reached"
+msgid "Estimation terminated at iteration number %d because maximum iterations has been reached"
 msgstr "估计在迭代%d时终止，已达到最大迭代次数"
 
 #: src/language/stats/logistic.c:995
@@ -3954,7 +3698,7 @@ msgstr "公式中的变量"
 msgid "Step 1"
 msgstr "步骤一"
 
-#: src/language/stats/logistic.c:1220 src/language/stats/regression.c:832
+#: src/language/stats/logistic.c:1220 src/language/stats/regression.c:835
 msgid "B"
 msgstr "B"
 
@@ -4081,29 +3825,29 @@ msgstr "J-T统计量标准差"
 msgid "Std. J-T Statistic"
 msgstr "标准J-T统计量"
 
-#: src/language/stats/mann-whitney.c:202 src/language/stats/wilcoxon.c:241
+#: src/language/stats/mann-whitney.c:229 src/language/stats/wilcoxon.c:241
 msgid "Sum of Ranks"
 msgstr "秩之和"
 
-#: src/language/stats/mann-whitney.c:264
+#: src/language/stats/mann-whitney.c:291
 msgid "Mann-Whitney U"
 msgstr "Mann-Whitney U"
 
-#: src/language/stats/mann-whitney.c:265
+#: src/language/stats/mann-whitney.c:292
 msgid "Wilcoxon W"
 msgstr "Wilcoxon W"
 
-#: src/language/stats/mann-whitney.c:266 src/language/stats/runs.c:399
+#: src/language/stats/mann-whitney.c:293 src/language/stats/runs.c:399
 #: src/language/stats/wilcoxon.c:318
 msgid "Z"
 msgstr "Z"
 
-#: src/language/stats/mann-whitney.c:271 src/language/stats/mcnemar.c:265
+#: src/language/stats/mann-whitney.c:298 src/language/stats/mcnemar.c:265
 #: src/language/stats/sign.c:134 src/language/stats/wilcoxon.c:323
 msgid "Exact Sig. (2-tailed)"
 msgstr "确切显著度(双尾)"
 
-#: src/language/stats/mann-whitney.c:272 src/language/stats/mcnemar.c:271
+#: src/language/stats/mann-whitney.c:299 src/language/stats/mcnemar.c:271
 #: src/language/stats/sign.c:140 src/language/stats/wilcoxon.c:327
 msgid "Point Probability"
 msgstr "点概率"
@@ -4191,22 +3935,17 @@ msgstr "要求%s, %s, %s或数字。"
 
 #: src/language/stats/npar.c:841
 #, c-format
-msgid ""
-"The specified value of HI (%d) is lower than the specified value of LO (%d)"
+msgid "The specified value of HI (%d) is lower than the specified value of LO (%d)"
 msgstr "指定的HI值(%d)小于指定的LO值(%d)"
 
-#: src/language/stats/npar.c:891
+#: src/language/stats/npar.c:893
 #, c-format
-msgid ""
-"%d expected values were given, but the specified range (%d-%d) requires "
-"exactly %d values."
+msgid "%d expected values were given, but the specified range (%d-%d) requires exactly %d values."
 msgstr "虽然要求的值%d已给出，但指定区间(%d-%d)要求值为%d。"
 
-#: src/language/stats/npar.c:1106 src/language/stats/t-test-parser.c:164
+#: src/language/stats/npar.c:1108 src/language/stats/t-test-parser.c:165
 #, c-format
-msgid ""
-"PAIRED was specified but the number of variables preceding WITH (%zu) did "
-"not match the number following (%zu)."
+msgid "PAIRED was specified but the number of variables preceding WITH (%zu) did not match the number following (%zu)."
 msgstr "设定了PAIRED参数，但WITH前的变量数量(%zu)与其后的数量(%zu)不匹配。"
 
 #: src/language/stats/npar-summary.c:146
@@ -4245,151 +3984,145 @@ msgstr "Games-Howell"
 msgid "Šidák"
 msgstr "Šidák"
 
-#: src/language/stats/oneway.c:513
+#: src/language/stats/oneway.c:515
 #, c-format
 msgid "The post hoc analysis method %s is not supported."
 msgstr "不支持事后分析方法%s"
 
-#: src/language/stats/oneway.c:828
+#: src/language/stats/oneway.c:830
 #, c-format
-msgid ""
-"Dependent variable %s has no non-missing values.  No analysis for this "
-"variable will be done."
+msgid "Dependent variable %s has no non-missing values.  No analysis for this variable will be done."
 msgstr "因变量%s不包含非缺失值，不对其进行分析。"
 
-#: src/language/stats/oneway.c:910
+#: src/language/stats/oneway.c:912
 #, c-format
-msgid ""
-"In contrast list %zu, the number of coefficients (%zu) does not equal the "
-"number of groups (%d). This contrast list will be ignored."
+msgid "In contrast list %zu, the number of coefficients (%zu) does not equal the number of groups (%d). This contrast list will be ignored."
 msgstr "对比列表%zu中，系数数量(%zu)不等于组数(%d)，忽略该对比。"
 
-#: src/language/stats/oneway.c:922
+#: src/language/stats/oneway.c:924
 #, c-format
 msgid "Coefficients for contrast %zu do not total zero"
 msgstr "对比%zu的系数这和非零"
 
-#: src/language/stats/oneway.c:975 src/language/stats/regression.c:942
+#: src/language/stats/oneway.c:977 src/language/stats/regression.c:945
 msgid "Sum of Squares"
 msgstr "平方和"
 
-#: src/language/stats/oneway.c:997
+#: src/language/stats/oneway.c:999
 msgid "Between Groups"
 msgstr "组间"
 
-#: src/language/stats/oneway.c:998
+#: src/language/stats/oneway.c:1000
 msgid "Within Groups"
 msgstr "组内"
 
-#: src/language/stats/oneway.c:1031
+#: src/language/stats/oneway.c:1033
 msgid "ANOVA"
 msgstr "方差分析"
 
-#: src/language/stats/oneway.c:1224
+#: src/language/stats/oneway.c:1226
 msgid "Levene Statistic"
 msgstr "Levene氏统计"
 
-#: src/language/stats/oneway.c:1225
+#: src/language/stats/oneway.c:1227
 msgid "df1"
 msgstr "df1"
 
-#: src/language/stats/oneway.c:1226
+#: src/language/stats/oneway.c:1228
 msgid "df2"
 msgstr "df2"
 
-#: src/language/stats/oneway.c:1229
+#: src/language/stats/oneway.c:1231
 msgid "Test of Homogeneity of Variances"
 msgstr "方差齐性检验"
 
-#: src/language/stats/oneway.c:1302
+#: src/language/stats/oneway.c:1304
 msgid "Contrast Coefficients"
 msgstr "对比系数"
 
-#: src/language/stats/oneway.c:1304 src/language/stats/oneway.c:1379
+#: src/language/stats/oneway.c:1306 src/language/stats/oneway.c:1381
 msgid "Contrast"
 msgstr "对比"
 
-#: src/language/stats/oneway.c:1377
+#: src/language/stats/oneway.c:1379
 msgid "Contrast Tests"
 msgstr "对比检验"
 
-#: src/language/stats/oneway.c:1380
+#: src/language/stats/oneway.c:1382
 msgid "Value of Contrast"
 msgstr "对比值"
 
-#: src/language/stats/oneway.c:1382 src/language/stats/regression.c:836
+#: src/language/stats/oneway.c:1384 src/language/stats/regression.c:839
 #: src/language/stats/t-test-indep.c:292
 #: src/language/stats/t-test-one-sample.c:95
 #: src/language/stats/t-test-paired.c:305
 msgid "t"
 msgstr "t"
 
-#: src/language/stats/oneway.c:1434
+#: src/language/stats/oneway.c:1438
 msgid "Assume equal variances"
 msgstr "假设方差相同"
 
-#: src/language/stats/oneway.c:1438
+#: src/language/stats/oneway.c:1442
 msgid "Does not assume equal"
 msgstr "不假设方差相同"
 
-#: src/language/stats/oneway.c:1584
+#: src/language/stats/oneway.c:1588
 #, c-format
 msgid "Multiple Comparisons (%s)"
 msgstr "多重比较(%s)"
 
-#: src/language/stats/oneway.c:1586
+#: src/language/stats/oneway.c:1590
 #, c-format
 msgid "(I) %s"
 msgstr "(I) %s"
 
-#: src/language/stats/oneway.c:1587
+#: src/language/stats/oneway.c:1591
 #, c-format
 msgid "(J) %s"
 msgstr "(J) %s"
 
-#: src/language/stats/oneway.c:1588 src/language/stats/t-test-indep.c:295
+#: src/language/stats/oneway.c:1592 src/language/stats/t-test-indep.c:295
 #: src/language/stats/t-test-one-sample.c:98
 msgid "Mean Difference"
 msgstr "均值差异"
 
-#: src/language/stats/oneway.c:1589
+#: src/language/stats/oneway.c:1593
 msgid "(I - J)"
 msgstr "(I - J)"
 
-#: src/language/stats/oneway.c:1594
+#: src/language/stats/oneway.c:1598
 #, c-format
 msgid "%g%% Confidence Interval"
 msgstr "%g%%的置信区间"
 
 #: src/language/stats/quick-cluster.c:530
 msgid "Final Cluster Centers"
-msgstr "ç»\93æ\9e\9cç±»ç°\87中心点"
+msgstr "ç»\93æ\9e\9c类群中心点"
 
 #: src/language/stats/quick-cluster.c:534
 msgid "Initial Cluster Centers"
-msgstr "å\88\9då§\8bç±»ç°\87中心点"
+msgstr "å\88\9då§\8b类群中心点"
 
 #: src/language/stats/quick-cluster.c:537
 #: src/language/stats/quick-cluster.c:592
 #: src/language/stats/quick-cluster.c:629
 msgid "Cluster"
-msgstr "ç±»ç°\87"
+msgstr "类群"
 
 #: src/language/stats/quick-cluster.c:590
-#, fuzzy
 msgid "Cluster Membership"
-msgstr "ç»\93æ\9e\9cç±»ç°\87中å¿\83ç\82¹"
+msgstr "类群å½\92å±\9e"
 
 #: src/language/stats/quick-cluster.c:627
 msgid "Number of Cases in each Cluster"
-msgstr "ç±»ç°\87中个案数"
+msgstr "类群中个案数"
 
 #: src/language/stats/quick-cluster.c:747
 msgid "The number of clusters must be positive"
-msgstr "ç±»ç°\87数量必须为正"
+msgstr "类群数量必须为正"
 
 #: src/language/stats/quick-cluster.c:762
-#, fuzzy
 msgid "The convergence criterium must be positive"
 msgstr "迭代次数必须为正"
 
@@ -4399,51 +4132,50 @@ msgstr "迭代次数必须为正"
 
 #: src/language/stats/rank.c:206
 #, c-format
-msgid ""
-"Cannot generate variable name for ranking %s with %s.  All candidates in use."
+msgid "Cannot generate variable name for ranking %s with %s.  All candidates in use."
 msgstr "不能为秩%s生成名称%s。可用名称均已被使用。"
 
-#: src/language/stats/rank.c:321
+#: src/language/stats/rank.c:322
 #, c-format
 msgid "Too many variables in %s clause."
 msgstr "%s子句变量过多。"
 
-#: src/language/stats/rank.c:323
+#: src/language/stats/rank.c:324
 #, c-format
 msgid "Variable %s already exists."
 msgstr "变量%s已经存在。"
 
-#: src/language/stats/rank.c:325 src/language/expressions/evaluate.c:164
+#: src/language/stats/rank.c:326 src/language/expressions/evaluate.c:164
 #, c-format
 msgid "Duplicate variable name %s."
 msgstr "变量名称%s重复。"
 
-#: src/language/stats/rank.c:631
+#: src/language/stats/rank.c:632
 #, c-format
 msgid "%s of %s by %s"
 msgstr "%s源于%s经由%s"
 
-#: src/language/stats/rank.c:823
+#: src/language/stats/rank.c:824
 #, c-format
 msgid "Variables Created By %s"
 msgstr "从%s创建变量"
 
-#: src/language/stats/rank.c:847
+#: src/language/stats/rank.c:848
 #, c-format
 msgid "%s into %s(%s of %s using %s BY %s)"
 msgstr "%s在%s之内(%s在%s内，使用%s经由%s)"
 
-#: src/language/stats/rank.c:857
+#: src/language/stats/rank.c:858
 #, c-format
 msgid "%s into %s(%s of %s BY %s)"
 msgstr "%s在%s之内(%s在%s内经由%s)"
 
-#: src/language/stats/rank.c:870
+#: src/language/stats/rank.c:871
 #, c-format
 msgid "%s into %s(%s of %s using %s)"
 msgstr "%s在%s之内(%s在%s内使用%s)"
 
-#: src/language/stats/rank.c:879
+#: src/language/stats/rank.c:880
 #, c-format
 msgid "%s into %s(%s of %s)"
 msgstr "%s在%s之内(%s在%s内)"
@@ -4453,9 +4185,7 @@ msgid "Reliability on a single variable is not useful."
 msgstr "单个变量的信度用处不大。"
 
 #: src/language/stats/reliability.c:280
-msgid ""
-"The STATISTICS subcommand is not yet implemented.  No statistics will be "
-"produced."
+msgid "The STATISTICS subcommand is not yet implemented.  No statistics will be produced."
 msgstr "暂不支持STATISTICS 子命令。将不输出统计量。"
 
 #: src/language/stats/reliability.c:299
@@ -4467,7 +4197,7 @@ msgstr "分割点必须小于变量数量"
 msgid "Scale: %s"
 msgstr "评分：%s"
 
-#: src/language/stats/reliability.c:588 src/ui/gui/logistic.ui:81
+#: src/language/stats/reliability.c:588 src/ui/gui/logistic.ui:80
 msgid "%"
 msgstr "%"
 
@@ -4536,160 +4266,158 @@ msgstr "长度不等"
 msgid "Guttman Split-Half Coefficient"
 msgstr "Guttman Split-Half系数"
 
-#: src/language/stats/roc.c:958
+#: src/language/stats/roc.c:962
 msgid "Area Under the Curve"
 msgstr "曲线下面积"
 
-#: src/language/stats/roc.c:960
+#: src/language/stats/roc.c:964
 #, c-format
 msgid "Area Under the Curve (%s)"
 msgstr "曲线下面积(%s)"
 
-#: src/language/stats/roc.c:965
+#: src/language/stats/roc.c:969
 msgid "Area"
 msgstr "面积"
 
-#: src/language/stats/roc.c:979
+#: src/language/stats/roc.c:983
 msgid "Asymptotic Sig."
 msgstr "渐进显著度"
 
-#: src/language/stats/roc.c:986
+#: src/language/stats/roc.c:990
 #, c-format
 msgid "Asymp. %g%% Confidence Interval"
 msgstr "渐进%g%%的置信区间"
 
-#: src/language/stats/roc.c:992
+#: src/language/stats/roc.c:996
 msgid "Variable under test"
 msgstr "检验变量"
 
-#: src/language/stats/roc.c:1051
+#: src/language/stats/roc.c:1055
 msgid "Case Summary"
 msgstr "个案总结"
 
-#: src/language/stats/roc.c:1071
+#: src/language/stats/roc.c:1075
 msgid "Unweighted"
 msgstr "未加权"
 
-#: src/language/stats/roc.c:1072
+#: src/language/stats/roc.c:1076
 msgid "Weighted"
 msgstr "加权"
 
-#: src/language/stats/roc.c:1076
+#: src/language/stats/roc.c:1080
 msgid "Valid N (listwise)"
 msgstr "有效 N(含缺失值则排除)"
 
-#: src/language/stats/roc.c:1108
+#: src/language/stats/roc.c:1112
 msgid "Coordinates of the Curve"
 msgstr "曲线的坐标"
 
-#: src/language/stats/roc.c:1110
+#: src/language/stats/roc.c:1114
 #, c-format
 msgid "Coordinates of the Curve (%s)"
 msgstr "曲线(%s)的坐标"
 
-#: src/language/stats/roc.c:1118
+#: src/language/stats/roc.c:1122
 msgid "Test variable"
 msgstr "检验变量"
 
-#: src/language/stats/roc.c:1120
+#: src/language/stats/roc.c:1124
 msgid "Positive if greater than or equal to"
 msgstr "正，若大于等于"
 
-#: src/language/stats/roc.c:1121 src/output/charts/roc-chart-cairo.c:38
+#: src/language/stats/roc.c:1125 src/output/charts/roc-chart-cairo.c:38
 msgid "Sensitivity"
 msgstr "灵敏度"
 
-#: src/language/stats/roc.c:1122 src/output/charts/roc-chart-cairo.c:37
+#: src/language/stats/roc.c:1126 src/output/charts/roc-chart-cairo.c:37
 msgid "1 - Specificity"
 msgstr "1 - 特异度"
 
-#: src/language/stats/regression.c:376
-msgid ""
-"REGRESSION with SAVE ignores TEMPORARY.  Temporary transformations will be "
-"made permanent."
+#: src/language/stats/regression.c:375
+msgid "REGRESSION with SAVE ignores TEMPORARY.  Temporary transformations will be made permanent."
 msgstr "带SAVE选项的REGRESSION忽略TEMPORARY选项。临时变换将被保存。"
 
-#: src/language/stats/regression.c:511
-msgid ""
-"The dependent variable is equal to the independent variable. The least "
-"squares line is therefore Y=X. Standard errors and related statistics may be "
-"meaningless."
+#: src/language/stats/regression.c:379
+msgid "REGRESSION with SAVE ignores FILTER.  All cases will be processed."
+msgstr "带 SAVE 选项的 REGRESSION 将忽略 FILTER 选项。所有个案都参与分析。"
+
+#: src/language/stats/regression.c:514
+msgid "The dependent variable is equal to the independent variable. The least squares line is therefore Y=X. Standard errors and related statistics may be meaningless."
 msgstr "因变量等于自变量。最小二乘直线为Y=X。标准误及相关统计量无意义。"
 
-#: src/language/stats/regression.c:695
+#: src/language/stats/regression.c:698
 msgid "No valid data found. This command was skipped."
 msgstr "没有找到有效数据，忽略该指令。"
 
-#: src/language/stats/regression.c:780
+#: src/language/stats/regression.c:783
 #: src/ui/gui/psppire-dialog-action-regression.c:42
 msgid "R"
 msgstr "R"
 
-#: src/language/stats/regression.c:781
+#: src/language/stats/regression.c:784
 msgid "R Square"
 msgstr "R平方"
 
-#: src/language/stats/regression.c:782
+#: src/language/stats/regression.c:785
 msgid "Adjusted R Square"
 msgstr "调整后的R平方"
 
-#: src/language/stats/regression.c:783
+#: src/language/stats/regression.c:786
 msgid "Std. Error of the Estimate"
 msgstr "估值的标准误"
 
-#: src/language/stats/regression.c:788
+#: src/language/stats/regression.c:791
 #, c-format
 msgid "Model Summary (%s)"
 msgstr "模型总结(%s)"
 
-#: src/language/stats/regression.c:831
+#: src/language/stats/regression.c:834
 msgid "Unstandardized Coefficients"
 msgstr "未标准化系数"
 
-#: src/language/stats/regression.c:834
+#: src/language/stats/regression.c:837
 msgid "Standardized Coefficients"
 msgstr "标准化后系数"
 
-#: src/language/stats/regression.c:835
+#: src/language/stats/regression.c:838
 msgid "Beta"
 msgstr "Beta"
 
-#: src/language/stats/regression.c:838
+#: src/language/stats/regression.c:841
 msgid "(Constant)"
 msgstr "(常量)"
 
-#: src/language/stats/regression.c:849
+#: src/language/stats/regression.c:852
 #, c-format
 msgid "%g%% Confidence Interval for B"
 msgstr "B的%g%%置信区间"
 
-#: src/language/stats/regression.c:913
+#: src/language/stats/regression.c:916
 #, c-format
 msgid "Coefficients (%s)"
 msgstr "系数(%s)"
 
-#: src/language/stats/regression.c:948 src/ui/gui/regression.ui:8
+#: src/language/stats/regression.c:951 src/ui/gui/regression.ui:8
 msgid "Regression"
 msgstr "回归"
 
-#: src/language/stats/regression.c:971
+#: src/language/stats/regression.c:974
 #, c-format
 msgid "ANOVA (%s)"
 msgstr "方差分析(%s)"
 
-#: src/language/stats/regression.c:998
+#: src/language/stats/regression.c:1001
 msgid "Covariances"
 msgstr "协方差"
 
-#: src/language/stats/regression.c:1013
+#: src/language/stats/regression.c:1016
 #, c-format
 msgid "Coefficient Correlations (%s)"
 msgstr "相关系数(%s)"
 
 #: src/language/stats/runs.c:168
 #, c-format
-msgid ""
-"Multiple modes exist for variable `%s'.  Using %.*g as the threshold value."
+msgid "Multiple modes exist for variable `%s'.  Using %.*g as the threshold value."
 msgstr "变量`%s'有多个众数。使用%.*g作为阈值。"
 
 #: src/language/stats/runs.c:325 src/ui/gui/runs.ui:8
@@ -4838,18 +4566,18 @@ msgstr "均值标准误"
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: src/language/stats/t-test-parser.c:124
+#: src/language/stats/t-test-parser.c:125
 #, c-format
 msgid "When applying %s to a string variable, two values must be specified."
 msgstr "将%s应用于字符串变量时，须同时指定两个值。"
 
-#: src/language/stats/t-test-parser.c:136
-#: src/language/stats/t-test-parser.c:232
+#: src/language/stats/t-test-parser.c:137
+#: src/language/stats/t-test-parser.c:233
 #, c-format
 msgid "%s subcommand may not be used with %s."
 msgstr "%s子指令必须与%s一起使用。"
 
-#: src/language/stats/t-test-parser.c:294
+#: src/language/stats/t-test-parser.c:296
 msgid "Exactly one of TESTVAL, GROUPS and PAIRS subcommands must be specified."
 msgstr "必须三个子指令TESTVAL、GROUPS和PAIRS中的一个。"
 
@@ -4870,11 +4598,8 @@ msgid "Cannot specify the active dataset since none has been defined."
 msgstr "没有可用数据集来指定活动数据集。"
 
 #: src/language/data-io/combine-files.c:220
-msgid ""
-"This command may not be used after TEMPORARY when the active dataset is an "
-"input source.  Temporary transformations will be made permanent."
-msgstr ""
-"活动数据集作为输入源时，该指令将不能用于TEMPORARY之后。临时变换将被保存。"
+msgid "This command may not be used after TEMPORARY when the active dataset is an input source.  Temporary transformations will be made permanent."
+msgstr "活动数据集作为输入源时，该指令将不能用于TEMPORARY之后。临时变换将被保存。"
 
 #: src/language/data-io/combine-files.c:255
 msgid "Multiple IN subcommands for a single FILE or TABLE."
@@ -4897,16 +4622,12 @@ msgid "BY is required when %s is specified."
 msgstr "指定%s时必须指定BY子命令。"
 
 #: src/language/data-io/combine-files.c:521
-msgid ""
-"Combining files with incompatible encodings. String data may not be "
-"represented correctly."
+msgid "Combining files with incompatible encodings. String data may not be represented correctly."
 msgstr "试图合并编码兼容的文件，字符串可能不能正常显示。"
 
 #: src/language/data-io/combine-files.c:564
 #, c-format
-msgid ""
-"Variable %s in file %s has different type or width from the same variable in "
-"earlier file."
+msgid "Variable %s in file %s has different type or width from the same variable in earlier file."
 msgstr "变量%s所处的文件%s与之前文件中同一个变量类型或长度不同。"
 
 #: src/language/data-io/combine-files.c:570
@@ -4931,9 +4652,7 @@ msgstr "之前文件中，%s是长度%d的字符串类型。"
 
 #: src/language/data-io/combine-files.c:621
 #, c-format
-msgid ""
-"Variable name %s specified on %s subcommand duplicates an existing variable "
-"name."
+msgid "Variable name %s specified on %s subcommand duplicates an existing variable name."
 msgstr "变量名称%s(子命令%s内)与现有变量冲突。"
 
 #: src/language/data-io/combine-files.c:793
@@ -4941,185 +4660,181 @@ msgstr "变量名称%s(子命令%s内)与现有变量冲突。"
 msgid "Encountered %zu sets of duplicate cases in the master file."
 msgstr "%zu的个案与主文件重复。"
 
-#: src/language/data-io/data-list.c:141
+#: src/language/data-io/data-list.c:129 src/language/data-io/data-list.c:144
+#, c-format
+msgid "The %s value must be nonnegative."
+msgstr "%s值不能为负数。"
+
+#: src/language/data-io/data-list.c:154
 #, c-format
 msgid "The %s subcommand may only be used within %s."
 msgstr "子指令%s仅可在%s内使用。"
 
-#: src/language/data-io/data-list.c:146
+#: src/language/data-io/data-list.c:159
 #, c-format
 msgid "The %s subcommand may only be specified once."
 msgstr "子指令%s仅须指定一次。"
 
-#: src/language/data-io/data-list.c:184
+#: src/language/data-io/data-list.c:197
 msgid "Only one of FIXED, FREE, or LIST may be specified."
 msgstr "FIXED、FREE和LIST仅可指定一个。"
 
-#: src/language/data-io/data-list.c:245
+#: src/language/data-io/data-list.c:260
 msgid "Encoding should not be specified for inline data. It will be ignored."
 msgstr "内联数据无须设定编码，设置将被忽略。"
 
-#: src/language/data-io/data-list.c:254
+#: src/language/data-io/data-list.c:269
 #, c-format
 msgid "The %s subcommand may be used only with %s."
 msgstr "%s子命令仅可与%s一起使用。"
 
-#: src/language/data-io/data-list.c:269
+#: src/language/data-io/data-list.c:284
 msgid "At least one variable must be specified."
 msgstr "至少指定一个变量。"
 
-#: src/language/data-io/data-list.c:368 src/language/data-io/data-list.c:476
-#: src/language/data-io/get-data.c:673
+#: src/language/data-io/data-list.c:383 src/language/data-io/data-list.c:491
+#: src/language/data-io/get-data.c:668
 #, c-format
 msgid "%s is a duplicate variable name."
 msgstr "变量名称%s重复。"
 
-#: src/language/data-io/data-list.c:375
+#: src/language/data-io/data-list.c:390
 #, c-format
 msgid "There is already a variable %s of a different type."
 msgstr "变量名称%s已存在，且类型不同。"
 
-#: src/language/data-io/data-list.c:382
+#: src/language/data-io/data-list.c:397
 #, c-format
 msgid "There is already a string variable %s of a different width."
 msgstr "字符串变量%s已存在，且长度不同。"
 
-#: src/language/data-io/data-list.c:390
+#: src/language/data-io/data-list.c:405
 #, c-format
 msgid "Cannot place variable %s on record %d when RECORDS=%d is specified."
 msgstr "不能将变量%s置于记录%d，因为已设定RECORDS=%d。"
 
-#: src/language/data-io/data-parser.c:461
-#: src/language/data-io/data-parser.c:470
+#: src/language/data-io/data-parser.c:433
+#: src/language/data-io/data-parser.c:442
 msgid "Quoted string extends beyond end of line."
 msgstr "引号内的字符串超过行末尾。"
 
-#: src/language/data-io/data-parser.c:496
+#: src/language/data-io/data-parser.c:468
 msgid "Missing delimiter following quoted string."
 msgstr "引号内的字符串后缺少分隔符。"
 
-#: src/language/data-io/data-parser.c:515
+#: src/language/data-io/data-parser.c:487
 #, c-format
 msgid "Data for variable %s is not valid as format %s: %s"
 msgstr "变量%s的数据格式应为%s: %s"
 
-#: src/language/data-io/data-parser.c:544
+#: src/language/data-io/data-parser.c:516
 #, c-format
 msgid "Partial case of %d of %d records discarded."
 msgstr "不完整个案%d的记录%d将被排除。"
 
-#: src/language/data-io/data-parser.c:600
+#: src/language/data-io/data-parser.c:572
 #, c-format
 msgid "Partial case discarded.  The first variable missing was %s."
 msgstr "排除不完整个案。第一个缺失的变量为%s。"
 
-#: src/language/data-io/data-parser.c:642
+#: src/language/data-io/data-parser.c:614
 #, c-format
-msgid ""
-"Missing value(s) for all variables from %s onward.  These will be filled "
-"with the system-missing value or blanks, as appropriate."
+msgid "Missing value(s) for all variables from %s onward.  These will be filled with the system-missing value or blanks, as appropriate."
 msgstr "自%s起所有变量都有缺失值，将据情况以系统缺失值或空白填充。"
 
-#: src/language/data-io/data-parser.c:663
+#: src/language/data-io/data-parser.c:635
 msgid "Record ends in data not part of any field."
 msgstr "记录末尾的数据不属于任何字段。"
 
-#: src/language/data-io/data-parser.c:683 src/language/data-io/print.c:447
+#: src/language/data-io/data-parser.c:655 src/language/data-io/print.c:447
 msgid "Record"
 msgstr "记录"
 
-#: src/language/data-io/data-parser.c:684 src/language/data-io/print.c:448
+#: src/language/data-io/data-parser.c:656 src/language/data-io/print.c:448
 #: src/ui/gui/psppire-var-sheet.c:1389
 msgid "Columns"
 msgstr "列"
 
-#: src/language/data-io/data-parser.c:685
-#: src/language/data-io/data-parser.c:722 src/language/data-io/print.c:449
+#: src/language/data-io/data-parser.c:657
+#: src/language/data-io/data-parser.c:694 src/language/data-io/print.c:449
 msgid "Format"
 msgstr "格式"
 
-#: src/language/data-io/data-parser.c:703
+#: src/language/data-io/data-parser.c:675
 #, c-format
 msgid "Reading %d record from %s."
 msgid_plural "Reading %d records from %s."
 msgstr[0] "读取%d条记录于%s。"
 
-#: src/language/data-io/data-parser.c:737
+#: src/language/data-io/data-parser.c:709
 #, c-format
 msgid "Reading free-form data from %s."
 msgstr "从%s读取不带格式的数据。"
 
 #. TRANSLATORS: this fragment will be interpolated into
 #. messages in fh_lock() that identify types of files.
-#: src/language/data-io/data-reader.c:138
+#: src/language/data-io/data-reader.c:136
 #: src/language/data-io/data-writer.c:79
 msgid "data file"
 msgstr "数据文件"
 
-#: src/language/data-io/data-reader.c:163
+#: src/language/data-io/data-reader.c:160
 #, c-format
 msgid "Could not open `%s' for reading as a data file: %s."
 msgstr "无法打开`%s'作为数据文件：%s。"
 
-#: src/language/data-io/data-reader.c:180
+#: src/language/data-io/data-reader.c:174
 #, c-format
 msgid "Could not read `%s' as a text file with encoding `%s': %s."
 msgstr "不能读取`%s'作为以编码`%s'的文本文件：%s。"
 
-#: src/language/data-io/data-reader.c:239
+#: src/language/data-io/data-reader.c:233
 #, c-format
-msgid ""
-"Missing %s while reading inline data.  This probably indicates a missing or "
-"incorrectly formatted %s command.  %s must appear by itself on a single line "
-"with exactly one space between words."
-msgstr ""
-"读取内联数据时找不到%s。原因可能是缺少%s指令或指令格式不正确。%s必须作为单独"
-"的行列出，单词之间以仅一个空格分隔。"
+msgid "Missing %s while reading inline data.  This probably indicates a missing or incorrectly formatted %s command.  %s must appear by itself on a single line with exactly one space between words."
+msgstr "读取内联数据时找不到%s。原因可能是缺少%s指令或指令格式不正确。%s必须作为单独的行列出，单词之间以仅一个空格分隔。"
 
-#: src/language/data-io/data-reader.c:259
-#: src/language/data-io/data-reader.c:393
+#: src/language/data-io/data-reader.c:253
+#: src/language/data-io/data-reader.c:387
 #, c-format
 msgid "Error reading file %s: %s."
 msgstr "读取文件%s出错：%s。"
 
-#: src/language/data-io/data-reader.c:267
+#: src/language/data-io/data-reader.c:261
 #, c-format
 msgid "Unexpected end of file in partial record reading %s."
 msgstr "读取不完全记录%s时文件意外结束。"
 
-#: src/language/data-io/data-reader.c:327
+#: src/language/data-io/data-reader.c:321
 #, c-format
 msgid "Corrupt block descriptor word at offset 0x%lx in %s."
 msgstr "区块描述损坏于偏移量0x%lx处，位于%s中。"
 
-#: src/language/data-io/data-reader.c:328
+#: src/language/data-io/data-reader.c:322
 #, c-format
 msgid "Corrupt record descriptor word at offset 0x%lx in %s."
 msgstr "记录描述损坏于偏移量0x%lx处，位于%s中。"
 
-#: src/language/data-io/data-reader.c:341
+#: src/language/data-io/data-reader.c:335
 #, c-format
 msgid "Corrupt record size at offset 0x%lx in %s."
 msgstr "记录大小损坏于偏移量0x%lx处，位于%s中。"
 
-#: src/language/data-io/data-reader.c:499
+#: src/language/data-io/data-reader.c:493
 msgid "Record exceeds remaining block length."
 msgstr "记录超过剩余区块长度。"
 
-#: src/language/data-io/data-reader.c:573
+#: src/language/data-io/data-reader.c:567
 #, c-format
 msgid "Attempt to read beyond end-of-file on file %s."
 msgstr "试图读取超过文件%s的结尾的内容。"
 
-#: src/language/data-io/data-reader.c:576
+#: src/language/data-io/data-reader.c:570
 #, c-format
 msgid "Attempt to read beyond %s."
 msgstr "试图读取超过%s处的内容。"
 
-#: src/language/data-io/data-reader.c:764
-msgid ""
-"This command is not valid here since the current input program does not "
-"access the inline file."
+#: src/language/data-io/data-reader.c:733
+msgid "This command is not valid here since the current input program does not access the inline file."
 msgstr "指令失效，原因是输入程序无读取内联文件权限。"
 
 #: src/language/data-io/data-writer.c:106
@@ -5145,66 +4860,54 @@ msgstr "未命名数据集"
 msgid "(active dataset)"
 msgstr "(活动数据集)"
 
-#: src/language/data-io/get-data.c:150
+#: src/language/data-io/get-data.c:144
 #, c-format
 msgid "Unsupported TYPE %s."
 msgstr "不支持TYPE %s。"
 
-#: src/language/data-io/get-data.c:285
+#: src/language/data-io/get-data.c:291
 msgid "The sheet index must be greater than or equal to 1"
 msgstr "工作表索引必须大于等于1"
 
-#: src/language/data-io/get-data.c:292 src/language/data-io/get-data.c:315
-#: src/language/data-io/get-data.c:334
+#: src/language/data-io/get-data.c:298 src/language/data-io/get-data.c:321
+#: src/language/data-io/get-data.c:340
 #, c-format
 msgid "%s must be followed by either \"%s\" or \"%s\"."
 msgstr "%s后必须接以\"%s\" 或 \"%s\"。"
 
-#: src/language/data-io/get-data.c:364
+#: src/language/data-io/get-data.c:370
 #, c-format
-msgid ""
-"%s is allowed only with %s arrangement, but %s arrangement was stated or "
-"implied earlier in this command."
+msgid "%s is allowed only with %s arrangement, but %s arrangement was stated or implied earlier in this command."
 msgstr "%s仅随%s排列使用，但该命令之前已声明或暗示使用%s排列。"
 
-#: src/language/data-io/get-data.c:446 src/language/data-io/get-data.c:484
-#: src/language/data-io/get-data.c:504
+#: src/language/data-io/get-data.c:452 src/language/data-io/get-data.c:490
 #, c-format
 msgid "Value of %s must be 1 or greater."
 msgstr "%s的值必须大于等于1。"
 
-#: src/language/data-io/get-data.c:516
-#, c-format
-msgid "Value of %s must be between 1 and 100."
-msgstr "%s的值必须处于1到100之间。"
+#: src/language/data-io/get-data.c:515
+msgid "Ignoring obsolete IMPORTCASES subcommand.  (N OF CASES or SAMPLE may be used to substitute.)"
+msgstr "子命令 IMPORTCASES已停用，将被忽略。 （可用 N OF CASES 或 SAMPLE 替代。）"
 
-#: src/language/data-io/get-data.c:567
-msgid ""
-"In compatible syntax mode, the QUALIFIER string must contain exactly one "
-"character."
+#: src/language/data-io/get-data.c:562
+msgid "In compatible syntax mode, the QUALIFIER string must contain exactly one character."
 msgstr "兼容语法模式下，QUALIFIER字串必须包含仅一个字符。"
 
-#: src/language/data-io/get-data.c:599
+#: src/language/data-io/get-data.c:594
 #: src/language/data-io/placement-parser.c:406
 #, c-format
-msgid ""
-"The record number specified, %ld, is at or before the previous record, %d.  "
-"Data fields must be listed in order of increasing record number."
-msgstr ""
-"指定的记录编号%ld占据或居于前一记录%d位置之前。数据字段必须以记录编号的升序方"
-"式列出。"
+msgid "The record number specified, %ld, is at or before the previous record, %d.  Data fields must be listed in order of increasing record number."
+msgstr "指定的记录编号%ld占据或居于前一记录%d位置之前。数据字段必须以记录编号的升序方式列出。"
 
-#: src/language/data-io/get-data.c:608
+#: src/language/data-io/get-data.c:603
 #, c-format
-msgid ""
-"The record number specified, %ld, exceeds the number of records per case "
-"specified on FIXCASE, %d."
+msgid "The record number specified, %ld, exceeds the number of records per case specified on FIXCASE, %d."
 msgstr "指定的记录编号%ld超过FIXCASE指定的个案记录数量%d。"
 
 #: src/language/data-io/get.c:132
 #, c-format
 msgid "%s: Data file dictionary has no variables."
-msgstr ""
+msgstr "%s: 数据文件字典没有变量。"
 
 #: src/language/data-io/inpt-pgm.c:133
 #, c-format
@@ -5221,44 +4924,36 @@ msgid "Input program did not create any variables."
 msgstr "输入程序没有生成任何变量。"
 
 #: src/language/data-io/inpt-pgm.c:365
-msgid ""
-"REREAD: Column numbers must be positive finite numbers.  Column set to 1."
+msgid "REREAD: Column numbers must be positive finite numbers.  Column set to 1."
 msgstr "REREAD：列编号必须为正数。已设为1。"
 
-#: src/language/data-io/list.c:227
+#: src/language/data-io/list.c:223
 #, c-format
-msgid ""
-"The first case (%ld) specified precedes the last case (%ld) specified.  The "
-"values will be swapped."
+msgid "The first case (%ld) specified precedes the last case (%ld) specified.  The values will be swapped."
 msgstr "第一个个案(%ld)先于最后一个个案(%ld)前指定。他们的值将被互换。"
 
-#: src/language/data-io/list.c:236
+#: src/language/data-io/list.c:232
 #, c-format
-msgid ""
-"The first case (%ld) to list is less than 1.  The value is being reset to 1."
-msgstr "要列出的第一个个案(%ld)小于1，将被重设为1。"
+msgid "The first case (%ld) to list is numbered less than 1.  The value is being reset to 1."
+msgstr "要列出的第一个个案(%ld)编号小于1，将被重设为1。"
 
-#: src/language/data-io/list.c:243
+#: src/language/data-io/list.c:239
 #, c-format
-msgid ""
-"The last case (%ld) to list is less than 1.  The value is being reset to 1."
-msgstr "要列出的最后一个个案(%ld)小于1，将被重设为1。"
+msgid "The last case (%ld) to list is numbered less than 1.  The value is being reset to 1."
+msgstr "要列出的最后一个个案(%ld)编号小于1，将被重设为1。"
 
-#: src/language/data-io/list.c:250
+#: src/language/data-io/list.c:246
 #, c-format
 msgid "The step value %ld is less than 1.  The value is being reset to 1."
 msgstr "步长%ld小于1，将被重设为1。"
 
 #: src/language/data-io/placement-parser.c:96
 #, c-format
-msgid ""
-"Number of variables specified (%zu) differs from number of variable formats "
-"(%zu)."
+msgid "Number of variables specified (%zu) differs from number of variable formats (%zu)."
 msgstr "变量数量(%zu)与变量格式数目(%zu)不同。"
 
 #: src/language/data-io/placement-parser.c:106
-msgid ""
-"SPSS-like or Fortran-like format specification expected after variable names."
+msgid "SPSS-like or Fortran-like format specification expected after variable names."
 msgstr "变量名称后要求类SPSS格式或Fortran格式。"
 
 #: src/language/data-io/placement-parser.c:129
@@ -5314,36 +5009,26 @@ msgid "Writing %zu record."
 msgid_plural "Writing %zu records."
 msgstr[0] "写入%zu条记录。"
 
-#: src/language/data-io/save-translate.c:167
-#: src/language/data-io/save-translate.c:182
+#: src/language/data-io/save-translate.c:170
+#: src/language/data-io/save-translate.c:185
 #, c-format
 msgid "The %s string must contain exactly one character."
 msgstr "字符串%s必须包含仅一个字符。"
 
-#: src/language/data-io/save-translate.c:252
+#: src/language/data-io/save-translate.c:253
 #, c-format
 msgid "Output file `%s' exists but %s was not specified."
 msgstr "输出文件`%s'已经存在，但没有指定%s。"
 
 #: src/language/data-io/trim.c:89
 #, c-format
-msgid ""
-"Cannot rename %s as %s because there already exists a variable named %s.  To "
-"rename variables with overlapping names, use a single RENAME subcommand such "
-"as `/RENAME (A=B)(B=C)(C=A)', or equivalently, `/RENAME (A B C=B C A)'."
-msgstr ""
-"不能将变量%s重命名为%s，因为变量%s已经存在。使用RENAME子命令为重复的变量名称"
-"重命名，例如`/RENAME (A=B)(B=C)(C=A)'或`/RENAME (A B C=B C A)'。"
+msgid "Cannot rename %s as %s because there already exists a variable named %s.  To rename variables with overlapping names, use a single RENAME subcommand such as `/RENAME (A=B)(B=C)(C=A)', or equivalently, `/RENAME (A B C=B C A)'."
+msgstr "不能将变量%s重命名为%s，因为变量%s已经存在。使用RENAME子命令为重复的变量名称重命名，例如`/RENAME (A=B)(B=C)(C=A)'或`/RENAME (A B C=B C A)'。"
 
 #: src/language/data-io/trim.c:123
 #, c-format
-msgid ""
-"Number of variables on left side of `=' (%zu) does not match number of "
-"variables on right side (%zu), in parenthesized group %d of RENAME "
-"subcommand."
-msgstr ""
-"`=' (%zu)左边的变量数量与右边变量数量(%zu)不匹配。请检查RENAME子命令括号内的"
-"组%d。"
+msgid "Number of variables on left side of `=' (%zu) does not match number of variables on right side (%zu), in parenthesized group %d of RENAME subcommand."
+msgstr "`=' (%zu)左边的变量数量与右边变量数量(%zu)不匹配。请检查RENAME子命令括号内的组%d。"
 
 #: src/language/data-io/trim.c:136
 #, c-format
@@ -5358,66 +5043,48 @@ msgstr "不能DROP字典的所有变量。"
 msgid "expecting number or string"
 msgstr "要求数字或字符串"
 
-#: src/language/expressions/helpers.c:41
-msgid ""
-"One of the arguments to a DATE function is not an integer.  The result will "
-"be system-missing."
+#: src/language/expressions/helpers.c:43
+msgid "One of the arguments to a DATE function is not an integer.  The result will be system-missing."
 msgstr "DATE函数的一个参数不是整数，结果将返回系统缺失值。"
 
-#: src/language/expressions/helpers.c:69
-msgid ""
-"The week argument to DATE.WKYR is not an integer.  The result will be system-"
-"missing."
+#: src/language/expressions/helpers.c:71
+msgid "The week argument to DATE.WKYR is not an integer.  The result will be system-missing."
 msgstr "DATE.WKYR的星期参数不是整数，返回值将为系统缺失值。"
 
-#: src/language/expressions/helpers.c:75
-msgid ""
-"The week argument to DATE.WKYR is outside the acceptable range of 1 to 53.  "
-"The result will be system-missing."
+#: src/language/expressions/helpers.c:77
+msgid "The week argument to DATE.WKYR is outside the acceptable range of 1 to 53.  The result will be system-missing."
 msgstr "DATE.WKYR的星期参数超出可接收范围1~53，返回值将为系统缺失值。"
 
-#: src/language/expressions/helpers.c:97
-msgid ""
-"The day argument to DATE.YRDAY is not an integer.  The result will be system-"
-"missing."
+#: src/language/expressions/helpers.c:99
+msgid "The day argument to DATE.YRDAY is not an integer.  The result will be system-missing."
 msgstr "DATE.YRDAY的天数参数不是整数，返回值将为系统缺失值。"
 
-#: src/language/expressions/helpers.c:103
-msgid ""
-"The day argument to DATE.YRDAY is outside the acceptable range of 1 to 366.  "
-"The result will be system-missing."
+#: src/language/expressions/helpers.c:105
+msgid "The day argument to DATE.YRDAY is outside the acceptable range of 1 to 366.  The result will be system-missing."
 msgstr "DATE.YRDAY的天数参数超出范围1~366之外，返回值将为系统缺失值。"
 
-#: src/language/expressions/helpers.c:125
-msgid ""
-"The year argument to YRMODA is greater than 47516.  The result will be "
-"system-missing."
+#: src/language/expressions/helpers.c:127
+msgid "The year argument to YRMODA is greater than 47516.  The result will be system-missing."
 msgstr "DATE.YRDAY的年数参数大于47516，返回值将为系统缺失值。"
 
-#: src/language/expressions/helpers.c:178
+#: src/language/expressions/helpers.c:180
 #, c-format
-msgid ""
-"Unrecognized date unit `%.*s'.  Valid date units are `%s', `%s', `%s', `%s', "
-"`%s', `%s', `%s', and `%s'."
-msgstr ""
-"时期单位`%.*s'无法识别。有效的时期单位为`%s', `%s', `%s', `%s', `%s', `%s', `"
-"%s' 和 `%s'。"
+msgid "Unrecognized date unit `%.*s'.  Valid date units are `%s', `%s', `%s', `%s', `%s', `%s', `%s', and `%s'."
+msgstr "时期单位`%.*s'无法识别。有效的时期单位为`%s', `%s', `%s', `%s', `%s', `%s', `%s' 和 `%s'。"
 
-#: src/language/expressions/helpers.c:331
+#: src/language/expressions/helpers.c:333
 #, c-format
 msgid "Invalid DATESUM method.  Valid choices are `%s' and `%s'."
 msgstr "DATESUM方法无效。有效选项为`%s' 和 `%s'。"
 
 #: src/language/expressions/parse.c:261
 #, c-format
-msgid ""
-"Type mismatch: expression has %s type, but a numeric value is required here."
+msgid "Type mismatch: expression has %s type, but a numeric value is required here."
 msgstr "类型不匹配：表达式含%s类型，但该处要求数值型。"
 
 #: src/language/expressions/parse.c:274
 #, c-format
-msgid ""
-"Type mismatch: expression has %s type, but a string value is required here."
+msgid "Type mismatch: expression has %s type, but a string value is required here."
 msgstr "类型不匹配：表达式含%s类型，但该处要求字符串。"
 
 #: src/language/expressions/parse.c:436
@@ -5426,25 +5093,12 @@ msgid "Type mismatch while applying %s operator: cannot convert %s to %s."
 msgstr "执行%s操作时类型不匹配：不能将%s转换为%s。"
 
 #: src/language/expressions/parse.c:650
-msgid ""
-"Chaining relational operators (e.g. `a < b < c') will not produce the "
-"mathematically expected result.  Use the AND logical operator to fix the "
-"problem (e.g. `a < b AND b < c').  If chaining is really intended, "
-"parentheses will disable this warning (e.g. `(a < b) < c'.)"
-msgstr ""
-"连锁运算(例如：`a < b < c')可能产生与预期不同的结果。使用逻辑运算符AND解决该"
-"问题(例如：`a < b AND b < c)。若仍要进行连锁运算，使用括号以消除本警告信息"
-"(如：`(a < b) < c')。"
+msgid "Chaining relational operators (e.g. `a < b < c') will not produce the mathematically expected result.  Use the AND logical operator to fix the problem (e.g. `a < b AND b < c').  If chaining is really intended, parentheses will disable this warning (e.g. `(a < b) < c'.)"
+msgstr "连锁运算(例如：`a < b < c')可能产生与预期不同的结果。使用逻辑运算符AND解决该问题(例如：`a < b AND b < c)。若仍要进行连锁运算，使用括号以消除本警告信息(如：`(a < b) < c')。"
 
 #: src/language/expressions/parse.c:752
-msgid ""
-"The exponentiation operator (`**') is left-associative, even though right-"
-"associative semantics are more useful.  That is, `a**b**c' equals "
-"`(a**b)**c', not as `a**(b**c)'.  To disable this warning, insert "
-"parentheses."
-msgstr ""
-"指数运算符(`**')为向左结合运算符。意味着`a**b**c'=`(a**b)**c'，而是不"
-"`a**(b**c)'。请使用括号以使本警告信息不再出现。"
+msgid "The exponentiation operator (`**') is left-associative, even though right-associative semantics are more useful.  That is, `a**b**c' equals `(a**b)**c', not as `a**(b**c)'.  To disable this warning, insert parentheses."
+msgstr "指数运算符(`**')为向左结合运算符。意味着`a**b**c'=`(a**b)**c'，而是不`a**(b**c)'。请使用括号以使本警告信息不再出现。"
 
 #: src/language/expressions/parse.c:832
 #, c-format
@@ -5483,9 +5137,7 @@ msgstr "%s要求至少%d个有效参数。"
 
 #: src/language/expressions/parse.c:1139
 #, c-format
-msgid ""
-"With %s, using minimum valid argument count of %d does not make sense when "
-"passing only %d arguments in list."
+msgid "With %s, using minimum valid argument count of %d does not make sense when passing only %d arguments in list."
 msgstr "对%s而言，使用最小有效参数数量%d无意义，因为仅传递了%d个参数。"
 
 #: src/language/expressions/parse.c:1193
@@ -5551,115 +5203,115 @@ msgstr "无法初始化膨胀因子：%s"
 msgid "Error inflating: %s"
 msgstr "膨胀处理出错：%s"
 
-#: src/libpspp/i18n.c:1027
+#: src/libpspp/i18n.c:1106
 msgid "Arabic"
 msgstr "阿拉伯语"
 
-#: src/libpspp/i18n.c:1029
+#: src/libpspp/i18n.c:1108
 msgid "Armenian"
 msgstr "亚美尼亚语"
 
-#: src/libpspp/i18n.c:1030
+#: src/libpspp/i18n.c:1109
 msgid "Baltic"
 msgstr "波罗的语"
 
-#: src/libpspp/i18n.c:1032
+#: src/libpspp/i18n.c:1111
 msgid "Celtic"
 msgstr "凯尔特语"
 
-#: src/libpspp/i18n.c:1033
+#: src/libpspp/i18n.c:1112
 msgid "Central European"
 msgstr "中欧"
 
-#: src/libpspp/i18n.c:1035
+#: src/libpspp/i18n.c:1114
 msgid "Chinese Simplified"
 msgstr "简体中文"
 
-#: src/libpspp/i18n.c:1037
+#: src/libpspp/i18n.c:1116
 msgid "Chinese Traditional"
 msgstr "繁体中文"
 
-#: src/libpspp/i18n.c:1039
+#: src/libpspp/i18n.c:1118
 msgid "Croatian"
 msgstr "克罗地亚语"
 
-#: src/libpspp/i18n.c:1040
+#: src/libpspp/i18n.c:1119
 msgid "Cyrillic"
 msgstr "西里尔语"
 
-#: src/libpspp/i18n.c:1042
+#: src/libpspp/i18n.c:1121
 msgid "Cyrillic/Russian"
 msgstr "西里尔/俄语"
 
-#: src/libpspp/i18n.c:1043
+#: src/libpspp/i18n.c:1122
 msgid "Cyrillic/Ukrainian"
 msgstr "西里尔/乌克兰语"
 
-#: src/libpspp/i18n.c:1045
+#: src/libpspp/i18n.c:1124
 msgid "Georgian"
 msgstr "格鲁吉亚语"
 
-#: src/libpspp/i18n.c:1046
+#: src/libpspp/i18n.c:1125
 msgid "Greek"
 msgstr "希腊语"
 
-#: src/libpspp/i18n.c:1047
+#: src/libpspp/i18n.c:1126
 msgid "Gujarati"
 msgstr "古吉拉特文"
 
-#: src/libpspp/i18n.c:1048
+#: src/libpspp/i18n.c:1127
 msgid "Gurmukhi"
 msgstr "古木基文"
 
-#: src/libpspp/i18n.c:1049
+#: src/libpspp/i18n.c:1128
 msgid "Hebrew"
 msgstr "希伯来语"
 
-#: src/libpspp/i18n.c:1051
+#: src/libpspp/i18n.c:1130
 msgid "Hebrew Visual"
 msgstr "希伯来符号"
 
-#: src/libpspp/i18n.c:1052
+#: src/libpspp/i18n.c:1131
 msgid "Hindi"
 msgstr "印地语"
 
-#: src/libpspp/i18n.c:1053
+#: src/libpspp/i18n.c:1132
 msgid "Icelandic"
 msgstr "冰岛语"
 
-#: src/libpspp/i18n.c:1054
+#: src/libpspp/i18n.c:1133
 msgid "Japanese"
 msgstr "日语"
 
-#: src/libpspp/i18n.c:1056
+#: src/libpspp/i18n.c:1135
 msgid "Korean"
 msgstr "韩语"
 
-#: src/libpspp/i18n.c:1058
+#: src/libpspp/i18n.c:1137
 msgid "Nordic"
 msgstr "挪威语"
 
-#: src/libpspp/i18n.c:1059
+#: src/libpspp/i18n.c:1138
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: src/libpspp/i18n.c:1061
+#: src/libpspp/i18n.c:1140
 msgid "South European"
 msgstr "南欧"
 
-#: src/libpspp/i18n.c:1062
+#: src/libpspp/i18n.c:1141
 msgid "Thai"
 msgstr "泰文"
 
-#: src/libpspp/i18n.c:1064
+#: src/libpspp/i18n.c:1143
 msgid "Turkish"
 msgstr "土耳其语"
 
-#: src/libpspp/i18n.c:1066
+#: src/libpspp/i18n.c:1145
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: src/libpspp/i18n.c:1068
+#: src/libpspp/i18n.c:1147
 msgid "Western European"
 msgstr "西欧"
 
@@ -5726,9 +5378,7 @@ msgstr "头端查询失败`%s': %s"
 
 #: src/libpspp/zip-reader.c:456
 #, c-format
-msgid ""
-"Name mismatch in zip archive. Central directory says `%s'; local file header "
-"says `%s'"
+msgid "Name mismatch in zip archive. Central directory says `%s'; local file header says `%s'"
 msgstr "zip文档名称不匹配，中央目录上为`%s'，而本地文件头上显示为`%s'"
 
 #: src/libpspp/zip-writer.c:96
@@ -5772,9 +5422,8 @@ msgstr "%s：写入失败"
 msgid "%%.%dlf&#215;10<sup>%d</sup>"
 msgstr "%%.%dlf&#215;10<sup>%d</sup>"
 
-#: src/math/histogram.c:136
-msgid ""
-"Not creating histogram because the data contains less than 2 distinct values"
+#: src/math/histogram.c:145
+msgid "Not creating histogram because the data contains less than 2 distinct values"
 msgstr "数据含有少于两个不同值，不绘制直方图"
 
 #: src/math/percentiles.c:36
@@ -5804,12 +5453,8 @@ msgstr "%s: %s必须为正整数或`auto'"
 
 #: src/output/ascii.c:365
 #, c-format
-msgid ""
-"ascii: page excluding margins and headers must be at least %d characters "
-"wide by %d lines long, but as configured is only %d characters by %d lines"
-msgstr ""
-"ascii: 去除边距和文件头的页面宽度至少为%d字符，行数至少为%d，但设置宽度却为%d"
-"字符、行数为%d行"
+msgid "ascii: page excluding margins and headers must be at least %d characters wide by %d lines long, but as configured is only %d characters by %d lines"
+msgstr "ascii: 去除边距和文件头的页面宽度至少为%d字符，行数至少为%d，但设置宽度却为%d字符、行数为%d行"
 
 #: src/output/ascii.c:413
 #, c-format
@@ -5841,12 +5486,12 @@ msgstr "*缺少值*"
 msgid "error opening output file `%s'"
 msgstr "打开输出文件出错`%s'"
 
-#: src/output/driver.c:374
+#: src/output/driver.c:377
 #, c-format
 msgid "%s is not a valid device type (the choices are `%s' and `%s')"
 msgstr "%s不是有效设备类型(可选`%s' 及 `%s')"
 
-#: src/output/driver.c:388
+#: src/output/driver.c:391
 #, c-format
 msgid "%s: unknown option `%s'"
 msgstr "%s: 未知选项 `%s'"
@@ -5891,8 +5536,8 @@ msgstr "读取文件`%s'出错"
 
 #: src/output/measure.c:279
 #, c-format
-msgid "paper size file `%s' does not state a paper size"
-msgstr "纸张大小文件`%s'没有设置纸张大小"
+msgid "file `%s' does not state a paper size"
+msgstr "文件`%s'没有设置纸张大小"
 
 #: src/output/options.c:112
 #, c-format
@@ -5938,9 +5583,9 @@ msgstr "%s: `%s' 是 `%s'，但要求文件包含`#'"
 #. reads from right to left (eg Persian, Arabic, Hebrew etc), then replace
 #. this string with "output-direction-rtl".  Otherwise either leave it
 #. untranslated or copy it verbatim.
-#: src/output/render.c:979
+#: src/output/render.c:976
 msgid "output-direction-ltr"
-msgstr ""
+msgstr "output-direction-ltr"
 
 #: src/output/tab.c:240
 #, c-format
@@ -5954,10 +5599,8 @@ msgstr "hline错误：x=(%d+%d=%d,%d+%d=%d) y=%d+%d=%d，位于表格大小(%d,%
 
 #: src/output/tab.c:322
 #, c-format
-msgid ""
-"bad box: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n"
-msgstr ""
-"box错误: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d)，位于表格大小(%d,%d)中\n"
+msgid "bad box: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n"
+msgstr "box错误: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d)，位于表格大小(%d,%d)中\n"
 
 #: src/output/cairo.c:238
 #, c-format
@@ -5971,16 +5614,12 @@ msgstr "打开输出文件错误`%s': %s"
 
 #: src/output/cairo.c:453
 #, c-format
-msgid ""
-"The defined page is not wide enough to hold at least %d characters in the "
-"default font.  In fact, there's only room for %d characters."
+msgid "The defined page is not wide enough to hold at least %d characters in the default font.  In fact, there's only room for %d characters."
 msgstr "指定的页面宽度不足容纳默认字体的至少%d个字符，仅能容纳%d个字符。"
 
 #: src/output/cairo.c:463
 #, c-format
-msgid ""
-"The defined page is not long enough to hold at least %d lines in the default "
-"font.  In fact, there's only room for %d lines."
+msgid "The defined page is not long enough to hold at least %d lines in the default font.  In fact, there's only room for %d lines."
 msgstr "指定的页面不足容纳默认字体的至少%d行，仅能容纳%d行。"
 
 #: src/output/cairo.c:520
@@ -5988,7 +5627,7 @@ msgstr "指定的页面不足容纳默认字体的至少%d行，仅能容纳%d
 msgid "error drawing output for %s driver: %s"
 msgstr "为驱动%s创建输出时出错：%s"
 
-#: src/output/cairo.c:1467
+#: src/output/cairo.c:1468
 #, c-format
 msgid "error writing output file `%s': %s"
 msgstr "写入输入文件`%s'出错: %s"
@@ -6087,9 +5726,7 @@ msgid "Error encountered while ERROR=STOP is effective."
 msgstr "设定了ERROR=STOP，有错误发生。"
 
 #: src/ui/terminal/main.c:152
-msgid ""
-"Stopping syntax file processing here to avoid a cascade of dependent command "
-"failures."
+msgid "Stopping syntax file processing here to avoid a cascade of dependent command failures."
 msgstr "停止语法文件处理以避免相关指令产生连锁错误。"
 
 #: src/ui/terminal/terminal-opts.c:124
@@ -6179,65 +5816,153 @@ msgstr ""
 msgid "could not access definition for terminal `%s'"
 msgstr "无法访问终端`%s'的定义设置"
 
-#: src/ui/gui/psppire-button-editable.c:135
-msgid "TreeView path"
-msgstr "树视图路径"
+#: src/ui/gui/psppire-import-assistant.c:535
+#, c-format
+msgid "Could not open `%s'"
+msgstr "无法打开`%s'"
 
-#: src/ui/gui/psppire-button-editable.c:136
-msgid "The path to the row in the GtkTreeView, as a string"
-msgstr "到GtkTreeView行的路径，类型为字符串"
+#: src/ui/gui/psppire-import-assistant.c:550
+#, c-format
+msgid "Error reading `%s': %s"
+msgstr "读取`%s'时出错: %s"
 
-#: src/ui/gui/psppire-cell-renderer-button.c:508
-msgid "Diagonal slash"
-msgstr "对角斜线"
+#: src/ui/gui/psppire-import-assistant.c:553
+#, c-format
+msgid "Failed to read `%s', because it contains a line over %d bytes long and therefore appears not to be a text file."
+msgstr "读取`%s'失败，文件可能不是一个文本文件，因其中包含一行长度超过%d字节。"
 
-#: src/ui/gui/psppire-cell-renderer-button.c:509
-msgid "Whether to draw a diagonal slash across the button."
-msgstr "是否在按钮上绘制对角斜线。"
+#: src/ui/gui/psppire-import-assistant.c:570
+#, c-format
+msgid "`%s' is empty."
+msgstr "`%s'为空。"
 
-#: src/ui/gui/autorecode-dialog.c:292 src/ui/gui/recode-dialog.c:659
-#: src/ui/gui/recode-dialog.c:744
-msgid "New"
-msgstr "新"
+#: src/ui/gui/psppire-import-assistant.c:652
+msgid "Line"
+msgstr "行"
 
-#: src/ui/gui/autorecode-dialog.c:306 src/ui/gui/recode-dialog.c:674
-#: src/ui/gui/recode-dialog.c:736
-msgid "Old"
-msgstr "旧"
+#: src/ui/gui/psppire-import-assistant.c:746
+msgid "Importing Spreadsheet Data"
+msgstr "从工作表导入数据"
 
-#: src/ui/gui/aggregate-dialog.c:155
-msgid "Aggregate destination file"
-msgstr "汇总的目标文件"
+#: src/ui/gui/psppire-import-assistant.c:853
+#: src/ui/gui/psppire-data-window.c:512 src/ui/gui/psppire-syntax-window.c:581
+#: src/ui/gui/psppire-window.c:684
+msgid "All Files"
+msgstr "所有文件"
 
-#: src/ui/gui/aggregate-dialog.c:159 src/ui/gui/psppire-data-window.c:493
-#: src/ui/gui/psppire-data-window.c:497 src/ui/gui/psppire-output-window.c:356
-#: src/ui/gui/psppire-syntax-window.c:569 src/ui/gui/psppire-window.c:527
-#: src/ui/gui/aggregate.ui:450
-msgid "Save"
-msgstr "保存"
+#: src/ui/gui/psppire-import-assistant.c:858
+msgid "Text Files"
+msgstr "文本文件"
 
-#: src/ui/gui/aggregate-dialog.c:168 src/ui/gui/psppire-data-window.c:503
-msgid "System Files (*.sav)"
-msgstr "系统文件(*.sav)"
+#: src/ui/gui/psppire-import-assistant.c:863
+msgid "Text (*.txt) Files"
+msgstr "文本文件(*.txt)"
 
-#: src/ui/gui/aggregate-dialog.c:173 src/ui/gui/psppire-data-window.c:508
-msgid "Compressed System Files (*.zsav)"
-msgstr "压缩系统文件(*.zsav)"
+#: src/ui/gui/psppire-import-assistant.c:869
+msgid "Plain Text (ASCII) Files"
+msgstr "纯文本(ASCII)文件"
 
-#: src/ui/gui/aggregate-dialog.c:178 src/ui/gui/psppire-data-window.c:513
-#: src/ui/gui/psppire-window.c:723
-msgid "Portable Files (*.por) "
-msgstr "便携格式文件(*.por)"
+#: src/ui/gui/psppire-import-assistant.c:874
+msgid "Comma Separated Value Files"
+msgstr "逗号分隔值文件"
+
+#: src/ui/gui/psppire-import-assistant.c:881
+msgid "Tab Separated Value Files"
+msgstr "制表符分隔值的文件"
+
+#: src/ui/gui/psppire-import-assistant.c:886
+msgid "Gnumeric Spreadsheet Files"
+msgstr "Gnumeric工作表文件"
 
-#: src/ui/gui/comments-dialog.c:57
+#: src/ui/gui/psppire-import-assistant.c:891
+msgid "OpenDocument Spreadsheet Files"
+msgstr "OpenDocument工作表文件"
+
+#: src/ui/gui/psppire-import-assistant.c:896
+msgid "All Spreadsheet Files"
+msgstr "所有工作表文件"
+
+#: src/ui/gui/psppire-import-assistant.c:905
+msgid "Select File to Import"
+msgstr "选择文件以导入"
+
+#: src/ui/gui/psppire-import-assistant.c:949
+msgid "Importing Delimited Text Data"
+msgstr "导入分隔符分隔的文本数据"
+
+#: src/ui/gui/psppire-import-assistant.c:1116
+msgid "Select the First Line"
+msgstr "选择第一行"
+
+#: src/ui/gui/psppire-import-assistant.c:1150
+msgid ""
+"This assistant will guide you through the process of importing data into PSPP from a text file with one line per case,  in which fields are separated by tabs, commas, or other delimiters.\n"
+"\n"
+msgstr ""
+"本帮助将指导从文本文件中导入数据到PSPP，每次导入一行作为一个个案，行中字段以制表符、逗号或其他分隔符隔开。\n"
+"\n"
+
+#: src/ui/gui/psppire-import-assistant.c:1158
 #, c-format
-msgid "Column Number: %d"
-msgstr "列编号：%d"
+msgid "The selected file contains %'lu line of text.  "
+msgid_plural "The selected file contains %'lu lines of text.  "
+msgstr[0] "选中的文件含有%'lu行文本。"
+
+#: src/ui/gui/psppire-import-assistant.c:1167
+#, c-format
+msgid "The selected file contains approximately %'lu line of text.  "
+msgid_plural "The selected file contains approximately %'lu lines of text.  "
+msgstr[0] "选中的文件约含有%'lu行文本。"
+
+#: src/ui/gui/psppire-import-assistant.c:1173
+#, c-format
+msgid "Only the first %zu line of the file will be shown for preview purposes in the following screens.  "
+msgid_plural "Only the first %zu lines of the file will be shown for preview purposes in the following screens.  "
+msgstr[0] "接下来预览显示仅显示文件最开始的%zu行。"
+
+#: src/ui/gui/psppire-import-assistant.c:1181
+msgid "You may choose below how much of the file should actually be imported."
+msgstr "您可在下面选择导入多少文件内容。"
+
+#: src/ui/gui/psppire-import-assistant.c:1198
+#, c-format
+msgid "Only the first %4d cases"
+msgstr "仅前%4d个个案"
+
+#: src/ui/gui/psppire-import-assistant.c:1214
+#, c-format
+msgid "Only the first %3d %% of file (approximately)"
+msgstr "仅文件的前%3d %%(约数)"
+
+#: src/ui/gui/psppire-import-assistant.c:1237
+msgid "Select the Lines to Import"
+msgstr "选择数据行以导入"
+
+#: src/ui/gui/psppire-import-assistant.c:1371
+#, c-format
+msgid "Cannot parse field content `%.*s' as format %s: %s"
+msgstr "不能将字段内容`%.*s' 解析为格式 %s: %s"
+
+#: src/ui/gui/psppire-import-assistant.c:1380
+#: src/ui/gui/psppire-import-assistant.c:1487
+msgid "This input line has too few separators to fill in this field."
+msgstr "输入行的分隔数过少不足以分隔字段。"
+
+#: src/ui/gui/psppire-import-assistant.c:1881
+msgid "Choose Separators"
+msgstr "选择分隔符"
+
+#: src/ui/gui/psppire-import-assistant.c:2106
+msgid "An error occurred reading the spreadsheet file."
+msgstr "读取工作表文件时发生错误。"
+
+#: src/ui/gui/psppire-import-assistant.c:2161
+msgid "Adjust Variable Formats"
+msgstr "调整变量格式"
 
 #: src/ui/gui/find-dialog.c:197
-#, fuzzy
 msgid "Find"
-msgstr "查找(_F)"
+msgstr "查找"
 
 #: src/ui/gui/find-dialog.c:649
 #, c-format
@@ -6256,9 +5981,7 @@ msgstr "贵州师范大学生命科学学院选修Shulin Yang讲授的《生物
 
 #: src/ui/gui/help-menu.c:101
 #, c-format
-msgid ""
-"Cannot open reference manual: %s.  The PSPP user manual is also available at "
-"%s"
+msgid "Cannot open reference manual: %s.  The PSPP user manual is also available at %s"
 msgstr "无法打开使用手册：%s。PSPP用户手册还可以由%s得到。"
 
 #: src/ui/gui/help-menu.c:120
@@ -6267,7 +5990,7 @@ msgstr "帮助(_H)"
 
 #: src/ui/gui/help-menu.c:123
 msgid "_About"
-msgstr ""
+msgstr "关于(_A)"
 
 #: src/ui/gui/help-menu.c:124
 msgid "_Reference Manual"
@@ -6276,8 +5999,7 @@ msgstr "使用手册(_R)"
 #: src/ui/gui/main.c:96
 #, c-format
 msgid ""
-"PSPPIRE, a GUI for PSPP, a program for statistical analysis of sampled "
-"data.\n"
+"PSPPIRE, a GUI for PSPP, a program for statistical analysis of sampled data.\n"
 "Usage: %s [OPTION]... FILE\n"
 "\n"
 "Arguments to long options also apply to equivalent short options.\n"
@@ -6301,8 +6023,7 @@ msgid ""
 "  -h, --help                display this help and exit\n"
 "  -V, --version             output version information and exit\n"
 "\n"
-"A non-option argument is interpreted as a data file in .sav or .zsav or ."
-"por\n"
+"A non-option argument is interpreted as a data file in .sav or .zsav or .por\n"
 "format or a syntax file to load.\n"
 msgstr ""
 "PSPPIRE, 数据统计分析软件PSPP的图形界面。\n"
@@ -6328,28 +6049,25 @@ msgstr ""
 "  -h, --help                显示帮助后退出\n"
 "  -V, --version             显示版本信息后退出\n"
 "\n"
-"不带任何参数则程序启动运行以备载入.sav、.zsav或.por格式的数据文件或语法文"
-"件。\n"
+"不带任何参数则程序启动运行以备载入.sav、.zsav或.por格式的数据文件或语法文件。\n"
 
 #: src/ui/gui/missing-val-dialog.c:214
-msgid ""
-"The maximum length of a missing value for a string variable is 8 in UTF-8."
-msgstr ""
+msgid "The maximum length of a missing value for a string variable is 8 in UTF-8."
+msgstr "UTF-8编码下字串变量缺失值的最大长度为8。"
 
 #: src/ui/gui/missing-val-dialog.c:265
-#, fuzzy
 msgid "At least one value must be specified"
-msgstr "è\87³å°\91æ\8c\87å®\9aä¸\80个å\8f\98é\87\8f。"
+msgstr "è\87³å°\91æ\8c\87å®\9aä¸\80个å\80¼。"
 
 #: src/ui/gui/missing-val-dialog.c:295
 msgid "Incorrect range specification"
 msgstr "指定的区域不正确"
 
-#: src/ui/gui/psppire.c:317
+#: src/ui/gui/psppire.c:316
 msgid "_Reset"
 msgstr "重置(_R)"
 
-#: src/ui/gui/psppire.c:318
+#: src/ui/gui/psppire.c:317
 msgid "_Select"
 msgstr "选择(_S)"
 
@@ -6389,86 +6107,123 @@ msgstr "个案"
 msgid "var"
 msgstr "var"
 
-#: src/ui/gui/psppire-data-window.c:175
+#: src/ui/gui/psppire-data-window.c:169
 msgid "Transformations Pending"
 msgstr "转换未完成"
 
-#: src/ui/gui/psppire-data-window.c:191
+#: src/ui/gui/psppire-data-window.c:185
 msgid "Filter off"
 msgstr "过滤器关闭"
 
-#: src/ui/gui/psppire-data-window.c:203
+#: src/ui/gui/psppire-data-window.c:197
 #, c-format
 msgid "Filter by %s"
 msgstr "通过%s过滤"
 
-#: src/ui/gui/psppire-data-window.c:224
+#: src/ui/gui/psppire-data-window.c:218
 msgid "No Split"
 msgstr "不拆分"
 
-#: src/ui/gui/psppire-data-window.c:233
+#: src/ui/gui/psppire-data-window.c:227
 msgid "Split by "
 msgstr "拆分依据"
 
-#: src/ui/gui/psppire-data-window.c:261
+#: src/ui/gui/psppire-data-window.c:255
 msgid "Weights off"
 msgstr "无权重"
 
-#: src/ui/gui/psppire-data-window.c:273
+#: src/ui/gui/psppire-data-window.c:267
 #, c-format
 msgid "Weight by %s"
 msgstr "通过%s加权"
 
-#: src/ui/gui/psppire-data-window.c:518 src/ui/gui/psppire-syntax-window.c:581
-#: src/ui/gui/psppire-window.c:734 src/ui/gui/page-file.c:259
-msgid "All Files"
-msgstr "所有文件"
+#: src/ui/gui/psppire-data-window.c:487 src/ui/gui/psppire-data-window.c:491
+#: src/ui/gui/psppire-dialog-action-aggregate.c:217
+#: src/ui/gui/psppire-output-window.c:357
+#: src/ui/gui/psppire-syntax-window.c:569 src/ui/gui/psppire-window.c:477
+#: src/ui/gui/aggregate.ui:549
+msgid "Save"
+msgstr "保存"
+
+#: src/ui/gui/psppire-data-window.c:497
+#: src/ui/gui/psppire-dialog-action-aggregate.c:226
+msgid "System Files (*.sav)"
+msgstr "系统文件(*.sav)"
+
+#: src/ui/gui/psppire-data-window.c:502
+#: src/ui/gui/psppire-dialog-action-aggregate.c:231
+msgid "Compressed System Files (*.zsav)"
+msgstr "压缩系统文件(*.zsav)"
 
-#: src/ui/gui/psppire-data-window.c:535
+#: src/ui/gui/psppire-data-window.c:507
+#: src/ui/gui/psppire-dialog-action-aggregate.c:236
+#: src/ui/gui/psppire-window.c:673
+msgid "Portable Files (*.por) "
+msgstr "便携格式文件(*.por)"
+
+#: src/ui/gui/psppire-data-window.c:529
 msgid "System File"
 msgstr "系统文件"
 
-#: src/ui/gui/psppire-data-window.c:542
+#: src/ui/gui/psppire-data-window.c:536
 msgid "Compressed System File"
 msgstr "压缩过的系统文件"
 
-#: src/ui/gui/psppire-data-window.c:548
+#: src/ui/gui/psppire-data-window.c:542
 msgid "Portable File"
 msgstr "便携格式文件"
 
-#: src/ui/gui/psppire-data-window.c:551
+#: src/ui/gui/psppire-data-window.c:545
 msgid "Format:"
 msgstr "格式："
 
-#: src/ui/gui/psppire-data-window.c:615
+#: src/ui/gui/psppire-data-window.c:609
 msgid "Delete Existing Dataset?"
 msgstr "删除现存数据集？"
 
-#: src/ui/gui/psppire-data-window.c:619
+#: src/ui/gui/psppire-data-window.c:613
 #, c-format
-msgid ""
-"Renaming \"%s\" to \"%s\" will destroy the existing dataset named \"%s\".  "
-"Are you sure that you want to do this?"
+msgid "Renaming \"%s\" to \"%s\" will destroy the existing dataset named \"%s\".  Are you sure that you want to do this?"
 msgstr "将\"%s\" 重命名为 \"%s\"将破坏已有数据集\"%s\"。是否继续？"
 
-#: src/ui/gui/psppire-data-window.c:625
-#, fuzzy
+#: src/ui/gui/psppire-data-window.c:619
 msgid "Delete"
-msgstr "å·²å\88 é\99¤"
+msgstr "删除"
 
-#: src/ui/gui/psppire-data-window.c:647
+#: src/ui/gui/psppire-data-window.c:641
 #, c-format
 msgid "Please enter a new name for dataset \"%s\":"
 msgstr "请给数据集\"%s\"输入新名称："
 
-#: src/ui/gui/psppire-data-window.c:649
+#: src/ui/gui/psppire-data-window.c:643
 msgid "Rename Dataset"
 msgstr "重命名数据集"
 
-#: src/ui/gui/psppire-data-window.c:1294
+#: src/ui/gui/psppire-data-window.c:1301
 msgid "Data Editor"
 msgstr "数据编辑器"
 
+#: src/ui/gui/psppire-dialog-action-aggregate.c:213
+msgid "Aggregate destination file"
+msgstr "汇总的目标文件"
+
+#: src/ui/gui/psppire-dialog-action-autorecode.c:343
+#: src/ui/gui/psppire-dialog-action-recode.c:726
+#: src/ui/gui/psppire-dialog-action-recode.c:808
+msgid "New"
+msgstr "新"
+
+#: src/ui/gui/psppire-dialog-action-autorecode.c:357
+#: src/ui/gui/psppire-dialog-action-recode.c:741
+#: src/ui/gui/psppire-dialog-action-recode.c:800
+msgid "Old"
+msgstr "旧"
+
+#: src/ui/gui/psppire-dialog-action-comments.c:142
+#, c-format
+msgid "Column Number: %d"
+msgstr "列编号：%d"
+
 #: src/ui/gui/psppire-dialog-action-crosstabs.c:71
 msgid "Chisq"
 msgstr "Chisq"
@@ -6576,6 +6331,22 @@ msgstr "选项(_O)..."
 msgid "Paired Samples T Test"
 msgstr "成对样本T检验"
 
+#: src/ui/gui/psppire-dialog-action-recode.c:545
+msgid "Recode into Different Variables: Old and New Values "
+msgstr "重编码到其他变量：旧、新值"
+
+#: src/ui/gui/psppire-dialog-action-recode.c:546
+msgid "Recode into Same Variables: Old and New Values"
+msgstr "重编码到变量自身：旧、新值"
+
+#: src/ui/gui/psppire-dialog-action-recode.c:713
+msgid "Recode into Different Variables"
+msgstr "重编码到其他变量"
+
+#: src/ui/gui/psppire-dialog-action-recode.c:716 src/ui/gui/recode.ui:373
+msgid "Recode into Same Variables"
+msgstr "重编码为到变量自身"
+
 #: src/ui/gui/psppire-dialog-action-regression.c:40
 msgid "Coeff"
 msgstr "系数"
@@ -6612,6 +6383,21 @@ msgstr "Bcov"
 msgid "Show the variance coefficient matrix"
 msgstr "显示方差系数矩阵"
 
+#: src/ui/gui/psppire-dialog-action-select.c:88
+#, c-format
+msgid "Approximately %3d%% of all cases."
+msgstr "大约所有个案中的%3d%%。"
+
+#: src/ui/gui/psppire-dialog-action-select.c:89
+#, c-format
+msgid "Exactly %3d cases from the first %3d cases."
+msgstr "正好%3d个个案取于前%3d个个案内。"
+
+#: src/ui/gui/psppire-dialog-action-select.c:236
+#, c-format
+msgid "%d thru %d"
+msgstr "%d到%d"
+
 #: src/ui/gui/psppire-dialog-action-two-sample.c:186
 #: src/ui/gui/k-related.ui:181
 msgid "Test Type"
@@ -6633,6 +6419,16 @@ msgstr "_McNemar"
 msgid "Two-Related-Samples Tests"
 msgstr "两个相关样本的检验"
 
+#: src/ui/gui/psppire-dialog-action-weight.c:74 src/ui/gui/weight.ui:67
+#: src/ui/gui/weight.ui:195
+msgid "Do not weight cases"
+msgstr "不对个案加权"
+
+#: src/ui/gui/psppire-dialog-action-weight.c:80
+#, c-format
+msgid "Weight cases by %s"
+msgstr "通过%s加权个案"
+
 #. TRANSLATORS: This string must be a valid variable name.  That means:
 #. - The string must be at most 64 bytes (not characters) long.
 #. - The string may not contain whitespace.
@@ -6668,11 +6464,11 @@ msgstr "层%d，位于%d内"
 
 #: src/ui/gui/psppire-means-layer.c:169
 msgid "Forward"
-msgstr ""
+msgstr "下一步"
 
 #: src/ui/gui/psppire-means-layer.c:170
 msgid "Back"
-msgstr ""
+msgstr "上一步"
 
 #: src/ui/gui/psppire-output-view.c:354
 msgid "Message"
@@ -6682,43 +6478,43 @@ msgstr "信息"
 msgid "failed to create temporary directory during clipboard operation"
 msgstr "剪贴版操作时创建临时目录失败"
 
-#: src/ui/gui/psppire-output-window.c:244
+#: src/ui/gui/psppire-output-window.c:245
 msgid "Infer file type from extension"
 msgstr "从扩展名推断文件类型"
 
-#: src/ui/gui/psppire-output-window.c:245
+#: src/ui/gui/psppire-output-window.c:246
 msgid "PDF (*.pdf)"
 msgstr "PDF (*.pdf)"
 
-#: src/ui/gui/psppire-output-window.c:246
+#: src/ui/gui/psppire-output-window.c:247
 msgid "HTML (*.html)"
 msgstr "HTML (*.html)"
 
-#: src/ui/gui/psppire-output-window.c:247
+#: src/ui/gui/psppire-output-window.c:248
 msgid "OpenDocument (*.odt)"
 msgstr "OpenDocument (*.odt)"
 
-#: src/ui/gui/psppire-output-window.c:248
+#: src/ui/gui/psppire-output-window.c:249
 msgid "Text (*.txt)"
 msgstr "文本文件(*.txt)"
 
-#: src/ui/gui/psppire-output-window.c:249
+#: src/ui/gui/psppire-output-window.c:250
 msgid "Text [plain] (*.txt)"
 msgstr "纯文本文件(*.txt)"
 
-#: src/ui/gui/psppire-output-window.c:250
+#: src/ui/gui/psppire-output-window.c:251
 msgid "PostScript (*.ps)"
 msgstr "PostScript (*.ps)"
 
-#: src/ui/gui/psppire-output-window.c:251
+#: src/ui/gui/psppire-output-window.c:252
 msgid "Comma-Separated Values (*.csv)"
 msgstr "逗号分隔值文件(*.csv)"
 
-#: src/ui/gui/psppire-output-window.c:352
+#: src/ui/gui/psppire-output-window.c:353
 msgid "Export Output"
 msgstr "导出输出结果"
 
-#: src/ui/gui/psppire-output-window.c:536
+#: src/ui/gui/psppire-output-window.c:527
 msgid "Output Viewer"
 msgstr "输出窗口"
 
@@ -6735,15 +6531,15 @@ msgstr "保存文件`%s'"
 msgid "Save Syntax"
 msgstr "保存语法"
 
-#: src/ui/gui/psppire-syntax-window.c:575 src/ui/gui/psppire-window.c:728
+#: src/ui/gui/psppire-syntax-window.c:575 src/ui/gui/psppire-window.c:678
 msgid "Syntax Files (*.sps) "
 msgstr "语法文件(*.sps)"
 
-#: src/ui/gui/psppire-syntax-window.c:887
+#: src/ui/gui/psppire-syntax-window.c:879
 msgid "Syntax Editor"
 msgstr "语法编辑器"
 
-#: src/ui/gui/psppire-syntax-window.c:902
+#: src/ui/gui/psppire-syntax-window.c:894
 #, c-format
 msgid "Cannot load syntax file `%s'"
 msgstr "无法载入语法文件`%s'"
@@ -6781,11 +6577,11 @@ msgid "{%s, %s}\n"
 msgstr "{%s, %s}\n"
 
 #: src/ui/gui/psppire-var-sheet.c:1374 src/language/stats/crosstabs.q:1351
-#: src/ui/gui/compute.ui:619
+#: src/ui/gui/compute.ui:287
 msgid "Type"
 msgstr "类型"
 
-#: src/ui/gui/psppire-var-sheet.c:1377 src/ui/gui/compute.ui:533
+#: src/ui/gui/psppire-var-sheet.c:1377 src/ui/gui/compute.ui:199
 msgid "Width"
 msgstr "宽度"
 
@@ -6814,365 +6610,201 @@ msgstr "衡量"
 msgid "Role"
 msgstr "角色"
 
-#: src/ui/gui/psppire-window.c:508
+#: src/ui/gui/psppire-window.c:458
 #, c-format
 msgid "Save the changes to `%s' before closing?"
 msgstr "关闭前将改动保存到`%s'？"
 
-#: src/ui/gui/psppire-window.c:515
+#: src/ui/gui/psppire-window.c:465
 #, c-format
-msgid ""
-"If you don't save, changes from the last %ld seconds will be permanently "
-"lost."
+msgid "If you don't save, changes from the last %ld seconds will be permanently lost."
 msgstr "如果选择不保存，之前%ld秒内作的改动将永久丢失。"
 
-#: src/ui/gui/psppire-window.c:519
+#: src/ui/gui/psppire-window.c:469
 msgid "Close _without saving"
 msgstr "不保存而关闭(_w)"
 
-#: src/ui/gui/psppire-window.c:699 src/ui/gui/psppire-window.c:703
-#: src/ui/gui/page-file.c:206
+#: src/ui/gui/psppire-window.c:649 src/ui/gui/psppire-window.c:653
 msgid "Open"
 msgstr "打开"
 
-#: src/ui/gui/psppire-window.c:708
+#: src/ui/gui/psppire-window.c:658
 msgid "Data and Syntax Files"
 msgstr "数据和语法文件"
 
-#: src/ui/gui/psppire-window.c:717
+#: src/ui/gui/psppire-window.c:667
 msgid "System Files (*.sav, *.zsav)"
 msgstr "系统文件(*.sav, *.zsav)"
 
-#: src/ui/gui/recode-dialog.c:642
-msgid "Recode into Different Variables"
-msgstr "重编码到其他变量"
-
-#: src/ui/gui/recode-dialog.c:645 src/ui/gui/recode.ui:332
-msgid "Recode into Same Variables"
-msgstr "重编码为到变量自身"
-
-#: src/ui/gui/recode-dialog.c:906
-msgid "Recode into Different Variables: Old and New Values "
-msgstr "重编码到其他变量：旧、新值"
-
-#: src/ui/gui/recode-dialog.c:907
-msgid "Recode into Same Variables: Old and New Values"
-msgstr "重编码到变量自身：旧、新值"
-
-#: src/ui/gui/select-cases-dialog.c:64
-#, c-format
-msgid "Approximately %3d%% of all cases."
-msgstr "大约所有个案中的%3d%%。"
-
-#: src/ui/gui/select-cases-dialog.c:65
-#, c-format
-msgid "Exactly %3d cases from the first %3d cases."
-msgstr "正好%3d个个案取于前%3d个个案内。"
-
-#: src/ui/gui/select-cases-dialog.c:207
-#, c-format
-msgid "%d thru %d"
-msgstr "%d到%d"
-
-#: src/ui/gui/page-assistant.c:94
-msgid "Importing Delimited Text Data"
-msgstr "导入分隔符分隔的文本数据"
-
-#: src/ui/gui/page-intro.c:92
-#, c-format
-msgid "Only the first %4d cases"
-msgstr "仅前%4d个个案"
-
-#: src/ui/gui/page-intro.c:102
-#, c-format
-msgid "Only the first %3d %% of file (approximately)"
-msgstr "仅文件的前%3d %%(约数)"
-
-#: src/ui/gui/page-intro.c:127
-msgid ""
-"This assistant will guide you through the process of importing data into "
-"PSPP from a text file with one line per case,  in which fields are separated "
-"by tabs, commas, or other delimiters.\n"
-"\n"
-msgstr ""
-"本帮助将指导从文本文件中导入数据到PSPP，每次导入一行作为一个个案，行中字段以"
-"制表符、逗号或其他分隔符隔开。\n"
-"\n"
-
-#: src/ui/gui/page-intro.c:133
-#, c-format
-msgid "The selected file contains %'zu line of text.  "
-msgid_plural "The selected file contains %'zu lines of text.  "
-msgstr[0] "选中的文件含有%'zu行文本。"
-
-#: src/ui/gui/page-intro.c:141
-#, c-format
-msgid "The selected file contains approximately %'lu line of text.  "
-msgid_plural "The selected file contains approximately %'lu lines of text.  "
-msgstr[0] "选中的文件约含有%'lu行文本。"
-
-#: src/ui/gui/page-intro.c:147
-#, c-format
-msgid ""
-"Only the first %zu line of the file will be shown for preview purposes in "
-"the following screens.  "
-msgid_plural ""
-"Only the first %zu lines of the file will be shown for preview purposes in "
-"the following screens.  "
-msgstr[0] "接下来预览显示仅显示文件最开始的%zu行。"
-
-#: src/ui/gui/page-intro.c:154
-msgid "You may choose below how much of the file should actually be imported."
-msgstr "您可在下面选择导入多少文件内容。"
-
-#: src/ui/gui/page-file.c:98
-#, c-format
-msgid "Could not open `%s'"
-msgstr "无法打开`%s'"
-
-#: src/ui/gui/page-file.c:114
-#, c-format
-msgid "Error reading `%s': %s"
-msgstr "读取`%s'时出错: %s"
-
-#: src/ui/gui/page-file.c:117
-#, c-format
-msgid ""
-"Failed to read `%s', because it contains a line over %d bytes long and "
-"therefore appears not to be a text file."
-msgstr "读取`%s'失败，文件可能不是一个文本文件，因其中包含一行长度超过%d字节。"
-
-#: src/ui/gui/page-file.c:135
-#, c-format
-msgid "`%s' is empty."
-msgstr "`%s'为空。"
-
-#: src/ui/gui/page-file.c:202
-msgid "Import Delimited Text Data"
-msgstr "导入分隔符分隔的文本数据。"
-
-#: src/ui/gui/page-file.c:212
-msgid "Text Files"
-msgstr "文本文件"
-
-#: src/ui/gui/page-file.c:217
-msgid "Text (*.txt) Files"
-msgstr "文本文件(*.txt)"
-
-#: src/ui/gui/page-file.c:223
-msgid "Plain Text (ASCII) Files"
-msgstr "纯文本(ASCII)文件"
-
-#: src/ui/gui/page-file.c:228
-msgid "Comma Separated Value Files"
-msgstr "逗号分隔值文件"
-
-#: src/ui/gui/page-file.c:235
-msgid "Tab Separated Value Files"
-msgstr "制表符分隔值的文件"
-
-#: src/ui/gui/page-file.c:240
-msgid "Gnumeric Spreadsheet Files"
-msgstr "Gnumeric工作表文件"
-
-#: src/ui/gui/page-file.c:245
-msgid "OpenDocument Spreadsheet Files"
-msgstr "OpenDocument工作表文件"
-
-#: src/ui/gui/page-file.c:250
-msgid "All Spreadsheet Files"
-msgstr "所有工作表文件"
-
-#: src/ui/gui/page-sheet-spec.c:252
-msgid "An error occurred reading the spreadsheet file."
-msgstr "读取工作表文件时发生错误。"
-
-#: src/ui/gui/text-data-import-dialog.c:330
-#: src/ui/gui/text-data-import-dialog.c:378
-msgid "This input line has too few separators to fill in this field."
-msgstr "输入行的分隔数过少不足以分隔字段。"
-
-#: src/ui/gui/text-data-import-dialog.c:369
-#, c-format
-msgid "Cannot parse field content `%.*s' as format %s: %s"
-msgstr "不能将字段内容`%.*s' 解析为格式 %s: %s"
-
-#: src/ui/gui/text-data-import-dialog.c:543
-msgid "Line"
-msgstr "行"
-
 #: src/ui/gui/t-test-options.c:65
 #, c-format
 msgid "Con_fidence Interval: %2d %%"
 msgstr "置信区间：%2d %%"
 
-#: src/ui/gui/val-labs-dialog.c:546
+#: src/ui/gui/val-labs-dialog.c:573
 #, c-format
 msgid "%s = `%s'"
 msgstr "%s = `%s'"
 
-#: src/ui/gui/weight-cases-dialog.c:79 src/ui/gui/weight.ui:67
-#: src/ui/gui/weight.ui:195
-msgid "Do not weight cases"
-msgstr "不对个案加权"
+#: src/ui/gui/windows-menu.c:92
+msgid "_Minimize all Windows"
+msgstr "最小化所有窗口(_M)"
 
-#: src/ui/gui/weight-cases-dialog.c:85
-#, c-format
-msgid "Weight cases by %s"
-msgstr "通过%s加权个案"
+#: src/ui/gui/windows-menu.c:93
+msgid "_Split"
+msgstr "拆分(_S)"
 
-#: utilities/pspp-convert.c:133
+#: src/ui/gui/windows-menu.c:133
+msgid "_Windows"
+msgstr "窗口(_W)"
+
+#: utilities/pspp-convert.c:134
 msgid "exactly two non-option arguments are required; use --help for help"
 msgstr "必须使用正好两个非选项参数；使用--help查看帮助"
 
-#: utilities/pspp-convert.c:144
+#: utilities/pspp-convert.c:145
 #, c-format
 msgid "%s: cannot guess output format (use -O option)"
 msgstr "%s：不能猜测输出格式类型(使用-O选项)"
 
-#: utilities/pspp-convert.c:156
+#: utilities/pspp-convert.c:157
 msgid "can only convert encrypted data file to sav or sys format"
 msgstr "加密数据文件只能转换为sav或sys格式"
 
-#: utilities/pspp-convert.c:162
-#, fuzzy
+#: utilities/pspp-convert.c:163
 msgid "can only convert encrypted syntax file to sps format"
-msgstr "加密数据文件只能转换为sav或sys格式"
+msgstr "加密语法文件只能转换为sps格式"
 
-#: utilities/pspp-convert.c:200
+#: utilities/pspp-convert.c:202
 #, c-format
 msgid "%s: unknown output format (use -O option)"
 msgstr "%s：未知的输出格式(使用-O选项)"
 
-#: utilities/pspp-convert.c:217
+#: utilities/pspp-convert.c:219
 #, c-format
 msgid "%s: error reading input file"
 msgstr "%s：读取输入文件错误"
 
-#: utilities/pspp-convert.c:219
+#: utilities/pspp-convert.c:221
 #, c-format
 msgid "%s: error writing output file"
 msgstr "%s：写入输出文件错误"
 
-#: utilities/pspp-convert.c:247
+#: utilities/pspp-convert.c:261
 msgid "sorry, wrong password"
 msgstr "抱歉，密码错误"
 
-#: src/language/utilities/set.q:163
+#: src/language/utilities/set.q:162
 #, c-format
 msgid "%s must be between 0 and 20."
 msgstr "%s的值必须介于0与20。"
 
-#: src/language/utilities/set.q:173 src/language/utilities/set.q:180
+#: src/language/utilities/set.q:172 src/language/utilities/set.q:179
 #, c-format
 msgid "%s must be at least 1."
 msgstr "%s必须至少为1。"
 
-#: src/language/utilities/set.q:187 src/language/data-io/file-handle.q:106
+#: src/language/utilities/set.q:186 src/language/data-io/file-handle.q:106
 #, c-format
 msgid "%s must not be negative."
 msgstr "%s不能为负数。"
 
-#: src/language/utilities/set.q:206
+#: src/language/utilities/set.q:205
 #, c-format
 msgid "%s must be at least 1MB"
 msgstr "%s至少为1MB"
 
-#: src/language/utilities/set.q:208
+#: src/language/utilities/set.q:207
 #, c-format
 msgid "%s must be positive"
 msgstr "%s必须为正数"
 
-#: src/language/utilities/set.q:214 src/language/utilities/set.q:216
-#: src/language/utilities/set.q:218 src/language/utilities/set.q:220
-#: src/language/utilities/set.q:222 src/language/utilities/set.q:224
-#: src/language/utilities/set.q:226 src/language/utilities/set.q:228
-#: src/language/utilities/set.q:230 src/language/utilities/set.q:232
-#: src/language/utilities/set.q:234
+#: src/language/utilities/set.q:213 src/language/utilities/set.q:215
+#: src/language/utilities/set.q:217 src/language/utilities/set.q:219
+#: src/language/utilities/set.q:221 src/language/utilities/set.q:223
+#: src/language/utilities/set.q:225 src/language/utilities/set.q:227
+#: src/language/utilities/set.q:229 src/language/utilities/set.q:231
+#: src/language/utilities/set.q:233
 #, c-format
 msgid "%s is obsolete."
 msgstr "%s已过时。"
 
-#: src/language/utilities/set.q:240
+#: src/language/utilities/set.q:239
 msgid "Active file compression is not implemented."
 msgstr "活动文件压缩功能未实现。"
 
-#: src/language/utilities/set.q:416
+#: src/language/utilities/set.q:415
 #, c-format
 msgid "%s must be 1500 or later."
 msgstr "%s必须为1500或之后。"
 
-#: src/language/utilities/set.q:423
+#: src/language/utilities/set.q:422
 #, c-format
 msgid "expecting %s or year"
 msgstr "要求%s可年份"
 
-#: src/language/utilities/set.q:451 src/language/utilities/set.q:548
+#: src/language/utilities/set.q:450 src/language/utilities/set.q:547
 #, c-format
 msgid "%s must be at least %d."
 msgstr "%s必须至少为%d。"
 
-#: src/language/utilities/set.q:487
+#: src/language/utilities/set.q:486
 #, c-format
 msgid "%s is not a recognized encoding or locale name"
 msgstr "无法识别编码或语言环境名称%s"
 
-#: src/language/utilities/set.q:575
+#: src/language/utilities/set.q:574
 #, c-format
-msgid ""
-"%s requires numeric output format as an argument.  Specified format %s is of "
-"type string."
+msgid "%s requires numeric output format as an argument.  Specified format %s is of type string."
 msgstr "%s要求数字输入格式作为参数，而设定的格式%s是字符串。"
 
-#: src/language/utilities/set.q:804
+#: src/language/utilities/set.q:803
 msgid "ISL (32-bit IEEE 754 single, little-endian)"
 msgstr "ISL (32-位 IEEE 754 单精度，小端序)"
 
-#: src/language/utilities/set.q:807
+#: src/language/utilities/set.q:806
 msgid "ISB (32-bit IEEE 754 single, big-endian)"
 msgstr "ISB (32-位 IEEE 754 单精度，大端序)"
 
-#: src/language/utilities/set.q:810
+#: src/language/utilities/set.q:809
 msgid "IDL (64-bit IEEE 754 double, little-endian)"
 msgstr "IDL (64-位 IEEE 754 双精度，小端序)"
 
-#: src/language/utilities/set.q:813
+#: src/language/utilities/set.q:812
 msgid "IDB (64-bit IEEE 754 double, big-endian)"
 msgstr "IDB (64-位 IEEE 754 双精度，大端序)"
 
-#: src/language/utilities/set.q:817
+#: src/language/utilities/set.q:816
 msgid "VF (32-bit VAX F, VAX-endian)"
 msgstr "VF (32-位 VAX F，VAX-端序)"
 
-#: src/language/utilities/set.q:820
+#: src/language/utilities/set.q:819
 msgid "VD (64-bit VAX D, VAX-endian)"
 msgstr "VD (64-位 VAX D，VAX-端序)"
 
-#: src/language/utilities/set.q:823
+#: src/language/utilities/set.q:822
 msgid "VG (64-bit VAX G, VAX-endian)"
 msgstr "VG (64-位 VAX G，VAX-端序)"
 
-#: src/language/utilities/set.q:827
+#: src/language/utilities/set.q:826
 msgid "ZS (32-bit IBM Z hexadecimal short, big-endian)"
 msgstr "ZS (32-位 IBM Z 短16进制，大端序)"
 
-#: src/language/utilities/set.q:830
+#: src/language/utilities/set.q:829
 msgid "ZL (64-bit IBM Z hexadecimal long, big-endian)"
 msgstr "ZL (64-位 IBM Z 长16进制，大端序)"
 
-#: src/language/utilities/set.q:998
+#: src/language/utilities/set.q:997
 #, c-format
 msgid "%s is %s."
 msgstr "%s 是 %s。"
 
-#: src/language/utilities/set.q:1102
+#: src/language/utilities/set.q:1101
 #, c-format
-msgid ""
-"Too many %s commands without a %s: at most %d levels of saved settings are "
-"allowed."
+msgid "Too many %s commands without a %s: at most %d levels of saved settings are allowed."
 msgstr "过多%s命令没有带%s：保存的水平设置最多允许%d水平。"
 
-#: src/language/utilities/set.q:1122
+#: src/language/utilities/set.q:1121
 #, c-format
 msgid "%s without matching %s."
 msgstr "%s没有匹配%s。"
@@ -7384,8 +7016,7 @@ msgstr "%s 依赖性"
 
 #: src/language/data-io/file-handle.q:74
 #, c-format
-msgid ""
-"File handle %s is already defined.  Use %s before redefining a file handle."
+msgid "File handle %s is already defined.  Use %s before redefining a file handle."
 msgstr "文件句柄%s已经定义。定义句柄前须使用%s。"
 
 #: src/language/data-io/file-handle.q:135
@@ -7395,15 +7026,12 @@ msgstr "%s必须与%s一起使用。"
 
 #: src/language/data-io/file-handle.q:146
 #, c-format
-msgid ""
-"The specified file mode requires LRECL.  Assuming %zu-character records."
+msgid "The specified file mode requires LRECL.  Assuming %zu-character records."
 msgstr "指定的文件模式要求LRECL，默认为%zu字符记录。"
 
 #: src/language/data-io/file-handle.q:150
 #, c-format
-msgid ""
-"Record length (%ld) must be between 1 and %lu bytes.  Assuming %zu-character "
-"records."
+msgid "Record length (%ld) must be between 1 and %lu bytes.  Assuming %zu-character records."
 msgstr "记录长度(%ld)必须处于1和%lu字节间，默认为%zu-字符。"
 
 #: src/language/data-io/file-handle.q:194
@@ -7423,63 +7051,63 @@ msgstr "要求一个文件名或句柄名"
 msgid "Handle for %s not allowed here."
 msgstr "该处不允许使用%s的句柄。"
 
-#: src/ui/gui/aggregate.ui:7
+#: src/ui/gui/aggregate.ui:8
 msgid "Aggregate Data"
 msgstr "数据汇总"
 
-#: src/ui/gui/aggregate.ui:101
+#: src/ui/gui/aggregate.ui:110
 msgid "_Break variable(s)"
 msgstr "分组变量(_B)"
 
-#: src/ui/gui/aggregate.ui:138
+#: src/ui/gui/aggregate.ui:163
 msgid "Variable Name: "
 msgstr "变量名称："
 
-#: src/ui/gui/aggregate.ui:163
+#: src/ui/gui/aggregate.ui:199
 msgid "Variable Label: "
 msgstr "变量标签："
 
-#: src/ui/gui/aggregate.ui:192
+#: src/ui/gui/aggregate.ui:236
 msgid "Function: "
 msgstr "函数"
 
-#: src/ui/gui/aggregate.ui:255
+#: src/ui/gui/aggregate.ui:311
 msgid "Argument 1: "
 msgstr "参数1："
 
-#: src/ui/gui/aggregate.ui:284
+#: src/ui/gui/aggregate.ui:348
 msgid "Argument 2: "
 msgstr "参数2："
 
-#: src/ui/gui/aggregate.ui:330
+#: src/ui/gui/aggregate.ui:412
 msgid "Aggregated variables"
 msgstr "汇总后的变量"
 
-#: src/ui/gui/aggregate.ui:364
+#: src/ui/gui/aggregate.ui:453
 msgid "_Add aggregated variables to the active dataset"
 msgstr "将汇总后产生的变量添加到活动数据集(_A)"
 
-#: src/ui/gui/aggregate.ui:378
+#: src/ui/gui/aggregate.ui:470
 msgid "_Replace the current dataset with the aggregated variables"
 msgstr "用汇总后的变量更换当前数据集(_R)"
 
-#: src/ui/gui/aggregate.ui:393
+#: src/ui/gui/aggregate.ui:488
 msgid "_Write a new data file containing only the aggregated variables"
 msgstr "将汇总后的变量写入新文件(_W)"
 
-#: src/ui/gui/aggregate.ui:430
+#: src/ui/gui/aggregate.ui:528
 msgid "label"
 msgstr "标签"
 
-#: src/ui/gui/aggregate.ui:474
+#: src/ui/gui/aggregate.ui:577
 msgid "File is _already sorted on break variable(s)"
 msgstr "文件中分组变量已排序(_a)"
 
-#: src/ui/gui/aggregate.ui:489
+#: src/ui/gui/aggregate.ui:593
 msgid "Sort file before a_ggregating"
 msgstr "会计前先排序(_g)"
 
-#: src/ui/gui/aggregate.ui:510
+#: src/ui/gui/aggregate.ui:614
 msgid "Options for very large datasets"
 msgstr "超大数据集选项"
 
@@ -7539,101 +7167,93 @@ msgstr "设定二分变量"
 msgid "Test _Proportion:"
 msgstr "检验比例(_P)："
 
-#: src/ui/gui/compute.ui:8
+#: src/ui/gui/compute.ui:16
+msgid "Compute Variable: Type and Label"
+msgstr "计算变量：类型和标签"
+
+#: src/ui/gui/compute.ui:51
+msgid "Use _expression as label"
+msgstr "使用表达式作标签(_e)"
+
+#: src/ui/gui/compute.ui:74
+msgid "_Label:"
+msgstr "标签(_L)："
+
+#: src/ui/gui/compute.ui:178
+msgid "_String"
+msgstr "字符串(_S)"
+
+#: src/ui/gui/compute.ui:271
+msgid "_Numeric"
+msgstr "数字型(_N)"
+
+#: src/ui/gui/compute.ui:326
 msgid "Compute Variable"
 msgstr "变量计算"
 
-#: src/ui/gui/compute.ui:42
+#: src/ui/gui/compute.ui:364
 msgid "Target _Variable:"
 msgstr "目标变量(_V)："
 
-#: src/ui/gui/compute.ui:73
+#: src/ui/gui/compute.ui:395
 msgid "_Type & Label..."
 msgstr "类型和标签(_T)..."
 
-#: src/ui/gui/compute.ui:121
+#: src/ui/gui/compute.ui:452
 msgid "="
 msgstr "="
 
-#: src/ui/gui/compute.ui:175
+#: src/ui/gui/compute.ui:509
 msgid "_Numeric Expressions:"
 msgstr "表达式(_N)"
 
-#: src/ui/gui/compute.ui:239
+#: src/ui/gui/compute.ui:581
 msgid "_Functions:"
 msgstr "函数(_F)：..."
 
-#: src/ui/gui/compute.ui:306 src/ui/gui/recode.ui:380
+#: src/ui/gui/compute.ui:661
 msgid "_If..."
 msgstr "如果(_I)..."
 
-#: src/ui/gui/compute.ui:360
-msgid "Compute Variable: Type and Label"
-msgstr "计算变量：类型和标签"
-
-#: src/ui/gui/compute.ui:395
-msgid "Use _expression as label"
-msgstr "使用表达式作标签(_e)"
-
-#: src/ui/gui/compute.ui:416
-msgid "_Label:"
-msgstr "标签(_L)："
-
-#: src/ui/gui/compute.ui:516
-msgid "_String"
-msgstr "字符串(_S)"
-
-#: src/ui/gui/compute.ui:602
-msgid "_Numeric"
-msgstr "数字型(_N)"
-
 #: src/ui/gui/barchart.ui:8
-#, fuzzy
 msgid "Barchart"
 msgstr "条形图"
 
 #: src/ui/gui/barchart.ui:96
-#, fuzzy
 msgid "Category A_xis:"
-msgstr "类别"
+msgstr "类别轴(_x)"
 
 #: src/ui/gui/barchart.ui:124
-#, fuzzy
 msgid "_N of cases"
-msgstr "个案数量"
+msgstr "个案数量(_N)"
 
 #: src/ui/gui/barchart.ui:142
-#, fuzzy
 msgid "_Cum. n of cases"
-msgstr "个案数量"
+msgstr "累积个案数量(_C)"
 
 #: src/ui/gui/barchart.ui:158
 msgid "Other _summary function"
-msgstr ""
+msgstr "其他汇总函数(_s)"
 
 #: src/ui/gui/barchart.ui:175
-#, fuzzy
 msgid "% of c_ases"
-msgstr "个案数量"
+msgstr "个案数量百分比(_a)"
 
 #: src/ui/gui/barchart.ui:191
-#, fuzzy
 msgid "C_um. % of cases"
-msgstr "个案数量"
+msgstr "累积个案数量百分比(_u)"
 
 #: src/ui/gui/barchart.ui:254 src/ui/gui/histogram.ui:84
-#, fuzzy
 msgid "_Variable:"
 msgstr "变量(_V)："
 
 #: src/ui/gui/barchart.ui:292
 msgid "Bars Represent"
-msgstr ""
+msgstr "柱条代表："
 
 #: src/ui/gui/barchart.ui:324
-#, fuzzy
 msgid "Category C_luster:"
-msgstr "类别标签来源"
+msgstr "类别群(_l)"
 
 #: src/ui/gui/correlation.ui:8
 msgid "Bivariate Correlations"
@@ -7751,23 +7371,23 @@ msgstr "单元格(_l)..."
 msgid "Crosstabs: Format"
 msgstr "交叉表：格式"
 
-#: src/ui/gui/crosstabs.ui:351
+#: src/ui/gui/crosstabs.ui:352
 msgid "Print tables"
 msgstr "输出表格"
 
-#: src/ui/gui/crosstabs.ui:367
+#: src/ui/gui/crosstabs.ui:368
 msgid "Pivot"
 msgstr "旋转"
 
-#: src/ui/gui/crosstabs.ui:383 src/ui/gui/sort.ui:141
+#: src/ui/gui/crosstabs.ui:384 src/ui/gui/sort.ui:141
 msgid "Ascending"
 msgstr "升序"
 
-#: src/ui/gui/crosstabs.ui:434
+#: src/ui/gui/crosstabs.ui:435
 msgid "Crosstabs: Statistics"
 msgstr "交叉表：统计量"
 
-#: src/ui/gui/crosstabs.ui:477 src/ui/gui/oneway.ui:450
+#: src/ui/gui/crosstabs.ui:478 src/ui/gui/oneway.ui:451
 msgid "Statistics"
 msgstr "统计量"
 
@@ -7833,7 +7453,7 @@ msgstr "在当前位置创建个案"
 msgid "Go To Variable..."
 msgstr "转到变量..."
 
-#: src/ui/gui/data-sheet.ui:74 src/ui/gui/data-editor.ui:523
+#: src/ui/gui/data-sheet.ui:74 src/ui/gui/data-editor.ui:532
 #: src/ui/gui/var-sheet.ui:50
 msgid "Jump to variable"
 msgstr "跳转到变量"
@@ -7846,36 +7466,36 @@ msgstr "转到个案..."
 msgid "Jump to a case in the data sheet"
 msgstr "跳转到数据表中的个案"
 
-#: src/ui/gui/data-sheet.ui:108 src/ui/gui/var-sheet.ui:75
+#: src/ui/gui/data-sheet.ui:107 src/ui/gui/var-sheet.ui:75
 msgid "Cl_ear Variables"
 msgstr "清除变量(_e)"
 
-#: src/ui/gui/data-sheet.ui:109 src/ui/gui/var-sheet.ui:76
+#: src/ui/gui/data-sheet.ui:108 src/ui/gui/var-sheet.ui:76
 msgid "Delete the variables at the selected position(s)"
 msgstr "删除选中的变量"
 
-#: src/ui/gui/data-sheet.ui:117
+#: src/ui/gui/data-sheet.ui:116
 msgid "_Clear Cases"
 msgstr "清除个案(_C)"
 
-#: src/ui/gui/data-sheet.ui:118
+#: src/ui/gui/data-sheet.ui:117
 msgid "Delete the cases at the selected position(s)"
 msgstr "删除选中的个案"
 
-#: src/ui/gui/data-sheet.ui:125
+#: src/ui/gui/data-sheet.ui:124
 msgid "_Find..."
 msgstr "查找(_F)"
 
-#: src/ui/gui/data-sheet.ui:132
+#: src/ui/gui/data-sheet.ui:131
 msgid "Sort _Ascending"
 msgstr "升序排列(_A)"
 
-#: src/ui/gui/data-sheet.ui:139
+#: src/ui/gui/data-sheet.ui:138
 msgid "Sort _Descending"
 msgstr "降序排列(_D)"
 
 #: src/ui/gui/descriptives.ui:116 src/ui/gui/factor.ui:776
-#: src/ui/gui/recode.ui:605
+#: src/ui/gui/recode.ui:619
 msgid "_Variables:"
 msgstr "变量(_V)："
 
@@ -7935,7 +7555,7 @@ msgstr "报告值(_R)"
 msgid "Explore: Statistics"
 msgstr "数据探索：统计量"
 
-#: src/ui/gui/examine.ui:448 src/ui/gui/oneway.ui:411
+#: src/ui/gui/examine.ui:448 src/ui/gui/oneway.ui:412
 msgid "_Descriptives"
 msgstr "描述性统计分析(_D)"
 
@@ -8039,7 +7659,7 @@ msgstr "提取"
 msgid "Factor Analysis"
 msgstr "因子分析"
 
-#: src/ui/gui/factor.ui:651 src/ui/gui/data-editor.ui:304
+#: src/ui/gui/factor.ui:651 src/ui/gui/data-editor.ui:314
 msgid "_Descriptives..."
 msgstr "描述统计(_D)..."
 
@@ -8067,19 +7687,19 @@ msgstr "值："
 msgid "Search value labels"
 msgstr "查找值标签"
 
-#: src/ui/gui/find.ui:193
+#: src/ui/gui/find.ui:194
 msgid "Regular expression Match"
 msgstr "正刚表达式匹配"
 
-#: src/ui/gui/find.ui:210
+#: src/ui/gui/find.ui:211
 msgid "Search substrings"
 msgstr "字符串部分匹配"
 
-#: src/ui/gui/find.ui:227
+#: src/ui/gui/find.ui:228
 msgid "Wrap around"
 msgstr "换行"
 
-#: src/ui/gui/find.ui:243
+#: src/ui/gui/find.ui:244
 msgid "Search backward"
 msgstr "后退查找"
 
@@ -8099,9 +7719,9 @@ msgstr "从不(_N)"
 msgid "If no _more than "
 msgstr "不超过(_m)"
 
-#: src/ui/gui/frequencies.ui:112 src/ui/gui/frequencies.ui:434
+#: src/ui/gui/frequencies.ui:112 src/ui/gui/frequencies.ui:435
 msgid "100"
-msgstr ""
+msgstr "100"
 
 #: src/ui/gui/frequencies.ui:128
 msgid "values"
@@ -8111,119 +7731,117 @@ msgstr "值"
 msgid "Display frequency tables"
 msgstr "显示频率表"
 
-#: src/ui/gui/frequencies.ui:176
+#: src/ui/gui/frequencies.ui:177
 msgid "A_scending value"
 msgstr "上升的值(_s)"
 
-#: src/ui/gui/frequencies.ui:194
+#: src/ui/gui/frequencies.ui:195
 msgid "D_escending value"
 msgstr "下降的值(_e)"
 
-#: src/ui/gui/frequencies.ui:212
+#: src/ui/gui/frequencies.ui:213
 msgid "Ascending _frequency"
 msgstr "上升的频率(_f)"
 
-#: src/ui/gui/frequencies.ui:230
+#: src/ui/gui/frequencies.ui:231
 msgid "Descending f_requency"
 msgstr "下降的频率(_e)"
 
-#: src/ui/gui/frequencies.ui:253
+#: src/ui/gui/frequencies.ui:254
 msgid "Order by"
 msgstr "排序方式"
 
-#: src/ui/gui/frequencies.ui:305
+#: src/ui/gui/frequencies.ui:306
 msgid "Frequencies: Charts"
 msgstr "频率：图表"
 
-#: src/ui/gui/frequencies.ui:336
+#: src/ui/gui/frequencies.ui:337
 msgid "Scale:"
 msgstr "缩放："
 
-#: src/ui/gui/frequencies.ui:346
+#: src/ui/gui/frequencies.ui:347
 msgid "_Frequencies"
 msgstr "频率(_F）"
 
-#: src/ui/gui/frequencies.ui:363
+#: src/ui/gui/frequencies.ui:364
 msgid "_Percentages"
 msgstr "百分比(_P)"
 
-#: src/ui/gui/frequencies.ui:387
+#: src/ui/gui/frequencies.ui:388
 msgid "Exclude values _below "
 msgstr "值小下列值则排除(_b)"
 
-#: src/ui/gui/frequencies.ui:402
+#: src/ui/gui/frequencies.ui:403
 msgid "Exclude values _above "
 msgstr "值大下列值则排除(_a)"
 
-#: src/ui/gui/frequencies.ui:421 src/ui/gui/reliability.ui:212
+#: src/ui/gui/frequencies.ui:422 src/ui/gui/reliability.ui:212
 msgid "0"
-msgstr ""
+msgstr "0"
 
-#: src/ui/gui/frequencies.ui:449
+#: src/ui/gui/frequencies.ui:450
 msgid "<b>Chart Formatting</b>"
 msgstr "<b>图表格式</b>"
 
-#: src/ui/gui/frequencies.ui:474
+#: src/ui/gui/frequencies.ui:475
 msgid "Draw _histograms"
 msgstr "绘制直方图(_h)"
 
-#: src/ui/gui/frequencies.ui:490
+#: src/ui/gui/frequencies.ui:491
 msgid "Superimpose _normal curve"
 msgstr "叠加正态曲线(_n)"
 
-#: src/ui/gui/frequencies.ui:510
+#: src/ui/gui/frequencies.ui:511
 msgid "<b>Histograms</b>"
 msgstr "<b>直方图</b>"
 
-#: src/ui/gui/frequencies.ui:535
+#: src/ui/gui/frequencies.ui:536
 msgid "Draw _bar charts"
 msgstr "绘制条形图(_b)"
 
-#: src/ui/gui/frequencies.ui:555
+#: src/ui/gui/frequencies.ui:556
 msgid "<b>Bar Charts</b>"
 msgstr "<b>条形图</b>"
 
-#: src/ui/gui/frequencies.ui:580
+#: src/ui/gui/frequencies.ui:581
 msgid "Draw _pie charts"
 msgstr "绘制饼状图(_p)"
 
-#: src/ui/gui/frequencies.ui:596
+#: src/ui/gui/frequencies.ui:597
 msgid "Include slices for _missing values"
 msgstr "饼状图中绘制缺失值(_m)"
 
-#: src/ui/gui/frequencies.ui:616
+#: src/ui/gui/frequencies.ui:617
 msgid "<b>Pie Charts</b>"
 msgstr "<b>饼状图</b>"
 
-#: src/ui/gui/frequencies.ui:704 src/ui/gui/rank.ui:471
+#: src/ui/gui/frequencies.ui:705 src/ui/gui/rank.ui:471
 msgid "_Variable(s):"
 msgstr "变量(_V)："
 
-#: src/ui/gui/frequencies.ui:748
+#: src/ui/gui/frequencies.ui:749
 msgid "_Statistics:"
 msgstr "统计量(_S)："
 
-#: src/ui/gui/frequencies.ui:762
+#: src/ui/gui/frequencies.ui:763
 msgid "Include _missing values"
 msgstr "包含缺失值(_m)"
 
-#: src/ui/gui/frequencies.ui:785
+#: src/ui/gui/frequencies.ui:786
 msgid "Ch_arts..."
 msgstr "图表(_a)..."
 
-#: src/ui/gui/frequencies.ui:800
+#: src/ui/gui/frequencies.ui:801
 msgid "Frequency _Tables..."
 msgstr "频率表(_T)..."
 
 #: src/ui/gui/histogram.ui:8
-#, fuzzy
 msgid "Histogram"
-msgstr "<b>直方图</b>"
+msgstr "直方图"
 
 #: src/ui/gui/histogram.ui:110
-#, fuzzy
 msgid "_Display normal curve"
-msgstr "叠加正态曲线(_n)"
+msgstr "显示正态曲线(_D)"
 
 #: src/ui/gui/indep-samples.ui:9
 msgid "Define Groups"
@@ -8285,27 +7903,27 @@ msgstr "_Kendall's W"
 msgid "_Cochran's Q"
 msgstr "_Cochran's Q"
 
-#: src/ui/gui/ks-one-sample.ui:115
+#: src/ui/gui/ks-one-sample.ui:116
 msgid "Test _Variable List:"
 msgstr "检验变量列表(_V)"
 
-#: src/ui/gui/ks-one-sample.ui:147
+#: src/ui/gui/ks-one-sample.ui:148
 msgid "_Normal"
 msgstr "正态分布(_N)"
 
-#: src/ui/gui/ks-one-sample.ui:165
+#: src/ui/gui/ks-one-sample.ui:166
 msgid "_Poisson"
 msgstr "泊松分布(_P)"
 
-#: src/ui/gui/ks-one-sample.ui:182
+#: src/ui/gui/ks-one-sample.ui:183
 msgid "_Uniform"
 msgstr "均匀分布(_U)"
 
-#: src/ui/gui/ks-one-sample.ui:197
+#: src/ui/gui/ks-one-sample.ui:198
 msgid "_Exponential"
 msgstr "指数分布(_E)"
 
-#: src/ui/gui/ks-one-sample.ui:216
+#: src/ui/gui/ks-one-sample.ui:217
 msgid "Test Distribution"
 msgstr "检验分布"
 
@@ -8317,36 +7935,36 @@ msgstr "逻辑斯蒂回归：选项"
 msgid "CI for _exp(B): "
 msgstr "_exp(B)的置信区间："
 
-#: src/ui/gui/logistic.ui:130
+#: src/ui/gui/logistic.ui:129
 msgid "Classification cu_toff: "
 msgstr "分类分割点(_t)："
 
-#: src/ui/gui/logistic.ui:143
+#: src/ui/gui/logistic.ui:142
 msgid "_Maximum Iterations: "
 msgstr "最大迭代次数(_M)："
 
-#: src/ui/gui/logistic.ui:161
+#: src/ui/gui/logistic.ui:160
 msgid "Include _constant in model"
 msgstr "模型中包含常量(_c)"
 
-#: src/ui/gui/logistic.ui:202
+#: src/ui/gui/logistic.ui:201
 msgid "Logistic Regression"
 msgstr "逻辑斯蒂回归"
 
-#: src/ui/gui/logistic.ui:229
+#: src/ui/gui/logistic.ui:228
 msgid "_Options..."
 msgstr "选项(_O)..."
 
-#: src/ui/gui/logistic.ui:244 src/ui/gui/regression.ui:50
+#: src/ui/gui/logistic.ui:243 src/ui/gui/regression.ui:50
 #: src/ui/gui/syntax-editor.ui:45
 msgid "_Save..."
 msgstr "保存(_S)"
 
-#: src/ui/gui/logistic.ui:347 src/ui/gui/regression.ui:169
+#: src/ui/gui/logistic.ui:346 src/ui/gui/regression.ui:169
 msgid "_Dependent"
 msgstr "因变量(_D)"
 
-#: src/ui/gui/logistic.ui:395 src/ui/gui/regression.ui:216
+#: src/ui/gui/logistic.ui:394 src/ui/gui/regression.ui:216
 msgid "_Independent"
 msgstr "自变量(_I)"
 
@@ -8410,11 +8028,11 @@ msgstr "因素(_F)："
 msgid "Dependent _Variable(s):"
 msgstr "因变量(_V)："
 
-#: src/ui/gui/oneway.ui:428
+#: src/ui/gui/oneway.ui:429
 msgid "_Homogeneity"
 msgstr "齐性(_H)"
 
-#: src/ui/gui/oneway.ui:469
+#: src/ui/gui/oneway.ui:471
 msgid "_Contrasts..."
 msgstr "对照(_C)..."
 
@@ -8606,59 +8224,51 @@ msgstr "当前状态 ："
 msgid "Analysis by groups is off"
 msgstr "分组分析选项关闭"
 
-#: src/ui/gui/recode.ui:16
-msgid "Old Value"
-msgstr "旧值"
-
-#: src/ui/gui/recode.ui:97
+#: src/ui/gui/recode.ui:118
 msgid "System _Missing"
 msgstr "系统缺失设置(_M)"
 
-#: src/ui/gui/recode.ui:113
+#: src/ui/gui/recode.ui:133
 msgid "Co_py old values"
 msgstr "拷贝旧值(_p)"
 
-#: src/ui/gui/recode.ui:139
+#: src/ui/gui/recode.ui:155
 msgid "Va_lue: "
 msgstr "值(_l)："
 
-#: src/ui/gui/recode.ui:174
+#: src/ui/gui/recode.ui:192
 msgid "New Value"
 msgstr "新值"
 
-#: src/ui/gui/recode.ui:232
+#: src/ui/gui/recode.ui:259
 msgid "Conver_t numeric strings to numbers (`5' -> 5)"
 msgstr "将数字字符转换为数字，如`5' -> 5(_t)"
 
-#: src/ui/gui/recode.ui:252
+#: src/ui/gui/recode.ui:280
 msgid "Output variables are _strings"
 msgstr "输出变量为字符串(_s)"
 
-#: src/ui/gui/recode.ui:269
+#: src/ui/gui/recode.ui:301
 msgid "Width: "
 msgstr "宽度："
 
-#: src/ui/gui/recode.ui:397
-msgid "(optional case selection condition)"
-msgstr "(自选个案选择条件)"
-
-#: src/ui/gui/recode.ui:478
+#: src/ui/gui/recode.ui:480
 msgid "_Name:"
 msgstr "名称(_N)："
 
-#: src/ui/gui/recode.ui:501
+#: src/ui/gui/recode.ui:508
 msgid "La_bel:"
 msgstr "标签(_b):"
 
-#: src/ui/gui/recode.ui:525
+#: src/ui/gui/recode.ui:537
 msgid "Chan_ge"
 msgstr "改动(_g)"
 
-#: src/ui/gui/recode.ui:552
+#: src/ui/gui/recode.ui:565
 msgid "Output Variable"
 msgstr "输出变量"
 
-#: src/ui/gui/recode.ui:628
+#: src/ui/gui/recode.ui:639
 msgid "Old and New Va_lues..."
 msgstr "旧值和新值(_l)..."
 
@@ -8739,91 +8349,90 @@ msgid "_Coordinate points of the ROC Curve"
 msgstr "ROC曲线的坐标点(_C)"
 
 #: src/ui/gui/scatterplot.ui:9
-#, fuzzy
 msgid "Scatterplot"
-msgstr "散点图%s"
+msgstr "散点图"
 
 #: src/ui/gui/scatterplot.ui:40
 msgid "_X Axis:"
-msgstr ""
+msgstr "_X轴"
 
 #: src/ui/gui/scatterplot.ui:84
 msgid "_Y Axis:"
-msgstr ""
+msgstr "_Y轴"
 
 #: src/ui/gui/select-cases.ui:21
 msgid "Select Cases: Range"
 msgstr "选择个案：范围"
 
-#: src/ui/gui/select-cases.ui:72
+#: src/ui/gui/select-cases.ui:71
 msgid "First case"
 msgstr "第一个个案"
 
-#: src/ui/gui/select-cases.ui:86
+#: src/ui/gui/select-cases.ui:83
 msgid "Last case"
 msgstr "最后一个个案"
 
-#: src/ui/gui/select-cases.ui:100
+#: src/ui/gui/select-cases.ui:95
 msgid "Observation"
 msgstr "观测值"
 
-#: src/ui/gui/select-cases.ui:135
+#: src/ui/gui/select-cases.ui:144
 msgid "Select Cases"
 msgstr "选择个案"
 
-#: src/ui/gui/select-cases.ui:345
+#: src/ui/gui/select-cases.ui:296
 msgid "Use filter variable"
 msgstr "使用过滤变量"
 
-#: src/ui/gui/select-cases.ui:413
+#: src/ui/gui/select-cases.ui:363
 msgid "Based on time or case range"
 msgstr "基于时间或个案范围"
 
-#: src/ui/gui/select-cases.ui:428
+#: src/ui/gui/select-cases.ui:378
 msgid "Range..."
 msgstr "范围..."
 
-#: src/ui/gui/select-cases.ui:478
+#: src/ui/gui/select-cases.ui:427
 msgid "Random sample of cases"
 msgstr "随机抽取个案"
 
-#: src/ui/gui/select-cases.ui:494
+#: src/ui/gui/select-cases.ui:443
 msgid "Sample..."
 msgstr "样本..."
 
-#: src/ui/gui/select-cases.ui:543
+#: src/ui/gui/select-cases.ui:491
 msgid "If condition is satisfied"
 msgstr "若满足条件"
 
-#: src/ui/gui/select-cases.ui:558
+#: src/ui/gui/select-cases.ui:506
 msgid "If..."
 msgstr "如果..."
 
-#: src/ui/gui/select-cases.ui:604
+#: src/ui/gui/select-cases.ui:550
 msgid "All Cases"
 msgstr "所有个案"
 
-#: src/ui/gui/select-cases.ui:620
+#: src/ui/gui/select-cases.ui:564
 msgid "Select"
 msgstr "选择"
 
-#: src/ui/gui/select-cases.ui:652
+#: src/ui/gui/select-cases.ui:591
 msgid "Filtered"
 msgstr "已过滤"
 
-#: src/ui/gui/select-cases.ui:669
+#: src/ui/gui/select-cases.ui:608
 msgid "Deleted"
 msgstr "已删除"
 
-#: src/ui/gui/select-cases.ui:694
+#: src/ui/gui/select-cases.ui:630
 msgid "Unselected Cases Are"
 msgstr "未选中个案进行的操作"
 
-#: src/ui/gui/select-cases.ui:742
+#: src/ui/gui/select-cases.ui:676
 msgid "Select Cases: Random Sample"
 msgstr "选择个案：随机抽样"
 
-#: src/ui/gui/select-cases.ui:844
+#: src/ui/gui/select-cases.ui:738
 msgid "Sample Size"
 msgstr "样本大小"
 
@@ -8843,146 +8452,117 @@ msgstr "单样本T检验"
 msgid "Test _Value: "
 msgstr "检验值(_V)："
 
-#: src/ui/gui/text-data-import.ui:8
-msgid "Importing Textual Data"
-msgstr "导入文本数据"
+#: src/ui/gui/text-data-import.ui:16
+msgid "Select the first line of the data file that contains data."
+msgstr "在包含数据的数据文件行中选择第一行"
+
+#: src/ui/gui/text-data-import.ui:38
+msgid "Line above selected line contains variable names"
+msgstr "选中行之上的行含有变量名称"
+
+#: src/ui/gui/text-data-import.ui:64
+msgid "Check the data formats displayed below and fix any that are incorrect.  You may set other variable properties now or later."
+msgstr "检查下列数据格式并更正错误。现在或以后均可设置其他变量属性。"
 
-#: src/ui/gui/text-data-import.ui:20
-#, fuzzy
+#: src/ui/gui/text-data-import.ui:103
+msgid "<b>Variables</b>"
+msgstr "<b>变量</b>"
+
+#: src/ui/gui/text-data-import.ui:133
+msgid "<b>Data Preview</b>"
+msgstr "<b>数据预览</b>"
+
+#: src/ui/gui/text-data-import.ui:162
 msgid ""
-"This assistant will guide you through the process of importing data into "
-"PSPP from a text file with one line per case,  in which fields are separated "
-"by tabs, commas, or other delimiters.\n"
+"This assistant will guide you through the process of importing data into PSPP from a text file with one line per case,  in which fields are separated by tabs, commas, or other delimiters.\n"
 "\n"
-"\t    The selected file contains N lines of text.  Only the first M of these "
-"will be shown for preview purposes in the following screens.  You may choose "
-"below how much of the file should actually be imported."
+"\tThe selected file contains N lines of text.  Only the first M of these will be shown for preview purposes in the following screens.  You may choose below how much of the file should actually be imported."
 msgstr ""
-"本指南将协助您以每行作为一个个案的方式从文本文件导入数据到PSPP，文本文件中字"
-"段间以制表符、逗号或其他分隔符隔开。\n"
+"本指南将协助您以每行作为一个个案的方式从文本文件导入数据到PSPP，文本文件中字段间以制表符、逗号或其他分隔符隔开。\n"
 "\n"
 "选中的文件含有N行文本。预览窗口将只显示M行。之后您可选择您想导入的行数。"
 
-#: src/ui/gui/text-data-import.ui:82
+#: src/ui/gui/text-data-import.ui:233
 msgid "All cases"
 msgstr "所有个案"
 
-#: src/ui/gui/text-data-import.ui:103
+#: src/ui/gui/text-data-import.ui:253
 msgid "<b>Amount to Import</b>"
 msgstr "<b>导入量</b>"
 
-#: src/ui/gui/text-data-import.ui:123
-msgid "Select Data to Import"
-msgstr "选择数据以导入"
-
-#: src/ui/gui/text-data-import.ui:135
-msgid "Select the first line of the data file that contains data."
-msgstr "在包含数据的数据文件行中选择第一行"
-
-#: src/ui/gui/text-data-import.ui:165
-msgid "Line above selected line contains variable names"
-msgstr "选中行之上的行含有变量名称"
-
-#: src/ui/gui/text-data-import.ui:184
-msgid "Choose Separators"
-msgstr "选择分隔符"
-
-#: src/ui/gui/text-data-import.ui:230
+#: src/ui/gui/text-data-import.ui:306
 msgid "C_ustom"
 msgstr "自定义(_u)"
 
-#: src/ui/gui/text-data-import.ui:246
+#: src/ui/gui/text-data-import.ui:322
 msgid "Slas_h (/)"
 msgstr "斜杠 / (_h)"
 
-#: src/ui/gui/text-data-import.ui:262
+#: src/ui/gui/text-data-import.ui:338
 msgid "Semicolo_n (;)"
 msgstr "分号 ; (_n)"
 
-#: src/ui/gui/text-data-import.ui:278
+#: src/ui/gui/text-data-import.ui:354
 msgid "P_ipe (|)"
 msgstr "管道 | (_i)"
 
-#: src/ui/gui/text-data-import.ui:294
+#: src/ui/gui/text-data-import.ui:370
 msgid "H_yphen (-)"
 msgstr "连字符 - (_y)"
 
-#: src/ui/gui/text-data-import.ui:310
+#: src/ui/gui/text-data-import.ui:386
 msgid "Co_mma (,)"
 msgstr "逗号,(_)"
 
-#: src/ui/gui/text-data-import.ui:326
+#: src/ui/gui/text-data-import.ui:402
 msgid "_Colon (:)"
 msgstr "冒号 :(_C)"
 
-#: src/ui/gui/text-data-import.ui:342
+#: src/ui/gui/text-data-import.ui:418
 msgid "Ban_g (!)"
 msgstr "感叹号 ! (_g)"
 
-#: src/ui/gui/text-data-import.ui:358
+#: src/ui/gui/text-data-import.ui:434
 msgid "Ta_b"
 msgstr "制表符(_b)"
 
-#: src/ui/gui/text-data-import.ui:374
+#: src/ui/gui/text-data-import.ui:450
 msgid "_Space"
 msgstr "空格(_S)"
 
-#: src/ui/gui/text-data-import.ui:396
+#: src/ui/gui/text-data-import.ui:471
 msgid "<b>Separators</b>"
 msgstr "<b>分隔符</b>"
 
-#: src/ui/gui/text-data-import.ui:436
+#: src/ui/gui/text-data-import.ui:517
 msgid "Quote separator characters with"
 msgstr "用下列符号作分隔符的引用符号"
 
-#: src/ui/gui/text-data-import.ui:456
+#: src/ui/gui/text-data-import.ui:537
 msgid "<b>Quoting</b>"
 msgstr "<b>引用</b>"
 
-#: src/ui/gui/text-data-import.ui:504
+#: src/ui/gui/text-data-import.ui:575
 msgid "<b>Fields Preview</b>"
 msgstr "<b>字段预览</b>"
 
-#: src/ui/gui/text-data-import.ui:522
-msgid "Adjust Variable Formats"
-msgstr "调整变量格式"
-
-#: src/ui/gui/text-data-import.ui:534
-msgid ""
-"Check the data formats displayed below and fix any that are incorrect.  You "
-"may set other variable properties now or later."
-msgstr "检查下列数据格式并更正错误。现在或以后均可设置其他变量属性。"
-
-#: src/ui/gui/text-data-import.ui:579
-msgid "<b>Variables</b>"
-msgstr "<b>变量</b>"
-
-#: src/ui/gui/text-data-import.ui:622
-msgid "<b>Data Preview</b>"
-msgstr "<b>数据预览</b>"
-
-#: src/ui/gui/text-data-import.ui:646
-msgid "Importing Spreadsheet Data"
-msgstr "从工作表导入数据"
-
-#: src/ui/gui/text-data-import.ui:658
-msgid ""
-"Enter below the sheet number and the cell range which you wish to import."
+#: src/ui/gui/text-data-import.ui:598
+msgid "Enter below the sheet number and the cell range which you wish to import."
 msgstr "在下面输入要导入的工作表序号及单元格范围。"
 
-#: src/ui/gui/text-data-import.ui:712
+#: src/ui/gui/text-data-import.ui:646
 msgid "_Cells: "
 msgstr "单元格(_C)"
 
-#: src/ui/gui/text-data-import.ui:726
+#: src/ui/gui/text-data-import.ui:660
 msgid "_Sheet Index: "
 msgstr "工作表索引(_S):"
 
-#: src/ui/gui/text-data-import.ui:737
+#: src/ui/gui/text-data-import.ui:671
 msgid "Use first row as _variable names"
 msgstr "第一行作为变量名(_v)"
 
-#: src/ui/gui/text-data-import.ui:760
+#: src/ui/gui/text-data-import.ui:693
 msgid "<b>Cells to Import</b>"
 msgstr "<b>要导入的单元格</b>"
 
@@ -9010,11 +8590,11 @@ msgstr "一元变量：统计量"
 msgid "Univariate"
 msgstr "一元变量"
 
-#: src/ui/gui/univariate.ui:259
+#: src/ui/gui/univariate.ui:264
 msgid "_Dependent Variable"
 msgstr "因变量(_D)"
 
-#: src/ui/gui/univariate.ui:307
+#: src/ui/gui/univariate.ui:312
 msgid "_Fixed Factors"
 msgstr "固定因子(_F)"
 
@@ -9124,236 +8704,223 @@ msgstr "转置(_T)"
 msgid "Transpose the cases with the variables"
 msgstr "对变量进行排序"
 
-#: src/ui/gui/data-editor.ui:194
+#: src/ui/gui/data-editor.ui:195
 msgid "_Aggregate..."
 msgstr "汇总(_A)"
 
-#: src/ui/gui/data-editor.ui:200
+#: src/ui/gui/data-editor.ui:196
+msgid "Aggregate the case values into a new variable"
+msgstr "将多个个案总计为新变量"
+
+#: src/ui/gui/data-editor.ui:203
 msgid "S_plit File..."
 msgstr "分割文件(_p)"
 
-#: src/ui/gui/data-editor.ui:201
+#: src/ui/gui/data-editor.ui:204
 msgid "Split the active dataset"
 msgstr "分割当前数据集"
 
-#: src/ui/gui/data-editor.ui:208
+#: src/ui/gui/data-editor.ui:212
 msgid "Select _Cases..."
 msgstr "选择个案(_C)"
 
-#: src/ui/gui/data-editor.ui:209
+#: src/ui/gui/data-editor.ui:213
 msgid "Choose a subset of cases for analysis"
 msgstr "选定一组个案进行分析"
 
-#: src/ui/gui/data-editor.ui:216
+#: src/ui/gui/data-editor.ui:220
 msgid "_Weight Cases..."
 msgstr "个案加权(_W)"
 
-#: src/ui/gui/data-editor.ui:217
+#: src/ui/gui/data-editor.ui:222
 msgid "Weight cases by variable"
 msgstr "使用变量对个案加权"
 
-#: src/ui/gui/data-editor.ui:224
+#: src/ui/gui/data-editor.ui:229
 msgid "_Transform"
 msgstr "变换(_T)"
 
-#: src/ui/gui/data-editor.ui:231
+#: src/ui/gui/data-editor.ui:236
 msgid "_Compute..."
 msgstr "计算(_C)..."
 
-#: src/ui/gui/data-editor.ui:239
+#: src/ui/gui/data-editor.ui:244
 msgid "Cou_nt..."
 msgstr "计数(_n)..."
 
-#: src/ui/gui/data-editor.ui:247
+#: src/ui/gui/data-editor.ui:252
 msgid "Ran_k Cases..."
 msgstr "个案排序(_k)..."
 
-#: src/ui/gui/data-editor.ui:254
+#: src/ui/gui/data-editor.ui:260
 msgid "Auto_matic Recode..."
 msgstr "自动编码(_m)..."
 
-#: src/ui/gui/data-editor.ui:261
+#: src/ui/gui/data-editor.ui:269
 msgid "Recode into _Same Variables..."
 msgstr "重编码到变量自身(_S)"
 
-#: src/ui/gui/data-editor.ui:268
+#: src/ui/gui/data-editor.ui:278
 msgid "Recode into _Different Variables..."
 msgstr "重编码到其他变量(_D)"
 
-#: src/ui/gui/data-editor.ui:275
+#: src/ui/gui/data-editor.ui:285
 msgid "_Run Pending Transforms"
 msgstr "运行设定好的转换(_R)"
 
-#: src/ui/gui/data-editor.ui:283
+#: src/ui/gui/data-editor.ui:293
 msgid "_Analyze"
 msgstr "分析(_A)"
 
-#: src/ui/gui/data-editor.ui:289
+#: src/ui/gui/data-editor.ui:299
 msgid "_Descriptive Statistics"
 msgstr "描述性统计(_D)"
 
-#: src/ui/gui/data-editor.ui:297
+#: src/ui/gui/data-editor.ui:307
 msgid "_Frequencies..."
 msgstr "频率(_F)"
 
-#: src/ui/gui/data-editor.ui:311
+#: src/ui/gui/data-editor.ui:321
 msgid "_Explore..."
 msgstr "数据探索(_E)"
 
-#: src/ui/gui/data-editor.ui:318
+#: src/ui/gui/data-editor.ui:328
 msgid "_Crosstabs..."
 msgstr "交叉表(_C)"
 
-#: src/ui/gui/data-editor.ui:324
+#: src/ui/gui/data-editor.ui:334
 msgid "Compare _Means"
 msgstr "比较均值(_M)"
 
-#: src/ui/gui/data-editor.ui:332
+#: src/ui/gui/data-editor.ui:342
 msgid "_Means..."
 msgstr "均值(_M)"
 
-#: src/ui/gui/data-editor.ui:339
+#: src/ui/gui/data-editor.ui:349
 msgid "_One Sample T Test..."
 msgstr "单样本T检验(_O)..."
 
-#: src/ui/gui/data-editor.ui:346
+#: src/ui/gui/data-editor.ui:356
 msgid "_Independent Samples T Test..."
 msgstr "独立样本T检验(_I)..."
 
-#: src/ui/gui/data-editor.ui:353
+#: src/ui/gui/data-editor.ui:363
 msgid "_Paired Samples T Test..."
 msgstr "成对样本T检验(_P)..."
 
-#: src/ui/gui/data-editor.ui:360
+#: src/ui/gui/data-editor.ui:370
 msgid "One Way _ANOVA..."
 msgstr "单因素方差分析(_A)..."
 
-#: src/ui/gui/data-editor.ui:367
+#: src/ui/gui/data-editor.ui:377
 msgid "_Univariate Analysis..."
 msgstr "单变量分析(_U)..."
 
-#: src/ui/gui/data-editor.ui:376
+#: src/ui/gui/data-editor.ui:385
 msgid "Bivariate _Correlation..."
 msgstr "二元相关性(_C)..."
 
-#: src/ui/gui/data-editor.ui:384
+#: src/ui/gui/data-editor.ui:393
 msgid "_K-Means Cluster..."
 msgstr "K-均值聚类分析(_K)"
 
-#: src/ui/gui/data-editor.ui:392
+#: src/ui/gui/data-editor.ui:401
 msgid "Factor _Analysis..."
 msgstr "因子分析(_A)"
 
-#: src/ui/gui/data-editor.ui:400
+#: src/ui/gui/data-editor.ui:409
 msgid "Re_liability..."
 msgstr "信度分析(_l)..."
 
-#: src/ui/gui/data-editor.ui:407
+#: src/ui/gui/data-editor.ui:416
 msgid "_Regression"
 msgstr "回归(_R)"
 
-#: src/ui/gui/data-editor.ui:415
+#: src/ui/gui/data-editor.ui:424
 msgid "_Linear..."
 msgstr "线性回归(_L)..."
 
-#: src/ui/gui/data-editor.ui:422
+#: src/ui/gui/data-editor.ui:431
 msgid "_Binary Logistic..."
 msgstr "二元Logistic回归分析(_B)..."
 
-#: src/ui/gui/data-editor.ui:428
+#: src/ui/gui/data-editor.ui:437
 msgid "_Non-Parametric Statistics"
 msgstr "非参数统计(_N)"
 
-#: src/ui/gui/data-editor.ui:436
+#: src/ui/gui/data-editor.ui:445
 msgid "_Chi-Square..."
 msgstr "卡方(_C)..."
 
-#: src/ui/gui/data-editor.ui:443
+#: src/ui/gui/data-editor.ui:452
 msgid "_Binomial..."
 msgstr "二项分布检验(_B)..."
 
-#: src/ui/gui/data-editor.ui:450
+#: src/ui/gui/data-editor.ui:459
 msgid "R_uns..."
 msgstr "游程检验(_u)..."
 
-#: src/ui/gui/data-editor.ui:457
+#: src/ui/gui/data-editor.ui:466
 msgid "1-Sample _K-S..."
 msgstr "单样本Kolmogorov–Smirnov检验(_K)"
 
-#: src/ui/gui/data-editor.ui:464
+#: src/ui/gui/data-editor.ui:473
 msgid "2 _Related Samples..."
 msgstr "两个相关样本检验(_R)..."
 
-#: src/ui/gui/data-editor.ui:471
+#: src/ui/gui/data-editor.ui:480
 msgid "K Related _Samples..."
 msgstr "K个相关样本检验(_S)..."
 
-#: src/ui/gui/data-editor.ui:478
+#: src/ui/gui/data-editor.ui:487
 msgid "ROC Cur_ve..."
 msgstr "ROC曲线(_v)..."
 
-#: src/ui/gui/data-editor.ui:485
+#: src/ui/gui/data-editor.ui:494
 msgid "_Graphs"
-msgstr ""
+msgstr "图形(_G)"
 
-#: src/ui/gui/data-editor.ui:492
-#, fuzzy
+#: src/ui/gui/data-editor.ui:501
 msgid "_Scatterplot"
-msgstr "散点图%s"
+msgstr "散点图(_S)"
 
-#: src/ui/gui/data-editor.ui:500
-#, fuzzy
+#: src/ui/gui/data-editor.ui:509
 msgid "_Histogram"
-msgstr "ç»\98å\88¶ç\9b´æ\96¹å\9b¾(_h)"
+msgstr "ç\9b´æ\96¹å\9b¾(_H)"
 
-#: src/ui/gui/data-editor.ui:508
-#, fuzzy
+#: src/ui/gui/data-editor.ui:517
 msgid "_Barchart"
-msgstr "条形图"
+msgstr "条形图(_B)"
 
-#: src/ui/gui/data-editor.ui:515
+#: src/ui/gui/data-editor.ui:524
 msgid "_Utilities"
 msgstr "工具(_U)"
 
-#: src/ui/gui/data-editor.ui:522
+#: src/ui/gui/data-editor.ui:531
 msgid "_Variables..."
 msgstr "变量(_V)..."
 
-#: src/ui/gui/data-editor.ui:530
+#: src/ui/gui/data-editor.ui:540
 msgid "Data File _Comments..."
 msgstr "数据文件注释(_C)..."
 
-#: src/ui/gui/data-editor.ui:537 src/ui/gui/output-window.ui:50
-#: src/ui/gui/syntax-editor.ui:154
-msgid "_Windows"
-msgstr "窗口(_W)"
-
-#: src/ui/gui/data-editor.ui:543 src/ui/gui/output-window.ui:57
-#: src/ui/gui/syntax-editor.ui:161
-msgid "_Minimize All Windows"
-msgstr "最小化所有窗口(_M)"
-
-#: src/ui/gui/data-editor.ui:550
-msgid "_Split"
-msgstr "拆分(_S)"
-
-#: src/ui/gui/data-editor.ui:699
+#: src/ui/gui/data-editor.ui:684
 msgid "Information Area"
 msgstr "信息区"
 
-#: src/ui/gui/data-editor.ui:721
+#: src/ui/gui/data-editor.ui:706
 msgid "Case Counter Area"
 msgstr "个案计数区"
 
-#: src/ui/gui/data-editor.ui:746
+#: src/ui/gui/data-editor.ui:731
 msgid "Filter Use Status Area"
 msgstr "过滤器使用状态区"
 
-#: src/ui/gui/data-editor.ui:772
+#: src/ui/gui/data-editor.ui:757
 msgid "Weight Status Area"
 msgstr "权重状态区"
 
-#: src/ui/gui/data-editor.ui:798
+#: src/ui/gui/data-editor.ui:783
 msgid "Split File Status Area"
 msgstr "文件拆分状态区"
 
@@ -9448,12 +9015,39 @@ msgstr "替代SPSS的免费数据统计分析软件"
 #~ msgid "Number of clusters may not be larger than the number of cases."
 #~ msgstr "类别数量不能大于个案数量。"
 
+#~ msgid "Value of %s must be between 1 and 100."
+#~ msgstr "%s的值必须处于1到100之间。"
+
+#~ msgid "TreeView path"
+#~ msgstr "树视图路径"
+
+#~ msgid "The path to the row in the GtkTreeView, as a string"
+#~ msgstr "到GtkTreeView行的路径，类型为字符串"
+
+#~ msgid "Diagonal slash"
+#~ msgstr "对角斜线"
+
+#~ msgid "Whether to draw a diagonal slash across the button."
+#~ msgstr "是否在按钮上绘制对角斜线。"
+
 #~ msgid "Incorrect value for variable type"
 #~ msgstr "变量类型的值不正确"
 
 #~ msgid "Font Selection"
 #~ msgstr "选择字体"
 
+#~ msgid "Import Delimited Text Data"
+#~ msgstr "导入分隔符分隔的文本数据。"
+
+#~ msgid "Old Value"
+#~ msgstr "旧值"
+
+#~ msgid "(optional case selection condition)"
+#~ msgstr "(自选个案选择条件)"
+
+#~ msgid "Importing Textual Data"
+#~ msgstr "导入文本数据"
+
 #~ msgid "Doubled quote mark treated as escape"
 #~ msgstr "将双引号用作转义字符"