www-commits
[Top][All Lists]
Advanced

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

www gnu/po/manifesto.ca.po gnu/po/why-gnu-linux...


From: Yavor Doganov
Subject: www gnu/po/manifesto.ca.po gnu/po/why-gnu-linux...
Date: Thu, 19 Aug 2010 16:27:18 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   10/08/19 16:27:18

Modified files:
        gnu/po         : manifesto.ca.po why-gnu-linux.ca.po 
        licenses       : rms-why-gplv3.ca.html 
        licenses/po    : rms-why-gplv3.ca.po translations.ca.po 
        philosophy     : microsoft-old.ca.html microsoft.ca.html 
        philosophy/po  : microsoft-old.ca.po microsoft.ca.po 
        server/standards/po: README.translations.ca.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.ca.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.ca.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/rms-why-gplv3.ca.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/rms-why-gplv3.ca.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.ca.po?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/microsoft-old.ca.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/microsoft.ca.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft-old.ca.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/microsoft.ca.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/server/standards/po/README.translations.ca.po?cvsroot=www&r1=1.14&r2=1.15

Patches:
Index: gnu/po/manifesto.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.ca.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gnu/po/manifesto.ca.po      19 Aug 2010 11:21:40 -0000      1.11
+++ gnu/po/manifesto.ca.po      19 Aug 2010 16:26:58 -0000      1.12
@@ -13,7 +13,7 @@
 "Language-Team: Catalan <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 msgid "The GNU Manifesto - GNU Project - Free Software Foundation (FSF)"
@@ -39,10 +39,6 @@
 "gent."
 
 # type: Content of: <p>
-#| msgid ""
-#| "Since that time, we have learned about certain common misunderstandings "
-#| "that different wording could help avoid.  Footnotes added in 1993 help "
-#| "clarify these points."
 msgid ""
 "Since that time, we have learned about certain common misunderstandings that "
 "different wording could help avoid.  Footnotes added since 1993 help clarify "
@@ -71,12 +67,6 @@
 msgstr "Què és GNU? GNU no és Unix!"
 
 # type: Content of: <p>
-#| msgid ""
-#| "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
-#| "compatible software system which I am writing so that I can give it away "
-#| "free to everyone who can use it. <a href=\"#f1\">(1)</a> Several other "
-#| "volunteers are helping me.  Contributions of time, money, programs and "
-#| "equipment are greatly needed."
 msgid ""
 "GNU, which stands for Gnu's Not Unix, is the name for the complete Unix-"
 "compatible software system which I am writing so that I can give it away "
@@ -86,23 +76,11 @@
 msgstr ""
 "GNU, que prové de <i>GNU's Not Unix</i> (GNU no és Unix, en català), és 
el "
 "nom per a un sistema complet compatible amb Unix que estic escrivint per tal "
-"de donar-lo a tot aquell que vulgui usar-lo <a href=\"#f1\">(1)</a>. Alguns 
altres voluntaris estan ajudant-me. Les contribucions econòmiques, de temps, 
de programes i equipament són molt necessàries."
+"de donar-lo a tot aquell que vulgui usar-lo <a href=\"#f1\">(1)</a>. Alguns "
+"altres voluntaris estan ajudant-me. Les contribucions econòmiques, de temps, 
"
+"de programes i equipament són molt necessàries."
 
 # type: Content of: <p>
-#| msgid ""
-#| "So far we have an Emacs text editor with Lisp for writing editor "
-#| "commands, a source level debugger, a yacc-compatible parser generator, a "
-#| "linker, and around 35 utilities.  A shell (command interpreter) is nearly "
-#| "completed.  A new portable optimizing C compiler has compiled itself and "
-#| "may be released this year.  An initial kernel exists but many more "
-#| "features are needed to emulate Unix.  When the kernel and compiler are "
-#| "finished, it will be possible to distribute a GNU system suitable for "
-#| "program development.  We will use TeX as our text formatter, but an nroff "
-#| "is being worked on.  We will use the free, portable X window system as "
-#| "well.  After this we will add a portable Common Lisp, an Empire game, a "
-#| "spreadsheet, and hundreds of other things, plus on-line documentation.  "
-#| "We hope to supply, eventually, everything useful that normally comes with "
-#| "a Unix system, and more."
 msgid ""
 "So far we have an Emacs text editor with Lisp for writing editor commands, a "
 "source level debugger, a yacc-compatible parser generator, a linker, and "
@@ -169,31 +147,19 @@
 "el deixarem per algú que el vulga fer servir en aquestes."
 
 # type: Content of: <p>
-#| msgid ""
-#| "To avoid horrible confusion, please pronounce the &lsquo;G&rsquo; in the "
-#| "word &lsquo;GNU&rsquo; when it is the name of this project."
 msgid ""
 "To avoid horrible confusion, please pronounce the <em>g</em> in the word "
 "&lsquo;GNU&rsquo; when it is the name of this project."
 msgstr ""
-"Per evitar una terrible confusió (en anglès), cal pronunciar la <em>g</em>' 
en la "
-"paraula 'GNU' quan es parli del projecte (en català és correcte dir 'nyu')."
+"Per evitar una terrible confusió (en anglès), cal pronunciar la <em>g</em>' 
"
+"en la paraula 'GNU' quan es parli del projecte (en català és correcte dir "
+"'nyu')."
 
 # type: Content of: <h3>
 msgid "Why I Must Write GNU"
 msgstr "Per què haig d'escriure el GNU"
 
 # type: Content of: <p>
-#| msgid ""
-#| "I consider that the golden rule requires that if I like a program I must "
-#| "share it with other people who like it.  Software sellers want to divide "
-#| "the users and conquer them, making each user agree not to share with "
-#| "others.  I refuse to break solidarity with other users in this way.  I "
-#| "cannot in good conscience sign a nondisclosure agreement or a software "
-#| "license agreement.  For years I worked within the Artificial Intelligence "
-#| "Lab to resist such tendencies and other inhospitalities, but eventually "
-#| "they had gone too far: I could not remain in an institution where such "
-#| "things are done for me against my will."
 msgid ""
 "I consider that the Golden Rule requires that if I like a program I must "
 "share it with other people who like it.  Software sellers want to divide the "
@@ -217,12 +183,6 @@
 "terme contra la meva voluntat."
 
 # type: Content of: <p>
-#| msgid ""
-#| "So that I can continue to use computers without dishonor, I have decided "
-#| "to put together a sufficient body of free software so that I will be able "
-#| "to get along without any software that is not free.  I have resigned from "
-#| "the AI lab to deny MIT any legal excuse to prevent me from giving GNU "
-#| "away."
 msgid ""
 "So that I can continue to use computers without dishonor, I have decided to "
 "put together a sufficient body of free software so that I will be able to "
@@ -234,8 +194,8 @@
 "decidit agrupar un cos suficient de programari lliure per tal de ser capaç "
 "de tirar endavant sense cap mena de programari que no sigui lliure. He "
 "abandonat el Laboratori d'Intel·ligència Artificial per denegar qualsevol "
-"excusa legal al MIT que m'impedís oferir el GNU lliurement.<a "
-"href=\"#f2a\">(2)</a>"
+"excusa legal al MIT que m'impedís oferir el GNU lliurement.<a href=\"#f2a\">"
+"(2)</a>"
 
 # type: Content of: <h3>
 msgid "Why GNU Will Be Compatible with Unix"
@@ -336,7 +296,13 @@
 "the general task list for GNU software packages. For other ways to help, see "
 "<a href=\"http://gnu.org/help/help.html\";>the guide to helping the GNU "
 "operating system</a>.)"
-msgstr "(Per trobar ara projectes de programari en què treballar, vegeu la <a 
href=\"http://fsf.org/campaigns/priority-projects\";>Llista de projectes d'alta 
prioritat</a> i la <a href=\"http://savannah.gnu.org/people/?type_id=1\";>GNU 
necessita ajuda</a>, que és la llista general de tasques per als paquets de 
programari GNU. Per conèixer altres maneres d'ajudar, vegeu <a 
href=\"http://gnu.org/help/help.html\";>la guia per ajudar al sistema operatiu 
GNU</a>.)"
+msgstr ""
+"(Per trobar ara projectes de programari en què treballar, vegeu la <a href="
+"\"http://fsf.org/campaigns/priority-projects\";>Llista de projectes d'alta "
+"prioritat</a> i la <a href=\"http://savannah.gnu.org/people/?type_id=1\";>GNU "
+"necessita ajuda</a>, que és la llista general de tasques per als paquets de "
+"programari GNU. Per conèixer altres maneres d'ajudar, vegeu <a 
href=\"http://";
+"gnu.org/help/help.html\">la guia per ajudar al sistema operatiu GNU</a>.)"
 
 # type: Content of: <p>
 msgid ""
@@ -360,20 +326,6 @@
 "sofisticades."
 
 # type: Content of: <p>
-#| msgid ""
-#| "I have found very many programmers eager to contribute part-time work for "
-#| "GNU.  For most projects, such part-time distributed work would be very "
-#| "hard to coordinate; the independently-written parts would not work "
-#| "together.  But for the particular task of replacing Unix, this problem is "
-#| "absent.  A complete Unix system contains hundreds of utility programs, "
-#| "each of which is documented separately.  Most interface specifications "
-#| "are fixed by Unix compatibility.  If each contributor can write a "
-#| "compatible replacement for a single Unix utility, and make it work "
-#| "properly in place of the original on a Unix system, then these utilities "
-#| "will work right when put together.  Even allowing for Murphy to create a "
-#| "few unexpected problems, assembling these components will be a feasible "
-#| "task.  (The kernel will require closer communication and will be worked "
-#| "on by a small, tight group.)"
 msgid ""
 "I have found very many programmers eager to contribute part-time work for "
 "GNU.  For most projects, such part-time distributed work would be very hard "
@@ -425,9 +377,6 @@
 msgstr "Per què tots els usuaris d'ordinador se'n sortiran beneficiats"
 
 # type: Content of: <p>
-#| msgid ""
-#| "Once GNU is written, everyone will be able to obtain good system software "
-#| "free, just like air.<a href=\"#f2\">(2)</a>"
 msgid ""
 "Once GNU is written, everyone will be able to obtain good system software "
 "free, just like air.<a href=\"#f2\">(3)</a>"
@@ -542,10 +491,6 @@
 "strong>"
 
 # type: Content of: <p>
-#| msgid ""
-#| "If people would rather pay for GNU plus service than get GNU free without "
-#| "service, a company to provide just service to people who have obtained "
-#| "GNU free ought to be profitable.<a href=\"#f3\">(3)</a>"
 msgid ""
 "If people would rather pay for GNU plus service than get GNU free without "
 "service, a company to provide just service to people who have obtained GNU "
@@ -652,11 +597,6 @@
 "reben benefici de la publicitat paguen per ella."
 
 # type: Content of: <p>
-#| msgid ""
-#| "On the other hand, if many people get GNU from their friends, and such "
-#| "companies don't succeed, this will show that advertising was not really "
-#| "necessary to spread GNU.  Why is it that free market advocates don't want "
-#| "to let the free market decide this?<a href=\"#f4\">(4)</a>"
 msgid ""
 "On the other hand, if many people get GNU from their friends, and such "
 "companies don't succeed, this will show that advertising was not really "
@@ -696,9 +636,6 @@
 "empès dins del costós negoci de la venta de sistemes operatius."
 
 # type: Content of: <p>
-#| msgid ""
-#| "I would like to see GNU development supported by gifts from many "
-#| "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(5)</a>"
 msgid ""
 "I would like to see GNU development supported by gifts from many "
 "manufacturers and users, reducing the cost to each.<a href=\"#f5\">(6)</a>"
@@ -817,12 +754,6 @@
 "com ara."
 
 # type: Content of: <p>
-#| msgid ""
-#| "Restricting copying is not the only basis for business in software.  It "
-#| "is the most common basis because it brings in the most money.  If it were "
-#| "prohibited, or rejected by the customer, software business would move to "
-#| "other bases of organization which are now used less often.  There are "
-#| "always numerous ways to organize any kind of business."
 msgid ""
 "Restricting copying is not the only basis for business in software.  It is "
 "the most common basis<a href=\"#f8\">(7)</a> because it brings in the most "
@@ -831,10 +762,10 @@
 "often.  There are always numerous ways to organize any kind of business."
 msgstr ""
 "Restringir la còpia no és l'única base per al negoci del programari. És 
la "
-"més comuna <a href=\"#f8\">(7)</a> perquè permet guanyar molts diners. Si 
aquesta es prohibís, o fos "
-"rebutjada pel consumidor, el negoci del programari es mouria cap altres "
-"bases d'organització que ara s'usen menys. Sempre hi ha nombroses maneres "
-"d'organitzar qualsevol tipus de negoci."
+"més comuna <a href=\"#f8\">(7)</a> perquè permet guanyar molts diners. Si "
+"aquesta es prohibís, o fos rebutjada pel consumidor, el negoci del "
+"programari es mouria cap altres bases d'organització que ara s'usen menys. "
+"Sempre hi ha nombroses maneres d'organitzar qualsevol tipus de negoci."
 
 # type: Content of: <p>
 msgid ""
@@ -869,12 +800,6 @@
 "les seves vides."
 
 # type: Content of: <p>
-#| msgid ""
-#| "People who have studied the issue of intellectual property rights<a href="
-#| "\"#f6\">(6)</a> carefully (such as lawyers) say that there is no "
-#| "intrinsic right to intellectual property.  The kinds of supposed "
-#| "intellectual property rights that the government recognizes were created "
-#| "by specific acts of legislation for specific purposes."
 msgid ""
 "People who have studied the issue of intellectual property rights<a href="
 "\"#f6\">(8)</a> carefully (such as lawyers) say that there is no intrinsic "
@@ -910,15 +835,6 @@
 "patentats."
 
 # type: Content of: <p>
-#| msgid ""
-#| "The idea of copyright did not exist in ancient times, when authors "
-#| "frequently copied other authors at length in works of non-fiction.  This "
-#| "practice was useful, and is the only way many authors' works have "
-#| "survived even in part.  The copyright system was created expressly for "
-#| "the purpose of encouraging authorship.  In the domain for which it was "
-#| "invented&mdash;books, which could be copied economically only on a "
-#| "printing press&mdash;it did little harm, and did not obstruct most of the "
-#| "individuals who read the books."
 msgid ""
 "The idea of copyright did not exist in ancient times, when authors "
 "frequently copied other authors at length in works of nonfiction.  This "
@@ -1044,12 +960,6 @@
 "reducció del seu salari? La meva experiència em demostra que sí."
 
 # type: Content of: <p>
-#| msgid ""
-#| "For more than ten years, many of the world's best programmers worked at "
-#| "the Artificial Intelligence Lab for far less money than they could have "
-#| "had anywhere else.  They got many kinds of non-monetary rewards: fame and "
-#| "appreciation, for example.  And creativity is also fun, a reward in "
-#| "itself."
 msgid ""
 "For more than ten years, many of the world's best programmers worked at the "
 "Artificial Intelligence Lab for far less money than they could have had "
@@ -1140,11 +1050,6 @@
 "feina també als programadors."
 
 # type: Content of: <p>
-#| msgid ""
-#| "People with new ideas could distribute programs as freeware<a href=\"#f7"
-#| "\">(7)</a>, asking for donations from satisfied users, or selling hand-"
-#| "holding services.  I have met people who are already working this way "
-#| "successfully."
 msgid ""
 "People with new ideas could distribute programs as freeware<a href=\"#f7\">"
 "(9)</a>, asking for donations from satisfied users, or selling hand-holding "
@@ -1228,14 +1133,6 @@
 "podran escollir-los per si mateixos."
 
 # type: Content of: <p>
-#| msgid ""
-#| "In the long run, making programs free is a step toward the post-scarcity "
-#| "world, where nobody will have to work very hard just to make a living.  "
-#| "People will be free to devote themselves to activities that are fun, such "
-#| "as programming, after spending the necessary ten hours a week on required "
-#| "tasks such as legislation, family counseling, robot repair and asteroid "
-#| "prospecting.  There will be no need to be able to make a living from "
-#| "programming."
 msgid ""
 "In the long run, making programs free is a step toward the postscarcity "
 "world, where nobody will have to work very hard just to make a living.  "
@@ -1309,13 +1206,6 @@
 "la llibertat de cooperar amb altres al utilitzar-lo."
 
 # type: Content of: <ol><li>
-#| msgid ""
-#| "<a name=\"f7\"></a>Subsequently we have learned to distinguish between "
-#| "&ldquo;free software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
-#| "freeware&rdquo; means software you are free to redistribute, but usually "
-#| "you are not free to study and change the source code, so most of it is "
-#| "not free software.  See <a href=\"/philosophy/words-to-avoid.html#Freeware"
-#| "\"> the Confusing Words and Phrases page</a> for more explanation."
 msgid ""
 "<a name=\"f2a\"></a>The expression &ldquo;give away&rdquo; is another "
 "indication that I had not yet clearly separated the issue of price from that "
@@ -1324,7 +1214,11 @@
 "html#GiveAwaySoftware\"> <q>Confusing Words and Phrases</q></a> for more "
 "explanation."
 msgstr ""
-"<a name=\"f2a\"></a>La paraula \"donar\" es una altra indicació que encara 
no havia separat clarament el tema del preu del de la llibertat. Recomanem 
evitar aquesta paraula al parlar de programari lliure. Vegeu <a 
href=\"/philosophy/words-to-avoid.ca.html#GiveAwaySoftware\">Paraules i Frases 
confuses</a> per a més explicacions."
+"<a name=\"f2a\"></a>La paraula \"donar\" es una altra indicació que encara "
+"no havia separat clarament el tema del preu del de la llibertat. Recomanem "
+"evitar aquesta paraula al parlar de programari lliure. Vegeu <a href=\"/"
+"philosophy/words-to-avoid.ca.html#GiveAwaySoftware\">Paraules i Frases "
+"confuses</a> per a més explicacions."
 
 # type: Content of: <ol><li>
 msgid ""
@@ -1345,11 +1239,6 @@
 msgstr "<a name=\"f3\"></a>Ja existeixen moltes d'aquestes companyies."
 
 # type: Content of: <ol><li>
-#| msgid ""
-#| "<a name=\"f4\"></a>The Free Software Foundation for 10 years raised most "
-#| "of its funds from a distribution service, although it is a charity rather "
-#| "than a company.  You can <a href=\"/order/order.html\">order things from "
-#| "the FSF</a>."
 msgid ""
 "<a name=\"f4\"></a> Although it is a charity rather than a company, the Free "
 "Software Foundation for 10 years raised most of its funds from its "
@@ -1381,20 +1270,16 @@
 "unchanged, in a free software world.  Therefore, I no longer expect that "
 "most paid programmers would earn less in a free software world."
 msgstr ""
-"<a name=\"f8\"></a>Crec que va ser un error dir que el programari propietari 
era la manera més habitual de fer diners amb el programari. Sembla que 
actualment el model de negoci més habitual es desenvolupar programari 
personalitzat. Això no dona la possibilitat de viure de renda, de manera que 
el negoci ha de treballar contínuament per mantenir els ingressos. El negoci 
del programari personalitzat continuaria existint, amb més o menys 
diferències, en un món amb programari lliure. Per tant, no crec que el 
programadors més ben pagats guanyessin menys en un món amb programari lliure."
+"<a name=\"f8\"></a>Crec que va ser un error dir que el programari propietari "
+"era la manera més habitual de fer diners amb el programari. Sembla que "
+"actualment el model de negoci més habitual es desenvolupar programari "
+"personalitzat. Això no dona la possibilitat de viure de renda, de manera que 
"
+"el negoci ha de treballar contínuament per mantenir els ingressos. El negoci 
"
+"del programari personalitzat continuaria existint, amb més o menys "
+"diferències, en un món amb programari lliure. Per tant, no crec que el "
+"programadors més ben pagats guanyessin menys en un món amb programari 
lliure."
 
 # type: Content of: <ol><li>
-#| msgid ""
-#| "<a name=\"f6\"></a>In the 80s I had not yet realized how confusing it was "
-#| "to speak of &ldquo;the issue&rdquo; of &ldquo;intellectual "
-#| "property&rdquo;.  That term is obviously biased; more subtle is the fact "
-#| "that it lumps together various disparate laws which raise very different "
-#| "issues.  Nowadays I urge people to reject the term &ldquo;intellectual "
-#| "property&rdquo; entirely, lest it lead others to suppose that those laws "
-#| "form one coherent issue.  The way to be clear is to discuss patents, "
-#| "copyrights, and trademarks separately.  See <a href=\"/philosophy/not-ipr."
-#| "html\">further explanation</a> of how this term spreads confusion and "
-#| "bias."
 msgid ""
 "<a name=\"f6\"></a>In the 1980s I had not yet realized how confusing it was "
 "to speak of &ldquo;the issue&rdquo; of &ldquo;intellectual property&rdquo;.  "
@@ -1417,13 +1302,6 @@
 "de com aquest terme provoca confusió i biaix."
 
 # type: Content of: <ol><li>
-#| msgid ""
-#| "<a name=\"f7\"></a>Subsequently we have learned to distinguish between "
-#| "&ldquo;free software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
-#| "freeware&rdquo; means software you are free to redistribute, but usually "
-#| "you are not free to study and change the source code, so most of it is "
-#| "not free software.  See <a href=\"/philosophy/words-to-avoid.html#Freeware"
-#| "\"> the Confusing Words and Phrases page</a> for more explanation."
 msgid ""
 "<a name=\"f7\"></a>Subsequently we learned to distinguish between &ldquo;"
 "free software&rdquo; and &ldquo;freeware&rdquo;.  The term &ldquo;"
@@ -1437,8 +1315,8 @@
 "\"programari gratuït\" significa programari que eres lliure de redistribuir, 
"
 "però que normalment no eres lliure d'estudiar o modificar el codi font, 
així "
 "que la majoria d'aquest programari no és lliure. Veieu <a 
href=\"/philosophy/"
-"words-to-avoid.ca.html#Freeware\">Paraules i Frases confuses</"
-"a> per a més explicacions."
+"words-to-avoid.ca.html#Freeware\">Paraules i Frases confuses</a> per a més "
+"explicacions."
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -1446,12 +1324,6 @@
 msgstr " "
 
 # type: Content of: <div><p>
-#| 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 "
-#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";
-#| "\"><em>address@hidden</em></a>."
 msgid ""
 "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
 "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
@@ -1478,9 +1350,6 @@
 "traducció al català del web de GNU."
 
 # type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008 Free Software "
-#| "Foundation, Inc.,"
 msgid ""
 "Copyright &copy; 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010 Free "
 "Software Foundation, Inc."

Index: gnu/po/why-gnu-linux.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.ca.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gnu/po/why-gnu-linux.ca.po  19 Aug 2010 11:45:42 -0000      1.15
+++ gnu/po/why-gnu-linux.ca.po  19 Aug 2010 16:26:58 -0000      1.16
@@ -13,14 +13,13 @@
 "Language-Team: Catalan <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation (FSF)"
 msgstr "Per què GNU/Linux? - Projecte GNU - Free Software Foundation (FSF)"
 
 # type: Content of: <h2>
-#| msgid "What's in a name?"
 msgid "What's in a Name?"
 msgstr "Què hi ha en un nom?"
 
@@ -32,12 +31,6 @@
 "strong>"
 
 # type: Content of: <div><blockquote><p>
-#| msgid ""
-#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-"
-#| "gnu.html\">Linux and the GNU Project</a> and our page on <a href=\"/gnu/"
-#| "gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of "
-#| "GNU</a>."
 msgid ""
 "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
 "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
@@ -46,19 +39,14 @@
 "gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
 "a>."
 msgstr ""
-"Per saber més sobre aquesta qüestió podeu llegir les nostres <a 
href=\"/gnu/gnu-linux-faq.ca.html\"> preguntes freqüents sobre GNU/Linux</a>, 
la nostra pàgina sobre <a href=\"/gnu/linux-and-gnu.ca.html\"> Linux i el 
Projecte GNU</a>, que explica la història del sistema GNU/Linux en relació 
amb el seu nom, i la pàgina sobre  <a 
href=\"/gnu/gnu-users-never-heard-of-gnu.ca.html\"> Usuaris de GNU que mai no 
han sentit parlar de GNU</a>."
+"Per saber més sobre aquesta qüestió podeu llegir les nostres <a 
href=\"/gnu/"
+"gnu-linux-faq.ca.html\"> preguntes freqüents sobre GNU/Linux</a>, la nostra "
+"pàgina sobre <a href=\"/gnu/linux-and-gnu.ca.html\"> Linux i el Projecte "
+"GNU</a>, que explica la història del sistema GNU/Linux en relació amb el 
seu "
+"nom, i la pàgina sobre  <a href=\"/gnu/gnu-users-never-heard-of-gnu.ca.html"
+"\"> Usuaris de GNU que mai no han sentit parlar de GNU</a>."
 
 # type: Content of: <p>
-#| msgid ""
-#| "Names convey meanings; our choice of names determines the meaning of what "
-#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
-#| "any name would smell as sweet&mdash;but if you call it a pen, people will "
-#| "be rather disappointed when they try to write with it.  And if you call "
-#| "pens &ldquo;roses&rdquo;, people may not realize what they are good for.  "
-#| "If you call our operating system &ldquo;Linux&rdquo;, that conveys a "
-#| "mistaken idea of the system's origin, history, and purpose.  If you call "
-#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
-#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
@@ -82,13 +70,6 @@
 "idea més precisa."
 
 # type: Content of: <p>
-#| msgid ""
-#| "But does this matter for our community? Is it important whether people "
-#| "know the system's origin, history, and purpose? Yes&mdash;because people "
-#| "who forget history are often condemned to repeat it.  The Free World "
-#| "which has developed around <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</"
-#| "a> is not secure; the problems that led us to develop GNU are not "
-#| "completely eradicated, and they threaten to come back."
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -106,10 +87,6 @@
 "amb tornar."
 
 # type: Content of: <p>
-#| msgid ""
-#| "When I explain why it's appropriate to call the operating system &ldquo;"
-#| "GNU/Linux&rdquo; rather than &ldquo;Linux&rdquo;, people sometimes "
-#| "respond this way:"
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -148,13 +125,6 @@
 "d'informar els altres sobre aquests objectius."
 
 # type: Content of: <p>
-#| msgid ""
-#| "It is possible to write good free software without thinking of GNU; much "
-#| "good work has been done in the name of Linux also.  But &ldquo;"
-#| "Linux&rdquo; has been associated ever since it was first coined with a "
-#| "philosophy that does not make a commitment to the freedom to cooperate.  "
-#| "As the name becomes used increasingly by business, we will have even more "
-#| "trouble making it connect with community spirit."
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -171,17 +141,6 @@
 "la comunitat."
 
 # type: Content of: <p>
-#| msgid ""
-#| "A great challenge to the future of free software comes from the tendency "
-#| "of the &ldquo;Linux&rdquo; distribution companies to add non-free "
-#| "software to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name "
-#| "of convenience and power.  All the major commercial distribution "
-#| "developers do this; none produces a distribution that is entirely free.  "
-#| "Most of them do not clearly identify the non-free packages in their "
-#| "distributions.  Many even develop non-free software and add it to the "
-#| "system.  Some outrageously advertise &ldquo;Linux&rdquo; systems that are "
-#| "&ldquo;licensed per seat&rdquo;, which give the user as much freedom as "
-#| "Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -205,16 +164,6 @@
 "l'usuari tanta llibertat com utilitzar Microsoft Windows."
 
 # type: Content of: <p>
-#| msgid ""
-#| "People justify adding non-free software in the name of the &ldquo;"
-#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
-#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
-#| "Magazine says Robert McMillan, editor of Linux Magazine, &ldquo;feels "
-#| "that the move toward open source software should be fueled by technical, "
-#| "rather than political, decisions.&rdquo; And Caldera's <acronym title="
-#| "\"Chief Executive Officer\">CEO</acronym> openly urged users to drop the "
-#| "goal of freedom and work instead for the &ldquo;popularity of "
-#| "Linux&rdquo;."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -235,14 +184,6 @@
 "treballar en canvi per la «popularitat de Linux»."
 
 # type: Content of: <p>
-#| msgid ""
-#| "Adding non-free software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
-#| "Linux</a> system may increase the popularity, if by popularity we mean "
-#| "the number of people using some of <a href=\"/gnu/linux-and-gnu.html"
-#| "\">GNU/Linux</a> in combination with non-free software.  But at the same "
-#| "time, it implicitly encourages the community to accept non-free software "
-#| "as a good thing, and forget the goal of freedom.  It is no use driving "
-#| "faster if you can't stay on the road."
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -261,18 +202,6 @@
 "de res conduir més de pressa si no pots mantenir-te a la carretera."
 
 # type: Content of: <p>
-#| msgid ""
-#| "When the non-free &ldquo;add-on&rdquo; is a library or programming tool, "
-#| "it can become a trap for free software developers.  When they write free "
-#| "software that depends on the non-free package, their software cannot be "
-#| "part of a completely free system.  Motif and Qt trapped large amounts of "
-#| "free software in this way in the past, creating problems whose solutions "
-#| "took years.  The Motif problem is still not entirely solved, since "
-#| "LessTif needs some polishing (please volunteer!).  Sun's non-free Java "
-#| "implementation is now having a similar effect: the <a href=\"/philosophy/"
-#| "java-trap.html\">Java Trap</a> (Historical note: As of December 2006 Sun "
-#| "is in the middle of <a href=\"http://www.fsf.org/news/fsf-welcomes-gpl-";
-#| "java.html\">rereleasing its Java platform under GNU GPL</a>.)"
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -290,16 +219,13 @@
 "que no ho és, els seus programes no podran formar part d'un sistema "
 "totalment lliure. En el passat, Motif i Qt van mantenir atrapada una gran "
 "quantitat de programari per aquest motiu, creant problemes que han trigat "
-"anys a solucionar-se. Motif va continuar sent un problema fins que va quedar 
obsolet i va deixar d'utilitzar-se. Posteriorment, la implementació de Java de 
Sun, que tampoc no és lliure, va tenir un efecte similar: la <a 
href=\"/philosophy/java-trap.html\">trampa de Java</a>, situació que 
afortunadament es troba ara redreçada."
+"anys a solucionar-se. Motif va continuar sent un problema fins que va quedar "
+"obsolet i va deixar d'utilitzar-se. Posteriorment, la implementació de Java "
+"de Sun, que tampoc no és lliure, va tenir un efecte similar: la <a href=\"/"
+"philosophy/java-trap.html\">trampa de Java</a>, situació que afortunadament "
+"es troba ara redreçada."
 
 # type: Content of: <p>
-#| msgid ""
-#| "If our community keeps moving in this direction, it could redirect the "
-#| "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic "
-#| "of free and non-free components.  Five years from now, we will surely "
-#| "still have plenty of free software; but if we are not careful, it will "
-#| "hardly be usable without the non-free software that users expect to find "
-#| "with it.  If this happens, our campaign for freedom will have failed."
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -317,17 +243,6 @@
 "fracassat."
 
 # type: Content of: <p>
-#| msgid ""
-#| "If releasing free alternatives were simply a matter of programming, "
-#| "solving future problems might become easier as our community's "
-#| "development resources increase.  But we face obstacles which threaten to "
-#| "make this harder: laws that prohibit free software.  As software patents "
-#| "mount up, and as laws like the <abbr title=\"Digital Millennium Copyright "
-#| "Act\">DMCA</abbr> are used to prohibit the development of free software "
-#| "for important jobs such as viewing a DVD or listening to a RealAudio "
-#| "stream, we will find ourselves with no clear way to fight the patented "
-#| "and secret data formats except to <strong>reject the non-free programs "
-#| "that use them</strong>."
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -344,17 +259,14 @@
 "desenvolupament de la nostra comunitat augmentessin. Però ens enfrontem a "
 "obstacles que amenacen amb fer-ho fins i tot més difícil: les lleis que "
 "prohibeixen el programari lliure. Mentre s'amunteguin les patents de "
-"programari i mentre lleis com la <acronym title=\"Digital Millennium 
Copyright Act\">DMCA</acronym> s'utilitzin per prohibir el desenvolupament 
d'eines importants de programari lliure com les que permeten veure un DVD o 
escoltar una emissió de RealAudio, ens trobarem sense cap forma clara de 
lluitar contra els formats de dades secrets i patentats que no sigui 
<strong>rebutjar els programes no lliures que els utilitzen</strong>."
+"programari i mentre lleis com la <acronym title=\"Digital Millennium "
+"Copyright Act\">DMCA</acronym> s'utilitzin per prohibir el desenvolupament "
+"d'eines importants de programari lliure com les que permeten veure un DVD o "
+"escoltar una emissió de RealAudio, ens trobarem sense cap forma clara de "
+"lluitar contra els formats de dades secrets i patentats que no sigui "
+"<strong>rebutjar els programes no lliures que els utilitzen</strong>."
 
 # type: Content of: <p>
-#| msgid ""
-#| "Meeting these challenges will require many different kinds of effort.  "
-#| "But what we need above all, to confront any kind of challenge, is to "
-#| "remember the goal of freedom to cooperate.  We can't expect a mere desire "
-#| "for powerful, reliable software to motivate people to make great "
-#| "efforts.  We need the kind of determination that people have when they "
-#| "fight for their freedom and their community, determination to keep on for "
-#| "years and not give up."
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -373,18 +285,6 @@
 "lluitant any rere any sense rendir-se."
 
 # type: Content of: <p>
-#| msgid ""
-#| "In our community, this goal and this determination emanate mainly from "
-#| "the GNU Project.  We're the ones who talk about freedom and community as "
-#| "something to stand firm for; the organizations that speak of &ldquo;"
-#| "Linux&rdquo; normally don't say this.  The magazines about &ldquo;"
-#| "Linux&rdquo; are typically full of ads for non-free software; the "
-#| "companies that package &ldquo;Linux&rdquo; add non-free software to the "
-#| "system; other companies &ldquo;support Linux&rdquo; with non-free "
-#| "applications; the user groups for &ldquo;Linux&rdquo; typically invite "
-#| "salesman to present those applications.  The main place people in our "
-#| "community are likely to come across the idea of freedom and determination "
-#| "is in the GNU Project."
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "

Index: licenses/rms-why-gplv3.ca.html
===================================================================
RCS file: /web/www/www/licenses/rms-why-gplv3.ca.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- licenses/rms-why-gplv3.ca.html      15 Jan 2010 09:26:49 -0000      1.6
+++ licenses/rms-why-gplv3.ca.html      19 Aug 2010 16:27:01 -0000      1.7
@@ -16,16 +16,18 @@
 <!-- language, where necessary. -->
 <p>per <strong>Richard Stallman</strong></p>
 
-<p><a href="/licenses/gpl.html">Version 3 of the GNU General Public License</a>
-(GNU GPL) has been released, enabling free software packages to upgrade from
-GPL version 2.  This article explains why upgrading the license is
-important.</p>
+<p>S'ha publicat la <a href="/licenses/gpl.html">versió 3 de la Llicència
+Pública General (GPL) de GNU</a>, i això permet que els paquets de
+programari lliure sota la versió 2 de la GPL puguin migrar a la nova
+versió. Aquest article explica per què és important actualitzar la
+llicència.</p>
 
 <p id="choice">
-First of all, it is important to note that upgrading is a choice.  GPL
-version 2 will remain a valid license, and no disaster will happen if some
-programs remain under GPLv2 while others advance to GPLv3.  These two
-licenses are incompatible, but that isn't a fundamental problem.</p>
+Primer que res, és important observar que l'actualització és facultativa. La
+GPL en la seva versió 2 continuarà sent una llicència vàlida, i no passarà
+res desastrós si alguns programes es queden sota la versió 2 de la GPL
+mentre que altres passen a la versió 3. Aquestes dues llicències són
+incompatibles, però això no és un problema seriós.</p>
 
 <p id="incompatibility">
 Quan diem que la GPLv2 i la GPLv3 són incompatibles, volem dir que no hi ha
@@ -37,27 +39,30 @@
 la GPLv3 una clàusula de compatibilitat amb la GPLv2, però no serviria de
 res, ja que la GPLv2 necessitaria una clàusula similar.</p>
 
-<p>Fortunately, license incompatibility matters only when you want to link,
-merge or combine code from two different programs into a single program.
-There is no problem in having GPLv3-covered and GPLv2-covered programs side
-by side in an operating system.  For instance, the TeX license and the
-Apache license are incompatible with GPLv2, but that doesn't stop us from
-running TeX and Apache in the same system with Linux, Bash and GCC.  This is
-because they are all separate programs.  Likewise, if Bash and GCC move to
-GPLv3, while Linux remains under GPLv2, there is no conflict.</p>
+<p>Afortunadament, la incompatibilitat de les llicències només ens ha de
+preocupar quan vulguem lligar, barrejar o combinar el codi de dos programes
+diferents en un sol programa. No hi ha cap problema en tenir junts en un
+mateix sistema operatiu programes sota la GPLv3 y la GPLv2. Per exemple, la
+llicència de TeX i la llicència d'Apache són incompatibles amb la GPLv2,
+però això no ens impedeix tenir TeX i Apache en el mateix sistema amb Linux,
+Bash i GCC, ja que són programes independents. Igualment, si Bash i GCC
+migren cap a la GPLv3 i Linux es queda sota la GPLv2, no hi haurà cap
+conflicte.</p>
 
-<p>Keeping a program under GPLv2 won't create problems.  The reason to migrate
-is because of the existing problems that GPLv3 will address.</p>
+<p>Mantenir un programa sota la GPLv2 no crearà problemes. La raó per migrar 
és
+el conjunt de problemes que la GPLv3 resoldrà.</p>
 
 <p id="tivoization">
-One major danger that GPLv3 will block is tivoization.  Tivoization means
-certain &ldquo;appliances&rdquo; (which have computers inside)  contain
-GPL-covered software that you can't effectively change, because the
-appliance shuts down if it detects modified software.  The usual motive for
-tivoization is that the software has features the manufacturer knows people
-will want to change, and aims to stop people from changing them.  The
-manufacturers of these computers take advantage of the freedom that free
-software provides, but they don't let you do likewise.</p>
+Un dels principals perills que la GPLv3 permetrà evitar és la
+tivoització. [N. del T.: les pràctiques poc ètiques de l'empresa TiVo van
+portar Stallman a crear aquest terme.] La tivoització ha comportat
+l'aparició de dispositius (anomenats &ldquo;appliances&rdquo;) que contenen
+programari sota la GPL que no es pot canviar, perquè el dispositiu s'apaga
+si detecta que el programa s'ha modificat. La raó de fons d'una tivoització
+és que el programa té unes funcionalitats que el fabricant pensa que la gent
+voldrà canviar, i intenta impedir-los-ho. Els fabricants d'aquests
+dispositius es beneficien de la llibertat que proporciona el programari
+lliure, però no deixen que vosaltres us en beneficieu.</p>
 
 <p>Alguns argumenten que la competència entre dispositius en un mercat lliure
 serà suficient per mantenir a ratlla aquestes funcionalitats
@@ -68,17 +73,18 @@
 poder suplicar o amenaçar als que el controlen.</p>
 
 <p id="drm">
-In the crucial area of Digital Restrictions Management (DRM)&mdash;nasty
-features designed to restrict your use of the data in your
-computer&mdash;competition is no help, because relevant competition is
-forbidden.  Under the Digital Millennium Copyright Act and similar laws, it
-is illegal, in the US and many other countries, to distribute DVD players
-unless they restrict the user according to the official rules of the DVD
-conspiracy (its web site is <a
-href="http://www.dvdcca.org/";>http://www.dvdcca.org/</a>, but the rules do
-not seem to be published there).  The public can't reject DRM by buying
-non-DRM players because none are available.  No matter how many products you
-can choose from, they all have equivalent digital handcuffs.</p>
+En l'àmbit crucial de la gestió de restriccions digitals (Digital
+Restrictions Management o DRM; funcionalitats perverses dissenyades per
+restringir l'ús de les dades de l'ordinador) la competitivitat no ajuda,
+perquè tota competència veritablement rellevant està prohibida. D'acord amb
+la Digital Millenium Copyright Act i altres lleis similars, és il·legal, als
+Estats Units i a molts altres països, distribuir lectors de DVD que no
+limitin a l'usuari seguint les regles oficials de la conspiració DVD (el seu
+web és <a href="http://www.dvdcca.org/";>http://www.dvdcca.org/</a>, però no
+sembla que s'hi hagin publicat les regles). El públic no pot rebutjar la
+gestió de restriccions digitals comprant lectors de DVD sense restriccions,
+perquè no n'hi ha. Poc importa entre quants productes pot escollir: tots
+porten les mateixes cadenes digitals.</p>
 
 <p>La GPLv3 garanteix que sou lliures de treure aquestes cadenes. No prohibeix
 els DRM o altres funcions. No posa cap límit a l'addició o a la retirada
@@ -88,21 +94,23 @@
 negar-nos aquesta llibertat; per protegir la nostra llibertat, la GPLv3
 prohibeix la tivoització.</p>
 
-<p>The ban on tivoization applies to any product whose use by consumers is to
-be expected, even occasionally.  GPLv3 tolerates tivoization only for
-products that are almost exclusively meant for businesses and 
organizations.</p>
+<p>La prohibició de tivoitzar s'aplica a tot producte del que s'espera que els
+consumidors en facin ús, ni que sigui ocasionalment. La GPLv3 només tolera
+la tivoització en productes destinats gairebé exclusivament a negocis i
+organitzacions.</p>
 
 <p id="patent-deals">
-Another threat that GPLv3 resists is that of patent deals like the
-Novell-Microsoft pact.  Microsoft wants to use its thousands of patents to
-make users pay Microsoft for the privilege of running GNU/Linux, and made
-this pact to try to achieve that.  The deal offers rather limited protection
-from Microsoft patents to Novell's customers.</p>
-
-<p>Microsoft made a few mistakes in the Novell-Microsoft deal, and GPLv3 is
-designed to turn them against Microsoft, extending that limited patent
-protection to the whole community.  In order to take advantage of this
-protection, programs need to use GPLv3.</p>
+Una altra amenaça a què fa front la GPLv3 és la dels acords sobre patents
+com ara el pacte entre Novell i Microsoft. Microsoft vol utilitzar els seus
+milers de patents per fer que els usuaris paguin a Microsoft pel privilegi
+d'utilitzar GNU/Linux, i va fer aquest pacte per intentar
+aconseguir-ho. L'acord ofereix als clients de Novell una protecció molt
+limitada respecte a les patents de Microsoft.</p>
+
+<p>Microsoft va cometre alguns errors en el pacte amb Novell, i la GPLv3 està
+pensada per aprofitar-los contra Microsoft, estenent aquesta protecció
+limitada a tota la comunitat. Per treure profit d'això, els programes han
+d'utilitzar la GPLv3.</p>
 
 <p>Els advocats de Microsoft no són estúpids, i poden evitar aquests errors 
la
 propera vegada. Per això, la GPLv3 diu no hi haurà &ldquo;propera
@@ -111,23 +119,24 @@
 usuaris royalties per a Microsoft.</p>
 
 <p id="patent-protection">
-GPLv3 also provides users with explicit patent protection from the program's
-contributors and redistributors.  With GPLv2, users rely on an implicit
-patent license to make sure that the company which provided them a copy
-won't sue them, or the people they redistribute copies to, for patent
-infringement.</p>
-
-<p>The explicit patent license in GPLv3 does not go as far as we might have
-liked.  Ideally, we would make everyone who redistributes GPL-covered code
-give up all software patents, along with everyone who does not redistribute
-GPL-covered code, because there should be no software patents.  Software
-patents are a vicious and absurd system that puts all software developers in
-danger of being sued by companies they have never heard of, as well as by
-all the megacorporations in the field.  Large programs typically combine
-thousands of ideas, so it is no surprise if they implement ideas covered by
-hundreds of patents.  Megacorporations collect thousands of patents, and use
-those patents to bully smaller developers.  Patents already obstruct free
-software development.</p>
+La GPLv3 també proporciona a l'usuari protecció explícita sobre patents en
+front dels creadors i els distribuïdors de programes. Amb la GPLv2, els
+usuaris confiaven en una llicència de patent implícita per assegurar-se que
+la companyia que els havia proporcionat la còpia no els demandaria per
+infracció de patent, ni a ells ni a les persones a qui donessin còpies.</p>
+
+<p>La llicència de patent explícita de la GPLv3 no va tan lluny com hauríem
+desitjat. Idealment, hauríem fet renunciar a tota patent de programari a
+tothom que distribuís codi sota la GPL, igual com ens agradaria fer-ho amb
+tothom que no distribueix codi sota la GPL, perquè no hauria d'haver-hi
+patents de programari. Les patents de programari són un sistema absurd i
+viciós en què els desenvolupadors de programes corren el risc de ser
+demandats per companyies o grans corporacions de què mai no havien sentit
+parlar. Els programes grans combinen habitualment milers d'idees, de manera
+que no és cap sorpresa que apliquin idees cobertes per centenars de
+patentes. Les grans corporacions posseeixen milers de patents, i les
+utilitzen per intimidar als petits desenvolupadors. Les patents ja estan
+obstaculitzant el desenvolupament de programari lliure.</p>
 
 <p>L'única manera de fer segur el desenvolupament de programari és abolir les
 patents de programari, i aspirem a aconseguir-ho algun dia. Però no podem
@@ -138,13 +147,13 @@
 desenvolupament de programari. Si haguéssim intentat fer-ho amb la GPLv3,
 hauríem fracassat.</p>
 
-<p>Therefore, GPLv3 seeks to limit and channel the danger.  In particular, we
-have tried to save free software from a fate worse than death: to be made
-effectively proprietary, through patents.  The explicit patent license of
-GPLv3 makes sure companies that use the GPL to give users the four freedoms
-cannot turn around and use their patents to tell some users, &ldquo;That
-doesn't include you.&rdquo; It also stops them from colluding with other
-patent holders to do this.</p>
+<p>Per aquesta raó, la GPLv3 intenta limitar i canalitzar el perill. En
+particular, hem intentat salvar el programari lliure d'un destí pitjor que
+la mort: esdevenir propietari per culpa de les patents. La llicència
+explícita de patent de la GPLv3 estableix que les companyies que utilitzen
+la GPL per donar als usuaris les quatre llibertats no poden tirar-se enrere
+i utilitzar les seves patents per dir a alguns usuaris "això no va per
+tu". També els impedeix aliar-se amb altres titulars de patents per 
fer-ho.</p>
 
 <p id="further-advantages">
 Altres avantatges de la GPLv3 són una millor internacionalització, una
@@ -152,19 +161,20 @@
 d'Apache. En resum, raons de sobres per actualitzar la llicència.</p>
 
 <p id="gpl4">
-Change is unlikely to cease once GPLv3 is released.  If new threats to
-users' freedom develop, we will have to develop GPL version 4.  It is
-important to make sure that programs will have no trouble upgrading to GPLv4
-if and when we write one.</p>
+Un cop publicada la GPLv3, és improbable que no hi hagi més canvis. Si
+sorgeixen noves amenaces a la llibertat dels usuaris, haurem de desenvolupar
+la versió 4 de la GPL. És important assegurar-se que els programes no
+tindran problemes per migrar a la GPLv4 quan arribi el moment.</p>
 
 <p id="future-proofing">
-One way to do this is to release a program under &ldquo;GPL version 3 or any
-later version&rdquo;.  Another way is for all the contributors to a program
-to state a proxy who can decide on upgrading to future GPL versions.  The
-third way is for all the contributors to assign copyright to one designated
-copyright holder, who will be in a position to upgrade the license version.
-One way or another, programs should provide this flexibility for future GPL
-versions.</p>
+Una manera de fer-ho és publicar els programes sota la &ldquo;versió 3 de la
+GPL o qualsevol versió posterior&rdquo;. Una altra és que tots els
+col·laboradors d'un programa nomenin un apoderat que pugui prendre decisions
+sobre la migració cap a futures versions de la GPL. La tercera via és que
+tots els col·laboradors escullin a un titular del copyright i li cedeixin
+els dret d'autor; el titular estaria capacitat per actualitzar la
+llicència. D'una manera o d'una altra, els programes haurien d'oferir
+aquesta flexibilitat per a les futures versions de la GPL.</p>
 
 <!-- If needed, change the copyright block at the bottom. In general, -->
 <!-- all pages on the GNU web server should have the section about    -->
@@ -200,9 +210,9 @@
 </p>
 
 <p>
-Copyright &copy; 2007, 2009 Richard Stallman <br /> Verbatim copying and
-distribution of this entire article are permitted worldwide without royalty
-in any medium provided this notice is preserved.</p>
+Copyright &copy; 2007, 2009 Richard Stallman <br /> Es permet realitzar i
+distribuir còpies literals d'aquest article en qualsevol medi sense pagament
+de drets, sempre que es conservi aquesta nota.</p>
 
 
 <div class="translators-credits">
@@ -214,7 +224,7 @@
 <!-- timestamp start -->
 Updated:
 
-$Date: 2010/01/15 09:26:49 $
+$Date: 2010/08/19 16:27:01 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/rms-why-gplv3.ca.po
===================================================================
RCS file: /web/www/www/licenses/po/rms-why-gplv3.ca.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- licenses/po/rms-why-gplv3.ca.po     19 Aug 2010 10:14:55 -0000      1.8
+++ licenses/po/rms-why-gplv3.ca.po     19 Aug 2010 16:27:07 -0000      1.9
@@ -13,7 +13,7 @@
 "Language-Team: Catalan <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 msgid "Why Upgrade to GPLv3 - GNU Project - Free Software Foundation (FSF)"
@@ -30,11 +30,6 @@
 msgstr "per <strong>Richard Stallman</strong>"
 
 # type: Content of: <p>
-#| msgid ""
-#| "<a href=\"/licenses/gpl.html\">Version 3 of the GNU General Public "
-#| "License</a> has been released, enabling free software packages to upgrade "
-#| "from GPL version 2.  This article explains why upgrading the license is "
-#| "important."
 msgid ""
 "<a href=\"/licenses/gpl.html\">Version 3 of the GNU General Public License</"
 "a> (GNU GPL) has been released, enabling free software packages to upgrade "
@@ -43,16 +38,10 @@
 msgstr ""
 "S'ha publicat la <a href=\"/licenses/gpl.html\">versió 3 de la Llicència "
 "Pública General (GPL) de GNU</a>, i això permet que els paquets de "
-"programari lliure sota la versió 2 de la GPL puguin migrar "
-"a la nova versió. Aquest article explica per què és important actualitzar 
la "
-"llicència."
+"programari lliure sota la versió 2 de la GPL puguin migrar a la nova 
versió. "
+"Aquest article explica per què és important actualitzar la llicència."
 
 # type: Content of: <p>
-#| msgid ""
-#| "First of all, it is important to note that upgrading is a choice.  GPL "
-#| "version 2 will remain a valid license, and no disaster will happen if "
-#| "some programs remain under GPLv2 while others advance to GPLv3.  These "
-#| "two licenses are incompatible, but that isn't a serious problem."
 msgid ""
 "First of all, it is important to note that upgrading is a choice.  GPL "
 "version 2 will remain a valid license, and no disaster will happen if some "
@@ -86,15 +75,6 @@
 "la GPLv2 necessitaria una clàusula similar."
 
 # type: Content of: <p>
-#| msgid ""
-#| "Fortunately, license incompatibility only matters when you want to link, "
-#| "merge or combine code from two different programs into a single program.  "
-#| "There is no problem in having GPLv3-covered and GPLv2-covered programs "
-#| "side by side in an operating system.  For instance, the TeX license and "
-#| "the Apache license are incompatible with GPLv2, but that doesn't stop us "
-#| "from running TeX and Apache in the same system with Linux, Bash and GCC.  "
-#| "This is because they are all separate programs.  Likewise, if Bash and "
-#| "GCC move to GPLv3, while Linux remains under GPLv2, there is no conflict."
 msgid ""
 "Fortunately, license incompatibility matters only when you want to link, "
 "merge or combine code from two different programs into a single program.  "
@@ -111,13 +91,11 @@
 "mateix sistema operatiu programes sota la GPLv3 y la GPLv2. Per exemple, la "
 "llicència de TeX i la llicència d'Apache són incompatibles amb la GPLv2, "
 "però això no ens impedeix tenir TeX i Apache en el mateix sistema amb 
Linux, "
-"Bash i GCC, ja que són programes independents. Igualment, si Bash i GCC 
migren cap a la "
-"GPLv3 i Linux es queda sota la GPLv2, no hi haurà cap conflicte."
+"Bash i GCC, ja que són programes independents. Igualment, si Bash i GCC "
+"migren cap a la GPLv3 i Linux es queda sota la GPLv2, no hi haurà cap "
+"conflicte."
 
 # type: Content of: <p>
-#| msgid ""
-#| "Keeping a program under GPLv2 won't create problems.  The reason to "
-#| "migrate is because of the existing problems which GPLv3 will address."
 msgid ""
 "Keeping a program under GPLv2 won't create problems.  The reason to migrate "
 "is because of the existing problems that GPLv3 will address."
@@ -126,14 +104,6 @@
 "el conjunt de problemes que la GPLv3 resoldrà."
 
 # type: Content of: <p>
-#| msgid ""
-#| "One major danger that GPLv3 will block is tivoization.  Tivoization means "
-#| "computers (called &ldquo;appliances&rdquo;) contain GPL-covered software "
-#| "that you can't change, because the appliance shuts down if it detects "
-#| "modified software.  The usual motive for tivoization is that the software "
-#| "has features the manufacturer thinks lots of people won't like.  The "
-#| "manufacturers of these computers take advantage of the freedom that free "
-#| "software provides, but they don't let you do likewise."
 msgid ""
 "One major danger that GPLv3 will block is tivoization.  Tivoization means "
 "certain &ldquo;appliances&rdquo; (which have computers inside)  contain GPL-"
@@ -150,10 +120,10 @@
 "(anomenats &ldquo;appliances&rdquo;) que contenen programari sota la GPL que "
 "no es pot canviar, perquè el dispositiu s'apaga si detecta que el programa "
 "s'ha modificat. La raó de fons d'una tivoització és que el programa té 
unes "
-"funcionalitats que el fabricant pensa que la gent voldrà canviar, i intenta 
impedir-los-ho. Els "
-"fabricants d'aquests dispositius es beneficien de la llibertat que "
-"proporciona el programari lliure, però no deixen que vosaltres us en "
-"beneficieu."
+"funcionalitats que el fabricant pensa que la gent voldrà canviar, i intenta "
+"impedir-los-ho. Els fabricants d'aquests dispositius es beneficien de la "
+"llibertat que proporciona el programari lliure, però no deixen que vosaltres 
"
+"us en beneficieu."
 
 # type: Content of: <p>
 msgid ""
@@ -173,18 +143,6 @@
 "poder suplicar o amenaçar als que el controlen."
 
 # type: Content of: <p>
-#| msgid ""
-#| "In the crucial area of Digital Restrictions Management&mdash;nasty "
-#| "features designed to restrict your use of the data in your computer&mdash;"
-#| "competition is no help, because relevant competition is forbidden.  Under "
-#| "the Digital Millennium Copyright Act and similar laws, it is illegal, in "
-#| "the US and many other countries, to distribute DVD players unless they "
-#| "restrict the user according to the official rules of the DVD conspiracy "
-#| "(its web site is <a href=\"http://www.dvdcca.org/\";>http://www.dvdcca.org/";
-#| "</a>, but the rules do not seem to be published there).  The public can't "
-#| "reject DRM by buying non-DRM players, because none are available.  No "
-#| "matter how many products you can choose from, they all have equivalent "
-#| "digital handcuffs."
 msgid ""
 "In the crucial area of Digital Restrictions Management (DRM)&mdash;nasty "
 "features designed to restrict your use of the data in your computer&mdash;"
@@ -228,11 +186,6 @@
 "prohibeix la tivoització."
 
 # type: Content of: <p>
-#| msgid ""
-#| "The ban on tivoization applies to any product whose use by consumers, "
-#| "even occasionally, is to be expected.  GPLv3 tolerates tivoization only "
-#| "for products that are almost exclusively meant for businesses and "
-#| "organizations."
 msgid ""
 "The ban on tivoization applies to any product whose use by consumers is to "
 "be expected, even occasionally.  GPLv3 tolerates tivoization only for "
@@ -244,12 +197,6 @@
 "organitzacions."
 
 # type: Content of: <p>
-#| msgid ""
-#| "Another threat that GPLv3 resists is that of patent deals like the Novell-"
-#| "Microsoft deal.  Microsoft wants to use its thousands of patents to make "
-#| "GNU/Linux users pay Microsoft for the privilege, and made this deal to "
-#| "try to get that.  The deal offers Novell's customers rather limited "
-#| "protection from Microsoft patents."
 msgid ""
 "Another threat that GPLv3 resists is that of patent deals like the Novell-"
 "Microsoft pact.  Microsoft wants to use its thousands of patents to make "
@@ -259,16 +206,12 @@
 msgstr ""
 "Una altra amenaça a què fa front la GPLv3 és la dels acords sobre patents "
 "com ara el pacte entre Novell i Microsoft. Microsoft vol utilitzar els seus "
-"milers de patents per fer que els usuaris paguin a Microsoft pel privilegi 
d'utilitzar GNU/Linux, i "
-"va fer aquest pacte per intentar aconseguir-ho. L'acord ofereix als clients "
-"de Novell una protecció molt limitada respecte a les patents de Microsoft."
+"milers de patents per fer que els usuaris paguin a Microsoft pel privilegi "
+"d'utilitzar GNU/Linux, i va fer aquest pacte per intentar aconseguir-ho. "
+"L'acord ofereix als clients de Novell una protecció molt limitada respecte a 
"
+"les patents de Microsoft."
 
 # type: Content of: <p>
-#| msgid ""
-#| "Microsoft made a few mistakes in the Novell-Microsoft deal, and GPLv3 is "
-#| "designed to turn them against Microsoft, extending that limited patent "
-#| "protection to the whole community.  In order to take advantage of this, "
-#| "programs need to use GPLv3."
 msgid ""
 "Microsoft made a few mistakes in the Novell-Microsoft deal, and GPLv3 is "
 "designed to turn them against Microsoft, extending that limited patent "
@@ -295,12 +238,6 @@
 "usuaris royalties per a Microsoft."
 
 # type: Content of: <p>
-#| msgid ""
-#| "GPLv3 also provides for explicit patent protection of the users from the "
-#| "program's contributors and redistributors.  With GPLv2, users rely on an "
-#| "implicit patent license to make sure that the company which provided them "
-#| "a copy won't sue them, or the people they redistribute copies to, for "
-#| "patent infringement."
 msgid ""
 "GPLv3 also provides users with explicit patent protection from the program's "
 "contributors and redistributors.  With GPLv2, users rely on an implicit "
@@ -315,18 +252,6 @@
 "infracció de patent, ni a ells ni a les persones a qui donessin còpies."
 
 # type: Content of: <p>
-#| msgid ""
-#| "The explicit patent license in GPLv3 does not go as far as we might have "
-#| "liked.  Ideally, we would make everyone who redistributes GPL-covered "
-#| "code surrender all software patents, along with everyone who does not "
-#| "redistribute GPL-covered code.  Software patents are a vicious and absurd "
-#| "system that puts all software developers in danger of being sued by "
-#| "companies they have never heard of, as well as by all the "
-#| "megacorporations in the field.  Large programs typically combine "
-#| "thousands of ideas, so it is no surprise if they implement ideas covered "
-#| "by hundreds of patents.  Megacorporations collect thousands of patents, "
-#| "and use those patents to bully smaller developers.  Patents already "
-#| "obstruct free software development."
 msgid ""
 "The explicit patent license in GPLv3 does not go as far as we might have "
 "liked.  Ideally, we would make everyone who redistributes GPL-covered code "
@@ -343,14 +268,15 @@
 "La llicència de patent explícita de la GPLv3 no va tan lluny com hauríem "
 "desitjat. Idealment, hauríem fet renunciar a tota patent de programari a "
 "tothom que distribuís codi sota la GPL, igual com ens agradaria fer-ho amb "
-"tothom que no distribueix codi sota la GPL, perquè no hauria d'haver-hi 
patents de programari. Les patents de programari són un "
-"sistema absurd i viciós en què els desenvolupadors de programes corren el "
-"risc de ser demandats per companyies o grans corporacions de què mai no "
-"havien sentit parlar. Els programes grans combinen habitualment milers "
-"d'idees, de manera que no és cap sorpresa que apliquin idees cobertes per "
-"centenars de patentes. Les grans corporacions posseeixen milers de patents, "
-"i les utilitzen per intimidar als petits desenvolupadors. Les patents ja "
-"estan obstaculitzant el desenvolupament de programari lliure."
+"tothom que no distribueix codi sota la GPL, perquè no hauria d'haver-hi "
+"patents de programari. Les patents de programari són un sistema absurd i "
+"viciós en què els desenvolupadors de programes corren el risc de ser "
+"demandats per companyies o grans corporacions de què mai no havien sentit "
+"parlar. Els programes grans combinen habitualment milers d'idees, de manera "
+"que no és cap sorpresa que apliquin idees cobertes per centenars de "
+"patentes. Les grans corporacions posseeixen milers de patents, i les "
+"utilitzen per intimidar als petits desenvolupadors. Les patents ja estan "
+"obstaculitzant el desenvolupament de programari lliure."
 
 # type: Content of: <p>
 msgid ""
@@ -372,14 +298,6 @@
 "hauríem fracassat."
 
 # type: Content of: <p>
-#| msgid ""
-#| "Therefore, GPLv3 seeks to limit and channel the danger.  In particular, "
-#| "we have tried to save free software from a fate worse than death: to be "
-#| "made effectively proprietary, through patents.  The explicit patent "
-#| "license of GPLv3 makes sure companies that use the GPL to give users the "
-#| "four freedoms cannot turn around and use their patents to tell some users "
-#| "&ldquo;That doesn't include you.&rdquo; It also stops them from colluding "
-#| "with other patent holders to do this."
 msgid ""
 "Therefore, GPLv3 seeks to limit and channel the danger.  In particular, we "
 "have tried to save free software from a fate worse than death: to be made "
@@ -394,8 +312,8 @@
 "la mort: esdevenir propietari per culpa de les patents. La llicència "
 "explícita de patent de la GPLv3 estableix que les companyies que utilitzen "
 "la GPL per donar als usuaris les quatre llibertats no poden tirar-se enrere "
-"i utilitzar les seves patents per dir a alguns usuaris \"això no va per 
tu\". "
-"També els impedeix aliar-se amb altres titulars de patents per fer-ho."
+"i utilitzar les seves patents per dir a alguns usuaris \"això no va per tu"
+"\". També els impedeix aliar-se amb altres titulars de patents per fer-ho."
 
 # type: Content of: <p>
 msgid ""
@@ -408,11 +326,6 @@
 "d'Apache. En resum, raons de sobres per actualitzar la llicència."
 
 # type: Content of: <p>
-#| msgid ""
-#| "Change is unlikely to cease once GPLv3 is released.  If new threats to "
-#| "users' freedom develop, we will have to develop GPL version 4.  It is "
-#| "important to make sure that programs will have no trouble upgrading to "
-#| "GPLv4 when the time comes."
 msgid ""
 "Change is unlikely to cease once GPLv3 is released.  If new threats to "
 "users' freedom develop, we will have to develop GPL version 4.  It is "
@@ -425,14 +338,6 @@
 "tindran problemes per migrar a la GPLv4 quan arribi el moment."
 
 # type: Content of: <p>
-#| msgid ""
-#| "One way to do this is to release a program under &ldquo;GPL version 3 or "
-#| "any later version&rdquo;.  Another way is for all the contributors to a "
-#| "program to state a proxy who can decide on upgrading to future GPL "
-#| "versions.  The third way is for all the contributors to assign copyright "
-#| "to one designated copyright holder, who will be in a position to upgrade "
-#| "the license version.  One way or another, programs should provide this "
-#| "flexibility for the future."
 msgid ""
 "One way to do this is to release a program under &ldquo;GPL version 3 or any "
 "later version&rdquo;.  Another way is for all the contributors to a program "
@@ -483,10 +388,6 @@
 "traducció al català del web de GNU."
 
 # type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 2007 Richard Stallman <br /> Verbatim copying and "
-#| "distribution of this entire article are permitted worldwide without "
-#| "royalty in any medium provided this notice is preserved."
 msgid ""
 "Copyright &copy; 2007, 2009 Richard Stallman <br /> Verbatim copying and "
 "distribution of this entire article are permitted worldwide without royalty "
@@ -511,4 +412,3 @@
 # type: Content of: <div><h4>
 msgid "Translations of this page"
 msgstr "Traduccions d'aquesta pàgina"
-

Index: licenses/po/translations.ca.po
===================================================================
RCS file: /web/www/www/licenses/po/translations.ca.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- licenses/po/translations.ca.po      19 Aug 2010 09:52:06 -0000      1.34
+++ licenses/po/translations.ca.po      19 Aug 2010 16:27:07 -0000      1.35
@@ -13,7 +13,7 @@
 "Language-Team: Catalan <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 msgid "Unofficial Translations - GNU Project - Free Software Foundation (FSF)"
@@ -167,14 +167,12 @@
 "openaccess/gnuv3-tc.html\"> Traducció al xinés (tradicional)</a> de la GPL"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[sk]</code> <a href=\"http://www.gpl.sk/\";> Slovak</a> translation "
-#| "of the GPL"
 msgid ""
 "<code>[cs]</code> <a href=\"http://www.gnugpl.cz/\";>Czech</a> translation of "
 "the GPL"
 msgstr ""
-"<code>[cs]</code> <a href=\"http://www.gnugpl.cz/\";>Traducció al Txec</a> de 
la GPL"
+"<code>[cs]</code> <a href=\"http://www.gnugpl.cz/\";>Traducció al Txec</a> de 
"
+"la GPL"
 
 # type: Content of: <ul><li>
 msgid ""
@@ -185,9 +183,6 @@
 "gpl-v3-nl-101.pdf\">Traducció a l'holandès</a> de la GPL (PDF)"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[es]</code> <a href=\"http://www.viti.es/gnu/licenses/gpl.html";
-#| "\">Spanish</a> translation of the GPL"
 msgid ""
 "<code>[eo]</code> <a href=\"http://zooplah.farvista.net/eo/programado/gpl3.";
 "html\">Esperanto</a> translation of the GPL"
@@ -428,9 +423,6 @@
 "l'hongarès</a> de la LGPL"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[fi]</code> <a href=\"http://www.turre.com/licenses/gpl_fi.html\";> "
-#| "Finnish</a> translation of the GPL"
 msgid ""
 "<code>[it]</code> <a href=\"http://www.posterburner.com/";
 "IT_GNU_LESSER_GENERAL_PUBLIC_LICEN.htm\"> Italian</a> translation of the LGPL"
@@ -447,9 +439,6 @@
 "al japonès</a> de la LGPL"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[mt]</code> <a href=\"http://www.dexsun.com/gnu/mt/v3/lgpl.html\";> "
-#| "Maltese</a> translation of the LGPL"
 msgid ""
 "<code>[mt]</code> <a href=\"http://www.dexxed.com/gnu/mt/v3/lgpl.html\";> "
 "Maltese</a> translation of the LGPL"
@@ -548,19 +537,14 @@
 "fdl/1.3/fdl.it.txt\">versió en text pla</a>)"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[ro]</code> <a href=\"http://ro.wikipedia.org/wiki/GNU_FDL";
-#| "\">Romanian</a> translation of the GFDL"
 msgid ""
 "<code>[ml]</code> <a href=\"http://ml.wikipedia.org/wiki/WP:GFDL-ml\";> "
 "Malayalam</a> translation of the GFDL"
 msgstr ""
-"<code>[ml]</code> <a href=\"http://ml.wikipedia.org/wiki/WP:GFDL-ml\";> 
Traducció al malaiàlam</a> de la GFDL"
+"<code>[ml]</code> <a href=\"http://ml.wikipedia.org/wiki/WP:GFDL-ml\";> "
+"Traducció al malaiàlam</a> de la GFDL"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[es]</code> <a href=\"http://stuff.danexnow.org/gfdl_es.html\";> "
-#| "Spanish</a> translation of the GFDL"
 msgid ""
 "<code>[es]</code> <a href=\"http://docs.danexlandia.com.mx/gfdl_es.html\";> "
 "Spanish</a> translation of the GFDL"
@@ -625,9 +609,6 @@
 "traducció al català del web de GNU."
 
 # type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2008, 2009 "
-#| "Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2008, 2009, 2010 "
 "Free Software Foundation, Inc."

Index: philosophy/microsoft-old.ca.html
===================================================================
RCS file: /web/www/www/philosophy/microsoft-old.ca.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/microsoft-old.ca.html    26 Oct 2009 08:26:46 -0000      1.2
+++ philosophy/microsoft-old.ca.html    19 Aug 2010 16:27:10 -0000      1.3
@@ -8,8 +8,8 @@
 <h2>És Microsoft el Papu?</h2>
 
 <div class="announcement">
-<blockquote><p>There is an <a href="/philosophy/microsoft.html"> updated 
version</a> of
-this article.</p></blockquote>
+<blockquote><p>Hi ha una <a href="/philosophy/microsoft.ca.html">versió 
actualitzada</a>
+d'aquest article.</p></blockquote>
 </div>
 
 <p>Molta gent s'imagina a Microsoft com un monstre amenaçador de la indústria
@@ -68,11 +68,12 @@
 <!--#include virtual="/server/footer.ca.html" -->
 <div id="footer">
 
-<p>Please send FSF &amp; GNU inquiries to <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also <a
-href="/contact/">other ways to contact</a> the FSF.  <br /> Please send
-broken links and other corrections or suggestions to <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+<p>Envieu les vostres preguntes sobre la FSF i GNU a <a
+href="mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
+href="/contact/contact.ca.html">altres formes de contactar</a> amb la
+FSF. <br />Envieu els enllaços trencats i d'altres correccions o
+suggeriments a <a
+href="mailto:address@hidden";><em>address@hidden</em></a>.
 </p>
 
 <p>
@@ -99,7 +100,7 @@
 <!-- timestamp start -->
 Updated:
 
-$Date: 2009/10/26 08:26:46 $
+$Date: 2010/08/19 16:27:10 $
 
 <!-- timestamp end -->
 </p>
@@ -151,7 +152,7 @@
 <li><a 
href="/philosophy/microsoft-old.ml.html">&#3374;&#3378;&#3375;&#3390;&#3379;&#3330;</a>&nbsp;[ml]</li>
 <!-- Dutch -->
 <li><a href="/philosophy/microsoft-old.nl.html">Nederlands</a>&nbsp;[nl]</li>
-<!-- Polski -->
+<!-- Polish -->
 <li><a href="/philosophy/microsoft-old.pl.html">polski</a>&nbsp;[pl]</li>
 <!-- Russian -->
 <li><a 
href="/philosophy/microsoft-old.ru.html">&#1088;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;</a>&nbsp;[ru]</li>

Index: philosophy/microsoft.ca.html
===================================================================
RCS file: /web/www/www/philosophy/microsoft.ca.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/microsoft.ca.html        4 May 2010 08:25:51 -0000       1.10
+++ philosophy/microsoft.ca.html        19 Aug 2010 16:27:10 -0000      1.11
@@ -8,89 +8,95 @@
 <h2>És Microsoft el Papu?</h2>
 
 <div class="announcement">
-<blockquote><p>This article was given a major rewrite in 2009.  The <a
-href="/philosophy/microsoft-old.html">old version</a> is also 
available.</p></blockquote>
+<blockquote><p>Aquest article es va reescriure el 2009.  La <a
+href="/philosophy/microsoft-old.html">versió anterior</a> també està
+disponible.</p></blockquote>
 </div>
 
-<p>Many people think of Microsoft as the monster menace of the software
-industry.  There is even a specific campaign to boycott Microsoft.  This
-feeling has intensified since Microsoft expressed active hostility towards
-free software.</p>
-
-<p>In the free software movement, our perspective is different.  We see that
-Microsoft is doing something that mistreats software users: making software
-<a href="/philosophy/categories.html#ProprietarySoftware"> proprietary</a>
-and thus denying users their rightful freedom.  But Microsoft is not alone
-in this; many other companies do the same thing to the users.  If other
-companies manage to dominate fewer users than Microsoft, that is not for
-lack of trying.</p>
-
-<p>This is not meant to excuse Microsoft.  Rather, it is meant as a reminder
-that Microsoft is the natural development of a software industry based on <a
-href="/philosophy/shouldbefree.html">keeping users divided and subjugating
-them</a>.  When criticizing Microsoft, we should not focus so narrowly on
-Microsoft that we let other proprietary software developers off the hook.</p>
-
-<p>When we reject Microsoft's proprietary software, that is not a boycott.  The
-word &ldquo;boycott&rdquo; means rejection, as a protest, of products that
-are otherwise acceptable.  Rejecting a product because it hurts you is not a
-boycott, just ordinary rationality.  To maintain your freedom, you need to
-reject <em>all</em> proprietary software, regardless of who developed it or
-who distributes it.</p>
-
-<p>There is no need to reject Microsoft non-software products, or services that
-you can use without proprietary software.  (When you use a web service,
-whether Microsoft's or not, watch out for <a
-href="/philosophy/javascript-trap.html">non-free JavaScript programs</a>
-that it may try to slip into your browser.)  When Microsoft releases free
-programs, which it occasionally does, they are acceptable in theory; but
-most of them depend fundamentally on Microsoft proprietary software, which
-we do need to reject, and that makes them useless for anyone that chooses to
-live in freedom.</p>
-
-<p>In the &ldquo;Halloween documents&rdquo;, leaked in October 1998, Microsoft
-executives stated an intention to use various methods to obstruct the
-development of free software: specifically, designing secret protocols and
-file formats, and patenting algorithms and software features.</p>
-
-<p>These obstructionist policies were not new: Microsoft, and many other
-software companies, had been doing them for years now.  Secrecy and patents
-have obstructed us greatly, and they may be more damaging in the future.
-For the most part, the companies' main motivation in doing these things is
-to attack each other; now, it seems, we are specifically targeted.
-Microsoft is using its patents directly to <a
-href="http://press.redhat.com/2009/09/09/microsoft-and-patent-trolls/";>
-attack the free software community</a>, and our community is fighting back.</p>
-
-<p>But Microsoft's patents are not the only patents that threaten us (and
-software developers and users generally)&mdash;consider the harm that the
-MP3 patent has done.  Thus, defending against specific attacks is necessary
-but not sufficient.  The only full solution is to <a
-href="http://endsoftpatents.org/";>eliminate software patents</a>.
+<p>Molta gent s'imagina a Microsoft com un monstre amenaçador de la indústria
+de programari. Hi ha fins i tot una campanya per boicotejar
+Microsoft. Aquesta percepció s'ha fet més intensa a mesura que la mateixa
+Microsoft ha donat mostres d'hostilitat envers el programari lliure.</p>
+
+<p>A la comunitat de programari lliure tenim una perspectiva diferent. Tenim
+clar que Microsoft fa quelcom dolent per als usuaris de programari: fer-lo
+<a href="/philosophy/categories.ca.html#ProprietarySoftware">propietari</a>
+i negar per tant als usuaris les seves llibertats. Però Microsoft no és
+l'única companyia que ho fa; moltes altres fan els mateix als usuaris. Si
+altres companyies no dominen tants usuaris com Microsoft, no és pas per
+falta de ganes.</p>
+
+<p>Això no vol dir que justifiquem a Microsoft. Més aviat és un recordatori 
que
+Microsoft és el resultat natural d'una indústria de programari basada en <a
+href="/philosophy/shouldbefree.ca.html">dividir i subjugar als
+usuaris</a>. Quan critiquem a Microsoft, no hauríem de centrar-nos-hi fins
+al punt d'oblidar-nos dels altres desenvolupadors de programari propietari.</p>
+
+<p>Quan rebutgem el programari privatiu de Microsoft, no estem fent-li
+boicot. La paraula "boicot" significa rebutjar, com a forma de protesta,
+productes que són acceptables. Rebutjar un producte perquè et perjudica no
+és boicot, és racionalitat normal i corrent. Per mantenir la vostra
+llibertat, necessiteu rebutjar <em>tot</em> el programari privatiu, sense
+importar qui el desenvolupa o el distribueix.</p>
+
+<p>No hi cap necessitat de rebutjar els productes de Microsoft que no són
+programari, o els serveis que pugueu utilitzar sense programari
+privatiu. (Quan utilitzeu un servei web, sigui de Microsoft o no, aneu amb
+compte amb els <a href="/philosophy/javascript-trap.html">programes de
+JavaScript no lliures</a> que poden introduir-se al vostre navegador.) Els
+programes lliures que Microsoft publica ocasionalment són en teoria
+acceptables, però la major part depenen fonamentalment del programari
+privatiu de Microsoft, que hem de rebutjar; això els fa inútils pels qui
+hagin triat viure en llibertat.</p>
+
+<p>Als "documents Halloween", apareguts a l'octubre de 1998, els directius de
+Microsoft van apuntar la intenció d'utilitzar diversos mètodes d'obstruir el
+desenvolupament del programari lliure: concretament, dissenyar protocols i
+sistemes de fitxers secrets i patentar algoritmes i característiques del
+programari.</p>
+
+<p>Aquestes polítiques obstruccionistes no eren noves: Microsoft i moltes
+altres companyies de programari les havien estat practicant durant anys. El
+secretisme i les patents ens han obstaculitzat molt i poden ser més
+perjudicials en el futur. Generalment, la principal motivació de les
+companyies per fer aquestes coses és atacar-se entre elles; ara sembla que
+nosaltres estem en el punt de mira. Microsoft està utilitzant les seves
+patents directament per <a
+href="http://press.redhat.com/2009/09/09/microsoft-and-patent-trolls/";>atacar
+la comunitat del programari lliure</a>, i la nostra comunitat s'està
+defensant.</p>
+
+<p>Però les patents de Microsoft no són les úniques que ens amenacen (a
+nosaltres, als desenvolupadors de programari i als usuaris en
+general). Considereu el mal que ha fet la patent de MP3. De manera que
+defensar-se d'atacs concrets és necessari, però no suficient. L'única
+solució definitiva és <a href="http://endsoftpatents.org/";>eliminar les
+patents de programari</a>.
 </p>
 
-<p>Other Microsoft practices specifically harmful to the adoption of free
-software are the ones designed to build up social inertia that obstructs
-migration to GNU/Linux.  For instance, when Microsoft &ldquo;donates&rdquo;
-copies of Windows to schools, it converts these schools into tools for
-implanting a dependence on Windows.  There are indications that Microsoft
-systematically plans these activities <a
-href="http://boycottnovell.com/wiki/index.php/EDGI";> as a campaign against
-the adoption of GNU/Linux</a>.</p>
-
-<p>Each Windows &ldquo;upgrade&rdquo; augments Microsoft's power over the
-users; Microsoft plans it that way.  And each one is a step forward in
-malicious features, which include <a
-href="http://DefectiveByDesign.org";>Digital Restrictions Management</a> and
-back doors.  So the FSF runs campaigns to warn users against
-&ldquo;upgrading&rdquo; to <a href="http://BadVista.org/";>Windows Vista</a>
-and <a href="http://Windows7Sins.org";>Windows 7</a>.  We aim to reduce the
-amount of inertia they will create.</p>
-
-<p>We don't hate Microsoft, and we don't consider it the Great Satan.  But we
-do recognize it as the company that has separated more users from their
-freedom than any other, and a powerful avowed enemy of computer users'
-freedom.  We act accordingly.</p>
+<p>Altres pràctiques de Microsoft especialment perjudicials per l'adopció de
+programari lliure són les dissenyades per a construir una inèrcia social que
+obstaculitzi la migració a GNU/Linux. Per exemple, quan Microsoft "fa una
+donació" de còpies de Windows a les escoles, converteix aquestes escoles en
+instruments per implantar una dependència de Windows. Hi ha evidències que
+Microsoft planeja sistemàticament aquestes accions <a
+href="http://boycottnovell.com/wiki/index.php/EDGI";> com a campanya contra
+l'adopció de GNU/Linux</a>.</p>
+
+<p>Cada "actualització" de Windows augmenta el poder de Microsoft sobre els
+usuaris; Microsoft ho ha planejat així. I cada actualització és un pas
+endavant cap a funcionalitats pèrfides, que inclouen la <a
+href="http://DefectiveByDesign.org";>Gestió de Restriccions Digitals
+(DRM)</a> i portes pel darrere. Per això la FSF promou campanyes per
+prevenir als usuaris contra les "actualitzacions" de <a
+href="http://BadVista.org/";>Windows Vista</a> i <a
+href="http://Windows7Sins.org";>Windows 7</a>. Aspirem a reduir la inèrcia
+que crearan.</p>
+
+<p>No odiem Microsoft, i no el considerem el Papu. Però la identifiquem com la
+companyia que ha apartat més usuaris de la seva llibertat, i com a un
+poderós enemic declarat de la llibertat dels usuaris d'ordinadors. I actuem
+en conseqüència.</p>
 
 <div style="font-size: small;">
 
@@ -101,11 +107,12 @@
 <!--#include virtual="/server/footer.ca.html" -->
 <div id="footer">
 
-<p>Please send FSF &amp; GNU inquiries to <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also <a
-href="/contact/">other ways to contact</a> the FSF.  <br /> Please send
-broken links and other corrections or suggestions to <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
+<p>Envieu les vostres preguntes sobre la FSF i GNU a <a
+href="mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
+href="/contact/contact.ca.html">altres formes de contactar</a> amb la
+FSF. <br />Envieu els enllaços trencats i d'altres correccions o
+suggeriments a <a
+href="mailto:address@hidden";><em>address@hidden</em></a>.
 </p>
 
 <p>
@@ -117,8 +124,8 @@
 </p>
 
 <p>
-Copyright &copy; 1997, 1998, 1999, 2000, 2007, 2008, 2009 Free Software
-Foundation, Inc.</p>
+Copyright &copy; 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010 Free
+Software Foundation, Inc.</p>
 <p>Es permet realitzar i distribuir còpies literals d'aquest article en
 qualsevol medi sense pagament de drets, sempre que es conservi aquesta nota.
 </p>
@@ -132,7 +139,7 @@
 <!-- timestamp start -->
 Updated:
 
-$Date: 2010/05/04 08:25:51 $
+$Date: 2010/08/19 16:27:10 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/microsoft-old.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft-old.ca.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/microsoft-old.ca.po   19 Aug 2010 14:34:32 -0000      1.3
+++ philosophy/po/microsoft-old.ca.po   19 Aug 2010 16:27:12 -0000      1.4
@@ -13,7 +13,7 @@
 "Language-Team: Catalan <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 msgid ""
@@ -29,7 +29,8 @@
 "There is an <a href=\"/philosophy/microsoft.html\"> updated version</a> of "
 "this article."
 msgstr ""
-"Hi ha una <a href=\"/philosophy/microsoft.ca.html\">versió actualitzada</a> 
d'aquest article."
+"Hi ha una <a href=\"/philosophy/microsoft.ca.html\">versió actualitzada</a> "
+"d'aquest article."
 
 # type: Content of: <p>
 msgid ""
@@ -139,12 +140,6 @@
 msgstr " "
 
 # type: Content of: <div><p>
-#| 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 "
-#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";
-#| "\"><em>address@hidden</em></a>."
 msgid ""
 "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
 "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
@@ -171,9 +166,6 @@
 "traducció al català del web de GNU."
 
 # type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1997, 1998, 1999, 2000, 2007, 2008 Free Software "
-#| "Foundation, Inc.,"
 msgid ""
 "Copyright &copy; 1997, 1998, 1999, 2000, 2007, 2008, 2009 Free Software "
 "Foundation, Inc."

Index: philosophy/po/microsoft.ca.po
===================================================================
RCS file: /web/www/www/philosophy/po/microsoft.ca.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/po/microsoft.ca.po       19 Aug 2010 14:34:31 -0000      1.9
+++ philosophy/po/microsoft.ca.po       19 Aug 2010 16:27:13 -0000      1.10
@@ -13,7 +13,7 @@
 "Language-Team: Catalan <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 msgid ""
@@ -29,15 +29,10 @@
 "This article was given a major rewrite in 2009.  The <a href=\"/philosophy/"
 "microsoft-old.html\">old version</a> is also available."
 msgstr ""
-"Aquest article es va reescriure el 2009.  La <a href=\"/philosophy/"
-"microsoft-old.html\">versió anterior</a> també està disponible."
+"Aquest article es va reescriure el 2009.  La <a href=\"/philosophy/microsoft-"
+"old.html\">versió anterior</a> també està disponible."
 
 # type: Content of: <p>
-#| msgid ""
-#| "Many people think of Microsoft as the monster menace of the software "
-#| "industry. There is even a campaign to boycott Microsoft. This feeling has "
-#| "intensified since Microsoft expressed active hostility towards free "
-#| "software."
 msgid ""
 "Many people think of Microsoft as the monster menace of the software "
 "industry.  There is even a specific campaign to boycott Microsoft.  This "
@@ -50,11 +45,6 @@
 "donat mostres d'hostilitat envers el programari lliure."
 
 # type: Content of: <p>
-#| msgid ""
-#| "In the free software movement, our perspective is different. We see that "
-#| "Microsoft is doing something that is bad for software users: making "
-#| "software <a href=\"/philosophy/categories.html#ProprietarySoftware\"> "
-#| "proprietary</a> and thus denying users their rightful freedom."
 msgid ""
 "In the free software movement, our perspective is different.  We see that "
 "Microsoft is doing something that mistreats software users: making software "
@@ -67,16 +57,12 @@
 "A la comunitat de programari lliure tenim una perspectiva diferent. Tenim "
 "clar que Microsoft fa quelcom dolent per als usuaris de programari: fer-lo "
 "<a href=\"/philosophy/categories.ca.html#ProprietarySoftware\">propietari</"
-"a> i negar per tant als usuaris les seves llibertats. Però Microsoft no és 
l'única companyia que ho fa; moltes altres fan els mateix als usuaris. Si 
altres companyies no dominen tants usuaris com Microsoft, no és pas per falta 
de ganes."
+"a> i negar per tant als usuaris les seves llibertats. Però Microsoft no és "
+"l'única companyia que ho fa; moltes altres fan els mateix als usuaris. Si "
+"altres companyies no dominen tants usuaris com Microsoft, no és pas per "
+"falta de ganes."
 
 # type: Content of: <p>
-#| msgid ""
-#| "This is not meant to excuse Microsoft. Rather, it is meant as a reminder "
-#| "that Microsoft is the natural development of a software industry based on "
-#| "<a href=\"/philosophy/shouldbefree.html\">dividing users and taking away "
-#| "their freedom</a>. When criticizing Microsoft, we must not exonerate the "
-#| "other companies that also make proprietary software. At the FSF, we don't "
-#| "run any proprietary software&mdash;not from Microsoft or anyone else."
 msgid ""
 "This is not meant to excuse Microsoft.  Rather, it is meant as a reminder "
 "that Microsoft is the natural development of a software industry based on <a "
@@ -84,10 +70,11 @@
 "them</a>.  When criticizing Microsoft, we should not focus so narrowly on "
 "Microsoft that we let other proprietary software developers off the hook."
 msgstr ""
-"Això no vol dir que justifiquem a Microsoft. Més aviat és "
-"un recordatori que Microsoft és el resultat natural d'una indústria de "
-"programari basada en <a href=\"/philosophy/shouldbefree.ca.html\">dividir i 
subjugar als "
-"usuaris</a>. Quan critiquem a Microsoft, no hauríem de centrar-nos-hi fins 
al punt d'oblidar-nos dels altres desenvolupadors de programari propietari."
+"Això no vol dir que justifiquem a Microsoft. Més aviat és un recordatori 
que "
+"Microsoft és el resultat natural d'una indústria de programari basada en <a 
"
+"href=\"/philosophy/shouldbefree.ca.html\">dividir i subjugar als usuaris</"
+"a>. Quan critiquem a Microsoft, no hauríem de centrar-nos-hi fins al punt "
+"d'oblidar-nos dels altres desenvolupadors de programari propietari."
 
 # type: Content of: <p>
 msgid ""
@@ -97,7 +84,13 @@
 "boycott, just ordinary rationality.  To maintain your freedom, you need to "
 "reject <em>all</em> proprietary software, regardless of who developed it or "
 "who distributes it."
-msgstr "Quan rebutgem el programari privatiu de Microsoft, no estem fent-li 
boicot. La paraula \"boicot\" significa rebutjar, com a forma de protesta, 
productes que són acceptables. Rebutjar un producte perquè et perjudica no 
és boicot, és racionalitat normal i corrent. Per mantenir la vostra 
llibertat, necessiteu rebutjar <em>tot</em> el programari privatiu, sense 
importar qui el desenvolupa o el distribueix."
+msgstr ""
+"Quan rebutgem el programari privatiu de Microsoft, no estem fent-li boicot. "
+"La paraula \"boicot\" significa rebutjar, com a forma de protesta, productes "
+"que són acceptables. Rebutjar un producte perquè et perjudica no és 
boicot, "
+"és racionalitat normal i corrent. Per mantenir la vostra llibertat, "
+"necessiteu rebutjar <em>tot</em> el programari privatiu, sense importar qui "
+"el desenvolupa o el distribueix."
 
 # type: Content of: <p>
 msgid ""
@@ -109,24 +102,27 @@
 "does, they are acceptable in theory; but most of them depend fundamentally "
 "on Microsoft proprietary software, which we do need to reject, and that "
 "makes them useless for anyone that chooses to live in freedom."
-msgstr "No hi cap necessitat de rebutjar els productes de Microsoft que no 
són programari, o els serveis que pugueu utilitzar sense programari privatiu. 
(Quan utilitzeu un servei web, sigui de Microsoft o no, aneu amb compte amb els 
<a href=\"/philosophy/javascript-trap.html\">programes de JavaScript no 
lliures</a> que poden introduir-se al vostre navegador.) Els programes lliures 
que Microsoft publica ocasionalment són en teoria acceptables, però la major 
part depenen fonamentalment del programari privatiu de Microsoft, que hem de 
rebutjar; això els fa inútils pels qui hagin triat viure en llibertat."
+msgstr ""
+"No hi cap necessitat de rebutjar els productes de Microsoft que no són "
+"programari, o els serveis que pugueu utilitzar sense programari privatiu. "
+"(Quan utilitzeu un servei web, sigui de Microsoft o no, aneu amb compte amb "
+"els <a href=\"/philosophy/javascript-trap.html\">programes de JavaScript no "
+"lliures</a> que poden introduir-se al vostre navegador.) Els programes "
+"lliures que Microsoft publica ocasionalment són en teoria acceptables, però 
"
+"la major part depenen fonamentalment del programari privatiu de Microsoft, "
+"que hem de rebutjar; això els fa inútils pels qui hagin triat viure en "
+"llibertat."
 
 # type: Content of: <p>
-#| msgid ""
-#| "In the &ldquo;Halloween documents&rdquo;, released at the end of October "
-#| "1998, Microsoft executives stated an intention to use various methods to "
-#| "obstruct the development of free software: specifically, designing secret "
-#| "protocols and file formats, and patenting algorithms and software "
-#| "features."
 msgid ""
 "In the &ldquo;Halloween documents&rdquo;, leaked in October 1998, Microsoft "
 "executives stated an intention to use various methods to obstruct the "
 "development of free software: specifically, designing secret protocols and "
 "file formats, and patenting algorithms and software features."
 msgstr ""
-"Als \"documents Halloween\", apareguts a l'octubre de 1998, els "
-"directius de Microsoft van apuntar la intenció d'utilitzar diversos mètodes 
"
-"d'obstruir el desenvolupament del programari lliure: concretament, dissenyar 
protocols i "
+"Als \"documents Halloween\", apareguts a l'octubre de 1998, els directius de "
+"Microsoft van apuntar la intenció d'utilitzar diversos mètodes d'obstruir 
el "
+"desenvolupament del programari lliure: concretament, dissenyar protocols i "
 "sistemes de fitxers secrets i patentar algoritmes i característiques del "
 "programari."
 
@@ -140,7 +136,16 @@
 "its patents directly to <a href=\"http://press.redhat.com/2009/09/09/";
 "microsoft-and-patent-trolls/\"> attack the free software community</a>, and "
 "our community is fighting back."
-msgstr "Aquestes polítiques obstruccionistes no eren noves: Microsoft i 
moltes altres companyies de programari les havien estat practicant durant anys. 
El secretisme i les patents ens han obstaculitzat molt i poden ser més 
perjudicials en el futur. Generalment, la principal motivació de les 
companyies per fer aquestes coses és atacar-se entre elles; ara sembla que 
nosaltres estem en el punt de mira. Microsoft està utilitzant les seves 
patents directament per <a 
href=\"http://press.redhat.com/2009/09/09/microsoft-and-patent-trolls/\";>atacar 
la comunitat del programari lliure</a>, i la nostra comunitat s'està 
defensant."
+msgstr ""
+"Aquestes polítiques obstruccionistes no eren noves: Microsoft i moltes "
+"altres companyies de programari les havien estat practicant durant anys. El "
+"secretisme i les patents ens han obstaculitzat molt i poden ser més "
+"perjudicials en el futur. Generalment, la principal motivació de les "
+"companyies per fer aquestes coses és atacar-se entre elles; ara sembla que "
+"nosaltres estem en el punt de mira. Microsoft està utilitzant les seves "
+"patents directament per <a href=\"http://press.redhat.com/2009/09/09/";
+"microsoft-and-patent-trolls/\">atacar la comunitat del programari lliure</"
+"a>, i la nostra comunitat s'està defensant."
 
 # type: Content of: <p>
 msgid ""
@@ -149,7 +154,13 @@
 "MP3 patent has done.  Thus, defending against specific attacks is necessary "
 "but not sufficient.  The only full solution is to <a href=\"http://";
 "endsoftpatents.org/\">eliminate software patents</a>."
-msgstr "Però les patents de Microsoft no són les úniques que ens amenacen 
(a nosaltres, als desenvolupadors de programari i als usuaris en general). 
Considereu el mal que ha fet la patent de MP3. De manera que defensar-se 
d'atacs concrets és necessari, però no suficient. L'única solució 
definitiva és <a href=\"http://endsoftpatents.org/\";>eliminar les patents de 
programari</a>."
+msgstr ""
+"Però les patents de Microsoft no són les úniques que ens amenacen (a "
+"nosaltres, als desenvolupadors de programari i als usuaris en general). "
+"Considereu el mal que ha fet la patent de MP3. De manera que defensar-se "
+"d'atacs concrets és necessari, però no suficient. L'única solució 
definitiva "
+"és <a href=\"http://endsoftpatents.org/\";>eliminar les patents de "
+"programari</a>."
 
 # type: Content of: <p>
 msgid ""
@@ -160,7 +171,15 @@
 "implanting a dependence on Windows.  There are indications that Microsoft "
 "systematically plans these activities <a href=\"http://boycottnovell.com/";
 "wiki/index.php/EDGI\"> as a campaign against the adoption of GNU/Linux</a>."
-msgstr "Altres pràctiques de Microsoft especialment perjudicials per 
l'adopció de programari lliure són les dissenyades per a construir una 
inèrcia social que obstaculitzi la migració a GNU/Linux. Per exemple, quan 
Microsoft \"fa una donació\" de còpies de Windows a les escoles, converteix 
aquestes escoles en instruments per implantar una dependència de Windows. Hi 
ha evidències que Microsoft planeja sistemàticament aquestes accions <a 
href=\"http://boycottnovell.com/wiki/index.php/EDGI\";> com a campanya contra 
l'adopció de GNU/Linux</a>."
+msgstr ""
+"Altres pràctiques de Microsoft especialment perjudicials per l'adopció de "
+"programari lliure són les dissenyades per a construir una inèrcia social 
que "
+"obstaculitzi la migració a GNU/Linux. Per exemple, quan Microsoft \"fa una "
+"donació\" de còpies de Windows a les escoles, converteix aquestes escoles 
en "
+"instruments per implantar una dependència de Windows. Hi ha evidències que "
+"Microsoft planeja sistemàticament aquestes accions <a href=\"http://";
+"boycottnovell.com/wiki/index.php/EDGI\"> com a campanya contra l'adopció de "
+"GNU/Linux</a>."
 
 # type: Content of: <p>
 msgid ""
@@ -172,7 +191,14 @@
 "BadVista.org/\">Windows Vista</a> and <a href=\"http://Windows7Sins.org";
 "\">Windows 7</a>.  We aim to reduce the amount of inertia they will create."
 msgstr ""
-"Cada \"actualització\" de Windows augmenta el poder de Microsoft sobre els 
usuaris; Microsoft ho ha planejat així. I cada actualització és un pas 
endavant cap a funcionalitats pèrfides, que inclouen la <a 
href=\"http://DefectiveByDesign.org\";>Gestió de Restriccions Digitals 
(DRM)</a> i portes pel darrere. Per això la FSF promou campanyes per prevenir 
als usuaris contra les \"actualitzacions\" de <a 
href=\"http://BadVista.org/\";>Windows Vista</a> i <a 
href=\"http://Windows7Sins.org\";>Windows 7</a>. Aspirem a reduir la inèrcia 
que crearan."
+"Cada \"actualització\" de Windows augmenta el poder de Microsoft sobre els "
+"usuaris; Microsoft ho ha planejat així. I cada actualització és un pas "
+"endavant cap a funcionalitats pèrfides, que inclouen la <a href=\"http://";
+"DefectiveByDesign.org\">Gestió de Restriccions Digitals (DRM)</a> i portes "
+"pel darrere. Per això la FSF promou campanyes per prevenir als usuaris "
+"contra les \"actualitzacions\" de <a href=\"http://BadVista.org/\";>Windows "
+"Vista</a> i <a href=\"http://Windows7Sins.org\";>Windows 7</a>. Aspirem a "
+"reduir la inèrcia que crearan."
 
 # type: Content of: <p>
 msgid ""
@@ -180,7 +206,11 @@
 "do recognize it as the company that has separated more users from their "
 "freedom than any other, and a powerful avowed enemy of computer users' "
 "freedom.  We act accordingly."
-msgstr "No odiem Microsoft, i no el considerem el Papu. Però la identifiquem 
com la companyia que ha apartat més usuaris de la seva llibertat, i com a un 
poderós enemic declarat de la llibertat dels usuaris d'ordinadors. I actuem en 
conseqüència."
+msgstr ""
+"No odiem Microsoft, i no el considerem el Papu. Però la identifiquem com la "
+"companyia que ha apartat més usuaris de la seva llibertat, i com a un "
+"poderós enemic declarat de la llibertat dels usuaris d'ordinadors. I actuem "
+"en conseqüència."
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -188,12 +218,6 @@
 msgstr " "
 
 # type: Content of: <div><p>
-#| 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 "
-#| "ways to contact</a> the FSF.  <br /> Please send broken links and other "
-#| "corrections or suggestions to <a href=\"mailto:address@hidden";
-#| "\"><em>address@hidden</em></a>."
 msgid ""
 "Please send FSF &amp; GNU inquiries to <a href=\"mailto:address@hidden";>&lt;"
 "address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other ways to "
@@ -220,9 +244,6 @@
 "traducció al català del web de GNU."
 
 # type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1997, 1998, 1999, 2000, 2007, 2008 Free Software "
-#| "Foundation, Inc.,"
 msgid ""
 "Copyright &copy; 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010 Free "
 "Software Foundation, Inc."

Index: server/standards/po/README.translations.ca.po
===================================================================
RCS file: /web/www/www/server/standards/po/README.translations.ca.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/standards/po/README.translations.ca.po       19 Aug 2010 09:43:32 
-0000      1.14
+++ server/standards/po/README.translations.ca.po       19 Aug 2010 16:27:15 
-0000      1.15
@@ -13,7 +13,7 @@
 "Language-Team: Catalan <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 # type: Content of: <title>
 msgid ""
@@ -32,7 +32,8 @@
 "Most important: <span class=\"highlight\"><em>Do NOT translate the raw HTML "
 "source</em>.</span>"
 msgstr ""
-"El més important: <span class=\"highlight\"><em>NO traduïu el codi 
HTML</em>.</span>"
+"El més important: <span class=\"highlight\"><em>NO traduïu el codi 
HTML</em>."
+"</span>"
 
 # type: Content of: <div><blockquote><p>
 msgid ""
@@ -46,7 +47,8 @@
 "contacteu si us plau amb l'equip de traducció corresponent, que trobareu <a "
 "href=\"#TranslationsUnderway\">més avall</a>. Si no hi ha cap equip "
 "establert per al vostre idioma, escriviu si us plau a <a href=\"mailto:web-";
-"address@hidden">&lt;address@hidden&gt;</a>, després de llegir els <a 
href=\"/software/trans-coord/manual/\">manuals</a>."
+"address@hidden">&lt;address@hidden&gt;</a>, després de llegir "
+"els <a href=\"/software/trans-coord/manual/\">manuals</a>."
 
 # type: Content of: <a>
 msgid "<a href=\"/graphics/atypinggnu.html\">"
@@ -113,7 +115,11 @@
 "two-letter language code is not assigned, 3-letter (ISO 639-2) can be used.  "
 "Later versions of RFC 1766 and ISO 639 may exist."
 msgstr ""
-"La norma <a 
href=\"http://www.loc.gov/standards/iso639-2/php/code_list.php\";>ISO 639</a> 
proporciona un codi d'idioma de dues lletres a la segona columna. Si a un 
idioma no se li ha assignat un codi de dues lletres, es pot utilitzar un codi 
de tres lletres (ISO 639-2). Pot haver-hi versions posteriors de RFC 1766 i ISO 
639."
+"La norma <a href=\"http://www.loc.gov/standards/iso639-2/php/code_list.php";
+"\">ISO 639</a> proporciona un codi d'idioma de dues lletres a la segona "
+"columna. Si a un idioma no se li ha assignat un codi de dues lletres, es pot "
+"utilitzar un codi de tres lletres (ISO 639-2). Pot haver-hi versions "
+"posteriors de RFC 1766 i ISO 639."
 
 # type: Content of: <ul><li>
 msgid ""
@@ -309,7 +315,9 @@
 "vegada que es modifiqui una pàgina al mòdul www del cvs. Normalment són "
 "quatre o cinc missatges al dia, i alguns més el cap de setmana. S'aconsella "
 "desar aquest missatges i repassar-los un cop a la setmana per garantir que "
-"les traduccions es mantinguin actualitzades. També podeu utilitzar 
<code>make report TEAM=LANG</code> si teniu el <a 
href=\"/software/gnun/\">GNUN</a> instal·lat."
+"les traduccions es mantinguin actualitzades. També podeu utilitzar "
+"<code>make report TEAM=LANG</code> si teniu el <a href=\"/software/gnun/"
+"\">GNUN</a> instal·lat."
 
 # type: Content of: <h3>
 msgid "Translations Underway"
@@ -425,18 +433,14 @@
 "Steuer</a>)"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>el</code> - <a href=\"https://savannah.gnu.org/projects/www-el";
-#| "\">Greek</a> (<a href=\"https://savannah.gnu.org/users/freeasinfreedom";
-#| "\">Kasabalis Athanasios</a>)"
 msgid ""
 "<code>el</code> - <a href=\"https://savannah.gnu.org/projects/www-el";
 "\">Greek</a> (<a href=\"https://savannah.gnu.org/users/gzarkadas\";>Georgios "
 "Zarkadas</a>)"
 msgstr ""
-"<code>el</code> - <a href=\"https://savannah.gnu.org/projects/www-el";
-"\">Grec</a> (<a href=\"https://savannah.gnu.org/users/gzarkadas\";>Georgios "
-"Zarkadas</a>)"
+"<code>el</code> - <a href=\"https://savannah.gnu.org/projects/www-el\";>Grec</"
+"a> (<a href=\"https://savannah.gnu.org/users/gzarkadas\";>Georgios Zarkadas</"
+"a>)"
 
 # type: Content of: <ul><li>
 msgid ""
@@ -485,14 +489,11 @@
 "address@hidden"> &lt;address@hidden&gt;</a>)"
 msgstr ""
 "<code>fr</code> - <a href=\"https://savannah.gnu.org/projects/www-fr";
-"\">Francès</a> (Es necessita coordinador, contacteu si us plau amb <a 
href=\"mailto:trad-";
-"address@hidden"> &lt;address@hidden&gt;</a> i <a href=\"mailto:web-";
-"address@hidden"> &lt;address@hidden&gt;</a>)"
+"\">Francès</a> (Es necessita coordinador, contacteu si us plau amb <a href="
+"\"mailto:address@hidden";> &lt;address@hidden&gt;</a> i <a href="
+"\"mailto:address@hidden";> &lt;address@hidden&gt;</a>)"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>nn</code> - Norwegian Nynorsk (<a href=\"https://savannah.gnu.org/";
-#| "users/att\">Andreas Tolfsen</a>, permanent coordinator needed)"
 msgid ""
 "<code>he</code> - <a href=\"https://savannah.gnu.org/projects/www-he";
 "\">Hebrew</a> (New coordinator needed)"
@@ -501,9 +502,6 @@
 "\">Hebreu</a> (Es necessita coordiandor)"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>nn</code> - Norwegian Nynorsk (<a href=\"https://savannah.gnu.org/";
-#| "users/att\">Andreas Tolfsen</a>, permanent coordinator needed)"
 msgid ""
 "<code>id</code> - <a href=\"https://savannah.gnu.org/projects/www-id";
 "\">Indonesian</a> (New coordinator needed)"
@@ -587,27 +585,19 @@
 "att\">Andreas Tolfsen</a>, es necessita un coordinador permanent)"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>fi</code> - <a href=\"https://savannah.gnu.org/projects/www-fi";
-#| "\">Finnish</a> (<a href=\"https://savannah.gnu.org/users/solarius";
-#| "\">Ville</a>)"
 msgid ""
 "<code>pl</code> - <a href=\"https://savannah.gnu.org/projects/www-pl";
 "\">Polish</a> (<a href=\"https:/savannah.gnu.org/users/jsowoc\">Jan Owoc</a>)"
 msgstr ""
 "<code>pl</code> - <a href=\"https://savannah.gnu.org/projects/www-pl";
-"\">Polonès</a> (<a href=\"https:/savannah.gnu.org/users/jsowoc\">Jan 
Owoc</a>)"
+"\">Polonès</a> (<a href=\"https:/savannah.gnu.org/users/jsowoc\">Jan Owoc</"
+"a>)"
 
 # type: Content of: <ul><li>
 msgid "<code>pt</code> - Portuguese (New coordinator needed)"
 msgstr "<code>pt</code> - Portuguès (Es necessita coordinador)"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>pt-br</code> - <a href=\"https://savannah.gnu.org/projects/www-pt-br";
-#| "\">Brazilian Portuguese</a> (New coordinator needed, please contact <a "
-#| "href=\"mailto:address@hidden";> &lt;address@hidden&gt;</"
-#| "a>)"
 msgid ""
 "<code>pt-br</code> - <a href=\"https://savannah.gnu.org/projects/www-pt-br";
 "\">Brazilian Portuguese</a> (New coordinator needed)"
@@ -676,20 +666,14 @@
 "Ramadoss</a>)"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>nn</code> - Norwegian Nynorsk (<a href=\"https://savannah.gnu.org/";
-#| "users/att\">Andreas Tolfsen</a>, permanent coordinator needed)"
 msgid ""
 "<code>th</code> - <a href=\"https://savannah.gnu.org/projects/www-th\";>Thai</"
 "a> (New coordinator needed)"
 msgstr ""
-"<code>th</code> - <a 
href=\"https://savannah.gnu.org/projects/www-th\";>Tailandès</"
-"a> (Es necessita coordinador)"
+"<code>th</code> - <a href=\"https://savannah.gnu.org/projects/www-th";
+"\">Tailandès</a> (Es necessita coordinador)"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>nn</code> - Norwegian Nynorsk (<a href=\"https://savannah.gnu.org/";
-#| "users/att\">Andreas Tolfsen</a>, permanent coordinator needed)"
 msgid ""
 "<code>tl</code> - <a href=\"https://savannah.gnu.org/projects/www-tl";
 "\">Tagalog</a> (New coordinator needed)"
@@ -718,11 +702,6 @@
 "Sudyr</a>)"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>zh-cn</code> - <a href=\"https://savannah.gnu.org/projects/www-zh-cn";
-#| "\">Simplified Chinese</a> (<a href=\"https://savannah.gnu.org/users/zeuux";
-#| "\">Bill Xu</a>, <a href=\"https://savannah.gnu.org/users/chxiaobin\";>Chen "
-#| "Xiaobin</a>)"
 msgid ""
 "<code>zh-cn</code> - <a href=\"https://savannah.gnu.org/projects/www-zh-cn";
 "\">Simplified Chinese</a> (<a href=\"https://savannah.gnu.org/users/monnand";
@@ -735,11 +714,6 @@
 "a>, <a href=\"https://savannah.gnu.org/users/chxiaobin\";>Chen Xiaobin</a>)"
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>zh-tw</code> - <a href=\"https://savannah.gnu.org/projects/www-zh-";
-#| "cn/\">Traditional Chinese</a> (<a href=\"https://savannah.gnu.org/users/";
-#| "zeuux\">Bill Xu</a>, <a href=\"https://savannah.gnu.org/users/chxiaobin";
-#| "\">Chen Xiaobin</a>)"
 msgid ""
 "<code>zh-tw</code> - <a href=\"https://savannah.gnu.org/projects/www-zh-cn";
 "\">Traditional Chinese</a> (<a href=\"https://savannah.gnu.org/users/monnand";



reply via email to

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