trans-coord-devel
[Top][All Lists]
Advanced

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

trans-coord/gnun home.ru.shtml home.zh-cn.shtml...


From: Yavor Doganov
Subject: trans-coord/gnun home.ru.shtml home.zh-cn.shtml...
Date: Wed, 11 Jun 2008 20:27:27 +0000

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   08/06/11 20:27:26

Modified files:
        gnun           : home.ru.shtml home.zh-cn.shtml 
        gnun/philosophy: philosophy.bg.html 
        gnun/philosophy/po: philosophy.bg.po philosophy.pot 
                            words-to-avoid.pot 
        gnun/server    : banner.af.html banner.bg.html banner.ca.html 
                         banner.es.html banner.it.html banner.pt-br.html 
                         banner.pt.html banner.ru.html banner.tr.html 
                         banner.zh-cn.html 
        gnun/server/po : banner.af.po banner.bg.po banner.ca.po 
                         banner.es.po banner.it.po banner.pot 
                         banner.pt-br.po banner.pt.po banner.ru.po 
                         banner.tr.po banner.zh-cn.po 
Added files:
        gnun/philosophy: right-to-read.it.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/home.ru.shtml?cvsroot=trans-coord&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/home.zh-cn.shtml?cvsroot=trans-coord&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/philosophy.bg.html?cvsroot=trans-coord&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/right-to-read.it.html?cvsroot=trans-coord&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/po/philosophy.bg.po?cvsroot=trans-coord&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/po/philosophy.pot?cvsroot=trans-coord&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/po/words-to-avoid.pot?cvsroot=trans-coord&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/banner.af.html?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/banner.bg.html?cvsroot=trans-coord&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/banner.ca.html?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/banner.es.html?cvsroot=trans-coord&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/banner.it.html?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/banner.pt-br.html?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/banner.pt.html?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/banner.ru.html?cvsroot=trans-coord&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/banner.tr.html?cvsroot=trans-coord&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/banner.zh-cn.html?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/po/banner.af.po?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/po/banner.bg.po?cvsroot=trans-coord&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/po/banner.ca.po?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/po/banner.es.po?cvsroot=trans-coord&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/po/banner.it.po?cvsroot=trans-coord&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/po/banner.pot?cvsroot=trans-coord&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/po/banner.pt-br.po?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/po/banner.pt.po?cvsroot=trans-coord&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/po/banner.ru.po?cvsroot=trans-coord&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/po/banner.tr.po?cvsroot=trans-coord&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/po/banner.zh-cn.po?cvsroot=trans-coord&r1=1.4&r2=1.5

Patches:
Index: home.ru.shtml
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/home.ru.shtml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- home.ru.shtml       4 Jun 2008 20:27:05 -0000       1.15
+++ home.ru.shtml       11 Jun 2008 20:27:23 -0000      1.16
@@ -246,13 +246,14 @@
   <li><strong>Гражданам США:</strong>
 <a href="/server/takeaction.html#antidmca">Подпишите петиции 
против
 патентов на программное обеспечение и 
DMCA</a>.</li>
-  <li><strong>Long-term contribution:</strong> <a 
-href="/server/takeaction.html#unmaint">Take over an unmaintained GNU 
-package:</a> <a href="/software/ffp/">ffp</a>, <a 
-href="/software/gnuprologjava/">gnuprologjava</a>, <a 
-href="/software/gnutrition/">gnutrition</a>, <a 
-href="/software/gtkeyboard/">gtkeyboard</a>, <a 
-href="/software/vmslib/">vmslib</a>.</li>
+  <li><strong>Долгосрочное содействие:</strong>
+<a href="/server/takeaction.html#unmaint">Требуются 
руководители
+для следующих GNU пакетов:</a>
+<a href="/software/ffp/">ffp</a>,
+<a href="/software/gnuprologjava/">gnuprologjava</a>,
+<a href="/software/gnutrition/">gnutrition</a>,
+<a href="/software/gtkeyboard/">gtkeyboard</a>,
+<a href="/software/vmslib/">vmslib</a>.</li>
   <li><strong>Долгосрочное содействие:</strong>
 <a href="/server/takeaction.html#gnustep">Пожалуйста, 
помогите</a> проекту
 свободного объектно-ориентированного 
фреймворка для разработки приложений -
@@ -311,7 +312,7 @@
  <p><!-- timestamp start -->
 Обновлено:
    
-   $Date: 2008/06/04 20:27:05 $
+   $Date: 2008/06/11 20:27:23 $
    
 <!-- timestamp end -->
 </p>

Index: home.zh-cn.shtml
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/home.zh-cn.shtml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- home.zh-cn.shtml    10 Jun 2008 20:27:05 -0000      1.31
+++ home.zh-cn.shtml    11 Jun 2008 20:27:23 -0000      1.32
@@ -11,7 +11,7 @@
 
 <!--#include virtual="/server/banner.zh-cn.html" -->
 
-<p class="center big"><strong>欢迎来到 GNU 操作系统 &mdash;GNU 
是自由软件。</strong></p>
+<p class="center big"><strong>欢迎来到 GNU 操作系统 &mdash; GNU 
是自由软件。</strong></p>
 
 <table width="100%" border="0" cellpadding="15" cellspacing="50">
   <tr>
@@ -231,7 +231,7 @@
  <p><!-- timestamp start -->
 最后更新:
    
-   $Date: 2008/06/10 20:27:05 $
+   $Date: 2008/06/11 20:27:23 $
    
 <!-- timestamp end -->
 </p>

Index: philosophy/philosophy.bg.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/philosophy.bg.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- philosophy/philosophy.bg.html       3 Jun 2008 20:27:09 -0000       1.20
+++ philosophy/philosophy.bg.html       11 Jun 2008 20:27:23 -0000      1.21
@@ -8,9 +8,13 @@
 <h2>Философия на проекта GNU</h2>
 
 <p>
-Този указател описва философията на 
Движението за свободен софтуер, която е 
-нашата мотивация за разработката на 
свободната операционна система GNU.</p>
-
+A series of articles describing the philosophy of the Free Software 
+Movement, which is the motivation for our development of the free software 
+operating system GNU.</p>
+
+<p><span class="highlight">If you prefer, you can view <a 
+href="all-philosophy-articles.html">a complete list of philosophy 
+articles</a> instead.</span></p>
 
 <p>
 
@@ -97,7 +101,7 @@
 <!-- timestamp start -->
 Последно обновяване:
 
-$Date: 2008/06/03 20:27:09 $
+$Date: 2008/06/11 20:27:23 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/philosophy.bg.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/po/philosophy.bg.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- philosophy/po/philosophy.bg.po      3 Jun 2008 20:27:10 -0000       1.17
+++ philosophy/po/philosophy.bg.po      11 Jun 2008 20:27:24 -0000      1.18
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-"POT-Creation-Date: 2008-06-03 16:25-0400\n"
+"POT-Creation-Date: 2008-06-11 16:25-0400\n"
 "PO-Revision-Date: 2008-06-01 11:46+0300\n"
 "Last-Translator: Yavor Doganov <address@hidden>\n"
 "Language-Team: Bulgarian <address@hidden>\n"
@@ -28,20 +28,29 @@
 
 # type: Content of: <p>
 #: ../../philosophy/po/philosophy.proto:11
+#, fuzzy
 msgid ""
-"This directory describes the philosophy of the Free Software Movement, which "
-"is the motivation for our development of the free software operating system "
-"GNU."
+"A series of articles describing the philosophy of the Free Software "
+"Movement, which is the motivation for our development of the free software "
+"operating system GNU."
 msgstr ""
 "Този указател описва философията на 
Движението за свободен софтуер, която е "
 "нашата мотивация за разработката на 
свободната операционна система GNU."
 
 # type: Content of: <p>
+#: ../../philosophy/po/philosophy.proto:15
+msgid ""
+"<span class=\"highlight\">If you prefer, you can view <a href=\"all-"
+"philosophy-articles.html\">a complete list of philosophy articles</a> "
+"instead.</span>"
+msgstr ""
+
+# type: Content of: <p>
 #.  please leave both these ID attributes here. ... 
 #.  ... we removed this as an H$ section as it was duplicating the  
 #.  same information on links.html, but it's possible that some users 
 #.  have the URLs bookmarked or on their pages. -len 
-#: ../../philosophy/po/philosophy.proto:18
+#: ../../philosophy/po/philosophy.proto:19
 msgid ""
 "<a id=\"TOCFreedomOrganizations\">We</a> <a id=\"FreedomOrganizations"
 "\">also</a> keep a list of <a href=\"/links/links.html#FreedomOrganizations"
@@ -54,7 +63,7 @@
 "на компютърната разработка и 
електронните комуникации</a>."
 
 # type: Content of: <p>
-#: ../../philosophy/po/philosophy.proto:28
+#: ../../philosophy/po/philosophy.proto:29
 msgid ""
 "Free software is a matter of freedom: people should be free to use software "
 "in all the ways that are socially useful.  Software differs from material "
@@ -71,7 +80,7 @@
 "софтуер трябва да са в състояние да се 
възползват от тях."
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:36
+#: ../../philosophy/po/philosophy.proto:37
 #, fuzzy
 msgid "<a href=\"about-free-software.html\">About free software</a>"
 msgstr ""
@@ -79,14 +88,14 @@
 "софтуер</a>"
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:37
+#: ../../philosophy/po/philosophy.proto:38
 msgid ""
 "<a href=\"about-the-gnu-operating-system.html\">About the GNU Operating "
 "System</a>"
 msgstr ""
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:38
+#: ../../philosophy/po/philosophy.proto:39
 #, fuzzy
 msgid "<a href=\"licensing-free-software.html\">Licensing free software</a>"
 msgstr ""
@@ -94,19 +103,19 @@
 "софтуер</a>"
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:39
+#: ../../philosophy/po/philosophy.proto:40
 #, fuzzy
 msgid "<a href=\"laws-and-issues.html\">Laws and issues</a>"
 msgstr "<a href=\"/gnu/manifesto.html\">Манифест на GNU</a>"
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:40
+#: ../../philosophy/po/philosophy.proto:41
 msgid ""
 "<a href=\"terminology-and-definitions.html\">Terminology and definitions</a>"
 msgstr ""
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:41
+#: ../../philosophy/po/philosophy.proto:42
 #, fuzzy
 msgid ""
 "<a href=\"upholding-software-freedom.html\">Upholding software freedom</a>"
@@ -114,12 +123,12 @@
 "<a href=\"/philosophy/linux-gnu-freedom.html\">Линукс, GNU и 
свободата</a>"
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:42
+#: ../../philosophy/po/philosophy.proto:43
 msgid "<a href=\"speeches-and-interview.html\">Speeches and interviews</a>"
 msgstr ""
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:43
+#: ../../philosophy/po/philosophy.proto:44
 #, fuzzy
 msgid "<a href=\"third-party-ideas.html\">Third party ideas</a>"
 msgstr ""
@@ -127,19 +136,19 @@
 "касетофони (DAT)</a>"
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:44
+#: ../../philosophy/po/philosophy.proto:45
 #, fuzzy
 msgid "<a href=\"misc-philosophy.html\">Miscellaneous philosophy</a>"
 msgstr "<a href=\"/philosophy/bsd.html\">Проблемът с лиценза 
BSD</a>"
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
-#: ../../philosophy/po/philosophy.proto:52
+#: ../../philosophy/po/philosophy.proto:53
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr " "
 
 # type: Content of: <div><p>
-#: ../../philosophy/po/philosophy.proto:59
+#: ../../philosophy/po/philosophy.proto:60
 msgid ""
 "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";
 "\"><em>address@hidden</em></a>.  There are also <a href=\"/contact/\">other "
@@ -156,7 +165,7 @@
 "address@hidden</em></a>."
 
 # type: Content of: <div><p>
-#: ../../philosophy/po/philosophy.proto:69
+#: ../../philosophy/po/philosophy.proto:70
 msgid ""
 "Please see the <a href=\"/server/standards/README.translations.html"
 "\">Translations README</a> for information on coordinating and submitting "
@@ -167,7 +176,7 @@
 "тази статия."
 
 # type: Content of: <div><p>
-#: ../../philosophy/po/philosophy.proto:76
+#: ../../philosophy/po/philosophy.proto:77
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
 "2006, 2007, 2008 Free Software Foundation, Inc.,"
@@ -176,14 +185,14 @@
 "2005, 2006, 2007, 2008 Фондация за свободен софтуер"
 
 # type: Content of: <div><address>
-#: ../../philosophy/po/philosophy.proto:78
+#: ../../philosophy/po/philosophy.proto:79
 msgid "51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"
 msgstr ""
 "Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA "
 "02110-1301, USA"
 
 # type: Content of: <div><p>
-#: ../../philosophy/po/philosophy.proto:79
+#: ../../philosophy/po/philosophy.proto:80
 msgid ""
 "Verbatim copying and distribution of this entire article is permitted in any "
 "medium, provided this notice is preserved."
@@ -194,7 +203,7 @@
 
 # type: Content of: <div><div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
-#: ../../philosophy/po/philosophy.proto:86
+#: ../../philosophy/po/philosophy.proto:87
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
 msgstr ""
 "<b>Превод</b>: Явор Доганов <a 
href=\"mailto:address@hidden";>&lt;address@hidden"
@@ -202,12 +211,12 @@
 
 # type: Content of: <div><p>
 #.  timestamp start 
-#: ../../philosophy/po/philosophy.proto:88
+#: ../../philosophy/po/philosophy.proto:89
 msgid "Updated:"
 msgstr "Последно обновяване:"
 
 # type: Content of: <div><h4>
-#: ../../philosophy/po/philosophy.proto:101
+#: ../../philosophy/po/philosophy.proto:102
 msgid "Translations of this page"
 msgstr "Други преводи на тази страница"
 

Index: philosophy/po/philosophy.pot
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/po/philosophy.pot,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/po/philosophy.pot        3 Jun 2008 20:27:10 -0000       1.11
+++ philosophy/po/philosophy.pot        11 Jun 2008 20:27:24 -0000      1.12
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-06-03 16:25-0400\n"
+"POT-Creation-Date: 2008-06-11 16:25-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -28,9 +28,17 @@
 # type: Content of: <p>
 #: ../../philosophy/po/philosophy.proto:11
 msgid ""
-"This directory describes the philosophy of the Free Software Movement, which "
-"is the motivation for our development of the free software operating system "
-"GNU."
+"A series of articles describing the philosophy of the Free Software "
+"Movement, which is the motivation for our development of the free software "
+"operating system GNU."
+msgstr ""
+
+# type: Content of: <p>
+#: ../../philosophy/po/philosophy.proto:15
+msgid ""
+"<span class=\"highlight\">If you prefer, you can view <a "
+"href=\"all-philosophy-articles.html\">a complete list of philosophy "
+"articles</a> instead.</span>"
 msgstr ""
 
 #.  please leave both these ID attributes here. ... 
@@ -38,7 +46,7 @@
 #.  same information on links.html, but it's possible that some users 
 #.  have the URLs bookmarked or on their pages. -len 
 # type: Content of: <p>
-#: ../../philosophy/po/philosophy.proto:18
+#: ../../philosophy/po/philosophy.proto:19
 msgid ""
 "<a id=\"TOCFreedomOrganizations\">We</a> <a "
 "id=\"FreedomOrganizations\">also</a> keep a list of <a "
@@ -47,7 +55,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/philosophy.proto:28
+#: ../../philosophy/po/philosophy.proto:29
 msgid ""
 "Free software is a matter of freedom: people should be free to use software "
 "in all the ways that are socially useful.  Software differs from material "
@@ -58,60 +66,60 @@
 msgstr ""
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:36
+#: ../../philosophy/po/philosophy.proto:37
 msgid "<a href=\"about-free-software.html\">About free software</a>"
 msgstr ""
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:37
+#: ../../philosophy/po/philosophy.proto:38
 msgid ""
 "<a href=\"about-the-gnu-operating-system.html\">About the GNU Operating "
 "System</a>"
 msgstr ""
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:38
+#: ../../philosophy/po/philosophy.proto:39
 msgid "<a href=\"licensing-free-software.html\">Licensing free software</a>"
 msgstr ""
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:39
+#: ../../philosophy/po/philosophy.proto:40
 msgid "<a href=\"laws-and-issues.html\">Laws and issues</a>"
 msgstr ""
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:40
+#: ../../philosophy/po/philosophy.proto:41
 msgid "<a href=\"terminology-and-definitions.html\">Terminology and 
definitions</a>"
 msgstr ""
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:41
+#: ../../philosophy/po/philosophy.proto:42
 msgid "<a href=\"upholding-software-freedom.html\">Upholding software 
freedom</a>"
 msgstr ""
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:42
+#: ../../philosophy/po/philosophy.proto:43
 msgid "<a href=\"speeches-and-interview.html\">Speeches and interviews</a>"
 msgstr ""
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:43
+#: ../../philosophy/po/philosophy.proto:44
 msgid "<a href=\"third-party-ideas.html\">Third party ideas</a>"
 msgstr ""
 
 # type: Content of: <ul><li>
-#: ../../philosophy/po/philosophy.proto:44
+#: ../../philosophy/po/philosophy.proto:45
 msgid "<a href=\"misc-philosophy.html\">Miscellaneous philosophy</a>"
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 # type: Content of: <div>
-#: ../../philosophy/po/philosophy.proto:52
+#: ../../philosophy/po/philosophy.proto:53
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 
 # type: Content of: <div><p>
-#: ../../philosophy/po/philosophy.proto:59
+#: ../../philosophy/po/philosophy.proto:60
 msgid ""
 "Please send FSF &amp; GNU inquiries to <a "
 "href=\"mailto:address@hidden";><em>address@hidden</em></a>.  There are also <a 
"
@@ -121,7 +129,7 @@
 msgstr ""
 
 # type: Content of: <div><p>
-#: ../../philosophy/po/philosophy.proto:69
+#: ../../philosophy/po/philosophy.proto:70
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
@@ -129,19 +137,19 @@
 msgstr ""
 
 # type: Content of: <div><p>
-#: ../../philosophy/po/philosophy.proto:76
+#: ../../philosophy/po/philosophy.proto:77
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, "
 "2006, 2007, 2008 Free Software Foundation, Inc.,"
 msgstr ""
 
 # type: Content of: <div><address>
-#: ../../philosophy/po/philosophy.proto:78
+#: ../../philosophy/po/philosophy.proto:79
 msgid "51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA"
 msgstr ""
 
 # type: Content of: <div><p>
-#: ../../philosophy/po/philosophy.proto:79
+#: ../../philosophy/po/philosophy.proto:80
 msgid ""
 "Verbatim copying and distribution of this entire article is permitted in any "
 "medium, provided this notice is preserved."
@@ -149,17 +157,17 @@
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 # type: Content of: <div><div>
-#: ../../philosophy/po/philosophy.proto:86
+#: ../../philosophy/po/philosophy.proto:87
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
 msgstr ""
 
 #.  timestamp start 
 # type: Content of: <div><p>
-#: ../../philosophy/po/philosophy.proto:88
+#: ../../philosophy/po/philosophy.proto:89
 msgid "Updated:"
 msgstr ""
 
 # type: Content of: <div><h4>
-#: ../../philosophy/po/philosophy.proto:101
+#: ../../philosophy/po/philosophy.proto:102
 msgid "Translations of this page"
 msgstr ""

Index: philosophy/po/words-to-avoid.pot
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/philosophy/po/words-to-avoid.pot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/words-to-avoid.pot    29 Apr 2008 20:25:23 -0000      1.1
+++ philosophy/po/words-to-avoid.pot    11 Jun 2008 20:27:24 -0000      1.2
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-04-29 16:25-0400\n"
+"POT-Creation-Date: 2008-06-11 16:25-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -37,7 +37,7 @@
 msgstr ""
 
 # type: Content of: <div>
-#: ../../philosophy/po/words-to-avoid.proto:18 
../../philosophy/po/words-to-avoid.proto:578
+#: ../../philosophy/po/words-to-avoid.proto:18 
../../philosophy/po/words-to-avoid.proto:600
 msgid ""
 "Also note <a href=\"/philosophy/categories.html\">Categories of Free "
 "Software</a>."
@@ -82,9 +82,12 @@
 "&ldquo;<a href=\"words-to-avoid.html#MP3Player\" name=\"TOCMP3Player\">MP3 "
 "player</a>&rdquo; | &ldquo;<a href=\"words-to-avoid.html#Open\" "
 "name=\"TOCOpen\">Open</a>&rdquo; | &ldquo;<a href=\"words-to-avoid.html#PC\" "
-"name=\"TOCPC\">PC</a>&rdquo; | &ldquo;<a href=\"words-to-avoid.html#Piracy\" "
+"name=\"TOCPC\">PC</a>&rdquo; | &ldquo;<a "
+"href=\"words-to-avoid.html#Photoshop\" name=\"TOCPC\">Photoshop</a>&rdquo; | "
+"&ldquo;<a href=\"words-to-avoid.html#Piracy\" "
 "name=\"TOCPiracy\">Piracy</a>&rdquo; | &ldquo;<a "
-"href=\"words-to-avoid.html#Protection\" "
+"href=\"words-to-avoid.html#PowerPoint\" name=\"TOCPC\">PowerPoint</a>&rdquo; "
+"| &ldquo;<a href=\"words-to-avoid.html#Protection\" "
 "name=\"TOCProtection\">Protection</a>&rdquo; | &ldquo;<a "
 "href=\"words-to-avoid.html#RAND\" name=\"TOCRAND\">RAND</a>&rdquo; | "
 "&ldquo;<a href=\"words-to-avoid.html#SellSoftware\" "
@@ -98,12 +101,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:85
+#: ../../philosophy/po/words-to-avoid.proto:89
 msgid "&ldquo;BSD-style&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:87
+#: ../../philosophy/po/words-to-avoid.proto:91
 msgid ""
 "The expression &ldquo;BSD-style license&rdquo; leads to confusion because it "
 "<a href=\"/philosophy/bsd.html\">lumps together licenses that have important "
@@ -113,7 +116,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:93
+#: ../../philosophy/po/words-to-avoid.proto:97
 msgid ""
 "To avoid confusion, it is best to name <a "
 "href=\"/licenses/license-list.html\"> the specific license in question</a> "
@@ -121,12 +124,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:98
+#: ../../philosophy/po/words-to-avoid.proto:102
 msgid "&ldquo;Closed&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:100
+#: ../../philosophy/po/words-to-avoid.proto:104
 msgid ""
 "Describing non-free software as &ldquo;closed&rdquo; clearly refers to the "
 "term &ldquo;open source&rdquo;.  In the Free Software Movement, <a "
@@ -140,19 +143,19 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:111
+#: ../../philosophy/po/words-to-avoid.proto:115
 msgid "&ldquo;Commercial&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:113
+#: ../../philosophy/po/words-to-avoid.proto:117
 msgid ""
 "Please don't use &ldquo;commercial&rdquo; as a synonym for "
 "&ldquo;non-free.&rdquo; That confuses two entirely different issues."
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:117
+#: ../../philosophy/po/words-to-avoid.proto:121
 msgid ""
 "A program is commercial if it is developed as a business activity.  A "
 "commercial program can be free or non-free, depending on its license.  "
@@ -162,7 +165,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:124
+#: ../../philosophy/po/words-to-avoid.proto:128
 msgid ""
 "In the first decade of the Free Software Movement, free software packages "
 "were almost always noncommercial; the components of the GNU/Linux operating "
@@ -172,7 +175,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:130
+#: ../../philosophy/po/words-to-avoid.proto:134
 msgid ""
 "Free commercial software is a contribution to our community, so we should "
 "encourage it.  But people who think that &ldquo;commercial&rdquo; means "
@@ -183,12 +186,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:138
+#: ../../philosophy/po/words-to-avoid.proto:142
 msgid "&ldquo;Compensation&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:140
+#: ../../philosophy/po/words-to-avoid.proto:144
 msgid ""
 "To speak of &ldquo;compensation for authors&rdquo; in connection with "
 "copyright carries the assumptions that (1) copyright exists for the sake of "
@@ -199,19 +202,19 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:148
+#: ../../philosophy/po/words-to-avoid.proto:152
 msgid "&ldquo;Consumer&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:150
+#: ../../philosophy/po/words-to-avoid.proto:154
 msgid ""
 "The term &ldquo;consumer&rdquo;, when used to refer to computer users, "
 "carries unfortunate assumptions."
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:153
+#: ../../philosophy/po/words-to-avoid.proto:157
 msgid ""
 "Economic theory uses the terms &ldquo;producer&rdquo; and "
 "&ldquo;consumer&rdquo;.  In that context these words are appropriate.  But "
@@ -221,7 +224,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:159
+#: ../../philosophy/po/words-to-avoid.proto:163
 msgid ""
 "This kind of thinking leads to travesties like the CBDTPA &ldquo;Consumer "
 "Broadband and Digital Television Promotion Act&rdquo; which would require "
@@ -230,14 +233,14 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:165
+#: ../../philosophy/po/words-to-avoid.proto:169
 msgid ""
 "The narrow economic vision of users as &ldquo;consumers&rdquo; tends to go "
 "hand in hand with the idea that published works are &ldquo;content&rdquo;."
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:169
+#: ../../philosophy/po/words-to-avoid.proto:173
 msgid ""
 "To describe people who are not limited to passive consumption on their "
 "computers, we suggest terms such as &ldquo;individuals&rdquo; and "
@@ -245,12 +248,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:174
+#: ../../philosophy/po/words-to-avoid.proto:178
 msgid "&ldquo;Content&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:176
+#: ../../philosophy/po/words-to-avoid.proto:180
 msgid ""
 "If you want to describe a feeling of comfort and satisfaction, by all means "
 "say you are &ldquo;content&rdquo;, but using it as a noun to describe "
@@ -261,7 +264,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:184
+#: ../../philosophy/po/words-to-avoid.proto:188
 msgid ""
 "Those who use this term are often the publishers that push for increased "
 "copyright power in the name of the authors (&ldquo;creators&rdquo;, as they "
@@ -275,7 +278,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:194
+#: ../../philosophy/po/words-to-avoid.proto:198
 msgid ""
 "However, as long as other people use the term &ldquo;content "
 "provider&rdquo;, political dissidents can well call themselves "
@@ -283,7 +286,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:198
+#: ../../philosophy/po/words-to-avoid.proto:202
 msgid ""
 "The term &ldquo;content management&rdquo; takes the prize for vacuity.  "
 "Neither word has any specific meaning; &ldquo;content&rdquo; means "
@@ -296,12 +299,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:207
+#: ../../philosophy/po/words-to-avoid.proto:211
 msgid "&ldquo;Creator&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:209
+#: ../../philosophy/po/words-to-avoid.proto:213
 msgid ""
 "The term &ldquo;creator&rdquo; as applied to authors implicitly compares "
 "them to a deity (&ldquo;the creator&rdquo;).  The term is used by publishers "
@@ -313,12 +316,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:218
+#: ../../philosophy/po/words-to-avoid.proto:222
 msgid "&ldquo;Digital Goods&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:221
+#: ../../philosophy/po/words-to-avoid.proto:225
 msgid ""
 "The term &ldquo;digital goods&rdquo; as applied to copies of works of "
 "authorship forces them into the thought mold of physical goods &mdash; which "
@@ -326,12 +329,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:226
+#: ../../philosophy/po/words-to-avoid.proto:230
 msgid "&ldquo;Digital Rights Management&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:228
+#: ../../philosophy/po/words-to-avoid.proto:232
 msgid ""
 "&ldquo;Digital Rights Management&rdquo; refers to technical schemes designed "
 "to impose restrictions on computer users.  The use of the word "
@@ -342,7 +345,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:235
+#: ../../philosophy/po/words-to-avoid.proto:239
 msgid ""
 "Good alternatives include &ldquo;Digital Restrictions Management&rdquo;, "
 "&ldquo;Digital Restrictions Malware&rdquo;, and &ldquo;digital "
@@ -350,12 +353,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:240
+#: ../../philosophy/po/words-to-avoid.proto:244
 msgid "&ldquo;Ecosystem&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:242
+#: ../../philosophy/po/words-to-avoid.proto:246
 msgid ""
 "It is a mistake to describe our community (or any community) as an "
 "&ldquo;ecosystem&rdquo;, because that word implies the absence of (1)  "
@@ -367,7 +370,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:251
+#: ../../philosophy/po/words-to-avoid.proto:255
 msgid ""
 "By contrast, beings that have ethical responsibility can decide to preserve "
 "something that, on its own, would tend to vanish&mdash;such as civil "
@@ -376,12 +379,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:258
+#: ../../philosophy/po/words-to-avoid.proto:262
 msgid "&ldquo;For free&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:260
+#: ../../philosophy/po/words-to-avoid.proto:264
 msgid ""
 "If you want to say that a program is free software, please don't say that it "
 "is available &ldquo;for free.&rdquo; That term specifically means &ldquo;for "
@@ -389,7 +392,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:265
+#: ../../philosophy/po/words-to-avoid.proto:269
 msgid ""
 "Free software copies are often available for free&mdash;for example, by "
 "downloading via FTP.  But free software copies are also available for a "
@@ -399,19 +402,19 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:271
+#: ../../philosophy/po/words-to-avoid.proto:275
 msgid ""
 "To avoid confusion, you can say that the program is available &ldquo;as free "
 "software.&rdquo;"
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:275
+#: ../../philosophy/po/words-to-avoid.proto:279
 msgid "&ldquo;Freely Available&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:277
+#: ../../philosophy/po/words-to-avoid.proto:281
 msgid ""
 "Don't use &ldquo;freely available&rdquo; as a synonym for &ldquo;free "
 "software.&rdquo; They are not equivalent.  &ldquo;Freely available&rdquo; "
@@ -421,12 +424,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:285
+#: ../../philosophy/po/words-to-avoid.proto:289
 msgid "&ldquo;Freeware&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:287
+#: ../../philosophy/po/words-to-avoid.proto:291
 msgid ""
 "Please don't use the term &ldquo;freeware&rdquo; as a synonym for "
 "&ldquo;free software.&rdquo; The term &ldquo;freeware&rdquo; was used often "
@@ -435,7 +438,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:293
+#: ../../philosophy/po/words-to-avoid.proto:297
 msgid ""
 "Also, if you use other languages than English, please try to avoid borrowing "
 "English terms such as &ldquo;free software&rdquo; or &ldquo;freeware.&rdquo; "
@@ -444,7 +447,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:300
+#: ../../philosophy/po/words-to-avoid.proto:304
 msgid ""
 "By using a word in <a href=\"/philosophy/fs-translations.html\">your own "
 "language</a>, you show that you are really referring to freedom and not just "
@@ -455,12 +458,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:309
+#: ../../philosophy/po/words-to-avoid.proto:313
 msgid "&ldquo;Give away software&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:311
+#: ../../philosophy/po/words-to-avoid.proto:315
 msgid ""
 "It's misleading to use the term &ldquo;give away&rdquo; to mean "
 "&ldquo;distribute a program as free software.&rdquo; It has the same problem "
@@ -469,12 +472,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:318
+#: ../../philosophy/po/words-to-avoid.proto:322
 msgid "Hacker"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:320
+#: ../../philosophy/po/words-to-avoid.proto:324
 msgid ""
 "A hacker is someone who <a "
 "href=\"http://stallman.org/articles/on-hacking.html\";> enjoys playful "
@@ -486,19 +489,19 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:330
+#: ../../philosophy/po/words-to-avoid.proto:334
 msgid ""
 "Please don't spread this mistake.  People who break security are "
 "&ldquo;crackers&rdquo;."
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:334
+#: ../../philosophy/po/words-to-avoid.proto:338
 msgid "&ldquo;Intellectual property&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:336
+#: ../../philosophy/po/words-to-avoid.proto:340
 msgid ""
 "Publishers and lawyers like to describe copyright as &ldquo;intellectual "
 "property&rdquo;&mdash;a term that also includes patents, trademarks, and "
@@ -509,7 +512,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:344
+#: ../../philosophy/po/words-to-avoid.proto:348
 msgid ""
 "The term &ldquo;intellectual property&rdquo; carries a hidden "
 "assumption&mdash;that the way to think about all these disparate issues is "
@@ -518,7 +521,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:349
+#: ../../philosophy/po/words-to-avoid.proto:353
 msgid ""
 "When it comes to copying, this analogy disregards the crucial difference "
 "between material objects and information: information can be copied and "
@@ -526,7 +529,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:354
+#: ../../philosophy/po/words-to-avoid.proto:358
 msgid ""
 "To avoid the bias and confusion of this term, it is best to make a firm "
 "decision <a href=\"/philosophy/not-ipr.html\"> not to speak or even think in "
@@ -534,7 +537,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:358
+#: ../../philosophy/po/words-to-avoid.proto:362
 msgid ""
 "The hypocrisy of calling these powers &ldquo;rights&rdquo; is <a "
 "href=\"/philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> starting to "
@@ -542,12 +545,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:363
+#: ../../philosophy/po/words-to-avoid.proto:367
 msgid "&ldquo;LAMP system&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:365
+#: ../../philosophy/po/words-to-avoid.proto:369
 msgid ""
 "&ldquo;LAMP&rdquo; stands for &ldquo;Linux, Apache, MySQL and "
 "PHP&rdquo;&mdash;a common combination of software to use on a web server, "
@@ -557,12 +560,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:373
+#: ../../philosophy/po/words-to-avoid.proto:377
 msgid "Linux system"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:375
+#: ../../philosophy/po/words-to-avoid.proto:379
 msgid ""
 "Linux is the name of the kernel that Linus Torvalds developed starting in "
 "1991.  The operating system in which Linux is used is basically GNU with "
@@ -573,19 +576,19 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:385
+#: ../../philosophy/po/words-to-avoid.proto:389
 msgid "&ldquo;Market&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:387
+#: ../../philosophy/po/words-to-avoid.proto:391
 msgid ""
 "It is misleading to describe the users of free software, or the software "
 "users in general, as a &ldquo;market&rdquo;."
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:390
+#: ../../philosophy/po/words-to-avoid.proto:394
 msgid ""
 "This is not to say we're against markets.  If you have a free software "
 "support business, then you have clients, and you trade with them in a "
@@ -594,7 +597,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:395
+#: ../../philosophy/po/words-to-avoid.proto:399
 msgid ""
 "But the free software movement is a social movement, not a business, and the "
 "success it aims for is not a market success.  We are trying to serve the "
@@ -604,12 +607,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:402
+#: ../../philosophy/po/words-to-avoid.proto:406
 msgid "&ldquo;MP3 player&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:404
+#: ../../philosophy/po/words-to-avoid.proto:408
 msgid ""
 "In the late 1990's it became feasible to make portable, solid-state digital "
 "audio players. Most support the patented MP3 codec, but not all.  Some "
@@ -622,12 +625,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:415
+#: ../../philosophy/po/words-to-avoid.proto:419
 msgid "&ldquo;Open&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:417
+#: ../../philosophy/po/words-to-avoid.proto:421
 msgid ""
 "Please avoid using the term &ldquo;open&rdquo; or &ldquo;open source&rdquo; "
 "as a substitute for &ldquo;free software&rdquo;.  They refer to a <a "
@@ -640,12 +643,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:427
+#: ../../philosophy/po/words-to-avoid.proto:431
 msgid "&ldquo;PC&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:429
+#: ../../philosophy/po/words-to-avoid.proto:433
 msgid ""
 "It's ok to use the abbreviation &ldquo;PC&rdquo; to refer to a certain kind "
 "of computer hardware, but please don't use it with the implication that the "
@@ -654,12 +657,26 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:435
+#: ../../philosophy/po/words-to-avoid.proto:439
+msgid "&ldquo;Photoshop&rdquo;"
+msgstr ""
+
+# type: Content of: <p>
+#: ../../philosophy/po/words-to-avoid.proto:441
+msgid ""
+"Please avoid using the term &ldquo;Photoshop&rdquo; as a verb, meaning any "
+"kind of photo manipulation or image editing in general.  Photoshop is just "
+"the name of one particular proprietary image editing program, and there are "
+"plenty of free alternatives, such as <a href=\"/software/gimp\">GIMP</a>."
+msgstr ""
+
+# type: Content of: <h4>
+#: ../../philosophy/po/words-to-avoid.proto:448
 msgid "&ldquo;Piracy&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:437
+#: ../../philosophy/po/words-to-avoid.proto:450
 msgid ""
 "Publishers often refer to prohibited copying as &ldquo;piracy.&rdquo; In "
 "this way, they imply that illegal copying is ethically equivalent to "
@@ -668,7 +685,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:442
+#: ../../philosophy/po/words-to-avoid.proto:455
 msgid ""
 "If you don't believe that illegal copying is just like kidnapping and "
 "murder, you might prefer not to use the word &ldquo;piracy&rdquo; to "
@@ -679,12 +696,27 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:450
+#: ../../philosophy/po/words-to-avoid.proto:463
+msgid "&ldquo;PowerPoint&rdquo;"
+msgstr ""
+
+# type: Content of: <p>
+#: ../../philosophy/po/words-to-avoid.proto:465
+msgid ""
+"Please avoid using the term &ldquo;PowerPoint&rdquo; to mean any kind of "
+"slide presentation.  PowerPoint is just the name of one particular "
+"proprietary program to make presentations, and there are plenty of free "
+"alternatives, such as the <tt>beamer</tt> class available with any (La)TeX "
+"distribution."
+msgstr ""
+
+# type: Content of: <h4>
+#: ../../philosophy/po/words-to-avoid.proto:472
 msgid "&ldquo;Protection&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:452
+#: ../../philosophy/po/words-to-avoid.proto:474
 msgid ""
 "Publishers' lawyers love to use the term &ldquo;protection&rdquo; to "
 "describe copyright.  This word carries the implication of preventing "
@@ -694,7 +726,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:458
+#: ../../philosophy/po/words-to-avoid.proto:480
 msgid ""
 "It is easy to avoid &ldquo;protection&rdquo; and use neutral terms instead.  "
 "For example, instead of &ldquo;Copyright protection lasts a very long "
@@ -702,7 +734,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:463
+#: ../../philosophy/po/words-to-avoid.proto:485
 msgid ""
 "If you want to criticize copyright instead of supporting it, you can use the "
 "term &ldquo;copyright restrictions.&rdquo; So you can say, &ldquo;Copyright "
@@ -710,7 +742,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:468
+#: ../../philosophy/po/words-to-avoid.proto:490
 msgid ""
 "The term &ldquo;protection&rdquo; is also used to describe malicious "
 "features, as in &ldquo;copy protection&rdquo;, a feature that interferes "
@@ -719,12 +751,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:475
+#: ../../philosophy/po/words-to-avoid.proto:497
 msgid "&ldquo;RAND (reasonable and non-discriminatory)&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:477
+#: ../../philosophy/po/words-to-avoid.proto:499
 msgid ""
 "Standards bodies that promulgate patent-restricted standards that prohibit "
 "free software typically have a policy of obtaining patent licenses that "
@@ -734,7 +766,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:483
+#: ../../philosophy/po/words-to-avoid.proto:505
 msgid ""
 "That term white-washes a class of patent licenses that are normally neither "
 "reasonable nor non-discriminatory.  It is true that these licenses do not "
@@ -744,7 +776,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:490
+#: ../../philosophy/po/words-to-avoid.proto:512
 msgid ""
 "Standards bodies should recognize that these licenses are discriminatory, "
 "and drop the use of the term &ldquo;reasonable and non-discriminatory&rdquo; "
@@ -755,7 +787,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:498
+#: ../../philosophy/po/words-to-avoid.proto:520
 msgid ""
 "We suggest the term &ldquo;uniform fee only,&rdquo; or &ldquo;UFO&rdquo; for "
 "short, as a replacement.  It is accurate because the only condition in these "
@@ -763,12 +795,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:503
+#: ../../philosophy/po/words-to-avoid.proto:525
 msgid "&ldquo;Sell software&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:505
+#: ../../philosophy/po/words-to-avoid.proto:527
 msgid ""
 "The term &ldquo;sell software&rdquo; is ambiguous.  Strictly speaking, "
 "exchanging a copy of a free program for a sum of money is "
@@ -781,19 +813,19 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:514
+#: ../../philosophy/po/words-to-avoid.proto:536
 msgid ""
 "See <a href=\"/philosophy/selling.html\">Selling Free Software</a> for more "
 "discussion of this issue."
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:518
+#: ../../philosophy/po/words-to-avoid.proto:540
 msgid "&ldquo;Software Industry&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:520
+#: ../../philosophy/po/words-to-avoid.proto:542
 msgid ""
 "The term &ldquo;software industry&rdquo; encourages people to imagine that "
 "software is always developed by a sort of factory and then delivered to "
@@ -804,7 +836,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:527
+#: ../../philosophy/po/words-to-avoid.proto:549
 msgid ""
 "The term &ldquo;industry&rdquo; is being used as propaganda by advocates of "
 "software patents.  They call software development &ldquo;industry&rdquo; and "
@@ -816,12 +848,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:537
+#: ../../philosophy/po/words-to-avoid.proto:559
 msgid "&ldquo;Theft&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:539
+#: ../../philosophy/po/words-to-avoid.proto:561
 msgid ""
 "Copyright apologists often use words like &ldquo;stolen&rdquo; and "
 "&ldquo;theft&rdquo; to describe copyright infringement.  At the same time, "
@@ -830,7 +862,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:544
+#: ../../philosophy/po/words-to-avoid.proto:566
 msgid ""
 "So it is pertinent to mention that the legal system&mdash;at least in the "
 "US&mdash;rejects the idea that copyright infringement is "
@@ -839,7 +871,7 @@
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:549
+#: ../../philosophy/po/words-to-avoid.proto:571
 msgid ""
 "The idea that laws decide what is right or wrong is mistaken in general.  "
 "Laws are, at their best, an attempt to achieve justice; to say that laws "
@@ -847,12 +879,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:555
+#: ../../philosophy/po/words-to-avoid.proto:577
 msgid "&ldquo;Trusted Computing&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:557
+#: ../../philosophy/po/words-to-avoid.proto:579
 msgid ""
 "<a href=\"can-you-trust.html\">&ldquo;Trusted computing&rdquo;</a> is the "
 "proponents name for a scheme to redesign computers so that application "
@@ -862,12 +894,12 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:565
+#: ../../philosophy/po/words-to-avoid.proto:587
 msgid "&ldquo;Vendor&rdquo;"
 msgstr ""
 
 # type: Content of: <p>
-#: ../../philosophy/po/words-to-avoid.proto:567
+#: ../../philosophy/po/words-to-avoid.proto:589
 msgid ""
 "Please don't use the term &ldquo;vendor&rdquo; to refer generally to anyone "
 "that develops or packages a software package.  Many programs are developed "
@@ -879,7 +911,7 @@
 msgstr ""
 
 # type: Content of: <h4>
-#: ../../philosophy/po/words-to-avoid.proto:582
+#: ../../philosophy/po/words-to-avoid.proto:604
 msgid ""
 "This essay is published in <a href=\"/doc/book13.html\"><cite>Free Software, "
 "Free Society: The Selected Essays of Richard M. Stallman</cite></a>."
@@ -887,12 +919,12 @@
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 # type: Content of: <div>
-#: ../../philosophy/po/words-to-avoid.proto:588
+#: ../../philosophy/po/words-to-avoid.proto:610
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
 msgstr ""
 
 # type: Content of: <div><p>
-#: ../../philosophy/po/words-to-avoid.proto:595
+#: ../../philosophy/po/words-to-avoid.proto:617
 msgid ""
 "Please send FSF &amp; GNU inquiries to <a "
 "href=\"mailto:address@hidden";><em>address@hidden</em></a>.  There are also <a 
"
@@ -902,7 +934,7 @@
 msgstr ""
 
 # type: Content of: <div><p>
-#: ../../philosophy/po/words-to-avoid.proto:605
+#: ../../philosophy/po/words-to-avoid.proto:627
 msgid ""
 "Please see the <a "
 "href=\"/server/standards/README.translations.html\">Translations README</a> "
@@ -910,19 +942,19 @@
 msgstr ""
 
 # type: Content of: <div><p>
-#: ../../philosophy/po/words-to-avoid.proto:612
+#: ../../philosophy/po/words-to-avoid.proto:634
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007 Free "
 "Software Foundation, Inc.,"
 msgstr ""
 
 # type: Content of: <div><address>
-#: ../../philosophy/po/words-to-avoid.proto:614
+#: ../../philosophy/po/words-to-avoid.proto:636
 msgid "51 Franklin St, Fifth Floor, Boston, MA 02110, USA"
 msgstr ""
 
 # type: Content of: <div><p>
-#: ../../philosophy/po/words-to-avoid.proto:615
+#: ../../philosophy/po/words-to-avoid.proto:637
 msgid ""
 "Verbatim copying and distribution of this entire article is permitted in any "
 "medium without royalty provided this notice is preserved."
@@ -930,17 +962,17 @@
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 # type: Content of: <div><div>
-#: ../../philosophy/po/words-to-avoid.proto:623
+#: ../../philosophy/po/words-to-avoid.proto:645
 msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
 msgstr ""
 
 #.  timestamp start 
 # type: Content of: <div><p>
-#: ../../philosophy/po/words-to-avoid.proto:625
+#: ../../philosophy/po/words-to-avoid.proto:647
 msgid "Updated:"
 msgstr ""
 
 # type: Content of: <div><h4>
-#: ../../philosophy/po/words-to-avoid.proto:633
+#: ../../philosophy/po/words-to-avoid.proto:655
 msgid "Translations of this page"
 msgstr ""

Index: server/banner.af.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/banner.af.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/banner.af.html       10 Apr 2008 20:25:11 -0000      1.3
+++ server/banner.af.html       11 Jun 2008 20:27:24 -0000      1.4
@@ -57,7 +57,7 @@
           <li id="tabLicenses"><a 
href="/licenses/licenses.html">Lisensies</a></li>
           <li><a href="/server/sitemap.html">Werfuitleg</a></li>
           <li><a href="/help/help.html">Help&nbsp;Ons</a></li>
-          <li><a href="http://order.fsf.org/";>FSF Store</a></li>
+          <li><a href="http://shop.fsf.org/";>FSF Shop</a></li>
         </ul>
         </div>
       </div>

Index: server/banner.bg.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/banner.bg.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/banner.bg.html       11 Apr 2008 20:25:18 -0000      1.9
+++ server/banner.bg.html       11 Jun 2008 20:27:24 -0000      1.10
@@ -57,7 +57,7 @@
           <li id="tabLicenses"><a 
href="/licenses/licenses.html">Лицензи</a></li>
           <li><a 
href="/server/sitemap.html">Карта&nbsp;на&nbsp;сайта</a></li>
           <li><a href="/help/help.html">Помогнете</a></li>
-          <li><a 
href="http://order.fsf.org/";>Магазин&nbsp;на&nbsp;ФСС</a></li>
+          <li><a href="http://shop.fsf.org/";>FSF Shop</a></li>
         </ul>
         </div>
       </div>

Index: server/banner.ca.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/banner.ca.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/banner.ca.html       20 Apr 2008 20:25:06 -0000      1.3
+++ server/banner.ca.html       11 Jun 2008 20:27:24 -0000      1.4
@@ -57,7 +57,7 @@
           <li id="tabLicenses"><a 
href="/licenses/licenses.ca.html">Llic&egrave;ncies</a></li>
           <li><a href="/server/sitemap.ca.html">Mapa</a></li>
           <li><a href="/help/help.ca.html">Ajudeu-nos</a></li>
-          <li><a href="http://order.fsf.org/";>Botiga FSF</a></li>
+          <li><a href="http://shop.fsf.org/";>FSF Shop</a></li>
         </ul>
         </div>
       </div>

Index: server/banner.es.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/banner.es.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/banner.es.html       1 May 2008 20:25:36 -0000       1.1
+++ server/banner.es.html       11 Jun 2008 20:27:24 -0000      1.2
@@ -57,7 +57,7 @@
           <li id="tabLicenses"><a 
href="/licenses/licenses.es.html">Licencias</a></li>
           <li><a href="/server/sitemap.es.html" title="Mapa de la 
web">Mapa</a></li>
           <li><a href="/help/help.es.html">Ayúdanos</a></li>
-          <li><a href="http://order.fsf.org/";>Tienda de la FSF</a></li>
+          <li><a href="http://shop.fsf.org/";>FSF Shop</a></li>
         </ul>
         </div>
       </div>

Index: server/banner.it.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/banner.it.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/banner.it.html       6 Jun 2008 20:27:06 -0000       1.2
+++ server/banner.it.html       11 Jun 2008 20:27:24 -0000      1.3
@@ -57,7 +57,7 @@
           <li id="tabLicenses"><a 
href="/licenses/licenses.it.html">Licenze</a></li>
           <li><a href="/server/sitemap.html">Mappa del sito</a></li>
           <li><a href="/help/help.it.html">Aiutate GNU</a></li>
-          <li><a href="http://order.fsf.org/";>FSF Store</a></li>
+          <li><a href="http://shop.fsf.org/";>FSF Shop</a></li>
         </ul>
         </div>
       </div>

Index: server/banner.pt-br.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/banner.pt-br.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/banner.pt-br.html    10 Apr 2008 20:25:11 -0000      1.3
+++ server/banner.pt-br.html    11 Jun 2008 20:27:24 -0000      1.4
@@ -57,7 +57,7 @@
           <li id="tabLicenses"><a 
href="/licenses/licenses.html">Licenças</a></li>
           <li><a href="/server/sitemap.html">Mapa do site</a></li>
           <li><a href="/help/help.html">Ajude&#45;nos</a></li>
-          <li><a href="http://order.fsf.org/";>FSF Store</a></li>
+          <li><a href="http://shop.fsf.org/";>FSF Shop</a></li>
         </ul>
         </div>
       </div>

Index: server/banner.pt.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/banner.pt.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/banner.pt.html       10 Apr 2008 20:25:11 -0000      1.3
+++ server/banner.pt.html       11 Jun 2008 20:27:24 -0000      1.4
@@ -57,7 +57,7 @@
           <li id="tabLicenses"><a 
href="/licenses/licenses.html">Licenças</a></li>
           <li><a href="/server/sitemap.html">Mapa do sítio</a></li>
           <li><a href="/help/help.html">Ajude&#45nos</a></li>
-          <li><a href="http://order.fsf.org/";>FSF Store</a></li>
+          <li><a href="http://shop.fsf.org/";>FSF Shop</a></li>
         </ul>
         </div>
       </div>

Index: server/banner.ru.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/banner.ru.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/banner.ru.html       10 Apr 2008 20:25:11 -0000      1.4
+++ server/banner.ru.html       11 Jun 2008 20:27:24 -0000      1.5
@@ -58,7 +58,7 @@
           <li id="tabLicenses"><a 
href="/licenses/licenses.html">Лицензии</a></li>
           <li><a 
href="/server/sitemap.html">Карта&nbsp;сайта</a></li>
           <li><a 
href="/help/help.ru.html">Помочь&nbsp;проекту</a></li>
-          <li><a href="http://order.fsf.org/";>FSF Store</a></li>
+          <li><a href="http://shop.fsf.org/";>FSF Shop</a></li>
         </ul>
         </div>
       </div>

Index: server/banner.tr.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/banner.tr.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/banner.tr.html       10 Apr 2008 20:25:11 -0000      1.4
+++ server/banner.tr.html       11 Jun 2008 20:27:24 -0000      1.5
@@ -58,7 +58,7 @@
           <li id="tabLicenses"><a 
href="/licenses/licenses.html">Lisans&nbsp;Sözleşmeleri</a></li>
           <li><a href="/server/sitemap.html">Dizin</a></li>
           <li><a href="/help/help.html">Bize&nbsp;Yardım&nbsp;Edin</a></li>
-          <li><a href="http://order.fsf.org/";>FSF Store</a></li>
+          <li><a href="http://shop.fsf.org/";>FSF Shop</a></li>
         </ul>
         </div>
       </div>

Index: server/banner.zh-cn.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/banner.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/banner.zh-cn.html    29 May 2008 20:27:04 -0000      1.3
+++ server/banner.zh-cn.html    11 Jun 2008 20:27:24 -0000      1.4
@@ -57,7 +57,7 @@
           <li id="tabLicenses"><a 
href="/licenses/licenses.html">许可证</a></li>
           <li><a href="/server/sitemap.html">网站地图</a></li>
           <li><a href="/help/help.html">帮助我们</a></li>
-          <li><a href="http://order.fsf.org/";>FSF 商店</a></li>
+          <li><a href="http://shop.fsf.org/";>FSF Shop</a></li>
         </ul>
         </div>
       </div>

Index: server/po/banner.af.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/po/banner.af.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/po/banner.af.po      10 Apr 2008 20:25:12 -0000      1.3
+++ server/po/banner.af.po      11 Jun 2008 20:27:25 -0000      1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: banner.html\n"
-"POT-Creation-Date: 2008-04-10 16:25-0400\n"
+"POT-Creation-Date: 2008-06-11 16:25-0400\n"
 "PO-Revision-Date: 2008-02-17 16:50+0200\n"
 "Last-Translator: Renier Maritz <address@hidden>\n"
 "Language-Team:\n"
@@ -110,7 +110,7 @@
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:61
 #, fuzzy
-msgid "<a href=\"http://order.fsf.org/\";>FSF Store</a>"
+msgid "<a href=\"http://shop.fsf.org/\";>FSF Shop</a>"
 msgstr "<a href=\"http://www.fsf.org/\";>Free Software Foundation</a>"
 
 # type: Content of: <body><div><div><p>

Index: server/po/banner.bg.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/po/banner.bg.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/po/banner.bg.po      10 Apr 2008 21:09:10 -0000      1.10
+++ server/po/banner.bg.po      11 Jun 2008 20:27:25 -0000      1.11
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: banner.html\n"
-"POT-Creation-Date: 2008-04-10 16:25-0400\n"
+"POT-Creation-Date: 2008-06-11 16:25-0400\n"
 "PO-Revision-Date: 2008-04-11 00:07+0300\n"
 "Last-Translator: Yavor Doganov <address@hidden>\n"
 "Language-Team: Bulgarian <address@hidden>\n"
@@ -111,5 +111,6 @@
 
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:61
-msgid "<a href=\"http://order.fsf.org/\";>FSF Store</a>"
+#, fuzzy
+msgid "<a href=\"http://shop.fsf.org/\";>FSF Shop</a>"
 msgstr "<a 
href=\"http://order.fsf.org/\";>Магазин&nbsp;на&nbsp;ФСС</a>"

Index: server/po/banner.ca.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/po/banner.ca.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/po/banner.ca.po      20 Apr 2008 11:09:19 -0000      1.3
+++ server/po/banner.ca.po      11 Jun 2008 20:27:25 -0000      1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: banner.ca.po\n"
-"POT-Creation-Date: 2008-04-10 16:25-0400\n"
+"POT-Creation-Date: 2008-06-11 16:25-0400\n"
 "PO-Revision-Date: 2008-04-20 13:03+0100\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
@@ -26,13 +26,23 @@
 
 # type: Content of: <body><div>
 #: ../../server/banner.html:12
-msgid "<span class=\"netscape4\"><a href=\"#content\">Skip to content</a> | 
</span><a href=\"#translations\">Translations of this page</a>"
-msgstr "<span class=\"netscape4\"><a href=\"#content\">Anar al contingut</a> | 
</span><a href=\"#translations\">Traduccions d'aquesta p&agrave;gina</a>"
+msgid ""
+"<span class=\"netscape4\"><a href=\"#content\">Skip to content</a> | </"
+"span><a href=\"#translations\">Translations of this page</a>"
+msgstr ""
+"<span class=\"netscape4\"><a href=\"#content\">Anar al contingut</a> | </"
+"span><a href=\"#translations\">Traduccions d'aquesta p&agrave;gina</a>"
 
 # type: Content of: <body><div><div><form><div>
 #: ../../server/banner.html:25
-msgid "<label for=\"phrase\">Search:</label> <input name=\"phrase\" 
id=\"phrase\" type=\"text\" size=\"35\" accesskey=\"s\" /> <input 
type=\"submit\" value=\"Go\" />"
-msgstr "<label for=\"phrase\">Cerca:</label> <input name=\"phrase\" 
id=\"phrase\" type=\"text\" size=\"35\" accesskey=\"s\" /> <input 
type=\"submit\" value=\"Go\" />"
+msgid ""
+"<label for=\"phrase\">Search:</label> <input name=\"phrase\" id=\"phrase\" "
+"type=\"text\" size=\"35\" accesskey=\"s\" /> <input type=\"submit\" value="
+"\"Go\" />"
+msgstr ""
+"<label for=\"phrase\">Cerca:</label> <input name=\"phrase\" id=\"phrase\" "
+"type=\"text\" size=\"35\" accesskey=\"s\" /> <input type=\"submit\" value="
+"\"Go\" />"
 
 # type: Content of: <body><div><div><div><h1>
 #: ../../server/banner.html:36
@@ -41,13 +51,21 @@
 
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:40
-msgid "<a 
href=\"https://www.fsf.org/associate/support_freedom/join_fsf?referrer=2442\";>Join
 the FSF today!</a>"
-msgstr "<a 
href=\"https://www.fsf.org/associate/support_freedom/join_fsf?referrer=2442\";>Uniu-vos
 a la FSF avui!</a>"
+msgid ""
+"<a href=\"https://www.fsf.org/associate/support_freedom/join_fsf?";
+"referrer=2442\">Join the FSF today!</a>"
+msgstr ""
+"<a href=\"https://www.fsf.org/associate/support_freedom/join_fsf?";
+"referrer=2442\">Uniu-vos a la FSF avui!</a>"
 
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:43
-msgid "<a href=\"/links/links.html#FreeGNULinuxDistributions\">Free GNU/Linux 
distros</a>"
-msgstr "<a 
href=\"/links/links.ca.html#FreeGNULinuxDistributions\">Distribucions lliures 
de GNU/Linux</a>"
+msgid ""
+"<a href=\"/links/links.html#FreeGNULinuxDistributions\">Free GNU/Linux "
+"distros</a>"
+msgstr ""
+"<a href=\"/links/links.ca.html#FreeGNULinuxDistributions\">Distribucions "
+"lliures de GNU/Linux</a>"
 
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:44
@@ -91,6 +109,6 @@
 
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:61
-msgid "<a href=\"http://order.fsf.org/\";>FSF Store</a>"
+#, fuzzy
+msgid "<a href=\"http://shop.fsf.org/\";>FSF Shop</a>"
 msgstr "<a href=\"http://order.fsf.org/\";>Botiga FSF</a>"
-

Index: server/po/banner.es.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/po/banner.es.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/po/banner.es.po      30 Apr 2008 21:22:42 -0000      1.1
+++ server/po/banner.es.po      11 Jun 2008 20:27:25 -0000      1.2
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: banner\n"
-"POT-Creation-Date: 2008-04-10 16:25-0400\n"
+"POT-Creation-Date: 2008-06-11 16:25-0400\n"
 "PO-Revision-Date: 2008-04-30 23:19+0200\n"
 "Last-Translator: Xavier Reina <address@hidden>\n"
 "Language-Team: castellano <address@hidden>\n"
@@ -18,9 +18,7 @@
 # type: Content of: <style>
 #: ../../server/banner.html:2
 msgid "@import url('/style.css');"
-msgstr ""
-"@import url('/style.css');"
-"@import url('/style.es.css');"
+msgstr "@import url('/style.css');@import url('/style.es.css');"
 
 # type: Content of: <style>
 #: ../../server/banner.html:6
@@ -30,17 +28,22 @@
 # type: Content of: <body><div>
 #: ../../server/banner.html:12
 msgid ""
-"<span class=\"netscape4\"><a href=\"#content\">Skip to content</a> | "
-"</span><a href=\"#translations\">Translations of this page</a>"
-msgstr "<span class=\"netscape4\"><a href=\"#content\">Ir al contenido</a> | 
</span><a href=\"#translations\">Traducciones de esta página</a>"
+"<span class=\"netscape4\"><a href=\"#content\">Skip to content</a> | </"
+"span><a href=\"#translations\">Translations of this page</a>"
+msgstr ""
+"<span class=\"netscape4\"><a href=\"#content\">Ir al contenido</a> | </"
+"span><a href=\"#translations\">Traducciones de esta página</a>"
 
 # type: Content of: <body><div><div><form><div>
 #: ../../server/banner.html:25
 msgid ""
 "<label for=\"phrase\">Search:</label> <input name=\"phrase\" id=\"phrase\" "
-"type=\"text\" size=\"35\" accesskey=\"s\" /> <input type=\"submit\" "
-"value=\"Go\" />"
-msgstr "<label for=\"phrase\">Búsqueda:</label> <input name=\"phrase\" 
id=\"phrase\" type=\"text\" size=\"35\" accesskey=\"s\" /> <input 
type=\"submit\" value=\"Ir\" />"
+"type=\"text\" size=\"35\" accesskey=\"s\" /> <input type=\"submit\" value="
+"\"Go\" />"
+msgstr ""
+"<label for=\"phrase\">Búsqueda:</label> <input name=\"phrase\" id=\"phrase\" 
"
+"type=\"text\" size=\"35\" accesskey=\"s\" /> <input type=\"submit\" value="
+"\"Ir\" />"
 
 # type: Content of: <body><div><div><div><h1>
 #: ../../server/banner.html:36
@@ -50,17 +53,20 @@
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:40
 msgid ""
-"<a "
-"href=\"https://www.fsf.org/associate/support_freedom/join_fsf?referrer=2442\";>Join
 "
-"the FSF today!</a>"
-msgstr "<a 
href=\"https://www.fsf.org/associate/support_freedom/join_fsf?referrer=2442\";>¡Únete
 hoy a la FSF!</a>"
+"<a href=\"https://www.fsf.org/associate/support_freedom/join_fsf?";
+"referrer=2442\">Join the FSF today!</a>"
+msgstr ""
+"<a href=\"https://www.fsf.org/associate/support_freedom/join_fsf?";
+"referrer=2442\">¡Únete hoy a la FSF!</a>"
 
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:43
 msgid ""
 "<a href=\"/links/links.html#FreeGNULinuxDistributions\">Free GNU/Linux "
 "distros</a>"
-msgstr "<a href=\"/links/links.html#FreeGNULinuxDistributions\">Distribuciones 
libres <br />de GNU/Linux</a>"
+msgstr ""
+"<a href=\"/links/links.html#FreeGNULinuxDistributions\">Distribuciones "
+"libres <br />de GNU/Linux</a>"
 
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:44
@@ -104,6 +110,6 @@
 
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:61
-msgid "<a href=\"http://order.fsf.org/\";>FSF Store</a>"
+#, fuzzy
+msgid "<a href=\"http://shop.fsf.org/\";>FSF Shop</a>"
 msgstr "<a href=\"http://order.fsf.org/\";>Tienda de la FSF</a>"
-

Index: server/po/banner.it.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/po/banner.it.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/po/banner.it.po      6 Jun 2008 18:10:46 -0000       1.1
+++ server/po/banner.it.po      11 Jun 2008 20:27:25 -0000      1.2
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: banner.html\n"
-"POT-Creation-Date: 2008-04-10 16:25-0400\n"
+"POT-Creation-Date: 2008-06-11 16:25-0400\n"
 "PO-Revision-Date: 2008-06-06 19:41+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian http://savannah.gnu.org/projects/www-it/\n";
@@ -109,5 +109,6 @@
 
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:61
-msgid "<a href=\"http://order.fsf.org/\";>FSF Store</a>"
+#, fuzzy
+msgid "<a href=\"http://shop.fsf.org/\";>FSF Shop</a>"
 msgstr "<a href=\"http://order.fsf.org/\";>FSF Store</a>"

Index: server/po/banner.pot
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/po/banner.pot,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/po/banner.pot        10 Apr 2008 20:25:12 -0000      1.6
+++ server/po/banner.pot        11 Jun 2008 20:27:25 -0000      1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-04-10 16:25-0400\n"
+"POT-Creation-Date: 2008-06-11 16:25-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -102,5 +102,5 @@
 
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:61
-msgid "<a href=\"http://order.fsf.org/\";>FSF Store</a>"
+msgid "<a href=\"http://shop.fsf.org/\";>FSF Shop</a>"
 msgstr ""

Index: server/po/banner.pt-br.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/po/banner.pt-br.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/po/banner.pt-br.po   10 Apr 2008 20:25:12 -0000      1.3
+++ server/po/banner.pt-br.po   11 Jun 2008 20:27:25 -0000      1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: banner.html\n"
-"POT-Creation-Date: 2008-04-10 16:25-0400\n"
+"POT-Creation-Date: 2008-06-11 16:25-0400\n"
 "PO-Revision-Date: 2008-03-19 20:10+0200\n"
 "Last-Translator: Og Maciel <address@hidden>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -110,7 +110,7 @@
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:61
 #, fuzzy
-msgid "<a href=\"http://order.fsf.org/\";>FSF Store</a>"
+msgid "<a href=\"http://shop.fsf.org/\";>FSF Shop</a>"
 msgstr "<a href=\"http://www.fsf.org/\";>Free Software Foundation</a>"
 
 # type: Content of: <body><div><div><p>

Index: server/po/banner.pt.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/po/banner.pt.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/po/banner.pt.po      10 Apr 2008 20:25:12 -0000      1.3
+++ server/po/banner.pt.po      11 Jun 2008 20:27:25 -0000      1.4
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: banner.html\n"
-"POT-Creation-Date: 2008-04-10 16:25-0400\n"
+"POT-Creation-Date: 2008-06-11 16:25-0400\n"
 "PO-Revision-Date: 2008-03-19 20:31+0200\n"
 "Last-Translator: Tiago Faria <address@hidden>\n"
 "Language-Team: Portuguese <address@hidden>\n"
@@ -110,7 +110,7 @@
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:61
 #, fuzzy
-msgid "<a href=\"http://order.fsf.org/\";>FSF Store</a>"
+msgid "<a href=\"http://shop.fsf.org/\";>FSF Shop</a>"
 msgstr "<a href=\"http://www.fsf.org/\";>Fundação do Software Livre</a>"
 
 # type: Content of: <body><div><div><p>

Index: server/po/banner.ru.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/po/banner.ru.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/po/banner.ru.po      29 Apr 2008 12:57:32 -0000      1.5
+++ server/po/banner.ru.po      11 Jun 2008 20:27:25 -0000      1.6
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: banner.html\n"
-"POT-Creation-Date: 2008-04-10 16:25-0400\n"
+"POT-Creation-Date: 2008-06-11 16:25-0400\n"
 "PO-Revision-Date: 2008-04-29 19:56+0700\n"
 "Last-Translator: Anatoly A. Kazantsev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -113,7 +113,7 @@
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:61
 #, fuzzy
-msgid "<a href=\"http://order.fsf.org/\";>FSF Store</a>"
+msgid "<a href=\"http://shop.fsf.org/\";>FSF Shop</a>"
 msgstr "<a href=\"http://order.fsf.org/\";>Магазин FSF</a>"
 
 # type: Content of: <body><div><div><p>

Index: server/po/banner.tr.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/po/banner.tr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/po/banner.tr.po      10 Apr 2008 20:25:12 -0000      1.4
+++ server/po/banner.tr.po      11 Jun 2008 20:27:25 -0000      1.5
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: banner.html\n"
-"POT-Creation-Date: 2008-04-10 16:25-0400\n"
+"POT-Creation-Date: 2008-06-11 16:25-0400\n"
 "PO-Revision-Date: 2008-03-05 10:22+0100\n"
 "Last-Translator: Ali Servet Dönmez <address@hidden>\n"
 "Language-Team: Turkish <address@hidden>\n"
@@ -112,7 +112,7 @@
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:61
 #, fuzzy
-msgid "<a href=\"http://order.fsf.org/\";>FSF Store</a>"
+msgid "<a href=\"http://shop.fsf.org/\";>FSF Shop</a>"
 msgstr "<a href=\"http://www.fsf.org/\";>Özgür Yazılım Vakfı</a>"
 
 # type: Content of: <body><div><div><p>

Index: server/po/banner.zh-cn.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/po/banner.zh-cn.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/po/banner.zh-cn.po   30 May 2008 06:19:10 -0000      1.4
+++ server/po/banner.zh-cn.po   11 Jun 2008 20:27:26 -0000      1.5
@@ -7,13 +7,13 @@
 msgstr ""
 "Project-Id-Version: banner.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-10 16:25-0400\n"
+"POT-Creation-Date: 2008-06-11 16:25-0400\n"
 "PO-Revision-Date: 2008-05-29 12:33+0300\n"
 "Last-Translator: Pan Yongzhi <address@hidden>\n"
 "Language-Team: Chinese <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit"
+"Content-Transfer-Encoding: 8-bit\n"
 
 # type: Content of: <style>
 #: ../../server/banner.html:2
@@ -112,5 +112,6 @@
 
 # type: Content of: <body><div><div><div><ul><li>
 #: ../../server/banner.html:61
-msgid "<a href=\"http://order.fsf.org/\";>FSF Store</a>"
+#, fuzzy
+msgid "<a href=\"http://shop.fsf.org/\";>FSF Shop</a>"
 msgstr "<a href=\"http://order.fsf.org/\";>FSF 商店</a>"

Index: philosophy/right-to-read.it.html
===================================================================
RCS file: philosophy/right-to-read.it.html
diff -N philosophy/right-to-read.it.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ philosophy/right-to-read.it.html    11 Jun 2008 20:27:23 -0000      1.1
@@ -0,0 +1,436 @@
+<!--#include virtual="/server/header.it.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>Il diritto a leggere - Progetto GNU - Free Software Foundation 
(FSF)</title>
+<!--#include virtual="/server/banner.it.html" -->
+<h2>Il diritto a leggere</h2>
+
+<p>
+di <a href="http://www.stallman.org/";><strong>Richard Stallman</strong></a> 
</p>
+
+<p>
+<em>Questo articolo è apparso nel numero di febbraio 1997 
+di<strong>Communications of the ACM</strong> (volume 40, numero 2).</em></p>
+
+<blockquote><p>
+            (da &ldquo;La strada per Tycho&rdquote;, una raccolta di articoli 
sugli 
+antefatti della Rivoluzione Lunare, pubblicata a Città della Luna nel 2096)
+</p></blockquote>
+
+<p>
+Per Dan Halbert, la strada per Tycho cominciò al college, quando Lissa Lenz 
+gli chiese in prestito il computer. Il suo le si era rotto, e non sarebbe 
+riuscita a completare il progetto di metà anno senza trovarne un altro in 
+prestito. E Dan era l'unico a cui avrebbe osato chiederlo.</p>
+
+<p>
+Dan si trovò di fronte a un dilemma. Certo, doveva aiutarla, ma se le avesse 
+prestato il computer, lei avrebbe potuto leggere i suoi libri. A parte il 
+fatto che lasciar leggere i propri libri a qualcuno significava rischiare 
+diversi anni di prigione, l'idea era scioccante di per sé. Come tutti, fin 
+da piccolo aveva imparato a scuola che condividere libri era cosa cattiva, 
+sbagliata, una cosa da pirati.</p>
+
+<p>
+E non c'era da illudersi di sfuggire all'APS, l'Autorità di Protezione del 
+Software. Nel corso d'informatica Dan aveva imparato che ogni libro 
+includeva delle sentinelle software per i diritti di copia che riportavano 
+alla Centrale Licenze dove e quando era stato letto, e da chi; le 
+informazioni venivano usate per identificare i pirati della lettura, ma 
+anche a costruire profili di interessi che venivano poi rivenduti. Appena 
+avesse connesso il suo computer in rete, la Centrale Licenze l'avrebbe 
+scoperto e lui, come proprietario del computer, avrebbe subito la pena più 
+dura, per la sua negligenza nel prevenire il crimine.</p>
+
+<p>
+Of course, Lissa did not necessarily intend to read his books.  She might 
+want the computer only to write her midterm.  But Dan knew she came from a 
+middle-class family and could hardly afford the tuition, let alone her 
+reading fees.  Reading his books might be the only way she could graduate.  
+He understood this situation; he himself had had to borrow to pay for all 
+the research papers he read.  (10% of those fees went to the researchers who 
+wrote the papers; since Dan aimed for an academic career, he could hope that 
+his own research papers, if frequently referenced, would bring in enough to 
+repay this loan.)</p>
+
+<p>
+Later on, Dan would learn there was a time when anyone could go to the 
+library and read journal articles, and even books, without having to pay.  
+There were independent scholars who read thousands of pages without 
+government library grants.  But in the 1990s, both commercial and nonprofit 
+journal publishers had begun charging fees for access.  By 2047, libraries 
+offering free public access to scholarly literature were a dim memory.</p>
+
+<p>
+There were ways, of course, to get around the SPA and Central Licensing.  
+They were themselves illegal.  Dan had had a classmate in software, Frank 
+Martucci, who had obtained an illicit debugging tool, and used it to skip 
+over the copyright monitor code when reading books.  But he had told too 
+many friends about it, and one of them turned him in to the SPA for a reward 
+(students deep in debt were easily tempted into betrayal).  In 2047, Frank 
+was in prison, not for pirate reading, but for possessing a debugger.</p>
+
+<p>
+Più tardi, Dan avrebbe appreso che c'era stato un tempo in cui chiunque 
+poteva possedere un debugger. C'erano persino dei debugger liberi 
+disponibili su CD o scaricabili dalla rete. Ma quando anche gli utenti 
+comuni cominciarono ad usarli per aggirare le sentinelle per i diritti di 
+copia, finì che un giudice sentenziò che proprio questo ne era diventato 
+l'uso prevalente nella pratica. Significava che erano diventati illegali; 
+gli autori di debugger furono imprigionati.</p>
+
+<p>
+Naturalmente i programmatori continuavano ad aver bisogno dei debugger, ma 
+nel 2047 i venditori di debugger distribuivano solo copie numerate, e solo 
+ai programmatori regolarmente autorizzati.  Il debugger che Dan aveva usato 
+durante le lezioni di informatica era tenuto dietro una protezione speciale 
+che lo confinava unicamente all'uso per gli esercizi in classe.</p>
+
+<p>
+Un altro modo per eludere le sentinelle per i diritti di copia era 
+sostituire il nocciolo di sistema con uno modificato, e Dan quindi arrivò ai 
+noccioli liberi, addirittura interi sistemi operativi, che erano esistiti 
+attorno al cambio di secolo. Ma non solo erano illegali, come i debugger, ma 
+per installarli dovevi conoscere la parola segreta primaria del tuo 
+computer, quella più segreta di tutte, e né l'<abbr title="Federal Bureau of 
+Investigation">FBI</abbr> né il supporto clienti della Microsoft te 
+l'avrebbero mai svelata.</p>
+
+<p>
+Dan si rese conto che non poteva semplicemente prestare il suo computer a 
+Lissa. Ma come poteva rifiutarsi di aiutarla? lui la amava. Ogni volta che 
+parlava con lei era una delizia. E lei lo aveva scelto nel chiedere aiuto, 
+questo poteva voler dire che anche lei lo amava.</p>
+
+<p>
+Dan risolse il dilemma facendo qualcosa di persino più impensabile, le 
+prestò il computer e le disse la sua parola segreta. In questo modo quando 
+Lissa avesse letto i suoi libri, la Centrale Licenze avrebbe creduto che 
+fosse lui a leggerli. Era sempre un crimine, ma l'APS non se ne sarebbe 
+accorta a meno che Lissa non lo denunciasse.</p>
+
+<p>
+Naturalmente, se la scuola avesse scoperto che aveva dato la sua parola 
+segreta a Lissa, si sarebbero subito chiusi tutti i cancelli per entrambi 
+come studenti, indipendentemente dall'uso che lei ne avesse fatto.  La 
+politica della scuola era che qualsiasi interferenza con i loro mezzi per 
+sorvegliare i computer degli studenti, faceva scattare un'azione 
+disciplinare. Non importava nulla se avevi fatto qualche danno o meno, la 
+colpa era l'aver reso più difficile agli amministratori sorvegliarti. Loro 
+assumevano che questo voleva dire che stavi facendo qualcos'altro di 
+proibito, senza bisogno di sapere cosa.</p>
+
+<p>
+Gli studenti non venivano espulsi di solito per questo, non 
+direttamente. Venivano invece banditi dai sistemi informatici della scuola, 
+e inevitabilmente avrebbero fallito in tutti i corsi.</p>
+
+<p>
+Più tardi Dan avrebbe imparato che una politica di questo tipo era 
+cominciata solo negli anni 1980, quando gli studenti universitari 
+cominciarono in gran numero ad usare i computer. Prima le università 
+adottavano un approccio differente alla disciplina degli studenti, punivano 
+le attività che causavano dei danni, non quelle che sollevavano solo 
+sospetti.</p>
+
+<p>
+Lissa non denunciò Dan all'APS. La sua decisione di aiutarla portò al loro 
+matrimonio, come li portò anche a mettere in dubbio quello che era stato 
+loro insegnato da bambini sulla pirateria. I due cominciarono a leggere 
+sulla storia dei diritti di copia, sull'Unione Sovietica e le sue 
+restrizioni alla copia, e persino la costituzione degli Stati Uniti com'era 
+all'origine. Si trasferirono sulla Luna, dove trovarono altri che come loro 
+s'erano sottratti al lungo braccio dell'APS. Quando cominciò la Rivolta di 
+Tycho nel 2062, il diritto universale a leggere ne divenne presto uno degli 
+obiettivi centrali.</p>
+
+
+<h3 id="AuthorsNote">Nota dell'autore</h3>
+
+<p>Questa nota è stata aggiornata nel 2007.</p>
+
+<p>
+Il diritto a leggere è una battaglia che si combatte oggi. Sebbene possano 
+volerci 50 anni perché il nostro stile di vita presente si dissolva 
+nell'oscurità, la maggior parte delle leggi e delle procedure legali 
+specifiche descritte sopra sono già state proposte; molte sono state 
+tradotte in legge negli USA e altrove. Negli USA, il Digital Millenium 
+Copyright Act del 1998 ha stabilito le basi legali per restringere la 
+lettura ed il prestito di libri elettronici (e anche di altre 
+opere). L'Unione Europea ha imposto restrizioni simili in una direttiva del 
+2001 sul diritto d'autore. In Francia, secondo la legge DADVSI adottata nel 
+2006, il solo possesso di una copia di DeCSS, il programma libero per 
+decrittare i video nei dvd, è un reato.</p>
+
+<p>
+Nel 2001 il senatore Hollings, finanziato dalla Disney, presentò una 
+proposta di legge chiamata SSSCA che imporrebbe che ogni nuovo computer 
+avesse dei dispositivi obbligatori di restrizione della copia che l'utente 
+non potesse scavalcare. Dopo il chip Clipper e similari proposte del governo 
+USA di accesso alle chiavi, questo mostra una tendenza di lungo termine: i 
+sistemi informatici vengono via via sempre più impostati in modo da dare 
+poteri di controllo a dei supervisori distanti sopra alle persone che usano 
+realmente il sistema informatico. L'SSSCA fu poi rinominato 
+nell'impronunciabile CBDTPA, che fu parafrasato in &ldquo;Consume But Don't 
+Try Programming Act&rdquo; (&ldquo;Codice del consuma ma non provare a 
+programmare&rdquo;).
+</p>
+
+<p>
+I Repubblicani ottennero il controllo del senato USA poco dopo. Essi sono 
+meno legati ad Holliwood dei Democratici, così non premettero su queste 
+proposte di legge. Adesso che i Democratici sono tornati al controllo, il 
+pericolo è di nuovo più alto.</p>
+
+<p>
+Nel 2001 gli USA cominciarono a cercare d'usare il proposto trattato della 
+Free Trade Area of Americas (&ldquo;Area di libero scambio delle 
+Americhe&rdquo;) per imporre le stesse regole su tutti i paesi nell'emisfero 
+occidentale. L'FTAA è uno dei cosiddetti trattati di &ldquo;libero 
+scambio&rdquo;, che sono invero disegnati per dare alle aziende un potere 
+accresciuto sopra i governi democratici; l'imposizione di leggi come la DMCA 
+è tipica di questo spirito. L'FTAA è stata di fatto affossata da Lula, 
+presidente del Brasile, che ha rifiutato gli obblighi della DMCA e altri.</p>
+
+<p>
+Da allora, gli USA hanno imposto obblighi simili a paesi come l'Australia e 
+il Messico attraverso degli accordi di &ldquo;libero scambio&rdquo; 
+bilaterali, e a paesi come il Costa Rica attraverso il CAFTA. Il presidente 
+dell'Ecuador, Correa ha rifiutato di firmare il trattato di &ldquo;libero 
+scambio&rdquo;, ma l?ecuador ha adottato qualcosa di simile al DMCA nel 
+2003. La nuova costituzione dell'Ecuador potrebbe fornire un'opportunità di 
+sbarazzarsene.</p>
+
+<p>
+Una delle idee nel racconto non è stata proposta nella realtà prima del 
+2002, quella che l'<abbr>FBI</abbr> e Microsoft terranno le parole segrete 
+primarie per il tuo computer personale, senza fornirtele.</p>
+
+<p>
+I proponenti di questo schema gli hanno dato nomi come &ldquo;trusted 
+computing&rdquo; (informatica fidata) e &ldquo;palladium&rdquo;. Noi lo 
+chiamiamo <a href="/philosophy/can-you-trust.html">&ldquo;treacherous 
+computing&rdquote;</a> (informatica infida), perché l'effetto è che il tuo 
+computer obbedisce alle aziende commerciali invece che a te. È stato 
+implementato nel 2007 come parte di <a href="http://badvista.org/";>Windows 
+Vista</a>; ci aspettiamo che Apple faccia qualcosa di simile. In tale 
+schema, è il produttore che tiene il codice segreto, ma l'FBI lo ottiene 
+facilmente.</p>
+
+<p>
+Quella che tiene Microsoft non è esattamente una parola segreta in senso 
+tradizionale, nessuno la scrive mai su un terminale, piuttosto è una chiave 
+di firma e cifratura che corrisponde ad una seconda chiave inclusa nel tuo 
+computer. Dà a Microsoft, e potenzialmente a ogni sito web che coopera con 
+Microsoft, il controllo ultimo sopra quello che l'utente può fare o meno col 
+proprio computer.</p>
+
+<p>
+Vista dà a Microsoft anche più poteri, per esempio Microsoft può installare 
+di forza degli aggiornamenti, e può ordinare a tutte le macchine con Vista 
+di rifiutare un certo software di dispositivo. Lo scopo principale delle 
+tante restrizioni in Vista è quello di fare un DRM (Digital Restriction 
+Management, &ldquo;gestione delle restrizioni digitali&rdquo;) che gli 
+utenti non possano scavalcare.</p>
+
+<p>
+La SPA [ndt: APS in italiano nel racconto], che sta in effetti per Software 
+Publisher's Association, è stata rimpiazzata in questo ruolo di poliziotta 
+dalla BSA o Business Software Alliance; non è oggi una forza di polizia 
+ufficiale, ma in via non ufficiale, si comporta come tale. Usando metodi che 
+ricordano l'ex Unione Sovietica, invita le persone a spiare sui colleghi di 
+lavoro e sugli amici. Una campagna mediatica terroristica della BSA in 
+Argentina nel 2001 avanzava velate minacce che le persone che condividevano 
+il software sarebbero state violentate.</p>
+
+<p>
+Quando questo racconto fu scritto all'inizio, la SPA stava minacciando dei 
+piccoli fornitori di accesso a Internet, pretendendo che essi le 
+permettessero di monitorare i loro utenti. I più s'arresero alle minacce, 
+poiché non potevano permettersi una causa legale (Atlanta 
+Journal-Constitution, 1 ottobre 1996, p. D3). Almeno uno, Community 
+ConneXion, di Oakland, California, rifiutò ed in effetti gli fu fatta 
+causa. La SPA più tardi lascio cadere quella causa, ma ottenne il DMCA che 
+diede loro il potere che cercavano.</p>
+
+<p>
+Le politiche di sicurezza delle università descritte sopra non sono 
+immaginarie. Per esempio, sullo schermo di un computer in un università 
+nell'area di Chicago compare questo messaggio quando ci si accede:</p>
+
+<blockquote><p>
+Questo sistema è solo per gli utenti autorizzati. Individui che usino questo 
+sistema informatico senza permesso o oltre i loro permessi sono soggetti a 
+che tutte le loro attività su questo sistema vengano monitorate e registrate 
+dal personale di sistema. Nel corso dei monitoraggi che gli individui non 
+usino impropriamente questo sistema o nel corso della manutenzione di 
+sistema, anche le attività degli utenti autorizzati possono venire 
+monitorate. Ognuno che usi questo sistema acconsente espressamente a questi 
+monitoraggi e si avvisa che se tali monitoraggi rivelano evidenze di 
+possibile attività illegale o violazioni dei regolamenti dell'Università il 
+personale di sistema può fornire le evidenze dai monitoraggi alle autorità 
+dell'Università e/o a agenti dell'ordine pubblico.
+</p></blockquote>
+
+<p>
+È invero un approccio interessante al Quarto Emendamento: pressare da subito 
+i più a rinunciare ai propri diritti che questo garantisce.</p>
+
+<h3 id="References">Riferimenti</h3>
+
+<ul>
+  <li>Il &ldquo;Libro bianco&rdquo; dell'amministrazione: Information 
+Infrastructure Task Force, Intellectual Property and the National 
+Information Infrastructure: The Report of the Working Group on Intellectual 
+Property Rights (1995).</li>
+
+  <li>http://www.wired.com/wired/archive/4.01/white.paper_pr.html";>Una 
spiegazione 
+del Libro Bianco: The Copyright Grab</a>, Pamela Samuelson, Wired, gennaio 
+1996</li>
+
+  <li><a href="http://www.law.duke.edu/boylesite/sold_out.htm";>Sold Out</a>, 
James 
+Boyle, New York Times, 31 marzo 1996</li>
+
+  <li>Public Data or Private Data, Washington Post, 4 Nov 1996.  In precedenza 
+avevamo un link a questo articolo, ma il Washington post ha deciso di 
+cominciare a far pagare gli articoli letti sul loro sito e quindi l'abbiamo 
+tolto.</li>
+
+  <li><a href="http://www.public-domain.org/";>Union for the Public Domain</a>, 
+un'organizzazione che mira a contrastare e ad invertire l'eccessiva 
+estensione dei poteri concessi dai diritti di copia e dai brevetti.</li>
+</ul>
+
+<hr />
+<h4>Questo testo è stato pubblicato in <a href="/doc/book13.html"><cite>  
Free 
+Software, Free Society: The Selected Essays of Richard M. Stallman</cite>.</h4>
+
+<p><strong>Other Texts to Read</strong></p>
+
+<ul>
+       <li><a href="/philosophy/philosophy.html">Filosofia del progetto 
GNU</a></li>
+       <li><a 
+href="http://www.computerworld.com/managementtopics/management/opinion/story/0,10801,49358,00.html";
 
+id="COPYPROCTECTION">Copy Protection: Just Say No</a>, Pubblicato in 
+Computer World.</li>
+</ul>
+
+<p>
+La nota dell'autore parla della battaglia per il diritto a leggere e della 
+sorveglianza elettronica. La battaglia è appena iniziata, ecco i 
+collegamenti a due articoli su alcune tecnologie in corso di sviluppo per 
+negarti il diritto a leggere.</p>
+<ul>
+<li><a 
+href="http://www.zdnet.com/zdnn/stories/news/0,4586,2324939,00.html";>Electronic
 
+Publishing:</a> un articolo sulla distribuzione dei libri in forma 
+elettronica, e questioni di diritti di copia con effetti sul diritto a 
+leggerli.</li>
+<li><a 
+href="http://channels.microsoft.com/presspass/press/1999/Aug99/SeyboldPR.asp";>Books
 
+inside Computers:</a> software per controllare chi può leggere libri e 
+documenti su un PC.</li>
+</ul>
+
+
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+*GNUN-SLOT: TRANSLATOR'S NOTES*</div>
+</div>
+
+<!--#include virtual="/server/footer.it.html" -->
+<div id="footer">
+
+<p>
+Per informazioni sull'FSF e su GNU rivolgersi, possibilmente in inglese, a 
+<a href="mailto:address@hidden";><em>address@hidden</em></a>address@hidden Ci 
sono 
+anche <a href="/contact/">altri modi di contattare</a> la FSF.<br />Inviate 
+segnalazioni di link non funzionanti e altri suggerimenti relativi alle 
+pagine web a <a 
+href="mailto:address@hidden";>address@hidden</a>. Grazie.
+</p>
+
+<p>
+Per informazioni su come tradurre questa pagina consultate la <a 
+href="/server/standards/README.translations.html">Guida alle traduzioni</a>.
+</p>
+
+<p>
+Copyright &copy; 1996 Richard Stallman <br /> La copia letterale e la 
+distribuzione di questo articolo nella sua integrità sono permesse con 
+qualsiasi mezzo, a condizione che questa nota sia riprodotta.
+</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+Tradotto da Giorgio Padrin e Francesco Potortì, con contributi di Alessandro 
+Rubini e Leonardo Taglialegne.</div>
+ <p>
+<!-- timestamp start -->
+Ultimo aggiornamento:
+
+$Date: 2008/06/11 20:27:23 $
+
+<!-- timestamp end -->
+</p>
+</div>
+
+<div id="translations">
+<h4>Traduzioni di questa pagina</h4>
+
+<!-- Please keep this list alphabetical. 
+ Comment what the language is for each type, i.e. de is German. 
+ Write the language name in its own language (Deutsch) in the text. 
+ If you add a new language here, please 
+ advise address@hidden and add it to 
+  - /home/www/bin/nightly-vars either TAGSLANG or WEBLANG 
+  - /home/www/html/server/standards/README.translations.html 
+  - one of the lists under the section "Translations Underway" 
+  - if there is a translation team, you also have to add an alias 
+  to mail.gnu.org:/com/mailer/aliases 
+ Please also check you have the 2 letter language code right, cf. 
+ <URL:http://www.w3.org/WAI/ER/IG/ert/iso639.htm> 
+ Please use W3C normative character entities. -->
+<ul class="translations-list">
+<!-- Bulgarian -->
+<li><a 
href="/philosophy/right-to-read.bg.html">&#x431;&#x44A;&#x43B;&#x433;&#x430;&#x440;&#x441;&#x43A;&#x438;</a>&nbsp;[bg]</li>
+<!-- Czech -->
+<li><a href="/philosophy/right-to-read.cs.html">&#x010c;esky</a>&nbsp;[cs]</li>
+<!-- German -->
+<li><a href="/philosophy/right-to-read.de.html">Deutsch</a>&nbsp;[de]</li>
+<!-- English -->
+<li><a href="/philosophy/right-to-read.html">English</a>&nbsp;[en]</li>
+<!-- Spanish -->
+<li><a 
href="/philosophy/right-to-read.es.html">Espa&#x00f1;ol</a>&nbsp;[es]</li>
+<!-- Finnish -->
+<li><a href="/philosophy/right-to-read.fi.html">Suomi</a>&nbsp;[fi]</li>
+<!-- French -->
+<li><a 
href="/philosophy/right-to-read.fr.html">Fran&#x00e7;ais</a>&nbsp;[fr]</li>
+<!-- Hebrew -->
+<li><a 
href="/philosophy/right-to-read.he.html">&#x05e2;&#x05d1;&#x05e8;&#x05d9;&#x05ea;</a>&nbsp;[he]</li>
+<!-- Hungarian -->
+<li><a href="/philosophy/right-to-read.hu.html">Magyar</a>&nbsp;[hu]</li>
+<!-- Japanese -->
+<li><a 
href="/philosophy/right-to-read.ja.html">&#x65e5;&#x672c;&#x8a9e;</a>&nbsp;[ja]</li>
+<!-- Korean -->
+<li><a 
href="/philosophy/right-to-read.ko.html">&#xd55c;&#xad6d;&#xc5b4;</a>&nbsp;[ko]</li>
+<!-- Dutch -->
+<li><a href="/philosophy/right-to-read.nl.html">Nederlands</a>&nbsp;[nl]</li>
+<!-- Polish -->
+<li><a href="/philosophy/right-to-read.pl.html">Polski</a>&nbsp;[pl]</li>
+<!-- Brazilian Portuguese -->
+<li><a href="/philosophy/right-to-read.pt-br.html">portugu&#x0ea;s do 
Brasil</a>&nbsp;[pt-br]</li>
+<!-- Russian -->
+<li><a 
href="/philosophy/right-to-read.ru.html">&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
+<!-- Slovenian -->
+<li><a href="/philosophy/right-to-read.sl.html">Slovensko</a>&nbsp;[sl]</li>
+<!-- Swedish -->
+<li><a href="/philosophy/right-to-read.sv.html">Svenska</a>&nbsp;[sv]</li>
+</ul>
+</div>
+</div>
+</body>
+</html>




reply via email to

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