From 56f55defc2c88267fc43efc2c4d92b9a15774542 Mon Sep 17 00:00:00 2001
From: Z <tdxdxoz@gmail.com>
Date: Thu, 21 Nov 2019 23:32:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E3=80=81=E6=8C=87=E5=8D=97(=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3)=E7=9A=84=E9=93=BE=E6=8E=A5=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BA=86=E6=B6=88=E6=81=AF=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../features/ui/components/link_footer.js     |   4 ++--
 app/javascript/mastodon/locales/zh-CN.json    |   2 +-
 app/views/about/show.html.haml                |   2 +-
 app/views/home/index.html.haml                |   2 +-
 app/views/layouts/public.html.haml            |   4 ++--
 config/locales/zh-CN.yml                      |   2 +-
 public/badge.png                              | Bin 3342 -> 1249 bytes
 public/mask-icon.svg                          |   2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/link_footer.js b/app/javascript/mastodon/features/ui/components/link_footer.js
index 2b9bd3875..4c010913e 100644
--- a/app/javascript/mastodon/features/ui/components/link_footer.js
+++ b/app/javascript/mastodon/features/ui/components/link_footer.js
@@ -51,10 +51,10 @@ class LinkFooter extends React.PureComponent {
           {withHotkeys && <li><Link to='/keyboard-shortcuts'><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></Link> · </li>}
           <li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li>
           <li><a href='/about/more' target='_blank'><FormattedMessage id='navigation_bar.info' defaultMessage='About this server' /></a> · </li>
-          <li><a href='https://joinmastodon.org/apps' target='_blank'><FormattedMessage id='navigation_bar.apps' defaultMessage='Mobile apps' /></a> · </li>
+          <li><a href='https://closed.social/apps' target='_blank'><FormattedMessage id='navigation_bar.apps' defaultMessage='Mobile apps' /></a> · </li>
           <li><a href='/terms' target='_blank'><FormattedMessage id='getting_started.terms' defaultMessage='Terms of service' /></a> · </li>
           <li><a href='/settings/applications' target='_blank'><FormattedMessage id='getting_started.developers' defaultMessage='Developers' /></a> · </li>
-          <li><a href='https://docs.joinmastodon.org' target='_blank'><FormattedMessage id='getting_started.documentation' defaultMessage='Documentation' /></a> · </li>
+          <li><a href='https://closed.social/intro' target='_blank'><FormattedMessage id='getting_started.documentation' defaultMessage='Documentation' /></a> · </li>
           <li><a href='/auth/sign_out' onClick={this.handleLogoutClick}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></a></li>
         </ul>
 
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 46b891573..d92365a0a 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -161,7 +161,7 @@
   "follow_request.reject": "拒绝",
   "getting_started.developers": "开发",
   "getting_started.directory": "用户目录",
-  "getting_started.documentation": "文档",
+  "getting_started.documentation": "指南",
   "getting_started.heading": "开始使用",
   "getting_started.invite": "邀请用户",
   "getting_started.open_source_notice": "Mastodon 是开源软件。欢迎前往 GitHub（{github}）贡献代码或反馈问题。",
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index 4181de6b2..935ad50dd 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -38,7 +38,7 @@
                 %small= t('about.browse_public_posts')
 
         .directory__tag
-          = link_to 'https://joinmastodon.org/apps', target: '_blank', rel: 'noopener' do
+          = link_to 'https://closed.social/apps', target: '_blank', rel: 'noopener' do
             %h4
               = fa_icon 'tablet fw'
               = t('about.get_apps')
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 30c7aab19..039e02a45 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -13,4 +13,4 @@
     = image_pack_tag 'logo.svg', alt: 'Mastodon'
 
     %div
-      = t('errors.noscript_html', apps_path: 'https://joinmastodon.org/apps')
+      = t('errors.noscript_html', apps_path: 'https://closed.social/apps')
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index b9179e23d..9684d7416 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -14,7 +14,7 @@
             - unless whitelist_mode?
               = link_to t('directories.directory'), explore_path, class: 'nav-link optional' if Setting.profile_directory
               = link_to t('about.about_this'), about_more_path, class: 'nav-link optional'
-              = link_to t('about.apps'), 'https://joinmastodon.org/apps', class: 'nav-link optional'
+              = link_to t('about.apps'), 'https://closed.social/apps', class: 'nav-link optional'
 
           .nav-center
 
@@ -52,6 +52,6 @@
             %h4= t 'footer.more'
             %ul
               %li= link_to t('about.source_code'), Mastodon::Version.source_url
-              %li= link_to t('about.apps'), 'https://joinmastodon.org/apps'
+              %li= link_to t('about.apps'), 'https://closed.social/apps'
 
 = render template: 'layouts/application'
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 8da3b9550..b1bae25ba 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -16,7 +16,7 @@ zh-CN:
     contact_missing: 未设定
     contact_unavailable: 未公开
     discover_users: 发现用户
-    documentation: 文档
+    documentation: 指南
     federation_hint_html: 在%{instance} 上拥有账户后，你可以关注其他闭社站点的人。
     get_apps: 尝试移动应用
     hosted_on: 一个在 %{domain} 上运行的闭社实例
diff --git a/public/badge.png b/public/badge.png
index c3e99ddd431b98964e14e1ee98ac53ce6835918f..989be08121331ad527b8b4a71b8d36a7a40eb7f5 100644
GIT binary patch
literal 1249
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zcalY)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHjcdD8DEp``;t|3=AxJo-U3d6}R5rJ-a$4o$<iK_#RD;
zSP6rPyEH>Ka7=Rg-{AIgkwS-RY=qarR&Dcz4-U0%Tag{kbyss~lkTDg2R+0WiFhkV
zx^yV0?W_~wUb@$Fm2c7P{@Y8sXEtze%q&WOHplWjb9>8dgFBV?znedwYi;~o4CoS6
zU?8&F?aSV}byZt_<!rrwMfZ&LRkyFRU-4fpb>0;9J=A@bbl+0>`c-n9Si+w#d^M+a
z$EC+nUrW6Uf4*CPZyN)9Va$5I$VsQaT65<I9RHd1ewXg1ex5JCf7N_t?PqM>R4%*S
z$(i?o;p?+|d@LK-*KT#JT5wCZ;ppx3wY-<!y%J`M*kgO`R>E6B1`Y-m1||l^1_lQP
z1qK0%xJ(8tR5T50)P~3R)|#<ys4!mx^uw}UN({@Mxs<N>^>5eRjs3Ht|Fvsh{rKwX
ztBkM5OZP5z<~<;mVYn`A`l{{E>+{0$L-IrauR0g9e06=u^<@SM=NJxup8qQ5tKU{r
z`#ilHYhNAubN}A#|Fye!+0-}fvi%=*b^r7D-6s3b&i*gXxaLY(X;EFy8Tr!xmh~$4
z=IE#8G+sM(^OgG5_0OwccTbc1fBu+F(?<FF_4C%eGg|7S*-(5nSj;Y%=Rx|_y5JLY
zEsPJf?hlkTDfKaIc)ohKue9~kFCJq5e!lWv)~z{@(Jy4aS*XuPo)6uxl9zRAvVCaY
z(>;yV+Vntc{oY@FD-$LES#3C4zqIPm7K5V<+h*5FuuOZV&wT4!&DoL-IqK{}2h4p~
zR~IBPbpOx1d|;JK{@486hN+g<vf>|pRl4rN^ObdOXl>cov#(B{we#*~P!l~+_H}An
zxVr<xWbOyiXV*0|Yk$8q>HFXHVY_*E8y^rk&k%hze0FR)J0s5_Bk{-Pvupn`uswe6
zee2hseYa9~%w=3w!FFRE-*c-aOfy~-H>9t&k7i<;k;IVx`Jot_%z;Jmoqx+VYwIaD
zINpkSko$k_uZb(uS25P;Uq6|?D0)HftL4k)uAIlX@Abv`hAah%jN5-keO;uP&ciq-
z{y^@(3ybZO3pdQIJ$<<K)#J9QK!x+NzeNitir8&EoZi6PHpOt~>YLJ!%91|Ho6qUV
z<u2KJ^ZnVooc3mCdoF5Qe|S-Ub8`H#3bqwD&%b?tCExaE>Kev5w;FF-By~xy*1z}g
z+w;Az<PM*Rc)R;BL!YG6u|2G}a=z_8lv6(=g~4>U)seTqroK#l!*}P|x96qK$9MgB
zn#=N`DKR;=X4$SEip&-{HzL&e&415$vX<?`0>$LJcj9H=Hs4p-K2_VcxcgW|>>2;C
w{xi)xw%@dN|Nig#U(0CQyevjoUT^TMkZ1hW#xiSi)fAAJr>mdKI;Vst04Ng|-v9sr

literal 3342
zcmV+p4e|1cP)<h;3K|Lk000e1NJLTq006)M006)U1ONa4_|>G000002VoOIv0RM-N
z%)bBt010qNS#tmY8d?AV8d?F>J8jJX000McNliru;RhE00Sn;kId}j744+9vK~#9!
z?OlDCj#V0e4OdC4EW_}e-+5;+i^YXSR>+o7>RS2`o3z))+ErPRis@rhNQPx1xr8M<
zB^s@zTwRzpreu6fC1rdJBHyf`8XuWq_K$pwG4J!9bDnd*@4WAOpWpxQd7t0!dCoca
z$GLBxufh#c%W3R%l=ol&hKOg8CZ@@`SSYiQgItk^o!E)}C_n)UQGybbpb!Npz<%t+
zPLYRP<j5>6lyk*2q={!S1Ow!~{!UI4C*H@S?5JDYX)W)?P?;{@#VULw4x#u0trRF0
zhwu%uWu{EWP~7KllTat-C{L&(Zj+B;Dwc^noFXJ!6{oNT%kjD#B)TNkjZ)H+syZFS
z6PPJi<5&ft+zkcz470>Ae<xfQ1;k6o>47x48mB8b?d72en~{Nm{${>P5l6iLm$DBs
z#GweJy*wPjJoFW{B7^z{7%H=HHcF^3jdRFFn!i(p{T>{NRBVev;>+SYq=`lqi~BgI
zhggC0F+l!hti=7kDiwl!*$+Eniu%jgBOVE}2(mfW#3=a}u@UXUM1JzMa%@y?w%XRU
zOb>(2P%jZVO#VfPJlQ<7?y}$Gd#3#g{D}KQMn49kh$+7c=kZb~*smleG1-A2r~BfF
z>BkhN*%k9B52lqciz!x+fa)v2IHp%|AtKs(nOs$*+CO-9Ck+)w-HAx{v2Aw!k7?CH
zp}(m`rvq}CQf+LFuWrlbHl67-LWZ5yze|jH`fcJq?{ThbG3)KOfdff3yuSYvnZ_{M
z1Ws#qyLk=eI~~1jzgbM7XRI^MqmZ4MJ{xd)m^vTUFnLz6$;dq??`G<(ZN(;z39Mz}
ztl?|@^UrUXHml!2XWjRIHj`#GZ(@O7K7S3IWYVnSEQHPm{1j7W9V2xXpp8tJb?i`I
zfRdOl60}fVfSzQs!nz2FPnj$de4%)al*8{-NUX220QG00$ndzz0yKw-BD06zRS_VM
zi6X<Ep!7Gm5$BjFLIksi<sD2CDS8I8fk!e)q!=GefTc_lDYAnJu$xID#Zh<quj4J4
z95vkpXu$-Lhi2Nloq_IQg2>U=O@Kj65IKgs2{4ukBFAJ7#fR4)l<6kGVkU?jAGryz
ziU}e|E(hZ)Zg8G&!-N2b-30iK2_naFHvtYZLF6cO6M(N{)8nk00LPgia-4G$fD4h)
zqu5P=ADAF=6oo>7b66uLiDBp~`^y(Fi{NziBNmC#7%X~Yuo#2?T<WG_54$l_z99SI
zA^D_C$69NV64yQ8M+^S$L*j|68X;8jx4}QHW!$ZCdL&gX8%mP*Si4kJgc(ljt4r~V
zVK_`JfY<k^Sd6Lti-48Yo8lwSe}At_{e?=R7xsIeVY$;J&;;?-<yg<J(P=jUytNeh
zA?S_R%1HAxLr!A7U@arC&eIH2e3gUD(9Ppn@dT9sC)BFPVubMw|1G=l1c+-JyA<V9
zN>9+j(`oUD+fSb{-*!cJ<@+~gwHJ4(wxJTWkZ-hmy{UYKtDA>~XfKHXa;#PbuB`^U
zODl~#Zfy<DESsBMqj8CAJdHQhv>N)6<Qudu!S>XCJLhO#vwcf<2EB?7@zsq_M4R3I
zb`j;;c|{4>4SMgt<JX%YvA*UvuvWX0z;HtWzI6LhGh^etfOaJcy^FBfKJ6h_Yt1lJ
zTL58L%FRt`!=GGdKu<%hFYHN!S{GVxsM6)3vNM>~lFYU*z!almI2voHxY?lES4WK}
zIAHVyuNf`ZS#CdRwyGHw>cyApGbAPH|Gv&`XZg9&6Fg(Y)>7+xfOy#G?|-O1L-Mr-
z0#vm`N??2AVIu(+Sw97dM~nnmsXjx48w~`gVJTN9umF!5u{GbmA@-7y02;<vVE33y
zz3X3VkdkNg1fz@um}A`+q;A5O8dY>Wud<r~J$LE25retl%00>b%YJUCnLB#Feql!3
zs&#TmHxNLp*^0lD_5^V_VD!3<CWwg1o3!7aSGE51w*~_2(t3t}Xzu{+4bO~j>FFpi
z{L$HZe_r2{BJUtvfJ#t;gMkA{0bZfGh7rR@-Tt;|!|`IhPI6+5_6!@fYH!BrSQ!^E
zQcK_##xY{I8!|Xz9xPGc#+=3`dyRZdgPtKK@jN7J93hN@KCW>SFHOi*H_GH2u-Pn_
zjawBLhg<NI(F|Kui_M!kAuix|Za?fTq&-~8Jo?x?nCEY!K>tlRYJPb_C9Z)~Pgx^w
zfhFwq81bLy9<@cX;oE;HqX2&lLjMCE3vO<A8oNjHJeTuvE7yTNo|8JZir(d01qs(9
z)k^B)2l!Qh1+<aOw9sy)5NUzF1E(uCdHsFYS5))t958tVL+T}#K9e{dF~Q6Ja@B4y
zPxLB%Y>clidW-oM+e;t7cyV*-b5~-0@r1{OmkSwv?yFnAwMQtyKCBZ<ungbe1WAtN
zPsqn7cn_Z-pQy9<34D!ZVhPq;NcU1RDY1={XNj@iU4Si25ive=7hn@pM2xrH1z67%
z(ISYsifpEc7$e*TSk4p?e*q7=dnuPNMZ^N!;x51frid0n5^PL^3=GvI{va9H+&P#S
z!7}hLfk`4ouq;~n0+U3F_b5Vn3_CeNKA+Dg`!PwRhtNURuMRP^5G<-KQkW!4)K3T=
z&}N$Ga6EXtKbdJF#AiVTXmBIbM2J}`DMx3RD6%t<%2h+`W1`4#mx=&iFi}*FxP&??
z0&qx%3b|@&r*AV=G;qBcQ_2!ZXR1h0d_}IHwHgi#TYk_>&WK)27R3fE+p69zX~%Sh
z$prg()K6f#tfN5b0D7sE(kZ6QvIX2n?}F!crpzk+({-;<XEA9Ou@=|q3h)NgW)0ix
z*4Dq`Ka`2HgoCo7K^YV7sci`d{LM^?;P@QL<XOOOqqqOUL6qA#c=mj{-Ubf33v6Ht
zJsmtVooYTW0~t)BF^a@<`sJ(2Zo^MAk%m71Z=DW4??ZNGDvj`tNp;8a&Oy~oi+IN{
z_MxZG-oRH(sRqtsg2!$5DgkCOt;z^ky~T?Fe`R8okS*H#D28as<OV(Muh#3ip*JcU
z7qE;4oJNLd>7yNZkBKf9`A9WzF&hXlkjXBC!(y83?AgjyF8-cGxOz@UZbVrcyX16{
zVp87Q+c!W~JuAMt&*xNgI>^T`1M4er62MXUJ_d_MzVHl8rFyV39q}sro1!l!U>SB<
zYZ>bW`|&X*qp!I?-_}vIJDC6hdx9lZ6)i<?`FA-N+1O*P{cVu<9AC=!F%_xuLD^QX
zAsy{5P?f5~ylR?Wvulv-bj1LS6w|O6IoNAhlK3)?i9D<l^D#v}FCG>tPGjwyg^(^n
zvxx+_+x$P(tt}d%o$Mwb5Rc#)q+y1bBQs?tmdUJ(z*3os8S+&*7O8TO>?eBrZ}+!>
z(CHOfA%@eHNPxfjcqolHdj(6c5a11_R&^1YOp`6f%&H3TTM_|IhTN!$U<pV<Gb()m
zc>Ek6?oSfD9?i@uj^t}`kU)Y>%&ht%G?K&`Zo<qen?5A&vYE`R`ZqukqCX=YW>!^z
zWReaQuQ9XgXCaD$uICIIXvVAnj>qOu<zur+r))k8*|Z1dYjuc>aeIK~`f3_;t2oFa
zWaC1XX%O+t&|5?jEVP{38m%L#23bY99ij{KtMU!pNtU;8PQKykVq44{NM9k$PdJ0u
z{S89-H1!fO5aS|C0S~>Tm2e)bWIxoTeFoVUkK-NeMhQx=EyBJ5CmuV<b9IW5gBSg`
zt9H0nqupsDdSM*0%NUjWB5oOSnowm7mGeDp$0CfA{Y8pwo=`{cz}oB@B#RXJXN(dH
zuqj|p(TND$3H+T<7@k|WIDm~Z3;)L3n1Klxh1AlJ&x?tejYU|Ajo7c)+_@++&9W4n
zj+Vsp2=z$eP7()QIIdUMid3th9gaqW0D+T*E523G+)@|%u)^Ool5OLfVnxK?cf2XG
zjpHhEY=|=XsrG=|BHvZr9{CY0K=)_}*xZ0Ak@_8I7FMmm-$5&^iAV_sM3J}D=^BAe
zP=-X8$2v|vfb|iz2Rs*raRaBL%#4VZSjWT|o!aJ+W+Oa`&lFu^;lNr9NVq=gV`z!>
z@E0r&llL@W$qn(cY#v*&%qpTiM&N^xMG^u<o<EnbIIVp#JmN$v48dF265_H1`;dW$
zqIR`68S&L+XE6-(u#s@HJ}EvG6LG%)^X)b&%Z8#mhGRBXVyEYF1O><uZ{ivB^f&cY
zVR8)?DF~;d_yY#xMNGvzVg)wfE9}JKEB24?QGi|8fm|#@hL|Lu7JtHBqGd>`Sy>(b
Y2dEt%3$*UUt^fc407*qoM6N<$f`-O1%>V!Z

diff --git a/public/mask-icon.svg b/public/mask-icon.svg
index f91ff5067..05825b846 100644
--- a/public/mask-icon.svg
+++ b/public/mask-icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 94.023018 100.80365" height="28.44903mm" width="26.535385mm"><path d="M72.57077 49.00625c-3.9125 0-7.085-3.1825-7.085-7.095 0-3.91125 3.1725-7.09375 7.085-7.09375 3.92125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1725 7.095-7.09375 7.095m-25.55875 0c-3.9225 0-7.095-3.1825-7.095-7.095 0-3.91125 3.1725-7.09375 7.095-7.09375 3.91125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1825 7.095-7.09375 7.095m-25.57 0c-3.91125 0-7.08375-3.1825-7.08375-7.095 0-3.91125 3.1725-7.09375 7.08375-7.09375 3.92125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1725 7.095-7.09375 7.095m72.5775-15.905c0-21.86625-14.32375-28.27375-14.32375-28.27375-7.23-3.31875-19.63-4.7125-32.5175-4.8275h-.3125c-12.88875.115-25.28875 1.50875-32.5075 4.8275 0 0-14.32375 6.4075-14.32375 28.27375 0 5.00375-.105 10.995.05125 17.34C.60577 71.83 4.00702 92.905 23.78327 98.1375c9.1125 2.4125 16.945 2.9125 23.24875 2.56875 11.4225-.63375 17.84-4.07625 17.84-4.07625l-.37375-8.3025s-8.16625 2.58-17.34125 2.2675c-9.09125-.3125-18.6825-.9775-20.16-12.13875-.135-.97875-.1975-2.02875-.1975-3.13125 0 0 8.915 2.185 20.2325 2.69375 6.9075.3225 13.39875-.39375 19.98375-1.185 12.6275-1.50875 23.62375-9.29 25.0075-16.405 2.17375-11.1925 1.99625-27.3275 1.99625-27.3275" fill="#000"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="15 25 2 30" height="28.44903mm" width="26.535385mm"><path d="0h36.013v7.202H14.405zm21.607 42.045c0 1.17-5.74.42-7.202 1.17-4.313 2.217-5.017 7.2-5.017 7.2-2.186 0-2.186 0-2.186-8.37V29.98a1.17 1.17 0 0 1 1.17-1.17h12.065a1.17 1.17 0 0 1 1.17 1.17v12.066z"/></svg>