From ea13c2052ab4b7f3111f33c29b43aace45acc15f Mon Sep 17 00:00:00 2001
From: Tom
æ¤é¡µé¢ä¸çå¾çé" -"ç¨ ç¥è¯å ±äº« ç½²å " +"ç®ä½ä¸æç± ä½æé« <hexuxin@foxmail.com> å®æç¿»è¯ã
æ¤é¡µé¢ä¸çå¾ç" +"éç¨ ç¥è¯å ±äº« ç½²å " "4.0 许å¯åè®®ï¼æè¾æ°çæ¬ï¼ è¿è¡è®¸å¯ï¼å ¶ä½é¨å以 ç¥è¯å ±äº« ç½²å-ç¸åæ¹å¼ 4.0 许å¯åè®® " "ï¼æè¾æ°çæ¬ï¼ è¿è¡è®¸å¯ãä¸è½½ç± Andrew Engelbrecht <" @@ -756,8 +756,8 @@ msgid "" "for GnuPG, then install it. Then restart the Enigmail setup wizard by going " "to Enigmail → Setup Wizard." msgstr "" -"æå¼ä½ 常ç¨æ¥å®è£ 软件çç¨åºï¼æç´¢ GnuPGï¼å¹¶å®è£ å®ãéè¿ Enigmail â Setup " -"Wizard æ¥éå¯ Enigmail å®è£ å导ã" +"æå¼ä½ 常ç¨æ¥å®è£ 软件çç¨åºï¼æç´¢ GnuPGï¼å¹¶å®è£ å®ãéè¿ Enigmail â å®è£ å导 æ¥" +"éå¯ Enigmail å®è£ å导ã" #. type: Content of:
# | When Edward receives your email, he will use his private key to decrypt # | it, then [-use your public key (which you sent him in Step 3.A) to encrypt his-] reply to you. -#, fuzzy -#| msgid "" -#| "When Edward receives your email, he will use his private key to decrypt " -#| "it, then use your public key (which you sent him in Step 3.A) to encrypt his reply to you." +#. type: Content of:
msgid "" "When Edward receives your email, he will use his private key to decrypt it, " "then reply to you." -msgstr "" -"å½ç±å¾·åæ¶å°ä½ çé®ä»¶ï¼ä»ä¼ä½¿ç¨ä»çç§é¥å»è§£å¯æ¶æ¯ï¼ä¸é¢ä½¿ç¨ä½ çå ¬é¥ï¼ä½ å¨ Step 3.A åç»ä»äºï¼å å¯ä»ç»ä½ çåå¤ã" +msgstr "å½ç±å¾·åæ¶å°ä½ çé®ä»¶ï¼ä»ä¼ä½¿ç¨ä»çç§é¥å»è§£å¯æ¶æ¯ï¼å¹¶ç»ä½ åå¤ã" #. type: Content of:
msgid "" @@ -1209,24 +1202,18 @@ msgstr "éå½¢åé ç¬å¾æ è½å¤è®©ä½ 对æ¯å°æ¶æ¯éæ©å å¯ãç¾åã msgid "Step 3.e Receive a response" msgstr "Step 3.e æ¥æ¶åä¿¡" -#. type: Content of:
# | When Edward receives your email, he will use your public key (which you # | sent him in Step 3.A) to verify [-that your # | signature is authentic and-] the message you sent has not been tampered # | [-with.-] {+with and to encrypt his reply to you.+} -#, fuzzy -#| msgid "" -#| "When Edward receives your email, he will use your public key (which you " -#| "sent him in Step 3.A) to verify that your " -#| "signature is authentic and the message you sent has not been tampered " -#| "with." +#. type: Content of:
msgid "" "When Edward receives your email, he will use your public key (which you sent " "him in Step 3.A) to verify the message you sent has " "not been tampered with and to encrypt his reply to you." msgstr "" "å½ç±å¾·åæ¶å°ä½ çé®ä»¶ï¼ä»å°ä¼ä½¿ç¨ä½ çå ¬é¥ï¼ä½ å¨ Step 3." -"A åç»ä»äºï¼å»éªè¯ä½ ç¾åççå®æ§ï¼ä»¥åä½ åéçæ¶æ¯æªç»ç¯¡æ¹ã" +"A åç»ä»äºï¼éªè¯ä½ åéçæ¶æ¯æªç»ç¯¡æ¹ï¼å¹¶ä»¥å å¯å½¢å¼ç»ä½ åå¤ã" #. type: Content of:
msgid "" diff --git a/zh-hans/confirmation.html b/zh-hans/confirmation.html index 5f6ed6f4..da074683 100644 --- a/zh-hans/confirmation.html +++ b/zh-hans/confirmation.html @@ -63,7 +63,7 @@ Foundation, Inc. éç§æ¿ç. æ为ä¼åï¼æ¯ææ们çå·¥ä½ã
-ç®ä½ä¸æç± Tom <hexuxin@foxmail.com> å®æç¿»è¯ã
æ¤é¡µé¢ä¸çå¾çéç¨ ç®ä½ä¸æç± ä½æé« <hexuxin@foxmail.com> å®æç¿»è¯ã
æ¤é¡µé¢ä¸çå¾çéç¨ ç¥è¯å
±äº« ç½²å 4.0
许å¯åè®®ï¼æè¾æ°çæ¬ï¼ è¿è¡è®¸å¯ï¼å
¶ä½é¨å以 ç¥è¯å
±äº« ç½²å-ç¸åæ¹å¼ 4.0 许å¯åè®®
diff --git a/zh-hans/index.html b/zh-hans/index.html
index 750381aa..e09b37cb 100644
--- a/zh-hans/index.html
+++ b/zh-hans/index.html
@@ -42,9 +42,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
å½ç±å¾·åæ¶å°ä½ çé®ä»¶ï¼ä»å°ä¼ä½¿ç¨ä½ çå ¬é¥ï¼ä½ å¨ Step 3.A -åç»ä»äºï¼å»éªè¯ä½ ç¾åççå®æ§ï¼ä»¥åä½ åéçæ¶æ¯æªç»ç¯¡æ¹ã
+åç»ä»äºï¼éªè¯ä½ åéçæ¶æ¯æªç»ç¯¡æ¹ï¼å¹¶ä»¥å å¯å½¢å¼ç»ä½ åå¤ãç±å¾·åå¯è½éè¦ä¸¤ä¸åéåå¤é®ä»¶ãå¨è¿æé´ï¼ä½ å¯ä»¥è·³è¿åé¢çé¨å并æ¥é æ¬æå åç¨å å¯ ç« èã
ç±å¾·åçåå¤ä¼æ¯å å¯çï¼å 为ä»è½å å¯å°±å å¯ãå¦æä¸å顺å©ï¼ä»ä¼åå¤âä½ çç¾å已被éªè¯âãå¦æä½ çæµè¯ç¾åé®ä»¶ä¹æ¯å å¯çï¼ä»ä¼ä¼å æåã
+å½ä½ æ¥æ¶ç±å¾·åçé®ä»¶å¹¶æå¼å®æ¶ï¼Enigmail ä¼èªå¨æ£æµå®æ¯å¦ä½¿ç¨ä½ çå ¬é¥å å¯çï¼æ¥ä¸æ¥ä½¿ç¨ä½ çç§é¥è§£å¯æ¶æ¯ã
+ +çææ¶æ¯ä¸æ¹çéç¥æ¡ï¼å®ä¼æ¾ç¤ºç±å¾·åå ¬é¥ç¶æçä¿¡æ¯ã
+ç®ä½ä¸æç± Tom <hexuxin@foxmail.com> å®æç¿»è¯ã
æ¤é¡µé¢ä¸çå¾çéç¨ ç®ä½ä¸æç± ä½æé« <hexuxin@foxmail.com> å®æç¿»è¯ã
æ¤é¡µé¢ä¸çå¾çéç¨ ç¥è¯å ±äº« ç½²å 4.0 许å¯åè®®ï¼æè¾æ°çæ¬ï¼ è¿è¡è®¸å¯ï¼å ¶ä½é¨å以 ç¥è¯å ±äº« ç½²å-ç¸åæ¹å¼ 4.0 许å¯åè®® diff --git a/zh-hans/infographic.html b/zh-hans/infographic.html index e4ff7c92..c82b0b02 100644 --- a/zh-hans/infographic.html +++ b/zh-hans/infographic.html @@ -61,7 +61,7 @@ Foundation, Inc. éç§æ¿ç. æ为ä¼åï¼æ¯ææ们çå·¥ä½ã
-ç®ä½ä¸æç± Tom <hexuxin@foxmail.com> å®æç¿»è¯ã
æ¤é¡µé¢ä¸çå¾çéç¨ ç®ä½ä¸æç± ä½æé« <hexuxin@foxmail.com> å®æç¿»è¯ã
æ¤é¡µé¢ä¸çå¾çéç¨ ç¥è¯å
±äº« ç½²å 4.0
许å¯åè®®ï¼æè¾æ°çæ¬ï¼ è¿è¡è®¸å¯ï¼å
¶ä½é¨å以 ç¥è¯å
±äº« ç½²å-ç¸åæ¹å¼ 4.0 许å¯åè®®
diff --git a/zh-hans/mac.html b/zh-hans/mac.html
index 07d931d1..c8458f71 100644
--- a/zh-hans/mac.html
+++ b/zh-hans/mac.html
@@ -42,9 +42,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
æ¶ä¿¡äººå°åå¡«å edward-en@fsf.orgãå¨é®ä»¶ä¸»é¢æ åæ£æéä»»ææ°åå 容ãå å«åéã
+href="mailto:edward-zh@fsf.org">edward-zh@fsf.orgãå¨é®ä»¶ä¸»é¢æ åæ£æéä»»ææ°åå 容ãå å«åéãå·¦ä¸æ¹çéå½¢å¾æ åºå½æ¯é»è²çï¼è¿æå³çå å¯å·²ç»å¯ç¨ãæ们éè¦è¿ç¬¬ä¸å°ç¹å«çé®ä»¶æ¯æªç»å å¯çï¼å æ¤éè¦åå»å¾æ 让å®å ³éãæ¤æ¶éå½¢å¾æ ä¼åæç°è²ï¼å¹¶å¸¦æå°èç¹ï¼ä»¥æéä½ é»è®¤è®¾ç½®å·²åçæ¹åï¼ãå å¯å ³éåï¼ç¹å»åéã
@@ -509,7 +508,7 @@ href="mailto:edward-en@fsf.org">edward-en@fsf.orgãå¨é®ä»¶ä¸»é¢æ åæ£å¨ä½ çé®ä»¶ç¨åºä¸åä¸å°æ°çé®ä»¶ï¼æ¶ä¿¡äººå°åå¡«å edward-en@fsf.orgãå¨ä¸»é¢ä¸å¡«åâå å¯æµè¯âæ类似çè¯è¯ï¼å¹¶å¨æ£æä¸åä¸äºå 容ã
+href="mailto:edward-zh@fsf.org">edward-zh@fsf.orgãå¨ä¸»é¢ä¸å¡«åâå å¯æµè¯âæ类似çè¯è¯ï¼å¹¶å¨æ£æä¸åä¸äºå 容ãçªå£å·¦ä¸æ¾çéå½¢å¾æ åºå½æ¯é»è²çï¼è¿æå³çå å¯å·²å¯ç¨ãè¿ä¼æ¯ä½ ä»åçé»è®¤è®¾ç½®ã
@@ -594,15 +593,10 @@ GnuPGï¼å³ä¾¿ä¸ç¥éä½ è¯´äºä»ä¹ãå½ä½ åéé件æ¶ï¼Enigmail ä¼è®©å½ç±å¾·åæ¶å°ä½ çé®ä»¶ï¼ä»ä¼ä½¿ç¨ä»çç§é¥å»è§£å¯æ¶æ¯ï¼ä¸é¢ä½¿ç¨ä½ çå ¬é¥ï¼ä½ å¨ Step 3.A -åç»ä»äºï¼å å¯ä»ç»ä½ çåå¤ã
+å½ç±å¾·åæ¶å°ä½ çé®ä»¶ï¼ä»ä¼ä½¿ç¨ä»çç§é¥å»è§£å¯æ¶æ¯ï¼å¹¶ç»ä½ åå¤ã
ç±å¾·åå¯è½éè¦ä¸¤ä¸åéåå¤é®ä»¶ãå¨è¿æé´ï¼ä½ å¯ä»¥è·³è¿åé¢çé¨å并æ¥é æ¬æå åç¨å å¯ ç« èã
-å½ä½ æ¥æ¶ç±å¾·åçé®ä»¶å¹¶æå¼å®æ¶ï¼Enigmail ä¼èªå¨æ£æµå®æ¯å¦ä½¿ç¨ä½ çå ¬é¥å å¯çï¼æ¥ä¸æ¥ä½¿ç¨ä½ çç§é¥è§£å¯æ¶æ¯ã
- -çææ¶æ¯ä¸æ¹çéç¥æ¡ï¼å®ä¼æ¾ç¤ºç±å¾·åå ¬é¥ç¶æçä¿¡æ¯ã
-å½ç±å¾·åæ¶å°ä½ çé®ä»¶ï¼ä»å°ä¼ä½¿ç¨ä½ çå ¬é¥ï¼ä½ å¨ Step 3.A -åç»ä»äºï¼å»éªè¯ä½ ç¾åççå®æ§ï¼ä»¥åä½ åéçæ¶æ¯æªç»ç¯¡æ¹ã
+åç»ä»äºï¼éªè¯ä½ åéçæ¶æ¯æªç»ç¯¡æ¹ï¼å¹¶ä»¥å å¯å½¢å¼ç»ä½ åå¤ãç±å¾·åå¯è½éè¦ä¸¤ä¸åéåå¤é®ä»¶ãå¨è¿æé´ï¼ä½ å¯ä»¥è·³è¿åé¢çé¨å并æ¥é æ¬æå åç¨å å¯ ç« èã
ç±å¾·åçåå¤ä¼æ¯å å¯çï¼å 为ä»è½å å¯å°±å å¯ãå¦æä¸å顺å©ï¼ä»ä¼åå¤âä½ çç¾å已被éªè¯âãå¦æä½ çæµè¯ç¾åé®ä»¶ä¹æ¯å å¯çï¼ä»ä¼ä¼å æåã
+å½ä½ æ¥æ¶ç±å¾·åçé®ä»¶å¹¶æå¼å®æ¶ï¼Enigmail ä¼èªå¨æ£æµå®æ¯å¦ä½¿ç¨ä½ çå ¬é¥å å¯çï¼æ¥ä¸æ¥ä½¿ç¨ä½ çç§é¥è§£å¯æ¶æ¯ã
+ +çææ¶æ¯ä¸æ¹çéç¥æ¡ï¼å®ä¼æ¾ç¤ºç±å¾·åå ¬é¥ç¶æçä¿¡æ¯ã
+ç®ä½ä¸æç± Tom <hexuxin@foxmail.com> å®æç¿»è¯ã
æ¤é¡µé¢ä¸çå¾çéç¨ ç®ä½ä¸æç± ä½æé« <hexuxin@foxmail.com> å®æç¿»è¯ã
æ¤é¡µé¢ä¸çå¾çéç¨ ç¥è¯å ±äº« ç½²å 4.0 许å¯åè®®ï¼æè¾æ°çæ¬ï¼ è¿è¡è®¸å¯ï¼å ¶ä½é¨å以 ç¥è¯å ±äº« ç½²å-ç¸åæ¹å¼ 4.0 许å¯åè®® diff --git a/zh-hans/next_steps.html b/zh-hans/next_steps.html index 4107167d..99bdcb5d 100644 --- a/zh-hans/next_steps.html +++ b/zh-hans/next_steps.html @@ -271,7 +271,7 @@ Foundation, Inc. éç§æ¿ç. æ为ä¼åï¼æ¯ææ们çå·¥ä½ã
-ç®ä½ä¸æç± Tom <hexuxin@foxmail.com> å®æç¿»è¯ã
æ¤é¡µé¢ä¸çå¾çéç¨ ç®ä½ä¸æç± ä½æé« <hexuxin@foxmail.com> å®æç¿»è¯ã
æ¤é¡µé¢ä¸çå¾çéç¨ ç¥è¯å
±äº« ç½²å 4.0
许å¯åè®®ï¼æè¾æ°çæ¬ï¼ è¿è¡è®¸å¯ï¼å
¶ä½é¨å以 ç¥è¯å
±äº« ç½²å-ç¸åæ¹å¼ 4.0 许å¯åè®®
diff --git a/zh-hans/windows.html b/zh-hans/windows.html
index f362c13c..44d10a33 100644
--- a/zh-hans/windows.html
+++ b/zh-hans/windows.html
@@ -42,9 +42,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />
æ¶ä¿¡äººå°åå¡«å edward-en@fsf.orgãå¨é®ä»¶ä¸»é¢æ åæ£æéä»»ææ°åå 容ãå å«åéã
+href="mailto:edward-zh@fsf.org">edward-zh@fsf.orgãå¨é®ä»¶ä¸»é¢æ åæ£æéä»»ææ°åå 容ãå å«åéãå·¦ä¸æ¹çéå½¢å¾æ åºå½æ¯é»è²çï¼è¿æå³çå å¯å·²ç»å¯ç¨ãæ们éè¦è¿ç¬¬ä¸å°ç¹å«çé®ä»¶æ¯æªç»å å¯çï¼å æ¤éè¦åå»å¾æ 让å®å ³éãæ¤æ¶éå½¢å¾æ ä¼åæç°è²ï¼å¹¶å¸¦æå°èç¹ï¼ä»¥æéä½ é»è®¤è®¾ç½®å·²åçæ¹åï¼ãå å¯å ³éåï¼ç¹å»åéã
@@ -509,7 +508,7 @@ href="mailto:edward-en@fsf.org">edward-en@fsf.orgãå¨é®ä»¶ä¸»é¢æ åæ£å¨ä½ çé®ä»¶ç¨åºä¸åä¸å°æ°çé®ä»¶ï¼æ¶ä¿¡äººå°åå¡«å edward-en@fsf.orgãå¨ä¸»é¢ä¸å¡«åâå å¯æµè¯âæ类似çè¯è¯ï¼å¹¶å¨æ£æä¸åä¸äºå 容ã
+href="mailto:edward-zh@fsf.org">edward-zh@fsf.orgãå¨ä¸»é¢ä¸å¡«åâå å¯æµè¯âæ类似çè¯è¯ï¼å¹¶å¨æ£æä¸åä¸äºå 容ãçªå£å·¦ä¸æ¾çéå½¢å¾æ åºå½æ¯é»è²çï¼è¿æå³çå å¯å·²å¯ç¨ãè¿ä¼æ¯ä½ ä»åçé»è®¤è®¾ç½®ã
@@ -594,15 +593,10 @@ GnuPGï¼å³ä¾¿ä¸ç¥éä½ è¯´äºä»ä¹ãå½ä½ åéé件æ¶ï¼Enigmail ä¼è®©å½ç±å¾·åæ¶å°ä½ çé®ä»¶ï¼ä»ä¼ä½¿ç¨ä»çç§é¥å»è§£å¯æ¶æ¯ï¼ä¸é¢ä½¿ç¨ä½ çå ¬é¥ï¼ä½ å¨ Step 3.A -åç»ä»äºï¼å å¯ä»ç»ä½ çåå¤ã
+å½ç±å¾·åæ¶å°ä½ çé®ä»¶ï¼ä»ä¼ä½¿ç¨ä»çç§é¥å»è§£å¯æ¶æ¯ï¼å¹¶ç»ä½ åå¤ã
ç±å¾·åå¯è½éè¦ä¸¤ä¸åéåå¤é®ä»¶ãå¨è¿æé´ï¼ä½ å¯ä»¥è·³è¿åé¢çé¨å并æ¥é æ¬æå åç¨å å¯ ç« èã
-å½ä½ æ¥æ¶ç±å¾·åçé®ä»¶å¹¶æå¼å®æ¶ï¼Enigmail ä¼èªå¨æ£æµå®æ¯å¦ä½¿ç¨ä½ çå ¬é¥å å¯çï¼æ¥ä¸æ¥ä½¿ç¨ä½ çç§é¥è§£å¯æ¶æ¯ã
- -çææ¶æ¯ä¸æ¹çéç¥æ¡ï¼å®ä¼æ¾ç¤ºç±å¾·åå ¬é¥ç¶æçä¿¡æ¯ã
-å½ç±å¾·åæ¶å°ä½ çé®ä»¶ï¼ä»å°ä¼ä½¿ç¨ä½ çå ¬é¥ï¼ä½ å¨ Step 3.A -åç»ä»äºï¼å»éªè¯ä½ ç¾åççå®æ§ï¼ä»¥åä½ åéçæ¶æ¯æªç»ç¯¡æ¹ã
+åç»ä»äºï¼éªè¯ä½ åéçæ¶æ¯æªç»ç¯¡æ¹ï¼å¹¶ä»¥å å¯å½¢å¼ç»ä½ åå¤ãç±å¾·åå¯è½éè¦ä¸¤ä¸åéåå¤é®ä»¶ãå¨è¿æé´ï¼ä½ å¯ä»¥è·³è¿åé¢çé¨å并æ¥é æ¬æå åç¨å å¯ ç« èã
ç±å¾·åçåå¤ä¼æ¯å å¯çï¼å 为ä»è½å å¯å°±å å¯ãå¦æä¸å顺å©ï¼ä»ä¼åå¤âä½ çç¾å已被éªè¯âãå¦æä½ çæµè¯ç¾åé®ä»¶ä¹æ¯å å¯çï¼ä»ä¼ä¼å æåã
+å½ä½ æ¥æ¶ç±å¾·åçé®ä»¶å¹¶æå¼å®æ¶ï¼Enigmail ä¼èªå¨æ£æµå®æ¯å¦ä½¿ç¨ä½ çå ¬é¥å å¯çï¼æ¥ä¸æ¥ä½¿ç¨ä½ çç§é¥è§£å¯æ¶æ¯ã
+ +çææ¶æ¯ä¸æ¹çéç¥æ¡ï¼å®ä¼æ¾ç¤ºç±å¾·åå ¬é¥ç¶æçä¿¡æ¯ã
+ç®ä½ä¸æç± Tom <hexuxin@foxmail.com> å®æç¿»è¯ã
æ¤é¡µé¢ä¸çå¾çéç¨ ç®ä½ä¸æç± ä½æé« <hexuxin@foxmail.com> å®æç¿»è¯ã
æ¤é¡µé¢ä¸çå¾çéç¨ ç¥è¯å
±äº« ç½²å 4.0
许å¯åè®®ï¼æè¾æ°çæ¬ï¼ è¿è¡è®¸å¯ï¼å
¶ä½é¨å以 ç¥è¯å
±äº« ç½²å-ç¸åæ¹å¼ 4.0 许å¯åè®®
diff --git a/zh-hans/workshops.html b/zh-hans/workshops.html
index c476792e..3edb04f3 100644
--- a/zh-hans/workshops.html
+++ b/zh-hans/workshops.html
@@ -42,9 +42,8 @@ href="//static.fsf.org/nosvn/enc-dev0/img/favicon.ico" />