From owner-svn-doc-all@freebsd.org Mon Dec 26 08:47:52 2016 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 302FEC91494; Mon, 26 Dec 2016 08:47:52 +0000 (UTC) (envelope-from rcyu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F321EE6F; Mon, 26 Dec 2016 08:47:51 +0000 (UTC) (envelope-from rcyu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBQ8lplb098882; Mon, 26 Dec 2016 08:47:51 GMT (envelope-from rcyu@FreeBSD.org) Received: (from rcyu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBQ8lplH098880; Mon, 26 Dec 2016 08:47:51 GMT (envelope-from rcyu@FreeBSD.org) Message-Id: <201612260847.uBQ8lplH098880@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rcyu set sender to rcyu@FreeBSD.org using -f From: Ruey-Cherng Yu Date: Mon, 26 Dec 2016 08:47:51 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r49764 - head/zh_TW.UTF-8/books/fdp-primer X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Dec 2016 08:47:52 -0000 Author: rcyu Date: Mon Dec 26 08:47:50 2016 New Revision: 49764 URL: https://svnweb.freebsd.org/changeset/doc/49764 Log: -remove the duplicate msgid in po file -recover the expanded $FreeBSD$ string in po file -update the book.xml after the fix of the po file Modified: head/zh_TW.UTF-8/books/fdp-primer/book.xml head/zh_TW.UTF-8/books/fdp-primer/zh_TW.po Modified: head/zh_TW.UTF-8/books/fdp-primer/book.xml ============================================================================== --- head/zh_TW.UTF-8/books/fdp-primer/book.xml Mon Dec 26 06:29:20 2016 (r49763) +++ head/zh_TW.UTF-8/books/fdp-primer/book.xml Mon Dec 26 08:47:50 2016 (r49764) @@ -2543,56 +2543,39 @@ example.xml:5: element head: validity er Comments - Comments are an XML construct, and are - normally only valid inside a DTD. However, - as shows, it is possible - to use XML syntax within the document. - - The delimiter for XML comments is the string - --. The first occurrence of - this string opens a comment, and the second closes it. + An XML document may contain comments. + They may appear anywhere as long as they are not inside tags. + They are even allowed in some locations inside the + DTD (e.g., between entity + declarations). + + XML comments start with the string + <!-- and end with the + string -->. + + Here are some examples of valid XML + comments: - <acronym>XML</acronym> Generic Comment + <acronym>XML</acronym> Generic Comments <!-- This is inside the comment --> -<!-- This is another comment --> +<!--This is another comment--> -<!-- This is one way - of doing multiline comments --> +<!-- This is how you + write multiline comments --> -<!-- This is another way of -- - -- doing multiline comments --> +<p>A simple <!-- Comment inside an element's content --> paragraph.</p> - XHTML users may be familiar with different - rules for comments. In particular, it is often believed that - the string <!-- opens a comment, and it is - only closed by -->. - - This is not correct. Many web browsers - have broken XHTML parsers, and will accept - incorrect input as valid. However, the XML - parsers used by the Documentation Project are more strict, and - will reject documents with that error. + XML comments may contain any strings + except --: - Erroneous <acronym>XML</acronym> Comments - - <!-- This is in the comment -- - - THIS IS OUTSIDE THE COMMENT! - - -- back inside the comment --> - - The XML parser will treat this as - though it were actually: + Erroneous <acronym>XML</acronym> Comment - <!THIS IS OUTSIDE THE COMMENT> - - That is not valid XML, and may give - confusing error messages. + <!-- This comment--is wrong --> @@ -4292,38 +4275,51 @@ example.xml:5: element head: validity er - book + <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN" + "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd"> + +article xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" + xml:lang="en" + info - titleYour Title Heretitle + titleAn Example Articletitle author personname - firstnameYour first namefirstname - surnameYour surnamesurname + firstnameYour first namefirstname + surnameYour surnamesurname personname affiliation address - emailYour email addressemail + emailfoo@example.comemail address affiliation author copyright - year1998year - holder role="mailto:your email address"Your nameholder + year2000year + holderCopyright string hereholder copyright - releaseinfo$FreeBSD$releaseinfo - abstract - paraInclude an abstract of the book's contents here.para + paraIf your article has an abstract then it should go here。para abstract info - … + sect1 + titleMy First Sectiontitle -book + paraThis is the first section in my article。para + + sect2 + titleMy First Sub-Sectiontitle + + paraThis is the first sub-section in my article。para + sect2 + sect1 +article @@ -4347,37 +4343,50 @@ example.xml:5: element head: validity er - article + <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN" + "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd"> + +article xmlns="http://docbook.org/ns/docbook" + xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" + xml:lang="en" + info - titleYour title heretitle + titleAn Example Articletitle author personname - firstnameYour first namefirstname - surnameYour surnamesurname + firstnameYour first namefirstname + surnameYour surnamesurname personname affiliation address - emailYour email addressemailaddress + emailfoo@example.comemail address affiliation author copyright - year1998year - holder role="mailto:your email address"Your nameholder + year2000year + holderCopyright string hereholder copyright - releaseinfo$FreeBSD$releaseinfo - abstract - paraInclude an abstract of the article's contents here.para + paraIf your article has an abstract then it should go here。para abstract info - … + sect1 + titleMy First Sectiontitle + paraThis is the first section in my article。para + + sect2 + titleMy First Sub-Sectiontitle + + paraThis is the first sub-section in my article。para + sect2 + sect1 article @@ -6961,7 +6970,7 @@ IMAGES= chapter1/fig1.png 每份英文版原稿的開頭，通常會有像下面的內容： - <!-- + <!-- The FreeBSD Documentation Project $FreeBSD$ @@ -6975,17 +6984,13 @@ IMAGES= chapter1/fig1.png $FreeBSD$) for new files. - Your translated documents should include their own - $FreeBSD$ line, and change the - FreeBSD Documentation Project line to - The FreeBSD language - Documentation Project. + 翻譯文件中，必須都要有 $FreeBSD$ 這行，並且把 FreeBSD Documentation Project 這行改為 The FreeBSD language Documentation Project。 此外，還必須加上第三行來指出你所翻譯的，到底是以英文版原稿的哪一版本為母本所做的翻譯。 因此呢，西班牙文版(Spanish)的檔案開頭應該是長像這樣： - <!-- + <!-- The FreeBSD Spanish Documentation Project $FreeBSD$ @@ -7317,10 +7322,10 @@ A Makefile 修改 Makefile 內容以產生單一的 book.xml： - # + # # $FreeBSD$ # -# Build the FreeBSD Porter's Handbook. +# Build the FreeBSD Porter's Handbook。 # MAINTAINER=doc@FreeBSD.org @@ -7390,10 +7395,10 @@ A Makefile 檢查 Makefile 的內容。因為這是簡單的文章，此例的 Makefile 不用修改。第二行的 $FreeBSD...$ 版本字串將會在檔案提交時被版本控制系統替換掉。 - # + # # $FreeBSD$ # -# Article: PGP Keys +# Article：PGP Keys DOC?= article @@ -7405,7 +7410,7 @@ INSTALL_ONLY_COMPRESSED?= SRCS= article.xml -# To build with just key fingerprints, set FINGERPRINTS_ONLY. +# To build with just key fingerprints, set FINGERPRINTS_ONLY。 URL_RELPREFIX?= ../../../.. DOC_PREFIX?= ${.CURDIR}/../../.. @@ -7554,12 +7559,7 @@ DOC_PREFIX?= ${.CURDIR}/../../.. 版本控制符號不會把 &dollar; entities 看成金錢符號，所以不會把字串展開成版本字串。 - When a PO file is created, the - &dollar; entities used in examples are - replaced with actual dollar signs. The resulting literal - $FreeBSD$ string will be - wrongly expanded by the version control system when the file - is committed. + 當 PO 檔建立後，範例中的 &dollar; entities 被實際的金錢符號取代。當檔案提交時，產生的 $FreeBSD$ 將會被版本控制系統展開。 英文文件用的相同技術可以被用在翻譯上。翻譯時用 &dollar; 來取代金錢符號，輸入到 PO 檔編輯器： @@ -7663,13 +7663,7 @@ A es_ES.po - Set the - Subversion - svn:keywords properties on these files - to FreeBSD=%H so - $FreeBSD$ strings are - expanded into the path, revision, date, and author when - committed: + 設定這些檔案的 Subversion svn:keywords 屬性到 FreeBSD=%H，讓提交時 $FreeBSD$ 字串可以被展開成路徑、版本、日期和作者。 % svn propset svn:keywords FreeBSD=%H Makefile article.xml es_ES.po property 'svn:keywords' set on 'Makefile' @@ -7718,12 +7712,7 @@ A ko_KR.po - Set the Subversion - svn:keywords properties on these files - to FreeBSD=%H so - $FreeBSD$ strings are - expanded into the path, revision, date, and author when - committed: + 設定這些檔案的 Subversion svn:keywords 屬性到 FreeBSD=%H，讓提交時 $FreeBSD$ 字串可以被展開成路徑、版本、日期和作者。 % svn propset svn:keywords FreeBSD=%H Makefile article.xml ko_KR.po property 'svn:keywords' set on 'Makefile' @@ -8329,15 +8318,16 @@ GB。 Hardware compression … <application>Vim</application> - Install from editors/vim - or editors/vim-lite, then follow the + Install from editors/vim or + editors/vim-lite, then follow the configuration instructions in . Use - Press P to reformat paragraphs or text that has been selected in Visual mode. Press + Press P to reformat paragraphs or text + that has been selected in Visual mode. Press T to replace groups of eight spaces with a tab. @@ -8392,14 +8382,88 @@ endfunction " Set_SGML() <application>Emacs</application> - Install from - editors/emacs - or editors/xemacs. + Install from editors/emacs or + editors/emacs-devel. + + + Validation - Edit ~/.emacs, adding this - line: + Emacs's nxml-mode uses compact relax NG schemas for + validating XML. A compact relax NG schema for FreeBSD's + extension to DocBook 5.0 is included in the documentation + repository. To configure nxml-mode to validate using this + schema, create + ~/.emacs.d/schema/schemas.xml and add + these lines to the file: - (add-hook 'nxml-mode-hook 'turn-on-auto-fill) + locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0" + documentElement localName="section" typeId="DocBook" + documentElement localName="chapter" typeId="DocBook" + documentElement localName="article" typeId="DocBook" + documentElement localName="book" typeId="DocBook" + typeId id="DocBook" uri="/usr/local/share/xml/docbook/5.0/rng/docbook.rnc" +locatingRules + + + + + Automated Proofreading with Flycheck and Igor + + The Flycheck package is available from Milkypostman's + Emacs Lisp Package Archive (MELPA). If + MELPA is not already in Emacs's + packages-archives, it can be added by evaluating + + (add-to-list 'package-archives '("melpa" . "http://stable.melpa.org/packages/") t) + + Add the line to Emacs's initialization file (one of + ~/.emacs, + ~/.emacs.el, or + ~.emacs.d/init.el) to make this change + permanent. + + To install Flycheck, evaluate + + (package-install 'flycheck) + + Create a Flycheck checker for + textproc/igor by evaluating + + (flycheck-define-checker igor + "FreeBSD Documentation Project sanity checker. + +See URLs http://www.freebsd.org/docproj/ and +http://www.freshports.org/textproc/igor/." + :command ("igor" "-X" source-inplace) + :error-parser flycheck-parse-checkstyle + :modes (nxml-mode) + :standard-input t) + + (add-to-list 'flycheck-checkers 'igor 'append) + + Again, add these lines to Emacs's initialization file to + make the changes permanent. + + + + FreeBSD Documentation Specific Settings + + To apply settings specific to the FreeBSD documentation + project, create .dir-locals.el in the + root directory of the documentation repository and add these + lines to the file: + + ;;; Directory Local Variables +;;; For more information see (info "(emacs) Directory Variables") + +((nxml-mode + (eval . (turn-on-auto-fill)) + (fill-column . 70) + (eval . (require 'flycheck)) + (eval . (flycheck-mode 1)) + (flycheck-checker . igor) + (eval . (add-to-list 'rng-schema-locating-files "~/.emacs.d/schema/schemas.xml")))) + Modified: head/zh_TW.UTF-8/books/fdp-primer/zh_TW.po ============================================================================== --- head/zh_TW.UTF-8/books/fdp-primer/zh_TW.po Mon Dec 26 06:29:20 2016 (r49763) +++ head/zh_TW.UTF-8/books/fdp-primer/zh_TW.po Mon Dec 26 08:47:50 2016 (r49764) @@ -52,13 +52,10 @@ msgstr "" #. (itstool) path: info/pubdate #. (itstool) path: info/releaseinfo #: book.translate.xml:89 book.translate.xml:91 -#, fuzzy msgid "" -"$FreeBSD: head/en_US.ISO8859-1/books/fdp-primer/book.xml 47339 2015-09-02 " -"20:30:53Z wblock $" +"$FreeBSD$" msgstr "" -"$FreeBSD: head/zh_TW.UTF-8/books/fdp-primer/zh_TW.po 48972 2016-06-21 " -"01:19:43Z kevlo $" +"$FreeBSD$" #. (itstool) path: legalnotice/title #: book.translate.xml:95 @@ -5850,7 +5847,6 @@ msgstr "" #. (itstool) path: example/programlisting #: book.translate.xml:4474 -#, fuzzy, no-wrap msgid "" "book\n" " info\n" @@ -5953,7 +5949,6 @@ msgstr "" #. (itstool) path: example/programlisting #: book.translate.xml:4529 -#, fuzzy, no-wrap msgid "" "article\n" " info\n" @@ -9562,7 +9557,6 @@ msgstr "每份英文版原稿的開頭 #. (itstool) path: answer/programlisting #: book.translate.xml:7279 -#, fuzzy, no-wrap msgid "" "<!--\n" " The FreeBSD Documentation Project\n" @@ -9578,33 +9572,26 @@ msgstr "" #. (itstool) path: answer/para #: book.translate.xml:7285 -#, fuzzy msgid "" "The exact boilerplate may change, but it will always include a $FreeBSD$ " "line and the phrase The FreeBSD Documentation Project. " -"Note that the $FreeBSD part is expanded automatically by Subversion, so it " +"Note that the $FreeBSD$ part is expanded automatically by Subversion, so it " "should be empty (just $FreeBSD$) for new files." msgstr "" -"實際上的內容可能稍有不同，但每份原稿都會附上 $FreeBSD: head/zh_TW.UTF-8/" -"books/fdp-primer/zh_TW.po 48972 2016-06-21 01:19:43Z kevlo $ 這一行以及" -"The FreeBSD Documentation Project 宣告。 請注意：$FreeBSD " -"開頭的這行是會由 Subversion 隨著每次異動而自動更改的， 所以，新檔案的話請保持" -"原狀(也就是只要寫 $FreeBSD: head/zh_TW.UTF-8/books/fdp-primer/zh_TW.po 48972 " -"2016-06-21 01:19:43Z kevlo $ 就好了)。" +"實際上的內容可能稍有不同，但每份原稿都會附上 $FreeBSD$ 這一行以及" +"The FreeBSD Documentation Project 宣告。 請注意：$FreeBSD$ 開頭的這行是會由 Subversion 隨著每次異動而自動更改的， 所以，新檔案的話請保持" +"原狀(也就是只要寫 $FreeBSD$ 就好了)。" #. (itstool) path: answer/para #: book.translate.xml:7293 -#, fuzzy msgid "" "Your translated documents should include their own $FreeBSD$ line, and " "change the FreeBSD Documentation Project line to " "The FreeBSD language Documentation " "Project." msgstr "" -"翻譯文件中，必須都要有 $FreeBSD: head/zh_TW.UTF-8/books/fdp-primer/zh_TW.po " -"48972 2016-06-21 01:19:43Z kevlo $ 這行，並且把 FreeBSD " -"Documentation Project 這行改為 The FreeBSD " -"你的語系 Documentation Project。" +"翻譯文件中，必須都要有 $FreeBSD$ 這行，並且把 FreeBSD " +"Documentation Project 這行改為 The FreeBSD language Documentation Project。" #. (itstool) path: answer/para #: book.translate.xml:7299 @@ -9622,7 +9609,6 @@ msgstr "因此呢，西班牙文版(Span #. (itstool) path: answer/programlisting #: book.translate.xml:7304 -#, fuzzy, no-wrap msgid "" "<!--\n" " The FreeBSD Spanish Documentation Project\n" @@ -10521,7 +10507,6 @@ msgstr "" #. (itstool) path: step/programlisting #: book.translate.xml:7725 -#, fuzzy, no-wrap msgid "" "#\n" "# $FreeBSD$\n" @@ -10695,7 +10680,6 @@ msgstr "" #. (itstool) path: step/programlisting #: book.translate.xml:7813 -#, fuzzy, no-wrap msgid "" "#\n" "# $FreeBSD$\n" @@ -10978,8 +10962,7 @@ msgid "" "&dollar; entities to avoid including actual literal " "dollar signs in the file:" msgstr "" -"檔案裡的 $FreeBSD: head/zh_TW.UTF-8/books/fdp-primer/zh_TW.po 48972 " -"2016-06-21 01:19:43Z kevlo $ 版本字串需要特別處理。例如 裡，這些字串不是要被展開 (expanded)。英文文" "件使用 &dollar; entities 來避免使用實際的金錢符號。" @@ -11001,7 +10984,6 @@ msgstr "" #. (itstool) path: sect2/para #: book.translate.xml:8005 -#, fuzzy msgid "" "When a PO file is created, the &dollar; entities used in examples are replaced with actual dollar signs. " @@ -11009,8 +10991,7 @@ msgid "" "expanded by the version control system when the file is committed." msgstr "" "當 PO 檔建立後，範例中的 &dollar; " -"entities 被實際的金錢符號取代。當檔案提交時，產生的 $FreeBSD: head/" -"zh_TW.UTF-8/books/fdp-primer/zh_TW.po 48972 2016-06-21 01:19:43Z kevlo $$FreeBSD$ 將會被版本控制系統展開。" #. (itstool) path: sect2/para @@ -11174,7 +11155,6 @@ msgstr "" #. (itstool) path: step/para #: book.translate.xml:8142 book.translate.xml:8209 -#, fuzzy msgid "" "Set the Subversion svn:keywords properties on these files to FreeBSD=%H so " @@ -11182,9 +11162,7 @@ msgid "" "date, and author when committed:" msgstr "" "設定這些檔案的 Subversion svn:keywords 屬性到 FreeBSD=%H，讓提交時 $FreeBSD: " -"head/zh_TW.UTF-8/books/fdp-primer/zh_TW.po 48972 2016-06-21 01:19:43Z kevlo " -"$ 字串可以被展開成路徑、版本、日期和作者。" +"literal> 屬性到 FreeBSD=%H，讓提交時 $FreeBSD$ 字串可以被展開成路徑、版本、日期和作者。" #. (itstool) path: step/screen #: book.translate.xml:8150