Fix Grammar, Spelling, Typos etc. #72
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -9,7 +9,7 @@ | |||
| :toclevels: 6 | |||
| :toc-title: | |||
|
|
|||
| Chinese "Communist" <<dictatorship,"Dictatorship">> "facts". 中国《共产主义》<<dictatorship,《独裁统治》>>的《事实》。<<faq,FAQ>>, <<news,news compilation>> and <<restaurants,restaurant>> and <<music,music>> recommendations. <<faq,常见问答集>>，<<news,新闻集>>和<<restaurants,饭店>>和<<music,音乐>>建议。<<xi-abolishes-term-limits-2018-03,Heil Xi 卐>>. <<xi-abolishes-term-limits-2018-03,习万岁>>。 | |||
| Chinese "Communist" <<dictatorship,"Dictatorship">> "facts". 中国《共产主义》<<dictatorship,《独裁统治》>>的《事实》。<<faq,FAQ>>, <<news,news compilation>>, and <<restaurants,restaurant>> and <<music,music>> recommendations. <<faq,常见问答集>>，<<news,新闻集>>和<<restaurants,饭店>>和<<music,音乐>>建议。<<xi-abolishes-term-limits-2018-03,Heil Xi 卐>>. <<xi-abolishes-term-limits-2018-03,习万岁>>。 | |||
There was a problem hiding this comment.
OK, let's stick to American style.
|
|
||
| * http://www.becker-posner-blog.com/2011/05/can-poor-countries-afford-democracy-becker.html | ||
| * https://www.quora.com/Is-democracy-or-authoritarianism-better-for-developing-countries | ||
|
|
||
| For: | ||
|
|
||
| * dictatorships are more likely to start <<war>> or other crazy policies like the Great Leap Forward, which completely destroy the economy in one go | ||
| * Dictatorships are more likely to start <<war,wars>> or other crazy policies like the Great Leap Forward, which completely destroy the economy in one go |
There was a problem hiding this comment.
Is there a source for this choice: https://english.stackexchange.com/questions/9752/capitalization-for-a-bullet-list ?
|
|
||
| ____ | ||
| While average rate of growth do not appear to differ much between democracies and authoritarian regimes, the variability in performance does differ more among authoritarian governments. China has had remarkable growth since the 1980s, but the prolonged devastation and hardship produced by China's “great leap forward” (when millions of farmers starved to death) and its Cultural Revolution would unlikely have occurred in a democratic country like say India. Nor is it likely that say Cuba and many African nations would have suffered so long with such terrible economic policies if they had reasonably democratic institutions. | ||
| While [the] average rate of growth do not appear to differ much between democracies and authoritarian regimes, the variability in performance does differ more among authoritarian governments. China has had remarkable growth since the 1980s, but the prolonged devastation and hardship produced by China's “great leap forward” (when millions of farmers starved to death) and its Cultural Revolution would unlikely have occurred in a democratic country like say India. Nor is it likely that say Cuba and many African nations would have suffered so long with such terrible economic policies if they had reasonably democratic institutions. |
There was a problem hiding this comment.
Is [the] really clarifying something from the context?
| ____ | ||
|
|
||
| Here are some examples of people reacting to the blocking of https://github.com/programthink/zhao/issues/38 as per https://github.com/github/gov-takedowns/blob/78775b09e64d85f08547287cab204b48b2491192/China/2016/2016-06-08-programthink-zhao.md from China (and likely on the entire repository, which appears to be the block granularity implemented): | ||
| Here are some examples of people reacting to it from China: |
There was a problem hiding this comment.
I think this has a merge conflict with something I had just pushed.
| @@ -529,15 +529,15 @@ The more freedom we have, the more we want to be controlled by the SS again. | |||
|
|
|||
| And then we want our secret police back, and concentration death camps again, and the universal fear everywhere! | |||
|
|
|||
| Only then can we feel ourselves calm and secure. | |||
| Only then can we feel calm and secure. | |||
There was a problem hiding this comment.
This was taken from the YouTube translation, but OK, let's fix the translation here I guess.
|
|
||
| What is worse is a subjective choice. For me: | ||
|
|
||
| * I love China and my Chinese wife, see also: <<bias>> | ||
| * I hate dictatorships, and China is the largest one by population / GDP / link:https://www.ploughshares.org/world-nuclear-stockpile-report[nuclear stockpile] | ||
| * I hate dictatorships, and China is the largest one by population / GDP / link:https://www.ploughshares.org/world-nuclear-stockpile-report[nuclear stockpile]. |
There was a problem hiding this comment.
Why change this line but not the one above?
|
|
||
| ==== Do you think Chinese politician X evil? | ||
|
|
||
| The term evil does not make sense to me. | ||
|
|
||
| The best definition I can reach is a psychopath with zero empathy for anyone: https://en.wikipedia.org/wiki/Psychopathy although I think that can be better characterized as a disease or extreme personality trait. | ||
| The best definition I can reach is a psychopath with zero empathy for anyone: https://en.wikipedia.org/wiki/Psychopathy , although I think that can be better characterized as a disease or extreme personality trait. |
There was a problem hiding this comment.
the space can be remove with https://en.wikipedia.org/wiki/Psychopathy[],
| @@ -865,76 +865,76 @@ And you just repeat these truth over and over and over: | |||
| * FLG is good | |||
| * xref:flg-religion[Alternate dimensions] | |||
| * FLG is good | |||
| * xref:flg-medication[Maybe FLG will make you healthier, but no promises, but it will make you a better person, and that's why you should do it, but if you really really believe, you get healthier] | |||
| * xref:flg-medication[Maybe FLG will make you healthier, but no promises, but it will make you a better person, and that’s why you should do it, but, if you really really believe, you get healthier] | |||
There was a problem hiding this comment.
I think let's keep away from typographic apostrophe and use just the ASCII one. Realistically I will never enter characters that are not available easily on my keyboard. There may be an Asciidoctor way to do it, but I don't know it.
|
|
||
| I never get mad. Only a slightly sad or annoyed sometimes. | ||
| I never get mad — only slightly sad or annoyed sometimes. |
There was a problem hiding this comment.
Asciidoctor has em-dash with --: https://asciidoctor.org/docs/user-manual/#replacements let's use that instead.
|
|
||
| .https://twitter.com/marnofavonlea/status/1182557311539150849[Source]. | ||
| image::https://web.archive.org/web/20191013075823/https://pbs.twimg.com/media/EGlJmSEUYAE7F7G?format=jpg&name=900x900[height=400] | ||
| image::http://web.archive.org/web/20191012095255im_/https://pbs.twimg.com/media/EGlJmSEUYAE7F7G.jpg[height=400] |
There was a problem hiding this comment.
I fixed all links just before your commit :-)
|
|
||
| Citizens should boycott such companies. | ||
|
|
||
| https://github.com/caffeine-overload/bandinchina contains a "List of companies who have apologized to the Chinese government and implemented censorship requests". I don't understand though why they won't add GitHub to the list, but so be it: https://github.com/caffeine-overload/bandinchina/pull/56#issuecomment-541230090 | https://github.com/caffeine-overload/bandinchina/pull/84 | ||
| https://github.com/caffeine-overload/bandinchina contains a "List of companies who have apologized to the Chinese government and implemented censorship requests." I don't understand though why they won't add GitHub to the list, but so be it: https://github.com/caffeine-overload/bandinchina/pull/56#issuecomment-541230090 |
|
|
||
| Here is a quick 2019 summary: | ||
|
|
||
| .https://twitter.com/hoho90272496/status/1182669015937966080[Source]. | ||
| image::https://web.archive.org/web/20191013075353/https://pbs.twimg.com/media/EGmvMb6XUAQgYq9?format=jpg&name=900x900[height=400] | ||
| image::http://web.archive.org/web/20191012093608im_/https://pbs.twimg.com/media/EGmvMb6XUAQgYq9.jpg[height=400] |
|
|
||
| And some good cartoons: | ||
|
|
||
| .https://www.rfa.org/english/cartoons/china-hongkong-us-10102019153228.html[Source]. | ||
| image::https://web.archive.org/web/20191011092825/https://pbs.twimg.com/media/EGikEkFXkAE-A8m?format=jpg&name=4096x4096[height=400] | ||
|
|
||
| .https://www.rfa.org/english/cartoons/China-Apple-cartoon-08242017103540.html[Source]. | ||
| image::https://web.archive.org/web/20191013080151/https://www.rfa.org/english/cartoons/China-Apple-cartoon-08242017103540.html/170731Apple-700.jpg[height=400] | ||
| image::http://web.archive.org/web/20191012080116im_/https://www.rfa.org/english/cartoons/China-Apple-cartoon-08242017103540.html/170731Apple-700.jpg[height=400] |
| @@ -1822,27 +1821,27 @@ This section also gives me more credibility as a balanced critic >:-) | |||
| [[flg-religion]] | |||
| ===== FLG downplays the fact that it is a religion | |||
|
|
|||
| If asked if they follow a religion, I think most FLG practitioners will say no. E.g. they call themselves "practitioners" instead of believers. | |||
| I asked if they follow a religion, I think most FLG practitioners will say no. E.g., they call themselves "practitioners" instead of believers. | |||
There was a problem hiding this comment.
I think this was correct, meant to be conditional, I didn't really ask them :-)
|
|
||
| If you ever want democracy, you will have to learn to accept the beliefs of others, and only punish them when they actually break a law. | ||
| If you ever want democracy, you will have to learn to accept the beliefs of others, and only punish them when they actually break the law. |
There was a problem hiding this comment.
I think a was fine here to highlight "one specific law"?
| * 2019-04-28 https://www.bbc.co.uk/news/world-asia-48084019 Hong Kong: Thousands protest against China extradition law | ||
| * 2019-04 996 https://github.com/996icu/996.ICU | ||
| ** https://www.reddit.com/r/China/comments/b927sk/tencent_xiaomi_and_others_block_github_page/ | ||
| ** https://www.reddit.com/r/cscareerquestions/comments/b8t8cc/overworked_chinese_developers_gather_on_github_to/ | ||
| ** 180k stars in a week!!!! | ||
| ** https://www.reddit.com/r/China/comments/auqkdl/biotech_giant_thermo_fisher_stops_selling_dna/ | ||
| * 2019-01 https://www.apnews.com/40f7cf4c0c6e43f18121af93f1e418f7 Microsoft Bing https://www.bing.com/ search engine blocked in China | ||
| * 2019-01 https://www.nytimes.com/2019/01/02/business/china-internet-censor.html interview with Beyondsoft, a company that offers censoring services | ||
| * 2019-01 https://www.nytimes.com/2019/01/02/business/china-internet-censor.html interview with Beyondsoft, a company that offers to censor services |
There was a problem hiding this comment.
This was meant to be "censorship".
| @@ -2431,42 +2430,42 @@ https://en.wikipedia.org/wiki/Belt_and_Road_Initiative | |||
|
|
|||
| Or to my other online presences, due to China activity: | |||
|
|
|||
| * 2019-10-12: https://hacpai.com/article/1570686552645 Login required, cowards. Post title: "更新 GitHub 官方 Repo 的人，竟然是个反华分子". Manual page dump after my replies with links to this FAQ: https://ia801505.us.archive.org/27/items/cirosantilli/hacpai_1570686552645.html OP then deleted my comments because they don't speak English "HacPai 是个文明的社区，不会发生辱骂的现象，你有你的观点，我们有我们的观点。但抱歉，我们的水平有限，没有阅读英文的能力，还请发送有效回复，否则只能折叠处理". It is some developper website: https://hacpai.com/article/1440573175609 (https://web.archive.org/web/20190811205230/https://hacpai.com/article/1440573175609[archive]) linked to https://github.com/b3log/solo[]. OP then made an useless post here: https://github.com/cirosantilli/china-dictatorship/issues/70 As of 2019-10-12, I can't login there anymore, either because the website is shitty, or I was blocked. GitHub login just fails silently, cannot reset password. If blocked, cowards. This led me to update: <<what-is-your-reply-strategy>> with the canned reply. | |||
| * 2019-10-12: https://hacpai.com/article/1570686552645 Login required, cowards. Post title: "更新 GitHub 官方 Repo 的人，竟然是个反华分子". Manual page dump after my replies with links to this FAQ: https://ia801505.us.archive.org/27/items/cirosantilli/hacpai_1570686552645.html OP then deleted my comments because they don't speak English "HacPai 是个文明的社区，不会发生辱骂的现象，你有你的观点，我们有我们的观点。但抱歉，我们的水平有限，没有阅读英文的能力，还请发送有效回复，否则只能折叠处理." It is some developer website: https://hacpai.com/article/1440573175609 (https://web.archive.org/web/20190811205230/https://hacpai.com/article/1440573175609[archive]) linked to https://github.com/b3log/solo[]. OP then made a useless post here: https://github.com/cirosantilli/china-dictatorship/issues/70 As of 2019-10-12, I can't log in there anymore, either because the website is shitty, or I was blocked. GitHub login just fails silently, cannot reset the password. If blocked, cowards. This led me to update: <<what-is-your-reply-strategy>> with the canned reply. | |||
| @@ -2875,9 +2874,9 @@ Last checked: 2017/06 | |||
| 14 Cours Jean Ballard, 13001 Marseille, France | |||
|
|
|||
| [[restaurants--uk]] | |||
| === United Kingdom 英国 | |||
| === The United Kingdom 英国 | |||
There was a problem hiding this comment.
I think without The is a bit better since this is part of a large country list.
|
Gummy! Every typo / grammar fix is always welcome, thanks for putting so much work into proof-reading! Punctuation, hyphenation vs spaces, and some preposition choices, I think I'll never learn, not even in Portuguese, so I basically just accepted all of those :-) learned a few new rules that I can remember though. Grammar is made worse in this repo because I'm often in "gotta finish this quickly to get back to coding!" mode. And some of them I thought were existing informal ways of speaking, but it is better to avoid those in any case to make it easier on Google Translate. List items, are you following a specific style? I commented in one of the instances, but would be good to clarify the general rules you propose. |
cirosantilli
force-pushed
the
master
branch
2 times, most recently
from
ce2c37c
to
3ba47f8
Compare
cirosantilli
force-pushed
the
master
branch
10 times, most recently
from
b15fb49
to
6d0bfd1
Compare
cirosantilli
force-pushed
the
master
branch
3 times, most recently
from
ddc4f8a
to
b0db725
Compare
cirosantilli
force-pushed
the
master
branch
4 times, most recently
from
fe91572
to
0d7bdc1
Compare
cirosantilli
force-pushed
the
master
branch
3 times, most recently
from
70c65f8
to
8806d92
Compare
| * 2018-08 https://www.reuters.com/article/us-china-rights-un/u-n-says-it-has-credible-reports-that-china-holds-million-uighurs-in-secret-camps-idUSKBN1KV1SU | ||
| * 2018-07 https://www.youtube.com/watch?v=Eak3WRtcdko Sairagul Sawytbai testifies to the existence of Chinese concentration camps in Xinjiang | ||
| * 2018-05 generic report https://jamestown.org/program/evidence-for-chinas-political-re-education-campaign-in-xinjiang/ | ||
| * 2018-05 mapping interment camps with satelite imaging: | ||
| * 2018-05 mapping internment camps with satellite imaging: |
There was a problem hiding this comment.
This one was funny in a sadistic way.
cirosantilli
added a commit
that referenced
this pull request
Apr 18, 2020
Incorporate only stuff that I have the patience to understand and am likely to follow in the future. Some of it I just can't be bothered. English is hard.
|
I incorporated the corrections that I can understand an am likely to be able to do in the future at 5610824 . Thanks a lot for this once again.
|
ghost
mentioned this pull request
This was referenced Feb 3, 2021
cirosantilli
added
the
not-shitpost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hello, I am a Chinese Canadian (my family is from Mainland China). I really like your writing and appreciate your support for China's freedom and democracy. I am anti-CCP and my English is good since I grew up here, so I helped you fix some grammar, spelling, typos, etc.