From: Ruijie Yu via "General discussions about Org-mode." <emacs-orgmode@gnu.org>
To: Ihor Radchenko <yantar92@posteo.net>
Cc: Timothy <orgmode@tec.tecosaur.net>,
emacs-orgmode@gnu.org, Bastien Guerry <bzg@gnu.org>
Subject: Re: [orgweb/zh-CN] [DRAFT PATCH v7] Tentative zh-CN translation
Date: Fri, 21 Apr 2023 10:33:11 +0800 [thread overview]
Message-ID: <sdvzg71zzor.fsf@netyu.xyz> (raw)
In-Reply-To: <87jzybg7se.fsf@localhost>
[-- Attachment #1: Type: text/plain, Size: 2048 bytes --]
Ihor Radchenko <yantar92@posteo.net> writes:
> Ruijie Yu <ruijie@netyu.xyz> writes:
>
>>> -org-mode-parser
>>> +/org-mode-parser/
>>>
>>> This probably belongs to the English version as well.
>>
>> Should the English version change belong to a new commit, unrelated to
>> the translation patchset? Or would I just modify it in the same commit
>> where I translate zh-CN/tools.org?
>
> A separate commit would be cleaner. However, if it requires you to do too
> much unnecessary rebasing, we can postpone it until the main translation
> is merged.
I had planned to send an update email but forgot to actually send it..
Anyways, attached at the end of this message are all the commits in
master..v7. As usual, it is also available on
https://git.sr.ht/~ruijieyu/orgweb/log/translate/zh-CN--v7.
---
What changed from v5?
The first patch (0001, a9fef16e) addresses the italicization and added a
period mentioned up-thread.
The copy-symlink patch (0003, 1b8b2f2f) and the patch on zh-CN/tools.org
(0008, 6b81da7c) are then adjusted accordingly.
On the postamble patch (0013, 0abd949), I translated the "unicorn" in
the alttext.
Then, we have this patch (0014, d448a30) that was part of another
thread, LGTM'd by Bastien, which converts `load' into `require' in
publish.sh.
The final patch (0016, 9c8a8d8) requires Bastien's attention (CC'd): it
is a patch on publish.sh which introduces a fallback definition to
`file-name-with-extension', then replaces ad-hoc use in the `dolist'
form into calling this function. In addition, it replaces `find-file'
into `find-file-noselect' so that contributors who `eval-buffer' this
script can rest assured that no .org buffers will pop up on the right
side.
If necessary, I can rebase patches 0014 and 0016 onto current master so
that they can be installed separately.
---
Should there be more iterations needed, I will only post patches that
are new or changed in order to save bandwidth. I will be (hopefully)
very clear in what remains, what gets replaced by what, and what is
removed, etc.
---
[-- Attachment #2: 0001-tools.org-Parsers-italicize-for-consistency-sentence.patch --]
[-- Type: text/x-patch, Size: 1313 bytes --]
From a9fef16eb3cdbebf380220a64c2285949f6510b8 Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Mon, 17 Apr 2023 17:05:59 +0800
Subject: [PATCH 01/16] * tools.org (Parsers): italicize for consistency;
sentence period
---
tools.org | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools.org b/tools.org
index a2325ca..1b1c27c 100644
--- a/tools.org
+++ b/tools.org
@@ -118,7 +118,7 @@ Includes (primitive) system for literate programming.
{{{link(/gioorgi.com/org-mode-parser/)}}}
[[https://seeklogo.com/images/N/nodejs-logo-FBE122E377-seeklogo.com.png]]
-org-mode-parser
+/org-mode-parser/
{{{end-link}}}
** Python
{{{gh(karlicoss/orgparse)}}}
@@ -130,7 +130,7 @@ org-mode-parser
{{{link(metacpan.org/release/Org-Parser)}}}
[[https://upload.wikimedia.org/wikipedia/commons/f/f0/Cebolla_Chulita.png]]
-Org::parser
+/Org::parser/
{{{end-link}}}
** Ruby
{{{gh(bdewey/org-ruby)}}}
@@ -198,7 +198,7 @@ other makups to org.
{{{gh(fasheng/vimwiki2org)}}}
[[https://cdn.freebiesupply.com/logos/large/2x/vim-logo-png-transparent.png]]
-A simple tool to convert vimwiki file to Org
+A simple tool to convert vimwiki file to Org.
{{{end-link}}}
** Exchange calenders
{{{gh(kautsig/ews-orgmode)}}}
--
2.40.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-zh-CN-.gitignore-Added-gitignore-for-output-HTML-fil.patch --]
[-- Type: text/x-patch, Size: 591 bytes --]
From 549f5d50e8803e0f028f1a171f667da150e6d09f Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Tue, 11 Apr 2023 23:19:42 +0800
Subject: [PATCH 02/16] * zh-CN/.gitignore: Added gitignore for output HTML
files
---
zh-CN/.gitignore | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 zh-CN/.gitignore
diff --git a/zh-CN/.gitignore b/zh-CN/.gitignore
new file mode 100644
index 0000000..d36543d
--- /dev/null
+++ b/zh-CN/.gitignore
@@ -0,0 +1,5 @@
+/features.html
+/index.html
+/manuals.html
+/quickstart.html
+/tools.html
\ No newline at end of file
--
2.40.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-Copies-and-symlinks-to-initialize-zh-CN.patch --]
[-- Type: text/x-patch, Size: 6233 bytes --]
From 1b8b2f2fa76f2dd908146fea1df24def408f6982 Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Tue, 11 Apr 2023 01:32:26 +0800
Subject: [PATCH 03/16] Copies and symlinks to initialize zh-CN
Symlinking zh-CN/Changes.org because translating it is not worth the effort due
to its size.
Symlinking zh-CN/elpa.org because this file is unreferenced in any language, so
it is not worth translating it. See relevant discussion in
https://list.orgmode.org/87a5zeu136.fsf@localhost/.
* zh-CN/Changes.org: Symlink from Changes.org.
* zh-CN/LICENSE.org: Copy from LICENSE.org.
* zh-CN/elpa.org: Symlink from elpa.org.
* zh-CN/features.org: Copy from features.org.
* zh-CN/index.org: Copy from index.org.
* zh-CN/manuals.org: Copy from manuals.org.
* zh-CN/org-demo.html: Copy from org-demo.html.
* zh-CN/quickstart.org: Copy from quickstart.org.
* zh-CN/resources/fonts: Symlink from resources/fonts.
* zh-CN/resources/img: Symlink from resources/img.
* zh-CN/resources/js: Symlink from resources/js.
* zh-CN/resources/normal-outline-3.html: Symlink from
resources/normal-outline-3.html.
* zh-CN/resources/oembed.info.json: Symlink from resources/oembed.info.json.
* zh-CN/resources/postamble.html: Copy from resources/postamble.html.
* zh-CN/resources/preamble.html: Copy from resources/preamble.html.
* zh-CN/resources/style: Symlink from resources/style.
* zh-CN/setup.org: Copy from setup.org.
* zh-CN/tools.org: Copy from tools.org.
---
zh-CN/Changes.org | 1 +
LICENSE.org => zh-CN/LICENSE.org | 0
zh-CN/elpa.org | 1 +
features.org => zh-CN/features.org | 0
index.org => zh-CN/index.org | 0
manuals.org => zh-CN/manuals.org | 0
org-demo.html => zh-CN/org-demo.html | 0
quickstart.org => zh-CN/quickstart.org | 0
zh-CN/resources/fonts | 1 +
zh-CN/resources/img | 1 +
zh-CN/resources/js | 1 +
zh-CN/resources/normal-outline-3.html | 1 +
zh-CN/resources/oembed-info.json | 1 +
{resources => zh-CN/resources}/postamble.html | 0
{resources => zh-CN/resources}/preamble.html | 0
zh-CN/resources/style | 1 +
setup.org => zh-CN/setup.org | 0
tools.org => zh-CN/tools.org | 0
18 files changed, 8 insertions(+)
create mode 120000 zh-CN/Changes.org
copy LICENSE.org => zh-CN/LICENSE.org (100%)
create mode 120000 zh-CN/elpa.org
copy features.org => zh-CN/features.org (100%)
copy index.org => zh-CN/index.org (100%)
copy manuals.org => zh-CN/manuals.org (100%)
copy org-demo.html => zh-CN/org-demo.html (100%)
copy quickstart.org => zh-CN/quickstart.org (100%)
create mode 120000 zh-CN/resources/fonts
create mode 120000 zh-CN/resources/img
create mode 120000 zh-CN/resources/js
create mode 120000 zh-CN/resources/normal-outline-3.html
create mode 120000 zh-CN/resources/oembed-info.json
copy {resources => zh-CN/resources}/postamble.html (100%)
copy {resources => zh-CN/resources}/preamble.html (100%)
create mode 120000 zh-CN/resources/style
copy setup.org => zh-CN/setup.org (100%)
copy tools.org => zh-CN/tools.org (100%)
diff --git a/zh-CN/Changes.org b/zh-CN/Changes.org
new file mode 120000
index 0000000..5768154
--- /dev/null
+++ b/zh-CN/Changes.org
@@ -0,0 +1 @@
+../Changes.org
\ No newline at end of file
diff --git a/LICENSE.org b/zh-CN/LICENSE.org
similarity index 100%
copy from LICENSE.org
copy to zh-CN/LICENSE.org
diff --git a/zh-CN/elpa.org b/zh-CN/elpa.org
new file mode 120000
index 0000000..acaa2d5
--- /dev/null
+++ b/zh-CN/elpa.org
@@ -0,0 +1 @@
+../elpa.org
\ No newline at end of file
diff --git a/features.org b/zh-CN/features.org
similarity index 100%
copy from features.org
copy to zh-CN/features.org
diff --git a/index.org b/zh-CN/index.org
similarity index 100%
copy from index.org
copy to zh-CN/index.org
diff --git a/manuals.org b/zh-CN/manuals.org
similarity index 100%
copy from manuals.org
copy to zh-CN/manuals.org
diff --git a/org-demo.html b/zh-CN/org-demo.html
similarity index 100%
copy from org-demo.html
copy to zh-CN/org-demo.html
diff --git a/quickstart.org b/zh-CN/quickstart.org
similarity index 100%
copy from quickstart.org
copy to zh-CN/quickstart.org
diff --git a/zh-CN/resources/fonts b/zh-CN/resources/fonts
new file mode 120000
index 0000000..db461b9
--- /dev/null
+++ b/zh-CN/resources/fonts
@@ -0,0 +1 @@
+../../resources/fonts
\ No newline at end of file
diff --git a/zh-CN/resources/img b/zh-CN/resources/img
new file mode 120000
index 0000000..a3dbcb6
--- /dev/null
+++ b/zh-CN/resources/img
@@ -0,0 +1 @@
+../../resources/img
\ No newline at end of file
diff --git a/zh-CN/resources/js b/zh-CN/resources/js
new file mode 120000
index 0000000..abe6c55
--- /dev/null
+++ b/zh-CN/resources/js
@@ -0,0 +1 @@
+../../resources/js
\ No newline at end of file
diff --git a/zh-CN/resources/normal-outline-3.html b/zh-CN/resources/normal-outline-3.html
new file mode 120000
index 0000000..2c53e57
--- /dev/null
+++ b/zh-CN/resources/normal-outline-3.html
@@ -0,0 +1 @@
+../../resources/normal-outline-3.html
\ No newline at end of file
diff --git a/zh-CN/resources/oembed-info.json b/zh-CN/resources/oembed-info.json
new file mode 120000
index 0000000..650c2c9
--- /dev/null
+++ b/zh-CN/resources/oembed-info.json
@@ -0,0 +1 @@
+../../resources/oembed-info.json
\ No newline at end of file
diff --git a/resources/postamble.html b/zh-CN/resources/postamble.html
similarity index 100%
copy from resources/postamble.html
copy to zh-CN/resources/postamble.html
diff --git a/resources/preamble.html b/zh-CN/resources/preamble.html
similarity index 100%
copy from resources/preamble.html
copy to zh-CN/resources/preamble.html
diff --git a/zh-CN/resources/style b/zh-CN/resources/style
new file mode 120000
index 0000000..d2c0a04
--- /dev/null
+++ b/zh-CN/resources/style
@@ -0,0 +1 @@
+../../resources/style
\ No newline at end of file
diff --git a/setup.org b/zh-CN/setup.org
similarity index 100%
copy from setup.org
copy to zh-CN/setup.org
diff --git a/tools.org b/zh-CN/tools.org
similarity index 100%
copy from tools.org
copy to zh-CN/tools.org
--
2.40.0
[-- Attachment #5: 0004-Update-preamble-files.patch --]
[-- Type: text/x-patch, Size: 3414 bytes --]
From 7ac7a3d4f867a148ed2c9f6bf0408a554ecdda1a Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Tue, 11 Apr 2023 01:32:26 +0800
Subject: [PATCH 04/16] Update preamble files
* resources/preamble.html: Updated to add link to zh-CN.
* zh-CN/resources/preamble.html: zh-CN translation.
---
resources/preamble.html | 4 +++-
zh-CN/resources/preamble.html | 22 ++++++++++++----------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/resources/preamble.html b/resources/preamble.html
index a64832f..c3836f3 100644
--- a/resources/preamble.html
+++ b/resources/preamble.html
@@ -7,7 +7,9 @@
<span id="translate">
[ <a title="English version" href="/index.html">en</a>
- <a title="Version française" href="/fr/index.html">fr</a>
- - <a title="Japanese version" href="/ja/index.html">ja</a> ]
+ - <a title="Japanese version" href="/ja/index.html">ja</a>
+ - <a title="简体中文版本" href="/zh_CN/index.html">简</a>
+ ]
</span>
<a href="index.html">
<p class="logo"><img src="/resources/img/org-mode-unicorn.svg" alt="Org-Mode Logo"/> Org Mode</p></a>
diff --git a/zh-CN/resources/preamble.html b/zh-CN/resources/preamble.html
index a64832f..5e9e3e5 100644
--- a/zh-CN/resources/preamble.html
+++ b/zh-CN/resources/preamble.html
@@ -7,15 +7,17 @@
<span id="translate">
[ <a title="English version" href="/index.html">en</a>
- <a title="Version française" href="/fr/index.html">fr</a>
- - <a title="Japanese version" href="/ja/index.html">ja</a> ]
+ - <a title="Japanese version" href="/ja/index.html">ja</a>
+ - <a title="简体中文版本" href="/zh_CN/index.html">简</a>
+ ]
</span>
- <a href="index.html">
- <p class="logo"><img src="/resources/img/org-mode-unicorn.svg" alt="Org-Mode Logo"/> Org Mode</p></a>
- <a href="/features.html">Features</a>
- <a title="Get detailed updates on the latest releases" href="/Changes.html">Releases</a>
- <a title="Check upcoming changes, help requests, confirmed bugs and submitted patches" href="https://updates.orgmode.org">Updates</a>
- <a title="Start here to install Org" href="https://orgmode.org/org.html#Installation">Install</a>
- <a title="Check all manuals" href="/manuals.html">Manuals</a>
- <a title="Worg is the community-driven documentation for Org" href="/worg">Worg</a>
- <a title="Start here if you want to contribute to Org" href="/worg/org-contribute.html">Contribute</a>
+ <a href=".">
+ <p class="logo"><img src="../resources/img/org-mode-unicorn.svg" alt="Org 主模式图标"/>Org 主模式</p></a>
+ <a href="features.html">功能</a>
+ <a title="获取详细的最新更新内容" href="Changes.html">更新内容</a>
+ <a title="查看即将到来的更新、帮助请求、已确认的bug、已提交的补丁" href="https://updates.orgmode.org">项目状态</a>
+ <a title="查看如何安装 Org" href="../org.html#Installation">安装</a>
+ <a title="查看所有手册" href="manuals.html">手册</a>
+ <a title="Worg 是社区为 Org 编写的文档" href="../worg">Worg</a>
+ <a title="查看如何为 Org 提交贡献 Start here if you want to contribute to Org" href="../worg/org-contribute.html">贡献</a>
</nav>
--
2.40.0
[-- Attachment #6: 0005-zh-CN-org-demo.html-zh-CN-translation.patch --]
[-- Type: text/x-patch, Size: 3289 bytes --]
From f6aadf50e707381061a3d81c439009c36f388a2e Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Tue, 11 Apr 2023 01:32:26 +0800
Subject: [PATCH 05/16] * zh-CN/org-demo.html: zh-CN translation
---
zh-CN/org-demo.html | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/zh-CN/org-demo.html b/zh-CN/org-demo.html
index 98416eb..9845276 100644
--- a/zh-CN/org-demo.html
+++ b/zh-CN/org-demo.html
@@ -1,5 +1,5 @@
<div id="org-demo" style="counter-set: chk 0">
- <asside class="label-left">Metadata </asside>
+ <asside class="label-left">元数据</asside>
<pre class="label-left">
#+title: <span class="org-document-title">Example Org File</span>
#+author: <span class="org-document-info">TEC</span>
@@ -7,16 +7,16 @@
<details open>
<summary>
<asside class="right" style="position: relative; z-index: -1">
- <h4>Outlining</h4>
- Headings and folding make structured editing a breeze.
- Plain text makes it easy to sync and version control Org files.
+ <h4>概述显示</h4> <!-- TODO: I don't know if this is the best way to phrase it -->
+ 章节标题与折叠让结构化编辑小菜一碟。
+ 纯文本使得将 Org 文件同步或者加入版本管理十分容易。
</asside>
<pre><span class="org-level-1">* Revamp orgmode.org website</span></pre>
</summary>
<asside class="left">
- <h4>Agenda</h4>
- List todos across all your files.
- Filter content, and update it in place.
+ <h4>日程</h4>
+ 列出你所有文件中的待办事项。
+ 过滤内容，并且直接更改其内容。
</asside>
<pre>
@@ -70,7 +70,7 @@ Go through <span class="org-link"><a href="/resources/style/org.css">[[file:styl
</details>
<details open class="label-left">
<summary>
- <asside class="label-left">Prose</asside>
+ <asside class="label-left">文本</asside>
<pre><span class="org-level-1">* Learn Org</span></pre>
</summary>
<pre>
@@ -98,10 +98,10 @@ here for you as well: dive into the manual and join the community!
</summary>
<asside class="right">
<h4>Babel</h4>
- Perform literate programming in org,
- with notebook-like live code execution in the buffer.
+ 在 Org 里进行文学编程。
+ 用的是缓存区里类似笔记本的实时代码运行功能。
</asside>
- <asside class="label-left">Code</asside>
+ <asside class="label-left">代码</asside>
<details open>
<summary><pre class="label-left" style="background-color: #ccc4"><span class="org-block-begin-line">#+begin_src python</span></pre></summary>
<pre class="src label-left" style="background-color: #fff4">
@@ -119,7 +119,7 @@ here for you as well: dive into the manual and join the community!
</details>
<details open>
<summary>
- <asside class="label-left">Evaluated results</asside>
+ <asside class="label-left">运行结果</asside>
<pre class="label-left br"><span class="org-block-begin-line">#+RESULTS:</span></pre>
</summary>
<pre class="label-left"><span class="org-table">| index.css | 76% minified ( 1.4 KiB) |
--
2.40.0
[-- Attachment #7: 0006-zh-CN-setup.org-Updated-lang-desc.patch --]
[-- Type: text/x-patch, Size: 739 bytes --]
From b2b91a9143b734b9de5016ec6d5c549f9bc8d692 Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Tue, 11 Apr 2023 01:32:26 +0800
Subject: [PATCH 06/16] * zh-CN/setup.org: Updated lang & desc
---
zh-CN/setup.org | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/zh-CN/setup.org b/zh-CN/setup.org
index ce047c5..64d789d 100644
--- a/zh-CN/setup.org
+++ b/zh-CN/setup.org
@@ -1,4 +1,5 @@
-#+language: en
+#+language: zh-CN
+#+description: Org 主模式：在 Emacs 上记笔记、作计划、写文档
#+startup: hidestars
#+options: H:3 num:nil toc:nil \n:nil @:t ::t |:t ^:t *:t TeX:t author:nil <:t LaTeX:t
#+property: header-args :eval no-export
--
2.40.0
[-- Attachment #8: 0007-zh-CN-index.org-zh-CN-translation.patch --]
[-- Type: text/x-patch, Size: 19605 bytes --]
From 517b07a51dd54ed42fa13ab85c78d56494bed1ce Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Tue, 11 Apr 2023 01:32:26 +0800
Subject: [PATCH 07/16] * zh-CN/index.org: zh-CN translation
---
zh-CN/index.org | 189 +++++++++++++++++++-----------------------------
1 file changed, 74 insertions(+), 115 deletions(-)
diff --git a/zh-CN/index.org b/zh-CN/index.org
index 6048934..b5da846 100644
--- a/zh-CN/index.org
+++ b/zh-CN/index.org
@@ -1,40 +1,35 @@
-#+title: Org mode for Emacs
+#+title: Emacs 的 Org 主模式
#+setupfile: setup.org
-#+description: Org: an Emacs Mode for Notes, Planning and Authoring
-#+html_head: <link rel="stylesheet" href="/resources/style/index.min.css" type="text/css" />
-#+html_head: <link rel="preload" href="/resources/img/org-mode-unicorn.svg" as="image" type="image/svg+xml">
-#+include: "./resources/preamble.html" export html
+#+html_head: <link rel="stylesheet" href="../resources/style/index.min.css" type="text/css" />
+#+html_head: <link rel="preload" href="../resources/img/org-mode-unicorn.svg" as="image" type="image/svg+xml">
+#+include: "resources/preamble.html" export html
-#+html_head: <link rel="stylesheet" href="/resources/style/org-demo.min.css" type="text/css" />
-#+include: "./resources/normal-outline-3.html" export html
+#+html_head: <link rel="stylesheet" href="resources/style/org-demo.min.css" type="text/css" />
+#+include: "resources/normal-outline-3.html" export html
#+begin_export html
<div class="banner hero" itemscope itemtype="https://schema.org/SoftwareApplication">
- <img src="/resources/img/org-mode-unicorn.svg"
+ <img src="resources/img/org-mode-unicorn.svg"
alt="Org unicorn logo" itemprop="image"/>
<div>
<h2>
- <span itemprop="name">Org Mode</span>
- <p class="subtitle">Your life in plain text</p>
+ <span itemprop="name">Org 主模式</span>
+ <p class="subtitle">纯文本的生活</p>
</h2>
<p>
- A <a href="https://www.gnu.org/software/emacs/" style="color: inherit; font-weight: bold; font-style: italic;"
+ 一个 <a href="https://www.gnu.org/software/emacs/" style="color: inherit; font-weight: bold; font-style: italic;"
title="An extensible, customizable, free/libre text editor">GNU Emacs</a>
- major mode for <span itemprop="applicationCategory"> keeping notes, authoring documents,
- computational notebooks, literate programming, maintaining to-do lists, planning
- projects, and more — in a fast and effective plain text
- system.</p>
- <p><a title="Install from GNU ELPA" href="https://elpa.gnu.org/packages/org.html"><img src="https://elpa.gnu.org/packages/org.svg" alt="Install from GNU ELPA" /></a>
- <a title="How to report a bug" href="https://orgmode.org/manual/Feedback.html"><img src="/resources/img/badge-report-bug.svg" alt="How to report a bug" /></a>
- <a title="Email the Org-mode mailing list" href="mailto:emacs-orgmode@gnu.org"><img src="/resources/img/badge-feedback.svg" alt="Email the Org-mode mailing list" /></a>
- <a title="Git clone repository URL" href="https://git.savannah.gnu.org/cgit/emacs/org-mode.git"><img src="/resources/img/badge-source-code.svg" alt="Git clone repository URL" /></a>
- <a title="sr.ht project page" href="https://sr.ht/~bzg/org"><img src="/resources/img/badge-srht-project.svg" alt="sr.ht project page"/></a></p>
+ 的纯文本主模式。Org 有多种用法：用户可用它来快捷且高效地<span itemprop="applicationCategory">记笔记、编写文档、计算笔记本、文学编程、维护待办事项、计划项目等等。</p>
+ <p><a title="从 GNU ELPA 下载" href="https://elpa.gnu.org/packages/org.html"><img src="https://elpa.gnu.org/packages/org.svg" alt="从 GNU ELPA 下载" /></a>
+ <a title="如何报告问题" href="/manual/Feedback.html"><img src="resources/img/badge-report-bug.svg" alt="如何报告问题" /></a>
+ <a title="给 Org Mode 邮件列表发送邮件" href="mailto:emacs-orgmode@gnu.org"><img src="resources/img/badge-feedback.svg" alt="给 Org Mode 邮件列表发送邮件" /></a>
+ <a title="使用 Git 克隆代码仓库" href="https://git.savannah.gnu.org/cgit/emacs/org-mode.git"><img src="resources/img/badge-source-code.svg" alt="使用 Git 克隆代码仓库" /></a>
+ <a title="sr.ht 项目主页" href="https://sr.ht/~bzg/org"><img src="resources/img/badge-srht-project.svg" alt="sr.ht 项目主页"/></a></p>
<p class="bubble">
- Support via 
- <a href="https://liberapay.com/org-mode" title="Donations always help"
+ 在 <a href="https://liberapay.com/org-mode" title="感谢捐款"
style="font-weight: bold; display: inline-block">
- <img class="inline" src="/resources/img/external/librepay.svg" alt="Liberapay logo"/>
- Liberapay</a></p>
+ <img class="inline" src="resources/img/external/librepay.svg" alt="Liberapay logo"/>
+ Liberapay</a> 上支持 Org </p>
<meta itemprop="operatingSystem" content="Linux, MacOS, Windows">
<meta itemprop="softwareVersion" content="9.3.8">
<meta itemprop="datePublished" content="2020-08-07">
@@ -42,172 +37,136 @@
</div>
</div>
<div class="banner slim grey faded inline">
- <p style="width:90vw; color:#515151">
- Created by
- <a target="new" href="https://staff.science.uva.nl/~dominik/"
- style="font-weight:500; color:inherit">Carsten Dominik</a>
- in <a target="new" href="/manual/History-and-Acknowledgments.html" style="color:#6e6e6e">2003</a>,
- maintained by <a target="new" href="https://bzg.fr/en/" style="font-weight:500; color:inherit">Bastien Guerry</a>
- and developed by
- <a href="https://orgmode.org/org.html#History-and-Acknowledgments" style="color:#6e6e6e">many others</a>.</p>
+ <p style="width:90vw; color:#515151"> 作者：<a
+ target="new" href="https://staff.science.uva.nl/~dominik/"
+ style="font-weight:500; color:inherit">Carsten Dominik</a>（<a
+ target="new" href="../manual/History-and-Acknowledgments.html" style="color:#6e6e6e"
+ >2003</a>）；维护者：<a target="new" href="https://bzg.fr/en/" style="font-weight:500; color:inherit"
+ >Bastien Guerry</a>；开发者：<a href="../org.html#History-and-Acknowledgments" style="color:#6e6e6e">大量贡献者</a>。</p>
</div>
#+end_export
-* Highlights
+* 主要亮点
:PROPERTIES:
:HTML_CONTAINER_CLASS: columns no-heading
:END:
-** Features
+** 功能
@@html:<a href="features.html">@@
- #+attr_html: :alt Three stars :title Delve into the possibilities
+ #+attr_html: :alt 三颗星星 :title 无尽可能
[[file:resources/img/stars.svg]]
@@html:</a>@@
-** Install
- @@html:<a href="https://orgmode.org/org.html#Installation">@@
- #+attr_html: :alt Downwards facing arrow :title What are you waiting for?
+** 安装
+ @@html:<a href="../org.html#Installation">@@
+ #+attr_html: :alt 下箭头 :title 你还在等什么？
[[file:resources/img/install.svg]]
@@html:</a>@@
-** Quickstart
+** 快速开始
@@html:<a href="quickstart.html">@@
- #+attr_html: :alt Running stickfigure :title Start using Org. You'll never stop.
+ #+attr_html: :alt 火箭 :title 立即开始，你会爱上它。
[[file:resources/img/quickstart.svg]]
@@html:</a>@@
-** Contribute
- @@html:<a href="worg/org-contribute.html">@@
- #+attr_html: :alt Git branch symbol :title Yes. Do this.
+** 贡献
+ @@html:<a href="../worg/org-contribute.html">@@
+ #+attr_html: :alt Git branch 图标 :title 多多益善。
[[file:resources/img/contribute.svg]]
@@html:</a>@@
* Elaboration + demo image :ignore:
- #+attr_html: :style margin-top:2rem;
- Org is a highly flexible structured plain text file format, composed
- of a few simple, yet versatile, structures --- constructed to be both
- [[https://karl-voit.at/2017/09/23/orgmode-as-markup-only/][simple enough for the novice]] and [[http://howardism.org/Technical/Emacs/literate-devops.html][powerful enough for the expert]].
+#+attr_html: :style margin-top:2rem;
- Get a glimpse of the expressive power Org offers in the example below.
- Click the headings and links to discover how Org intelligently folds structural content.
+Org 是一个非常灵活的有结构的纯文本文件格式，由几种简单而又多用的结构组成。因此，Org 即足够[[https://karl-voit.at/2017/09/23/orgmode-as-markup-only/][简单]]，又足够[[http://howardism.org/Technical/Emacs/literate-devops.html][强大]]。
- #+include: org-demo.html export html
+请在以下这个例子里一窥 Org 具有的强大功能。点击段落标题与链接可以智能折叠与展开相应内容。
-* Further reading
+#+include: org-demo.html export html
+
+* 更多资料
:PROPERTIES:
:CUSTOM_ID: reading
:END:
-Beyond the [[file:quickstart.org][quickstart]] and the [[file:manual/index.html][manual]], Org has a [[file:guide/index.html][guide]] and a wealth of
-community-written documentation on [[https://orgmode.org/worg/][Worg]] .
+除开[[file:quickstart.org][快速开始]]与[[file:../manual/][手册]]之外，Org 还有一个[[file:../guide/][指南]]和大量由社区编写的文档：[[file:../worg/][Worg]]。
-Nearly every Org user has a story to tell about how Org enables and
-empowers them --- some have found it so useful that they have written
-[[https://orgmode.org/worg/org-papers.html][(scientific) papers]] about the value of Org for conducting [[https://en.wikipedia.org/wiki/Reproducibility#Reproducible_research][reproducible
-research]]. Some have produced third party tools to enjoy Org outside of
-Emacs, such as mobile applications.
+几乎所有的 Org 用户都有自己关于 Org 的故事 － 有些人甚至撰写了关于 Org 对于其实现[[https://en.wikipedia.org/wiki/Reproducibility#Reproducible_research][可重复性研究（英语；外网）]]价值的[[file:../worg/org-papers.html][科学论文]]。还有些人开发了一系列第三方工具用来在 Emacs 以外的环境里使用 Org ，例如在移动设备上。
-* More Org
+* 更多 Org
:PROPERTIES:
:CUSTOM_ID: more
:END:
-The /de facto/ mimetype for Org files is =text/org=. Org files use the
-~.org~ extension. Most operating systems don't know to open ~.org~ files
-in Emacs, but they can be configured to do so without much effort.
+Org 文件的 MIME 类型为 =text/org=，使用 ~.org~ 后缀名。大部分操作系统不知道应该使用 Emacs 来打开 ~.org~ 文件，但通常可以轻松修改其对应设置来达到此目的。
-While the reference implementation of Org in Emacs lisp is by far the
-most featureful, there are many additional [[file:tools.org][tools]] that work with Org.
+Org 在 Emacs Lisp 上的默认实现目前为止拥有最丰富的功能。不过，目前仍有很多其它的[[file:tools.org][工具]]能与 Org 进行交互。
#+begin_center
#+attr_html: :class btn
-[[file:tools.org][Tools that work with Org]]
+[[file:tools.org][能与 Org 交互的工具]]
#+end_center
-* [[https://orgmode.org/worg/][Worg]], a /World/ of Org
+* [[file:../worg/][Worg]]，Org /世界/
:PROPERTIES:
:CUSTOM_ID: worg
:END:
-Org and Org-mode have so many use cases that it is simply not possible
-to easily document them, let alone show them all off on a single page.
-As a result, [[https://orgmode.org/worg/][Worg]] serves as a community wiki and provides a place to
-document and share information about all aspects of using and working
-with Org.
+Org 的用法五花八门，因此我们无法把它们轻松地纪录下来，更别提把它们在一个网页里展示出来。因此，我们创造了[[file:../worg/][Worg]]作为社区百科，为纪录、分享用户们使用 Org 的各方面信息提供了空间。
-For example, Worg contains:
+举个例子，[[file:../worg/][Worg]]包含了：
-- [[https://orgmode.org/worg/org-faq.html][The FAQ]]
-- [[https://orgmode.org/worg/org-hacks.html][Org hacks]]
-- [[https://orgmode.org/worg/org-tutorials/index.html][A list of tutorials]]
-- [[https://orgmode.org/worg/doc.html][Documentation on all hooks, commands and options]]
-- [[https://orgmode.org/worg/org-in-the-wild.html][Org in the wild]]
-- /...and much more/
+- [[file:../worg/org-faq.html][常见问题]]
+- [[file:../worg/org-hacks.html][Org 妙招]]
+- [[file:../worg/org-tutorials/index.html][各种教程]]
+- [[file:../worg/doc.html][所有挂勾、命令与选项的文档]]
+- [[file:../worg/org-in-the-wild.html][野生的 Org]]
+- /……以及更多/
-Worg is maintained as a Git repository of Org files that are published
-as an HTML website. New [[https://orgmode.org/worg/worg-about.html#contribute-to-worg][contributors are welcome]].
+[[file:../worg/][Worg]]是一个装有 Org 文件的 Git 代码仓库，发布为 HTML 网页，[[file:../worg/worg-about.html#contribute-to-worg][欢迎贡献]]。
#+BEGIN_SRC shell
~$ git clone https://git.sr.ht/~bzg/worg
#+END_SRC
-* Joining the mailing list
+* 加入邮件列表
:PROPERTIES:
:CUSTOM_ID: mailing-list
:END:
-Org mailing list is the central place where to connect with Org
-community. You can [[https://lists.gnu.org/mailman/listinfo/emacs-orgmode][subscribe to the list]] and browse the list archive
-on [[https://list.orgmode.org][list.orgmode.org]] or on [[https://lists.gnu.org/archive/html/emacs-orgmode/][this mailman page]].
+Org 邮件列表是一个能与整个 Org 社区交流的地方。你可以[[https://lists.gnu.org/mailman/listinfo/emacs-orgmode][订阅此列表]]，也可以在[[https://list.orgmode.org][list.orgmode.org]]或者[[https://lists.gnu.org/archive/html/emacs-orgmode/][此 mailman 网页]]浏览往期邮件。_请注意，此列表需要使用英语交流。_
+
+即使你不是此列表的订阅者，你仍可以向[[mailto:emacs-orgmode@gnu.org][emacs-orgmode@gnu.org]]发送邮件，我们会把你加入白名单。
-If you are not a subscriber to the list, you can still send an email
-to [[mailto:emacs-orgmode@gnu.org][emacs-orgmode@gnu.org]], we will add you to the whitelist of people
-who can reach the list.
+更多关于邮件列表的信息请见[[file:../worg/org-mailing-list.html][此网页（英语）]]。此外，Org 还有其它的[[file:../worg/org-web-social.html][社交平台（英语）]]。
-You can [[https://orgmode.org/worg/org-mailing-list.html][read more on the mailing list]] and more information on [[https://orgmode.org/worg/org-web-social.html][Org news
-on the social web]].
+你也可以使用 IRC 在[[https://libera.chat/][Libera.Chat]]的 ~#org-mode~ 频道上与其它 Org 爱好者交流。_请注意，此频道需要使用英语交流。_
-You can also connect with other org-thusiasts via IRC at ~#org-mode~ on
-[[https://libera.chat/][Libera.Chat]].
+[[https://emacs-china.org][Emacs China]]是一个中文 Emacs 用户聚集的论坛。在此你可以讨论 Org 以及其他与 Emacs 相关的内容。_请注意，此论坛需要使用中文交流。_
-The full [[https://orgmode.org/worg/contributors.html][list of contributors]] to Org mode is maintained in /Worg/ and
-you can also check the manual's [[https://orgmode.org/org.html#History-and-Acknowledgments][acknowledgments]].
+Org 的完整贡献者列表在 /Worg/ 里[[file:../worg/contributors.html][可见（英语）]]。你也可以查看手册的[[file:../org.html#History-and-Acknowledgments][鸣谢（英语）]]。
-* Doom, Spacemacs, Scimax and popular configs
+* Doom，Spacemacs，Scimax以及热门配置
:PROPERTIES:
:CUSTOM_ID: configs
:END:
-The Emacs starter kits [[https://github.com/hlissner/doom-emacs][Doom]], [[https://www.spacemacs.org/][Spacemacs]] and [[https://github.com/jkitchin/scimax][Scimax]] come with a curated
-set of packages and configurations that aim to enhance Org mode (and
-Emacs more generally) for particular use cases. They include Org
-along with integrations between =org-mode= and other modes (such as
-=evil-mode=). Here are links to the current packages included with
-[[https://github.com/hlissner/doom-emacs/blob/develop/modules/lang/org/packages.el][Doom]], and [[https://github.com/syl20bnr/spacemacs/blob/master/layers/%2Bemacs/org/packages.el][Spacemacs]]. /Scimax/ is deeply integrated with Org so a good
-place to start is the [[https://github.com/jkitchin/scimax/blob/master/scimax.org#org-mode][manual]]. /Doom/ installs a version of Org that is
-close to the development ~HEAD~, while /Spacemacs/ and /Scimax/ track org
-elpa.
-
-Starter kits often make significant changes to the default user
-experience for Emacs. If you are looking for something closer to
-vanilla Emacs there are popular configs such as [[https://github.com/purcell/emacs.d/blob/master/lisp/init-org.el][Purcell's emacs.d]] that
-include org-mode customization and Org-related packages.
-
-* In Other Editors
+[[https://github.com/hlissner/doom-emacs][Doom]]，[[https://www.spacemacs.org/][Spacemacs]]，以及[[https://github.com/jkitchin/scimax][Scimax]]这几个 Emacs 入门工具包包含了一系列经过精细管理过的组件与配置，目标是给常用的 Org（以及 Emacs 本身）用法带来优化。它们包含了 =org-mode= 与其它模式的集成（例如 =evil-mode=）。这里是它们目前使用的组件列表：[[https://github.com/hlissner/doom-emacs/blob/develop/modules/lang/org/packages.el][Doom]]、[[https://github.com/syl20bnr/spacemacs/blob/master/layers/%2Bemacs/org/packages.el][Spacemacs]]。/Scimax/ 与 Org 紧密集成，所以 /Scimax/ 用户应先参考它的[[https://github.com/jkitchin/scimax/blob/master/scimax.org#org-mode][手册（英语）]]。/Doom/ 使用的 Org 版本接近与开发版 ~HEAD~，而 /Spacemacs/ 与 /Scimax/ 使用的则是 Org 在 GNU ELPA 上发布的版本。
+
+各种入门工具包通常大量修改了 Emacs 的默认用户设置。如果你更偏向于原版 Emacs，可以参考包含配置了 Org 及其关联组件的热门配置，例如 [[https://github.com/purcell/emacs.d/blob/master/lisp/init-org.el][Purcell 的 emacs.d]]。
+
+* 其它文本编辑器
:PROPERTIES:
:CUSTOM_ID: editors
:END:
-While the full set of Org [[file:features.html][features]] is currently exclusive to Emacs,
-basic functionality for Org files has been implemented for a variety
-of editors. Here are some extensions for other editors that enable
-support for Org files.
+尽管用户只能在 Emacs 上享受完整的 Org [[file:features.org][功能]]，但是 Org 文件的基本功能已经在一系列其它编辑器上被实现出来，详见以下列表：
-- *Vim* : [[https://github.com/kristijanhusak/orgmode.nvim][orgmode.nvim]], [[https://github.com/jceb/vim-orgmode][vim-orgmode]], and [[https://github.com/axvr/org.vim][org.vim]]
+- *Vim* : [[https://github.com/kristijanhusak/orgmode.nvim][orgmode.nvim]]、[[https://github.com/jceb/vim-orgmode][vim-orgmode]]、 [[https://github.com/axvr/org.vim][org.vim]]
- *Atom* : [[https://atom.io/packages/org-mode][org-mode]]
- *VS Codium* : [[https://github.com/vscode-org-mode/vscode-org-mode][vscode-org-mode]]
--
2.40.0
[-- Attachment #9: 0008-zh-CN-tools.org-zh-CN-translation.patch --]
[-- Type: text/x-patch, Size: 8663 bytes --]
From 6b81da7cee0f5fea806c356e0ae1510293362bec Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Tue, 11 Apr 2023 01:32:26 +0800
Subject: [PATCH 08/16] * zh-CN/tools.org: zh-CN translation
---
zh-CN/tools.org | 70 ++++++++++++++++++++++---------------------------
1 file changed, 32 insertions(+), 38 deletions(-)
diff --git a/zh-CN/tools.org b/zh-CN/tools.org
index 1b1c27c..0a0c818 100644
--- a/zh-CN/tools.org
+++ b/zh-CN/tools.org
@@ -1,9 +1,9 @@
-#+title: Tools | Org mode
+#+title: 工具 | Org mode
#+setupfile: setup.org
-#+description: Org: an Emacs Mode for Notes, Planning and Authoring
-#+include: "./resources/preamble.html" export html
+#+include: "resources/preamble.html" export html
#+macro: link @@html:<a href="https://$1">@@
+#+macro: worg @@html:<a href="../worg/$1">@@
#+macro: gh {{{link(github.com/$1)}}}
#+macro: end-link @@html:</a>@@
@@ -24,7 +24,7 @@
</style>
#+END_EXPORT
-* Import & Export
+* 导入与导出
:PROPERTIES:
:HTML_CONTAINER_CLASS: columns
:END:
@@ -35,10 +35,9 @@
{{{link(pandoc.org)}}}
[[https://lh3.googleusercontent.com/-S8Fwe-PISrU/WExNwRXJHKI/AAAAAAAAAFo/tRbv1NAYBWoEBitmvDRFY_bc5xv07lnMACLcB/s1600/pandoc.png]]
-The Swiss-army knife of markup format converters.
-It can convert documents between many source formats, including Org.
+瑞士军刀级别的 markup 文档转换器：它能将文档在不同格式之间自由转换，包括 Org。
{{{end-link}}}
-* Publishing
+* 发布
:PROPERTIES:
:HTML_CONTAINER_CLASS: columns
:END:
@@ -46,27 +45,27 @@ It can convert documents between many source formats, including Org.
{{{link(gohugo.io)}}}
[[https://upload.wikimedia.org/wikipedia/commons/a/af/Logo_of_Hugo_the_static_website_generator.svg]]
-A static site generator written in Go, supports Org natively.
+一个使用 Go 编写的、原生支持 Org 的静态网页生成器。
{{{end-link}}}
** Org-Jekyll
-{{{link(orgmode.org/worg/org-tutorials/org-jekyll.html)}}}
+{{{worg(org-tutorials/org-jekyll.html)}}}
[[https://cdn.worldvectorlogo.com/logos/jekyll.svg]]
-A way to combine Org with a simple, blog aware, static site generator.
+将 Org 与一个简易的博客静态网页生成器融合在一起。
{{{end-link}}}
** o-blog
{{{link(renard.github.com/o-blog)}}}
[[https://upload.wikimedia.org/wikipedia/commons/3/31/Blogger.svg]]
-Stand-alone blogging system that does not require any external software
+自成一体的博客系统，不需要任何外部软件。
{{{end-link}}}
** Org2Blog
{{{gh(org2blog/org2blog)}}}
# [[https://raw.githubusercontent.com/org2blog/org2blog/master/svg/Org2Blog_shorthand.svg]]
-Blog from Org mode to WordPress.
+使用 Org 编写博客，然后将其发布在 WordPress 上。
{{{end-link}}}
-* Utilities
+* 工具
:PROPERTIES:
:HTML_CONTAINER_CLASS: columns
:END:
@@ -77,27 +76,27 @@ Blog from Org mode to WordPress.
{{{gh(novoid/Memacs)}}}
[[https://static.thenounproject.com/png/870-200.png]]
-A method to extract and analyse metadata from Org.
+提取、分析 Org 的元数据。
{{{end-link}}}
** org-manage
{{{gh(dmgerman/org-manage)}}}
[[https://static.thenounproject.com/png/3266143-200.png]]
-A module to help managing a large collection of org files.
+帮助用户管理一大批 Org 文件。
{{{end-link}}}
** orgFixLinks
{{{gh(cashTangoTangoCash/orgFixLinks)}}}
[[https://static.thenounproject.com/png/2805259-200.png]]
-A script to try to repair file links.
+一个帮助用户修复文件链接的脚本。
{{{end-link}}}
** Logseq
{{{gh(logseq/logseq)}}}
[[https://pbs.twimg.com/profile_images/1284058782012563464/oQFKw8uM_400x400.png]]
-A privacy-first knowledge base using the Org syntax.
+一个使用 Org 语法的、隐私优先的知识库。
{{{end-link}}}
-* Parsers
+* Org 语法解析
:PROPERTIES:
:HTML_CONTAINER_CLASS: columns
:END:
@@ -105,14 +104,13 @@ A privacy-first knowledge base using the Org syntax.
{{{link(bitbucket.org/joebo/pico-org/src)}}}
[[https://upload.wikimedia.org/wikipedia/commons/4/40/PicoLisp_Logo.svg]]
-/pico-org/ --- a tiny org-mode parser.
+/pico-org/ ----- 一个小的 Org 解析库，可以将 Org 文件内容解析成 Pico Lisp 数据解构。
{{{end-link}}}
** Common Lisp
{{{link(common-lisp.net/project/cl-org-mode/)}}}
[[https://lispcookbook.github.io/cl-cookbook/assets/cl-logo-blue.png]]
-/cl-org-mode/ creates a tree of org-mode nodes.
-Includes (primitive) system for literate programming.
+/cl-org-mode/ 将 Org 文件解析成为一个 Common Lisp 里的树结构。此库（初步）支持文学编程。
{{{end-link}}}
** NodeJS
{{{link(/gioorgi.com/org-mode-parser/)}}}
@@ -124,7 +122,7 @@ Includes (primitive) system for literate programming.
{{{gh(karlicoss/orgparse)}}}
[[https://cdn.iconscout.com/icon/free/png-256/python-14-569257.png]]
-/orgparse/ creates a tree from an org file.
+/orgparse/ 将 Org 文件解析成为一个 Python 的树结构。
{{{end-link}}}
** Perl
{{{link(metacpan.org/release/Org-Parser)}}}
@@ -136,22 +134,21 @@ Includes (primitive) system for literate programming.
{{{gh(bdewey/org-ruby)}}}
[[https://upload.wikimedia.org/wikipedia/commons/7/73/Ruby_logo.svg]]
-/org-ruby/ is a gem (used by GitHub) for parsing Org files and converting to HTML
-or textile.
+/org-ruby/ 是一个解析 Org 文件以及将其转换为文本格式以及 HTML 格式的 Ruby 库。此外，GitHub 使用这个库来显示网页上的 Org 文件。
{{{end-link}}}
** Rust
{{{gh(poiscript/orgize)}}}
[[https://upload.wikimedia.org/wikipedia/commons/d/d5/Rust_programming_language_black_logo.svg]]
-/Orgize/ parses org files and can render them to HTML.
+/Orgize/ 可以解析 Org 文件，以及将其转换为 HTML 格式。
{{{end-link}}}
** JavaScript
{{{gh(orgapp/orgajs)}}}
[[https://upload.wikimedia.org/wikipedia/commons/9/99/Unofficial_JavaScript_logo_2.svg]]
-/Orga/ parses Org files into a AST.
+/Orga/ 能够解析 Org 文件，将其转换为一个抽象语法树（AST）。
{{{end-link}}}
-* Exporters
+* 导出
:PROPERTIES:
:HTML_CONTAINER_CLASS: columns
:END:
@@ -159,14 +156,13 @@ or textile.
{{{link(www.drupal.org/project/orgmode)}}}
[[https://www.drupal.org/files/EL_blue_RGB%281%29.png]]
-A drupal module able to import single files, such as articles and transform them
-into nodes.
+一个 drupal 库，可以导入 Org 文件（例如文章），然后转换为 drupal 结点。
{{{end-link}}}
** Pandoc
{{{gh(kawabata/ox-pandoc)}}}
[[https://static.thenounproject.com/png/2710766-200.png]]
-/ox-pandoc/ hooks pandoc into Org's export functionality.
+/ox-pandoc/ 使用 pandoc 来实现 Org 的导出功能。
{{{end-link}}}
** ox-hugo
:PROPERTIES:
@@ -175,14 +171,13 @@ into nodes.
{{{link(ox-hugo.scripter.co)}}}
[[https://upload.wikimedia.org/wikipedia/commons/4/48/Markdown-mark.svg]]
-An exporter to Hugo-compatible Markdown (Blackfriday), which allows for a bit
-more versatility.
+支持导出到兼容 Hugo 的 Markdown 格式（黑色星期五 --- Blackfriday）。此格式相比通常的 Markdown 格式更为灵活。
{{{end-link}}}
** ox-⁎
[[https://static.thenounproject.com/png/608341-200.png]]
-There are many more Emacs Org exporters. Just look around.
-* Importers
+这里还有很多 Org 导出工具，可以四处看看。
+* 导入
:PROPERTIES:
:HTML_CONTAINER_CLASS: columns
:END:
@@ -190,19 +185,18 @@ There are many more Emacs Org exporters. Just look around.
{{{gh(tecosaur/org-pandoc-import)}}}
[[https://static.thenounproject.com/png/2404511-200.png]]
-/org-pandoc-import/ is an interface to pandoc which makes it trivial to convert
-other makups to org.
+/org-pandoc-import/ 是一个面对 pandoc 的工具，帮助用户将其它格式的标记文件转换为 Org 格式。
{{{end-link}}}
** VimWiki
{{{gh(fasheng/vimwiki2org)}}}
[[https://cdn.freebiesupply.com/logos/large/2x/vim-logo-png-transparent.png]]
-A simple tool to convert vimwiki file to Org.
+一个简易的转换工具，将 vimwiki 格式文件转换成 Org 格式。
{{{end-link}}}
** Exchange calenders
{{{gh(kautsig/ews-orgmode)}}}
[[https://upload.wikimedia.org/wikipedia/commons/e/ea/Microsoft_Exchange_%282019-present%29.svg]]
-A script to fetch your calendar from an exchange server and view it as an agenda.
+此脚本可以从一个 Exchange 服务器上获取你的日历，然后在 Org Agenda 上显示出来。
{{{end-link}}}
--
2.40.0
[-- Attachment #10: 0009-zh-CN-manuals.org-zh-CN-translation.patch --]
[-- Type: text/x-patch, Size: 2751 bytes --]
From b32b59b5742ecf09548ed8ac83dfd0c2de2c1137 Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Tue, 11 Apr 2023 01:32:26 +0800
Subject: [PATCH 09/16] * zh-CN/manuals.org: zh-CN translation
---
zh-CN/manuals.org | 42 +++++++++++++++++++-----------------------
1 file changed, 19 insertions(+), 23 deletions(-)
diff --git a/zh-CN/manuals.org b/zh-CN/manuals.org
index 309d44e..aaed859 100644
--- a/zh-CN/manuals.org
+++ b/zh-CN/manuals.org
@@ -1,35 +1,31 @@
-#+title: Manuals | Org mode
+#+title: 手册 | Org 主模式
#+setupfile: setup.org
-#+description: Org: an Emacs Mode for Notes, Planning and Authoring
-#+include: "./resources/preamble.html" export html
+#+include: "resources/preamble.html" export html
-* Org manual
+* Org 手册
-The Org manual is the comprehensive and official resource for features
-in Org's core.
+Org 手册是介绍 Org 核心功能的一个全面的官方资源。
-- As [[https://orgmode.org/org.html][a single HTML page]]
-- As [[https://orgmode.org/manual/][multiple HTML pages]]
-- As [[https://orgmode.org/org.pdf][a PDF document]]
+- 作为 [[file:../org.html][单一 HTML 网页]]
+- 作为 [[file:../manual/][多个 HTML 网页]]
+- 作为 [[file:../org.pdf][一个 PDF 文档]]
-* Org Mode compact guide
+* Org 指南
-The Org Mode compact guide is a shorter introduction to the main
-features of Org Mode.
+Org 指南更简洁地介绍了 Org 的主要功能。
-- As [[https://orgmode.org/orgguide.html][a single HTML page]]
-- As [[https://orgmode.org/guide/][multiple HTML pages]]
-- As [[https://orgmode.org/orgguide.pdf][a PDF document]]
+- 作为 [[file:../orgguide.html][单一 HTML 网页]]
+- 作为 [[file:../guide/][多个 HTML 网页]]
+- 作为 [[file:../orgguide.pdf][一个 PDF 文档]]
-* Worg: the community-driven documentation
+* Worg：社区文档
-- As [[https://orgmode.org/worg/][HTML]]
-- As a Git repository: =~$ git clone https://git.sr.ht/~bzg/worg=
-- [[https://orgmode.org/worg/worg-about.html][About Worg]]: how to contribute?
+- 作为 [[file:../worg/][HTML]]
+- 作为 Git 代码仓库：=~$ git clone https://git.sr.ht/~bzg/worg=
+- [[file:../worg/worg-about.html][关于 Worg]]：如何贡献？
-* Org manual for the GNU Emacs version
+* GNU Emacs 内置 Org 手册
-GNU Emacs publishes manuals for its components. Org is distributed
-with GNU Emacs.
+GNU Emacs 负责发布其内置组件的手册，包括 Org 的手册。
-You can access the [[https://www.gnu.org/software/emacs/manual/org.html][GNU Emacs Org manual from here]].
+你可在[[https://www.gnu.org/software/emacs/manual/org.html][此处]]查看 GNU Emacs 的 Org 手册。
--
2.40.0
[-- Attachment #11: 0010-zh-CN-LICENSE.org-zh-CN-translation.patch --]
[-- Type: text/x-patch, Size: 1187 bytes --]
From 494e5a99e6ff01b76abd900f1d82b0df360e620f Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Tue, 11 Apr 2023 01:32:26 +0800
Subject: [PATCH 10/16] * zh-CN/LICENSE.org: zh-CN translation
---
zh-CN/LICENSE.org | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/zh-CN/LICENSE.org b/zh-CN/LICENSE.org
index b080fd2..dac0e7f 100644
--- a/zh-CN/LICENSE.org
+++ b/zh-CN/LICENSE.org
@@ -2,8 +2,6 @@
# Free Documentation license v1.3 or later, code examples are released
# under the GNU General Public License v3 or later.
-The contents of this repository is licensed under the [[https://www.gnu.org/licenses/fdl-1.3.html][GNU Free
-Documentation License version 1.3 or later]].
+这个代码仓库的内容根据 [[https://www.gnu.org/licenses/fdl-1.3.html][GNU Free Documentation License version 1.3 or later]] 授权。
-The code examples and CSS stylesheets are licensed under the [[https://www.gnu.org/licenses/gpl-3.0.html][GNU
-General Public License v3 or later]].
+代码范例与 CSS 样式表根据 [[https://www.gnu.org/licenses/gpl-3.0.html][GNU General Public License v3 or later]] 授权。
--
2.40.0
[-- Attachment #12: 0011-zh-CN-features.org-zh-CN-translation.patch --]
[-- Type: text/x-patch, Size: 22966 bytes --]
From b7772ec1822eb07111ae6c3a39677cd6a1c6f7c6 Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Tue, 11 Apr 2023 01:32:26 +0800
Subject: [PATCH 11/16] * zh-CN/features.org: zh-CN translation
---
zh-CN/features.org | 271 ++++++++++++++++-----------------------------
1 file changed, 97 insertions(+), 174 deletions(-)
diff --git a/zh-CN/features.org b/zh-CN/features.org
index 721ec29..0367040 100644
--- a/zh-CN/features.org
+++ b/zh-CN/features.org
@@ -1,7 +1,6 @@
-#+title: Features | Org mode
+#+title: 功能 | Org
#+setupfile: setup.org
-#+description: Org: an Emacs Mode for Notes, Planning and Authoring
-#+include: "./resources/preamble.html" export html
+#+include: "resources/preamble.html" export html
#+begin_export html
<style>
@@ -25,98 +24,78 @@
}
</style>
-<script type="text/javascript" async src="/resources/js/org-quotes.js"></script>
+<script type="text/javascript" async src="../resources/js/org-quotes.js"></script>
<div class="banner slim"> <p id="a-quote"></p> </div>
#+end_export
-* Elegant Markup
+* 多种标记选项
:PROPERTIES:
:CUSTOM_ID: markup
:HTML_CONTAINER_CLASS: side-fig
:END:
-#+attr_html: :class main-image :style max-height:12em; :alt Example basic Org document showing the key textual elements
+#+attr_html: :class main-image :style max-height:12em; :alt 使用文字元素标记文本的例子
[[file:resources/img/features/simple-syntax.svg]]
-
-** Description
-Org mode is routinely used to build and manage complex workflows. It
-does this using an elegantly simple syntax that scales from basic
-markup to full LaTeX typesetting and from plain text notes to literate
-programs.
+** 描述
-Everything you need to get started is demonstrated in the example.
+Org 常被用于构建与管理复杂的工作流程。为此，Org 使用了优美且简单的语法，从最基本的标记到完整的 LaTeX 排版，从纯文本到文学程序，都可以使用 Org 编写而成。
-*** More
+以下这个例子包含了所有你开始使用 Org 需要的内容。
-More on [[file:manual/Markup-for-Rich-Contents.html][markup]] (manual)
+*** 更多
-* Structured Editing@@comment: and Navigation@@
+详见手册（英语）：[[file:../manual/Markup-for-Rich-Contents.html][标记]]
+
+* 结构化的编辑@@comment:与导航@@
:PROPERTIES:
:CUSTOM_ID: editing
:HTML_CONTAINER_CLASS: side-fig
:END:
-#+attr_html: :class main-image :alt Demonstration of folding and unfolding sections in Org
+#+attr_html: :class main-image :alt 演示在 Org 里折叠与显示章节
[[file:resources/img/features/folding.gif]]
-** Description
+** 描述
-The fundamental structure of an Org document is a tree, with nested,
-collapsible sections forming its backbone. You can fold and unfold
-whole trees with single keystroke --- =tab=.
+Org 里最基础的结构是由可嵌套、可折叠的章节构成的树。你可以使用一个快捷键 ----- =tab= ----- 来折叠、展开整个树。
-Org's trees make for quick, graceful navigation and powerful
-information hiding that lets you focus on the task at hand without
-compromising the ability to get the information you need complete it.
+Org 的树结构给用户带来了快速且优雅的导引与强大的信息遮避功能，让你在保持获取需要信息的能力的同时专心于手头的任务。
-Controlling section visibility is only a tiny part of Org's set of
-tools and commands for structured editing of plain text. Org mode
-leverages Org's regular syntax to transform otherwise tedious tasks
-into single key commands, freeing you to focus on content rather than
-form.
+控制章节可见与否只是 Org 的一个小小的功能，而 Org 仍有其它多种工具与命令来为结构化地编辑纯文本带来便利。 Org 的语法让用户把枯燥的任务变成了单个的键盘命令，让用户更着重于内容而不是形式。
-*** More
+*** 更多
-More on [[file:manual/Document-Structure.html][document structure]] (manual)
+详见手册（英语）：[[file:../manual/Document-Structure.html][文档结构]]
-* Transparent Tables
+* 透明化的表格处理
:PROPERTIES:
:CUSTOM_ID: tables
:HTML_CONTAINER_CLASS: side-fig
:END:
-#+attr_html: :class main-image :alt Manipulating tables with Org, moving cells/rows and executing formulas
+#+attr_html: :class main-image :alt 在 Org 中处理表格，移动行列以及运行公式
[[file:resources/img/features/tables.gif]]
-** Description
-
-Org includes a powerful table editor.
+** 描述
-=tab= moves between /columns/.
-=return= moves between /rows/.
+Org 自带了一个强大的表格编辑器。
-Layout updates automatically as cell contents change.
+按 =tab= 可以左右移动；按 =return= 可以上下移动。
-Import tables from =.csv= and =.tsv= files, or directly from the
-contents of the current buffer, then export them to any format
-supported by Org.
+在内容发生改变时，表格结构会自动更新。
-Org tables aren't just static views of data. They can be used as a
-full [[https://orgmode.org/manual/The-Spreadsheet.html][spreadsheet]] system, with formulas, references and more --- all
-with the simplicity and transparency of plain text.
+可以从 =.csv= 和 =.tsv= 文件，或直接从当前缓存区中导入表格，也可以把表格导出到任何 Org 支持的格式。
-*** More
+Org 表格不只是静态的数据堆积。它也可以被视作一个完整的[[file:../manual/The-Spreadsheet.html][表格]]系统，包含公式、引用等等 ----- 同时不失其作为纯文本系统的简洁与透明。
-The [[file:manual/Built_002din-Table-Editor.html][built-in table editor]] (manual)
+*** 更多
-Org as a [[file:manual/The-Spreadsheet.html][spreadsheet]] system (manual)
+详见手册（英语）：[[file:../manual/Built_002din-Table-Editor.html][表格编辑器]]、[[file:../manual/The-Spreadsheet.html][表格系统]]
-Introduction to [[https://orgmode.org/worg/org-tutorials/tables.html][editing tables]] (Worg)
+Worg 教程（英语）：[[file:../worg/org-tutorials/tables.html][使用表格工作]]、[[file:../worg/org-tutorials/org-spreadsheet-intro.html][表格系统]]
-Using [[https://orgmode.org/worg/org-tutorials/org-spreadsheet-intro.html][Org as a spreadsheet]] (Worg)
-
-* Superior Source Code
+* 更优越的源代码
:PROPERTIES:
:CUSTOM_ID: babel
:HTML_CONTAINER_CLASS: side-fig
@@ -125,223 +104,167 @@ Using [[https://orgmode.org/worg/org-tutorials/org-spreadsheet-intro.html][Org a
#+attr_html: :class main-image :alt Demonstration of Org Babel executing code blocks
[[file:resources/img/features/babel.gif]]
-** Description
+** 描述
-Org provides functionality far beyond that of computational notebooks
-such as [[https://jupyter.org/][Jupyter]] or [[https://rmarkdown.rstudio.com/][R Markdown]].
+Org 提供的功能远远超过[[https://jupyter.org/][Jupyter]]、[[https://rmarkdown.rstudio.com/][R Markdown]]等计算笔记本。
# Program your way.
-[[https://orgmode.org/worg/org-contrib/babel/][Org babel]] transforms the lowly executable source block into a complete
-[[https://en.wikipedia.org/wiki/Literate_programming][literate programming]] environment, allowing you to weave the inputs and
-outputs of multiple languages and runtime environments across multiple
-machines into a single unified system, empowering you to achieve new
-levels of [[https://en.wikipedia.org/wiki/Don%27t_repeat_yourself][DRYness]] regardless of whether the languages you are working
-in want you to or not.
+[[file:../worg/org-contrib/babel/][Org babel]]把可运行的代码区转换为一个完整的[[https://en.wikipedia.org/wiki/Literate_programming][文学编程（英语，外网）]]环境，使得用户可以用输入与输出串联不同的语言、运行环境、甚至不同的设备到同一个系统里。用户就此可以在[[https://en.wikipedia.org/wiki/Don%27t_repeat_yourself][DRY（英语，外网）]]上达到一个前所为有的高度。
# Free your code
-Org makes it trivial to extract source code and generate documentation
-from the same file. While many languages have support for generating
-developer documentation from code comments, with Org your developer
-guide and user manual can also be the source code for implementation
-and testing --- a single source of truth that won't drift out of sync.
+使用 Org ，你可以非常简单地从同一个文件里提取源代码与生成帮助文档。尽管很多语言支持从代码备注里生成文档，Org 还可以同时在同一个文件里放入开发者指南、用户手册、实现以及测试 ----- 因此，每个 Org 文件是唯一的、不会逐步失去同步的信息源。
# Emacs. We will add your technological distinctiveness to our own.
-Org currently has support for over [[https://orgmode.org/worg/org-contrib/babel/languages/index.html][80 languages]], and projects like
-[[https://github.com/nnicandro/emacs-jupyter#org-mode-source-blocks][emacs-jupyter]] make it possible to leverage the Jupyter kernel
-ecosystem for even more languages.
+Org 目前支持超过[[file:../worg/org-contrib/babel/languages/index.html][80种不同语言]]，并且像[[https://github.com/nnicandro/emacs-jupyter#org-mode-source-blocks][emacs-jupyter]]这样的组件使得用户可以利用 Jupyter 内核生态来使用更多的语言。
+
+*** 更多
-*** More
+详见手册（英语）：[[file:../manual/Working-with-Source-Code.html][使用源代码]]
-[[file:manual/Working-with-Source-Code.html][Working with source code]] (manual)
+Worg（英语）：[[file:../worg/org-contrib/babel/languages/index.html][支持语言]]列表
-List of [[https://orgmode.org/worg/org-contrib/babel/languages/index.html][supported languages]] (Worg)
-* Export and Publish
+* 导出与发布
:PROPERTIES:
:CUSTOM_ID: publishing
:HTML_CONTAINER_CLASS: side-fig
:END:
# Powerful publishing
-#+attr_html: :class main-image :alt Showing an Org file being exported to HTML, markdown, PDF and plaintext
+#+attr_html: :class main-image :alt 示范如何把一个 Org 文件导出到 HTML，markdown，PDF 以及纯文本
[[file:resources/img/features/exports.gif]]
-** Description
+** 描述
-Org is an authoring and publishing tool --- it can function as
-everything from a static site generator, to a suite of tools for
-self-publishing.
+Org 是一个撰写与发布的工具 ----- 它既可以是静态网页生成器，也可以是一系列为发布内容提供便利的工具。
-Draft documents using Org's intuitive markup, then export to your
-format of choice. Org supports many formats including:
+你使用 Org 的简洁易懂的标记语法来撰写稿件，然后导出到你所选择的任何一种格式。 Org 支持很多格式，其中包含：
- =HTML=
-- $\LaTeX$
+- \(\LaTeX\)
- =ODT=
-- and more!
+- 以及更多！
-Developers can easily create new backends for their favorite format
-(see the [[https://orgmode.org/worg/dev/org-export-reference.html][ox reference documentation]]) and Org is also supported by
-[[https://pandoc.org][Pandoc]].
+开发者可以轻松地为任何格式创造新的导出后端（详见[[file:../worg/dev/org-export-reference.html][ox的文档]]),并且 Org 也被[[https://pandoc.org][Pandoc]]支持。
-In addition to exporting single files, you can define /publishing
-projects/ for one or more =.org= files and accompanying resources,
-targeting one or more publication backends.
+除开导出单一的文件以外，你还可以/发布项目/ ----- 将一个或更多的 =.org= 文件以及其需要的各种资源导出到一个或更多的发布后端。
-*** More
+*** 更多
-One poorly kept secret is that the Org website is written in Org!
+冷知识：Org 的网页是由 Org 编写而成！
-More on [[file:manual/Markup-for-Rich-Contents.html][markup]] (manual)
+详见手册（英语）：[[file:../manual/Markup-for-Rich-Contents.html][标记]]，[[file:../manual/Exporting.html][导出]]，[[file:../manual/Publishing.html][发布]]
-More on [[file:manual/Exporting.html][exporting]] (manual)
+Worg 教程（英语）：发布到 [[file:../worg/org-tutorials/org-publish-html-tutorial.html][HTML]] ；发布到 [[file:../worg/org-tutorials/org-latex-export.html][\(\LaTeX\)]]
-More on [[file:manual/Publishing.html][publishing]] (manual)
-
-[[https://orgmode.org/worg/org-tutorials/org-publish-html-tutorial.html][Tutorial on publishing]] to HTML (Worg)
-
-[[https://orgmode.org/worg/org-tutorials/org-latex-export.html][Tutorial on publishing]] to $\LaTeX$ (Worg)
-* Take Control of Tasks
+* 把握任务的进程
:PROPERTIES:
:CUSTOM_ID: planning
:HTML_CONTAINER_CLASS: side-fig
:END:
-#+attr_html: :class main-image :alt Demonstration of planning with org, managing a scheduled todo list
+#+attr_html: :class main-image :alt 演示在 Org 里设置计划，管理一个待办事项
[[file:resources/img/features/planning.gif]]
-** Description
-
-Org is an extremely capable task planner, time tracker and TODO list.
+** 描述
-Any section can become a /TODO item/ by adding a keyword such as =TODO= or
-=HOLD= to track the state of the task. You can cycle through task
-states with the shortcuts =S-<left>= and =S-<right>=.
+Org 是一个功能齐全的任务计划工具、时间管理工具以及待办事项工具。
-Need add your own set of states? No problem. Org lets you customize
-them to support your workflow.
+任何一个章节都可以通过增加例如 =TODO= 或者 =HOLD= 等关键词来被设置成/待办事项/。你可以由此跟踪纪录此任务的进度。你也可以使用快捷键 =S-<left>= 和 =S-<right>= 来把任务切换到不同状态。
-Org /Agenda/ makes it easy to view tasks from multiple files in one
-place. All you have to do is add one of the TODO keywords. Org has
-built-in support for task priority, deadlines, scheduled tasks, tags,
-clocking and more. /Agenda/ can use of all of it to organize and
-prioritize tasks --- seamlessly scaling from a simple TODO list into a
-complete project management suite, all with plain text markup.
+需要增加其他的任务状态？没问题。你可以根据你的工作流程自由地设置任务状态。
-*** More
+在 Org /日程/（Agenda）里，你可以轻松地查看多个文件里的任务 ----- 你仅需要添加一个任务状态关键词，例如 =TODO=。Org 为以下功能有内置支持：任务优先级、截止日期、计划中任务、标签、打卡等等。/日程/能够使用上述所有功能来整理任务以及设置优先级。因此，在仅需使用纯文本标记的同时，你可以把一个简单的待办事项列表无缝升级为一个完整的项目管理软件。
-More on [[file:manual/TODO-Items.html][TODO items]] (manual)
+*** 更多
-Handling [[file:manual/Dates-and-Times.html][dates and times]] (manual)
+详见手册（英语）：[[file:../manual/TODO-Items.html][待办事项]]、处理[[file:../manual/Dates-and-Times.html][日期与时间]]
-* Actionable Agendas
+* 可执行的日程表
:PROPERTIES:
:CUSTOM_ID: agendas
:HTML_CONTAINER_CLASS: side-fig
:END:
-#+attr_html: :class main-image :alt An example Org agenda, displaying various todo keywords, priorities, categorisation and scheduling
+#+attr_html: :class main-image :alt Org 日程的一个例子，显示了不同的待办关键词、优先级、分类方式以及计划
[[file:resources/img/features/agenda.svg]]
-** Description
+** 描述
-Plan your day, your way, with ease.
+轻松计划你的一天，方式由你而定。
-With /agenda views/ --- reports generated from your /TODO items/ --- you
-can see your tasks on a daily, weekly and monthly basis.
+在/日程界面/里（一个由你所有待办事项组成的报告），你可以看到你每日、每周、每月的任务。
-Even with hundreds of =.org= files and thousands of tasks, agenda lets
-you focus on what you need to do and quickly take action, jumping
-from the high level overview directly into the task at hand.
+就算你有上百个 =.org= 文件以及上千个任务，日程仍可以让你集中精力攻克你最需要响应的任务 ----- 并且你可以从日程的优先级界面可以直接跳到你手头这个需要完成的任务。
-The default agenda shows scheduled and deadlined tasks for the week,
-stalled projects and all your outstanding TODO items.
+日程的默认界面显示了你当周里计划中的、临近截止的、暂停的、以及未完成的待办任务。
-Not satisfied with the defaults? Org agenda is highly configurable.
-You can customize the contents of default views or create your own
-[[https://orgmode.org/manual/Custom-Agenda-Views.html][custom views]].
+对这个默认界面不满意？你可以随意修改 Org 日程的配置。你既可以修改其默认界面，也可以创建[[file:../manual/Custom-Agenda-Views.html][自定义界面]]。
-In a sense Org is an expressive language that captures the key points
-of interaction in workflows, simplifying and refining the process of
-developing new workflows as they emerge during the course of work,
-play, or life in general.
+从某种程度上来说，Org 是一个富有表达力的、能抓取在工作进程里的交互关键点的语言，使你在因生活、工作、娱乐等等需要构建新的工作进程时的步骤变得更加简单易懂。
-*** More
+*** 更多
-More on [[file:manual/Agenda-Views.html][agenda views]] (manual)
+详见手册（英语）：[[file:../manual/Agenda-Views.html][日程界面]]
-Tutorial on [[https://orgmode.org/worg/org-tutorials/org-custom-agenda-commands.html][agenda commands]] (Worg)
+Worg 教程（英语）：[[file:../worg/org-tutorials/org-custom-agenda-commands.html][日程命令]]
-* Clocking
+* 打卡
:PROPERTIES:
:CUSTOM_ID: clocking
:HTML_CONTAINER_CLASS: side-fig
:END:
-#+attr_html: :class main-image :alt Using Org to keep track of how long various subtasks took
+#+attr_html: :class main-image :alt 使用 Org 来纪录每个小任务花费的时间
[[file:resources/img/features/clocking.svg]]
-** Description
+** 描述
-Keep track of the time you spend on your tasks with Org /Clocking/, and
-at end of the day you can generate customized reports about how you
-spent your time.
+使用 Org /打卡/（clocking）来纪录你花费在任务上的时间。你可以在一天结束之际生成关于你当天如何使用时间的报告。
-Org provides shortcuts to /clock in/ and /clock out/ of tasks. When
-working in an =.org= file =C-c C-x C-i= clocks in and =C-c C-x C-o= clocks
-out. Time is stored in the property drawer of the heading for the
-task at had.
+Org 提供了给开始任务与结束任务打卡的快捷键。当你在使用一个 =.org= 文件时，按下 =C-c C-x C-i= 来打卡开始任务，=C-c C-x C-o= 来打卡结束任务。所有的打卡时间都被存储在该任务标题的属性抽屉里。
-You can also use =I= and =O= when in an agenda view.
+当你在日程界面时，你可以使用 =I= 和 =O= 打卡。
-*** More
+*** 更多
-More on [[file:manual/Clocking-Work-Time.html][clocking tasks]] (manual)
+详见手册（英语）：[[file:../manual/Clocking-Work-Time.html][任务打卡]]
-* Capture Data From Anywhere
+* 从任何地方抓取信息
:PROPERTIES:
:CUSTOM_ID: capturing
:HTML_CONTAINER_CLASS: side-fig
:END:
-#+attr_html: :class main-image :alt Using Org Capture to record an idea while editing a file
+#+attr_html: :class main-image :alt 使用 Org Capture 来纪录编辑文件时产生的一个想法
[[file:resources/img/features/capturing.gif]]
-** Description
+** 描述
-You can add content to an =.org= file by /capturing/ data.
+你可以/抓取/信息，然后把它加入到一个 =.org= 文件里。
-You can capture from anywhere --- from an Emacs buffer or from other
-applications like your web browser, PDF viewer and more.
+你可以从任何地方抓取信息 ----- 可以是一个 Emacs 缓存区，也可以是其它程序，例如你的浏览器、PDF 阅览器等等。
-Capture templates provide a quick and effective way to ingest
-structured data for a variety of workflows, from adding TODO items to
-quoting the relevant section of a manual or saving a receipt.
+抓取模版让你快速且便捷地从各种工作流程中抓取信息，例如增加新任务、引用手册的关联章节、或者保存收据。
-*** More
+*** 更多
-More on [[file:manual/Capture.html][capturing]] (manual)
+详见手册（英语）：[[file:../manual/Capture.html][抓取]]
-* Extremely Extensible
+* 极度的可扩展性
:PROPERTIES:
:CUSTOM_ID: extensibiliy
:HTML_CONTAINER_CLASS: side-fig
:END:
-#+attr_html: :class main-image :alt Display of some default and custom Org link types
+#+attr_html: :class main-image :alt 显示一些自带的以及自定义的链接种类
[[file:resources/img/features/links.svg]]
-** Description
+** 描述
-Org mode isn't just extensible, it is /Emacs extensible/.
+Org 不只是一般的“可扩展”；它是 /Emacs 级别/的可扩展。
-Org started out as an extension. As a result, extensibility is present
-in nearly every aspect of Org.
+Org 起初只是 Emacs 的一个扩展组件。因此，Org 的各方各面都包含了对可扩展性的考量。
-To give only a single example, consider hyperlinks. While updating
-documentation you find yourself repeatedly linking to GitHub
-issues. In Org you can add a new ~issue:~ link type to the document so
-that ~[[issue:74][big bug]]~ expands to
-=https://github.com/author/repo/issues/74=.
+举一个小小的例子：超链接。当你在更新开发文档时你会经常重复引用到项目的问题列表，例如GitHub Issues。你可以在 Org 文件里添加一个新的 ~issue:~ 链接类型，使得类似~[[issue:74][big bug]]~的链接能够引用到=https://github.com/author/repo/issues/74=。
-Beyond expanding links, you can define custom resolving functions,
-link to files on remote machines with [[https://www.emacswiki.org/emacs/TrampMode][Tramp]], and more.
+除了超链接，你也可以自定义解析函数、使用 [[https://www.emacswiki.org/emacs/TrampMode][Tramp]] 链接远程设备的文件，等等。
--
2.40.0
[-- Attachment #13: 0012-zh-CN-quickstart.org-zh-CN-translation.patch --]
[-- Type: text/x-patch, Size: 17880 bytes --]
From cb1179082872043c29990e01af8a1d62a7cae0d3 Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Tue, 11 Apr 2023 01:32:26 +0800
Subject: [PATCH 12/16] * zh-CN/quickstart.org: zh-CN translation
---
zh-CN/quickstart.org | 247 ++++++++++++++++++-------------------------
1 file changed, 104 insertions(+), 143 deletions(-)
diff --git a/zh-CN/quickstart.org b/zh-CN/quickstart.org
index 8a34c51..4470d23 100644
--- a/zh-CN/quickstart.org
+++ b/zh-CN/quickstart.org
@@ -1,214 +1,181 @@
-#+TITLE: Quickstart | Org mode
+#+TITLE: 快速开始 | Org 主模式
#+setupfile: setup.org
-#+description: Org: an Emacs Mode for Notes, Planning and Authoring
-#+include: "./resources/preamble.html" export html
+#+include: "resources/preamble.html" export html
-* Getting started with Org-mode
+* 开始使用 Org@@comment:Get Started@@
:PROPERTIES:
:CUSTOM_ID: getting-started
:END:
-In its simplest form, Org is like any other markup language.
+简单来说，Org 与任何其它的标记语言一样：你可以在任何文本编辑器里使用[[file:../worg/dev/org-syntax.html][Org 语法]]编辑文档。
-You can write [[https://orgmode.org/worg/dev/org-syntax.html][Org syntax]] in any text editor.
-
-However, to experience the full potential of Org you need an editor
-that transforms Org syntax into a living, interactive document.
+然而，为了体验 Org 全部的潜力，你需要一个能够把 Org 语法转换为一个可互动文档的编辑器。
#+begin_center
#+attr_html: :class btn
-*[[https://orgmode.org/org.html#Installation][Install Org]]*
+*[[file:../org.html#Installation][安装 Org]]*
#+end_center
-* Preamble
+* 文档引言@@comment:Preamble@@
:PROPERTIES:
:CUSTOM_ID: preamble
:END:
-At the start of a file (before the first heading), it is common to
-set the title, author and other [[https://orgmode.org/manual/Export-Settings.html][export options]].
+在文件的最开始（第一个章节标题之前），你常常需要设置标题、作者以及其它[[file:../manual/Export-Settings.html][导出选项]]。
#+BEGIN_SRC org
-,#+title: The glories of Org
-,#+author: A. Org Writer
+,#+title: Org 的荣光
+,#+author: Org 用户
#+END_SRC
-* Heading
+* 章节标题@@comment:Heading@@
:PROPERTIES:
:CUSTOM_ID: headings
:END:
-Lines that start with an asterisk ~*~ are [[https://orgmode.org/worg/dev/org-syntax.html#Headlines_and_Sections][headings]].
+由星号 ~*~ 开始的行被称作[[file:../worg/dev/org-syntax.html#Headlines_and_Sections][章节标题（heading）]]。
-A single ~*~ denotes a 1st-level heading, ~**~ denotes a 2nd-level
-heading, etc.
+一个星号 ~*~ 代表一级章节标题，两个星号 ~**~ 代表二级章节标题，等等。
#+BEGIN_SRC org
-,* Welcome to Org-mode
-,** Sub-heading
-Each extra ~*~ increases the depth by one level.
+ ,* 欢迎来到 Org
+ ,** 子章节标题
+ 每个额外的 ~*~ 为章节的深度增加一级。
#+END_SRC
-In their simplest form headings are just the start of a section.
-However, any heading can also become a [[https://orgmode.org/manual/TODO-Items.html][TODO item]].
+简单来说，章节标题代表了一个章节的开始。然而，任何章节也可以成为一个[[file:../manual/TODO-Items.html][待办事项]]。
-TODO items are the basic building block that Org uses to track and
-organize all kinds of tasks.
+待办事项是 Org 用来跟踪、整理各类的任务的基本模块。
-To add a TODO item to a heading, start the heading with a TODO
-keyword such as ~TODO~ or ~HOLD~.
+若要把一个现有的章节标题转换为一个待办事项，仅需在其开头加上一个待办关键词，例如 ~TODO~ 或者 ~HOLD~。
#+BEGIN_SRC org
-,* TODO Promulgate Org to the world
-,** TODO Create a quickstart guide
+ ,* TODO 向世界介绍 Org
+ ,** TODO 创建一个快速开始指南
#+END_SRC
-* Markup
+* 标记@@comment:markup@@
:PROPERTIES:
:CUSTOM_ID: markup
:END:
-To mark up text in Org, simply surround it with one or more marker
-characters. *Bold*, /italic/ and _underline_ are fairly intuitive, and the
-ability to use +strikethrough+ is a plus. You can _/*combine*/_ the basic
-markup in any order, however ~code~ and =verbatim= need to be the
-*_~inner-most~_* markers if they are present since their contents are
-interpreted =_literally_=.
+# 代码 = code; 逐字 = verbatim
+若要在 Org 里标记文字，仅需要在其两侧使用标记字符。*加粗*、/斜体/、_下划线_都很简单；你甚至能够轻松地使用+删除线+。你可以任意组合这些基本的标记，但需要记住一点，若使用了~代码~或=逐字=这两个标记之一，它们需要在这个组合的*_~最里侧~_*，因为它们包含的内容是=按字面=解析的。
#+begin_example
-To markup text in Org, simply surround it with one or more marker characters.
-*Bold*, /italic/ and _underline_ are fairly intuitive, and the ability to use
-+strikethrough+ is a plus. You can _/*combine*/_ the basic markup in any
-order, however ~code~ and =verbatim= need to be the *_~inner-most~_* markers
-if they are present since their contents are interpreted =_literally_=.
+若要在 Org 里标记文字，仅需要在其两侧使用标记字符。*加粗*、/斜体/、_下划线_都很简单；你甚至能够轻松地使用+删除线+。你可以任意组合这些基本的标记，但需要记住一点，若使用了~代码~或=逐字=这两个标记之一，它们需要在这个组合的*_~最里侧~_*，因为它们包含的内容是=按字面=解析的。
#+end_example
-See [[https://orgmode.org/worg/dev/org-syntax.html#Emphasis_Markers][Emphasis Markers]] for more details.
+可在[[file:../worg/dev/org-syntax.html#Emphasis_Markers][标记符号（英语）]]里查看更多信息。
+
+** 中文用户
+中文用户_：由于 Org 的限制，标记字符的内侧必须不是空格，而外侧必须是空格（包含换行等）。因此，中文用户需要在使用标记时，可以在有需要时使用[[file:../manual/Escape-Character.html][零宽空格]]（16进制代码~#x200b~，名称为~ZERO WIDTH SPACE~）。
-* Lists
+* 列表@@comment:Lists@@
:PROPERTIES:
:CUSTOM_ID: lists
:END:
-Unordered lists start with ~+~, ~-~, or ~*~[fn::~*~ cannot be used to start
-a plain list if it is immediately preceded by a newline because it
-will be interpreted as a heading.]. Ordered lists start with ~1.~, ~1)~,
-~A.~, or ~A)~. Ordered and unordered bullets can be nested in any order.
+# 无序列表 = unordered list; 有序列表 = ordered list
+无序列表由~+~、~-~、~*~开头[fn::~*~不能被用作一行的最开头，因为这样它会被解析成一个章节标题。]。有序列表由~1.~、~1)~、~A.~、~A)~开头。有序与无序符号可以以任意顺序嵌套。
#+BEGIN_SRC org
-To buy:
-1. Milk
-2. Eggs
- - Organic
-3. Cheese
- + Parmesan
- + Mozzarella
+ 采购单：
+ 1. 牛奶
+ 2. 鸡蛋
+ - 有机
+ 3. 调料
+ + 糖
+ + 盐
#+END_SRC
-Lists can contain checkboxes ~[ ]~, ~[-]~, ~[X]~.
+# 勾选项 = checkbox
+列表可包含勾选项~[ ]~、~[-]~、~[X]~。
#+BEGIN_SRC org
-- [ ] not started
-- [-] in progress
-- [X] complete
+ - [ ] 未开始
+ - [-] 进行中
+ - [X] 已完成
#+END_SRC
-Lists can contain tags (and checkboxes at the same time).
+# 标签 = tag
+列表也可同时包含标签。
#+BEGIN_SRC org
-- [ ] fruits :: get apples
-- [X] veggies :: get carrots
+ - [ ] 水果 :: 买苹果
+ - [X] 蔬菜 :: 买胡萝卜
#+END_SRC
-* Links
+* 链接@@comment:Links@@
:PROPERTIES:
:CUSTOM_ID: links
:END:
-To create a link put the target between two square brackets, like so: ~[[target]]~.
-You can include a description in square brackets after the target ~[[target][desc]]~.
+创建链接时把目标放在两对*半角*方括号中，例如：~[[目标]]~。你也可以在链接里、目标之后添加描述：~[[目标][描述]]~。
-The order is easy to remember because it is the same as an html =<a>=
-tag ~<a href="target">desc</a>~ and you can't mix up brackets and
-parentheses because there are only square brackets!
+这个顺序相当好记，因为这跟 HTML 的 =<a>= 标记 ~<a href="目标">描述</a>~ 一样，并且你不可能混淆不同种类的括号，因为 Org 语法里只用中括号。
-Org supports a wide variety of types of link targets, and you can also
-[[https://orgmode.org/manual/Adding-Hyperlink-Types.html][add your own]].
-Link types are indicated with a ~type:~ prefix, i.e., ~[type:target]~.
-If no ~type:~ is provided, org searches the current file for a heading
-that matches ~target~.
+Org 支持一系列不同的链接目标类型，并且你还可以[[file:../manual/Adding-Hyperlink-Types.html][添加你自己的目标类型]]。链接目标类型由其前缀~类型:~表示，例如：~[[类型:目标]]~。若没有提供类型，Org 会在当前文件里搜索一个符合~目标~的章节标题。
-Some examples:
+举个例子：
#+BEGIN_EXAMPLE
-[[https://orgmode.org][a nice website]]
+[[https://orgmode.org][一个网页]]
[[file:~/Pictures/dank-meme.png]]
-[[earlier heading][an earlier heading in the document]]
+[[之前的章节标题][此文档里一个之前的章节标题]]
#+END_EXAMPLE
-** More info
-For more on links, see the manual sections for
-[[https://orgmode.org/manual/Internal-Links.html][Internal Links]] and
-[[https://orgmode.org/manual/External-Links.html][External Links]].
+** 更多信息
+更多关于链接的信息参见手册（英语）：[[file:../manual/Internal-Links.html][内部链接]]、[[file:../manual/External-Links.html][外部链接]]。
-* Images
+* 图像@@comment:Images@@
:PROPERTIES:
:CUSTOM_ID: images
:END:
-Org mode automatically recognizes and renders image links during
-export. Just link to an image (don't include a description). That's
-it. \\
-~[[https://upload.wikimedia.org/wikipedia/commons/5/5d/Konigsberg_bridges.png]]~
+Org 会在导出时自动识别且显示图片链接。你只需要链接一个图片，且不提供描述既可。\\
+~[[https://orgmode.org/resources/img/quickstart.svg]]~
#+attr_html: :height 120px
-[[https://upload.wikimedia.org/wikipedia/commons/5/5d/Konigsberg_bridges.png]]
+[[file:../resources/img/quickstart.svg]]
-Images located on your computer can also be rendered in the Emacs
-buffer with =C-c C-x C-v=.
+在你电脑里的图片也可以按 =C-c C-x C-v= 在 Emacs 缓存区里显示。
-* Blocks
+* 区块@@comment:Blocks@@
:PROPERTIES:
:CUSTOM_ID: blocks
:END:
-Org mode uses =#+BEGIN= ... =#+END= blocks for many purposes.
-Some of the basic blocks types quote, example, and src.
+Org 主模式里可以包含区块 =#+BEGIN= …… =#+END=，不同的区块对应不同的用途。基本的区块包括：引用（quote），举例（example），以及源码（src）。
-If all you need is monospace text, you can use an example block.
+若你只需要等宽文字，你可以使用举例区块。
#+BEGIN_SRC org
,#+begin_example
-monospace
+monospace 等宽
,#+end_example
#+END_SRC
-However, example blocks do not give you the power of [[https://orgmode.org/worg/org-contrib/babel/][Org babel]].
-For that you need a source block.
-Source blocks provide syntax highlighting, code execution, literate programming, and more.
+然而，你不能在举例区块里使用 [[file:../worg/org-contrib/babel/][Org Babel]] ----- 你需要使用源码区块。源码区块提供了语法高亮、代码运行、文学编程等等。
#+BEGIN_SRC org
,#+begin_src emacs-lisp
(message "Hello world")
,#+end_src
#+END_SRC
-** More info
-A hello world example cannot even begin to scratch the surface
-Org mode's support for [[https://orgmode.org/manual/Working-with-Source-Code.html][working with source code]].
+** 更多信息
+一个”你好世界“的例子根本不足以向你展示 Org 与源代码的[[file:../manual/Working-with-Source-Code.html][所有功能]]。
-* Tables
+* 表格@@comment:Tables@@
:PROPERTIES:
:CUSTOM_ID: tables
:END:
-Org mode comes with a table editor complete with support cell references
-and formulas.
-
-In its simplest form a table is text separated using pipes ~|~.
+Org 主模式内置了一个表格编辑器，并且支持各种与元素引用以及公式的功能。
+最简单的表格仅仅是由 ~|~ 分隔开的文本。
#+BEGIN_SRC org
-| I | am | a | table |
-| with | two | rows | ! |
+| 我 | 是 | 一个 | 表格 |
+| 我 | 有 | 两行 | ！ |
#+END_SRC
-A more useful example is this comparison of existing Literate
-programming / reproducible research tools (from [[doi:10.18637/jss.v046.i03][Schulte /et al./ 2012]]).
+这是在一篇论文（[[doi:10.18637/jss.v046.i03][Schulte /et al./ 2012]]）里的一个表格，对比了现有的文学编程与可重复研究工具。
#+BEGIN_SRC org
| Tool | Literate programming? | Reproducible Research? | Languages |
@@ -220,75 +187,69 @@ programming / reproducible research tools (from [[doi:10.18637/jss.v046.i03][Sch
| Org-mode | yes | yes | any |
#+END_SRC
-Worried about aligning free text tables?
-Org mode does it in a single keystroke -- =tab=.
+担心无法在文本表格中对齐？你只需按一个键 ----- =tab=。
-* Comments
+* 注释@@comment:Comments@@
:PROPERTIES:
:CUSTOM_ID: comments
:END:
-Org mode has a variety of ways to add comments.
+在 Org 里有很多种方法添加注释：
-- Line comments start with ~#~.
-- Inline comments wrap ~@@comment:like so@@~.
-- Block comments are wrapped with ~#+BEGIN_COMMENT~ and ~#+END_COMMENT~.
-- Section comments can be created by adding the ~COMMENT~ keyword to a heading ~*
- COMMENT like so~[fn::There are a number of more granular ways to control the
- exact behavior of headings, including use of the special tags ~:ARCHIVE:~ and
- ~:noexport:~.].
+- 行注释：用~#~开头。
+- 行内注释：把注释包起来（~@@comment:就像这样@@~）。
+- 区块注释：用~#+BEGIN_COMMENT~和~#+END_COMMENT~把注释包起来。
+- 章节注释：在章节标题前加上 ~COMMENT~ 可以把这整个章节变成注释[fn::还有一些对章节的更精细的操作，包括使用特殊章节标签~:ARCHIVE:~以及~:noexport:~。]。
#+BEGIN_SRC org
-# A line comment
+# 一个行注释
-Example of an @@comment:inline@@ comment.
+这是一个@@comment:行内@@注释。
-Inline comments are used for end of line comments. @@comment:~#~ won't
-work@@ Since # only only works if preceeded by a newline follow by
-whitespace.
+行内注释可同时被用作行末注释。@@comment:~#~没有用@@
+这是因为~#~只在作为一行第一个非空格字符时才是行注释。
,#+begin_comment
-This is a block comment.
-It can span multiple line.
-As well as other markup.
+这是一个区块注释。
+它可以跨越多行，或者其它标记与区块定义。
,#+begin_src emacs-lisp
(+ 1 2)
,#+end_src
,#+end_comment
-,* A top level heading
-,** COMMENT This section and subsections are commented out
-,*** This heading inherits the =COMMENT= keyword
-This text is commented out
-,** This heading is not commented
-This text will be exported and code blocks will run.
+,* 一个顶层章节标题
+,** COMMENT 这个章节与其子章节是注释
+,*** 这个章节继承了关键词=COMMENT=
+这段文字是注释
+,** 这个章节不是注释
+这段文字会被导出，且代码区块会被运行。
#+END_SRC
-* Macros
+** 中文用户
+_中文用户_：=@@comment:行内注释@@=两侧需要使用零宽空格，详见[[#markup][标记]]章节。
+
+* 宏@@comment:Macros@@
:PROPERTIES:
:CUSTOM_ID: macros
:END:
-Org has many more advanced features built into its syntax. To give
-only a single example, let's take a look at [[https://orgmode.org/manual/Macro-Replacement.html][macros]].
+ Org 的语法拥有更多高级功能，[[file:../manual/Macro-Replacement.html][这里]]有一个简单的例子。
#+BEGIN_SRC org
,#+macro: attn _*/$1/*_
-{{{attn(Attention! This text gets all the markup!)}}}
+{{{attn(注意！这个文本有所有标记！)}}}
,#+html_head: <style>.red{color:red;}</style>
,#+latex_header: \usepackage{xcolor}
,#+macro: red @@html:<span class="red">$1</span>@@@@latex:\textcolor{red}{$1}@@
-Regular text. {{{red(This text will be red.)}}} More regular text.
+普通文本。{{{red(红色文本。)}}}更多普通文本。
#+END_SRC
-* Next steps
+* 下一步
:PROPERTIES:
:CUSTOM_ID: next-steps
:END:
-Looking for something in particular? The [[file:manual/][manual]] ([[file:org.pdf][PDF]]) is a good place
-to start.
+在寻找某一个话题？试着读读[[file:../manual/][手册]]（[[file:../org.pdf][PDF]]）吧。
-Looking for something between this quickstart and the manual? The
-[[file:guide/][guide]] ([[file:orgguide.pdf][PDF]]) is worth a shot.
+在寻找这个快速开始与手册之间的内容？试试[[file:../guide/][指南]]（[[file:../orgguide.pdf][PDF]]）吧。
--
2.40.0
[-- Attachment #14: 0013-zh-CN-resources-postamble.html-zh-CN-translation.patch --]
[-- Type: text/x-patch, Size: 2326 bytes --]
From 0abd949c6d07c93fc77af6f12bde893150044d01 Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Sat, 15 Apr 2023 23:07:01 +0800
Subject: [PATCH 13/16] * zh-CN/resources/postamble.html: zh-CN translation
---
zh-CN/resources/postamble.html | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/zh-CN/resources/postamble.html b/zh-CN/resources/postamble.html
index f332b11..6b84e76 100644
--- a/zh-CN/resources/postamble.html
+++ b/zh-CN/resources/postamble.html
@@ -1,17 +1,15 @@
-<p class="author">Created by
- <a href="https://github.com/tecosaur/"
- style="font-weight: bold; font-size: 0.9em; letter-spacing: 0.05em"
- title="Your friendly neighbourhood Org-thusiast">TEC</a>
- with
- <a href="https://orgmode.org/worg/org-site-colophon.html">
- <img class="inline" src="/resources/img/org-mode-unicorn-borderless-icon.svg" alt="Org mode unicorn logo"
- style="height:1.5em; margin-bottom:-0.3em; opacity:0.9;"
- title="Conquer the world with Org 😉"/>
- </a>
-</p>
-<p class="license-text" style="color: #aaa">licensed under the
+<p class="author"
+ >由<a href="https://github.com/tecosaur/"
+ style="font-weight: bold; font-size: 0.9em; letter-spacing: 0.05em"
+ title="Your friendly neighbourhood Org-thusiast"
+ >TEC</a>用<a href="https://orgmode.org/worg/org-site-colophon.html">
+ <img class="inline"
+ src="resources/img/org-mode-unicorn-borderless-icon.svg" alt="Org 独角兽 logo"
+ style="height:1.5em; margin-bottom:-0.3em; opacity:0.9;"
+ title="Conquer the world with Org 😉"/>
+ </a>完成。</p>
+<p class="license-text" style="color: #aaa">根据
<a rel="license" href="https://git.sr.ht/~bzg/orgweb/blob/master/LICENSE.org"
style="font-size: 0.8em; letter-spacing: 0.1em; font-weight: bold; color: inherit"
- title="GNU Free Documentation License version 1.3">GNU FDL 1.3</a>
- — see the <a href="https://git.sr.ht/~bzg/orgweb">source code</a> for this website.
-</p>
+ title="GNU Free Documentation License version 1.3">GNU FDL 1.3</a> 授权
+ — 本网页源代码见<a href="https://git.sr.ht/~bzg/orgweb">此</a>。</p>
--
2.40.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #15: 0014-publish.sh-Converted-load-into-require.patch --]
[-- Type: text/x-patch, Size: 996 bytes --]
From d448a30db4704289c1c7de797b54cdf5f9977201 Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Fri, 14 Apr 2023 16:04:27 +0800
Subject: [PATCH 14/16] * publish.sh: Converted load into require
Converted the `load' into `require'. This allows someone who works on a local
clone to `eval-buffer' successfully, given that the individual installs these
dependencies from GNU/NonGNU Elpa. Previously, due to the hard-coded path,
`eval-buffer' would fail at the `load' call.
---
publish.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/publish.sh b/publish.sh
index 4fb7cb6..a8b66d2 100755
--- a/publish.sh
+++ b/publish.sh
@@ -7,7 +7,8 @@
(require 'ox-html)
(require 'ox-extra)
(ox-extras-activate '(ignore-headlines))
-(load "/usr/share/emacs/site-lisp/elpa-src/htmlize-1.56/htmlize.el")
+(add-to-list 'load-path "/usr/share/emacs/site-lisp/elpa-src/htmlize-1.56")
+(require 'htmlize)
(setq make-backup-files nil
debug-on-error t)
--
2.40.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #16: 0015-publish.sh-allow-using-locale-specific-postamble.patch --]
[-- Type: text/x-patch, Size: 1499 bytes --]
From 72b7da234d517a5c46589d6158f809f9cd5c5563 Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Tue, 11 Apr 2023 23:15:05 +0800
Subject: [PATCH 15/16] * publish.sh: allow using locale-specific postamble
(get-postamble): Took the sexp from `setq' on `org-html-postamble-format' and
converted into a function.
(setq org-html-postamble-format): specified a zh-CN-specific postamble file.
---
publish.sh | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/publish.sh b/publish.sh
index a8b66d2..00184ff 100755
--- a/publish.sh
+++ b/publish.sh
@@ -13,6 +13,12 @@
(setq make-backup-files nil
debug-on-error t)
+(defun get-postamble (root-dname)
+ (with-temp-buffer
+ (insert-file-contents-literally
+ (expand-file-name "resources/postamble.html" root-dname))
+ (buffer-substring-no-properties (point-min) (point-max))))
+
(setq org-confirm-babel-evaluate nil
org-html-style-default ""
org-html-scripts ""
@@ -22,9 +28,8 @@
org-html-validation-link nil
org-html-postamble t
org-html-postamble-format
- `(("en" ,(with-temp-buffer
- (insert-file-contents-literally "./resources/postamble.html")
- (buffer-substring-no-properties (point-min) (point-max))))))
+ `(("en" ,(get-postamble "."))
+ ("zh-CN" ,(get-postamble "zh-CN"))))
(dolist (org-file (directory-files-recursively default-directory "\\.org$"))
(let ((html-file (concat (file-name-directory org-file)
--
2.40.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #17: 0016-publish.sh-Avoid-reinventing-wheel-and-facilitate-di.patch --]
[-- Type: text/x-patch, Size: 2323 bytes --]
From 9c8a8d8feac2aa2850aee69466a5c8e176a6c46d Mon Sep 17 00:00:00 2001
From: Ruijie Yu <ruijie@netyu.xyz>
Date: Sat, 15 Apr 2023 18:29:41 +0800
Subject: [PATCH 16/16] * publish.sh: Avoid reinventing wheel, and facilitate
direct loading
(file-name-with-extension): Created equivalent function for older Emacsen, to be
used in the `dolist' form.
(dolist): Replaced ad-hoc use of `file-name-with-extension' into calling this
function; replaced use of `default-directory' and `file-relative-name' with just
passing "." to `directory-files-recursively'; replaced `find-file' with
`find-file-noselect' because otherwise directly loading this elisp script from
within Emacs show all these files in a buffer; reindentations.
---
publish.sh | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/publish.sh b/publish.sh
index 00184ff..2b6d4f9 100755
--- a/publish.sh
+++ b/publish.sh
@@ -13,6 +13,13 @@
(setq make-backup-files nil
debug-on-error t)
+(unless (fboundp 'file-name-with-extension) ; >= 28.1
+ (defalias 'file-name-with-extension
+ (lambda (fname ext)
+ (concat (file-name-directory fname)
+ (file-name-base fname)
+ "." ext))))
+
(defun get-postamble (root-dname)
(with-temp-buffer
(insert-file-contents-literally
@@ -31,14 +38,13 @@
`(("en" ,(get-postamble "."))
("zh-CN" ,(get-postamble "zh-CN"))))
-(dolist (org-file (directory-files-recursively default-directory "\\.org$"))
- (let ((html-file (concat (file-name-directory org-file)
- (file-name-base org-file) ".html")))
+(dolist (org-file (directory-files-recursively "." "\\.org$"))
+ (let ((html-file (file-name-with-extension org-file "html")))
(if (and (file-exists-p html-file)
(file-newer-than-file-p html-file org-file))
- (message " [skipping] unchanged %s" org-file)
- (message "[exporting] %s" (file-relative-name org-file default-directory))
- (with-current-buffer (find-file org-file)
- (condition-case err
+ (message " [skipping] unchanged %s" org-file)
+ (message "[exporting] %s" org-file)
+ (with-current-buffer (find-file-noselect org-file)
+ (condition-case err
(org-html-export-to-html)
(error (message (error-message-string err))))))))
--
2.40.0
[-- Attachment #18: Type: text/plain, Size: 134 bytes --]
--
Best,
RY
[Please note that this mail might go to spam due to some
misconfiguration in my mail server -- still investigating.]
next prev parent reply other threads:[~2023-04-21 3:30 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-10 17:48 [orgweb/zh_CN] [DRAFT PATCH] Tentative zh_CN translation Ruijie Yu via General discussions about Org-mode.
2023-04-11 11:09 ` Ihor Radchenko
2023-04-11 16:39 ` [orgweb/zh-CN] [DRAFT PATCH] Tentative zh-CN translation Ruijie Yu via General discussions about Org-mode.
2023-04-15 16:01 ` Ruijie Yu via General discussions about Org-mode.
2023-04-16 12:55 ` Ihor Radchenko
2023-04-16 15:12 ` Ruijie Yu via General discussions about Org-mode.
2023-04-16 15:34 ` Ihor Radchenko
2023-04-21 2:33 ` Ruijie Yu via General discussions about Org-mode. [this message]
2023-04-22 14:31 ` [orgweb/zh-CN] [DRAFT PATCH v7] " Ihor Radchenko
2023-04-22 14:56 ` Ruijie Yu via General discussions about Org-mode.
2023-04-22 15:20 ` Ihor Radchenko
2023-04-23 0:48 ` Ruijie Yu via General discussions about Org-mode.
2023-06-13 12:04 ` Ihor Radchenko
2023-06-14 4:46 ` Ruijie Yu via General discussions about Org-mode.
2023-06-14 12:29 ` Ihor Radchenko
2023-12-08 14:37 ` Ihor Radchenko
2023-04-16 13:10 ` [orgweb/zh-CN] [DRAFT PATCH] " Ihor Radchenko
2023-04-16 14:04 ` Hanno Perrey
2023-04-16 15:04 ` Ruijie Yu via General discussions about Org-mode.
2023-04-16 15:17 ` Ruijie Yu via General discussions about Org-mode.
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=sdvzg71zzor.fsf@netyu.xyz \
--to=emacs-orgmode@gnu.org \
--cc=bzg@gnu.org \
--cc=orgmode@tec.tecosaur.net \
--cc=ruijie@netyu.xyz \
--cc=yantar92@posteo.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).