aboutsummaryrefslogtreecommitdiff
path: root/zh_TW.UTF-8
diff options
context:
space:
mode:
authorRuey-Cherng Yu <rcyu@FreeBSD.org>2019-10-07 08:23:51 +0000
committerRuey-Cherng Yu <rcyu@FreeBSD.org>2019-10-07 08:23:51 +0000
commitd979ed1b3df57bdc363ba7f3f2961517744038f2 (patch)
tree40a9520ffcda029f2e670b09a5df4f592419db93 /zh_TW.UTF-8
parentbc7a4a7a24900accddb22f9eddd87539234df85a (diff)
downloaddoc-d979ed1b3df57bdc363ba7f3f2961517744038f2.tar.gz
doc-d979ed1b3df57bdc363ba7f3f2961517744038f2.zip
- Update the traditional Chinese translation of FAQ 1.6 and 1.7
Notes
Notes: svn path=/head/; revision=53469
Diffstat (limited to 'zh_TW.UTF-8')
-rw-r--r--zh_TW.UTF-8/books/faq/book.xml33
-rw-r--r--zh_TW.UTF-8/books/faq/zh_TW.po20
2 files changed, 14 insertions, 39 deletions
diff --git a/zh_TW.UTF-8/books/faq/book.xml b/zh_TW.UTF-8/books/faq/book.xml
index 1d86349462..3ea148f448 100644
--- a/zh_TW.UTF-8/books/faq/book.xml
+++ b/zh_TW.UTF-8/books/faq/book.xml
@@ -192,12 +192,7 @@
</question>
<answer>
- <para xml:lang="en">James Howard wrote a good explanation of the history
- and differences between the various projects, called <link xlink:href="https://jameshoward.us/archive/the-bsd-family-tree/">The
- BSD Family Tree</link> which goes a fair way to
- answering this question. Some of the information is out
- of date, but the history portion in particular remains
- accurate.</para>
+ <para>James Howard 寫了一篇關於不同計畫的差異和歷史淵源的好文章叫 <link xlink:href="https://jameshoward.us/archive/the-bsd-family-tree/">The BSD Family Tree</link> 可以回答這個問題。雖然有些資訊有點過時,但是關於歷史淵源的部份仍是相當正確的。</para>
<para>時至今日,大部分的 BSD 家族仍是共用修補和程式碼的。這些 BSD 家族有著共同的祖先。</para>
@@ -225,27 +220,11 @@
</question>
<answer>
- <para xml:lang="en">At any point in the development of FreeBSD, there can be
- multiple parallel branches. 12.<replaceable>X</replaceable> releases are made
- from the <emphasis>12-STABLE</emphasis> branch, and 11.<replaceable>X</replaceable> releases are
- made from the <emphasis>11-STABLE</emphasis> branch.</para>
-
- <para xml:lang="en">Up until the release of 9.0, the 11.<replaceable>X</replaceable> series
- was the one known as <emphasis>-STABLE</emphasis>.
- However, as of 13.<replaceable>X</replaceable>, the 11.<replaceable>X</replaceable> branch
- will be designated for an <quote>extended support</quote>
- status and receive only fixes for major problems, such as
- security-related fixes.
- <!--There will be no more releases made from the
- &rel2.stable; branch, and it is considered a
- <quote>legacy</quote> branch and most current work will only
- become a part of &rel.stable; and &rel2.stable;.--></para>
-
- <para xml:lang="en">Version <link xlink:href="https://download.FreeBSD.org/ftp/releases/amd64/amd64/12.0-RELEASE/">12.0</link>
- is the latest release from the <emphasis>12-STABLE</emphasis> branch; it was
- released in December 2018. Version <link xlink:href="https://download.FreeBSD.org/ftp/releases/amd64/amd64/11.2-RELEASE/">11.2</link>
- is the latest release from the <emphasis>11-STABLE</emphasis> branch; it
- was released in June 2018.</para>
+ <para>在 FreeBSD 開發的任何時間點,都有多個平行的分支。12.<replaceable>X</replaceable> releases 是從 <emphasis>12-STABLE</emphasis> 分支而來,而 11.<replaceable>X</replaceable> releases 是從 <emphasis>11-STABLE</emphasis> 分支而來。</para>
+
+ <para>在 9.0 之前,11.<replaceable>X</replaceable> 系列仍屬 <emphasis>-STABLE</emphasis>分支。 然而從13.<replaceable>X</replaceable> 發行開始,11.<replaceable>X</replaceable> 將只著重在重大問題上(比如:漏洞修補、安全維護)以及所謂的 <quote>extended support</quote> 。</para>
+
+ <para>於 2018年12月所發行的 <link xlink:href="https://download.FreeBSD.org/ftp/releases/amd64/amd64/12.0-RELEASE/">12.0</link> 是目前最新的 <emphasis>12-STABLE</emphasis> 分支。 於 2018年6月所發行的 <link xlink:href="https://download.FreeBSD.org/ftp/releases/amd64/amd64/11.2-RELEASE/">11.2</link>是目前最新的 <emphasis>11-STABLE</emphasis> 分支。</para>
<para>Releases 版 <link linkend="release-freq">每幾個月</link> 才會發行一次。 雖然如此,有很多人和 FreeBSD 原始碼同步更新 (詳見 <link linkend="current">FreeBSD-CURRENT</link> 和 <link linkend="stable">FreeBSD-STABLE</link>的相關問題) ,但因為原始碼是一直不斷地在變動的,所以如果要這麼做的話得要花上更多的精力。</para>
diff --git a/zh_TW.UTF-8/books/faq/zh_TW.po b/zh_TW.UTF-8/books/faq/zh_TW.po
index 1ec5b5fd72..22817460e1 100644
--- a/zh_TW.UTF-8/books/faq/zh_TW.po
+++ b/zh_TW.UTF-8/books/faq/zh_TW.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2019-10-03 17:21+0800\n"
-"PO-Revision-Date: 2019-10-03 18:38+0800\n"
+"PO-Revision-Date: 2019-10-07 16:03+0800\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: zh_TW\n"
@@ -386,13 +386,12 @@ msgstr "FreeBSD 及 NetBSD, OpenBSD 以及其他 open source BSD 作業系統之
#. (itstool) path: answer/para
#: book.translate.xml:344
-#, fuzzy
msgid ""
"James Howard wrote a good explanation of the history and differences between the various projects, called <link xlink:href=\"https://jameshoward.us/"
"archive/the-bsd-family-tree/\">The BSD Family Tree</link> which goes a fair way to answering this question. Some of the information is out of date, but "
"the history portion in particular remains accurate."
msgstr ""
-"James Howard 寫了一篇關於不同計畫的差異和歷史淵源的好文章叫 <link xlink:href=\"http://www.freebsdworld.gr/freebsd/bsd-family-tree.html\">The BSD Family "
+"James Howard 寫了一篇關於不同計畫的差異和歷史淵源的好文章叫 <link xlink:href=\"https://jameshoward.us/archive/the-bsd-family-tree/\">The BSD Family "
"Tree</link> 可以回答這個問題。雖然有些資訊有點過時,但是關於歷史淵源的部份仍是相當正確的。"
#. (itstool) path: answer/para
@@ -436,36 +435,33 @@ msgstr "最新版的 FreeBSD 是那一版?"
#. (itstool) path: answer/para
#: book.translate.xml:387
-#, fuzzy
msgid ""
"At any point in the development of FreeBSD, there can be multiple parallel branches. 12.<replaceable>X</replaceable> releases are made from the "
"<emphasis>12-STABLE</emphasis> branch, and 11.<replaceable>X</replaceable> releases are made from the <emphasis>11-STABLE</emphasis> branch."
msgstr ""
-"在 FreeBSD 開發的任何時間點,都有多個平行的分支。11.<replaceable>X</replaceable> releases 是從 <emphasis>11-STABLE</emphasis> 分支而來,而 10."
-"<replaceable>X</replaceable> releases 是從 <emphasis>10-STABLE</emphasis> 分支而來。"
+"在 FreeBSD 開發的任何時間點,都有多個平行的分支。12.<replaceable>X</replaceable> releases 是從 <emphasis>12-STABLE</emphasis> 分支而來,而 11."
+"<replaceable>X</replaceable> releases 是從 <emphasis>11-STABLE</emphasis> 分支而來。"
#. (itstool) path: answer/para
#: book.translate.xml:392
-#, fuzzy
msgid ""
"Up until the release of 9.0, the 11.<replaceable>X</replaceable> series was the one known as <emphasis>-STABLE</emphasis>. However, as of 13."
"<replaceable>X</replaceable>, the 11.<replaceable>X</replaceable> branch will be designated for an <quote>extended support</quote> status and receive "
"only fixes for major problems, such as security-related fixes."
msgstr ""
-"在 9.0 之前,10.<replaceable>X</replaceable> 系列仍屬 <emphasis>-STABLE</emphasis>分支。 然而從12.<replaceable>X</replaceable> 發行開始,10."
+"在 9.0 之前,11.<replaceable>X</replaceable> 系列仍屬 <emphasis>-STABLE</emphasis>分支。 然而從13.<replaceable>X</replaceable> 發行開始,11."
"<replaceable>X</replaceable> 將只著重在重大問題上(比如:漏洞修補、安全維護)以及所謂的 <quote>extended support</quote> 。"
#. (itstool) path: answer/para
#: book.translate.xml:403
-#, fuzzy
msgid ""
"Version <link xlink:href=\"https://download.FreeBSD.org/ftp/releases/amd64/amd64/12.0-RELEASE/\">12.0</link> is the latest release from the "
"<emphasis>12-STABLE</emphasis> branch; it was released in December 2018. Version <link xlink:href=\"https://download.FreeBSD.org/ftp/releases/amd64/"
"amd64/11.2-RELEASE/\">11.2</link> is the latest release from the <emphasis>11-STABLE</emphasis> branch; it was released in June 2018."
msgstr ""
-"於 2017年七月所發行的 <link xlink:href=\"ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/i386/11.1-RELEASE/\">11.1</link> 是目前最新的 <emphasis>11-"
-"STABLE</emphasis> 分支。 於 2017年十月所發行的 <link xlink:href=\"ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/10.4-RELEASE/\">10.4</link>是目前最新"
-"的 <emphasis>10-STABLE</emphasis> 分支。"
+"於 2018年12月所發行的 <link xlink:href=\"https://download.FreeBSD.org/ftp/releases/amd64/amd64/12.0-RELEASE/\">12.0</link> 是目前最新的 <emphasis>12-"
+"STABLE</emphasis> 分支。 於 2018年6月所發行的 <link xlink:href=\"https://download.FreeBSD.org/ftp/releases/amd64/amd64/11.2-RELEASE/\">11.2</link>是目前"
+"最新的 <emphasis>11-STABLE</emphasis> 分支。"
#. (itstool) path: answer/para
#: book.translate.xml:409