From 063f7b2953251125c8a782e16e11ea1a3812f70d Mon Sep 17 00:00:00 2001 From: Xuxin He <hxxtom@gmail.com> Date: Tue, 6 Sep 2022 18:48:37 +0800 Subject: [PATCH] zh-hans: translate thunderbird's string base on thunderbird's l10n. --- esd-zh-hans.po | 61 +++++++++++++++++++++------------------------- zh-hans/index.html | 40 +++++++++++++++--------------- 2 files changed, 47 insertions(+), 54 deletions(-) diff --git a/esd-zh-hans.po b/esd-zh-hans.po index 8a4ff71e..62ad0640 100644 --- a/esd-zh-hans.po +++ b/esd-zh-hans.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: emailselfdefense 4.0\n" "POT-Creation-Date: 2022-04-16 18:29+0200\n" -"PO-Revision-Date: 2022-09-06 16:39+0800\n" +"PO-Revision-Date: 2022-09-06 18:04+0800\n" "Last-Translator: Xuxin He (Tom) <hxxtom@gmail.com>\n" "Language-Team: \n" "Language: zh_CN\n" @@ -474,7 +474,7 @@ msgstr "第 1.A æ¥ï¼å®è£ å导" #. type: Content of: <html><body><section><div><div><div><h3> msgid "<em>Step 1.a</em> Set up your email program with your email account" -msgstr "<em>第 1.a æ¥</em> é ç½®çµåé®ä»¶å¸å·" +msgstr "<em>第 1.a æ¥</em> é ç½®çµåé®ä»¶è´¦æ·" #. type: Content of: <html><body><section><div><div><div><p> msgid "" @@ -484,9 +484,9 @@ msgid "" "settings from your systems administrator or the help section of your email " "account." msgstr "" -"æå¼çµé®ç¨åºï¼æç §å导ä¸æ¥ä¸æ¥é 置好çµé®å¸å·ãé常第ä¸æ¥æ¯ä»âå¸å·è®¾" -"ç½®â→âæ·»å çµåé®ä»¶å¸å·âå¼å§çãä»ç³»ç»ç®¡çååçµé®å¸å·å¸®å©é¡µé¢å¯ä»¥è·å¾çµé®" -"æå¡å¨è®¾ç½®ä¿¡æ¯ã" +"æå¼çµé®ç¨åºï¼æç §å导ä¸æ¥ä¸æ¥é 置好çµé®è´¦æ·ãé常第ä¸æ¥æ¯ä»âè´¦æ·è®¾ç½®â " +"→ âæ·»å é®ä»¶è´¦æ·âå¼å§çãä»ç³»ç»ç®¡çååçµé®è´¦æ·å¸®å©é¡µé¢å¯ä»¥è·å¾çµé®æå¡å¨" +"设置信æ¯ã" #. type: Content of: <html><body><section><div><div><div><div><h4> msgid "Troubleshooting" @@ -1282,7 +1282,7 @@ msgstr "第 3.A æ¥ï¼çé¾è§£ç" # | account-] {+encryption+} #. type: Content of: <html><body><section><div><div><div><h3> msgid "<em>Step 3.a</em> Set up your email with encryption" -msgstr "<em>第 3.a æ¥</em> é ç½®çµåé®ä»¶å¸å·" +msgstr "<em>第 3.a æ¥</em> é ç½®çµåé®ä»¶è´¦æ·" #. type: Content of: <html><body><section><div><div><div><p> msgid "" @@ -1302,7 +1302,7 @@ msgstr "# æå¼çµé®å®¢æ·ç«¯ï¼éæ©âå·¥å ·â → <i>OpenPGP å¯é¥ç®¡ #. type: Content of: <html><body><section><div><div><div><p> msgid "# Under \"File\" → <i>Import Secret Key(s) From File</i>" -msgstr "# éæ©âæ件â → <i>ä»æ件ä¸å¯¼å ¥ç§é¥</i>" +msgstr "# éæ©âæ件â → <i>ä»æä»¶å¯¼å ¥ç§é¥</i>" #. type: Content of: <html><body><section><div><div><div><p> msgid "" @@ -1318,15 +1318,15 @@ msgstr "# 使ç¨å¯ç 解é" msgid "" "# You will receive a \"OpenPGP keys successfully imported\" window to " "confirm success" -msgstr "# ä½ ä¼çå° âOpenPGP å¯é¥æåå¯¼å ¥â ççªå£ç¡®è®¤å¯¼å ¥æå" +msgstr "# ä½ ä¼çå° âå·²æåå¯¼å ¥ OpenPGP å¯é¥ï¼â ççªå£ç¡®è®¤å¯¼å ¥æå" #. type: Content of: <html><body><section><div><div><div><p> msgid "" "# Go to \"Account settings\" → \"End-To-End Encryption,\" and make sure " "your key is imported and select <i>Treat this key as a Personal Key</i>." msgstr "" -"# å¨ âå¸å·è®¾ç½®â → â端å°ç«¯å å¯âéï¼ç¡®è®¤ä½ çå¯é¥å·²ç»å¯¼å ¥ï¼å¹¶éæ© " -"<i>Treat this key as a Personal Key</i>ã" +"# å¨ âè´¦æ·è®¾ç½®â → â端å°ç«¯å å¯âéï¼ç¡®è®¤ä½ çå¯é¥å·²ç»å¯¼å ¥ï¼å¹¶éæ© <i>å°æ¤" +"å¯é¥è§ä¸ºä¸ªäººå¯é¥</i>ã" #. type: Content of: <html><body><section><div><div><div><div><dl><dt> msgid "I'm not sure the import worked correctly" @@ -1339,7 +1339,7 @@ msgid "" "you can try again via the <i>Add key</i> option. Make sure you have the " "correct, active, secret key file." msgstr "" -"å¨ âå¸å·è®¾ç½®â → â端å°ç«¯å å¯âéæ¥çãå¨è¿éä½ å¯ä»¥çå°ä¸æ¤çµé®å¸å·ç¸å ³çå¯" +"å¨ âè´¦æ·è®¾ç½®â → â端å°ç«¯å å¯âéæ¥çãå¨è¿éä½ å¯ä»¥çå°ä¸æ¤çµé®è´¦æ·ç¸å ³çå¯" "é¥æ¯å¦åå¨ãå¦æ没æï¼è¯·éè¯ <i>æ·»å å¯é¥</i> é项ãç¡®ä¿ä½ ææ£ç¡®ãæªè¿æçç§é¥" "æ件ã" @@ -1393,8 +1393,8 @@ msgid "" msgstr "" "è¿ä¸æ¥å¾ç¹å«ï¼å ä¸ºä½ åç人éä¿¡æ¶ä¸éè¦åãå¨ä½ çé®ä»¶ç¨åºèåä¸ï¼éæ©âå·¥å ·â " "→ âOpenPGPå¯é¥ç®¡çå¨âãä½ åºå½çå°ä½ çå¯é¥å¨å¼¹çªçå表ä¸ãå¨ä½ çå¯é¥å¤å³" -"é®ï¼éæ©âéè¿é®ä»¶åéå ¬é¥âãè¿ä¼å建ä¸å°è稿æ¶æ¯ï¼å°±å¥½åä½ ç¹å»äºâæ°åâæé®ï¼" -"å¨é件ä¸ä¼çå°ä½ çå ¬é¥ã" +"é®ï¼éæ©âéè¿çµåé®ä»¶åéå ¬é¥âãè¿ä¼å建ä¸å°è稿æ¶æ¯ï¼å°±å¥½åä½ ç¹å»äºâæ°åâæ" +"é®ï¼å¨é件ä¸ä¼çå°ä½ çå ¬é¥ã" #. type: Content of: <html><body><section><div><div><div><p> msgid "" @@ -1478,9 +1478,8 @@ msgid "" "you don't yet have.\" A popup with Edward's key details will follow." msgstr "" "<strong>é项ä¸</strong> ç±å¾·åçå ¬é¥å¨å®åå¤ä½ ç第ä¸å°é®ä»¶éãå¨é®ä»¶å³ä¾§ï¼æ°" -"ååºåçä¸æ¹ï¼ä½ è½å¤æ¾å° OpenPGP æé®ï¼æè¾¹æéå齿轮å¾æ ãç¹å»å®ï¼éæ©âè¿å°" -"ä¿¡ç±ä¸ä¸ªå°æªä¿åçå¯é¥è¿è¡ç¾åâæç <i>Discover</i>ãç±å¾·åå¯é¥çç»èå°ä¼æ¾" -"示ã" +"ååºåçä¸æ¹ï¼ä½ è½å¤æ¾å° OpenPGP æé®ï¼æè¾¹æéå齿轮å¾æ ãç¹å»å®ï¼éæ©âæ¤æ¶" +"æ¯æ¯ç¨æ¨æ²¡æçå¯é¥æç¾åçâæç <i>寻æ¾</i>ãç±å¾·åå¯é¥çç»èå°ä¼æ¾ç¤ºã" #. type: Content of: <html><body><section><div><div><div><p> msgid "" @@ -1488,8 +1487,8 @@ msgid "" "\"Keyserver\" choose <i>Discover Keys Online</i>. Here, fill in Edward's " "email address, and import Edward's key." msgstr "" -"<strong>é项äº</strong> æå¼ OpenPGP å¯é¥ç®¡çå¨ï¼å¨å¯é¥æå¡å¨éæ© " -"<i>Discover Keys Online</i>ãè¾å ¥ç±å¾·åçµåé®ç®±ï¼å¯¼å ¥å¯é¥ã" +"<strong>é项äº</strong> æå¼ OpenPGP å¯é¥ç®¡çå¨ï¼å¨å¯é¥æå¡å¨éæ© <i>å¨ç½ä¸å¯»" +"æ¾å¯é¥</i>ãè¾å ¥ç±å¾·åçµåé®ç®±ï¼å¯¼å ¥å¯é¥ã" #. type: Content of: <html><body><section><div><div><div><p> msgid "" @@ -1497,8 +1496,8 @@ msgid "" "manager, and now it can be used to send encrypted emails and to verify " "digital signatures from Edward." msgstr "" -"<i>Accepted (unverified)</i> é项å°è¿ä¸ªä½ è¦æ·»å å°å¯é¥ç®¡çå¨ï¼ç°å¨å®å°ç¨äºåç±" -"å¾·ååéå å¯çµé®åéªè¯æ°åç¾åã" +"<i>æ¥å (æªéªè¯)</i> é项å°è¿ä¸ªä½ è¦æ·»å å°å¯é¥ç®¡çå¨ï¼ç°å¨å®å°ç¨äºåç±å¾·ååé" +"å å¯çµé®åéªè¯æ°åç¾åã" #. type: Content of: <html><body><section><div><div><div><p> msgid "" @@ -1542,8 +1541,8 @@ msgid "" "\"Security\" and select <i>Require Encryption</i>. Once encryption is on, " "hit Send." msgstr "" -"è¿æ¬¡ï¼å¨âå®å ¨âä¸æèåéå®å ¨ <i>Require Encryption</i> å°å å¯å¼å¯ãå å¯å¼å¯" -"åï¼ç¹å»åéã" +"è¿æ¬¡ï¼å¨ä¸æèåâå®å ¨âééæ© <i>è¦æ±å å¯</i> å°å å¯å¼å¯ãå å¯å¼å¯åï¼ç¹å»å" +"éã" # | [-Click Send. Enigmail will pop up a window that says-]\"Recipients not # | valid, not trusted or not [-found.\"-] {+found\+} @@ -1581,10 +1580,9 @@ msgid "" "\"Acceptance\" option at the bottom of this window. Resend the email." msgstr "" "å½ä½ å°è¯åéå å¯é®ä»¶æ¶å¯è½ä¼éå°ä¸åé®é¢ï¼âæ æ³ä½¿ç¨ç«¯å°ç«¯å å¯åéæ¤æ¶æ¯ï¼å 为" -"ä¸åæ¶ä»¶äººçå¯é¥åå¨é®é¢ï¼edward-en@fsf.orgãâåé常æ¯å¯¼å ¥å¯é¥æ¶éæ©äº " -"unaccepted (unverified) é项ãå° OpenPGP å¯é¥ç®¡çå¨ééæ©æ¤å¯é¥ï¼å³é®âå¯é¥å±" -"æ§âï¼å¨çªå£åºé¨ç Acceptance é项ä¸éæ© <i>Yes, but I have not verified that " -"this is the correct key</i> ãéæ°åéé®ä»¶ã" +"ä¸åæ¶ä»¶äººçå¯é¥åå¨é®é¢ï¼edward-en@fsf.orgãâåé常æ¯å¯¼å ¥å¯é¥æ¶éæ©äº ä¸æ¥" +"å (æªéªè¯) é项ãå° OpenPGP å¯é¥ç®¡çå¨ééæ©æ¤å¯é¥ï¼å³é®âå¯é¥å±æ§âï¼å¨çªå£åº" +"é¨çâæ¥åâé项ä¸éæ© <i>æ¥åï¼ä½ææªéªè¯è¿æ¯å¦ä¸ºæ£ç¡®å¯é¥</i> ãéæ°åéé®ä»¶ã" # | [-Enigmail-]{+I+} can't find Edward's key #. type: Content of: <html><body><section><div><div><div><div><dl><dt> @@ -1608,8 +1606,8 @@ msgid "" msgstr "" "å ³éç¹å»åéæ¶çå¼¹çªï¼ç¡®ä¿ä½ å·²ç»è¿æ¥ä¸å ç¹ç½å¹¶åè¯ä¸æ¬¡ãå¦æä»ç¶æ æï¼è¯·æå¨" "å¨<a href=\"https://keys.openpgp.org/search?q=edward-en%40fsf.org\">å¯é¥æå¡" -"å¨</a>ä¸è½½å¯é¥ï¼å¹¶å¨ OpenPGP å¯é¥ç®¡çå¨ä¸éæ© <i>Import Public Key(s) from " -"File</i>éé¡¹å¯¼å ¥å¯é¥ã" +"å¨</a>ä¸è½½å¯é¥ï¼å¹¶å¨ OpenPGP å¯é¥ç®¡çå¨ä¸éæ© <i>ä»æä»¶å¯¼å ¥å ¬é¥</i> éé¡¹å¯¼å ¥" +"å¯é¥ã" #. type: Content of: <html><body><section><div><div><div><div><dl><dt> msgid "Unscrambled messages in the Sent folder" @@ -1781,8 +1779,7 @@ msgid "" "In \"Account Settings\" → \"End-To-End-Encryption\" you can opt to " "<i>add digital signature by default</i>." msgstr "" -"å¨âå¸å·è®¾ç½®â → â端å°ç«¯å å¯âï¼ä½ å¯ä»¥éæ© <i>add digital signature by " -"default</i>ã" +"å¨âè´¦æ·è®¾ç½®â → â端å°ç«¯å å¯âï¼ä½ å¯ä»¥éæ© <i>é»è®¤æ·»å æçæ°åç¾å</i>ã" # | <em>Step [-3-]{+4+}.e</em> Receive a response #. type: Content of: <html><body><section><div><div><div><h3> @@ -1908,9 +1905,7 @@ msgstr "" msgid "" "Under \"Your Acceptance,\" you can select <i>Yes, I've verified in person " "this key has the correct fingerprint\"</i>." -msgstr "" -"å¨ Your Acceptance éï¼éæ© <i>Yes, I've verified in person this key has the " -"correct fingerprint\"</i>ã" +msgstr "å¨âæ¨æ¯å¦è¦æ¥åâéï¼éæ© <i>âæ¥åï¼ä½æè¿æªéªè¯è¿æ¯å¦ä¸ºæ£ç¡®å¯é¥â</i>ã" # | You've just effectively said \"I trust that Edward's public key actually # | belongs to Edward.\" This doesn't mean much because Edward isn't a real diff --git a/zh-hans/index.html b/zh-hans/index.html index e42d7abd..d9587c7f 100644 --- a/zh-hans/index.html +++ b/zh-hans/index.html @@ -149,9 +149,10 @@ alt="第 1.A æ¥ï¼å®è£ å导" /></p> <!-- /.sidebar --> <div class="main"> -<h3><em>第 1.a æ¥</em> é ç½®çµåé®ä»¶å¸å·</h3> +<h3><em>第 1.a æ¥</em> é ç½®çµåé®ä»¶è´¦æ·</h3> -<p>æå¼çµé®ç¨åºï¼æç §å导ä¸æ¥ä¸æ¥é 置好çµé®å¸å·ãé常第ä¸æ¥æ¯ä»âå¸å·è®¾ç½®â→âæ·»å çµåé®ä»¶å¸å·âå¼å§çãä»ç³»ç»ç®¡çååçµé®å¸å·å¸®å©é¡µé¢å¯ä»¥è·å¾çµé®æå¡å¨è®¾ç½®ä¿¡æ¯ã</p> +<p>æå¼çµé®ç¨åºï¼æç §å导ä¸æ¥ä¸æ¥é 置好çµé®è´¦æ·ãé常第ä¸æ¥æ¯ä»âè´¦æ·è®¾ç½®â → +âæ·»å é®ä»¶è´¦æ·âå¼å§çãä»ç³»ç»ç®¡çååçµé®è´¦æ·å¸®å©é¡µé¢å¯ä»¥è·å¾çµé®æå¡å¨è®¾ç½®ä¿¡æ¯ã</p> @@ -537,17 +538,16 @@ alt="第 3.A æ¥ï¼çé¾è§£ç" /></p> <!-- /.sidebar --> <div class="main"> -<h3><em>第 3.a æ¥</em> é ç½®çµåé®ä»¶å¸å·</h3> +<h3><em>第 3.a æ¥</em> é ç½®çµåé®ä»¶è´¦æ·</h3> <p>å®æé®ä»¶å å¯è®¾ç½®åï¼ä½ 就帮å©å¢å äºå ç¹ç½ä¸çå å¯æµéãé¦å æ们æå¯é¥å¯¼å ¥å°çµé®å®¢æ·ç«¯ï¼æ们ä¹å°å¦ä¹ å¦ä½ä»æå¡å¨å¯¼å ¥å ¶ä»äººçå ¬é¥ï¼è¿æ ·ä½ å°±å¯ä»¥åéåæ¥æ¶å å¯é®ä»¶ã</p> <p># æå¼çµé®å®¢æ·ç«¯ï¼éæ©âå·¥å ·â → <i>OpenPGP å¯é¥ç®¡çå¨</i></p> -<p># éæ©âæ件â → <i>ä»æ件ä¸å¯¼å ¥ç§é¥</i></p> +<p># éæ©âæ件â → <i>ä»æä»¶å¯¼å ¥ç§é¥</i></p> <p># éæ©ä½ å¨<a href="#step-2b">第 2.B æ¥</a>导åºä¿åçç§é¥æ件</p> <p># 使ç¨å¯ç 解é</p> -<p># ä½ ä¼çå° âOpenPGP å¯é¥æåå¯¼å ¥â ççªå£ç¡®è®¤å¯¼å ¥æå</p> -<p># å¨ âå¸å·è®¾ç½®â → â端å°ç«¯å å¯âéï¼ç¡®è®¤ä½ çå¯é¥å·²ç»å¯¼å ¥ï¼å¹¶éæ© <i>Treat this key as a Personal -Key</i>ã</p> +<p># ä½ ä¼çå° âå·²æåå¯¼å ¥ OpenPGP å¯é¥ï¼â ççªå£ç¡®è®¤å¯¼å ¥æå</p> +<p># å¨ âè´¦æ·è®¾ç½®â → â端å°ç«¯å å¯âéï¼ç¡®è®¤ä½ çå¯é¥å·²ç»å¯¼å ¥ï¼å¹¶éæ© <i>å°æ¤å¯é¥è§ä¸ºä¸ªäººå¯é¥</i>ã</p> </div> @@ -560,7 +560,7 @@ Key</i>ã</p> <dl> <dt>æä¸ç¥éæ¯å¦å·²æ£ç¡®å¯¼å ¥å¯é¥</dt> <dd> -å¨ âå¸å·è®¾ç½®â → â端å°ç«¯å å¯âéæ¥çãå¨è¿éä½ å¯ä»¥çå°ä¸æ¤çµé®å¸å·ç¸å ³çå¯é¥æ¯å¦åå¨ãå¦æ没æï¼è¯·éè¯ <i>æ·»å å¯é¥</i> +å¨ âè´¦æ·è®¾ç½®â → â端å°ç«¯å å¯âéæ¥çãå¨è¿éä½ å¯ä»¥çå°ä¸æ¤çµé®è´¦æ·ç¸å ³çå¯é¥æ¯å¦åå¨ãå¦æ没æï¼è¯·éè¯ <i>æ·»å å¯é¥</i> é项ãç¡®ä¿ä½ ææ£ç¡®ãæªè¿æçç§é¥æ件ã </dd> @@ -617,7 +617,7 @@ alt="第 4.A æ¥ åç±å¾·ååéå ¬é¥" /></p> <h3><em>第 4.a æ¥</em> åéå ¬é¥ç»ç±å¾·å</h3> <p>è¿ä¸æ¥å¾ç¹å«ï¼å ä¸ºä½ åç人éä¿¡æ¶ä¸éè¦åãå¨ä½ çé®ä»¶ç¨åºèåä¸ï¼éæ©âå·¥å ·â → -âOpenPGPå¯é¥ç®¡çå¨âãä½ åºå½çå°ä½ çå¯é¥å¨å¼¹çªçå表ä¸ãå¨ä½ çå¯é¥å¤å³é®ï¼éæ©âéè¿é®ä»¶åéå ¬é¥âãè¿ä¼å建ä¸å°è稿æ¶æ¯ï¼å°±å¥½åä½ ç¹å»äºâæ°åâæé®ï¼å¨é件ä¸ä¼çå°ä½ çå ¬é¥ã</p> +âOpenPGPå¯é¥ç®¡çå¨âãä½ åºå½çå°ä½ çå¯é¥å¨å¼¹çªçå表ä¸ãå¨ä½ çå¯é¥å¤å³é®ï¼éæ©âéè¿çµåé®ä»¶åéå ¬é¥âãè¿ä¼å建ä¸å°è稿æ¶æ¯ï¼å°±å¥½åä½ ç¹å»äºâæ°åâæé®ï¼å¨é件ä¸ä¼çå°ä½ çå ¬é¥ã</p> <p>æ¶ä¿¡äººå°åå¡«å <a href="mailto:edward-zh@fsf.org">edward-zh@fsf.org</a>ãå¨é®ä»¶ä¸»é¢æ åæ£æéä»»ææ°åå 容ãå å«åéã</p> @@ -658,12 +658,12 @@ alt="第 4.B æ¥ éé¡¹äº å¯¼å ¥å¯é¥" /></p> <p>ä½ éè¦ç±å¾·åçå ¬é¥æè½ç»ä»åéå å¯é®ä»¶ï¼å æ¤ä½ éè¦ä»å¯é¥æå¡å¨ä¸è½½å®ãæ两ç§ä¸åæ³å¸å¯ä»¥åå°ï¼</p> <p><strong>é项ä¸</strong> ç±å¾·åçå ¬é¥å¨å®åå¤ä½ ç第ä¸å°é®ä»¶éãå¨é®ä»¶å³ä¾§ï¼æ°ååºåçä¸æ¹ï¼ä½ è½å¤æ¾å° OpenPGP -æé®ï¼æè¾¹æéå齿轮å¾æ ãç¹å»å®ï¼éæ©âè¿å°ä¿¡ç±ä¸ä¸ªå°æªä¿åçå¯é¥è¿è¡ç¾åâæç <i>Discover</i>ãç±å¾·åå¯é¥çç»èå°ä¼æ¾ç¤ºã</p> +æé®ï¼æè¾¹æéå齿轮å¾æ ãç¹å»å®ï¼éæ©âæ¤æ¶æ¯æ¯ç¨æ¨æ²¡æçå¯é¥æç¾åçâæç <i>寻æ¾</i>ãç±å¾·åå¯é¥çç»èå°ä¼æ¾ç¤ºã</p> -<p><strong>é项äº</strong> æå¼ OpenPGP å¯é¥ç®¡çå¨ï¼å¨å¯é¥æå¡å¨éæ© <i>Discover Keys -Online</i>ãè¾å ¥ç±å¾·åçµåé®ç®±ï¼å¯¼å ¥å¯é¥ã</p> +<p><strong>é项äº</strong> æå¼ OpenPGP å¯é¥ç®¡çå¨ï¼å¨å¯é¥æå¡å¨éæ© +<i>å¨ç½ä¸å¯»æ¾å¯é¥</i>ãè¾å ¥ç±å¾·åçµåé®ç®±ï¼å¯¼å ¥å¯é¥ã</p> -<p><i>Accepted (unverified)</i> é项å°è¿ä¸ªä½ è¦æ·»å å°å¯é¥ç®¡çå¨ï¼ç°å¨å®å°ç¨äºåç±å¾·ååéå å¯çµé®åéªè¯æ°åç¾åã</p> +<p><i>æ¥å (æªéªè¯)</i> é项å°è¿ä¸ªä½ è¦æ·»å å°å¯é¥ç®¡çå¨ï¼ç°å¨å®å°ç¨äºåç±å¾·ååéå å¯çµé®åéªè¯æ°åç¾åã</p> <p class="notes">å¼¹åºçªå£å°ç¡®è®¤æ¯å¦å¯¼å ¥ç±å¾·åå¯é¥ï¼ä½ ä¼çå°è¿ä¸ªå¯é¥å ³èäºè®¸å¤é®ç®±ãè¿æ²¡é®é¢ï¼ä½ å¯ä»¥å®å ¨å¯¼å ¥å¯é¥ã</p> @@ -674,7 +674,7 @@ Online</i>ãè¾å ¥ç±å¾·åçµåé®ç®±ï¼å¯¼å ¥å¯é¥ã</p> <p> å¨ä½ çé®ä»¶ç¨åºä¸åä¸å°æ°çé®ä»¶ï¼æ¶ä¿¡äººå°åå¡«å <a href="mailto:edward-zh@fsf.org">edward-zh@fsf.org</a>ãå¨ä¸»é¢ä¸å¡«åâå å¯æµè¯âæ类似çè¯è¯ï¼å¹¶å¨æ£æä¸åä¸äºå 容ã</p> -<p>è¿æ¬¡ï¼å¨âå®å ¨âä¸æèåéå®å ¨ <i>Require Encryption</i> å°å å¯å¼å¯ãå å¯å¼å¯åï¼ç¹å»åéã</p> +<p>è¿æ¬¡ï¼å¨ä¸æèåâå®å ¨âééæ© <i>è¦æ±å å¯</i> å°å å¯å¼å¯ãå å¯å¼å¯åï¼ç¹å»åéã</p> @@ -690,14 +690,13 @@ OpenPGP å¯é¥ç®¡çå¨ï¼ç¡®è®¤æ¶ä»¶äººå¯é¥å¨ä¸é¢ã</dd> <dt>æ æ³åéæ¶æ¯</dt> <dd>å½ä½ å°è¯åéå å¯é®ä»¶æ¶å¯è½ä¼éå°ä¸åé®é¢ï¼âæ æ³ä½¿ç¨ç«¯å°ç«¯å å¯åéæ¤æ¶æ¯ï¼å 为ä¸åæ¶ä»¶äººçå¯é¥åå¨é®é¢ï¼edward-en@fsf.orgãâåé常æ¯å¯¼å ¥å¯é¥æ¶éæ©äº -unaccepted (unverified) é项ãå° OpenPGP å¯é¥ç®¡çå¨ééæ©æ¤å¯é¥ï¼å³é®âå¯é¥å±æ§âï¼å¨çªå£åºé¨ç Acceptance -é项ä¸éæ© <i>Yes, but I have not verified that this is the correct key</i> -ãéæ°åéé®ä»¶ã</dd> +ä¸æ¥å (æªéªè¯) é项ãå° OpenPGP å¯é¥ç®¡çå¨ééæ©æ¤å¯é¥ï¼å³é®âå¯é¥å±æ§âï¼å¨çªå£åºé¨çâæ¥åâé项ä¸éæ© +<i>æ¥åï¼ä½ææªéªè¯è¿æ¯å¦ä¸ºæ£ç¡®å¯é¥</i> ãéæ°åéé®ä»¶ã</dd> <dt>ææ¾ä¸å°ç±å¾·åçå ¬é¥</dt> <dd>å ³éç¹å»åéæ¶çå¼¹çªï¼ç¡®ä¿ä½ å·²ç»è¿æ¥ä¸å ç¹ç½å¹¶åè¯ä¸æ¬¡ãå¦æä»ç¶æ æï¼è¯·æå¨å¨<a href="https://keys.openpgp.org/search?q=edward-en%40fsf.org">å¯é¥æå¡å¨</a>ä¸è½½å¯é¥ï¼å¹¶å¨ -OpenPGP å¯é¥ç®¡çå¨ä¸éæ© <i>Import Public Key(s) from File</i>éé¡¹å¯¼å ¥å¯é¥ã</dd> +OpenPGP å¯é¥ç®¡çå¨ä¸éæ© <i>ä»æä»¶å¯¼å ¥å ¬é¥</i> éé¡¹å¯¼å ¥å¯é¥ã</dd> <dt>å·²åéæ件夹ä¸è§£å¯çæ¶æ¯</dt> <dd>å³ä¾¿ä½ æ æ³è§£å¯ç¨å ¶ä»äººå ¬é¥å å¯è¿çæ¶æ¯ï¼ä½ çé®ä»¶ç¨åºä¼èªå¨ç¨ä½ çå ¬é¥ä¿åä¸ä»½å¯æ¬ï¼è¿å°±ä½¿å¾ä½ è½å¤å¨å·²åéæ件夹åæ¥çæ®éé®ä»¶ä¸æ ·æ¥çå®ãè¿æ¯æ£å¸¸çï¼å®å¹¶ä¸ä»£è¡¨ä½ å·²åçé®ä»¶æ²¡æ被å å¯ã</dd> @@ -794,7 +793,7 @@ GnuPGï¼ä»ä»¬ä»å°æè½åé è¯»ä½ çæ¶æ¯å¹¶æ¥çä½ çç¾åãå¦æä» <p>è¦æ³å¯¹åç»ç±å¾·åçé®ä»¶ç¾åï¼å¹¶æ°åä¸äºæ¶æ¯ç»ä»ï¼ç¹å»ç´§é»éå½¢å¾æ çé ç¬å¾æ ï¼å®ä¼åæéé»è²ãä½ è¦æ¯å¯¹æ¶æ¯ç¾åï¼GnuPG å¯è½ä¼å¨ä½ ç¹å»åéæ¶æ¯å询é®ä½ å¯ç ï¼è¿æ¯å 为ç¾åéè¦è§£éç§é¥ã</p> -<p>å¨âå¸å·è®¾ç½®â → â端å°ç«¯å å¯âï¼ä½ å¯ä»¥éæ© <i>add digital signature by default</i>ã</p> +<p>å¨âè´¦æ·è®¾ç½®â → â端å°ç«¯å å¯âï¼ä½ å¯ä»¥éæ© <i>é»è®¤æ·»å æçæ°åç¾å</i>ã</p> </div> <!-- End .main --> @@ -864,8 +863,7 @@ alt="第 5 èï¼ä¿¡ä»»å¯é¥" /></p> <p>å¨çµé®èåä¸ï¼æ¾å° OpenPGP å¯é¥ç®¡çå¨ï¼å³é®ç±å¾·åçå¯é¥ï¼éæ©<i>å¯é¥å±æ§</i>ã</p> -<p>å¨ Your Acceptance éï¼éæ© <i>Yes, I've verified in person this key has the -correct fingerprint"</i>ã</p> +<p>å¨âæ¨æ¯å¦è¦æ¥åâéï¼éæ© <i>âæ¥åï¼ä½æè¿æªéªè¯è¿æ¯å¦ä¸ºæ£ç¡®å¯é¥â</i>ã</p> <p class="notes">ä½ ååæåå°è¡¨è¾¾äºâæä¿¡ä»»ç±å¾·åçå ¬é¥ï¼å®çç¡®å±äºç±å¾·åâãç±äºç±å¾·åæ¯ä¸ä¸ªæºå¨äººï¼è¿å¯¹å®å¹¶ä¸æå³çä»ä¹ï¼ä½è¿æ¯ä¸ä¸ªè¯å¥½çå®è·µãä½å¯¹äºç人ï¼è¿å¾éè¦ãå¨<a href="#check-ids-before-signing">ç¾ååæ£æ¥ ID</a>é 读æ´å¤æå ³å¯¹å ¶ä»äººå¯é¥ç¾åçä¿¡æ¯ã</p> -- 2.25.1