aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/zh_CN
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/zh_CN')
-rw-r--r--Documentation/zh_CN/SubmitChecklist2
-rw-r--r--Documentation/zh_CN/email-clients.txt210
-rw-r--r--Documentation/zh_CN/magic-number.txt2
3 files changed, 107 insertions, 107 deletions
diff --git a/Documentation/zh_CN/SubmitChecklist b/Documentation/zh_CN/SubmitChecklist
index 951415bbab0..4c741d6bc04 100644
--- a/Documentation/zh_CN/SubmitChecklist
+++ b/Documentation/zh_CN/SubmitChecklist
@@ -67,7 +67,7 @@ Linux内核提交清单
67 67
6812:已经通过CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT, 6812:已经通过CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT,
69 CONFIG_DEBUG_SLAB, CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES, 69 CONFIG_DEBUG_SLAB, CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES,
70 CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_SPINLOCK_SLEEP测试,并且同时都 70 CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_ATOMIC_SLEEP测试,并且同时都
71 使能。 71 使能。
72 72
7313:已经都构建并且使用或者不使用 CONFIG_SMP 和 CONFIG_PREEMPT测试执行时间。 7313:已经都构建并且使用或者不使用 CONFIG_SMP 和 CONFIG_PREEMPT测试执行时间。
diff --git a/Documentation/zh_CN/email-clients.txt b/Documentation/zh_CN/email-clients.txt
index 5d65e323d06..b9a1a3e6c78 100644
--- a/Documentation/zh_CN/email-clients.txt
+++ b/Documentation/zh_CN/email-clients.txt
@@ -1,4 +1,4 @@
1閿?Chinese translated version of Documentation/email-clients.txt 1Chinese translated version of Documentation/email-clients.txt
2 2
3If you have any comment or update to the content, please contact the 3If you have any comment or update to the content, please contact the
4original document maintainer directly. However, if you have a problem 4original document maintainer directly. However, if you have a problem
@@ -8,203 +8,203 @@ or if there is a problem with the translation.
8 8
9Chinese maintainer: Harry Wei <harryxiyou@gmail.com> 9Chinese maintainer: Harry Wei <harryxiyou@gmail.com>
10--------------------------------------------------------------------- 10---------------------------------------------------------------------
11Documentation/email-clients.txt ???娑????槒?? 11Documentation/email-clients.txt 殑涓枃缈昏瘧
12 12
13婵??????疇??鐠佺????瀛?鐗???????????櫢??鐠囬?瀛?銉???????锝??缂佸瓨?銈?????????娴?法??鲸?? 13鏋滄宠瘎璁烘栨洿鏂版湰鏂殑鍐呭锛岃洿ヨ仈師鏂囨。鐨勭淮傚鏋滀綘浣跨嫳鏂
14銈??????????拠?閿?稊????禒銉??娑???????缂瓨???Ч???鈹??俊???????槒????瓨?棰????????????紙? 14夊洶闅剧殑璇濓屼篃彲浠ュ悜涓枃姢鑰灉鏈炕璇洿鏂颁笉強鏃舵
15鐠?鐎???銊??妫??柉????????缂佸瓨?????? 15璇戝瓨鍦棶棰橈紝璇疯郴涓存姢
16 16
17稉???????紒瀛?銈??閿? 儳??婵? Harry Wei <harryxiyou@gmail.com> 17姢鑰咃細 璐惧▉濞 Harry Wei <harryxiyou@gmail.com>
18稉???????鏄?????閿? 拹鎯??? Harry Wei <harryxiyou@gmail.com> 18昏瘧鑰咃細 璐惧▉濞 Harry Wei <harryxiyou@gmail.com>
19稉?????????陇?????閿? Yinglin Luan <synmyth@gmail.com> 19枃鐗堟牎璇戣咃細 Yinglin Luan <synmyth@gmail.com>
20 Xiaochen Wang <wangxiaochen0@gmail.com> 20 Xiaochen Wang <wangxiaochen0@gmail.com>
21 yaxinsn <yaxinsn@163.com> 21 yaxinsn <yaxinsn@163.com>
22 22
23禒銉??稉鐑?锝?? 23浠ヤ笅涓
24--------------------------------------------------------------------- 24---------------------------------------------------------------------
25 25
26Linux???禒璺???????純?穱鈩?? 26Linux閭欢瀹风疆淇
27====================================================================== 27======================================================================
28 28
29?????????純? 29鏅氶厤
30---------------------------------------------------------------------- 30----------------------------------------------------------------------
31Linux?????姝屗夋稉???????鏉????娴犳儼?????娴溿倗??閿????婵傝姤??鐞涖儰??娴?娑撴椽??娴犳湹????????瀹?????????????娴?缂佸瓨?銈?? 31Linux鍐呮牳琛ヤ竵鏄氳繃閭欢琚彁浜ょ殑锛屾渶濂芥妸琛ヤ竵浣滀负閭欢浣撶殑鍐呭祵鏂囨湰銆傛湁浜涚淮鎶よ
32??銉?鍫????担???????娴墎?????鐎?鐓??惔?鐠囥儲??"text/plain"?????鎯??敍????湹????????娑?挧???????閿? 32帴鏀堕檮浠讹紝浣嗘槸闄勪欢鐨勫唴鏍紡搴"text/plain"銆傜劧鑰岋紝檮浠朵竴鑸槸涓嶈殑锛
33???娑撻??娴?娴儻藟娑????瀵???銊?銊?????????娑??????????浼?淇?? 33鍥犱鸿氫娇涓佺儴鍒嗗湪璇勮彉鐨勫緢鍥闅俱
34 34
35??銊?銉?????Linux?????姝屗夋稉???????娴犺泛?銏?椋????銊?????鐞涖儰????璺??鐠囥儱??娴?????????????婵???鑸?????娓?婵?閿? 35鐢ㄦ潵鍙戦丩inux鍐呮牳琛ヤ竵鐨勯偖浠跺鎴风鍦ㄥ彂閫佽ˉ涓佹椂搴旇澶勪簬鏂囨湰鐨勫師濮嬬姸鎬併備緥濡傦紝
36禒?????姤?懓?????????????銈?粭???????缁儤?纭???????櫕????銊??稉?鐞?????婢瓨??????亸淇?? 36浠栦滑涓嶈兘敼鍙垨鑰呭闄ゅ┖鏍硷湪姣忎竴琛澶存垨鑰粨灏俱
37 37
38娑?鐟????鏉?"format=flowed"Ο????????鐞儰?????潻???渹???鐠ц?????0????儱?????瑰磭?????鐞???? 38涓嶈閫氳繃"format=flowed"紡鍙戦佽ˉ涓傝繖牱浼氬紩捣涓棰勬熶互鍙湁瀹崇殑柇琛
39 39
40娑?鐟?鐠鈺????????娴泛?銏?椋??鏉?悰????????????潻??????????娴????儰????? 40涓嶈閭欢瀹㈡风杩涜鑷姩銆牱涔熶氱牬忎綘殑琛ヤ竵
41 41
42???娴犺泛?銏?椋??娑???鑺?鐟???????????鐎?缁????缂??????鐟?????鐟??????????鐞涖儰???????鑺??ASCII??????UTF-8缂??????鐟??閿? 42閭欢瀹㈡埛绔笉鑳芥敼鍙樻枃鏈殑瀛楃闆嗙紪鐮佹柟寮忋傝鍙戦佺殑琛ヤ竵鍙兘鏄疉SCII鎴栬匲TF-8缂栫爜鏂瑰紡锛
43????娴?娴h??UTF-8缂??????懓???????????娴璁????锝??娴????????娴???????????????缁???????妫???? 43灉浣犱║TF-8缂鐮佹彂閫侀锛岄偅涔堜綘灏嗕細閬垮厤涓浜涘彲兘鍙戠敓鐨勫銆
44 44
45???娴犺泛?銏???惔?拠銉埌???楠湹??穱???? References: ?????? In-Reply-To: ???0?敍???絼?? 45偖浠跺搴褰垚骞朵笖淇 References: 鎴栬 In-Reply-To: 紝閭d箞
46???娴犳儼??妫?鐏忓??娴?稉??????? 46閭欢璇濋灏变笉氫腑柇銆
47 47
48婢???鍓??鐢?(?????????鐠愬??鐢?)???鐢晲????鐣?銊??鐞涖儰??閿????娑撳搫?鎯般冪粭?娴?鏉????娑撹櫣鈹??绗??娴h法??xclipboard, xclip 48澶嶅埗绮樺笘(鎴栬呭壀璐寸矘甯)閫氬父涓嶈兘鐢ㄤ簬琛ヤ竵锛屽洜涓哄埗琛ㄧ浼氳浆鎹负绌烘牸銆備娇鐢▁clipboard, xclip
49??????xcutsel娑?鐠佺ǹ??娴犮儻??娴???????婵??鐠?稉?稉?????????灝??法?銊????鍓?????? 49鎴栬xcutsel鍙锛屼絾瘯涓涓嬫垨鑰呴垮厤浣ㄥ鍒剁矘甯栥
50 50
51娑?鐟???銊ゅ▏???PGP/GPG缂冩彃????????娴犳湹鑵??????鐞涖儰?????鏉???铚??娴e灝??瀵?婢???????娑???鍊?璇??????????銊??娴????鐞涖儰????? 51涓嶈鍦ㄤ娇鐢≒GP/GPG缃插悕鐨勯偖浠朵腑鍖呭惈琛ヤ竵銆傝繖鏍蜂細浣垮緱寰堝鑴氭湰涓嶈兘璇诲彇鍜岄傜敤浜庝綘鐨勮ˉ涓併
52?潻?娑????妫?鎼?鐠囥儲?????娴犮鎱ㄦ径????閿? 52锛堣繖涓棶棰樺槸鍙互淇嶇殑锛
53 53
54??銊???????鎼??娴犺泛??鐞涖劌?????鐞涖儰??娑????閿?缂????瀹稿崬?????娑?娑?鐞涖儰?????娑?娑???????娑撶粯??閿?娣?鐎???銉?璺?鎵?? 54鍦ㄧ粰鍐呮牳閭欢鍒楄〃鍙戦佽ˉ涓佷箣鍓嶏紝缁欒嚜宸卞彂閫佷竴涓ˉ涓佹槸涓笉閿欑殑涓绘剰锛屼繚瀛樻帴鏀跺埌鐨
55???娴犺???悰銉?????'patch'??鎴掓????閿?俊??????????娴?閿????缂????????泛??鐞劌???????? 55浠讹紝灏嗚ˉ涓'patch'鍛戒涓婏紝濡鍔熶簡锛屽啀缁欏唴搁偖浠跺垪〃鍙戦
56 56
57 57
58?禍????娴犺泛??椋?????粈? 58涓浜涢偖浠鎻愮ず
59---------------------------------------------------------------------- 59----------------------------------------------------------------------
60鏉????缂???杞??娴?鐠?缂????MUA???缂????缁鐚?????娴犮儳?銊??缂?Linux?????绋?????鐞涖儰?????鏉?娴?楠炴湹???????铏?? 60杩欓噷缁欏嚭涓浜涜缁嗙殑MUA閰嶇疆鎻愮ず锛屽彲浠ョ敤浜庣粰Linux鍐呮牳鍙戦佽ˉ涓併傝繖浜涘苟涓嶆剰鍛虫槸
61?????????潪?禒璺?????純???????? 61蒋浠跺寘閰缃荤粨銆
62 62
63鐠囧??閿? 63璇存庯細
64TUI = 禒銉??????铏???????銊??銉?? 64TUI = 湰涓熀纭鐨ㄦ埛鎺
65GUI = ??鎯ц埌?????銏?銊??銉?? 65GUI = 鍥惧ㄦ埛鎺
66 66
67~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 67~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
68Alpine (TUI) 68Alpine (TUI)
69 69
70???????妞ょ櫢?? 70疆閫夐」
71???"Sending Preferences"??銊??敍? 71"Sending Preferences"儴鍒嗭細
72 72
73- "Do Not Send Flowed Text"韫?妞よ????? 73- "Do Not Send Flowed Text"蹇呴』寮鍚
74- "Strip Whitespace Before Sending"韫?妞よ?鎶?? 74- "Strip Whitespace Before Sending"蹇呴』鍏抽棴
75 75
76瑜???????埖?璁????????惔?鐠銉?鎯?稉?娴???铏?鎵?????鐧????璺?????娑?CTRL-R紒?????????????? 76褰撳啓閭欢椂锛屽厜囧簲斁鍦ㄨˉ涓佷細虹幇鐨劧鍚庢CTRL-R粍鍚紝浣囧畾
77鐞涖儰?????娴泛????銉?即??犳湹??? 77枃浠跺ュ埌閭欢涓
78 78
79~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 79~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
80Evolution (GUI) 80Evolution (GUI)
81 81
82娑?娴?????????????????娴法??????????? 82涓浜紑鍙呮垚鍔熺敤瀹鍙戦佽ˉ涓
83 83
84瑜??????鈺??娴爼??い鐧??Preformat 84綋閫嫨閭欢閫夐」锛Preformat
85 娴?Format->Heading->Preformatted (Ctrl-7)??????銉?閿?? 85 Format->Heading->Preformatted (Ctrl-7)鎴栬鍏锋爮
86 86
87??璺??娴h法??? 87鐒跺悗浣跨細
88 Insert->Text File... (Alt-n x)?????銉ㄋ稉????娴翰?? 88 Insert->Text File... (Alt-n x)彃鍏ˉ涓佹枃浠躲
89 89
90娴?鏉????娴?"diff -Nru old.c new.c | xclip"敍???????Preformat閿???璺??娴h法?銊よ厬??鎾??鏉???敮???? 90杩樺彲浠"diff -Nru old.c new.c | xclip"夋嫨Preformat庝娇敤涓棿閿杩涜矘甯栥
91 91
92~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 92~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
93Kmail (GUI) 93Kmail (GUI)
94 94
95稉?娴?????????????????娴法?銊????????鐞儰????? 95涓浜涘紑鍙戣姛鐨勪娇鐢ㄥ冨彂閫
96 96
97姒?拋銈?鍓х枂娑?娑?HTML??鐓???????????????娑?憰??????劌????? 97榛樿璁疆涓嶄负HTML鏍煎紡鏄悎傜殑锛涓嶈鍚敤瀹
98 98
99瑜?娑????娑?鐏????娴犲墎????璺??閿???銊??妞ら?????娑?鐟??????鈺????銊?銏????????娑????缂傝櫣?鐟版皑???娴???銊??娴犳湹鑵戞潏???銉??娴犺???????? 99褰撲功鍐欎竴灏侀偖浠剁殑鏃跺欙紝鍦ㄩ夐」涓嬮潰涓嶈閫夋嫨鑷姩鎹㈣銆傚敮涓鐨勭己鐐瑰氨鏄綘鍦ㄩ偖浠朵腑杈撳叆鐨勪换浣曟枃鏈
100??鎴??娴?鐞??????銊?銏??閿????濮濄倓??韫?妞よ?銊?????鐞涖儰??娑?????????銊?銏????????缁?????????瑙??鐏忚鲸???????銊????銊?銏????銉ゅ姛??????娴犺?? 100閮戒笉浼氳鑷姩鎹㈣锛屽洜姝や綘蹇呴』鍦ㄥ彂閫佽ˉ涓佷箣鍓嶆墜鍔ㄦ崲琛屻傛渶绠鍗曠殑鏂规硶灏辨槸鍚敤鑷姩鎹㈣鏉ヤ功鍐欓偖浠讹紝
101??璺?????鐎?娣?鐎?娑撻缚??缁嬭¥??娑????娴???銊??缁嬪じ鑵???濞嗏剝??瀵?鐎?閿?鐎?瀹歌尙????銊?銊????銊?銏??娴?閿???锝??娴???????娴犳儼?鐣?鑸电梾??? 101鐒跺悗鎶婂畠淇濆瓨涓鸿崏绋裤備竴鏃︿綘鍦ㄨ崏绋夸腑鍐嶆鎵撳紑瀹冿紝瀹冨凡缁忓叏閮ㄨ嚜鍔ㄦ崲琛屼簡锛岄偅涔堜綘鐨勯偖浠惰櫧鐒舵病鏈
102?????鈺????銊?銏??敍?担????鏉?稉???鍑???????????劍?銏????? 102鑷姩崲琛岋紝浣槸杩樹笉氬け鍘诲凡湁鐨勮嚜
103 103
104????娴墎??鎼????敍??????稉?????閿???彞??摜?銊??悰銉???????閿?娑?娑?鏉?鐎????(---)??? 104鍦ㄩ偖浠剁彃鍏ヨˉ涓佷箣鍓嶏紝句笂殑琛ヤ竵瀹锛氫笁涓繛瀛(---)
105 105
106??璺?????"Message"????????锛??閿??????鈺????銉??娴犺????銉????????娴????鐞涖儰?????娴犺翰??鏉????娑?娑?妫?婢???????妞ょ櫢??娴????娴? 106鐒跺悗鍦"Message"鑿滃崟鏉$洰锛岄夋嫨鎻掑叆鏂囦欢锛屾帴鐫閫夊彇浣犵殑琛ヤ竵鏂囦欢銆傝繕鏈変竴涓澶栫殑閫夐」锛屼綘鍙互
107???鏉?????缂?娴???????娴泛缂撶粩??攱????????閿?鏉????娴稉?"insert file"??????? 107瀹冮厤缃殑閭欢寤虹嬪伐鍏爮鑿滃崟锛岃繕鍙互甯︿笂"insert file"鍥炬爣銆
108 108
109娴????娴犮儱????銊?浼??鏉?GPG???鐠佷即??娴犺??娴???????瀹?鐞涖儰?????婵傛垝??鐟?娴h法??GPG???鐠佹澘??娴????娴?娑撳搫??瀹??????????缁涙儳??鐞涖儰??閿? 109浣犲彲浠ュ畨鍏ㄥ湴閫氳繃GPG鏍囪闄勪欢锛屼絾鏄唴宓岃ˉ涓佹渶濂戒笉瑕佷娇鐢℅PG鏍囪瀹冧滑銆備綔涓哄唴宓屾枃鏈殑绛惧彂琛ヤ竵锛
110瑜?娴?GPG稉???????7娴???????湹??娴じ?????????????婢??????? 110褰撲粠GPG彁鍙7栫爜椂浼氫娇浠栦滑彉鐨洿鍔
111 111
112婵????娴????鐟?娴犮儵??娴犲墎??瑜般垹????????鐞涖儰??閿???锝??鐏忓崬?鎶????鐟?濠??娴犺????璺?????娑?鐏???褝??缁????"Suggest automatic 112濡傛灉浣犻潪瑕佷互闄勪欢鐨勫舰寮忓彂閫佽ˉ涓侊紝閭d箞灏卞彸閿偣鍑婚檮浠讹紝鐒跺悗閫変腑灞炴э紝绐佸嚭"Suggest automatic
113display"閿?潻???嘲??畵????犺埖?鏉?瑙??鐠佲晞?????????? 113display"锛岃繖洿瀹规璇昏呯湅
114 114
115瑜?娴?鐟?娣?鐎?鐏?鐟?????????????瀹???????鐞涖儰??閿?娴????娴犮儰??濞???????鐞涖劎????濂????鈺?????鐞涖儰????????娴犺????璺????鍐?濠????? 115褰撲綘瑕佷繚瀛樺皢瑕佸彂閫佺殑鍐呭祵鏂囨湰琛ヤ竵锛屼綘鍙互浠庢秷鎭垪琛ㄧ獥鏍奸夋嫨鍖呭惈琛ヤ竵鐨勯偖浠讹紝鐒跺悗鍙冲嚮閫夋嫨
116"save as"???娴????娴犮儰濞??銊??娑?濞屸剝????瀛?鍦????????鐞涖儰????????娴犺??婵????鐎????娴犮儲?锝団???瑜般垹??缂???????瑜?娴?濮濓絿????銊?? 116"save as"銆備綘鍙互浣跨敤涓涓病鏈夋洿鏀圭殑鍖呭惈琛ヤ竵鐨勯偖浠讹紝濡傛灉瀹冩槸浠ユ纭殑褰㈠紡缁勬垚銆傚綋浣犳鐪熷湪瀹
117???瀹歌京??缁???锝??娑?鐎????閿???锝?鑸电梾??????妞ょ懓??娴犮儰??鐎????娴?--瀹歌尙?????娑?娑?鏉???椋??bug鐞?濮???銉?棰??kmail???bugzilla 117鑷繁鐨勭獥鍙d箣涓嬪療鐪嬶紝閭f椂娌℃湁閫夐」鍙互淇濆瓨閭欢--宸茬粡鏈変竴涓繖鏍风殑bug琚眹鎶ュ埌浜唊mail鐨刡ugzilla
118楠炴湹??鐢????鏉?鐏?娴?鐞?婢??????????娴犺埖??娴犮儱?????鐎佃??娑???銊?宄??鐠囪???????????鐞?娣?鐎????閿????娴犮儱?????娴???铏?????娴犺泛????璺?鏉?鏈????鐗?鐧?? 118骞朵笖甯屾湜杩欏皢浼氳澶勭悊銆傞偖浠舵槸浠ュ彧閽堝鏌愪釜鐢ㄦ埛鍙鍐欑殑鏉冮檺琚繚瀛樼殑锛屾墍浠ュ鏋滀綘鎯虫妸閭欢澶嶅埗鍒板叾浠栧湴鏂癸紝
119娴?娑??稉????禒?娴????????????涜礋紒?????????缈?????鐠眹?? 119浣犱笉緱涓妸浠栦滑鐨檺鏀逛负垨鑰呮暣浣撳彲璇汇
120 120
121~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 121~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
122Lotus Notes (GUI) 122Lotus Notes (GUI)
123 123
124娑?鐟?娴?劌????? 124浣跨
125 125
126~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 126~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
127Mutt (TUI) 127Mutt (TUI)
128 128
129??Linux????娴搫??娴h??mutt鐎广垺?椋??閿????禒銉?????????鐎?????????鐢憡??娴???? 129堝Linux彂浜哄憳浣跨╩utt锛屾浠ヨ瘉鏄畾宸ヤ鐨勯潪甯告紓浜
130 130
131Mutt娑????鐢?缂?鏉????閿????娴犮儰??缁犫??娴h法?銊??娑?缂?鏉???銊?鎴??鎼?鐠囥儱鐢????????銊??鐞????婢堆????鎵??鏉???銊?钘夌敨??? 131Mutt涓嶈嚜甯︾紪杈戝櫒锛屾墍浠ヤ笉绠′綘浣跨敤浠涔堢紪杈戝櫒閮戒笉搴旇甯︽湁鑷姩鏂銆傚ぇ澶氭暟缂栬緫鍣ㄩ兘甯︽湁
132娑?娑?"insert file"???妞ょ櫢??????娴犮??潻????懓?????禒璺??鐎湱????鐟???????銉??禒韬?? 132涓涓"insert file"锛屽鍙互閫氳繃涓敼鍙枃浠鍐呭彃鍏ユ枃浠躲
133 133
134'vim'娴?娑?mutt????鏉????閿? 134'vim'浣滀负mutt栬緫鍣細
135 set editor="vi" 135 set editor="vi"
136 136
137????娴h??xclip閿???彃?銉簰娑???鎴掓 137 灉浣▁clip暡鍏互涓嬪懡浠
138 :set paste 138 :set paste
139 ???稉????娑??????????shift-insert???????? 139 寜涓箣鍓嶆垨鑰shift-insert呬娇鐢
140 :r filename 140 :r filename
141 141
142婵??????疇?????鐞涖儰??担?搫??畵?????????? 142兂瑕佹妸琛ヤ竵浣滀负祵鏂囨湰銆
143(a)ttach銉??????總鏂??娑?鐢????"set paste"??? 143(a)ttach伐浣滅殑寰堝ソ锛屼"set paste"
144 144
145???????妞ょ櫢?? 145疆閫夐」
146鐎?鎼?鐠囥や簰姒?鐠併倛?墽鐤???般垹??儰????? 146浠ラ粯璁剧疆鐨勫舰寮忓伐浣
147??儼??閿????"send_charset"拋鍓х枂娑?"us-ascii::utf-8"????娑?娑?娑???????娑????? 147鐒惰岋紝"send_charset"疆涓"us-ascii::utf-8"槸涓涓笉殑涓鎰忋
148 148
149~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 149~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
150Pine (TUI) 150Pine (TUI)
151 151
152Pine鏉?????稉?娴??????????妫?閿?娴????鏉?娴???鏉?銊??鐠囥???娣?婢?娴???? 152Pine杩囧変竴浜┖鏍煎垹鍑忛棶棰橈浣嗘繖浜ㄥ簲璇借淇浜嗐
153 153
154俊???????娴犮儻??鐠囪???alpine(pine????儻??) 154彲浠ワ紝璇蜂娇鐢╝lpine(pine缁ф壙)
155 155
156???????妞ょ櫢?? 156疆閫夐」
157- ???潻??????????????濞???銈????????? 157- 渶杩殑鐗堟湰闇瑕佹秷闄ゆ祦绋鏂囨湰
158- "no-strip-whitespace-before-send"???????????憰??????? 158- "no-strip-whitespace-before-send"閫夐」涔殑銆
159 159
160 160
161~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 161~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
162Sylpheed (GUI) 162Sylpheed (GUI)
163 163
164- ???畵??????????犮儱??晫??銉??閿??????????娴犺????? 164- 枃鏈彲浠ュ緢濂伐浣滐紙呬娇鐢浠讹級銆
165- ???鐠??????銊???鏉???劊?? 165- 璁镐娇鐢閮栬緫鍣
166- ??????潏?婢???爼??鐢憡????? 166- 瀵逛簬綍父鎱€
167- 婵???????鏉?non-SSL潻???銉?????濞?担璺??TLS SMTP????????? 167- 灉閫氳non-SSL帴锛棤娉曚娇鐢═LS SMTP鎺堟潈銆
168- ??銊????????锝鑵???稉?稉?????????ruler bar??? 168- 缁勬垚绐楀彛涓湁涓涓緢鏈夌敤鐨剅uler bar
169- 紒????????稉?濞h????澘??鐏彉??娴?锝団???禍?憴锝?鍓с仛?????? 169- 粰鍦板湰涓灏变笉浼‘鐨勪f樉绀哄悕
170 170
171~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 171~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
172Thunderbird (GUI) 172Thunderbird (GUI)
173 173
174姒?鐠併倖????鍏??閿?thunderbird瀵?鐎硅??????????????閿?娴????鏉????娑?娴???瑙?????娴犮儱宸??璺?????瀵???鏉戙偨??? 174榛樿鎯呭喌涓嬶紝thunderbird寰堝鏄撴崯鍧忔枃鏈紝浣嗘槸杩樻湁涓浜涙柟娉曞彲浠ュ己鍒跺畠鍙樺緱鏇村ソ銆
175 175
176- ??銊?銊?嘲????柉?枂???敍??????????敍?稉?鐟???????"Compose messages in HTML format"??? 176- 敤鎴笎鍙疯粍鎴愬拰瀵诲锛屼笉"Compose messages in HTML format"
177 177
178- 缂?鏉?娴????Thunderbird???純?墽鐤??ゅ▏鐎?稉?鐟????鐞?娴法???user_pref("mailnews.wraplength", 0); 178- 缂栬緫浣犵殑Thunderbird疆璁疆鏉ヤ娇涓嶈浣跨細user_pref("mailnews.wraplength", 0);
179 179
180- 缂?鏉?娴????Thunderbird????鐠?娴e灝??娑?鐟?娴h??"format=flowed"??鐓??閿?user_pref("mailnews. 180- 缂栬緫浣犵殑Thunderbird疆璁剧疆屼娇瀹涓嶈鐢"format=flowed"鏍煎紡锛user_pref("mailnews.
181 send_plaintext_flowed", false); 181 send_plaintext_flowed", false);
182 182
183- 娴????鐟?娴?Thunderbird???椽???????鐓????鐟??閿? 183- 浣犻渶瑕佷娇Thunderbird鍙樹负棰勫厛牸寮柟寮忥細
184 婵????姒?鐠併倖????鍏??娴?娑??????????HTML??鐓??閿???锝?????瀵???淇??娴?娴?娴????妫???????娑????濡?娑???????"Preformat"??鐓????? 184 濡傛灉榛樿鎯呭喌涓嬩綘涔﹀啓鐨勬槸HTML鏍煎紡锛岄偅涓嶆槸寰堥毦銆備粎浠呬粠鏍囬鏍忕殑涓嬫媺妗嗕腑閫夋嫨"Preformat"鏍煎紡銆
185 婵????姒?鐠併倖????鍏??娴?娑??????????????????鐓??閿?娴?娑?瀵????鐎???閫涜礋HTML??鐓??閿?娴?娴?娴?娑撹桨??濞嗏剝?褏??閿???銉ゅ姛?????鎵??濞????閿? 185 濡傛灉榛樿鎯呭喌涓嬩綘涔﹀啓鐨勬槸鏂囨湰鏍煎紡锛屼綘涓嶅緱鎶婂畠鏀逛负HTML鏍煎紡锛堜粎浠呬綔涓轰竴娆℃х殑锛夋潵涔﹀啓鏂扮殑娑堟伅锛
186 ??璺??瀵搫?鏈靛▏鐎??????鐗???????鐓??閿???????鐎?鐏忓彉?????鐞????鐟?鐎???鏉??閿???銊??娣囷紕????鐐??娑?娴h法??shift?????銉ゅ▏鐎????娑?HTML 186 鐒跺悗寮哄埗浣垮畠鍥炲埌鏂囨湰鏍煎紡锛屽惁鍒欏畠灏变細鎷嗚銆傝瀹炵幇瀹冿紝鍦ㄥ啓淇$殑鍥炬爣涓婁娇鐢╯hift閿潵浣垮畠鍙樹负HTML
187 ????敍???璺?????0???????稉????濡?稉???????"Preformat"??鐓????? 187 鏍煎紡锛劧鍚爮鐨勪笅涓夋嫨"Preformat"鏍煎紡銆
188 188
189- ???鐠??????銊???鏉????閿? 189- 璁镐娇鐢閮栬緫鍣細
190 ???鐎?Thunderbird???鐞涖儰?????缁?????????瑙??鐏忚鲸??娴h法?銊??娑?"external editor"??鈺??閿???璺??娴h法?銊????????濞嗐垻?? 190 閽堝Thunderbird鎵撹ˉ涓佹渶绠鍗曠殑鏂规硶灏辨槸浣跨敤涓涓"external editor"鎵╁睍锛岀劧鍚庝娇鐢ㄤ綘鏈鍠滄鐨
191 $EDITOR??銉?璇???????????楠炴儼藟娑???鐗?????娑????鐟?鐎???鏉??閿????娴犮儰??鏉炶棄鑻熸稉?鐎?鐟?鏉?娑???鈺??閿???璺??濞h??娑?娑?娴h法?銊????? 191 $EDITOR鏉ヨ鍙栨垨鑰呭悎骞惰ˉ涓佸埌鏂囨湰涓傝瀹炵幇瀹冿紝鍙互涓嬭浇骞朵笖瀹夎杩欎釜鎵╁睍锛岀劧鍚庢坊鍔犱竴涓娇鐢ㄥ畠鐨
192 ??????View->Toolbars->Customize...??????瑜?担?稊????娣団???????璺??禒?娴????璇??鐏崬??娴儰????? 192 鎸夐敭View->Toolbars->Customize...渶鍚庡綋浣犱功鍐欎俊伅鐨椂鍊欎粎浠偣鍑诲畠彲浠ヤ簡
193 193
194~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 194~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
195TkRat (GUI) 195TkRat (GUI)
196 196
197???娴犮儰??劌?????娴h??"Insert file..."??????径??????鏉???劊?? 197彲浠ヤ娇鐢備娇鐢"Insert file..."垨鑰呭閮ㄧ栬緫鍣
198 198
199~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 199~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
200Gmail (Web GUI) 200Gmail (Web GUI)
201 201
202娑??娴法?銊????????鐞儰????? 202涓嶈浣敤瀹冨
203 203
204Gmail純?妞潧?銏?椋???????銊?鐗????儼銆粭?潪????櫣鈹???? 204Gmail靛鑷姩鍦妸鍒﹁浆鎹绌烘牸銆
205 205
206??鐣?璺?鎯般冪粭?鏉????娑撹櫣鈹??濂??妫????娴犮儴??婢???銊??鏉???銊ㄐ??绛???????璺??鏉?娴?娴h法?銊??鏉???銏?????濮?鐞???????娑?78娑?鐎?缁???? 206铏界劧鍒惰〃绗﹁浆鎹负绌烘牸闂鍙互琚閮ㄧ紪杈戝櫒瑙e喅锛屽悓鏃跺畠杩樹細浣跨敤鍥炶溅鎹㈣鎶婃瘡琛屾媶鍒嗕负78涓瓧绗︺
207 207
208???娑?娑????妫????Gmail鏉?娴????娴犺??娑????ASCII???鐎?缁????娣団剝????閫涜礋base64缂???????鐎????娑?鐟楀灝????????濞喲勫簥娴滆櫣?????鐎???? 208鍙︿竴涓棶棰樻槸Gmail杩樹細鎶婁换浣曚笉鏄疉SCII鐨勫瓧绗︾殑淇℃伅鏀逛负base64缂栫爜銆傚畠鎶婁笢瑗垮彉鐨勫儚娆ф床浜虹殑鍚嶅瓧銆
209 209
210 ### 210 ###
diff --git a/Documentation/zh_CN/magic-number.txt b/Documentation/zh_CN/magic-number.txt
index 4c4ce853577..c278f412dc6 100644
--- a/Documentation/zh_CN/magic-number.txt
+++ b/Documentation/zh_CN/magic-number.txt
@@ -66,7 +66,7 @@ MKISS_DRIVER_MAGIC 0x04bf mkiss_channel drivers/net/mkiss.h
66RISCOM8_MAGIC 0x0907 riscom_port drivers/char/riscom8.h 66RISCOM8_MAGIC 0x0907 riscom_port drivers/char/riscom8.h
67SPECIALIX_MAGIC 0x0907 specialix_port drivers/char/specialix_io8.h 67SPECIALIX_MAGIC 0x0907 specialix_port drivers/char/specialix_io8.h
68HDLC_MAGIC 0x239e n_hdlc drivers/char/n_hdlc.c 68HDLC_MAGIC 0x239e n_hdlc drivers/char/n_hdlc.c
69APM_BIOS_MAGIC 0x4101 apm_user arch/i386/kernel/apm.c 69APM_BIOS_MAGIC 0x4101 apm_user arch/x86/kernel/apm_32.c
70CYCLADES_MAGIC 0x4359 cyclades_port include/linux/cyclades.h 70CYCLADES_MAGIC 0x4359 cyclades_port include/linux/cyclades.h
71DB_MAGIC 0x4442 fc_info drivers/net/iph5526_novram.c 71DB_MAGIC 0x4442 fc_info drivers/net/iph5526_novram.c
72DL_MAGIC 0x444d fc_info drivers/net/iph5526_novram.c 72DL_MAGIC 0x444d fc_info drivers/net/iph5526_novram.c