From cf87ff277c069549561513487c3ac5fab927a8ff Mon Sep 17 00:00:00 2001 From: Youhuang Bai Date: Mon, 21 Oct 2019 14:10:50 -0500 Subject: [PATCH 1/7] translate assigned to group 3 --- po/R-zh_CN.po | 58 ++++++++++++++++++++++++++---------------------- po/zh_CN.po | 61 +++++++++++++++++++++++++++++++++------------------ 2 files changed, 72 insertions(+), 47 deletions(-) diff --git a/po/R-zh_CN.po b/po/R-zh_CN.po index ec3b630c3c..40ca532519 100644 --- a/po/R-zh_CN.po +++ b/po/R-zh_CN.po @@ -168,97 +168,103 @@ msgstr "" msgid ". Only integer, double or character columns may be roll joined." msgstr "" - +>>>>>>>> msgid "Incompatible join types: x." -msgstr "" +msgstr "不兼容的合并类型： x。" msgid "(" -msgstr "" +msgstr "（" msgid ") and i." -msgstr "" +msgstr "）和 i。" msgid "). Factor columns must join to factor or character columns." -msgstr "" +msgstr "）。 因子类型的列必须与因子类型或字符类型的列才可以合并" msgid ")" -msgstr "" +msgstr "）" msgid "Incompatible join types:" -msgstr "" +msgstr "不兼容的合并类型" msgid "is type integer64 but" -msgstr "" +msgstr "是 integer64 类型但是" msgid "is type double and contains fractions" -msgstr "" +msgstr "是 double 类型并且包含分数" msgid "roll is not implemented for non-equi joins yet." -msgstr "" +msgstr "roll 还没有执行 non-equi joins" msgid "Column name '_nqgrp_' is reserved for non-equi joins." -msgstr "" +msgstr "列名 '_nqgrp_' 是为 non-equi joins 保留的" msgid "key argument of data.table() must be character" -msgstr "" +msgstr "data.table() 的主参数必须是字符" msgid "Object '" -msgstr "" +msgstr "对象 '" msgid "' not found. Perhaps you intended" -msgstr "" +msgstr "' 不存在， 可能你打算" msgid "," -msgstr "" +msgstr "," msgid "or" -msgstr "" +msgstr "或者" msgid "more" -msgstr "" +msgstr "更多" msgid "' not found amongst" -msgstr "" +msgstr "' 没有发现" msgid "and" -msgstr "" +msgstr "并且" msgid "Provide either by= or keyby= but not both" -msgstr "" +msgstr "提供 by= 或 keyby= ，但两者不能同时存在" msgid "Ignoring keyby= because j= is not supplied" -msgstr "" +msgstr "忽略 keyby= 因为没有提供 j= " msgid "Ignoring by= because j= is not supplied" -msgstr "" +msgstr "忽略 by= 因为没有提供 j= " msgid "" "When on= is provided but not i=, on= must be a named list or data.table|" "frame, and a natural join (i.e. join on common names) is invoked. Ignoring " "on= which is '" msgstr "" +"当提供 on= 而不提供 i= 的时候， on= 必须是带名称的 list 或者 data.table 或者 data.frame，" +"并且会调用自然合并（例如，按照共有名称合并），忽略 on= " msgid "'." -msgstr "" +msgstr "'。" msgid "" "i and j are both missing so ignoring the other arguments. This warning will " "be upgraded to error in future." msgstr "" +"i 和 j 都缺少的时候忽略其他参数。将来此警告信息将升级为错误信息。" msgid "mult argument can only be 'first', 'last' or 'all'" -msgstr "" +msgstr "mult 参数只能赋值为 'first'， 'last' 或 'all'" msgid "" "roll must be a single TRUE, FALSE, positive/negative integer/double " "including +Inf and -Inf or 'nearest'" msgstr "" +"roll 必须是单个参数，例如 TRUE， FALSE, 正或负的 integer 或 double" +"包括 +Inf ， -Inf 或 'nearest'" msgid "roll is '" -msgstr "" +msgstr "roll 是" msgid "' (type character). Only valid character value is 'nearest'." -msgstr "" +msgstr "'(字符类型)。 唯一有效的字符值是'nearest'。" +<<<<<<<< msgid "rollends must be a logical vector" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 710b460ec5..f98be42a90 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -314,6 +314,7 @@ msgid "" "your code." msgstr "" +>>>>>>>> #: assign.c:449 msgid "" "This data.table has either been loaded from disk (e.g. using readRDS()/" @@ -321,6 +322,8 @@ msgid "" "or setalloccol() on it first (to pre-allocate space for new columns) before " "assigning by reference to it." msgstr "" +" data.table ǴӲ̵( readRDS()/load() )ֶ( structure() )" +"ͨõķʽиֵǰ setDT() setalloccol() ΪӵԤȷռ" #: assign.c:450 #, c-format @@ -328,6 +331,8 @@ msgid "" "Internal error: oldtncol(%d) < oldncol(%d). Please report to data.table " "issue tracker, including result of sessionInfo()." msgstr "" +"ڲ: oldtncol(%d) < oldncol(%d) 뽫㱨 data.table ׷" +" sessionInfo() Ϣ" #: assign.c:452 #, c-format @@ -337,6 +342,9 @@ msgid "" "please report to data.table issue tracker including the result of " "sessionInfo()." msgstr "" +"truelength (%d) ֵڳ 10000 (length = %d)鿴 ?truelength +"ûн datatable.alloccol Ϊdzֵ뽫㱨 data.table ׷" +" sessionInfo() Ϣ" #: assign.c:454 #, c-format @@ -344,6 +352,8 @@ msgid "" "Internal error: DT passed to assign has not been allocated enough column " "slots. l=%d, tl=%d, adding %d" msgstr "" +"ڲ: ݳȥֵ DT ûб㹻вۡ l=%d, tl=%d, %d" + #: assign.c:456 msgid "" @@ -351,17 +361,22 @@ msgid "" "reassigned. Please ensure to use setnames() rather than names<- or " "colnames<-. Otherwise, please report to data.table issue tracker." msgstr "" +" ǰijʱ̣ data.table Ѿ¸ֵ" +"ȷʹ setnames() names<- colnames<- иֵ" +"ð취Ч뽫㱨 data.table ׷ sessionInfo() Ϣ" #: assign.c:460 #, c-format msgid "Internal error: selfrefnames is ok but tl names [%d] != tl [%d]" msgstr "" +"ڲ: selfrefnames ȷ tl [%d] != tl [%d]" #: assign.c:471 msgid "" "Internal error: earlier error 'When deleting columns, i should not be " "provided' did not happen." msgstr "" +"ڲ: ǰڵĴ 'ɾеʱ򣬲Ӧṩ i ' ûз" #: assign.c:482 #, c-format @@ -369,11 +384,13 @@ msgid "" "RHS for item %d has been duplicated because NAMED==%d MAYBE_SHARED==%d, but " "then is being plonked. length(values)==%d; length(cols)==%d)\n" msgstr "" +"Ŀ %d RHS Ѿƣ Ϊ NAMED==%d MAYBE_SHARED==%d Ȼ plonk" +"length(values)==%d; length(cols)==%d)\n" #: assign.c:487 #, c-format msgid "Direct plonk of unnamed RHS, no copy. NAMED==%d, MAYBE_SHARED==%d\n" -msgstr "" +msgstr "ֱ plonk ûֵ RHSûиơ NAMED==%d, MAYBE_SHARED==%d\n" #: assign.c:556 #, c-format @@ -381,117 +398,119 @@ msgid "" "Dropping index '%s' as it doesn't have '__' at the beginning of its name. It " "was very likely created by v1.9.4 of data.table.\n" msgstr "" +" '%s' Ϊǰû '__' ܿ data.table v1.9.4 " #: assign.c:564 msgid "Internal error: index name ends with trailing __" -msgstr "" +msgstr "ڲ: __ β" #: assign.c:569 msgid "Internal error: Couldn't allocate memory for s4." -msgstr "" +msgstr "ڲ: ܸ s4 ڴ" #: assign.c:580 msgid "Internal error: Couldn't allocate memory for s5." -msgstr "" +msgstr "ڲ: ܸ s5 ڴ" #: assign.c:601 assign.c:617 #, c-format msgid "Dropping index '%s' due to an update on a key column\n" -msgstr "" +msgstr " Ϊһеĸ£ '%s'" #: assign.c:610 #, c-format msgid "Shortening index '%s' to '%s' due to an update on a key column\n" -msgstr "" +msgstr "Ϊһеĸ£ '%s' '%s'" #: assign.c:687 #, c-format msgid "Internal error: recycle length error not caught earlier. slen=%d len=%d" -msgstr "" +msgstr "ڲ: δֵѭȴ slen=%d len=%d" #: assign.c:691 msgid "Internal error: memrecycle has received NULL colname" -msgstr "" +msgstr "ڲ: memrecycle ܵΪ NULL " #: assign.c:717 #, c-format msgid "" "Cannot assign 'factor' to '%s'. Factors can only be assigned to factor, " "character or list columns." -msgstr "" +msgstr "ܽ 'factor' ֵΪ '%s' ֵֻܸΪӣַбе" #: assign.c:731 #, c-format msgid "" "Assigning factor numbers to column %d named '%s'. But %d is outside the " "level range [1,%d]" -msgstr "" +msgstr " %d Ϊ '%s' ֵΪӡ %d ڲηΧ[1,%d]֮" #: assign.c:739 #, c-format msgid "" "Assigning factor numbers to column %d named '%s'. But %f is outside the " "level range [1,%d], or is not a whole number." -msgstr "" +msgstr " %d Ϊ '%s' ֵΪӡ %f ڲηΧ[1,%d]֮⣬߲һ" #: assign.c:745 #, c-format msgid "" "Cannot assign '%s' to 'factor'. Factor columns can be assigned factor, " "character, NA in any type, or level numbers." -msgstr "" +msgstr "ܽ 'factor' ֵΪ '%s' пɱֵΪӣַ NA ֵ" #: assign.c:766 msgid "" "Internal error: levels of target are either not unique or have truelength<0" -msgstr "" +msgstr "ڲ: ĿIJβΨһ߳<0" #: assign.c:805 #, c-format msgid "Unable to allocate working memory of %d bytes to combine factor levels" -msgstr "" +msgstr "ܷ %d ֽڵĹڴӲ" #: assign.c:812 msgid "Internal error: extra level check sum failed" -msgstr "" +msgstr "ڲ: IJУʧ" #: assign.c:831 #, c-format msgid "" "Coercing 'character' RHS to '%s' to match the type of the target column " "(column %d named '%s')." -msgstr "" +msgstr "'character' RHS ǿת '%s' ƥĿе" #: assign.c:837 #, c-format msgid "" "Cannot coerce 'list' RHS to 'integer64' to match the type of the target " "column (column %d named '%s')." -msgstr "" +msgstr "ܽ'list' RHS ǿת 'integer64' ƥĿе" #: assign.c:842 #, c-format msgid "" "Coercing 'list' RHS to '%s' to match the type of the target column (column " "%d named '%s')." -msgstr "" +msgstr "'list' RHS ǿת '%s' ƥĿе( %d '%s')" #: assign.c:848 #, c-format msgid "Zero-copy coerce when assigning '%s' to '%s' column %d named '%s'.\n" -msgstr "" +msgstr " '%s' ֵ '%s' %d '%s'Zero-copyǿת" #: assign.c:943 #, c-format msgid "type '%s' cannot be coerced to '%s'" -msgstr "" +msgstr " '%s' ǿת '%s'" #: assign.c:1063 msgid "" "To assign integer64 to a character column, please use as.character() for " "clarity." -msgstr "" +msgstr "ʹ as.character() integer64 ͵ֵֵַ" +<<<<<<<< #: assign.c:1074 #, c-format msgid "Unsupported column type in assign.c:memrecycle '%s'" From 658c85b35b43d06f14104954d277b6d0174b0f58 Mon Sep 17 00:00:00 2001 From: Youhuang Bai Date: Mon, 21 Oct 2019 14:21:10 -0500 Subject: [PATCH 2/7] translate assigned to group 3 --- po/zh_CN.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index f98be42a90..6316b51516 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -343,8 +343,8 @@ msgid "" "sessionInfo()." msgstr "" "truelength (%d) ֵڳ 10000 (length = %d)鿴 ?truelength -"ûн datatable.alloccol Ϊdzֵ뽫㱨 data.table ׷" -" sessionInfo() Ϣ" +"ûн datatable.alloccol Ϊdzֵ" +"뽫㱨 data.table ׷ sessionInfo() Ϣ" #: assign.c:454 #, c-format @@ -384,7 +384,7 @@ msgid "" "RHS for item %d has been duplicated because NAMED==%d MAYBE_SHARED==%d, but " "then is being plonked. length(values)==%d; length(cols)==%d)\n" msgstr "" -"Ŀ %d RHS Ѿƣ Ϊ NAMED==%d MAYBE_SHARED==%d Ȼ plonk" +"Ŀ %d RHS Ѿƣ Ϊ NAMED==%d MAYBE_SHARED==%d Ȼ plonk" "length(values)==%d; length(cols)==%d)\n" #: assign.c:487 From dcb06e843ea06ab596d3782335d97a09cb3df2dd Mon Sep 17 00:00:00 2001 From: Youhuang Bai Date: Mon, 21 Oct 2019 14:51:55 -0500 Subject: [PATCH 3/7] translate assigned to group 3 --- po/R-zh_CN.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/R-zh_CN.po b/po/R-zh_CN.po index 40ca532519..e74389da20 100644 --- a/po/R-zh_CN.po +++ b/po/R-zh_CN.po @@ -170,7 +170,7 @@ msgid ". Only integer, double or character columns may be roll joined." msgstr "" >>>>>>>> msgid "Incompatible join types: x." -msgstr "不兼容的合并类型： x。" +msgstr "不兼容的联结类型： x。" msgid "(" msgstr "（" @@ -179,13 +179,13 @@ msgid ") and i." msgstr "）和 i。" msgid "). Factor columns must join to factor or character columns." -msgstr "）。 因子类型的列必须与因子类型或字符类型的列才可以合并" +msgstr "）。 因子类型的列必须与因子类型或字符类型的列才可以联结" msgid ")" msgstr "）" msgid "Incompatible join types:" -msgstr "不兼容的合并类型" +msgstr "不兼容的联结类型" msgid "is type integer64 but" msgstr "是 integer64 类型但是" @@ -238,7 +238,7 @@ msgid "" "on= which is '" msgstr "" "当提供 on= 而不提供 i= 的时候， on= 必须是带名称的 list 或者 data.table 或者 data.frame，" -"并且会调用自然合并（例如，按照共有名称合并），忽略 on= " +"并且会调用自然联结（例如，按照共有名称联结），忽略 on= " msgid "'." msgstr "'。" From 0861db3c349caad2ea9468a9d707814dbc643658 Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Tue, 22 Oct 2019 08:07:21 +0800 Subject: [PATCH 4/7] remove merge conflict vestiges --- po/R-zh_CN.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/R-zh_CN.po b/po/R-zh_CN.po index e74389da20..45517e7c48 100644 --- a/po/R-zh_CN.po +++ b/po/R-zh_CN.po @@ -168,7 +168,7 @@ msgstr "" msgid ". Only integer, double or character columns may be roll joined." msgstr "" ->>>>>>>> + msgid "Incompatible join types: x." msgstr "不兼容的联结类型： x。" @@ -264,7 +264,6 @@ msgstr "roll 是" msgid "' (type character). Only valid character value is 'nearest'." msgstr "'(字符类型)。 唯一有效的字符值是'nearest'。" -<<<<<<<< msgid "rollends must be a logical vector" msgstr "" From 7cbb28dc894e4dcb275ab631b7ace6f479ef51a6 Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Tue, 22 Oct 2019 08:09:38 +0800 Subject: [PATCH 5/7] remove merge conflict vestiges --- po/zh_CN.po | 163 ++++++++++++++++++++++++++-------------------------- 1 file changed, 80 insertions(+), 83 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 6316b51516..a5ca89c9c4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -314,7 +314,6 @@ msgid "" "your code." msgstr "" ->>>>>>>> #: assign.c:449 msgid "" "This data.table has either been loaded from disk (e.g. using readRDS()/" @@ -322,8 +321,8 @@ msgid "" "or setalloccol() on it first (to pre-allocate space for new columns) before " "assigning by reference to it." msgstr "" -" data.table ǴӲ̵( readRDS()/load() )ֶ( structure() )" -"ͨõķʽиֵǰ setDT() setalloccol() ΪӵԤȷռ" +"此 data.table 是从硬盘导入(例如 readRDS()/load() )或者手动创建(例如 structure() )。" +"在通过引用的方式进行赋值前，请先运行 setDT() 或 setalloccol() 来为增加的列预先分配空间" #: assign.c:450 #, c-format @@ -331,8 +330,8 @@ msgid "" "Internal error: oldtncol(%d) < oldncol(%d). Please report to data.table " "issue tracker, including result of sessionInfo()." msgstr "" -"ڲ: oldtncol(%d) < oldncol(%d) 뽫㱨 data.table ׷" -" sessionInfo() Ϣ" +"内部错误: oldtncol(%d) < oldncol(%d)。 请将此问题汇报给 data.table 问题追踪器，" +"包括 sessionInfo() 的信息。" #: assign.c:452 #, c-format @@ -342,9 +341,9 @@ msgid "" "please report to data.table issue tracker including the result of " "sessionInfo()." msgstr "" -"truelength (%d) ֵڳ 10000 (length = %d)鿴 ?truelength -"ûн datatable.alloccol Ϊdzֵ" -"뽫㱨 data.table ׷ sessionInfo() Ϣ" +"truelength (%d) 的值大于超额分配的 10000 项 (length = %d)。请查看 ?truelength。 +"如果你没有将 datatable.alloccol 设置为非常大的数值，" +"请将此问题汇报给 data.table 问题追踪器，包含 sessionInfo() 的信息" #: assign.c:454 #, c-format @@ -352,8 +351,7 @@ msgid "" "Internal error: DT passed to assign has not been allocated enough column " "slots. l=%d, tl=%d, adding %d" msgstr "" -"ڲ: ݳȥֵ DT ûб㹻вۡ l=%d, tl=%d, %d" - +"内部错误: 传递出去赋值的 DT 没有被分配足够的列槽。 l=%d, tl=%d, 增加 %d" #: assign.c:456 msgid "" @@ -361,22 +359,22 @@ msgid "" "reassigned. Please ensure to use setnames() rather than names<- or " "colnames<-. Otherwise, please report to data.table issue tracker." msgstr "" -" ǰijʱ̣ data.table Ѿ¸ֵ" -"ȷʹ setnames() names<- colnames<- иֵ" -"ð취Ч뽫㱨 data.table ׷ sessionInfo() Ϣ" +"看起来， 在前面的某个时刻，此 data.table 的名称已经被重新赋值。" +"请确保使用 setnames() 而不是 names<- 或 colnames<- 进行赋值。" +"如果该办法无效，请将此问题汇报给 data.table 问题追踪器，包含 sessionInfo() 的信息" #: assign.c:460 #, c-format msgid "Internal error: selfrefnames is ok but tl names [%d] != tl [%d]" msgstr "" -"ڲ: selfrefnames ȷ tl [%d] != tl [%d]" +"内部错误: selfrefnames 正确，但 tl 的名称 [%d] != tl [%d]" #: assign.c:471 msgid "" "Internal error: earlier error 'When deleting columns, i should not be " "provided' did not happen." msgstr "" -"ڲ: ǰڵĴ 'ɾеʱ򣬲Ӧṩ i ' ûз" +"内部错误: 前期的错误 '当删除列的时候，不应该提供参数 i ' 没有发生" #: assign.c:482 #, c-format @@ -384,13 +382,13 @@ msgid "" "RHS for item %d has been duplicated because NAMED==%d MAYBE_SHARED==%d, but " "then is being plonked. length(values)==%d; length(cols)==%d)\n" msgstr "" -"Ŀ %d RHS Ѿƣ Ϊ NAMED==%d MAYBE_SHARED==%d Ȼ plonk" +"条目 %d 的 RHS 已经被复制， 因为 NAMED==%d MAYBE_SHARED==%d， 但是然后被 plonk。" "length(values)==%d; length(cols)==%d)\n" #: assign.c:487 #, c-format msgid "Direct plonk of unnamed RHS, no copy. NAMED==%d, MAYBE_SHARED==%d\n" -msgstr "ֱ plonk ûֵ RHSûиơ NAMED==%d, MAYBE_SHARED==%d\n" +msgstr "直接 plonk 没有名字的 RHS，并没有复制。 NAMED==%d, MAYBE_SHARED==%d\n" #: assign.c:556 #, c-format @@ -398,119 +396,118 @@ msgid "" "Dropping index '%s' as it doesn't have '__' at the beginning of its name. It " "was very likely created by v1.9.4 of data.table.\n" msgstr "" -" '%s' Ϊǰû '__' ܿ data.table v1.9.4 " +"丢掉索引 '%s' 因为它的名字前面没有 '__' 。这个很可能是 data.table v1.9.4 创建的" #: assign.c:564 msgid "Internal error: index name ends with trailing __" -msgstr "ڲ: __ β" +msgstr "内部错误: 索引名称以 __ 结尾" #: assign.c:569 msgid "Internal error: Couldn't allocate memory for s4." -msgstr "ڲ: ܸ s4 ڴ" +msgstr "内部错误: 不能给 s4 分配内存" #: assign.c:580 msgid "Internal error: Couldn't allocate memory for s5." -msgstr "ڲ: ܸ s5 ڴ" +msgstr "内部错误: 不能给 s5 分配内存" #: assign.c:601 assign.c:617 #, c-format msgid "Dropping index '%s' due to an update on a key column\n" -msgstr " Ϊһеĸ£ '%s'" +msgstr " 因为一个主列的更新，丢掉索引 '%s'" #: assign.c:610 #, c-format msgid "Shortening index '%s' to '%s' due to an update on a key column\n" -msgstr "Ϊһеĸ£ '%s' '%s'" +msgstr "因为一个主列的更新，缩短索引 '%s' 到 '%s'" #: assign.c:687 #, c-format msgid "Internal error: recycle length error not caught earlier. slen=%d len=%d" -msgstr "ڲ: δֵѭȴ slen=%d len=%d" +msgstr "内部错误: 早期未被发现的循环长度错误 slen=%d len=%d" #: assign.c:691 msgid "Internal error: memrecycle has received NULL colname" -msgstr "ڲ: memrecycle ܵΪ NULL " +msgstr "内部错误: memrecycle 接受到的列名为 NULL " #: assign.c:717 #, c-format msgid "" "Cannot assign 'factor' to '%s'. Factors can only be assigned to factor, " "character or list columns." -msgstr "ܽ 'factor' ֵΪ '%s' ֵֻܸΪӣַбе" +msgstr "不能将 'factor' 赋值为 '%s' 。因子类型只能赋值为因子，字符或者列表其中的列" #: assign.c:731 #, c-format msgid "" "Assigning factor numbers to column %d named '%s'. But %d is outside the " "level range [1,%d]" -msgstr " %d Ϊ '%s' ֵΪӡ %d ڲηΧ[1,%d]֮" +msgstr "将列 %d 名称为 '%s' 赋值为因子。但是 %d 在层次范围[1,%d]之外" #: assign.c:739 #, c-format msgid "" "Assigning factor numbers to column %d named '%s'. But %f is outside the " "level range [1,%d], or is not a whole number." -msgstr " %d Ϊ '%s' ֵΪӡ %f ڲηΧ[1,%d]֮⣬߲һ" +msgstr "将列 %d 名称为 '%s' 赋值为因子。但是 %f 在层次范围[1,%d]之外，或者不是一个完整的数字" #: assign.c:745 #, c-format msgid "" "Cannot assign '%s' to 'factor'. Factor columns can be assigned factor, " "character, NA in any type, or level numbers." -msgstr "ܽ 'factor' ֵΪ '%s' пɱֵΪӣַ NA ֵ" +msgstr "不能将 'factor' 赋值为 '%s' 。 因子列可被赋值为因子，字符 ，NA 或者 层次数值" #: assign.c:766 msgid "" "Internal error: levels of target are either not unique or have truelength<0" -msgstr "ڲ: ĿIJβΨһ߳<0" +msgstr "内部错误: 目标的层次不是唯一或者长度<0" #: assign.c:805 #, c-format msgid "Unable to allocate working memory of %d bytes to combine factor levels" -msgstr "ܷ %d ֽڵĹڴӲ" +msgstr "不能分配 %d 字节的工作内存来组合因子层次" #: assign.c:812 msgid "Internal error: extra level check sum failed" -msgstr "ڲ: IJУʧ" +msgstr "内部错误: 额外的层次校验和失败" #: assign.c:831 #, c-format msgid "" "Coercing 'character' RHS to '%s' to match the type of the target column " "(column %d named '%s')." -msgstr "'character' RHS ǿת '%s' ƥĿе" +msgstr "将'character' RHS 强制转换成 '%s' 来匹配目标列的类型" #: assign.c:837 #, c-format msgid "" "Cannot coerce 'list' RHS to 'integer64' to match the type of the target " "column (column %d named '%s')." -msgstr "ܽ'list' RHS ǿת 'integer64' ƥĿе" +msgstr "不能将'list' RHS 强制转换成 'integer64' 来匹配目标列的类型" #: assign.c:842 #, c-format msgid "" "Coercing 'list' RHS to '%s' to match the type of the target column (column " "%d named '%s')." -msgstr "'list' RHS ǿת '%s' ƥĿе( %d '%s')" +msgstr "将'list' RHS 强制转换成 '%s' 来匹配目标列的类型(列 %d 名称 '%s')" #: assign.c:848 #, c-format msgid "Zero-copy coerce when assigning '%s' to '%s' column %d named '%s'.\n" -msgstr " '%s' ֵ '%s' %d '%s'Zero-copyǿת" +msgstr "当 '%s' 赋值成 '%s' 列 %d 名称 '%s'，进行Zero-copy强制转换。" #: assign.c:943 #, c-format msgid "type '%s' cannot be coerced to '%s'" -msgstr " '%s' ǿת '%s'" +msgstr "类型 '%s' 不能强制转换成 '%s'" #: assign.c:1063 msgid "" "To assign integer64 to a character column, please use as.character() for " "clarity." -msgstr "ʹ as.character() integer64 ͵ֵֵַ" +msgstr "请使用 as.character() 把 integer64 类型的数值赋值给字符列" -<<<<<<<< #: assign.c:1074 #, c-format msgid "Unsupported column type in assign.c:memrecycle '%s'" @@ -3075,11 +3072,11 @@ msgstr "" #: gsumm.c:47 msgid "l is not an integer vector" -msgstr "l " +msgstr "l 不是整数向量" #: gsumm.c:56 msgid "irowsArg is neither an integer vector nor NULL" -msgstr "irowsArg ȲҲ NULL" +msgstr "irowsArg 既不是整数向量也不是 NULL" #: gsumm.c:58 #, c-format @@ -3089,48 +3086,48 @@ msgstr "" #: gsumm.c:66 #, c-format msgid "o has length %d but sum(l)=%d" -msgstr "o ijΪ %d sum(l) = %d" +msgstr "o 的长度为 %d，但 sum(l) = %d" #: gsumm.c:69 msgid "Internal error: o's maxgrpn attribute mismatches recalculated maxgrpn" -msgstr "ڲo maxgrpn ¼ maxgrpn ƥ" +msgstr "内部错误：o 的 maxgrpn 属性与重新计算的 maxgrpn 不匹配" #: gsumm.c:89 #, c-format msgid "" "Internal error: nrow=%d ngrp=%d nbit=%d shift=%d highSize=%d nBatch=%d " "batchSize=%d lastBatchSize=%d\n" -msgstr "ڲnrow=%d ngrp=%d nbit=%d shift=%d highSize=%d nBatch=%d " +msgstr "内部错误：nrow=%d ngrp=%d nbit=%d shift=%d highSize=%d nBatch=%d " "batchSize=%d lastBatchSize=%d\n" #: gsumm.c:98 #, c-format msgid "gforce initial population of grp took %.3f\n" -msgstr "grp gforce ʼȺռ %.3f\n " +msgstr "grp 的 gforce 初始群体数占了 %.3f\n " #: gsumm.c:116 msgid "" "Internal error: Failed to allocate counts or TMP when assigning g in gforce" -msgstr "ڲ gforce Ϊ g ֵʱδܳɹΪ counts TMP ռ" +msgstr "内部错误：在 gforce 中为 g 赋值时，未能成功为 counts 或者 TMP 分配空间" #: gsumm.c:194 #, c-format msgid "gforce assign high and low took %.3f\n" -msgstr "gforce high low %.3f\n" +msgstr "gforce 分配 high 和 low 用了 %.3f\n" #: gsumm.c:200 #, c-format msgid "gforce eval took %.3f\n" -msgstr "gforce eval %.3f\n" +msgstr "gforce eval 用了 %.3f\n" #: gsumm.c:216 msgid "gather took ... " -msgstr "gather ..." +msgstr "gather 用了 ..." #: gsumm.c:334 #, c-format msgid "gather implemented for INTSXP, REALSXP, and CPLXSXP but not '%s'" -msgstr "gather ֧ INTSXPREALSXP CPLXSXP֧ '%s'" +msgstr "gather 已支持 INTSXP，REALSXP 和 CPLXSXP，但不支持 '%s'" #: gsumm.c:336 gsumm.c:568 #, c-format @@ -3139,65 +3136,65 @@ msgstr "" #: gsumm.c:345 msgid "sum is not meaningful for factors." -msgstr "ӵĺû塣" +msgstr "因子的和没有意义。" #: gsumm.c:349 #, c-format msgid "This gsum took (narm=%s) ... " -msgstr "gsum ռ (narm=%s) ..." +msgstr "gsum 占用了 (narm=%s) ..." #: gsumm.c:350 gsumm.c:606 #, c-format msgid "nrow [%d] != length(x) [%d] in gsum" -msgstr "gsum nrow [%d] != length(x) [%d]" +msgstr "gsum 中 nrow [%d] != length(x) [%d]" #: gsumm.c:404 msgid "" "The sum of an integer column for a group was more than type 'integer' can " "hold so the result has been coerced to 'numeric' automatically for " "convenience." -msgstr "ijз͵ĽУ" -"˳ͣintergerֵֵ" -"ʽԶתΪֵͣnumeric" +msgstr "某整数列分组求和的结果中，" +"出现了超过了整型（interger）数值所允许最大值的情况，" +"故结果被自动转换为数值类型（numeric）" #: gsumm.c:565 #, c-format msgid "" "Type '%s' not supported by GForce sum (gsum). Either add the prefix base::" "sum(.) or turn off GForce optimization using options(datatable.optimize=1)" -msgstr "GForce ͣgsum֧ '%s'ʹ base::sum(.) " -" options(datatable.optimize=1) ر GForce Ż" +msgstr "GForce 求和（gsum）不支持类型 '%s'。请使用 base::sum(.) 或者" +"设置 options(datatable.optimize=1) 关闭 GForce 优化" #: gsumm.c:578 msgid "" "GForce mean can only be applied to columns, not .SD or similar. Likely " "you're looking for 'DT[,lapply(.SD,mean),by=,.SDcols=]'. See ?data.table." -msgstr "GForce ƽֵУ .SD " -"ڲ 'DT[,lapply(.SD,mean),by=,.SDcols=]'μ ?data.table " +msgstr "GForce 求平均值仅适用于列，而不能用于 .SD 或其它。" +"或许你在查找 'DT[,lapply(.SD,mean),by=,.SDcols=]'。参见 ?data.table 。" #: gsumm.c:579 msgid "mean is not meaningful for factors." -msgstr "ӵƽֵû" +msgstr "因子的平均值没有意义" #: gsumm.c:599 #, c-format msgid "Internal error: gsum returned type '%s'. typeof(x) is '%s'" -msgstr "ڲgsum ص '%s' typeof(x) Ľ '%s'" +msgstr "内部错误：gsum 返回的类型是 '%s'，而 typeof(x) 的结果则是 '%s'" #: gsumm.c:609 #, c-format msgid "Unable to allocate %d * %d bytes for sum in gmean na.rm=TRUE" -msgstr "޷Ϊ gmean na.rm=TRUE ܺͣsum %d * %d ֽڿռ" +msgstr "无法为 gmean na.rm=TRUE 的总和（sum）分配 %d * %d 字节空间" #: gsumm.c:612 #, c-format msgid "Unable to allocate %d * %d bytes for counts in gmean na.rm=TRUE" -msgstr "޷Ϊ gmean na.rm=TRUE ļcounts %d * %d ֽڿռ" +msgstr "无法为 gmean na.rm=TRUE 的计数（counts）分配 %d * %d 字节空间" #: gsumm.c:638 #, c-format msgid "Unable to allocate %d * %d bytes for si in gmean na.rm=TRUE" -msgstr "޷Ϊ gmean na.rm=TRUE si %d * %d ֽڿռ" +msgstr "无法为 gmean na.rm=TRUE 的 si 分配 %d * %d 字节空间" #: gsumm.c:650 #, c-format @@ -3205,12 +3202,12 @@ msgid "" "Type '%s' not supported by GForce mean (gmean) na.rm=TRUE. Either add the " "prefix base::mean(.) or turn off GForce optimization using options(datatable." "optimize=1)" -msgstr "GForce ֵgmean֧ '%s'ʹ base::mean(.) " -" options(datatable.optimize=1) ر GForce Ż" +msgstr "GForce 求均值（gmean）不支持类型 '%s'。请使用 base::mean(.) 或者" +"设置 options(datatable.optimize=1) 关闭 GForce 优化" #: gsumm.c:674 msgid "Internal error: unsupported type at the end of gmean" -msgstr "ڲgmean βڲֵ֧" +msgstr "内部错误：gmean 结尾处存在不支持的类型" #: gsumm.c:687 msgid "" @@ -3218,45 +3215,45 @@ msgid "" "of all items in a list such as .SD, either add the prefix base::min(.SD) or " "turn off GForce optimization using options(datatable.optimize=1). More " "likely, you may be looking for 'DT[,lapply(.SD,min),by=,.SDcols=]'" -msgstr "GForce СֵminУ .SD " -"ҪҵбУ .SDԪصСֵʹ base::min(.SD) " -" options(datatable.optimize=1) ر GForce Ż" -"ڲ 'DT[,lapply(.SD,min),by=,.SDcols=]'" +msgstr "GForce 求最小值（min）仅适用于列，而不能用于 .SD 或其它。" +"要找到列表中（如 .SD）所有元素的最小值，须使用 base::min(.SD) 或者" +"设置 options(datatable.optimize=1) 关闭 GForce 优化。" +"你更像是在查找 'DT[,lapply(.SD,min),by=,.SDcols=]'" #: gsumm.c:688 msgid "min is not meaningful for factors." -msgstr "ӵСֵû塣" +msgstr "因子的最小值没有意义。" #: gsumm.c:693 #, c-format msgid "nrow [%d] != length(x) [%d] in gmin" -msgstr "gmin nrow [%d] != length(x) [%d]" +msgstr "gmin 中 nrow [%d] != length(x) [%d]" #: gsumm.c:717 gsumm.c:850 msgid "" "No non-missing values found in at least one group. Coercing to numeric type " "and returning 'Inf' for such groups to be consistent with base" -msgstr "һûзȱʧֵ" -"Ϊ base һ£ЩǿתΪֵͲ Inf" +msgstr "在至少一个分组中没有发现缺失值。" +"为了与 base 保持一致，将这些组强制转换为数值类型并返回 ‘Inf’。" #: gsumm.c:756 gsumm.c:891 msgid "" "No non-missing values found in at least one group. Returning 'NA' for such " "groups to be consistent with base" -msgstr "һûзȱʧֵ" -"Ϊ base һ£Щ齫 NA" +msgstr "在至少一个分组中没有发现缺失值。" +"为了与 base 保持一致，这些组将返回 ‘NA’。" #: gsumm.c:783 msgid "" "No non-missing values found in at least one group. Returning 'Inf' for such " "groups to be consistent with base" -msgstr "һûзȱʧֵ" -"Ϊ base һ£Щ齫 Inf" +msgstr "在至少一个分组中没有发现缺失值。" +"为了与 base 保持一致，这些组将返回 ‘Inf’。" #: gsumm.c:791 msgid "Type 'complex' has no well-defined min" -msgstr "ܱȽϴСûСֵ" +msgstr "复数不能比较大小，故没有最小值" #: gsumm.c:794 #, c-format @@ -3264,8 +3261,8 @@ msgid "" "Type '%s' not supported by GForce min (gmin). Either add the prefix base::" "min(.) or turn off GForce optimization using options(datatable.optimize=1)" msgstr "" -"'%s'֧Ӧ GForce Сֵgmin Żǰ׺ base::" -"min(.) ʹ options(datatable.optimize=1) ر GForce Ż" +"类型'%s'不支持应用 GForce 最小值（gmin） 优化。你可以添加前缀 base::" +"min(.) 或者使用 options(datatable.optimize=1) 关闭 GForce 优化" #: gsumm.c:806 msgid "" From b3e82f97e2ba4e995227ad0526ce14e76a256242 Mon Sep 17 00:00:00 2001 From: Youhuang Bai Date: Mon, 21 Oct 2019 22:20:29 -0500 Subject: [PATCH 6/7] plonk --- po/R-zh_CN.po | 4 ++-- po/zh_CN.po | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/R-zh_CN.po b/po/R-zh_CN.po index 45517e7c48..df0e977a0f 100644 --- a/po/R-zh_CN.po +++ b/po/R-zh_CN.po @@ -194,10 +194,10 @@ msgid "is type double and contains fractions" msgstr "是 double 类型并且包含分数" msgid "roll is not implemented for non-equi joins yet." -msgstr "roll 还没有执行 non-equi joins" +msgstr "roll 还没有执行不等长联结" msgid "Column name '_nqgrp_' is reserved for non-equi joins." -msgstr "列名 '_nqgrp_' 是为 non-equi joins 保留的" +msgstr "列名 '_nqgrp_' 是为不等长联结保留的" msgid "key argument of data.table() must be character" msgstr "data.table() 的主参数必须是字符" diff --git a/po/zh_CN.po b/po/zh_CN.po index a5ca89c9c4..c7a5899660 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -382,13 +382,13 @@ msgid "" "RHS for item %d has been duplicated because NAMED==%d MAYBE_SHARED==%d, but " "then is being plonked. length(values)==%d; length(cols)==%d)\n" msgstr "" -"条目 %d 的 RHS 已经被复制， 因为 NAMED==%d MAYBE_SHARED==%d， 但是然后被 plonk。" +"条目 %d 的 RHS 已经被复制， 因为 NAMED==%d MAYBE_SHARED==%d， 但是然后被替换。" "length(values)==%d; length(cols)==%d)\n" #: assign.c:487 #, c-format msgid "Direct plonk of unnamed RHS, no copy. NAMED==%d, MAYBE_SHARED==%d\n" -msgstr "直接 plonk 没有名字的 RHS，并没有复制。 NAMED==%d, MAYBE_SHARED==%d\n" +msgstr "直接替换没有名字的 RHS，并没有复制。 NAMED==%d, MAYBE_SHARED==%d\n" #: assign.c:556 #, c-format From dfc8ccc9240d8b414bea82159b1bab74ab7d9478 Mon Sep 17 00:00:00 2001 From: Youhuang Bai Date: Sat, 2 Nov 2019 16:55:00 -0500 Subject: [PATCH 7/7] update translation --- po/R-zh_CN.po | 12 ++++++------ po/zh_CN.po | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/po/R-zh_CN.po b/po/R-zh_CN.po index df0e977a0f..328004b716 100644 --- a/po/R-zh_CN.po +++ b/po/R-zh_CN.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: data.table 1.12.5\n" "POT-Creation-Date: 2019-10-21 16:15\n" -"PO-Revision-Date: 2019-10-04 17:06+08\n" -"Last-Translator: Michael Chirico \n" +"PO-Revision-Date: 2019-11-02 17:06+08\n" +"Last-Translator: Youhuang Bai \n" "Language-Team: Mandarin\n" "Language: Mandarin\n" "MIME-Version: 1.0\n" @@ -194,7 +194,7 @@ msgid "is type double and contains fractions" msgstr "是 double 类型并且包含分数" msgid "roll is not implemented for non-equi joins yet." -msgstr "roll 还没有执行不等长联结" +msgstr "不等长联结还不能执行 roll " msgid "Column name '_nqgrp_' is reserved for non-equi joins." msgstr "列名 '_nqgrp_' 是为不等长联结保留的" @@ -218,7 +218,7 @@ msgid "more" msgstr "更多" msgid "' not found amongst" -msgstr "' 没有发现" +msgstr "' 不存在" msgid "and" msgstr "并且" @@ -227,10 +227,10 @@ msgid "Provide either by= or keyby= but not both" msgstr "提供 by= 或 keyby= ，但两者不能同时存在" msgid "Ignoring keyby= because j= is not supplied" -msgstr "忽略 keyby= 因为没有提供 j= " +msgstr "因为没有提供 j= ，所以忽略 keyby= " msgid "Ignoring by= because j= is not supplied" -msgstr "忽略 by= 因为没有提供 j= " +msgstr "因为没有提供 j= ，所以忽略 by= " msgid "" "When on= is provided but not i=, on= must be a named list or data.table|" diff --git a/po/zh_CN.po b/po/zh_CN.po index c7a5899660..843e69c01e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: data.table 1.12.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-21 16:15+0800\n" -"PO-Revision-Date: 2019-10-04 17:06+08\n" -"Last-Translator: Michael Chirico \n" +"PO-Revision-Date: 2019-11-02 17:06+08\n" +"Last-Translator: Youhuang Bai \n" "Language-Team: Mandarin\n" "Language: Mandarin\n" "MIME-Version: 1.0\n" @@ -359,7 +359,7 @@ msgid "" "reassigned. Please ensure to use setnames() rather than names<- or " "colnames<-. Otherwise, please report to data.table issue tracker." msgstr "" -"看起来， 在前面的某个时刻，此 data.table 的名称已经被重新赋值。" +"此 data.table 的名称在早先已经被重新赋值。" "请确保使用 setnames() 而不是 names<- 或 colnames<- 进行赋值。" "如果该办法无效，请将此问题汇报给 data.table 问题追踪器，包含 sessionInfo() 的信息" @@ -382,7 +382,7 @@ msgid "" "RHS for item %d has been duplicated because NAMED==%d MAYBE_SHARED==%d, but " "then is being plonked. length(values)==%d; length(cols)==%d)\n" msgstr "" -"条目 %d 的 RHS 已经被复制， 因为 NAMED==%d MAYBE_SHARED==%d， 但是然后被替换。" +"因为 NAMED==%d MAYBE_SHARED==%d， 所以条目 %d 的 RHS 已经被复制，但是接下来又要被替换了。" "length(values)==%d; length(cols)==%d)\n" #: assign.c:487