www philosophy/self-interest.zh-tw.html philoso...

[GNUN]

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     20/07/08 11:01:08

Modified files:
        philosophy     : self-interest.zh-tw.html x.de.html x.ja.html 
                         x.ko.html x.nl.html x.pl.html 
        philosophy/po  : self-interest.zh-tw-en.html 
                         self-interest.zh-tw.po x.de-en.html x.id.po 
                         x.ja-en.html x.ja.po x.ko-en.html x.ko.po 
                         x.nl-en.html x.nl.po x.pl-en.html x.pl.po 
        thankgnus/po   : 2020supporters.de-diff.html 
                         2020supporters.de.po 2020supporters.pot 
                         2020supporters.pt-br.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/self-interest.zh-tw.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/x.de.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/x.ja.html?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/x.ko.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/x.nl.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/x.pl.html?cvsroot=www&r1=1.44&r2=1.45
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/self-interest.zh-tw-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/self-interest.zh-tw.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.de-en.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.id.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.ja-en.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.ja.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.ko-en.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.ko.po?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.nl-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.nl.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.pl-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.pl.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/thankgnus/po/2020supporters.de-diff.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/thankgnus/po/2020supporters.de.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/thankgnus/po/2020supporters.pot?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/thankgnus/po/2020supporters.pt-br.po?cvsroot=www&r1=1.87&r2=1.88

Patches:
Index: philosophy/self-interest.zh-tw.html
===================================================================
RCS file: /web/www/www/philosophy/self-interest.zh-tw.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- philosophy/self-interest.zh-tw.html 27 Aug 2019 15:31:22 -0000      1.4
+++ philosophy/self-interest.zh-tw.html 8 Jul 2020 15:01:06 -0000       1.5
@@ -1,17 +1,20 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/self-interest.en.html" -->
 
 <!--#include virtual="/server/header.zh-tw.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.92 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>利己主義 - GNU 專案 - 自由軟體基金會</title>
 
 <!--#include virtual="/philosophy/po/self-interest.translist" -->
 <!--#include virtual="/server/banner.zh-tw.html" -->
+<div class="reduced-width">
 <h2>利己主義</h2>
 
-<p>作者為 <strong>Loyd Fueston</strong></p>
+<p class="byline">作者為 Loyd Fueston</p>
+<hr class="thin" />
 
+<div class="article">
 <p>
 åˆ©å·±ä¸»ç¾©è¶³å¤ çµ„ç¹”ä¸€å€‹è‡ªç”±çš„ç¶“æ¿Ÿç¤¾æœƒå—Žï¼Ÿ</p>
 
@@ -19,21 +22,19 @@
 回答將是：不能。而且， 沒有一個知名的自由市å 
´ç†è«–方面的專家會認為利己主義曾經、 
甚至有可能足以組織自由經濟，或是將它維持一段時間。在這些理論家中，
 亞當‧斯密經常被認為是利己主義的主要的衛道士。 
但是在一本用來糾正對他的教義的錯誤理解的書中， 
我們看到了這樣的對於他對利己主義的觀點的評述：</p>
 
-<blockquote><p>
+<blockquote class="italic"><p>
 「與『成為個人主義者』相比，斯密 
認為是社會的影響將人轉變為道德的生物。 
他認為人們經常高估了自己的利己主義。」
 </p></blockquote>
 
 <p>
 更多更直接的論述如下：</p>
 
-<blockquote><p>
-「（亞當‧斯密）認為基於利己主義來解釋人類行為的嘗試是在分析上被誤導的，
 並且在道德上是有害的。」
+<blockquote class="italic"><p>
+「（亞當‧斯密）認為基於利己主義來解釋人類行為的嘗試是在分析上被誤導的，
 並且在道德上是有害的。」&nbsp;<a
+href="#fn1">[1]</a>
 </p></blockquote>
 
 <p>
-【兩文皆引自 Jerry Z. Muller 的 
《亞當‧斯密：他與我們的時代》第2é ï¼Œ 普林斯é 
“ï¼šæ™®æž—æ–¯é “å¤§å­¸å‡ºç‰ˆç¤¾ï¼Œ1993】</p>
-
-<p>
 
亞當‧斯密意識到，利己主義在任何社會中都是激勵經濟活力的首要力量，
 
無論在相對自由開放的社會中，還是在最最壓抑甚至是禽獸統治的社會中。
 
我們大多數人不喜歡由於尊敬某人而帶來的他(她)的無節制的利己主義é€
 成的後果。 例如，在蘇聯，蘇聯å…
±ç”¢é»¨å’Œè˜‡è¯è»äº‹å’Œæ–‡åŒ–è¾¦å…¬å®¤çš„é ­é ­å€‘ï¼Œ
 
在極力發展利己主義的同時，把蘇聯帶到了對人民不利的境地，
 無論他們是否知道自己做了什麼。</p>
@@ -56,11 +57,10 @@
 有時候，人們會認為事情
出了差錯，他們需要為了某個道德準則而奮鬥， 有必
要犧牲，或者至少是限制自己的利己主義。 當代的自由市å 
´ç†è«–家 Thomas
 Sowell 說：</p>
 
-<blockquote><p>
+<blockquote class="italic"><p>
 
「世界上當然存在非經濟的價值。確實的，存在唯一的非經濟的價值。
 經濟本身不是價值，只是一種價值轉移的辦法。 
如果有關於『非經濟價值』的說法
 （更具體的說，是『社會價值』或者『人類價值』）， 
只是為了否認貿易的å…
§åœ¨çš„真實性，或是否認貿易過程中的一些特殊的價值，
-那麼這種無私的理想的價值只有通過與對此的興趣進行交易才能最有效的體現出來。
 這就是經濟的貿易。」 【引自 Thomas Sowell
-《知識與選擇》第79é ï¼ŒNew York：Basic Books,1980.】
+那麼這種無私的理想的價值只有通過與對此的興趣進行交易才能最有效的體現出來。
 這就是經濟的貿易。」&nbsp;<a href="#fn2">[2]</a>
 </p></blockquote>
 
 <p>
@@ -70,7 +70,17 @@
 利己主義是一種社會的強力的燃料， 
至少當這個社會的人們是經過良好教育的個人時是如此， 
但是利己主義沒什麼神奇而神秘的東西能保証道德的後果。
 只有在外部的，更多的是å…
§å¿ƒçš„道德的約束下，利己主義才會產生道德的後果， 
æŒ‡å¼•ç•¶äº‹äººçš„è¡Œå‹•ã€‚ä¸€å€‹æœ‰è‰¯å¥½ç´„æŸçš„ç¤¾æœƒä¸¦ä¸é 
魔術而存在，
 è€Œæ˜¯é 
向著更高目標的人們的行動，無論是整個社會中對自由的保護，
 還是程式員社群中合作精神的保留，或是在同一時間。</p>
+</div>
 
+<div class="infobox">
+<h3>註釋</h3>
+<ol>
+ <li id="fn1">兩文皆引自 Jerry Z. Muller 的 
《亞當‧斯密：他與我們的時代》第2é ï¼Œ 普林斯é 
“ï¼šæ™®æž—æ–¯é “å¤§å­¸å‡ºç‰ˆç¤¾ï¼Œ1993.</li>
+ <li id="fn2">引自 Thomas Sowell 《知識與選擇》第79é ï¼ŒNew 
York：Basic Books,1980.</li>
+</ol>
+</div>
+
+</div>
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -138,7 +148,7 @@
 <p class="unprintable"><!-- timestamp start -->
 更新時間︰
 
-$Date: 2019/08/27 15:31:22 $
+$Date: 2020/07/08 15:01:06 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/x.de.html
===================================================================
RCS file: /web/www/www/philosophy/x.de.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- philosophy/x.de.html        3 Dec 2016 23:45:11 -0000       1.34
+++ philosophy/x.de.html        8 Jul 2020 15:01:06 -0000       1.35
@@ -12,12 +12,12 @@
 
 <!--#include virtual="/philosophy/po/x.translist" -->
 <!--#include virtual="/server/banner.de.html" -->
+<div class="reduced-width">
 <h2>Die X Window System-Falle</h2>
 
-<p>
-  von <a href="http://www.stallman.org/";><strong>Richard Stallman</strong></a>
-</p>
-
+<p class="byline">von Richard Stallman</p>
+<hr class="thin" />
+<div class="article">
 <p>
 Copyleft oder nicht Copyleft? Das ist eine der größten Kontroversen in der
 Freie-Software-Gemeinschaft. Die Idee des Copylefts ist, dass Feuer mit
@@ -169,7 +169,8 @@
 der Gnade derer abhängig, die mit mehr Mitteln als Skrupel ausgestattet
 sind. Mit Copyleft können wir Freiheit verteidigen, nicht nur für uns,
 sondern für unsere gesamte Gemeinschaft.</p>
-
+</div>
+</div>
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -230,7 +231,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman.</p>
+<p>Copyright &copy; 1998, 1999, 2009, 2015, 2020 Richard M. Stallman.</p>
 
 <p>Dieses Werk ist lizenziert unter einer <a rel="license"
 href="//creativecommons.org/licenses/by-nd/4.0/deed.de">Creative Commons
@@ -245,7 +246,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Letzte Änderung:
 
-$Date: 2016/12/03 23:45:11 $
+$Date: 2020/07/08 15:01:06 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/x.ja.html
===================================================================
RCS file: /web/www/www/philosophy/x.ja.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- philosophy/x.ja.html        3 Feb 2016 09:13:54 -0000       1.36
+++ philosophy/x.ja.html        8 Jul 2020 15:01:06 -0000       1.37
@@ -13,12 +13,12 @@
 
 <!--#include virtual="/philosophy/po/x.translist" -->
 <!--#include virtual="/server/banner.ja.html" -->
+<div class="reduced-width">
 <h2>Xã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒ»ã‚·ã‚¹ãƒ†ãƒ ã®ç½ </h2>
 
-<p>
-  <strong>リチャード・ストールマン</strong>著
-</p>
-
+<p class="byline">リチャード・ストールマン著</p>
+<hr class="thin" />
+<div class="article">
 <p>
 
コピーレフトにすべきか、せざるべきか。これは、自由ソフトウェアのコミュニティにおける主要な論争点の一つです。コピーレフトとは、わたしたちが銃撃には銃撃をもって戦わなければならないということ、すなわち、わたしたちのコードが自由で有り続けるために著作権を利用すべきã
 という考えを意味しています。GNU
 GPLはコピーレフトのライセンスの一例です。</p>
@@ -66,7 +66,7 @@
 Groupは、もはや否というのは間違いだ
などという道義的な勧告をすることはできません。これによって、Xに関連したご自分のソフトウェアにコピーレフトとするとあなたが決断するのは容易となるでしょう。</p>
 
 <p>
-XサーバやXlib、XtといったXのコアにあたるプログラム
の作業をしているならば、コピーレフトとしないことに現実的な理由があります。X.orgグループはこういったプログラãƒ
 
を維持管理するという、コミュニティにとって重要な仕事を行っており、わたしたちの変更点にコピーレフトを適用することは、その利点よりも、それによって開発が分裂してしまうという害の方が大きいのです。ですから、X.orgグループといっしょに作業し、これらのプログラãƒ
 
へのわたしたちの変更にはコピーレフトとしないほうが良いと言えます。また、<tt>xset</tt>や<tt>xrdb</tt>といった、Xコアに近く、大規模な改良をå¿
…
要としないユーティリティも同様です。少なくとも、わたしたちはX.orgグループが、これらのプログラãƒ
 を自由ソフトウェアとして開発し続けã
 
¦ã„くということに関して強固にコミットしていることは知っています。</p>
+XサーバやXlib、XtといったXのコアにあたるプログラム
の作業をしているならば、コピーレフトとしないことに現実的な理由があります。X.orgグループはこういったプログラãƒ
 
を維持管理するという、コミュニティにとって重要な仕事を行っており、わたしたちの変更点にコピーレフトを適用することは、その利点よりも、それによって開発が分裂してしまうという害の方が大きいのです。ですから、X.orgグループといっしょに作業し、これらのプログラãƒ
 
へのわたしたちの変更にはコピーレフトとしないほうが良いと言えます。また、<code>xset</code>や<code>xrdb</code>といった、Xコアに近く、大規模な改良をå¿
…
要としないユーティリティも同様です。少なくとも、わたしたちはX.orgグループが、これらのプログラãƒ
 を自由ソフトウェアとして開発し
 
続けていくということに関して強固にコミットしていることは知っています。</p>
 
 <p>
 ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚„ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒžãƒãƒ¼ã‚¸ãƒ£ã€è¿½åŠ 
的なライブラリやウィジェットといったXコア以外のプログラãƒ
 
については話が違います。そういったものにコピーレフトとしない理由はありませんし、わたしたちはそれらにコピーレフトとすべきです。</p>
@@ -81,7 +81,8 @@
 <p>
 自由ソフトウェア開発者
の皆さん、古い過ちを繰り返してはなりません!
 
もし自分のソフトウェアをコピーレフトとしなければ、わたしたちはソフトウェアの将来を、良心よりも資産の方が多いような誰かのæ
…ˆæ‚²ã«ã‚†ã 
ねることになってしまいます。コピーレフトによって、わたしたちはわたしたち自身のためã
 けではなく、わたしたちのコミュニティå…
¨ä½“の自由を守ることができるのです。</p>
-
+</div>
+</div>
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -134,7 +135,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman</p>
+<p>Copyright &copy; 1998, 1999, 2009, 2015, 2020 Richard M. Stallman</p>
 
 <p>このページは<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ja";>Creative
@@ -149,7 +150,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最終更新:
 
-$Date: 2016/02/03 09:13:54 $
+$Date: 2020/07/08 15:01:06 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/x.ko.html
===================================================================
RCS file: /web/www/www/philosophy/x.ko.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- philosophy/x.ko.html        5 Jul 2019 09:29:42 -0000       1.28
+++ philosophy/x.ko.html        8 Jul 2020 15:01:06 -0000       1.29
@@ -12,12 +12,12 @@
 
 <!--#include virtual="/philosophy/po/x.translist" -->
 <!--#include virtual="/server/banner.ko.html" -->
+<div class="reduced-width">
 <h2>X 윈도우 시스템의 í•¨ì •</h2>
 
-<p>
-  글: <strong>리처드 스톨먼</strong>
-</p>
-
+<p class="byline">글: 리처드 스톨먼</p>
+<hr class="thin" />
+<div class="article">
 <p>
 ì¹´í”¼ë ˆí”„íŠ¸ë¥¼ ì‚¬ìš©í•  것인가, 사용하지 않을 것인가? 
그것은 ìžìœ  소프트웨어 공동체에서 벌어지는 주된 논쟁 중 
하나입니다. ì¹´í”¼ë ˆí”„íŠ¸ì˜
 개념은 불을 끄기 위해 불을 사용하는 것처럼 우리의 
코드를 ìžìœ ë¡­ê²Œ 하기 위해서 카피라이트를 사용해야 
한다는 것입니다. GNU GPL은
@@ -87,9 +87,9 @@
 여러분이 X 서버나 Xlib, Xt와 같은 X의 핵심 부분에 대한 
일을 í•˜ê³  있다면 그것은 ì¹´í”¼ë ˆí”„íŠ¸ë¥¼ 사용하지 못하는 
분명한 ì´ìœ ê°€
 됩니다. X.org 그룹은 그런 프로그램들을 ìœ ì§€í•˜ê¸° 위해 
중요한 ì—­í• ì„ í•˜ê³  있습니다. ê·¸ë¦¬ê³  이러한 프로그램에 
ì¹´í”¼ë ˆí”„íŠ¸ë¥¼ ì ìš©í•˜ê²Œ
 됨으로써 얻어지는 이익은 개발이 분리(fork)되는 것에 의한 
피해보다는 ì ì„ 것입니다. 따라서 X.org 그룹과 일을 하는 
것이 더
-좋을 수도 ìžˆê³ , <tt>xset</tt>ê³¼ <tt>xrdb</tt>와 같은 X 코어에 
가까운 ìœ í‹¸ë¦¬í‹°ë‚˜ 큰 ê°œì„ ì´ 필요하지 않은
-프로그램에서 ì¹´í”¼ë ˆí”„íŠ¸ë¥¼ ì ìš©í•˜ì§€ 않을 수도 있습니다. 
ì ì–´ë„ 우리는 X.org 그룹이 이 프로그램들을 ìžìœ  
소프트웨어로 ê°œë°œí•  확실한
-의무를 ê°€ì§€ê³  있는 것을 ì•Œê³  있습니다.</p>
+좋을 수도 ìžˆê³ , <code>xset</code>ê³¼ <code>xrdb</code>와 같은 X 
코어에 가까운 ìœ í‹¸ë¦¬í‹°ë‚˜ 큰 ê°œì„ ì´
+필요하지 않은 프로그램에서 ì¹´í”¼ë ˆí”„íŠ¸ë¥¼ ì ìš©í•˜ì§€ 않을 
수도 있습니다. ì ì–´ë„ 우리는 X.org 그룹이 이 프로그램들을 
ìžìœ  소프트웨어로
+ê°œë°œí•  확실한 의무를 ê°€ì§€ê³  있는 것을 ì•Œê³  있습니다.</p>
 
 <p>
 그러나 윈도우 ë§¤ë‹ˆì €ë‚˜ ë¶€ê°€ì ì¸ 라이브러리와 ì• 
플리케이션 프로그램들과 같은 X 코어의 바깥에 있는 
프로그램에서는 ë¬¸ì œê°€ 다릅니다. 이들
@@ -112,7 +112,8 @@
 여러분, ìžìœ  소프트웨어 개발자 여러분. 실수를 반복하지 
맙시다. 우리가 ì¹´í”¼ë ˆí”„íŠ¸ë¥¼ 우리의 소프트웨어에 ì 
ìš©í•˜ì§€ 않는다면, 미래에는
 소프트웨어를 사용하기 위해서 양심 보다는 소프트웨어와 
ê´€ë ¨ëœ 자산을 더 많이 가진 사람의 자비심에 호소해야 
합니다. ì¹´í”¼ë ˆí”„íŠ¸ë¥¼
 사용함으로써 우리는 우리 ìžì‹ ì€ ë¬¼ë¡ , 공동체 ì „ì²´ì˜ 
ìžìœ ë¥¼ 지킬 수 있습니다. </p>
-
+</div>
+</div>
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -164,7 +165,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman</p>
+<p>Copyright &copy; 1998, 1999, 2009, 2015, 2020 Richard M. Stallman</p>
 
 <p>이 페이지는 <a rel="license"
 
href="http://creativecommons.org/licenses/by-nd/4.0/deed.ko";>크리에이티브 
커먼스
@@ -183,7 +184,7 @@
 <p class="unprintable"><!-- timestamp start -->
 최종 ìˆ˜ì •ì¼:
 
-$Date: 2019/07/05 09:29:42 $
+$Date: 2020/07/08 15:01:06 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/x.nl.html
===================================================================
RCS file: /web/www/www/philosophy/x.nl.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/x.nl.html        22 May 2017 08:01:00 -0000      1.16
+++ philosophy/x.nl.html        8 Jul 2020 15:01:06 -0000       1.17
@@ -14,12 +14,12 @@
 
 <!--#include virtual="/philosophy/po/x.translist" -->
 <!--#include virtual="/server/banner.nl.html" -->
+<div class="reduced-width">
 <h2>De X Window's Valstrik</h2>
 
-<p>
-  door <strong>Richard M. Stallman</strong>
-</p>
-
+<p class="byline">door Richard Stallman</p>
+<hr class="thin" />
+<div class="article">
 <p>
 Auteursplicht of geen auteursplicht? Dat is &eacute;&eacute;n van de
 grootste controversen binnen de vrije software gemeenschap. Het idee van
@@ -127,10 +127,10 @@
 kwaad doen dan goed door de noodzakelijke splitsing van de ontwikkeling. Het
 is daarom beter met de XFree86 groep samen te werken en onze wijzigingen
 niet auteursplichtig te maken. Hetzelfde geldt voor programma's die daar
-nauw aan gerelateerd zijn zoals <tt>xset</tt> en <tt>xrdb</tt> en die geen
-grote verbeteringen meer nodig hebben. We weten tenminste zeker dat de X.org
-groep zijn best zal doen om deze programma's verder te ontwikkelen als vrije
-software.</p>
+nauw aan gerelateerd zijn zoals <code>xset</code> en <code>xrdb</code> en
+die geen grote verbeteringen meer nodig hebben. We weten tenminste zeker dat
+de X.org groep zijn best zal doen om deze programma's verder te ontwikkelen
+als vrije software.</p>
 
 <p>
 Voor programma's buiten de kern van X is dit anders: toepassingen, window
@@ -162,7 +162,8 @@
 zijn toekomst in gevaar en is de software overgeleverd aan iedereen met meer
 middelen en minder scrupules. Met auteursplicht kunnen we onze vrijheid
 verdedigen, niet alleen voor onszelf maar ook voor de gemeenschap.</p>
-
+</div>
+</div>
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -219,7 +220,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman</p>
+<p>Copyright &copy; 1998, 1999, 2009, 2015, 2020 Richard M. Stallman</p>
 
 <p>Deze pagina is uitgebracht onder een <a rel="license"
 href="https://creativecommons.org/licenses/by-nd/4.0/deed.nl";>Creative
@@ -235,7 +236,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Bijgewerkt:
 
-$Date: 2017/05/22 08:01:00 $
+$Date: 2020/07/08 15:01:06 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/x.pl.html
===================================================================
RCS file: /web/www/www/philosophy/x.pl.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- philosophy/x.pl.html        4 Mar 2016 04:27:27 -0000       1.44
+++ philosophy/x.pl.html        8 Jul 2020 15:01:06 -0000       1.45
@@ -14,12 +14,12 @@
 
 <!--#include virtual="/philosophy/po/x.translist" -->
 <!--#include virtual="/server/banner.pl.html" -->
+<div class="reduced-width">
 <h2>Pułapka X Window</h2>
 
-<p>
-  <strong>Richard M. Stallman</strong>
-</p>
-
+<p class="byline">Richard Stallman</p>
+<hr class="thin" />
+<div class="article">
 <p>
 Stosować copyleft czy&nbsp;nie? To jedna z&nbsp;głównych kontrowersji
 w&nbsp;społeczności wolnego oprogramowania. U&nbsp;podstaw copyleft leży
@@ -169,7 +169,8 @@
 jego przyszłość na&nbsp;łaskę każdego, kto ma więcej środków niż
 skrupułów. Za&nbsp;pomocą copyleft możemy bronić wolności nie tylko 
własnej,
 ale&nbsp;całej naszej społeczności.</p>
-
+</div>
+</div>
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -230,7 +231,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman</p>
+<p>Copyright &copy; 1998, 1999, 2009, 2015, 2020 Richard M. Stallman</p>
 
 <p>Ta strona jest dostępna na&nbsp;<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.pl";>licencji
@@ -247,7 +248,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Aktualizowane:
 
-$Date: 2016/03/04 04:27:27 $
+$Date: 2020/07/08 15:01:06 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/self-interest.zh-tw-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/self-interest.zh-tw-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/self-interest.zh-tw-en.html   27 Aug 2019 15:31:23 -0000      
1.1
+++ philosophy/po/self-interest.zh-tw-en.html   8 Jul 2020 15:01:07 -0000       
1.2
@@ -1,13 +1,16 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.92 -->
 <title>Self-Interest
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/self-interest.translist" -->
 <!--#include virtual="/server/banner.html" -->
+<div class="reduced-width">
 <h2>Self-Interest</h2>
 
-<p>by <strong>Loyd Fueston</strong></p>
+<p class="byline">by Loyd Fueston</p>
+<hr class="thin" />
 
+<div class="article">
 <p>
 Is Self-Interest Sufficient to Organize a Free Economy?</p>
 
@@ -21,7 +24,7 @@
 we find the following summaries of Smith's view about
 self-interest:</p>
 
-<blockquote><p>
+<blockquote class="italic"><p>
 Far from being an individualist, Smith believed it is the influence
 of society that transforms people into moral beings. He thought that
 people often misjudge their own self-interest.
@@ -30,18 +33,13 @@
 <p>
 Even more directly to the point:</p>
 
-<blockquote><p>
+<blockquote class="italic"><p>
 [Adam Smith] regarded the attempt to explain all human behavior on
 the basis of self-interest as analytically misguided and morally
-pernicious.
+pernicious.&nbsp;<a href="#fn1">[1]</a>
 </p></blockquote>
 
 <p>
-[Both quotes are from page 2 of &ldquo;Adam Smith: In His Time and
-Ours&rdquo;, Jerry Z. Muller, Princeton: Princeton University Press,
-1993.]</p>
-
-<p>
 As Adam Smith certainly realized, self-interest will be one of the
 principal forces organizing economic activities in any society, but
 that is as true of the most repressive or brutal society as it is of
@@ -99,7 +97,7 @@
 to sacrifice, or at least qualify, their own self-interest. In the
 words of Thomas Sowell, a free-market theorist of our time:</p>
 
-<blockquote><p>
+<blockquote class="italic"><p>
 There are, of course, noneconomic values.  Indeed, there are
 <em>only</em> noneconomic values. Economics is not a value itself but
 merely a method of trading off one value against another.  If
@@ -109,8 +107,7 @@
 or to exempt some particular value from the trade-off process, then
 such selfless ideals can be no more effectively demonstrated than by
 trading off financial gains in the interest of such ideals. This is an
-economic trade-off. <tt>[from page 79 of &ldquo;Knowledge &amp;
-Decisions&rdquo;, Thomas Sowell, New York: Basic Books, 1980.]</tt>
+economic trade-off.&nbsp;<a href="#fn2">[2]</a>
 </p></blockquote>
 
 <p>
@@ -133,7 +130,20 @@
 the preservation of liberty in the society as a whole or the
 preservation of a cooperative spirit within communities of
 programmers, or maybe both of those at the same time.</p>
+</div>
 
+<div class="infobox">
+<h3>Footnotes</h3>
+<ol>
+ <li id="fn1">Both quotes are from page 2 of &ldquo;Adam Smith: In His Time and
+Ours&rdquo;, Jerry Z. Muller, Princeton: Princeton University Press,
+1993.</li>
+ <li id="fn2">From page 79 of &ldquo;Knowledge &amp; Decisions&rdquo;,
+Thomas Sowell, New York: Basic Books, 1980.</li>
+</ol>
+</div>
+
+</div>
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -191,7 +201,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/08/27 15:31:23 $
+$Date: 2020/07/08 15:01:07 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/self-interest.zh-tw.po
===================================================================
RCS file: /web/www/www/philosophy/po/self-interest.zh-tw.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/self-interest.zh-tw.po        8 Jul 2020 14:41:57 -0000       
1.3
+++ philosophy/po/self-interest.zh-tw.po        8 Jul 2020 15:01:07 -0000       
1.4
@@ -17,7 +17,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2020-07-08 12:55+0000\n"
 
 #. type: Content of: <title>
 msgid "Self-Interest - GNU Project - Free Software Foundation"
@@ -226,15 +225,14 @@
 "Both quotes are from page 2 of &ldquo;Adam Smith: In His Time and "
 "Ours&rdquo;, Jerry Z. Muller, Princeton: Princeton University Press, 1993."
 msgstr ""
-"兩文皆引自 Jerry Z. Muller 的 
《亞當‧斯密：他與我們的時代》第2é ï¼Œ 普林斯"
-"é “ï¼šæ™®æž—æ–¯é “å¤§å­¸å‡ºç‰ˆç¤¾ï¼Œ1993."
+"兩文皆引自 Jerry Z. Muller 的 
《亞當‧斯密：他與我們的時代》第2é ï¼Œ æ™®æž—æ–¯é “ï¼š"
+"æ™®æž—æ–¯é “å¤§å­¸å‡ºç‰ˆç¤¾ï¼Œ1993."
 
 #. type: Content of: <div><div><ol><li>
 msgid ""
 "From page 79 of &ldquo;Knowledge &amp; Decisions&rdquo;, Thomas Sowell, New "
 "York: Basic Books, 1980."
-msgstr "引自 Thomas Sowell 《知識與選"
-"擇》第79é ï¼ŒNew York：Basic Books,1980."
+msgstr "引自 Thomas Sowell 《知識與選擇》第79é ï¼ŒNew York：Basic 
Books,1980."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>

Index: philosophy/po/x.de-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/x.de-en.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- philosophy/po/x.de-en.html  21 Dec 2015 17:30:25 -0000      1.26
+++ philosophy/po/x.de-en.html  8 Jul 2020 15:01:07 -0000       1.27
@@ -9,13 +9,12 @@
 
 <!--#include virtual="/philosophy/po/x.translist" -->
 <!--#include virtual="/server/banner.html" -->
-
+<div class="reduced-width">
 <h2>The X Window System Trap</h2>
 
-<p>
-  by <strong>Richard M. Stallman</strong>
-</p>
-
+<p class="byline">by Richard M. Stallman</p>
+<hr class="thin" />
+<div class="article">
 <p>
 To copyleft or not to copyleft?  That is one of the major
 controversies in the free software community.  The idea of copyleft is
@@ -118,7 +117,8 @@
 these programs, and the benefit of copylefting our changes would be
 less than the harm done by a fork in development.  So it is better to
 work with them, and not copyleft our changes on these programs.
-Likewise for utilities such as <tt>xset</tt> and <tt>xrdb</tt>, which are 
close to the
+Likewise for utilities such as <code>xset</code> and <code>xrdb</code>,
+which are close to the
 core of X and do not need major improvements.  At least we know that
 the X.org group has a firm commitment to developing these programs as
 free software.</p>
@@ -153,7 +153,8 @@
 equipped with more resources than scruples.  With copyleft, we can
 defend freedom, not just for ourselves, but for our whole
 community.</p>
-
+</div>
+</div>
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -201,7 +202,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman</p>
+<p>Copyright &copy; 1998, 1999, 2009, 2015, 2020 Richard M. Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -211,7 +212,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/12/21 17:30:25 $
+$Date: 2020/07/08 15:01:07 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/x.id.po
===================================================================
RCS file: /web/www/www/philosophy/po/x.id.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/x.id.po       8 Jul 2020 14:39:25 -0000       1.3
+++ philosophy/po/x.id.po       8 Jul 2020 15:01:07 -0000       1.4
@@ -291,11 +291,10 @@
 # | the benefit of copylefting our changes would be less than the harm done by
 # | a fork in development.  So it is better to work with [-the XFree86 group-]
 # | {+them,+} and not copyleft our changes on these programs.  Likewise for
-# | utilities such as <code>xset</code> and
-# | <code>xrdb</code> which are close to the core of X
-# | and [-which-] do not need major improvements.  At least we know that the
-# | X.org group has a firm commitment to developing these programs as free
-# | software.
+# | utilities such as <code>xset</code> and <code>xrdb<{+/+}code>, which are
+# | close to the core of X and [-which-] do not need major improvements.  At
+# | least we know that the X.org group has a firm commitment to developing
+# | these programs as free software.
 #, fuzzy
 #| msgid ""
 #| "When you work on the core of X, on programs such as the X server, Xlib, "
@@ -304,10 +303,10 @@
 #| "and the benefit of copylefting our changes would be less than the harm "
 #| "done by a fork in development.  So it is better to work with the XFree86 "
 #| "group and not copyleft our changes on these programs.  Likewise for "
-#| "utilities such as <code>xset</code> and <code>xrdb<code>, which are close 
to the "
-#| "core of X and which do not need major improvements.  At least we know "
-#| "that the X.org group has a firm commitment to developing these programs "
-#| "as free software."
+#| "utilities such as <code>xset</code> and <code>xrdb<code>, which are close "
+#| "to the core of X and which do not need major improvements.  At least we "
+#| "know that the X.org group has a firm commitment to developing these "
+#| "programs as free software."
 msgid ""
 "When you work on the core of X, on programs such as the X server, Xlib, and "
 "Xt, there is a practical reason not to use copyleft.  The X.org group does "
@@ -326,11 +325,11 @@
 "tersebut setiap perubahan akan lebih sedikit daripada kerugian yang "
 "diakibatkan sebuah garpu dalam pengembangan.  Sehingga lebih baik bekerja "
 "dengan kelompok XFree86 dan tidak membebaskan perubahan kita pada program-"
-"program ini. Begitupun untuk penggunaan seperti <code>xset</code> dan 
<code>xrdb</"
-"code>, yang dekat dengan inti dari X, dan yang tidak memerlukan perbaikan-"
-"perbaikan yang besar. Setidaknya kita mengetahui bahwa kelompok X.org "
-"memiliki komitmen yang tegas untuk mengembangkan program-program ini sebagai "
-"perangkat lunak bebas."
+"program ini. Begitupun untuk penggunaan seperti <code>xset</code> dan "
+"<code>xrdb</code>, yang dekat dengan inti dari X, dan yang tidak memerlukan "
+"perbaikan-perbaikan yang besar. Setidaknya kita mengetahui bahwa kelompok X."
+"org memiliki komitmen yang tegas untuk mengembangkan program-program ini "
+"sebagai perangkat lunak bebas."
 
 #. type: Content of: <div><div><p>
 msgid ""

Index: philosophy/po/x.ja-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/x.ja-en.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/po/x.ja-en.html  29 Dec 2015 07:07:08 -0000      1.20
+++ philosophy/po/x.ja-en.html  8 Jul 2020 15:01:07 -0000       1.21
@@ -9,13 +9,12 @@
 
 <!--#include virtual="/philosophy/po/x.translist" -->
 <!--#include virtual="/server/banner.html" -->
-
+<div class="reduced-width">
 <h2>The X Window System Trap</h2>
 
-<p>
-  by <strong>Richard M. Stallman</strong>
-</p>
-
+<p class="byline">by Richard M. Stallman</p>
+<hr class="thin" />
+<div class="article">
 <p>
 To copyleft or not to copyleft?  That is one of the major
 controversies in the free software community.  The idea of copyleft is
@@ -118,7 +117,8 @@
 these programs, and the benefit of copylefting our changes would be
 less than the harm done by a fork in development.  So it is better to
 work with them, and not copyleft our changes on these programs.
-Likewise for utilities such as <tt>xset</tt> and <tt>xrdb</tt>, which are 
close to the
+Likewise for utilities such as <code>xset</code> and <code>xrdb</code>,
+which are close to the
 core of X and do not need major improvements.  At least we know that
 the X.org group has a firm commitment to developing these programs as
 free software.</p>
@@ -153,7 +153,8 @@
 equipped with more resources than scruples.  With copyleft, we can
 defend freedom, not just for ourselves, but for our whole
 community.</p>
-
+</div>
+</div>
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -201,7 +202,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman</p>
+<p>Copyright &copy; 1998, 1999, 2009, 2015, 2020 Richard M. Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -211,7 +212,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/12/29 07:07:08 $
+$Date: 2020/07/08 15:01:07 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/x.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/x.ja.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- philosophy/po/x.ja.po       8 Jul 2020 14:40:16 -0000       1.21
+++ philosophy/po/x.ja.po       8 Jul 2020 15:01:07 -0000       1.22
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2020-07-08 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid "The X Window System Trap - GNU Project - Free Software Foundation"
@@ -249,10 +248,10 @@
 
"したちの変更点にコピーレフトを適用することは、その利点よりも、それによって開"
 
"発が分裂してしまうという害の方が大きいのです。ですから、X.orgグループといっ"
 "しょに作業し、これらのプログラム
へのわたしたちの変更にはコピーレフトとしない"
-"ほうが良いと言えます。また、<code>xset</code>や<code>xrdb</code>といった、Xコアに近"
-"く、大規模な改良を必
要としないユーティリティも同様です。少なくとも、わたした"
-"ちはX.orgグループが、これらのプログラム
を自由ソフトウェアとして開発し続けてい"
-"くということに関して強固にコミットしていることは知っています。"
+"ほうが良いと言えます。また、<code>xset</code>や<code>xrdb</code>といった、Xコ"
+"アに近く、大規模な改良を必
要としないユーティリティも同様です。少なくとも、わ"
+"たしたちはX.orgグループが、これらのプログラム
を自由ソフトウェアとして開発し続"
+"けていくということに関して強固にコミットしていることは知っています。"
 
 #. type: Content of: <div><div><p>
 msgid ""

Index: philosophy/po/x.ko-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/x.ko-en.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/x.ko-en.html  9 May 2017 18:28:25 -0000       1.19
+++ philosophy/po/x.ko-en.html  8 Jul 2020 15:01:07 -0000       1.20
@@ -9,13 +9,12 @@
 
 <!--#include virtual="/philosophy/po/x.translist" -->
 <!--#include virtual="/server/banner.html" -->
-
+<div class="reduced-width">
 <h2>The X Window System Trap</h2>
 
-<p>
-  by <strong>Richard M. Stallman</strong>
-</p>
-
+<p class="byline">by Richard M. Stallman</p>
+<hr class="thin" />
+<div class="article">
 <p>
 To copyleft or not to copyleft?  That is one of the major
 controversies in the free software community.  The idea of copyleft is
@@ -118,7 +117,8 @@
 these programs, and the benefit of copylefting our changes would be
 less than the harm done by a fork in development.  So it is better to
 work with them, and not copyleft our changes on these programs.
-Likewise for utilities such as <tt>xset</tt> and <tt>xrdb</tt>, which are 
close to the
+Likewise for utilities such as <code>xset</code> and <code>xrdb</code>,
+which are close to the
 core of X and do not need major improvements.  At least we know that
 the X.org group has a firm commitment to developing these programs as
 free software.</p>
@@ -153,7 +153,8 @@
 equipped with more resources than scruples.  With copyleft, we can
 defend freedom, not just for ourselves, but for our whole
 community.</p>
-
+</div>
+</div>
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -201,7 +202,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman</p>
+<p>Copyright &copy; 1998, 1999, 2009, 2015, 2020 Richard M. Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -211,7 +212,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/05/09 18:28:25 $
+$Date: 2020/07/08 15:01:07 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/x.ko.po
===================================================================
RCS file: /web/www/www/philosophy/po/x.ko.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- philosophy/po/x.ko.po       8 Jul 2020 14:40:16 -0000       1.19
+++ philosophy/po/x.ko.po       8 Jul 2020 15:01:07 -0000       1.20
@@ -18,7 +18,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2020-07-08 13:26+0000\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
 #. type: Content of: <title>
@@ -240,10 +239,10 @@
 "그램들을 ìœ ì§€í•˜ê¸° 위해 중요한 ì—­í• ì„ í•˜ê³  있습니다. 
ê·¸ë¦¬ê³  이러한 프로그램에 "
 "ì¹´í”¼ë ˆí”„íŠ¸ë¥¼ ì ìš©í•˜ê²Œ 됨으로써 얻어지는 이익은 개발이 
분리(fork)되는 것에 의"
 "한 피해보다는 ì ì„ 것입니다. 따라서 X.org 그룹과 일을 
하는 것이 더 좋을 수도 "
-"ìžˆê³ , <code>xset</code>ê³¼ <code>xrdb</code>와 같은 X 코어에 
가까운 ìœ í‹¸ë¦¬í‹°ë‚˜ 큰 ê°œì„ "
-"이 필요하지 않은 프로그램에서 ì¹´í”¼ë ˆí”„íŠ¸ë¥¼ ì ìš©í•˜ì§€ 
않을 수도 있습니다. ì ì–´"
-"도 우리는 X.org 그룹이 이 프로그램들을 ìžìœ  
소프트웨어로 ê°œë°œí•  확실한 의무"
-"를 ê°€ì§€ê³  있는 것을 ì•Œê³  있습니다."
+"ìžˆê³ , <code>xset</code>ê³¼ <code>xrdb</code>와 같은 X 코어에 
가까운 ìœ í‹¸ë¦¬í‹°"
+"나 큰 ê°œì„ ì´ 필요하지 않은 프로그램에서 ì¹´í”¼ë ˆí”„íŠ¸ë¥¼ ì 
ìš©í•˜ì§€ 않을 수도 있습"
+"니다. ì ì–´ë„ 우리는 X.org 그룹이 이 프로그램들을 ìžìœ  
소프트웨어로 ê°œë°œí•  확"
+"실한 의무를 ê°€ì§€ê³  있는 것을 ì•Œê³  있습니다."
 
 #. type: Content of: <div><div><p>
 msgid ""

Index: philosophy/po/x.nl-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/x.nl-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/x.nl-en.html  22 May 2017 08:01:01 -0000      1.7
+++ philosophy/po/x.nl-en.html  8 Jul 2020 15:01:07 -0000       1.8
@@ -9,13 +9,12 @@
 
 <!--#include virtual="/philosophy/po/x.translist" -->
 <!--#include virtual="/server/banner.html" -->
-
+<div class="reduced-width">
 <h2>The X Window System Trap</h2>
 
-<p>
-  by <strong>Richard M. Stallman</strong>
-</p>
-
+<p class="byline">by Richard M. Stallman</p>
+<hr class="thin" />
+<div class="article">
 <p>
 To copyleft or not to copyleft?  That is one of the major
 controversies in the free software community.  The idea of copyleft is
@@ -118,7 +117,8 @@
 these programs, and the benefit of copylefting our changes would be
 less than the harm done by a fork in development.  So it is better to
 work with them, and not copyleft our changes on these programs.
-Likewise for utilities such as <tt>xset</tt> and <tt>xrdb</tt>, which are 
close to the
+Likewise for utilities such as <code>xset</code> and <code>xrdb</code>,
+which are close to the
 core of X and do not need major improvements.  At least we know that
 the X.org group has a firm commitment to developing these programs as
 free software.</p>
@@ -153,7 +153,8 @@
 equipped with more resources than scruples.  With copyleft, we can
 defend freedom, not just for ourselves, but for our whole
 community.</p>
-
+</div>
+</div>
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -201,7 +202,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman</p>
+<p>Copyright &copy; 1998, 1999, 2009, 2015, 2020 Richard M. Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -211,7 +212,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/05/22 08:01:01 $
+$Date: 2020/07/08 15:01:07 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/x.nl.po
===================================================================
RCS file: /web/www/www/philosophy/po/x.nl.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/po/x.nl.po       8 Jul 2020 14:40:17 -0000       1.11
+++ philosophy/po/x.nl.po       8 Jul 2020 15:01:07 -0000       1.12
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2020-07-08 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid "The X Window System Trap - GNU Project - Free Software Foundation"
@@ -249,10 +248,10 @@
 "kwaad doen dan goed door de noodzakelijke splitsing van de ontwikkeling. Het "
 "is daarom beter met de XFree86 groep samen te werken en onze wijzigingen "
 "niet auteursplichtig te maken. Hetzelfde geldt voor programma's die daar "
-"nauw aan gerelateerd zijn zoals <code>xset</code> en <code>xrdb</code> en die 
geen "
-"grote verbeteringen meer nodig hebben. We weten tenminste zeker dat de X.org "
-"groep zijn best zal doen om deze programma's verder te ontwikkelen als vrije "
-"software."
+"nauw aan gerelateerd zijn zoals <code>xset</code> en <code>xrdb</code> en "
+"die geen grote verbeteringen meer nodig hebben. We weten tenminste zeker dat "
+"de X.org groep zijn best zal doen om deze programma's verder te ontwikkelen "
+"als vrije software."
 
 #. type: Content of: <div><div><p>
 msgid ""

Index: philosophy/po/x.pl-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/x.pl-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- philosophy/po/x.pl-en.html  4 Mar 2016 04:27:27 -0000       1.18
+++ philosophy/po/x.pl-en.html  8 Jul 2020 15:01:07 -0000       1.19
@@ -9,13 +9,12 @@
 
 <!--#include virtual="/philosophy/po/x.translist" -->
 <!--#include virtual="/server/banner.html" -->
-
+<div class="reduced-width">
 <h2>The X Window System Trap</h2>
 
-<p>
-  by <strong>Richard M. Stallman</strong>
-</p>
-
+<p class="byline">by Richard M. Stallman</p>
+<hr class="thin" />
+<div class="article">
 <p>
 To copyleft or not to copyleft?  That is one of the major
 controversies in the free software community.  The idea of copyleft is
@@ -118,7 +117,8 @@
 these programs, and the benefit of copylefting our changes would be
 less than the harm done by a fork in development.  So it is better to
 work with them, and not copyleft our changes on these programs.
-Likewise for utilities such as <tt>xset</tt> and <tt>xrdb</tt>, which are 
close to the
+Likewise for utilities such as <code>xset</code> and <code>xrdb</code>,
+which are close to the
 core of X and do not need major improvements.  At least we know that
 the X.org group has a firm commitment to developing these programs as
 free software.</p>
@@ -153,7 +153,8 @@
 equipped with more resources than scruples.  With copyleft, we can
 defend freedom, not just for ourselves, but for our whole
 community.</p>
-
+</div>
+</div>
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -201,7 +202,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1998, 1999, 2009, 2015 Richard M. Stallman</p>
+<p>Copyright &copy; 1998, 1999, 2009, 2015, 2020 Richard M. Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -211,7 +212,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/03/04 04:27:27 $
+$Date: 2020/07/08 15:01:07 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/x.pl.po
===================================================================
RCS file: /web/www/www/philosophy/po/x.pl.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/po/x.pl.po       8 Jul 2020 14:40:17 -0000       1.24
+++ philosophy/po/x.pl.po       8 Jul 2020 15:01:07 -0000       1.25
@@ -16,7 +16,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2020-07-08 13:26+0000\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.1\n"

Index: thankgnus/po/2020supporters.de-diff.html
===================================================================
RCS file: /web/www/www/thankgnus/po/2020supporters.de-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- thankgnus/po/2020supporters.de-diff.html    1 Jul 2020 15:35:35 -0000       
1.8
+++ thankgnus/po/2020supporters.de-diff.html    8 Jul 2020 15:01:07 -0000       
1.9
@@ -104,6 +104,7 @@
   <span class="inserted"><ins><em>&lt;li&gt;Arthur Gleckler&lt;/li&gt;
   &lt;li&gt;Ben Abrams&lt;/li&gt;</em></ins></span>
   &lt;li&gt;Catena Cyber&lt;/li&gt;
+  <span class="inserted"><ins><em>&lt;li&gt;Chase 
Courtney&lt;/li&gt;</em></ins></span>
   &lt;li&gt;Conan Chiles&lt;/li&gt;
   <span class="inserted"><ins><em>&lt;li&gt;Dario Armani&lt;/li&gt;
   &lt;li&gt;David Klann&lt;/li&gt;
@@ -198,7 +199,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2020/07/01 15:35:35 $
+$Date: 2020/07/08 15:01:07 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: thankgnus/po/2020supporters.de.po
===================================================================
RCS file: /web/www/www/thankgnus/po/2020supporters.de.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- thankgnus/po/2020supporters.de.po   1 Jul 2020 15:35:35 -0000       1.20
+++ thankgnus/po/2020supporters.de.po   8 Jul 2020 15:01:07 -0000       1.21
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 2020supporters.html\n"
 "Report-Msgid-Bugs-To: <development@fsf.org>\n"
-"POT-Creation-Date: 2020-07-01 15:26+0000\n"
+"POT-Creation-Date: 2020-07-08 14:55+0000\n"
 "PO-Revision-Date: 2020-03-04 22:00+0100\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <www-de-translators@gnu.org>\n"
@@ -208,6 +208,13 @@
 msgstr "Catena Cyber"
 
 #. type: Content of: <ul><li>
+# | Chase [-Kelley-] {+Courtney+}
+#, fuzzy
+#| msgid "Chase Kelley"
+msgid "Chase Courtney"
+msgstr "Chase Kelley"
+
+#. type: Content of: <ul><li>
 msgid "Conan Chiles"
 msgstr "Conan Chiles"
 
@@ -986,9 +993,6 @@
 #~ msgid "Brett Holleman"
 #~ msgstr "Brett Holleman"
 
-#~ msgid "Chase Kelley"
-#~ msgstr "Chase Kelley"
-
 #~ msgid "Conner McKeeth"
 #~ msgstr "Conner McKeeth"
 

Index: thankgnus/po/2020supporters.pot
===================================================================
RCS file: /web/www/www/thankgnus/po/2020supporters.pot,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- thankgnus/po/2020supporters.pot     1 Jul 2020 15:35:36 -0000       1.37
+++ thankgnus/po/2020supporters.pot     8 Jul 2020 15:01:07 -0000       1.38
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2020supporters.html\n"
-"POT-Creation-Date: 2020-07-01 15:26+0000\n"
+"POT-Creation-Date: 2020-07-08 14:55+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,6 +163,10 @@
 msgstr ""
 
 #. type: Content of: <ul><li>
+msgid "Chase Courtney"
+msgstr ""
+
+#. type: Content of: <ul><li>
 msgid "Conan Chiles"
 msgstr ""
 

Index: thankgnus/po/2020supporters.pt-br.po
===================================================================
RCS file: /web/www/www/thankgnus/po/2020supporters.pt-br.po,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- thankgnus/po/2020supporters.pt-br.po        1 Jul 2020 15:35:36 -0000       
1.87
+++ thankgnus/po/2020supporters.pt-br.po        8 Jul 2020 15:01:08 -0000       
1.88
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2020supporters.html\n"
-"POT-Creation-Date: 2020-07-01 15:26+0000\n"
+"POT-Creation-Date: 2020-07-08 14:55+0000\n"
 "PO-Revision-Date: 2020-06-30 08:29-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -181,6 +181,10 @@
 msgstr "Catena Cyber"
 
 #. type: Content of: <ul><li>
+msgid "Chase Courtney"
+msgstr ""
+
+#. type: Content of: <ul><li>
 msgid "Conan Chiles"
 msgstr "Conan Chiles"