zh-hans: update infograph

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

diff --git a/svg/zh-hans/gnupg-infographic.svg b/svg/zh-hans/gnupg-infographic.svg
index 3508f37aa794374591a7f8199ff2db3addde479b..a36b06aeb9181120d389bc834bdcf13238251b0f 100644 (file)
--- a/svg/zh-hans/gnupg-infographic.svg
+++ b/svg/zh-hans/gnupg-infographic.svg
@@ -14,11 +14,11 @@
    height="1965.7238"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.1 r15371"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
    sodipodi:docname="gnupg-infographic.svg"
-   inkscape:export-filename=""
-   inkscape:export-xdpi="134.28999"
-   inkscape:export-ydpi="134.28999">
+   inkscape:export-filename="/home/tom/Projects/enc/static/svg/zh-hans/gnupg-infographic.svg.png"
+   inkscape:export-xdpi="143.23785"
+   inkscape:export-ydpi="143.23785">
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -27,10 +27,10 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.6377977"
-     inkscape:cx="255.5132"
-     inkscape:cy="1317.7606"
+     inkscape:cx="246.24431"
+     inkscape:cy="47.76248"
      inkscape:document-units="px"
-     inkscape:current-layer="layer2"
+     inkscape:current-layer="g7577"
      showgrid="false"
      inkscape:snap-page="true"
      inkscape:window-width="1366"
@@ -1348,7 +1348,7 @@
              y="1863.4539"
              style="font-family:'Archivo Narrow';-inkscape-font-specification:'Archivo Narrow';fill:#008000;fill-opacity:1" /></flowRegion><flowPara
            id="flowPara5551"
-           style="font-size:13px;line-height:1.25">Teach yourself email self-defense. Learn GnuPG in 30 minutes at</flowPara></flowRoot>      <flowRoot
+           style="font-size:13px;line-height:1.25;-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">三十分钟自学电子邮件加密指南就在</flowPara></flowRoot>      <flowRoot
          transform="matrix(3.8973707,0,0,3.8973707,-45.242635,-5460.143)"
          style="font-style:normal;font-variant:normal;font-weight:200;font-stretch:normal;line-height:0.01%;font-family:Dosis;-inkscape-font-specification:'Dosis Ultra-Light';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008000;fill-opacity:1;stroke:none"
          id="flowRoot6321"
@@ -1650,11 +1650,11 @@
            y="747.11188"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.72991276px;line-height:110.00000238%;font-family:'Archivo Narrow';-inkscape-font-specification:'Archivo Narrow';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#4b4f2f;fill-opacity:1" /></flowRegion><flowPara
          id="flowPara7019"
-         style="font-size:13.72991276px;line-height:1.10000002;-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">你只需要一款被称为 <flowSpan
-   style="-inkscape-font-specification:'Roboto Bold';font-family:Roboto;font-weight:bold;font-style:normal;font-stretch:normal;font-variant:normal"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.72991276px;line-height:1.10000002;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'">你只需要一款被称为 <flowSpan
+   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Roboto;-inkscape-font-specification:'Roboto Bold'"
    id="flowSpan1305">GnuPG</flowSpan> 的简单程序。</flowPara><flowPara
-         style="font-size:13.72991276px;line-height:1.10000002;-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="flowPara1303">它会将你的邮件加密，只有合适的人才能阅读。</flowPara></flowRoot>    <flowRoot
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.72991276px;line-height:1.10000002;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC'"
+         id="flowPara1303">它将你的邮件加密，只有合适的人才能阅读。</flowPara></flowRoot>    <flowRoot
        inkscape:export-ydpi="134.53"
        inkscape:export-xdpi="134.53"
        inkscape:export-filename=""
@@ -1672,11 +1672,11 @@
            id="rect5264" /></flowRegion><flowPara
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:1.25;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC';text-align:start;text-anchor:start"
          id="flowPara1309"><flowSpan
-   style="-inkscape-font-specification:roboto;font-family:roboto;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="flowSpan1317">GnuPG</flowSpan> 几乎可以运行在任何计算机和智能手机上。他是自由授权的，你无需花钱。每一位用户都有一把独一无二的<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:normal;font-stretch:normal;font-family:roboto;-inkscape-font-specification:roboto"
+   id="flowSpan1317">GnuPG</flowSpan> 几乎可以运行在任何计算机和智能手机上。它是自由授权的，你无需花钱。每位用户都有一把独一无二的<flowSpan
+   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="flowSpan1313">公钥</flowSpan>和<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="flowSpan1315">私钥</flowSpan>，它是由随机数字组成的字符串。</flowPara></flowRoot>    <flowRoot
        inkscape:export-ydpi="134.53"
        inkscape:export-xdpi="134.53"
@@ -6369,7 +6369,7 @@
            y="926"
            style="font-style:normal;font-variant:normal;font-weight:200;font-stretch:normal;font-size:13px;line-height:125%;font-family:Dosis;-inkscape-font-specification:'Dosis Ultra-Light';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1" /></flowRegion><flowPara
          id="flowPara3453"
-         style="font-style:normal;font-variant:normal;font-weight:200;font-stretch:normal;font-size:13px;line-height:125%;font-family:Dosis;-inkscape-font-specification:'Dosis Ultra-Light';text-align:start;letter-spacing:-0.55812615px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1">EMAIL SELF-DEFENSE</flowPara></flowRoot>    <flowRoot
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13px;line-height:125%;font-family:'Source Han Sans SC';-inkscape-font-specification:'Source Han Sans SC';text-align:start;letter-spacing:-0.55812615px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1">电子邮件加密指南</flowPara></flowRoot>    <flowRoot
        inkscape:export-ydpi="134.53"
        inkscape:export-xdpi="134.53"
        inkscape:export-filename=""
@@ -8013,7 +8013,9 @@
          xml:space="preserve"
          id="flowRoot7103"
          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:#008000;fill-opacity:1;stroke:none"
-         transform="matrix(1.3644425,0,0,1.3644425,323.16921,-631.25239)"><flowRegion
+         transform="matrix(1.3644425,0,0,1.3644425,323.16921,-631.25239)"
+         inkscape:export-xdpi="143.23785"
+         inkscape:export-ydpi="143.23785"><flowRegion
            id="flowRegion7105"><rect
              id="rect7107"
              width="282.05722"
@@ -8024,7 +8026,7 @@
            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="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'"
@@ -8067,9 +8069,15 @@
              width="282.05722"
              id="rect16300" /></flowRegion><flowPara
            style="font-weight:normal;font-size:10px;line-height:1.25;-inkscape-font-specification:Dosis"
-           id="flowPara16302">Copyright 2014 Free Software Foundation.  </flowPara><flowPara
+           id="flowPara16302">Copyright 2014 <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="flowSpan1318">自由软件基金会</flowSpan> </flowPara><flowPara
            style="font-weight:bold;font-size:10px;line-height:1.25;-inkscape-font-specification:'Dosis Bold'"
-           id="flowPara7101">Remixing encouraged! Get the source at the URL above.</flowPara></flowRoot>      <g
+           id="flowPara7101"><flowSpan
+   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="flowSpan1320">支持再创作！从上述</flowSpan> URL <flowSpan
+   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="flowSpan1322">获取源代码。</flowSpan></flowPara></flowRoot>      <g
          style="fill:#ffffff"
          id="g7241"
          transform="matrix(0.06823027,0,0,0.06823027,12.766899,1890.9297)">