Translation haogao gu by Koohoko · Pull Request #4002 · Rdatatable/data.table

Koohoko · 2019-10-27T13:12:05Z

Translation from Haogao Gu (group 14).

For the src (zh_CN.po), there are some chinese characteres (line 3056 - 3252) which have been previously added by other translator, appear to crash into nonsense characters on my machine, I am not sure if it is due to encoding problem of my editor. So I copy them from their previous commit on the web and paste back to my file. :(
Also I have difficult in triggering the message, so in fact I did not actually go through the testing. Sorry about that.

Thank you!

MichaelChirico · 2019-10-27T13:16:45Z

Excellent! Pending review from @biobai. I'll try and have a look into the encoding thing. Seems to be affecting everyone 😓

MichaelChirico · 2019-10-27T13:37:17Z

Have merged to the translation branch which covers the encoding thing. update_pkg_po working as intended -- all that's left is to confirm the Chinese itself! :)

Koohoko · 2019-10-28T09:05:33Z

@MichaelChirico Thank you!

biobai · 2019-11-02T21:13:23Z

 #, c-format
 msgid "gather implemented for INTSXP, REALSXP, and CPLXSXP but not '%s'"
-msgstr "gather ��֧�� INTSXP��REALSXP �� CPLXSXP������֧�� '%s'"
+msgstr "gather 已支持 INTSXP，REALSXP 和 CPLXSXP，但不支持 '%s'"


“implemented”此处是不是翻译“执行”？

biobai · 2019-11-02T21:19:00Z

-msgstr "GForce ��ͣ�gsum����֧������ '%s'����ʹ�� base::sum(.) ����"
-"���� options(datatable.optimize=1) �ر� GForce �Ż�"
+msgstr "GForce 求和（gsum）不支持类型 '%s'。请使用 base::sum(.) 或者"
+"设置 options(datatable.optimize=1) 关闭 GForce 优化"


建议“请使用前缀 base::sum(.) 或者设置 options(datatable.optimize=1) 来关闭 GForce 优化”

biobai · 2019-11-02T21:26:45Z

+"input= 必须是以下其中一种字符串: "
+"一个文件名, 一个含有不少于一个空格的系统命令, "
+"以'http[s]://','ftp[s]://' 或 'file://' 开头的URL, "
+"或是包含至少一个\\n 或 \\r的输入数据本身"


“或是包含至少一个\n 或 \r的输入数据本身” 建议为“或是本身就包含至少一个\n 或 \r的输入数据”

biobai · 2019-11-02T21:31:26Z

+"') 同时一个变量也被传输到 `input=`.请使用fread(cmd=...)."
+"这是出于安全考虑. 试想你在开发一个app, 这个app可能有恶意用户, "
+"同时这个app的运行环境不安全 (比如在root环境下运行)."
+"请阅读v1.11.6版本的NEWS file里面的item 5获取更多资讯, 或了解如何减少这个提示."


“或了解如何减少这个提示”建议为“或了解如何取消这个提示”

biobai · 2019-11-02T21:36:32Z


 msgid "Encountered <"
-msgstr ""
+msgstr "遇到"


这里漏掉了“<”

biobai · 2019-11-02T21:42:58Z

Hi @Koohoko , I finished the review process. Hope it helps.

Koohoko · 2019-11-05T07:35:34Z

Hi @Koohoko , I finished the review process. Hope it helps.

Thanks so much for your kind help!

Koohoko · 2019-11-05T07:39:23Z

@MichaelChirico I agree with most of the comments, but what am I suppose to do to proceed? should I renew the code on my local machine and pull request again? Sorry I dont have experience like this before..

MichaelChirico · 2019-11-05T07:45:03Z

Yes, on your local copy, make the edits in the files. Then

# check the status of your files locally.
#   only po/R-zh_CN.po and po/zh_CN.po should appear
git status
# if that's working, commit these changes
git commit -am 'updated with feedback'
# push to GitHub; 'origin' is the name where your fork is.
#   You can confirm this by looking at git remote -v
#   origin should be in the line with Koohoko/data.table
git push origin translation-haogao-gu

Whenever you push a new commit to your fork on the branch in this pull request (i.e. Koohoko/data.table:translation-haogao-gu), it will automatically be incorporated into this Pull Request (i.e., no need to file a different PR)

Koohoko · 2019-11-06T09:24:18Z

@MichaelChirico My changes are in the "48bdf46" commit. However I seemed to messed up the changes when merging it with the previous edits (which lead to c8fda17).

Basically the "48bdf46" commit contains what I want, and I wish to abandon/revert the c8fda17 commit...

MichaelChirico · 2019-11-06T10:10:22Z

I think what happened is you did a merge commit against the current translation branch and I think I fixed it by:

reset your branch locally to the target commit: git reset --hard 48bdf46639c204d73d9bb7896c017a7c546f6590
force-push this back to remote: git push haogao translation-haogao-gu --force*
locally merge the translation branch into this branch (translation-haogao-gu): git merge translation
Resolve conflicts -- po/zh_CN.po and po/R-zh_CN.po were typical, but also two binary .mo files in inst/po/zh_CN/LC_MESSAGES were conflicted. I used git checkout --ours -- inst/po/zh_CN/LC_MESSAGES/* to "resolve" this conflict, but after finishing the merge, I re-ran update_pkg_po('.') and those .mo files changed again, so I suspect I should have done --theirs instead?

I'll merge now, but please have another glance and check everything looks OK.

I think this removed some intermediate commits I had added to Haogao's remote branch that hadn't been pulled locally? Or something? I was seeing a message in git status about being 5 commits behind remote after doing git reset --hard, when I really should only have been 1 commit behind. Not sure what those other commits were.

Koohoko · 2019-11-08T03:13:56Z

I think what happened is you did a merge commit against the current translation branch and I think I fixed it by:

reset your branch locally to the target commit: git reset --hard 48bdf46639c204d73d9bb7896c017a7c546f6590

force-push this back to remote: git push haogao translation-haogao-gu --force*

locally merge the translation branch into this branch (translation-haogao-gu): git merge translation

Resolve conflicts -- po/zh_CN.po and po/R-zh_CN.po were typical, but also two binary .mo files in inst/po/zh_CN/LC_MESSAGES were conflicted. I used git checkout --ours -- inst/po/zh_CN/LC_MESSAGES/* to "resolve" this conflict, but after finishing the merge, I re-ran update_pkg_po('.') and those .mo files changed again, so I suspect I should have done --theirs instead?

I'll merge now, but please have another glance and check everything looks OK.

I think this removed some intermediate commits I had added to Haogao's remote branch that hadn't been pulled locally? Or something? I was seeing a message in git status about being 5 commits behind remote after doing git reset --hard, when I really should only have been 1 commit behind. Not sure what those other commits were.

Thanks @MichaelChirico , I checked the translation in the most recent commit, they appear like what I want.
I think I have to spend some time learning git, sometimes I am not clear what is happening...

@shrektan

* initial exploration of adding a chinese translation of messages working version of chinese translation * adding another .mo file that was untracked * trying to get the .pot for src/ files * adding warning()s from C * C messages with DTPRINT or Rprintf * adding STOP messages * DTWARN messages * Error in forder * odds&ends more messages * cannot use _() with \r * update .pot for src files * moving pot file to po/ * update header metadata for src .pot * run update_pkg_po on the src to get mo files * update_pkg_po after merge * add template message in onAttach() & clear typos/PYDT issue along the way * remove some strings * improve arg checking&message in groupingsets; add some messages * get tests working (fix some bad quotes, adjust to new messages) * update po with latest message edits * Finished the translation assigned to Chun-Hui Gao (#3983) * Finished the translation of line 3058-3231 in po/zh_CN.po. Totally 34 messages. * Finished the translation assigned to Chun-Hui Gao in R-zh_cn.po. Lines 1500-1598 in original R-zh_CN.po. Totally 26 messages. * Resolved reviewer's comments. * Resolved reviewer's comments. * (hopefully) apply encoding fix & check compilation * improve internal error & regenerate messages * Finish translation to zh_CN assigned to group 2 (Hongyuan Jia) (#3986) * Finish translation. * Resolve review comments. * balance quotes * extra nocov * some coverage of fmelt * complete coverage of fmelt * fix test error * update message per DeLuns feedback * update message again; some minor tweaks to nearby code * Translation to zh_CN assigned to group 3 (#3985) * translate assigned to group 3 * translate assigned to group 3 * translate assigned to group 3 * remove merge conflict vestiges * remove merge conflict vestiges * plonk * update translation * minor update * added new message caught by xianghui * Translation haogao gu (#4002) * R-zh_CN_2019-10-26 * 10-26 * restore previous * updated with feedback * regenerate with small fix * regenerate .mo files * Translation finished (soappp) (#4023) * readme link examples, rm old link to a talk (#4001) * Homepage additions (#4006) * pkgdown, keep manual tab, link cranlike page, minor rename (#4008) * fix Rd warnings (#4011) * use Rdevel for revdeps due to bioc-devel (3.11) now needing R 4+ * (hopefully) apply encoding fix & check compilation * improve internal error & regenerate messages * Finish translation to zh_CN assigned to group 2 (Hongyuan Jia) (#3986) * Finish translation. * Resolve review comments. * balance quotes * extra nocov * some coverage of fmelt * complete coverage of fmelt * fix test error * update message per DeLuns feedback * update message again; some minor tweaks to nearby code * translatation completed * fixed somme message 1 * fix format tags for two translations * done some translation! * Finish translation to zh_CN assigned to group 5 (Leo Lee) (#3995) * chinese translation by Leo * Update R-zh_CN.po fix a typo * Update zh_CN.po * add missing quotes * number out-of-order format strings * apply numbering to formatters * Update R-zh_CN.po & Change author * Fix the problems of missing %d in zh_CN.po & Polish translation * Translation dracodoc (#4034) * 895 - 939 * 945 - 1007 * To the real 1007 line msg * convert enconding from GBK to UTF-8 * Revert "convert enconding from GBK to UTF-8" This reverts commit 6e65d0e. * translate start and end of assigned msgs. * till 1899 * two entries then found possible problem of missing messages * 10 missing message not captured? * till 1962 * finished assignment * review and edit * update meta info * macro-within-macro removed * syntax error -- split ternary operator * roll back use of translation in ASSERT internal errors * Update according to @shrektan's comments * re-run update_pkg_po * update binaries * Translation caiquanyou (#4039) * finish translation * Update R-zh_CN.po * Update zh_CN.po * update mo files * translation(partial) into zh_CN by Yuanchen Xie (#4010) * translation(partial) into zh_CN by Yuanchen Xie * Add new translation results, based on messages * update mo file * update transitions as renkun-ken's suggestions * update binary mo * update vs recent master * Translation to zh_CN - Group 7 (#4019) * translate R msgs * src error messages * missing quote * missing quote * remove extra quote * fix-up of merge * update po after merge * update fuzzy translations * update mistaken PRIu64->PRId64 * caught a few more failed merges * line # update * rerun update_pkg_po * Translation shawn (#4050) * done some translation! * done some translation! * done some translation * revised the translation * small tweak * Translation yilei (#3989) * messsage * messsage * messsage * messsage * messsage * done some translation! * done it. * updating some small misses from last pull * Translation to zh_CN assigned to group 12 (#3987) * Update translations * Minor refine * Minor reformatting * no longer using %llu, other small tidying * Translation fengqifang (#3990) * First version, finished all message * 2nd one, multiple lines of msgstr * 3rd, finished * zh_CN.po 1st * after zh_CN.po reviewed * fix encoding issue * manually editing per GH UI submission * run update_pkg_po on new merge * done some translation (#4069) * done some translation * do some revisions * touch-up * Translation to zh_CN assigned to group 4 (#3997) * finish R-zh_CN.po * finish zh_CN.po * finalize two files * change author * make the package * finalize the messages * change the format of numbering * install the pacakge * delete excessive src folders * manually revert coding issues (open to a better solution... `iconv(bad_str, from = 'GBK'|'GB18030', to = 'UTF-8')` both returned something gibberish-y. * update mo files * update .mo * add in suggestions from gaospecial * update mo * My part of translation has been completed. It's so happy! (#4051) * messsage * Update R-zh_CN.po * Update R-zh_CN.po * Update zh_CN.po * some revisions due to foreign char, touch-up, remove fuzzy * Translation yuliang li (#4055) * completed yuliang's translation * yuliang's work * Update zh_CN.po Co-authored-by: Michael Chirico <michaelchirico4@gmail.com> * tweaks for syntax mistakes * Translation to zh_CN - Group 17 (#4049) * finish the Chinese message translation for group 17 * change as KingdaShi suggests Co-authored-by: Michael Chirico <michaelchirico4@gmail.com> * update mo, fix missing field * Translation yc0802 (#4054) * message * message * added hongyuans review Co-authored-by: Michael Chirico <michaelchirico4@gmail.com> * adding "leftover" translations (#4143) * done some translation!-kingda (#4046) * done some translation! * done some translation * messsage * messsage Co-authored-by: Michael Chirico <michaelchirico4@gmail.com> * Translation leftover pt2 (#4146) * covering trivial translations from among the leftovers * progress on paring down leftover translations * completed translations!!! * adjustments * missing dot * add note for proceeding to CRAN_Relase * %f needed for > integer max Co-authored-by: Chun-Hui Gao <gaospecial@gmail.com> Co-authored-by: Hongyuan Jia <hongyuan.jia@bears-berkeley.sg> Co-authored-by: biobai <biobai@zju.edu.cn> Co-authored-by: Koohoko <koohoko@gmail.com> Co-authored-by: soappp <soappp9527@gmail.com> Co-authored-by: KingdaShi <50854702+KingdaShi@users.noreply.github.com> Co-authored-by: Guangzheng Li <leolee0828@outlook.com> Co-authored-by: dracodoc <dracodoc@gmail.com> Co-authored-by: caiquanyou <48861819+caiquanyou@users.noreply.github.com> Co-authored-by: Yuanchen Xie <yuanchen.gm@gmail.com> Co-authored-by: Amy Tzu-Yu Chen <amy17519@gmail.com> Co-authored-by: ShawnChen1996 <shawnchen1996@outlook.com> Co-authored-by: Yilei <30611492+Zachary-Wu@users.noreply.github.com> Co-authored-by: Kun Ren <mail@renkun.me> Co-authored-by: fengqifang <nclxin@gmail.com> Co-authored-by: Shayebuhuii <32659317+sunshine1126@users.noreply.github.com> Co-authored-by: Zhi Yang <zhiyang@usc.edu> Co-authored-by: Xueliang24 <56901274+Xueliang24@users.noreply.github.com> Co-authored-by: JulianYlli12 <43525270+JulianYlli12@users.noreply.github.com> Co-authored-by: Xianying Tan <shrektan@126.com> Co-authored-by: yc0802 <55459478+yc0802@users.noreply.github.com>

Koohoko added 3 commits October 26, 2019 22:41

R-zh_CN_2019-10-26

5fff664

10-26

0270bf5

restore previous

bfeea25

MichaelChirico added the translation issues/PRs related to message translation projects label Oct 29, 2019

biobai reviewed Nov 2, 2019

View reviewed changes

Comment thread po/zh_CN.po

biobai reviewed Nov 2, 2019

View reviewed changes

Comment thread po/R-zh_CN.po Outdated

msgid "Encountered <"

msgstr ""

msgstr "遇到"

Copy link
Copy Markdown

Contributor

biobai Nov 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里漏掉了“<”

updated with feedback

48bdf46

Koohoko force-pushed the translation-haogao-gu branch from c8fda17 to 814ff55 Compare November 6, 2019 09:54

MichaelChirico force-pushed the translation-haogao-gu branch from 814ff55 to 48bdf46 Compare November 6, 2019 09:55

Michael Chirico added 3 commits November 6, 2019 17:59

regenerate with small fix

a01e17f

Merge branch 'translation' into translation-haogao-gu

993e0d3

regenerate .mo files

70e0e0b

MichaelChirico merged commit 219b726 into Rdatatable:translation Nov 6, 2019

Conversation

Koohoko commented Oct 27, 2019

Uh oh!

MichaelChirico commented Oct 27, 2019

Uh oh!

MichaelChirico commented Oct 27, 2019

Uh oh!

Koohoko commented Oct 28, 2019

Uh oh!

Uh oh!

biobai Nov 2, 2019

Choose a reason for hiding this comment

Uh oh!

biobai Nov 2, 2019

Choose a reason for hiding this comment

Uh oh!

biobai Nov 2, 2019

Choose a reason for hiding this comment

Uh oh!

biobai Nov 2, 2019

Choose a reason for hiding this comment

Uh oh!

biobai Nov 2, 2019

Choose a reason for hiding this comment

Uh oh!

biobai commented Nov 2, 2019

Uh oh!

Koohoko commented Nov 5, 2019

Uh oh!

Koohoko commented Nov 5, 2019

Uh oh!

MichaelChirico commented Nov 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Koohoko commented Nov 6, 2019

Uh oh!

MichaelChirico commented Nov 6, 2019

Uh oh!

Koohoko commented Nov 8, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

MichaelChirico commented Nov 5, 2019 •

edited

Loading