www-commits
[Top][All Lists]
Advanced

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

www home.uk.html keepingup.uk.html gnu/po/incor...


From: GNUN
Subject: www home.uk.html keepingup.uk.html gnu/po/incor...
Date: Sat, 3 Feb 2018 05:36:23 -0500 (EST)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/02/03 05:36:21

Modified files:
        .              : home.uk.html keepingup.uk.html 
        gnu/po         : incorrect-quotation.translist 
        licenses       : why-assign.uk.html 
        licenses/po    : fdl-1.3-faq.translist gpl-violation.translist 
                         why-assign.uk-en.html why-assign.uk.po 
        philosophy     : free-software-for-freedom.zh-cn.html 
                         free-sw.uk.html fs-translations.fr.html 
                         gnutella.uk.html javascript-trap.uk.html 
                         not-ipr.uk.html selling.uk.html 
                         surveillance-vs-democracy.uk.html 
                         why-copyleft.uk.html 
        philosophy/po  : free-sw.uk-en.html free-sw.uk.po 
                         fs-translations.fr-en.html gnutella.uk-en.html 
                         gnutella.uk.po javascript-trap.uk-en.html 
                         javascript-trap.uk.po not-ipr.uk-en.html 
                         not-ipr.uk.po selling.uk-en.html selling.uk.po 
                         surveillance-vs-democracy.uk-en.html 
                         surveillance-vs-democracy.uk.po 
                         why-copyleft.uk-en.html why-copyleft.uk.po 
        po             : home.uk-en.html home.uk.po keepingup.uk-en.html 
                         keepingup.uk.po 
        proprietary    : malware-apple.fr.html malware-apple.ru.html 
                         proprietary-drm.fr.html proprietary-drm.ru.html 
                         proprietary-sabotage.fr.html 
                         proprietary-sabotage.ru.html 
        proprietary/po : malware-apple.fr-en.html 
                         malware-apple.ja-diff.html 
                         malware-apple.nl-diff.html 
                         malware-apple.ru-en.html malware-apple.ru.po 
                         proprietary-drm.fr-en.html 
                         proprietary-drm.ja-diff.html 
                         proprietary-drm.ru-en.html 
                         proprietary-drm.ru.po 
                         proprietary-sabotage.fr-en.html 
                         proprietary-sabotage.it-diff.html 
                         proprietary-sabotage.ja-diff.html 
                         proprietary-sabotage.ru-en.html 
                         proprietary-sabotage.ru.po 
Added files:
        licenses       : gpl-violation.uk.html 
        licenses/po    : gpl-violation.uk-en.html 
        philosophy/po  : free-software-for-freedom.zh-cn-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home.uk.html?cvsroot=www&r1=1.187&r2=1.188
http://web.cvs.savannah.gnu.org/viewcvs/www/keepingup.uk.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/incorrect-quotation.translist?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/why-assign.uk.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-violation.uk.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/fdl-1.3-faq.translist?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-violation.translist?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/why-assign.uk-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/why-assign.uk.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-violation.uk-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-software-for-freedom.zh-cn.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.uk.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/fs-translations.fr.html?cvsroot=www&r1=1.129&r2=1.130
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/gnutella.uk.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/javascript-trap.uk.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/not-ipr.uk.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/selling.uk.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/surveillance-vs-democracy.uk.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/why-copyleft.uk.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.uk-en.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.uk.po?cvsroot=www&r1=1.61&r2=1.62
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/fs-translations.fr-en.html?cvsroot=www&r1=1.78&r2=1.79
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/gnutella.uk-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/gnutella.uk.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/javascript-trap.uk-en.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/javascript-trap.uk.po?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/not-ipr.uk-en.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/not-ipr.uk.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling.uk-en.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/selling.uk.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.uk-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.uk.po?cvsroot=www&r1=1.65&r2=1.66
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-copyleft.uk-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/why-copyleft.uk.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-software-for-freedom.zh-cn-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.uk-en.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.uk.po?cvsroot=www&r1=1.298&r2=1.299
http://web.cvs.savannah.gnu.org/viewcvs/www/po/keepingup.uk-en.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/po/keepingup.uk.po?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/malware-apple.fr.html?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/malware-apple.ru.html?cvsroot=www&r1=1.44&r2=1.45
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-drm.fr.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-drm.ru.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-sabotage.fr.html?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-sabotage.ru.html?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-apple.fr-en.html?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-apple.ja-diff.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-apple.nl-diff.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-apple.ru-en.html?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-apple.ru.po?cvsroot=www&r1=1.130&r2=1.131
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-drm.fr-en.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-drm.ja-diff.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-drm.ru-en.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-drm.ru.po?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-sabotage.fr-en.html?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-sabotage.it-diff.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-sabotage.ja-diff.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-sabotage.ru-en.html?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-sabotage.ru.po?cvsroot=www&r1=1.119&r2=1.120

Patches:
Index: home.uk.html
===================================================================
RCS file: /web/www/www/home.uk.html,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -b -r1.187 -r1.188
--- home.uk.html        1 Jan 2018 06:21:48 -0000       1.187
+++ home.uk.html        3 Feb 2018 10:36:18 -0000       1.188
@@ -382,7 +382,8 @@
      Information document, www.gnu.org/prep/maintain. -->
 <p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
-<a href="http://www.fsf.org";>Free Software Foundation</a>, Inc.</p>
+<a href="http://www.fsf.org";>Фонд вільного програмного 
забезпечення</a>,
+Inc.</p>
 
 <p>Ця сторінка доступна на умовах <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> ліцензії
@@ -399,7 +400,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2018/01/01 06:21:48 $
+$Date: 2018/02/03 10:36:18 $
 
 <!-- timestamp end -->
 </p>

Index: keepingup.uk.html
===================================================================
RCS file: /web/www/www/keepingup.uk.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- keepingup.uk.html   31 Dec 2017 08:24:30 -0000      1.20
+++ keepingup.uk.html   3 Feb 2018 10:36:18 -0000       1.21
@@ -131,7 +131,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2003, 2004, 2005, 2006, 2007, 2014, 2015, 2017 Фонд
+<p>Copyright &copy; 2003, 2004, 2005, 2006, 2007, 2014, 2015, 2017, 2018 
Фонд
 вільного програмного забезпечення, Inc.</p>
 
 <p>Ця сторінка доступна на умовах <a rel="license"
@@ -148,7 +148,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2017/12/31 08:24:30 $
+$Date: 2018/02/03 10:36:18 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/po/incorrect-quotation.translist
===================================================================
RCS file: /web/www/www/gnu/po/incorrect-quotation.translist,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/po/incorrect-quotation.translist        10 Jan 2018 16:03:22 -0000      
1.1
+++ gnu/po/incorrect-quotation.translist        3 Feb 2018 10:36:19 -0000       
1.2
@@ -3,8 +3,10 @@
 value='<div id="translations">
 <p>
 <span dir="ltr" class="original"><a lang="en" hreflang="en" 
href="/gnu/incorrect-quotation.en.html">English</a>&nbsp;[en]</span> &nbsp;
+<span dir="ltr"><a lang="fr" hreflang="fr" 
href="/gnu/incorrect-quotation.fr.html">français</a>&nbsp;[fr]</span> &nbsp;
 </p>
 </div>' -->
 <link rel="alternate" type="text/html" href="/gnu/incorrect-quotation.html" 
hreflang="x-default" />
 <link rel="alternate" type="text/html" lang="en" hreflang="en" 
href="/gnu/incorrect-quotation.en.html" title="English" />
+<link rel="alternate" type="text/html" lang="fr" hreflang="fr" 
href="/gnu/incorrect-quotation.fr.html" title="français" />
 <!-- end translist file -->

Index: licenses/why-assign.uk.html
===================================================================
RCS file: /web/www/www/licenses/why-assign.uk.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- licenses/why-assign.uk.html 31 Dec 2017 08:24:38 -0000      1.4
+++ licenses/why-assign.uk.html 3 Feb 2018 10:36:19 -0000       1.5
@@ -88,8 +88,8 @@
 перекладу&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2001, 2008, 2009, 2014, 2017 Фонд вільного 
програмного
-забезпечення, Inc.</p>
+<p>Copyright &copy; 2001, 2008, 2009, 2014, 2017, 2018 Фонд 
вільного
+програмного забезпечення, Inc.</p>
 
 <p>Ця сторінка доступна на умовах <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> ліцензії
@@ -106,7 +106,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2017/12/31 08:24:38 $
+$Date: 2018/02/03 10:36:19 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/fdl-1.3-faq.translist
===================================================================
RCS file: /web/www/www/licenses/po/fdl-1.3-faq.translist,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- licenses/po/fdl-1.3-faq.translist   22 May 2015 06:07:06 -0000      1.13
+++ licenses/po/fdl-1.3-faq.translist   3 Feb 2018 10:36:19 -0000       1.14
@@ -9,6 +9,7 @@
 <span dir="ltr"><a lang="fr" hreflang="fr" 
href="/licenses/fdl-1.3-faq.fr.html">français</a>&nbsp;[fr]</span> &nbsp;
 <span dir="ltr"><a lang="ja" hreflang="ja" 
href="/licenses/fdl-1.3-faq.ja.html">日本語</a>&nbsp;[ja]</span> &nbsp;
 <span dir="ltr"><a lang="ru" hreflang="ru" 
href="/licenses/fdl-1.3-faq.ru.html">русский</a>&nbsp;[ru]</span> &nbsp;
+<span dir="ltr"><a lang="uk" hreflang="uk" 
href="/licenses/fdl-1.3-faq.uk.html">українська</a>&nbsp;[uk]</span> 
&nbsp;
 </p>
 </div>' -->
 <link rel="alternate" type="text/html" href="/licenses/fdl-1.3-faq.html" 
hreflang="x-default" />
@@ -19,4 +20,5 @@
 <link rel="alternate" type="text/html" lang="fr" hreflang="fr" 
href="/licenses/fdl-1.3-faq.fr.html" title="français" />
 <link rel="alternate" type="text/html" lang="ja" hreflang="ja" 
href="/licenses/fdl-1.3-faq.ja.html" title="日本語" />
 <link rel="alternate" type="text/html" lang="ru" hreflang="ru" 
href="/licenses/fdl-1.3-faq.ru.html" title="русский" />
+<link rel="alternate" type="text/html" lang="uk" hreflang="uk" 
href="/licenses/fdl-1.3-faq.uk.html" title="українська" />
 <!-- end translist file -->

Index: licenses/po/gpl-violation.translist
===================================================================
RCS file: /web/www/www/licenses/po/gpl-violation.translist,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- licenses/po/gpl-violation.translist 22 May 2015 06:07:07 -0000      1.10
+++ licenses/po/gpl-violation.translist 3 Feb 2018 10:36:19 -0000       1.11
@@ -13,6 +13,7 @@
 <span dir="ltr"><a lang="pl" hreflang="pl" 
href="/licenses/gpl-violation.pl.html">polski</a>&nbsp;[pl]</span> &nbsp;
 <span dir="ltr"><a lang="ru" hreflang="ru" 
href="/licenses/gpl-violation.ru.html">русский</a>&nbsp;[ru]</span> 
&nbsp;
 <span dir="ltr"><a lang="ta" hreflang="ta" 
href="/licenses/gpl-violation.ta.html">தமிழ்</a>&nbsp;[ta]</span> 
&nbsp;
+<span dir="ltr"><a lang="uk" hreflang="uk" 
href="/licenses/gpl-violation.uk.html">українська</a>&nbsp;[uk]</span>
 &nbsp;
 <span dir="ltr"><a lang="zh-cn" hreflang="zh-cn" 
href="/licenses/gpl-violation.zh-cn.html">简体中文</a>&nbsp;[zh-cn]</span> 
&nbsp;
 <span dir="ltr"><a lang="zh-tw" hreflang="zh-tw" 
href="/licenses/gpl-violation.zh-tw.html">繁體中文</a>&nbsp;[zh-tw]</span> 
&nbsp;
 </p>
@@ -29,6 +30,7 @@
 <link rel="alternate" type="text/html" lang="pl" hreflang="pl" 
href="/licenses/gpl-violation.pl.html" title="polski" />
 <link rel="alternate" type="text/html" lang="ru" hreflang="ru" 
href="/licenses/gpl-violation.ru.html" title="русский" />
 <link rel="alternate" type="text/html" lang="ta" hreflang="ta" 
href="/licenses/gpl-violation.ta.html" title="தமிழ்" />
+<link rel="alternate" type="text/html" lang="uk" hreflang="uk" 
href="/licenses/gpl-violation.uk.html" title="українська" />
 <link rel="alternate" type="text/html" lang="zh-cn" hreflang="zh-cn" 
href="/licenses/gpl-violation.zh-cn.html" title="简体中文" />
 <link rel="alternate" type="text/html" lang="zh-tw" hreflang="zh-tw" 
href="/licenses/gpl-violation.zh-tw.html" title="繁體中文" />
 <!-- end translist file -->

Index: licenses/po/why-assign.uk-en.html
===================================================================
RCS file: /web/www/www/licenses/po/why-assign.uk-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- licenses/po/why-assign.uk-en.html   31 Dec 2017 08:24:41 -0000      1.3
+++ licenses/po/why-assign.uk-en.html   3 Feb 2018 10:36:19 -0000       1.4
@@ -73,7 +73,7 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2001, 2008, 2009, 2014, 2017 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 2001, 2008, 2009, 2014, 2017, 2018 Free Software 
Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -83,7 +83,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/12/31 08:24:41 $
+$Date: 2018/02/03 10:36:19 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/why-assign.uk.po
===================================================================
RCS file: /web/www/www/licenses/po/why-assign.uk.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- licenses/po/why-assign.uk.po        2 Feb 2018 17:18:57 -0000       1.8
+++ licenses/po/why-assign.uk.po        3 Feb 2018 10:36:19 -0000       1.9
@@ -14,9 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODINGLanguage: uk\n"
-"X-Outdated-Since: 2018-01-01 05:57+0000\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
 
 #. type: Content of: <title>
@@ -148,15 +147,12 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 2001, 2008, 2009, 2014, 2017 Free Software Foundation, "
-#| "Inc."
 msgid ""
 "Copyright &copy; 2001, 2008, 2009, 2014, 2017, 2018 Free Software "
 "Foundation, Inc."
 msgstr ""
-"Copyright &copy; 2001, 2008, 2009, 2014, 2017, 2018 Фонд вільного 
програмного "
-"забезпечення, Inc."
+"Copyright &copy; 2001, 2008, 2009, 2014, 2017, 2018 Фонд вільного 
"
+"програмного забезпечення, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -179,4 +175,3 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Оновлено:"
-

Index: philosophy/free-software-for-freedom.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-software-for-freedom.zh-cn.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/free-software-for-freedom.zh-cn.html     6 Jan 2009 23:22:38 
-0000       1.6
+++ philosophy/free-software-for-freedom.zh-cn.html     3 Feb 2018 10:36:19 
-0000       1.7
@@ -1,226 +1,276 @@
-<?xml version="1.0" encoding="GB2312" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="zh_CN">
-
-<head>
-<title>¿ª·ÅÔ´Âë - GNU ²Ù×÷ϵͳ - ×ÔÓÉÈí¼þ»ù½ð»á£¨FSF£©</title>
-<meta http-equiv="content-type" content='text/html; charset=gb2312' />
-<link rel="stylesheet" type="text/css" href="/gnu.css" />
-<link rev="made" href="mailto:address@hidden"; />
-<meta http-equiv="Description" name="Description" content="This essay 
describes the key differences between open source and free software, and 
describes why the GNU project favors the term free software." />
-<meta http-equiv="Keywords" name="Keywords" content="open source, free 
software, open, source, free, software, gnu, foundation, freedom, programmers, 
linux" />
-</head>
-
-<!-- ²Ù×÷ Èí¼þ ¹¤³Ì ÐÅÏ¢ Îĵµ Ö÷Ò³ cn -->
-<!-- ²Ù×÷ Èí¼þ ¹¤³Ì ÐÅÏ¢ Îĵµ Ö÷Ò³ cn -->
-
-<!-- This document is in XML, and xhtml 1.0 -->
-<!-- Please make sure to properly nest your tags -->
-<!-- and ensure that your final document validates -->
-<!-- consistent with W3C xhtml 1.0 and CSS standards -->
-<!-- See validator.w3.org -->
-
-<body>
-
-<p>±¾Ò³µÄ <a 
href="free-software-for-freedom.html#translations">·­ÒëÎı¾</a></p>
-
-<h3>×ÔÓÉÈí¼þ£¬²»Ö»ÊÇ¿ª·ÅÔ´Âë</h3>
-<p>
-<a href="/graphics/philosophicalgnu.html"><img 
src="/graphics/philosophical-gnu-sm.jpg"
-       alt=" [image of a Philosophical Gnu] "
-       width="160" height="200" /></a>
-</p>
-
-<p><a href="/philosophy/open-source-misses-the-point.html">¡°Open
-Source¡± misses the point of Free Software</a> is an updated
-version of this article.</p>
-
-<P>×ÔÓÉÈí¼þ¼´Ê¹²»ÒÔ ×ÔÓÉ ÃüÃû£¬Ò»ÑùÒ²ÄÜ»ñÖ ×ÔÓÉ 
µÄʵÖÊ£¬µ«ÎÒÃÇ»¹ÊÇÒªÕâ¸öÃû³Æ¡£</p>
+<!--#set var="ENGLISH_PAGE" 
value="/philosophy/free-software-for-freedom.en.html" -->
 
-<P>ÀíÓÉÊÇ£º<b>Ãû³Æ´ú±íÒâ棬²»Í¬×ÖÑÛ´«µ¼²»Í¬ÀíÄî¡£</b></p>
+<!--#include virtual="/server/header.zh-cn.html" -->
+<!-- Parent-Version: 1.79 -->
 
-<p>Ò»¾Å¾Å°ËÄ꣬×ÔÓÉÈí¼þÉçȺµÄijЩÈË£¬¿ªÊ¼¸ÄÓà ``<a 
href="http://www.opensource.org/";>¿ª·ÅÔ´ÂëÈí¼þ</a> <span class="rm">£¨open 
source software£©</span>'' À´Ìæ´ú ``<a 
href="/philosophy/free-sw.html">×ÔÓÉÈí¼þ</a> <span class="rm">£¨free 
software£©</span>'' 
Ö®Ãû¡£¡¸¿ª·ÅÔ´Â롹Õâ¸ö´Ê£¬Ñ¸¼´Á¬½áµ½²»Í¬µÄÐÄ̬¡¢²»Í¬µÄ˼ά¡¢²»Í¬µÄ¼ÛÖµ£¬ÉõÖÁ³ÉΪ×ÔÓɾ«ÉñµÄÐÂʽ¼ìÑé³ß¡£ÏÖÔÚ£¬×ÔÓÉÈí¼þÔ˶¯Ó뿪·ÅÔ´ÂëÔ˶¯£¬ÒѾ­
 <a href="#relationship">¸÷ÓзÖÒ°</a> 
¡£ËäȻʵÎñÉÏÁ½ÕßÄÜÒ»Æð¹¤×÷£¬µ××ÓÈ´Óв»Í¬ÊÓ½çÓ벻ͬĿ±ê¡£</p>
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>为什么&ldquo;自由软件&rdquo;好于&ldquo;开源&rdquo; - 
GNU工程 - 自由软件基金会</title>
 
-<p>Á½¸öÔ˶¯ÔÚ»ù±¾²ãÃæµÄ²î±ð£¬ÏµÆðì¶ËûÃǵļÛÖµÐÅÄÓëËûÃÇ¿´´ýÊÀ½çµÄ·½·¨¡£¾Í¿ª·ÅÔ´ÂëÔ˶¯¶øÑÔ£¬Ô´Âë°éËæÈí¼þÉ¢²¥ÏµÊµÖʱØÒª£¬²»ÊǵÀµÂËßÇó¡£</p>
+<!--#include virtual="/philosophy/po/free-software-for-freedom.translist" -->
+<!--#include virtual="/server/banner.zh-cn.html" -->
+<h2>为什么&ldquo;自由软件&rdquo;好于&ldquo;开源&rdquo;</h2>
 
-<p>ÓÐÈËÕâô˵£¬<b>¡¸¿ª·ÅÔ´ÂëÊÇÒ»ÖÖ¿ª·¢Èí¼þµÄ·½·¨ÂÛ£»×ÔÓÉÈí¼þÔòÊÇÉç»áÔ˶¯¡£¡¹</b></p>
-
-<p>¿ª·ÅÔ´ÂëÔ˶¯ÈÏΪ£¬·Ç×ÔÓÉÈí¼þ <span class="rm">£¨non-free software£©</span> 
»¹ËãÊÇ´ÕºÏÀíÏëµÄÌæ´ú°¸¡£¶ø×ÔÓÉÈí¼þÔ˶¯ÈÏΪ£¬·Ç×ÔÓÉÈí¼þÖ®´æÔÚ£¬¼´±íáçÁËÉç»áÎÊÌâµÄ´æÔÚ£¬Õë¶ÔÕâ¸öÎÊÌ⣬×ÔÓÉÈí¼þ¾ÍÊǽâ¾ö·½°¸¡£</p>
+<div class="announcement">
+<blockquote><p>本文已经被其主要重写版替代,<a
+href="/philosophy/open-source-misses-the-point.html">&ldquo;开源&rdquo;错失了自由软件的重点</a>,重写版要好得多。为了历史原å›
 ï¼Œæˆ‘们还把它放在这里。</p></blockquote>
+</div>
 
-<A NAME="relationship">
-<h4>Á½¸öÔ˶¯µÄÇ×Ôµ¹Øϵ</h4>
-</a>
+<p>
+虽然自由软件不以自由命名,也能给你同æ 
·çš„自由,但是使用其他的名字会造
成重大的不同:不同的词汇<em>传达不同的理念</em>。</p>
 
-<p>ÏëÏñ×ÔÓÉÈí¼þÉçȺÊǸö¹ú¼Ò£¬Á½¸öÔ˶¯Â·Ïß¾ÍÏñÊÇÒ»¹úÖ®ÄÚÓÐÁ½¸öÕþµ³¡£</p>
+<p>
+1998年,自由软件社区有些人开始使用<a
+href="https://opensource.org/";>&ldquo;开源软件&rdquo;</a>来替代<a
+href="/philosophy/free-sw.html">&ldquo;自由软件&rdquo;</a>来描述他们的所作所为。&ldquo;开源&rdquo;一词è¿
…速å…
³è”到不同的方法、不同的哲学、不同的价值,甚至是接受何种许可证的不同æ
 ‡å‡†ã€‚现在,自由软件运动与开源运动,已经是<a
+href="#relationship">各自独立的运动</a>,它们有不同的观点和目æ
 ‡ï¼Œè™½ç„¶ä¸¤è€…还能一起从事实际的项目。</p>
 
-<p>ÁùÊ®Äê´ú¼¤½øÍÅÌåµÄ»î¶¯Àú³Ì£¬Ê¹ÈËÃǶԵ³ÅÉÖ®ÕùÓÐÕâÑùµÄÈÏÖª£º 
<b>×éÖ¯µÄ¸îÁÑÆðÒòì¶ÈÎÊÂÓëÕþ²ßµÄ²»Ò»Ö¼û½â£¬ÒìÒéÕóÓª¶ÔÖÅÈôµÐ¡£</b> 
»òÖÁÉÙ¿É˵£¬ÎÞÂÛÕâ¸öÈÏÖªÊÇ·ñºÏºõʷʵ£¬ÈËÃǵÄÓ¡Ïó´ó¸Å¾ÍÊÇÄÇÑù¡£</p>
+<p>
+两个运动的根本差别在于它们的价值、它们看待
世界的方法。就开源运动而言,软件是否应该开源是一个实é™
…
的问题,而不是道德诉求。正如有人指出,&ldquo;开源是一种开发的方法;自由软件是一场社会运动。&rdquo;对开源运动来说,非自由软件不是最佳答案。对自由软件运动来说,非自由软件是社会问题,而自由软件是正解。</p>
 
-<p>×ÔÓÉÓ뿪·ÅÁ½¸öÔ˶¯ÕóÓªÖ®¼ä£¬ÍêÈ«²»Í¬ì¶ÉÏÊöÄÇ»ØÊ¡£ËûÃǵĻù±¾Ô­Ôò²»Í¬£¬µ«ÊµÎñ²ãÃæµÄ·½Õë´óÖÂÏàͬ¡£Á½ÕßÄܹ²Í¬³É¾ÍÌض¨µÄ¹¤³Ì¡£×ÔÓÉÕóÓª²»½«¿ª·ÅÕóÓªµ±×÷µÐÈË¡£
 <a href="/philosophy/categories.html#ProprietarySoftware">˽ȨÈí¼þ²ÅÊǵÐÈË</a> 
¡£</p>
+<h3 id="relationship">自由软件运动和开源运动的关系</h3>
 
-<p>×ÔÓÉÈí¼þÔ˶¯Õß²»·´¶Ô¿ª·ÅÔ´ÂëÔ˶¯£¬µ«Õâ²»±íʾÁ½Õß¿ÉÒÔº¬ºý»­ÉϵȺš£ÎÒÃdzÐÈÏ 
``open source'' 
¶Ô×ÔÓÉÈí¼þÉçȺÓй±Ï×£¬È»¶ø£¬ÎÒÃÇÆÚÍûÈËÃÇÈÏʶµ½£¬×ÔÓÉÈí¼þÉçȺµÄʼ´´¾ÍÊÇÖ²¸ùì¶ 
``free software'' 
µÄÀíÄî¡£¶Ôì¶ÎÒÃǵijɹû£¬ÎÒÃÇÆÚ´ýÈËÃÇÁªÏëµ½×ÔÓÉÈí¼þµÄ¼ÛÖµÐÅÄîÒÔ¼°ÕÜѧ¹Û£¬²»ÊÇÁªÏëµ½¿ª·ÅÔ´ÂëÐûÑïµÄ¹ÛÄî¡£ÎÒÃÇÒªÈËÃÇ¿´¼ûÎÒÃÇ£¬ÎÒÃDz»Ï£ÍûÑÚ±ÎÔÚ
 ``open source'' µÄ¹ââºó¡£ÎªÃâì¶ ``free'' ±»ÊÓΪ ``open'' 
µÄÒ»¸ö·ÖÁ÷£¬ÎÒÃÇÈÌÍ´±ÜÓà ``¿ª·ÅµÄ<span class="rm">£¨open£©</span>'' 
Õâ×ÖÑÛ´ú³Æ×ÔÓÉÈí¼þ£¬Ò²²»Ê¹Óà ``·Ç¿ª·ÅµÄ¡¢·â±ÕµÄ<span 
class="rm">£¨closed£©</span>'' ³Æºô·Ç×ÔÓÉÈí¼þ¡£</p>
+<p>
+自由软件运动和开源运动就像自由软件社区里的两个政治阵营。</p>
 
-<p>Òò´Ë£¬µ±Äú̸ÂÛÎÒÃǵÄ×÷Ϊ£¬ÒÔ¼°Ì¸ÂÛÎÒÃǵÄÈí¼þ--±ÈÈç <a 
href="gnu/linux-and-gnu.html">GNU/Linux</a> 
²Ù×÷ϵͳ£¬Çë˵£º×ÔÓÉÈí¼þÔ˶¯£¬¶ø²»ÊǹڳÆËûÃû¡£</p>
+<p>
+20世纪60年代激进团体形成的口碑就是派系主义:组织的割裂起å›
 äºŽå¯¹æˆ˜ç•¥ç»†èŠ‚的分歧,而后异议阵营对峙若敌。或者
至少可说,无论这个是否属实,人们的印象就是这样。</p>
 
-<a name="relationship">
-<h4>Á½ÖÖ´ë´ÇµÄ±È½Ï</h4>
-</a>
+<p>
+自由软件运动与开源运动的å…
³ç³»å’Œä¸Šè¿°å°è±¡æ­£å¥½ç›¸åã€‚我们的基本原则不同,但对实际
操作的建议大致相同。所以两者能够å…
±åŒæˆå°±ç‰¹å®šçš„项目。我们不认为开源运动是敌人。敌人是<a
+href="/philosophy/categories.html#ProprietarySoftware">专属软件</a>。</p>
 
-<p>µ×ÏÂÕë¶Ô ``free software'' ÒÔ¼° ``open source'' Á½ÖÖ´ë´Ç×ö±È½Ï¡£¸æËßÄúΪºÎ 
``open source'' Ìõ¿îûÓнâ¾öÒ»ÇÐÎÊÌ⣬·´¶øÖÆÔìÆäËüÎÊÌâ¡£</p>
+<p>
+我们不反对开源运动,但是我们不想和他们混为一谈。我们感谢他们对自由软件社区有贡献,但是是我们创建的社区,而我们期望人们认识到这一点。我们期å¾
…
人们把我们的价值与哲学和我们的成就联系起来,而不是联想到开源的观念。我们要人们听到我们的声音,而不是被遮蔽在持有不同观点的另一群人背后。为了防止被视为是他们的一部分,我们忍痛避用&ldquo;开放的&rdquo;这个词汇来描述自由软件,也不使用&ldquo;封闭的&rdquo;这个字眼来称呼非自由软件。</p>
 
-<h4>ÓïÒ⺬ºý</h4>
+<p>
+因
此,当您谈论我们的作为,以及谈论我们的软件&mdash;比如<a
+href="/gnu/linux-and-gnu.html">GNU/Linux</a>操作系统时,请说自由软件运动。</p>
 
-<p>Õâ¸öÃû³Æ ``free software'' °üº¬Ä£ºýµã£¬µ¼ÖÂÒ»¸öÒâÍâµÄ½âÊÍ£º 
<b>¡¸Ã⸶·ÑµÄÈí¼þ¡¹</b> £»Í¬Ê±£¬Ò²º¬ÓÐËüÆóͼ´«´ïµÄÒâζ£º 
<b>¡¸¸øÓèʹÓÃÕßÃ÷È·³Ì¶È×ÔÓɵÄÈí¼þ¡¹</b> ¡£ÎÒÃÇÓÐ <a 
href="/philosophy/free-sw.html">¸ü¾«È·µÄ¶¨Òå</a> 
ÒÔÒòÓ¦ÎÊÌ⣬µ«ÊÇ£¬¹âÀåÕýËüµÄ¶¨Òå²»ÄÜÈ«È»Ïû³ýÕÏ°­¡£Èç¹ûÄÜÕÒµ½¾«×¼µÄÕýÈ·´ë´Ç¡¢Ò»¸ö²»ÒýÆðÆäËüÒÉÎʵĴë´Ç£¬ÄÇÑùµ±È»±È½ÏºÃ¡£</p>
+<h3 id="comparison">两种措辞的比较</h3>
 
-<p>Ôã¸âµÄÊÇ£¬Äܹ»Öû» ``free'' 
µÄÒ»ÇÐÓ¢ÎÄ×ֻ㣬¶¼Óи÷×ÔµÄÎÊÌâ¡£ÎÒÃdz¢ÊÔ¸÷·½ÈËÊ¿½¨ÒéµÄ×Ö£¬Ò²Ã»ÓÐÕÒµ½×ã¿ÉÒ»ÑÔÒԱεÄ×Ö¡£Ã¿¸öÌá°¸¶¼ÓÐÀàËƵÄÓïÒåÖ®ÒÉ£¬ÉõÖÁ¸ü²Ò£¬°üÀ¨
 ``opensource software'' Ò²²»³É¡£</p>
+<p>
+本文以下部分比较&ldquo;自由软件&rdquo;和&ldquo;开源&rdquo;两种措辞。这会告诉您为何&ldquo;开源&rdquo;一词没有解决任何问题,反而制é€
 äº†éº»çƒ¦ã€‚</p>
 
-<p>¾ÍÁ½¸öÔ˶¯ÕóÓªµÄÕýʽ¶¨Òå <span class="rm">£¨¹Ù·½¶¨Ò壩</span>¶øÑÔ£¬ ``open 
source software'' ¼¸ºõµÈì¶ ``free software'' £»²»¹ý£¬Ä³Ð©·½Ãæ ``open source'' 
ÉÔÏÓËÉÉ¢£¬ÇÒËûÃÇÒý½øµÄ²¿·ÖÌõ¿î£¬¸øʹÓÃÕß´øÀ´¾ÐÊø£¬ÔÚÎÒÃǵĿ¼Á¿Éϲ»ÄܽÓÊÜ¡£</p>
+<h3 id="ambiguity">歧义</h3>
 
-<p>´ËÍ⣬ ``open source'' 
ÏÔÈ»±íʾ<b>¡¸Äú¿ÉÒÔ¼ìÊÓÔ´Â롹¡£</b>Õâ¸öÅÐ×¼±È×ÔÓÉÈí¼þÏëÒªµÄ¸üÐα¡Èõ£¬ÒòΪËü¾¡¹Ü¿ÉÒÔ°üÂÞ×ÔÓÉÈí¼þ£¬µ«ÆäËüµÄ
 <a href="/philosophy/categories.html#semi-freeSoftware">°ë×ÔÓÉÈí¼þ</a> 
ÒÔ¼°Ä³Ð© <a href="/philosophy/categories.html#ProprietarySoftware">˽ȨÈí¼þ</a> 
¶¼¿ÉÒÔ»ì¹ý×ÖÒ婶´¡£</p>
+<p>
+&ldquo;free
+software&rdquo;一词带有歧义,它有一个不是我们期望的解释:&ldquo;å
…è´¹å¯å¾—的软件&rdquo;。而我们的定义是:&ldquo;给予使用者
自由的软件&rdquo;。两个解释都刚好符合这个名字。我们发布说明<a
+href="/philosophy/free-sw.html">更准确的自由软件定义</a>来澄清
这个问题,但这不是一个完美的解决方案;它不能å…
¨ç„¶æ¶ˆé™¤è¿™ä¸ªé—®é¢˜ã€‚如果能找到没有歧义、也不引起å…
¶ä»–问题的措辞当然是比较好的。</p>
 
-<p>``open source'' 
Ëù±íʾµÄÒâ˼£¬ÒÑÍÑÀëÔ­Ïȳ«ÒéÕßµÄËßÇó¡£½á¹ûÔì³É´ó¶àÈËÎó½âËüµÄ±¾Òâ¡£À´¿´¿´×÷¼Ò 
Neal StephensonÈçºÎ½âÊÍ ``open source'' £º
+<p>
+不幸的是,所有可用的替代英文措辞都有各自的问题。我们尝试各方人士建议的措辞,也没有找到一个明显&ldquo;正确&rdquo;的好替代。每个替代&ldquo;free
+software&rdquo;的提案都有类似的语义问题,甚至更差&mdash;å…
¶ä¸­åŒ…括&ldquo;opensource
+software(开源)&rdquo;</p>
 
-<blockquote><b>Linux 
ÊÇ¿ª·ÅÔ´ÂëÈí¼þ£¬ÒâζÖø¡¢µ±È»µÄ£¬ÎÞÂÛË­¶¼ÄÜÄõ½ËüµÄÈí¼þÔ´Âë¡£</b></blockquote>
+<p>
+由开源促进会发布的&ldquo;开源软件&rdquo;的官方定义和我们对自由软件的定义非常接近;不过,它某些方面稍显松散,而且它接受的某些许可证给用户带来限制是我们不能接受的。然而,&ldquo;开源软件&rdquo;这一表达的字面意义是&ldquo;ä½
 å¯ä»¥æŸ¥çœ‹æºä»£ç ã€‚&rdquo;这个标准比自由软件弱太多;它包
含自由软件,但是也包含一些<a
+href="/philosophy/categories.html#ProprietarySoftware">专属</a>程序,比如Xv和按ç
…§åŽŸå§‹è®¸å¯è¯å‘布的Qt(在QPL<sup><a
+href="#TransNote1">1</a></sup>之前的许可证)。</p>
 
-<p>ÎÒÏë Neal Stephenson ²¢Î´Ö£ÖØÆäʵØÀí½â ``open source'' 
µÄÕýʽ¶¨Òå¡£ÎÒÏ룬ËûÖ»Êǵ¥´¿¹ËÃû˼Òå¡£¿°Èø˹ÖÝÕþ¸®µÄ¹ÙÑùÑÔÂÛÖУ¬Ò²±íÏÖÀàËƳ̶ȵÄÈÏÖª£º
+<p>
+&ldquo;开源&rdquo;的字面意思已经不是倡议者原来的诉求。å…
¶ç»“果是大多人误解了其倡导者倡导的本意。来看看作家Neal
+Stephenson如何定义&ldquo;开源&rdquo;:</p>
 
-<blockquote><b>¿ª·ÅÔ´ÂëÈí¼þµÄʵÓòãÃæ¡£ËüµÄ³ÌʽԴÂë¿ÉÒÔ×ÔÓÉÇÒ¹«¿ªÁ÷ͨ£¬ÖÁì¶Ê¹ÓÃÕßÄܹ»ÀûÓÃÆäÔ´Âë×öʲôÊ£¬ÔòÊÓ¸÷É«²»Ò»µÄ¸½´øÌõ¿îÖ®ÈÝÐí³Ì¶È¡£</b></blockquote>
+<blockquote><p>
+Linux是&ldquo;开源&rdquo;软件意味着,简单说,任何人都可以获得å
…¶æºä»£ç æ–‡ä»¶çš„拷贝。
+</p></blockquote>
 
-<p>µ±È»ÁË£¬¾ÍÏñÎÒÃǶÔì¶ ``free software'' 
¶¨ÒåµÄ¿àÐÄ£¬Ö÷ÕÅ¿ª·ÅÔ´ÂëµÄÈËÊ¿Ò²Ôø³¢ÊÔ×÷³ö¸ü¾«È·µÄ¶¨Òå¡£</p>
+<p>
+<!-- The <a href="http://da.state.ks.us/itec/TechArchPt6ver80.pdf";>
+ state of
+Kansas</a> published a similar definition: -->
+我认为Neal
+Stephenson并非故
意拒绝或争论开源的&ldquo;官方&rdquo;定义。我想他只是单纯地从英语文字出发,顾名思义。å
 ªè¨æ–¯å·žæ”¿åºœä¹Ÿå‘布类似的认知:
+</p>
 
-<p>È»¶ø ``free software'' µÄ½âÊÍÊǼòµ¥µÄ¡£ÈÃÎÒÃǶÁ³öÕâ¾ä»°<b>¡¸×ÔÓÉÑÔÂÛ <span 
class="rm">£¨freespeech£©</span> £¬Ãâ·ÑÆ¡¾Æ <span class="rm">£¨free 
beer£©</span>¡¹</b> £¬Ö»ÏûÕÆÎÕÆäÖÐ ``free'' 
µÄÒ»ÓïË«Ò壬˭¶¼Äܹ»²»ÔÙ´í½â×ÔÓÉÈí¼þµÄ ``free'' Òâζ¡£ÖÁì¶ ``open source'' 
ÔòûÓÐÕâ°ã¼ò½àº­¸ÇÕýʽ¶¨ÒåµÄ·½°¸£¬ÕâͬʱÏÔʾÎÒÃÇ´ó¿É²»±Ø¸ÄÓà ``open source'' 
À´´ú³Æ×ÔÓÉÈí¼þ¡£</p>
+<blockquote><p>
+请使用开源软件(OSS)。开源软件的源代码免费且å…
¬å¼€ï¼Œå°½ç®¡å…¶å¯¹äººä»¬å¯¹å…¶æºä»£ç 
å¯ä»¥åšä»€ä¹ˆä¸å¯ä»¥åšä»€ä¹ˆçš„许可证有多种变化。
+</p></blockquote>
 
-<h4>η¾å×ÔÓÉ</h4>
+<p>
+当然,正如我们对&ldquo;自由软件&rdquo;做的一æ 
·ï¼Œå¼€æºäººå£«ä¹Ÿæ›¾åŠªåŠ›é€šè¿‡å‘布该词语的精确定义来解决问题。</p>
 
-<p> ``open source software'' µÄÖ÷ּԴ춲¿·ÖÈ˶Ôì¶ ``free software'' 
¸Ðµ½²»°²¡£ÄÇÊÇÊÂʵ£º</p>
+<p>
+然而&ldquo;free
+software&rdquo;的解释是简单的&mdash;人们只要能理解&ldquo;言论自由,而非å
…è´¹å•¤é…
’&rdquo;,就能够不再错解自由软件中&ldquo;free&rdquo;的意味。而&ldquo;开源&rdquo;却没有一个方法能够这般简洁地涵盖å
…¶æ­£å¼å®šä¹‰å¹¶æ˜Žç¡®æŒ‡å‡ºä¸ºä»€ä¹ˆå…¶å­—面意义是错误的。</p>
 
-<blockquote> 
<b≯ÂÛÓйØ×ÔÓɵĻ°Ì⡢̸ÂÛµÀµÂÂ×ÀíµÄÒéÌ⡢̸ÂÛ¹«ÖÚÒåÎñÒÔ¼°¸ö¼ºÈ¨Ò棬µÈͬ춴ÙʹȺÖÚ˼¼°ËûÃÇÒ»ÏòÒÔΪÎ޹ؽôÒªµÄÊÂÎï¡£Äǽ«Òý·¢Çé¸ÐµÄ²»Ôá¢ÒÔ¼°Ä³Ð©ÈËÊ¿µÄµÖÖÆ¡£</b>
 </blockquote>
+<h3 id="fear">对自由的恐惧</h3>
 
-<p>ÒòΪ ``free'' 
µÄÀíÄΣ¼°<b>¡¸ÈºÖÚ²»¹ØÇÐÕâЩÊ£¬½ÏÄÜά³ÖÉç»áÎȶ¨¡¹</b>µÄÓظ¯»ÃÏë¡£</p>
+<p>
+&ldquo;开源软件&rdquo;的主要论点是&ldquo;自由软件&rdquo;会使一些人感到不安。那是真的:谈论有å
…³è‡ªç”±çš„话题、谈论道德伦理的议题、谈论å…
¬ä¼—义务以及个人利益,就是在促使人们思考他们宁愿忽视的一些事。这会引发æƒ
…
感的不悦、以及某些人士的抵制。这并不意味着如果人们不å…
³å¿ƒè¿™äº›äº‹ã€ç¤¾ä¼šå°±ä¼šå˜å¾—更好。</p>
 
-<p>¼¸ÄêÇ°µÄ×ÔÓÉÈí¼þ¿ª·¢ÕßÃÇ£¬×¢Òâµ½ÎÊÌâÖ¢½á£¬¿ªÊ¼Ì½¾¿Ò»¸öÄÜÃâ³ýÀ§¾ÖµÄÐÂ˼ά¡£ËûÃÇÒâʶµ½£¬Èç¹û¶Ôì¶Â×ÀíÓë×ÔÓÉÀíÄî±£³Ö¾²Ä¬£¬Ö»ºâÁ¿Äܹ»Á¢¼´´øÀ´ÊµÖÊÀûÒæµÄ×ÔÓÉÈí¼þ£¬ËûÃÇ»òÐíÄܸüÓÐЧÂʵء¸ÏúÊÛ¡¹Êʵ±Èí¼þ¸øÊÊÓÿͻ§£¬ÌرðÊÇÆóÒµ½çµÄ¶ÔÏ󡣶ø
 ``open source'' 
ÀíÄîÕýºÃÊÇʵ¼ùÖ®·½£¬ÒòΪ¹©³öÔ´Âë<b>¡¸ÈÃÆóÒµ½ç¸Ðµ½¸üÂúÒ⡹</b>¡£¿ª·ÅÔ´ÂëµÄÐÂÊÓÒ°ÓëмÛÖµ£¬¾ÍÕâÑù±ÄÏÖ³öÀ´¡£</p>
+<p>
+几年前,自由软件的开发者
们注意到这种不悦的反应,有人开始探究一个能å…
é™¤å›°å±€çš„方法。他们意识到,如果对道德与自由的理念保持沉默,只讨论能够立即带来实质利益的自由软件,他们或许能更有效率地&ldquo;销售&rdquo;这些软件给客户,特别是企业界的客户。&ldquo;开源&rdquo;一词就是用来更多地朝这个方向努力&mdash;一个&ldquo;让企业界更接受&rdquo;的方式。开源运动的视野与价值就是æ
 ¹æ¤åœ¨è¿™ä¸ªå†³å®šä¹‹ä¸Šã€‚</p>
 
-<p>ÕâÖÖ˼άÒÑ»ñʵ֤£¬ÒÀÕÕÕâ¸öÀíÄîÔË×÷ÓÐЧ¡£½ñÌìÐí¶àÈËÊ¿Ò×ÕÞµ½ ``free'' 
µÄ·Ïߣ¬¾ÍΪ´Ë´¿´âʵ¼ÊµÄÀíÓÉ¡£Ä¿Ç°ÎªÖ¹ÕâÏԵúܺ㬵«ÎÒÃÇıÇóµÄ²¢²»µ½´ËΪֹ£¡ÎüÒýÈËÃǽÓÄÉ×ÔÓÉÈí¼þÊǹ¤×÷µÄÒ»²¿·Ö£¬ËüÖ»ÊÇ¿ç³öµÄµÚÒ»²½¡£</p>
+<p>
+用他们自己的话来说,这种方法已被证实有效。今天有许多人就为纯粹实é™
…的理由而转到自由软件。这æ 
·ä¸‹åŽ»ä¹Ÿå¾ˆå¥½ï¼Œä½†æˆ‘们谋求的并不到此为止!吸引人们接纳自由软件并不是整个工程,它只是第一步。</p>
 
-<p>ÒòÉÏÊöÄ¿µÄ¶øתÏò×ÔÓÉÈí¼þµÄÓû§£¬µ©ÓÐʵ¼ÊÀûÒæµÄÈκο¼Á¿¸¡ÏÖ£¬³ÙÔçÔٸĻØ˽ȨµÄÈí¼þ¡£ÎªÊýÅÓ´óµÄÈí¼þ¹«Ë¾ÆóͼÉè¼ÆеÄÀûÓչܵÀ£¬Óû§ÄѵÀ»á¾Ü¾øÊÜ»óÂ𣿳ý·ÇËûÃÇÊ®·ÖÃ÷°×ÇÒ¶®µÃÆÀ¹À×ÔÓÉÈí¼þÌṩµÄ×ÔÓÉÖ®¼Û--ÍêÈ«ºÏºõ×ÔÀû¿¼Á¿µÄ¼ÛÖµ¡£ÕâÖÖÀíÄîÓÐÀµì¶ÎÒÃǵÄÉ¢²¥£¬ÇÒΪʵ¼ùËü£¬ÎÒÃDZØÐë̸̸--×ÔÓÉ¡£Ç°ÃæÌá¼°µÄ¡°¾²Ä¬×塱¶ÔÎÒÃǵÄÉçȺÏ൱ÓÐÖúÒ棬µ«ÎÒÃÇÆÚ´ýËûÃÇÄÜÀí½â¡°×ÔÓÉ¡±¸ü¶àЩ¡£</p>
+<p>
+这些用户迟早会因
为实用的优势而再转回到专属软件。为数庞大的软件å…
¬å¸æ­£åœ¨æä¾›æ­¤ç±»åˆ©è¯±ï¼Œç”¨æˆ·ä¸ºä»€ä¹ˆè¦æ‹’绝呢?除非他们懂得去<em>衡量自由的价值</em>,这些自由是自由软件自身就带有的。这种理念有赖于我们的ä¼
 æ’­&mdash;为了实践它,我们必
须谈论自由。有一些人用&ldquo;沉默&rdquo;的方法做生意对社区可能有益,但我们还å¿
…须得有足够多的谈论自由的声音。</p>
 
-<p>ÏÖÔÚÎÒÃÇÉçȺµÄ¡°¾²Ä¬×塱²»ÉÙ£¬È´ºÜǷȱ¶Ôì¶--×ÔÓÉ--µÄ̽ÌÖ¡£´ó¶àÊý²ÎÓë×ÔÓÉÈí¼þÕߣ¬¿ÉÄÜÊÇΪÁË<b>¡¸ÈÃÆóÒµ½ç¸üÂúÒ⡹</b>¶øºÜÉÙ̸¼°×ÔÓÉ¡£Èí¼þÏúÊÛÒµÕßÓÈÆäÇãÏòÕâÖÖ×Ë̬¡£ÓÐЩ
 <a href="/gnu/linux-and-gnu.html">GNU/Linux</a> 
²Ù×÷ϵͳµÄ°üÉ¢²¼Õߣ¬½«Ë½È¨ÖʵÄÈí¼þ¸½×°µ½Õâ¸ö×ÔÓɾ«ÉñµÄϵͳÉÏ£¬ËûÃǹÄÀøÓû§½«Ö®ÊÓΪÀûÒ棬ûÓиæËßËûÃÇÕâÊÇÔÚ×ÔÓÉ֮·¿ªµ¹³µ¡£</p>
+<p>
+现在,我们有太多的&ldquo;沉默&rdquo;,而对自由的讨论却不够。大多数参与自由软件è€
…很少谈论自由&mdash;通常是因
为他们要寻求&ldquo;让企业界更接受&rdquo;。软件销售业者尤å…
¶å€¾å‘这种姿态。有些<a
+href="/gnu/linux-and-gnu.html">GNU/Linux</a>操作系统的发行版将专属软件添åŠ
 
到自由系统之中,他们鼓励用户将之视为优势,而不是告诉他们这是在背离自由。</p>
 
-<p>ÎÒÃDz»¿ÉÄÜ×·ÉÏÿ¸ö×ÔÓÉÈí¼þµÄÓû§£¬ÔÚËûÃDzÉÓÃ×ÔÓÉÈí¼þµÄͬʱת֪ËûÃÇÕâ¸öÊÀ½çµÄ֪ʶ¡£ÕâÊDZÈÈç
 Qt Ö®ÀàµÄ ·Ç×ÔÓÉÈí¼þ 
ÒÔ¼°²¿·Ö¡¸·Ç×ÔÓɲÙ×÷ϵͳ¡¹µÄÉ¢²¼ÉÌÄÜÔÚÕâƬÎÖÍÁ¸û×÷µÄÔ­Òò¡£ÎÒÃDz»ÒòÒ­·Ïʳ·ÅÆú 
``free'' ×ÖÑÛ£»ÎÒÃÇÒª¸ü¶à£¬²»ÊǸüÉÙ£¬¸ü¶à¹Øì¶×ÔÓÉȨÒæµÄ̽ÌÖ¡£</p>
+<p>
+人数增长太快,我们没能应对好自由软件用户的涌å…
¥ï¼Œæ²¡èƒ½æ•™è‚²å¥½äººä»¬è‡ªç”±å’Œæˆ‘们社区的价值。这就是为什么非自由软件(比如最初开始流行的Qt),特别是非自由的操作系统发行版能在这片土地繁荣的原å›
 
。现在我们放弃使用&ldquo;自由&rdquo;一词会是一个错误;我们需要更多、而不是更少的å
…³äºŽè‡ªç”±çš„探讨。</p>
 
-<p>ÒòΪ ``open source'' 
µÄÎüÒýÁ¦¶ø´øÀ´¸ü¶àÓû§Í¶ÈëÎÒÃÇÉçȺ£¬Äǵ±È»Êǹ±Ï×£¬µ«ÎÒÃÇÒò´Ë¿ÉÄܵøü·ÑÁ¦²ÅÓа취ÈÃËûÃÇ°Ñ¡°×ÔÓÉ¡±ÌýÈë¶úÖУ¬ÎÒÃDZØÐë¸üÂÞËô¡¢¸üàÐÔÓµÄ˵¡¸ËüÊÇ×ÔÓÉÈí¼þ£¬×ÔÓÉÈí¼þ¸øÄã×ÔÓÉ£¡¡¹</p>
+<p>
+如果&ldquo;开源&rdquo;一词吸引更多的用户加å…
¥æˆ‘们的社区,那当然是贡献,但我们因
此可能得更费力才有办法让他们把自由听入耳中。我们必
须说,&ldquo;这是自由软件,它给你
自由!&rdquo;&mdash;比以往更多、更大声地说。</p>
 
-<A NAME="newinfeb">
-<h4>É̱êÓÐÓÃÂð£¿</h4>
-</A>
+<h3 id="newinfeb">商标会有帮助吗?</h3>
 
-<P>``open source'' 
Èí¼þµÄ³«ÒéÕߣ¬ÏëÒªÈøÃÀíÄîת»¯ÎªÉ̱꣬ÈÏΪÄÇÄܱÜÃâ¸Ã×ÖÑÛÔâµ½ÀÄÓ᣺óÀ´·ÅÆú³õÖÔ£¬ÒòΪËüÊǸöÃèÊö£¬²»ÊǸöÃû³Æ£¬ÄÑÒÔͨ¹ýÉ̱êµÄÈÏÖ¤¹æÔò£»½á¹û£¬ÔÚ·¨ÂÉÉÏ
 ``open source'' Óë ``free software'' 
ͬÑù<b>¡¸ÆäʹÓó¡ºÏµÃ²»ÊÜ·¨¶¨¾ÐÊø¡£¡¹</b>ÎÒÌý˵Ðí¶àÈí¼þÉ̵IJúÆ·¼´Ê¹²»·û¿ª·ÅÔ´ÂëµÄÕýʽ¶¨Ò壬ÈÔÈ»ÒÔ
 ``opensource'' Ö®Ãû¹Ú³ÆÖ®£»ÎÒÒ²Ç×¼û¼¸¸öʵÀý¡£</p>
+<p>
+&ldquo;开源软件&rdquo;的倡议者想要让该理念转化为商æ 
‡ï¼Œè®¤ä¸ºé‚£èƒ½é¿å…è¯¥å­—眼遭到滥用。后来放弃初衷,因
为它是个描述,不是个名称,难以通过商æ 
‡çš„认证规则;结果,在法律上&ldquo;开源&rdquo;与&ldquo;自由软件&rdquo;一æ
 ·ï¼šå…
¶ä½¿ç”¨ä¸å—<em>法定</em>拘束。我听说许多软件商的产品即使不符开源的正式定义,仍然以&ldquo;开源&rdquo;之名å†
 ç§°ä¹‹ï¼›æˆ‘也亲见几个实例。</p>
 
-<p>½«Ñ°³£Ê¹ÓõĴë´Çת±ä³ÉÉ̱êÄܸıäÊÂ̬Â𣿲»¾¡È»¡£</p>
+<p>
+将寻常使用的措辞转变成商标能改变事态吗?不尽然。</p>
 
-<p>³§ÉÌ·¢²¼ÒâÒå²»Ã÷È·µÄ¹«¿ªÉùÃ÷£¬ÒÔ±ãʹÈËÃǶÔÆä²úÆ·ÃÈÉú ``open source'' 
µÄÓ¡Ïó¡£ÀýÈç IBM¶Ôì¶ËüµÄÒ»¸ö²»·û ``open'' ¶¨ÒåµÄ²úÆ·Èç´ËÉù³Æ£º
+<p>
+厂商也曾发布意义不明确的公开声明,以便使人们对å…
¶äº§å“èŒç”Ÿ&ldquo;开源&rdquo;的印象。例如IBM对它的一个不符开源官方定义的产品如此声称:</p>
 
-<blockquote><b>Ò»È翪·ÅÔ´ÂëÉçȺ£¬ÎÒÃÇ¡­Ä³¡­¿Æ¼¼²úƷʹÓÃÕߣ¬Ò²ÄܲÎÓë IBM 
µÄÑз¢¡­</b></blockquote>
+<blockquote><p>
+一如开源社群,......科技产品的使用者
也能参与IBM的合作......
+</p></blockquote>
 
-<p>´ËÉùÃ÷²¢Î´È·ÊµÖ¸³ö±Ë³Ìʽ¹«¿ªÊͳöÔ´Â룬Ðí¶àÌý¼ûÕâ¸öÏûÏ¢µÄÈËÈ´²»»á¼ÓÒÔ×¢Òâ¡£ 
<span class="rm">£¨ÎÒ±ØÐë³Ïʵ¸æÖª¶ÁÕߣ¬ºóÀ´ IBM 
ÕæµÄÊÔÖøÈÃËü±ä³É×ÔÓÉÈí¼þ£¬²¢ÒýÈ뼸ÏîÌõ¿îʹËü ``free'' ÇÒ ``open source'' 
£»Ö»²»¹ý£¬ÉÏÊöµÄÉùÃ÷·¢±íÖ®³õ£¬Ëü¼È²»·ûºÏ ``free'' Ò²²»ÊÇ ``open'' 
¡££©</span></p>
+<p>
+此声明并未明确说该程序<em>是</em>&ldquo;开源&rdquo;程序;但是许多读è€
…却不会注意此细节。(我必须告知读者
,后来IBM真诚地试着让它变成自由软件,并引å…
¥ä¸€ä¸ªæ–°è®¸å¯è¯ä½¿å®ƒå˜æˆè‡ªç”±è½¯ä»¶å’Œ&ldquo;开源&rdquo;;只不过,上述的声明发表之初,它哪个都不是。</p>
 
-<p>Æä´ÎµÄ°¸Àý£¬ Cygnus Solutions 
Ô­ÒâÊÇ×é³ÉÒ»¼Ò×ÔÓÉÈí¼þµÄ¹«Ë¾£¬ËæºóÒ²À©Õ¹ÒµÎñµ½Ë½È¨Èí¼þµÄ·¶³ë£¬ËüΪ˽ȨÈí¼þ×÷Èç´ËÐû´«£º</p>
+<p>
+其次的案例是,Cygnus 
Solutions如何从原来要成为一家自由软件å…
¬å¸ï¼Œè€Œç»“果变成专属软件å…
¬å¸çš„分支,它为专属软件作如此宣传:</p>
 
-<blockquote><b>Cygnus Solutions ÔÚ¿ª·ÅÔ´ÂëÊг¡¾ÓÁìµ¼µØ룬²¢½«Á½Ïî²úƷͶÈë 
[GNU/]Linux µÄÊг¡¡£</b></blockquote>
+<blockquote><p>
+Cygnus Solutions在开源市场居领导地位,并将两项产品投å…
¥[GNU/]Linux的市场。 
+</p></blockquote>
 
-<p>Óë IBM ²»Í¬µÄÊÇ£¬ Cygnus Solutions 
ûÏëÒªÈÃËüµÄÉÌÆ·±ä³É×ÔÓÉÈí¼þ£¬ÆäÐÔÖÊÒ²²»ÇãÏò×ÔÓÉÈí¼þ¡£ Cygnus Solutions 
²¢Î´È·³Æ֮Ϊ ``open source software'' £¬Î¨ËûÃǵĴë´Ç×ãÒÔ»ìÏýÊÓÌý¡£</p>
+<p>
+与IBM不同的是,Cygnus 
Solutions没想要让它的商品变成自由软件,å…
¶æ€§è´¨ä¹Ÿä¸å€¾å‘自由软件。但是Cygnus
+Solutions并未确称之为&ldquo;开源软件&rdquo;,他们使用该措辞只是要混淆视听。</p>
 
-<p>ÉÏÃæÁ½Àý±íÃ÷ÁËÉ̱겻Äܶžø¸úËæ ``open source'' ×ÖÑÛ¶øÆðµÄ»ìÏý¡£</p>
+<p>
+上面两例表明了商æ 
‡å¹¶ä¸èƒ½çœŸæ­£æœç»ç”±&ldquo;开源&rdquo;一词引起的混淆。</p>
 
-<A NAME="newinnovember">
-<h4>ÀÄÓã¿¿ª·ÅÔ´Âë</h4>
-</A>
+<h3 id="newinnovember">对&ldquo;开源&rdquo;的误解(?)</h3>
 
-<p>Æäʵ£¬¿ª·ÅÔ´ÂëµÄ¶¨Òå¹»Çå³þÁË£¬¹»Çå³þÈÃÈË¿´³öµäÐÍ·Ç×ÔÓÉÈí¼þ²»·û¿ª·ÅµÄ¾«Éñ¡£ÄÇôÄãÊDz»ÊÇÈÏΪ¡°¿ª·ÅÔ´Â빫˾¡±µÄ²úÆ·£¬µ±È»¾ÍÊÇ
 <span class="rm">£¨»òºÜ½Ó½ü£©</span> ×ÔÓÉÈí¼þ£¬ÊÇÂ𣿰¦£¬Ðí¶à¹«Ë¾È´ÏëΪ ``open 
source'' ¸³ÓèÆäËüÒâζ¡£</p>
+<p>
+其实,开放源码的定义够清楚了,够清楚让人看出å…
¸åž‹éžè‡ªç”±è½¯ä»¶ä¸ç¬¦å¼€æºçš„精神。那么你
是不是认为&ldquo;开放源码å…
¬å¸&rdquo;的产品,当然就是(或很接近是)自由软件?唉,许多å
…¬å¸å´æƒ³èµ‹äºˆå®ƒä¸åŒçš„意思。</p>
 
-<p>Ò»¾Å¾Å°ËÄê°ËÔ ``Open Source Developers Day'' <span 
class="rm">£¨¿ª·ÅÔ´Â뿪·¢ÕߵļÍÄîÈÕ£©</span> 
»áÒéÉÏ£¬¼¸¸öÊÜÑûµÄÉÌÒµÈí¼þÉ̱íʾ£¬ËûÃÇÄÜÈÃËûÃÇÒ»²¿·Ö²úÆ·±ä³É×ÔÓÉÈí¼þ<span 
class="rm">£¨»ò¿ª·ÅÔ´Â룩</span>¡£ËûÃǵÄÊÂÒµÖØÐÄÈÔÔÚ¿ª·¢ÆäËü˽ȨµÄ¸½¼ÓÎï <span 
class="rm">£¨Èí¼þ»ò <a href="/philosophy/free-doc.html">ÊÖ²á</a>£©</span> 
ÒÔÏúÊÛ¸øËûÃǵÄ×ÔÓÉÈí¼þ¿Í»§¡£ËûÃÇÏ£ÍûÎÒÃÇÈÏͬ´Ë¾ÙµÄÕýµ±ÐÔ£¬ÒÔ±ã³ÉΪÎÒÃÇÉçȺµÄÒ»Ô±£¬ÒòΪËûÃÇÔ¸ÒâÌṩ²¿·Ö»ñÀû£¬ÔÞÖú×ÔÓÉÈí¼þµÄ¿ª·¢¡£</p>
+<p>
+1998年8月,在开放源码开发者日会议上,几
个受邀的商业软件商表示他们只愿意让一部分产品变成自由软件(或&ldquo;开源&rdquo;)。他们的事业重心仍在开发å
…¶ä»–的专属附加组件(软件或<a
+href="/philosophy/free-doc.html">手册</a>),以销售给他们的自由软件客户。他们希望我们认同此举的正当性,å›
 ä¸ºéƒ¨åˆ†èŽ·åˆ©ä¼šèµžåŠ©è‡ªç”±è½¯ä»¶çš„开发。</p>
 
-<p>ʵÖÊÉÏ£¬ËûÃÇÏëҪΪËûÃÇ <span class="rm">£¨²»¿ª·ÅÔ´ÂëµÄ£©</span>˽ȨÈí¼þÓ®µÃ 
``open source'' 
µÄÕý×Ö´ÁÓ¡£¬Ö»ÒòΪËûÃÇÓë×ÔÓÉÈí¼þÓеãÔ¨Ô´¡¢»òÕßËûÃÇʵ¼ÊÉÏ¿ª·¢¹ý¼¸¸ö×ÔÓÉÈí¼þ¡£ 
<span 
class="rm">£¨Ä³¼Ò¹«Ë¾µÄ´´Ê¼ÈË£¬°ÑËûÃǵÄÕæÐÄ˵µÃ¼«ÎªÃ÷°×£¬×ÔÓÉÈí¼þµÄÉçȺ±¾Éí¾ÍÊÇ×ÔÓÉÈí¼þ×îÇ¿´óµÄºóÔ®£¬ËûÃÇÒò´ËÒ²ÂäµÃÇáËÉ¡£</span>£©</p>
+<p>
+实质上,他们想要为他们的专属软件赢得&ldquo;开源&rdquo;的名声&mdash;即使这些产品不是&ldquo;开源软件&rdquo;&mdash;只å›
 ä¸ºä»–们与自由软件有点渊源、或者这些å…
¬å¸ä¹Ÿåœ¨ç»´æŠ¤ä¸€äº›è‡ªç”±è½¯ä»¶ã€‚(某家å…
¬å¸çš„创始人相当直白地说,他们只会尽量少地为他们所支持的自由软件付出,除非社区æ—
 æ³•å¿å—这种行为。)</p>
 
-<p>ÏÈÇ°ÊýÄ꣬Ðí¶à¹«Ë¾Í¶Èë×ÔÓÉÈí¼þµÄ¿ª·¢¡£ÆäÖеļ¸Ð©¹«Ë¾½«Ö÷Á¦Çãע춷Ç×ÔÓÉÈí¼þ£¬µ«Ò²²¦³ö×ÊԴΪ×ÔÓÉÈí¼þ¹¤×÷£»ËùÒÔÎÒÃÇ´ó¿ÉÄ®ÊÓËûÃǵÄÆäËü²úÆ·£¬¶øÓëËûÃǺÏ×÷·¢Õ¹×ÔÓÉÈí¼þ¡£ÎÒÃÇÕæ³Ï¸ÐлËûÃǶÔ×ÔÓÉÈí¼þµÄ¹±Ï×£¬ºÁÎÞ¹¢½éËûÃÇÁíÍâ´ÓʵķÇ×ÔÓÉÈí¼þÊÂÒµ¡£</p>
+<p>
+多年以来,许多公司为自由软件的开发做出贡献。å…
¶ä¸­æœ‰äº›å…
¬å¸ä¸»è¦æ˜¯å¼€å‘非自由软件,但是两边的工作是独立的;所以,我们可以忽略å
…
¶éžè‡ªç”±çš„产品,而与他们合作发展自由软件项目。而后我们真诚地感谢他们对自由软件的贡献,并不å¿
…谈起他们的非自由软件事业。</p>
 
-<p>ÎÒÃÇȴû·¨×ÓÓëÇ°ÊöµÄй«Ë¾²ÉÐÐͬÑùºÏ×÷·½Ê½£¬ÊÂʵÉÏÊÇËûÃDz»ÔÊ×¼¡£ÕâЩ¹«Ë¾»ý¼«ÃÔÂÒȺÖÚ£¬Æóͼ½«×ÔÓÉÓë·Ç×ÔÓÉÁ½ÂëÊ»ìΪһ̸£»ËûÃÇÒâͼҪÎÒÃÇװɵ£¬³ÐÈÏËûÃÇÄÇЩ·Ç×ÔÓÉÈí¼þ²úÆ·ÓëÎÒÃǵĶ«Î÷Ïàͬ¡£ËûÃÇ°Ñ×Ô¼º´ò°ç³É¡°¿ª·ÅÔ´ÂëÈí¼þ¹«Ë¾¡±ÍýÏ붯֮ÒÔÇ飬ÒÔΪÎÒÃǽ«Òò´ËÉýÆðºÃ¸Ð¶øÔÚÕâÎÊÌâÉÏ´òÃÔºýÕÌ¡£</p>
+<p>
+我们却没法子与前述的新公司采行同æ 
·åˆä½œæ–¹å¼ï¼Œäº‹å®žä¸Šæ˜¯ä»–们不允准。这些公司主动邀请å…
¬ä¼—来把各种工作混在一起;他们想让我们承认他们那些非自由软件产品也是真正的贡献,虽然实é™
…上它们不是。他们把自己打扮成&ldquo;开源软件å…
¬å¸&rdquo;,以为我们将因
此升起好感而在这问题上打迷糊仗。</p>
 
-<p>ËûÃÇÇÉÃîµÄÎÄ×ÖÓÎÏ·£¬Èç¹ûÄÃÀ´²ÙŪ ``free software'' 
Ò»Ñù×àЧ¡£µ«ÊÇËûÃÇËƺõ²»ÏëÈ¡Óà ``free software'' Õâ¸ö´ë´Ç£»»òÐíÊÇ ``free'' 
Õâ¸ö×ÖÑÛ²»ÃâÁîÈËÁªÏëÆðÀíÏëÖ÷Ò壬·´¶ø±ä³ÉÉÌÈ˲»ÓûÅö´¥µÄ¶ÔÏó¡£ÕýÇÉ ``open 
source'' Õâ¸ö´ë´Ç£¬´ÍÓèËûÃÇ°áŪÎÄѧµÄ»ú»á¡£</p>
+<p>
+他们巧妙的文字游戏,如果拿来操弄&ldquo;自由软件&rdquo;也一æ
 
·å¥æ•ˆã€‚但是他们似乎不想取用&ldquo;自由软件&rdquo;这个措辞;或许是自由软件这个字眼不å
…
ä»¤äººè”想起理想主义,反而变成商人不欲碰触的对象。正巧&ldquo;开源&rdquo;这个措辞,为他们打开了搬弄文字的大门。</p>
 
-<p>Ò»¾Å¾Å°ËÄêβµÄÉÌÕ¹£¬ÓÈÆäÓë <a href="/gnu/linux-and-gnu.html">``Linux''</a> 
Ïà¹ØµÄ²Ù×÷ϵͳÊǵ±ºì½¿ÍÞ£¬À´×ÔijÖøÃûÈí¼þ¹«Ë¾µÄÖ÷¹ÜÈËÓгö³¡·¢±í¶¯È˵ÄÑÝ˵¡£Ëû¿ÉÄÜÊÜÑû˵Ã÷ËûµÄ¹«Ë¾¡°Ö§Ô®¡±Linux
 µÄ¾öÐÄ¡£²»ÃîµÄÊÇ£¬ËûÃǵġ°Ö§Ô®¡±Òâ˼ÊÇ£¬½«ËûÃÇµÄ non-free Èí¼þ´îÅäµ½ free 
²Ù×÷ϵͳµ±ÖÐ--Ò×ÑÔÖ®£¬ËûÃÇÏëÀ´×ÔÓÉÉçȺ»®µØÇóÊÛ£¬¶ø²»ÊÇÏëÒªÓÐËù¹±Ïס£</p>
+<p>
+1998年末的商展,专为通常被称为<a
+href="/gnu/linux-and-gnu.html">&ldquo;Linux&rdquo;</a>的操作系统而举办。å
…¶ç²¾é€‰çš„演讲嘉宾是来自某著名软件公司的高管。他可能是因
为该å…
¬å¸å†³å®š&ldquo;支持&rdquo;此操作系统而受邀。不妙的是,他们的&ldquo;支持&rdquo;åŒ
…
括发布支持该系统的非自由软件&mdash;换句话说,他们想来自由社区开辟市场,而不是想要有所贡献。</p>
 
-<p>Ëû˵ÁË 
<b>¡¸ÒªÎÒÃǹ«¿ª²úÆ·Ô´ÂëϵÎÞ¿ÉÄܵÄÀ²£¬µ«ÏµÎÒÃÇ»òÐíͬÒâ`¶ÔÄÚ'¹«¿ªÔ´Âë¡£¼ÙʹÎÒÃÇÔÊÐí¿Í»§µÄϵͳ֧Ԯ²¿ÃÅÅö´¥Ô´Â룬ËûÃÇ¿ÉÒÔ×ÔÐÐÅųý³ÌʽµÄ´í±×£¬ÎÒÃÇÔò¹©Ó¦¸üºÃµÄ²úÆ·Óë·þÎñ¡£¡¹</b>
 <span 
class="rm">£¨ÎÒûÓе±³¡±Ê¼Ç£¬ÕâÀïÓôÊÖ»ÇóּȤ£¬ÓëÔ­ÑÝ˵µÄÓôʲ»¾¡Ïà·û¡££©</span>)</p>
+<p>
+他说了,&ldquo;要我们的产品开源是不可能的啦,但我们或许可以同意&ldquo;对å†
…&rdquo;开源。假使我们允许我们的客户支持部门访问源ç 
ï¼Œä»–们可以为客户修复问题,我们则可以提供更好的产品与服务。&rdquo;(这不是原话,å›
 ä¸ºæˆ‘没有当场笔记,但是这概括了大意。)</p>
 
-<p>ÑÝ˵½áÊøºó£¬ÔÚ×ùµÄijÌýÖÚ¶ÔÎÒ˵ <b>¡¸Ëû¸ù±¾Ã»Ìáµ½Öص㡣¡¹</b> 
ÊÇÂð£¿ÎÒµ¹ÒÔΪËûµÄº¬ºý¼¼ÇÉÕæÊÇÒ»Íø´ò¾¡Öص㡣</p>
+<p>
+演说结束后,在座的某听众对我说&ldquo;他æ 
¹æœ¬æ²¡æåˆ°é‡ç‚¹ã€‚&rdquo;是吗?他还需要哪个重点?</p>
 
-<p>ËûµÄ̸»°Ã»ÓЩµô¿ª·ÅÔ´ÂëÔ˶¯µÄÒªÖ¼¡£¿ª·ÅÔ´ÂëÔ˶¯ÕæµÄû³«ÑÔʹÓÃÕßÓ¦ÓÐ×ÔÓÉ£¬Ö»³«ÑÔÔ´Â뿪·Å½«¿É´Ù½øÈí¼þ·¢Õ¹µÃ¸ü¿ì¸üºÃ¡£ÕâλÑÝ˵ÕßȷʵÁì»áµ½Õâµã£»Î¨Ëû²»È«ÅÌÂÄÐпª·ÅÔ´ÂëµÄ¾«Éñ£¬Ëû´òË㽫Ѱ³£Óû§ÅųýÔÚÍ⣬ֻƫ̻¹«Ë¾ÐÍ¿Í»§¡£</p>
+<p>
+他的谈话并没有错失开源运动的重点。开源运动并没有说用户应有自由,只是说让更多的人ç
 ”究源码可以使软件开发得更快更好。这位高管完å…
¨é¢†ä¼šåˆ°è¿™ä¸ªé‡ç‚¹ï¼›åªæ˜¯ä»–不愿å…
¨ç›˜å±¥è¡Œå¼€æºçš„精神,也不想考虑用户,只是想在公司内
部部分履行开源精神。</p>
 
-<p>ËûûÓÐÐËȤÕչ˵ģ¬Ò²ÕýÊÇ ``open source'' µÄ³õÖÔËùÒÅ©µÄ£ºÊ¹ÓÃÕß 
<b>Ó¦µÃµÄ</b> ×ÔÓÉȨÒæ¡£</p>
+<p>
+他错失的重点是&ldquo;开源&rdquo;的初衷所要避å…
çš„:用户<em>应得的</em>自由。</p>
 
-<p>É¢²¥×ÔÓÉȨÒæµÄÀíÄîÊÇ´ó´ó·ÑÁ¦µÄÊÂ--ËùÒÔÐèÒªÄúЭÁ¦¡£ÄÇÊÇÎÒÃǼá³ÖʹÓà GNU 
¹¤³ÌµÄ ``free software'' 
´ËÒ»´ë´ÇÖ®Ôµ¹Ê£¬ËüÓÐÀû춱¾ÏîÊÂÎñµÄÍƶ¯¡£Èç¹ûÄúͬÒ⣬×ÔÓÉȨÒæÓëÉçȺ¸ÅÄîµÄÖØÒªÐÔ--²»Ö»ÎªÍ¼Ëü´øÀ´µÄÏÖʵÀûÒæ--Çë¼ÓÈëÎÒÃÇ£¬ÇëʹÓÃ
 ``free software'' Õâ¸ö´ë´Ç¡£</p>
+<p>
+散播自由权益的理念是艰巨的事业&mdash;它需要你
的帮助。那也是我们坚持为GNU工程使用&ldquo;自由软件&rdquo;这一措辞的缘æ•
…,它有助于完成这个事业。如果你
感到自由权益与社区本身的重要性&mdash;不只为图它带来的便利&mdash;请åŠ
 å…¥æˆ‘们一起使用&ldquo;自由软件&rdquo;这个措辞。</p>
 
-<HR>Joe Barr дÁËһƪÎÄÕ <a 
href="http://www.itworld.com/AppDev/350/LWD010523vcontrol4/";>£¨×Ô¼º£©Òª»î£¬Ò²ÒªÈÃÐí¿ÉÖ¤»î</a><span
 class="rm">£¨Ó¢ÎÄ£©</span> ±í´ïËû¶Ô´ËÒéÌâµÄ¹Ûµã¡£
+<hr />
 
-<p>¸ÃÂÛÎÄÊÕ¼
-ì¶ <a href="http://shop.fsf.org/product/free-software-free-society/";>Àí
-²é¡¤Ê·ÍÐÂüµÄÑ¡ÎÄÊé¼® ¡¶×ÔÓÉÈí¼þ£¬×ÔÓÉÉç»á¡·</a> ¡£</p>
+<!-- The archived version is truncated.
+<p>
 
-<H4>
-<p>²ÎÔÄ <A HREF="/philosophy/philosophy.zh-tw.html">Ïà¹ØÎĵµ</A> ¡£
-</H4>
+Joe Barr wrote an article called
+<a 
href="http://web.archive.org/web/20080703140137/http://www.itworld.com/LWD010523vcontrol4";>Live
 and
+let license [archived]</a> that gives his perspective on this issue.</p>
+-->
+<p>
+Lakhani和Wolf在<a
+href="http://ocw.mit.edu/courses/sloan-school-of-management/15-352-managing-innovation-emerging-trends-spring-2005/readings/lakhaniwolf.pdf";>å
…³äºŽè‡ªç”±è½¯ä»¶å¼€å‘者
之动机的论文</a>中说,相当一部分开发者
的动机是认为软件应该是自由的。而这个结果还是基于他们的调查是针对在SourceForge上的开发è€
…,而那是一个并不支持自由软件的道德观点的网站。</p>
 
 <hr />
-
-<div class="translations">
-<p>±¾Ò³µÄ <a 
href="free-software-for-freedom.html#translations">·­ÒëÎı¾</a></p>
+<blockquote id="fsfs"><p class="big">本问发表于<a
+href="http://shop.fsf.org/product/free-software-free-society/";><cite>自由软件,自由社会:Richard
+M. Stallman选集</cite></a>。</p></blockquote>
+
+<div class="translators-notes">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+<h3>译注</h3>
+<ol>
+<li id="TransNote1">QPL,Q Public 
License的简称。它是一个非copyleft的自由软件许可证,和GNU
+QPL不兼容。</li>
+</ol></div>
 </div>
 
-<div class="copyright">
-<p>
-»Øµ½ <a href="/home.zh-cn.html">GNU ¹¤³ÌÖ÷Ò³</a> ¡£
-</p>
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.zh-cn.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>请将有å…
³è‡ªç”±è½¯ä»¶åŸºé‡‘会(FSF)&amp;GNU的一般性问题发送到<a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。也可以通过<a
+href="/contact/">å…
¶ä»–联系方法</a>联系自由软件基金会(FSF)。请将无效链接,å…
¶ä»–错误或建议发送给<a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>。</p>
 
 <p>
-Ç뽫¹Ø춡¸×ÔÓÉÈí¼þ»ù½ð»á¡¹ÒÔ¼°¡¸GNU ¹¤³Ì¡¹µÄ²éѯË͵½
-<a href="mailto:address@hidden";><em>address@hidden</em></a> ¡£Ò²ÓÐ
-<a href="/home.zh-cn.html#ContactInfo">ÆäËü·½Ê½¿ÉÒÔÁªÏµ</a> ×ÔÓÉÈí¼þ»ù½ð»á¡£
-<br />
-Ç뽫ʧЧÁ´½ÓÒÔ¼°ÆäËüÍøÒ³µÄ¸üÕý£¨»ò½¨Ò飩Ë͵½ <a 
href="mailto:address@hidden";><em>address@hidden</em></a> ¡£
-</p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
 
-<p>
-Çë²éÔÄ <a href="/server/standards/README.translations.html">·­Òë¶ÁÎÒ</a> 
ÒÔÈ¡µÃ¹Ø춡¸Ð­µ÷¡¹Ó롸¼Ä½»¡¹·­ÒëµÄÐÅÏ¢¡£
-</p>
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+若您想翻译本文,请参看<a 
href="/server/standards/README.translations.html">翻译须知</a>。</p>
+</div>
 
-<p>
-Ç뽫Óйط­ÒëµÄÎÊÌâË͵½
-<a href="http://savannah.gnu.org/projects/chinese/";>GNU/CTT</a> µÄ
-<a href="mailto:address@hidden";>·­ÒëÈËÔ±</a> ¡£
-<br />
-·­Ò룺 Canyon Tseng &lt;address@hidden&gt; ¡£
-<br />
-ÑéÖ¤£º Áõ ÕѺê &lt;<A HREF="mailto:address@hidden";>address@hidden</A>&gt; ¡£
-</p>
+<p>Copyright &copy; 1998, 1999, 2000, 2001, 2007, 2016 Free Software
+Foundation, Inc.</p>
 
-<p>
-Copyright (C) 2004 Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA  02110,  USA
-<br />
-Verbatim copying and distribution of this entire article is
-permitted in any medium without royalty provided this notice is 
-preserved.
-<br />
-±¾ÎÄÔÊÐíÔÚ²»±ä¸üÎĵµÄÚÈݵÄÇ°ÌáÏ¿¯µÇÔÚÈκÎÐÎʽµÄýÌåÖУ¬µ«Ðè±£Áô´ËÉùÃ÷¡£
-</p>
+<p>本页面<a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
+Attribution-NoDerivatives 4.0 International License</a>授权。</p>
+
+<!--#include virtual="/server/bottom-notes.zh-cn.html" -->
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<b>翻译</b>: Canyon Tseng &lt;address@hidden&gt;<br></br>
+<b>审校</b>: 刘昭宏 &lt;address@hidden&gt;<br></br>
+<b>翻译团队</b>:<a rel="team"
+href="https://savannah.gnu.org/projects/www-zh-cn/";>&lt;CTT&gt;</a>,2018。</div>
+
+<p class="unprintable"><!-- timestamp start -->
+最后更新:
+
+$Date: 2018/02/03 10:36:19 $
 
-<p>
-Updated:
-<!-- timestamp start -->
-$Date: 2009/01/06 23:22:38 $ $Author: yavor $
 <!-- timestamp end -->
 </p>
 </div>
-
+</div>
 </body>
 </html>

Index: philosophy/free-sw.uk.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.uk.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- philosophy/free-sw.uk.html  31 Dec 2017 08:24:44 -0000      1.28
+++ philosophy/free-sw.uk.html  3 Feb 2018 10:36:19 -0000       1.29
@@ -622,7 +622,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1996, 2002, 2004-2007, 2009-2017 Фонд вільного 
програмного
+<p>Copyright &copy; 1996, 2002, 2004-2007, 2009-2018 Фонд вільного 
програмного
 забезпечення, Inc.</p>
 
 <p>Ця сторінка доступна на умовах <a rel="license"
@@ -640,7 +640,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2017/12/31 08:24:44 $
+$Date: 2018/02/03 10:36:19 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/fs-translations.fr.html
===================================================================
RCS file: /web/www/www/philosophy/fs-translations.fr.html,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- philosophy/fs-translations.fr.html  1 Jan 2018 17:34:53 -0000       1.129
+++ philosophy/fs-translations.fr.html  3 Feb 2018 10:36:19 -0000       1.130
@@ -1,7 +1,7 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/fs-translations.en.html" -->
 
 <!--#include virtual="/server/header.fr.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.85 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Traductions du terme « free software » - Projet GNU - Free Software
@@ -413,6 +413,28 @@
 
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="gl">Galicien</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Code de langue</th>
+<td>gl</td></tr>
+<tr><th><cite>Free Software</cite></th>
+<td lang="gl" xml:lang="gl">
+software libre</td></tr>
+<tr><th><cite>Gratis Software</cite></th>
+<td lang="gl" xml:lang="gl">
+software gratuíto</td></tr>
+<tr><th><cite>Proprietary Software</cite></th>
+<td lang="gl" xml:lang="gl">
+software privativo</td></tr>
+<tr><th><cite>Commercial Software</cite></th>
+<td lang="gl" xml:lang="gl">
+software comercial</td></tr>
+</table>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
 <h3 id="cy">Gallois</h3>
 
 <!-- GNUN-SORT-END-KEY -->
@@ -1119,7 +1141,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2018/01/01 17:34:53 $
+$Date: 2018/02/03 10:36:19 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/gnutella.uk.html
===================================================================
RCS file: /web/www/www/philosophy/gnutella.uk.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/gnutella.uk.html 31 Dec 2017 08:24:44 -0000      1.7
+++ philosophy/gnutella.uk.html 3 Feb 2018 10:36:19 -0000       1.8
@@ -97,8 +97,8 @@
 перекладу&rdquo;</a>.</p>
 </div>
 
-<p>Copyright &copy; 2004, 2005, 2007, 2016, 2017 Фонд вільного 
програмного
-забезпечення, Inc.</p>
+<p>Copyright &copy; 2004, 2005, 2007, 2016, 2017, 2018 Фонд 
вільного
+програмного забезпечення, Inc.</p>
 
 <p>Ця сторінка доступна на умовах <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> ліцензії
@@ -115,7 +115,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2017/12/31 08:24:44 $
+$Date: 2018/02/03 10:36:19 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/javascript-trap.uk.html
===================================================================
RCS file: /web/www/www/philosophy/javascript-trap.uk.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/javascript-trap.uk.html  10 Dec 2017 07:30:45 -0000      1.11
+++ philosophy/javascript-trap.uk.html  3 Feb 2018 10:36:19 -0000       1.12
@@ -1,7 +1,7 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/javascript-trap.en.html" -->
 
 <!--#include virtual="/server/header.uk.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.84 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Пастка JavaScript</title>
@@ -122,8 +122,8 @@
 проблему програм на клієнтській стороні. 
Проблему серверної сторони ми
 розглядаємо окремо.</p>
 
-<p>Як на практиці ми можемо вирішувати 
проблему невільних програм на мові
-JavaScript на сайтах? Перший крок&nbsp;&nbsp; уникати 
їх виконання.</p>
+<p>Як на практиці ми можемо вирішувати 
проблему нетривіальних невільних програм
+на мові  JavaScript на сайтах? Перший крок&nbsp;&nbsp; 
уникати їх виконання.</p>
 
 <p>Що ми розуміємо під 
&ldquo;нетривіальним&rdquo;? Це поняття широке, 
тому це
 питання створення простого критерію, що 
дає хороші результати, а не пошук
@@ -263,7 +263,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2009-2013, 2016, 2017 Річард Столмен</p>
+<p>Copyright &copy; 2009-2013, 2016, 2017, 2018 Річард Столмен</p>
 
 <p>Ця сторінка доступна на умовах <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> ліцензії
@@ -280,7 +280,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2017/12/10 07:30:45 $
+$Date: 2018/02/03 10:36:19 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/not-ipr.uk.html
===================================================================
RCS file: /web/www/www/philosophy/not-ipr.uk.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/not-ipr.uk.html  31 Dec 2017 08:24:45 -0000      1.11
+++ philosophy/not-ipr.uk.html  3 Feb 2018 10:36:19 -0000       1.12
@@ -317,7 +317,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy;  2004, 2006, 2010, 2013, 2015, 2016, 2017 Річард М. 
Столмен</p>
+<p>Copyright &copy;  2004, 2006, 2010, 2013, 2015, 2016, 2017, 2018 Р
ічард
+М. Столмен</p>
 
 <p>Ця сторінка доступна на умовах <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> ліцензії
@@ -334,7 +335,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2017/12/31 08:24:45 $
+$Date: 2018/02/03 10:36:19 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/selling.uk.html
===================================================================
RCS file: /web/www/www/philosophy/selling.uk.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/selling.uk.html  31 Dec 2017 08:24:46 -0000      1.11
+++ philosophy/selling.uk.html  3 Feb 2018 10:36:19 -0000       1.12
@@ -237,8 +237,8 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1996, 1997, 1998, 2001, 2007, 2013, 2015, 2016, 2017 
Фонд
-вільного програмного забезпечення, Inc.</p>
+<p>Copyright &copy; 1996, 1997, 1998, 2001, 2007, 2013, 2015, 2016, 2017, 2018
+Фонд вільного програмного забезпечення, 
Inc.</p>
 
 <p>Ця сторінка доступна на умовах <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> ліцензії
@@ -255,7 +255,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2017/12/31 08:24:46 $
+$Date: 2018/02/03 10:36:19 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/surveillance-vs-democracy.uk.html
===================================================================
RCS file: /web/www/www/philosophy/surveillance-vs-democracy.uk.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/surveillance-vs-democracy.uk.html        31 Dec 2017 08:24:47 
-0000      1.24
+++ philosophy/surveillance-vs-democracy.uk.html        3 Feb 2018 10:36:19 
-0000       1.25
@@ -129,6 +129,15 @@
 &ldquo;шпигунстві&rdquo;, пошук &ldquo;шпигуна&rdquo; 
дасть привід для
 доступу до накопиченого матеріалу.</p>
 
+<p>На практиці ми навіть не можемо 
очікувати, що державні агентства стануть
+вигадувати виправдання, щоб задовольнити 
правили користування даними,
+отриманими за допомогою стеження&nbsp;&nbsp; бо 
агентства США вже <a
+href="https://the
+intercept.com/2018/01/09/dark-side-fbi-dea-illegal-searches-secret-evidence/">
+брешуть, щоб прикрити порушення правил</a>. 
Ніхто в дійсності не збирається
+дотримуватися цих правил; це просто казка, 
яку ми можемо вірити, якщо нам до
+вподоби.</p>
+
 <p>Крім того, державний персонал стеження 
буде зловживати даними в особистих
 цілях. Деякі агенти АНБ <a
 
href="http://www.theguardian.com/world/2013/aug/24/nsa-analysts-abused-surveillance-systems";>
@@ -157,7 +166,13 @@
 них, вона може зловживати цими даними страх
ітливим чином, як показують <a
 
href="http://falkvinge.net/2012/03/17/collected-personal-data-will-always-be-used-against-the-citizens/";>приклади
 з Європи</a> і <a
-href="https://en.wikipedia.org/wiki/Japanese_American_internment";>США</a>.</p>
+href="https://en.wikipedia.org/wiki/Japanese_American_internment";>США</a>, 
а
+зовсім недавно й <a
+href="http://www.cbc.ca/news/world/terrifying-how-a-single-line-of-computer-code-put-thousands-of-innocent-turks-in-jail-1.4495021";>Туреччини</a>
+(Омана Туреччини про те, хто насправді 
користувався програмою Bullock,
+тільки посилила основну навмисну 
несправедливість довільного покарання 
людей
+за користування нею.)
+</p>
 
 <p>Особисті дані, зібрані державою, нерідко 
стають здобиччю зловмисників
 ззовні, які зламують захист серверів, 
включаючи і <a
@@ -222,8 +237,8 @@
 відправляти їх на сервер.</p>
 
 <p>Заради конфіденційності ви повинні 
уникати невільних програм, оскільки
-внаслідок передачі іншим контролю над 
вашими обчисленнями, вони, <a
-href="/malware/proprietary-surveillance.html">ймовірно, 
шпигують за
+внаслідок передачі компаніям контролю над 
вашими обчисленнями, вони, <a
+href="/malware/proprietary-surveillance.html">ймовірно, 
шпигуватимуть за
 вами</a>. Уникайте <a
 href="/philosophy/who-does-that-server-really-serve.html"> послуг 
підміни
 програм</a>, а також передачі іншим контролю 
над вашими обчисленнями, це
@@ -236,9 +251,9 @@
 контактів. Не кажіть таким компаніям, як 
Facebook, нічого такого про своїх
 друзів, що вони могли б не хотіти 
опублікувати в газеті. А ще краще не
 користуйтеся Facebook взагалі. Відмовляйтеся 
від систем зв'язку, в яких від
-користувачів потрібно називати свої 
справжні імена, навіть якщо ви
-збираєтеся назвати свої, позаяк це заох
очує інших людей відмовитися від
-своєї конфіденційності.</p>
+користувачів потрібно називати свої 
справжні імена, навіть якщо ви раді
+назвати свої, позаяк це заохочує інших 
людей відмовитися від своєї
+конфіденційності.</p>
 
 <p>Самозахист важливий, але найпильнішого 
самозахисту недостатньо, щоб
 захистити вашу конфіденційність на 
системах, які вам не належать. Коли ми
@@ -592,7 +607,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2015, 2016, 2017 Річард Столмен</p>
+<p>Copyright &copy; 2015, 2016, 2017, 2018 Річард Столмен</p>
 
 <p>Ця сторінка доступна на умовах <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> ліцензії
@@ -609,7 +624,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2017/12/31 08:24:47 $
+$Date: 2018/02/03 10:36:19 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/why-copyleft.uk.html
===================================================================
RCS file: /web/www/www/philosophy/why-copyleft.uk.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/why-copyleft.uk.html     1 Nov 2014 07:02:44 -0000       1.1
+++ philosophy/why-copyleft.uk.html     3 Feb 2018 10:36:20 -0000       1.2
@@ -1,7 +1,7 @@
 <!--#set var="ENGLISH_PAGE" value="/philosophy/why-copyleft.en.html" -->
 
 <!--#include virtual="/server/header.uk.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.84 -->
 
 <!-- This file is automatically generated by GNUnited Nations! -->
 <title>Навіщо копілефт? - Проект GNU - Фонд 
вільного програмного забезпечення</title>
@@ -35,23 +35,43 @@
 </p>
 
 <p>
-Смирення&nbsp;&mdash; це зречення від своїх 
власних інтересів; але ви і ті,
-хто використовує ваші програми,&mdash; не 
єдині, кого стосується ваш вибір
-ліцензії вільних програм для використання 
вашого вихідного тексту. Дехто,
-користуючись вашим вихідним текстом у 
невільній програмі, намагається
-відмовити у свободі іншим, і якщо ви 
дозволите йому це, то ви не зумієте
-захистити свободу. Лягти і нічого не 
робити, коли мова йде про захист
-свободи інших&nbsp;&nbsp; прояв слабкості, а не 
смирення.
+Покора&nbsp;&mdash; це зречення своїх власних 
інтересів; але інтерес, від
+якого ви відмовляєтеся, коли не 
застосовуєте копілефт для свого 
програмного
+коду, це не суто ваш особистий інтерес.  Дех
то, користуючись вашим вихідним
+кодом у невільній програмі, намагається 
відмовити у свободі іншим, і якщо ви
+дозволите йому це, то ви не зумієте зах
истити свободу тих людей. Лягти і
+нічого не робити, коли мова йде про захист 
свободи кожного&nbsp;&nbsp; прояв
+слабкості, а не покори.
 </p>
 
 <p>
-Випускаючи свій вихідний текст під однією 
з ліцензій BSD або якою-небудь
-іншою ліберальною ліцензією без 
копілефту, ви не робите погано; програма
+Випускаючи свій вихідний текст під однією 
з <a
+href="/licenses/bsd.html">ліцензій BSD</a>  або 
якою-небудь іншою
+ліберальною ліцензією без копілефту, ви не 
робите погано; програма
 залишається вільною і служить на благо 
нашої спільноти. Але це слабкість, і
 в більшості випадків це не кращий спосіб 
сприяти свободі користувачів
 змінювати програми та обмінюватися ними.
 </p>
 
+<p>
+Ось конкретні приклади невільних версій 
вільних програм, які завдали
+суттєвої шкоди світу свободи.</p>
+
+<ul>
+<li>Ті, хто випустив LLVM під ліцензією без 
копілефту, тим самим <a
+href="https://www.anandtech.com/show/5238/nvidia-releases-cuda-41-cuda-goes-llvm-and-open-source-kind-of";>дали
+nVidia можливість випустити якісний 
невільний компілятор</a> для своїх
+мікропроцесорів, зберігаючи набір 
інструкцій у таємниці. Таким чином, ми не
+можемо написати для цієї платформи 
вільний компілятор без трудомісткої
+зворотної розробки. Не вільна адаптація 
LLVM&nbsp;&mdash; це єдиний
+компілятор для цих машин, і швидше за все 
вона залишиться єдиною.</li>
+
+<li>Intel застосовує <a
+href="http://www.tomshardware.com/news/google-removing-minix-management-engine-intel,35876.html";>невільну
+версію системи MINIX</a>, яка вільна, але без 
копілефту, в чорному ході
+керівного пристрою своїх сучасних 
процесорів.</li>
+</ul>
+
 <div class="translators-notes">
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -95,7 +115,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -109,13 +129,13 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2003, 2007, 2008, 2013 Фонд вільного 
програмного
-забезпечення, Inc.</p>
+<p>Copyright &copy; 2003, 2007, 2008, 2013, 2017, 2018 Фонд 
вільного
+програмного забезпечення, Inc.</p>
 
 <p>Ця сторінка доступна на умовах <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.uk";> 
ліцензії
-Creative Commons Attribution-NoDerivs (<em>Із зазначенням
-авторства&nbsp;&mdash; Без похідних творів</em>) 3.0 
Сполучені Штати</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> ліцензії
+Creative Commons Attribution-NoDerivatives (<em>Із зазначенням
+авторства&nbsp;&mdash; Без похідних творів</em>) 4.0 
Міжнародна</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.uk.html" -->
 <div class="translators-credits">
@@ -127,7 +147,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Оновлено:
 
-$Date: 2014/11/01 07:02:44 $
+$Date: 2018/02/03 10:36:20 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/free-sw.uk-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.uk-en.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- philosophy/po/free-sw.uk-en.html    31 Dec 2017 08:24:48 -0000      1.21
+++ philosophy/po/free-sw.uk-en.html    3 Feb 2018 10:36:20 -0000       1.22
@@ -593,7 +593,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996, 2002, 2004-2007, 2009-2017
+<p>Copyright &copy; 1996, 2002, 2004-2007, 2009-2018
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -604,7 +604,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/12/31 08:24:48 $
+$Date: 2018/02/03 10:36:20 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/free-sw.uk.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.uk.po,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- philosophy/po/free-sw.uk.po 2 Feb 2018 17:18:59 -0000       1.61
+++ philosophy/po/free-sw.uk.po 3 Feb 2018 10:36:20 -0000       1.62
@@ -14,9 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2018-01-01 05:58+0000\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
 
 #. type: Content of: <title>
@@ -1134,9 +1133,6 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1996, 2002, 2004-2007, 2009-2017 Free Software "
-#| "Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 2002, 2004-2007, 2009-2018 Free Software Foundation, "
 "Inc."

Index: philosophy/po/fs-translations.fr-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/fs-translations.fr-en.html,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- philosophy/po/fs-translations.fr-en.html    1 Jan 2018 17:34:54 -0000       
1.78
+++ philosophy/po/fs-translations.fr-en.html    3 Feb 2018 10:36:20 -0000       
1.79
@@ -1,9 +1,8 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.84 -->
+<!-- Parent-Version: 1.85 -->
 <title>Translations of the term &ldquo;free software&rdquo;
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/fs-translations.translist" -->
-
 <style type="text/css" media="print,screen">
 <!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" --><!--
 #content th { text-align: right; }
@@ -315,6 +314,26 @@
 </table>
 <!-- GNUN-SORT-NEXT-ITEM -->
 <!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="gl">Galician</h3>
+<!-- GNUN-SORT-END-KEY -->
+<table border="1">
+<tr><th>Language Code</th>
+<td>gl</td></tr>
+<tr><th>Free Software</th>
+<td lang="gl" xml:lang="gl">
+software libre</td></tr>
+<tr><th>Gratis Software</th>
+<td lang="gl" xml:lang="gl">
+software gratuíto</td></tr>
+<tr><th>Proprietary Software</th>
+<td lang="gl" xml:lang="gl">
+software privativo</td></tr>
+<tr><th>Commercial Software</th>
+<td lang="gl" xml:lang="gl">
+software comercial</td></tr>
+</table>
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
 <h3 id="ka">Georgian</h3>
 <!-- GNUN-SORT-END-KEY -->
 <table border="1">
@@ -972,7 +991,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/01/01 17:34:54 $
+$Date: 2018/02/03 10:36:20 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/gnutella.uk-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/gnutella.uk-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/gnutella.uk-en.html   31 Dec 2017 08:24:49 -0000      1.5
+++ philosophy/po/gnutella.uk-en.html   3 Feb 2018 10:36:20 -0000       1.6
@@ -86,7 +86,7 @@
 information on coordinating and submitting translations of this article.</p>
 </div>
 
-<p>Copyright &copy; 2004, 2005, 2007, 2016, 2017 Free Software Foundation, 
Inc.</p>
+<p>Copyright &copy; 2004, 2005, 2007, 2016, 2017, 2018 Free Software 
Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -96,7 +96,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/12/31 08:24:49 $
+$Date: 2018/02/03 10:36:20 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/gnutella.uk.po
===================================================================
RCS file: /web/www/www/philosophy/po/gnutella.uk.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- philosophy/po/gnutella.uk.po        2 Feb 2018 17:18:57 -0000       1.12
+++ philosophy/po/gnutella.uk.po        3 Feb 2018 10:36:20 -0000       1.13
@@ -14,9 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODINGLanguage: uk\n"
-"X-Outdated-Since: 2018-01-01 05:58+0000\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
 
 #. type: Content of: <title>
@@ -166,15 +165,12 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 2004, 2005, 2007, 2016, 2017 Free Software Foundation, "
-#| "Inc."
 msgid ""
 "Copyright &copy; 2004, 2005, 2007, 2016, 2017, 2018 Free Software "
 "Foundation, Inc."
 msgstr ""
-"Copyright &copy; 2004, 2005, 2007, 2016, 2017, 2018 Фонд вільного 
програмного "
-"забезпечення, Inc."
+"Copyright &copy; 2004, 2005, 2007, 2016, 2017, 2018 Фонд вільного 
"
+"програмного забезпечення, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -197,4 +193,3 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Оновлено:"
-

Index: philosophy/po/javascript-trap.uk-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/javascript-trap.uk-en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/po/javascript-trap.uk-en.html    10 Dec 2017 07:30:45 -0000      
1.9
+++ philosophy/po/javascript-trap.uk-en.html    3 Feb 2018 10:36:20 -0000       
1.10
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.79 -->
+<!-- Parent-Version: 1.84 -->
 <title>The JavaScript Trap</title>
 <!--#include virtual="/philosophy/po/javascript-trap.translist" -->
 <!--#include virtual="/server/banner.html" -->
@@ -120,7 +120,7 @@
 only the issue of the client-side software.  We are addressing the
 server issue separately.</p>
 
-<p>In practical terms, how can we deal with the problem of nonfree
+<p>In practical terms, how can we deal with the problem of nontrivial nonfree
 JavaScript programs in web sites?  The first step is to avoid running
 it.</p>
 
@@ -251,7 +251,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2009-2013, 2016, 2017 Richard Stallman</p>
+<p>Copyright &copy; 2009-2013, 2016, 2017, 2018 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -261,7 +261,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/12/10 07:30:45 $
+$Date: 2018/02/03 10:36:20 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/javascript-trap.uk.po
===================================================================
RCS file: /web/www/www/philosophy/po/javascript-trap.uk.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- philosophy/po/javascript-trap.uk.po 2 Feb 2018 17:18:57 -0000       1.26
+++ philosophy/po/javascript-trap.uk.po 3 Feb 2018 10:36:20 -0000       1.27
@@ -14,9 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODINGLanguage: uk\n"
-"X-Outdated-Since: 2017-12-11 08:56+0000\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
 
 #. type: Content of: <h2>
@@ -481,7 +480,6 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-#| msgid "Copyright &copy; 2009-2013, 2016, 2017 Richard Stallman"
 msgid "Copyright &copy; 2009-2013, 2016, 2017, 2018 Richard Stallman"
 msgstr "Copyright &copy; 2009-2013, 2016, 2017, 2018 Річард 
Столмен"
 

Index: philosophy/po/not-ipr.uk-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/not-ipr.uk-en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/po/not-ipr.uk-en.html    31 Dec 2017 08:24:50 -0000      1.9
+++ philosophy/po/not-ipr.uk-en.html    3 Feb 2018 10:36:20 -0000       1.10
@@ -302,7 +302,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2004, 2006, 2010, 2013, 2015, 2016, 2017 Richard M. 
Stallman</p>
+<p>Copyright &copy; 2004, 2006, 2010, 2013, 2015, 2016, 2017, 2018 Richard M. 
Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -312,7 +312,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/12/31 08:24:50 $
+$Date: 2018/02/03 10:36:20 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/not-ipr.uk.po
===================================================================
RCS file: /web/www/www/philosophy/po/not-ipr.uk.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- philosophy/po/not-ipr.uk.po 2 Feb 2018 17:18:57 -0000       1.24
+++ philosophy/po/not-ipr.uk.po 3 Feb 2018 10:36:20 -0000       1.25
@@ -14,9 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODINGLanguage: uk\n"
-"X-Outdated-Since: 2018-01-01 05:58+0000\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
 
 #. type: Content of: <title>
@@ -524,15 +523,12 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 2004, 2006, 2010, 2013, 2015, 2016, 2017 Richard M. "
-#| "Stallman"
 msgid ""
 "Copyright &copy; 2004, 2006, 2010, 2013, 2015, 2016, 2017, 2018 Richard M. "
 "Stallman"
 msgstr ""
-"Copyright &copy;  2004, 2006, 2010, 2013, 2015, 2016, 2017, 2018 Річард 
М."
-" Столмен"
+"Copyright &copy;  2004, 2006, 2010, 2013, 2015, 2016, 2017, 2018 Річард 
М. "
+"Столмен"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -555,4 +551,3 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Оновлено:"
-

Index: philosophy/po/selling.uk-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/selling.uk-en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/po/selling.uk-en.html    31 Dec 2017 08:24:50 -0000      1.9
+++ philosophy/po/selling.uk-en.html    3 Feb 2018 10:36:20 -0000       1.10
@@ -228,7 +228,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996, 1997, 1998, 2001, 2007, 2015, 2016, 2017
+<p>Copyright &copy; 1996, 1997, 1998, 2001, 2007, 2015, 2016, 2017, 2018
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -239,7 +239,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/12/31 08:24:50 $
+$Date: 2018/02/03 10:36:20 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/selling.uk.po
===================================================================
RCS file: /web/www/www/philosophy/po/selling.uk.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/po/selling.uk.po 2 Feb 2018 17:18:57 -0000       1.20
+++ philosophy/po/selling.uk.po 3 Feb 2018 10:36:20 -0000       1.21
@@ -14,9 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODINGLanguage: uk\n"
-"X-Outdated-Since: 2018-01-01 05:58+0000\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
 
 #. type: Content of: <title>
@@ -403,16 +402,12 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 2001, 2007, 2015, 2016, 2017 Free "
-#| "Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 2001, 2007, 2015, 2016, 2017, 2018 Free "
 "Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 1996, 1997, 1998, 2001, 2007, 2013, 2015, 2016, 2017, 2018"
-" Фонд "
-"вільного програмного забезпечення, Inc."
+"Copyright &copy; 1996, 1997, 1998, 2001, 2007, 2013, 2015, 2016, 2017, 2018 "
+"Фонд вільного програмного забезпечення, 
Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -435,4 +430,3 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Оновлено:"
-

Index: philosophy/po/surveillance-vs-democracy.uk-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.uk-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- philosophy/po/surveillance-vs-democracy.uk-en.html  31 Dec 2017 08:24:51 
-0000      1.18
+++ philosophy/po/surveillance-vs-democracy.uk-en.html  3 Feb 2018 10:36:20 
-0000       1.19
@@ -123,6 +123,14 @@
 &ldquo;espionage,&rdquo; finding the &ldquo;spy&rdquo; will provide an
 excuse to access the accumulated material.</p>
 
+<p>In practice, we can't expect state agencies even to make up excuses
+to satisfy the rules for using surveillance data&mdash;because US
+agencies
+already <a 
href="https://theintercept.com/2018/01/09/dark-side-fbi-dea-illegal-searches-secret-evidence/";>
+lie to cover up breaking the rules</a>.  These rules are not seriously
+meant to be obeyed; rather, they are a fairy-tale we can believe if we
+like.</p>
+
 <p>In addition, the state's surveillance staff will misuse the data
 for personal reasons.  Some NSA
 agents <a 
href="http://www.theguardian.com/world/2013/aug/24/nsa-analysts-abused-surveillance-systems";>used
@@ -149,9 +157,14 @@
 this is prohibited.  Once the data has been accumulated and the state
 has the possibility of access to it, it can misuse that data in
 dreadful ways, as shown by examples
-from <a 
href="http://falkvinge.net/2012/03/17/collected-personal-data-will-always-be-used-against-the-citizens/";>Europe</a>
-and <a href="https://en.wikipedia.org/wiki/Japanese_American_internment";>the
-US </a>.</p>
+from <a 
href="http://falkvinge.net/2012/03/17/collected-personal-data-will-always-be-used-against-the-citizens/";>Europe</a>,
+<a href="https://en.wikipedia.org/wiki/Japanese_American_internment";>the
+US</a>, and most
+recently <a 
href="http://www.cbc.ca/news/world/terrifying-how-a-single-line-of-computer-code-put-thousands-of-innocent-turks-in-jail-1.4495021";>Turkey</a>.
+(Turkey's confusion about who had really used the Bylock program only
+exacerbated the basic deliberate injustice of arbitrarily punishing
+people for having used it.)
+</p>
 
 <p>Personal data collected by the state is also likely to be obtained
 by outside crackers that break the security of the servers, even
@@ -216,14 +229,14 @@
 files, with free software on your own computer before uploading
 it.</p>
 
-<p>For privacy's sake, you must avoid nonfree software since, as a
-consequence of giving others control of your computing, it
-is <a href="/malware/proprietary-surveillance.html">likely to spy
-on you</a>.
+<p>For privacy's sake, you must avoid nonfree software; if you give
+control of your computer's operations to companies, they
+are <a href="/malware/proprietary-surveillance.html">likely to make it
+spy on you</a>.
 Avoid <a href="/philosophy/who-does-that-server-really-serve.html">service
-as a software substitute</a>; in addition to giving others control of how your
-computing is done, it requires you to hand over all the pertinent data to the
-server.</p>
+as a software substitute</a>; in addition to giving others control of
+how your computing is done, it requires you to hand over all the
+pertinent data to the company's server.</p>
 
 <p>Protect your friends' and acquaintances' privacy,
 too.  <a 
href="http://bits.blogs.nytimes.com/2014/05/21/in-cybersecurity-sometimes-the-weakest-link-is-a-family-member/";>Don't
@@ -232,7 +245,7 @@
 Don't tell a company such as Facebook anything about your friends that
 they might not wish to publish in a newspaper.  Better yet, don't be
 used by Facebook at all.  Reject communication systems that require
-users to give their real names, even if you are going to give yours,
+users to give their real names, even if you are happy to divulge yours,
 since they pressure other people to surrender their privacy.</p>
 
 <p>Self-protection is essential, but even the most rigorous
@@ -578,7 +591,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2015, 2016, 2017 Richard Stallman</p>
+<p>Copyright &copy; 2015, 2016, 2017, 2018 Richard Stallman</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -588,7 +601,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/12/31 08:24:51 $
+$Date: 2018/02/03 10:36:20 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/surveillance-vs-democracy.uk.po
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.uk.po,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- philosophy/po/surveillance-vs-democracy.uk.po       2 Feb 2018 17:18:57 
-0000       1.65
+++ philosophy/po/surveillance-vs-democracy.uk.po       3 Feb 2018 10:36:20 
-0000       1.66
@@ -14,9 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODINGLanguage: uk\n"
-"X-Outdated-Since: 2018-01-01 05:59+0000\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
 
 #. type: Content of: <title>
@@ -250,14 +249,13 @@
 "a>.  These rules are not seriously meant to be obeyed; rather, they are a "
 "fairy-tale we can believe if we like."
 msgstr ""
-"На практиці ми навіть не можемо очікувати, 
що державні агентства стануть"
-" вигадувати виправдання, щоб задовольнити 
правили користування даними,"
-" отриманими за допомогою стеження&nbsp;&nbsp; 
бо агентства США вже <a"
-" href=\"https://the intercept.com/2018/01/09/dark-side-fbi-dea-illegal-"
-"searches-secret-evidence/\"> брешуть, щоб прикрити 
порушення правил</a>."
-" Ніхто в дійсності не збирається "
-"дотримуватися цих правил; це просто казка, 
яку ми можемо вірити, якщо нам до"
-" вподоби."
+"На практиці ми навіть не можемо очікувати, 
що державні агентства стануть "
+"вигадувати виправдання, щоб задовольнити 
правили користування даними, "
+"отриманими за допомогою стеження&nbsp;&nbsp; 
бо агентства США вже <a href="
+"\"https://the intercept.com/2018/01/09/dark-side-fbi-dea-illegal-searches-"
+"secret-evidence/\"> брешуть, щоб прикрити 
порушення правил</a>. Ніхто в "
+"дійсності не збирається дотримуватися цих
 правил; це просто казка, яку ми "
+"можемо вірити, якщо нам до вподоби."
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -303,14 +301,6 @@
 "officers-abuse-confidential-databases\">багато інших 
прикладів у США</a>."
 
 #. type: Content of: <div><div><p>
-#| msgid ""
-#| "Surveillance data will always be used for other purposes, even if this is "
-#| "prohibited.  Once the data has been accumulated and the state has the "
-#| "possibility of access to it, it can misuse that data in dreadful ways, as "
-#| "shown by examples from <a href=\"http://falkvinge.net/2012/03/17/";
-#| "collected-personal-data-will-always-be-used-against-the-citizens/"
-#| "\">Europe</a> and <a href=\"https://en.wikipedia.org/wiki/";
-#| "Japanese_American_internment\">the US </a>."
 msgid ""
 "Surveillance data will always be used for other purposes, even if this is "
 "prohibited.  Once the data has been accumulated and the state has the "
@@ -329,13 +319,12 @@
 "них, вона може зловживати цими даними 
страхітливим чином, як показують <a "
 "href=\"http://falkvinge.net/2012/03/17/collected-personal-data-will-always-";
 "be-used-against-the-citizens/\">приклади з Європи</a> і <a 
href=\"https://en.";
-"wikipedia.org/wiki/Japanese_American_internment\">США</a>, а "
-"зовсім недавно й <a 
href=\"http://www.cbc.ca/news/world/terrifying-how-a-";
-"single-line-of-computer-code-put-thousands-of-innocent-turks-in-"
-"jail-1.4495021\">Туреччини</a> (Омана Туреччини про 
те, хто насправді "
-"користувався програмою Bullock, тільки 
посилила основну навмисну"
-" несправедливість "
-"довільного покарання людей за 
користування нею.)"
+"wikipedia.org/wiki/Japanese_American_internment\">США</a>, а зовсім 
недавно "
+"й <a href=\"http://www.cbc.ca/news/world/terrifying-how-a-single-line-of-";
+"computer-code-put-thousands-of-innocent-turks-in-jail-1.4495021\">Туреччини</"
+"a> (Омана Туреччини про те, хто насправді 
користувався програмою Bullock, "
+"тільки посилила основну навмисну 
несправедливість довільного покарання 
людей "
+"за користування нею.)"
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -470,14 +459,6 @@
 "відправляти їх на сервер."
 
 #. type: Content of: <div><div><p>
-#| msgid ""
-#| "For privacy's sake, you must avoid nonfree software since, as a "
-#| "consequence of giving others control of your computing, it is <a href=\"/"
-#| "malware/proprietary-surveillance.html\">likely to spy on you</a>.  Avoid "
-#| "<a href=\"/philosophy/who-does-that-server-really-serve.html\">service as "
-#| "a software substitute</a>; in addition to giving others control of how "
-#| "your computing is done, it requires you to hand over all the pertinent "
-#| "data to the server."
 msgid ""
 "For privacy's sake, you must avoid nonfree software; if you give control of "
 "your computer's operations to companies, they are <a href=\"/malware/"
@@ -488,25 +469,13 @@
 "the company's server."
 msgstr ""
 "Заради конфіденційності ви повинні 
уникати невільних програм, оскільки "
-"внаслідок передачі компаніям контролю 
над вашими обчисленнями, вони, <a"
-" href=\"/"
-"malware/proprietary-surveillance.html\">ймовірно, 
шпигуватимуть за вами</a>. "
-"Уникайте <a 
href=\"/philosophy/who-does-that-server-really-serve.html\"> "
+"внаслідок передачі компаніям контролю 
над вашими обчисленнями, вони, <a href="
+"\"/malware/proprietary-surveillance.html\">ймовірно, 
шпигуватимуть за вами</"
+"a>. Уникайте <a 
href=\"/philosophy/who-does-that-server-really-serve.html\"> "
 "послуг підміни програм</a>, а також 
передачі іншим контролю над вашими "
 "обчисленнями, це вимагає від вас надання 
всіх оброблюваних даних на сервер."
 
 #. type: Content of: <div><div><p>
-#| msgid ""
-#| "Protect your friends' and acquaintances' privacy, too.  <a href=\"http://";
-#| "bits.blogs.nytimes.com/2014/05/21/in-cybersecurity-sometimes-the-weakest-"
-#| "link-is-a-family-member/\">Don't give out their personal information</a> "
-#| "except how to contact them, and never give any web site your list of "
-#| "email or phone contacts.  Don't tell a company such as Facebook anything "
-#| "about your friends that they might not wish to publish in a newspaper.  "
-#| "Better yet, don't be used by Facebook at all.  Reject communication "
-#| "systems that require users to give their real names, even if you are "
-#| "going to give yours, since they pressure other people to surrender their "
-#| "privacy."
 msgid ""
 "Protect your friends' and acquaintances' privacy, too.  <a href=\"http://";
 "bits.blogs.nytimes.com/2014/05/21/in-cybersecurity-sometimes-the-weakest-"
@@ -526,8 +495,8 @@
 "нічого такого про своїх друзів, що вони 
могли б не хотіти опублікувати в "
 "газеті. А ще краще не користуйтеся Facebook 
взагалі. Відмовляйтеся від "
 "систем зв'язку, в яких від користувачів 
потрібно називати свої справжні "
-"імена, навіть якщо ви раді назвати свої, 
позаяк це заохочує інших "
-"людей відмовитися від своєї 
конфіденційності."
+"імена, навіть якщо ви раді назвати свої, 
позаяк це заохочує інших людей "
+"відмовитися від своєї конфіденційності."
 
 #. type: Content of: <div><div><p>
 msgid ""
@@ -1176,7 +1145,6 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-#| msgid "Copyright &copy; 2015, 2016, 2017 Richard Stallman"
 msgid "Copyright &copy; 2015, 2016, 2017, 2018 Richard Stallman"
 msgstr "Copyright &copy; 2015, 2016, 2017, 2018 Річард Столмен"
 

Index: philosophy/po/why-copyleft.uk-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/why-copyleft.uk-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/why-copyleft.uk-en.html       1 Nov 2014 07:02:45 -0000       
1.1
+++ philosophy/po/why-copyleft.uk-en.html       3 Feb 2018 10:36:20 -0000       
1.2
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.84 -->
 <title>Why Copyleft?
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/philosophy/po/why-copyleft.translist" -->
@@ -31,23 +31,43 @@
 </p>
 
 <p>
-Humility is abnegating your own self interest, but you and the one who
-uses your code are not the only ones affected by your choice of which
-free software license to use for your code.  Someone who uses your
-code in a nonfree program is trying to deny freedom to others, and if
-you let him do it, you're failing to defend their freedom.  When it
-comes to defending the freedom of others, to lie down and do nothing
-is an act of weakness, not humility.
+Humility is disregarding your own self-interest, but the interest you
+abandon when you don't copyleft your code is much bigger than your
+own.  Someone who uses your code in a nonfree program is denying
+freedom to others, so if you allow that, you're failing to defend
+those people's freedom.  When it comes to defending everyone's
+freedom, to lie down and do nothing is an act of weakness, not
+humility.
 </p>
 
 <p>
-Releasing your code under one of the BSD licenses, or some other
-permissive non-copyleft license, is not doing wrong; the program is
-still free software, and still a contribution to our community.  But
-it is weak, and in most cases it is not the best way to promote users'
-freedom to share and change software.
+Releasing your code under <a href="/licenses/bsd.html"> one of the BSD
+licenses</a>, or some other lax, permissive license, is not doing
+wrong; the program is still free software, and still a contribution to
+our community.  But it is weak, and in most cases it is not the best
+way to promote users' freedom to share and change software.
 </p>
 
+<p>
+Here are specific examples of nonfree versions of free programs
+that have done major harm to the free world.</p>
+
+<ul>
+<li>Those who released LLVM under a non-copyleft
+license <a 
href="https://www.anandtech.com/show/5238/nvidia-releases-cuda-41-cuda-goes-llvm-and-open-source-kind-of";>enabled
+nVidia to release a high-quality nonfree compiler</a> for its GPUs,
+while keeping its instruction set secret.  Thus, we can't write a free
+compiler for that platform without a big reverse engineering job.  The
+nonfree adaptation of LLVM is the only compiler for those machines,
+and is likely to remain so.</li>
+
+<li>Intel uses
+<a 
href="http://www.tomshardware.com/news/google-removing-minix-management-engine-intel,35876.html";>a
+proprietary version of the MINIX system</a>, which is free but not
+copylefted, in the Management Engine back door in its modern
+processors.</li>
+</ul>
+
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -80,7 +100,7 @@
 
 <!-- Regarding copyright, in general, standalone pages (as opposed to
      files generated as part of manuals) on the GNU web server should
-     be under CC BY-ND 3.0 US.  Please do NOT change or remove this
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
      without talking with the webmasters or licensing team first.
      Please make sure the copyright date is consistent with the
      document.  For web pages, it is ok to list just the latest year the
@@ -95,17 +115,17 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2003, 2007, 2008, 2013 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2003, 2007, 2008, 2013, 2017, 2018 Free Software 
Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
 
 <!--#include virtual="/server/bottom-notes.html" -->
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/11/01 07:02:45 $
+$Date: 2018/02/03 10:36:20 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/po/why-copyleft.uk.po
===================================================================
RCS file: /web/www/www/philosophy/po/why-copyleft.uk.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/why-copyleft.uk.po    2 Feb 2018 17:18:57 -0000       1.8
+++ philosophy/po/why-copyleft.uk.po    3 Feb 2018 10:36:20 -0000       1.9
@@ -14,9 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODINGLanguage: uk\n"
-"X-Outdated-Since: 2017-12-11 09:56+0000\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
 
 #. type: Content of: <title>
@@ -103,8 +102,8 @@
 "Here are specific examples of nonfree versions of free programs that have "
 "done major harm to the free world."
 msgstr ""
-"Ось конкретні приклади невільних версій 
вільних програм, які завдали суттєвої"
-" шкоди світу свободи."
+"Ось конкретні приклади невільних версій 
вільних програм, які завдали "
+"суттєвої шкоди світу свободи."
 
 #. type: Content of: <ul><li>
 msgid ""
@@ -116,14 +115,14 @@
 "job.  The nonfree adaptation of LLVM is the only compiler for those "
 "machines, and is likely to remain so."
 msgstr ""
-"Ті, хто випустив LLVM під ліцензією без 
копілефту, тим самим <a"
-" 
href=\"https://www.anandtech.com/show/5238/nvidia-releases-cuda-41-cuda-goes-";
-"llvm-and-open-source-kind-of\">дали nVidia можливість 
випустити якісний"
-" невільний компілятор</a> для своїх 
мікропроцесорів, зберігаючи набір"
-" інструкцій у таємниці. Таким чином, ми не 
можемо написати для цієї платформи"
-" вільний компілятор без трудомісткої 
зворотної розробки. Не вільна адаптація"
-" LLVM&nbsp;&mdash; це єдиний компілятор для цих 
машин, і швидше за все вона"
-" залишиться єдиною."
+"Ті, хто випустив LLVM під ліцензією без 
копілефту, тим самим <a href="
+"\"https://www.anandtech.com/show/5238/nvidia-releases-cuda-41-cuda-goes-llvm-";
+"and-open-source-kind-of\">дали nVidia можливість 
випустити якісний невільний "
+"компілятор</a> для своїх мікропроцесорів, 
зберігаючи набір інструкцій у "
+"таємниці. Таким чином, ми не можемо 
написати для цієї платформи вільний "
+"компілятор без трудомісткої зворотної 
розробки. Не вільна адаптація "
+"LLVM&nbsp;&mdash; це єдиний компілятор для цих 
машин, і швидше за все вона "
+"залишиться єдиною."
 
 #. type: Content of: <ul><li>
 msgid ""
@@ -133,9 +132,9 @@
 "door in its modern processors."
 msgstr ""
 "Intel застосовує <a 
href=\"http://www.tomshardware.com/news/google-removing-";
-"minix-management-engine-intel,35876.html\">невільну версію 
системи MINIX</a>,"
-" яка вільна, але без копілефту, в чорному х
оді керівного пристрою своїх"
-" сучасних процесорів."
+"minix-management-engine-intel,35876.html\">невільну версію 
системи MINIX</"
+"a>, яка вільна, але без копілефту, в чорному 
ході керівного пристрою своїх "
+"сучасних процесорів."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -184,15 +183,12 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 2003, 2007, 2008, 2013, 2017 Free Software Foundation, "
-#| "Inc."
 msgid ""
 "Copyright &copy; 2003, 2007, 2008, 2013, 2017, 2018 Free Software "
 "Foundation, Inc."
 msgstr ""
-"Copyright &copy; 2003, 2007, 2008, 2013, 2017, 2018 Фонд вільного 
програмного "
-"забезпечення, Inc."
+"Copyright &copy; 2003, 2007, 2008, 2013, 2017, 2018 Фонд вільного 
"
+"програмного забезпечення, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -215,4 +211,3 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Оновлено:"
-

Index: po/home.uk-en.html
===================================================================
RCS file: /web/www/www/po/home.uk-en.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- po/home.uk-en.html  31 Dec 2017 08:24:52 -0000      1.29
+++ po/home.uk-en.html  3 Feb 2018 10:36:20 -0000       1.30
@@ -372,7 +372,7 @@
      Information document, www.gnu.org/prep/maintain. -->
 
 <p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 
2017 <a
+2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 
2017, 2018 <a
 href="http://www.fsf.org";>Free Software Foundation</a>, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -383,7 +383,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/12/31 08:24:52 $
+$Date: 2018/02/03 10:36:20 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/home.uk.po
===================================================================
RCS file: /web/www/www/po/home.uk.po,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -b -r1.298 -r1.299
--- po/home.uk.po       2 Feb 2018 17:18:57 -0000       1.298
+++ po/home.uk.po       3 Feb 2018 10:36:20 -0000       1.299
@@ -14,9 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODINGLanguage: uk\n"
-"X-Outdated-Since: 2018-01-01 06:00+0000\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
 
 #. type: Content of: <title>
@@ -461,19 +460,15 @@
 "координування і додавання перекладу цієї 
статті."
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, "
-#| "2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, "
-#| "2017 <a href=\"http://www.fsf.org\";>Free Software Foundation</a>, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
 "2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 "
 "<a href=\"http://www.fsf.org\";>Free Software Foundation</a>, Inc."
 msgstr ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
-"2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018"
-" <a "
-"href=\"http://www.fsf.org\";>Фонд вільного програмного 
забезпечення</a>, Inc."
+"2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 "
+"<a href=\"http://www.fsf.org\";>Фонд вільного 
програмного забезпечення</a>, "
+"Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: po/keepingup.uk-en.html
===================================================================
RCS file: /web/www/www/po/keepingup.uk-en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/keepingup.uk-en.html     31 Dec 2017 08:24:52 -0000      1.10
+++ po/keepingup.uk-en.html     3 Feb 2018 10:36:20 -0000       1.11
@@ -124,7 +124,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2003, 2004, 2005, 2006, 2007, 2014, 2015, 2017 Free 
Software
+<p>Copyright &copy; 2003, 2004, 2005, 2006, 2007, 2014, 2015, 2017, 2018 Free 
Software
 Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -135,7 +135,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/12/31 08:24:52 $
+$Date: 2018/02/03 10:36:20 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/keepingup.uk.po
===================================================================
RCS file: /web/www/www/po/keepingup.uk.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po/keepingup.uk.po  2 Feb 2018 17:18:57 -0000       1.26
+++ po/keepingup.uk.po  3 Feb 2018 10:36:20 -0000       1.27
@@ -14,9 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2018-01-01 06:00+0000\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
-"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
 
 #. type: Content of: <title>
@@ -240,9 +239,6 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 2003, 2004, 2005, 2006, 2007, 2014, 2015, 2017 Free "
-#| "Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 2003, 2004, 2005, 2006, 2007, 2014, 2015, 2017, 2018 Free "
 "Software Foundation, Inc."

Index: proprietary/malware-apple.fr.html
===================================================================
RCS file: /web/www/www/proprietary/malware-apple.fr.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- proprietary/malware-apple.fr.html   22 Jan 2018 21:00:55 -0000      1.45
+++ proprietary/malware-apple.fr.html   3 Feb 2018 10:36:20 -0000       1.46
@@ -91,12 +91,7 @@
 <p>Apple a <a
 
href="https://www.nytimes.com/2017/07/29/technology/china-apple-censorhip.html";>supprimé
 plusieurs VPN de son app store chinois</a>, utilisant ainsi sa propre
-capacité de censure pour renforcer celle du gouvernement chinois.
-</p>
-
-<p>Si Apple n'avait pas conçu les iMonstres pour lui permettre de censurer les
-applications, <a href="/proprietary/proprietary-jails.html">elle n'aurait
-pas eu le pouvoir d'empêcher l'installation de VPN par les 
utilisateurs</a>.</p>
+capacité de censure pour renforcer celle du gouvernement chinois.</p>
 </li>
 
 <li><p>
@@ -220,6 +215,13 @@
 
 <ul>
   <li>
+    <p>MacOS High Sierra reformate d'office les disques de démarrages SSD et 
<a
+href="https://www.macworld.com/article/3230498/storage/apple-file-system-apfs-faq.html";>remplace
+le système de fichiers HFS+ par APFS</a>, système auquel ni GNU/Linux, ni
+Windows, ni même les anciennes versions de MacOS ne peuvent accéder.</p>
+  </li>
+
+  <li>
     <p>Apple va cesser de <a
 
href="https://www.theguardian.com/technology/2017/jun/06/iphone-ipad-apps-games-apple-5-5c-obsolete";>fournir
 des correctifs pour les anciens modèles d'iTrucs</a>.</p>
@@ -404,6 +406,11 @@
 
 <h3 id="drm">DRM</h3>
 <ul>
+  <li><p>Les vidéos d'iTunes ont un DRM, ce qui permet à Apple de <a
+href="https://fr.wikipedia.org/wiki/FairPlay";>décider où ses clients peuvent
+regarder les vidéos qu'ils ont achetées</a>.</p>
+  </li>
+
   <li><p>La DMCA et la directive de l'UE relative au droit d'auteur rendent <a
 href="https://boingboing.net/2017/11/25/la-la-la-cant-hear-you.html";>illégal
 d'étudier la manière dont les applis sous iOS espionnent l'utilisateur</a>
@@ -554,7 +561,7 @@
 
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2015, 2016, 2017, 2018 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2015-2018 Free Software Foundation, Inc.</p>
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
@@ -572,7 +579,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2018/01/22 21:00:55 $
+$Date: 2018/02/03 10:36:20 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/malware-apple.ru.html
===================================================================
RCS file: /web/www/www/proprietary/malware-apple.ru.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- proprietary/malware-apple.ru.html   2 Feb 2018 06:33:11 -0000       1.44
+++ proprietary/malware-apple.ru.html   3 Feb 2018 10:36:20 -0000       1.45
@@ -207,6 +207,13 @@
 
 <ul>
   <li>
+    <p>MacOS High Sierra принудительно 
переформатирует загрузочные диски SSD и <a
+href="https://www.macworld.com/article/3230498/storage/apple-file-system-apfs-faq.html";>
+меняет файловую систему с HFS+ на APFS</a>, с 
которой нельзя работать под
+GNU/Linux, Windows или даже старыми версиями MacOS.</p>
+  </li>
+
+  <li>
     <p>Apple <a
 
href="https://www.theguardian.com/technology/2017/jun/06/iphone-ipad-apps-games-apple-5-5c-obsolete";>прекратит
 исправлять ошибки в старых моделях</a> 
ай-штучек.</p>
@@ -389,7 +396,7 @@
 <ul>
   <li><p>В видеороликах iTunes есть цифровое 
управление ограничениями, которое
 позволяет Apple <a 
href="https://en.wikipedia.org/wiki/FairPlay";>диктовать
-вам, на чем просматривать купленные вами 
видеоролики</a>.</p>
+своим клиентам, на чем просматривать 
купленные ими видеоролики</a>.</p>
   </li>
 
   <li><p>DMCA и Директива об автоском праве 
Евросоюза делают <a
@@ -561,7 +568,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2018/02/02 06:33:11 $
+$Date: 2018/02/03 10:36:20 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/proprietary-drm.fr.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-drm.fr.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- proprietary/proprietary-drm.fr.html 28 Nov 2017 17:29:22 -0000      1.15
+++ proprietary/proprietary-drm.fr.html 3 Feb 2018 10:36:20 -0000       1.16
@@ -36,6 +36,11 @@
 </p>
 
 <ul>
+<li><p>Les vidéos d'iTunes ont un DRM, ce qui permet à Apple de <a
+href="https://fr.wikipedia.org/wiki/FairPlay";>décider où ses clients peuvent
+regarder les vidéos qu'ils ont achetées</a>.</p>
+</li>
+
 <li><p>La DMCA et la directive de l'UE relative au droit d'auteur rendent <a
 href="https://boingboing.net/2017/11/25/la-la-la-cant-hear-you.html";>illégal
 d'étudier la manière dont les applis sous iOS espionnent l'utilisateur</a>
@@ -274,7 +279,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014-2018 Free Software Foundation, Inc.</p>
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
@@ -292,7 +297,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2017/11/28 17:29:22 $
+$Date: 2018/02/03 10:36:20 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/proprietary-drm.ru.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-drm.ru.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- proprietary/proprietary-drm.ru.html 2 Feb 2018 06:33:11 -0000       1.15
+++ proprietary/proprietary-drm.ru.html 3 Feb 2018 10:36:20 -0000       1.16
@@ -40,7 +40,7 @@
 <ul>
 <li><p>В видеороликах iTunes есть цифровое 
управление ограничениями, которое
 позволяет Apple <a 
href="https://en.wikipedia.org/wiki/FairPlay";>диктовать
-вам, на чем просматривать купленные вами 
видеоролики</a>.</p>
+своим клиентам, на чем просматривать 
купленные ими видеоролики</a>.</p>
 </li>
 
 <li><p>DMCA и Директива об автоском праве 
Евросоюза делают <a
@@ -306,7 +306,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2018/02/02 06:33:11 $
+$Date: 2018/02/03 10:36:20 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/proprietary-sabotage.fr.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-sabotage.fr.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- proprietary/proprietary-sabotage.fr.html    28 Nov 2017 17:29:22 -0000      
1.42
+++ proprietary/proprietary-sabotage.fr.html    3 Feb 2018 10:36:20 -0000       
1.43
@@ -25,6 +25,13 @@
 
 <ul>
   <li>
+    <p>MacOS High Sierra reformate d'office les disques de démarrages SSD et 
<a
+href="https://www.macworld.com/article/3230498/storage/apple-file-system-apfs-faq.html";>remplace
+le système de fichiers HFS+ par APFS</a>, système auquel ni GNU/Linux, ni
+Windows, ni même les anciennes versions de MacOS ne peuvent accéder.</p>
+  </li>
+
+  <li>
     <p>Logitech va saboter tous les dispositifs Harmony Link de contrôle 
domotique
 en <a
 
href="https://arstechnica.com/gadgets/2017/11/logitech-to-shut-down-service-and-support-for-harmony-link-devices-in-2018/";>arrêtant
@@ -426,7 +433,7 @@
 
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2013, 2015, 2016, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2013, 2015, 2016, 2017, 2018 Free Software Foundation, 
Inc.</p>
 
 <p>Cette page peut être utilisée suivant les conditions de la licence <a
 rel="license"
@@ -444,7 +451,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Dernière mise à jour :
 
-$Date: 2017/11/28 17:29:22 $
+$Date: 2018/02/03 10:36:20 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/proprietary-sabotage.ru.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-sabotage.ru.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- proprietary/proprietary-sabotage.ru.html    28 Nov 2017 18:59:22 -0000      
1.37
+++ proprietary/proprietary-sabotage.ru.html    3 Feb 2018 10:36:21 -0000       
1.38
@@ -26,6 +26,13 @@
 
 <ul>
   <li>
+    <p>MacOS High Sierra принудительно 
переформатирует загрузочные диски SSD и <a
+href="https://www.macworld.com/article/3230498/storage/apple-file-system-apfs-faq.html";>
+меняет файловую систему с HFS+ на APFS</a>, с 
которой нельзя работать под
+GNU/Linux, Windows или даже старыми версиями MacOS.</p>
+  </li>
+
+  <li>
     <p>Logitech будет саботировать все домашние 
устройства управления Harmony Link,
 <a
 
href="https://arstechnica.com/gadgets/2017/11/logitech-to-shut-down-service-and-support-for-harmony-link-devices-in-2018/";>
@@ -418,7 +425,7 @@
 
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 2013, 2015, 2016, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2013, 2015, 2016, 2017, 2018 Free Software Foundation, 
Inc.</p>
 
 <p>Это произведение доступно по <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лицензии
@@ -438,7 +445,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Обновлено:
 
-$Date: 2017/11/28 18:59:22 $
+$Date: 2018/02/03 10:36:21 $
 
 <!-- timestamp end -->
 </p>

Index: proprietary/po/malware-apple.fr-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/malware-apple.fr-en.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- proprietary/po/malware-apple.fr-en.html     22 Jan 2018 21:00:55 -0000      
1.43
+++ proprietary/po/malware-apple.fr-en.html     3 Feb 2018 10:36:21 -0000       
1.44
@@ -82,14 +82,7 @@
 
href="https://www.nytimes.com/2017/07/29/technology/china-apple-censorhip.html";>
 deleted several VPNs from its app store for China</a>, 
 thus using its own censorship power to strengthen that of the Chinese 
-government.
-</p>
-
-<p>If Apple had not designed the iMonsters to let Apple censor
-applications, 
-<a href="/proprietary/proprietary-jails.html">
-Apple would not have had the power to stop users from installing
-VPNs</a>.</p>
+government.</p>
 </li>
 
 <li><p>
@@ -200,6 +193,13 @@
 
 <ul>
   <li>
+    <p>MacOS High Sierra forcibly reformats SSD boot drives, and <a
+    
href="https://www.macworld.com/article/3230498/storage/apple-file-system-apfs-faq.html";>
+    changes the file system from HFS+ to APFS</a>, which cannot be accessed
+    from GNU/Linux, Windows or even older versions of MacOS.</p>
+  </li>
+
+  <li>
     <p>Apple will stop <a 
href="https://www.theguardian.com/technology/2017/jun/06/iphone-ipad-apps-games-apple-5-5c-obsolete";>fixing
 bugs for older
     model iThings</a>.</p>
 
@@ -368,6 +368,11 @@
 
 <h3 id="drm">Apple DRM</h3>
 <ul>
+  <li><p>iTunes videos have DRM, which allows Apple to <a
+  href="https://en.wikipedia.org/wiki/FairPlay";>dictate where its customers can
+  watch the videos they purchased</a>.</p>
+  </li>
+
   <li><p>The DMCA and the EU Copyright Directive make it <a
 href="https://boingboing.net/2017/11/25/la-la-la-cant-hear-you.html";>
       illegal to study how iOS cr...apps spy on users</a>, because this
@@ -511,7 +516,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/01/22 21:00:55 $
+$Date: 2018/02/03 10:36:21 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/malware-apple.ja-diff.html
===================================================================
RCS file: /web/www/www/proprietary/po/malware-apple.ja-diff.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- proprietary/po/malware-apple.ja-diff.html   1 Feb 2018 20:29:39 -0000       
1.13
+++ proprietary/po/malware-apple.ja-diff.html   3 Feb 2018 10:36:21 -0000       
1.14
@@ -217,7 +217,14 @@
 
 &lt;ul&gt;
   &lt;li&gt;
-    <span class="inserted"><ins><em>&lt;p&gt;Apple will stop &lt;a 
href="https://www.theguardian.com/technology/2017/jun/06/iphone-ipad-apps-games-apple-5-5c-obsolete"&gt;fixing
 bugs for older
+    <span class="inserted"><ins><em>&lt;p&gt;MacOS High Sierra forcibly 
reformats SSD boot drives, and &lt;a
+    
href="https://www.macworld.com/article/3230498/storage/apple-file-system-apfs-faq.html"&gt;
+    changes the file system from HFS+ to APFS&lt;/a&gt;, which cannot be 
accessed
+    from GNU/Linux, Windows or even older versions of MacOS.&lt;/p&gt;
+  &lt;/li&gt;
+
+  &lt;li&gt;
+    &lt;p&gt;Apple will stop &lt;a 
href="https://www.theguardian.com/technology/2017/jun/06/iphone-ipad-apps-games-apple-5-5c-obsolete"&gt;fixing
 bugs for older
     model iThings&lt;/a&gt;.&lt;/p&gt;
 
     &lt;p&gt;Meanwhile, Apple stops people from fixing problems themselves;
@@ -386,8 +393,8 @@
 &lt;h3 id="drm"&gt;Apple DRM&lt;/h3&gt;
 &lt;ul&gt;
   <span class="inserted"><ins><em>&lt;li&gt;&lt;p&gt;iTunes videos have DRM, 
which allows Apple to &lt;a
-  href="https://en.wikipedia.org/wiki/FairPlay"&gt;dictate where you can watch
-  your purchased videos&lt;/a&gt;.&lt;/p&gt;
+  href="https://en.wikipedia.org/wiki/FairPlay"&gt;dictate where its customers 
can
+  watch the videos they purchased&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;The DMCA and the EU Copyright Directive make it &lt;a
@@ -533,7 +540,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/02/01 20:29:39 $
+$Date: 2018/02/03 10:36:21 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: proprietary/po/malware-apple.nl-diff.html
===================================================================
RCS file: /web/www/www/proprietary/po/malware-apple.nl-diff.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- proprietary/po/malware-apple.nl-diff.html   1 Feb 2018 20:29:39 -0000       
1.18
+++ proprietary/po/malware-apple.nl-diff.html   3 Feb 2018 10:36:21 -0000       
1.19
@@ -217,7 +217,14 @@
 
 &lt;ul&gt;
   &lt;li&gt;
-    <span class="inserted"><ins><em>&lt;p&gt;Apple will stop &lt;a 
href="https://www.theguardian.com/technology/2017/jun/06/iphone-ipad-apps-games-apple-5-5c-obsolete"&gt;fixing
 bugs for older
+    <span class="inserted"><ins><em>&lt;p&gt;MacOS High Sierra forcibly 
reformats SSD boot drives, and &lt;a
+    
href="https://www.macworld.com/article/3230498/storage/apple-file-system-apfs-faq.html"&gt;
+    changes the file system from HFS+ to APFS&lt;/a&gt;, which cannot be 
accessed
+    from GNU/Linux, Windows or even older versions of MacOS.&lt;/p&gt;
+  &lt;/li&gt;
+
+  &lt;li&gt;
+    &lt;p&gt;Apple will stop &lt;a 
href="https://www.theguardian.com/technology/2017/jun/06/iphone-ipad-apps-games-apple-5-5c-obsolete"&gt;fixing
 bugs for older
     model iThings&lt;/a&gt;.&lt;/p&gt;
 
     &lt;p&gt;Meanwhile, Apple stops people from fixing problems themselves;
@@ -386,8 +393,8 @@
 &lt;h3 id="drm"&gt;Apple DRM&lt;/h3&gt;
 &lt;ul&gt;
   <span class="inserted"><ins><em>&lt;li&gt;&lt;p&gt;iTunes videos have DRM, 
which allows Apple to &lt;a
-  href="https://en.wikipedia.org/wiki/FairPlay"&gt;dictate where you can watch
-  your purchased videos&lt;/a&gt;.&lt;/p&gt;
+  href="https://en.wikipedia.org/wiki/FairPlay"&gt;dictate where its customers 
can
+  watch the videos they purchased&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;The DMCA and the EU Copyright Directive make it &lt;a
@@ -533,7 +540,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/02/01 20:29:39 $
+$Date: 2018/02/03 10:36:21 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: proprietary/po/malware-apple.ru-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/malware-apple.ru-en.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- proprietary/po/malware-apple.ru-en.html     2 Feb 2018 06:33:11 -0000       
1.42
+++ proprietary/po/malware-apple.ru-en.html     3 Feb 2018 10:36:21 -0000       
1.43
@@ -193,6 +193,13 @@
 
 <ul>
   <li>
+    <p>MacOS High Sierra forcibly reformats SSD boot drives, and <a
+    
href="https://www.macworld.com/article/3230498/storage/apple-file-system-apfs-faq.html";>
+    changes the file system from HFS+ to APFS</a>, which cannot be accessed
+    from GNU/Linux, Windows or even older versions of MacOS.</p>
+  </li>
+
+  <li>
     <p>Apple will stop <a 
href="https://www.theguardian.com/technology/2017/jun/06/iphone-ipad-apps-games-apple-5-5c-obsolete";>fixing
 bugs for older
     model iThings</a>.</p>
 
@@ -362,8 +369,8 @@
 <h3 id="drm">Apple DRM</h3>
 <ul>
   <li><p>iTunes videos have DRM, which allows Apple to <a
-  href="https://en.wikipedia.org/wiki/FairPlay";>dictate where you can watch
-  your purchased videos</a>.</p>
+  href="https://en.wikipedia.org/wiki/FairPlay";>dictate where its customers can
+  watch the videos they purchased</a>.</p>
   </li>
 
   <li><p>The DMCA and the EU Copyright Directive make it <a
@@ -509,7 +516,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/02/02 06:33:11 $
+$Date: 2018/02/03 10:36:21 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/malware-apple.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/malware-apple.ru.po,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- proprietary/po/malware-apple.ru.po  2 Feb 2018 17:16:21 -0000       1.130
+++ proprietary/po/malware-apple.ru.po  3 Feb 2018 10:36:21 -0000       1.131
@@ -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: 2018-02-02 15:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -404,10 +403,10 @@
 "changes the file system from HFS+ to APFS</a>, which cannot be accessed from "
 "GNU/Linux, Windows or even older versions of MacOS."
 msgstr ""
-"MacOS High Sierra принудительно переформатирует 
загрузочные диски SSD и <a href=\"https://";
-"www.macworld.com/article/3230498/storage/apple-file-system-apfs-faq.html\"> "
-"меняет файловую систему с HFS+ на APFS</a>, с 
которой нельзя работать под "
-"GNU/Linux, Windows или даже старыми версиями MacOS."
+"MacOS High Sierra принудительно переформатирует 
загрузочные диски SSD и <a "
+"href=\"https://www.macworld.com/article/3230498/storage/apple-file-system-";
+"apfs-faq.html\"> меняет файловую систему с HFS+ на 
APFS</a>, с которой "
+"нельзя работать под GNU/Linux, Windows или даже 
старыми версиями MacOS."
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -762,14 +761,6 @@
 msgstr "Цифровое управление ограничениями"
 
 #. type: Content of: <ul><li><p>
-# | iTunes videos have DRM, which allows Apple to <a
-# | href=\"https://en.wikipedia.org/wiki/FairPlay\";>dictate where [-you-]
-# | {+its customers+} can watch [-your purchased videos</a>.-] {+the videos
-# | they purchased</a>.+}
-#| msgid ""
-#| "iTunes videos have DRM, which allows Apple to <a href=\"https://en.";
-#| "wikipedia.org/wiki/FairPlay\">dictate where you can watch your purchased "
-#| "videos</a>."
 msgid ""
 "iTunes videos have DRM, which allows Apple to <a href=\"https://en.wikipedia.";
 "org/wiki/FairPlay\">dictate where its customers can watch the videos they "

Index: proprietary/po/proprietary-drm.fr-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-drm.fr-en.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- proprietary/po/proprietary-drm.fr-en.html   28 Nov 2017 17:29:25 -0000      
1.14
+++ proprietary/po/proprietary-drm.fr-en.html   3 Feb 2018 10:36:21 -0000       
1.15
@@ -29,6 +29,11 @@
 </p>
 
 <ul>
+<li><p>iTunes videos have DRM, which allows Apple to <a
+href="https://en.wikipedia.org/wiki/FairPlay";>dictate where its customers can
+watch the videos they purchased</a>.</p>
+</li>
+
 <li><p>The DMCA and the EU Copyright Directive make it <a
 href="https://boingboing.net/2017/11/25/la-la-la-cant-hear-you.html";>
 illegal to study how iOS cr...apps spy on users</a>, because this
@@ -236,7 +241,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, 
Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -246,7 +251,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/11/28 17:29:25 $
+$Date: 2018/02/03 10:36:21 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary-drm.ja-diff.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-drm.ja-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- proprietary/po/proprietary-drm.ja-diff.html 1 Feb 2018 20:29:39 -0000       
1.5
+++ proprietary/po/proprietary-drm.ja-diff.html 3 Feb 2018 10:36:21 -0000       
1.6
@@ -42,8 +42,8 @@
 
 &lt;ul&gt;
 <span class="inserted"><ins><em>&lt;li&gt;&lt;p&gt;iTunes videos have DRM, 
which allows Apple to &lt;a
-href="https://en.wikipedia.org/wiki/FairPlay"&gt;dictate where you can watch
-your purchased videos&lt;/a&gt;.&lt;/p&gt;
+href="https://en.wikipedia.org/wiki/FairPlay"&gt;dictate where its customers 
can
+watch the videos they purchased&lt;/a&gt;.&lt;/p&gt;
 &lt;/li&gt;
 
 &lt;li&gt;&lt;p&gt;The DMCA and the EU Copyright Directive make it &lt;a
@@ -263,7 +263,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/02/01 20:29:39 $
+$Date: 2018/02/03 10:36:21 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: proprietary/po/proprietary-drm.ru-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-drm.ru-en.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- proprietary/po/proprietary-drm.ru-en.html   2 Feb 2018 06:33:11 -0000       
1.15
+++ proprietary/po/proprietary-drm.ru-en.html   3 Feb 2018 10:36:21 -0000       
1.16
@@ -30,8 +30,8 @@
 
 <ul>
 <li><p>iTunes videos have DRM, which allows Apple to <a
-href="https://en.wikipedia.org/wiki/FairPlay";>dictate where you can watch
-your purchased videos</a>.</p>
+href="https://en.wikipedia.org/wiki/FairPlay";>dictate where its customers can
+watch the videos they purchased</a>.</p>
 </li>
 
 <li><p>The DMCA and the EU Copyright Directive make it <a
@@ -251,7 +251,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/02/02 06:33:11 $
+$Date: 2018/02/03 10:36:21 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary-drm.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-drm.ru.po,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- proprietary/po/proprietary-drm.ru.po        2 Feb 2018 17:16:22 -0000       
1.42
+++ proprietary/po/proprietary-drm.ru.po        3 Feb 2018 10:36:21 -0000       
1.43
@@ -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: 2018-02-02 15:56+0000\n"
 
 #. type: Content of: <title>
 msgid "Proprietary DRM - GNU Project - Free Software Foundation"
@@ -79,14 +78,6 @@
 "DefectiveByDesign.org/\"> упразднение цифрового 
управления ограничениями</a>."
 
 #. type: Content of: <ul><li><p>
-# | iTunes videos have DRM, which allows Apple to <a
-# | href=\"https://en.wikipedia.org/wiki/FairPlay\";>dictate where [-you-]
-# | {+its customers+} can watch [-your purchased videos</a>.-] {+the videos
-# | they purchased</a>.+}
-#| msgid ""
-#| "iTunes videos have DRM, which allows Apple to <a href=\"https://en.";
-#| "wikipedia.org/wiki/FairPlay\">dictate where you can watch your purchased "
-#| "videos</a>."
 msgid ""
 "iTunes videos have DRM, which allows Apple to <a href=\"https://en.wikipedia.";
 "org/wiki/FairPlay\">dictate where its customers can watch the videos they "

Index: proprietary/po/proprietary-sabotage.fr-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-sabotage.fr-en.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- proprietary/po/proprietary-sabotage.fr-en.html      28 Nov 2017 17:29:25 
-0000      1.38
+++ proprietary/po/proprietary-sabotage.fr-en.html      3 Feb 2018 10:36:21 
-0000       1.39
@@ -19,6 +19,13 @@
 
 <ul>
   <li>
+    <p>MacOS High Sierra forcibly reformats SSD boot drives, and <a
+    
href="https://www.macworld.com/article/3230498/storage/apple-file-system-apfs-faq.html";>
+    changes the file system from HFS+ to APFS</a>, which cannot be accessed
+    from GNU/Linux, Windows or even older versions of MacOS.</p>
+  </li>
+
+  <li>
     <p>Logitech will sabotage all Harmony Link household control devices by
 <a 
href="https://arstechnica.com/gadgets/2017/11/logitech-to-shut-down-service-and-support-for-harmony-link-devices-in-2018/";>
       turning off the server through which the products' supposed owners
@@ -368,7 +375,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2013, 2015, 2016, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2013, 2015, 2016, 2017, 2018 Free Software Foundation, 
Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -378,7 +385,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/11/28 17:29:25 $
+$Date: 2018/02/03 10:36:21 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary-sabotage.it-diff.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-sabotage.it-diff.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- proprietary/po/proprietary-sabotage.it-diff.html    28 Nov 2017 15:00:04 
-0000      1.6
+++ proprietary/po/proprietary-sabotage.it-diff.html    3 Feb 2018 10:36:21 
-0000       1.7
@@ -31,7 +31,14 @@
 
 &lt;ul&gt;
   &lt;li&gt;
-    <span class="inserted"><ins><em>&lt;p&gt;Logitech will sabotage all 
Harmony Link household control devices by
+    <span class="inserted"><ins><em>&lt;p&gt;MacOS High Sierra forcibly 
reformats SSD boot drives, and &lt;a
+    
href="https://www.macworld.com/article/3230498/storage/apple-file-system-apfs-faq.html"&gt;
+    changes the file system from HFS+ to APFS&lt;/a&gt;, which cannot be 
accessed
+    from GNU/Linux, Windows or even older versions of MacOS.&lt;/p&gt;
+  &lt;/li&gt;
+
+  &lt;li&gt;
+    &lt;p&gt;Logitech will sabotage all Harmony Link household control devices 
by
 &lt;a 
href="https://arstechnica.com/gadgets/2017/11/logitech-to-shut-down-service-and-support-for-harmony-link-devices-in-2018/"&gt;
       turning off the server through which the products' supposed owners
       communicate with them&lt;/a&gt;.&lt;/p&gt;
@@ -380,7 +387,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2013, 2015, 2016, 2017 Free Software Foundation, 
Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2013, 2015, 2016, <span 
class="removed"><del><strong>2017</strong></del></span> <span 
class="inserted"><ins><em>2017, 2018</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -390,7 +397,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2017/11/28 15:00:04 $
+$Date: 2018/02/03 10:36:21 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: proprietary/po/proprietary-sabotage.ja-diff.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-sabotage.ja-diff.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- proprietary/po/proprietary-sabotage.ja-diff.html    28 Nov 2017 15:00:04 
-0000      1.10
+++ proprietary/po/proprietary-sabotage.ja-diff.html    3 Feb 2018 10:36:21 
-0000       1.11
@@ -31,7 +31,14 @@
 
 &lt;ul&gt;
   &lt;li&gt;
-    <span class="inserted"><ins><em>&lt;p&gt;Logitech will sabotage all 
Harmony Link household control devices by
+    <span class="inserted"><ins><em>&lt;p&gt;MacOS High Sierra forcibly 
reformats SSD boot drives, and &lt;a
+    
href="https://www.macworld.com/article/3230498/storage/apple-file-system-apfs-faq.html"&gt;
+    changes the file system from HFS+ to APFS&lt;/a&gt;, which cannot be 
accessed
+    from GNU/Linux, Windows or even older versions of MacOS.&lt;/p&gt;
+  &lt;/li&gt;
+
+  &lt;li&gt;
+    &lt;p&gt;Logitech will sabotage all Harmony Link household control devices 
by
 &lt;a 
href="https://arstechnica.com/gadgets/2017/11/logitech-to-shut-down-service-and-support-for-harmony-link-devices-in-2018/"&gt;
       turning off the server through which the products' supposed owners
       communicate with them&lt;/a&gt;.&lt;/p&gt;
@@ -380,7 +387,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2013, 2015, <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2017</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2013, 2015, <span 
class="removed"><del><strong>2016</strong></del></span> <span 
class="inserted"><ins><em>2016, 2017, 2018</em></ins></span> Free Software 
Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/"&gt;Creative
@@ -390,7 +397,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2017/11/28 15:00:04 $
+$Date: 2018/02/03 10:36:21 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: proprietary/po/proprietary-sabotage.ru-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-sabotage.ru-en.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- proprietary/po/proprietary-sabotage.ru-en.html      28 Nov 2017 18:59:22 
-0000      1.38
+++ proprietary/po/proprietary-sabotage.ru-en.html      3 Feb 2018 10:36:21 
-0000       1.39
@@ -19,6 +19,13 @@
 
 <ul>
   <li>
+    <p>MacOS High Sierra forcibly reformats SSD boot drives, and <a
+    
href="https://www.macworld.com/article/3230498/storage/apple-file-system-apfs-faq.html";>
+    changes the file system from HFS+ to APFS</a>, which cannot be accessed
+    from GNU/Linux, Windows or even older versions of MacOS.</p>
+  </li>
+
+  <li>
     <p>Logitech will sabotage all Harmony Link household control devices by
 <a 
href="https://arstechnica.com/gadgets/2017/11/logitech-to-shut-down-service-and-support-for-harmony-link-devices-in-2018/";>
       turning off the server through which the products' supposed owners
@@ -368,7 +375,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 2013, 2015, 2016, 2017 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2013, 2015, 2016, 2017, 2018 Free Software Foundation, 
Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -378,7 +385,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2017/11/28 18:59:22 $
+$Date: 2018/02/03 10:36:21 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary/po/proprietary-sabotage.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-sabotage.ru.po,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- proprietary/po/proprietary-sabotage.ru.po   2 Feb 2018 17:16:22 -0000       
1.119
+++ proprietary/po/proprietary-sabotage.ru.po   3 Feb 2018 10:36:21 -0000       
1.120
@@ -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: 2018-02-02 16:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Proprietary Sabotage - GNU Project - Free Software Foundation"
@@ -64,10 +63,10 @@
 "changes the file system from HFS+ to APFS</a>, which cannot be accessed from "
 "GNU/Linux, Windows or even older versions of MacOS."
 msgstr ""
-"MacOS High Sierra принудительно переформатирует 
загрузочные диски SSD и <a href=\"https://";
-"www.macworld.com/article/3230498/storage/apple-file-system-apfs-faq.html\"> "
-"меняет файловую систему с HFS+ на APFS</a>, с 
которой нельзя работать под "
-"GNU/Linux, Windows или даже старыми версиями MacOS."
+"MacOS High Sierra принудительно переформатирует 
загрузочные диски SSD и <a "
+"href=\"https://www.macworld.com/article/3230498/storage/apple-file-system-";
+"apfs-faq.html\"> меняет файловую систему с HFS+ на 
APFS</a>, с которой "
+"нельзя работать под GNU/Linux, Windows или даже 
старыми версиями MacOS."
 
 #. type: Content of: <ul><li><p>
 msgid ""
@@ -756,13 +755,10 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; 201[-4-]{+3+}, 2015, 2016, [-2017-] {+2017, 2018+} Free
-# | Software Foundation, Inc.
-#| msgid ""
-#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 2013, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
-msgstr "Copyright &copy; 2013, 2015, 2016, 2017, 2018 Free Software 
Foundation, Inc."
+msgstr ""
+"Copyright &copy; 2013, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""

Index: licenses/gpl-violation.uk.html
===================================================================
RCS file: licenses/gpl-violation.uk.html
diff -N licenses/gpl-violation.uk.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ licenses/gpl-violation.uk.html      3 Feb 2018 10:36:19 -0000       1.1
@@ -0,0 +1,176 @@
+<!--#set var="ENGLISH_PAGE" value="/licenses/gpl-violation.en.html" -->
+
+<!--#include virtual="/server/header.uk.html" -->
+<!-- Parent-Version: 1.84 -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>Порушення ліцензій GNU - Проект GNU - Фонд 
вільного програмного забезпечення</title>
+
+<!--#include virtual="/licenses/po/gpl-violation.translist" -->
+<!--#include virtual="/server/banner.uk.html" -->
+<h2>Порушення ліцензій GNU</h2>
+
+<!--#include virtual="/licenses/fsf-licensing.uk.html" -->
+<p>
+Якщо ви думаєте, що виявили порушення <a 
href="/licenses/gpl.html">GNU
+GPL</a>, <a href="/licenses/lgpl.html">GNU LGPL</a>, <a
+href="/licenses/agpl.html">GNU AGPL</a> або <a href="/licenses/fdl.html">GNU
+FDL</a>, спершу вам потрібно ретельно 
перевірити такі речі:</p>
+<ul>
+  <li>Чи містить дистрибутив копію 
ліцензії?</li>
+  <li>Чи зрозуміло вказано, на які програми 
поширюється ліцензія? Чи йде мова про
+що-небудь оманливе, наприклад, створюється 
враження, ніби нащось ліцензія
+поширюється, хоча в дійсності це не так?</li>
+  <li>Чи входить у дистрибутив джерельний 
код?</li>
+  <li>Чи входить у дистрибутив пропозиція 
джерельного коду або лише двійкових
+файлів?</li>
+  <li>Чи доступний джерельний код є повним 
або він призначений для компонування
+зіншими невільними модулями?</li>
+</ul>
+<p>
+Якщо щось дійсно здається порушенням, то 
вам потрібноакуратно та докладно
+описати:</p>
+
+<ul>
+<li>точну назву продукту</li>
+<li>ім'я особи або назву організації, яка 
розповсюджує це</li>
+
+<li>адреси електронної пошти, поштові 
адреси та номери телефонів для зв'язку із
+розповсюджувачами</li>
+
+<li>точну назву пакунку, ліцензія якого 
порушена</li>
+
+<li>яким чином порушена ліцензія:
+<ul>
+    <li>Чи міститься сповіщення 
правовласника про авторські права?</li>
+    <li>Чи повністю відсутній джерельний 
код?</li>
+ 
+    <li>Чи є письмова пропозиція джерельного 
коду, в якому чогосьбракує? Це могло б
+трапитися, якщо в ньому вказано контактну 
адресу абоадресу в мережі, яка в
+якомусь відношенні неправильна.</li>
+
+    <li>Чи містить дистрибутив копію 
ліцензії?</li>
+
+    <li>Чи доступна тільки частина вихідного 
тексту, а не усе? Якщо так, то яких
+частин не вистачає?</li>
+</ul>
+</li>
+</ul>
+
+<p>
+Чим більше у вас є цих подробиць, тим 
простіше правовласнику вирішити
+проблему.</p>
+
+<p>
+Як тільки ви зберете подробиці, вам слід 
надіслати точний звітправовласнику
+пакунків, щодо яких допущено 
зловживання.Саме правовласник за законом
+уповноважений вживати заходів 
дляконтролю дотримання ліцензії.</p>
+
+<p>
+Якщо правовласником <strong> є </strong> Фонд 
вільного
+програмногозабезпечення, будь ласка, 
надішліть звіт за адресою: <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+Важливо, щоб мимогли зв'язатися з вами для 
отримання подальших відомостей
+про порушення абопро продукт. Тому, якщо ви 
користуєтеся анонімним
+пересиланням, будь ласка,надайте 
який-небудь спосіб зворотного зв'язку. Якщо
+ви хотіли бзашифрувати свою 
кореспонденцію, пошліть коротке 
повідомлення, в
+якому про цейдеться, і ми зробимо 
відповідні кроки. Оскільки ФВПЗ схвалив <a
+href = "https://www.fsf.org/licensing/enforcement-principles";>
+принципигромадсько-орієнтованої охорони 
GPL </a>, ви можете бути впевнені,
+що вашзвіт більше посприяє освіті 
порушників, а не покаранню їх за помилку.</p>
+
+<p>
+Зверніть увагу, що GPL та інші ліцензії з 
копілефтом єліцензійними
+договорами в системі авторського права. Це 
означає, що тількиправовласники
+уповноважені діяти проти порушень. ФВПЗ 
реагує навсі виявлені порушення GPL
+щодо програм, права на якіналежать ФВПЗ, і 
ми пропонуємо підтримку
+будь-якому іншому правовласнику,який 
бажає чинити так само.</p>
+
+<p>
+Однак ми не можемо діяти від свого імені, 
якщо авторські права нам
+неналежать. Тому обов'язково дізнайтеся, х
то є правовласником,перед тим, як
+надіслати звіт про порушення.</p>
+
+<div class="translators-notes">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.uk.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Будь ласка, надсилайте загальні запити 
фонду та GNU за адресою <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. Наявні 
також <a
+href="/contact/">інші способи зв'язку</a> з фондом. 
Звіти про непрацюючі
+посилання і інші виправлення чи 
пропозиції можна надсилати за адресою <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Ми намагалися зробити цей переклад точним 
та якісним, але виключити
+можливість помилки ми не можемо. 
Надсилайте, будь ласка, свої зауваження і
+пропозиції щодо перекладу за адресою <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+</p><p>Відомості з координації та пропозицій 
перекладів наших статей див. у
+<a href="/server/standards/README.translations.html">&ldquo;Посібнику 
з
+перекладу&rdquo;</a>.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+<p>Copyright &copy; 1999, 2001, 2007, 2008, 2013, 2014, 2017, 2018  Фонд
+вільного програмного забезпечення, Inc.</p>
+
+<p>Ця сторінка доступна на умовах <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> ліцензії
+Creative Commons Attribution-NoDerivatives (<em>Із зазначенням
+авторства&nbsp;&mdash; Без похідних творів</em>) 4.0 
Міжнародна</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.uk.html" -->
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+Підтримка українського перекладу: Андрій 
Бандура
+(address@hidden)</div>
+
+<p class="unprintable"><!-- timestamp start -->
+Оновлено:
+
+$Date: 2018/02/03 10:36:19 $
+
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: licenses/po/gpl-violation.uk-en.html
===================================================================
RCS file: licenses/po/gpl-violation.uk-en.html
diff -N licenses/po/gpl-violation.uk-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ licenses/po/gpl-violation.uk-en.html        3 Feb 2018 10:36:19 -0000       
1.1
@@ -0,0 +1,160 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.84 -->
+<title>Violations of the GNU Licenses
+- GNU Project - Free Software Foundation</title>
+<!--#include virtual="/licenses/po/gpl-violation.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>Violations of the GNU Licenses</h2>
+<!--#include virtual="/licenses/fsf-licensing.html" -->
+
+<p>
+If you think you see a violation of the GNU
+<a href="/licenses/gpl.html">GPL</a>,
+<a href="/licenses/lgpl.html">LGPL</a>,
+<a href="/licenses/agpl.html">AGPL</a>, or
+<a href="/licenses/fdl.html">FDL</a>,
+the first thing you
+should do is double-check the facts:</p>
+<ul>
+  <li>Does the distribution contain a copy of the License?</li>
+  <li>Does it clearly state which software is covered by the License?
+       Does it say anything misleading, perhaps giving the impression
+       that something is covered by the License when in fact it is not?</li>
+  <li>Is source code included in the distribution?</li>
+  <li>Is a written offer for source code included with a distribution of
+       just binaries?</li>
+  <li>Is the available source code complete, or is it designed for
+       linking in other non-free modules?</li>
+</ul>
+<p>
+If there seems to be a real violation, the next thing you need to do
+is record the details carefully:</p>
+
+<ul>
+<li>the precise name of the product</li>
+<li>the name of the person or organization distributing it</li>
+
+<li>email addresses, postal addresses and phone numbers for how to
+contact the distributor(s)</li>
+
+<li>the exact name of the package whose license is violated</li>
+
+<li>how the license was violated:
+<ul>
+    <li>Is the copyright notice of the copyright holder included?</li>
+    <li>Is the source code completely missing?</li>
+ 
+    <li>Is there a written offer for source that's incomplete in some
+    way?  This could happen if it provides a contact address or
+    network URL that's somehow incorrect.</li>
+
+    <li>Is there a copy of the license included in the distribution?</li>
+
+    <li>Is some of the source available, but not all?  If so, what parts
+        are missing?</li>
+</ul>
+</li>
+</ul>
+
+<p>
+The more of these details that you have, the easier it is for the
+copyright holder to pursue the matter.</p>
+
+<p>
+Once you have collected the details, you should send a precise report
+to the copyright holder of the packages that are being misused.  The
+copyright holder is the one who is legally authorized to take action
+to enforce the license.</p>
+
+<p>
+If the copyright holder <strong>is</strong> the Free Software
+Foundation, please send the report to <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+It's important that we be able to write back to you to get more
+information about the violation or product.  So, if you use an
+anonymous remailer, please provide a return path of some sort. If
+you'd like to encrypt your correspondence, just send a brief mail
+saying so, and we'll make appropriate arrangements. Because the FSF
+endorsed <a
+href="https://www.fsf.org/licensing/enforcement-principles";>the
+Principles of Community-Oriented GPL Enforcement</a>, you can rest
+assured that your report will help to educate the violator rather than
+punish them for their mistake.</p>
+
+<p>
+Note that the GPL, and other copyleft licenses, are copyright licenses.
+This means that only the copyright holders are empowered to act against
+violations.  The FSF acts on all GPL violations reported on FSF
+copyrighted code, and we offer assistance to any other copyright holder
+who wishes to do the same.</p>
+
+<p>
+But, we cannot act on our own if we do not hold copyright.  Thus, be sure
+to find out who the copyright holders of the software are before reporting
+a violation.</p>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>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 to contact</a>
+the FSF.  Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+</div>
+
+<!-- Regarding copyright, in general, standalone pages (as opposed to
+     files generated as part of manuals) on the GNU web server should
+     be under CC BY-ND 4.0.  Please do NOT change or remove this
+     without talking with the webmasters or licensing team first.
+     Please make sure the copyright date is consistent with the
+     document.  For web pages, it is ok to list just the latest year the
+     document was modified, or published.
+     
+     If you wish to list earlier years, that is ok too.
+     Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+     years, as long as each year in the range is in fact a copyrightable
+     year, i.e., a year in which the document was published (including
+     being publicly visible on the web or in a revision control system).
+     
+     There is more detail about copyright years in the GNU Maintainers
+     Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright &copy; 1999, 2001, 2007, 2008, 2013, 2014, 2017, 2018
+Free Software Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2018/02/03 10:36:19 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>

Index: philosophy/po/free-software-for-freedom.zh-cn-en.html
===================================================================
RCS file: philosophy/po/free-software-for-freedom.zh-cn-en.html
diff -N philosophy/po/free-software-for-freedom.zh-cn-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/po/free-software-for-freedom.zh-cn-en.html       3 Feb 2018 
10:36:20 -0000       1.1
@@ -0,0 +1,452 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.79 -->
+<title>Why &ldquo;Free Software&rdquo; is better than &ldquo;Open Source&rdquo;
+- GNU Project - Free Software Foundation</title>
+<!--#include virtual="/philosophy/po/free-software-for-freedom.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>Why &ldquo;Free Software&rdquo; is better than &ldquo;Open 
Source&rdquo;</h2>
+
+<div class="announcement">
+<blockquote><p>This article has been superseded by a major rewrite,
+<a href="/philosophy/open-source-misses-the-point.html">&ldquo;Open
+Source&rdquo; misses the point of Free Software</a>, which is much
+better.  We keep this version for historical reasons.</p></blockquote>
+</div>
+
+<p>
+While free software by any other name would give you the same
+freedom, it makes a big difference which name we use: different words
+<em>convey different ideas</em>.</p>
+
+<p>
+In 1998, some of the people in the free software community began using
+the term <a href="https://opensource.org/";>&ldquo;open source
+software&rdquo;</a> instead of <a href="/philosophy/free-sw.html">&ldquo;free
+software&rdquo;</a> to describe what they do.  The term &ldquo;open 
source&rdquo;
+quickly became associated with a different approach, a different
+philosophy, different values, and even a different criterion for which
+licenses are acceptable.  The Free Software movement and the Open
+Source movement are today <a href="#relationship"> separate
+movements</a> with different views and goals, although we can and do
+work together on some practical projects.</p>
+
+<p>
+The fundamental difference between the two movements is in their
+values, their ways of looking at the world.  For the Open Source
+movement, the issue of whether software should be open source is a
+practical question, not an ethical one.  As one person put it, &ldquo;Open
+source is a development methodology; free software is a social
+movement.&rdquo;  For the Open Source movement, non-free software is a
+suboptimal solution.  For the Free Software movement, non-free
+software is a social problem and free software is the solution.</p>
+
+<h3 id="relationship">Relationship between the Free Software
+movement and Open Source movement</h3>
+
+<p>
+The Free Software movement and the Open Source movement are like two
+political camps within the free software community.</p>
+
+<p>
+Radical groups in the 1960s developed a reputation for factionalism:
+organizations split because of disagreements on details of strategy,
+and then treated each other as enemies.  Or at least, such is the
+image people have of them, whether or not it was true.</p>
+
+<p>
+The relationship between the Free Software movement and the Open
+Source movement is just the opposite of that picture.  We disagree on
+the basic principles, but agree more or less on the practical
+recommendations.  So we can and do work together on many specific
+projects.  We don't think of the Open Source movement as an enemy.
+The enemy is
+<a href="/philosophy/categories.html#ProprietarySoftware"> proprietary
+software</a>.</p>
+
+<p>
+We are not against the Open Source movement, but we don't want to be
+lumped in with them.  We acknowledge that they have contributed to our
+community, but we created this community, and we want people to know
+this.  We want people to associate our achievements with our values
+and our philosophy, not with theirs.  We want to be heard, not
+obscured behind a group with different views.  To prevent people from
+thinking we are part of them, we take pains to avoid using the word
+&ldquo;open&rdquo; to describe free software, or its contrary,
+&ldquo;closed&rdquo;, in talking about non-free software.</p>
+
+<p>
+So please mention the Free Software movement when you talk about the
+work we have done, and the software we have developed&mdash;such as the
+<a href="/gnu/linux-and-gnu.html">GNU/Linux</a> operating system.</p>
+
+<h3 id="comparison">Comparing the two terms</h3>
+
+<p>
+This rest of this article compares the two terms &ldquo;free software&rdquo; 
and
+&ldquo;open source&rdquo;.  It shows why the term &ldquo;open source&rdquo; 
does not solve
+any problems, and in fact creates some.</p>
+
+<h3 id="ambiguity">Ambiguity</h3>
+
+<p>
+The term &ldquo;free software&rdquo; has an ambiguity problem: an unintended
+meaning, &ldquo;Software you can get for zero price,&rdquo; fits the term just
+as well as the intended meaning, &ldquo;software which gives the user
+certain freedoms.&rdquo;  We address this problem by publishing a
+<a href="/philosophy/free-sw.html"> more precise definition of free
+software</a>, but this is not a perfect solution; it cannot completely
+eliminate the problem.  An unambiguously correct term would be better,
+if it didn't have other problems.</p>
+
+<p>
+Unfortunately, all the alternatives in English have problems of their
+own.  We've looked at many alternatives that people have suggested,
+but none is so clearly &ldquo;right&rdquo; that switching to it would be a good
+idea.  Every proposed replacement for &ldquo;free software&rdquo; has a similar
+kind of semantic problem, or worse&mdash;and this includes &ldquo;open source
+software.&rdquo;</p>
+
+<p>
+The official definition of &ldquo;open source software,&rdquo; as published
+by the Open Source Initiative, is very close to our definition
+of free software; however, it is a little looser in some respects,
+and they have accepted a few licenses that we consider unacceptably
+restrictive of the users.
+
+However, 
+the obvious meaning for the expression &ldquo;open source software&rdquo;
+is &ldquo;You can look at
+the source code.&rdquo;  This is a much weaker criterion than free
+software; it includes free software, but also
+some <a href="/philosophy/categories.html#ProprietarySoftware">
+proprietary</a> programs, including Xv, and Qt under its original license
+(before the QPL).</p>
+
+<p>
+That obvious meaning for &ldquo;open source&rdquo; is not the meaning that its
+advocates intend.  The result is that most people misunderstand
+what those advocates are advocating.  Here is how writer Neal
+Stephenson defined &ldquo;open source&rdquo;:</p>
+
+<blockquote><p>
+Linux is &ldquo;open source&rdquo; software
+meaning, simply, that anyone can get copies of its source code files.
+</p></blockquote>
+
+<p>
+I don't think he deliberately sought to reject or dispute the
+&ldquo;official&rdquo; definition.  I think he simply applied the conventions 
of
+the English language to come up with a meaning for the term. The state
+of Kansas published a similar definition:
+<!-- The <a href="http://da.state.ks.us/itec/TechArchPt6ver80.pdf";> state of
+Kansas</a> published a similar definition: --></p>
+
+<blockquote><p>
+Make use of open-source software (OSS). OSS is software for which the
+source code is freely and publicly available, though the specific licensing
+agreements vary as to what one is allowed to do with that code.
+</p></blockquote>
+
+<p>
+Of course, the open source people have tried to deal with this by
+publishing a precise definition for the term, just as we have done for
+&ldquo;free software.&rdquo;</p>
+
+<p>
+But the explanation for &ldquo;free software&rdquo; is simple&mdash;a
+person who has grasped the idea of &ldquo;free speech, not free
+beer&rdquo; will not get it wrong again.  There is no such succinct
+way to explain the official meaning of &ldquo;open source&rdquo; and
+show clearly why the natural definition is the wrong one.</p>
+
+<h3 id="fear">Fear of Freedom</h3>
+
+<p>
+The main argument for the term &ldquo;open source software&rdquo; is
+that &ldquo;free software&rdquo; makes some people uneasy.  That's
+true: talking about freedom, about ethical issues, about
+responsibilities as well as convenience, is asking people to think
+about things they might rather ignore.  This can trigger discomfort,
+and some people may reject the idea for that.  It does not follow that
+society would be better off if we stop talking about these things.</p>
+
+<p>
+Years ago, free software developers noticed this discomfort reaction,
+and some started exploring an approach for avoiding it.  They figured
+that by keeping quiet about ethics and freedom, and talking only about
+the immediate practical benefits of certain free software, they might
+be able to &ldquo;sell&rdquo; the software more effectively to certain
+users, especially business.  The term &ldquo;open source&rdquo; is
+offered as a way of doing more of this&mdash;a way to be &ldquo;more
+acceptable to business.&rdquo; The views and values of the Open Source
+movement stem from this decision.</p>
+
+<p>
+This approach has proved effective, in its own terms.  Today many
+people are switching to free software for purely practical reasons.
+That is good, as far as it goes, but that isn't all we need to do!
+Attracting users to free software is not the whole job, just the first
+step.</p>
+
+<p>
+Sooner or later these users will be invited to switch back to
+proprietary software for some practical advantage.  Countless
+companies seek to offer such temptation, and why would users decline?
+Only if they have learned to <em>value the freedom</em> free software
+gives them, for its own sake.  It is up to us to spread this
+idea&mdash;and in order to do that, we have to talk about freedom.  A
+certain amount of the &ldquo;keep quiet&rdquo; approach to business
+can be useful for the community, but we must have plenty of freedom
+talk too.</p>
+
+<p>
+At present, we have plenty of &ldquo;keep quiet&rdquo;, but not enough
+freedom talk.  Most people involved with free software say little
+about freedom&mdash;usually because they seek to be &ldquo;more
+acceptable to business.&rdquo; Software distributors especially show
+this pattern.  Some
+<a href="/gnu/linux-and-gnu.html">GNU/Linux</a> operating system
+distributions add proprietary packages to the basic free system, and
+they invite users to consider this an advantage, rather than a step
+backwards from freedom.</p>
+
+<p>
+We are failing to keep up with the influx of free software users,
+failing to teach people about freedom and our community as fast as
+they enter it.  This is why non-free software (which Qt was when it
+first became popular), and partially non-free operating system
+distributions, find such fertile ground.  To stop using the word
+&ldquo;free&rdquo; now would be a mistake; we need more, not less, talk about
+freedom.</p>
+
+<p>
+If those using the term &ldquo;open source&rdquo; draw more users into our
+community, that is a contribution, but the rest of us will have to
+work even harder to bring the issue of freedom to those users'
+attention.  We have to say, &ldquo;It's free software and it gives you
+freedom!&rdquo;&mdash;more and louder than ever before.</p>
+
+<h3 id="newinfeb">Would a Trademark Help?</h3>
+
+<p>
+The advocates of &ldquo;open source software&rdquo; tried to make it a
+trademark, saying this would enable them to prevent misuse.  This
+initiative was later dropped, the term being too descriptive to
+qualify as a trademark; thus, the legal status of &ldquo;open source&rdquo; is
+the same as that of &ldquo;free software&rdquo;: there is no <em>legal</em>
+constraint on using it.  I have heard reports of a number of
+companies' calling software packages &ldquo;open source&rdquo; even though they
+did not fit the official definition; I have observed some instances
+myself.</p>
+
+<p>
+But would it have made a big difference to use a term that is a
+trademark?  Not necessarily.</p>
+
+<p>
+Companies also made announcements that give the impression that a
+program is &ldquo;open source software&rdquo; without explicitly saying so.  
For
+example, one IBM announcement, about a program that did not fit the
+official definition, said this:</p>
+
+<blockquote><p>
+As is common in the open source community, users of the ...
+technology will also be able to collaborate with IBM ...
+</p></blockquote>
+
+<p>
+This did not actually say that the program <em>was</em> &ldquo;open
+source&rdquo;, but many readers did not notice that detail.  (I should note
+that IBM was sincerely trying to make this program free software, and
+later adopted a new license which does make it free software and
+&ldquo;open source&rdquo;; but when that announcement was made, the program did
+not qualify as either one.)</p>
+
+<p>
+And here is how Cygnus Solutions, which was formed to be a free
+software company and subsequently branched out (so to speak) into
+proprietary software, advertised some proprietary software products:</p>
+
+<blockquote><p>
+Cygnus Solutions is a leader in the open source market and has just
+launched two products into the [GNU/]Linux marketplace. 
+</p></blockquote>
+
+<p>
+Unlike IBM, Cygnus was not trying to make these packages free
+software, and the packages did not come close to qualifying.  But
+Cygnus didn't actually say that these are &ldquo;open source software&rdquo;,
+they just made use of the term to give careless readers that
+impression.</p>
+
+<p>
+These observations suggest that a trademark would not have truly
+prevented the confusion that comes with the term &ldquo;open source&rdquo;.</p>
+
+<h3 id="newinnovember">Misunderstandings(?) of &ldquo;Open Source&rdquo;</h3>
+
+<p>
+The Open Source Definition is clear enough, and it is quite clear that
+the typical non-free program does not qualify.  So you would think
+that &ldquo;Open Source company&rdquo; would mean one whose products are free
+software (or close to it), right?  Alas, many companies are trying to
+give it a different meaning.</p>
+
+<p>
+At the &ldquo;Open Source Developers Day&rdquo; meeting in August 1998, several
+of the commercial developers invited said they intend to make only a
+part of their work free software (or &ldquo;open source&rdquo;).  The focus of
+their business is on developing proprietary add-ons (software or
+<a href="/philosophy/free-doc.html">manuals</a>) to sell to the users of
+this free software.  They ask us to regard this as legitimate, as part
+of our community, because some of the money is donated to free
+software development.</p>
+
+<p>
+In effect, these companies seek to gain the favorable cachet of
+&ldquo;open source&rdquo; for their proprietary software
+products&mdash;even though those are not &ldquo;open source
+software&rdquo;&mdash;because they have some relationship to free
+software or because the same company also maintains some free
+software.  (One company founder said quite explicitly that they would
+put, into the free package they support, as little of their work as
+the community would stand for.)</p>
+
+<p>
+Over the years, many companies have contributed to free software
+development.  Some of these companies primarily developed non-free
+software, but the two activities were separate; thus, we could ignore
+their non-free products, and work with them on free software projects.
+Then we could honestly thank them afterward for their free software
+contributions, without talking about the rest of what they did.</p>
+
+<p>
+We cannot do the same with these new companies, because they won't let
+us.  These companies actively invite the public to lump all their
+activities together; they want us to regard their non-free software as
+favorably as we would regard a real contribution, although it is not
+one.  They present themselves as &ldquo;open source companies,&rdquo; hoping
+that we will get a warm fuzzy feeling about them, and that we will be
+fuzzy-minded in applying it.</p>
+
+<p>
+This manipulative practice would be no less harmful if it were done
+using the term &ldquo;free software.&rdquo;  But companies do not seem to use
+the term &ldquo;free software&rdquo; that way; perhaps its association with
+idealism makes it seem unsuitable.  The term &ldquo;open source&rdquo; opened
+the door for this.</p>
+
+<p>
+At a trade show in late 1998, dedicated to the operating system often
+referred to
+as <a href="/gnu/linux-and-gnu.html">&ldquo;Linux&rdquo;</a>, the
+featured speaker was an executive from a prominent software company.
+He was probably invited on account of his company's decision to
+&ldquo;support&rdquo; that system.  Unfortunately, their form of
+&ldquo;support&rdquo; consists of releasing non-free software that
+works with the system&mdash;in other words, using our community as a
+market but not contributing to it.</p>
+
+<p>
+He said, &ldquo;There is no way we will make our product open source,
+but perhaps we will make it &lsquo;internal&rsquo; open source.  If we
+allow our customer support staff to have access to the source code,
+they could fix bugs for the customers, and we could provide a better
+product and better service.&rdquo; (This is not an exact quote, as I
+did not write his words down, but it gets the gist.)</p>
+
+<p>
+People in the audience afterward told me, &ldquo;He just doesn't get the
+point.&rdquo;  But is that so?  Which point did he not get?</p>
+
+<p>
+He did not miss the point of the Open Source movement.  That movement
+does not say users should have freedom, only that allowing more people
+to look at the source code and help improve it makes for faster and
+better development.  The executive grasped that point completely;
+unwilling to carry out that approach in full, users included, he was
+considering implementing it partially, within the company.</p>
+
+<p>
+The point that he missed is the point that &ldquo;open source&rdquo; was
+designed not to raise: the point that users <em>deserve</em>
+freedom.</p>
+
+<p>
+Spreading the idea of freedom is a big job&mdash;it needs your help.
+That's why we stick to the term &ldquo;free software&rdquo; in the GNU
+Project, so we can help do that job.  If you feel that freedom and
+community are important for their own sake&mdash;not just for the
+convenience they bring&mdash;please join us in using the term
+&ldquo;free software&rdquo;.</p>
+
+<hr />
+
+<!-- The archived version is truncated.
+<p>
+Joe Barr wrote an article called
+<a 
href="http://web.archive.org/web/20080703140137/http://www.itworld.com/LWD010523vcontrol4";>Live
 and
+let license [archived]</a> that gives his perspective on this issue.</p>
+-->
+
+<p>
+Lakhani and Wolf's
+<a 
href="http://ocw.mit.edu/courses/sloan-school-of-management/15-352-managing-innovation-emerging-trends-spring-2005/readings/lakhaniwolf.pdf";>paper
 on the
+motivation of free software developers</a> says that a considerable
+fraction are motivated by the view that software should be free.  This
+was despite the fact that they surveyed the developers on SourceForge,
+a site that does not support the view that this is an ethical issue.</p>
+
+<hr />
+<blockquote id="fsfs"><p class="big">This essay is published
+in <a href="http://shop.fsf.org/product/free-software-free-society/";><cite>Free
+Software, Free Society: The Selected Essays of Richard
+M. Stallman</cite></a>.</p></blockquote>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>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 to contact</a> the FSF.  Broken links and other
+corrections or suggestions can be sent to <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+        replace it with the translation of these two:
+
+        We work hard and do our best to provide accurate, good quality
+        translations.  However, we are not exempt from imperfection.
+        Please send your comments and general suggestions in this regard
+        to <a href="mailto:address@hidden";>
+        &lt;address@hidden&gt;</a>.</p>
+
+        <p>For information on coordinating and submitting translations of
+        our web pages, see <a
+        href="/server/standards/README.translations.html">Translations
+        README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations README</a> for
+information on coordinating and submitting translations of this article.</p>
+</div>
+
+<p>Copyright &copy; 1998, 1999, 2000, 2001, 2007, 2016 Free Software 
Foundation,
+Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2018/02/03 10:36:20 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>



reply via email to

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