X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=po%2Fzh_CN.po;h=6b01bb43d83215f6b90743f05bd36de134b88b4c;hb=8182275f1f6638e708a9b354b71709a1e4f33280;hp=6bc9c7b5782ea2a0a8f4c173727e7bde6b8db9d2;hpb=3d183ce2adfc32a104c91baa3ab5909d6f7afaa1;p=pspp

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6bc9c7b578..6b01bb43d8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pspp-0.10.5-pre3\n"
+"Project-Id-Version: pspp-1.0.1\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
 "POT-Creation-Date: 2015-06-19 20:56-0700\n"
-"PO-Revision-Date: 2017-08-22 17:18+0800\n"
+"PO-Revision-Date: 2017-08-29 16:17+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"
@@ -79,8 +79,8 @@ msgstr "字符串"
 msgid "Numeric"
 msgstr "数字"
 
-#: src/data/format.c:416 src/data/sys-file-reader.c:2199
-#: src/data/sys-file-reader.c:2201 src/language/xforms/recode.c:512
+#: src/data/format.c:416 src/data/sys-file-reader.c:2193
+#: src/data/sys-file-reader.c:2195 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
@@ -88,8 +88,8 @@ msgstr "数字"
 msgid "numeric"
 msgstr "数字"
 
-#: src/data/format.c:416 src/data/sys-file-reader.c:2199
-#: src/data/sys-file-reader.c:2201 src/language/xforms/recode.c:512
+#: src/data/format.c:416 src/data/sys-file-reader.c:2193
+#: src/data/sys-file-reader.c:2195 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
@@ -455,7 +455,7 @@ msgstr "系统"
 msgid "scratch"
 msgstr "草稿"
 
-#: src/data/dictionary.c:1336
+#: src/data/dictionary.c:1350
 #, c-format
 msgid "Truncating document line to %d bytes."
 msgstr "将文件行截短到%d字节。"
@@ -605,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:3506
+#: src/data/pc+-file-reader.c:224 src/data/sys-file-reader.c:3507
 #, c-format
 msgid "%s: stat failed (%s)."
 msgstr "%s: 状态统计失败 (%s)."
@@ -711,8 +711,7 @@ msgid "Value labels claimed to be at offset %u with length %u but file size is o
 msgstr "值标签应位于偏移%u处，长度为%u，但文件大小仅为%u字节。"
 
 #: src/data/pc+-file-reader.c:656
-#, fuzzy, c-format
-#| msgid "Value labels end with partial label (%u bytes left in record, label length %<PRIu8>)."
+#, c-format
 msgid "Value labels end with partial label (%u bytes left in record, label length %<PRIu8>)."
 msgstr "值标签的末尾标签值不完整(记录尚剩余%u字节，标签长度为%<PRIu8>)"
 
@@ -737,10 +736,9 @@ msgid "Record 1 has length %u (expected %u)."
 msgstr "记录1长度为%u（要求为%u）。"
 
 #: src/data/pc+-file-reader.c:751
-#, fuzzy, c-format
-#| msgid "Variable %u has invalid type %<PRIu8>."
+#, c-format
 msgid "Variable %u has invalid type %<PRIu8>."
-msgstr "变量%u的类型%<PRIu8>有误。"
+msgstr "变量%u的类型%<PRIu8>无效。"
 
 #: src/data/pc+-file-reader.c:787
 #, c-format
@@ -762,7 +760,7 @@ msgstr "将重复的变量名称`%s'重命名为`%s'。"
 msgid "Cannot weight by string variable `%s'."
 msgstr "字符串变量 `%s'不能用于加权操作。"
 
-#: src/data/pc+-file-reader.c:975 src/data/sys-file-reader.c:2726
+#: src/data/pc+-file-reader.c:975 src/data/sys-file-reader.c:2727
 msgid "File ends in partial case."
 msgstr "文件结束于不完整个案。"
 
@@ -771,36 +769,36 @@ msgstr "文件结束于不完整个案。"
 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:1000 src/data/sys-file-reader.c:2734
+#: src/data/pc+-file-reader.c:1000 src/data/sys-file-reader.c:2735
 #, c-format
 msgid "Error reading case from file %s."
 msgstr "从文件%s读取个案时出现错误。"
 
-#: src/data/pc+-file-reader.c:1116 src/data/sys-file-reader.c:2897
+#: src/data/pc+-file-reader.c:1116 src/data/sys-file-reader.c:2898
 #, c-format
 msgid "Possible compressed data corruption: string contains compressed integer (opcode %d)."
 msgstr "压缩数据可能已损坏：字符串含有压缩过整数(操作 %d)。"
 
-#: src/data/pc+-file-reader.c:1160 src/data/sys-file-reader.c:3195
+#: src/data/pc+-file-reader.c:1160 src/data/sys-file-reader.c:3196
 #, c-format
 msgid "`%s' near offset 0x%llx: "
-msgstr "`%s'位于偏移量0x%llx附近"
+msgstr "`%s'位于偏移量0x%llx附近:"
 
-#: src/data/pc+-file-reader.c:1163 src/data/sys-file-reader.c:3198
+#: src/data/pc+-file-reader.c:1163 src/data/sys-file-reader.c:3199
 #, c-format
 msgid "`%s': "
 msgstr "`%s': "
 
-#: src/data/pc+-file-reader.c:1219 src/data/sys-file-reader.c:3253
+#: src/data/pc+-file-reader.c:1219 src/data/sys-file-reader.c:3254
 #, c-format
 msgid "System error: %s."
 msgstr "系统错误：%s。"
 
-#: src/data/pc+-file-reader.c:1224 src/data/sys-file-reader.c:3258
+#: src/data/pc+-file-reader.c:1224 src/data/sys-file-reader.c:3259
 msgid "Unexpected end of file."
 msgstr "文件意外结束。"
 
-#: src/data/pc+-file-reader.c:1309 src/data/sys-file-reader.c:3483
+#: src/data/pc+-file-reader.c:1309 src/data/sys-file-reader.c:3484
 #, c-format
 msgid "%s: seek failed (%s)."
 msgstr "%s: 查找失败 (%s)."
@@ -1141,352 +1139,357 @@ msgstr "变量类型7的亚类型%d大小%u有误（要求为%d）。"
 msgid "Record type 7, subtype %d has bad count %u (expected %d)."
 msgstr "变量类型7的亚类型%d数量%u有误（要求%d）。"
 
-#: src/data/sys-file-reader.c:1528
+#: src/data/sys-file-reader.c:1530
 msgid "Missing string continuation record."
 msgstr "缺少字符串连续记录。"
 
-#: src/data/sys-file-reader.c:1574
+#: src/data/sys-file-reader.c:1576
 #, 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:1578
+#: src/data/sys-file-reader.c:1580
 #, 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:1583
+#: src/data/sys-file-reader.c:1585
 msgid "Suppressing further invalid format warnings."
 msgstr "不再提示错误格式。"
 
-#: src/data/sys-file-reader.c:1637
+#: src/data/sys-file-reader.c:1639
 #, c-format
 msgid "Floating-point representation 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:1655
 #, c-format
 msgid "Integer format indicated by system file (%d) differs from expected (%d)."
 msgstr "系统文件(%d)提供的整数格式与要求的格式(%d)不同。"
 
-#: src/data/sys-file-reader.c:1671 src/data/sys-file-reader.c:1677
+#: src/data/sys-file-reader.c:1673 src/data/sys-file-reader.c:1679
 #, 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:1686
+#: src/data/sys-file-reader.c:1688
 #, c-format
 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:1738 src/data/sys-file-reader.c:1757
+#: src/data/sys-file-reader.c:1740 src/data/sys-file-reader.c:1759
 #, c-format
 msgid "Missing space following `%c' at offset %zu in MRSETS record."
 msgstr "多重响应数据集(MRSETS)在`%c'后 缺少空格，该处的偏移量为%zu。"
 
-#: src/data/sys-file-reader.c:1767
+#: src/data/sys-file-reader.c:1769
 #, c-format
 msgid "Unexpected label source value following `E' at offset %zu in MRSETS record."
 msgstr "多重响应数据集(MRSETS)的`E'之后标签源值与要求不符，该处的偏移量为%zu。"
 
-#: src/data/sys-file-reader.c:1774
+#: src/data/sys-file-reader.c:1776
 #, 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:1801
+#: src/data/sys-file-reader.c:1803
 #, c-format
 msgid "Missing new-line parsing variable names at offset %zu in MRSETS record."
 msgstr "多重响应数据集(MRSETS)在偏移量%zu处缺少换行解析变量名称。"
 
-#: src/data/sys-file-reader.c:1836
+#: src/data/sys-file-reader.c:1838
 #, c-format
-msgid "Multiple response set name `%s' does not begin with `$'."
-msgstr "多重响应数据集(MRSETS)名称 `%s' 应该以 `$'开头。"
+msgid "Invalid multiple response set name `%s'."
+msgstr "多重响应集名称%s无效。"
 
-#: src/data/sys-file-reader.c:1870
+#: src/data/sys-file-reader.c:1871
 #, c-format
 msgid "MRSET %s contains duplicate variable name %s."
 msgstr "多重响应数据集(MRSETS)%s含有重复的变量名称%s。"
 
-#: src/data/sys-file-reader.c:1885
+#: src/data/sys-file-reader.c:1886
 #, c-format
 msgid "MRSET %s contains both string and numeric variables."
 msgstr "多重响应数据集(MRSETS)%s同时含有字符串变量和数字变量。"
 
-#: src/data/sys-file-reader.c:1897
+#: src/data/sys-file-reader.c:1898
 #, c-format
 msgid "MRSET %s has no variables."
 msgstr "多重响应数据集(MRSETS)%s中没有变量。"
 
-#: src/data/sys-file-reader.c:1899
+#: src/data/sys-file-reader.c:1900
 #, c-format
 msgid "MRSET %s has only one variable."
 msgstr "多重响应数据集(MRSETS)%s只有一个变量。"
 
-#: src/data/sys-file-reader.c:1943
+#: src/data/sys-file-reader.c:1944
 #, c-format
 msgid "Extension 11 has bad count %u (for %zu variables)."
 msgstr "扩展11数量%u有误(共%zu个变量)。"
 
-#: src/data/sys-file-reader.c:1976
+#: src/data/sys-file-reader.c:1977
 #, c-format
 msgid "Invalid variable display parameters for variable %zu (%s).  Default parameters substituted."
 msgstr "变量 %zu (%s)的显示参数有误，使用默认参数代替。"
 
-#: src/data/sys-file-reader.c:2071
-#, c-format
-msgid "Long variable mapping from %s to invalid variable name `%s'."
-msgstr "将%s用长变量映射为不合语法的`%s'。"
-
-#: src/data/sys-file-reader.c:2082
+#: src/data/sys-file-reader.c:2021
 #, c-format
 msgid "Duplicate long variable name `%s'."
 msgstr "长变量名`%s'重复。"
 
-#: src/data/sys-file-reader.c:2115
+#: src/data/sys-file-reader.c:2074
+#, c-format
+msgid "Long variable mapping from %s to invalid variable name `%s'."
+msgstr "将%s用长变量映射为不合语法的`%s'。"
+
+#: src/data/sys-file-reader.c:2109
 #, 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:2126
+#: src/data/sys-file-reader.c:2120
 #, c-format
 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:2134
+#: src/data/sys-file-reader.c:2128
 #, c-format
 msgid "Very long string %s overflows dictionary."
 msgstr "长字符串%s溢出字典。"
 
-#: src/data/sys-file-reader.c:2152
+#: src/data/sys-file-reader.c:2146
 #, c-format
 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:2195
+#: src/data/sys-file-reader.c:2189
 #, c-format
 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:2215
+#: src/data/sys-file-reader.c:2209
 #, c-format
 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:2244
+#: src/data/sys-file-reader.c:2238
 #, c-format
 msgid "Duplicate value label for %g on %s."
 msgstr "值标签%g于%s上重复。"
 
-#: src/data/sys-file-reader.c:2248 src/data/sys-file-reader.c:2562
+#: src/data/sys-file-reader.c:2242 src/data/sys-file-reader.c:2563
 #, c-format
 msgid "Duplicate value label for `%.*s' on %s."
 msgstr "值标签`%.*s'于%s上重复。"
 
-#: src/data/sys-file-reader.c:2275
+#: src/data/sys-file-reader.c:2269
 #, c-format
 msgid "Variable index %d not in valid range 1...%zu."
 msgstr "变量索引%d的超出有效范围1...%zu。"
 
-#: src/data/sys-file-reader.c:2284
+#: src/data/sys-file-reader.c:2278
 #, c-format
 msgid "Variable index %d refers to long string continuation."
 msgstr "变量索引%d指向长字符串连续性。"
 
-#: src/data/sys-file-reader.c:2320
+#: src/data/sys-file-reader.c:2314
 #, c-format
 msgid "Error parsing attribute value %s[%d]."
 msgstr "特征值解析错误%s[%d]。"
 
-#: src/data/sys-file-reader.c:2334
+#: src/data/sys-file-reader.c:2328
 #, c-format
 msgid "Attribute value %s[%d] is not quoted: %s."
 msgstr "特征值%s[%d]没有被引用：%s。"
 
-#: src/data/sys-file-reader.c:2424
+#: src/data/sys-file-reader.c:2341
+#, c-format
+msgid "Duplicate attribute %s."
+msgstr "特征%s重复。"
+
+#: src/data/sys-file-reader.c:2425
 #, c-format
 msgid "Invalid role for variable %s."
 msgstr "变量%s角色错误。"
 
-#: src/data/sys-file-reader.c:2433
+#: src/data/sys-file-reader.c:2434
 #, c-format
 msgid "%zu other variables had invalid roles."
 msgstr "%zu的其他变量角色无效。"
 
-#: src/data/sys-file-reader.c:2446
+#: src/data/sys-file-reader.c:2447
 #, c-format
 msgid "Extension record subtype %d ends unexpectedly."
 msgstr "扩展变量子类型%d意外结束。"
 
-#: src/data/sys-file-reader.c:2492
+#: src/data/sys-file-reader.c:2493
 #, c-format
 msgid "Ignoring long string value label record for unknown variable %s."
 msgstr "未知变量%s，忽略长字串值标签记录。"
 
-#: src/data/sys-file-reader.c:2497
+#: src/data/sys-file-reader.c:2498
 #, c-format
 msgid "Ignoring long string value label record for numeric variable %s."
 msgstr "忽略数字变量%s的长字串值标签记录。"
 
-#: src/data/sys-file-reader.c:2504
+#: src/data/sys-file-reader.c:2505
 #, 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)."
 msgstr "忽略变量%s的长字串值标签记录，因其宽度(%d)与变量宽度(%d)不符。"
 
-#: src/data/sys-file-reader.c:2535
+#: src/data/sys-file-reader.c:2536
 #, c-format
 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:2609
+#: src/data/sys-file-reader.c:2610
 #, c-format
 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:2619
+#: src/data/sys-file-reader.c:2620
 #, c-format
 msgid "Ignoring long string missing value record for unknown variable %s."
 msgstr "忽略未知变量%s的长字符串缺失值记录。"
 
-#: src/data/sys-file-reader.c:2624
+#: src/data/sys-file-reader.c:2625
 #, c-format
 msgid "Ignoring long string missing value record for numeric variable %s."
 msgstr "忽略数字变量%s的长字符串缺失值记录。"
 
-#: src/data/sys-file-reader.c:2649
+#: src/data/sys-file-reader.c:2650
 #, c-format
 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:2704
+#: src/data/sys-file-reader.c:2705
 msgid "File ends in partial string value."
 msgstr "文件结束于不完整字符串值。"
 
-#: src/data/sys-file-reader.c:2843
+#: src/data/sys-file-reader.c:2844
 msgid "Possible compressed data corruption: compressed spaces appear in numeric field."
 msgstr "压缩的数据可能已损坏：压缩空间出现于数字字段。"
 
-#: src/data/sys-file-reader.c:2994
+#: src/data/sys-file-reader.c:2995
 #, c-format
 msgid "Suppressed %d additional related warnings."
 msgstr "%d的相关警告没有显示。"
 
-#: src/data/sys-file-reader.c:3040 src/data/sys-file-reader.c:3057
+#: src/data/sys-file-reader.c:3041 src/data/sys-file-reader.c:3058
 #, c-format
 msgid "Dictionary record refers to unknown variable %s."
 msgstr "字典记录指向未知变量%s。"
 
-#: src/data/sys-file-reader.c:3119
+#: src/data/sys-file-reader.c:3120
 #, c-format
 msgid "Expecting digit at offset %zu in MRSETS record."
 msgstr "多重响应记录在偏移量%zu处应为数字。"
 
-#: src/data/sys-file-reader.c:3127
+#: src/data/sys-file-reader.c:3128
 #, c-format
 msgid "Expecting space at offset %zu in MRSETS record."
 msgstr "多重响应记录在偏移量%zu处应为空格。"
 
-#: src/data/sys-file-reader.c:3135
+#: src/data/sys-file-reader.c:3136
 #, c-format
 msgid "%zu-byte string starting at offset %zu exceeds record length %zu."
 msgstr "%zu字节的字符串从偏移量%zu开始处超过记录长度%zu。"
 
-#: src/data/sys-file-reader.c:3145
+#: src/data/sys-file-reader.c:3146
 #, c-format
 msgid "Expecting space at offset %zu following %zu-byte string."
 msgstr "偏移量%zu处应为紧接于%zu-字节字符串后的空格。"
 
-#: src/data/sys-file-reader.c:3441
+#: src/data/sys-file-reader.c:3442
 #, c-format
 msgid "Wrong ZLIB data header offset %#llx (expected %#llx)."
 msgstr "ZLIB数据头偏移错误%#llx(应为%#llx)."
 
-#: src/data/sys-file-reader.c:3449
+#: src/data/sys-file-reader.c:3450
 #, c-format
 msgid "Impossible ZLIB trailer offset 0x%llx."
 msgstr "错误的ZLIB尾端偏移0x%llx."
 
-#: src/data/sys-file-reader.c:3456
+#: src/data/sys-file-reader.c:3457
 #, c-format
 msgid "Invalid ZLIB trailer length %lld."
 msgstr "ZLIB尾端长度错误%lld."
 
-#: src/data/sys-file-reader.c:3520
+#: src/data/sys-file-reader.c:3521
 #, 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:3530
+#: src/data/sys-file-reader.c:3531
 #, c-format
 msgid "ZLIB trailer bias (%lld) differs from file header bias (%.2f)."
 msgstr "ZLIB尾端偏量(%lld)与文件头偏量(%.2f)不符。"
 
-#: src/data/sys-file-reader.c:3540
+#: src/data/sys-file-reader.c:3541
 #, c-format
 msgid "ZLIB trailer \"zero\" field has nonzero value %lld."
 msgstr "ZLIB尾端\"zero\"字段含有非零值%lld。"
 
-#: src/data/sys-file-reader.c:3546
+#: src/data/sys-file-reader.c:3547
 #, c-format
 msgid "ZLIB trailer specifies unexpected %u-byte block size."
 msgstr "ZLIB尾端含有不符合要求的%u字节块。"
 
-#: src/data/sys-file-reader.c:3554
+#: src/data/sys-file-reader.c:3555
 #, c-format
 msgid "%lld-byte ZLIB trailer specifies %u data blocks (expected %lld)."
 msgstr "ZLIB尾端%lld-字节含有%u数据块（应该为%lld）。"
 
-#: src/data/sys-file-reader.c:3579
+#: src/data/sys-file-reader.c:3580
 #, c-format
 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:3588
+#: src/data/sys-file-reader.c:3589
 #, c-format
 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:3598
+#: src/data/sys-file-reader.c:3599
 #, c-format
 msgid "ZLIB block descriptor %u reported block size %#x, when %#x was expected."
 msgstr "ZLIB块描述%u的区块尺寸为%#x，应该为%#x。"
 
-#: src/data/sys-file-reader.c:3606
+#: src/data/sys-file-reader.c:3607
 #, c-format
 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:3618
+#: src/data/sys-file-reader.c:3619
 #, c-format
 msgid "ZLIB block descriptor %u reports compressed size %u and uncompressed size %u."
 msgstr "ZLIB块描述%u中的压缩尺寸为%u，未压缩尺寸为%u。"
 
-#: src/data/sys-file-reader.c:3630
+#: src/data/sys-file-reader.c:3631
 #, c-format
 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:3649
+#: src/data/sys-file-reader.c:3650
 #, c-format
 msgid "ZLIB initialization failed (%s)."
 msgstr "ZLIB初始化失败(%s)。"
 
-#: src/data/sys-file-reader.c:3664
+#: src/data/sys-file-reader.c:3665
 #, c-format
 msgid "Inconsistency at end of ZLIB stream (%s)."
 msgstr "ZLIB流结束处数据前后矛盾(%s)。"
 
-#: src/data/sys-file-reader.c:3723
+#: src/data/sys-file-reader.c:3724
 #, c-format
 msgid "ZLIB stream inconsistency (%s)."
 msgstr "ZLIB流数据前后矛盾(%s)。"
 
-#: src/data/sys-file-reader.c:3747
+#: src/data/sys-file-reader.c:3748
 msgid "Unexpected end of ZLIB compressed data."
 msgstr "ZLIB压缩数据结束处不符要求。"
 
-#: src/data/sys-file-reader.c:3785
+#: src/data/sys-file-reader.c:3786
 msgid "SPSS System File"
 msgstr "SPSS系统文件"
 
@@ -3536,8 +3539,6 @@ msgid "Multivariate analysis is not yet implemented"
 msgstr "不包含多元分析"
 
 #: src/language/stats/glm.c:273
-#, fuzzy
-#| msgid "Only types 1, 2 & 3 sums of squares are currently implemented"
 msgid "Only types 1, 2 & 3 sums of squares are currently implemented"
 msgstr "仅支持平方和类型1，2和3"
 
@@ -3781,8 +3782,6 @@ msgid "-2 Log likelihood"
 msgstr "-2x对数似然"
 
 #: src/language/stats/logistic.c:1370
-#, fuzzy
-#| msgid "Cox & Snell R Square"
 msgid "Cox & Snell R Square"
 msgstr "Cox和Snell R平方"
 
@@ -3955,10 +3954,8 @@ msgid "Exact Sig. (1-tailed)"
 msgstr "确切显著度(单尾)"
 
 #: src/language/stats/median.c:359
-#, fuzzy
-#| msgid "Median"
 msgid "> Median"
-msgstr "中位数"
+msgstr ">中位数"
 
 #: src/language/stats/median.c:362
 msgid "≤ Median"
@@ -4487,10 +4484,8 @@ msgid "Test Value (median)"
 msgstr "检验值(中位数)"
 
 #: src/language/stats/runs.c:387
-#, fuzzy
-#| msgid "Cases ≥ Test Value"
 msgid "Cases < Test Value"
-msgstr "≥检验值的个案"
+msgstr "<检验值的个案"
 
 #: src/language/stats/runs.c:390
 msgid "Cases ≥ Test Value"
@@ -4593,8 +4588,7 @@ msgid "Correlation"
 msgstr "相关"
 
 #: src/language/stats/t-test-paired.c:246
-#, fuzzy, c-format
-#| msgid "%s & %s"
+#, c-format
 msgid "%s & %s"
 msgstr "%s 和 %s"
 
@@ -5214,10 +5208,8 @@ msgid "Type mismatch while applying %s operator: cannot convert %s to %s."
 msgstr "执行%s操作时类型不匹配：不能将%s转换为%s。"
 
 #: src/language/expressions/parse.c:650
-#, fuzzy
-#| msgid "Chaining relational operators (e.g. `a &lt; b &lt; c') will not produce the mathematically expected result.  Use the AND logical operator to fix the problem (e.g. `a &lt; b AND b &lt; c').  If chaining is really intended, parentheses will disable this warning (e.g. `(a &lt; b) &lt; 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')。"
+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."
@@ -5476,10 +5468,9 @@ msgid "Unsupported compression type (%d)"
 msgstr "不支持压缩类型(%d)"
 
 #: src/libpspp/zip-reader.c:212
-#, fuzzy, c-format
-#| msgid "Corrupt file at 0x%llx: Expected %&lt;PRIx32&gt;; got %&lt;PRIx32&gt;"
+#, c-format
 msgid "Corrupt file at 0x%llx: Expected %<PRIx32>; got %<PRIx32>"
-msgstr "文件于0x%llx处损坏：要求%<PRIx32>；实际为%<PRIx32>；"
+msgstr "文件于0x%llx处损坏：要求%<PRIx32>；实际为%<PRIx32>"
 
 #: src/libpspp/zip-reader.c:337
 msgid "Cannot find central directory"
@@ -5505,7 +5496,7 @@ msgstr "头端查询失败`%s': %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
+#: src/libpspp/zip-writer.c:96 utilities/pspp-convert.c:207
 #, c-format
 msgid "%s: error opening output file"
 msgstr "%s：打开输出文件出错"
@@ -6658,7 +6649,7 @@ msgstr "通过%s加权个案"
 #. - The string may not contain whitespace.
 #. - The first character may not be '$'
 #. - The first character may not be a digit
-#. - The final charactor may not be '.' or '_'
+#. - The final character may not be '.' or '_'
 #.
 #: src/ui/gui/psppire-dict.c:332
 #, c-format
@@ -6904,17 +6895,17 @@ msgstr "加密语法文件只能转换为sps格式"
 msgid "%s: unknown output format (use -O option)"
 msgstr "%s：未知的输出格式(使用-O选项)"
 
-#: utilities/pspp-convert.c:219
+#: utilities/pspp-convert.c:221
 #, c-format
 msgid "%s: error reading input file"
 msgstr "%s：读取输入文件错误"
 
-#: utilities/pspp-convert.c:221
+#: utilities/pspp-convert.c:223
 #, c-format
 msgid "%s: error writing output file"
 msgstr "%s：写入输出文件错误"
 
-#: utilities/pspp-convert.c:261
+#: utilities/pspp-convert.c:263
 msgid "sorry, wrong password"
 msgstr "抱歉，密码错误"
 
@@ -7298,8 +7289,6 @@ msgid "Automatic Recode"
 msgstr "自动重编码"
 
 #: src/ui/gui/autorecode.ui:120
-#, fuzzy
-#| msgid "Variable -> New Name"
 msgid "Variable -> New Name"
 msgstr "变量 -> 新名称"
 
@@ -7380,8 +7369,6 @@ msgid "Target _Variable:"
 msgstr "目标变量(_V)："
 
 #: src/ui/gui/compute.ui:412
-#, fuzzy
-#| msgid "_Type & Label..."
 msgid "_Type & Label..."
 msgstr "类型和标签(_T)..."
 
@@ -7899,8 +7886,6 @@ msgid "0"
 msgstr "0"
 
 #: src/ui/gui/frequencies.ui:467
-#, fuzzy
-#| msgid "<b>Chart Formatting</b>"
 msgid "<b>Chart Formatting</b>"
 msgstr "<b>图表格式</b>"
 
@@ -7997,14 +7982,10 @@ msgid "_Grouping Variable:"
 msgstr "分组变量(_G)"
 
 #: src/ui/gui/k-independent.ui:62
-#, fuzzy
-#| msgid "_Upper:"
 msgid "_Upper limit:"
 msgstr "上限(_U)："
 
 #: src/ui/gui/k-independent.ui:76
-#, fuzzy
-#| msgid "_Lower:"
 msgid "_Lower limit:"
 msgstr "下限(_L)："
 
@@ -8183,10 +8164,8 @@ msgid "Options Case"
 msgstr "选项"
 
 #: src/ui/gui/options.ui:55
-#, fuzzy
-#| msgid "Value _Labels"
 msgid "Display _Labels"
-msgstr "值标签(_L)"
+msgstr "显示标签(_L)"
 
 #: src/ui/gui/options.ui:71
 msgid "Display _Names"
@@ -8425,8 +8404,6 @@ msgid "New Value"
 msgstr "新值"
 
 #: src/ui/gui/recode.ui:275
-#, fuzzy
-#| msgid "Conver_t numeric strings to numbers (`5' -> 5)"
 msgid "Conver_t numeric strings to numbers (`5' -> 5)"
 msgstr "将数字字符转换为数字，如`5' -> 5(_t)"
 
@@ -8655,10 +8632,8 @@ msgid "<b>Variables</b>"
 msgstr "<b>变量</b>"
 
 #: src/ui/gui/text-data-import.ui:149
-#, fuzzy
-#| msgid "<b>Variables</b>"
 msgid "<b>Data Preview</b>"
-msgstr "<b>变量</b>"
+msgstr "<b>数据预览</b>"
 
 #: src/ui/gui/text-data-import.ui:178
 msgid ""
@@ -8675,8 +8650,6 @@ msgid "All cases"
 msgstr "所有个案"
 
 #: src/ui/gui/text-data-import.ui:269
-#, fuzzy
-#| msgid "<b>Amount to Import</b>"
 msgid "<b>Amount to Import</b>"
 msgstr "<b>导入量</b>"
 
@@ -8733,8 +8706,6 @@ msgid "<b>Quoting</b>"
 msgstr "<b>引用</b>"
 
 #: src/ui/gui/text-data-import.ui:591
-#, fuzzy
-#| msgid "<b>Fields Preview</b>"
 msgid "<b>Fields Preview</b>"
 msgstr "<b>字段预览</b>"
 
@@ -8755,8 +8726,6 @@ msgid "Use first row as _variable names"
 msgstr "第一行作为变量名(_v)"
 
 #: src/ui/gui/text-data-import.ui:709
-#, fuzzy
-#| msgid "<b>Cells to Import</b>"
 msgid "<b>Cells to Import</b>"
 msgstr "<b>要导入的单元格</b>"
 
@@ -8977,8 +8946,6 @@ msgid "_Non-Parametric Statistics"
 msgstr "非参数统计(_N)"
 
 #: src/ui/gui/data-editor.ui:338
-#, fuzzy
-#| msgid "_Chi-Square..."
 msgid "_Chi Square..."
 msgstr "卡方(_C)..."
 
@@ -9055,8 +9022,6 @@ msgid "Syntax"
 msgstr "语法"
 
 #: src/ui/gui/syntax-editor.ui:31
-#, fuzzy
-#| msgid "_Data"
 msgid "Data"
 msgstr "数据"
 
@@ -9156,6 +9121,9 @@ msgstr "统计软件"
 msgid "Analyze statistical data with a free alternative to SPSS"
 msgstr "替代SPSS的免费数据统计分析软件"
 
+#~ msgid "Multiple response set name `%s' does not begin with `$'."
+#~ msgstr "多重响应数据集(MRSETS)名称 `%s' 应该以 `$'开头。"
+
 #, fuzzy
 #~| msgid "> Median"
 #~ msgid "&gt; Median"