zh-hans:

- Using PXL-2000-12-0 font:
 img/zh-hans/full-infographic.png
 img/zh-hans/screenshots/section5-02-use-it-well.png
 img/zh-hans/screenshots/step2a-01-make-keypair.png

- Change font position:
 img/zh-hans/screenshots/section6-next-steps.png
 img/zh-hans/screenshots/step2a-01-make-keypair.png
 svg/zh-hans/elements.svg
 svg/zh-hans/step2a-01-make-keypair.svg

- Change image size:
 img/zh-hans/screenshots/workshop-section1.png

- Add space between Chinese and English:
 svg/zh-hans/gnupg-infographic.svg

diff --git a/img/zh-hans/full-infographic.png b/img/zh-hans/full-infographic.png
index 940479ee04f49301c66176f9e95e11b9132c22b1..497dcb92c52fc9c84eefa8d78fca223283f8771b 100644 (file)
Binary files a/img/zh-hans/full-infographic.png and b/img/zh-hans/full-infographic.png differ

diff --git a/img/zh-hans/screenshots/section5-02-use-it-well.png b/img/zh-hans/screenshots/section5-02-use-it-well.png
index 5d2a7b6ccfe46e67f253cf408d83c005162039a2..dfed3075e0b7dd0241c7d550c873c34d63eb9aa6 100644 (file)
Binary files a/img/zh-hans/screenshots/section5-02-use-it-well.png and b/img/zh-hans/screenshots/section5-02-use-it-well.png differ

diff --git a/img/zh-hans/screenshots/section6-next-steps.png b/img/zh-hans/screenshots/section6-next-steps.png
index 5e4b7013eb74a571a9adedc7e0bc28ffc7f1ef2e..5c1276c824ee4e62a7cde3efcbe40d4ba1a83f02 100644 (file)
Binary files a/img/zh-hans/screenshots/section6-next-steps.png and b/img/zh-hans/screenshots/section6-next-steps.png differ

diff --git a/img/zh-hans/screenshots/step2a-01-make-keypair.png b/img/zh-hans/screenshots/step2a-01-make-keypair.png
index 301668c4d38c714fc11eb20f6e4e5bb2cbc55f96..6c573d4998a6561276da427d0ca5bfa11fd25ec0 100644 (file)
Binary files a/img/zh-hans/screenshots/step2a-01-make-keypair.png and b/img/zh-hans/screenshots/step2a-01-make-keypair.png differ

diff --git a/img/zh-hans/screenshots/workshop-section1.png b/img/zh-hans/screenshots/workshop-section1.png
index 82f8d15a5372305fc1ce103b2ffd87f2f39beaf3..9d103917fe3284f44a81dc985a7dc683e300ce98 100644 (file)
Binary files a/img/zh-hans/screenshots/workshop-section1.png and b/img/zh-hans/screenshots/workshop-section1.png differ

diff --git a/svg/zh-hans/elements.svg b/svg/zh-hans/elements.svg
index d6aa2920002093e68e42140e1ada1c1aaf99125c..54a7b4b50f0b946f584905b188dde539beb67efc 100644 (file)
--- a/svg/zh-hans/elements.svg
+++ b/svg/zh-hans/elements.svg
@@ -14,7 +14,7 @@
    id="svg3952"
    version="1.1"
    inkscape:version="0.92.1 r15371"
-   sodipodi:docname=""
+   sodipodi:docname="elements.svg"
    inkscape:export-filename=""
    inkscape:export-xdpi="285.07001"
    inkscape:export-ydpi="285.07001">
@@ -59,10 +59,10 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.1504296"
-     inkscape:cx="325.00339"
-     inkscape:cy="473.13107"
+     inkscape:cx="179.84023"
+     inkscape:cy="539.62797"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g7357"
      showgrid="false"
      inkscape:window-width="1366"
      inkscape:window-height="708"
@@ -112,7 +112,7 @@
            xml:space="preserve"
            id="flowRoot7325"
            style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0.01%;font-family:Dosis;-inkscape-font-specification:'Dosis Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#5f8dd3;fill-opacity:1;stroke:none"
-           transform="matrix(0.6870976,0,0,0.6870976,509.48885,161.30258)"><flowRegion
+           transform="matrix(0.6870976,0,0,0.6870976,507.91485,161.30258)"><flowRegion
              id="flowRegion7327"><rect
                id="rect7329"
                width="79.5"

diff --git a/svg/zh-hans/gnupg-infographic.svg b/svg/zh-hans/gnupg-infographic.svg
index a68e32564b34bf9ddefbf422c6e8a3ef7782ca90..3508f37aa794374591a7f8199ff2db3addde479b 100644 (file)
--- a/svg/zh-hans/gnupg-infographic.svg
+++ b/svg/zh-hans/gnupg-infographic.svg
@@ -15,7 +15,7 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.92.1 r15371"
-   sodipodi:docname=""
+   sodipodi:docname="gnupg-infographic.svg"
    inkscape:export-filename=""
    inkscape:export-xdpi="134.28999"
    inkscape:export-ydpi="134.28999">
@@ -27,8 +27,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.6377977"
-     inkscape:cx="246.24431"
-     inkscape:cy="91.139536"
+     inkscape:cx="255.5132"
+     inkscape:cy="1317.7606"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
      showgrid="false"
@@ -1315,15 +1315,15 @@
            style="font-size:13px;line-height:1.25">GnuPG <flowSpan
    style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
    id="flowSpan1369">是<flowSpan
-   style="-inkscape-font-specification:'Source Han Sans SC Bold';font-family:'Source Han Sans SC';font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal"
+   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC Bold'"
    id="flowSpan1377">自由软件</flowSpan>；它是完全透明的，任何人都可以复制它，制作自己的版本。这使得它比专有软件（比如</flowSpan> Windows <flowSpan
-   style="-inkscape-font-specification:'Source Han Sans SC';font-family:'Source Han Sans SC';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
    id="flowSpan1371">和</flowSpan> Word<flowSpan
-   style="-inkscape-font-specification:'Source Han Sans SC';font-family:'Source Han Sans SC';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="flowSpan1373">）更难受到监控。你可以在</flowSpan> <flowSpan
-   style="-inkscape-font-specification:'Dosis Bold';font-family:Dosis;font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="flowSpan1379">FSF.org</flowSpan> <flowSpan
-   style="-inkscape-font-specification:'Source Han Sans SC';font-family:'Source Han Sans SC';font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
+   id="flowSpan1373">）更难受到监控。你可以在</flowSpan><flowSpan
+   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Dosis;-inkscape-font-specification:'Dosis Bold'"
+   id="flowSpan1379">FSF.org </flowSpan><flowSpan
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
    id="flowSpan1375">上了解更多有关自由软件的信息。</flowSpan></flowPara></flowRoot>    </g>
     <g
        id="g7523"
@@ -1731,6 +1731,10 @@
          id="flowPara5321"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.44159412px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'">你的私钥更像是现实中的钥匙，你需要自行保管它（在你的计算机中）。</flowPara><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.44159412px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
+         id="flowPara1316" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.44159412px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
+         id="flowPara1318" /><flowPara
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.44159412px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
          id="flowPara1332" /><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.44159412px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
          id="flowPara1334" /><flowPara
@@ -1751,19 +1755,19 @@
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.44159412px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
          id="flowPara1346" /><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.44159412px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
-         id="flowPara1348"></flowPara><flowPara
+         id="flowPara1348" /><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.44159412px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
-         id="flowPara1350"></flowPara><flowPara
+         id="flowPara1350" /><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.44159412px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
-         id="flowPara1352"></flowPara><flowPara
+         id="flowPara1352" /><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.44159412px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
-         id="flowPara1354"></flowPara><flowPara
+         id="flowPara1354" /><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.44159412px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
          id="flowPara1356" /><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.44159412px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
          id="flowPara1360" /><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.44159412px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
-         id="flowPara1362"> </flowPara><flowPara
+         id="flowPara1362" /><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11.44159412px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
          id="flowPara1358">你使用 GnuPG 和私钥来解密他人发给你的加密邮件。</flowPara></flowRoot>    <flowRoot
        inkscape:export-ydpi="134.53"
@@ -8019,10 +8023,10 @@
              style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:7.32900047px;line-height:125%;font-family:Dosis;-inkscape-font-specification:'Dosis Bold';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#008000;fill-opacity:1" /></flowRegion><flowPara
            id="flowPara7113"
            style="font-weight:normal;font-size:7.32900047px;line-height:1.25;-inkscape-font-specification:Dosis;fill:#008000;fill-opacity:1"><flowSpan
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
-   id="flowSpan1395">信息图和指南由</flowSpan> <flowSpan
-   id="flowSpan7121"
-   style="font-weight:bold;-inkscape-font-specification:'Dosis Bold';fill:#008000;fill-opacity:1">Journalism++ <flowSpan
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
+             id="flowSpan1395">信息图和指南由</flowSpan><flowSpan
+             id="flowSpan7121"
+             style="font-weight:bold;-inkscape-font-specification:'Dosis Bold';fill:#008000;fill-opacity:1">Journalism++ <flowSpan
    style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
    id="flowSpan1397">设计</flowSpan></flowSpan></flowPara></flowRoot>    </g>
     <path

diff --git a/svg/zh-hans/step2a-01-make-keypair.svg b/svg/zh-hans/step2a-01-make-keypair.svg
index b8c8764827c33d503c24cd2596d85554a841b78c..cae515e1be3f3419a1ca7ef63b85217478324421 100644 (file)
--- a/svg/zh-hans/step2a-01-make-keypair.svg
+++ b/svg/zh-hans/step2a-01-make-keypair.svg
@@ -14,7 +14,7 @@
    id="svg3428"
    version="1.1"
    inkscape:version="0.92.1 r15371"
-   sodipodi:docname="">
+   sodipodi:docname="step2a-01-make-keypair.svg">
   <defs
      id="defs3430" />
   <sodipodi:namedview
@@ -24,9 +24,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.70872576"
-     inkscape:cx="142.40747"
-     inkscape:cy="157.14286"
+     inkscape:zoom="1.4174515"
+     inkscape:cx="263.33545"
+     inkscape:cy="266.18148"
      inkscape:document-units="px"
      inkscape:current-layer="g7405"
      showgrid="false"
@@ -69,7 +69,7 @@
          xml:space="preserve"
          id="flowRoot14505"
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0.01%;font-family:Dosis;-inkscape-font-specification:'Dosis Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#2f5faa;fill-opacity:1;stroke:none"
-         transform="matrix(1.2841166,-0.96003306,0.96003306,1.2841166,-294.35455,-927.08284)"><flowRegion
+         transform="matrix(1.2841166,-0.96003306,0.96003306,1.2841166,-298.11807,-925.20108)"><flowRegion
            id="flowRegion14507"><rect
              id="rect14509"
              width="79.5"