www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www philosophy/po/categories.zh-tw.po philosoph...


From: Cheng-Chia Tseng
Subject: www philosophy/po/categories.zh-tw.po philosoph...
Date: Tue, 21 Nov 2017 08:39:09 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     Cheng-Chia Tseng <zerngjia>     17/11/21 08:39:09

Modified files:
        philosophy/po  : categories.zh-tw.po philosophy.zh-tw.po 
                         why-free.zh-tw.po 
        po             : home.zh-tw.po 
        proprietary/po : proprietary.zh-tw.po 
        server/gnun/compendia: compendium.zh-tw.po 
        server/po      : body-include-2.zh-tw.po bottom-notes.zh-tw.po 
                         footer-text.zh-tw.po head-include-2.zh-tw.po 

Log message:
        update translations of existing po files

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.zh-tw.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.zh-tw.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-free.zh-tw.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.zh-tw.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary.zh-tw.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.zh-tw.po?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/body-include-2.zh-tw.po?cvsroot=www&r1=1.60&r2=1.61
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/bottom-notes.zh-tw.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/footer-text.zh-tw.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/head-include-2.zh-tw.po?cvsroot=www&r1=1.22&r2=1.23

Patches:
Index: philosophy/po/categories.zh-tw.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.zh-tw.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- philosophy/po/categories.zh-tw.po   21 Aug 2017 09:59:43 -0000      1.12
+++ philosophy/po/categories.zh-tw.po   21 Nov 2017 13:39:07 -0000      1.13
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: categories.html\n"
 "POT-Creation-Date: 2017-07-07 12:26+0000\n"
-"PO-Revision-Date: 2017-08-21 17:33+0800\n"
+"PO-Revision-Date: 2017-11-21 16:26+0800\n"
 "Last-Translator: Cheng-Chia Tseng <address@hidden>\n"
 "Language-Team: Traditional Chinese <address@hidden>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.13\n"
+"X-Generator: Poedit 2.0.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Content of: <title>
@@ -702,7 +702,7 @@
 "commercial compiler.&rdquo; The salesmen reply, &ldquo;GNU Ada <em>is</em> a "
 "commercial compiler; it happens to be free software.&rdquo;"
 msgstr ""
-"舉例而言,GNU Ada 是一公司開發的軟體,並一直採用 GNU GPL 
的授權條款散佈軟體,"
+"舉例而言,GNU Ada 是一公司開發的軟體,並一直採用 GNU GPL 
的授權條款散布軟體,"
 "因此所有的軟體副本拷貝也都是自由軟體;但它的開發者
有銷售軟體的支援合約。 當他"
 
"們的業務和潛在顧客對談時,有的客戶會說:「我們覺得商業的編譯器軟體比較安"
 "全」,此時他們的業務就會回答:「GNU Ada <em>是</em> 
商業的編譯器;只是剛好也"

Index: philosophy/po/philosophy.zh-tw.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.zh-tw.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/philosophy.zh-tw.po   25 Sep 2017 09:59:59 -0000      1.6
+++ philosophy/po/philosophy.zh-tw.po   21 Nov 2017 13:39:07 -0000      1.7
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
 "POT-Creation-Date: 2017-09-25 09:56+0000\n"
-"PO-Revision-Date: 2017-06-24 14:37+0800\n"
+"PO-Revision-Date: 2017-11-21 16:40+0800\n"
 "Last-Translator: Cheng-Chia Tseng <address@hidden>\n"
 "Language-Team: Traditional Chinese <address@hidden>\n"
 "Language: zh_TW\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Outdated-Since: 2017-09-25 09:56+0000\n"
-"X-Generator: Poedit 1.8.13\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #. type: Content of: <title>
 msgid "Philosophy of the GNU Project - GNU Project - Free Software Foundation"
@@ -93,14 +93,10 @@
 "堅持自由軟體</a>"
 
 #. type: Content of: <ul><li>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"/philosophy/proprietary.html\"> Proprietary software is often "
-#| "malware</a>"
 msgid ""
 "<a href=\"/proprietary/proprietary.html\"> Proprietary software is often "
 "malware</a>"
-msgstr "<a 
href=\"/philosophy/proprietary.html\">專有軟體常是惡意軟體</a>"
+msgstr "<a 
href=\"/proprietary/proprietary.html\">專有軟體常是惡意軟體</a>"
 
 #. type: Content of: <ul><li>
 msgid "<a href=\"/gnu/gnu.html\">History of GNU/Linux</a>"
@@ -221,13 +217,8 @@
 "README</a> 來瞭解協調和提交我們的網頁翻譯相關事宜。"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
-#| "Foundation, Inc."
 msgid "Copyright &copy; 2013, 2015, 2016, 2017 Free Software Foundation, Inc."
-msgstr ""
-"版權所有 &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 
自由軟體基金會"
+msgstr "Copyright &copy; 2013, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: philosophy/po/why-free.zh-tw.po
===================================================================
RCS file: /web/www/www/philosophy/po/why-free.zh-tw.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/po/why-free.zh-tw.po     20 Aug 2017 15:58:50 -0000      1.11
+++ philosophy/po/why-free.zh-tw.po     21 Nov 2017 13:39:07 -0000      1.12
@@ -8,35 +8,38 @@
 msgstr ""
 "Project-Id-Version: why-free.html\n"
 "POT-Creation-Date: 2014-03-31 06:29+0000\n"
-"PO-Revision-Date: 2017-08-20 23:49+0800\n"
+"PO-Revision-Date: 2017-11-21 21:38+0800\n"
 "Last-Translator: Cheng-Chia Tseng <address@hidden>\n"
 "Language-Team: GNUCTT <address@hidden>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.13\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #. type: Content of: <title>
 msgid ""
 "Why Software Should Not Have Owners - GNU Project - Free Software Foundation"
-msgstr "為何軟體不應有主人 - GNU 專案 - 自由軟體基金會"
+msgstr "為何軟體不應有其所有者 - GNU 專案 - 自由軟體基金會"
 
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, GNU Project, FSF, Free Software, Free Software Foundation, Why Software "
 "Should Not Have Owners"
-msgstr "GNU, GNU 專案, FSF, 自由軟體, 自由軟體基金會, 
為何軟體不應有主人"
+msgstr ""
+"GNU, GNU 專案, FSF, 自由軟體, 自由軟體基金會, 
為何軟體不應有所有者, GNU "
+"Project, Free Software, Free Software Foundation, Why Software Should Not "
+"Have Owners"
 
 #. type: Content of: <h2>
 msgid "Why Software Should Not Have Owners"
-msgstr "為何軟體不應有主人"
+msgstr "為何軟體不應有其所有者"
 
 #. type: Content of: <p>
 msgid ""
 "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 msgstr ""
-"作者是 <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
+"作者為 <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
 "strong></a>"
 
 #. type: Content of: <p>
@@ -45,8 +48,8 @@
 "to copy and modify information.  Computers promise to make this easier for "
 "all of us."
 msgstr ""
-"數位資訊科技對世界的一大貢獻就是讓資訊的複製與修改變得容易許多。對å
…¨äººé¡žè€Œ"
-"言,電腦就是讓這件事變得容易的希望。"
+"數位資訊科技對世界的一大貢獻就是讓資訊的複製與修改變得更為簡單。對å
…¨äººé¡žè€Œ"
+"言,電腦就是讓這件事變得容易的希望曙光。"
 
 #. type: Content of: <p>
 msgid ""
@@ -55,9 +58,9 @@
 "potential benefit from the rest of the public.  They would like to be the "
 "only ones who can copy and modify the software that we use."
 msgstr ""
-"但不是所有人都這樣想。著作權法的制度讓軟體程式有了「主人」,他們之中大多數都"
-"想要留住軟體的潛在利益而不願分給å…
¶ä»–人。他們希望自己是世上唯一能複製和修改軟"
-"體的人。"
+"但不是所有人都這樣想。著作權法的制度讓軟體程式有了「所有è€
…」,他們之中大多數"
+"都想要留住軟體的潛在利益而不願分給å…
¶ä»–人。他們希望自己是世上唯一能複製和修改"
+"軟體的人。"
 
 #. type: Content of: <p>
 msgid ""
@@ -68,9 +71,9 @@
 "press, could copy books only with pen and ink, and few readers were sued for "
 "that."
 msgstr ""
-"著作權法的制度跟隨着印刷業發展——印刷是種大量製造
複製品的技術。著作權法剛好和"
-"這項技術相合,因為它只限制了能大量複製的廠
商。它沒有剝奪書本讀者的自由。一般"
-"讀者
可沒有印刷機,他們只能用筆墨抄寫作品,所以少有讀者因
而被告。"
+"著作權法的制度跟隨著印刷業發展——印刷是種大量製造
複製品的技術。著作權法剛好和"
+"這項技術搭在一塊,因為它只能限制可大量複製的廠
商,但它沒有剝奪讀者的閱讀自"
+"由。一般讀者
沒有印刷機,他們只能用筆墨抄寫作品,所以鮮少有讀者因
而被告。"
 
 #. type: Content of: <p>
 msgid ""
@@ -81,27 +84,28 @@
 "measures now used to enforce software copyright.  Consider these four "
 "practices of the Software Publishers Association (SPA):"
 msgstr ""
-"數位科技比印刷機更為靈活:當資訊以數位形式呈現時,你
可以輕鬆複製來和他人分"
-"享。這種極其靈活的特性卻和著作權制度格格不å…
¥ã€‚現在有越來越多日益嚴苛、惡劣的"
-"措施用來施行軟體著作權。看看這些軟體出版商協會 
(Software Publishers "
-"Association, SPA) 的四種慣常說法:"
+"數位科技比印刷機更為靈活:當資訊以數位形式呈現,你
可以輕鬆複製與他人分享。這"
+"種極其靈活的特性卻和著作權制度格格不å…
¥ã€‚現在有越來越多日益嚴苛、惡劣的措施用"
+"來執行軟體著作權。我們來看這些軟體出版協會 (Software 
Publishers Association, "
+"SPA) 常用的四種作法:"
 
 #. type: Content of: <ul><li>
 msgid ""
 "Massive propaganda saying it is wrong to disobey the owners to help your "
 "friend."
-msgstr "大肆宣傳違反著作權法去幫助朋友是錯誤的。"
+msgstr 
"大肆宣傳違反著作權人的意願去幫助朋友是錯誤行為。"
 
 #. type: Content of: <ul><li>
 msgid ""
 "Solicitation for stool pigeons to inform on their coworkers and colleagues."
-msgstr "誘使大家告發違返規定的同事和同僚。"
+msgstr "誘使大家舉發違反規定的同事和夥伴。"
 
 #. type: Content of: <ul><li>
 msgid ""
 "Raids (with police help) on offices and schools, in which people are told "
 "they must prove they are innocent of illegal copying."
-msgstr "如果警察協助突擊搜查公司和學校,那裡的人們必é 
ˆè­‰æ˜Žè‡ªå·±æ²’有非法複製。"
+msgstr ""
+"突擊(還有警察協助)辦公室和學校,而被突擊的人必é 
ˆä¸»å‹•è­‰æ˜Žè‡ªå·±æ²’有非法複製。"
 
 #. type: Content of: <ul><li>
 msgid ""
@@ -111,9 +115,9 @@
 "any), but merely for leaving copying facilities unguarded and failing to "
 "censor their use.<a href=\"#footnote1\">[1]</a>"
 msgstr ""
-"因
軟體出版商協會提出要求,美國政府起訴一些如麻省理工學院的
 David LaMacchia 的"
-"人,不是因為他非法複製軟體,而只是因
為沒有升級他的複製工具,從而不能對使用者"
-"非法複製軟體進行檢查。<a href=\"#footnote1\">[1]</a>"
+"有些人還因
此被起訴(軟體出版協會提請美國政府控告這些人),例如麻省理工學院的
 "
+"David LaMacchia,但起訴主因
竟不是他非法複製任何軟體,而是他沒有管制複製用的工"
+"具,所以無法審查使用者是否有非法複製軟體。<a 
href=\"#footnote1\">[1]</a>"
 
 #. type: Content of: <p>
 msgid ""
@@ -126,21 +130,21 @@
 "the sharing of information, no matter why, leads to the same methods and the "
 "same harshness."
 msgstr ""
-"這些æ…
£å¸¸èªªæ³•å’Œå‰è˜‡è¯æ›¾ç”¨éŽçš„做法相似,在每一台影印機前都有一個守衛,以防止那"
-"些未經許可複印,同時個人只有秘密地複製訊息,並像「秘密出版物」<a
 href="
-"\"#trans1\">[按1]</a>一樣在手é 
­å‚³æ’­ã€‚不同的是,蘇聯管制訊息是政治原因,而美國"
-"則是為了經濟利益。無論動機如何,我們都受到影響。不管什麼原å›
 ï¼Œä»»ä½•äººä¼åœ–阻止"
-"訊息共享,都導致了相同的後果和同樣的不便。"
+"這些常見作法和前蘇聯過去的作為如出一轍:每臺影印機前面都派駐一名守衛以防有人"
+"未經許可就影印;同時間,人們只能私下秘密複製訊息,並像「秘密出版物」<a
 href="
+"\"#trans1\">[按1]</a>那樣在民眾手é 
­é–“傳播。不同的是,蘇聯管制訊息是政治原因,"
+"而美國則是為了經濟利益。無論政府的動機為何,人民都受到政府的作為影響。不管任"
+"何原因
,只要企圖阻止資訊的分享,都導致相同的後果和一樣的苦難。"
 
 #. type: Content of: <p>
 msgid ""
 "Owners make several kinds of arguments for giving them the power to control "
 "how we use information:"
-msgstr "軟體所有者
用各種理由來控制我們如何使用資訊的權利︰"
+msgstr "軟體所有者創造
各種理由取得我們對資訊使用的控制權︰"
 
 #. type: Content of: <ul><li>
 msgid "Name calling."
-msgstr "中傷"
+msgstr "貼上標籤。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -149,9 +153,9 @@
 "and &ldquo;damage&rdquo;, to suggest a certain line of thinking to the "
 "public&mdash;a simplistic analogy between programs and physical objects."
 msgstr ""
-"軟體所有者
使用「盜竊」、「剽竊」這類帶有誣衊的詞語,或者
「知識產權」、「損"
-"害」之類專業的術語,向公眾暗示他們是合理的--å…
¶å¯¦ï¼Œä»–們是將軟體和真實物件混"
-"為一談。"
+"軟體所有者
利用「盜版」、「偷竊」這類帶有誣衊意涵的詞語,再搭é…
ã€ŒçŸ¥è­˜è²¡ç”¢ã€ã€"
+"「損害權利」之類的專業術語,向大眾暗示他們隱含的說法——軟體程式可簡單類比成實"
+"體物件。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -160,12 +164,13 @@
 "don't directly apply to <em>making a copy</em> of something.  But the owners "
 "ask us to apply them anyway."
 msgstr ""
-"我們對「拿取別人的物件」的概念 
,並不能直接套用在複製這件事,然而軟體所有者卻"
-"迫使我們必須接受他們的想法。"
+"我們人類對於財產和有形實體的想法與直覺,可以用來判斷「<em>拿取他人物件</em>」"
+"這個行為是否適當。但這可不能直接套到<em>複製</em>某事物這類事æƒ
…上。然而,軟體"
+"所有者卻要求我們必須一體適用。"
 
 #. type: Content of: <ul><li>
 msgid "Exaggeration."
-msgstr "憑空誇大"
+msgstr "誇大其辭。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -175,9 +180,10 @@
 "the person who made the copy would otherwise have paid for one from the "
 "owner."
 msgstr ""
-"軟體所有者
聲稱當用戶複製他們的程序時,他們受到「傷害」或「經濟損失」。但複製"
-"並不會對軟體所有者造
成直接的影響,也沒有傷害到任何人。只有在使用複製者
不願意"
-"給軟體所有者付費時,軟體所有者才會受損失。"
+"軟體所有者聲稱使用者
複製他們的程式,致使他們蒙受「傷害」或「經濟損失」。但複"
+"製這個動作沒有對軟體所有者本人造
成直接影響,也沒有傷害到任何人。唯有在複製者"
+"原先打算支付軟體所有者
一份副本費用的錢,但終究沒有付費之時,軟體所有者
才會有"
+"所損失。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -185,12 +191,13 @@
 "Yet the owners compute their &ldquo;losses&rdquo; as if each and every one "
 "would have bought a copy.  That is exaggeration&mdash;to put it kindly."
 msgstr ""
-"很明顯大多數這樣的人不願意購買這些程式,但是軟體所有è€
…會假定所有人都會購買,"
-"並以此來計算他們的「損失」。客氣點說這就是誇大了專有軟體的價值。"
+"稍微思考一下,我們就能知道其實大多數這樣的人原å…
ˆæ²’有打算購買他們製作的副本。"
+"但是軟體所有者卻假定每個人、所有者
都會向他們購買一份副本,並以此計算他們的"
+"「損失」。客氣點說——這不過是誇誇而談。"
 
 #. type: Content of: <ul><li>
 msgid "The law."
-msgstr "法律"
+msgstr "引用法律。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -200,14 +207,17 @@
 "same time, we are urged to regard these penalties as facts of nature that "
 "can't be blamed on anyone."
 msgstr ""
-"軟體所有者經常引用當今的法律和苛刻的刑罰來威脅
我們。這暗示現今的法律反映了一"
-"個不容置疑的道德觀念,同時æ…
«æ¿æˆ‘們視這些刑罰為正常及不能推卸。"
+"軟體所有者經常引用當今的法律和苛刻的刑罰來威脅
我們。這種作法暗示今日的法律反"
+"映出一種毋庸置疑的道德觀——同時間,我們因而被æ…
«æ¿å°‡é€™äº›ä¸è©²è²¬æ€ªä»»ä½•äººçš„懲罰視"
+"為自然不過的事實。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
 "This line of persuasion isn't designed to stand up to critical thinking; "
 "it's intended to reinforce a habitual mental pathway."
-msgstr "這些說詞面對嚴謹的思維是站不住è…
³çš„,這做法只是打算利用了人的慣性思維。"
+msgstr ""
+"這些說詞在面對嚴謹的思維時並站不住è…
³ï¼›ä¹‹æ‰€ä»¥è¦åè¦†èªªæ˜¯ç‚ºäº†åŠ å¼·äººå€‘的慣性思"
+"路。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -216,12 +226,12 @@
 "black person to sit in the front of a bus; but only racists would say "
 "sitting there was wrong."
 msgstr ""
-"顯然法律是不能決定錯對的。美國人都應該知道,五十年代的黑人在許多州份坐在巴士"
-"前座是違法的;但只有種族主義者才會說他們是錯誤的。"
+"本質上,法律無法判斷是與非。任何美國人都應該知道,1950年代的黑人在許多洲省坐"
+"在巴士前座是違法行為;但只有種族主義者
才會說他們這樣坐是錯的。"
 
 #. type: Content of: <ul><li>
 msgid "Natural rights."
-msgstr "自然權利"
+msgstr "自然權利。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -232,9 +242,9 @@
 "hold the copyrights on software, but we are expected to ignore this "
 "discrepancy.)"
 msgstr ""
-"軟體作者常常聲稱與自己編寫的程式有一種特殊聯繫,因
此他們宣稱對這個程序的渴望"
-"和興趣是高於世上任何人。(通常是å…
¬å¸æŒæœ‰è»Ÿé«”著作權,而不是作者,但是我們預期"
-"忽略這個差異。)"
+"軟體作者
常聲稱自己和所寫的程式有一種特殊的連結,所以他們對這個程式的愛意和興"
+"趣絕對比過其他人——或者甚至說å…
¨ä¸–界的所有人。(一般來說是公司持有軟體的著作"
+"權,而不是作者,不過我們這裡打算擱置這個差異。)"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -242,14 +252,14 @@
 "important than you&mdash;I can only say that I, a notable software author "
 "myself, call it bunk."
 msgstr ""
-"對那些打算把「作者
高於一切」推崇為一種道德的人,本人作為一個著名的軟體開發"
-"者,只能說這是廢話。"
+"對於那些把「作者遠
比任何人都還重要」宣說成道德規範的人,本人以一位著名的軟體"
+"著作者身份說,你們講的那些。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
 "But people in general are only likely to feel any sympathy with the natural "
 "rights claims for two reasons."
-msgstr "但一般人有兩個原因對自然權利的說法產生共鳴。"
+msgstr "但一般人只會在兩種情
況下對軟體的自然權利說有同感。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -259,10 +269,10 @@
 "can eat the spaghetti, so the question is, which one? The smallest "
 "distinction between us is enough to tip the ethical balance."
 msgstr ""
-"第一個原因
是將軟體與現實事物過分地類比。當我做意大利麵時,如果å…
¶ä»–人也要吃,"
-"我一定會反感,因
為那樣的話,我就吃不上了。他的行為對我造
成的損失,正如他得到"
-"的利益一樣。我們中僅
有一人可以吃意大利麵,問題是誰來吃?我們兩者
之間最小的分"
-"歧也足以打破道德上的平衡。"
+"第一個情況是過度延伸類比成實體物件。如果我ç…
®äº†ç¾©å¤§åˆ©éºµï¼Œçµæžœæœ‰äººå»åƒæŽ‰æˆ‘的義"
+"大利麵時我一定會反對,因
為那樣的話我就吃不到了。他的行為造成我實際損失,而我"
+"這損失正是他得到的利益。我們之中僅
有一人可以吃到義大利麵,所以問題是誰該吃?"
+"我們兩人之間只要有一丁點的分歧就足以打ç 
´é“德上的平衡。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -271,15 +281,17 @@
 "your friend much more than it affects me.  I shouldn't have the power to "
 "tell you not to do these things.  No one should."
 msgstr ""
-"問題是︰你會否因
為運行或修改一個我寫的程序而直接影響到你
,而對我只會產生一點"
-"間接影響?你會否複製我的軟體給你的朋友,而對你
們的影響遠比對我的還要大?我不"
-"應有這樣的權利去叫你不要這麼做。任何人都不該有。"
+"但是不論你
怎樣使用、或怎樣修改我所編寫的軟體,這些動作直接影響的是ä½
 æœ¬äººï¼Œå°"
+"我就只有間接影響。不管你想不想製作一份軟體副本給你
的好友鄰居,這件事對你和好"
+"友鄰居之間的影響遠比對我的影響大。我不應有權要求你
別做這些事。任何人都不該"
+"有。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
 "The second reason is that people have been told that natural rights for "
 "authors is the accepted and unquestioned tradition of our society."
-msgstr "這第二個原因就是,人們被告知作者
的自然權利是社會約定俗成的準則。"
+msgstr ""
+"第二個情況是,人們被告知作者的自然權利是我們社會所å…
¬èªä¸”不應質疑的傳統。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -292,10 +304,11 @@
 "authors somewhat, and publishers more, but that is intended as a means of "
 "modifying their behavior."
 msgstr ""
-"歷史證明,相反的一方才是正確的。當年起草美國憲法時堅
決駁回了關於作者自然權利"
-"的提議。這就是為什麼憲法只是å…
è¨±è‘—作權體系,而並不強制要求;所以說著作權體制一"
-"定是臨時的。憲法也說明著作權體制的目的是促進發展,而不是獎勵作è€
…。著作權確實"
-"給作者
和出版社帶來了更多收益,但這本來只是一種激勵他們的手段而已。"
+"單純講歷史事實,與此相反的說法才是對的。當年美國憲法起草時所謂作è€
…的自然權利"
+"說被果斷駁回。這就是為什麼憲法只說<em>得</em>有著作權法,但沒有<em>å¿
…</em>要"
+"有;這也就是為何著作權法的保護年限一定有時效性。憲法也明確指出著作權法的目的"
+"是要促進發展——而不是用來獎勵作者
。著作權制度確實某種程度上給作者帶來獎勵,而"
+"出版社甚至還得到更多,但這終究只是一種鼓勵人民創作的手段而已。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -303,18 +316,18 @@
 "the natural rights of the public&mdash;and that this can only be justified "
 "for the public's sake."
 msgstr ""
-"事實是我們的社會建立了削弱å…
¬çœ¾è‡ªç„¶æ¬Šåˆ©çš„著作權制度。然而著作權只有用於公益事"
-"業才是正當的。"
+"我們社會真正建立的傳統觀點,是認為著作權制度會削減å…
¬çœ¾çš„自然權利——而著作權必"
+"須用於公眾才算得上是正義。"
 
 #. type: Content of: <ul><li>
 msgid "Economics."
-msgstr "經濟"
+msgstr "經濟影響。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
 "The final argument made for having owners of software is that this leads to "
 "production of more software."
-msgstr 
"軟體應該有主人的最終辯解理由是,這會提高軟體產量。"
+msgstr "軟體應該有其所有者
的最後論點是這樣可以提升軟體產量。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -323,8 +336,8 @@
 "software.  And it is empirically clear that people will produce more of "
 "something if they are well paid for doing so."
 msgstr ""
-"這個論據至少比以上的更切合主題。它立足於一個合理目標——滿足軟體用戶的需求。以"
-"經驗看來,人們因為滿意的回å 
±è€Œç”Ÿç”¢æ›´å¤šï¼Œæ˜¯å¾ˆå®¹æ˜“理解的。"
+"這個論點至少比上述的其他說法更合情理。這個論點æ 
¹æ“šä¸€å€‹æ˜Žç¢ºç›®æ¨™è€Œæˆç«‹â€”—滿足軟"
+"體使用者。而且以實務經驗來看,人們確實會因為豐厚的å 
±é…¬è€Œé¡˜æ„æ›´å¤§é‡ç”Ÿç”¢ã€‚"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -333,8 +346,9 @@
 "that <em>production of software</em> is what we want, whether the software "
 "has owners or not."
 msgstr ""
-"但是這個關於經濟的論據有瑕疵:它基於這樣一個假設,區別åƒ
…僅是我們要付多少錢的"
-"問題。它假設無論軟體是否有其所有者
,「軟體產品」都是我們想要的。"
+"但是這個經濟論據有缺陷:它的假設成立於我們要付多少錢的差異之上,錢是變å›
 ã€‚é‚„"
+"有,這個假設的é 
æœŸç›®æ¨™æ˜¯æˆ‘們希望能<em>生產出軟體</em>,但這個目標卻無關軟體到"
+"底該不該有其所有者。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -347,10 +361,11 @@
 "sandwich from an owner or not cannot directly affect anything but the amount "
 "of money you have afterwards."
 msgstr ""
-"由於這個假設合乎我們處理真實物件的經驗,所以人們很樂意接受。假設ä½
 ä»˜è²»èˆ‡å¦éƒ½"
-"能得到一份一樣的三明治,這樣你
付的費用就是唯一的分別。不管你是否購買,三明治"
-"有相同的味道和相同的營養,但你只能吃一次。不管你
是否從所有者手中得到三明治,"
-"它都不能直接影響到你的金錢以外的任何事情。"
+"由於這個假設合乎我們處理真實物件的經驗,所以人們很容易接受它。舉例來說,假設"
+"ä½ 
不管有沒有付錢都能得到一份沒有任何差別的相同三明治,這個æƒ
…況下付了多少錢是"
+"唯一的差別。不管你
是否購買,三明治都有相同的味道、相同的營養成份,而且都一樣"
+"只吃一次就沒了。不管你是不是從三明治的所有者
手中拿到它,這之後都不會直接影響"
+"到任何事情,全部就只有影響到你的錢。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -358,7 +373,8 @@
 "owner does not directly affect what it <em>is</em>, or what you can do with "
 "it if you acquire it."
 msgstr ""
-"對任何真實物件,這都是正確的︰不管它是否有主人都不會直接影響它的本質和用途。"
+"對任何真實物件來說這點千真萬確——不管東西是否有個所有è€
…,都不會直接影響這個東"
+"西的<em>本質</em>,或是影響你
獲得之後可以對它做些什麼。"
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -368,9 +384,9 @@
 "produce something&mdash;but not what society really needs.  And it causes "
 "intangible ethical pollution that affects us all."
 msgstr ""
-"如果程式有了主人,這將大大影響它的本質,和你
對它的用途。不同之處不僅僅是錢的"
-"問題。軟體該有主人的體制鼓勵軟體主人生產,但不一定是社會真正需要的。它導致的"
-"道德低落影響我們所有人。"
+"如果軟體有了所有者
,卻會大大影響它的本質,以及影響如果你
買了軟體副本之後能對"
+"它做些什麼。差別不僅僅是錢而已。軟體該有所有者
的體制鼓勵軟體所有者生產軟體——"
+"但不見得是社會真正需要的軟體。而這個體制製造
出能影響我們所有者的道德污染。"
 
 #. type: Content of: <p>
 msgid ""
@@ -379,15 +395,17 @@
 "improve, not just operate.  But what software owners typically deliver is a "
 "black box that we can't study or change."
 msgstr ""
-"社會需要什麼?社會需要對å…
¬æ°‘真實可用的訊息──例如,人們可以解讀、修補、使用和"
-"改進的程式,而不只是操作。但是軟體主人往往會給我們一個不能ç
 ”究和修改的黑盒"
-"子。"
+"社會需要什麼?社會需要對å…
¬æ°‘來說真正能用的資訊——例如,人們可以解讀、修正、調"
+"整和改善的程式,而不只是操作而已。但是軟體的所有者
往往給我們的是一個不能研究"
+"或修改的黑箱子。"
 
 #. type: Content of: <p>
 msgid ""
 "Society also needs freedom.  When a program has an owner, the users lose "
 "freedom to control part of their own lives."
-msgstr 
"社會也需要自由。當程式有了主人,用戶就失去了控制他們部分生活的自由。"
+msgstr ""
+"社會也需要自由。當程式有了所有者,程式的使用者
就失去控制他們一部分生活的自"
+"由。"
 
 #. type: Content of: <p>
 msgid ""
@@ -396,16 +414,17 @@
 "neighbors in a natural way is &ldquo;piracy&rdquo;, they pollute our "
 "society's civic spirit."
 msgstr ""
-"總之社會需要鼓勵å…
¬æ°‘們自主合作的精神。當軟體主人告訴我們用這種自然的方式幫助"
-"旁人是剽竊行為時,那他們就是玷污我們的人格。"
+"總而言之,社會需要鼓勵å…
¬æ°‘們自主合作的精神。當軟體的所有者告訴我們,用一種自"
+"然而然的方式幫助我們的朋友鄰居
是種「盜版」行為,他們這種說法無疑在敗壞我們社"
+"會的良好公民精神。"
 
 #. type: Content of: <p>
 msgid ""
 "This is why we say that <a href=\"/philosophy/free-sw.html\">free software</"
 "a> is a matter of freedom, not price."
 msgstr ""
-"這正是我們提倡<a href=\"/philosophy/free-sw.html\">自由軟體</a> 
事關自由,而"
-"並非價格的原因。"
+"這正是我們說<a 
href=\"/philosophy/free-sw.html\">自由軟體</a>事關自由,無關價"
+"格的原因。"
 
 #. type: Content of: <p>
 msgid ""
@@ -414,8 +433,9 @@
 "for admiration and love; but if we want more software than those people "
 "write, we need to raise funds."
 msgstr ""
-"支持所有者
的經濟論據是錯誤的,但是經濟問題確實存在。一些人出於榮譽、認同和博"
-"愛,而編寫了有用的軟體,但是如果我們希望有更多的軟體,就需要籌集資金。"
+"雖然支持軟體應有所有者
的經濟說漏洞百出,但是我們的確需要處理經濟問題。或許有"
+"些人出於樂趣、榮譽和熱誠
而編寫有用的軟體;但如果我們希望有更多的軟體可用,就"
+"需要籌募資金。"
 
 #. type: Content of: <p>
 msgid ""
@@ -424,8 +444,8 @@
 "typical income is plenty of incentive to do many jobs that are less "
 "satisfying than programming."
 msgstr ""
-"自由軟體開發者自從å…
«åå¹´ä»£å˜—試過許多尋求財源的方法,稍有小成。我們不需要讓任"
-"何人置富,典型的收å…
¥ï¼Œè¶³ä»¥å¸å¼•äººåšå¾ˆå¤šæ¯”編程少滿足感的工作。"
+"自由軟體開發者
自1980年代以來嘗試過許多尋求財源的方法,稍有小成。我們不å¿
…讓任"
+"何人致富;一般性收入就足以吸引人投å…
¥è¨±å¤šæ¯”起程式開發滿足感較少一些的工作。"
 
 #. type: Content of: <p>
 msgid ""
@@ -436,9 +456,9 @@
 "the enhancements they wanted, rather than on the features I would otherwise "
 "have considered highest priority."
 msgstr ""
-"多年以來,我一直靠
改進自己編寫的自由軟體為生,直到獲得ç 
”究經費。每次改進我都"
-"會添加
到標準發佈版本,使得大眾受益。客戶為我付費,這樣我就會優å
…ˆå®Œæˆä»–們需"
-"求,自己的變成次要。"
+"有許多年,我一直靠
著客製改善自己編寫的自由軟體為生,直到後來獲得ç 
”究經費才停"
+"下來。每一次的改善我都會一併加
到標準發行版中,讓大眾能一同共享成果。客戶向我"
+"付費,如此我才會優å…
ˆè™•ç†ä»–們提出的要求,而自己原本想優å…
ˆé–‹ç™¼çš„功能則往後擺。"
 
 #. type: Content of: <p>
 msgid ""
@@ -447,8 +467,9 @@
 "percent of its staff activity was free software development&mdash;a "
 "respectable percentage for a software company."
 msgstr ""
-"一些自由軟體開發者通過支援服務賺錢。1994年,Cygnus 
有近50個員工,估計有大約百"
-"分之十五的員工從事自由軟體開發︰對一間軟體å…
¬å¸è€Œè¨€ï¼Œé€™æ˜¯å€‹äº†ä¸èµ·çš„比例。"
+"一些自由軟體開發者透過銷售支援服務賺錢。1994年,Cygnus 
Support 這間公司有近 "
+"50 
位員工,估計有大約百分之十五的員工從事自由軟體開發——這對於一間軟體å
…¬å¸è€Œ"
+"言,是個了不起的比例。"
 
 #. type: Content of: <p>
 msgid ""
@@ -458,9 +479,9 @@
 "compiler for the Ada language was funded in the 90s by the US Air Force, and "
 "continued since then by a company formed specifically for the purpose."
 msgstr ""
-"九十年代,Intel、Motorola、Texas Instruments 和 Analog Devices 等å…
¬å¸è¯åˆè´ŠåŠ©"
-"持續發展的 GNU C 語言編譯器。現在大部份開發 GCC 
的人工作還是支薪的開發者完成"
-"的。GNU 的 Ada 語言編譯器受美國空軍贊助,之後成立專屬å…
¬å¸å»¶çºŒéŽå€‹é …目。"
+"1990年代,Intel、Motorola、德州儀器和 Analog Devices 等å…
¬å¸è¯åˆè³‡åŠ©æŒçºŒç™¼å±•"
+"的 GNU C 編譯器,GCC 絕大部份的開發都來自受僱開發者
完成。而 Ada 語言的 GNU 編"
+"譯器則在1990年代中受美國空軍資助,之後也成立å…
¬å¸å°ˆé–€ç¹¼çºŒé€™å€‹é …目。"
 
 #. type: Content of: <p>
 msgid ""
@@ -468,8 +489,8 @@
 "supported radio in the US shows it's possible to support a large activity "
 "without forcing each user to pay."
 msgstr ""
-"自由軟體運動的規模還是很小,但是靠
聽眾支持的美國電台的例子說明,不用強迫每個"
-"用戶付費也可以支撐一個巨大的活動。"
+"自由軟體運動的規模還小,但是以美國那些靠
聽眾支持得以發展的電臺為例來說明,我"
+"們不用強迫每位使用者付錢也可以撐起巨大的影響。"
 
 #. type: Content of: <p>
 msgid ""
@@ -481,10 +502,11 @@
 "live an upright life openly with pride, and this means saying no to "
 "proprietary software."
 msgstr ""
-"今天如果你發現用了<a 
href=\"/philosophy/categories.html#ProprietarySoftware"
-"\">專有軟體</a>。如果你的朋友問你
複製一份,拒絕是不對的。合作比著作權更重要。"
-"私下傳播也不能建立健康的社會。人應當自豪的嚮往開放而正直的生活,這就意味著應"
-"該對專有軟體說「不」。"
+"今天作為一位電腦使用者,你發現你用的是<a 
href=\"/philosophy/categories."
+"html#ProprietarySoftware\">專有軟體</a>,而當你的朋友向你
要一份軟體拷貝時,如"
+"果拒絕拿來和朋友分享是不對的事。互助合作遠
比著作權法更為重要。而且,地下合"
+"作、祕密合作無法塑造
良善社會。人們應當嚮往過著有自尊、開放且正直的生活,這就"
+"代表我們應當對專有軟體說不。"
 
 #. type: Content of: <p>
 msgid ""
@@ -493,20 +515,20 @@
 "to teach your students with it.  You deserve to be able to hire your "
 "favorite programmer to fix it when it breaks."
 msgstr ""
-"你應該能與其他軟體使用者開放、自由地合作,能夠
學習軟體如何運作,並教導學生,"
-"能夠在軟體出問題時請中意的程式員修復它。"
+"你應得以和其他軟體使用者開放地、自由地互助合作。你
應得以學習軟體的運作原理、"
+"並拿它教導學生。你
應得以在軟體出問題時僱請中意的程式設計師做修正。"
 
 #. type: Content of: <p>
 msgid "You deserve free software."
-msgstr "你應該得到自由軟體。"
+msgstr "你應得自由軟體。"
 
 #. type: Content of: <h3>
 msgid "Footnotes"
-msgstr "註釋"
+msgstr "註腳"
 
 #. type: Content of: <ol><li>
 msgid "The charges were subsequently dismissed."
-msgstr "這項指控後來徹銷了"
+msgstr "這項指控後來撤銷了。"
 
 #. type: Content of: <blockquote><p>
 msgid ""
@@ -535,10 +557,10 @@
 "can be sent to <a href=\"mailto:address@hidden";>&lt;address@hidden"
 "org&gt;</a>."
 msgstr ""
-"請來郵 <a 
href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>查詢「自由軟體基"
-"金會」及「GNU 計畫」的事宜。或者<a href=\"/contact/\">透過å…
¶ä»–方式</a>聯絡自"
-"由軟體基金會。請來郵<a 
href=\"mailto:address@hidden";>&lt;address@hidden"
-"org&gt;</a>告訴我們任何失效的連結、錯誤和建議。"
+"請來信到 <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> 
詢問有關自由"
+"軟體基金會 (FSF) 和 GNU 的一般問題;或者<a 
href=\"/contact/\">以其他方式</a>"
+"聯絡自由軟體基金會。至於損毀的連結及å…
¶ä»–修正和建議,可以將之寄給 <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>。"
 
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
@@ -557,12 +579,15 @@
 "\">Translations README</a> for information on coordinating and submitting "
 "translations of this article."
 msgstr ""
-"請參照 <a 
href=\"/server/standards/README.translations.html\">翻譯說明</a> 了"
-"解有關協助翻譯本文的事情。"
+"我們努力盡所能提供貼切、品質良善的翻譯。然而,我們無法十å
…¨åç¾Žï¼Œé‚„請將你的意"
+"見評述與一般建議寄給 <a href=\"mailto:address@hidden";>&lt;web-"
+"address@hidden&gt;</a></p><p>請參照 <a href=\"/server/standards/README."
+"translations.html\">翻譯讀我 README</a> 
來瞭解協調和提交我們的網頁翻譯相關事"
+"宜。"
 
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 1994, 2009 Richard Stallman"
-msgstr "著作權所有 &copy; 1994, 2009 Richard Stallman"
+msgstr "Copyright &copy; 1994, 2009 Richard Stallman"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -572,12 +597,15 @@
 msgstr ""
 "本頁面採用 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
 "nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
-"License</a> 許可證授權。"
+"License</a> 給予授權。"
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
-msgstr "<b>翻譯</b>: Karl Lam 2012"
+msgstr ""
+"<b>翻譯</b>:\n"
+"Cheng-Chia Tseng, 2017.\n"
+"Karl Lam, 2012."
 
 #.  timestamp start 
 #. type: Content of: <div><p>

Index: po/home.zh-tw.po
===================================================================
RCS file: /web/www/www/po/home.zh-tw.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/home.zh-tw.po    29 Sep 2017 13:30:30 -0000      1.11
+++ po/home.zh-tw.po    21 Nov 2017 13:39:08 -0000      1.12
@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: home.html\n"
 "POT-Creation-Date: 2017-09-29 13:26+0000\n"
-"PO-Revision-Date: 2017-08-18 20:39+0800\n"
+"PO-Revision-Date: 2017-11-21 21:03+0800\n"
 "Last-Translator: Cheng-Chia Tseng <address@hidden>\n"
 "Language-Team: Traditional Chinese <address@hidden>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.13\n"
+"X-Generator: Poedit 2.0.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Content of: <title>
@@ -243,8 +243,8 @@
 "started in 1990 (before Linux was started).  Volunteers continue developing "
 "the Hurd because it is an interesting technical project."
 msgstr ""
-"GNU 自身的內部核心——<a href=\"/software/hurd/hurd.html\">The 
Hurd</a>,起源於"
-"1990年(在 Linux 誕生之前)。 Hurd 
是個有趣的技術專案,志工們仍持續開發中。"
+"GNU 自身的內部核心——<a 
href=\"/software/hurd/hurd.html\">Hurd</a>,起源於1990"
+"年(在 Linux 誕生之前)。 Hurd 
是個有趣的技術專案,志工們仍持續開發中。"
 
 #. type: Content of: <div><div><p>
 msgid "<a href=\"/gnu/gnu.html\">More information</a>"

Index: proprietary/po/proprietary.zh-tw.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary.zh-tw.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- proprietary/po/proprietary.zh-tw.po 4 Nov 2017 14:29:13 -0000       1.5
+++ proprietary/po/proprietary.zh-tw.po 21 Nov 2017 13:39:08 -0000      1.6
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: proprietary.html\n"
 "POT-Creation-Date: 2017-11-04 14:26+0000\n"
-"PO-Revision-Date: 2017-09-21 21:10+0800\n"
+"PO-Revision-Date: 2017-11-21 16:25+0800\n"
 "Last-Translator: Cheng-Chia Tseng <address@hidden>\n"
 "Language-Team: Traditional Chinese <address@hidden>\n"
 "Language: zh_TW\n"
@@ -144,10 +144,8 @@
 "<a 
href=\"/proprietary/malware-appliances.html\">應用程式的惡意軟體</a>"
 
 #. type: Content of: <div><div><ul><li>
-#, fuzzy
-#| msgid "<a href=\"/proprietary/malware-games.html\">Malware in games</a>"
 msgid "<a href=\"/proprietary/malware-cars.html\">Malware in cars</a>"
-msgstr "<a href=\"/proprietary/malware-games.html\">遊戲的惡意軟體</a>"
+msgstr "<a href=\"/proprietary/malware-games.html\">車內的惡意軟體</a>"
 
 #. type: Content of: <div><div><h3>
 msgid "Type&nbsp;of&nbsp;malware"
@@ -163,7 +161,7 @@
 
 #. type: Content of: <div><div><ul><li>
 msgid "<a href=\"/proprietary/proprietary-coverups.html\">Coverups</a>"
-msgstr "<a href=\"/proprietary/proprietary-coverups.html\">遮蔽</a>"
+msgstr "<a href=\"/proprietary/proprietary-coverups.html\">屏蔽</a>"
 
 #. type: Content of: <div><div><ul><li>
 msgid "<a href=\"/proprietary/proprietary-deception.html\">Deception</a>"

Index: server/gnun/compendia/compendium.zh-tw.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.zh-tw.po,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- server/gnun/compendia/compendium.zh-tw.po   19 Nov 2017 09:30:42 -0000      
1.71
+++ server/gnun/compendia/compendium.zh-tw.po   21 Nov 2017 13:39:09 -0000      
1.72
@@ -7,21 +7,17 @@
 "Project-Id-Version: body-include-2.html\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-13 09:25+0000\n"
-"PO-Revision-Date: 2012-02-15 13:54+0800\n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2017-11-21 16:54+0800\n"
+"Last-Translator: Cheng-Chia Tseng <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
-"Language: zh-tw\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Outdated-Since: 2012-05-05 16:00-0300\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #. type: Content of: <div><div><p>
-#, fuzzy
-#| msgid ""
-#| "Please send FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;"
-#| "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways 
to "
-#| "contact</a> the FSF."
 msgid ""
 "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
 "\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other 
ways "
@@ -29,9 +25,10 @@
 "can be sent to <a href=\"mailto:address@hidden";>&lt;address@hidden"
 "org&gt;</a>."
 msgstr ""
-"請來郵 <a 
href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>查詢「自由軟體基"
-"金會」及「GNU 計畫」的事宜。或者<a href=\"/contact/\">透過å…
¶ä»–方式</a>聯絡自"
-"由軟體基金會。"
+"請來信到 <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> 
詢問有關自由"
+"軟體基金會 (FSF) 和 GNU 的一般問題;或者<a 
href=\"/contact/\">以其他方式</a>"
+"聯絡自由軟體基金會。至於損毀的連結及å…
¶ä»–修正和建議,可以將之寄給 <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>。"
 
 #.  TRANSLATORS: Ignore the original text in this paragraph,
 #.         replace it with the translation of these two:
@@ -50,11 +47,13 @@
 "\">Translations README</a> for information on coordinating and submitting "
 "translations of this article."
 msgstr ""
-"請參照 <a 
href=\"/server/standards/README.translations.html\">翻譯說明</a> 了"
-"解有關協助翻譯本文的事情。"
+"我們努力盡所能提供貼切、品質良善的翻譯。然而,我們無法十å
…¨åç¾Žï¼Œé‚„請將你的意"
+"見評述與一般建議寄給 <a href=\"mailto:address@hidden";>&lt;web-"
+"address@hidden&gt;</a></p><p>請參照 <a href=\"/server/standards/README."
+"translations.html\">翻譯讀我 README</a> 
來瞭解協調和提交我們的網頁翻譯相關事"
+"宜。"
 
 #. type: Content of: <div><p>
-#, fuzzy
 #| msgid ""
 #| "This page is licensed under a <a rel=\"license\" href=\"http://";
 #| "creativecommons.org/licenses/by-nd/3.0/us/\">Creative Commons Attribution-"
@@ -64,9 +63,8 @@
 "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
 "NoDerivatives 4.0 International License</a>."
 msgstr ""
-"本頁面採用 <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-";
-"nd/3.0/us/\">Creative Commons Attribution-NoDerivs 3.0 United States "
-"License</a> 許可證授權。"
+"本頁面採用<a rel=\"license\" 
href=\"https://creativecommons.org/licenses/by-";
+"nd/4.0/deed.zh_TW\">創用 CC 姓名標示-禁止改作 4.0 
國際</a>條款給予授權。"
 
 #.  timestamp start 
 #. type: Content of: <div><p>
@@ -85,38 +83,32 @@
 
 #. type: Content of: <ul><li>
 msgid "John Gilmore"
-msgstr ""
+msgstr "John Gilmore"
 
 #. type: Content of: <ul><li>
 msgid "Paul Eggert"
-msgstr ""
+msgstr "Paul Eggert"
 
 #. type: Content of: <div><p>
-#, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
 #| "Foundation, Inc."
 msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
-msgstr ""
-"版權所有 &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 
自由軟體基金會"
+msgstr "Copyright &copy; 2014 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
-#, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
 #| "Foundation, Inc."
 msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
-msgstr ""
-"版權所有 &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 
自由軟體基金會"
+msgstr "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
-#, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
 #| "Foundation, Inc."
 msgid "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
-msgstr ""
-"版權所有 &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 
自由軟體基金會"
+msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. type: Content of: <table><tr><td>
 msgid "</a>"
@@ -128,35 +120,30 @@
 
 #. type: Content of: <h3>
 msgid "Table of Contents"
-msgstr ""
+msgstr "目錄"
 
 #. type: Content of: <p>
-#, fuzzy
 #| msgid ""
 #| "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
 #| "strong></a>"
 msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
-msgstr ""
-"作者︰<a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
-"strong></a>"
+msgstr "作者為 <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 
 #. type: Content of: <p>
-#, fuzzy
 #| msgid ""
 #| "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
 #| "strong></a>"
 msgid "by <strong>Richard Stallman</strong>"
-msgstr ""
-"作者︰<a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
-"strong></a>"
+msgstr "作者為 <strong>Richard Stallman</strong>"
 
 #. type: Attribute 'content' of: <meta>
 msgid ""
 "GNU, FSF, Free Software Foundation, Linux, Emacs, GCC, Unix, Free Software, "
 "Operating System, GNU Kernel, HURD, GNU HURD, Hurd"
 msgstr ""
-"GNU, FSF, 自由軟體基金會, Linux, Emacs, GCC, Unix, 自由軟體, 
操作系統, GNU 核"
-"心, GNU Hurd"
+"GNU, FSF, Free Software Foundation, 自由軟體基金會, Linux, Emacs, GCC, 
Unix, "
+"Free Software, 自由軟體, Operating System, 作業系統, GNU Kernel, GNU 
核心, "
+"GNU 內核, HURD, GNU Hurd, Hurd"
 
 #. type: Attribute 'content' of: <meta>
 msgid ""
@@ -164,27 +151,29 @@
 "computer users can have the freedom to share and improve the software they "
 "use."
 msgstr ""
-"從1983年,不斷開發Unix風格的自由操作系統 GNU,使電è…
¦ç”¨æˆ¶å¯ä»¥è‡ªç”±åœ°åˆ†äº«åŠæ”¹è‰¯"
-"這些軟體。"
+"起源於1983年,持續不斷開發自由的 Unix 風作業系統 
GNU,使電腦使用者能擁有分享"
+"這些軟體並改善的自由。"
 
 #. type: Content of: <h4>
 msgid "Disclaimer"
-msgstr ""
+msgstr "棄權聲明"
 
 #. type: Content of: <p>
 msgid ""
 "<a href=\"/fun/humor.html\">Other humor</a> in the GNU Humor Collection."
-msgstr ""
+msgstr "GNU 幽默集裡的<a href=\"/fun/humor.html\">å…
¶ä»–幽默作品</a>。"
 
 #. type: Content of: <p>
 msgid "The Free Software Foundation claims no copyright on this joke."
-msgstr ""
+msgstr "自由軟體基金會聲明本會沒有這個笑話的著作權。"
 
 #. type: Content of: <p>
 msgid ""
 "The joke on this page was obtained from the FSF's <a href=\"http://lists.gnu.";
 "org/\">email archives</a> of the GNU Project."
 msgstr ""
+"此頁面上的笑話是從 FSF 的 GNU 專案<a 
href=\"http://lists.gnu.org/\";>電子郵件"
+"封存檔</a>中摘錄出來的。"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -192,17 +181,17 @@
 "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
 "contact</a> the FSF."
 msgstr ""
-"請來郵 <a 
href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>查詢「自由軟體基"
-"金會」及「GNU 計畫」的事宜。或者<a href=\"/contact/\">透過å…
¶ä»–方式</a>聯絡自"
-"由軟體基金會。"
+"請寫信到 <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a> 
詢問「自由軟"
+"體基金會」及「GNU 專案」的相關事宜。或者<a 
href=\"/contact/\">透過其他方式</"
+"a>聯絡自由軟體基金會。"
 
 #. type: Content of: <div><p>
 msgid ""
 "Please send broken links and other corrections or suggestions to <a href="
 "\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
 msgstr ""
-"請來郵<a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>告"
-"訴我們任何失效的連結、錯誤和建議。"
+"請寫信給 <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</"
+"a> 告訴我們失效的連結、錯誤之處和建議等。"
 
 #. type: Content of: <h3>
 msgid "Footnotes"
@@ -212,30 +201,27 @@
 msgid ""
 "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 msgstr ""
-"作者︰<a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
+"作者為 <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
 "strong></a>"
 
 #. type: Content of: <h3>
 msgid "Licensing"
-msgstr ""
+msgstr "授權條款"
 
 #. type: Content of: <p>
 msgid "This picture is available in the following formats:"
-msgstr ""
+msgstr "此圖片以下列格式提供:"
 
 #. type: Content of: <div><p>
 msgid "Copyright notice above."
-msgstr ""
+msgstr "上述著作權申明。"
 
 #. type: Content of: <p>
-#, fuzzy
 #| msgid ""
 #| "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
 #| "strong></a>"
 msgid "by Richard Stallman"
-msgstr ""
-"作者︰<a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
-"strong></a>"
+msgstr "作者為 Richard Stallman"
 
 #. type: Content of: <blockquote><p>
 msgid ""
@@ -248,22 +234,19 @@
 "M. Stallman</cite></a>。"
 
 #. type: Content of: <blockquote><p>
-#, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1996-2002, 2004-2007, 2009, 2010, 2012 Free Software "
 #| "Foundation, Inc."
 msgid "Media Contact: Free Software Foundation"
-msgstr ""
-"版權所有 &copy; 1996-2002, 2004-2007, 2009, 2010, 2012, 2013 
自由軟體基金會"
+msgstr "媒體聯絡:自由軟體基金會"
 
 # type: Content of: <body><div><div><div><ul><li>
 #. type: Content of: <p>
-#, fuzzy
 #| msgid "<a href=\"/philosophy/philosophy.html\">Philosophy</a>"
 msgid ""
 "<a href=\"/proprietary/proprietary.html\">Other examples of proprietary "
 "malware</a>"
-msgstr "<a href= \"/philosophy/philosophy.html\">理念</a>"
+msgstr "<a href=\"/proprietary/proprietary.html\">å…
¶ä»–專有惡意軟體的範例</a>"
 
 #. type: Content of: <p>
 msgid ""
@@ -273,73 +256,81 @@
 "even-more-important.html\">that is the basic injustice</a>. The developers "
 "often exercise that power to the detriment of the users they ought to serve."
 msgstr ""
+"非自由(專有)軟體經常是惡意軟體(設計目的以不良方式對å¾
…使用者)。非自由軟體"
+"被其開發者控制,而這群開發者所掌握的權力凌駕於使用者
之上;<a href=\"/"
+"philosophy/free-software-even-more-important.html\">這種作法基本上就是不å
…¬ä¸"
+"義</a>。開發者經常利用這種權力損害其應該服務的使用者
。"
 
 #. type: Content of: <p>
 msgid "Donald and Jill Knuth"
-msgstr ""
+msgstr "Donald and Jill Knuth"
 
 #. type: Content of: <p>
 msgid "Krishna Kunchithapadam"
-msgstr ""
+msgstr "Krishna Kunchithapadam"
 
 #. type: Content of: <p>
 msgid "Terence O'Gorman"
-msgstr ""
+msgstr "Terence O'Gorman"
 
 #. type: Content of: <p>
 msgid "David Moews"
-msgstr ""
+msgstr "David Moews"
 
 #. type: Content of: <p>
 msgid "Alessandro Vesely"
-msgstr ""
+msgstr "Alessandro Vesely"
 
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#equipmentservices\" id=\"TOCequipment\">Equipment and Services</a>"
-msgstr ""
+msgstr "<a href=\"#equipmentservices\" id=\"TOCequipment\">設備與服務</a>"
 
 #. type: Content of: <ul><li>
 msgid "<a href=\"#patrons\" id=\"TOCpatrons\">Patrons</a>"
-msgstr ""
+msgstr "<a href=\"#patrons\" id=\"TOCpatrons\">大力資助者</a>"
 
 #. type: Content of: <ul><li>
 msgid ""
 "<a href=\"#sustaining\" id=\"TOCsustaining\">Sustaining Contributors</a>"
-msgstr ""
+msgstr "<a href=\"#sustaining\" id=\"TOCsustaining\">有力貢獻者</a>"
 
 #. type: Content of: <ul><li>
 msgid "<a href=\"#contributor\" id=\"TOCcontributor\">Contributors</a>"
-msgstr ""
+msgstr "<a href=\"#contributor\" id=\"TOCcontributor\">貢獻者</a>"
 
 #. type: Content of: <ul><li>
 msgid "<a id=\"TOCother\">Other</a>"
-msgstr ""
+msgstr "<a id=\"TOCother\">其他</a>"
 
 #. type: Content of: <h4>
 msgid "<a href= \"#TOCpatrons\" id=\"patrons\">Patrons</a> ($5000 or more)"
 msgstr ""
+"<a href= \"#TOCpatrons\" id=\"patrons\">大力資助者</a> ($5000 
美金或更高)"
 
 #. type: Content of: <h4>
 msgid ""
 "<a href=\"#TOCsustaining\" id=\"sustaining\">Sustaining Contributors</a> "
 "($1000 to $4999)"
 msgstr ""
+"<a href=\"#TOCsustaining\" id=\"sustaining\">有力貢獻者</a> ($1000 到 
$4999 "
+"美金)"
 
 #. type: Content of: <h4>
 msgid ""
 "<a href=\"#TOCcontributor\" id=\"contributor\">Contributors</a> ($500 to "
 "$999)"
 msgstr ""
+"<a href=\"#TOCcontributor\" id=\"contributor\">貢獻者</a> ($500 到 $999 
美金)"
 
 #. type: Content of: <ul><li>
 msgid "Julian Graham"
-msgstr ""
+msgstr "Julian Graham"
 
 #. type: Content of: <h4>
 msgid ""
 "<a href=\"#TOCequipment\" id=\"equipmentservices\">Equipment and Services</a>"
-msgstr ""
+msgstr "<a href=\"#TOCequipment\" id=\"equipmentservices\">設備與服務</a>"
 
 #, fuzzy
 #~| msgid ""

Index: server/po/body-include-2.zh-tw.po
===================================================================
RCS file: /web/www/www/server/po/body-include-2.zh-tw.po,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- server/po/body-include-2.zh-tw.po   16 Nov 2017 08:01:27 -0000      1.60
+++ server/po/body-include-2.zh-tw.po   21 Nov 2017 13:39:09 -0000      1.61
@@ -8,7 +8,7 @@
 "Project-Id-Version: body-include-2.html\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-16 07:56+0000\n"
-"PO-Revision-Date: 2017-05-01 22:31+0800\n"
+"PO-Revision-Date: 2017-11-21 16:23+0800\n"
 "Last-Translator: Cheng-Chia Tseng <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "Language: zh_TW\n"
@@ -16,13 +16,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Outdated-Since: 2017-09-15 15:26+0000\n"
-"X-Generator: Poedit 1.8.13\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #. type: Content of: <div><p>
 msgid ""
 "Associate members power up the Free Software Foundation.  Help smash our "
 "goal of <b>700</b> new members or donate by December 31st!"
 msgstr ""
+"會員是自由軟體基金會的力量。請協助我們達成 <b>700</b> 
位新會員的目標,或是在"
+"12月31日前捐款贊助!"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -31,26 +33,29 @@
 "\"join\" href=\"http://my.fsf.org/join?";
 "pk_campaign=2017_Fundraiser_Banner&amp;pk_kwd=Join\"> Join</a>"
 msgstr ""
+"<a class=\"donate\" href=\"http://my.fsf.org/donate?";
+"pk_campaign=2017_Fundraiser_Banner&amp;pk_kwd=Donate\"> 贊助</a> <a class="
+"\"join\" href=\"http://my.fsf.org/join?";
+"pk_campaign=2017_Fundraiser_Banner&amp;pk_kwd=Join\"> 加入</a>"
 
 #. type: Content of: <div><div><div><span>
 msgid "<span class=\"percentage\">"
-msgstr ""
+msgstr "<span class=\"percentage\">"
 
 #. #echo encoding="none" var="d_value" 
 #. type: Content of: <div><div><div>
 msgid "</span>"
-msgstr ""
+msgstr "</span>"
 
 #. type: Content of: <div><div><div>
 msgid "<span class=\"goal\">$450,000</span>"
-msgstr ""
+msgstr "<span class=\"goal\">$450,000 美金</span>"
 
 # type: Content of: <body><div><div><div><ul><li>
 #. type: Content of: <div><div><div><p>
-#, fuzzy
 #| msgid "<a href=\"http://www.fsf.org/fss\";>Free Software Supporter</a>"
 msgid "<a href=\"//www.fsf.org/fss\">Free Software Supporter</a>"
-msgstr "<a href=\"http://www.fsf.org/fss\";>自由軟體支持者</a>"
+msgstr "<a href=\"//www.fsf.org/fss\">自由軟體支持者</a>"
 
 #. type: Content of: <div><div><div><form><div>
 msgid ""

Index: server/po/bottom-notes.zh-tw.po
===================================================================
RCS file: /web/www/www/server/po/bottom-notes.zh-tw.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/po/bottom-notes.zh-tw.po     15 Sep 2017 15:31:37 -0000      1.11
+++ server/po/bottom-notes.zh-tw.po     21 Nov 2017 13:39:09 -0000      1.12
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: bottom-notes.html\n"
 "POT-Creation-Date: 2017-09-15 15:26+0000\n"
-"PO-Revision-Date: 2017-04-30 00:03+0800\n"
+"PO-Revision-Date: 2017-11-21 16:29+0800\n"
 "Last-Translator: Cheng-Chia Tseng <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "Language: zh\n"
@@ -16,14 +16,10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Outdated-Since: 2017-09-15 15:26+0000\n"
-"X-Generator: Poedit 1.8.13\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"http://www.fsf.org/about/dmca-notice\";>Copyright Infringement "
-#| "Notification</a>"
 msgid ""
 "<a href=\"//www.fsf.org/about/dmca-notice\">Copyright Infringement "
 "Notification</a>"
-msgstr "<a 
href=\"http://www.fsf.org/about/dmca-notice\";>著作權侵犯通知</a>"
+msgstr "<a href=\"//www.fsf.org/about/dmca-notice\">著作權侵犯通知</a>"

Index: server/po/footer-text.zh-tw.po
===================================================================
RCS file: /web/www/www/server/po/footer-text.zh-tw.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/po/footer-text.zh-tw.po      15 Sep 2017 15:31:38 -0000      1.16
+++ server/po/footer-text.zh-tw.po      21 Nov 2017 13:39:09 -0000      1.17
@@ -8,7 +8,7 @@
 "Project-Id-Version: footer-text.html\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-15 15:26+0000\n"
-"PO-Revision-Date: 2017-08-18 20:44+0800\n"
+"PO-Revision-Date: 2017-11-21 16:29+0800\n"
 "Last-Translator: Cheng-Chia Tseng <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "Language: zh_TW\n"
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Outdated-Since: 2017-09-15 15:26+0000\n"
-"X-Generator: Poedit 1.8.13\n"
+"X-Generator: Poedit 2.0.3\n"
 
 # type: Content of: <div><p>
 #. type: Content of: <p>
@@ -25,18 +25,16 @@
 
 # type: Content of: <div><div><div><div><ul><li><ul><li>
 #. type: Content of: <div><ul><li>
-#, fuzzy
 #| msgid "<a href=\"http://www.fsf.org/\";>FSF</a>"
 msgid "<a href=\"//www.fsf.org/\">FSF</a>"
-msgstr "<a href=\"http://www.fsf.org/\";>FSF</a>"
+msgstr "<a href=\"//www.fsf.org/\">FSF</a>"
 
 # type: Content of: <div><div><div><div><ul><li>
 #. type: Content of: <div><ul><li>
-#, fuzzy
 #| msgid ""
 #| "<a href=\"http://directory.fsf.org\";>FREE&nbsp;SOFTWARE&nbsp;DIRECTORY</a>"
 msgid "<a href=\"//directory.fsf.org\">FREE&nbsp;SOFTWARE&nbsp;DIRECTORY</a>"
-msgstr "<a href=\"http://directory.fsf.org\";>自由軟體目錄</a>"
+msgstr "<a href=\"//directory.fsf.org\">自由軟體目錄</a>"
 
 #. type: Content of: <div><ul><li>
 msgid "<a href=\"https://h-node.org/\";>HARDWARE</a>"
@@ -59,10 +57,9 @@
 
 # type: Content of: <div><div><div><div><ul><li><ul><li>
 #. type: Content of: <div><blockquote><p><a>
-#, fuzzy
 #| msgid "<a href=\"http://www.fsf.org\";>"
 msgid "<a href=\"//www.fsf.org\">"
-msgstr "<a href=\"http://www.fsf.org\";>"
+msgstr "<a href=\"//www.fsf.org\">"
 
 #. type: Attribute 'alt' of: <div><blockquote><p><a><img>
 msgid "[FSF logo]"
@@ -79,16 +76,6 @@
 
 # type: Content of: <div><div><p>
 #. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "The <a href=\"http://www.fsf.org\";>Free Software Foundation</a> is the "
-#| "principal organizational sponsor of the GNU Operating System.  "
-#| "<strong>Support GNU and the FSF</strong> by <a href=\"http://shop.fsf.org/";
-#| "\">buying manuals and gear</a>, <a href=\"https://my.fsf.org/associate/";
-#| "support_freedom?referrer=4052\"> <strong>joining the FSF</strong></a> as "
-#| "an associate member, or making a <strong>donation</strong>, either <a "
-#| "href=\"http://donate.fsf.org/\";>directly to the FSF</a> or <a href="
-#| "\"http://flattr.com/thing/313733/gnuproject-on-Flattr\";>via Flattr</a>."
 msgid ""
 "The <a href=\"//www.fsf.org\">Free Software Foundation</a> is the principal "
 "organizational sponsor of the GNU Operating System.  <strong>Support GNU and "
@@ -99,12 +86,13 @@
 "the FSF</a> or <a href=\"https://flattr.com/thing/313733/gnuproject-on-Flattr";
 "\">via Flattr</a>."
 msgstr ""
-"<a href=\"http://www.fsf.org\";>自由軟體基金會 (FSF) </a>是 GNU 
作業系統的主要"
-"籌劃贊助者。您可以經由<a 
href=\"http://shop.fsf.org/\";>購買使用手冊及物品</"
-"a>、<a 
href=\"https://my.fsf.org/associate/support_freedom?referrer=4052\";>加"
-"入 FSF 會員</a>、<a href=\"http://donate.fsf.org/\";>直接捐款給 
FSF</a>,或<a "
-"href=\"http://flattr.com/thing/313733/gnuproject-on-Flattr\";>透過 Flattr 
捐款"
-"</a>等途徑來<strong>支持 GNU 與 FSF</strong>。"
+"<a href=\"//www.fsf.org\">自由軟體基金會 (FSF) </a>是 GNU 
作業系統的主要籌劃"
+"贊助者。您可以<a 
href=\"//shop.fsf.org/\">購買使用手冊及物品</a>、<a href="
+"\"https://my.fsf.org/associate/support_freedom?referrer=4052\";><strong>加入 
"
+"FSF 會員</strong></a>、<a 
href=\"//donate.fsf.org/\">直接<strong>捐款</"
+"strong>給 FSF</a>,或<a 
href=\"https://flattr.com/thing/313733/gnuproject-on-";
+"Flattr\">透過 Flattr <strong>捐款</strong></a>等方式來<strong>支持 
GNU 與 "
+"FSF</strong>。"
 
 # type: Content of: <div><div><div><div><ul><li>
 #~ msgid "<a href=\"/fun/fun.html\">GNU&nbsp;Fun</a>"

Index: server/po/head-include-2.zh-tw.po
===================================================================
RCS file: /web/www/www/server/po/head-include-2.zh-tw.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/po/head-include-2.zh-tw.po   16 Nov 2017 18:59:04 -0000      1.22
+++ server/po/head-include-2.zh-tw.po   21 Nov 2017 13:39:09 -0000      1.23
@@ -8,7 +8,7 @@
 "Project-Id-Version: head-include-2.html\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-11-16 18:56+0000\n"
-"PO-Revision-Date: 2017-04-30 23:03+0800\n"
+"PO-Revision-Date: 2017-11-21 16:23+0800\n"
 "Last-Translator: Cheng-Chia Tseng <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "Language: zh_TW\n"
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Outdated-Since: 2017-11-16 07:56+0000\n"
-"X-Generator: Poedit 1.8.13\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #. type: Attribute 'content' of: <meta>
 msgid "width=device-width, initial-scale=1"
@@ -114,22 +114,11 @@
 "  width: 4em;\n"
 "}\n"
 msgstr ""
+"\n"
+"#fundraiser .donate, #fundraiser .join\n"
+"{\n"
+"  width: 4em;\n"
+"}\n"
 
-#~ msgid ""
-#~ "#banner2012 { width:974px; height:150px; padding-top:10px;display:block; "
-#~ "margin-left:auto; margin-right:auto;text-align:center; } #banner2012 ."
-#~ "underline { text-decoration: underline; } #banner2012 .nounderline { text-"
-#~ "decoration: none; } #banner2012 .left { float:left; width:150px; "
-#~ "height:150px; } #banner2012 .right { float:right; width:820px; "
-#~ "height:150px;text-align:center; font:16px sans-serif; position:relative; "
-#~ "top:10%; } #banner2012 img {width:100px;display:block;margin-left:auto;"
-#~ "margin-right:auto;padding-bottom:0px;margin-bottom:0px;}"
-#~ msgstr ""
-#~ "#banner2012 { width:974px; height:150px; padding-top:10px;display:block; "
-#~ "margin-left:auto; margin-right:auto;text-align:center; } #banner2012 ."
-#~ "underline { text-decoration: underline; } #banner2012 .nounderline { text-"
-#~ "decoration: none; } #banner2012 .left { float:left; width:150px; "
-#~ "height:150px; } #banner2012 .right { float:right; width:820px; "
-#~ "height:150px;text-align:center; font:16px sans-serif; position:relative; "
-#~ "top:10%; } #banner2012 img {width:100px;display:block;margin-left:auto;"
-#~ "margin-right:auto;padding-bottom:0px;margin-bottom:0px;}"
+#~ msgid "#banner2012 { width:974px; height:150px; 
padding-top:10px;display:block; margin-left:auto; 
margin-right:auto;text-align:center; } #banner2012 .underline { 
text-decoration: underline; } #banner2012 .nounderline { text-decoration: none; 
} #banner2012 .left { float:left; width:150px; height:150px; } #banner2012 
.right { float:right; width:820px; height:150px;text-align:center; font:16px 
sans-serif; position:relative; top:10%; } #banner2012 img 
{width:100px;display:block;margin-left:auto;margin-right:auto;padding-bottom:0px;margin-bottom:0px;}"
+#~ msgstr "#banner2012 { width:974px; height:150px; 
padding-top:10px;display:block; margin-left:auto; 
margin-right:auto;text-align:center; } #banner2012 .underline { 
text-decoration: underline; } #banner2012 .nounderline { text-decoration: none; 
} #banner2012 .left { float:left; width:150px; height:150px; } #banner2012 
.right { float:right; width:820px; height:150px;text-align:center; font:16px 
sans-serif; position:relative; top:10%; } #banner2012 img 
{width:100px;display:block;margin-left:auto;margin-right:auto;padding-bottom:0px;margin-bottom:0px;}"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]