diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000..e07ea35
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,72 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ # The branches below must be a subset of the branches above
+ branches: [ master ]
+ schedule:
+ - cron: '43 8 * * 0'
+
+jobs:
+ analyze:
+ name: Analyze
+ runs-on: ubuntu-latest
+ permissions:
+ actions: read
+ contents: read
+ security-events: write
+
+ strategy:
+ fail-fast: false
+ matrix:
+ language: [ 'javascript' ]
+ # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+ # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v2
+ with:
+ languages: ${{ matrix.language }}
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file.
+ # Prefix the list here with "+" to use these queries and those in the config file.
+
+ # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+ # queries: security-extended,security-and-quality
+
+
+ # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+ # If this step fails, then you should remove it and run the build manually (see below)
+ - name: Autobuild
+ uses: github/codeql-action/autobuild@v2
+
+ # i️ Command-line programs to run using the OS shell.
+ # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+ # If the Autobuild fails above, remove it and uncomment the following three lines.
+ # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+ # - run: |
+ # echo "Run, Build Application using script"
+ # ./location_of_script_within_repo/buildscript.sh
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v2
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000..2478ede
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1 @@
+docs/resources/*
\ No newline at end of file
diff --git a/README.md b/README.md
index 9644c32..9d4f097 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
\n \n ',e=Docsify.dom.create("div",n),n=Docsify.dom.find("aside");Docsify.dom.toggleClass(e,"search"),Docsify.dom.before(n,e)}(i),n=Docsify.dom.find("div.search"),a=Docsify.dom.find(n,"input"),e=Docsify.dom.find(n,".input-wrap"),Docsify.dom.on(n,"click",function(e){return-1===["A","H2","P","EM"].indexOf(e.target.tagName)&&e.stopPropagation()}),Docsify.dom.on(a,"input",function(n){clearTimeout(t),t=setTimeout(function(e){return c(n.target.value.trim())},100)}),Docsify.dom.on(e,"click",function(e){"INPUT"!==e.target.tagName&&(a.value="",c())}),i&&setTimeout(function(e){return c(i)},500)}function v(e,n){var t,a,i,r,o;d(e),t=e.placeholder,a=n.route.path,(r=Docsify.dom.getNode('.search input[type="search"]'))&&("string"==typeof t?r.placeholder=t:(i=Object.keys(t).filter(function(e){return-1>=?|&&|\|\||[=!+\-*/%^&|]=?|[?~:]/,punctuation:/\(\(?|\)\)?|,|;/}},{pattern:/\$\((?:\([^)]+\)|[^()])+\)|`[^`]+`/,greedy:!0,inside:{variable:/^\$\(|^`|\)$|`$/}},{pattern:/\$\{[^}]+\}/,greedy:!0,inside:{operator:/:[-=?+]?|[!\/]|##?|%%?|\^\^?|,,?/,punctuation:/[\[\]]/,environment:{pattern:RegExp("(\\{)"+t),lookbehind:!0,alias:"constant"}}},/\$(?:\w+|[#?*!@$])/],entity:/\\(?:[abceEfnrtv\\"]|O?[0-7]{1,3}|U[0-9a-fA-F]{8}|u[0-9a-fA-F]{4}|x[0-9a-fA-F]{1,2})/};e.languages.bash={shebang:{pattern:/^#!\s*\/.*/,alias:"important"},comment:{pattern:/(^|[^"{\\$])#.*/,lookbehind:!0},"function-name":[{pattern:/(\bfunction\s+)[\w-]+(?=(?:\s*\(?:\s*\))?\s*\{)/,lookbehind:!0,alias:"function"},{pattern:/\b[\w-]+(?=\s*\(\s*\)\s*\{)/,alias:"function"}],"for-or-select":{pattern:/(\b(?:for|select)\s+)\w+(?=\s+in\s)/,alias:"variable",lookbehind:!0},"assign-left":{pattern:/(^|[\s;|&]|[]\()\w+(?=\+?=)/,inside:{environment:{pattern:RegExp("(^|[\\s;|&]|[]\\()"+t),lookbehind:!0,alias:"constant"}},alias:"variable",lookbehind:!0},string:[{pattern:/((?:^|[^<])<<-?\s*)(\w+)\s[\s\s]*?(?:\r?\n|\r)2円/,lookbehind:!0,greedy:!0,inside:a},{pattern:/((?:^|[^<])<<-?\s*)(["'])(\w+)2円\s[\s\s]*?(?:\r?\n|\r)3円/,lookbehind:!0,greedy:!0,inside:{bash:n}},{pattern:/(^|[^\\](?:\\\\)*)"(?:\\[\s\s]|\$\([^)]+\)|\$(?!\()|`[^`]+`|[^"\\`$])*"/,lookbehind:!0,greedy:!0,inside:a},{pattern:/(^|[^$\\])'[^']*'/,lookbehind:!0,greedy:!0},{pattern:/\$'(?:[^'\\]|\\[\s\s])*'/,greedy:!0,inside:{entity:a.entity}}],environment:{pattern:regexp("\\$?"+t),alias:"constant"},variable:a.variable,function:{pattern:/(^|[\s;|&]|[]\()(?:add|apropos|apt|apt-cache|apt-get|aptitude|aspell|automysqlbackup|awk|basename|bash|bc|bconsole|bg|bzip2|cal|cat|cfdisk|chgrp|chkconfig|chmod|chown|chroot|cksum|clear|cmp|column|comm|composer|cp|cron|crontab|csplit|curl|cut|date|dc|dd|ddrescue|debootstrap|df|diff|diff3|dig|dir|dircolors|dirname|dirs|dmesg|docker|docker-compose|du|egrep|eject|env|ethtool|expand|expect|expr|fdformat|fdisk|fg|fgrep|file|find|fmt|fold|format|free|fsck|ftp|fuser|gawk|git|gparted|grep|groupadd|groupdel|groupmod|groups|grub-mkconfig|gzip|halt|head|hg|history|host|hostname|htop|iconv|id|ifconfig|ifdown|ifup|import|install|ip|jobs|join|kill|killall|less|link|ln|locate|logname|logrotate|look|lpc|lpr|lprint|lprintd|lprintq|lprm|ls|lsof|lynx|make|man|mc|mdadm|mkconfig|mkdir|mke2fs|mkfifo|mkfs|mkisofs|mknod|mkswap|mmv|more|most|mount|mtools|mtr|mutt|mv|nano|nc|netstat|nice|nl|node|nohup|notify-send|npm|nslookup|op|open|parted|passwd|paste|pathchk|ping|pkill|pnpm|podman|podman-compose|popd|pr|printcap|printenv|ps|pushd|pv|quota|quotacheck|quotactl|ram|rar|rcp|reboot|remsync|rename|renice|rev|rm|rmdir|rpm|rsync|scp|screen|sdiff|sed|sendmail|seq|service|sftp|sh|shellcheck|shuf|shutdown|sleep|slocate|sort|split|ssh|stat|strace|su|sudo|sum|suspend|swapon|sync|tac|tail|tar|tee|time|timeout|top|touch|tr|traceroute|tsort|tty|umount|uname|unexpand|uniq|units|unrar|unshar|unzip|update-grub|uptime|useradd|userdel|usermod|users|uudecode|uuencode|v|vcpkg|vdir|vi|vim|virsh|vmstat|wait|watch|wc|wget|whereis|which|who|whoami|write|xargs|xdg-open|yarn|yes|zenity|zip|zsh|zypper)(?=$|[)\s;|&])/,lookbehind:!0},keyword:{pattern:/(^|[\s;|&]|[]\()(?:case|do|done|elif|else|esac|fi|for|function|if|in|select|then|until|while)(?=$|[)\s;|&])/,lookbehind:!0},builtin:{pattern:/(^|[\s;|&]|[]\()(?:\.|:|alias|bind|break|builtin|caller|cd|command|continue|declare|echo|enable|eval|exec|exit|export|getopts|hash|help|let|local|logout|mapfile|printf|pwd|read|readarray|readonly|return|set|shift|shopt|source|test|times|trap|type|typeset|ulimit|umask|unalias|unset)(?=$|[)\s;|&])/,lookbehind:!0,alias:"class-name"},boolean:{pattern:/(^|[\s;|&]|[]\()(?:false|true)(?=$|[)\s;|&])/,lookbehind:!0},"file-descriptor":{pattern:/\B&\d\b/,alias:"important"},operator:{pattern:/\d?|>\||\+=|=[=~]?|!=?|<<[<-]?|[&\d]?>>|\d[]&?|[][&=]?|&[>&]?|\|[&|]?/,inside:{"file-descriptor":{pattern:/^\d/,alias:"important"}}},punctuation:/\$?\(\(?|\)\)?|\.\.|[{}[\];\\]/,number:{pattern:/(^|\s)(?:[1-9]\d*|0)(?:[.,]\d+)?\b/,lookbehind:!0}},n.inside=e.languages.bash;for(var o=["comment","function-name","for-or-select","assign-left","string","environment","function","keyword","builtin","boolean","file-descriptor","operator","punctuation","number"],s=a.variable[1].inside,i=0;i0&&void 0!==arguments[0]?arguments[0]:{},r=i.backgroundColor,d=void 0===r?"#000":r,a=i.cornerOffset,c=void 0===a?20:a,s=i.diameter,l=void 0===s?56:s,u=i.ease,p=void 0===u?function(o){return.5*(1-Math.cos(Math.PI*o))}:u,m=i.id,h=void 0===m?"back-to-top":m,b=i.innerHTML,v=void 0===b?'':b,f=i.onClickScrollTo,x=void 0===f?0:f,w=i.scrollContainer,g=void 0===w?document.body:w,k=i.scrollDuration,y=void 0===k?100:k,T=i.showWhenScrollTopIs,M=void 0===T?1:T,z=i.size,E=void 0===z?l:z,C=i.textColor,L=void 0===C?"#fff":C,N=i.zIndex,I=void 0===N?1:N,A=g===document.body,B=A&&document.documentElement;o=Math.round(.43*E),t=Math.round(.29*E),e="#"+h+"{background:"+d+";-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;bottom:"+c+"px;-webkit-box-shadow:0 2px 5px 0 rgba(0,0,0,.26);-moz-box-shadow:0 2px 5px 0 rgba(0,0,0,.26);box-shadow:0 2px 5px 0 rgba(0,0,0,.26);color:"+L+";cursor:pointer;display:block;height:"+E+"px;opacity:1;outline:0;position:fixed;right:"+c+"px;-webkit-tap-highlight-color:transparent;-webkit-touch-callout:none;-webkit-transition:bottom .2s,opacity .2s;-o-transition:bottom .2s,opacity .2s;-moz-transition:bottom .2s,opacity .2s;transition:bottom .2s,opacity .2s;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;width:"+E+"px;z-index:"+I+"}#"+h+" svg{display:block;fill:currentColor;height:"+o+"px;margin:"+t+"px auto 0;width:"+o+"px}#"+h+".hidden{bottom:-"+E+"px;opacity:0}",(n=document.createElement("style")).appendChild(document.createTextNode(e)),document.head.insertAdjacentElement("afterbegin",n);var D=function(){var o=document.createElement("div");return o.id=h,o.className="hidden",o.innerHTML=v,o.addEventListener("click",function(o){o.preventDefault(),function(){var o="function"==typeof x?x():x,t=window,e=t.performance,n=t.requestAnimationFrame;if(y<=0||void 0===e||void 0===n)return q(o);var i=e.now(),r=j(),d=r-o;n(function o(t){var e=Math.min((t-i)/y,1);q(r-Math.round(p(e)*d)),e<1&&n(o)})}()}),document.body.appendchild(o),o}(),h=!0;function S(){j()>=M?function(){if(!H)return;D.className="",H=!1}():function(){if(H)return;D.className="hidden",H=!0}()}function j(){return g.scrollTop||B&&document.documentElement.scrollTop||0}function q(o){g.scrollTop=o,B&&(document.documentElement.scrollTop=o)}(A?window:g).addEventListener("scroll",S),S()}
\ No newline at end of file
diff --git a/docs/resources/vue.css b/docs/resources/vue.css
new file mode 100644
index 0000000..bb6437d
--- /dev/null
+++ b/docs/resources/vue.css
@@ -0,0 +1 @@
+*{-webkit-font-smoothing:antialiased;-webkit-overflow-scrolling:touch;-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-text-size-adjust:none;-webkit-touch-callout:none;box-sizing:border-box}body:not(.ready){overflow:hidden}body:not(.ready) .app-nav,body:not(.ready)>nav,body:not(.ready) [data-cloak]{display:none}div#app{font-size:30px;font-weight:lighter;margin:40vh auto;text-align:center}div#app:empty:before{content:"Loading..."}.emoji{height:1.2rem;vertical-align:middle}.progress{background-color:var(--theme-color,#42b983);height:2px;left:0;position:fixed;right:0;top:0;transition:width .2s,opacity .4s;width:0;z-index:999999}.search a:hover{color:var(--theme-color,#42b983)}.search .search-keyword{color:var(--theme-color,#42b983);font-style:normal;font-weight:700}body,html{height:100%}body{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;color:#34495e;font-family:Source Sans Pro,Helvetica Neue,Arial,sans-serif;font-size:15px;letter-spacing:0;margin:0;overflow-x:hidden}img{max-width:100%}a[disabled]{cursor:not-allowed;opacity:.6}kbd{border:1px solid #ccc;border-radius:3px;display:inline-block;font-size:12px!important;line-height:12px;margin-bottom:3px;padding:3px 5px;vertical-align:middle}li input[type=checkbox]{margin:0 .2em .25em 0;vertical-align:middle}.app-nav{margin:25px 60px 0 0;position:absolute;right:0;text-align:right;z-index:10}.app-nav.no-badge{margin-right:25px}.app-nav p{margin:0}.app-nav>a{margin:0 1rem;padding:5px 0}.app-nav li,.app-nav ul{display:inline-block;list-style:none;margin:0}.app-nav a{color:inherit;font-size:16px;text-decoration:none;transition:color .3s}.app-nav a:hover{color:var(--theme-color,#42b983)}.app-nav a.active{border-bottom:2px solid var(--theme-color,#42b983);color:var(--theme-color,#42b983)}.app-nav li{display:inline-block;margin:0 1rem;padding:5px 0;position:relative;cursor:pointer}.app-nav li ul{background-color:#fff;border:1px solid;border-color:#ddd #ddd #ccc;border-radius:4px;box-sizing:border-box;display:none;max-height:calc(100vh - 61px);overflow-y:auto;padding:10px 0;position:absolute;right:-15px;text-align:left;top:100%;white-space:nowrap}.app-nav li ul li{display:block;font-size:14px;line-height:1rem;margin:8px 14px;white-space:nowrap}.app-nav li ul a{display:block;font-size:inherit;margin:0;padding:0}.app-nav li ul a.active{border-bottom:0}.app-nav li:hover ul{display:block}.github-corner{border-bottom:0;position:fixed;right:0;text-decoration:none;top:0;z-index:1}.github-corner:hover .octo-arm{-webkit-animation:octocat-wave .56s ease-in-out;animation:octocat-wave .56s ease-in-out}.github-corner svg{color:#fff;fill:var(--theme-color,#42b983);height:80px;width:80px}main{display:block;position:relative;width:100vw;height:100%;z-index:0}main.hidden{display:none}.anchor{display:inline-block;text-decoration:none;transition:all .3s}.anchor span{color:#34495e}.anchor:hover{text-decoration:underline}.sidebar{border-right:1px solid rgba(0,0,0,.07);overflow-y:auto;padding:40px 0 0;position:absolute;top:0;bottom:0;left:0;transition:transform .25s ease-out;width:300px;z-index:20}.sidebar>h1{margin:0 auto 1rem;font-size:1.5rem;font-weight:300;text-align:center}.sidebar>h1 a{color:inherit;text-decoration:none}.sidebar>h1 .app-nav{display:block;position:static}.sidebar .sidebar-nav{line-height:2em;padding-bottom:40px}.sidebar li.collapse .app-sub-sidebar{display:none}.sidebar ul{margin:0 0 0 15px;padding:0}.sidebar li>p{font-weight:700;margin:0}.sidebar ul,.sidebar ul li{list-style:none}.sidebar ul li a{border-bottom:none;display:block}.sidebar ul li ul{padding-left:20px}.sidebar::-webkit-scrollbar{width:4px}.sidebar::-webkit-scrollbar-thumb{background:transparent;border-radius:4px}.sidebar:hover::-webkit-scrollbar-thumb{background:hsla(0,0%,53.3%,.4)}.sidebar:hover::-webkit-scrollbar-track{background:hsla(0,0%,53.3%,.1)}.sidebar-toggle{background-color:transparent;background-color:hsla(0,0%,100%,.8);border:0;outline:none;padding:10px;position:absolute;bottom:0;left:0;text-align:center;transition:opacity .3s;width:284px;z-index:30;cursor:pointer}.sidebar-toggle:hover .sidebar-toggle-button{opacity:.4}.sidebar-toggle span{background-color:var(--theme-color,#42b983);display:block;margin-bottom:4px;width:16px;height:2px}body.sticky .sidebar,body.sticky .sidebar-toggle{position:fixed}.content{padding-top:60px;position:absolute;top:0;right:0;bottom:0;left:300px;transition:left .25s ease}.markdown-section{margin:0 auto;max-width:80%;padding:30px 15px 40px;position:relative}.markdown-section>*{box-sizing:border-box;font-size:inherit}.markdown-section>:first-child{margin-top:0!important}.markdown-section hr{border:none;border-bottom:1px solid #eee;margin:2em 0}.markdown-section iframe{border:1px solid #eee;width:1px;min-width:100%}.markdown-section table{border-collapse:collapse;border-spacing:0;display:block;margin-bottom:1rem;overflow:auto;width:100%}.markdown-section th{font-weight:700}.markdown-section td,.markdown-section th{border:1px solid #ddd;padding:6px 13px}.markdown-section tr{border-top:1px solid #ccc}.markdown-section tr:nth-child(2n){background-color:#f8f8f8}.markdown-section p.tip{background-color:#f8f8f8;border-bottom-right-radius:2px;border-left:4px solid #f66;border-top-right-radius:2px;margin:2em 0;padding:12px 24px 12px 30px;position:relative}.markdown-section p.tip:before{background-color:#f66;border-radius:100%;color:#fff;content:"!";font-family:Dosis,Source Sans Pro,Helvetica Neue,Arial,sans-serif;font-size:14px;font-weight:700;left:-12px;line-height:20px;position:absolute;height:20px;width:20px;text-align:center;top:14px}.markdown-section p.tip code{background-color:#efefef}.markdown-section p.tip em{color:#34495e}.markdown-section p.warn{background:rgba(66,185,131,.1);border-radius:2px;padding:1rem}.markdown-section ul.task-list>li{list-style-type:none}body.close .sidebar{transform:translateX(-300px)}body.close .sidebar-toggle{width:auto}body.close .content{left:0}@media print{.app-nav,.github-corner,.sidebar,.sidebar-toggle{display:none}}@media screen and (max-width:768px){.github-corner,.sidebar,.sidebar-toggle{position:fixed}.app-nav{margin-top:16px}.app-nav li ul{top:30px}main{height:auto;min-height:100vh;overflow-x:hidden}.sidebar{left:-300px;transition:transform .25s ease-out}.content{left:0;max-width:100vw;position:static;padding-top:20px;transition:transform .25s ease}.app-nav,.github-corner{transition:transform .25s ease-out}.sidebar-toggle{background-color:transparent;width:auto;padding:30px 30px 10px 10px}body.close .sidebar{transform:translateX(300px)}body.close .sidebar-toggle{background-color:hsla(0,0%,100%,.8);transition:background-color 1s;width:284px;padding:10px}body.close .content{transform:translateX(300px)}body.close .app-nav,body.close .github-corner{display:none}.github-corner:hover .octo-arm{-webkit-animation:none;animation:none}.github-corner .octo-arm{-webkit-animation:octocat-wave .56s ease-in-out;animation:octocat-wave .56s ease-in-out}}@-webkit-keyframes octocat-wave{0%,to{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@keyframes octocat-wave{0%,to{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}section.cover{align-items:center;background-position:50%;background-repeat:no-repeat;background-size:cover;height:100vh;width:100vw;display:none}section.cover.show{display:flex}section.cover.has-mask .mask{background-color:#fff;opacity:.8;position:absolute;top:0;height:100%;width:100%}section.cover .cover-main{flex:1;margin:-20px 16px 0;text-align:center;position:relative}section.cover a{color:inherit;text-decoration:none}section.cover a:hover{text-decoration:none}section.cover p{line-height:1.5rem;margin:1em 0}section.cover h1{color:inherit;font-size:2.5rem;font-weight:300;margin:.625rem 0 2.5rem;position:relative;text-align:center}section.cover h1 a{display:block}section.cover h1 small{bottom:-.4375rem;font-size:1rem;position:absolute}section.cover blockquote{font-size:1.5rem;text-align:center}section.cover ul{line-height:1.8;list-style-type:none;margin:1em auto;max-width:500px;padding:0}section.cover .cover-main>p:last-child a{border-radius:2rem;border:1px solid var(--theme-color,#42b983);box-sizing:border-box;color:var(--theme-color,#42b983);display:inline-block;font-size:1.05rem;letter-spacing:.1rem;margin:.5rem 1rem;padding:.75em 2rem;text-decoration:none;transition:all .15s ease}section.cover .cover-main>p:last-child a:last-child{background-color:var(--theme-color,#42b983);color:#fff}section.cover .cover-main>p:last-child a:last-child:hover{color:inherit;opacity:.8}section.cover .cover-main>p:last-child a:hover{color:inherit}section.cover blockquote>p>a{border-bottom:2px solid var(--theme-color,#42b983);transition:color .3s}section.cover blockquote>p>a:hover{color:var(--theme-color,#42b983)}.sidebar,body{background-color:#fff}.sidebar{color:#364149}.sidebar li{margin:6px 0}.sidebar ul li a{color:#505d6b;font-size:14px;font-weight:400;overflow:hidden;text-decoration:none;text-overflow:ellipsis;white-space:nowrap}.sidebar ul li a:hover{text-decoration:underline}.sidebar ul li ul{padding:0}.sidebar ul li.active>a{border-right:2px solid;color:var(--theme-color,#42b983);font-weight:600}.app-sub-sidebar li:before{content:"-";padding-right:4px;float:left}.markdown-section h1,.markdown-section h2,.markdown-section h3,.markdown-section h4,.markdown-section strong{color:#2c3e50;font-weight:600}.markdown-section a{color:var(--theme-color,#42b983);font-weight:600}.markdown-section h1{font-size:2rem;margin:0 0 1rem}.markdown-section h2{font-size:1.75rem;margin:45px 0 .8rem}.markdown-section h3{font-size:1.5rem;margin:40px 0 .6rem}.markdown-section h4{font-size:1.25rem}.markdown-section h5{font-size:1rem}.markdown-section h6{color:#777;font-size:1rem}.markdown-section figure,.markdown-section p{margin:1.2em 0}.markdown-section ol,.markdown-section p,.markdown-section ul{line-height:1.6rem;word-spacing:.05rem}.markdown-section ol,.markdown-section ul{padding-left:1.5rem}.markdown-section blockquote{border-left:4px solid var(--theme-color,#42b983);color:#858585;margin:2em 0;padding-left:20px}.markdown-section blockquote p{font-weight:600;margin-left:0}.markdown-section iframe{margin:1em 0}.markdown-section em{color:#7f8c8d}.markdown-section code,.markdown-section output:after,.markdown-section pre{font-family:Roboto Mono,Monaco,courier,monospace}.markdown-section code,.markdown-section pre{background-color:#f8f8f8}.markdown-section output,.markdown-section pre{margin:1.2em 0;position:relative}.markdown-section output,.markdown-section pre>code{border-radius:2px;display:block}.markdown-section output:after,.markdown-section pre>code{-moz-osx-font-smoothing:initial;-webkit-font-smoothing:initial}.markdown-section code{border-radius:2px;color:#e96900;margin:0 2px;padding:3px 5px;white-space:pre-wrap}.markdown-section>:not(h1):not(h2):not(h3):not(h4):not(h5):not(h6) code{font-size:.8rem}.markdown-section pre{padding:0 1.4rem;line-height:1.5rem;overflow:auto;word-wrap:normal}.markdown-section pre>code{color:#525252;font-size:.8rem;padding:2.2em 5px;line-height:inherit;margin:0 2px;max-width:inherit;overflow:inherit;white-space:inherit}.markdown-section output{padding:1.7rem 1.4rem;border:1px dotted #ccc}.markdown-section output>:first-child{margin-top:0}.markdown-section output>:last-child{margin-bottom:0}.markdown-section code:after,.markdown-section code:before,.markdown-section output:after,.markdown-section output:before{letter-spacing:.05rem}.markdown-section output:after,.markdown-section pre:after{color:#ccc;font-size:.6rem;font-weight:600;height:15px;line-height:15px;padding:5px 10px 0;position:absolute;right:0;text-align:right;top:0}.markdown-section output:after,.markdown-section pre:after{content:attr(data-lang)}.token.cdata,.token.comment,.token.doctype,.token.prolog{color:#8e908c}.token.namespace{opacity:.7}.token.boolean,.token.number{color:#c76b29}.token.punctuation{color:#525252}.token.property{color:#c08b30}.token.tag{color:#2973b7}.token.string{color:var(--theme-color,#42b983)}.token.selector{color:#6679cc}.token.attr-name{color:#2973b7}.language-css .token.string,.style .token.string,.token.entity,.token.url{color:#22a2c9}.token.attr-value,.token.control,.token.directive,.token.unit{color:var(--theme-color,#42b983)}.token.function,.token.keyword{color:#e96900}.token.atrule,.token.regex,.token.statement{color:#22a2c9}.token.placeholder,.token.variable{color:#3d8fd1}.token.deleted{text-decoration:line-through}.token.inserted{border-bottom:1px dotted #202746;text-decoration:none}.token.italic{font-style:italic}.token.bold,.token.important{font-weight:700}.token.important{color:#c94922}.token.entity{cursor:help}code .token{-moz-osx-font-smoothing:initial;-webkit-font-smoothing:initial;min-height:1.5rem;position:relative;left:auto}
\ No newline at end of file
diff --git a/docs/rookie/DE&App.md b/docs/rookie/DE&App.md
index 2200fe4..8656b70 100644
--- a/docs/rookie/DE&App.md
+++ b/docs/rookie/DE&App.md
@@ -36,7 +36,7 @@ EDITOR=vim visudo # 需要以 root 用户运行 visudo 命令
找到下面这样的一行,把前面的注释符号 `#` 去掉,`:wq` 保存并退出即可。
```sudoers
-#%wheel ALL=(ALL) ALL
+#%wheel ALL=(ALL:ALL) ALL
```
这里稍微解释一下
@@ -120,6 +120,7 @@ sudo systemctl enable --now NetworkManager #确
接下来安装一些基础功能包。
```bash
+sudo pacman -S sof-firmware alsa-firmware alsa-ucm-conf #一些可能需要的声音固件
sudo pacman -S ntfs-3g #识别NTFS格式的硬盘
sudo pacman -S adobe-source-han-serif-cn-fonts wqy-zenhei #安装几个开源中文字体 一般装上文泉驿就能解决大多wine应用中文方块的问题
sudo pacman -S noto-fonts-cjk noto-fonts-emoji noto-fonts-extra #安装谷歌开源字体及表情
@@ -154,28 +155,24 @@ sudo chattr +i /etc/resolv.conf
## 9.设置系统为中文
-打开 _System Settings_> _Regional Settings_> _Language_ -> _Add languages_ 中选择中文加入,再拖拽到第一位,Apply。
+打开 _System Settings_> \_Regional Settings 在语言中添加中文加入,应用即可。
-再将*System Settings*> _Regional Settings_> _Formats_ 中的值设为`中文-简体中文(zh_CN)`
-
-最后重新登陆即可。
-
-> 很多人会错误的更改 _System Settings_> _Regional Settings_> _Formats_ 中的值为中文蒙古(mn_CN),默认,或者其他值,这会导致系统中一半英文一半中文。这里的值要保持默认的 en_US 或 zh_CN,或者改为你在 locale.gen 中添加的任意一种语言。
+接下来编辑 `~/.config/plasma-localerc` ,将其中的 LANG 值更改为 zh_CN.UTF-8
## 10.安装 yay
AUR 为 archlinux user repository。任何用户都可以上传自己制作的 AUR 包,这也是 Arch Linux 可用软件众多的原因。由于任何人都可上传,也存在对应的风险,一般选用大众认可的包即可。
-使用 [yay](https://github.com/Jguer/yay) 可以安装 AUR 中的包。由于[中国大陆政府封锁 Github](https://zh.wikipedia.org/wiki/%E5%AF%B9GitHub%E7%9A%84%E5%AE%A1%E6%9F%A5%E5%92%8C%E5%B0%81%E9%94%81#%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD)的原因,你很可能没有办法用 yay 官方仓库中正常的方式安装 yay,所以 ArchLinuxStudio 提供一份可以直接安装的 bin 包以供你在安装时暂时使用。
+使用 [yay](https://github.com/Jguer/yay) 或 [paru](https://github.com/Morganamilo/paru) 可以安装 AUR 中的包。由于[中国大陆政府封锁 Github](https://zh.wikipedia.org/wiki/%E5%AF%B9GitHub%E7%9A%84%E5%AE%A1%E6%9F%A5%E5%92%8C%E5%B0%81%E9%94%81#%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD)的原因,你很可能没有办法用 yay 官方仓库中正常的方式安装 yay,所以 ArchLinuxStudio 提供一份可以直接安装的 bin 包以供你在安装时暂时使用。
执行如下命令安装 yay。
```bash
-wget https://archlinuxstudio.github.io/ArchLinuxTutorial/res/yay-bin-11.1.2-1-x86_64.pkg.tar.zst
-sudo pacman -U yay-bin-11.1.2-1-x86_64.pkg.tar.zst
+wget https://raw.githubusercontent.com/ArchLinuxStudio/ArchLinuxTutorial/master/docs/res/yay-bin-12.3.3-1-x86_64.pkg.tar.zst
+sudo pacman -U yay-bin-12.3.3-1-x86_64.pkg.tar.zst
```
-> github.io 也被中国大陆政府封锁,只是封锁力度暂时还没有很大。如你在下载过程中卡住,可以尝试 ctrl+c 终止命令后重新尝试下载,也可尝试更换手机热点的网络环境再次进行下载,后文安装 Qv2ray 时同理。当你配置好全局代理后,你将不再需要担心任何网络封锁问题。我们将持续为本书读者提供突破互联网审查的可靠流程。
+> github.io 与 raw.githubusercontent.com 也被中国大陆政府封锁,只是封锁力度暂时还没有很大。如你在下载过程中卡住,可以尝试 ctrl+c 终止命令后重新尝试下载,也可尝试更换手机热点的网络环境再次进行下载,后文安装 Qv2ray 时同理。当你配置好全局代理后,你将不再需要担心任何网络封锁问题。我们将持续为本书读者提供突破互联网审查的可靠流程。
## 11.安装输入法
@@ -230,22 +227,33 @@ export EDITOR='vim'
这样就不用在每次执行命令时都指定一遍 `EDITOR=vim` 了。
-## 13.启用蓝牙(若有)
+## 13.启用蓝牙相关功能
-如果你有蓝牙设备,需要安装蓝牙软件包并启用蓝牙服务。随后在系统设置中进行添加设备与连接即可。
+对于蓝牙及无线网卡,在 Linux 下推荐使用英特尔产品。博通以及瑞昱产品在兼容性,稳定性方面在 Linux 中表现很差,会带来很多不必要的麻烦,如在驱动,BLE 方面的支持很差或者没有。
+
+如果你有蓝牙设备,需要安装蓝牙软件包并启用蓝牙服务。随后在系统设置中进行添加设备与连接即可。注意,文件传输功能现在需要额外安装包`bluez-obex`,其功能与 2024 年已从 `bluez` 包中分离出来。
```bash
-sudo pacman -S bluez bluez-utils
+sudo pacman -S bluez bluez-utils bluez-obex
sudo systemctl enable --now bluetooth
```
-如果要连接蓝牙音频设备,需要安装 `pulseaudio-bluetooth` 并重启 `pulseaudio`。
+设置开机自动启用蓝牙设备,编辑`/etc/bluetooth/main.conf`文件,将`AutoEnable`设置为 true 即可。如果一些设备依然无法实现开机自动连接,尝试继续将`Experimental`以及`KernelExperimental`两项的值设置为 true。
+
+博通(Broadcom)网卡在 Linux 下的支持度很差,无论是无线还是蓝牙模块。对于无线功能来说,一般直接安装 broadcom-wl 包即可。
```bash
-sudo pacman -S pulseaudio-bluetooth
-pulseaudio -k
+sudo pacman -S broadcom-wl
```
+对于蓝牙模块,需要查阅[broadcom-bt-firmware](https://github.com/winterheart/broadcom-bt-firmware)仓库,在 brcm 文件夹中找到适合于自己网卡型号的 hcd 文件,将其下载并置于 `/lib/firmware/brcm` 文件夹中后重启即可。如果你无法确认自己的网卡型号对应哪一个 hcd 文件,那就全部下载并置于文件夹中。
+
+ref:
+
+- [Broadcom wireless ArchWiki](https://wiki.archlinux.org/title/broadcom_wireless)
+- [Fix WiFi and Bluetooth problems in ArcoLinux or Arch Linux](https://kaneis.wordpress.com/2020/12/16/fix-bluetooth-problem-not-scanning-any-devices-in-arcolinux-or-arch-linux-with-broadcom-bluetooth-usb-dongle-or-broadcom-half-mini-card-bcm94352-hmb-azurewave-aw-ce123h-supports-wifi-ac-and-bt4le/)
+- [ [Broadcom BCM4352] A fix for empty bluetooth scan/visibility](https://bbs.archlinux.org/viewtopic.php?id=228561)
+
diff --git a/docs/rookie/archlinux_pre_install.md b/docs/rookie/archlinux_pre_install.md
index 21d0209..e69492e 100644
--- a/docs/rookie/archlinux_pre_install.md
+++ b/docs/rookie/archlinux_pre_install.md
@@ -2,6 +2,32 @@
由于当前 UEFI 已普及十余年,安装将全部以 UEFI+GPT 的形式进行,传统 BIOS 方式不再赘述。
+## 0.终端编辑器 vim 的使用
+
+在安装 Arch Linux 的过程中,需要使用到 vim 编辑器,如果你不会使用,这里首先进行一个简要的介绍,你需要掌握如下基本操作。实践的环境可以找一个在线的 Linux 体验环境进行 vim 的尝试,如[copy.sh](https://copy.sh/v86/?profile=archlinux)。注意,由于其是在线环境,所以性能较差,执行 vim 命令时需要耐心等待。
+
+```bash
+vim 1.txt #创建并编辑名为1.txt的文件
+```
+
+你可以看到进入了一个空的界面。此时你处在 vim 的`命令模式`。在`命令模式`下,可以用一些快捷指令来对文本进行操作。
+现在我们输入`a`进入 vim 的`编辑模式`,此时输入任意文本,即可进行编辑。
+在输入完成后,我们按下 Esc 键,即可从`编辑模式`退出到`命令模式`。此时输入`:wq`即可保存并退出 vim。
+下面介绍一些在命令模式下常用的命令
+
+```bash
+:wq # 保存退出
+:q! # 不保存,强制退出
+dd # 删除一行
+2dd # 删除两行
+gg # 回到文本第一行
+shift+g # 转到文本最后一行
+/xxx # 在文中搜索内容'xxx' 回车搜索,按n键转到下一个
+?xxx # 反向搜索
+```
+
+拓展链接:需要完整教程的读者可以在终端中输入命令`vimtutor`来学习完整的 vim 教程。
+
## 1.确保网络环境
如果你可以使用路由器分接出来的网线,以 dhcp 的方式直接上网,那么不用准备什么。如果你的环境只能使用无线网络安装,需要事先把自己所用的 wifi 名称改成自己能记住的英文名称。因为**安装时无法显示和输入中文名的 wifi**,你会看到一堆不知道是什么的方块,并且在安装过程中你将没有办法输入中文的无线名称进行连接。虽然通过一些繁琐的步骤可以解决终端中文的问题,但是显然这么做在安装 Arch Linux 时毫无必要。
@@ -10,7 +36,7 @@
## 2.刻录启动优盘
-准备一个 2G 以上的优盘,刻录一个安装启动盘。安装镜像 iso 在[下载页面](https://archlinux.org/download/)下载,你需要选择通过磁力链接或 torrent 下载,下载完成后,还需要在 archlinux 下载页面下载`PGP signature`签名文件(不要从镜像源下载签名文件),将签名文件和 iso 镜像置于同一文件夹,随后进行对镜像的签名校验,以保证下载的镜像是完整,无错误的,未被篡改的。执行以下命令,确保输出完好的签名。具体镜像名根据名字自行修改。
+准备一个 2G 以上的优盘,刻录一个安装启动盘。安装镜像 iso 在[下载页面](https://archlinux.org/download/)下载,注意,你需要选择最新的镜像下载,选择通过磁力链接或 torrent 下载,下载完成后,还需要在 archlinux 下载页面下载`PGP signature`签名文件(不要从镜像源下载签名文件),将签名文件和 iso 镜像置于同一文件夹,随后进行对镜像的签名校验,以保证下载的镜像是完整,无错误的,未被篡改的。若你使用 Linux,执行以下命令,确保输出完好的签名。具体镜像名根据名字自行修改。如果你使用其他系统,请自行搜索验证签名的方式。
```bash
gpg --keyserver-options auto-key-retrieve --verify archlinux-202x.0x.01-x86_64.iso.sig
diff --git a/docs/rookie/basic_install.md b/docs/rookie/basic_install.md
index 748e59b..9a87382 100644
--- a/docs/rookie/basic_install.md
+++ b/docs/rookie/basic_install.md
@@ -88,7 +88,7 @@ quit #最后quit退出parted命令行交互
```
-接下来使用 cfdisk 命令对磁盘分区。进入 cfdisk 后的操作很直观,用键盘即可操作分配各个分区的大小与格式。一般建议将 EFI 分区设置为磁盘的第一个分区,据说有些主板如果不将 EFI 设置为第一个分区,可能有不兼容的问题。其中 EFI 分区选择`EFI System`类型,其余两个分区选择`Linux filesystem`类型。如果你还是不会操作,可参见配套视频中的详细操作。
+接下来使用 cfdisk 命令对磁盘分区。进入 cfdisk 后的操作很直观,用键盘的方向键、Tab 键、回车键配合即可操作分配各个分区的大小与格式。一般建议将 EFI 分区设置为磁盘的第一个分区,据说有些主板如果不将 EFI 设置为第一个分区,可能有不兼容的问题。其中 EFI 分区选择`EFI System`类型,其余两个分区选择`Linux filesystem`类型。
```bash
cfdisk /dev/sdx #来执行分区操作,分配各个分区大小,类型
@@ -97,7 +97,7 @@ fdisk -l #分区结束后, 复查磁盘情况
## 5.格式化
-建立好分区后,需要对分区用合适的文件系统进行格式化。这里用`mkfs.ext4`命令格式化根分区与 home 分区,用`mkfs.vfat`命令格式化 EFI 分区。如下命令中的 sdax 中,x 代表分区的序号。格式化命令要与上一步分区中生成的分区名字对应才可以。如果你还是不会操作,可参见配套视频中的详细操作。
+建立好分区后,需要对分区用合适的文件系统进行格式化。这里用`mkfs.ext4`命令格式化根分区与 home 分区,用`mkfs.vfat`命令格式化 EFI 分区。如下命令中的 sdax 中,x 代表分区的序号。格式化命令要与上一步分区中生成的分区名字对应才可以。
磁盘若事先有数据,会提示你: 'proceed any way?' 按 y 回车继续即可。
@@ -109,7 +109,7 @@ mkfs.vfat /dev/sdax #格式化efi分区
## 6.挂载
在挂载时,挂载是有顺序的,先挂载根分区,再挂载 EFI 分区。
-这里的 sdax 只是例子,具体根据你的实际情况来,如果你还是无法理解,请注意配套视频中的操作。
+这里的 sdax 只是例子,具体根据你自身的实际分区情况来。
```bash
mount /dev/sdax /mnt
@@ -138,10 +138,14 @@ Server = https://mirrors.tuna.tsinghua.edu.cn/archlinux/$repo/os/$arch
> 这里使用中国境内的镜像源以提高访问速度。然而这存在问题,镜像源(如 arch linux 清华镜像源)以及第三方源(如 archlinux-cn)可以知道你的 ip 是什么,什么时候更新了系统,什么时候检查了系统,什么时候更新了什么软件,你安装的软件列表是什么。在威权国家的镜像源维护者完全有可能根据威权当局的要求提供这些数据,很多维护者在网络上几乎是实名上网的,他们没有任何抵抗能力,进一步的,威权国家可以根据这些元数据与你产生的其他元数据进行比对,从而对你进行进一步的定位与辨识。简单举一个例子,要求维护者提供或监视安装了 v2ray/qv2ray 等软件包的使用者的 ip,以及安装时间,以及其全部软件列表。
-> 如果你在安装 arch linux 时的网络已经处于代理模式下,可以选择一个与你代理位置较近的,非威权国家的镜像源来使用。如果你在安装 arch linux 时的网络环境没有代理,那么在安装结束后,需要尽快更换一个非威权国家的镜像源来使用。如下列举一些较为优质的国际源
+> 如果你在安装 arch linux 时的网络已经处于代理模式下,可以选择一个与你代理位置较近的,非威权国家的镜像源来使用。如果你在安装 arch linux 时的网络环境没有代理,那么在安装结束后,需要尽快更换一个非威权国家的镜像源来使用。如下列举一些较为优质的国际源。
```bash
-Server = https://mirror.aktkn.sg/archlinux/$repo/os/$arch #新加坡
+Server = https://mirror.archlinux.tw/ArchLinux/$repo/os/$arch #东亚地区:中华民国
+Server = https://mirror.0xem.ma/arch/$repo/os/$arch #北美洲地区:加拿大
+Server = https://mirror.aktkn.sg/archlinux/$repo/os/$arch #东南亚地区:新加坡
+Server = https://archlinux.uk.mirror.allworldit.com/archlinux/$repo/os/$arch #欧洲地区:英国
+Server = https://mirrors.cat.net/archlinux/$repo/os/$arch #东亚地区:日本
```
## 8.安装系统
@@ -152,6 +156,10 @@ Server = https://mirror.aktkn.sg/archlinux/$repo/os/$arch #新加坡
pacstrap /mnt base base-devel linux linux-headers linux-firmware #base-devel在AUR包的安装是必须的
```
+> 注意,目前需要首先确保等待 pacman-init.service 服务启动后,才能执行 pacstrap 或 pacman 命令安装包,否则会引发错误使得安装过程无法进行。使用`systemctl status pacman-init.service`命令来检查当前服务状态。更多内容参考 bbs 中的[帖子](https://bbs.archlinux.org/viewtopic.php?id=278518&p=2)
+
+> 若安装时出现密钥环相关错误,参考此文章[GnuPG-2.1 and the pacman keyring](https://archlinux.org/news/gnupg-21-and-the-pacman-keyring/)并执行其中的命令。
+
必须的功能性软件
```bash
@@ -198,7 +206,11 @@ hwclock --systohc
Locale 决定了地域、货币、时区日期的格式、字符排列方式和其他本地化标准。
-编辑 /etc/locale.gen,去掉 en_US.UTF-8 所在行以及 zh_CN.UTF-8 所在行的注释符号(#)。
+首先使用 vim 编辑 /etc/locale.gen,去掉 en_US.UTF-8 所在行以及 zh_CN.UTF-8 所在行的注释符号(#)。这里需要使用 vim 的寻找以及编辑功能,如果你忘记了,请翻到上一节复习 vim 的操作。
+
+```bash
+vim /etc/locale.gen
+```
然后使用如下命令生成 locale。
@@ -206,7 +218,7 @@ Locale 决定了地域、货币、时区日期的格式、字符排列方式和
locale-gen
```
-向 /etc/locale.conf 导入内容
+最后向 /etc/locale.conf 导入内容
```bash
echo 'LANG=en_US.UTF-8'> /etc/locale.conf
@@ -258,12 +270,14 @@ pacman -S grub efibootmgr #grub是启动引导器,efibootmgr被 grub 脚本
grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=GRUB
```
-接下来编辑/etc/default/grub 文件,去掉`GRUB_CMDLINE_LINUX_DEFAULT`一行中最后的 quiet 参数,同时把 log level 的数值从 3 改成 5。这样是为了后续如果出现系统错误,方便排错。同时在同一行加入 nowatchdog 参数,这可以显著提高开关机速度。不会 vim 的读者注意视频中的操作。
+接下来编辑/etc/default/grub 文件,去掉`GRUB_CMDLINE_LINUX_DEFAULT`一行中最后的 quiet 参数,同时把 log level 的数值从 3 改成 5。这样是为了后续如果出现系统错误,方便排错。同时在同一行加入 nowatchdog 参数,这可以显著提高开关机速度。这里需要使用 vim 的编辑功能,如果你忘记了,请翻到上一节复习 vim 的操作。
```bash
vim /etc/default/grub
```
+使用 N 卡的用户需要注意,KDE6 默认使用 wayland session 为默认,如果你需要使用 wayland,则需开启 DRM。同样编辑/etc/default/grub 文件,在`GRUB_CMDLINE_LINUX_DEFAULT`一行中最后的加入参数:nvidia_drm.modeset=1
+
最后生成 GRUB 所需的配置文件
```bash
diff --git a/docs/rookie/fxckGFW.md b/docs/rookie/fxckGFW.md
index eec2905..1a17a57 100644
--- a/docs/rookie/fxckGFW.md
+++ b/docs/rookie/fxckGFW.md
@@ -31,8 +31,7 @@ vmess://xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
如果购买机场的订阅服务,可以参考它们的订阅流程以获取节点。在我们列出一些较为可信的机场服务以供选择,但是**我们不提供任何担保**。需要提醒的是,机场服务属于灰色产业,随时有停止服务的可能,购买建议以月付进行购买以避免过大损失。关于机场审计规则,我们的观点是"我可以不看,但是你不可以封禁"。对于机场审计程度,读者可根据自身实际情况自行评估。
-- [白月光](https://ss.cn88.net/#/register?code=wH0Pr5l8) 新运营的机场,优点在于速度较为优秀,对流媒体解锁支持较为全面,机场主的售后服务迅速。对于其审计规则,可在注册账户后进入后台面板自行查看。据我们测试,其并没有严格按照审计规则进行审计。
-- [GLaDOS](https://glados.rocks) 邮箱注册后使用激活码`9FMKX-GYLMK-ZYIZW-5U3T0`激活账户并获取免费时长。GLaDOS 的优势在于可以进行签到来免费使用,而且运营时间较长,较为可信。除此之外,GLaDOS 还是为数不多的拥有 Trojan 节点的机场。缺点在于速度并不算优秀。对于其审计规则,可在注册账户后进入后台面板自行查看。据我们测试,其并没有严格按照审计规则进行审计。
+- [GLaDOS](https://www.glados.rocks/landing/9FMKX-GYLMK-ZYIZW-5U3T0) 在使用邮箱注册后,使用激活码`9FMKX-GYLMK-ZYIZW-5U3T0`激活账号后即可获得 5 天免费试用时长和 10GB 试用流量。 GLaDOS 的优点是可以免费使用,运行时间较长,比较可信。 除此之外,GLaDOS 是少数拥有 Trojan 节点的机场之一。 缺点是速度算不上非常快。 其审核规则,注册账号后可以进入后台面板自行查看。 根据我们的测试,它没有严格按照审计规则进行审计。
---
diff --git a/docs/rookie/graphic_driver.md b/docs/rookie/graphic_driver.md
index f709f8f..6096353 100644
--- a/docs/rookie/graphic_driver.md
+++ b/docs/rookie/graphic_driver.md
@@ -38,7 +38,9 @@ sudo pacman -S mesa lib32-mesa xf86-video-amdgpu vulkan-radeon lib32-vulkan-rade
### 英伟达独立显卡
-较新型号的独立显卡直接安装如下几个包即可。[官方文档](https://wiki.archlinux.org/index.php/NVIDIA)
+本节建议查看官方文档,此处只列出主要的显卡系列。[官方文档](https://wiki.archlinux.org/index.php/NVIDIA)
+
+较新型号的独立显卡直接安装如下几个包即可。
```bash
sudo pacman -S nvidia nvidia-settings lib32-nvidia-utils #必须安装
@@ -133,7 +135,7 @@ DRI_PRIME=1 steam steam://rungameid/730 #运行cs go
### glmark2
-glmark 提供了一系列丰富的测试,涉及图形单元性能(缓冲,建筑,照明,纹理等)的不同方面,允许进行更全面和有意义的测试。 每次测试单独计算帧速率。 最终,用户根据以前的所有测试获得了一个成绩分数。在 archlinux 上属于包[glmark2](https://aur.archlinux.org/packages/glmark2/)AUR
+glmark 提供了一系列丰富的测试,涉及图形单元性能(缓冲,建筑,照明,纹理等)的不同方面,允许进行更全面和有意义的测试。 每次测试单独计算帧速率。 最终,用户根据以前的所有测试获得了一个成绩分数。在 archlinux 上属于包[glmark2](https://aur.archlinux.org/packages/glmark2-git)AUR
### Unigine benchmark
diff --git a/docs/uk/README.md b/docs/uk/README.md
index 1f55d23..29bfad4 100644
--- a/docs/uk/README.md
+++ b/docs/uk/README.md
@@ -2,7 +2,7 @@
> Notice: English translation is still in progress, documentation is now incomplete. Welcome to submit pull requests for translations.
-Arch Linux installation and usage tutorials, updated daily in real time! From Arch Linux installation, breaking through internet censorship and blockades, transparent proxies, graphics drivers, everyday software use and more, plus everything you might need for media production, programming and more. Make Arch Linux your go-to system!
+Arch Linux installation and usage tutorials, updated daily in real time! From Arch Linux installation, breaking through internet censorship and blockades, transparent proxies, graphics drivers, everyday software use and more, plus everything you might need for media production, programming, crypto currency usage in ArchLinux and more. Make Arch Linux your go-to system!
This book provides some of our experience of using Linux over the years and teaches it to those who need it. Another part that is inseparable from Linux: [GNU](https://www.gnu.org/home.zh-cn.html).
@@ -49,10 +49,4 @@ If this book has been helpful to you, please recommend it to your friends who ne
We would be very grateful if receive digital currency donations. With your support, the ArchLinuxStudio community will become even more enriched and active.
-[](https://en.cryptobadges.io/donate/1Lth3oca4WnMnTnwHBcDLkEqniA2pBxkeC)
-
-[](https://en.cryptobadges.io/donate/0x5A218a8d570d9947f42e0a4916ece7a60A181c2d)
-
-[](https://en.cryptobadges.io/donate/LdJXzaSzzrAxfKJdj5effRLcC7k1TbuXJ8)
-
-
+- Donate with Monero: `43KJJZztPtBC7k8ZjJpuw7bThW1mUH6N947TeNxvsSHD7DywRN365WZ7qpSxVopSd7cg4PFjMuUewjfvATUtTKGQLMboU36`
diff --git a/docs/uk/_sidebar.md b/docs/uk/_sidebar.md
index e5e1981..01e9823 100644
--- a/docs/uk/_sidebar.md
+++ b/docs/uk/_sidebar.md
@@ -14,7 +14,7 @@
- [Try To Be an Admin](uk/advanced/beAdmin)
- [Power Control](uk/advanced/undervoltage)
- [System Beautification](uk/advanced/beauty)
- - [Troubleshooting](/advanced/troubleshooting)
+ - [Troubleshooting](uk/advanced/troubleshooting)
- Entertainment & Office
@@ -25,7 +25,7 @@
- Special Areas
- - [Cryptocurrency Mining](uk/exclusive/mine)
+ - [Getting Started with Cryptocurrencies](uk/exclusive/mine)
- [Streaming and Multimedia Production](uk/exclusive/media)
- [Programming](uk/exclusive/code)
diff --git a/docs/uk/about.md b/docs/uk/about.md
index 88baa18..3b5d8fd 100644
--- a/docs/uk/about.md
+++ b/docs/uk/about.md
@@ -1,28 +1,30 @@
-# 关于&致谢
+# About & Acknowledgements
-## 补充解释
+## About
-这里对本书做一些补充解释。
+Here are some additional explanations for this book.
-首先说明一下和官方文档的定位区别。官方中文文档确实很全,但它的定位是官方 Wiki,这样的话已经就需要做到事无巨细。但是这种过于详细的文档,会使得新手在一个又一个链接中迷失方向,他们更需要的是指引,而不是字典。本文的定位是指引,以及我们认为的当前的较好的方案。另外,官方中文文档大多翻译自英文文档,存在翻译不及时的情况。少数还有翻译有误或者含义不清的情况。
+First of all, let me explain the difference between the positioning and the official document. The official Chinese documentation is indeed very complete, but its positioning is the official Wiki, so it is already necessary to do everything in detail. But this kind of overly detailed documentation can make newbies get lost in link after link, and they need guidance more than a dictionary. The positioning of this article is a guide, and what we think is the current better solution. In addition, most of the official Chinese documents are translated from English documents, and there are cases where the translation is not timely. There are a few cases where the translation is wrong or the meaning is unclear.
-网上类似的文档一大把,为何还要这样一份文档?技术的变更是日新月异的,不论是操作系统本身还是具有价值的软件,网上一些教程大多年久失修,大家都知道互联网知识时效性是很重要的。本书的 Flag 就是只要健在,就一直更新。并且立志做到中文社区中较好的位置。
+There are a lot of similar documents on the Internet, why do you need such a document? Technological changes are changing with each passing day. Whether it is the operating system itself or valuable software, some online tutorials are mostly in disrepair. Everyone knows that the timeliness of Internet knowledge is very important. The flag of this book is that it will be updated as long as it is alive. And determined to achieve a better position in the Chinese community.
-许多人还在认为 Linux 不适合做日常使用的操作系统。说实在的,在本世纪的前十年,Linux 桌面确实不太堪用。但是现在时间已经是 2021 年后了,Linux 桌面与生态有了长足的进步。不论是办公,轻度娱乐还是编程,基本都可以满足需求。
+Many people still think that Linux is not suitable as an operating system for everyday use. Let's be honest, the Linux desktop really wasn't usable in the first decade of this century. But now the time is after 2021, and the Linux desktop and ecology have made great progress. Whether it is office, light entertainment or programming, it can basically meet the needs.
-关于本书存在的任何问题以及建议,均可以给我们发送邮件,也可以直接在本页下方留言。
+For any questions and suggestions about this book, you can send us an email, or you can leave a message directly at the bottom of this page.
-电子邮件: archlinuxstudio@tutamail.com
-Telegram 电报群: [ArchLinuxStudio🇨🇦🏳️⚧️🏳️🌈](https://t.me/FSF_Ministry_of_Truth)
+Email: archlinuxstudio@tutamail.com
+Telegram group: [ArchLinuxStudio🇨🇦🏳️⚧️🏳️🌈](https://t.me/FSF_Ministry_of_Truth)
+Matrix group: [Matrix Group:ArchLinuxStudio🇨🇦🏳️⚧️🏳️🌈](https://matrix.to/#/#ArchLinuxStudio:matrix.org)
-## 更新日志
+## Changelog
-- 0.4.0 为处于互联网被封锁地区的读者提供更好的安装流程 优化多个章节。 2021年12月25日
-- 0.3.0 根据 2021 年的变更做出更新。 2021年5月15日
-- 0.2.0 全面的完善与修订 作为正式对外发布的首个版本。 2021年4月11日
-- 0.1.0 初步可用的第一个版本 由于事后重新整理过 commit 时间已不可考。
-- 0.0.0 项目启动。 2020年9月1日
+- 0.5.0 Finish English translation. Added related content about cryptocurrency. 2022年7月9日
+- 0.4.0 Provides a better installation process for readers in areas where the Internet is blocked. Optimized multiple chapters. 2021年12月25日
+- 0.3.0 Updated for 2021 changes. 2021年5月15日
+- 0.2.0 comprehensive improvement and revision as the first version officially released to the outside world. 2021年4月11日
+- 0.1.0 The first version that is initially available. The commit time is no longer available due to post-reorganization.
+- 0.0.0 project started. 2020年9月1日
-## 致谢
+## Acknowledgements
-向所有自由软件开发者、布道者与先行者致敬。
+Salute to all free software developers, evangelists and pioneers.
diff --git a/docs/uk/advanced/beAdmin.md b/docs/uk/advanced/beAdmin.md
index 1162f0b..9cccc87 100644
--- a/docs/uk/advanced/beAdmin.md
+++ b/docs/uk/advanced/beAdmin.md
@@ -1,243 +1,218 @@
-# Linux 日常操作与基础知识
+# Linux daily operations and basics
-阅读完`新手上路`章节,你的系统已完全可以使用,KDE 桌面环境提供了强大的 [GUI](https://zh.wikipedia.org/wiki/%E5%9B%BE%E5%BD%A2%E7%94%A8%E6%88%B7%E7%95%8C%E9%9D%A2) 以供普通用户使用。按 `Windows` 键(Linux 下也常被叫做 Meta 键)呼出菜单栏,找到`设置`=>`系统设置`,可以找到绝大多数系统设置项。
+After reading the `Beginners on the Road` chapter, your system is completely ready to use, the KDE desktop environment provides a powerful [GUI](https://en.wikipedia.org/wiki/Graphical_user_interface) for normal users. Press the `Windows` key (also often called the Meta key under Linux) to call out the menu bar, find `Settings`=>`System Settings`, you can find most of the system settings.
-但如果想要游刃有余的掌控你的系统,你还需要阅读掌握本文的内容。
-如果你想进一步详细了解本文各部分的详细知识,可以点击在各个小节给出的拓展链接进行学习。
-如果你不想详细了解,本章介绍的知识也足够你来应付日常的使用。
+But if you want to master your system with ease, you also need to read this article.
+If you want to learn more about the detailed knowledge of each section of this article, you can click on the extension links given in each section to learn.
+If you don't want to know in detail, the knowledge introduced in this chapter is enough for you to deal with daily use.
-## 必须掌握的 Linux 知识
+## Must-learn Linux knowledge
-此处只介绍最基本的,最必要的 Linux 知识点与小技巧 。
+Only the most basic and necessary Linux knowledge points and tips are introduced here.
-1. 在 Linux 中,文件目录结构与 Windows 完全不同。Windows 存在 C 盘、D 盘等盘符,而在 Linux 中不存在这些划分,最上层的目录是根目录,路径为 _/_ ,并以一个树形结构从此向下一级一级区分。
-2. 对于 Linux 的树形文件结构,存在相对路径与绝对路径之分。绝对路径是代表从根路径 _/_ 开始的完整路径,如`/home/testuser/Download`。相对路径代表从当前目录,到目标目录的一个部分路径。比如当前你所在的目录为`/home/testuser`,那么切换到绝对路径`/home/testuser/Download`的相对路径即为`./Download`。其中`./`代表从当前目录,再向下寻找。另外,`..`这种两个句点代表的是向上层寻找,比如你当前所在的路径为`/home/testuser/Download`,向上寻找到`/home/testuser/Desktop`的相对路径即为`../Desktop`。
-3. 简单来说,Linux 中存在两类用户。第一类用户即为 root 用户,也称为超级用户,它拥有系统中最高的权限。第二类用户就是除了 root 用户的普通用户,他们可以拥有不同等级的权限。使用 root 权限时需要十分小心。
-4. 理论上来说,任何图形化界面中的操作都可以用对应的命令行命令完成。如果你打开某个程序报错,不妨试试找到它的对应启动命令,在终端中执行此命令,并观察它运行时的错误日志输出,查阅相关资料,解决问题。
+1. In Linux, the file directory structure is completely different from Windows. There are drive letters such as C drive and D drive in Windows, but these divisions do not exist in Linux. The top-level directory is the root directory, and the path is _/_ , and is distinguished from one level to the next in a tree structure.
+2. For the tree file structure of Linux, there are relative paths and absolute paths. An absolute path represents a full path starting from the root path _/_, such as `/home/testuser/Download`. A relative path represents a partial path from the current directory to the target directory. For example, the current directory you are in is `/home/testuser`, then the relative path to switch to the absolute path `/home/testuser/Download` is `./Download`. Where `./` represents from the current directory, and then look down. In addition, the two periods of `..` represent the search to the upper layer. For example, your current path is `/home/testuser/Download`, and the relative path to `/home/testuser/Desktop` is `../Desktop`.
+3. Simply put, there are two types of users in Linux. The first type of user is the root user, also known as the super user, which has the highest authority in the system. The second type of users are ordinary users other than the root user, who can have different levels of permissions. Be very careful when using root privileges.
+4. In theory, any operation in the graphical interface can be completed with the corresponding command line command. If you open a program and report an error, try to find its corresponding startup command, execute this command in the terminal, and observe the error log output when it is running, consult relevant information, and solve the problem.
-## 终端操作基础
+## Terminal Operation Basics
-如果想要熟练掌握 Linux,就必须掌握终端的常见命令与使用方式。
+If you want to be proficient in Linux, you must master the common commands and usage of the terminal.
```bash
-ls /some_path # 查看某个文件夹下的文件与子文件夹 /代表根目录,是Linux最顶端的路径,是绝对路径
-pwd # 查看当前终端所在路径
-cd /home/testuser # 切换目录命令,将当前终端切换到某一个路径下
-cp ./a.cpp ./b.cpp # 复制命令 将当前路径下的a.cpp复制一份为b.cpp ./代表当前文件夹所在路径,是相对路径
-cp -r ./a ./b # 复制整体文件夹
-rm b.cpp # 删除命令 删除b.cpp
-mv a.cpp b.cpp # 移动(重命名)命令 将a.cpp更名为b.cpp
-mkdir new_folder # 新建文件夹new_folder
-sudo some command # 使普通用户以root权限执行某些命令
+ls /some_path # View files and subfolders under a certain folder / represents the root directory, which is the top path of Linux and is an absolute path
+pwd # View the path where the current terminal is located
+cd /home/testuser # switch directory command, switch the current terminal to a certain path
+cp ./a.cpp ./b.cpp # Copy command Copy a.cpp in the current path as b.cpp ./ represents the path of the current folder, which is a relative path
+cp -r ./a ./b # copy the whole folder
+rm b.cpp # delete command delete b.cpp
+mv a.cpp b.cpp # move (rename) command to rename a.cpp to b.cpp
+mkdir new_folder # create a new folder new_folder
+sudo some command # Make ordinary users execute certain commands with root privileges
```
-拓展链接:推荐阅读在线进阶书籍 [Linux 命令行与 Shell 脚本教程](https://archlinuxstudio.github.io/ShellTutorial/#/)。 随后也将提供与此书配套的教学视频 [Linux 命令行与 Shell 教程](https://www.youtube.com/channel/UCVO7lXKucA6z3O37WV7FG5w/videos)TODO。
+Extension link: It is recommended to read the online advanced book [Linux Command Line and Shell Script Tutorial](https://archlinuxstudio.github.io/ShellTutorial/#/).
-## Pacman 包管理
+## Pacman Package Management
-Pacman 是 Arch Linux 的包管理器,它用于安装、删除、查询软件等。
+Pacman is the package manager for Arch Linux, it is used to install, remove, query software, etc.
```bash
-sudo pacman -S package_name # 安装软件包
-sudo pacman -Syu package_name # 升级系统并安装软件包,Arch Linux 不支持部分升级,建议用此命令先升级再安装
-sudo pacman -Syu # 升级系统
-sudo pacman -Syyu # 升级系统 yy标记强制刷新 u标记升级动作
-sudo pacman -R package_name # 删除软件包
-sudo pacman -Rs package_name # 删除软件包,及其所有没有被其他已安装软件包使用的依赖包
-sudo pacman -Qdt # 找出孤立包 Q为查询本地软件包数据库 d标记依赖包 t标记不需要的包 dt合并标记孤立包
-sudo pacman -Rs $(pacman -Qtdq) # 删除孤立软件包
-sudo pacman -Fy # 更新命令查询文件列表数据库
-sudo pacman -F xxx # 当不知道某个命令属于哪个包时,用来查询某个xxx命令属于哪个包
+sudo pacman -S package_name # install the package
+sudo pacman -Syu package_name # Upgrade the system and install the software package. Arch Linux does not support partial upgrades. It is recommended to use this command to upgrade first and then install
+sudo pacman -Syu # upgrade system
+sudo pacman -Syyu # upgrade the system yy mark forced refresh u mark upgrade action
+sudo pacman -R package_name # remove the package
+sudo pacman -Rs package_name # remove the package and all its dependencies not used by other installed packages
+sudo pacman -Qdt # find orphaned packages Q is to query the local package database d mark dependent packages t mark unwanted packages dt merge marks orphaned packages
+sudo pacman -Rs $(pacman -Qtdq) # remove orphaned packages
+sudo pacman -Fy # update command to query file list database
+sudo pacman -F xxx # When you don't know which package a command belongs to, it is used to query which package a xxx command belongs to
```
-一个好用的图形化包管理软件
+An easy-to-use graphical package management software
```bash
-yay -S octopi #包管理器前端界面
+yay -S octopi #package manager front-end interface
```
-拓展链接: [官方文档](https://wiki.archlinux.org/index.php/Pacman)
+Extension link: [Official Documentation](https://wiki.archlinux.org/index.php/Pacman)
-## 终端编辑器的使用
+## Operation and introduction of system services
-你需要掌握一个能在终端中进行文本编辑的软件,这里介绍 vim。
+There are various services running in the Linux system, and you need to master the way to query and change the status of the service. At the same time, it is best to have a general understanding of creating services. Here is the usage of the command `systemctl`. Take dhcpcd as an example
```bash
-vim 1.txt #创建并编辑名为1.txt的文件
+systemctl start dhcpcd # start the service
+systemctl stop dhcpcd # stop the service
+systemctl restart dhcpcd # restart the service
+systemctl reload dhcpcd # Reload the service and its configuration file
+systemctl status dhcpcd # View service status
+systemctl enable dhcpcd # Set the boot service
+systemctl enable --now dhcpcd # Set the service to start on boot and start the unit immediately:
+systemctl disable dhcpcd # Cancel automatic startup at boot
+systemctl daemon-reload dhcpcd # Reload systemd configuration Scan for new or changed service units Will not reload changed configuration Use reload to load changed configuration
```
-你可以看到进入了一个空的界面。此时你处在 vim 的`命令模式`。在`命令模式`下,可以用一些快捷指令来对文本进行操作。
-现在我们输入`a`进入 vim 的`编辑模式`,此时输入任意文本,即可进行编辑。
-在输入完成后,我们按下 Esc 键,即可从`编辑模式`退出到`命令模式`。此时输入`:wq`即可保存并退出 vim。
-下面介绍一些在命令模式下常用的命令
+Extension link: [systemctl official documentation](https://wiki.archlinux.org/index.php/Systemd#Basic_systemctl_usage)
+[systemd configuration file example explanation](https://www.freedesktop.org/software/systemd/man/systemd.service.html#Examples)
-```bash
-:wq # 保存退出
-:q! # 不保存,强制退出
-dd # 删除一行
-2dd # 删除两行
-gg # 回到文本第一行
-shift+g # 转到文本最后一行
-/xxx # 在文中搜索内容'xxx' 回车搜索,按n键转到下一个
-?xxx # 反向搜索
-```
-
-拓展链接:需要完整教程的读者可以在终端中输入命令`vimtutor`来学习完整的 vim 教程。
-
-## 系统服务的操作与介绍
-
-Linux 系统中运行着各种服务,你需要掌握查询,变更服务状态的方式。同时对创建服务最好也有大致的了解。这里讲述命令`systemctl`的用法。以 dhcpcd 为例
-
-```bash
-systemctl start dhcpcd # 启动服务
-systemctl stop dhcpcd # 停止服务
-systemctl restart dhcpcd # 重启服务
-systemctl reload dhcpcd # 重新加载服务以及它的配置文件
-systemctl status dhcpcd # 查看服务状态
-systemctl enable dhcpcd # 设置开机启动服务
-systemctl enable --now dhcpcd # 设置服务为开机启动并立即启动这个单元:
-systemctl disable dhcpcd # 取消开机自动启动
-systemctl daemon-reload dhcpcd # 重新载入 systemd 配置 扫描新增或变更的服务单元 不会重新加载变更的配置 加载变更的配置用 reload
-```
-
-拓展链接: [systemctl 官方文档](https://wiki.archlinux.org/index.php/Systemd#Basic_systemctl_usage) [systemd 配置文件样例解释](https://www.freedesktop.org/software/systemd/man/systemd.service.html#Examples)
-
-## 编辑系统配置文件
+## Edit system configuration files
-#### 用 sudoedit 编辑配置文件
+#### Edit configuration files with sudoedit
-在前面的"[桌面环境与常用应用](../rookie/DE%26App.md)"一节中,我们已经多次编辑了系统配置文件。它们的特点是对系统中的所有用户生效、归 root 用户所有、并且只有 root 用户才拥有写入的权限,这就需要我们用 sudo 提升到 root 权限才能编辑它们。很容易想到用 sudo 命令去运行文本编辑器,以 vim 为例:
+In the previous section "[Desktop Environment and Common Applications](../rookie/DE%26App.md)", we have edited the system configuration file several times. Their characteristics are that they are effective for all users in the system, are owned by the root user, and only the root user has write permissions, which requires us to use sudo to elevate to root permissions to edit them. It is easy to think of using the sudo command to run a text editor, taking vim as an example:
```shell
-sudo vim 你要编辑的文件的路径
+sudo vim the path to the file you want to edit
```
-但是这样却不是最好的方式,因为它违反了"[最小权限原则](https://zh.wikipedia.org/wiki/%E6%9C%80%E5%B0%8F%E6%9D%83%E9%99%90%E5%8E%9F%E5%88%99)"。因为当我们用 sudo 执行一个命令时,整个进程都会获得 root 权限。也就是说,vim 的所有操作、甚至包括所有的 vim 插件都会在 root 权限下运行,这通常来说是非常危险的。有的文本编辑器甚至会在检测到自身以 root 权限运行的时候拒绝运行,以避免做出危险的操作。
+But this is not the best way because it violates the "[Least Privilege Principle](https://en.wikipedia.org/wiki/%E6%9C%80%E5%B0%8F%E6%9D%83%E9%99%90%E5%8E%9F%E5%88%99)". Because when we execute a command with sudo, the whole process gets root privileges. In other words, all vim operations, including all vim plugins, will run under root privileges, which is usually very dangerous. Some text editors will even refuse to run when they detect that they are running with root privileges to avoid dangerous actions.
-反过来考虑,只是编辑一个文件不需要那么强大的权限,我们只需要拥有对这一个配置文件的读写权限就足够了。而 `sudoedit`(或 `sudo -e`,二者是完全等效的)是编辑一个系统配置文件的最佳实践。
+On the other hand, just editing a file does not require such powerful permissions, we only need to have read and write permissions to this configuration file. And `sudoedit` (or `sudo -e`, which are completely equivalent) is the best practice for editing a system configuration file.
```shell
-EDITOR=vim sudoedit 要编辑的文件
+EDITOR=vim sudoedit the file to edit
```
-sudoedit 命令大致是这样工作的:它会先创建一份普通用户有权编辑的临时文件,把要编辑的文件以 root 权限复制到这个临时文件中,接着根据 EDITOR 等环境变量,**以普通用户的权限**运行文本编辑器。在文本编辑器编辑完成并退出后,它会再次以 root 权限用这个编辑好的临时文件去覆盖掉原先的配置文件。
+The sudoedit command works roughly like this: it will first create a temporary file that ordinary users have the right to edit, copy the files to be edited into this temporary file with root permissions, and then according to environment variables such as EDITOR, ** as ordinary users **permission to run the text editor. After the text editor finishes editing and exits, it will overwrite the original configuration file with this edited temporary file with root privileges again.
-关于 sudoedit 的更多信息,详见 [sudo 的手册](https://man.archlinux.org/man/sudo.8.en#e)。
+For more information on sudoedit, see [sudo's manual](https://man.archlinux.org/man/sudo.8.en#e).
-#### 配置文件的语法高亮
+#### Syntax highlighting for configuration files
-严格来说这不是一个关于 sudoedit 的问题,而是一个关于文本编辑器的问题,但是它经常在用 sudoedit 编辑文件时遇到。
+Strictly speaking this is not a question about sudoedit but a question about text editors, but it is often encountered when editing files with sudoedit .
-因为 sudoedit 会创建一个随机名称的临时文件,文本编辑器可能不认识这个文件名,不知道该启用什么语法的高亮显示。这时候就需要我们主动告诉文本编辑器该使用什么语法,以 vim 为例,可以在命令行模式下用如下设置语法:
+Because sudoedit creates a temporary file with a random name, the text editor may not recognize the file name and what syntax highlighting to enable. At this time, we need to actively tell the text editor what syntax to use. Taking vim as an example, you can set the syntax as follows in command line mode:
```vim
-:set syntax=文件的语法
+:set syntax=file syntax
```
-另一个问题是如何知道语法的名称。一方面我们可以用搜索引擎搜索,或者在 vim 的内置插件里寻找,不过对于那些普通用户也能读取的配置文件,可以直接用 vim 去查看它,这时候 vim 会以只读模式打开文件,但是会根据文件名启用语法高亮。这样只需要在命令行模式下运行:
+Another problem is how to know the name of the grammar. On the one hand, we can use a search engine to search, or find it in vim's built-in plug-ins, but for those configuration files that ordinary users can also read, you can use vim to view it directly. At this time, vim will open the file in read-only mode. But syntax highlighting is enabled based on the filename. This just needs to be run in command line mode:
```vim
:set syntax
```
-即可查看当前 vim 所使用的高亮语法。
+You can view the highlighted syntax used by the current vim.
-#### 编辑 sudoers 配置文件
+#### Edit sudoers configuration file
-在前面我们编辑过 sudoers 配置文件。sudoers 算是系统配置文件中的一个特例,编辑它的最佳实践不是使用 `sudoedit`,而是 `visudo` 命令。
+Earlier we edited the sudoers configuration file. sudoers are a special case of system configuration files, and the best practice for editing them is not to use `sudoedit`, but the `visudo` command.
```shell
-sudo visudo # visudo 需要使用 root 权限运行。默认编辑 /etc/sudoers
-sudo visudo -f 要编辑的sudoers文件的路径 # 也可以指定文件路径
+sudo visudo # visudo needs to be run with root privileges. Edit /etc/sudoers by default
+sudo visudo -f The path to the sudoers file to be edited # You can also specify the file path
```
-visudo 与 sudoedit 类似的是,它也会把要编辑的配置文件先复制到一个临时文件,再调用文本编辑器编辑,而不同的是,在开始编辑之前 visudo 还会锁定正在编辑的 sudoers 文件,以此避免两个人同时对它编辑;并且会在编辑完成之后检查 sudoers 的语法,如果发现错误则会拒绝这次编辑的结果。
+Similar to sudoedit, visudo will also copy the configuration file to be edited to a temporary file, and then call the text editor to edit, but the difference is that before starting to edit, visudo will also lock the sudoers file being edited, so that This avoids editing it by two people at the same time; and will check the syntax of sudoers after the edit is complete, rejecting the result of the edit if an error is found.
-这是因为,如果在 sudoers 文件中遇到语法错误,sudo 为了安全性,会让整个 sudoers 配置文件都不生效。这样的话,如果普通用户不慎改坏了 sudoers 文件,则有可能失去使用 sudo 命令的权限,就好像"关上了大门并把自己关在了外面",这时候就需要直接用 root 用户登录甚至需要 live USB 急救才行。而 visudo 检查 sudoers 语法就可以很大程度上避免这种情况发生。
+This is because if a syntax error is encountered in the sudoers file, sudo will disable the entire sudoers configuration file for security reasons. In this case, if ordinary users accidentally change the sudoers file, they may lose the permission to use the sudo command, as if "closing the door and shutting themselves out", at this time, they need to log in directly with the root user or even need to Live USB first aid only. And visudo checks the syntax of sudoers to avoid this to a large extent.
-另一方面,visudo 需要使用 root 身份运行,这意味着它的文本编辑器实际上也是以 root 身份运行的,这一点与 sudoedit 不同。为了安全,可以配置为只使用某些受限制的"安全的"文本编辑器来编辑 sudoers 文件。详见 [ArchWiki](https://wiki.archlinux.org/title/Sudo#Using_visudo) 以及 [sudoers 手册](https://man.archlinux.org/man/sudoers.5)中的 editor 一节和 [env_editor](https://man.archlinux.org/man/sudoers.5#env_editor) 一节。
+On the other hand, visudo needs to be run as root, which means that its text editor actually runs as root as well, unlike sudoedit. For security, it can be configured to only use certain restricted "safe" text editors to edit the sudoers file. See the editor section in [ArchWiki](https://wiki.archlinux.org/title/Sudo#Using_visudo) and [sudoers manual](https://man.archlinux.org/man/sudoers.5) and [env_editor](https://man.archlinux.org/man/sudoers.5#env_editor) section.
-关于 visudo 的更多内容详见[手册](https://man.archlinux.org/man/visudo.8)。
+For more information about visudo, see the [Manual](https://man.archlinux.org/man/visudo.8).
-## 文件传输与系统备份
+## File transfer and system backup
-有一点 Linux 经验读者应该知道[scp]()这个命令。它常被用来在服务器间传输文件。但是目前它应该被更现代的工具[rsync](https://wiki.archlinux.org/index.php/Rsync)替代,其拥有即时压缩,差量传输等新特性。同时,`rsync`也被用来进行备份操作。
+Readers with a little Linux experience should know the [scp]() command. It is often used to transfer files between servers. But for now it should be replaced by a more modern tool [rsync](https://wiki.archlinux.org/index.php/Rsync) with new features like on-the-fly compression, delta transfer, etc. At the same time, `rsync` is also used for backup operations.
```bash
-rsync foo.txt me@server:/home/me/ # 最基础的复制文件 与scp的操作完全相同
-rsync -a bar/ me@server:/home/me/ # -a 标记实现目录复制等 比scp -r 能更好的处理符号链接等情况
+rsync foo.txt me@server:/home/me/ # The most basic copy file is exactly the same as the scp operation
+rsync -a bar/ me@server:/home/me/ # The -a flag implements directory copying, etc. Better than scp -r to handle symbolic links, etc.
```
-关于全盘备份,请阅读[官方文档](https://wiki.archlinux.org/index.php/Rsync#Full_system_backup)。如果你寻求一种图形化的操作方式,可以自行尝试[Timeshift](https://aur.archlinux.org/packages/timeshift/)AUR。
+For full disk backup, please read the [official documentation](https://wiki.archlinux.org/index.php/Rsync#Full_system_backup).
-## 文件解压缩
+## File decompression
-除了众所周知的 tar 命令,我们在之前安装过的 [ark](https://archlinux.org/packages/extra/x86_64/ark/) 包可以配合 dolphin 文件管理器轻松的右键直接解压缩,其可选依赖提供了各个压缩格式的支持,可以自行选择安装。需要注意的是解压 windows 下的压缩包,可能会乱码,安装 ark 的可选依赖之一 unarchiver,使用 unar 可以避免这个问题。
+In addition to the well-known tar command, the [ark](https://archlinux.org/packages/extra/x86_64/ark/) package we installed before can be directly decompressed with the dolphin file manager with an easy right-click, which is optional Dependency provides support for various compression formats, and you can choose to install it yourself. It should be noted that decompressing the compressed package under windows may cause garbled characters. Install unarchiver, one of the optional dependencies of ark, and use unar to avoid this problem.
```bash
sudo pacman -S unarchiver
-unar xxx.zip
+unar-xxx.zip
```
-## 系统硬件信息检测
+## System hardware information detection
-磁盘检测可使用 [smartmontools](https://archlinux.org/packages/extra/x86_64/smartmontools/)
+Disk detection can be done using [smartmontools](https://archlinux.org/packages/extra/x86_64/smartmontools/)
```bash
-sudo smartctl -A /dev/sda #硬盘
-sudo smartctl -d sat -A /dev/sdc #usb设备
+sudo smartctl -A /dev/sda #hard disk
+sudo smartctl -d sat -A /dev/sdc #usb device
```
-磁盘空间分析可直接使用 dh 命令,也可使用 [Filelight](https://archlinux.org/packages/extra/x86_64/filelight/)图形化界面直观查看磁盘占用情况
+Disk space analysis can directly use the dh command, or use the [Filelight](https://archlinux.org/packages/extra/x86_64/filelight/) graphical interface to visually check the disk usage
```bash
df -h
```
-cpu 与显卡的信息查看可使用如下两款软件
+The following two softwares can be used to view the information of cpu and graphics card
```bash
yay -S cpu-x
yay -S gpu-viewer
```
-使用 [dmidecode](https://archlinux.org/packages/extra/x86_64/dmidecode/) 可以完整查看系统绝大部分硬件信息,包括较难得到的内存频率,主板 BIOS 等等。
+Use [dmidecode](https://archlinux.org/packages/extra/x86_64/dmidecode/) to fully view most of the hardware information of the system, including hard-to-get memory frequency, motherboard BIOS, etc.
```bash
sudo dmidecode
```
-## 制作 windows10 启动盘
+## Make windows 10 boot disk
-你可能在 linux 下,有时需要制作 win10 的启动盘。在以往,在 linux 下制作一个 win10 启动盘还是很简单的,但是随着近几年微软的更新,其 iso 安装镜像中存在一个名为`install.wim`的文件,其大小已经超出了 4GB,超出了 fat32 所要求的单个文件最大 4GB 的限制。这使得必须用额外的步骤才能制作一个启动盘。这里依旧使用 fat32 格式是因为其兼容性是最好的,ntfs 的 uefi 启动盘很多情况下不被识别。
+You may be under linux, and sometimes you need to make a boot disk for win10. In the past, it was very simple to make a win10 boot disk under linux, but with the update of Microsoft in recent years, there is a file named `install.wim` in its iso installation image, and its size has exceeded 4GB. Exceeded the maximum 4GB limit for a single file required by fat32. This necessitates an extra step to make a bootable disk. The fat32 format is still used here because its compatibility is the best, and the uefi boot disk of ntfs is not recognized in many cases.
-首先和基础安装中的部分步骤类似,首先用 parted 命令创建 U 盘的分区 label 为 gpt。接下来用 cfdisk 命令创建新分区,在 Type 中选择 Microsoft basic data。接下来使用 mkfs.vfat 命令格式化所创建的分区。这样 U 盘就准备好了。
+First of all, similar to some steps in the basic installation, first use the parted command to create the partition label of the U disk as gpt. Next create a new partition with the cfdisk command and select Microsoft basic data in Type. Next use the mkfs.vfat command to format the created partition. The USB stick is now ready.
-接下来下载 win10 的 iso 镜像并解压。在某些文件管理器中,你会得到如下错误。
+Next download the iso image of win10 and extract it. In some file managers, you will get errors like the following.
```bash
This disc contains a "UDF" file system and requires an operating system
that supports the ISO-13346 "UDF" file system specification.w
```
-这种情况下则需要手动挂载并复制出来
+In this case, you need to manually mount and copy it out
```bash
mount -o loop /path/of/windows10.iso /mnt/your/mountpoint
```
-得到复制出来的文件后,最后要进行的就是压缩 install.wim 文件,这里需要首先安装一个包
+After getting the copied file, the last thing to do is to compress the install.wim file, here you need to install a package first
```bash
sudo pacman -S wimlib
```
-接下来进行压缩,这一步会持续较长时间,耐心等待。完成后可以看到文件已经被压缩到了 3.x GB。
+Next, compress, this step will last for a long time, wait patiently. When finished, you can see that the file has been compressed to 3.x GB.
```bash
sudo wimlib-imagex optimize install.wim --solid
```
-最后把全部文件复制到 U 盘中即可。
+Finally, copy all the files to the U disk.
Ref: [[1]](https://www.dedoimedo.com/computers/windows-10-usb-media-linux.html)
diff --git a/docs/uk/advanced/beauty.md b/docs/uk/advanced/beauty.md
index c00e4e9..001a407 100644
--- a/docs/uk/advanced/beauty.md
+++ b/docs/uk/advanced/beauty.md
@@ -1,104 +1,103 @@
-# 系统美化
+# System beautification
-本文讲述如何配置以让 KDE 桌面环境看起来更加拥有美感。
-原则:美化不应该付出大量的时间折腾,既没有实际用处,也没有意义。花最少的时间完成性价比最高的美化始终是第一原则。
-在美化部分,需要设置代理之后再使用`系统设置`的功能,如下载主题等。否则网速会非常慢,甚至无法使用。
-经测试,需通过 proxychains 或设置全局透明代理将网络连接重定向到代理。
+This article describes how to configure the KDE desktop environment to look more aesthetically pleasing.
+Principle: Landscaping should not take a lot of time and toss, which is neither practical nor meaningful. The most cost-effective landscaping in the least amount of time is always the first principle.
+In the beautification part, you need to set the proxy before using the `system settings` function, such as downloading themes. Otherwise, the internet speed will be very slow or even unusable.
+After testing, it is necessary to redirect network connections to the proxy through proxychains or setting up a global transparent proxy.
```bash
-proxychains systemsettings5 #通过代理打开系统设置
+proxychains systemsettings5 #Open system settings through proxy
```
-> 在 KDE 相关软件更新前后,出现过第三方主题不稳定/卡顿的问题,再次强调不要美化魔改的太过,这会添加更多的不确定性,让你的桌面稳定性下降。
+> Before and after the KDE-related software update, there have been problems of unstable/stuck third-party themes. Again, don't beautify the magic changes too much, which will add more uncertainty and reduce the stability of your desktop.
-## 壁纸
+## Wallpapers
-在桌面右键,选择`配置桌面`。在新出现的窗口中右下角选择`添加图片`可以选择你想要的图片。其中`位置`一项选择'缩放,保持比例',`背景`一项选择'模糊'。这样你就可以拥有一个成比例,且边缘带有高斯模糊的漂亮的桌面壁纸。
+Right-click on the desktop and select `Configure Desktop`. In the new window that appears in the lower right corner, select `Add Picture` to select the picture you want. The 'Position' item selects 'Scale, maintain proportion', and the 'Background' item selects 'Blur'. This way you can have a beautiful desktop wallpaper that is proportional and has Gaussian blur on the edges.
-## 系统主题
+## System themes
-使用一个高质量的系统主题可以直线提升系统的美观程度。_系统设置_> _外观_> _全局主题_> _获取新的全局主题_ ,搜索主题 layan,进行设置即可。 顺便说一句,这个主题的作者 vinceliuice 是一位中国大佬,是一位设计师,他设计的主题以及图标的质量都很高,你可以去他的[主页](https://www.pling.com/u/vinceliuice/)为他打分和点赞。
+Using a high-quality system theme can directly improve the aesthetics of the system. _System settings_> _Appearance_> _Global themes_> _Get a new global theme_ , search for the theme layan, and set it. By the way, the author of this theme, vinceliuice, is a big Chinese and a designer. The quality of the themes and icons he designs are very high, you can go to his [homepage](https://www.pling.com/u/vinceliuice/) to rate and like him.
-> 如果切换主题后,windows 键不能呼出菜单,可在左下角右键,配置程序启动器,在键盘快捷键中重新设置`windows+F1`键,windows 键会显示为 Meta 键。
+> If the Windows key cannot call out the menu after switching themes, you can right-click in the lower left corner, configure the program launcher, and reset the `windows+F1` key in the keyboard shortcuts, and the Windows key will be displayed as the Meta key.
-## 窗口装饰
+## Window decoration
-在 _系统设置_> _外观_> _窗口装饰_ 中,获取新窗口装饰,搜索 layan,并应用即可。
+In _system settings_> _appearance_> _window decoration_, get the new window decoration, search for layan, and apply it.
-## 系统图标
+## System icons
-如果主题中的图标不能满足你,那么可以选择一些自定义的图标。_系统设置_> _外观_> _图标_> _获取新图标主题_ ,搜索图标名 Tela-icon-theme,进行安装设置即可。
+If the icons in the theme don't satisfy you, you can choose some custom icons. _System Settings_> _Appearance_> _Icons_> _Get New Icon Theme_ , search for the icon name Tela-icon-theme, and install it.
-## SDDM 主题
+## SDDM themes
-你应该注意得到,输入密码时默认的登录界面是很丑的,这里也可以替换掉。_系统设置_> _开机和关机_> _登录屏幕(SDDM)_> _获取新登录屏幕_ ,搜索 SDDM 主题 layan 并设置即可
+You should note that the default login screen when entering a password is ugly and can be replaced here as well. _System Settings_> _Startup and Shutdown_> _Login Screen (SDDM)_> _Get New Login Screen_ , search for SDDM theme layan and set it
-## 欢迎屏幕(splashscreen)
+## Splashscreen
-可以对在登录界面后的欢迎屏幕进行美化。 _系统设置_> _外观_> _欢迎屏幕_> _获取新欢迎屏幕_ ,搜索 miku 进行设置即可。这个`Snowy Night Miku`是我们搜索到的最好看的二刺猿属性的初始界面了。另外,还有一个大佬做了一些二次元主题的欢迎屏幕,但是质量一般,这里是他的[主页](https://www.pling.com/u/thevladsoft/)。
+The welcome screen after the login interface can be beautified. _System Settings_> _Appearance_> _Welcome Screen_> _Get New Welcome Screen_ , search for miku to set it up. This `Snowy Night Miku` is the initial interface of the best looking two-spined ape attribute we have searched. In addition, there is a big guy who has made some welcome screens of the second dimension theme, but the quality is average, here is his [home page](https://www.pling.com/u/thevladsoft/).
-## 桌面插件
+## Desktop plugin
-在任务栏空白处右键,选择编辑面板,添加部件。
+Right-click an empty space on the taskbar, select Edit Panel, and add widgets.
-- Netspeed widget 网速组件,这个很实用
-- simple system monitor 系统信息
-- todolist 任务组件
+- Netspeed widget network speed component, this is very practical
+- todolist task component
-然后把你经常使用的软件固定在任务栏即可。
+Then you can pin the software you often use to the taskbar.
-KDE Plasma 5.22.1 更新后,需要额外安装 ksysguard 才能确保桌面插件的正常运行。[[1]](https://github.com/dfaust/plasma-applet-netspeed-widget/issues/28)
+After the KDE Plasma 5.22.1 update, an additional installation of ksysguard is required to ensure the proper functioning of the desktop plugin. [[1]](https://github.com/dfaust/plasma-applet-netspeed-widget/issues/28)
-## 混成器
+## Mixer
-_系统设置_> _显示和监控_> _混成器_ 开启混成器
+_System Settings_> _Display and Monitoring_> _Mixer_ Turn on the mixer
-## 终端样式设置
+## Terminal style settings
-打开 konsole, _设置_> _编辑当前方案_> _外观_ ,选择`Red-Black` 应用确认即可。
+Open konsole, go to _settings_> _edit current scheme_> _appearance_ , select `Red-Black` to apply and confirm.
## Kvantum Manager
-主题配合 Kvantum Manager 可以达到更好的效果。
+Themes work with Kvantum Manager to achieve better results.
```bash
sudo pacman -S kvantum
```
-在[这里](https://www.pling.com/p/1325246/)下载 Layan 的 Kvantum 主题,并解压。打开 Kvantum Manager,选择主题并安装,接下来在`Change/Delete Theme`中选择 Layan,Use this theme。最后在系统设置,外观中的应用程序风格中选择 kvantum 即可。
+Download Layan's Kvantum theme from [here](https://www.pling.com/p/1325246/) and unzip it. Open Kvantum Manager, select the theme and install it, then select Layan in `Change/Delete Theme`, Use this theme. Finally, in the system settings, select kvantum in the application style in the appearance.
-> 如果透明的效果没有显示,确保 KDE 的全局缩放比例为整数倍。或者尝试切换混成器中 openGL 的设置。
+> If the transparent effect is not displayed, make sure that the global scale of KDE is an integer multiple. Or try toggling the openGL settings in the mixer.
-## GRUB 主题
+## GRUB themes
-[官方文档](https://wiki.archlinux.org/title/GRUB/Tips_and_tricks#Theme)
+[Official Documentation](https://wiki.archlinux.org/title/GRUB/Tips_and_tricks#Theme)
-在[pling](https://www.pling.com/browse/cat/109/order/latest/)选择下载你想要的 GRUB 主题,比如这个[二刺螈主题](https://www.pling.com/p/1526503/)。接下来 `cd` 进解压出来的文件夹,打开 konsole 输入
+Select and download the GRUB theme you want at [pling](https://www.pling.com/browse/cat/109/order/latest/), such as this [two-stinged salamander theme](https://www.pling.com/p/1526503/). Next, `cd` into the unzipped folder, open konsole and enter
```bash
sudo cp -r . /usr/share/grub/themes/Nino
```
-以将主题放置在系统的 GRUB 默认文件夹内。
-接着编辑 `/etc/default/grub` 文件,找到 `#GRUB_THEME=` 一行,将前面的注释去掉,并指向主题的 `theme.txt` 文件。即
+to place the theme in the system's GRUB default folder.
+Then edit the `/etc/default/grub` file, find the `#GRUB_THEME=` line, remove the previous comment, and point to the theme's `theme.txt` file. which is
```bash
#GRUB_THEME=
-GRUB_THEME="/usr/share/grub/themes/Nino/theme.txt" #修改后
+GRUB_THEME="/usr/share/grub/themes/Nino/theme.txt" #After modification
```
-然后再在终端输入
+and then type in the terminal
```bash
sudo grub-mkconfig -o /boot/grub/grub.cfg
```
-更新 GRUB ,并重启即可。
+Update GRUB and restart.
-## 开机动画
+## Boot animation
-[Plymouth](https://fedoraproject.org/wiki/Releases/FeatureBetterStartup) 是一个来自于 Fedora 社区的提供美化启动图形界面的功能的项目,如有需要,可以参考[官方文档]()进行配置。不建议新手在此项配置上花费太多时间。
+[Plymouth](https://fedoraproject.org/wiki/Releases/FeatureBetterStartup) is a project from the Fedora community that provides the function of beautifying the startup GUI. If necessary, you can refer to the [official document]() to configure. Novices are not advised to spend too much time on this configuration.
---
-其余 KDE 桌面有很多配置项,大家可以自行探索。
+The rest of the KDE desktop has many configuration items, you can explore by yourself.
diff --git a/docs/uk/advanced/troubleshooting.md b/docs/uk/advanced/troubleshooting.md
index 094b68c..6f66661 100644
--- a/docs/uk/advanced/troubleshooting.md
+++ b/docs/uk/advanced/troubleshooting.md
@@ -1,85 +1,133 @@
-# 常见问题排除与解决
+# Troubleshooting and solutions
-本节描述一些在日常使用过程中你有很大概率可能遇到的问题,并提供解决方法。
+This section describes some of the problems that you are likely to encounter in daily use, and provides solutions.
-### 鼠标出现按键不灵敏或失灵的现象
+### Install Arch Linux using BIOS+GPT mode
-一般来说大多数鼠标都是即插即用的,但 5.14 内核前后更新后可能遇到失灵的情况。根据自身鼠标品牌安装对应的驱动即可解决。[[1]](https://openrazer.github.io/#arch)
+Although there are fewer and fewer installation scenarios using traditional BIOS mode, in some special scenarios, such as installing Arch Linux on a VPS, it may still be necessary to use BIOS mode. This section describes the differences between installing in BIOS+GPT mode and UEFI+GPT mode, and most of the steps are the same.
-### 某些笔记本设备安装后没有声音
+- Before installation, in the motherboard's BIOS settings, or in the VPS's boot settings (if any), adjust the boot mode to Legacy BIOS mode boot.
+- When partitioning, you need to separate a 2M BIOS boot mode partition, this partition does not need to be formatted and mounted.
+- When installing the bootloader, the corresponding commands are modified to: `grub-install --target=i386-pc /dev/vda` and `grub-mkconfig -o /boot/grub/grub.cfg`. Among them, `/dev/vda` in the first command is the disk where GRUB is installed, not a partition. The specific name is changed according to the actual situation of the installer.
-安装包`sof-firmware`。
+### Static IP Settings
-### 关机时卡住很久才能关机
+Although the use of tools that can automatically obtain IP addresses can cover most scenarios, there are still some special scenarios, such as campus networks, VPS and other environments that require static IP settings. This section gives a brief way to set a static IP. If you need to set a static IP, you need to disable the tools that automatically obtain IP such as dhcpcd or NetworkManager.
-一般屏幕会出现形如`A stop job is running for...(1m30s)`的信息,这是经常会遇到的关机卡住 1 分 30 秒的问题,一般来说这种情况是出现了某个进程在关机时不愿停止,需要等到超时时间到达强行停止。通用的解决办法是调整缩短这个等待时间,建议从 1 分 30 秒调整至 30 秒,30 秒已经足够几乎所有进程正常结束。
+```bash
+sudo systemctl stop dhcpcd NetworkManager
+sudo systemctl disable dhcpcd NetworkManager
+```
+
+Next enable systemd-networkd
+
+```bash
+sudo systemctl enable --now systemd-networkd
+```
+
+Use the `ip ad` command to view the name of the current network card, for example, the name ens3 is used here. Then create the configuration file `/etc/systemd/network/10-static-ens3.network`. Then fill in the content in it. The ip address and gateway need to be obtained from your network provider. The DNS settings also need to be set in `/etc/resolv.conf` in the same way as above.
+
+```conf
+[Match]
+Name=ens3
+
+[Network]
+Address=YOUR_IPV4_ADDRESS/MASK
+Gateway=YOUR_IPV4_GATEWAY
+DNS=8.8.8.8
+
+[Network]
+Address=YOUR_IPV6_ADDRESS/MASK
+Gateway=YOUR_IPV6_GATEWAY
+DNS=2001:4860:4860::8888
+```
-编辑 `/etc/systemd/system.conf`
+Finally, restart the service.
+
+```bash
+sudo systemctl restart systemd-networkd
+```
+
+### The mouse button is insensitive or malfunctioning
+
+Generally speaking, most mice are plug and play, but may experience failure after the 5.14 kernel update. It can be solved by installing the corresponding driver according to your own mouse brand. [[1]](https://openrazer.github.io/#arch)
+
+### It takes a long time to shut down when shutting down
+
+Generally, a message in the form of `A stop job is running for...(1m30s)` will appear on the screen. This is a common problem that the shutdown is stuck for 1 minute and 30 seconds. Generally speaking, this situation is caused by a certain A process is unwilling to stop when it is shut down, and needs to wait until the timeout period is reached to force it to stop. The general solution is to adjust and shorten this waiting time. It is recommended to adjust it from 1 minute and 30 seconds to 30 seconds. 30 seconds is enough for almost all processes to end normally.
+
+Edit `/etc/systemd/system.conf`
```bash
sudo vim /etc/systemd/system.conf
```
-找到其中`DefaultTimeoutStopSec`一项,将其前方的井号去掉,并赋值为 30s 即可。最后执行 daemon-reload 使其生效。
+Find the `DefaultTimeoutStopSec` item, remove the pound sign in front of it, and assign the value to 30s. Finally execute daemon-reload to make it take effect.
```bash
sudo systemctl daemon-reload
```
-上述解决方案其实只是将这个等待时间缩小了,并没有解决实际问题。如果你想排查问题真正的原因所在,在关机时如果出现了`A stop job is running for...(1m30s)`的信息,耐心等待其结束关机,然后重新启动电脑,执行以下命令:
+The above solution actually only reduces this waiting time, and does not solve the actual problem. If you want to troubleshoot the real cause of the problem, if the message `A stop job is running for...(1m30s)` appears during shutdown, wait patiently for the shutdown to end, then restart the computer and execute the following commands:
```bash
journalctl -p5
```
-按/(斜杠键)搜索`Killing`关键字,找到你关机的时间附近所在的匹配行,你可以在附近看到到底是哪一个进程导致了 timeout,然后再去排查这个进程有什么问题即可。
+Press / (slash key) to search for the `Killing` keyword, find the matching line near the time you shut down, you can see which process caused the timeout nearby, and then check what is wrong with this process. Can.
-ref: [[1](https://forum.manjaro.org/t/a-stop-job-is-running-for-user-manager-for-uid-1000-during-shutdown/37799)][[2](https://unix.stackexchange.com/questions/273876/a-stop-job-is-running-for-session-c2-of-user)]
+ref: [[1](https://forum.manjaro.org/t/a-stop-job-is-running-for-user-manager-for-uid-1000-during-shutdown/37799)][[ 2](https://unix.stackexchange.com/questions/273876/a-stop-job-is-running-for-session-c2-of-user)]
-### 磁盘容量不足的处理方式
+### How to deal with insufficient disk capacity
-一般使用 LVM 安装 Linux 系统则不用担心这种情况发生。但是我们使用的是传统的 ext4 经典分区方式。这种情况下一般建议在安装的开始就将根目录设置的大一些,如 100G。如果/home 分区大小不够了,可以新安装一块硬盘,将其挂载到你想要的位置,再按照`基础安装`的步骤中重新 genfstab 一下就行了。
+Generally use LVM to install Linux system without worrying about this happening. But we are using the traditional ext4 classic partitioning method. In this case, it is generally recommended to set the root directory larger at the beginning of the installation, such as 100G. If the size of the /home partition is not enough, you can install a new hard disk, mount it to the location you want, and then follow the steps of `basic installation` to re-genfstab it.
-除此之外,如果根目录容量不足,可以不定期清理一下 pacman 的缓存,详见[archwiki](https://wiki.archlinux.org/title/Pacman#Cleaning_the_package_cache)。太长不看的可以直接用下面这一行命令清理没有安装的所有缓存的包,和没有被使用的同步数据库。
+In addition, if the root directory capacity is insufficient, you can clean the pacman cache from time to time, see [archwiki](https://wiki.archlinux.org/title/Pacman#Cleaning_the_package_cache) for details. If it is too long to read, you can directly use the following command to clean up all cached packages that are not installed, and the synchronization database that is not used.
```bash
sudo pacman -Sc
```
-### 软件的降级
+### Software downgrade
-在 archlinux 上 偶尔会出现某一个包的最新版本有各种问题的情况,此时需要降级该包以正常使用,包可以是普通软件,也可以是内核。
+Occasionally, on archlinux, the latest version of a certain package has various problems, such as some software is too new, and some dependencies are not supported, such as [virtualbox crash under linux5.18 kernel](https:// bugs.archlinux.org/task/74900), at which point the package needs to be downgraded for normal use. A package can be either normal software or the kernel.
```bash
yay -S downgrade
```
-安装此包即可,使用方法也很简单,downgrade 后加上需要降级的包名即可,随后会提示你选择需要降级到的版本,点选即可。
+Just install this package, and the usage method is also very simple. Just add the package name to be downgraded after downgrade, and then you will be prompted to select the version to be downgraded to, just click.
-### 升级系统时出现形如 unable to lock database 的错误
+### An error like unable to lock database occurs when upgrading the system
-可能存在升级系统时异常关机或程序异常退出的情况,或者多个 pacman 的相关程序在同时执行。移除 pacman 的 db 锁即可
+There may be abnormal shutdown or abnormal program exit when the system is upgraded, or multiple pacman related programs are executed at the same time. Just remove the db lock of pacman
```bash
sudo rm /var/lib/pacman/db.lck
```
-### 手动开关混成器
+### Manual switch mixer
-有时混成器会因为某些原因需要手动开启或关闭,但是目前在 KDE 下混成器在设置里无法在不关机的情况下直接关闭,下面命令提供手动开关混成器的效果。[[1]](https://unix.stackexchange.com/questions/597736/disabling-kwin-compositor-from-command-line)
+Sometimes the mixer needs to be turned on or off manually for some reason, but currently the mixer cannot be turned off directly in the settings under KDE without shutting down. The following command provides the effect of manually switching the mixer on and off. [[1]](https://unix.stackexchange.com/questions/597736/disabling-kwin-compositor-from-command-line)
```bash
-qdbus org.kde.KWin /Compositor suspend #禁用
+qdbus org.kde.KWin /Compositor suspend #disable
-qdbus org.kde.KWin /Compositor resume #开启
+qdbus org.kde.KWin /Compositor resume #Open
```
-### 屏幕溢出: overscan
+### Screen overflow: overscan
-在连接一些老式的显示设备时,可能与出现[overscan](https://en.wikipedia.org/wiki/Overscan)的现象,简单来说就是电视屏幕四圈会有一圈溢出了,不显示出来。对于英特尔核芯显卡,可以选择 intel panel fitter 的方式[[1]](https://askubuntu.com/questions/508358/overscanning-picture-problem-using-hdmi-with-intel-graphics)。最后就是要加入到一个 service 里开机自动启动,并且是在 DE 加载完成后执行[[2]](https://unix.stackexchange.com/questions/397853/how-to-set-a-systemd-unit-to-start-after-loading-the-desktop)。
+When connecting some old-fashioned display devices, the phenomenon of [overscan](https://en.wikipedia.org/wiki/Overscan) may appear. Simply put, the TV screen will overflow in four circles, and it will not be displayed. . For Intel HD graphics, you can choose intel panel fitter [[1]](https://askubuntu.com/questions/508358/overscanning-picture-problem-using-hdmi-with-intel-graphics). The last thing is to add to a service to automatically start at boot, and execute [[2]](https://unix.stackexchange.com/questions/397853/how-to-set-a-systemd-unit-to-start-after-loading-the-desktop).
```
sudo intel_panel_fitter -p A -x 1230 -y 700
```
+
+---
+
+## Ref
+
+- [[1]GUID 分区表*(GPT)*特殊操作]()
diff --git a/docs/uk/advanced/undervoltage.md b/docs/uk/advanced/undervoltage.md
index c27b2d0..e71dfae 100644
--- a/docs/uk/advanced/undervoltage.md
+++ b/docs/uk/advanced/undervoltage.md
@@ -1,64 +1,64 @@
-# 功耗控制
+# Power Control
-针对散热不好的设备,功耗控制显得非常必要。这里说的功耗控制不是指直接对处理器的频率做出限制,而是对处理器的电压进行最大限度的下探,在挖掘 cpu 体质的极限的同时,起到既能降低发热,又能最大限度保持性能的效果。除了电压的下探,同时也可以尝试对处理器的功率墙(又常被称为 TDP)做出降低的限制,比如考虑这种情况,在 cpu 满睿频时,其实不需要默认的那么多功耗来维持,也许在默认功耗的基础上减几瓦,也能维持满睿频,这样就又可以进一步降低温度。对功率墙进行限制不同于对电压进行下探,若限制功率墙的参数较低,这会不可避免的损失较多的性能,但是在散热过差的设备上这也是一个好办法。
+For equipment with poor heat dissipation, power consumption control is very necessary. The power consumption control mentioned here does not mean to directly limit the frequency of the processor, but to probe the voltage of the processor to the maximum extent. While excavating the limit of the cpu physique, it can not only reduce heat, but also Maximize the effect of maintaining performance. In addition to the voltage drop, you can also try to reduce the power wall (also called TDP) of the processor. For example, considering this situation, when the CPU is at full turbo frequency, it does not need to be as much as the default. Power consumption to maintain, maybe reduce a few watts on the basis of the default power consumption, but also maintain full turbo frequency, so that the temperature can be further reduced. Limiting the power wall is different from lowering the voltage. If the parameters for limiting the power wall are low, it will inevitably lose more performance, but it is also a good method for equipment with poor heat dissipation.
-## 电压下探
+## Undervolting CPU
-[官方参考文档](https://wiki.archlinux.org/index.php/Undervolting_CPU)
+[Official reference documentation](https://wiki.archlinux.org/index.php/Undervolting_CPU)
-如果正常操作,降低电压一般不会损害 cpu,一般建议从 50 毫伏进行尝试,每次降压尝试多增加 10 毫伏。只要确保在降低电压前,系统中任务均被正确保存即可。网络上传言的降低 cpu 电压会"缩肛"是谣言[[1]](https://www.zhihu.com/question/62335676)。
+Under normal operation, lowering the voltage will generally not harm the CPU, and it is generally recommended to try from 50 mV, adding an extra 10 mV for each step-down attempt. Just make sure that the tasks in the system are properly saved before lowering the voltage. It is a rumor that reducing the CPU voltage on the Internet will "shrink the anus" [[1]](https://www.zhihu.com/question/62335676).
-### 英特尔 四代酷睿 Haswell 及更新的 cpu
+### Intel 4th Gen Core Haswell and newer CPUs
-如文档中所说,使用 intel-undervolt 即可降压。对于其配置文件中降压部分的五个参数含义如下:
+Using intel-undervolt, as the documentation says, can be stepped down. The meanings of the five parameters in the step-down part of the configuration file are as follows:
-- 0:cpu 核心电压
-- 1:cpu 核芯显卡电压
-- 2:cpu 缓存电压
-- 3:系统周边电压,与内存等设备相关
-- 4:模拟 I/O 电压
+- 0: cpu core voltage
+- 1: cpu core graphics card voltage
+- 2: cpu cache voltage
+- 3: System peripheral voltage, related to memory and other devices
+- 4: Analog I/O Voltage
-一般来说只调整 0 和 2 两项电压即可。
+Generally speaking, only two voltages 0 and 2 can be adjusted.
-在调整完电压,apply 之后,可以尝试使用 [s-tui](https://archlinux.org/packages/community/any/s-tui/) 这个工具进行烤机测试,同时观察温度、频率、TDP 的数据。
+After adjusting the voltage and applying, you can try to use the tool [s-tui](https://archlinux.org/packages/community/any/s-tui/) to test the oven, and observe the temperature, frequency, TDP The data.
-在调整到一个合适的降压配置后,开启其对应 service 即可。
+After adjusting to a suitable step-down configuration, start its corresponding service.
```bash
sudo systemctl enable --now intel-undervolt
```
-### 英特尔 四代酷睿 Haswell 之前的 cpu
+### Cpu before Intel 4th generation Haswell
-arch 官方文档中提到,二代酷睿及以前的 cpu 可使用 PHC 的方式进行降压。经测试,在 i7-2760QM 上不能直接使用,需要在内核启动参数中加入`intel_pstate=disable`才能正确识别到 phc 的 driver,[参考 1](https://wiki.archlinux.org/index.php/CPU_frequency_scaling),可用命令`cpupower frequency-info`验证。接下来进行降压尝试,按照 archwiki 的操作始终不能更改 phc_vid 文件,其中内容始终为 0,即便已经用 vim 将其更改为其他值。也许是 cpu/主板 BIOS 不支持降频。翻阅了 phc-intel 的官方文档,其说明只支持酷睿,酷睿 2 及之前的 cpu 系列,不支持酷睿 i,这与 archwiki 的描述相矛盾。
+The arch official document mentioned that the second-generation Core and previous CPUs can use PHC to reduce voltage. After testing, it cannot be used directly on i7-2760QM. It is necessary to add `intel_pstate=disable` to the kernel startup parameters to correctly identify the phc driver. [Reference 1](https://wiki.archlinux.org/index.php/CPU_frequency_scaling), which can be verified with the command `cpupower frequency-info`. Next, try to reduce the voltage. According to the archwiki operation, the phc_vid file cannot be changed, and its content is always 0, even if it has been changed to another value with vim. Maybe the cpu/motherboard BIOS doesn't support downclocking. I read the official documentation of phc-intel, and its instructions only support Core, Core 2 and previous cpu series, not Core i, which contradicts the description of archwiki.
-对于夹在中间的三代酷睿 lvy bridge,[有项目](https://github.com/tiziw/iuvolt)称可以使用 intel-undervolt 的原理进行降压,但是经测试失败了,尝试用 PHC 的方式依旧失败。目前应该没有什么好的办法可以降压三代酷睿。
+For the three-generation Core Ivy bridge sandwiched in the middle, [there is a project](https://github.com/tiziw/iuvolt) says that the principle of intel-undervolt can be used to reduce voltage, but the test failed, so try to use PHC. still fails. At present, there should be no good way to step down the three-generation Core.
-对于此范围内的老设备降压,我将不会花费更多时间探索。如果你知道有办法可以正确降压,欢迎提交 PR,或[进群讨论](https://t.me/FSF_Ministry_of_Truth)。
+For older equipment bucks in this range, I won't spend more time exploring. If you know of a way to properly depressurize, please submit a PR, or [enter group discussion](https://t.me/FSF_Ministry_of_Truth).
ref: [[1]](https://www.reddit.com/r/intel/comments/8ubdsg/undervolting_intel_i5_3230m/) [[2]](https://forum.thinkpads.com/viewtopic.php?t=128707)
### AMD
-我没有设备,未能验证。可按照 wiki 中使用 amdctl 尝试降压。
+Use amdctl in the wiki to try undervolting.
-## 降低功率墙
+## Limit power wall
-对于功率墙的调整,有些主板在 BIOS 中提供了设置项可以直接调整。对于没有设置项的主板,有的主板是锁定了瞬时和长时功率墙,这种情况就无法调整功率墙了。有的主板 BIOS 随没有提供功率墙调整项,但依旧可以通过命令行设置。通过以下的命令可以查看主板是否可以调整功率墙。
+For the adjustment of the power wall, some motherboards provide setting items in the BIOS that can be adjusted directly. For motherboards without setting items, some motherboards lock the instantaneous and long-term power wall, and in this case, the power wall cannot be adjusted. Some motherboard BIOS does not provide power wall adjustment items, but it can still be set through the command line. Use the following command to check whether the motherboard can adjust the power wall.
```bash
grep . /sys/class/powercap/intel-rapl/intel-rapl:0/*
```
-如果在输出中看到了如下的 enable 值为 1,即可以调整。第一行的代表现有的功率墙限制。
+If you see an enable value of 1 in the output like the following, you can adjust it. The first row represents the existing power wall limit.
```bash
/sys/class/powercap/intel-rapl/intel-rapl:0/constraint_0_power_limit_uw:100000000
/sys/class/powercap/intel-rapl/intel-rapl:0/enabled:1
```
-具体的调整步骤参考[这个链接](https://askubuntu.com/questions/1226254/set-max-tdp-of-intel-h-series-cpu)。有空的时候我再翻译整理。
+The specific adjustment steps refer to [this link](https://askubuntu.com/questions/1226254/set-max-tdp-of-intel-h-series-cpu). I will translate it when I have time.
Ref: [[1]](https://askubuntu.com/questions/1231091/tee-constraint-0-power-limit-uw-no-data-available),[[2]](https://miloserdov.org/?p=1932),[[3]](https://zhuanlan.zhihu.com/p/25537264)
-此外,intel-undervolt 也可直接进行功率墙限制。如看到`package power limit is locked`,则说明这台电脑不可更改功率墙。
+In addition, intel-undervolt can also directly perform power wall limiting. If you see `package power limit is locked`, it means that this computer cannot change the power wall.
diff --git a/docs/uk/contribution.md b/docs/uk/contribution.md
index 88106fc..27a5baf 100644
--- a/docs/uk/contribution.md
+++ b/docs/uk/contribution.md
@@ -1,36 +1,36 @@
-# 贡献文档与代码
+# Contribution
-点击本文右上角的 github 图标,即可查看本工程。在每一页的最下方也有`编辑本文`的链接,点击即可跳转到 github 编辑。
+Click the github icon in the upper right corner of this article to view this project. There is also a link to `edit this article` at the bottom of each page, click to jump to github for editing.
-本书的大纲目录由项目组成员把控,文章内容可自由编辑。本书主线内容以实用为主旨,只提供一条我们认为当前较优的、简洁的安装主线。冗余且无意义的内容不被接受。
+The outline directory of this book is controlled by the project team members, and the content of the article can be edited freely. The main line of this book is based on practicality, and only provides a simple and concise installation line that we think is currently better. Redundant and meaningless content will not be accepted.
-对于项目资源的添加,如图片,非必要 js 文件,非必要 css 文件等均不被接受。因为某些国家对于 github 的封锁和限制,导致直连下如有此类文件会更大的拖慢网页加载速度。
+The addition of project resources, such as images, non-essential js files, and non-essential css files, are not accepted. Because of the blockade and restrictions on github in some countries, such files under direct connection will greatly slow down the loading speed of web pages.
-本项目最初采用 CC BY-SA 4.0 许可,最终改用 CC BY-NC-ND 4.0 许可,原因参见[Why we changed the license to CC BY-NC-ND 4.0](https://github.com/ArchLinuxStudio/ArchLinuxTutorial/issues/68)。
+This project was originally licensed under the CC BY-SA 4.0 license, and eventually switched to the CC BY-NC-ND 4.0 license, see [Why we changed the license to CC BY-NC-ND 4.0](https://github.com/ArchLinuxStudio/ArchLinuxTutorial/issues/68).
-## 文档贡献
+## Documentation contribution
-文档贡献非常简单,你只需要拥有一个编辑器,将工程 fork,修改,提交 pull request 即可。
+Documentation contribution is very simple, you only need to have an editor, fork the project, modify it, and submit a pull request. Note that if you submit changes in one language, please also submit changes in the other language.
-## 格式约定
+## Format convention
-本系列文档的理念是不必过于苛求格式,因为内容才是真正重要的东西。但是也有少量规范必需遵守,否则会影响阅读。
+The philosophy of this series of documents is that you don't have to be too strict about formatting, because the content is what really matters. But there are also a few specifications that must be followed, otherwise reading will be affected.
-- 使用 OSS code 进行开发,配合 Prettier 插件默认配置进行格式化代码,写完部分文档后使用 ctrl+s 自动格式化保存。
-- 每个 md 文档标题按层级编排内容,大标题为#,其次##,再次###,以此类推。
-- 代表片段需用 markdown 语法包裹,并指定代码类型,如 bash。
-- 一般情况下,请尽量正常使用句号、顿号、引号、冒号等标点符号。
-- 需要引起注意的部分可使用 markdown 引用语法。
-- 专有名词可使用行内代码``语法进行提示,其比加粗更为明显。
-- 行内代码请使用行内代码进行提示。
+- Use OSS code for development, format the code with the default configuration of the Prettier plugin, and use ctrl+s to automatically format and save after writing some documents.
+- Each md document title organizes the content hierarchically, the main title is #, followed by ##, then ###, and so on.
+- means that the fragment needs to be wrapped in markdown syntax and specify the code type, such as bash.
+- In general, please try to use punctuation such as periods, commas, quotation marks, and colons as normal.
+- Use markdown citation syntax for parts that need attention.
+- Proper nouns can be hinted using inline code `` syntax, which is more obvious than bold.
+- Inline code Please use inline code for hints.
-## 代码贡献
+## Code contribution
-本工程使用 [docsify](https://docsify.js.org/#/) 编写而成。如果想贡献相关代码请先阅读 docsify 的项目文档。
+This project is written using [docsify](https://docsify.js.org/#/). If you want to contribute related code, please read the docsify project documentation first.
-本工程使用 yarn 管理依赖,结构非常简单。如果没有接触过,你可能需要简单了解一下[yarn](https://classic.yarnpkg.com/en/)
+This project uses yarn to manage dependencies, and the structure is very simple. If you have not been exposed to it, you may need to briefly understand [yarn](https://classic.yarnpkg.com/en/)
-本地调试
+Local debugging:
```bash
yarn install
diff --git a/docs/uk/exclusive/code.md b/docs/uk/exclusive/code.md
index e9c2678..7a1b463 100644
--- a/docs/uk/exclusive/code.md
+++ b/docs/uk/exclusive/code.md
@@ -1,63 +1,61 @@
-# 编程软件
+# Programming
-很多人不清楚的是,Linux 几乎是最适合编程的操作系统,其对于各个方向的编程支持非常到位(微软与苹果的专有系统编程除外),可以为你省去很多痛苦。本文介绍各个编程方向优质的软件介绍。我们建议读者使用自由软件进行编程工作,本节也仅列出自由软件。
+What many people don't know is that Linux is almost the most suitable operating system for programming, and its programming support for all directions is in place (except Microsoft and Apple's proprietary system programming), which can save you a lot of pain. This article introduces high-quality software introductions in various programming directions. We recommend that readers use free software for programming, and only free software is listed in this section.
-## 前端编程
+## Front-end programming
-对于前端来说,一般需要浏览器以及 IDE(或编辑器) 即可,附加一些网络工具。
+For the front end, a browser and IDE (or editor) are generally required, with some network tools attached.
-关于 IDE(或编辑器),可以使用 [OSS code](https://www.archlinux.org/packages/community/x86_64/code/),它是由官方仓库的生成的开源构建。[vscodium-bin](https://aur.archlinux.org/packages/vscodium-bin/)AUR是社区驱动的 vs code 版本,或者使用 [atom](https://archlinux.org/packages/community/x86_64/atom/)。
+For IDE (or editor), you can use [OSS code](https://www.archlinux.org/packages/community/x86_64/code/), which is an open source build generated from the official repository. [vscodium-bin](https://aur.archlinux.org/packages/vscodium-bin/)AUR is a community driven version of vs code.
-> 微软公司 Visual Studio Code 的二进制构建实际为专有软件。很多人在此存在误解。如此偷梁换柱的手段越来越被更多公司发掘使用。[[1]](https://carlchenet.com/you-think-the-visual-studio-code-binary-you-use-is-a-free-software-think-again/)
+> Binary builds of Microsoft Visual Studio Code are actually proprietary software. Many people have misunderstandings here. Such tricks are increasingly being explored and used by more companies. [[1]](https://carlchenet.com/you-think-the-visual-studio-code-binary-you-use-is-a-free-software-think-again/)
-浏览器方面有 [firefox](https://archlinux.org/packages/extra/x86_64/firefox/),[chromium](https://archlinux.org/packages/extra/x86_64/chromium/),[firefox-developer-edition](https://www.archlinux.org/packages/community/x86_64/firefox-developer-edition/),[brave](https://aur.archlinux.org/packages/brave-dev-bin/)AUR等众多软件可供选择。
+On the browser side there are [firefox](https://archlinux.org/packages/extra/x86_64/firefox/), [chromium](https://archlinux.org/packages/extra/x86_64/chromium/), [firefox -developer-edition](https://www.archlinux.org/packages/community/x86_64/firefox-developer-edition/), [brave](https://aur.archlinux.org/packages/brave-dev-bin/)AUR and many other software to choose from.
-网络工具常使用 [httptoolkit](https://aur.archlinux.org/packages/httptoolkit/)AUR(作为 charles 的代替),以及 [wireshark-qt](https://archlinux.org/packages/community/x86_64/wireshark-qt/)。
+Network tools often use [httptoolkit](https://aur.archlinux.org/packages/httptoolkit/)AUR (as a replacement for charles), and [wireshark-qt](https://archlinux.org/packages/community/x86_64/wireshark-qt/).
-至于 [yarn](https://www.archlinux.org/packages/community/any/yarn/)、[npm](https://www.archlinux.org/packages/community/any/npm/) 等前端常用工具,也均可用 pacman 安装。
+As for front-ends such as [yarn](https://www.archlinux.org/packages/community/any/yarn/), [npm](https://www.archlinux.org/packages/community/any/npm/) Common tools can also be installed with pacman.
-
+## Back-end programming
-## 后端编程
+Jetbrains' open source IDE can be found in the official archlinux repository, such as [IntelliJ Idea](https://www.archlinux.org/packages/community/x86_64/intellij-idea-community-edition/), [PyCharm](https://www.archlinux.org/packages/community/x86_64/pycharm-community-edition/), et al.
+More traditional IDEs include [Netbeans](https://www.archlinux.org/packages/community/any/netbeans/) and eclipse, which has multiple versions and can be searched in the AUR.
-Jetbrains 公司开源的 IDE 可在 archlinux 官方仓库中找到,如[IntelliJ Idea](https://www.archlinux.org/packages/community/x86_64/intellij-idea-community-edition/),[PyCharm](https://www.archlinux.org/packages/community/x86_64/pycharm-community-edition/),等。
-较为传统的 IDE 有 [Netbeans](https://www.archlinux.org/packages/community/any/netbeans/) 以及 eclipse,eclipse 有多种版本,可在 AUR 中自行搜索。
+There is no need to say much about the programming language itself, except that the C language and C++ are supported by the installed system, java, node, etc. can be easily installed.
-关于编程语言自身,更是不必多说,除了 c 语言和 c++安装好系统即支持外,java, node,等都可以被轻易安装。
+In addition to the default installed gcc, you can also install clang and llvm for use
-除了默认安装好的 gcc,也可以安装 clang 以及 llvm 以供使用
-
-关于数据库相关软件,也有多种选择。
+When it comes to database-related software, there are also a variety of options.
- [Mysql Workbench](https://www.archlinux.org/packages/community/x86_64/mysql-workbench/)
- [pgadmin4](https://www.archlinux.org/packages/community/x86_64/pgadmin4/)
- [dbeaver](https://www.archlinux.org/packages/community/x86_64/dbeaver/)
- [robo3t](https://aur.archlinux.org/packages/robo3t-bin/)AUR
-- [redis-desktop-manager](https://aur.archlinux.org/packages/redis-desktop-manager/)AUR
-- [rdm-bin](https://aur.archlinux.org/packages/rdm-bin/)AUR 如果上面的编译有问题,可用这个 bin 版本
+- [RESP.app](https://aur.archlinux.org/packages/resp-app/)AUR (pre redis-desktop-manager)
+- [rdm-bin](https://aur.archlinux.org/packages/rdm-bin/)AUR If there is a problem with the above compilation, use this bin version
-针对大数据方面,可安装[hadoop](https://aur.archlinux.org/packages/hadoop/)AUR等包。如有包长期没有更新或包不存在,如 hbase 和 hive,则只能去官网自行下载并配置。
+For big data, packages such as [hadoop](https://aur.archlinux.org/packages/hadoop/)AUR can be installed. If the package has not been updated for a long time or the package does not exist, such as hbase and hive, you can only go to the official website to download and configure it yourself.
-关于软件测试,[junit](https://archlinux.org/packages/extra/any/junit/)等常见软件也可轻松安装,配合你喜欢的 IDE 来使用。
+Regarding software testing, common software such as [junit](https://archlinux.org/packages/extra/any/junit/) can also be easily installed and used with your favorite IDE.
-## 安卓客户端编程
+## Android client programming
-目前来说,安卓开发已经统一到了 [Android Studio](https://aur.archlinux.org/packages/android-studio/)AUR 进行开发。当然传统的 Eclipse 也可以用来使用。常用的安卓模拟器则也可使用[Anbox](https://wiki.archlinux.org/title/Anbox#Installation)或 [Waydriod](https://wiki.archlinux.org/title/Waydroid#Installation)。
+At present, Android development has been unified to [Android Studio](https://aur.archlinux.org/packages/android-studio/)AUR for development. Of course traditional Eclipse can also be used. Common Android emulators can also use [Anbox](https://wiki.archlinux.org/title/Anbox#Installation) or [Waydriod](https://wiki.archlinux.org/title/Waydroid#Installation) .
-## 桌面应用编程
+## Desktop application programming
-目前桌面开发较为流行的是 [electron](https://archlinux.org/packages/community/x86_64/electron/) 和 [Qt](https://archlinux.org/packages/extra/x86_64/qt6-base/) 应用。electron 可直接用 OSS Code 进行开发,Qt 应用使用 [Qt Creator](https://www.archlinux.org/packages/extra/x86_64/qtcreator/) 进行开发。
+At present, the more popular desktop development is [electron](https://archlinux.org/packages/community/x86_64/electron/) and [Qt](https://archlinux.org/packages/extra/x86_64/qt6-base/) application. Electron can be developed directly with OSS Code, and Qt applications can be developed with [Qt Creator](https://www.archlinux.org/packages/extra/x86_64/qtcreator/).
-## 机器学习与深度学习
+## Machine Learning and Deep Learning
-针对机器学习方面的编程,IDE 可使用同后端编程中一样的软件。机器学习常用的[jupyter-notebook](https://archlinux.org/packages/community/any/jupyter-notebook/) 以及所需要的相关库如[numpy](https://archlinux.org/packages/extra/x86_64/python-numpy/)、[sklearn](https://archlinux.org/packages/community/x86_64/python-scikit-learn/)、[pandas](https://archlinux.org/packages/community/x86_64/python-pandas/)等,也均可在源中找到。同时,[tensorflow](https://archlinux.org/packages/community/x86_64/tensorflow/)、[pytorch](https://archlinux.org/packages/?sort=&q=python-pytorch&maintainer=&flagged=)以及其相关的 cuda 支持包等深度学习相关的包也均可安装使用。
+For programming in machine learning, the IDE can use the same software as in backend programming. Machine learning commonly used [jupyter-notebook](https://archlinux.org/packages/community/any/jupyter-notebook/) and required related libraries such as [numpy](https://archlinux.org/packages/extra/x86_64/python-numpy/), [sklearn](https://archlinux.org/packages/community/x86_64/python-scikit-learn/), [pandas](https://archlinux.org/packages/community/x86_64/python-pandas/), etc., can also be found in the source. Meanwhile, [tensorflow](https://archlinux.org/packages/community/x86_64/tensorflow/), [pytorch](https://archlinux.org/packages/?sort=&q=python-pytorch&maintainer=&flagged=) And deep learning related packages such as its related cuda support package can also be installed and used.
-## 科学计算
+## Scientific Computing
-[SageMath](https://www.sagemath.org/)(原名 Sage)是免费的、自由的数学软件,支持代数、几何、数论、密码学、数值计算和相关领域的研究和教学,可作为 MATLAB 的替代。Sage 的开发模式和 Sage 本身的技术都非常强调开放性、社区性、合作性和协作性:我们在制造汽车,而不是重新发明轮子。Sagemath 的总体目标是为"4M"(即 Maple、Mathematica、Magma 和 Matlab)提供一个可行的、免费的、自由的替代品。SageMath 为目前科学计算领域的大多数开源软件/库统一重写了接口,提供了一种类兼容 python 的语法,可以说集开源数学软件之大成。目前已可部分替代"4M"。
+[SageMath](https://www.sagemath.org/) (formerly Sage) is free, liberating mathematical software that supports research and teaching in algebra, geometry, number theory, cryptography, numerical computing, and related fields, and is available as Alternative to MATLAB. Both Sage's development model and Sage's own technology place a strong emphasis on openness, community, cooperation, and collaboration: we're building cars, not reinventing the wheel. The overall goal of Sagemath is to provide a viable, free, free alternative to the "4M" (i.e. Maple, Mathematica, Magma, and Matlab). SageMath rewrites the interface for most open source software/libraries in the field of scientific computing, and provides a python-compatible syntax, which can be said to be the culmination of open source mathematical software. At present, it can partially replace "4M".
-[Arch Wiki](https://wiki.archlinux.org/title/SageMath) ||| [中文教程及文档](https://www.osgeo.cn/sagemath/index.html)
+[Arch Wiki](https://wiki.archlinux.org/title/SageMath) ||| [Chinese Tutorial and Documentation](https://www.osgeo.cn/sagemath/index.html)
-## 逆向工程
+## Reverse Engineering
-可安装知名的[ghidra](https://archlinux.org/packages/community/x86_64/ghidra/)作为 IDA 的替代,更多替代选项可参考[alternativeto](https://alternativeto.net/software/ida/)。除此之外再介绍一个好用的十六进制编辑器[Bless](https://archlinux.org/packages/community/any/bless/)。
+The well-known [ghidra](https://archlinux.org/packages/community/x86_64/ghidra/) can be installed as an alternative to IDA. For more alternative options, please refer to [alternativeto](https://alternativeto.net/software/ida/). In addition, introduce a useful hex editor [Bless](https://archlinux.org/packages/community/any/bless/).
diff --git a/docs/uk/exclusive/media.md b/docs/uk/exclusive/media.md
index da8558e..5f8318a 100644
--- a/docs/uk/exclusive/media.md
+++ b/docs/uk/exclusive/media.md
@@ -1,91 +1,88 @@
-# 直播与多媒体制作
+# Streaming and Multimedia Production
-本节将列出多媒体制作方向的各类优质软件,包括做直播,视频剪辑,图像编辑与绘制等方向所需的软件。
+This section will list all kinds of high-quality software in the direction of multimedia production, including the software required for live broadcast, video editing, image editing and drawing.
-## 直播推流及弹幕姬辅助软件
+## Live streaming and barrage Ji auxiliary software
-直播以及录制在 linux 上使用[obs-studio](https://www.archlinux.org/packages/community/x86_64/obs-studio/)完成,用法与 windows 下基本一致。
+The live broadcast and recording are done on linux using [obs-studio](https://www.archlinux.org/packages/community/x86_64/obs-studio/), and the usage is basically the same as that under windows.
-b 站直播时的弹幕可以使用[弹幕库](https://www.danmaku.live/),这个历史比较复杂,v1 版本的仓库在[这里](https://github.com/pandaGao/bilibili-live-helper),但是作者说不更新了。v2 版本的作者目前没有开源,并且说以后[也不会更新了](https://t.bilibili.com/378501835576827480)。AUR:[bilibili-live-helper-bin](https://aur.archlinux.org/packages/bilibili-live-helper-bin/)。
+You can use [danmaku library](https://www.danmaku.live/) for the live broadcast of station b. This history is more complicated. The v1 version of the warehouse is [here](https://github.com/pandaGao/bilibili-live-helper), but the author said that it will not be updated. The author of the v2 version is currently not open source, and said that it [will not be updated in the future](https://t.bilibili.com/378501835576827480). AUR: [bilibili-live-helper-bin](https://aur.archlinux.org/packages/bilibili-live-helper-bin/).
-除此之外还有一个[bilibili-live-chat](https://github.com/Tsuk1ko/bilibili-live-chat),这是一个浏览器的弹幕实现,风格仿照 youtube 的弹幕风格,也是很多弹幕软件的基础,直接在 web 上使用。除了 B 站直播,twitch 等其他平台的直播方式大同小异,只不过你需要寻找不同的弹幕插件,如在 twitch 上可参考[这篇文章](https://www.bilibili.com/read/cv10092277/)。
+In addition to this, there is also a [bilibili-live-chat](https://github.com/Tsuk1ko/bilibili-live-chat), which is a browser's bullet chat implementation, the style is modeled after youtube's bullet chat style, It is also the basis of many barrage software, which can be used directly on the web. In addition to the live broadcast of station B, the live broadcast methods of other platforms such as twitch are similar, but you need to find different bullet screen plug-ins. For example, you can refer to [this article](https://www.bilibili.com/read/cv10092277/) on twitch .
-> bilibili-live-chat 等基于浏览器的弹幕姬实现需要使用有浏览器插件集成的 obs, arch 官方仓库中默认的 obs-studio 是无此功能的,如需使用 bilibili-live-chat,请安装 AUR 中的[obs-studio-browser](https://aur.archlinux.org/packages/obs-studio-browser/)
+> Browser-based danmakuji implementations such as bilibili-live-chat require the use of obs integrated with browser plug-ins. The default obs-studio in the arch official repository does not have this function. If you want to use bilibili-live-chat, please Install [obs-studio-browser](https://aur.archlinux.org/packages/obs-studio-browser/) in AUR.
-如果你使用较新的英伟达显卡,可以使用 NVENC 编码器,这将大大降低直播或录制过程中 cpu 的压力,详情可见[NVIDIA NVENC OBS 指南](https://www.nvidia.cn/geforce/guides/broadcasting-guide/)
+If you use a newer NVIDIA graphics card, you can use the NVENC encoder, which will greatly reduce the pressure on the cpu during live streaming or recording, see [NVIDIA NVENC OBS Guide](https://www.nvidia.cn/geforce/guides/broadcasting-guide/)
-注意,如果你使用 qv2ray+cgproxy 开启了透明代理,那么需要将 obs 加入到/etc/cgproxy/config.json 的 program_noproxy 的值中。
+Note that if you use qv2ray+cgproxy to enable transparent proxy, then you need to add obs to the value of program_noproxy in /etc/cgproxy/config.json.
-## 视频制作剪辑与特效
+## Video production editing and special effects
-视频剪辑与制作推荐使用自由软件[shotcut](https://www.archlinux.org/packages/community/x86_64/shotcut/)。它可以满足大多数的视频剪辑制作需求。同类的软件还有[kdenlive](https://www.archlinux.org/packages/extra/x86_64/kdenlive/)以及[mkvtoolnix](https://archlinux.org/packages/extra/x86_64/mkvtoolnix-gui/)。
+The free software [shotcut](https://www.archlinux.org/packages/community/x86_64/shotcut/) is recommended for video editing and production. It can meet most video editing needs. Similar software includes [kdenlive](https://www.archlinux.org/packages/extra/x86_64/kdenlive/) and [mkvtoolnix](https://archlinux.org/packages/extra/x86_64/mkvtoolnix-gui/).
-在视频录制时,一些 KDE 的辅助功能非常实用。在 KDE 的系统设置中,找到工作区行为->桌面特效,在无障碍功能中勾选`鼠标定位`与`鼠标点击动效`两项,并使用。这两项设置在视频制作中可以突出的显示鼠标位置与点击效果,对于视频制作来说相当有用。
+Some of KDE's accessibility features are useful when recording video. In KDE's system settings, find Workspace Behavior->Desktop Effects, check `Mouse Positioning` and `Mouse Click Animation` in Accessibility Functions, and use them. These two settings can highlight the mouse position and click effect in video production, which is quite useful for video production.
-对于键盘的输入,可以安装包[screenkey](https://archlinux.org/packages/community/any/screenkey/),它可以将键盘的键入显示在显示屏上,对于视频的制作同样相当有用。
+For keyboard input, you can install the package [screenkey](https://archlinux.org/packages/community/any/screenkey/), which can display the keyboard input on the display screen, which is also quite useful for video production.
-## 绘图、制图与修饰
+## Drawing, drafting and retouching
-在 linux 上的修饰图片可用[gimp](https://www.archlinux.org/packages/extra/x86_64/gimp/)。如果你需要配合数位板绘图,可使用[krita](https://www.archlinux.org/packages/extra/x86_64/krita/),krita 同时也提供一定的制图功能。矢量图片操作可使用 [inkscape](https://www.archlinux.org/packages/extra/x86_64/inkscape/)
+Retouched images on linux are available [gimp](https://www.archlinux.org/packages/extra/x86_64/gimp/). If you need to draw with the tablet, you can use [krita](https://www.archlinux.org/packages/extra/x86_64/krita/), krita also provides certain drawing functions. Vector image manipulation can be done using [inkscape](https://www.archlinux.org/packages/extra/x86_64/inkscape/)
-[Aseprite](https://www.aseprite.org/) 是一款像素艺术绘制工具,可以使用 yay 安装包[aseprite](https://aur.archlinux.org/packages/aseprite/)。
+[Aseprite](https://www.aseprite.org/) is a pixel art drawing tool, you can use the yay installation package [aseprite](https://aur.archlinux.org/packages/aseprite/).
-[RawTherapee](https://archlinux.org/packages/community/x86_64/rawtherapee/) 是一个自由开源的跨平台 RAW 格式图像处理程序。
+[RawTherapee](https://archlinux.org/packages/community/x86_64/rawtherapee/) is a free and open source cross-platform RAW format image processing program.
-[hugin](https://archlinux.org/packages/community/x86_64/hugin/)是一个可以对图片进行景深进行合成、对图片进行拼接的开源软件,可以以此替代 PhotoShop 的自动对齐图层和自动合并图层。
+[hugin](https://archlinux.org/packages/community/x86_64/hugin/) is an open source software that can synthesize the depth of field of pictures and stitch pictures. It can replace the automatic alignment layers and Automatically merge layers.
-至于格式转换,可以使用 [imagemagick](https://archlinux.org/packages/extra/x86_64/imagemagick/) 的 convert 功能进行图片格式之间的转换。
+As for format conversion, you can use the convert function of [imagemagick](https://archlinux.org/packages/extra/x86_64/imagemagick/) to convert between image formats.
-手绘以及各种手写需求,可以尝试使用[rnote](https://archlinux.org/packages/community/x86_64/rnote/)
+For handwriting and various handwriting needs, you can try to use [rnote](https://archlinux.org/packages/community/x86_64/rnote/)
-## 建模
+## Modeling
-- [blender](https://archlinux.org/packages/community/x86_64/blender/) 强大的 3D 建模软件
-- [Sweet Home 3D](https://archlinux.org/packages/community/x86_64/sweethome3d/) Sweet Home 3D 是一款免费的家装辅助设计软件。它能帮您通过二维的家居平面图来设计和布置您的家具,还可以用三维的视角浏览整个装修布局的全貌。
-- [Synfig Studio](https://archlinux.org/packages/community/x86_64/synfigstudio/) Synfig Studio 是一款免费开源的 2D 动画软件,用于使用矢量和位图图稿创建电影质量的动画。
+- [blender](https://archlinux.org/packages/community/x86_64/blender/) powerful 3D modeling software
+- [Sweet Home 3D](https://archlinux.org/packages/community/x86_64/sweethome3d/) Sweet Home 3D is a free home improvement assistant design software. It can help you design and arrange your furniture through a two-dimensional home floor plan, and you can also browse the entire decoration layout with a three-dimensional perspective.
+- [Synfig Studio](https://archlinux.org/packages/community/x86_64/synfigstudio/) Synfig Studio is a free and open source 2D animation software for creating film-quality animations using vector and bitmap artwork.
-## 音频
+## Audio
-专业的音频制作可使用如下软件。
+Professional audio production can use the following software.
-- [Kwave](https://archlinux.org/packages/extra/x86_64/kwave/) Kwave 是 KDE 开发的一款自由开源的音频编辑软件,可以录制、播放、导入和编辑许多音频文件,包括多声道文件。
-- [lmms](https://archlinux.org/packages/community/x86_64/lmms/) LMMS 是免费自由开源并且跨平台的作曲工具。通过制作旋律和节拍,合成和混合音频,安排音频片段等方法创作音乐。
-- [carla](https://archlinux.org/packages/community/x86_64/carla/)
-- [Ardour](https://archlinux.org/packages/community/x86_64/ardour/) Ardour 是一款自由开源的让你可以在 Linux 上录音、编辑和混音的软件。
-- [vcvrack](https://aur.archlinux.org/packages/vcvrack-bin/) VCV Rack 是一款开源可视化、模块化的音响合成器。
-- [Mixxx](https://archlinux.org/packages/community/x86_64/mixxx/) Mixxx 集成了 DJ 使用数字音乐文件进行创造性现场混音所需的工具。
-- [MuseScore](https://archlinux.org/packages/community/x86_64/lmms/) MuseScore 是 Muse Group 开发的一个跨平台的自由开源制谱软件。
-- [SoundConverter](https://archlinux.org/packages/community/any/soundconverter/) SoundConverter 是 GNOME 桌面的音频文件转换器(这不影响在 Plasma 桌面环境下使用)。
+- [Kwave](https://archlinux.org/packages/extra/x86_64/kwave/) Kwave is a free and open source audio editing software developed by KDE, which can record, play, import and edit many audio files, including many soundtrack file.
+- [lmms](https://archlinux.org/packages/community/x86_64/lmms/) LMMS is a free, open source and cross-platform composition tool. Create music by crafting melodies and beats, synthesizing and mixing audio, arranging audio clips, and more.
+- [carla](https://archlinux.org/packages/community/x86_64/carla/) Carla is a fully-featured modular audio plugin host, with support for many audio drivers and plugin formats.
+- [Ardour](https://archlinux.org/packages/community/x86_64/ardour/) Ardour is a free and open source software that allows you to record, edit and mix on Linux.
+- [vcvrack](https://aur.archlinux.org/packages/vcvrack-bin/) VCV Rack is an open source visual, modular sound synthesizer.
+- [Mixxx](https://archlinux.org/packages/community/x86_64/mixxx/) Mixxx integrates the tools DJs need for creative live mixing using digital music files.
+- [MuseScore](https://archlinux.org/packages/community/x86_64/lmms/) MuseScore is a cross-platform free and open source notation software developed by Muse Group.
+- [SoundConverter](https://archlinux.org/packages/community/any/soundconverter/) SoundConverter is an audio file converter for the GNOME desktop (this does not affect use in the Plasma desktop environment).
+- [Reaper](https://archlinux.org/packages/community/x86_64/reaper/) REAPER is a complete digital audio production application for computers, offering a full multitrack audio and MIDI recording, editing, processing, mixing and mastering toolset.
-## UI/UX 设计
+## UI/UX Design
-- [figma-linux](https://github.com/Figma-Linux/figma-linux) figma 在线版,或者使用一个非官方的 Linux figma 桌面端软件
-- [Akira](https://aur.archlinux.org/packages/akira/) 使用 Vala 和 GTK 构建的 UI/UX 设计 Linux 原生应用
+- [figma-linux](https://github.com/Figma-Linux/figma-linux) figma online version, or use an unofficial Linux figma desktop software
+- [Akira](https://aur.archlinux.org/packages/akira/) Designing Linux-native apps with UI/UX built with Vala and GTK
-## 字幕制作
+## Subtitles
-一般情况来讲,一个视频加上外带的 srt 字幕是较为普遍的情况。这里描述如何为 youtube 视频加入字幕。
-首先要进行视频字幕的下载,这里可以使用一个 chrome 拓展:[YouTubeTM 双字幕](https://chrome.google.com/webstore/detail/youtube-dual-subtitles/hkbdddpiemdeibjoknnofflfgbgnebcm),即可下载你所需要的字幕文件。如果你有更方便的下载方式,欢迎告诉我们。
-接下来进行字幕与视频的重新烧录。MKVToolNix 只能做那种分离的字幕,但是 如 B 站等某些视频网站需要上传烧录好的,为了更好的兼容性,建议始终将视频和文件重新烧录。使用 ffmpeg 进行操作:
+Generally speaking, it is more common to add srt subtitles to a video. Here is how to add subtitles to youtube videos.
+The first thing to do is to download video subtitles, here you can use a chrome extension: [YouTubeTM Dual Subtitles](https://chrome.google.com/webstore/detail/youtube-dual-subtitles/hkbdddpiemdeibjoknnofflfgbgnebcm), you can download your Required subtitle file. If you have a more convenient way to download, please let us know.
+Next, re-burn the subtitles and video. MKVToolNix can only do that kind of separated subtitles, but some video sites such as Bilibili need to upload and burn it. For better compatibility, it is recommended to always re-burn the video and file. Do it with ffmpeg:
```bash
ffmpeg -i input.mp4 -vf subtitles=input.srt output.mp4
```
-如果需要制作双语字幕(同时显示,而不是分字幕轨道),在 youtube 选择自动翻译后,点击中文,如视频支持,会出现双语字幕的文件下载。如视频不支持双语字幕下载,可以使用两次 ffmpeg 命令,第一次添加主字幕,第二次添加副字幕。第一次操作使用 MarginV 进行垂直方向的区分。更多参数可以自行参考 ffmpeg 文档。
+If you need to make bilingual subtitles (display at the same time, instead of subtitle tracks), after youtube selects automatic translation, click Chinese, if the video supports, the file download of bilingual subtitles will appear. If the video does not support bilingual subtitle download, you can use the ffmpeg command twice, the first to add the main subtitle and the second to add the subtitle. The first operation uses MarginV for vertical differentiation. For more parameters, you can refer to the ffmpeg documentation yourself.
```bash
-ffmpeg -i hack.mp4 -strict -2 -vf subtitles=hack_zh.srt:force_style='Fontsize=20,円Fontname=FZYBKSJW--GB1-0,円MarginV=30,円Bold=-1,円BorderStyle=1' -qscale:v 3 hack_with_zh.mp4
-ffmpeg -i hack_with_zh.mp4 -strict -2 -vf subtitles=hack_en.srt:force_style
+ffmpeg -i hack.mp4 -strict -2 -vf subtitles=hack_en.srt:force_style='Fontsize=20,円Fontname=FZYBKSJW--GB1-0,円MarginV=30,円Bold=-1,円BorderStyle=1 ' -qscale:v 3 hack_with_en.mp4
+ffmpeg -i hack_with_en.mp4 -strict -2 -vf subtitles=hack_en.srt:force_style
='Fontsize=15,円Fontname=FZYBKSJW--GB1-0,円Bold=-1,円BorderStyle=1' -qscale:v 3 hack_with_double_subtitles.mp4
```
-除此之外,ffmpeg 还可以进行转码等诸多操作,是一个非常强大的工具,其也是很多音视频软件的重要组件。关于 ffmpeg 更多可自行查询。
+In addition, ffmpeg can also perform transcoding and many other operations. It is a very powerful tool and an important component of many audio and video software. More about ffmpeg can be inquired by yourself.
-## 视觉小说的素材提取
+## Material extraction for visual novels
-目前一般常用的为 [GARbro](https://github.com/morkt/GARbro),但是其在 linux 下通过 wine 无法正常使用。这里提供一个跨平台的 gal game 内容提取工具[arc_unpacker](https://aur.archlinux.org/packages/arc_unpacker-git/)。详细用法可自行查看其 github。
-
-
+At present, [GARbro](https://github.com/morkt/GARbro) is commonly used, but it cannot be used normally through wine under linux. Here is a cross-platform gal game content extraction tool [arc_unpacker](https://aur.archlinux.org/packages/arc_unpacker-git/). For detailed usage, you can check its github by yourself.
diff --git a/docs/uk/exclusive/mine.md b/docs/uk/exclusive/mine.md
index eb2c3b6..979e6d7 100644
--- a/docs/uk/exclusive/mine.md
+++ b/docs/uk/exclusive/mine.md
@@ -1,79 +1,124 @@
-# 加密货币挖矿
+# Getting Started with Cryptocurrencies
-本节描述如何在 Arch Linux 中进行加密货币挖矿。一提到加密货币与挖矿,很多中国读者对加密货币与挖矿有着很深的误解与偏见,这实际上与其国家政府及其控制的媒体、自媒体的宣传导向有关。我们不希望我们的读者被蒙蔽,所以在本文中将进行一些解释。
+This section will briefly describe some basic concepts of cryptocurrencies, and our interpretation. At the same time, readers will be taught how to enter the world of cryptocurrencies on Arch Linux. When it comes to cryptocurrency and mining, many Chinese readers have deep misunderstandings and prejudices about cryptocurrency and mining, which is actually related to the propaganda orientation of the national government and its controlled media and self-media. We don't want our readers to be fooled, so some explanation will be given in this article.
-为什么有人反对加密货币?第一,加密货币在某些威权政府中被视为会威胁其独裁统治的存在,是极其危险与不可控的,所以要进行全面禁止。第二,加密货币已经形成相当庞大的交易市场,其已经对传统的金融行业产生了一定的影响与冲击,所以以巴菲特为首的部分商界代表公开反对加密货币。第三,加密货币在恐怖主义、诈骗与洗钱方面的应用,以及加密货币不环保等较为边缘的理由。
+## What is cryptocurrency
-我们为何支持加密货币?第一,使用加密货币对于无处不在的监视与审计进行反抗。在一些国家中,各种应用广泛的支付手段已经被完全绑定实名,以及进行了全面的监视与审查,个人隐私丝毫没有保障。使用加密货币可以很好的保护你自身的隐私。即使不使用 XMR 等能够高度保证隐私的加密货币,仅仅只使用(正确的使用)普通加密货币也能在很大程度上保障你个人的隐私。第二,加密货币可以作为对抗法币的不稳定性,资产多样化的一种工具。即使很多政府以及各类名流不断的对加密货币进行禁止和否定,加密货币依然安然度过了十余个年头。法币是否稳定?这个问题读者可以自行思考一些国家二十年来法币购买力的变化,一些国家全面禁止加密货币起因何在?读者们应该能够有自己的理解。持有在全世界广泛流通的加密货币,能够提升你在抵御法币风险时的能力,保障自身的权益。第三,即使没有加密货币,恐怖主义、诈骗与洗钱仍然广泛存在于世界,不能因为加密货币可以用于这些用途,就将其归罪与加密货币,这是荒唐的逻辑,提出此类观点的人或组织一般都存在其他的目的。
+Cryptocurrency is a medium of exchange that uses cryptographic principles to secure transactions and control the creation of transaction units. This Wikipedia-style description is more difficult to understand. We try to describe in simpler language. The originator of cryptocurrencies is Bitcoin (BTC), which originated in 2009. In the genesis block of Bitcoin, the sentence `The Times 03/Jan/2009 Chancellor on brink of second bailout for banks.` is embedded. This satirizes the traditional financial industry, while stating the position of the founder Satoshi Nakamoto. Cryptocurrencies that conform to the concept of Bitcoin generally have the following characteristics.
-我们为何支持加密货币挖矿?由于我们的读者大多来自中国,他们通过正规且安全的渠道购买加密货币的手段已经越来越少,从 2022 年目前来看,他们可以获取加密货币的途径只有以下几种:
+- Decentralization, the distribution and decision-making of currency is not determined by centralized organizations, such as governments, banks and other organizations in any centralized form. By participating in mining, you can get a share of your own income.
+- Under the premise of correct use, the personal privacy of users can generally be protected to a great extent.
+- The currency itself is **truly** held by its owner, truly realizing the inviolability of private property. The owner of the currency holds the private key, and others without the private key cannot seize, freeze, or confiscate their cryptocurrency assets.
-- 使用仍允许中国用户进行交易的交易所进行买入
-- 线下交易
-- 通过挖矿获取
+## Why use cryptocurrency
-通过简单的搜索即可发现,目前仍可使用的交易所,某些具有强劲的政府背景,这样的交易所几乎无法保证安全。即使你可以通过此类交易所进行买入与转出,与你实名认证相关的持有、交易、提现到链的记录也可以被轻松获取。实际上,你不应该使用任何中心化交易所。
+As supporters of the free software movement, we also support the use of cryptocurrencies for the following reasons:
-线下交易则是更难,而且风险更高的方式,这一点应该无需赘述。
+- First, use cryptocurrencies to resist ubiquitous surveillance and auditing. In some countries, various payment methods that are widely used have been completely bound with real names, and comprehensive surveillance and review have been carried out, and personal privacy is not guaranteed at all. Using cryptocurrencies is a great way to protect your own privacy. Even if you don't use cryptocurrencies such as XMR that can guarantee a high degree of privacy, just using (correctly used) ordinary cryptocurrencies can protect your personal privacy to a large extent.
+- Second, since fiat currencies in some countries have little or no credit, the use of cryptocurrencies provides protection against this risk as a tool for asset diversification. Even though many governments and various celebrities continue to ban and deny cryptocurrencies, cryptocurrencies have survived more than ten years. Is fiat currency stable? Readers of this question can think about the changes in the purchasing power of fiat currency in some countries over the past few decades. What is the reason for some countries to completely ban cryptocurrencies? Readers should be able to have their own understanding. Holding cryptocurrencies that are widely circulated around the world can improve your ability to resist legal currency risks and protect your rights.
+- Third, even without cryptocurrencies, terrorism, fraud and money laundering are still widespread in the world. Just because cryptocurrencies can be used for these purposes, it cannot be blamed on cryptocurrencies. This is absurd logic. People or organizations generally have other purposes.
-所以综上所述,挖矿是对于处在被压迫的国家或地区的人们**唯一**安全且方便的获取加密货币的方式。
+Why are some people against cryptocurrencies?
-如果你对于加密货币一无所知,可以参考[币安学院](https://academy.binance.com/zh/search?page=1)的系列文章入门,数百篇从低阶到高阶的文章可以供你阅读。
+- First, cryptocurrencies are seen in some totalitarian governments as a threat to their dictatorship. They are extremely dangerous and uncontrollable, so a total ban is required.
+- Second, cryptocurrencies have formed a relatively large trading market, which has had a certain impact and impact on the traditional financial industry, so some business representatives led by Buffett are openly opposed to cryptocurrencies.
+- Third, the use of cryptocurrencies in terrorism, fraud and money laundering, and the more marginal reasons that cryptocurrencies are not environmentally friendly.
-## 注意事项
+## Enter the world of cryptocurrencies on Arch Linux
-在进行挖矿前,在安全方面与使用方面,均有一些重要事项需要提前提醒:
+### Wallet and address
-- 由于个别国家对于加密货币的全面禁止与管制,在进行挖矿的设备上需要使用全局代理,包括代理 DNS。这不仅能够使你连接到矿池等网站,也可以帮助你隐藏自己正在访问加密货币相关网站的动作,从而避开 ISP 或者政府相关部门的监视。这里可以使用 v2raya,它可以使你通过浏览器远程管理挖矿设备的网络,而不用在挖矿设备上安装任何图形化界面程序。
-- 在添加新设备之后,可能需要移除主板 BIOS 电池来放电,注意在放电后系统时间会重置,这会导致 v2ray 无法使用。这种情况下记得先重新校准系统时间。
-- 控制你进行挖矿场所的电费使用情况在一个合理范围内。如果电费使用情况过于离谱,可能会引起某些政府部门的怀疑和监视。
-- 主板 BIOS 设置中,需要开启`Above 4G Decoding`选项以支持多张(一般为 4 张以上)图形显示卡。此设置一般存在于 PCIE 设置中。此设置启用芯片组 64bit 兼容性硬件物理寻址,在关闭时 BIOS 只能使用 32bit 硬件物理寻址。
+If you want to use cryptocurrency, you first need to have a wallet. Currently, the most widely used browser wallet is [Metamask](https://metamask.io/), which can be used by installing the Metamask plugin in the extension store of the browser you are using. The browser wallet allows you to conveniently use the current massive decentralized programs, including many financial applications, communities, games, etc., but generally speaking, its security is not as good as other non-custodial wallets and cold wallets.
-## 钱包与地址
+The selection of wallets and the acquisition of addresses on Arch Linux are described in detail in the chapter of [Modern Privacy Protection Guide](https://archlinuxstudio.github.io/ModernSecurityProtectionGuide/#/anonymous_pay), and will not be repeated in this article.
-关于在 Arch Linux 上钱包的选择与地址的获取,在[现代隐私保护指南](https://archlinuxstudio.github.io/ModernSecurityProtectionGuide/#/anonymous_pay)的章节中有详细描述,本文不再赘述。
+If you need a channel to buy cryptocurrencies anonymously, consider using the service provided by [localmonero](https://localmonero.co/) to buy monero. The transfer between Monero addresses after purchase is anonymous and invisible to the outside world. To convert Monero to other currencies, use a non-mainland Chinese cryptocurrency exchange platform such as [changenow](https://changenow.io/).
-## 选择矿池
+### Mining
-在获得自己的加密货币地址后,要进行矿池的选择。简单来说,加密货币矿工自行进行挖矿,效率是较为低下的。加入矿池,并进行分成是更具效率的挖矿方式。矿池有非常多,有着各自不同的手续费收取方式以及收取比例。对于新手来讲,选择[unmineable](https://unmineable.com/)矿池是不错的选择,它的界面简单易用。
+Mining is the most direct way to enter the cryptocurrency world, this section describes how to do cryptocurrency mining in Arch Linux.
-在进入矿池后,可以选择你需要进行挖矿的币种。注意,这里可以选择的一些实际不能挖矿的币种,不是你实际进行此币种的挖矿操作,而是你进行 Ethereum 等可以挖掘币种的挖矿,然后 unmineable 矿池将收益转化成你所选择的币种再支付给你。
+Since most of our readers are from China, they have fewer and fewer means of purchasing cryptocurrencies through formal and secure channels. From the current point of view in 2022, there are only the following ways for them to obtain cryptocurrencies:
-## 使用工具挖矿
+- Buy using exchanges that still allow Chinese users to trade
+- Offline transactions
+- Obtained by mining
-挖矿工具也有很多以供选择,本文主要讲述 xmrig 用于 CPU 挖矿,LoLMiner 进行 AMD GPU 挖矿、以及 t-rex 进行 Nvidia GPU 挖矿。[ethminer](https://github.com/ethereum-mining/ethminer)则是使用 GPL-3.0 协议的自由软件,是一款通用的以太坊挖矿软件。一般来说,使用 GPU 进行 Ethereum 挖矿效率更高。
+A simple search reveals that there are exchanges that are still in use today, some with strong government backgrounds, with little guarantee of security. Even if you can buy and transfer through such exchanges, the records of holding, trading, and withdrawing to the chain related to your real-name authentication can be easily obtained. Actually, you should not use any centralized exchange.
-### xmrig
+Offline transactions are a more difficult and riskier way, which should not need to be repeated.
-xmrig 可从[github 下载地址](https://github.com/xmrig/xmrig/releases)自行下载,也可从 [AUR](https://aur.archlinux.org/packages/?O=0&SeB=nd&K=xmrig&outdated=&SB=n&SO=a&PP=50&do_Search=Go) 安装。xmrig 是使用 GPL-3.0 许可的自由软件。xmrig-cuda 是 xmrig cuda backends 的插件,你可以根据需要自行选择。在安装完成后,可以使用如下命令进行挖矿。如下命令在亚洲矿池使用 RandomX 进行 TRX 的挖矿。
+So to sum up, mining is the only safe and convenient way for people in oppressed countries to obtain cryptocurrency.
+
+If you don't know anything about cryptocurrencies, you can refer to the [Binance Academy](https://academy.binance.com/en/search?page=1) series of articles to get started, hundreds of articles ranging from low-level to high-level articles are available for you to read.
+
+---
+
+Before mining, there are some important matters that need to be reminded in advance in terms of safety and use:
+
+- Due to the comprehensive prohibition and regulation of cryptocurrencies in individual countries, a global proxy, including proxy DNS, is required on the mining equipment. This not only allows you to connect to websites such as mining pools, but also helps you hide your activity on cryptocurrency-related websites from being monitored by ISPs or government agencies. Here you can use v2rayA, which allows you to remotely manage the network of mining rigs through a browser without installing any GUI program on the mining rig.
+- After adding a new device, it may be necessary to remove the motherboard BIOS battery to discharge, note that the system time will reset after discharge, which will make v2ray unusable. In this case, remember to recalibrate the system time first.
+- Control the electricity usage of your mining site within a reasonable range. If the electricity bill usage is too outrageous, it may arouse suspicion and surveillance by some government departments.
+- In the motherboard BIOS settings, you need to enable the `Above 4G Decoding` option to support multiple (usually 4 or more) graphics cards. This setting is normally present in PCIE settings. This setting enables chipset 64bit compatibility hardware physical addressing, when turned off the BIOS can only use 32bit hardware physical addressing.
+- In the motherboard BIOS settings, adjust the PCI-E speed to Gen2 or Gen1. Otherwise, the problem of not recognizing the graphics card may occur.
+
+---
+
+After obtaining your own cryptocurrency address, you need to choose a mining pool. To put it simply, cryptocurrency miners mine on their own, which is inefficient. Joining a mining pool and splitting is a more efficient way of mining. There are many mining pools, each with different fee collection methods and charging ratios. For beginners, choosing the [unmineable](https://unmineable.com/) mining pool is a good choice, and its interface is simple and easy to use.
+
+After entering the mining pool, you can choose the currency you need to mine. Note that some of the coins that you can choose here are not actually mineable. It is not that you actually perform the mining operation of this currency, but that you mine the coins that can be mined such as Ethereum, and then the unmineable mining pool will convert the income into you. The chosen currency is then paid to you. For specific operations, please refer to the article on the unmineable website. After reaching the minimum amount required to withdraw, you can initiate a withdrawal in the mining pool. There is a certain waiting time for withdrawal, please be patient.
+
+---
+
+When mining with an Nvidia graphics card, you need to install [cuda](https://archlinux.org/packages/community/x86_64/cuda/) first.
+
+When mining with an AMD graphics card, if you use the AMD open source mesa driver, you may not be able to run the mining software. The solution is to temporarily use the proprietary AMD driver [opencl-amd](https://aur.archlinux.org/packages/opencl-amd/). However the latest version of the opencl-amd driver in AUR may still not work, if you encounter this problem, the solution is to use the [older version 20.45 driver](https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=opencl-amd&id=99929da87153c0f36a2a9497c38221c12307ecfc). After downloading PKGBUILD, use makepkg to generate the package and install it. This may be required when using other AMD mining programs.
+
+There are also many mining tools to choose from. [ethminer](https://github.com/ethereum-mining/ethminer) is free software using the GPL-3.0 protocol and is a general-purpose Ethereum mining software. In general, Ethereum mining is more efficient with GPUs. There are also some popular proprietary mining software such as LoLMiner and T-Rex. For specific operations, please refer to their official documentation.
+
+[xmrig](https://github.com/xmrig/xmrig) can be used for XMR mining. xmrig is free software licensed under GPL-3.0. xmrig-cuda is a plugin for xmrig cuda backends, you can choose according to your needs.
+
+---
+
+Generally speaking, the mining program needs to be set to automatically restart and start automatically. For this, you can use supervisor to achieve this. First, install and start.
```bash
-xmrig -o rx-asia.unmineable.com:3333 -u TRX:TWxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.miner1 -p x --1g
+sudo pacman -S supervisor
+sudo systemctl enable --now supervisord.service
```
-其中部分参数含义同上, --1g 参数为开启 1g 大页面的支持。
+Then, create a configuration file in the target directory, such as `/etc/supervisor.d/eth.ini`, and then restart the supervisord service for the configuration to take effect. In this way, the requirements of automatic restart and boot-up can be realized. Below is a sample configuration file.
-### T-Rex
+```ini
+[program:eth]
+directory=/home/testuser
+command=YOUR_MINE_COMMAND
+autostart=true
+autorestart=true
+```
-使用 Nvidia 显卡挖矿时,需要首先安装 [cuda](https://archlinux.org/packages/community/x86_64/cuda/)。
+### Fan speed regulation in headless conditions
-T-Rex 可从[github 下载地址](https://github.com/trexminer/T-Rex/releases)自行下载,也可从 [AUR](https://aur.archlinux.org/packages/trex-bin/) 安装。T-Rex 是专有软件。在安装完成后,可以使用如下命令进行挖矿。如下命令在亚洲矿池使用 ethash 进行 TRX 的挖矿。
+Adjusting the fan speed of the graphics card is a tricky thing when it is not connected to the monitor, that is, headless.
+
+Set the fan speed of AMD graphics card. Install the software amdgpu-fan and enable the service. amdgpu-fan will automatically adjust the fan speed according to the graphics card temperature. Note that [the current version of AUR](https://github.com/zzkW35/amdgpu-fan/issues/2) has a problem that the boot cannot be automatically started to take effect. According to [Issue](https://github.com/zzkW35 /amdgpu-fan/issues/2), its upstream [source repository] (https://github.com/chestm007/amdgpu-fan) does not have this problem.
-```bash
-./t-rex -a ethash -o ethash-asia.unmineable.com:3333 -u TRX:TWxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.miner1 -p x
+```
+yay -S amdgpu-fan
+sudo systemctl enable --now amdgpu-fan
```
-其中-a 参数指定算法。-o 指定矿池的 ip 和端口号,这些参数你可以在矿池页面找到。-u 参数指定币种、收币地址、主机名、以及优惠码,其中收币地址需要更换成你自身的地址,而使用优惠码可以减免 0.25%的手续费。
+For more information on setting the fan speed of AMD graphics cards, please refer to [Arch Wiki](https://wiki.archlinux.org/title/fan_speed_control#AMDGPU_sysfs_fan_control).
-需要注意的是,t-rex 运行后会在本机 127.0.0.1:4067 开启控制面板,你可在其中进行各类信息的查看。如果想要在其他机器访问挖矿机器面板,则需额外指定`--api-bind-http 0.0.0.0:4067`参数,这样一来你就可以达到目的。
+---
-使用英伟达显卡挖矿也需要额外对风扇转速进行设置,否则风扇不会根据温度来调整转速,即使温度较高,也近会运行在较低的转速,这个问题在进行深度学习等操作时仍然存在。如果你启动了图形化界面,则可通过 nvidia-settings 进行转速设置。英伟达显卡的转速设置依赖 X server 造成的,所以默认情况下,如果不启动 X server 则无法进行风扇调速。此时可以使用工具[coolgpus](https://github.com/andyljones/coolgpus),其工作原理是,它会为每个 GPU 设置一个临时 X server。然后,它每隔几秒钟循环查看一次 GPU,并根据它们的温度设置风扇速度。当脚本终止时,它会将风扇的控制权返回给驱动程序并清理 X server。pip 安装的 coolgpus 位于`~/.local/bin/coolgpus`。
+Mining with NVIDIA graphics cards also requires additional fan speed settings, otherwise the fan will not adjust the speed according to the temperature. Even if the temperature is high, it will run at a low speed. This problem still exists when deep learning and other operations are performed. . If you start the GUI, you can set the speed through nvidia-settings. The speed setting of the Nvidia graphics card depends on the X server, so by default, if the X server is not activated, the fan speed cannot be adjusted. The tool [coolgpus](https://github.com/andyljones/coolgpus) is available at this point, which works by setting up a temporary X server per GPU. It then cycles through the GPUs every few seconds and sets fan speeds based on their temperatures. When the script terminates, it returns control of the fan to the driver and cleans up the X server. The coolgpus installed by pip is located at `~/.local/bin/coolgpus`.
- https://ximikang.icu/2021/03/09/ubuntu%E7%B3%BB%E7%BB%9F%E8%B0%83%E8%8A%82GPU%E9%A3%8E%E6%89%87%E8%BD%AC%E9%80%9F
---
-coolgpus 在一些显卡无法生效,这种情况下可以使用[set_gpu_fans_public](https://github.com/boris-dimitrov/set_gpu_fans_public)。下载 set_gpu_fans_public 后,需要更改其 cool_gpu 以及 nvscmd 两个脚本中 `nvidia-smi`以及`nvidia-settings` 命令的路径为正确路径,除此之外还需修改 cool_gpu 中 dir 的路径为正确路径。随后需要安装包[xorg-xinit](https://archlinux.org/packages/extra/x86_64/xorg-xinit/)。最后创建符号链接,在位于 /opt 其目录中用 tcsh 启动,详见其代码注释。
+coolgpus does not work for some graphics cards, in this case, you can use [set_gpu_fans_public](https://github.com/boris-dimitrov/set_gpu_fans_public). After downloading set_gpu_fans_public, you need to change the paths of the `nvidia-smi` and `nvidia-settings` commands in the two scripts of cool_gpu and nvscmd to the correct path. In addition, you need to modify the path of the dir in cool_gpu to the correct path. The package [xorg-xinit](https://archlinux.org/packages/extra/x86_64/xorg-xinit/) is then required to be installed. Finally, create a symbolic link and start it with tcsh in its directory located in /opt, see its code comments for details.
- https://www.codeleading.com/article/26244997267/
- https://www.jianshu.com/p/ab956df5e40c
@@ -88,87 +133,79 @@ Ref:
- https://github.com/iaalm/GPUFanSpeed
- https://www.google.com/search?q=TOC-Faking-a-Head-for-a-Headless-X-Server+347
-### lolMiner
+### Graphics card overclocking in headless conditions
-lolMiner 是专有软件。
+In the case of starting the graphical interface, overclocking the Nvidia graphics card is relatively simple, please refer to [arch wiki](https://wiki.archlinux.org/title/NVIDIA/Tips_and_tricks#Overclocking_and_cooling) for details. This section describes overclocking Nvidia graphics cards in a headless environment without starting the GUI.
-在使用 AMD 显卡进行挖矿时,如果你使用 AMD 开源 mesa 驱动则有可能无法运行挖矿软件。解决方案是使用专有 AMD 驱动 [opencl-amd](https://aur.archlinux.org/packages/opencl-amd/)。然而在 AUR 中最新版本的 opencl-amd 驱动仍可能无法作用,如果你遇到此问题,解决方案是使用[旧版的 20.45 版本的驱动程序](https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=opencl-amd&id=99929da87153c0f36a2a9497c38221c12307ecfc)。将 PKGBUILD 下载后使用 makepkg 生成包并安装。使用其他 AMD 挖矿程序时均可能需要此操作。
+The general overclocking ideas related to Ethereum are: overclocking memory, down/locking the core, and limiting the maximum power if necessary.
-接下来需要对 AMD 显卡的风扇风速进行设定。安装软件 amdgpu-fan 并启用服务即可。amdgpu-fan 会根据显卡温度自动调整风扇转速。注意,[AUR 当前的版本](https://github.com/zzkW35/amdgpu-fan/issues/2)存在开机无法自动启动生效的问题,根据[Issue](https://github.com/zzkW35/amdgpu-fan/issues/2)描述,其上游[源仓库](https://github.com/chestm007/amdgpu-fan)不存在此问题。
+For more complete steps, please refer to the article [Linux Overclocking Graphics Card Via Command Line](https://jybb.me/linux-overclock-graphic-card-via-cli), and follow the steps. Here are some additional considerations:
-```
-yay -S amdgpu-fan
-sudo systemctl enable --now amdgpu-fan
-```
+- When editing `/etc/X11/xorg.conf`, the value of `ConnectedMonitor` needs to be filled in according to the actual value in your own generated file. In ArchLinux its value is generally `Monitor0` instead of `DFP-0`.
+- When setting different perf levels during overclocking, generally the value of [4] corresponds to the current preferred maximum performance level. The ratings shown in nvidia-smi do not seem to correspond to the numbers here. If you are not sure about your current level, try it from 1 to 4.
+- If you are still not sure about the perf level, you can directly use the adjustments corresponding to all levels, such as `GPUMemoryTransferRateOffsetAllPerformanceLevels` and `GPUGraphicsClockOffsetAllPerformanceLevels`.
+- If the overclocking command is executed directly in the terminal, the parameters following the -a option of nvidia-settings can be wrapped without single quotes, but if executed in a script, the parameters need to be wrapped with single quotes.
+- Lock the core frequency of a graphics card with this command: `nvidia-smi -i 0 -lgc 1075`. This command limits the core frequency of the zeroth graphics card to 1075. Note that if the frequency limit is set too high, but the power or performance is insufficient, the frequency will drop and eventually settle at a value below the set lock frequency.
+- Even with the same model of graphics card, the physique and type of video memory may be different. Therefore, you need to adjust slowly according to the actual physique of your graphics card to find the most stable overclocking parameters. The existing overclocking parameters on the Internet can only be used as a rough reference.
+- The lighting problem of the graphics card, many 20, 30 series new graphics cards use I2C control, but the NVIDIA linux driver does not support it, the traditional control through the `GPULogoBrightness` parameter can no longer take effect. See [github issue](https://github.com/NVIDIA/nvidia-settings/issues/48)
+- If overclocking is not possible, try restarting the lightdm service and overclocking again.
-关于更多 AMD 显卡风扇转速的设置方法可参考 [Arch Wiki](https://wiki.archlinux.org/title/fan_speed_control#AMDGPU_sysfs_fan_control).
+Ref:
-下载 [lolMiner](https://github.com/Lolliedieb/lolMiner-releases) 并运行:
+- [ethminer overlock guide](https://github.com/ethereum-mining/ethminer/issues/456#issuecomment-370224878)
+- [NVIDIA-SMI 系列命令总结](https://blog.csdn.net/handsome_bear/article/details/80903477)
+- [nvidia-smi: Control Your GPUs](https://www.microway.com/hpc-tech-tips/nvidia-smi_control-your-gpus/)
-```bash
-./lolMiner --algo ETHASH --pool ethash-asia.unmineable.com:3333 --user ETH:0xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.miner1 --ethstratum ETHPROXY pause --apihost 0.0.0.0 --apiport YOUR_PORT
-```
+---
+
+AMD graphics cards are much easier to overclock than Nvidia graphics cards in a headless environment. Just refer to the wiki. For overclocking tools, it is recommended to use [amdgpu-clocks-git](https://aur.archlinux.org/packages/amdgpu-clocks-git).
-## 提现
+Ref:
+
+- [AMD RX 470(D) Linux 挖矿](https://reimu.moe/2021/03/10/AMD-RX470-D-Linux-Mining/)
+- [Arch wiki](https://wiki.archlinux.org/title/AMDGPU#Overclocking)
-在达到要求提现的最小限额后,你即可在矿池发起提现。提现有一定等待时间,需要耐心等待。
+---
-## 防火墙防护
+### Firewall Protection
-如果你在内网环境中启用一些监控面板以便使用,则需要注意开启防火墙防护,因为你的内网中的设备,可能存在恶意软件,对网络中的端口、服务进行扫描、监视并上报。
+If you enable some monitoring panels for use in the intranet environment, you need to pay attention to opening the firewall protection, because the devices in your intranet may have malware, scan, monitor and report the ports and services in the network.
-这里采用 ufw 工具进行防火墙防护。第一,因为其使用简单,第二,因为 ufw 与 v2raya 无冲突,可正常使用。firewalld 默认情况下无法与 v2raya 同时正常使用。
+The ufw tool is used here for firewall protection. First, because it is easy to use, and second, because ufw does not conflict with v2raya, it can be used normally. firewalld does not work properly with v2raya by default.
```bash
sudo pacman -S ufw
sudo systemctl enable --now ufw
-sudo ufw default deny #默认拒绝
+sudo ufw default deny #default deny
-sudo ufw allow from YOUR_TRUST_LAN_IP #只允许你信任的内网 ip 连接
-sudo ufw allow ssh #允许 ssh 以便内网以及外网通过 nps 的ssh连接
-sudo ufw allow 8024 #允许 nps 的默认网桥通信端口工作
+sudo ufw allow from YOUR_TRUST_LAN_IP #Only allow connections from your trusted intranet ip
+sudo ufw allow ssh #Allow ssh so that the internal network and the external network can connect through nps ssh
+sudo ufw allow 8024 #Allow the default bridge communication port of nps to work
-sudo ufw enable #设置完成后启用
-sudo ufw status #检查状态
+sudo ufw enable #Enable after setting is complete
+sudo ufw status #Check status
```
Ref: https://wiki.archlinux.org/title/Uncomplicated_Firewall
-## 辅助命令
+### Auxiliary commands
-你可用如下命令查看识别到的显卡编号,此命令将列出真正被系统识别可用的显卡编号。
+You can use the following command to check the identified graphics card numbers, this command will list the graphics card numbers that are actually recognized by the system.
```bash
ls /sys/class/drm | grep "^card[[:digit:]]$"
```
-你可用如下命令查看各个显卡设备的详情
+You can use the following command to view the details of each graphics card device
```bash
sudo lspci -vnn | grep VGA -A 12
```
-你可用[speedtest-cli](https://archlinux.org/packages/community/any/speedtest-cli/)在终端下测试网速情况
+You can use [speedtest-cli](https://archlinux.org/packages/community/any/speedtest-cli/) to test the network speed in the terminal
```bash
sudo pacman -S speedtest-cli
speedtest-cli
```
-
----
-
-## 附加说明
-
-TRON 网络自身会屏蔽一些 IP 地址,经过我们验证的有亚洲香港,新加坡,未经过我们验证的可能也有其他地区。如果你使用这些被屏蔽的地区的代理来使用 TRON 网络,操作 TRON 钱包,你可能会遇到如下的问题。在你想要给某人发送 TRON 钱包中的货币时,如 USDT,你的余额可能从你的余额的实际数值突然跳转至 0,这将使你无法继续发送货币给对方,解决办法如下。
-
-使用一个欧盟地区的代理来进行以下操作。
-
-1. 先从你的原有钱包里导出 TRON 钱包的私钥。
-2. 在设置中重新下载备份文件。
-3. 使用一个你未曾使用过加密货币钱包如 Guarda 的浏览器,重新进入钱包,选择"Restore or Import"选项
-4. 选择"Import by currency",然后将刚刚得到的 TRON 钱包的私钥填入其中
-
-做完如上步骤后,再发送 USDT 即可一切正常。
-
-另外一个可能的问题是,导入巨量的钱包时,上述问题可能重现。
diff --git a/docs/uk/play&office/android.md b/docs/uk/play&office/android.md
index ba62ae7..7c76eed 100644
--- a/docs/uk/play&office/android.md
+++ b/docs/uk/play&office/android.md
@@ -1,83 +1,85 @@
-# 安卓刷机
+# Android Flashing
-[Arch Wiki 安卓文档](https://wiki.archlinux.org/index.php/android)
+[Arch Wiki Android Doc](https://wiki.archlinux.org/index.php/android)
-## 为什么要刷机
+## Why need Android Flashing
-在目前市面上可见的各个手机品牌中,除了其自己魔改的闭源安卓手机系统外,几乎任何一个品牌都会预装上一系列的出厂应用,如浏览器,通讯录,应用市场等。这些应用均为闭源软件,由各个手机厂商开发提供。这里就存在严重的问题,这些魔改系统以及闭源应用软件可能会进行各种间谍功能,对使用者进行监控以及审计。据报告,小米以及华为手机均会对用户的搜索以及浏览进行上报,匹配到关键词如"西藏自由","台湾独立","民主自由"等词即会进行加密上报,这些关键词可能有成百上千个。由于此类原因,使得使用者必须对手机的系统进行重新刷入,选择一个开源可靠的 ROM 刷入手机可以保障自己的隐私及安全。在硬件层面,也存在审计与监控的可能性,但是目前尚未知明确且可靠的报告,如有条件,可选择非人身所在国家品牌的手机。
+Among the mobile phone brands currently available on the market, in addition to its own magic-modified closed-source Android mobile phone system, almost any brand will be pre-installed with a series of factory applications, such as browsers, contacts, and application markets. These applications are all closed-source software developed and provided by various mobile phone manufacturers. There is a serious problem here. These magic-modified systems and closed-source application software may perform various espionage functions to monitor and audit users. According to reports, both Xiaomi and Huawei mobile phones will report users' searches and browsing, and if keywords such as "Tibet freedom", "Taiwan independence", "democracy and freedom" are matched, they will be encrypted and reported. These keywords may have Hundreds of thousands. Due to such reasons, users must re-flash the system of the mobile phone. Choosing an open source and reliable ROM to flash the mobile phone can protect their privacy and security. At the hardware level, there is also the possibility of auditing and monitoring, but there is no clear and reliable report yet.
-> 华为鸿蒙与小米的 MIUI 等厂商存在着与威权政府合作的风险,并且这种风险目前来看越来越大,操作系统层面来看,整合所谓"反诈系统"几乎已经是箭在弦上的事情。是否会有硬件级别的监控和审计,目前尚无明确证据。为了你的隐私与安全,如果这些厂商的手机无法自行刷入安全的 ROM,那么你需要拒绝使用这些厂商的产品。
+> Mainland Chinese manufacturers such as Huawei Hongmeng and Xiaomi’s MIUI have the risk of cooperating with the authoritarian government, and this risk is getting bigger and bigger. From the perspective of the operating system, the integration of the so-called "anti-fraud system" is almost on the verge of completion. . Whether there will be hardware-level monitoring and auditing, there is no clear evidence yet. For your privacy and security, if the mobile phones of these manufacturers cannot be flashed into the secure ROM by themselves, then you need to refuse to use the products of these manufacturers.
-买手机最好买知名度大的品牌,较热门的机型,这样在刷机时可以方便的找到官方的 twrp 和知名的 ROM 包,如[魔趣](https://download.mokeedev.com/),[LineageOS](https://lineageos.org/),[crDroid](https://crdroid.net/), [Resurrection Remix](https://resurrectionremix.com/),[PixelExperience](https://download.pixelexperience.org/devices)等。如果是较冷门的品牌,官方可能没有提供 ROM,只能在网上自行寻找个人改造过的 twrp 和上述 ROM 包的 unofficial ROM,搜索的方式一般为手机的代号+ROM。这种个人改造版本的安全性比较难说,而且还可能有更多的 bug。也有可能你翻遍全网,也找不到冷门机型能用(指好用的、非硬件提供商的官方 ROM)的 twrp 和 ROM。硬件方面,一般推荐买高通骁龙的 cpu,不要买联发科的,因为更多 ROM 的版本都是适配高通硬件的。
+It is best to buy a mobile phone with a well-known brand and a popular model, so that you can easily find the official twrp and well-known ROM packages when flashing the phone, such as[LineageOS](https://lineageos.org/), [crDroid](https://crdroid.net/), [Resurrection Remix](https://resurrectionremix.com/), [PixelExperience](https://download.pixelexperience.org/devices),[grapheneos](https://grapheneos.org/) etc. If it is a relatively unpopular brand, the official may not provide ROM, and you can only find the personal modified twrp and the unofficial ROM of the above ROM package on the Internet. The search method is generally the code name of the mobile phone + ROM. The security of such a personal modification is more difficult to say, and it may also have more bugs. It is also possible that you have searched the whole network, but you cannot find twrp and ROM that can be used by unpopular models (referring to easy-to-use, non-hardware provider's official ROM). In terms of hardware, it is generally recommended to buy Qualcomm Snapdragon cpu, not MediaTek, because more ROM versions are compatible with Qualcomm hardware.
-首先需要安装 linux 上的安卓工具包
+First you need to install the android toolkit on linux
```bash
sudo pacman -S android-tools
```
-## 解锁 bootloader
+## Unlock bootloader
-再次提醒要购买或使用有可能解锁 bootloader 的手机品牌。一般来说像小米这种品牌,官方会提供解锁 bootloader 的途径和工具,但是这些工具基本只能在 windows 下用。这时候你就只能用一台 windows 操作,或者使用虚拟机。
+Again, a reminder to buy or use a phone brand that might unlock the bootloader. Generally speaking, for brands like Xiaomi, the official will provide ways and tools to unlock the bootloader, but these tools can only be used under windows. At this time, you can only use a windows operation, or use a virtual machine.
-除此之外,如果你能获取,或通过很 hack 的方式拿到 bootloader 的解锁码,那么也可以使用 adb 在 fastboot 模式下进行解锁。
+In addition, if you can get, or get the unlock code of the bootloader in a very hacky way, you can also use adb to unlock it in fastboot mode.
```bash
-$ adb reboot bootloader #手机先链接电脑,重启到fastboot
-$ fastboot oem unlock xxxxxxx #在fastboot模式下解锁,要加上正确的bl码才能解锁,否则会报错
+$ adb reboot bootloader #The mobile phone first connects to the computer and restarts to fastboot
+$ fastboot oem unlock xxxxxxx #Unlock in fastboot mode, you must add the correct bl code to unlock, otherwise an error will be reported
FAILED (remote: 'check password failed!')
fastboot: error: Command failed
```
-## 刷入 twrp 并进行刷机
+## Flash twrp and ROM
-没有官方 twrp 的设备,可以在[unofficialtwrp](https://unofficialtwrp.com/devices/)查看下是否有。
+There is no official twrp device, you can check it at [unofficialtwrp](https://unofficialtwrp.com/devices/).
-如果没有相关信息有几个论坛和网站可以看看
+If there is no relevant information, there are several forums and websites you can look at
- xda https://forum.xda-developers.com/
-- https://androidfilehost.com/ 搜索 开发代号 + 你想要的系统名字
+- https://androidfilehost.com/ search development code + system name you want
-一般 twrp 的版本和 ROM 包有对应关系,刷机前先确认你的两个版本是兼容的,否则刷机过程可能报奇怪的错误,如 unable to mount /system
+Generally, the version of twrp has a corresponding relationship with the ROM package. Before flashing, make sure that your two versions are compatible, otherwise the flashing process may report strange errors, such as unable to mount /system
-去下载你机型对应的 twrp。在[官网](https://twrp.me/Devices/)搜索你的机型,下载。如果没有看到你的机型说明官方不支持,你需要自行搜索别人修改的版本。将手机连接电脑,注意要连到 USB2.0 的接口,否则可能有兼容性问题。
+Go to download the twrp corresponding to your model. Search for your model on the [official website](https://twrp.me/Devices/) and download it. If you don't see your model, it means that it is not officially supported, and you need to search for the version modified by others. Connect the phone to the computer, be careful to connect it to the USB2.0 interface, otherwise there may be compatibility problems.
-让手机进入 fastboot 模式,在电脑打开终端,执行
+Put the phone into fastboot mode, open the terminal on the computer, and execute
```bash
fastboot flash recovery ./path/of/your-twrp.img
```
-看到终端执行完毕的时候,就可以让手机重启了。这里注意,执行`fastboot reboot`可以重启,但是许多设备会在首次启动时自动覆盖替换你刷入的自定义 recovery,这样直接重启会报错不是官方系统等类似信息。为防止这种情况,在手机上通过硬件按键重启进入 recovery,TWRP 将给 ROM 打 patch,以防止 ROM 替换 TWRP。[[1]](https://twrp.me/xiaomi/xiaomimi5.html)
+When you see the terminal has finished executing, you can restart the phone. Note here that executing `fastboot reboot` can restart, but many devices will automatically overwrite and replace the custom recovery you flashed at the first boot, so a direct restart will report an error that it is not an official system and similar information. To prevent this, reboot into recovery via a hardware key on the phone, and TWRP will patch the ROM to prevent the ROM from replacing TWRP. [[1]](https://twrp.me/xiaomi/xiaomimi5.html)
-剩下的步骤就是普通的进入 twrp,双清,刷机即可。
+The remaining steps are to simply enter twrp, double-clear, and flash.
-> 有时双清或者进入 twrp 可能看到报错,用高级清理,从 ext4 改一下格式,再改回 ext4 可能就解决了
+> Sometimes double-clear or enter twrp may see an error, use advanced cleaning, change the format from ext4, and then change back to ext4 may be solved
-更多命令:
+More commands:
```bash
-$ adb shell #打开adb shell
-$ adb root #在手机已经root的情况下打开root权限的adb shell
+$ adb shell #Open adb shell
+$ adb root #Open adb shell with root privileges when the phone is already rooted
```
-## 有关华为设备
+## Remove the network restriction prompt
-如果你没有在 18 年华为关闭 bl 锁码申请前拿到密码,那刷机在现在将变得基本不可能,尤其是近一年左右的新设备。
+Google has introduced the "Captive Portal" mechanism since Android 5.0, which is mainly used to detect whether the WiFI network authentication is normal. The default detection access is the server outside the Google wall. When using native Android, which is common in the world, this service will prompt that the network is restricted in the wall environment, even if services such as Shadowsocks have been turned on. To solve this problem, you can use the adb command to modify the server to detect access to google.cn.
-老一些的设备可以尝试一下如下方法。
-
-下载 DC-unlocker 花四欧元,下载到电脑上检测设备,登陆,然后尝试解锁读取 bl 码。不是所有设备都能成功,有些机型虽然在其支持列表里,也没有成功。流程大致可以参考[这个](https://www.forece.net/post/4886.htm)。查到的原因是安卓 8 之后某个安全补丁后,DC unlocker 已经不能读到 bl 码。看 DC 之后的更新能否解决这个问题吧。
+```
+adb shell settings put global captive_portal_server www.google.cn
+adb shell settings put global captive_portal_https_url https://www.google.cn/generate_204
+adb shell settings put global captive_portal_mode 0
+```
-还有另一个办法是先降级,然后在用 DC 解锁。通过 Firmware Finder 降级的方式,经过尝试后也无法成功,拿不到检测的更新了,据说是 **EMUI8.0.0.129** 后封死了其他渠道回滚。[资料 1](https://club.huawei.com/thread-15361104-1-1.html)[资料 2](https://cn.ui.vmall.com/thread-19813753-1-1.html)[资料 3](https://www.cnblogs.com/lsgxeva/p/13469490.html)
+Finally, switch to the flight mode and switch back to solve it.
-淘宝卖码的反馈华为较新机型无法解锁拿到 BL。
+## Flash into Google Suite
-还有一个自行拿十六进制里 bl 码的[教程](https://www.52pojie.cn/thread-816065-1-1.html),前提是必须先拿到 root,这在新机型上基本也不可能了。旧机型可以尝试。在 linux 上检查十六进制可用这个软件[Bless](https://www.archlinux.org/packages/community/any/bless/)
+In some scenarios, you need to flash into the Google suite because you need to use Google play. Optional projects are [opengapps](https://opengapps.org/), [nikgapps](https://nikgapps.com/) and [suites provided by lineageos](https://wiki.lineageos.org/gapps). opengapps updates seem to have stalled at the moment. nikgapps can be customized.
-最后有 github 项目[PotatoNV](https://github.com/mashed-potatoes/PotatoNV)可以参考,其声称可以解锁部分机型的 bootloader。Linux 下的版本:[PotatoNV-crossplatform](https://github.com/mashed-potatoes/PotatoNV-crossplatform)
+## Unlock root privileges
----
+Use Magisk to unlock root privileges. Download the Magisk apk file from its [official release interface](https://github.com/topjohnwu/Magisk/releases), and rename it to a .zip suffix. Then copy it to the phone, and finally enter twrp to flash the zip package.
Ref:
diff --git a/docs/uk/play&office/media.md b/docs/uk/play&office/media.md
index 91e66b3..7aa5980 100644
--- a/docs/uk/play&office/media.md
+++ b/docs/uk/play&office/media.md
@@ -1,43 +1,44 @@
-# 视频影音
+# Audio & Video
-本节记录在 arch linux 上观看影视,收听音乐等相关信息。
+This section records related information about watching movies and listening to music on arch linux.
-## 在线听歌与音频播放器
+## Online music and audio player
-网络音乐收听可以使用网易或腾讯出品的[网易云音乐](https://aur.archlinux.org/packages/netease-cloud-music/),[qq 音乐](https://aur.archlinux.org/packages/qqmusic-bin/),但它们都年久失修,或者质量惨不忍睹。显然这些大公司是不会愿意向 Linux 桌面投放精力的,我们更推荐你来使用维护更到位的自由软件。
+To listen to online music, you can use [Netease Cloud Music](https://aur.archlinux.org/packages/netease-cloud-music/), [qq Music](https://aur.archlinux.org/packages/qqmusic-bin/) produced by NetEase or Tencent , but they are either in disrepair or of poor quality. Obviously these big companies are not willing to invest their energy in the Linux desktop, and we recommend you to use free software that is better maintained.
-[yesplaymusic](https://github.com/qier222/YesPlayMusic) 是一款全平台的开源听歌软件,颜值高、无社交功能,并且是全网资源整合,推荐使用
+[yesplaymusic](https://github.com/qier222/YesPlayMusic) is a full-platform open source music listening software, with high appearance, no social functions, and integration of whole network resources, it is recommended to use
```bash
yay -S yesplaymusic
```
-[listen1](https://github.com/listen1/listen1_desktop) 是一款老牌的听歌软件,功能完善,同样资源全网整合,推荐使用
+[listen1](https://github.com/listen1/listen1_desktop) is an old-fashioned music listening software with complete functions. The same resources are integrated across the entire network. It is recommended to use
```bash
yay -S listen1-desktop-appimage
```
-[Electron Netease Cloud Music](https://github.com/Rocket1184/electron-netease-cloud-music) 是一款用 Electron 和 Vue 编写的网易云音乐 Linux 客户端,支持歌曲下载,这是它的优势,但是曲库没有前两款软件齐全。
+[Electron Netease Cloud Music](https://github.com/Rocket1184/electron-netease-cloud-music) is a Netease Cloud Music Linux client written with Electron and Vue, which supports song download, which is its advantage , but the music library is not as complete as the first two software.
```bash
-sudo pacman -S electron-netease-cloud-music
+yay -S electron-netease-cloud-music
```
-[FeelUOwn](https://github.com/feeluown/FeelUOwn) 是一个符合 Unix 哲学的跨平台的音乐播放器,安装简单,新手友好,默认提供国内各音乐平台插件。
+
+[FeelUOwn](https://github.com/feeluown/FeelUOwn) is a cross-platform music player that conforms to the Unix philosophy. It is easy to install, novice-friendly, and provides plug-ins for various domestic music platforms by default.
```bash
yay -S feeluown
-# 按需安装以下插件
+# Install the following plugins as needed
yay -S feeluown-local feeluown-netease feeluown-qqmusic feeluown-kuwo
```
-## 视频播放器
+## Video player
-本地音视频播放一般使用 vlc 或 mpv
+Local audio and video playback generally uses vlc or mpv
```bash
-sudo pacman -S vlc #VLC 播放器
-sudo pacman -S mpv #MPV 播放器
+sudo pacman -S vlc #VLC player
+sudo pacman -S mpv #MPV player
```
-除此之外,如果你想收看在线影视资源,[zy-player](https://aur.archlinux.org/packages/zy-player-bin/)是一个很好的选择,它是一个跨平台视频资源播放器, 整合全网资源,可以播放一些电影。
+Besides, if you want to watch online video resources, [zy-player](https://aur.archlinux.org/packages/zy-player-bin/) is a good choice, it is a cross-platform Video resource player, integrates the whole network resources, can play some movies.
diff --git a/docs/uk/play&office/office.md b/docs/uk/play&office/office.md
index c90a0e4..dbb25e9 100644
--- a/docs/uk/play&office/office.md
+++ b/docs/uk/play&office/office.md
@@ -1,193 +1,202 @@
-# 办公日常
+# Office Routine
-本章记录日常办公需要用到的软件及配置。同时包括各类即时通讯软件和网盘、远程协助等软件的配置与使用。
+This chapter records the software and configuration required for daily office work. At the same time, it includes the configuration and use of various instant messaging software, network disk, remote assistance and other software.
-> QQ 与微信等中国国内知名闭源专有 IM 软件均存在不同程度的间谍行为(实际上不仅仅是 IM 软件,几乎所有你能见到的中国国内大型互联网 APP 均有严重的间谍行为,美其名曰:用户行为监测或用户画像描述)。收集用户信息,扫描用户手机存储内容,监控粘贴版内容,记录手机安装 APP 列表等无耻行为几乎已经成为业内公开的秘密。除了自身作恶,这类专有间谍软件还与威权政府狼狈为奸,迫害与追捕民运人士以及异议人士。同时,腾讯一直以来不遗余力的封杀第三方客户端,导致始终没有一个稳定可用的版本。腾讯于 2020 年出品了官方版本 LinuxQQ,其品质可以用惨不忍睹形容。**我们不支持你使用 QQ 或微信这类专有间谍通讯软件作为你的主要通讯方式。本教程亦不提供任何支持。**
+> Well-known closed-source proprietary IM software in China, such as QQ and WeChat, have different degrees of espionage (actually, not only IM software, but almost all large domestic Internet APPs you can see in China have serious espionage behavior. Its name is: user behavior monitoring or user portrait description). Shameless acts such as collecting user information, scanning user mobile phone storage, monitoring pasted content, and recording mobile phone installed APP lists have almost become open secrets in the industry. In addition to its own evildoing, this type of proprietary spyware also works with authoritarian governments to persecute and hunt down pro-democracy activists and dissidents. At the same time, Tencent has spared no effort to block third-party clients, resulting in no stable and usable version. Tencent released the official version of LinuxQQ in 2020, and its quality can be described as appalling. **We do not support your use of proprietary spy messenger software such as QQ or WeChat as your primary means of communication. This tutorial also does not provide any support. **
-> 欧盟于近些年出台了[GDPR 通用数据保护条例](https://en.wikipedia.org/wiki/General_Data_Protection_Regulation),国内各大知名互联网软件公司在开发海外版软件时均需严格遵守上传数据、用户隐私等规定。然而在开发中国国内版时,则尽可能上传其能获取到的全部用户个人隐私数据,这是无耻且邪恶的。我们希望尽可能多的人抵制使用这种专有软件。
+> The European Union has promulgated the [GDPR General Data Protection Regulation](https://en.wikipedia.org/wiki/General_Data_Protection_Regulation) in recent years, and major domestic well-known Internet software companies must strictly abide by the uploaded data when developing overseas software , user privacy and other regulations. However, when developing the Chinese domestic version, it uploads all the personal privacy data that it can obtain as much as possible, which is shameless and evil. We want as many people as possible to resist using this proprietary software.
-> 希望所有人抵制或放弃此类恶意专有软件是不现实的,如果你不能舍弃使用这些软件,我们只能希望你可以在一个较为安全的隔离环境中使用它们,如一个不存在任何敏感个人信息的隔离物理设备中使用。使用自由开源的,注重隐私保护的通讯软件始终是正确的选择。
+> It is unrealistic to hope that everyone will boycott or give up such malicious proprietary software, if you cannot give up using these software, we can only hope that you can use them in a relatively safe and isolated environment, such as one without any sensitive individuals Information is used in isolated physical devices. Using free and open source, privacy-conscious messaging software is always the right choice.
-## 即时通讯
+## Instant messaging
-**我们强烈建议你使用开源自由的通讯软件,这是为了你自身的自由,也是为了身边人的自由。**
+**We strongly recommend that you use open source and free communication software for your own freedom and the freedom of those around you.**
-### 即时通讯软件的分类
+### Classification of instant messaging software
-除了 p2p 的模式,即时通讯软件分为客户端软件与服务端软件。你应该选择开源的客户端软件来使用。而对于服务端,除非你打算自行部署服务器程序,否则讨论某个即时通讯软件的服务端是否开源毫无意义,因为永远也没有人知道被部署的是否是被声称的那一份代码。
+In addition to the p2p mode, instant messaging software is divided into client software and server software. You should choose open source client software to use. As for the server, unless you plan to deploy the server program yourself, it is meaningless to discuss whether the server of an instant messaging software is open source, because no one will ever know whether the deployed code is the claimed code.
-除了自身是否是开源自由的软件外,即时通讯软件从其服务端部署的形式上,可以分为三类。
+In addition to whether it is an open source and free software, instant messaging software can be divided into three categories in the form of its server deployment.
-- 第一类是完全中心化的通讯软件,这些软件的服务器被运营企业完全控制,并为用户提供服务。典型的例子有微信、QQ、Telegram、Signal 以及 Keybase 等。
-- 第二类是分布式的,联邦式的通讯软件,这些软件的运营企业或组织一般会提供官方的服务器,但是同时支持任何人或组织自行部署服务器。同时这些服务器之间可以互相通讯。典型的例子如基于 Matrix 的通讯软件 Element。
-- 第三类是完全去中心化,p2p 的通讯软件。这些软件基本无需任何服务器进行服务的提供(可能有少量的引导节点,但其除了引导不提供任何服务),而是通讯双方直接和对方进行通讯沟通。这是一种最自由,但同时提供功能较为有限的模式。典型的例子如基于 Tox 协议的通讯软件 qTox。
+- The first category is completely centralized communication software, the server of these software is fully controlled by the operating company and provides services to users. Typical examples are WeChat, QQ, Telegram, Signal, and Keybase.
+- The second category is distributed, federated communication software. The operating companies or organizations of these software generally provide official servers, but at the same time support any person or organization to deploy servers by themselves. At the same time, these servers can communicate with each other. A typical example is the Matrix-based communication software Element.
+- The third category is completely decentralized, p2p communication software. These software basically do not need any server to provide services (there may be a small number of bootstrap nodes, but they do not provide any services except bootstrap), but the two communicating parties communicate directly with each other. This is the most liberal mode, but at the same time offers more limited functionality. A typical example is the communication software qTox based on the Tox protocol.
-下面介绍一些我们较为推荐的通讯软件。
+Below are some of our recommended communication software.
### Telegram
-Telegram,中文名一般称为电报,是一个在世界广泛应用的开源通讯软件,注重隐私保护和单人通讯加密。我们一向提醒读者不应该相信企业不作恶,但是某些极少数的企业在经过时间的检验后确实证明它们是较为值得信赖的,如 Lavabit 以及 Telegram。如过你没有进行极度敏感的活动,那么 Telegram 目前看来是值得信赖的。使用 Telegram 请不要使用+86 的中国境内电话号码注册,**请务必使用虚拟电话注册**,这是为了你的安全着想。如果你可以使用虚拟货币购买谷歌语音虚拟电话账户,可在[群组](https://t.me/FSF_Ministry_of_Truth)中说明"我想购买谷歌语音账户",会有我们的管理员与你私聊,协助完成你的购买。注册完成后,需要在 Telegram 设置中的`Privacy and Security`中进行如下设置来保障你的隐私安全:
+Telegram, commonly known as Telegram in Chinese, is an open source communication software widely used in the world, focusing on privacy protection and single-person communication encryption. We always remind readers that companies should not be trusted to be evil, but some very few companies have proven themselves to be more trustworthy over time, such as Lavabit and Telegram. If you haven't done extremely sensitive activities, Telegram seems to be trustworthy for now. Please do not use the +86 phone number in China to register with Telegram, **please register with a virtual phone**, this is for your safety. If you can buy a Google Voice virtual phone account with cryptocurrency, you can say "I want to buy a Google Voice account" in the [group](https://t.me/FSF_Ministry_of_Truth), and our administrator will chat with you privately chat to assist with your purchase. Alternatively, you can also directly contact our [admin](https://t.me/LLC_XMR) to make a purchase. After registration, you need to set the following settings in `Privacy and Security` in Telegram settings to ensure your privacy:
-- Phone number 中的 Who can see my phone number 设置为 Nobody;
-- Phone number 中的 Who can find me by my number 设置为 My contacts;
-- 把 Contacts 一节中的 Sync contact 关闭 (仅能在手机端操作);
-- 把 Contacts 一节中的 Suggest Frequent Contacts 关闭 (仅能在手机端操作);
-- 点击 Contacts 一节中的 Delete synced contacts,这样即使之前有联系人,也无法再次关联到你(仅能在手机端操作);
+- Who can see my phone number in Phone number is set to Nobody;
+- Who can find me by my number in Phone number is set to My contacts;
+- Turn off Sync contact in Contacts section (only on mobile);
+- Turn off Suggest Frequent Contacts in the Contacts section (mobile only);
+- Click Delete synced contacts in the Contacts section, so that even if there is a contact before, it cannot be linked to you again (only on mobile);
-> 注意,上述的三个仅能在手机端操作,建议在 Arch Linux 中的安卓模拟器中完成。或者在一个纯净的,刷入开源可信的 ROM 的,并未安装任何中国的闭源间谍软件的手机上操作,这是因为如果你使用了中国手机厂商的闭源操作系统以及闭源间谍软件,它们是可以获取你安装 Telegram 的行为的,并有可能与威权政府合作对你进行进一步的监视甚至抓捕。
+> Note that the above three can only be operated on the mobile phone, it is recommended to complete the Android emulator in Arch Linux. Or operate it on a clean, open-source trusted ROM that doesn't have any Chinese closed-source spyware installed, because if you use a Chinese phone manufacturer's closed-source operating system and closed-source spyware , they can capture your installation of Telegram, and may cooperate with authoritarian governments to further monitor or even arrest you.
-通过以下命令在 Arch Linux 上安装 Telegram:
+Install Telegram on Arch Linux with the following command:
```bash
sudo pacman -S telegram-desktop
```
-> 任何技术始终都是双刃剑。Telegram 上进行恐怖活动和诈骗活动是事实,Telegram 官方也在进行持续封禁。但是不能因为这些原因就否定或质疑其存在的意义。Telegram 同时为处于威权和独裁国家中的异议人士与民运人士提供了可靠的平台进行通讯和活动。你一定不想成为这些独裁国家政府的帮凶。
+> Any technology is always a double-edged sword. It is a fact that terrorist activities and scams are carried out on Telegram, and Telegram officials are also carrying out continuous bans. But the significance of its existence cannot be denied or questioned for these reasons. Telegram also provides a reliable platform for dissidents and pro-democracy activists in authoritarian and authoritarian countries to communicate and operate. You definitely don't want to be an accomplice to the governments of these dictatorships.
+
+Finally, if the device you are currently using is very sensitive, you will need to turn off automatic media downloads in Settings, Advanced. In fact, the safest way is to use Telegram without installing it on sensitive devices.
### Element
-Element 是一款基于开源 Matrix 协议的分布式、联邦式的即时通讯应用客户端。它所对应的服务端 synapse 同样是自由软件,你可以自行部署服务端程序。
+Element is a distributed, federated instant messaging application client based on the open source Matrix protocol. Its corresponding server-side synapse is also free software, and you can deploy the server-side program yourself.
```bash
sudo pacman -S element-desktop
```
-Element 相较于 Telegram 的最大优势是其服务端程序是开源自由的,并且可以自行部署。如果进行自行部署,这样可以保障你在与他人进行通讯时,不仅可以确定你使用的客户端是安全的,同时也能确定使用的服务端是安全的。除此之外,Element 支持群组聊天的端对端加密,这也是 Telegram 所不支持的。
-
-由此可以看出,从部署的形势来看,Element 比 Telegram,在自行部署服务端的情况下可以获得更高强度的安全性。如果你从事极度敏感的线上活动,使用 Element 并自行部署 synapse 是比 Telegram 更好的选择。但是,在部署服务器程序的同时也要付出更多的精力与资金进行维护。
+The biggest advantage of Element over Telegram is that its server program is open source and free, and can be deployed by itself. If you deploy it yourself, you can ensure that when you communicate with others, you can not only be sure that the client you are using is secure, but also that the server you are using is secure. In addition to this, Element supports end-to-end encryption of group chats, which Telegram does not.
-Element 官方也提供了官方的服务器 matrix.org 以供用户免费使用。如果其部署的服务确实是其宣称的那部分代码,那么这些服务器在端对端加密的情况下仅能获取一些用户的元数据。如上线时间以及交流对象等。如果自行部署服务器,这些元数据也将掌控在你自己手中。需要提醒的是,如果自行部署了服务器,还对于隐私安全要求程度很高,那么在自行部署的服务器上存在的端对端加密群组中的成员应该均在你自己的服务器上进行注册,在其他服务器,如 matrix.org 中注册的用户应该被禁止加入你自己的群组。因为如果他们加入,你自行部署的服务器上的群组中的元数据以及加密聊天数据会流转至其他服务器,这是一种危险。
+It can be seen from the deployment situation that Element can achieve higher security than Telegram by deploying its own server. If you are doing extremely sensitive online activities, using Element and deploying synapse yourself is a better option than Telegram. However, when deploying the server program, more energy and money must be expended to maintain it.
-我们可能在未来提供自行部署 synapse 的教程。
+Element also provides the official server matrix.org for free use by users. If the services they deploy are indeed the parts of the code they claim to be, then those servers will only be able to access some of the user's metadata with end-to-end encryption. Such as online time and communication objects. If you deploy the server yourself, this metadata is also in your own hands. It should be reminded that if you deploy the server yourself and have high requirements for privacy and security, then the members of the end-to-end encryption group that exists on the self-deployed server should all be registered on your own server. Users registered on other servers, such as matrix.org, should be banned from joining your own groups. Because if they join, the metadata and encrypted chat data in the group on your self-deployed server will flow to other servers, which is a danger.
### qTox
-qTox 是一款基于 tox 协议制作的端对端加密即时通讯工具。除了 tox 的基本功能,qTox 还实现了离线消息发送的功能。tox 最初的想法就是创建一个即时通讯工具,无需使用中央服务器即可运行,并且点对点,端到端加密,保证用户通信的保密性和安全性。然而正是由于它的这种特性,qTox 提供的功能较为有限,如 qTox 中的群组,如果有人下线,那么他就无法接收到离线期间的群组信息。
+qTox is an end-to-end encrypted instant messaging tool based on the tox protocol. In addition to the basic functions of tox, qTox also implements the function of offline message sending. The original idea of tox was to create an instant messenger that could run without the use of a central server, with peer-to-peer, end-to-end encryption, to ensure the confidentiality and security of user communications. However, it is precisely because of its characteristics that qTox provides limited functions, such as groups in qTox. If someone goes offline, he cannot receive group information during the offline period.
```bash
sudo pacman -S qtox
```
-qTox 在注册时会生成 Tox ID,这个 ID 用来添加好友,并且在此 ID 中存在注册时的用户 IP 信息,用来作为未来进行连接的一种方式。qTox 的连接方式如下,首先 qTox 会去连接一些[启动节点](https://nodes.tox.chat/),这些启动节点会获取你当前的 IP 并为你提供你想要通讯的对象的 IP。如果启动节点没有你想要通讯的对象的 IP,那么则会尝试使用对方 Tox ID 中的 IP 进行连接。如果均无法建连,则失败。qTox 在中国被屏蔽的原因可能是因为中国政府屏蔽了所有启动节点,同时由于大多数人没有稳定可达的公网 IP,所以导致在不翻墙时无法正确建连。
+qTox will generate a Tox ID when registering, this ID is used to add friends, and the user IP information at the time of registration exists in this ID, which is used as a way to connect in the future. The connection method of qTox is as follows. First, qTox will connect to some [startup nodes](https://nodes.tox.chat/), these startup nodes will obtain your current IP and provide you with the IP of the object you want to communicate with . If the initiating node does not have the IP of the object you want to communicate with, it will try to connect using the IP in the peer's Tox ID. If the connection cannot be established, it will fail. The reason why qTox is blocked in China may be because the Chinese government blocks all startup nodes, and because most people do not have a stable and reachable public network IP, it is impossible to establish a connection correctly without overturning the wall.
### IRC
-IRC,因特网中继聊天,是一种古老的交流方式,在开源社区中仍被广泛使用,常用的客户端有 WeeChat,以及 Emacs 的 erc。
+IRC, Internet Relay Chat, is an ancient communication method that is still widely used in the open source community. Common clients include WeeChat and Emacs' erc.
```bash
sudo pacman -S weechat
```
-### 屏幕分享
+### Screen sharing
-除了上述软件,对于另外一些手机通讯软件在电脑上的投屏可以尝试使用[scrcpy](https://archlinux.org/packages/community/x86_64/scrcpy/)。
-也可以使用 [KDE Connect](https://archlinux.org/packages/extra/x86_64/kdeconnect/) 在电脑上获取 Android 通知。
+In addition to the above software, you can try to use [scrcpy](https://archlinux.org/packages/extra/x86_64/scrcpy/) for screen projection of other mobile communication software on the computer.
+You can also use [KDE Connect](https://archlinux.org/packages/extra/x86_64/kdeconnect/) to get Android notifications on your computer.
-## 办公套件
+## Office kit
-主要两个选择是 [LibreOffice](https://wiki.archlinux.org/index.php/LibreOffice)以及[onlyoffice]()AUR。 我们建议你使用开源的 LibreOffice 以及 onlyoffice,而不是专有软件 WPS,前两者其目前的安装已经非常简单。
+The main two options are [LibreOffice](https://wiki.archlinux.org/index.php/LibreOffice) and [onlyoffice](https://aur.archlinux.org/packages/onlyoffice-bin/) AUR. We recommend that you use the open source LibreOffice and onlyoffice, rather than the proprietary software WPS, the first two of which are currently very easy to install.
```bash
-sudo pacman -S libreoffice-still #稳定版
-sudo pacman -S libreoffice-fresh #尝鲜版
+sudo pacman -S libreoffice-still #stable
+sudo pacman -S libreoffice-fresh #Trial version
yay -S onlyoffice-bin
```
-## 打印机
+To read some old chm documentation, install `kchmviewer`.
+
+```bash
+sudo pacman -S kchmviewer
+```
+
+## Printer
-对于日常办公来说,打印机是非常必要的。除此之外,我们建议读者维持一份纸质的密码,包括你可以将你虚拟货币钱包中的私钥打印出来保存,这是非常好的一个方案。对于打印机的品牌,我们建议使用惠普打印机。其对于 Linux 的支持非常到位,可以去其[网站](https://hplipopensource.com/)查看所支持的设备等详情。在 Arch Linux 上,安装包 hplip 即可。
+For daily office, a printer is very necessary. In addition, we recommend readers to maintain a paper password, including that you can print out the private key in your cryptocurrency wallet and save it, which is a very good solution. For the brand of printer, we recommend using HP printers. Its support for Linux is very comprehensive, you can go to its [website](https://hplipopensource.com/) to check the supported devices and other details. On Arch Linux, install the packages hplip and cups and use them after starting the service.
```bash
+sudo pacman -S system-config-printer
sudo pacman -S hplip
+sudo pacman -S cups
+sudo systemctl enable --now cups.service
```
-## 笔记本
+## Notebook
-Joplin 是一个简单的 markdown 笔记本,具有标签和层级等基础功能。并且具有 cli 和 desktop 两个版本。其 LICENSE 为 MIT 。
+Joplin is a simple markdown notebook with basic features like tags and hierarchies. And has two versions of cli and desktop. Its LICENSE is MIT .
```
-yay -S joplin # cli
-yay -S joplin-desktop # desktop
+yay -S joplin #cli
+yay -S joplin-desktop #desktop
```
-Trilium 是一个开源的 electron 笔记软件,它支持 markdown 还有 evernote 格式的导入,并且支持 markdown 和 html 的导出格式。其本身具有标签、无限层级、关系图以及历史记录等功能,基于 CKEditor 所见即所得的 markdown 编辑器。并且支持在服务器上自己搭建。其 LICENSE 为 AGPL 3.0 。
+Trilium is an open source electronic note-taking software, which supports the import of markdown and evernote formats, and supports the export of markdown and html formats. It has functions such as labels, unlimited levels, relationship diagrams, and history records, based on CKEditor's WYSIWYG markdown editor. And support to build your own on the server. Its LICENSE is AGPL 3.0 .
```
yay -S trilium-bin
yay -S trilium-server-bin
```
-## 电子书
+## eBooks
-pdf 可直接用浏览器打开,也可选用其他专用的阅读软件,如[okular](https://archlinux.org/packages/extra/x86_64/okular/)或者[calibre](https://archlinux.org/packages/community/x86_64/calibre/)。okular 在打开大型 epub 时会非常卡顿,并且图片模糊不清,[Foliate](https://archlinux.org/packages/community/x86_64/foliate/) 是阅读 epub 的更佳选择。
+The pdf can be opened directly with a browser, or other dedicated reading software, such as [okular](https://archlinux.org/packages/extra/x86_64/okular/) or [calibre](https://archlinux.org/packages/extra/x86_64/calibre/). okular can be very laggy when opening large epubs, and the pictures are blurry, [Foliate](https://archlinux.org/packages/extra/x86_64/foliate/) is a better choice for reading epubs.
-## RSS 阅读器
+## RSS reader
-RSS 阅读器 newsflash 是 feedreader 的精神继承者,支持本地 RSS 源和 RSS API 的读取,由 Rust 写成。 目前 feedreader 已经不再维护。也可使用 liferea。
+The RSS reader newsflash is the spiritual successor to feedreader, supports reading of native RSS feeds and the RSS API, and is written in Rust. Currently feedreader is no longer maintained. You can also use liferea.
```
sudo pacman -S newsflash
```
-## 文献管理
+## Document management
-JabRef 是 java 编写的并且与 LaTeX 协作较好的开源文献管理软件,可以与 vim, Emacs 协作,并通过 bib 格式管理文献。
+JabRef is an open source document management software written in java and works well with LaTeX. It can cooperate with vim, Emacs, and manage documents in bib format.
```
yay -S jabref
```
-Zotero 是一个开源的,基于 Firefox 解决方案的应用,其可以通过 VSCode 插件和 vim 插件进行引用。beta 版本具有笔记和内置 PDF 阅读器功能。
+Zotero is an open-source, Firefox-based solution that can be referenced via the VSCode plugin and vim plugin. The beta version features note taking and built-in PDF reader.
```
yay -S zotero
-yay -S zotero-beta #具有笔记和内置 PDF 阅读器
+yay -S zotero-beta # with notes and built-in PDF reader
```
-## 截图
+## Screenshot
-推荐使用 flameshot 火焰截图
+It is recommended to use flameshot flame screenshots
```
sudo pacman -S flameshot
```
-快捷键的命令是`flameshot gui`,可在 KDE 设置中加入设置快捷键为你所熟悉的键位。或者尝试另一种流行的 KDE 出品的截图软件 [spectacle](https://archlinux.org/packages/extra/x86_64/spectacle/)
+The command for the shortcut key is `flameshot gui`, which can be added to the KDE settings to set the shortcut keys to the keys you are familiar with. Or try another popular screenshot software from KDE [spectacle](https://archlinux.org/packages/extra/x86_64/spectacle/)
-## 下载存储
+## Download & storage
-> 不要使用任何墙国国内的网盘存储你的个人数据,他们可以根据"相关条款与规定",或者"自我阉割"的精神觉悟随意处置你的所有数据,在仔细阅读过他们的用户协议后,你会觉得毛骨悚然。墙国网盘只能用来存储无关紧要的垃圾数据。
+> Do not use any domestic network disk to store your personal data, they can dispose of all your data at will according to the "relevant terms and regulations", or the spiritual awareness of "self-castration", after carefully reading their user agreement , you will feel creepy. The wall country network disk can only be used to store irrelevant junk data.
-> 不要使用迅雷、旋风等墙国类似软件。关于 BT 的原理及迅雷的恶行可参考文章[为什么国内 BT 环境如此恶劣?](https://zhuanlan.zhihu.com/p/87193566)
+> Do not use similar software such as Thunder and Cyclone. Regarding the principle of BT and the evil deeds of Thunder, you can refer to the article [Why is the China BT environment so bad? ](https://zhuanlan.zhihu.com/p/87193566)
-- [Mega](https://aur.archlinux.org/packages/megasync/)AUR 新西兰注重隐私的老牌网盘,也可直接使用 [web 版本](https://mega.nz/fm/dashboard)
-> Mega 网盘也许存在一些争议,但是选择 Mega 还是选择一些和威权政府合作非常愉快的网盘,结论非常明显。
-- [onedrive](https://aur.archlinux.org/packages/onedrive-abraunegg/)AUR 微软创办的网盘业务,linux 下存在一个命令行客户端
-- [qbtorrent-enhance-version](https://aur.archlinux.org/packages/qbittorrent-enhanced/)AUR 老牌 BT 客户端增强版,支持填入 tracker 的 URL 网址进行拉取,配合[TrackersListCollection 项目](https://github.com/XIU2/TrackersListCollection)使用更佳。
+- [Mega](https://aur.archlinux.org/packages/megasync/)AUR New Zealand's old privacy-conscious online disk, you can also use the [web version](https://mega.nz/fm/dashboard)
+> There may be some controversies about the Mega network disk, but choosing Mega is still choosing some network disks that cooperate with authoritarian governments very happily. The conclusion is very obvious.
+- [onedrive](https://aur.archlinux.org/packages/onedrive-abraunegg/)AUR The online disk business founded by Microsoft, there is a command line client under linux
+- [qbtorrent-enhance-version](https://aur.archlinux.org/packages/qbittorrent-enhanced/)AUR Enhanced version of the old BT client, support filling in the tracker URL for pulling It is better to use it with the [TrackersListCollection project](https://github.com/XIU2/TrackersListCollection).
-## 图片浏览
+## Picture Viewer
-在桌面环境与必要应用一节中已经安装了 [gwenview](https://archlinux.org/packages/extra/x86_64/gwenview/),它基本可以满足日常看图的需求。如果另需快速看图软件,可以尝试以下软件。
+[gwenview](https://archlinux.org/packages/extra/x86_64/gwenview/) has been installed in the section on desktop environment and necessary applications, which can basically meet the needs of daily picture viewing. If you need another quick viewing software, you can try the following software.
- [feh](https://www.archlinux.org/packages/extra/x86_64/feh/)
-- [nomacs](https://www.archlinux.org/packages/community/x86_64/nomacs/)
+- [nomacs](https://aur.archlinux.org/packages/nomacs)
-## 常用系统组件
+## Common System Components
-日常办公中所需要用到的各类小工具有很多实现,其中 KDE 的套件中就有很多,可以自行查询,此处仅列出几个常用的例子。
+There are many implementations of various gadgets needed in daily office work, among which there are many in KDE's suites, which can be inquired by yourself. Here are just a few commonly used examples.
-- [Kcalc](https://archlinux.org/packages/extra/x86_64/kcalc/) 计算器
-- [Kamoso](https://archlinux.org/packages/extra/x86_64/kamoso/) 相机
-- [Cheese](https://archlinux.org/packages/extra/x86_64/kamoso/) 茄子相机
-- [KTimer](https://archlinux.org/packages/extra/x86_64/ktimer/) 倒计时执行器
+- [Kcalc](https://archlinux.org/packages/extra/x86_64/kcalc/) calculator
+- [Kamoso](https://archlinux.org/packages/extra/x86_64/kamoso/) camera
+- [Cheese](https://archlinux.org/packages/extra/x86_64/kamoso/) Eggplant Camera
+- [KTimer](https://archlinux.org/packages/extra/x86_64/ktimer/) countdown executor
-## 远程协助
+## Remote Assistance
-如需连接 windows 远程机器,你可以使用开源的[freerdp](https://archlinux.org/packages/community/x86_64/freerdp/)协议,配合开源实现[Xrdp](https://wiki.archlinux.org/title/Xrdp),或者[Rdesktop](https://wiki.archlinux.org/title/Rdesktop)即可。
+To connect to a Windows remote machine, you can use the open source [freerdp](https://archlinux.org/packages/extra/x86_64/freerdp/) protocol, in conjunction with the open source implementation [Xrdp](https://wiki.archlinux.org/title/Xrdp), or [Rdesktop](https://wiki.archlinux.org/title/Rdesktop).
-如需链接 Linux 服务器,大多数场景使用 ssh 即可。
+To connect to a Linux server, ssh is sufficient for most scenarios.
-如果以上解决方案不能满足你,那么可以尝试免费使用的专有软件[teamviewer](https://aur.archlinux.org/packages/teamviewer/)AUR,其完善的功能基本可以满足全部需求。需要注意安装后需按照提示启动服务。
+If the above solutions do not satisfy you, then you can try the free proprietary software [teamviewer](https://aur.archlinux.org/packages/teamviewer/)AUR, its perfect function is basically Can meet all needs. It should be noted that after installation, you need to start the service according to the prompts.
```bash
sudo systemctl enable --now teamviewerd
diff --git a/docs/uk/play&office/play.md b/docs/uk/play&office/play.md
index 02effd3..f0dd2b9 100644
--- a/docs/uk/play&office/play.md
+++ b/docs/uk/play&office/play.md
@@ -1,109 +1,180 @@
-# 娱乐软件
+# Games amd entertainment
-## 网游网络加速
+## Online game network acceleration
-对于在 Linux 上玩网游,网络加速一直是一个难题,尤其是在玩一些外服网游的时候。这里提供一些思路来在 Linux 下对网游加速。
+For playing online games on Linux, network acceleration has always been a problem, especially when playing some online games on external servers. Here are some ideas to speed up online games under Linux.
-- 一些机场会提供网游游戏节点,这些节点专门为游戏优化,限制流量并且提高倍率,一般可以得到较好的加速效果。在 Linux 中配合 [透明代理](/advanced/transparentProxy),同时开启对 UDP 流量的代理加速,即可以得到优化网游网速的效果。
-- 一些中端或者高端的路由器,会内置一些市面上常见的网游加速器,如果你的路由器有这个功能,那可以直接使用路由器内置的加速器加速本机的网游流量。或者你也可以使用 openwrt 配合安装支持 openwrt 的加速器插件。不要使用网易 uu 路由器加速插件,它会错误的将 Linux PC 识别为安卓手机,根据它的逻辑,如果设备被识别为手机,那只能加速手游而不能加速 PC 游戏。目前,网易 uu 加速器已将 Linux PC 移出识别范围,如有需求,请使用其他品牌的路由器加速插件。
-- 在虚拟机或 wine 执行市面上常见的网游加速客户端,理论上也是可以起到加速效果的。但是目前来说执行起来较为复杂,理论上是可行的,未来可能会有更方便的工具出现。关于原理可以参考[Wine 待研究课题:让 Windows 版网游加速器的虚拟网卡模式可在 Linux 下工作](https://hu60.cn/q.php/xsBEbMHq-5hkgyEFTaIlwB-00AAA/bbs.topic.95016.html)以及[在 Linux 中通过虚拟机使用 Windows 版网游加速器](https://hu60.cn/q.php/bbs.topic.95932.html)
+- Some airports will provide game nodes for online games. These nodes are specially optimized for games, restricting traffic and increasing the magnification. Generally, a better acceleration effect can be obtained. Cooperate with [transparent proxy](/advanced/transparentProxy) in Linux, and enable proxy acceleration for UDP traffic at the same time, you can get the effect of optimizing the network speed of online games.
+- Some mid-range or high-end routers have built-in online game accelerators that are common in the market. If your router has this function, you can directly use the built-in accelerator of the router to accelerate the online game traffic of the machine. Or you can also use openwrt to install accelerator plugins that support openwrt. Do not use the NetEase uu router acceleration plug-in, it will mistakenly identify the Linux PC as an Android phone. According to its logic, if the device is identified as a mobile phone, it can only accelerate mobile games but not PC games. At present, the NetEase uu accelerator has removed the Linux PC from the recognition scope. If necessary, please use other brands of router acceleration plug-ins.
+- Executing common online game acceleration clients on the market in a virtual machine or wine can theoretically accelerate. But at present, it is more complicated to implement, which is theoretically feasible, and more convenient tools may appear in the future. For the principle, please refer to [Wine to be researched topic: Make the virtual network card mode of the Windows version of the online game accelerator work under Linux](https://hu60.cn/q.php/xsBEbMHq-5hkgyEFTaIlwB-00AAA/bbs.topic.95016.html) and [Using the Windows version of the online game accelerator through a virtual machine in Linux](https://hu60.cn/q.php/bbs.topic.95932.html)
-## 原生仓库游戏
+## Native Linux game
-Arch Linux 官方仓库和 AUR 中存在一些原生支持的游戏,列举如下
+There are some natively supported games in Arch Linux official repository and AUR, listed below
-- [shattered-pixel-dungeon](https://aur.archlinux.org/packages/shattered-pixel-dungeon/) 破碎像素地牢 生存游戏
-- [0ad](https://archlinux.org/packages/community/x86_64/0ad/) 被誉为开源帝国时代
-- [openra](https://archlinux.org/packages/community/any/openra/) 红警 1 的开源实现
+- [shattered-pixel-dungeon](https://aur.archlinux.org/packages/shattered-pixel-dungeon/) Shattered Pixel Dungeon Survival Game
+- [0ad](https://archlinux.org/packages/extra/x86_64/0ad/) Known as the Age of Open Source Empires
+- [openra](https://archlinux.org/packages/community/any/openra/) Open source implementation of Red Alert 1
## Steam
-[官方文档](https://wiki.archlinux.org/index.php/Steam)
+[Arch Wiki: Steam](https://wiki.archlinux.org/index.php/Steam)
-一些字体和驱动已经在`新手上路`章节中配置完成。若有安装问题请自查。
+Some fonts and drivers have already been configured in the `Getting Started` section. If you have installation problems, please check yourself.
-此外,如果某些游戏启动或者游玩有问题,可以用终端使用`steam`命令启动 steam 客户端,并观察游戏崩溃时的终端报错。一般都是缺少某种依赖造成的,可以根据具体情况自行安装依赖。同时,archlinux 官方文档也提供了一个 [查错页面](https://wiki.archlinux.org/index.php/Steam/Game-specific_troubleshooting),记录了一些游戏崩溃的解决方式。
+In addition, if some games have problems starting or playing, you can use the terminal to use the `steam` command to start the steam client, and observe the terminal error when the game crashes. Generally, it is caused by the lack of a certain dependency, and you can install the dependency yourself according to the specific situation. At the same time, the official archlinux documentation also provides a [error page](https://wiki.archlinux.org/index.php/Steam/Game-specific_troubleshooting), which records some solutions to game crashes.
-安装 Steam专有:
+To install Steam Proprietary:
```bash
sudo pacman -S steam
```
-steam 上的游戏可分为有 Linux 原生支持的,以及通过[Steam Play](https://wiki.archlinux.org/index.php/Steam#Proton_Steam-Play)游玩的两大类。Steam Play(Proton) 基于 Wine,可以让你在 Linux 上游玩只支持 Windows 平台的游戏。关于非 Linux 平台的游戏,通过 Steam Play 运行的可玩程度,可通过[protondb](https://www.protondb.com/)这个网站进行查询。如果玩某个游戏出现问题,在这个网站里你也可以找到玩家发布的各个游戏的修正方式。有时最新版 Proton 可能存在问题,这时自行尝试其他版本即可。
+Games on steam can be divided into two categories: those with native Linux support, and those played through [Steam Play](https://wiki.archlinux.org/index.php/Steam#Proton_Steam-Play). Steam Play (Proton) is based on Wine and allows you to play Windows-only games on Linux. Regarding the degree of playability of games on non-Linux platforms running through Steam Play, you can check the website [protondb](https://www.protondb.com/). If you have a problem with a game, you can also find fixes for each game posted by players on this site. Sometimes there may be problems with the latest version of Proton, in which case you can try other versions yourself.
-另外,github 上还存在一些官方 Proton 的 fork 版本,如 [Proton GE](https://github.com/GloriousEggroll/proton-ge-custom),可以支持一些额外的,官方暂不支持或支持不完善的游戏。使用方式也很简单,根据官方文档,下载 release 的压缩包到指定位置,重启 steam 后即可选择特定版本的 GE proton。
+In addition, there are also some official Proton fork versions on github, such as [Proton GE](https://github.com/GloriousEggroll/proton-ge-custom), which can support some additional ones, which are not officially supported or are not fully supported. game. The usage method is also very simple. According to the official documentation, download the compressed package of the release to the specified location, and restart steam to select a specific version of GE proton.
-如有些游戏启动器启动不了,可以去游戏目录尝试直接执行游戏本体的可执行文件。
+If some game launchers cannot be started, you can go to the game directory and try to directly execute the executable file of the game itself.
-有问题还可以去 github 查询。如 V 社的 [csgo 仓库](https://github.com/ValveSoftware/csgo-osx-linux/issues)
+If you have any questions, you can also go to github to query. For example, Valve's [csgo repository](https://github.com/ValveSoftware/csgo-osx-linux/issues)
-最近的 steam 官方的 proton 不能正确检测系统的 fsync,依然以 esync 模式启动游戏。更换 GE 版本的 proton 可以正确检测并使用 fsync 模式启动游戏。
+The recent steam official proton can not correctly detect the system's fsync, and still start the game in esync mode. Replacing the GE version of the proton correctly detects and launches the game with fsync mode.
-> 游戏锁区解决办法:让你的 steam 处于一个国家的代理下,如日本。先随便加一个游戏到购物车,在购物车右上角国家地区改成日本,再去访问已锁区的游戏,就可以浏览购买了。
+> Game lock solution: keep your steam under the proxy of a country, such as Japan. First add a game to the shopping cart, change the country and region in the upper right corner of the shopping cart to Japan, and then go to the locked game, you can browse and purchase.
## Lutris
-Lutris 基于 Wine,提供了大量游戏在 Linux 下的解决方案。其为你已经配置好了 Wine 相关的一切配置,你只需要安装游玩即可。一般极少需要额外配置。进入 [官网](https://lutris.net/) 在右上角搜索你想玩的游戏。点击进入游戏页面后,可以看到在相应版本右侧有一个 install 按钮,点击后即可拉起 Lurtis 进行安装。玩游戏前要先装好 [驱动](https://github.com/lutris/docs/blob/master/InstallingDrivers.md) 和 [依赖](https://github.com/lutris/docs/blob/master/WineDependencies.md)。注意,此两个文档中没有列出 vkd3d 与 lib32-vkd3d 两个可选安装项,然而目前大多数大型游戏均需安装此两个包,读者需按需添加安装。同时在 lutris 中,需要根据容器种类选择开启 Esync 或 Fsync。
+Based on Wine, Lutris provides solutions for a large number of games under Linux. It has already configured everything related to Wine for you, you only need to install and play. Generally very little additional configuration is required. Go to the [official website](https://lutris.net/) and search for the game you want to play in the upper right corner. After clicking to enter the game page, you can see that there is an install button on the right side of the corresponding version. After clicking, you can pull up Lurtis to install it. Before playing the game, you must install the [driver](https://github.com/lutris/docs/blob/master/InstallingDrivers.md) and [dependency](https://github.com/lutris/docs/blob/master/WineDependencies.md). Note that the two optional installation items vkd3d and lib32-vkd3d are not listed in these two documents. However, most large-scale games currently need to install these two packages, and readers need to add and install them as needed. At the same time, in lutris, you need to choose to open Esync or Fsync according to the container type.
-在 Lutris 的各个游戏页面,一般有玩家上传的报告,如你遇到不能运行的状况,可以详细翻阅一下历史 Issue,包括已经标记为已解决的。
+On each game page of Lutris, there are generally reports uploaded by players. If you encounter a situation that cannot be run, you can read the historical issues in detail, including those that have been marked as resolved.
-如果你发现还是无法登陆某些游戏,检查你的代理设置。比如你是国服的帐号,但是代理挂的是日本的,那是无法登陆的,可以换一个香港的代理再尝试。
+If you find that you are still unable to log into certain games, check your proxy settings. For example, if you have an account of the national server, but the proxy is linked to Japan, it is impossible to log in. You can change to a Hong Kong proxy and try again.
-如果无法更新游戏,在需要更新游戏的时候,将 Wine 版本设置为系统的 Wine staging 版本,如果最新的 wine-staging 版本仍然闪退,可以退回到以前可用的容器版本。如果依旧无法更新,可以尝试重新安装游戏启动器。在更新完毕后,需要启动游戏时,再将 wine 版本设置为 Lutris 自带的版本。
+If you can't update the game, when you need to update the game, set the Wine version to the system's Wine staging version. If the latest wine-staging version still crashes, you can go back to the previously available container version. If you still can't update, you can try reinstalling the game launcher. After the update is complete, when you need to start the game, set the wine version to the version that comes with Lutris.
-如遇到无法启动闪退的情况,可以尝试在命令行启动 Lutris,再启动游戏即可,玄学、不知道原因。如果启动器中启动游戏还是闪退,可以尝试把 Lutris 容器的启动文件从启动器改到游戏本体的可执行文件。还有另一个更通用的方式,可以使用 Lutris 的功能 `Run EXE inside wine prefix`,然后选择游戏本体就可以通过验证玩游戏了。`Run EXE inside wine prefix` 的位置在 Lutris 下方,点击小酒杯,最后一个。
+If you encounter a situation where you cannot start the flashback, you can try to start Lutris on the command line, and then start the game. If starting the game in the launcher still crashes, you can try to change the startup file of the Lutris container from the launcher to the executable file of the game itself. There is another more general way, you can use the Lutris function `Run EXE inside wine prefix`, and then select the game body to pass the verification to play the game. The location of `Run EXE inside wine prefix` is below Lutris, click on the wine glass, the last one.
-如果习惯使用各类游戏插件,也可以安装在同一个容器里,一般功能是可以正常使用的。
+If you are used to using various game plug-ins, you can also install them in the same container, and the general functions can be used normally.
-## 原生 Wine
+## Wine
-安装使用原生 [Wine](https://wiki.archlinux.org/index.php/Wine) 也可运行 windows 游戏,但是很多情况下需要你自行处理 Windows 下的依赖问题,常用的工具是 [winetricks](https://archlinux.org/packages/multilib/x86_64/winetricks/)。这种方式费时费力,只运行无需处理依赖的小游戏或者 gal 还好。
+Installing and using native [Wine](https://wiki.archlinux.org/index.php/Wine) can also run windows games, but in many cases you need to deal with the dependency problems under Windows by yourself. The commonly used tool is [winetricks](https://archlinux.org/packages/multilib/x86_64/winetricks/). This method is time-consuming and labor-intensive, and it is fine to only run small games or gals that do not need to deal with dependencies.
-## 性能提升
+Run winecfg on the terminal, you can open the wine settings page, and follow the terminal prompts to install the missing packages.
-在进行某些游戏时,如《Total War: THREE KINGDOMS》,如遇到性能问题,可尝试调节 cpu 频率调节器[[1]](https://support.feralinteractive.com/docs/zh_cn/threekingdomstw/1.0.15/linux/faqs/?access=zooevrj6xb&utm_source=game_linux&utm_medium=link&utm_campaign=game_linux_threekingdomstw_support#i_linux_cpu_governor)。
+## Galgame
-## 性能监控
+This section describes possible problems with running Galgame with Wine.
-和微星的 Afterburner 软件中性能显示的部分类似,Linux 上也有一款同类软件可以监控游戏中的电脑性能,名为[MangoHud](https://github.com/flightlessmango/MangoHud)。使用方式可参见此项目的 readme。此外,官方提供图形化的参数设置软件 [GOverlay](https://github.com/benjamimgois/goverlay#arch--manjaro--other-arch-derivatives),可以自行选择安装。
+If there are font problems for some languages, the most straightforward way is to place the required fonts in the container's font directory. The default directory for wine is `~/.wine`.
-## 可选内核更换
+Running games with Wine may have issues with missing [GStreamer](https://wiki.archlinux.org/title/GStreamer) plugins, such as
-一般来说,采用了 fsync 的 patch 的内核游戏性能会更好。尤其在一些采用.Net 的 wine 游戏中,fsync 会有明显的性能提升[[1]](https://github.com/ValveSoftware/Proton/issues/3706#issuecomment-636632984)。目前 Linux 内核并没有加入 fsync 功能,可以更换 zen 内核。
+```bash
+Missing decoder: Advanced Streaming Format (ASF) (video/x-ms-asf)
+```
+
+After installing each plug-in according to the Wiki, the error may still exist. This is because most Galgames require 32-bit compatibility libraries, and the current gst32-bit compatibility library in the official Arch Linux Multilib warehouse is not complete. For example, `lib32-gst- The plugins-ugly` package currently only exists in the AUR, but its PKGBUILD currently has many problems that prevent it from being successfully installed directly. ASF exists in this package, so its absence causes this error. The solution is as follows:
+
+First, one of the dependencies of lib32-gst-plugins-ugly, lib32-lv2, has a build spell check problem. After cloning the `lib32-lv2` warehouse locally, modify its PKGBUILD file, delete the check part, and then use `makepkg -si` to install it manually.
+
+Next, `lib32-gst-plugins-ugly` depends on another package `lib32-shaderc`. There is also an error in the construction of this package, and it is not necessary, so directly in `lib32-gst-plugins-ugly` Delete it from the PKGBUILD and then install it manually.
+
+Ref:
+
+- https://bbs.archlinux.org/viewtopic.php?id=249982
+- https://archlinux.org/packages/?q=gst
+- https://aur.archlinux.org/packages/lib32-gst-plugins-ugly
+- https://docs.usebottles.com/faq/video-gstreamer-problems
+
+## Performance improvement
+
+Turning off KDE's Compositor can significantly improve game performance and solve problems such as unstable screen tearing.
+
+ref: https://linux-gaming.kwindu.eu/index.php?title=Improving_performance
+
+When playing some games, such as "Total War: THREE KINGDOMS", if you encounter performance problems, you can try to adjust the cpu frequency regulator[[1]](https://support.feralinteractive.com/docs/zh_cn/threekingdomstw/1.0.15/linux/faqs/?access=zooevrj6xb&utm_source=game_linux&utm_medium=link&utm_campaign=game_linux_threekingdomstw_support#i_linux_cpu_governor).
+
+[GameMode](https://github.com/FeralInteractive/gamemode) is a comprehensive game performance adjustment software, which provides a variety of game performance optimization functions. If necessary, you can check the github page for details.
+
+## Performance monitoring
+
+Similar to the performance display part of MSI's Afterburner software, there is also a similar software on Linux that can monitor computer performance in games, named [MangoHud](https://github.com/flightlessmango/MangoHud). The usage can be found in the readme of this project. In ArchLinux, install the packages mangohud and lib32-mangohud.
+
+In addition, MangoHud officially provides a graphical parameter setting software [GOverlay](https://github.com/benjamimgois/goverlay#arch--manjaro--other-arch-derivatives), which can be installed by yourself.
+
+## Optional kernel replacement
+
+In general, kernel games with patches that use fsync will perform better. Especially in some wine games using .Net, fsync will have a significant performance improvement[[1]](https://github.com/ValveSoftware/Proton/issues/3706#issuecomment-636632984). At present, the fsync function is not added to the Linux kernel, and the zen kernel can be replaced.
```bash
sudo pacman -S linux-zen linux-zen-headers
```
-安装完毕后重新更新一下 grub 即可。
+After the installation is complete, update grub again.
```bash
sudo grub-mkconfig -o /boot/grub/grub.cfg
```
-> 如果你使用英伟达显卡,记得更换驱动为相应的 dkms 版本。一般来说较新的显卡安装 nvidia-dkms 即可。
+> If you use NVIDIA graphics card, remember to change the driver to the corresponding dkms version. Generally speaking, newer graphics cards can install nvidia-dkms.
-## 游戏手柄
+## Gamepad
-一般情况下手柄通过数据线连接计算机即可直接使用。支持无线的手柄(DUALSHOCK® 3、DUALSHOCK® 4、Xbox 360、Xbox One、8BitDo 等)也可以通过蓝牙直接连接,无需额外操作。
+The most compatible controller in Arch Linux is the Xbox controller, and the use of other controllers is not recommended. If you are using a wireless adapter to connect, install it using [xone](https://github.com/medusalix/xone). If you use a Bluetooth connection, install it using [xpadneo](https://aur.archlinux.org/packages/xpadneo-dkms). For Bluetooth connectivity, additional configuration is required.
-虽然无线手柄一般情况下可以通过蓝牙直连,但是通常这样会有较大的延迟。使用 [Xbox 无线适配器](https://www.microsoftstore.com.cn/accessories/microsoft-xbox-wireless-adapter) 以获得近乎有线的低延迟体验。
+1. First you need to enable UserspaceHID, if you don't do this, the controller will not connect properly and will start to cycle connecting and disconnecting, and the Xbox button will keep flashing. Edit configuration file:
-为了在 Arch Linux 下使用 Xbox 无线适配器,需要安装第三方开源驱动 [xow](https://github.com/medusalix/xow)。
+```bash
+vim /etc/bluetooth/input.conf
-1. 安装 [xow](https://aur.archlinux.org/packages/xow-git/)AUR:
+```
- ```sh
- yay -S xow
- ```
+Uncomment `UserspaceHID` and change the value to true.
-2. 启动 `xcow` 服务:
+2. Next make some settings in the main bluetooth profile so xpadneo can work as expected, also need to resolve the input lag issue. Edit the main file:
- ```sh
- sudo systemctl enable xow.service
- ```
+```bash
+vim /etc/bluetooth/main.conf
+```
+
+Change the following parameters to the following values
+
+```bash
+[General]
+Privacy=device
+JustWorksRepairing = always
+Class = 0x000100
+FastConnectable = true
+
+[LE]
+MinConnectionInterval=7
+MaxConnectionInterval=9
+ConnectionLatency=0
+```
+
+Finally, restart the computer and connect.
+
+ref: https://www.reddit.com/r/linux_gaming/comments/smxqm2/how_to_use_xpadneo_with_an_xbox_series_controller/
+
+## Gamescope
+
+Gamescope is an independent compositor supported by Valve specifically for game development. It can solve the display problems of some games. For example, when some games open the virtual desktop, although they can be windowed into full screen, they still cannot expand to full screen (still the original low resolution of the game). Gamescope works with lutris. It's still early days for Gamescope.
+
+Note that NVIDIA graphics cards must use NVIDIA closed source drivers when using Gamescope, and nvidia-open open source drivers are not supported. In addition, the kernel parameter `nvidia-drm.modeset=1` must be added.
+
+Gamescope's predecessor was Xephyr, which is now on hold.
+
+See the Gamescope documentation for details: https://wiki.archlinux.org/title/Gamescope
+
+## protonhax
+
+Sometimes, you need to run other programs besides the game in the Proton container, such as cheat engine, etc. Currently Proton cannot meet this requirement. [protonhax](https://github.com/aoleg94/protonhax) is used here to run other programs in the same Proton container as the game.
+
+```bash
+yay -S protonhax
+```
-3. 重启计算机,插入 Xbox 无线适配器并和 Xbox 手柄配对即可
+Set `protonhax init %COMMAND%` in the game running parameters, and then execute `protonhax ls` to obtain the running game appid. Finally use `protonhax run ` to run other programs in the target container. For more usage, please refer to the project warehouse page.
-实际体验和 Windows 下并无差异。对延迟敏感的音游(如 [喵斯快跑](https://store.steampowered.com/app/774171/Muse_Dash/))在游戏设置中微调偏移值即可。
+Ref: https://www.reddit.com/r/linux_gaming/comments/pxs5es/running_a_second_program_inside_a_proton_prefix/?rdt=44318
diff --git a/docs/uk/postscript.md b/docs/uk/postscript.md
index 7c36897..56ec326 100644
--- a/docs/uk/postscript.md
+++ b/docs/uk/postscript.md
@@ -1,45 +1,23 @@
-# 后记
+# Postscript
-最近这些日子,"内卷"、"躺平"这些词又被一些群体炒的沸沸扬扬,想着之前一直想写的话,正好也该补上了。
+ArchLinuxStudio always puts the privacy and security of readers first, and continues to make efforts to promote the development of the free software movement, and this `ArchLinux Installation and Use Tutorial` is the initial project of the organization, and we will give the highest priority to ensuring its project quality. It will play a role in bringing more people into the world of free software.
-就像很多人说的一样,互联网公司的程序员是很累的,其实无论大小公司,都会很累。在大公司,你是螺丝钉,有不停的螺丝需要你来拧,同时大公司往往除了 KPI 之外,还会有 OKR 之类的东西存在,这些名义上不计入绩效考核的东西实际是干什么的,懂的人都懂,无需我多说。小公司更是,如果你是一个能力较强的人,那么你是需要担任多面手的角色的。
+What can free software bring to the masses? This is a question worth exploring in depth. Simply put, it gives enough respect to each user and gives users the right to choose. Proprietary software tramples on users' privacy, dignity, and does countless shameless and dirty acts. In the eyes of these proprietary software, users are just data that can be used, sold and oppressed at will, not a person.
-讲到这里,马上会有一些人开始用"你不够努力!"来开始指责了。或者是什么"你父辈比你吃的苦比你多多了,你这累一点算什么?"。其实说这种话的人无非两种,一种是身居高位或者已经家境殷实,没什么顾虑的人。一种是真正的啥比,没有经历过就开始指点江山了。下面从两个方面开始讲,一个方面是单纯的工作方面,另一个方面是个人生活方面,来讲述一些普遍真实的事情。
+However, what is even more dangerous is that in many totalitarian and authoritarian countries, commercial companies that own proprietary software are in cahoots with these totalitarian and authoritarian governments, not only monitoring people in all aspects, but also secretly arresting and secretly arresting pro-democracy activists and dissidents. persecution. Many times, whenever we witness such an incident, we will sigh that these people have not mastered the use of free software and have not realized the value of free software.
----
-
-在工作上,我相信大多数的平庸之辈,进入大型互联网公司之后干的活都是非常无聊的工作,我不否认可以提升你所从事的方向的相关方面技术,但重要的是,你做的这些事情是否真的有意义?网络上流行过的带有戏谑成分的一句话可以从一定程度反应我的想法:"做 app 救不了中国"。当然,重点是"做 app 救不了...",而不是"救中国",没法救,我也根本救不了。一旦你进入工作后,会发现很多事情都是无用功,比如原来的某个领导喜欢一套东西,大家辛辛苦苦搞起来。然后后来哪天又来了个新领导,他觉得原来的东西,不行!他认为的东西,行!结果原来做好的一切都被推倒重来,又要加班暴肝好久。结果其实根本本质上是一个东西,甚至没有原来的好。类似的政治工作太多了,这些都让我觉得恶心。
-
-再来说说同事关系,其实很简单,就是一切向钱看,所有人的一切动作,言语,都是为了绩效,为了钱,他们可以做出任何事情,你要有这种心里准备,一个一直和你相处很好的同事,可能随时做好向你的上级领导打小报告的准备。
-
-互联网公司的绩效基本都是半年制,也就是说每半年你都要对其余人评价,其余人也会评价你。看似时间很长,其实很短暂,这就造成很多人要抓住一切机会来提升自己的绩效,拉低别人的绩效,这是保证自己收入的必须要做的事情。半年很短,工作上能**真正**做出的成果一定是极为有限的,其余人对你的了解也是极为有限的,因为不可能所有人都对你的工作都了解,那么造成的必然结果就是,这种绩效考核在很大程度上,人情考核以及日常的"谋略"与表演都是需要重点关注,大下功夫的。
-
-以上几点都是冰山一角而已,没有人想要讲述太多了。从这些事情来看,它根本就不是什么奋斗与不奋斗的问题,而是已经到了一个极为病态的程度,每个人在这个环境中人格,精神,都是不正常的。因为所有人做出的行为都是有原因的,那就是为了钱。
-
-讲到这里,还会有一类自觉满腹经纶的人用"存在即合理"这句话来反驳。"存在即合理"这句被很多人奉为圭臬的话其实是一句不知道是哪个带文豪"浓缩"来的"精华"。每个人都追求钱,这是正常的吗?明显是不正常的,但是是谁造成的呢?
-
----
+> Where there is oppression, there is resistance.
-工作部分讲完,再来说说生活部分。工作的时间基本是一周六天,然后每天晚上九点到十点下班,如果你家离得远,那么恭喜你,到家洗漱完已经快十二点了。早上基本是睡到不能再睡的最后一刻再去上班,一般是九点左右。我觉得这也不用我再说什么了。。。因为事实就在这里,没什么好说的,这种作息,你基本除了工作啥也干不成。谈恋爱?别闹了。休息那天睡到自然醒,洗衣服,收拾屋子,吃饭,躺尸一会,一天就这么过去了,非常快啊〜〜〜
+It is very ironic that this sentence, said today, will shame and fear some political parties in the world. Some people will think it is completely incomprehensible that people and organizations supporting the free software movement are concerned with politics, as if politics were an issue that had nothing to do with them. In fact, this view is very ignorant and stupid. The main goal of the free software movement is to guarantee the freedom and dignity that users deserve. However, in authoritarian countries, people are suppressed and oppressed in all aspects at the electoral level, the financial level, the network level, the speech level, etc., which makes the supporters of the free software movement unable to stand by. For the web, they have developed software that breaks internet blockades, such as V2ray and Shadowsocks, re-giving people the right to freely access the internet. For finance, they have developed the blockchain and the cryptocurrency system that grows on it, re-empowering people to truly control their own property, and to be free from the wealth plunder caused by the government's indiscriminate currency issuance. For administration, election and decision-making, the transparency and immutability of the blockchain ensures that everything is open, transparent and fair. In terms of speech, software such as Mammoth, Telegram, Matrix, etc. re-empowers people to freely express their opinions.
-就像知乎某热帖一样,如果你只有一级,每天能拿 500 点经验,升级要 100000000 点经验,这个游戏你还会不会玩下去了,我想是个脑子正常的人的反应都是:老子不玩了,摆烂呗。普通家庭在中国某超一线城市如果想扎根生活下去,面临的感受是极为类似的。理论上来说,如果掏空家中所有的积蓄,再加上收入,再贷款个三十年,还是可以在这个城市买一套 60 平米左右的房子的,也即:可以扎根了。但是你真的想这么做吗?原因主要有几点。第一,这样风险实在太大了,全部家当外加半辈子都投到一个房子里,风险有多大不用我多说。第二,这样的话,一辈子就都被绑定在这个房子上了,你也没有任何机会做想做的事情了,这值得吗?第三,家与城市的距离有多远?你与家人相聚的时间还能有几个月?用手指都能数过来。
-
-还有人会说,可以去一个房价没那么离谱的城市生活啊,其实这并没有什么两样,因为就算换个城市,工作还是那个环境,房价会好一些,但也不会好多少,而且在那种城市,你想找到一个你薪资满意,同时工作合适的机会,还是挺难的,互联网行业,好的工作都集中在超一线城市,大家都知道的。
-
-这种生活是你们想要的吗?
-
----
-
----
-
----
+> If you listen to it, it will be bright, and if you believe in it, it will be dark.
-在这个已经被资本牢牢统治的世界,《钱》早已被奉为成功与否的唯一标准。这样的世界人是否还应有除了赚钱以外的其他理想?是否**还能有**除了赚钱以外的其他理想?我们认为当然是应该和能够的,尽管很多人并不能理解和体会。我们的理想是每个人都应该有自由使用软件的权利,这不仅仅只局限在计算机行业内,而是在现代生活中与每个人所应享有的权利息息相关。直到我们多年前接触到自由软件运动,其所倡导的理念与我们之前的想法不谋而合。捧着手机刷抖音的你,不会知道这些软件在背后做了多少令人作呕的事情。这些专有软件也同时将无数人牢牢绑定在了它们的系统中,成为它们手中作恶的资本。另外提一点,有趣的是,我们在提到类似事情的时候,总会有人说到: "你看美国也是怎样怎样的..."。我们也没说美国好呀,您急什么?我们是不是某些人口中的"心怀叵测的境外势力"😅?
+This Chinese idiom is very applicable in many ways. Write the code, and after reading the source code of as many similar projects as possible, you will have a better grasp of the project you need to do. Watching news, only by listening to reports from various countries and media in the world, and combining your own thinking, can you come to a more rational conclusion. When making a decision, only after listening to the opinions of the relevant personnel, can a more reasonable and rational decision be made in the interests of more people. However, in authoritarian and totalitarian countries. We don't see any such possibility. The blockade of the Internet makes it difficult or impossible for people in these countries to obtain the world's news information, the latest software and technology, and can only hear and see what authoritarian and totalitarian governments want them to see. Cover people's eyes, ears, and finally sew their mouths. In this case, people will only be more and more deceived, and eventually become extreme and stupid. **We can't do it to see it all, and to be indifferent and stand idly by. **
-专有软件作恶、威权政府审计和监控,与冠绝全球的 Great Firewall 并驾齐驱,"我们赢了!"
+In fact, there is almost no monetary income for everything we do, which is incomprehensible to many people who believe in the philosophy of putting money first. Of course, this just shows that we are fundamentally different from these people. A scholar must be courageous and have a long way to go. Many people's ambition is to make money, but not here.
-这本`ArchLinux 安装使用教程`是本组织的初始项目,其质量一定会得到保障。随后也会有其他教程与各位见面,同时 ArchLinuxStudio 也会继续开发各类自由软件、以及能够做到"Equal Internet access for all."的各类工具。士不可以不弘毅,任重而道远,很多人的志向是赚钱,但在这里不是。
+Later, there will be other tutorials to meet readers, and ArchLinuxStudio will continue to develop various free software and various tools that can achieve "Equal Internet access for all." It's just that due to human and economic reasons, we can't guarantee the speed of the update, but we can guarantee that our speed may be very slow, but it will never stop.
---
-"萧瑟秋风今又是,换了人间。"
+Proprietary software for evil, totalitarian government surveillance, arrest and persecution, keep pace with the world's largest Great Firewall, "We won 🎉!"
diff --git a/docs/uk/rookie/DE&App.md b/docs/uk/rookie/DE&App.md
index 2200fe4..923207a 100644
--- a/docs/uk/rookie/DE&App.md
+++ b/docs/uk/rookie/DE&App.md
@@ -1,143 +1,144 @@
-# 桌面环境与常用应用
+# Desktop environment and common applications
-官方文档: [安装后的工作](https://wiki.archlinux.org/index.php/General_recommendations)
-本节只介绍最基本的,能使系统真正意义上可用所需的组件
+Official Documentation: [Working After Installation](https://wiki.archlinux.org/index.php/General_recommendations)
+This section describes only the most basic components needed to make the system truly usable
-注: 文档中带有 AUR 角标的软件代表是用户自行打包的第三方软件[AUR](https://aur.archlinux.org/),不在 Arch 官方支持范围内,可能会出现更新不及时、无法安装、使用出错等各种问题。如果遇到问题,你可自行去其 AUR 页面查看其他人的评论中是否有解决方法。如果不是实在没有官方支持的同类软件,则不建议使用。
+Note: The software with AUR in the document represents the third-party software packaged by the user [AUR](https://aur.archlinux.org/), which is not officially supported by Arch. It may be There will be various problems such as untimely updates, inability to install, and use errors. If you encounter problems, you can go to their AUR page to see if there are solutions in other people's comments. If it is not a similar software that is not officially supported, it is not recommended to use it.
-## 1.确保系统为最新
+## 1. Make sure the system is up to date
-如果你在做完上一节的内容后,重启并放置过一段时间,那需要先按照上节末尾处的方式重新连接网络,然后更新系统。
+If you restarted and left it for a while after completing the content of the previous section, you need to reconnect to the network as at the end of the previous section, and then update the system.
```bash
-pacman -Syyu #升级系统中全部包
+pacman -Syyu #Upgrade all packages in the system
```
-## 2.准备非 root 用户
+## 2. Prepare non-root user
-添加用户,比如新增加的用户叫 testuser
+Add a user, for example, the newly added user is called testuser
```bash
-useradd -m -G wheel -s /bin/bash testuser #wheel附加组可sudo,以root用户执行命令 -m同时创建用户家目录
+useradd -m -G wheel -s /bin/bash testuser #wheel additional group can be sudo, execute the command as root user -m create user home directory at the same time
```
-设置新用户 testuser 的密码
+Set a password for the new user testuser
```bash
passwd testuser
```
-编辑 sudoers 配置文件
+Edit sudoers configuration file
```bash
-EDITOR=vim visudo # 需要以 root 用户运行 visudo 命令
+EDITOR=vim visudo # need to run visudo command as root user
```
-找到下面这样的一行,把前面的注释符号 `#` 去掉,`:wq` 保存并退出即可。
+Find the following line, remove the preceding comment symbol `#`, save and exit with `:wq`.
```sudoers
-#%wheel ALL=(ALL) ALL
+#%wheel ALL=(ALL:ALL) ALL
```
-这里稍微解释一下
-%wheel 代表是 wheel 组,百分号是前缀
-ALL= 代表在所有主机上都生效(如果把同样的`sudoers`文件下发到了多个主机上)
-(ALL) 代表可以成为任意目标用户
-ALL 代表可以执行任意命令
-一个更详细的例子:
+Here's a little explanation
+%wheel represents the wheel group, and the percent sign is the prefix
+ALL= means it takes effect on all hosts (if the same `sudoers` file is sent to multiple hosts)
+(ALL) means that you can be any target user
+ALL means that any command can be executed
+A more detailed example:
```sudoers
-%mailadmin snow,rain=(root) /usr/sbin/postfix, /usr/sbin/postsuper, /usr/bin/doveadm
-nobody ALL=(root) NOPASSWD: /usr/sbin/rndc reload
+%mailadmin snow,rain=(root) /usr/sbin/postfix, /usr/sbin/postsuper, /usr/bin/doveadm
+nobody ALL=(root) NOPASSWD: /usr/sbin/rndc reload
```
-组 mailadmin 可以作为 root 用户,执行一些邮件服务器控制命令。可以在 "snow" 和 "rain"这两台主机上执行
-用户 nobody 可以以 root 用户执行`rndc reload`命令。可以在所有主机上执行。同时可以不输入密码。(正常来说 sudo 都是要求输入调用方的密码的)
+The group mailadmin can execute some mail server control commands as the root user. Can be executed on both "snow" and "rain" hosts
+User nobody can execute the `rndc reload` command as root. Can be executed on all hosts. At the same time, you can not enter a password. (Normally sudo requires the caller's password)
-## 3.安装 KDE Plasma 桌面环境
+## 3. Install KDE Plasma Desktop Environment
```bash
-pacman -S plasma-meta konsole dolphin #安装plasma-meta元软件包以及终端和文件管理器
+pacman -S plasma-meta konsole dolphin # install the plasma-meta meta package as well as the terminal and file manager
```
-## 4.配置 greeter sddm
+## 4. Configure greeter sddm
-
```
systemctl enable sddm
```
-## 5.设置交换文件 swap(可选)
+## 5. Set the swap file swap (optional)
-在桌面环境中,交换分区或文件用来实现休眠(hibernate)的功能,即将当前环境保存在磁盘的交换文件或分区部分。除此之外,某些特定软件需要 swap 才可以正确运行。交换文件与分区性能相同,且交换文件更为灵活,可随时变更大小,增加与删除。[[1]](https://wiki.archlinux.org/title/Swap#Swap_file)
+In the desktop environment, the swap partition or file is used to implement the function of hibernate, that is, to save the current environment in the swap file or partition part of the disk. In addition, some specific software requires swap to function correctly. The performance of the swap file is the same as that of the partition, and the swap file is more flexible and can be changed in size, added and deleted at any time. [[1]](https://wiki.archlinux.org/title/Swap#Swap_file)
```bash
-dd if=/dev/zero of=/swapfile bs=1M count=4096 status=progress #创建4G的交换空间 大小根据需要自定
-chmod 600 /swapfile #设置正确的权限
-mkswap /swapfile #格式化swap文件
-swapon /swapfile #启用swap文件
+dd if=/dev/zero of=/swapfile bs=1M count=4096 status=progress #Create a 4G swap space, the size can be customized as needed
+chmod 600 /swapfile #Set the correct permissions
+mkswap /swapfile #Format swap file
+swapon /swapfile #Enable swap file
```
-最后,向/etc/fstab 中**追加**如下内容:
+Finally, **append** the following to /etc/fstab:
```bash
/swapfile none swap defaults 0 0
```
-KDE 自身提供开箱即用的睡眠功能(suspend),即将系统挂起到内存,消耗少量的电量。休眠(hibernate)会将系统挂起到交换分区或文件,几乎不消耗电量。睡眠功能已可满足绝大多数人的需求,如果你一定需要休眠功能,可以参考[官方文档](https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate)设置休眠相关步骤。
+KDE itself provides an out-of-the-box sleep function (suspend), which suspends the system to memory and consumes a small amount of power. Hibernate (hibernate) will suspend the system to the swap partition or files, almost no power consumption. The sleep function can already meet the needs of most people. If you absolutely need the sleep function, you can refer to the [official document](https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate) to set up the relevant steps for sleep.
-## 6.开启 32 位支持库
+## 6. Enable 32-bit support library
```bash
vim /etc/pacman.conf
```
-去掉[multilib]一节中两行的注释,来开启 32 位库支持。
+Uncomment the two lines in the [multilib] section to enable 32-bit library support.
-最后:wq 保存退出,刷新 pacman 数据库
+Finally: wq save and exit, refresh the pacman database
```bash
-pacman -Syyu
+pacman-Syyu
```
-重启电脑,即可看到欢迎界面,输入新用户的密码即可登录桌面
+Restart the computer, you can see the welcome interface, enter the password of the new user to log in to the desktop
-## 7.安装基础功能包
+## 7. Install the basic function package
-进入桌面后,搜索 konsole。它是 KDE 桌面环境默认的命令行终端。
+Once on the desktop, search for konsole. It is the default command line terminal for the KDE desktop environment.
-首先先进行桌面环境中的网络设置:
+First perform the network settings in the desktop environment:
```bash
-sudo systemctl disable iwd #确保iwd开机处于关闭状态,其无线连接会与NetworkManager冲突
-sudo systemctl stop iwd #同上,立即关闭iwd
-sudo systemctl enable --now NetworkManager #确保先启动NetworkManager,并进行网络连接 若iwd已经与NetworkManager冲突 则执行完上一步重启一下电脑即可。
+sudo systemctl disable iwd #Ensure that iwd is turned off, its wireless connection will conflict with NetworkManager
+sudo systemctl stop iwd #Same as above, close iwd immediately
+sudo systemctl enable --now NetworkManager #Make sure to start NetworkManager first and connect to the network If iwd has conflicted with NetworkManager, just restart the computer after performing the previous step.
```
-接下来安装一些基础功能包。
+Next install some basic function packages.
```bash
-sudo pacman -S ntfs-3g #识别NTFS格式的硬盘
-sudo pacman -S adobe-source-han-serif-cn-fonts wqy-zenhei #安装几个开源中文字体 一般装上文泉驿就能解决大多wine应用中文方块的问题
-sudo pacman -S noto-fonts-cjk noto-fonts-emoji noto-fonts-extra #安装谷歌开源字体及表情
-sudo pacman -S firefox chromium #安装常用的火狐、谷歌浏览器
-sudo pacman -S ark #与dolphin同用右键解压
-sudo pacman -S p7zip unrar unarchiver lzop lrzip #安装ark可选依赖
-sudo pacman -S packagekit-qt5 packagekit appstream-qt appstream #确保Discover(软件中心)可用 需重启
-sudo pacman -S gwenview #图片查看器
-sudo pacman -S git wget kate bind #一些工具
+sudo pacman -S sof-firmware alsa-firmware alsa-ucm-conf #some sound firmware that may be needed
+sudo pacman -S ntfs-3g #Identify NTFS formatted hard disks
+sudo pacman -S adobe-source-han-serif-cn-fonts wqy-zenhei #Install several open source Chinese fonts Generally, installing Wenquanyi can solve the problem of most wine application Chinese squares
+sudo pacman -S noto-fonts-cjk noto-fonts-emoji noto-fonts-extra #Install Google open source fonts and expressions
+sudo pacman -S firefox chromium #Install commonly used Firefox and Google Chrome
+sudo pacman -S ark # with dolphin right-click to decompress
+sudo pacman -S p7zip unrar unarchiver lzop lrzip #Install ark optional dependencies
+sudo pacman -S packagekit-qt5 packagekit appstream-qt appstream #Ensure that Discover (Software Center) is available and needs to be restarted
+sudo pacman -S gwenview #imageviewer
+sudo pacman -S git wget kate bind #some tools
```
-> 不要安装过多字体:在字体超过 255 种时,某些 QT 程序可能无法正确显示某些表情和符号,详见链接[2](https://wiki.archlinux.org/title/fonts#Emoji_and_symbols)。
+> Don't install too many fonts: when there are more than 255 fonts, some QT programs may not display some emojis and symbols correctly, see link [2](https://wiki.archlinux.org/title/fonts#Emoji_and_symbols).
-## 8. 设置 DNS
+## 8. Set up DNS
-一般来说,如今大多电脑连接的路由器是可以自动处理 DNS 的,如果你的路由器不能处理,则需要额外进行 DNS 的设置。同时,如果使用 ISP 提供的默认 DNS,你的网络访问记录将存在**更大的**,被泄露或被当局存储记录的风险。除此之外,使用 ISP 提供的 DNS 还有可能将某些服务解析至一些已经失效或劣化的服务器。即使你的网络环境可以自动处理 DNS 设置,我们还是建议你使用可信的国际通用 DNS 设置。如下的配置将固定使用谷歌的 DNS,但是网络访问延迟可能增加。在阅读完随后的代理设置一节后,你的 DNS 请求将均通过代理发送,这将在 DNS 发送方面最大限度的保障你的隐私和安全。
+Generally speaking, most routers connected to computers today can automatically handle DNS. If your router cannot handle it, you need to perform additional DNS settings. At the same time, if you use the default DNS provided by your ISP, your network access records will be at a greater risk of being leaked or stored by authorities. In addition, the use of DNS provided by the ISP may also resolve some services to some servers that have failed or degraded. Even if your network environment can handle DNS settings automatically, we recommend that you use trusted international DNS settings. The configuration below will always use Google's DNS, but network access latency may increase. After reading the proxy settings section that follows, your DNS requests will be sent through a proxy, which will maximize your privacy and security in DNS sending.
-vim 编辑/etc/resolv.conf,删除已有条目,并将如下内容加入其中
+vim edit /etc/resolv.conf, delete existing entries, and add the following to it
```bash
nameserver 8.8.8.8
@@ -146,106 +147,60 @@ nameserver 8.8.4.4
nameserver 2001:4860:4860::8844
```
-如果你的路由器可以自动处理 DNS,resolvconf 会在每次网络连接时用路由器的设置覆盖本机/etc/resolv.conf 中的设置,执行如下命令加入不可变标志,使其不能覆盖如上加入的配置[[3]](https://wiki.archlinux.org/title/Domain_name_resolution#Overwriting_of_/etc/resolv.conf)[[4]](https://nssurge.zendesk.com/hc/zh-cn/articles/360011927114-DNS-%E9%85%8D%E7%BD%AE%E6%8C%87%E5%8D%97)。
+If your router can automatically handle DNS, resolvconf will overwrite the settings in the local /etc/resolv.conf with the router's settings each time the network is connected. Execute the following command to add an immutable flag so that it cannot overwrite the configuration added above. [[3]](https://wiki.archlinux.org/title/Domain_name_resolution#Overwriting_of_/etc/resolv.conf)[[4]](https://nssurge.zendesk.com/hc/en-us/articles/360011927114-DNS-%E9%85%8D%E7%BD%AE%E6%8C%87%E5%8D%97).
```bash
sudo chattr +i /etc/resolv.conf
```
-## 9.设置系统为中文
+## 9. Install yay
-打开 _System Settings_> _Regional Settings_> _Language_ -> _Add languages_ 中选择中文加入,再拖拽到第一位,Apply。
+AUR is the archlinux user repository. Any user can upload their own AUR packages, which is why there are so many software available for Arch Linux. Since anyone can upload, there are corresponding risks. Generally, a package recognized by the public can be used.
-再将*System Settings*> _Regional Settings_> _Formats_ 中的值设为`中文-简体中文(zh_CN)`
+Use [yay](https://github.com/Jguer/yay) to install packages from the AUR. Due to [Mainland China government blocks Github](https://zh.wikipedia.org/wiki/%E5%AF%B9GitHub%E7%9A%84%E5%AE%A1%E6%9F%A5%E5%92%8C%E5%B0%81%E9%94%81#%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD), you may not be able to install yay in the normal way in the official yay repository, so ArchLinuxStudio provides a bin package that can be installed directly for your temporary use during installation.
-最后重新登陆即可。
-
-> 很多人会错误的更改 _System Settings_> _Regional Settings_> _Formats_ 中的值为中文蒙古(mn_CN),默认,或者其他值,这会导致系统中一半英文一半中文。这里的值要保持默认的 en_US 或 zh_CN,或者改为你在 locale.gen 中添加的任意一种语言。
-
-## 10.安装 yay
-
-AUR 为 archlinux user repository。任何用户都可以上传自己制作的 AUR 包,这也是 Arch Linux 可用软件众多的原因。由于任何人都可上传,也存在对应的风险,一般选用大众认可的包即可。
-
-使用 [yay](https://github.com/Jguer/yay) 可以安装 AUR 中的包。由于[中国大陆政府封锁 Github](https://zh.wikipedia.org/wiki/%E5%AF%B9GitHub%E7%9A%84%E5%AE%A1%E6%9F%A5%E5%92%8C%E5%B0%81%E9%94%81#%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD)的原因,你很可能没有办法用 yay 官方仓库中正常的方式安装 yay,所以 ArchLinuxStudio 提供一份可以直接安装的 bin 包以供你在安装时暂时使用。
-
-执行如下命令安装 yay。
+Execute the following command to install yay.
```bash
-wget https://archlinuxstudio.github.io/ArchLinuxTutorial/res/yay-bin-11.1.2-1-x86_64.pkg.tar.zst
+wget https://raw.githubusercontent.com/ArchLinuxStudio/ArchLinuxTutorial/master/docs/res/yay-bin-11.1.2-1-x86_64.pkg.tar.zst
sudo pacman -U yay-bin-11.1.2-1-x86_64.pkg.tar.zst
```
-> github.io 也被中国大陆政府封锁,只是封锁力度暂时还没有很大。如你在下载过程中卡住,可以尝试 ctrl+c 终止命令后重新尝试下载,也可尝试更换手机热点的网络环境再次进行下载,后文安装 Qv2ray 时同理。当你配置好全局代理后,你将不再需要担心任何网络封锁问题。我们将持续为本书读者提供突破互联网审查的可靠流程。
-
-## 11.安装输入法
-
-[Fcitx5 官方文档]()
-中文及日文输入法均体验良好。
-
-```bash
-sudo pacman -S fcitx5-im #基础包组
-sudo pacman -S fcitx5-chinese-addons #官方中文输入引擎
-sudo pacman -S fcitx5-anthy #日文输入引擎
-yay -S fcitx5-pinyin-moegirl #萌娘百科词库 由于中国大陆政府对github封锁,你可能在此卡住。如卡住,可根据后文设置好代理后再安装
-sudo pacman -S fcitx5-pinyin-zhwiki #中文维基百科词库
-sudo pacman -S fcitx5-material-color #主题
-```
-
-设置环境变量:编辑文件 `EDITOR=vim sudoedit /etc/environment` 加入以下内容。konsole 以及 dolphin 都需要这些环境变量,倒是 chrome 和 firefox 都不需要就可以输入中文
-
-```bash
-GTK_IM_MODULE=fcitx
-QT_IM_MODULE=fcitx
-XMODIFIERS=@im=fcitx
-SDL_IM_MODULE=fcitx
-```
-
-打开 _系统设置_> _区域设置_> _输入法_,先点击`运行Fcitx`即可,拼音为默认添加项。如你还需要更多输入法如五笔,则再点击`添加输入法`,找到简体中文下的五笔 ,点击添加即可加入五笔输入法。
-
-接下来点击 _拼音_ 右侧的配置按钮,点选`云拼音`和`在程序中显示预编辑文本` 最后应用。
-
-回到输入法设置,点击`配置附加组件`,找到 _经典用户界面_ 在主题里选择一个你喜欢的颜色 最后应用。
-
-注销,重新登陆,就可以发现已经可以在各个软件中输入中文了
+> github.io and raw.githubusercontent.com are also blocked by the Chinese mainland government, but the blockade has not been very strong for the time being. If you get stuck during the download process, you can try ctrl+c to terminate the command and try the download again, or you can try to change the network environment of the mobile hotspot to download again. The same is true when installing Qv2ray later. When you configure the global proxy, you will no longer need to worry about any network blocking issues. We will continue to provide readers of this book with a reliable process for breaking through Internet censorship.
----
+## 10. Configure the system default editor
-- RIME
- 中州韵输入法引擎(英语:Rime Input Method Engine,又称 Rime 输入法)是由佛振编写的开源中文输入法,目前项目网站、源代码均托管在 GitHub。基于同一个核心架构,该输入法分为三个官方发行版:Linux 发行版中州韵(ibus-rime)、Windows 发行版小狼毫(Weasel)、macOS 发行版鼠须管(Squirrel)。另有数个第三方发行版:Linux 发行版 fcitx-rime、Windows 发行版 PRIME、macOS 发行版 XIME、Android 发行版同文输入法(Trime)、iOS 发行版 iRime。
-
-这里介绍一下 fcitx5-rime 的安装方式
-'''bash
-sudo pacman -S fcitx5-rime #不是 fcitx-rime,因为 fcitx 与 fcitx5 有版本冲突
-'''
-然后打开 打开 _系统设置_> _区域设置_> _输入法_>,点击添加输入法,找到 RIME,即可添加 RIME 输入法。
-RIME 输入法默认是繁体字按 Ctrl+~,即可打开选单,使用键盘上的←→,选择朙月拼音·简化字,回车。
-
-## 12.配置系统默认编辑器
-
-默认情况下,Arch Linux 在一些终端编辑场景使用 vi 编辑器,但是我们使用 vim。如果不做一个额外配置,在 git 等场景下,在终端调用编辑器会出错。编辑 `EDITOR=vim sudoedit /etc/profile` 文件,加入如下内容,将 vim 设置为默认 EDITOR
+By default, Arch Linux uses the vi editor for some terminal editing scenarios, but we use vim. If you do not do an additional configuration, in scenarios such as git, calling the editor in the terminal will cause an error. Edit the `EDITOR=vim sudoedit /etc/profile` file and add the following to set vim as the default EDITOR
```bash
export EDITOR='vim'
```
-这样就不用在每次执行命令时都指定一遍 `EDITOR=vim` 了。
+This eliminates the need to specify `EDITOR=vim` every time you execute a command.
-## 13.启用蓝牙(若有)
+## 11. Enable Bluetooth
-如果你有蓝牙设备,需要安装蓝牙软件包并启用蓝牙服务。随后在系统设置中进行添加设备与连接即可。
+For Bluetooth and wireless network cards, Intel products are recommended under Linux. Broadcom and Realtek products perform very poorly in Linux in terms of compatibility and stability, which will cause a lot of unnecessary troubles, such as poor or no support for drivers and BLE.
+
+If you have a bluetooth device, you need to install the bluetooth package and enable the bluetooth service. Then you can add devices and connections in the system settings.
```bash
sudo pacman -S bluez bluez-utils
sudo systemctl enable --now bluetooth
```
-如果要连接蓝牙音频设备,需要安装 `pulseaudio-bluetooth` 并重启 `pulseaudio`。
+To set the bluetooth device to automatically start at boot, edit the `/etc/bluetooth/main.conf` file and set `AutoEnable` to true.
+
+Broadcom network cards are poorly supported under Linux, both wireless and bluetooth modules. For the wireless function, generally install the broadcom-wl package directly.
```bash
-sudo pacman -S pulseaudio-bluetooth
-pulseaudio -k
+sudo pacman -S broadcom-wl
```
-
+- [Broadcom wireless ArchWiki](https://wiki.archlinux.org/title/broadcom_wireless)
+- [Fix WiFi and Bluetooth problems in ArcoLinux or Arch Linux](https://kaneis.wordpress.com/2020/12/16/fix-bluetooth-problem-not-scanning-any-devices-in-arcolinux-or-arch-linux-with-broadcom-bluetooth-usb-dongle-or-broadcom-half-mini-card-bcm94352-hmb-azurewave-aw-ce123h-supports-wifi-ac-and-bt4le/)
+- [ [Broadcom BCM4352] A fix for empty bluetooth scan/visibility](https://bbs.archlinux.org/viewtopic.php?id=228561)
diff --git a/docs/uk/rookie/archlinux_pre_install.md b/docs/uk/rookie/archlinux_pre_install.md
index 21d0209..492aff6 100644
--- a/docs/uk/rookie/archlinux_pre_install.md
+++ b/docs/uk/rookie/archlinux_pre_install.md
@@ -1,53 +1,79 @@
-# 安装前的准备
+# Preparation before installation
-由于当前 UEFI 已普及十余年,安装将全部以 UEFI+GPT 的形式进行,传统 BIOS 方式不再赘述。
+Since UEFI has been popular for more than ten years, the installation will be carried out in the form of UEFI+GPT, and the traditional BIOS method will not be repeated.
-## 1.确保网络环境
+## 0. Use of terminal editor vim
-如果你可以使用路由器分接出来的网线,以 dhcp 的方式直接上网,那么不用准备什么。如果你的环境只能使用无线网络安装,需要事先把自己所用的 wifi 名称改成自己能记住的英文名称。因为**安装时无法显示和输入中文名的 wifi**,你会看到一堆不知道是什么的方块,并且在安装过程中你将没有办法输入中文的无线名称进行连接。虽然通过一些繁琐的步骤可以解决终端中文的问题,但是显然这么做在安装 Arch Linux 时毫无必要。
+In the process of installing Arch Linux, you need to use the vim editor. If you don't know how to use it, here is a brief introduction. You need to master the following basic operations. For a practical environment, you can find an online Linux experience environment to try vim, such as [copy.sh](https://copy.sh/v86/?profile=archlinux). Note that because it is an online environment, the performance is poor, and you need to wait patiently when executing the vim command.
-其次,有些笔记本电脑上存在无线网卡的硬件开关或者键盘控制,开机后安装前需要**确保你的无线网卡硬件开关处于打开状态**。
+```bash
+vim 1.txt #Create and edit a file named 1.txt
+```
+
+You can see that an empty interface is entered. You are now in vim's `command mode`. In `command mode`, you can use some shortcuts to manipulate text.
+Now we enter `a` to enter vim's `edit mode`, enter any text at this time, and you can edit it.
+After the input is complete, we can press the Esc key to exit from `edit mode` to `command mode`. At this point, enter `:wq` to save and exit vim.
+Here are some commonly used commands in command mode
+
+```bash
+:wq # save and exit
+:q! # do not save, force quit
+dd # delete a line
+2dd # delete two lines
+gg # go back to the first line of text
+shift+g # go to the last line of text
+/xxx # Search for the content 'xxx' in the text, press Enter to search, press the n key to go to the next one
+?xxx # reverse search
+```
+
+Extended link: Readers who need a complete tutorial can enter the command `vimtutor` in the terminal to learn the complete vim tutorial.
+
+## 1. Ensure the network environment
+
+If you can use the network cable from the router to directly access the Internet by dhcp, then you don't need to prepare anything. If your environment can only use wireless network installation, you need to change the wifi name you use to an English name you can remember in advance. Because **installation cannot display and enter the Chinese name of the wifi**, you will see a bunch of blocks that you don't know what it is, and during the installation process you will not be able to enter the Chinese name of the wifi to connect. Although some tedious steps can solve the problem of terminal Chinese, it is obviously unnecessary to do so when installing Arch Linux.
+
+Secondly, there are hardware switches or keyboard controls for wireless network cards on some laptops. After booting, you need to ensure that your wireless network card hardware switches are turned on before installation.
-## 2.刻录启动优盘
+## 2. Burn the bootable USB
-准备一个 2G 以上的优盘,刻录一个安装启动盘。安装镜像 iso 在[下载页面](https://archlinux.org/download/)下载,你需要选择通过磁力链接或 torrent 下载,下载完成后,还需要在 archlinux 下载页面下载`PGP signature`签名文件(不要从镜像源下载签名文件),将签名文件和 iso 镜像置于同一文件夹,随后进行对镜像的签名校验,以保证下载的镜像是完整,无错误的,未被篡改的。执行以下命令,确保输出完好的签名。具体镜像名根据名字自行修改。
+Prepare a USB disk with a size of more than 2G, and burn a boot disk for installation. Install the mirror iso to download at the [download page](https://archlinux.org/download/), you need to download the newest iso, choose to download through a magnet link or torrent, after the download is complete, you also need to download the `PGP signature` signature file on the archlinux download page ( Do not download the signature file from the mirror source), put the signature file and the iso image in the same folder, and then perform the signature verification of the image to ensure that the downloaded image is complete, error-free and untampered. If you are using Linux, execute the following command to make sure the output is well signed. The specific image name can be modified according to the name. If you use another system, please search for a way to verify the signature by yourself.
```bash
gpg --keyserver-options auto-key-retrieve --verify archlinux-202x.0x.01-x86_64.iso.sig
```
-注意,这里的签名校验**非常重要**,这可以保证你的安装镜像是未被篡改的,同时可以保证你在使用安装盘安装系统时,用正确的公钥校验安装包。
+Note that the signature verification here is **very important**, which can ensure that your installation image has not been tampered with, and can also ensure that you use the correct public key to verify the installation package when you use the installation disk to install the system.
---
-Windows 下推荐使用[ventoy](https://www.ventoy.net/cn/doc_start.html)或者[Rufus](https://rufus.ie/)或者[etcher](https://github.com/balena-io/etcher)进行优盘刻录。三者皆为自由软件。具体操作请自行查阅,都非常简单。
+It is recommended to use [ventoy](https://www.ventoy.net/cn/doc_start.html) or [Rufus](https://rufus.ie/) or [etcher](https://github.com/balena-io/etcher) to burn to USB. All three are free software. Please check the specific operation by yourself, it is very simple.
-Linux 下可以直接用 dd 命令进行刻录。注意 of 的参数为 sdx,不是 sdx1 sdx2 等。
+Under Linux, you can directly use the dd command to burn. Note that the parameter of of is sdx, not sdx1 sdx2 etc.
```bash
sudo dd bs=4M if=/path/to/archlinux.iso of=/dev/sdx status=progress oflag=sync
```
-> bs=4M 指定一个较为合理的文件输入输出块大小。
-> status=progress 用来输出刻录过程总的信息。
-> oflag=sync 用来控制写入数据时的行为特征。确保命令结束时数据及元数据真正写入磁盘,而不是刚写入缓存就返回。
+> bs=4M specifies a reasonable file input and output block size.
+> status=progress is used to output general information about the burning process.
+> oflag=sync is used to control behavior when writing data. Make sure that the data and metadata are actually written to disk at the end of the command, rather than just being written to the cache and returning.
-## 3.进入主板 BIOS 进行设置
+## 3. Enter the motherboard BIOS to set
-插入优盘并开机。在开机的时候,按下 F2/F8/F10/DEL 等(取决与你的主板型号,具体请查阅你主板的相关信息)按键,进入主板的 BIOS 设置界面。
+Insert the USB stick and turn it on. When booting, press F2/F8/F10/DEL (depending on your motherboard model, please refer to the relevant information of your motherboard) to enter the motherboard's BIOS setting interface.
-## 4.关闭主板设置中的 Secure Boot
+## 4. Turn off Secure Boot in the motherboard settings
-在类似名为 `security` 的选项卡中,找到一项名为 Secure Boot(名称可能略有差异)的选项,选择 Disable 将其禁用。
+In a tab like `security`, find an option called Secure Boot (the name may vary slightly), select Disable to disable it.
-## 5.调整启动方式为 UEFI
+## 5. Adjust the boot method to UEFI
-在某些旧的主板里,需要调整启动模式为 UEFI,而非传统的 BIOS/CSM。在类似名为 `boot` 的选项卡中,找到类似名为 Boot Mode 的选项,确保将其调整为 UEFI only,而非 legacy/CSM。
+In some old motherboards, it is necessary to adjust the boot mode to UEFI instead of traditional BIOS/CSM. In a tab called something like `boot`, find an option called something like Boot Mode, make sure to adjust it to UEFI only, not legacy/CSM.
-## 6.调整硬盘启动顺序
+## 6. Adjust the hard disk boot order
-在类似名为 `boot` 的选项卡中,找到类似名为 Boot Options(名称可能略有差异)的设置选项,将 USB 优盘的启动顺序调至首位。
+In a tab called `boot`, find a setting option called Boot Options (the name may be slightly different), and adjust the boot order of the USB stick to the first place.
-## 7.准备安装
+## 7. Ready to install
-最后保存 BIOS 设置并退出,一般的按键是 F10。此时系统重启,不出意外你应该已经进入 archlinux 的安装界面。
+Finally, save the BIOS settings and exit, the general key is F10. At this point, the system restarts, and you should have entered the installation interface of archlinux.
diff --git a/docs/uk/rookie/basic_install.md b/docs/uk/rookie/basic_install.md
index 748e59b..d6c925b 100644
--- a/docs/uk/rookie/basic_install.md
+++ b/docs/uk/rookie/basic_install.md
@@ -1,45 +1,45 @@
-# Arch Linux 基础安装
+# Arch Linux Basic Installation
-本节从安装最基础的无图形化 ArchLinux 系统开始。[官方安装指南](https://wiki.archlinux.org/index.php/Installation_guide)
+This section starts with installing the most basic non-graphical ArchLinux system. [Official Installation Guide](https://wiki.archlinux.org/index.php/Installation_guide)
-## 0.禁用 reflector
+## 0. Disable reflector
-reflector 会为你选择速度合适的镜像源,但其结果并不准确,同时会清空配置文件中的内容,对于新人来讲并不适用,我们首先对其进行禁用。
+Reflector will choose a mirror source with suitable speed for you, but the result is not accurate, and it will clear the content in the configuration file. It is not suitable for newcomers, so we first disable it.
```bash
systemctl stop reflector.service
```
-## 1.再次确保是否为 UEFI 模式
+## 1. Make sure again if it is UEFI mode
-在一系列的信息刷屏后,可以看到已经以 root 登陆安装系统了,此时可以执行的命令:
+After a series of information flashes, you can see that the installation system has been logged in as root, and the commands that can be executed at this time:
```bash
ls /sys/firmware/efi/efivars
```
-若输出了一堆东西,即 efi 变量,则说明已在 UEFI 模式。否则请确认你的启动方式是否为 UEFI。
+If it outputs a bunch of things, namely the efi variable, it means that it is already in UEFI mode. Otherwise, please confirm whether your boot method is UEFI.
-## 2.连接网络
+## 2. Connect to the Internet
-一般来说,你连接的网络几乎均可以通过 DHCP 的方式来进行 IP 地址和 DNS 的相关设置,你无需进行额外操作。在没有合适网络的情况下,使用手机的移动热点也是很方便的选择。如果你的网络环境需要配置静态 IP 和 DNS,请自行参考 Arch Wiki。
+Generally speaking, almost all the networks you connect to can perform IP address and DNS related settings through DHCP, and you do not need to perform additional operations. In the absence of a suitable network, using the mobile hotspot of the mobile phone is also a very convenient choice. If your network environment needs to configure static IP and DNS, please refer to the Arch Wiki.
-对于有线连接来说,直接插入网线即可。
+For wired connections, just plug in the network cable directly.
-对于无线连接,则需进行如下操作进行网络连接。
+For wireless connection, you need to perform the following operations to connect to the network.
-无线连接使用 iwctl 命令进行,按照如下步骤进行网络连接:
+The wireless connection is made using the iwctl command, and the network connection is made according to the following steps:
```bash
-iwctl #执行iwctl命令,进入交互式命令行
-device list #列出设备名,比如无线网卡看到叫 wlan0
-station wlan0 scan #扫描网络
-station wlan0 get-networks #列出网络 比如想连接YOUR-WIRELESS-NAME这个无线
-station wlan0 connect YOUR-WIRELESS-NAME #进行连接 输入密码即可
-exit #成功后exit退出
+iwctl #Execute the iwctl command to enter the interactive command line
+device list #List the device name, for example, the wireless network card is called wlan0
+station wlan0 scan #Scan network
+station wlan0 get-networks #List networks For example, if you want to connect to the wireless network of YOUR-WIRELESS-NAME
+station wlan0 connect YOUR-WIRELESS-NAME #Connect and enter the password
+exit # exit after success
```
-可以等待几秒等网络建立链接后再进行下面测试网络的操作。
+You can wait a few seconds for the network to establish a link before proceeding with the following test network operations.
```bash
ping www.gnu.org
@@ -47,260 +47,274 @@ ping www.gnu.org
---
-**如果**你不能正常连接网络,首先确认系统已经启用网络接口[[1]](https://wiki.archlinux.org/index.php/Network_configuration/Wireless#Check_the_driver_status)。
+**If** you cannot connect to the network normally, first make sure that the system has enabled the network interface [[1]](https://wiki.archlinux.org/index.php/Network_configuration/Wireless#Check_the_driver_status).
```bash
-ip link #列出网络接口信息,如不能联网的设备叫wlan0
-ip link set wlan0 up #比如无线网卡看到叫 wlan0
+ip link #List network interface information, such as a device that cannot be connected to the Internet is called wlan0
+ip link set wlan0 up #For example, when the wireless network card sees it is called wlan0
```
-**如果**随后看到类似`Operation not possible due to RF-kill`的报错,继续尝试`rfkill`命令来解锁无线网卡。
+**If** you then see an error like `Operation not possible due to RF-kill`, continue to try the `rfkill` command to unlock the wireless card.
```bash
rfkill unblock wifi
```
-## 3.更新系统时钟
+## 3. Update the system clock
```bash
-timedatectl set-ntp true #将系统时间与网络时间进行同步
-timedatectl status #检查服务状态
+timedatectl set-ntp true #Sync system time with network time
+timedatectl status #Check service status
```
-## 4.分区
+## 4. Partition
-这里总共设置三个分区,是一个**我们认为**较为通用的方案。此步骤会清除磁盘中全部内容,请事先确认。
+There are a total of three partitions set up here, which is a **we think** a more general scheme. This step will clear all the contents of the disk, please confirm in advance.
-- EFI 分区[[2]](https://wiki.archlinux.org/title/EFI_system_partition#Mount_the_partition): `/efi` 800M
-- 根目录: `/` 100G
-- 用户主目录: `/home` 剩余全部
+- EFI partition[[2]](https://wiki.archlinux.org/title/EFI_system_partition#Mount_the_partition): `/efi` 800M
+- root directory: `/` 100G
+- User home directory: `/home` and everything else
-> 这里根目录的大小仅为参考,一般来说个人日常使用的 linux 分配 100G 已经够用了。根目录最小建议不小于 50G,根目录过小会造成无法更新系统软件包等问题。
+> The size of the root directory here is for reference only. Generally speaking, 100G allocated for linux for daily use is enough. The minimum recommended root directory size is not less than 50G. If the root directory is too small, it will cause problems such as inability to update system software packages.
-首先将磁盘转换为 gpt 类型,这里假设比如你想安装的磁盘名称为 sdx。如果你使用 NVME 的固态硬盘,你看到的磁盘名称可能为 nvme0n1。
+First convert the disk to gpt type, assuming that the name of the disk you want to install is sdx. If you are using an NVME SSD, you may see the disk name as nvme0n1.
```bash
-lsblk #显示分区情况 找到你想安装的磁盘名称
-parted /dev/sdx #执行parted,进入交互式命令行,进行磁盘类型变更
-(parted)mktable #输入mktable
-New disk label type? gpt #输入gpt 将磁盘类型转换为gpt 如磁盘有数据会警告,输入yes即可
-quit #最后quit退出parted命令行交互
+lsblk #Display partition situation Find the name of the disk you want to install
+parted /dev/sdx #Execute parted, enter the interactive command line, and change the disk type
+(parted)mktable #Enter mktable
+New disk label type? gpt #Enter gpt to convert the disk type to gpt If the disk has data, it will warn you, enter yes
+quit #Finally quit quits parted command line interaction
```
-接下来使用 cfdisk 命令对磁盘分区。进入 cfdisk 后的操作很直观,用键盘即可操作分配各个分区的大小与格式。一般建议将 EFI 分区设置为磁盘的第一个分区,据说有些主板如果不将 EFI 设置为第一个分区,可能有不兼容的问题。其中 EFI 分区选择`EFI System`类型,其余两个分区选择`Linux filesystem`类型。如果你还是不会操作,可参见配套视频中的详细操作。
+Next use the cfdisk command to partition the disk. The operation after entering cfdisk is very intuitive. You can use the arrow keys, Tab key and Enter key of the keyboard to operate and assign the size and format of each partition. It is generally recommended to set the EFI partition as the first partition of the disk. It is said that some motherboards may have incompatibility problems if they do not set the EFI as the first partition. The EFI partition selects the `EFI System` type, and the other two partitions select the `Linux filesystem` type.
```bash
-cfdisk /dev/sdx #来执行分区操作,分配各个分区大小,类型
-fdisk -l #分区结束后, 复查磁盘情况
+cfdisk /dev/sdx #To perform partition operations, assign the size and type of each partition
+fdisk -l #After the partition is over, review the disk status
```
-## 5.格式化
+## 5. Formatting
-建立好分区后,需要对分区用合适的文件系统进行格式化。这里用`mkfs.ext4`命令格式化根分区与 home 分区,用`mkfs.vfat`命令格式化 EFI 分区。如下命令中的 sdax 中,x 代表分区的序号。格式化命令要与上一步分区中生成的分区名字对应才可以。如果你还是不会操作,可参见配套视频中的详细操作。
+After creating the partition, you need to format the partition with a suitable file system. Here, use the `mkfs.ext4` command to format the root partition and home partition, and use the `mkfs.vfat` command to format the EFI partition. In sdax in the following command, x represents the serial number of the partition. The format command must correspond to the partition name generated in the previous step.
-磁盘若事先有数据,会提示你: 'proceed any way?' 按 y 回车继续即可。
+If the disk has data in advance, it will prompt you: 'proceed any way?' Press y and press Enter to continue.
```bash
-mkfs.ext4 /dev/sdax #格式化根目录和home目录的两个分区
-mkfs.vfat /dev/sdax #格式化efi分区
+mkfs.ext4 /dev/sdax #Format the two partitions of the root directory and the home directory
+mkfs.vfat /dev/sdax #Format efi partition
```
-## 6.挂载
+## 6. Mount
-在挂载时,挂载是有顺序的,先挂载根分区,再挂载 EFI 分区。
-这里的 sdax 只是例子,具体根据你的实际情况来,如果你还是无法理解,请注意配套视频中的操作。
+When mounting, the mounting is sequential, the root partition is mounted first, and then the EFI partition is mounted.
+The sdax here is just an example, according to your own actual partition situation.
```bash
-mount /dev/sdax /mnt
-mkdir /mnt/efi #创建efi目录
+mount /dev/sdax /mnt
+mkdir /mnt/efi #Create efi directory
mount /dev/sdax /mnt/efi
-mkdir /mnt/home #创建home目录
+mkdir /mnt/home #Create home directory
mount /dev/sdax /mnt/home
```
-## 7.镜像源的选择
+## 7. Mirror source selection
-使用如下命令编辑镜像列表:
+Edit the mirror list with the following command:
```bash
vim /etc/pacman.d/mirrorlist
```
-其中的首行是将会使用的镜像源。添加中科大或者清华的放在最上面即可。
+The first line of this is the image source that will be used. Add the ones from the University of Science and Technology of China or Tsinghua University and put them on the top.
```
Server = https://mirrors.ustc.edu.cn/archlinux/$repo/os/$arch
Server = https://mirrors.tuna.tsinghua.edu.cn/archlinux/$repo/os/$arch
```
-如果其速度不佳,可以手动指定其他镜像源。完整的镜像源列表可参考官方[镜像源生成器](https://archlinux.org/mirrorlist/)。
+If it's not as fast, you can manually specify another mirror source. For a complete list of mirror sources, please refer to the official [mirror source generator](https://archlinux.org/mirrorlist/).
-> 这里使用中国境内的镜像源以提高访问速度。然而这存在问题,镜像源(如 arch linux 清华镜像源)以及第三方源(如 archlinux-cn)可以知道你的 ip 是什么,什么时候更新了系统,什么时候检查了系统,什么时候更新了什么软件,你安装的软件列表是什么。在威权国家的镜像源维护者完全有可能根据威权当局的要求提供这些数据,很多维护者在网络上几乎是实名上网的,他们没有任何抵抗能力,进一步的,威权国家可以根据这些元数据与你产生的其他元数据进行比对,从而对你进行进一步的定位与辨识。简单举一个例子,要求维护者提供或监视安装了 v2ray/qv2ray 等软件包的使用者的 ip,以及安装时间,以及其全部软件列表。
+> Here use the mirror source in China to improve the access speed. However, there is a problem with this, mirror sources (such as arch linux Tsinghua mirror source) and third-party sources (such as archlinux-cn) can know what your ip is, when you updated the system, when you checked the system, and when you updated what Software, what is the list of software you have installed. Mirror source maintainers in authoritarian countries are entirely possible to provide these data according to the requirements of authoritarian authorities. Many maintainers are almost online with real names on the Internet, and they have no resistance. Further, authoritarian countries can communicate with you based on these metadata. Compare with other metadata generated to further locate and identify you. As a simple example, the maintainer is required to provide or monitor the ip of users who have installed packages such as v2ray/qv2ray, as well as the installation time, and a list of all their software.
-> 如果你在安装 arch linux 时的网络已经处于代理模式下,可以选择一个与你代理位置较近的,非威权国家的镜像源来使用。如果你在安装 arch linux 时的网络环境没有代理,那么在安装结束后,需要尽快更换一个非威权国家的镜像源来使用。如下列举一些较为优质的国际源
+> If your network is already in proxy mode when you install arch linux, you can choose a mirror source from a non-authoritarian country that is close to your proxy location to use. If there is no proxy in the network environment when you install arch linux, then after the installation, you need to replace the mirror source of a non-authoritative country as soon as possible to use it. Some of the more high-quality international sources are listed below.
```bash
-Server = https://mirror.aktkn.sg/archlinux/$repo/os/$arch #新加坡
+Server = https://mirror.archlinux.tw/ArchLinux/$repo/os/$arch #East Asia: Republic of China
+Server = https://mirror.0xem.ma/arch/$repo/os/$arch #North America:Canada
+Server = https://mirror.aktkn.sg/archlinux/$repo/os/$arch #Southeast Asia:Singapore
+Server = https://archlinux.uk.mirror.allworldit.com/archlinux/$repo/os/$arch #Europe Region: UK
+Server = https://mirrors.cat.net/archlinux/$repo/os/$arch #East Asia: Japan
```
-## 8.安装系统
+## 8. Install the system
-必须的基础包
+Required base package
```bash
-pacstrap /mnt base base-devel linux linux-headers linux-firmware #base-devel在AUR包的安装是必须的
+pacstrap /mnt base base-devel linux linux-headers linux-firmware #base-devel is required to install the AUR package
```
-必须的功能性软件
+> Note that at present, it is necessary to ensure that the pacman-init.service service is started before executing the pacstrap or pacman command to install the package, otherwise an error will be raised and the installation process cannot be performed. Use the `systemctl status pacman-init.service` command to check the current service status. For more content, refer to the [post] in bbs (https://bbs.archlinux.org/viewtopic.php?id=278518&p=2)
+
+> If there is an error related to the keyring during installation, refer to this article [GnuPG-2.1 and the pacman keyring](https://archlinux.org/news/gnupg-21-and-the-pacman-keyring/) and execute the commands.
+
+Required functional software
```bash
-pacstrap /mnt dhcpcd iwd vim bash-completion #一个有线所需(iwd也需要dhcpcd) 一个无线所需 一个编辑器 一个补全工具
+pacstrap /mnt dhcpcd iwd vim bash-completion #Required for a wired (iwd also requires dhcpcd) A wireless requires an editor and a completion tool
```
-## 9.生成 fstab 文件
+## 9. Generate fstab file
-fstab 用来定义磁盘分区
+fstab is used to define disk partitions
```bash
genfstab -U /mnt>> /mnt/etc/fstab
```
-复查一下 /mnt/etc/fstab 确保没有错误
+Double check /mnt/etc/fstab to make sure there are no errors
```bash
cat /mnt/etc/fstab
```
-## 10.change root
+## 10. change root
-把环境切换到新系统的/mnt 下
+Switch the environment to /mnt of the new system
```bash
arch-chroot /mnt
```
-## 11.时区设置
+## 11. Time zone settings
-设置时区,在/etc/localtime 下用/usr 中合适的时区创建符号连接。如下设置上海时区。
+To set the time zone, create a symlink under /etc/localtime with the appropriate time zone in /usr. Set the Shanghai time zone as follows.
```bash
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
```
-随后进行硬件时间设置,将当前的正确 UTC 时间写入硬件时间。
+The hardware time setting is then performed to write the current correct UTC time to the hardware time.
```bash
hwclock --systohc
```
-## 12.设置 Locale 进行本地化
+## 12. Set Locale for localization
+
+Locale determines the format, character arrangement, and other localization criteria for locale, currency, time zone dates.
-Locale 决定了地域、货币、时区日期的格式、字符排列方式和其他本地化标准。
+First, use vim to edit /etc/locale.gen, and remove the comment symbol (#) on the line where en_US.UTF-8 is located and the line where zh_CN.UTF-8 is located. Here you need to use vim's search and editing functions. If you forget, please turn to the previous section to review the operation of vim.
-编辑 /etc/locale.gen,去掉 en_US.UTF-8 所在行以及 zh_CN.UTF-8 所在行的注释符号(#)。
+```bash
+vim /etc/locale.gen
+```
-然后使用如下命令生成 locale。
+Then use the following command to generate the locale.
```bash
locale-gen
```
-向 /etc/locale.conf 导入内容
+Finally import the content to /etc/locale.conf
```bash
-echo 'LANG=en_US.UTF-8'> /etc/locale.conf
+echo 'LANG=en_US.UTF-8'> /etc/locale.conf
```
-## 13.设置主机名
+## 13. Set the hostname
-首先在`/etc/hostname`设置主机名
+First set the hostname in `/etc/hostname`
```bash
vim /etc/hostname
```
-加入你想为主机取的主机名,这里比如叫 myarch。
+Add the hostname you want for the host, for example myarch here.
-接下来在`/etc/hosts`设置与其匹配的条目。
+Next set the matching entry in `/etc/hosts`.
```
vim /etc/hosts
```
-加入如下内容
+add the following
```bash
-127.0.0.1 localhost
-::1 localhost
-127.0.1.1 myarch
+127.0.0.1 localhost
+::1 localhost
+127.0.1.1 myarch
```
-> 某些情况下如不设置主机名,在 KDE 下可能会存在网络情况变更时无法启动 GUI 应用的问题,在终端中出现形如`No protocol specified qt.qpa.xcb: could not connect to display`的错误,这种情况较为少见[[3]](https://bbs.archlinux.org/viewtopic.php?id=241338)[[4]](https://bbs.archlinux.org/viewtopic.php?id=243674)[[5]](https://wiki.archlinux.org/title/Network_configuration#Local_hostname_resolution)。
+> In some cases, if you do not set the hostname, there may be a problem in KDE that the GUI application cannot be started when the network conditions change, and a message like `No protocol specified qt.qpa.xcb: could not connect to display` will appear in the terminal error, which is relatively rare [[3]](https://bbs.archlinux.org/viewtopic.php?id=241338)[[4]](https://bbs.archlinux.org/viewtopic.php?id=243674)[[5]](https://wiki.archlinux.org/title/Network_configuration#Local_hostname_resolution).
-## 14.为 root 用户设置密码
+## 14. Set password for root user
```bash
passwd root
```
-## 15.安装微码
+## 15. Install microcode
```bash
-pacman -S intel-ucode #Intel
-pacman -S amd-ucode #AMD
+pacman -S intel-ucode #Intel
+pacman -S amd-ucode #AMD
```
-## 16.安装引导程序
+## 16. Install the bootloader
```bash
-pacman -S grub efibootmgr #grub是启动引导器,efibootmgr被 grub 脚本用来将启动项写入 NVRAM。
+pacman -S grub efibootmgr #grub is the bootloader, efibootmgr is used by the grub script to write boot entries into NVRAM.
grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=GRUB
```
-接下来编辑/etc/default/grub 文件,去掉`GRUB_CMDLINE_LINUX_DEFAULT`一行中最后的 quiet 参数,同时把 log level 的数值从 3 改成 5。这样是为了后续如果出现系统错误,方便排错。同时在同一行加入 nowatchdog 参数,这可以显著提高开关机速度。不会 vim 的读者注意视频中的操作。
+Next, edit the /etc/default/grub file, remove the last quiet parameter in the `GRUB_CMDLINE_LINUX_DEFAULT` line, and change the log level value from 3 to 5. This is for the convenience of troubleshooting if a system error occurs in the future. Also add the nowatchdog parameter on the same line, which can significantly speed up the power on and off. Here you need to use the editing function of vim. If you forget, please turn to the previous section to review the operation of vim.
```bash
vim /etc/default/grub
```
-最后生成 GRUB 所需的配置文件
+Finally generate the configuration files required by GRUB
+
+Users using Nvidia cards need to note that KDE6 uses wayland session by default. If you need to use wayland, you need to enable DRM. Also edit the /etc/default/grub file and add the last parameter in the `GRUB_CMDLINE_LINUX_DEFAULT` line: nvidia_drm.modeset=1
```bash
grub-mkconfig -o /boot/grub/grub.cfg
```
-> 我们在之前的命令中指定了 bootloader-id 为 GRUB,这一般不会出现问题。然而在某些主板安装完成后,你会发现没有 nvme 启动条目。这是因为某些主板的 UEFI 固件在显示 UEFI NVRAM 引导条目之前,需要在特定的位置存放可引导文件,不支持自定义存放 efi 文件[[6]](https://wiki.archlinux.org/index.php/GRUB#Default/fallback_boot_path)。解决方式是使用`--removable` 参数解决一些主板 NVRAM 的兼容性问题。
+> We specified the bootloader-id as GRUB in the previous command, which usually doesn't cause problems. However, after some motherboards are installed, you will find that there is no nvme boot entry. This is because the UEFI firmware of some motherboards needs to store the bootable file in a specific location before displaying the UEFI NVRAM boot entry, and does not support custom storage of efi files [[6]](https://wiki.archlinux.org/index.php/GRUB#Default/fallback_boot_path). The workaround is to use the `--removable` parameter to resolve some motherboard NVRAM compatibility issues.
```bash
grub-install --target=x86_64-efi --efi-directory=/efi --removable
grub-mkconfig -o /boot/grub/grub.cfg
```
-除此之外,如果你的主板是一些较老的型号,如 intel 9 系列以下或者较老 AMD 的主板,它们很可能不支持从 nvme 启动系统,虽然可以通过修改 BIOS 加入 NVME 支持模块来解决,但这不在本文讨论范围内。
+In addition, if your motherboard is some older models, such as intel 9 series or below or older AMD motherboards, they are likely to not support booting the system from nvme, although it can be solved by modifying the BIOS to add the NVME support module, But this is beyond the scope of this article.
-## 17.完成安装
+## 17. Complete the installation
```bash
-exit # 退回安装环境#
-umount -R /mnt # 卸载新分区
-reboot # 重启
+exit # Return to the installation environment#
+umount -R /mnt # unmount the new partition
+reboot # reboot
```
-注意,重启前要先拔掉优盘,否则你重启后还是进安装程序而不是安装好的系统。重启后,开启 dhcp 服务,即可连接网络
+Note that you must unplug the USB before restarting, otherwise you will still enter the installer instead of the installed system after restarting. After restarting, start the dhcp service to connect to the network
```bash
-systemctl start dhcpcd #立即启动dhcp
-ping www.gnu.org #测试网络连接
+systemctl start dhcpcd #Start dhcp immediately
+ping www.gnu.org #test network connection
```
-若为无线链接,则还需要启动 iwd 才可以使用 iwctl 连接网络
+If it is a wireless link, you also need to start iwd before you can use iwctl to connect to the network
```bash
-systemctl start iwd #立即启动iwd
-iwctl #和之前的方式一样,连接无线网络
+systemctl start iwd #Start iwd immediately
+iwctl #Same as before, connect to the wireless network
```
-到此为止,一个基础的,无 UI 界面的 Arch Linux 已经安装完成了。紧接着下一节,我们来安装图形界面。
+So far, a basic, UI-less Arch Linux has been installed. In the next section, let's install the graphical interface.
-> archlinux 在 2021 年 4 月在安装镜像中内置了一个[安装脚本](https://archlinux.org/packages/extra/any/archinstall/),提供一些选项,即可快速安装。其和所有一键安装脚本类似,提供自动化,且不灵活的安装过程。不建议使用这种安装脚本,除了不灵活的原因,初学者也无法在这种安装过程中学到任何东西。如果你因为任何原因需要快速启动一个基础的 archlinux 环境,那么可以尝试此脚本。
+> archlinux has an [installation script](https://archlinux.org/packages/extra/any/archinstall/) built into the installation image in April 2021, providing some options for quick installation. Similar to all one-click installation scripts, it provides an automated and inflexible installation process. This type of installation script is not recommended, and aside from being inflexible, beginners won't be able to learn anything during this type of installation. If you need to quickly start a basic archlinux environment for any reason, then try this script.
diff --git a/docs/uk/rookie/fxckGFW.md b/docs/uk/rookie/fxckGFW.md
index eec2905..11b2304 100644
--- a/docs/uk/rookie/fxckGFW.md
+++ b/docs/uk/rookie/fxckGFW.md
@@ -1,60 +1,59 @@
-# 魔法学院
+# School of Magic
-> **[访问互联网权](https://zh.wikipedia.org/wiki/%E8%A8%AA%E5%95%8F%E4%BA%92%E8%81%AF%E7%B6%B2%E6%AC%8A)认为所有人必须能够访问互联网,以行使和享受其言论自由、通信自由、见解自由以及其他基本人权。任何国家及地区不合理地限制个人对互联网的访问都是对基本人权的践踏。**
+> **[Right to access the Internet](https://en.wikipedia.org/wiki/%E8%A8%AA%E5%95%8F%E4%BA%92%E8%81%AF%E7%B6%B2%E6%AC%8A) believes that all people must have access to the Internet in order to exercise and enjoy their freedom of speech, freedom of communication, freedom of opinion, and other fundamental human rights. Any country or region that unreasonably restricts personal access to the Internet is a violation of basic human rights.**
-**为了你的人身安全,不要在任何装有具有间谍性质的专有软件的设备上使用科学上网客户端。这些设备可以是手机,PC 等。在手机上,威权政府的监管机构可以轻易得到你所安装的应用列表,并可以通过各种手段关联并查询到你所做的事和发表的言论,并采取进一步控制,这是有先例的。理论上,在 PC 设备上也完全存在这种可能。如果你必须要使用微信,QQ 等具有间谍性质的专有软件,请在完全隔离的物理设备中使用。更多内容请阅读[现代隐私保护指南](https://archlinuxstudio.github.io/ModernSecurityProtectionGuide/#/),这对你的安全非常重要!**
+**For your personal safety, do not use the Science Internet Client on any device with spyware proprietary software. These devices can be cell phones, PCs, etc. On mobile phones, there is precedent for authoritarian government regulators to easily get a list of the apps you have installed, and to correlate and query what you do and say through various means, and take further control. In theory, this is entirely possible on PC devices as well. If you must use WeChat, QQ and other proprietary software with espionage properties, please use it in a completely isolated physical device. Please read [Modern Privacy Protection Guide](https://archlinuxstudio.github.io/ModernSecurityProtectionGuide/#/) for more content, it is very important for your security!**
-本节描述如何在 linux 下进行科学上网。本节以及后续的全局代理章节都是**必读章节**。如果没有配置好科学上网,那么你在日常使用中会遇到各种问题,不论是被封锁的资源或代码,还是查阅相关问题资料,你都会有可能无法下载和浏览。所有人**必须**配置好科学上网再继续。
+This section describes how to surf the web scientifically under linux. This section and subsequent global proxy chapters are **must read**. If you do not configure Scientific Internet, then you will encounter various problems in daily use, whether it is blocked resources or codes, or consulting related problem materials, you may not be able to download and browse. Everyone **must** configure Science Internet before proceeding.
-## 1.节点的准备
+## 1. Preparation of nodes
-简单来讲节点是形如如下的神秘链接,不论你以何种方式获得的这些连接,如果你已经拥有,可以直接阅读下面一小节。
+Simply put, a node is a mysterious link in the form of the following. No matter how you get these links, if you already have them, you can directly read the following section.
```txt
-ss://xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-vmess://xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ss://xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+vmess://xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
```
-如果你没有这些连接,可以自行部署或者购买机场的订阅服务。
+If you don't have these connections, you can deploy it yourself or buy a subscription to the airport.
-如果自行部署,你则需要自行购买处于自由互联网的服务器并进行节点搭建,这不在本文讨论范围内,仅提供三篇 GFW Report 的高质量文章作为参考。但是这些文章已被 GFW 屏蔽。我们之后会提供一些办法解决这个问题。
+If you deploy it yourself, you need to purchase a server on the free Internet and build a node yourself. This is not within the scope of this article, and only three high-quality articles from the GFW Report are provided for reference. But these articles have been blocked by GFW. We will provide some solutions to this problem later.
-- [如何部署一台抗封锁的 Shadowsocks-libev 服务器](https://gfw.report/blog/ss_tutorial/zh/)
-- [防御 GFW 主动探测的实用指南](https://gfw.report/blog/ss_advise/zh/)
-- [Shadowsocks 是如何被检测和封锁的](https://gfw.report/talks/imc20/zh/)
+- [How to deploy an anti-blocking Shadowsocks-libev server](https://gfw.report/blog/ss_tutorial/en/)
+- [A practical guide to defending against GFW active detection](https://gfw.report/blog/ss_advise/en/)
+- [How Shadowsocks is detected and blocked](https://gfw.report/talks/imc20/en/)
-对于服务器的购买,我们提供一个网址以供参考: https://bitcoin-vps.com/ 。bitcoin-vps 提供了非常详尽、且及时更新的服务器供应商列表,这些服务器供应商均在不同程度上支持使用加密货币进行支付,如比特币、以太坊等等。使用加密货币支付的好处在于,在正确操作的基础上,你可以完全保障自己的隐私安全。使用支付宝等实名支付手段购买类似的服务是不安全的,我们希望读者们可以认识到加密货币在各方面的价值,并认识到加密货币可以作为你的隐私保护者的存在。
+For server purchases, we provide a URL for reference: https://bitcoin-vps.com/ . bitcoin-vps provides a very detailed and up-to-date list of server providers that support the use of cryptocurrencies for payments to varying degrees, such as Bitcoin, Ethereum, and more. The advantage of paying with cryptocurrencies is that, with proper operation, you can fully protect your privacy. It is not safe to use real-name payment methods such as Alipay to purchase similar services. We hope that readers can recognize the value of cryptocurrencies in all aspects and realize that cryptocurrencies can exist as your privacy protectors.
---
-如果购买机场的订阅服务,可以参考它们的订阅流程以获取节点。在我们列出一些较为可信的机场服务以供选择,但是**我们不提供任何担保**。需要提醒的是,机场服务属于灰色产业,随时有停止服务的可能,购买建议以月付进行购买以避免过大损失。关于机场审计规则,我们的观点是"我可以不看,但是你不可以封禁"。对于机场审计程度,读者可根据自身实际情况自行评估。
+If you purchase subscription services for airports, you can refer to their subscription process to get nodes. We have listed some of the more trusted airport services to choose from, but **WE DO NOT GIVE ANY WARRANTY**. It should be reminded that the airport service is a gray industry, and it is possible to stop the service at any time. It is recommended to pay monthly to avoid excessive losses. Regarding airport audit rules, our view is "I can not read, but you can't ban". As for the degree of airport audit, readers can make their own assessments according to their own actual situation.
-- [白月光](https://ss.cn88.net/#/register?code=wH0Pr5l8) 新运营的机场,优点在于速度较为优秀,对流媒体解锁支持较为全面,机场主的售后服务迅速。对于其审计规则,可在注册账户后进入后台面板自行查看。据我们测试,其并没有严格按照审计规则进行审计。
-- [GLaDOS](https://glados.rocks) 邮箱注册后使用激活码`9FMKX-GYLMK-ZYIZW-5U3T0`激活账户并获取免费时长。GLaDOS 的优势在于可以进行签到来免费使用,而且运营时间较长,较为可信。除此之外,GLaDOS 还是为数不多的拥有 Trojan 节点的机场。缺点在于速度并不算优秀。对于其审计规则,可在注册账户后进入后台面板自行查看。据我们测试,其并没有严格按照审计规则进行审计。
+- [GLaDOS](https://www.glados.rocks/landing/9FMKX-GYLMK-ZYIZW-5U3T0) After registration, use the activation code `9FMKX-GYLMK-ZYIZW-5U3T0` to activate the account and get free time. The advantage of GLaDOS is that it can be used for free upon check-in, and it operates for a long time and is more credible. In addition to that, GLaDOS is one of the few airports with a Trojan node. The downside is that the speed isn't great. For its audit rules, you can enter the background panel to view it yourself after registering an account. According to our tests, it is not audited strictly in accordance with the auditing rules.
---
-如果你不想花任何费用,可安装[赛风](https://psiphon3.com/zh/index.html)这类软件。赛风是自由软件。
+If you don't want to spend any money, you can install software like [Psiphon](https://psiphon3.com/zh/index.html). Psiphon is free software.
-如果你使用赛风,可以非常方便的发送空邮件到get@psiphon3.com以获取赛风下载链接。赛风应用目前只支持 Windows\Android\IOS\MacOS 平台。当你在这些平台上能够访问自由互联网时,可以去各个渠道搜索可用的节点和代理资源,如[这个](https://t.me/wtovpn)或者[这个](https://t.me/TG_Mtproxy_1)。注意,使用公共节点需要自行承担可能的风险。
+If you use Psiphon, you can easily send an empty email to get@psiphon3.com to get the Psiphon download link. Psiphon application currently only supports Windows\Android\IOS\MacOS platform. When you can access the free Internet on these platforms, you can go to various channels to search for available nodes and proxy resources, such as [this](https://t.me/wtovpn) or [this](https://t.me/TG_Mtproxy_1). Note that using public nodes is at your own risk.
-## 2.安装
+## 2. Installation
-Qv2ray 和 V2rayA 是两款非常优秀的在 Linux 上可用的科学上网通用客户端。你可以把二者都安装,以作备用。其中 V2rayA 是一款浏览器客户端,它可以在服务器等 headless 环境中通过远程在浏览器端访问。Qv2ray 是一款经典的使用 QT 开发的 C/S 架构桌面端软件。
+Qv2ray and V2rayA are two excellent general-purpose clients for scientific internet available on Linux. You can install both as a backup. Among them, V2rayA is a browser client, which can be accessed remotely on the browser side in a headless environment such as a server. Qv2ray is a classic C/S architecture desktop software developed with QT.
-
+
### v2ray
-v2ray 是使用 Qv2ray 以及 V2rayA 的前提。需要先进行安装。在前面[镜像源的选择](/rookie/basic_install?id=_7镜像源的选择)一节中我们提到,读者应该尽快更换非威权国家的镜像源以保障自身的安全,**在此处安装 v2ray 之前是你更换非威权国家的镜像源的最晚时刻**。使用安全的镜像源安装 v2ray。
+v2ray is a prerequisite for using Qv2ray and V2rayA. It needs to be installed first. In the previous section [Selection of Mirror Sources](uk/rookie/basic_install?id=_7-mirror-source-selection), we mentioned that readers should replace mirror sources in non-authoritarian countries as soon as possible to ensure their own security, ** here Before installing v2ray is the last time you can switch to a mirror source in a non-authoritarian country**. Install v2ray using a secure mirror source.
```bash
sudo pacman -S v2ray
```
-如果在你的网络环境下,没有较快速度的或可达的安全镜像源来安装 v2ray,你可以执行如下命令安装 ArchLinuxStudio 为你提供的 v2ray 安装包。
+If there is no faster or accessible secure mirror source to install v2ray in your network environment, you can execute the following command to install the v2ray installation package provided by ArchLinuxStudio.
```bash
wget https://archlinuxstudio.github.io/ArchLinuxTutorial/res/v2ray-4.44.0-1-x86_64.pkg.tar.zst
@@ -63,18 +62,18 @@ sudo pacman -U v2ray-4.44.0-1-x86_64.pkg.tar.zst
### V2rayA
-V2rayA 是一个浏览器客户端,使用非常方便。由于作者提供了在墙内的下载地址,可以直接在 AUR 进行安装。安装后需启动服务。V2rayA 更新频繁,开发活跃,并且其安装和使用流程都对新手更加友好,推荐新人使用 V2rayA 进行科学上网。
+V2rayA is a browser client that is very convenient to use. Since the author provides the download address in the wall, it can be installed directly in AUR. The service needs to be started after installation. V2rayA is updated frequently, developed actively, and its installation and use process are more friendly to novices. It is recommended for newcomers to use V2rayA for scientific Internet access.
```bash
yay -S v2raya-bin
sudo systemctl enable --now v2raya
```
-随后在 KDE 菜单中搜索 v2raya,点击即可打开浏览器页面。登陆后在其中加入订阅即可使用。更多使用方法请看[官方文档](https://v2raya.org/)与[项目地址](https://github.com/v2rayA/v2rayA)
+Then search for v2raya in the KDE menu and click to open the browser page. After logging in, you can use it by adding a subscription. For more usage methods, please see [Official Documentation](https://v2raya.org/) and [Project Address](https://github.com/v2rayA/v2rayA)
### Qv2ray 3.0
-和上一节中所述相同的原因,由于[中国大陆政府封锁 Github](https://zh.wikipedia.org/wiki/%E5%AF%B9GitHub%E7%9A%84%E5%AE%A1%E6%9F%A5%E5%92%8C%E5%B0%81%E9%94%81#%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD)的原因,你很可能没有办法用正常 yay 的方式通过 AUR 安装[Qv2ray 3.0](https://github.com/Shadowsocks-NET/Qv2ray),所以 ArchLinuxStudio 提供一组可以直接安装的包以供你使用。Qv2ray3.0 的 bin 仓库在于 AUR 的地址: [qv2ray-static-nightly-bin](https://aur.archlinux.org/packages/qv2ray-static-nightly-bin)。 Qv2ray3.0 的动态链接仓库在于 AUR 的地址: [qv2ray-git](https://aur.archlinux.org/packages/qv2ray-git)。Qv2ray 的安装与使用较为复杂,不建议新手使用。需要提醒的是,如果你使用动态链接的 Qv2ray,在其相关依赖更新后,你需要手动重新构建 Qv2ray。
+For the same reasons as described in the previous section, due to the [Mainland Chinese government blocks Github](https://zh.wikipedia.org/wiki/%E5%AF%B9GitHub%E7%9A%84%E5%AE%A1%E6%9F%A5%E5%92%8C%E5%B0%81%E9%94%81#%E4%B8%AD%E5%8D%8E%E4%BA%BA%E6%B0%91%E5%85%B1%E5%92%8C%E5%9B%BD), you probably cannot install [Qv2ray 3.0](https://github.com/Shadowsocks-NET/Qv2ray) through AUR in the normal yay way, so ArchLinuxStudio provides a set of ready-to-install packages for you to use. The bin repository of Qv2ray3.0 is at the AUR address: [qv2ray-static-nightly-bin](https://aur.archlinux.org/packages/qv2ray-static-nightly-bin). The dynamic link repository of Qv2ray3.0 is at the AUR address: [qv2ray-git](https://aur.archlinux.org/packages/qv2ray-git). The installation and use of Qv2ray is more complicated and is not recommended for novice users. It should be reminded that if you use a dynamically linked Qv2ray, you will need to manually rebuild Qv2ray after its related dependencies are updated.
```bash
wget https://archlinuxstudio.github.io/ArchLinuxTutorial/res/qv2ray-git-3.0.0.rc1.r36.g0f1bf651-1-x86_64.pkg.tar.zst
@@ -84,34 +83,34 @@ wget https://archlinuxstudio.github.io/ArchLinuxTutorial/res/uvw-2.11.0_libuv_v1
sudo pacman -U *.pkg.tar.zst
```
-> github.io 也被中国大陆政府封锁,只是封锁力度暂时还没有很大。如你在此过程中卡住,可以尝试 ctrl+c 终止命令后重新尝试下载,也可尝试更换手机热点的网络环境再次进行下载。当你配置好全局代理后,你将不再需要担心任何网络封锁问题。我们将持续为本书读者提供突破互联网审查的可靠流程。
+> github.io is also blocked by the Chinese mainland government, but the blockade has not been very strong for the time being. If you get stuck during this process, you can try ctrl+c to terminate the command and try the download again, or you can try to change the network environment of the mobile phone hotspot to download again. When you configure the global proxy, you will no longer need to worry about any network blocking issues. We will continue to provide readers of this book with a reliable process for breaking through Internet censorship.
-安装后在 Plugins 中,选择 V2ray V4 support,并进行 V2ray 的设置。现在你已经可以使用,你需要按照官方文档导入已有的链接或订阅,其余细节请详细阅读 [Qv2ray 的文档](https://qv2ray.net/)。有如下几个注意事项:
+After installation, in Plugins, select V2ray V4 support, and set V2ray. Now that you can use it, you need to import the existing links or subscriptions according to the official documentation. For the rest of the details, please read [Qv2ray's documentation](https://qv2ray.net/). There are a few things to note:
-- Qv2ray3.0 中 VMESS MD5 与非 0 的 AlterID 的形式已不被支持,若你的机场或节点下发的 AlterID 是非 0 是无法使用的。如果服务端支持,你可将 AlterID 改为 0 来使用 VMessAEAD 形式。
-- Qv2ray3.0 已经将机场的默认订阅类型改为规范:SIP008。如果你的机场订阅类型为 base64,则需要在分组->订阅设置->订阅类型 中,将 SIP008 改为 base64,否则你将拿不到任何订阅链接中的节点。
-- **如果**你先前使用过 2.x 的旧版本 Qv2ray ,需要删除旧版 Qv2ray 以及不兼容的配置,同时旧版 Qv2ray 与新版 Qv2ray 不能共存。
+- The form of VMESS MD5 and non-0 AlterID in Qv2ray3.0 is no longer supported. If the AlterID issued by your airport or node is non-0, it cannot be used. If the server supports it, you can change the AlterID to 0 to use the VMessAEAD form.
+- Qv2ray3.0 has changed the airport's default subscription type to Specification: SIP008. If your airport subscription type is base64, you need to change SIP008 to base64 in Group->Subscription Settings->Subscription Type, otherwise you will not get any nodes in the subscription link.
+- **If** you have used an old version of Qv2ray 2.x before, you need to delete the old version of Qv2ray and the incompatible configuration, and the old version of Qv2ray and the new version of Qv2ray cannot coexist.
```bash
rm -rf ~/.config/qv2ray
sudo pacman -R qv2ray-dev-git
```
-- Qv2ray 3.0 与旧版插件不兼容,原有 Qv2ray 2.x 旧版插件不可使用。目前 Qv2ray 3.0 集成了 VMess、Shadowsocks 以及 Trojan 的支持,并通过[插件仓库](https://github.com/Shadowsocks-NET/QvPlugins)提供 命令行插件、测速插件、Trojan-Go 和 Naive 的支持。如果你需要使用其中的插件,则需要自行编译,并将其置入目标目录`~.config/qv2ray/plugins/`。同时,ArchLinuxStudio 也提供预先为你编译好的插件以方便你的使用。其中的 Trojan-Go 插件目前似乎并不能正常使用,其中的 hostname 以及 port 不能被正常解析[[1]](https://github.com/Shadowsocks-NET/QvPlugins/issues/1)。当然你也可以自行编译插件,在CMakeLists.txt中解除你需要编译的插件的注释,随后进行编译。编译步骤可参考QvPlugins的Actions的[workflow file](https://github.com/Shadowsocks-NET/QvPlugins/actions/runs/1156038253/workflow)。
- - [命令行插件](https://archlinuxstudio.github.io/ArchLinuxTutorial/res/QvPlugins/libQvPlugin-Command.so)
- - [测速插件](https://archlinuxstudio.github.io/ArchLinuxTutorial/res/QvPlugins/libQvPlugin-LatencyTest.so)
+- Qv2ray 3.0 is not compatible with the old plug-ins, the old Qv2ray 2.x old plug-ins cannot be used. Currently, Qv2ray 3.0 integrates the support of VMess, Shadowsocks and Trojan, and provides support for command line plugins, speed measurement plugins, Trojan-Go and Naive through [Plugin Repository](https://github.com/Shadowsocks-NET/QvPlugins). If you need to use one of the plugins, you need to compile it yourself and put it in the target directory `~.config/qv2ray/plugins/`. At the same time, ArchLinuxStudio also provides pre-compiled plug-ins for your convenience. The Trojan-Go plugin does not seem to be working properly at present, and the hostname and port cannot be resolved normally [[1]](https://github.com/Shadowsocks-NET/QvPlugins/issues/1). Of course, you can also compile the plugin yourself, uncomment the plugin you need to compile in CMakeLists.txt, and then compile it. For the compilation steps, please refer to the [workflow file](https://github.com/Shadowsocks-NET/QvPlugins/actions/runs/1156038253/workflow) of Actions of QvPlugins .
+ - [Command Line Plugin](https://archlinuxstudio.github.io/ArchLinuxTutorial/res/QvPlugins/libQvPlugin-Command.so)
+ - [Speed Test Plugin](https://archlinuxstudio.github.io/ArchLinuxTutorial/res/QvPlugins/libQvPlugin-LatencyTest.so)
- [Trojan-Go](https://archlinuxstudio.github.io/ArchLinuxTutorial/res/QvPlugins/libQvPlugin-TrojanGo.so)
- [Naive](https://archlinuxstudio.github.io/ArchLinuxTutorial/res/QvPlugins/libQvPlugin-NaiveProxy.so)
-## 3. 代理的初步设置
+## 3. Preliminary settings for the proxy
-在经过上述步骤后,你应该已经有了 SOCKS5 代理以及 HTTP 代理的地址和端口。本小节描述如何单独为一些程序设置代理,但是需要提醒的是,这不是我们推荐的使用方式,如果你是 Linux 的日常重度使用者,你应该使用后续将会讲述的全局代理方式。
+After going through the above steps, you should already have the SOCKS5 proxy and the address and port of the HTTP proxy. This section describes how to set up a proxy for some programs individually, but it should be reminded that this is not the recommended way to use it. If you are a daily heavy user of Linux, you should use the global proxy method that will be described later.
-在节点链接后,你可在 KDE 的`系统设置` -> `网络设置` -> `代理`中设置代理。注意,`系统设置`中的代理配置在 KDE 桌面环境中并不是所有应用都会遵守,经过测试,chrome/chromium/brave 浏览器与 steam 等应用会遵循 KDE 的系统代理设置。没有遵循系统设置代理的应用还需要单独进行代理配置。下面说明几种常用的软件中单独配置代理的方式。
+After the node is linked, you can set the proxy in KDE's `System Settings` -> `Network Settings` -> `Proxy`. Note that the proxy configuration in `system settings` is not followed by all applications in the KDE desktop environment. After testing, applications such as chrome/chromium/brave browsers and steam will follow KDE's system proxy settings. Applications that do not follow the system settings proxy also require separate proxy configuration. The following describes how to configure agents individually in several commonly used software.
-- Firefox 浏览器
- 火狐浏览器自身的设置选项中存在代理配置,进行配置即可。
+- Firefox browser
+ There is a proxy configuration in the settings options of the Firefox browser itself, and you can configure it.
-- 终端
- 可以通过 export 命令设置当前终端的代理方式。比如使用 tldr 或 github raw 等资源需要设置 https 代理。
+- Terminal
+ The proxy mode of the current terminal can be set through the export command. For example, using resources such as tldr or github raw requires setting an https proxy.
```bash
export https_proxy=http://127.0.0.1:8889
@@ -119,37 +118,37 @@ sudo pacman -U *.pkg.tar.zst
export all_proxy=http://127.0.0.1:8889
```
-> 不同终端命令所识别的环境变量名不同,如 all_proxy 对 curl 生效,而对 wget 则不生效,具体可查看各个命令的 man page。
+> The names of environment variables recognized by different terminal commands are different. For example, all_proxy is valid for curl, but not for wget. For details, please refer to the man page of each command.
-- code OSS
- File => Preference => Settings
- 搜索 proxy,在其中填入 http 代理地址即可
+- code OSS
+ File => Preferences => Settings
+ Search for proxy and fill in the http proxy address in it
-- proxychains-ng
- 如果对于一个应用,KDE 的全局代理不生效,在终端 export 了 ALL_PROXY 变量再用终端启动此应用代理也不生效,并且这个应用自身也没有配置代理的选项,此时可以尝试使用 proxychains-ng,它可以为单行命令配置代理。它是一个预加载的 hook,允许通过一个或多个 SOCKS 或 HTTP 代理重定向现有动态链接程序的 TCP 流量。
+-proxychains-ng
+If for an application, KDE's global proxy does not take effect, exporting the ALL_PROXY variable in the terminal and then starting the application proxy from the terminal does not take effect, and the application itself does not have the option to configure the proxy. At this time, you can try to use proxychains-ng, it The proxy can be configured for a one-line command. It is a preloaded hook that allows to redirect TCP traffic for existing dynamic linkers through one or more SOCKS or HTTP proxies.
- ```bash
- sudo pacman -S proxychains-ng
- sudo vim /etc/proxychains.conf
- ```
+```bash
+sudo pacman -S proxychains-ng
+sudo vim /etc/proxychains.conf
+```
- 把配置文件中最后一行改为本地代理的 ip 和端口,如`socks5 127.0.0.1 1089`
+Change the last line in the configuration file to the ip and port of the local proxy, such as `socks5 127.0.0.1 1089`
- proxychains 不能够支持 yay 以及其他一些程序,详见[Incompatible with proxychains](https://github.com/Jguer/yay/issues/429)[proxychains4 with Go lang](https://github.com/rofl0r/proxychains-ng/issues/199)。这种情况可以使用透明代理。
+proxychains cannot support yay and some other programs, see [Incompatible with proxychains](https://github.com/Jguer/yay/issues/429)[proxychains4 with Go lang](https://github.com/rofl0r/proxychains-ng/issues/199). A transparent proxy can be used in this case.
-## 4. 更加全面的系统级全局代理
+## 4. A more comprehensive system-level global proxy
-由以上各部分可以看到,为各个软件单独设置代理是很麻烦的。如果你把 Linux 作为主力使用,那么配置透明代理也是必须的,如果你使用 V2rayA,那么可以很方便的在设置中开启全局代理。如果你的技术水平不高,建议你直接使用 V2rayA 的全局代理。如果你使用 Qv2ray,请阅读随后的[透明代理](rookie/transparentProxy)一节。
+As can be seen from the above sections, it is very troublesome to set up a proxy for each software separately. If you use Linux as the main force, it is also necessary to configure a transparent proxy. If you use V2rayA, you can easily turn on the global proxy in the settings. If your technical level is not high, it is recommended that you use V2rayA's global proxy directly. If you use Qv2ray, please read the following section [Transparent Proxy](uk/rookie/transparentProxy).
-对于全局代理的情况下,开启 UDP 支持,DNS 请求也将被拦截并导入 v2ray 中,更详细的描述将在下节进行。
+In the case of global proxy, with UDP support turned on, DNS requests will also be intercepted and imported into v2ray, a more detailed description will be given in the next section.
-## 5. 为什么我们不建议使用分流代理?分流代理可能存在什么危险?
+## 5. Why do we not recommend the use of offload proxies? What are the possible dangers of offloading proxies?
-分流代理在大多数场景下指的是:在访问国内资源时,使用直连的方式,而在访问国外被墙的资源时,使用代理进行连接。这种网络的使用方式确实会非常方便,但是存在显而易见的危险,然而大众几乎并没有意识到这里的问题。
+In most scenarios, the shunt proxy refers to using a direct connection method when accessing domestic resources, and using a proxy connection when accessing foreign resources that are blocked. This way of using the network can be very convenient, but there are obvious dangers, but the public is almost unaware of the problem.
-使用分流代理的方式非常容易泄露你自身的隐私信息,包括但不限于 IP 地址,浏览器以及硬件指纹(几乎可以唯一标记你这一个用户的指纹)等等一系列信息,并且可以将你使用的代理 IP 与你自身的真实 IP 进行对应。
+It is very easy to leak your own private information, including but not limited to IP address, browser and hardware fingerprint (which can almost uniquely mark your user's fingerprint), etc., and can use the information you use. The proxy IP corresponds to your own real IP.
-举例来说,一个最常见的例子就是某个国外的网站使用了百度统计脚本,这时你的代理 IP 与真实 IP 的对应信息可以轻松的被这样的网站进行对应,这是非常危险的。
-另一个例子就是一些恶意的邮件,比如你在使用国外的邮箱服务,接收到了一个恶意邮件,这个邮件中嵌入了一些国内的资源如图片,那么你的真实 IP 等信息也可以被轻松获取。
+For example, one of the most common examples is that a foreign website uses a Baidu statistics script. At this time, the corresponding information between your proxy IP and real IP can be easily matched by such a website, which is very dangerous.
+Another example is some malicious emails. For example, you are using a foreign email service and receive a malicious email. This email contains some domestic resources such as pictures, so your real IP and other information can also be easily obtained.
-真实的例子不止以上两个,还有很多类似的情况存在。我们一直为了大众的隐私与安全而战,希望今后你可以放弃使用分流代理的网络连接方式。
+There are more real examples than the above two, there are many similar situations. We have always fought for the privacy and security of the public, and we hope that in the future you will be able to forgo the use of shunt proxy network connections.
diff --git a/docs/uk/rookie/graphic_driver.md b/docs/uk/rookie/graphic_driver.md
index f709f8f..584e6d4 100644
--- a/docs/uk/rookie/graphic_driver.md
+++ b/docs/uk/rookie/graphic_driver.md
@@ -1,62 +1,62 @@
-# 显卡驱动
+# Graphics card driver
-现在是 2022 年,显卡驱动的安装在 Arch Linux 上已经变得非常容易。本文区分核芯显卡和独立显卡两大类描述显卡驱动的安装。**注意,确保你已经按照本教程之前的章节安装配置好科学上网、安装好必要的包后再向下进行,不要多个教程混着看,你可能漏掉了本教程前置步骤中的某些操作,从而造成问题。**
+It's 2022 and the installation of graphics card drivers has become very easy on Arch Linux. This article distinguishes between core graphics cards and discrete graphics cards to describe the installation of graphics card drivers. **Note, make sure that you have installed and configured the scientific Internet according to the previous chapters of this tutorial, installed the necessary packages before proceeding down. certain operations, causing problems.**
-> 所有 AMD 显卡建议使用开源驱动。英伟达显卡建议使用闭源驱动,因为逆向工程的开源驱动性能过于低下,本文也只描述英伟达闭源驱动安装。如果你支持自由软件运动,请尽可能使用具有官方支持开源驱动的英特尔和 AMD 显卡。
+> Open source drivers are recommended for all AMD graphics cards. It is recommended to use closed source drivers for NVIDIA graphics cards, because the performance of open source drivers for reverse engineering is too low, and this article only describes the installation of NVIDIA closed source drivers. If you support the free software movement, use Intel and AMD graphics cards with officially supported open source drivers whenever possible.
-## 核芯显卡
+## HD Graphics
-### 英特尔核芯显卡
+### Intel HD Graphics
-[官网文档](https://wiki.archlinux.org/index.php/Intel_graphics)
+[Official website documentation](https://wiki.archlinux.org/index.php/Intel_graphics)
-英特尔核芯显卡安装如下几个包即可。
+Intel HD Graphics can install the following packages.
```bash
sudo pacman -S mesa lib32-mesa vulkan-intel lib32-vulkan-intel
```
-> `xf86-video-intel`arch wiki 里写的很多发行版不建议安装它,而应使用 xorg 的 modesetting 驱动(也就是什么都不用装的意思)。经过我们测试目前确实是默认 modesetting 驱动较为稳定。
+> Many distributions written in the `xf86-video-intel`arch wiki do not recommend installing it, but use xorg's modesetting driver (that is, don't need to install anything). After our test, it is true that the default modesetting driver is relatively stable.
-注意,只有 Intel HD 4000 及以上的核显才支持 vulkan。
+Note that vulkan is only supported on Intel HD 4000 and above.
-### AMD 核芯显卡
+### AMD HD Graphics
-对于具有核芯显卡的 AMD 处理器,需要先确定核显架构(Architecture)是什么,再决定安装什么驱动。推荐在 [techpowerup 网站](https://www.techpowerup.com/)进行查询,信息非常全面。在确定了显卡架构后,再根据架构对照[这个文档](https://wiki.archlinux.org/index.php/Xorg#AMD)决定安装什么驱动。**对于 GCN2.0 及以下架构的老显卡,直接安装开源 ATI 驱动即可,原本闭源的老旧的 Catalyst 驱动在 2021 年已被废弃。GCN2.0 及以下架构的老显卡也不要使用开源的 AMDGPU 驱动,因为其仅处于实验性质,需要各种自定义内核编译选项与配置,非常麻烦,得不偿失。**对于新型号,即 GCN3 架构及更新型的核芯显卡,直接安装开源驱动 AMDGPU 即可,也就是以下这几个包。
+For AMD processors with HD graphics, you need to first determine what the graphics architecture is, and then decide what drivers to install. It is recommended to check on the [techpowerup website](https://www.techpowerup.com/), the information is very comprehensive. After determining the graphics card architecture, then decide what driver to install based on the architecture comparison [this document](https://wiki.archlinux.org/index.php/Xorg#AMD). **For old graphics cards with GCN2.0 and below architecture, you can directly install the open source ATI driver. The old closed source Catalyst driver will be abandoned in 2021. Do not use the open source AMDGPU driver for old graphics cards with GCN2.0 and below architectures, because it is only experimental and requires various custom kernel compilation options and configurations, which is very troublesome and not worth the loss.** For new models, namely GCN3 architecture and newer core graphics cards, you can directly install the open source driver AMDGPU, which is the following packages.
```bash
sudo pacman -S mesa lib32-mesa xf86-video-amdgpu vulkan-radeon lib32-vulkan-radeon libva-mesa-driver lib32-libva-mesa-driver mesa-vdpau lib32-mesa-vdpau
```
-- 比如你的笔记本 cpu 是目前常见的 AMD R7 4800U,那么它的核显为 Vega 8。通过查询,可知其为 GCN 5.0 架构,那么对照 arch 官方文档,你可选择安装 AMDGPU 开源驱动。
-- 再比如你的台式机 cpu 是目前常见的 锐龙 5 3400G,那么它的核显为 Vega 11。通过查询,可知其为 GCN 5.0 架构,那么对照 arch 官方文档,你可选择安装 AMDGPU 开源驱动。
-- 再老一些的 apu A10-9700 处理器 ,它的核显为 Radeon R7。通过查询,可知其为 GCN 2.0 架构,那么对照 arch 官方文档,你选择安装 ATI 开源驱动。
+- For example, if your notebook cpu is the common AMD R7 4800U, then its core display is Vega 8. Through the query, it can be seen that it is the GCN 5.0 architecture, then you can choose to install the AMDGPU open source driver according to the official arch documentation.
+- For another example, if your desktop cpu is the currently common Ryzen 5 3400G, then its core display is Vega 11. Through the query, it can be seen that it is the GCN 5.0 architecture, then you can choose to install the AMDGPU open source driver according to the official arch documentation.
+- The older apu A10-9700 processor has a Radeon R7 core. Through the query, it can be seen that it is the GCN 2.0 architecture, then according to the official arch documentation, you choose to install the ATI open source driver.
-## 独立显卡
+## Discrete graphics card
-这部分会分为仅有独立显卡(无核显)与同时拥有独立显卡和核芯显卡两种情况进行讲解。
+This part will be divided into two cases where there is only a discrete graphics card (no core graphics) and both discrete graphics and core graphics.
-### 英伟达独立显卡
+### NVIDIA discrete graphics card
-较新型号的独立显卡直接安装如下几个包即可。[官方文档](https://wiki.archlinux.org/index.php/NVIDIA)
+Newer models of discrete graphics cards can directly install the following packages. [Official Documentation](https://wiki.archlinux.org/index.php/NVIDIA)
```bash
-sudo pacman -S nvidia nvidia-settings lib32-nvidia-utils #必须安装
+sudo pacman -S nvidia nvidia-settings lib32-nvidia-utils #must be installed
```
-如果是 GeForce 630 以上到 GeForce 920 以下的老卡,安装 [nvidia-470xx-dkms](https://aur.archlinux.org/packages/nvidia-470xx-dkms/)AUR及其 32 位支持包。使用 dkms 驱动同时需要 headers。
+If it is an old card from GeForce 630 or above to GeForce 920 or below, install [nvidia-470xx-dkms](https://aur.archlinux.org/packages/nvidia-470xx-dkms/)AUR and Its 32-bit support package. Using the dkms driver also requires headers.
```bash
yay -S nvidia-470xx-dkms nvidia-settings lib32-nvidia-470xx-utils linux-headers
```
-如果是 GeForce 630 以下到 GeForce 400 系列的老卡,安装 [nvidia-390xx-dkms](https://aur.archlinux.org/packages/nvidia-390xx-dkms/)AUR及其 32 位支持包。使用 dkms 驱动同时需要 headers。
+For older cards from GeForce 630 to GeForce 400 series, install [nvidia-390xx-dkms](https://aur.archlinux.org/packages/nvidia-390xx-dkms/)AUR and Its 32-bit support package. Using the dkms driver also requires headers.
```bash
yay -S nvidia-390xx-dkms nvidia-settings lib32-nvidia-390xx-utils linux-headers
```
-再老的显卡直接使用[开源驱动](https://wiki.archlinux.org/index.php/Nouveau)即可。
+The old graphics card can directly use the [open source driver](https://wiki.archlinux.org/index.php/Nouveau).
```bash
sudo pacman -S mesa lib32-mesa xf86-video-nouveau
@@ -64,108 +64,108 @@ sudo pacman -S mesa lib32-mesa xf86-video-nouveau
---
-**在同时拥有核芯显卡和英伟达独立显卡的笔记本上安装驱动是大多数人关注的事情,这里着重讲述。**
+**Installing drivers on laptops with both HD Graphics and Nvidia discrete graphics is something that most people care about, and I will focus on it here.**
-> 再次提醒请按照本书前置章节配置好系统后再进行,不要多个教程混看,**尤其是一些过时的教程**。尤其需要注意的是确保 base-devel 包的安装以及配置好科学上网软件,以及使用 X11 模式。
+> Once again, please refer to the previous chapters of this book to configure the system before proceeding. Do not mix up multiple tutorials, **especially some outdated tutorials**. Special attention should be paid to ensure that the base-devel package is installed, the scientific Internet software is configured, and the X11 mode is used.
-[英伟达双显卡模式官方文档](https://wiki.archlinux.org/index.php/NVIDIA_Optimus) /// [optimus-manager 官方文档](https://github.com/Askannz/optimus-manager/wiki)
+[NVIDIA dual graphics card mode official documentation](https://wiki.archlinux.org/index.php/NVIDIA_Optimus) /// [optimus-manager official documentation](https://github.com/Askannz/optimus-manager/wiki)
-若为同时拥有核芯显卡与英伟达独显的笔记本电脑,同样需要按照上述步骤先安装各个软件包。除此之外还需要安装 optimus-manager。可以在核芯显卡和独立显卡间轻松切换。optimus-manager 提供三种模式,分别为仅用独显,仅用核显,和 hybrid 动态切换模式。
+If it is a notebook computer with both a core graphics card and an NVIDIA graphics card, you also need to install each software package according to the above steps. In addition to this, optimus-manager needs to be installed. Easily switch between HD graphics and discrete graphics. optimus-manager provides three modes, which are using only discrete graphics, only using core graphics, and hybrid dynamic switching mode.
```bash
yay -S optimus-manager optimus-manager-qt
```
-安装完成后重启即可使用。optimus-manager 安装完成后会默认 enable optimus-manager 的服务,你可在重启前检查其状态,若没有 enable 则手动将其 enable。重启后在菜单栏搜索 optimus-manager 点击即可使用。可在其设置中设置开机自动启动。
+After the installation is complete, it can be used by restarting. After optimus-manager is installed, the service of optimus-manager will be enabled by default. You can check its status before restarting, and enable it manually if it is not enabled. After restarting, search for optimus-manager in the menu bar and click to use it. It can be set to automatically start at boot in its settings.
```bash
sudo systemctl enable optimus-manager
```
-此时你应该已经可以进行显卡切换了,如果有问题,请详细阅读 optimus-manager 的文档,里面有详细的描述。由于各类问题太多,本文不进行描述,optimus-manager 的文档很详尽,请自行查看。此处仅列出几项较为重要的注意事项:
+At this point, you should be able to switch the graphics card. If there is any problem, please read the documentation of optimus-manager, which has a detailed description. Since there are too many types of problems, this article will not describe them. The documentation of optimus-manager is very detailed, please check it yourself. Here are just a few of the more important considerations:
-- 如果需要在独显和核显模式间切换,要注意你没安装各类 GPU 监控插件,它们会阻止显卡切换,导致不可预料的错误。
-- 不要使用 Nvidia Control Panel 中的`Save to X Configuration file`按钮。会导致配置冲突。
-- 在显卡之间的切换时,重新登陆后如在 splash screen 卡住或者黑屏,可以尝试在 tty1 tty2 之间进行切换。
-- 如果你在安装 optimus manager 并重启后,直接黑屏卡死,不能进入系统,很有可能是遇到了常见的"ACPI ISSUE",简单来说,这是笔记本制造商的实现问题。可以尝试在内核启动参数中加入`acpi_osi=! acpi_osi="Windows 2009"` 后再尝试。[[1]](https://github.com/Askannz/optimus-manager/wiki/FAQ,-common-issues,-troubleshooting#when-i-switch-gpus-my-system-completely-locks-up-i-cannot-even-switch-to-a-tty-with-ctrlaltfx)
+- If you need to switch between discrete graphics and core graphics mode, pay attention that you do not install various GPU monitoring plug-ins, they will prevent graphics card switching and cause unpredictable errors.
+- Do not use the `Save to X Configuration file` button in the Nvidia Control Panel. will result in a configuration conflict.
+- When switching between graphics cards, if the splash screen is stuck or black screen after re-login, you can try switching between tty1 and tty2.
+- If after installing optimus manager and restarting, you are stuck on a black screen and cannot enter the system, it is very likely that you have encountered the common "ACPI ISSUE". In short, this is an implementation problem of the notebook manufacturer. You can try adding `acpi_osi=! acpi_osi="Windows 2009"` to the kernel boot parameters and try again. [[1]](https://github.com/Askannz/optimus-manager/wiki/FAQ,-common-issues,-troubleshooting#when-i-switch-gpus-my-system-completely-locks-up-i-cannot-even-switch-to-a-tty-with-ctrlaltfx)
-最后详细说下动态切换模式。本质上其还是使用官方的 [PRIME](https://wiki.archlinux.org/index.php/PRIME#PRIME_render_offload)对闭源驱动的方法进行切换。需要设置三个环境变量,或者用 nvidia-prime 包提供的命令 prime-run,二者本质也是一样的,都是设置三个环境变量。
+Finally, let\'s talk about the dynamic switching mode in detail. In essence, it still uses the official [PRIME](https://wiki.archlinux.org/index.php/PRIME#PRIME_render_offload) method to switch the closed source drive. You need to set three environment variables, or use the command prime-run provided by the nvidia-prime package. The essence of both is the same, and three environment variables are set.
```bash
sudo pacman -S nvidia-prime
-prime-run some_program #使用prime-run前缀来用独显运行某些程序
+prime-run some_program #Use the prime-run prefix to run some programs with a discrete graphics
```
-对于 AMD 核显+N 卡独显的读者,optimus-manager 对于这套组合的支持目前已经发布,最新可用版本为 1.4。
+For readers of AMD core graphics + N card independent graphics, optimus-manager's support for this combination has been released, and the latest available version is 1.4.
---
-**如果你不是强烈追求能效控制以及注重电池寿命的用户,那么可以不用往下看了,如果你是,那么需要针对你的硬件以及笔记本型号尝试正确的电源管理方式。此部分的设置可能导致黑屏,并且尝试过程可能较长,也会遇到各类问题,请根据你个人的操作水平自行斟酌是否操作**
+**If you are not a user who strongly pursues energy efficiency control and pays attention to battery life, then you can look no further. If you are, then you need to try the correct power management method for your hardware and notebook model. The settings in this part may cause a black screen, and the trial process may be long, and various problems may also be encountered. Please decide whether to operate it according to your personal operation level**
-电源控制做的事情是,在只用核显的模式下,确保正确关闭独立显卡。而在混合模式下,绝大多数情况下 Nvidia 模块实际是始终开启的,电源控制并不生效。这件事情其实很复杂,因为对于不同的显卡型号,以及笔记本型号的组合,可行的方案都是不同的。笼统来说,最广泛适用的办法是 bbswitch。但仍不建议上来就按照此方式安装使用,因为某些特定的硬件就是会出问题,也就是黑屏。这里建议按照 optimus-manager 官方的文档一步一步来,按步骤尝试,最后找到属于你自己的电脑合适的电源管理方式。**此[文档](https://github.com/Askannz/optimus-manager/wiki/A-guide--to-power-management-options)必须详细阅读!**
+What the power control does is ensure that the discrete graphics card is properly turned off in a graphics-only mode. In hybrid mode, the Nvidia module is actually always on in most cases, and the power control does not take effect. This thing is actually very complicated, because for different graphics card models and combinations of notebook models, the feasible solutions are different. In general, the most widely applicable approach is bbswitch. But it is still not recommended to install and use it in this way, because some specific hardware will cause problems, that is, black screen. It is recommended to follow the official documentation of optimus-manager step by step, try step by step, and finally find a suitable power management method for your own computer. **This [documentation](https://github.com/Askannz/optimus-manager/wiki/A-guide--to-power-management-options) must be read in detail!**
-针对大多数笔记本适用的 Bbswitch,此处进行安装使用的讲解。首先安装包 bbswitch。若使用其它内核,则安装包 bbswitch-dkms。
+For Bbswitch suitable for most notebooks, here are the instructions for installation and use. First install the package bbswitch. If using other kernels, install the package bbswitch-dkms.
```bash
-sudo pacman -S bbswitch #安装 bbswitch 切换方式
+sudo pacman -S bbswitch #Install bbswitch switch mode
```
-接下来右键点击 optimus-manager 的托盘设置,在 Optimus 选项卡中的 switch method 选择 Bbswitch 即可。
+Next, right-click on the tray settings of optimus-manager and select Bbswitch from the switch method in the Optimus tab.
-### AMD 独立显卡
+### AMD discrete graphics
-AMD 独立显卡的驱动安装步骤实际上 AMD 核芯显卡是相同的,都需要先确定架构,然后选定正确的驱动安装即可。真正需要关注的是如何在核芯显卡和独立显卡间进行切换。可以使用 [PRIME](https://wiki.archlinux.org/title/PRIME#For_open_source_drivers_-_PRIME) 对开源驱动的双显卡切换方式。
+The driver installation steps for AMD discrete graphics cards are actually the same for AMD core graphics cards. You need to determine the architecture first, and then select the correct driver to install. What really needs attention is how to switch between HD graphics and discrete graphics. You can use [PRIME](https://wiki.archlinux.org/title/PRIME#For_open_source_drivers_-_PRIME) to switch between dual graphics cards for open source drivers.
-此外,可以使用 `glmark2`,`DRI_PRIME=1 glmark2` 分别对核显和独显进行测试,选择分数更高的一个进行使用。可以在 steam 游戏的启动前缀中加入`DRI_PRIME=1 mangohud %command%`来使用独显。(关于 [mangohud](/play/software?id=性能监控))。
+In addition, you can use `glmark2`, `DRI_PRIME=1 glmark2` to test the nuclear display and the independent display respectively, and choose the one with a higher score to use. Dedicated graphics can be used by adding `DRI_PRIME=1 mangohud %command%` to the startup prefix of steam games. (About [mangohud](/play/software?id=performancemonitoring)).
-笔记本上使用独立显卡运行 steam 游戏的另一个例子。
+Another example of running steam games on a laptop with a discrete graphics card.
```bash
-DRI_PRIME=1 steam steam://rungameid/570 #运行dota2
-DRI_PRIME=1 steam steam://rungameid/730 #运行cs go
+DRI_PRIME=1 steam steam://rungameid/570 #Run dota2
+DRI_PRIME=1 steam steam://rungameid/730 #Run cs go
```
-## 性能测试
+## Performance Testing
-[官方文档](https://wiki.archlinux.org/index.php/benchmarking)。
+[Official Documentation](https://wiki.archlinux.org/index.php/benchmarking).
-最传统和广为人知的方式为使用`glxgears`命令进行测试,其属于[mesa-utils](https://www.archlinux.org/packages/extra/x86_64/mesa-demos/)包。但其仅仅只能提供简单的测试场景及帧数显示,只测试了当前 OpenGL 功能的一小部分,功能明显不足。我们推荐如下两种工具。
+The most traditional and well-known way is to use the `glxgears` command for testing, which belongs to the [mesa-utils](https://www.archlinux.org/packages/extra/x86_64/mesa-demos/) package. However, it can only provide a simple test scene and frame number display, and only test a small part of the current OpenGL functions, which is obviously insufficient. We recommend the following two tools.
### glmark2
-glmark 提供了一系列丰富的测试,涉及图形单元性能(缓冲,建筑,照明,纹理等)的不同方面,允许进行更全面和有意义的测试。 每次测试单独计算帧速率。 最终,用户根据以前的所有测试获得了一个成绩分数。在 archlinux 上属于包[glmark2](https://aur.archlinux.org/packages/glmark2/)AUR
+glmark provides a rich set of tests covering different aspects of graphics unit performance (buffering, architecture, lighting, textures, etc.), allowing for more comprehensive and meaningful testing. Frame rate is calculated separately for each test. Ultimately, the user receives a score based on all previous tests. On archlinux belongs to package [glmark2](https://aur.archlinux.org/packages/glmark2-git)AUR
### Unigine benchmark
-Unigine 3D 引擎是一个更全面的基准测试工具。 截止目前有五个版本,从旧到新分别是
+The Unigine 3D engine is a more comprehensive benchmarking tool. There are five versions so far, from old to new are
-- sanctuary(2007)
-- tropics(2008)
-- heaven(2009)
-- valley(2013)
-- superposition(2017)
+- sanctuary (2007)
+- tropics (2008)
+- heaven (2009)
+- valley (2013)
+- superposition (2017)
-可从[AUR](https://aur.archlinux.org/packages/?O=0&K=Unigine)下载全部版本。它们均为专有软件。
+The full version can be downloaded from [AUR](https://aur.archlinux.org/packages/?O=0&K=Unigine). They are all proprietary software.
-## 显卡信息查看
+## Graphics card information view
-对于英伟达显卡,nvidia-settings 这个包即可全面的展示显卡相关信息。
+For NVIDIA graphics cards, the nvidia-settings package can comprehensively display graphics card-related information.
-对于 AMD 显卡,稍微麻烦一些,通过 yay 安装 radeon-profile-git 这个包,同时安装其依赖 radeon-profile-daemon,最后启动这个进程。即可以图形化的方式查看 amd 显卡信息。[github 项目地址](https://github.com/marazmista/radeon-profile)
+For AMD graphics cards, it is a little more troublesome, install the radeon-profile-git package through yay, and install its dependent radeon-profile-daemon, and finally start the process. That is, you can view the amd graphics card information in a graphical way. [github project address](https://github.com/marazmista/radeon-profile)
```bash
sudo systemctl enable --now radeon-profile-daemon.service
```
-注意,不要对左下角的 auto low high 进行更改 有 bug 会卡死。同时,显存占用在某些型号显卡上展示可能有误。
+Be careful, don't make changes to auto low high in the lower left corner, there are bugs and it will get stuck. At the same time, the display of video memory usage may be wrong on some models of graphics cards.
-## 后续
+## follow up
-如果作为一个普通使用者,到这里你的系统已经配置完毕了。不会命令行也没太大关系,你可以慢慢探索 KDE 这个桌面环境,记住时常用如下命令或 Discover 软件更新系统即可。
+If you are an ordinary user, your system has been configured here. It doesn't matter if you don't know the command line, you can slowly explore the KDE desktop environment, remember to use the following commands or the Discover software to update the system.
```bash
-sudo pacman -Syyu #更新官方仓库
-yay -Syyu #同时更新官方仓库与AUR
+sudo pacman -Syyu #Update the official repository
+yay -Syyu #Update the official repository and AUR at the same time
```
-接下来你可以查阅娱乐、办公、多媒体等章节了解更多使用软件的安装与使用。如果你需要成为一名较为专业的人员,那么请阅读进阶、以及编程等章节。
+Next, you can refer to the entertainment, office, multimedia and other chapters to learn more about the installation and use of the software. If you need to become a more professional person, then please read the advanced, and programming chapters.
diff --git a/docs/uk/rookie/transparentProxy.md b/docs/uk/rookie/transparentProxy.md
index 25bcfee..3ffb1e9 100644
--- a/docs/uk/rookie/transparentProxy.md
+++ b/docs/uk/rookie/transparentProxy.md
@@ -1,92 +1,92 @@
-# 使用 Qv2ray+cgproxy 配置透明代理
+# Configure transparent proxy using Qv2ray+cgproxy
-全局代理,也即透明代理。本节所述为真正的,操作系统级别的代理,而不是仅仅针对浏览器中全部网址的"全局代理"。之所以叫做透明代理,是因为这种系统级别的代理对于操作系统中的各个应用相当于是透明的,应用们感知不到代理的存在。之所以叫做全局代理,很明显意为操作系统级别的、全局的代理。这两个词汇在中文环境中经常同时使用,并且全局代理一词容易引起混淆。
+Global proxy, also known as transparent proxy. This section describes true, OS-level proxies, not just "global proxies" for all URLs in the browser. The reason why it is called a transparent proxy is that this system-level proxy is transparent to each application in the operating system, and the applications cannot perceive the existence of the proxy. The reason why it is called a global proxy obviously means an operating system-level, global proxy. These two terms are often used together in the Chinese context, and the term global agent can easily cause confusion.
-本节主体原文收集自 [Qv2ray 用户组](https://t.me/Qv2ray_chat),并非原创,我们仅在其基础上进行更新、完善与修正。[cgproxy 项目地址](https://github.com/springzfx/cgproxy)。
+The main text of this section is collected from [Qv2ray User Group](https://t.me/Qv2ray_chat), not original, we only update, improve and revise it based on it. [cgproxy project address](https://github.com/springzfx/cgproxy).
-## 安装与设置
+## Installation and setup
-1. 安装`cgproxy`软件。可直接在 [AUR](https://aur.archlinux.org/packages/cgproxy/) 上安装。由于中国大陆政府封锁 Github 的原因,你很可能没有办法用正常 yay 的方式通过 AUR 安装 cgproxy,所以 ArchLinuxStudio 提供一组可以直接安装的包以供你使用。
+1. Install the `cgproxy` software. Installable directly at [AUR](https://aur.archlinux.org/packages/cgproxy/). Due to the reason that the Chinese mainland government blocks Github, you may not be able to install cgproxy through AUR in the normal yay way, so ArchLinuxStudio provides a set of packages that can be installed directly for you to use.
```bash
wget https://archlinuxstudio.github.io/ArchLinuxTutorial/res/cgproxy-0.19-1-x86_64.pkg.tar.zst
sudo pacman -U cgproxy-0.19-1-x86_64.pkg.tar.zst
```
-> github.io 也被中国大陆政府封锁,只是封锁力度暂时还没有很大。如你在此过程中卡住,可以尝试 ctrl+c 终止命令后重新尝试下载,也可尝试更换手机热点的网络环境再次进行下载。当你配置好全局代理后,你将不再需要担心任何网络封锁问题。我们将持续为本书读者提供突破互联网审查的可靠流程。
+> github.io is also blocked by the Chinese mainland government, but the blockade has not been very strong for the time being. If you get stuck during this process, you can try ctrl+c to terminate the command and try the download again, or you can try to change the network environment of the mobile phone hotspot to download again. When you configure the global proxy, you will no longer need to worry about any network blocking issues. We will continue to provide readers of this book with a reliable process for breaking through Internet censorship.
-2. 在 Qv2ray 的"首选项-入站设置"的下方启用任意门设置选项。
+2. Enable any door settings option in Qv2ray under Preferences - Inbound Settings.
- - 监听 ipv4 地址可填`127.0.0.1` 或 `0.0.0.0`,建议前者。若需双栈代理,则在监听 ipv6 地址填上`::1`(如果监听 ipv4 填了 0.0.0.0 则可不填)。
- - 嗅探选择 Full,Destination Override 的三项均勾选。
- - 模式选择"tproxy"。
-
+ - The listening ipv4 address can be filled with `127.0.0.1` or `0.0.0.0`, the former is recommended. If a dual-stack proxy is required, fill in `::1` in the monitoring ipv6 address (if the monitoring ipv4 is filled with 0.0.0.0, you can leave it blank).
+ - Select Full for sniffing, and check all three of Destination Override.
+ - Mode select "tproxy".
+
- 如果是复杂配置,则需要手动添加相应的 dokodemo-door 入站。由于目前版本复杂配置并没有提供 tproxy 选项,因此 tproxy 模式需要通过编辑 json 来实现。
+ If it is a complex configuration, you need to manually add the corresponding dokodemo-door inbound. Since the current version of the complex configuration does not provide the tproxy option, the tproxy mode needs to be implemented by editing json.
-3. 配置`cgproxy`,编辑`/etc/cgproxy/config.json`:
+3. To configure `cgproxy`, edit `/etc/cgproxy/config.json`:
- - **在`cgroup_proxy`中括号里加上"/"(包含引号)**,`port`改为 Qv2ray 首选项里的透明代理的端口。
- - `cgproxy`默认配置是代理所有 tcp 和 udp,ipv4 和 ipv6 的流量,如果不希望代理其中的某种(些)流量,则将对应的`enable_xxx`改为 false。注意这里的配置要和 Qv2ray 选项里的配置一致(如,Qv2ray 选项里没有勾选 udp,则这里务必把`enable_udp`改为 false)。
- - 如果希望当本机作为网关设备时为连接到本机网关的其他设备(如连接到本机开设的 wifi 热点的设备)也提供透明代理,则把`enable_gateway`改为 true。
+ - \*\*Add "/" (including quotation marks) in brackets in `cgroup_proxy`, `port` is changed to the port of the transparent proxy in Qv2ray preferences.
+ - The default configuration of `cgproxy` is to proxy all tcp and udp, ipv4 and ipv6 traffic. If you do not want to proxy some (some) traffic, change the corresponding `enable_xxx` to false. Note that the configuration here should be consistent with the configuration in Qv2ray options (for example, if udp is not checked in Qv2ray options, be sure to change `enable_udp` to false).
+ - If you want to provide a transparent proxy for other devices connected to the local gateway (such as devices connected to the wifi hotspot opened by the local machine) when the local machine acts as a gateway device, change `enable_gateway` to true.
-4. (重要)透明代理的基本原理是拦截系统发出的所有流量,并将这些流量转到代理工具里,从而实现让系统所有流量都走代理的目的。此时,为了避免流量出现死循环(即代理工具发出的流量又转回到代理工具里),需要将代理工具排除在透明代理环境外面。有两种方式可以实现这一点:
+4. (Important) The basic principle of transparent proxy is to intercept all the traffic sent by the system and transfer these traffic to the proxy tool, so as to realize the purpose of letting all the traffic of the system go through the proxy. At this time, in order to avoid an infinite loop of traffic (that is, the traffic sent by the proxy tool is transferred back to the proxy tool), the proxy tool needs to be excluded from the transparent proxy environment. There are two ways to achieve this:
- - 通过`execsnoop`监控代理工具的启动,并自动将其移至透明代理环境外面:
+ - Monitor the startup of the proxy tool via `execsnoop` and automatically move it out of the transparent proxy environment:
- - `cgproxy`软件自带`execsnoop`支持,以上`cgproxy`测试过的发行版均可支持。
- - 编辑`/etc/cgproxy/config.json`,在`program_noproxy`中括号里加上"v2ray","qv2ray"(包含引号和逗号),以使`qv2ray`和`v2ray`发出的流量不经过透明代理。如果你的`v2ray`或`qv2ray`不在`PATH`里,则需要填写它们的绝对路径。
+ - The `cgproxy` software comes with `execsnoop` support, which can be supported by the above `cgproxy` tested distributions.
+ - Edit `/etc/cgproxy/config.json`, add "v2ray", "qv2ray" (including quotes and commas) in brackets in `program_noproxy`, so that the traffic from `qv2ray` and `v2ray` is not transparent acting. If your `v2ray` or `qv2ray` are not in `PATH`, you need to fill in their absolute path.
- - 在每次连接代理节点时,让`qv2ray`自己把自己移到透明代理环境外面:
+ - Let `qv2ray` move itself out of the transparent proxy environment every time you connect to a proxy node:
- - 安装 Qvplugin-Command 插件,在插件设置里的"pre-connection"栏里加上一句
+ - Install the Qvplugin-Command plugin and add a sentence to the "pre-connection" column in the plugin settings
```
sh -c "cgnoproxy --pid $(pgrep -x qv2ray)"
```
- 即可。
+ That's it.
-5. (重要)如果启用了 udp 的透明代理(dns 也是 udp),则给 v2ray 二进制文件加上相应的特权:
+5. (Important) If transparent proxy for udp is enabled (dns is also udp), add the appropriate privileges to the v2ray binary:
```
sudo setcap "cap_net_admin,cap_net_bind_service=ep" /usr/bin/v2ray
```
- 否则 udp 的透明代理可能会出问题。
+ Otherwise udp's transparent proxy may have problems.
-> 如果每次更新了 v2ray 二进制文件,都需要重新执行此命令。
+> This command needs to be re-executed every time the v2ray binaries are updated.
-6. 启动透明代理服务:`systemctl start cgproxy.service`或`systemctl enable --now cgproxy.service`。
+6. Start the transparent proxy service: `systemctl start cgproxy.service` or `systemctl enable --now cgproxy.service`.
-以上步骤完成后,透明代理应该能正常使用了。
+After the above steps are completed, the transparent proxy should be able to be used normally.
-## dns 配置说明
+## DNS configuration instructions
-如果勾选了"dns 拦截",且启用了 dns 和 udp 的透明代理,则 v2ray 会拦截对系统 dns 的请求,并将其转发到 v2ray 的内置 dns 里,即让 v2ray 内置 dns 接管系统 dns。但 v2ray 内置 dns 是会遵循路由规则的。
+If "dns interception" is checked and the transparent proxy of dns and udp is enabled, v2ray will intercept the request to the system dns and forward it to the built-in dns of v2ray, that is, let the built-in dns of v2ray take over the system dns. But v2ray built-in dns will follow routing rules.
-如果没勾选"dns 拦截",则 v2ray 虽然不会让内置 dns 接管系统 dns,但如果启用了 dns 和 udp 的透明代理,则系统 dns 也会走透明代理进 v2ray,并遵循 v2ray 的路由规则。
+If "dns interception" is not checked, although v2ray will not let the built-in dns take over the system dns, but if the transparent proxy of dns and udp is enabled, the system dns will also go through the transparent proxy into v2ray and follow the routing rules of v2ray.
-因此,在启用了 dns 和 udp 的透明代理时,若系统 dns 或 v2ray 的内置 dns 配置不当,可能导致 dns 请求发不出去,从而影响正常上网。
+Therefore, when the transparent proxy of dns and udp is enabled, if the dns of the system or the built-in dns of v2ray is not configured properly, it may cause the dns request to not be sent out, thus affecting the normal Internet access.
-由于 qv2ray 常见的路由规则是绕过国内 ip,国外 ip 均走代理。在这个情形中,以下两个配置是典型的有问题的 dns 配置方式:
+Because the common routing rule of qv2ray is to bypass domestic ip, foreign ip all go through proxy. In this case, the following two configurations are typical problematic dns configurations:
-- 配置了国外普通 dns 作为首选,但代理本身不支持 udp(此时 dns 查询的 udp 流量出不去,dns 无法查询)
-- 配置了使用域名的 doh 作为首选。此时 doh 的域名无法被解析,从而 doh 也无法使用。
+- The foreign common dns is configured as the first choice, but the proxy itself does not support udp (at this time, the udp traffic queried by dns cannot go out, and dns cannot be queried)
+- Doh is configured to use the domain name as the preference. At this time, the domain name of doh cannot be resolved, so doh cannot be used.
-一般而言,如果并不在意将 dns 查询发给谁,那么,在绕过国内 ip 的情况下,只需要配置一个国内普通 dns 作为首选即可保证不会出问题。若代理本身不支持 udp,又希望使用国外 dns,则可以考虑使用使用 ip 的 doh(如`https://1.1.1.1/dns-query`等)。
+Generally speaking, if you don't care who you send the dns query to, then in the case of bypassing the domestic ip, you only need to configure a domestic ordinary dns as the first choice to ensure that there will be no problems. If the proxy itself does not support udp and wants to use foreign dns, you can consider using doh using ip (such as `https://1.1.1.1/dns-query`, etc.).
-如果需要更复杂的 dns 配置,建议参考[上游文档](https://www.v2ray.com/chapter_02/04_dns.html),并选择合适的不会影响正常上网的 dns 配置。
+If more complex dns configuration is required, it is recommended to refer to [upstream documentation](https://www.v2ray.com/chapter_02/04_dns.html), and select an appropriate dns configuration that will not affect normal Internet access.
---
-在显示的为 firefox 等应用设置代理时,因为这些应用程序知道代理的存在,所以不会发出 DNS 请求。而透明代理的情况下,各应用感知不到代理的存在,所以会发出自己的 dns 请求。
+When proxying is shown for apps like firefox, DNS requests are not made because those apps are aware of the proxy's existence. In the case of a transparent proxy, each application cannot perceive the existence of the proxy, so it will send its own dns request.
-这时通过 cgproxy 可将全部 tcp/udp 的流量(包括 DNS 查询)转给 v2ray。由于这种情况下,一定会有 DNS 查询流量的产生,所以为了保证本机不发出任何 DNS 请求(这是为了隐私和安全),需要进行以下设置。此时需要分两种情况讨论。
+At this time, all tcp/udp traffic (including DNS queries) can be forwarded to v2ray through cgproxy. In this case, there must be DNS query traffic, so in order to ensure that the machine does not issue any DNS requests (this is for privacy and security), the following settings are required. At this point, two situations need to be discussed.
-- 如果不进行任何 v2ray 的内置 DNS 设置以及 DNS 拦截,那么 DNS 流量会使用本机的 DNS 设置如 8.8.8.8 发出,这种情况不论如何配置 v2ray(全局或者分流),只要保证对于 8.8.8.8 的请求能够通过代理发出即可。
+- If you do not perform any v2ray's built-in DNS settings and DNS interception, then DNS traffic will be sent out using the local DNS settings such as 8.8.8.8. In this case, no matter how v2ray is configured (global or diverted), as long as you ensure that the 8.8.8.8 The request can be made through the proxy.
-- 如果 v2ray 通过形如如下路由规则,拦截经由 dokodemo-door 接收到的 dns 流量到 dns outbounds,那么 v2ray 是可以导向 DNS 查询流量到"dns-out"的 out bound 的,也即 dns-outbound 进行的"拦截"和"重新转发"。
+- If v2ray intercepts dns traffic received through dokodemo-door to dns outbounds through routing rules like the following, then v2ray can direct DNS query traffic to the out bound of "dns-out", that is, dns-outbound "Intercept" and "Re-forward".
```json
rules:
@@ -101,52 +101,52 @@ sudo pacman -U cgproxy-0.19-1-x86_64.pkg.tar.zst
},
```
- 此时 dns outbound 应该调用内置 DNS 设置进行解析,假如 v2ray 内置 DNS 设置为 1.1.1.1,此时原有对于 8.8.8.8 的 DNS 请求就会转而向 1.1.1.1 请求(随后对 1.1.1.1 的请求还是会遵循你的路由规则的),并将结果返回给应用端。你可以通过开启 qv2ray 更详细的日志级别进行验证。
+ At this time, dns outbound should call the built-in DNS settings for resolution. If the v2ray built-in DNS is set to 1.1.1.1, the original DNS request for 8.8.8.8 will turn to 1.1.1.1 request (then the request for 1.1.1.1). will still follow your routing rules) and return the result to the application. You can verify by turning on qv2ray's more verbose log level.
-如果只是为了阻止本机发 dns 请求,完全可以不使用 fakedns。fakedns 在透明代理的条件下确实可以减少一次 dns 请求,理论上确实会快一点。但是也在有的文章指出如果所有域名都伪造 dns 返回可能会有问题。
+If it is just to prevent the local machine from sending dns requests, fakedns can be completely omitted. Fakedns can indeed reduce a dns request under the condition of transparent proxy, which is indeed faster in theory. But there are also some articles that point out that there may be problems if all domain names are forged dns returns.
-题外话:使用 clientIP 可解决使用代理服务器解析 DNS 若返回国外 CDN 的网址时网速慢的情况,但是前提是你信任代理服务器和 DNS 服务器接收你的本地 IP,为了你的安全,不建议使用。
+Digression: Using clientIP can solve the problem of using a proxy server to resolve DNS. If the network speed is slow when returning the URL of a foreign CDN, but the premise is that you trust the proxy server and DNS server to receive your local IP. For your security, it is not recommended to use it.
-## 常见问题
+## Common problem
-- 启用透明代理后无法访问任何外网,且 v2ray 的 cpu 占用率飙升
+- After enabling the transparent proxy, it is impossible to access any external network, and the cpu usage of v2ray soars
- 可能是流量陷入死循环了,检查第 4 步有没有正确配置。如果配置没问题,执行`systemctl status cgproxy.service`看下有没有诸如`info: process noproxy pid msg: xxx`之类的输出。如果没有,则说明 cgproxy 软件或 execsnoop 没有正常工作。注意 cgproxy 软件需要 cgroup v2。
+ Maybe the traffic is stuck in an infinite loop, check if step 4 is configured correctly. If the configuration is OK, execute `systemctl status cgproxy.service` to see if there is any output such as `info: process noproxy pid msg: xxx`. If not, the cgproxy software or execsnoop is not working properly. Note that cgproxy software requires cgroup v2.
- 尝试退出 qv2ray,随后在终端里执行`cgnoproxy qv2ray`看是否恢复正常,如恢复正常,说明 cgproxy 正常工作,只是 execsnoop 没有正常工作。由于 execsnoop 一定程度上依赖于内核,非上述 cgproxy 测试过的发行版用户,建议使用第 4 步中的第 2 种方法。另外,对 kde 用户,5.19+版的 plasma 会给从 krunner 里启动的程序额外设置 cgroup,尽管 cgproxy 软件考虑到了这一点,但仍有极少数场合可能出现 plasma 设置的 cgroup 覆盖掉了 cgproxy 设置的 cgroup 的情况,此时通常重启一下 qv2ray 即可。
+ Try to exit qv2ray, and then execute `cgnoproxy qv2ray` in the terminal to see if it returns to normal. If it returns to normal, it means that cgproxy is working normally, but execsnoop is not working normally. Since execsnoop is somewhat dependent on the kernel, users of distros not tested with cgproxy above are advised to use method 2 in step 4. In addition, for kde users, the 5.19+ version of plasma will set additional cgroups for programs started from krunner. Although the cgproxy software takes this into account, there are still rare occasions where the cgroups set by plasma may override the cgroups set by cgproxy. In this case, you can usually restart qv2ray at this time.
-- 启用透明代理后,无法访问(部分)域名
+- When transparent proxy is enabled, (some) domains cannot be accessed
- 可能是 dns 无法解析(部分)域名。一般这种故障只发生在启用了 dns 及 udp 透明代理的时候。
+ It may be that dns cannot resolve (part of) the domain name. Generally, this kind of failure only occurs when dns and udp transparent proxy are enabled.
- 终端里执行`dig 无法访问的域名`看下报什么错:
+ Execute `dig unreachable domain name` in the terminal to see what error is reported:
- - 若出现类似`reply from unexpected source: 192.168.0.100#42050, expected 8.8.8.8#53`的报错,则检查第 5 步的有没有正确配置。
+ - If an error like `reply from unexpected source: 192.168.0.100#42050, expected 8.8.8.8#53` appears, check if the configuration in step 5 is correct.
- - 若出现类似`connection timed out; no servers could be reache`的报错,则说明 dns 查询的流量出不去,此时往往是系统 dns 或 v2ray 内置 dns 配置不当。请检查是否出现了前文提到的几种不当配置。如果没有勾选"dns 拦截",则此时 v2ray 虽然不会用内置 dns 接管系统 dns,但它仍然会让系统 dns 走透明代理,从而遵循 v2ray 的路由规则,此时需要检查系统 dns 是否是前文提到的那几种不当配置。
+ - If an error like `connection timed out; no servers could be reach` appears, it means that the traffic of the dns query cannot go out. In this case, the system dns or the built-in dns of v2ray is often misconfigured. Please check whether there are several improper configurations mentioned above. If "dns interception" is not checked, at this time, although v2ray will not use the built-in dns to take over the system dns, it will still let the system dns go through a transparent proxy, so as to follow the routing rules of v2ray. At this time, it is necessary to check whether the system dns is the previous one. The kinds of improper configurations mentioned.
-- 能不能分应用代理(如,下载 BT 时不能走代理)
+- Can you use proxy application (for example, you can't use proxy when downloading BT)
- 对于本机的程序,可以,可通过两种方式实现:
+ For native programs, yes, it can be implemented in two ways:
- - 通过`cgnoproxy`实现:如,在命令行中执行`cgnoproxy qbittorrent`,启动的 qbittorrent 程序就不会走透明代理。又如,在命令行中执行`cgnoproxy --pid 12345`,执行之后 pid 为 12345 的程序就不再走透明代理。这种方式可支持任何应用。
- - 通过`/etc/cgproxy/config.json`实现:在配置里的`program_noproxy`中括号里加上相应的应用即可。这种方式只支持可执行文件,不支持各种脚本。如希望把 clash 与 kde connect 加入 noproxy 规则,则在把此字段补全成["v2ray", "qv2ray", "clash", "/usr/lib/kdeconnectd"]即可。注意修改`config.json`之后,需要重启 cgproxy 服务才能生效,执行`systemctl restart cgproxy.service`即可。
+ - Implemented through `cgnoproxy`: For example, by executing `cgnoproxy qbittorrent` on the command line, the launched qbittorrent program will not go through the transparent proxy. For another example, if `cgnoproxy --pid 12345` is executed on the command line, the program with the pid of 12345 will no longer go through the transparent proxy after execution. Any application can be supported in this way.
+ - Implemented through `/etc/cgproxy/config.json`: add the corresponding application in the brackets of `program_noproxy` in the configuration. This method only supports executable files and does not support various scripts. If you want to add clash and kde connect to the noproxy rule, you can complete this field as ["v2ray", "qv2ray", "clash", "/usr/lib/kdeconnectd"]. Note that after modifying `config.json`, you need to restart the cgproxy service to take effect, execute `systemctl restart cgproxy.service`.
- 对于当本机作为网关设备时为连接到本机网关的其他设备,不行,那些设备的所有流量(到本机的流量除外)都必然会走代理。
+ For other devices connected to the local gateway when the local machine is used as a gateway device, no, all traffic of those devices (except the traffic to the local machine) will inevitably go through the proxy.
-- 透明代理环境中响应速度变慢
+- Slow response time in transparent proxy environment
- 由于 iptables 是在域名解析成 ip 之后,才对相应的流量进行重定向。因此,在透明代理环境中,访问一个域名 s 可能会需要解析至少 2 次 dns(系统解析一次,重定向到 v2ray 之后 v2ray 分流模块再解析一次)。因此,响应理论上是会变慢一点的,变慢的幅度取决于系统 dns 及 v2ray 的 dns 的响应速度。
+ Because iptables redirects the corresponding traffic after the domain name is resolved into ip. Therefore, in a transparent proxy environment, accessing a domain name s may require at least 2 DNS resolutions (the system resolves once, and the v2ray offloading module resolves again after redirecting to v2ray). Therefore, the response is theoretically slower, and the magnitude of the slowdown depends on the response speed of the system dns and v2ray's dns.
-- 开启 UDP 支持后报错`too many open files`
+- Error `too many open files` is reported after enabling UDP support
- 核心问题是,Linux 系统定义了一系列限制,其中一种限制是最大打开文件数,并且有软限制和硬限制,具体的限制结果可以通过`ulimit -Sa`和`ulimit -Ha`查看。一般来说 arch 默认的软限制 open files 的值为 1024,这个数值太小。硬限制的 open files 的值为 524288,这个数值够大了。打开网页过多,或者开启 udp 加速的时候,连接数(打开的文件数)很容易超过 1024 这个数,所以就被限制住了。解决办法很简单,只需要修改系统级别的关于这个限制的配置文件,在/etc/security/limits.conf 文件的最末尾,加上下面这行,然后重启即可:
+ The core problem is that the Linux system defines a series of limits, one of which is the maximum number of open files, and there are soft limits and hard limits. The specific limit results can be viewed through `ulimit -Sa` and `ulimit -Ha`. Generally speaking, the default soft limit open files value of arch is 1024, which is too small. The hard limit for open files is 524288, which is large enough. When you open too many web pages or turn on udp acceleration, the number of connections (the number of open files) can easily exceed the number of 1024, so it is limited. The solution is very simple, just modify the system-level configuration file about this limit, add the following line at the end of the /etc/security/limits.conf file, and then restart:
```bash
- * soft nofile 8192 #不要落下了最前面的星号
+ * soft nofile 8192 #Don't drop the first asterisk
```
-- 使用 docker/libvirt 时与 cgproxy 不能正常使用。解决方法见[cgproxy issue3](https://github.com/springzfx/cgproxy/issues/3#issuecomment-637309706)
+- Does not work properly with cgproxy when using docker/libvirt. For the solution, see [cgproxy issue3](https://github.com/springzfx/cgproxy/issues/3#issuecomment-637309706)
---
diff --git a/docs/vue.css b/docs/vue.css
deleted file mode 100644
index 7f38a61..0000000
--- a/docs/vue.css
+++ /dev/null
@@ -1,850 +0,0 @@
-* {
- -webkit-font-smoothing: antialiased;
- -webkit-overflow-scrolling: touch;
- -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
- -webkit-text-size-adjust: none;
- -webkit-touch-callout: none;
- box-sizing: border-box;
-}
-body:not(.ready) {
- overflow: hidden;
-}
-body:not(.ready) .app-nav,
-body:not(.ready)> nav,
-body:not(.ready) [data-cloak] {
- display: none;
-}
-div#app {
- font-size: 30px;
- font-weight: lighter;
- margin: 40vh auto;
- text-align: center;
-}
-div#app:empty:before {
- content: 'Loading...';
-}
-.emoji {
- height: 1.2rem;
- vertical-align: middle;
-}
-.progress {
- background-color: var(--theme-color, #42b983);
- height: 2px;
- left: 0;
- position: fixed;
- right: 0;
- top: 0;
- transition: width 0.2s, opacity 0.4s;
- width: 0;
- z-index: 999999;
-}
-.search .search-keyword,
-.search a:hover {
- color: var(--theme-color, #42b983);
-}
-.search .search-keyword {
- font-style: normal;
- font-weight: 700;
-}
-body,
-html {
- height: 100%;
-}
-body {
- -moz-osx-font-smoothing: grayscale;
- -webkit-font-smoothing: antialiased;
- color: #34495e;
- font-family: Source Sans Pro, Helvetica Neue, Arial, sans-serif;
- font-size: 15px;
- letter-spacing: 0;
- margin: 0;
- overflow-x: hidden;
-}
-img {
- max-width: 100%;
-}
-a[disabled] {
- cursor: not-allowed;
- opacity: 0.6;
-}
-kbd {
- border: 1px solid #ccc;
- border-radius: 3px;
- display: inline-block;
- font-size: 12px !important;
- line-height: 12px;
- margin-bottom: 3px;
- padding: 3px 5px;
- vertical-align: middle;
-}
-li input[type='checkbox'] {
- margin: 0 0.2em 0.25em 0;
- vertical-align: middle;
-}
-.app-nav {
- margin: 25px 60px 0 0;
- position: absolute;
- right: 0;
- text-align: right;
- z-index: 10;
-}
-.app-nav.no-badge {
- margin-right: 25px;
-}
-.app-nav p {
- margin: 0;
-}
-.app-nav> a {
- margin: 0 1rem;
- padding: 5px 0;
-}
-.app-nav li,
-.app-nav ul {
- display: inline-block;
- list-style: none;
- margin: 0;
-}
-.app-nav a {
- color: inherit;
- font-size: 16px;
- text-decoration: none;
- transition: color 0.3s;
-}
-.app-nav a.active,
-.app-nav a:hover {
- color: var(--theme-color, #42b983);
-}
-.app-nav a.active {
- border-bottom: 2px solid var(--theme-color, #42b983);
-}
-.app-nav li {
- display: inline-block;
- margin: 0 1rem;
- padding: 5px 0;
- position: relative;
- cursor: pointer;
-}
-.app-nav li ul {
- background-color: #fff;
- border: 1px solid;
- border-color: #ddd #ddd #ccc;
- border-radius: 4px;
- box-sizing: border-box;
- display: none;
- max-height: calc(100vh - 61px);
- overflow-y: auto;
- padding: 10px 0;
- position: absolute;
- right: -15px;
- text-align: left;
- top: 100%;
- white-space: nowrap;
-}
-.app-nav li ul li {
- display: block;
- font-size: 14px;
- line-height: 1rem;
- margin: 8px 14px;
- white-space: nowrap;
-}
-.app-nav li ul a {
- display: block;
- font-size: inherit;
- margin: 0;
- padding: 0;
-}
-.app-nav li ul a.active {
- border-bottom: 0;
-}
-.app-nav li:hover ul {
- display: block;
-}
-.github-corner {
- border-bottom: 0;
- position: fixed;
- right: 0;
- text-decoration: none;
- top: 0;
- z-index: 1;
-}
-.github-corner:hover .octo-arm {
- -webkit-animation: octocat-wave 0.56s ease-in-out;
- animation: octocat-wave 0.56s ease-in-out;
-}
-.github-corner svg {
- color: #fff;
- fill: var(--theme-color, #42b983);
- height: 80px;
- width: 80px;
-}
-main {
- display: block;
- position: relative;
- width: 100vw;
- height: 100%;
- z-index: 0;
-}
-main.hidden {
- display: none;
-}
-.anchor {
- display: inline-block;
- text-decoration: none;
- transition: all 0.3s;
-}
-.anchor span {
- color: #34495e;
-}
-.anchor:hover {
- text-decoration: underline;
-}
-.sidebar {
- border-right: 1px solid rgba(0, 0, 0, 0.07);
- overflow-y: auto;
- padding: 40px 0 0;
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- transition: transform 0.25s ease-out;
- width: 300px;
- z-index: 20;
-}
-.sidebar> h1 {
- margin: 0 auto 1rem;
- font-size: 1.5rem;
- font-weight: 300;
- text-align: center;
-}
-.sidebar> h1 a {
- color: inherit;
- text-decoration: none;
-}
-.sidebar> h1 .app-nav {
- display: block;
- position: static;
-}
-.sidebar .sidebar-nav {
- line-height: 2em;
- padding-bottom: 40px;
-}
-.sidebar li.collapse .app-sub-sidebar {
- display: none;
-}
-.sidebar ul {
- margin: 0 0 0 15px;
- padding: 0;
-}
-.sidebar li> p {
- font-weight: 700;
- margin: 0;
-}
-.sidebar ul,
-.sidebar ul li {
- list-style: none;
-}
-.sidebar ul li a {
- border-bottom: none;
- display: block;
-}
-.sidebar ul li ul {
- padding-left: 20px;
-}
-.sidebar::-webkit-scrollbar {
- width: 4px;
-}
-.sidebar::-webkit-scrollbar-thumb {
- background: transparent;
- border-radius: 4px;
-}
-.sidebar:hover::-webkit-scrollbar-thumb {
- background: hsla(0, 0%, 53.3%, 0.4);
-}
-.sidebar:hover::-webkit-scrollbar-track {
- background: hsla(0, 0%, 53.3%, 0.1);
-}
-.sidebar-toggle {
- background-color: transparent;
- background-color: hsla(0, 0%, 100%, 0.8);
- border: 0;
- outline: none;
- padding: 10px;
- position: absolute;
- bottom: 0;
- left: 0;
- text-align: center;
- transition: opacity 0.3s;
- width: 284px;
- z-index: 30;
- cursor: pointer;
-}
-.sidebar-toggle:hover .sidebar-toggle-button {
- opacity: 0.4;
-}
-.sidebar-toggle span {
- background-color: var(--theme-color, #42b983);
- display: block;
- margin-bottom: 4px;
- width: 16px;
- height: 2px;
-}
-body.sticky .sidebar,
-body.sticky .sidebar-toggle {
- position: fixed;
-}
-.content {
- padding-top: 60px;
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 300px;
- transition: left 0.25s ease;
-}
-.markdown-section {
- margin: 0 auto;
- max-width: 80%;
- padding: 30px 15px 40px;
- position: relative;
-}
-.markdown-section> * {
- box-sizing: border-box;
- font-size: inherit;
-}
-.markdown-section> :first-child {
- margin-top: 0 !important;
-}
-.markdown-section hr {
- border: none;
- border-bottom: 1px solid #eee;
- margin: 2em 0;
-}
-.markdown-section iframe {
- border: 1px solid #eee;
- width: 1px;
- min-width: 100%;
-}
-.markdown-section table {
- border-collapse: collapse;
- border-spacing: 0;
- display: block;
- margin-bottom: 1rem;
- overflow: auto;
- width: 100%;
-}
-.markdown-section th {
- font-weight: 700;
-}
-.markdown-section td,
-.markdown-section th {
- border: 1px solid #ddd;
- padding: 6px 13px;
-}
-.markdown-section tr {
- border-top: 1px solid #ccc;
-}
-.markdown-section p.tip,
-.markdown-section tr:nth-child(2n) {
- background-color: #f8f8f8;
-}
-.markdown-section p.tip {
- border-bottom-right-radius: 2px;
- border-left: 4px solid #f66;
- border-top-right-radius: 2px;
- margin: 2em 0;
- padding: 12px 24px 12px 30px;
- position: relative;
-}
-.markdown-section p.tip:before {
- background-color: #f66;
- border-radius: 100%;
- color: #fff;
- content: '!';
- font-family: Dosis, Source Sans Pro, Helvetica Neue, Arial, sans-serif;
- font-size: 14px;
- font-weight: 700;
- left: -12px;
- line-height: 20px;
- position: absolute;
- height: 20px;
- width: 20px;
- text-align: center;
- top: 14px;
-}
-.markdown-section p.tip code {
- background-color: #efefef;
-}
-.markdown-section p.tip em {
- color: #34495e;
-}
-.markdown-section p.warn {
- background: rgba(66, 185, 131, 0.1);
- border-radius: 2px;
- padding: 1rem;
-}
-.markdown-section ul.task-list> li {
- list-style-type: none;
-}
-body.close .sidebar {
- transform: translateX(-300px);
-}
-body.close .sidebar-toggle {
- width: auto;
-}
-body.close .content {
- left: 0;
-}
-@media print {
- .app-nav,
- .github-corner,
- .sidebar,
- .sidebar-toggle {
- display: none;
- }
-}
-@media screen and (max-width: 768px) {
- .github-corner,
- .sidebar,
- .sidebar-toggle {
- position: fixed;
- }
- .app-nav {
- margin-top: 16px;
- }
- .app-nav li ul {
- top: 30px;
- }
- main {
- height: auto;
- overflow-x: hidden;
- }
- .sidebar {
- left: -300px;
- transition: transform 0.25s ease-out;
- }
- .content {
- left: 0;
- max-width: 100vw;
- position: static;
- padding-top: 20px;
- transition: transform 0.25s ease;
- }
- .app-nav,
- .github-corner {
- transition: transform 0.25s ease-out;
- }
- .sidebar-toggle {
- background-color: transparent;
- width: auto;
- padding: 30px 30px 10px 10px;
- }
- body.close .sidebar {
- transform: translateX(300px);
- }
- body.close .sidebar-toggle {
- background-color: hsla(0, 0%, 100%, 0.8);
- transition: background-color 1s;
- width: 284px;
- padding: 10px;
- }
- body.close .content {
- transform: translateX(300px);
- }
- body.close .app-nav,
- body.close .github-corner {
- display: none;
- }
- .github-corner:hover .octo-arm {
- -webkit-animation: none;
- animation: none;
- }
- .github-corner .octo-arm {
- -webkit-animation: octocat-wave 0.56s ease-in-out;
- animation: octocat-wave 0.56s ease-in-out;
- }
-}
-@-webkit-keyframes octocat-wave {
- 0%,
- to {
- transform: rotate(0);
- }
- 20%,
- 60% {
- transform: rotate(-25deg);
- }
- 40%,
- 80% {
- transform: rotate(10deg);
- }
-}
-@keyframes octocat-wave {
- 0%,
- to {
- transform: rotate(0);
- }
- 20%,
- 60% {
- transform: rotate(-25deg);
- }
- 40%,
- 80% {
- transform: rotate(10deg);
- }
-}
-section.cover {
- align-items: center;
- background-position: 50%;
- background-repeat: no-repeat;
- background-size: cover;
- height: 100vh;
- width: 100vw;
- display: none;
-}
-section.cover.show {
- display: flex;
-}
-section.cover.has-mask .mask {
- background-color: #fff;
- opacity: 0.8;
- position: absolute;
- top: 0;
- height: 100%;
- width: 100%;
-}
-section.cover .cover-main {
- flex: 1;
- margin: -20px 16px 0;
- text-align: center;
- position: relative;
-}
-section.cover a {
- color: inherit;
-}
-section.cover a,
-section.cover a:hover {
- text-decoration: none;
-}
-section.cover p {
- line-height: 1.5rem;
- margin: 1em 0;
-}
-section.cover h1 {
- color: inherit;
- font-size: 2.5rem;
- font-weight: 300;
- margin: 0.625rem 0 2.5rem;
- position: relative;
- text-align: center;
-}
-section.cover h1 a {
- display: block;
-}
-section.cover h1 small {
- bottom: -0.4375rem;
- font-size: 1rem;
- position: absolute;
-}
-section.cover blockquote {
- font-size: 1.5rem;
- text-align: center;
-}
-section.cover ul {
- line-height: 1.8;
- list-style-type: none;
- margin: 1em auto;
- max-width: 500px;
- padding: 0;
-}
-section.cover .cover-main> p:last-child a {
- border-radius: 2rem;
- border: 1px solid var(--theme-color, #42b983);
- box-sizing: border-box;
- color: var(--theme-color, #42b983);
- display: inline-block;
- font-size: 1.05rem;
- letter-spacing: 0.1rem;
- margin: 0.5rem 1rem;
- padding: 0.75em 2rem;
- text-decoration: none;
- transition: all 0.15s ease;
-}
-section.cover .cover-main> p:last-child a:last-child {
- background-color: var(--theme-color, #42b983);
- color: #fff;
-}
-section.cover .cover-main> p:last-child a:last-child:hover {
- color: inherit;
- opacity: 0.8;
-}
-section.cover .cover-main> p:last-child a:hover {
- color: inherit;
-}
-section.cover blockquote> p> a {
- border-bottom: 2px solid var(--theme-color, #42b983);
- transition: color 0.3s;
-}
-section.cover blockquote> p> a:hover {
- color: var(--theme-color, #42b983);
-}
-.sidebar,
-body {
- background-color: #fff;
-}
-.sidebar {
- color: #364149;
-}
-.sidebar li {
- margin: 6px 0;
-}
-.sidebar ul li a {
- color: #505d6b;
- font-size: 14px;
- font-weight: 400;
- overflow: hidden;
- text-decoration: none;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-.sidebar ul li a:hover {
- text-decoration: underline;
-}
-.sidebar ul li ul {
- padding: 0;
-}
-.sidebar ul li.active> a {
- border-right: 2px solid;
- color: var(--theme-color, #42b983);
- font-weight: 600;
-}
-.app-sub-sidebar li:before {
- content: '-';
- padding-right: 4px;
- float: left;
-}
-.markdown-section h1,
-.markdown-section h2,
-.markdown-section h3,
-.markdown-section h4,
-.markdown-section strong {
- color: #2c3e50;
- font-weight: 600;
-}
-.markdown-section a {
- color: var(--theme-color, #42b983);
- font-weight: 600;
-}
-.markdown-section h1 {
- font-size: 2rem;
- margin: 0 0 1rem;
-}
-.markdown-section h2 {
- font-size: 1.75rem;
- margin: 45px 0 0.8rem;
-}
-.markdown-section h3 {
- font-size: 1.5rem;
- margin: 40px 0 0.6rem;
-}
-.markdown-section h4 {
- font-size: 1.25rem;
-}
-.markdown-section h5 {
- font-size: 1rem;
-}
-.markdown-section h6 {
- color: #777;
- font-size: 1rem;
-}
-.markdown-section figure,
-.markdown-section p {
- margin: 1.2em 0;
-}
-.markdown-section ol,
-.markdown-section p,
-.markdown-section ul {
- line-height: 1.6rem;
- word-spacing: 0.05rem;
-}
-.markdown-section ol,
-.markdown-section ul {
- padding-left: 1.5rem;
-}
-.markdown-section blockquote {
- border-left: 4px solid var(--theme-color, #42b983);
- color: #858585;
- margin: 2em 0;
- padding-left: 20px;
-}
-.markdown-section blockquote p {
- font-weight: 600;
- margin-left: 0;
-}
-.markdown-section iframe {
- margin: 1em 0;
-}
-.markdown-section em {
- color: #7f8c8d;
-}
-.markdown-section code,
-.markdown-section output:after,
-.markdown-section pre {
- font-family: Roboto Mono, Monaco, courier, monospace;
-}
-.markdown-section code,
-.markdown-section pre {
- background-color: #f8f8f8;
-}
-.markdown-section output,
-.markdown-section pre {
- margin: 1.2em 0;
- position: relative;
-}
-.markdown-section output,
-.markdown-section pre> code {
- border-radius: 2px;
- display: block;
-}
-.markdown-section output:after,
-.markdown-section pre> code {
- -moz-osx-font-smoothing: initial;
- -webkit-font-smoothing: initial;
-}
-.markdown-section code {
- border-radius: 2px;
- color: #e96900;
- margin: 0 2px;
- padding: 3px 5px;
- white-space: pre-wrap;
-}
-.markdown-section> :not(h1):not(h2):not(h3):not(h4):not(h5):not(h6) code {
- font-size: 0.8rem;
-}
-.markdown-section pre {
- padding: 0 1.4rem;
- line-height: 1.5rem;
- overflow: auto;
- word-wrap: normal;
-}
-.markdown-section pre> code {
- color: #525252;
- font-size: 0.8rem;
- padding: 2.2em 5px;
- line-height: inherit;
- margin: 0 2px;
- max-width: inherit;
- overflow: inherit;
- white-space: inherit;
-}
-.markdown-section output {
- padding: 1.7rem 1.4rem;
- border: 1px dotted #ccc;
-}
-.markdown-section output> :first-child {
- margin-top: 0;
-}
-.markdown-section output> :last-child {
- margin-bottom: 0;
-}
-.markdown-section code:after,
-.markdown-section code:before,
-.markdown-section output:after,
-.markdown-section output:before {
- letter-spacing: 0.05rem;
-}
-.markdown-section output:after,
-.markdown-section pre:after {
- color: #ccc;
- font-size: 0.6rem;
- font-weight: 600;
- height: 15px;
- line-height: 15px;
- padding: 5px 10px 0;
- position: absolute;
- right: 0;
- text-align: right;
- top: 0;
- content: attr(data-lang);
-}
-.token.cdata,
-.token.comment,
-.token.doctype,
-.token.prolog {
- color: #8e908c;
-}
-.token.namespace {
- opacity: 0.7;
-}
-.token.boolean,
-.token.number {
- color: #c76b29;
-}
-.token.punctuation {
- color: #525252;
-}
-.token.property {
- color: #c08b30;
-}
-.token.tag {
- color: #2973b7;
-}
-.token.string {
- color: var(--theme-color, #42b983);
-}
-.token.selector {
- color: #6679cc;
-}
-.token.attr-name {
- color: #2973b7;
-}
-.language-css .token.string,
-.style .token.string,
-.token.entity,
-.token.url {
- color: #22a2c9;
-}
-.token.attr-value,
-.token.control,
-.token.directive,
-.token.unit {
- color: var(--theme-color, #42b983);
-}
-.token.function,
-.token.keyword {
- color: #e96900;
-}
-.token.atrule,
-.token.regex,
-.token.statement {
- color: #22a2c9;
-}
-.token.placeholder,
-.token.variable {
- color: #3d8fd1;
-}
-.token.deleted {
- text-decoration: line-through;
-}
-.token.inserted {
- border-bottom: 1px dotted #202746;
- text-decoration: none;
-}
-.token.italic {
- font-style: italic;
-}
-.token.bold,
-.token.important {
- font-weight: 700;
-}
-.token.important {
- color: #c94922;
-}
-.token.entity {
- cursor: help;
-}
-code .token {
- -moz-osx-font-smoothing: initial;
- -webkit-font-smoothing: initial;
- min-height: 1.5rem;
- position: relative;
- left: auto;
-}
diff --git a/package.json b/package.json
index 0251321..39a396c 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"name": "ArchLinuxStudio",
"url": "https://github.com/ArchLinuxStudio"
},
- "version": "0.4.0",
+ "version": "0.5.0",
"private": false,
"dependencies": {
"docsify-cli": "^4.4.4"
diff --git a/pull_request_template.md b/pull_request_template.md
new file mode 100644
index 0000000..8f2fd21
--- /dev/null
+++ b/pull_request_template.md
@@ -0,0 +1,2 @@
+- Please make sure all your changes are verified by yourself.
+- Please assign task to ryosukeeeeee.
diff --git a/yarn.lock b/yarn.lock
index f689bd0..8beb402 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -170,15 +170,6 @@ cli-boxes@^2.2.0:
resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
-clipboard@^2.0.0:
- version "2.0.6"
- resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz#52921296eec0fdf77ead1749421b21c968647376"
- integrity sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==
- dependencies:
- good-listener "^1.2.2"
- select "^1.1.2"
- tiny-emitter "^2.0.0"
-
cliui@^6.0.0:
version "6.0.0"
resolved "https://registry.npmmirror.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
@@ -302,11 +293,6 @@ defer-to-connect@^1.0.1:
resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
-delegate@^3.1.2:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
- integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
-
depd@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -545,13 +531,6 @@ global-dirs@^2.0.1:
dependencies:
ini "1.3.7"
-good-listener@^1.2.2:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
- integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=
- dependencies:
- delegate "^3.1.2"
-
got@^9.6.0:
version "9.6.0"
resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
@@ -597,9 +576,9 @@ has-yarn@^2.1.0:
integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
http-cache-semantics@^4.0.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
- integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+ integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
http-errors@~1.7.2:
version "1.7.3"
@@ -814,9 +793,9 @@ min-indent@^1.0.0:
integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
minimist@^1.2.0:
- version "1.2.5"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
- integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+ version "1.2.6"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+ integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
ms@2.0.0:
version "2.0.0"
@@ -839,9 +818,11 @@ nested-error-stacks@^2.0.0:
integrity sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==
node-fetch@^2.6.0:
- version "2.6.1"
- resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
- integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+ version "2.6.7"
+ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+ integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+ dependencies:
+ whatwg-url "^5.0.0"
normalize-path@^3.0.0, normalize-path@~3.0.0:
version "3.0.0"
@@ -849,9 +830,9 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
normalize-url@^4.1.0:
- version "4.5.0"
- resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
- integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
+ version "4.5.1"
+ resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
+ integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
on-finished@~2.3.0:
version "2.3.0"
@@ -963,11 +944,9 @@ prepend-http@^2.0.0:
integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
prismjs@^1.23.0:
- version "1.23.0"
- resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33"
- integrity sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA==
- optionalDependencies:
- clipboard "^2.0.0"
+ version "1.28.0"
+ resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.28.0.tgz#0d8f561fa0f7cf6ebca901747828b149147044b6"
+ integrity sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw==
pump@^3.0.0:
version "3.0.0"
@@ -1042,11 +1021,6 @@ responselike@^1.0.2:
dependencies:
lowercase-keys "^1.0.0"
-select@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
- integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
-
semver-diff@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
@@ -1055,9 +1029,9 @@ semver-diff@^3.1.1:
semver "^6.3.0"
semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
- integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+ version "6.3.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+ integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
send@0.17.1:
version "0.17.1"
@@ -1199,11 +1173,6 @@ term-size@^2.1.0:
resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54"
integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==
-tiny-emitter@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
- integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
-
tinydate@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/tinydate/-/tinydate-1.3.0.tgz#e6ca8e5a22b51bb4ea1c3a2a4fd1352dbd4c57fb"
@@ -1226,6 +1195,11 @@ toidentifier@1.0.0:
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+tr46@~0.0.3:
+ version "0.0.3"
+ resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+ integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+
tweezer.js@^1.4.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/tweezer.js/-/tweezer.js-1.5.0.tgz#ca50ac5215022203fd3be4d28617e8e2305f5c0c"
@@ -1291,6 +1265,19 @@ utils-merge@1.0.1:
resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+webidl-conversions@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+ integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+
+whatwg-url@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+ integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+ dependencies:
+ tr46 "~0.0.3"
+ webidl-conversions "^3.0.0"
+
which-module@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"