trans-coord/gnun/philosophy/po categories.ca.po...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   10/02/15 19:25:10

Modified files:
        gnun/philosophy/po: categories.ca.po categories.pot 
                            free-software-for-freedom.bg.po 
                            free-software-for-freedom.pot 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/po/categories.ca.po?cvsroot=trans-coord&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/po/categories.pot?cvsroot=trans-coord&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/po/free-software-for-freedom.bg.po?cvsroot=trans-coord&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/po/free-software-for-freedom.pot?cvsroot=trans-coord&r1=1.4&r2=1.5

Patches:
Index: categories.ca.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/po/categories.ca.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- categories.ca.po    11 Nov 2009 19:25:54 -0000      1.5
+++ categories.ca.po    15 Feb 2010 19:25:10 -0000      1.6
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2009-11-11 14:25-0500\n"
+"POT-Creation-Date: 2010-02-15 14:25-0500\n"
 "PO-Revision-Date: 2008-05-24 20:39+0100\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
@@ -138,6 +138,17 @@
 "&eacute;s realment programari lliure; d'altres, no."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Many languages have two separate words for &ldquo;free&rdquo; as in "
+#| "freedom and &ldquo;free&rdquo; as in zero price. For example, French has "
+#| "&ldquo;libre&rdquo; and &ldquo;gratuit&rdquo;. Not so English; there is a "
+#| "word &ldquo;gratis&rdquo; that refers unambiguously to price, but no "
+#| "common adjective that refers unambiguously to freedom. So if you are "
+#| "speaking another language, we suggest you translate &ldquo;free&rdquo; "
+#| "into your language to make it clearer. See our list of <a href= \"/"
+#| "philosophy/fs-translations.html\">translations of the term &ldquo;free "
+#| "software&rdquo;</a> into various other languages."
 msgid ""
 "Many languages have two separate words for &ldquo;free&rdquo; as in freedom "
 "and &ldquo;free&rdquo; as in zero price. For example, French has &ldquo;"
@@ -146,8 +157,8 @@
 "adjective that refers unambiguously to freedom. So if you are speaking "
 "another language, we suggest you translate &ldquo;free&rdquo; into your "
 "language to make it clearer. See our list of <a href= \"/philosophy/fs-"
-"translations.html\">translations of the term &ldquo;free software&rdquo;</a> "
-"into various other languages."
+"translations.html\"> translations of the term &ldquo;free software&rdquo;</"
+"a> into various other languages."
 msgstr ""
 "A difer&egrave;ncia de l'angl&egrave;s, on &quot;free&quot; pot significar "
 "tant &quot;lliure&quot; com &quot;gratu&iuml;t&quot;, moltes lleng&uuml;es "
@@ -584,12 +595,13 @@
 #| "\">volunteers</a>. Some contributed software is copyrighted by the Free "
 #| "Software Foundation; some is copyrighted by the contributors who wrote it."
 msgid ""
-"Some GNU software is written by <a href= \"http://www.fsf.org/about/staff/";
+"Some GNU software was written by <a href= \"http://www.fsf.org/about/staff/";
 "\">staff</a> of the <a href=\"http://www.fsf.org/\";>Free Software "
-"Foundation</a>, but most GNU software is contributed by <a href=\"/people/"
-"people.html\">volunteers</a>. Some contributed software is copyrighted by "
-"the Free Software Foundation; some is copyrighted by the contributors who "
-"wrote it."
+"Foundation</a>, but most GNU software comes from many <a href=\"/people/"
+"people.html\">volunteers</a>.  (Some of these volunteers are paid by "
+"companies or universities, but they are volunteers for us.)  Some "
+"contributed software is copyrighted by the Free Software Foundation; some is "
+"copyrighted by the contributors who wrote it."
 msgstr ""
 "Els <a href= \"/people/people.ca.html\">membres</a> de la <a href=\"/fsf/fsf."
 "html\">Free Software Foundation</a> escriuen part del programari GNU, "
@@ -605,141 +617,22 @@
 msgstr "<strong>Programari no lliure</strong>"
 
 # type: Content of: <dl><dd>
-msgid ""
-"Non-free software is any software that is not free. This includes <a href="
-"\"#semi-freeSoftware\">semi-free software</a> and <a href="
-"\"#ProprietarySoftware\">proprietary software</a>."
-msgstr ""
-"&Eacute;s qualsevol programari que no &eacute;s lliure. Inclou el programari "
-"<a href=\"#semi-freeSoftware\">semilliure</a> i el <a href="
-"\"#ProprietarySoftware\">programari privatiu</a>."
-
-# type: Content of: <dl><dt>
-#, fuzzy
-#| msgid "<strong>Semi-free software</strong>"
-msgid "Semi-free software"
-msgstr "<strong>Programari semilliure</strong>"
-
-# type: Content of: <dl><dd>
-msgid ""
-"Semi-free software is software that is not free, but comes with permission "
-"for individuals to use, copy, distribute, and modify (including distribution "
-"of modified versions) for non-profit purposes. PGP is an example of a semi-"
-"free program."
-msgstr ""
-"Programari semilliure &eacute;s aquell programari que no &eacute;s lliure, "
-"per&ograve; ve amb el perm&iacute;s d'&uacute;s, c&ograve;pia, "
-"distribuci&oacute; i modificaci&oacute; (incloent-hi el dret a distribuir "
-"versions modificades) si es fa per a usos no comercials. El PGP &eacute;s un "
-"exemple de programa semilliure."
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"Semi-free software is much better ethically than <a href= "
-"\"#ProprietarySoftware\">proprietary software</a>, but it still poses "
-"problems, and we cannot use it in a free operating system."
-msgstr ""
-"&Egrave;ticament, el programari semilliure &eacute;s molt millor que el <a "
-"href= \"#ProprietarySoftware\">programari privatiu</a>, per&ograve; "
-"aix&iacute; i tot planteja problemes pr&agrave;ctics, i per tant no el podem "
-"utilitzar en un sistema operatiu lliure."
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"The restrictions of copyleft are designed to protect the essential freedoms "
-"for all users. For us, the only justification for any substantive "
-"restriction on using a program is to prevent other people from adding other "
-"restrictions. Semi-free programs have additional restrictions, motivated by "
-"purely selfish goals."
-msgstr ""
-"Les restriccions de copyleft estan dissenyades per protegir les llibertats "
-"essencials de tots els usuaris. Per a nosaltres, l'&uacute;nica "
-"justificaci&oacute; per imposar importants restriccions en l'&uacute;s d'un "
-"programa &eacute;s impedir que altres persones imposin noves restriccions. "
-"El programes semilliures contenen restriccions addicionals, motivades "
-"purament per objectius egoistes."
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"It is impossible to include semi-free software in a free operating system. "
-"This is because the distribution terms for the operating system as a whole "
-"are the conjunction of the distribution terms for all the programs in it. "
-"Adding one semi-free program to the system would make the system <em>as a "
-"whole</em> just semi-free. There are two reasons we do not want that to "
-"happen:"
-msgstr ""
-"&Eacute;s impossible incloure programari semilliure en un sistema operatiu "
-"lliure, ja que els termes de distribuci&oacute; del sistema operatiu lliure "
-"en conjunt s&oacute;n una s&iacute;ntesi dels termes de distribuci&oacute; "
-"de tots els programes que en formen part. Si afegim un programa semilliure, "
-"<em>tot</em> el sistema esdev&eacute; semilliure. Hi ha dues raons per les "
-"quals no volem que aix&ograve; passi:"
-
-# type: Content of: <dl><dd><ul><li>
-msgid ""
-"We believe that free software should be for everyone&mdash;including "
-"businesses, not just schools and hobbyists. We want to invite business to "
-"use the whole GNU system, and therefore we must not include a semi-free "
-"program in it."
-msgstr ""
-"Creiem que el programari lliure no hauria de ser nom&eacute;s per als "
-"escolars o aficionats, sin&oacute; per a tothom, incloent-hi les empreses. "
-"Convidem a les empreses a utilitzar el sistema GNU complet, i per tant no "
-"hem d'incloure-hi cap programa semilliure."
-
-# type: Content of: <dl><dd><ul><li>
-msgid ""
-"Commercial distribution of free operating systems, including the <a href=\"/"
-"gnu/linux-and-gnu.html\">GNU/Linux system</a>, is very important, and users "
-"appreciate the convenience of commercial CD-ROM distributions. Including one "
-"semi-free program in an operating system would cut off commercial CD-ROM "
-"distribution for it."
-msgstr ""
-"La distribuci&oacute; comercial de sistemes operatius lliures, incloent-hi "
-"el <a href=\"/gnu/linux-and-gnu.ca.html\">sistema GNU/Linux</a>, &eacute;s "
-"molt important, i els usuaris aprecien tenir la possibilitat de comprar "
-"distribucions comercials en CD-ROM. Incloure un programa semilliure en un "
-"sistema operatiu podria impedir la seva distribuci&oacute; comercial en CD-"
-"ROM."
-
-# type: Content of: <dl><dd><p>
 #, fuzzy
 #| msgid ""
-#| "The Free Software Foundation itself is non-commercial, and therefore we "
-#| "would be legally permitted to use a semi-free program &ldquo;"
-#| "internally&rdquo;. But we don't do that, because that would undermine our "
-#| "efforts to obtain a program which we could also include in GNU."
-msgid ""
-"The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> itself is "
-"non-commercial, and therefore we would be legally permitted to use a semi-"
-"free program &ldquo;internally&rdquo;. But we don't do that, because that "
-"would undermine our efforts to obtain a program which we could also include "
-"in GNU."
-msgstr ""
-"La mateixa Free Software Foundation no &eacute;s una organitzaci&oacute; "
-"comercial, i per tant podr&iacute;em legalment utilitzar un programa "
-"semilliure &quot;internament&quot;. Per&ograve; no volem fer-ho, "
-"perqu&egrave; aix&ograve; seria malbaratar els nostres esfor&ccedil;os per "
-"aconseguir un programa que tamb&eacute; podr&iacute;em incloure a GNU."
-
-# type: Content of: <dl><dd><p>
-msgid ""
-"If there is a job that needs doing with software, then until we have a free "
-"program to do the job, the GNU system has a gap. We have to tell volunteers, "
-"&ldquo;We don't have a program yet to do this job in GNU, so we hope you "
-"will write one.&rdquo; If we ourselves used a semi-free program to do the "
-"job, that would undermine what we say; it would take away the impetus (on "
-"us, and on others who might listen to our views)  to write a free "
-"replacement. So we don't do that."
-msgstr ""
-"Si hi ha una tasca que necessita un programa, fins que no tinguem un "
-"programa lliure per fer-la hi haur&agrave; una mancan&ccedil;a al sistema "
-"GNU. Hem de dir als voluntaris: &quot;No tenim encara un programa per fer "
-"aquesta tasca a GNU; ens agradaria que n'escriv&iacute;ssiu un&quot;. Si "
-"nosaltres mateixos utilitz&eacute;ssim un programa semilliure per fer la "
-"tasca, perdr&iacute;em tota la for&ccedil;a moral i, a m&eacute;s, nosaltres "
-"o altres persones que comparteixen els nostres punts de vista perdrien els "
-"incentius per escriure un substitut lliure. Per aix&ograve; no ho fem."
+#| "Proprietary software is software that is not free or semi-free.  Its use, "
+#| "redistribution or modification is prohibited, or requires you to ask for "
+#| "permission, or is restricted so much that you effectively can't do it "
+#| "freely."
+msgid ""
+"Non-free software is any software that is not free.  Its use, redistribution "
+"or modification is prohibited, or requires you to ask for permission, or is "
+"restricted so much that you effectively can't do it freely."
+msgstr ""
+"El programari privatiu &eacute;s aquell programari que no &eacute;s lliure "
+"ni semilliure. El seu &uacute;s, distribuci&oacute; o modificaci&oacute; es "
+"troba regulat o prohibit, o requereix que demaneu perm&iacute;s, o "
+"cont&eacute; tals restriccions que no es pot distribuir o modificar "
+"lliurement."
 
 # type: Content of: <dl><dt>
 #, fuzzy
@@ -747,17 +640,15 @@
 msgid "Proprietary software"
 msgstr "<strong>Programari privatiu</strong>"
 
-# type: Content of: <dl><dd>
+# type: Content of: <p>
 msgid ""
-"Proprietary software is software that is not free or semi-free.  Its use, "
-"redistribution or modification is prohibited, or requires you to ask for "
-"permission, or is restricted so much that you effectively can't do it freely."
+"Proprietary software is another name for non-free software.  In the past we "
+"subdivided non-free software into &ldquo;semi-free software&rdquo;, which "
+"could be modified and redistributed noncommercially, and &ldquo; proprietary "
+"software&rdquo;, which could not be.  But we have dropped that distinction "
+"and now use &ldquo;proprietary software&rdquo; as synonymous with non-free "
+"software."
 msgstr ""
-"El programari privatiu &eacute;s aquell programari que no &eacute;s lliure "
-"ni semilliure. El seu &uacute;s, distribuci&oacute; o modificaci&oacute; es "
-"troba regulat o prohibit, o requereix que demaneu perm&iacute;s, o "
-"cont&eacute; tals restriccions que no es pot distribuir o modificar "
-"lliurement."
 
 # type: Content of: <dl><dd><p>
 msgid ""
@@ -774,12 +665,20 @@
 "pensem que no hi ha cap excusa per instal&middot;lar un programa privatiu."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "For example, we felt justified in installing Unix on our computer in the "
+#| "1980s, because we were using it to write a free replacement for Unix. "
+#| "Nowadays, since free operating systems are available, the excuse is no "
+#| "longer applicable; we have eliminated all our non-free operating systems, "
+#| "and any new computer we install must run a completely free operating "
+#| "system."
 msgid ""
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for Unix. "
 "Nowadays, since free operating systems are available, the excuse is no "
-"longer applicable; we have eliminated all our non-free operating systems, "
-"and any new computer we install must run a completely free operating system."
+"longer applicable; we do not use any non-free operating systems, and any new "
+"computer we install must run a completely free operating system."
 msgstr ""
 "Per exemple, estava justificat instal&middot;lar Unix en els nostres "
 "ordinadors als anys 80 perqu&egrave; el f&egrave;iem servir per escriure un "
@@ -789,10 +688,15 @@
 "completament lliure."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "We don't insist that users of GNU, or contributors to GNU, have to live "
+#| "by this rule. It is a rule we made for ourselves. But we hope you will "
+#| "decide to follow it too."
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
-"this rule. It is a rule we made for ourselves. But we hope you will decide "
-"to follow it too."
+"this rule. It is a rule we made for ourselves. But we hope you will follow "
+"it too, for your freedom's sake."
 msgstr ""
 "No insistim que els usuaris o col&middot;laboradors de GNU segueixin aquesta "
 "regla. &Eacute;s una norma que v&agrave;rem crear per a nosaltres. "
@@ -1073,6 +977,144 @@
 msgid "Translations of this page"
 msgstr "Traduccions d'aquesta p&agrave;gina"
 
+# type: Content of: <dl><dd>
+#~ msgid ""
+#~ "Non-free software is any software that is not free. This includes <a href="
+#~ "\"#semi-freeSoftware\">semi-free software</a> and <a href="
+#~ "\"#ProprietarySoftware\">proprietary software</a>."
+#~ msgstr ""
+#~ "&Eacute;s qualsevol programari que no &eacute;s lliure. Inclou el "
+#~ "programari <a href=\"#semi-freeSoftware\">semilliure</a> i el <a href="
+#~ "\"#ProprietarySoftware\">programari privatiu</a>."
+
+# type: Content of: <dl><dt>
+#, fuzzy
+#~| msgid "<strong>Semi-free software</strong>"
+#~ msgid "Semi-free software"
+#~ msgstr "<strong>Programari semilliure</strong>"
+
+# type: Content of: <dl><dd>
+#~ msgid ""
+#~ "Semi-free software is software that is not free, but comes with "
+#~ "permission for individuals to use, copy, distribute, and modify "
+#~ "(including distribution of modified versions) for non-profit purposes. "
+#~ "PGP is an example of a semi-free program."
+#~ msgstr ""
+#~ "Programari semilliure &eacute;s aquell programari que no &eacute;s "
+#~ "lliure, per&ograve; ve amb el perm&iacute;s d'&uacute;s, c&ograve;pia, "
+#~ "distribuci&oacute; i modificaci&oacute; (incloent-hi el dret a distribuir "
+#~ "versions modificades) si es fa per a usos no comercials. El PGP &eacute;s "
+#~ "un exemple de programa semilliure."
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "Semi-free software is much better ethically than <a href= "
+#~ "\"#ProprietarySoftware\">proprietary software</a>, but it still poses "
+#~ "problems, and we cannot use it in a free operating system."
+#~ msgstr ""
+#~ "&Egrave;ticament, el programari semilliure &eacute;s molt millor que el "
+#~ "<a href= \"#ProprietarySoftware\">programari privatiu</a>, per&ograve; "
+#~ "aix&iacute; i tot planteja problemes pr&agrave;ctics, i per tant no el "
+#~ "podem utilitzar en un sistema operatiu lliure."
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "The restrictions of copyleft are designed to protect the essential "
+#~ "freedoms for all users. For us, the only justification for any "
+#~ "substantive restriction on using a program is to prevent other people "
+#~ "from adding other restrictions. Semi-free programs have additional "
+#~ "restrictions, motivated by purely selfish goals."
+#~ msgstr ""
+#~ "Les restriccions de copyleft estan dissenyades per protegir les "
+#~ "llibertats essencials de tots els usuaris. Per a nosaltres, l'&uacute;"
+#~ "nica justificaci&oacute; per imposar importants restriccions en l'&uacute;"
+#~ "s d'un programa &eacute;s impedir que altres persones imposin noves "
+#~ "restriccions. El programes semilliures contenen restriccions addicionals, "
+#~ "motivades purament per objectius egoistes."
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "It is impossible to include semi-free software in a free operating "
+#~ "system. This is because the distribution terms for the operating system "
+#~ "as a whole are the conjunction of the distribution terms for all the "
+#~ "programs in it. Adding one semi-free program to the system would make the "
+#~ "system <em>as a whole</em> just semi-free. There are two reasons we do "
+#~ "not want that to happen:"
+#~ msgstr ""
+#~ "&Eacute;s impossible incloure programari semilliure en un sistema "
+#~ "operatiu lliure, ja que els termes de distribuci&oacute; del sistema "
+#~ "operatiu lliure en conjunt s&oacute;n una s&iacute;ntesi dels termes de "
+#~ "distribuci&oacute; de tots els programes que en formen part. Si afegim un "
+#~ "programa semilliure, <em>tot</em> el sistema esdev&eacute; semilliure. Hi "
+#~ "ha dues raons per les quals no volem que aix&ograve; passi:"
+
+# type: Content of: <dl><dd><ul><li>
+#~ msgid ""
+#~ "We believe that free software should be for everyone&mdash;including "
+#~ "businesses, not just schools and hobbyists. We want to invite business to "
+#~ "use the whole GNU system, and therefore we must not include a semi-free "
+#~ "program in it."
+#~ msgstr ""
+#~ "Creiem que el programari lliure no hauria de ser nom&eacute;s per als "
+#~ "escolars o aficionats, sin&oacute; per a tothom, incloent-hi les "
+#~ "empreses. Convidem a les empreses a utilitzar el sistema GNU complet, i "
+#~ "per tant no hem d'incloure-hi cap programa semilliure."
+
+# type: Content of: <dl><dd><ul><li>
+#~ msgid ""
+#~ "Commercial distribution of free operating systems, including the <a href="
+#~ "\"/gnu/linux-and-gnu.html\">GNU/Linux system</a>, is very important, and "
+#~ "users appreciate the convenience of commercial CD-ROM distributions. "
+#~ "Including one semi-free program in an operating system would cut off "
+#~ "commercial CD-ROM distribution for it."
+#~ msgstr ""
+#~ "La distribuci&oacute; comercial de sistemes operatius lliures, incloent-"
+#~ "hi el <a href=\"/gnu/linux-and-gnu.ca.html\">sistema GNU/Linux</a>, "
+#~ "&eacute;s molt important, i els usuaris aprecien tenir la possibilitat de "
+#~ "comprar distribucions comercials en CD-ROM. Incloure un programa "
+#~ "semilliure en un sistema operatiu podria impedir la seva "
+#~ "distribuci&oacute; comercial en CD-ROM."
+
+# type: Content of: <dl><dd><p>
+#, fuzzy
+#~| msgid ""
+#~| "The Free Software Foundation itself is non-commercial, and therefore we "
+#~| "would be legally permitted to use a semi-free program &ldquo;"
+#~| "internally&rdquo;. But we don't do that, because that would undermine "
+#~| "our efforts to obtain a program which we could also include in GNU."
+#~ msgid ""
+#~ "The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> itself "
+#~ "is non-commercial, and therefore we would be legally permitted to use a "
+#~ "semi-free program &ldquo;internally&rdquo;. But we don't do that, because "
+#~ "that would undermine our efforts to obtain a program which we could also "
+#~ "include in GNU."
+#~ msgstr ""
+#~ "La mateixa Free Software Foundation no &eacute;s una organitzaci&oacute; "
+#~ "comercial, i per tant podr&iacute;em legalment utilitzar un programa "
+#~ "semilliure &quot;internament&quot;. Per&ograve; no volem fer-ho, "
+#~ "perqu&egrave; aix&ograve; seria malbaratar els nostres esfor&ccedil;os "
+#~ "per aconseguir un programa que tamb&eacute; podr&iacute;em incloure a GNU."
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "If there is a job that needs doing with software, then until we have a "
+#~ "free program to do the job, the GNU system has a gap. We have to tell "
+#~ "volunteers, &ldquo;We don't have a program yet to do this job in GNU, so "
+#~ "we hope you will write one.&rdquo; If we ourselves used a semi-free "
+#~ "program to do the job, that would undermine what we say; it would take "
+#~ "away the impetus (on us, and on others who might listen to our views)  to "
+#~ "write a free replacement. So we don't do that."
+#~ msgstr ""
+#~ "Si hi ha una tasca que necessita un programa, fins que no tinguem un "
+#~ "programa lliure per fer-la hi haur&agrave; una mancan&ccedil;a al sistema "
+#~ "GNU. Hem de dir als voluntaris: &quot;No tenim encara un programa per fer "
+#~ "aquesta tasca a GNU; ens agradaria que n'escriv&iacute;ssiu un&quot;. Si "
+#~ "nosaltres mateixos utilitz&eacute;ssim un programa semilliure per fer la "
+#~ "tasca, perdr&iacute;em tota la for&ccedil;a moral i, a m&eacute;s, "
+#~ "nosaltres o altres persones que comparteixen els nostres punts de vista "
+#~ "perdrien els incentius per escriure un substitut lliure. Per aix&ograve; "
+#~ "no ho fem."
+
 # type: Attribute 'alt' of: <p><img>
 #~ msgid "[diagram of a the different categories of software]"
 #~ msgstr "[diagrama de les diferents categories de programari]"

Index: categories.pot
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/po/categories.pot,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- categories.pot      11 Nov 2009 19:25:54 -0000      1.5
+++ categories.pot      15 Feb 2010 19:25:10 -0000      1.6
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-11-11 14:25-0500\n"
+"POT-Creation-Date: 2010-02-15 14:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -98,7 +98,7 @@
 "adjective that refers unambiguously to freedom. So if you are speaking "
 "another language, we suggest you translate &ldquo;free&rdquo; into your "
 "language to make it clearer. See our list of <a href= "
-"\"/philosophy/fs-translations.html\">translations of the term &ldquo;free "
+"\"/philosophy/fs-translations.html\"> translations of the term &ldquo;free "
 "software&rdquo;</a> into various other languages."
 msgstr ""
 
@@ -336,13 +336,14 @@
 
 # type: Content of: <p>
 msgid ""
-"Some GNU software is written by <a href= "
+"Some GNU software was written by <a href= "
 "\"http://www.fsf.org/about/staff/\";>staff</a> of the <a "
 "href=\"http://www.fsf.org/\";>Free Software Foundation</a>, but most GNU "
-"software is contributed by <a "
-"href=\"/people/people.html\">volunteers</a>. Some contributed software is "
-"copyrighted by the Free Software Foundation; some is copyrighted by the "
-"contributors who wrote it."
+"software comes from many <a href=\"/people/people.html\">volunteers</a>.  "
+"(Some of these volunteers are paid by companies or universities, but they "
+"are volunteers for us.)  Some contributed software is copyrighted by the "
+"Free Software Foundation; some is copyrighted by the contributors who wrote "
+"it."
 msgstr ""
 
 # type: Content of: <h3>
@@ -351,84 +352,9 @@
 
 # type: Content of: <p>
 msgid ""
-"Non-free software is any software that is not free. This includes <a "
-"href=\"#semi-freeSoftware\">semi-free software</a> and <a "
-"href=\"#ProprietarySoftware\">proprietary software</a>."
-msgstr ""
-
-# type: Content of: <h3>
-msgid "Semi-free software"
-msgstr ""
-
-# type: Content of: <p>
-msgid ""
-"Semi-free software is software that is not free, but comes with permission "
-"for individuals to use, copy, distribute, and modify (including distribution "
-"of modified versions) for non-profit purposes. PGP is an example of a "
-"semi-free program."
-msgstr ""
-
-# type: Content of: <p>
-msgid ""
-"Semi-free software is much better ethically than <a href= "
-"\"#ProprietarySoftware\">proprietary software</a>, but it still poses "
-"problems, and we cannot use it in a free operating system."
-msgstr ""
-
-# type: Content of: <p>
-msgid ""
-"The restrictions of copyleft are designed to protect the essential freedoms "
-"for all users. For us, the only justification for any substantive "
-"restriction on using a program is to prevent other people from adding other "
-"restrictions. Semi-free programs have additional restrictions, motivated by "
-"purely selfish goals."
-msgstr ""
-
-# type: Content of: <p>
-msgid ""
-"It is impossible to include semi-free software in a free operating "
-"system. This is because the distribution terms for the operating system as a "
-"whole are the conjunction of the distribution terms for all the programs in "
-"it. Adding one semi-free program to the system would make the system <em>as "
-"a whole</em> just semi-free. There are two reasons we do not want that to "
-"happen:"
-msgstr ""
-
-# type: Content of: <ul><li>
-msgid ""
-"We believe that free software should be for everyone&mdash;including "
-"businesses, not just schools and hobbyists. We want to invite business to "
-"use the whole GNU system, and therefore we must not include a semi-free "
-"program in it."
-msgstr ""
-
-# type: Content of: <ul><li>
-msgid ""
-"Commercial distribution of free operating systems, including the <a "
-"href=\"/gnu/linux-and-gnu.html\">GNU/Linux system</a>, is very important, "
-"and users appreciate the convenience of commercial CD-ROM "
-"distributions. Including one semi-free program in an operating system would "
-"cut off commercial CD-ROM distribution for it."
-msgstr ""
-
-# type: Content of: <p>
-msgid ""
-"The <a href=\"http://www.fsf.org/\";>Free Software Foundation</a> itself is "
-"non-commercial, and therefore we would be legally permitted to use a "
-"semi-free program &ldquo;internally&rdquo;. But we don't do that, because "
-"that would undermine our efforts to obtain a program which we could also "
-"include in GNU."
-msgstr ""
-
-# type: Content of: <p>
-msgid ""
-"If there is a job that needs doing with software, then until we have a free "
-"program to do the job, the GNU system has a gap. We have to tell volunteers, "
-"&ldquo;We don't have a program yet to do this job in GNU, so we hope you "
-"will write one.&rdquo; If we ourselves used a semi-free program to do the "
-"job, that would undermine what we say; it would take away the impetus (on "
-"us, and on others who might listen to our views)  to write a free "
-"replacement. So we don't do that."
+"Non-free software is any software that is not free.  Its use, redistribution "
+"or modification is prohibited, or requires you to ask for permission, or is "
+"restricted so much that you effectively can't do it freely."
 msgstr ""
 
 # type: Content of: <h3>
@@ -437,10 +363,12 @@
 
 # type: Content of: <p>
 msgid ""
-"Proprietary software is software that is not free or semi-free.  Its use, "
-"redistribution or modification is prohibited, or requires you to ask for "
-"permission, or is restricted so much that you effectively can't do it "
-"freely."
+"Proprietary software is another name for non-free software.  In the past we "
+"subdivided non-free software into &ldquo;semi-free software&rdquo;, which "
+"could be modified and redistributed noncommercially, and &ldquo; proprietary "
+"software&rdquo;, which could not be.  But we have dropped that distinction "
+"and now use &ldquo;proprietary software&rdquo; as synonymous with non-free "
+"software."
 msgstr ""
 
 # type: Content of: <p>
@@ -457,15 +385,15 @@
 "For example, we felt justified in installing Unix on our computer in the "
 "1980s, because we were using it to write a free replacement for "
 "Unix. Nowadays, since free operating systems are available, the excuse is no "
-"longer applicable; we have eliminated all our non-free operating systems, "
-"and any new computer we install must run a completely free operating system."
+"longer applicable; we do not use any non-free operating systems, and any new "
+"computer we install must run a completely free operating system."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "We don't insist that users of GNU, or contributors to GNU, have to live by "
-"this rule. It is a rule we made for ourselves. But we hope you will decide "
-"to follow it too."
+"this rule. It is a rule we made for ourselves. But we hope you will follow "
+"it too, for your freedom's sake."
 msgstr ""
 
 # type: Content of: <h3>

Index: free-software-for-freedom.bg.po
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/philosophy/po/free-software-for-freedom.bg.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- free-software-for-freedom.bg.po     7 Jan 2009 19:27:09 -0000       1.4
+++ free-software-for-freedom.bg.po     15 Feb 2010 19:25:10 -0000      1.5
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: free-software-for-freedom.html\n"
-"POT-Creation-Date: 2009-01-07 14:25-0500\n"
+"POT-Creation-Date: 2010-02-15 14:25-0500\n"
 "PO-Revision-Date: 2008-02-15 15:43+0200\n"
 "Last-Translator: Yavor Doganov <address@hidden>\n"
 "Language-Team: Bulgarian <address@hidden>\n"
@@ -223,6 +223,20 @@
 "изключение."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "The official definition of &ldquo;open source software,&rdquo; as "
+#| "published by the Open Source Initiative, is very close to our definition "
+#| "of free software; however, it is a little looser in some respects, and "
+#| "they have accepted a few licenses that we consider unacceptably "
+#| "restrictive of the users.  However, the obvious meaning for the "
+#| "expression &ldquo;open source software&rdquo; is &ldquo;You can look at "
+#| "the source code.&rdquo; This is a much weaker criterion than free "
+#| "software; it includes free software, but also includes <a href=\"/"
+#| "philosophy/categories.html#semi-freeSoftware\">semi-free</a> programs "
+#| "such as Xv, and even some <a href=\"/philosophy/categories."
+#| "html#ProprietarySoftware\"> proprietary</a> programs, including Qt under "
+#| "its original license (before the QPL)."
 msgid ""
 "The official definition of &ldquo;open source software,&rdquo; as published "
 "by the Open Source Initiative, is very close to our definition of free "
@@ -231,10 +245,9 @@
 "users.  However, the obvious meaning for the expression &ldquo;open source "
 "software&rdquo; is &ldquo;You can look at the source code.&rdquo; This is a "
 "much weaker criterion than free software; it includes free software, but "
-"also includes <a href=\"/philosophy/categories.html#semi-freeSoftware\">semi-"
-"free</a> programs such as Xv, and even some <a href=\"/philosophy/categories."
-"html#ProprietarySoftware\"> proprietary</a> programs, including Qt under its "
-"original license (before the QPL)."
+"also some <a href=\"/philosophy/categories.html#ProprietarySoftware\"> "
+"proprietary</a> programs, including Xv, and Qt under its original license "
+"(before the QPL)."
 msgstr ""
 "Официалната дефиниция за „софтуер с 
отворен код“, както е публикувана от "
 "Инициативата за отворен код (OSI — Open Source 
Initiative), е много близка "

Index: free-software-for-freedom.pot
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/philosophy/po/free-software-for-freedom.pot,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- free-software-for-freedom.pot       7 Jan 2009 19:27:09 -0000       1.4
+++ free-software-for-freedom.pot       15 Feb 2010 19:25:10 -0000      1.5
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-01-07 14:25-0500\n"
+"POT-Creation-Date: 2010-02-15 14:25-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -160,11 +160,9 @@
 "users.  However, the obvious meaning for the expression &ldquo;open source "
 "software&rdquo; is &ldquo;You can look at the source code.&rdquo; This is a "
 "much weaker criterion than free software; it includes free software, but "
-"also includes <a "
-"href=\"/philosophy/categories.html#semi-freeSoftware\">semi-free</a> "
-"programs such as Xv, and even some <a "
-"href=\"/philosophy/categories.html#ProprietarySoftware\"> proprietary</a> "
-"programs, including Qt under its original license (before the QPL)."
+"also some <a href=\"/philosophy/categories.html#ProprietarySoftware\"> "
+"proprietary</a> programs, including Xv, and Qt under its original license "
+"(before the QPL)."
 msgstr ""
 
 # type: Content of: <p>