-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

1 files changed, 11 insertions, 33 deletions

diff --git a/zh_TW.UTF-8/books/fdp-primer/zh_TW.po b/zh_TW.UTF-8/books/fdp-primer/zh_TW.po
index fcc6e67faf..6f873da2e4 100644
--- a/zh_TW.UTF-8/books/fdp-primer/zh_TW.po
+++ b/zh_TW.UTF-8/books/fdp-primer/zh_TW.po
@@ -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 ""
 "<tag class=\"starttag\">book</tag>\n"
 "  <tag class=\"starttag\">info</tag>\n"
@@ -5953,7 +5949,6 @@ msgstr ""
 
 #. (itstool) path: example/programlisting
 #: book.translate.xml:4529
-#, fuzzy, no-wrap
 msgid ""
 "<tag class=\"starttag\">article</tag>\n"
 "  <tag class=\"starttag\">info</tag>\n"
@@ -9562,7 +9557,6 @@ msgstr "每份英文版原稿的開頭，通常會有像下面的內容："
 
 #. (itstool) path: answer/programlisting
 #: book.translate.xml:7279
-#, fuzzy, no-wrap
 msgid ""
 "&lt;!--\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 <literal>The FreeBSD Documentation Project</literal>. "
-"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 <literal>$FreeBSD$</literal>) for new files."
 msgstr ""
-"實際上的內容可能稍有不同，但每份原稿都會附上 $FreeBSD: head/zh_TW.UTF-8/"
-"books/fdp-primer/zh_TW.po 48972 2016-06-21 01:19:43Z kevlo $ 這一行以及"
-"<literal>The FreeBSD Documentation Project</literal> 宣告。 請注意：$FreeBSD "
-"開頭的這行是會由 Subversion 隨著每次異動而自動更改的， 所以，新檔案的話請保持"
-"原狀(也就是只要寫 $FreeBSD: head/zh_TW.UTF-8/books/fdp-primer/zh_TW.po 48972 "
-"2016-06-21 01:19:43Z kevlo $ 就好了)。"
+"實際上的內容可能稍有不同，但每份原稿都會附上 &dollar;FreeBSD&dollar; 這一行以及"
+"<literal>The FreeBSD Documentation Project</literal> 宣告。 請注意：&dollar;FreeBSD&dollar; 開頭的這行是會由 Subversion 隨著每次異動而自動更改的， 所以，新檔案的話請保持"
+"原狀(也就是只要寫 &dollar;FreeBSD&dollar; 就好了)。"
 
 #. (itstool) path: answer/para
 #: book.translate.xml:7293
-#, fuzzy
 msgid ""
 "Your translated documents should include their own $FreeBSD$ line, and "
 "change the <literal>FreeBSD Documentation Project</literal> line to "
 "<literal>The FreeBSD <replaceable>language</replaceable> Documentation "
 "Project</literal>."
 msgstr ""
-"翻譯文件中，必須都要有 $FreeBSD: head/zh_TW.UTF-8/books/fdp-primer/zh_TW.po "
-"48972 2016-06-21 01:19:43Z kevlo $ 這行，並且把 <literal>FreeBSD "
-"Documentation Project</literal> 這行改為  <literal>The FreeBSD <replaceable>"
-"你的語系</replaceable> Documentation Project</literal>。"
+"翻譯文件中，必須都要有 $FreeBSD$  這行，並且把 <literal>FreeBSD "
+"Documentation Project</literal> 這行改為  <literal>The FreeBSD <replaceable>language</replaceable> Documentation Project</literal>。"
 
 #. (itstool) path: answer/para
 #: book.translate.xml:7299
@@ -9622,7 +9609,6 @@ msgstr "因此呢，西班牙文版(Spanish)的檔案開頭應該是長像這樣
 
 #. (itstool) path: answer/programlisting
 #: book.translate.xml:7304
-#, fuzzy, no-wrap
 msgid ""
 "&lt;!--\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 ""
 "<literal>&amp;dollar;</literal> 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 $ 版本字串需要特別處理。例如 <xref linkend=\"po-"
+"檔案裡的 &dollar;FreeBSD&dollar; 版本字串需要特別處理。例如 <xref linkend=\"po-"
 "translations-creating-example\"/> 裡，這些字串不是要被展開 (expanded)。英文文"
 "件使用 <literal>&amp;dollar;</literal> entities 來避免使用實際的金錢符號。"
 
@@ -11001,7 +10984,6 @@ msgstr ""
 
 #. (itstool) path: sect2/para
 #: book.translate.xml:8005
-#, fuzzy
 msgid ""
 "When a <acronym>PO</acronym> file is created, the <literal>&amp;dollar;</"
 "literal> 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 ""
 "當 <acronym>PO</acronym> 檔建立後，範例中的 <literal>&amp;dollar;</literal> "
-"entities 被實際的金錢符號取代。當檔案提交時，產生的 <literal>$FreeBSD: head/"
-"zh_TW.UTF-8/books/fdp-primer/zh_TW.po 48972 2016-06-21 01:19:43Z kevlo $</"
+"entities 被實際的金錢符號取代。當檔案提交時，產生的 <literal>$FreeBSD$</"
 "literal>  將會被版本控制系統展開。"
 
 #. (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 <application>Subversion</application> <literal>svn:keywords</"
 "literal> properties on these files to <literal>FreeBSD=%H</literal> so "
@@ -11182,9 +11162,7 @@ msgid ""
 "date, and author when committed:"
 msgstr ""
 "設定這些檔案的 <application>Subversion</application> <literal>svn:keywords</"
-"literal> 屬性到 <literal>FreeBSD=%H</literal>，讓提交時 <literal>$FreeBSD: "
-"head/zh_TW.UTF-8/books/fdp-primer/zh_TW.po 48972 2016-06-21 01:19:43Z kevlo "
-"$</literal> 字串可以被展開成路徑、版本、日期和作者。"
+"literal> 屬性到 <literal>FreeBSD=%H</literal>，讓提交時 <literal>$FreeBSD$</literal> 字串可以被展開成路徑、版本、日期和作者。"
 
 #. (itstool) path: step/screen
 #: book.translate.xml:8150