www distros/po/common-distros.es.po distros/po/...

www-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www distros/po/common-distros.es.po distros/po/...

From:	Yavor Doganov
Subject:	www distros/po/common-distros.es.po distros/po/...
Date:	Sun, 30 Jan 2011 17:27:55 +0000
CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   11/01/30 17:27:55

Modified files:
        distros/po     : common-distros.es.po common-distros.fr.po 
                         common-distros.pl.po common-distros.pot 
                         common-distros.ru.po 
        licenses       : translations.es.html 
        licenses/po    : translations.es.po 
        people/po      : people.es.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.es.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.fr.po?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pl.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pot?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ru.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/translations.es.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.es.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/people/po/people.es.po?cvsroot=www&r1=1.29&r2=1.30

Patches:
Index: distros/po/common-distros.es.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.es.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- distros/po/common-distros.es.po     16 Jan 2011 21:07:24 -0000      1.12
+++ distros/po/common-distros.es.po     30 Jan 2011 17:27:39 -0000      1.13
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: common-distros.es.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-13 12:27-0500\n"
+"POT-Creation-Date: 2011-01-30 12:27-0500\n"
 "PO-Revision-Date: 2011-01-16 22:04+0100\n"
 "Last-Translator: Xavier Reina <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -56,9 +56,13 @@
 "libres de GNU/Linux</a>."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "All of the distributions listed on this page fail to follow the "
+#| "guidelines in at least two important ways:"
 msgid ""
-"All of the distributions listed on this page fail to follow the guidelines "
-"in at least two important ways:"
+"Except where noted, all of the distributions listed on this page fail to "
+"follow the guidelines in at least two important ways:"
 msgstr ""
 "Todas las distribuciones listadas en esta pÃ¡gina no aprueban las pautas en "
 "al menos dos aspectos importantes:"
@@ -78,10 +82,15 @@
 "debajo."
 
 # type: Content of: <ul><li><p>
-msgid ""
-"The version of the kernel Linux that they distribute includes blobs: pieces "
-"of object code, distributed without source, usually to help operate some "
-"device."
+#, fuzzy
+#| msgid ""
+#| "The version of the kernel Linux that they distribute includes blobs: "
+#| "pieces of object code, distributed without source, usually to help "
+#| "operate some device."
+msgid ""
+"The kernel that they distribute (in most cases, Linux) includes <em>blobs</"
+"em>: pieces of object code distributed without source, usually firmware to "
+"run some device."
 msgstr ""
 "La versiÃ³n del nÃºcleo Linux que distribuyen incluye <span 
style=\"font-style:"
 "italic;\">blobs</span>: piezas de objetos de cÃ³digo distribuidos sin la "
@@ -111,15 +120,21 @@
 msgstr "<a id=\"Arch\"></a>"
 
 # type: Content of: <h3>
-msgid "Arch"
-msgstr "Arch"
+msgid "Arch GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Arch has the two common issues listed above: there's no clear policy "
+#| "about what software can be included, and nonfree blobs are shipped with "
+#| "their Linux kernel.  Arch also has no policy about not distributing "
+#| "nonfree software through their normal channels."
 msgid ""
-"Arch has the two common issues listed above: there's no clear policy about "
-"what software can be included, and nonfree blobs are shipped with their "
-"Linux kernel.  Arch also has no policy about not distributing nonfree "
-"software through their normal channels."
+"Arch has the two usual problems: there's no clear policy about what software "
+"can be included, and nonfree blobs are shipped with their Linux kernel.  "
+"Arch also has no policy about not distributing nonfree software through "
+"their normal channels."
 msgstr ""
 "Arch sufre dos de las cuestiones habituales mencionadas mÃ¡s arriba: no hay "
 "una polÃtica clara sobre el software que se puede incluir y bloques binarios 
"
@@ -136,10 +151,16 @@
 msgstr "CentOS"
 
 # type: Content of: <p>
-msgid ""
-"We're not aware of problems in CentOS aside from the two listed above: "
-"there's no clear policy about what software can be included, and nonfree "
-"blobs are shipped with Linux.  Of course, with no firm policy in place, "
+#, fuzzy
+#| msgid ""
+#| "We're not aware of problems in CentOS aside from the two listed above: "
+#| "there's no clear policy about what software can be included, and nonfree "
+#| "blobs are shipped with Linux.  Of course, with no firm policy in place, "
+#| "there might be other nonfree software included that we missed."
+msgid ""
+"We're not aware of problems in CentOS aside from the two usual ones: there's "
+"no clear policy about what software can be included, and nonfree blobs are "
+"shipped with Linux, the kernel.  Of course, with no firm policy in place, "
 "there might be other nonfree software included that we missed."
 msgstr ""
 "No conocemos problemas en CentOS, aparte de los dos listados arriba: no "
@@ -153,17 +174,27 @@
 msgstr "<a id=\"Debian\"></a>"
 
 # type: Content of: <h3>
-msgid "Debian"
-msgstr "Debian"
+msgid "Debian GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract does say that all software in the main "
+#| "distribution will be free software.  Unfortunately, that's not always "
+#| "true in practice.  Debian has repeatedly made tacit or explicit "
+#| "exceptions for specific pieces of nonfree software, such as the blobs "
+#| "included in or accompanying Linux.  We're still hopeful that there won't "
+#| "be such exceptions in the future, but we can't turn a blind eye to the "
+#| "situation as it stands today."
 msgid ""
 "Debian's Social Contract does say that all software in the main distribution "
-"will be free software.  Unfortunately, that's not always true in practice.  "
+"will be free software.  At present, that's not always true in practice: "
 "Debian has repeatedly made tacit or explicit exceptions for specific pieces "
 "of nonfree software, such as the blobs included in or accompanying Linux.  "
-"We're still hopeful that there won't be such exceptions in the future, but "
-"we can't turn a blind eye to the situation as it stands today."
+"The next release of Debian will reportedly move these blobs out of Linux.  "
+"That will be a substantial step towards a completely free distro, but won't "
+"get all the way there."
 msgstr ""
 "El contrato social de Debian dice que todo el software en la distribuciÃ³n "
 "principal serÃ¡ software libre. Desafortunadamente, en la prÃ¡ctica eso no "
@@ -220,8 +251,8 @@
 msgstr "<a id=\"Gentoo\"></a>"
 
 # type: Content of: <h3>
-msgid "Gentoo"
-msgstr "Gentoo"
+msgid "Gentoo GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
 msgid ""
@@ -236,7 +267,9 @@
 msgstr "<a id=\"Mandriva\"></a>"
 
 # type: Content of: <h3>
-msgid "Mandriva"
+#, fuzzy
+#| msgid "Mandriva"
+msgid "Mandriva GNU/Linux"
 msgstr "Mandriva"
 
 # type: Content of: <p>
@@ -264,22 +297,26 @@
 msgstr "<a id=\"openSUSE\"></a>"
 
 # type: Content of: <h3>
-msgid "openSUSE"
+#, fuzzy
+#| msgid "openSUSE"
+msgid "openSUSE GNU/Linux"
 msgstr "openSUSE"
 
 # type: Content of: <p>
-msgid "openSUSE offers its users access to a repository of nonfree software."
+msgid ""
+"openSUSE offers its users access to a repository of nonfree software.  This "
+"is an instance of how <a href=\"/philosophy/open-source-misses-the-point."
+"htmlopen-source-misses-the-point.html\"> \"open\" is weaker than \"free\"</"
+"a>."
 msgstr ""
-"openSUSE ofrece a sus usuarios acceso a un repositorio de software que no es "
-"libre."
 
 # type: Content of: outside any tag (error?)
 msgid "<a id=\"RedHat\"></a>"
 msgstr "<a id=\"RedHat\"></a>"
 
 # type: Content of: <h3>
-msgid "Red Hat"
-msgstr "Red Hat"
+msgid "Red Hat GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
 msgid ""
@@ -304,12 +341,19 @@
 msgstr "Slackware"
 
 # type: Content of: <p>
-msgid ""
-"Slackware has the two problems listed above: there's no clear policy about "
-"what software can be included, and nonfree blobs are shipped with Linux.  It "
-"also ships with the nonfree image-viewing program xv.  Of course, with no "
-"firm policy in place, there might be other nonfree software included that we "
-"missed."
+#, fuzzy
+#| msgid ""
+#| "Slackware has the two problems listed above: there's no clear policy "
+#| "about what software can be included, and nonfree blobs are shipped with "
+#| "Linux.  It also ships with the nonfree image-viewing program xv.  Of "
+#| "course, with no firm policy in place, there might be other nonfree "
+#| "software included that we missed."
+msgid ""
+"Slackware has the two usual problems: there's no clear policy about what "
+"software can be included, and nonfree blobs are included in Linux, the "
+"kernel.  It also ships with the nonfree image-viewing program xv.  Of "
+"course, with no firm policy in place, there might be other nonfree software "
+"included that we missed."
 msgstr ""
 "Slackware padece los dos problemas mencionados mÃ¡s arriba: no existe una "
 "polÃtica especÃfica sobre el software que puede incluirse, y se distribuyen 
"
@@ -323,13 +367,17 @@
 msgstr "<a id=\"SUSE\"></a>"
 
 # type: Content of: <h3>
-msgid "SUSE"
-msgstr "SUSE"
+msgid "SUSE GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Several nonfree software programs are available for download from SUSE's "
+#| "official FTP site."
 msgid ""
-"Several nonfree software programs are available for download from SUSE's "
-"official FTP site."
+"In addition to the usual two problens, several nonfree software programs are "
+"available for download from SUSE's official FTP site."
 msgstr ""
 "Varios programas que no son libres estÃ¡n disponibles para su descarga desde "
 "el sitio FTP oficial de SUSE."
@@ -339,15 +387,24 @@
 msgstr "<a id=\"Ubuntu\"></a>"
 
 # type: Content of: <h3>
-msgid "Ubuntu"
-msgstr "Ubuntu"
+msgid "Ubuntu GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels.  Even if you try to avoid all of "
+#| "that, the default application installer will advertise nonfree software "
+#| "to you."
 msgid ""
 "Ubuntu provides specific repositories of nonfree software, and Canonical "
 "expressly promotes and recommends nonfree software under the Ubuntu name in "
-"some of their distribution channels.  Even if you try to avoid all of that, "
-"the default application installer will advertise nonfree software to you."
+"some of their distribution channels.  Ubuntu offers the option to install "
+"only free packages, which means it also offers the option to install nonfree "
+"packages too.  In addition, the version of Linux included in Ubuntu contains "
+"firmware \"blobs\"."
 msgstr ""
 "Ubuntu provee repositorios especÃficos de software que no es libre, y "
 "Canonical promueve y recomienda explÃcitamente en nombre de Ubuntu software "
@@ -364,39 +421,33 @@
 msgstr "Â¿QuÃ© hay acerca las distribuciones BSD?"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "FreeBSD, NetBSD, and OpenBSD all include instructions for obtaining "
+#| "nonfree programs in their ports system."
 msgid ""
 "FreeBSD, NetBSD, and OpenBSD all include instructions for obtaining nonfree "
-"programs in their ports system."
+"programs in their ports system.  In addition, their kernels includes nonfree "
+"firmware blobs."
 msgstr ""
 "FreeBSD, NetBSD y OpenBSD, todas ellas, incluyen instrucciones para obtener "
 "programas que no son libres en sus sistemas."
 
 # type: Content of: <p>
 msgid ""
-"BSD systems refer to proprietary drivers as &ldquo;blobs&rdquo; and some "
-"have policies against including these.  That is good, but unfortunately no "
-"BSD system has policies against proprietary binary-only firmware that might "
-"be loaded even by free drivers."
-msgstr ""
-"Los sistemas BSD se denominan a los controladores privativos Â«blobsÂ», y "
-"algunos de ellos tienen polÃticas en contra de su inclusiÃ³n. Eso es bueno, "
-"pero desafortunadamente ningÃºn sistema BSD tiene una polÃtica en contra del 
"
-"firmware que sÃ³lo estÃ© disponible en formato binario, que pueda ejecutarse "
-"incluso desde controladores libres."
+"Nonfree firmware programs in Linux are called &ldquo;blobs,&rdquo; and "
+"that's how we use the term.  In BSD parlance, the term &ldquo;blob&rdquo; "
+"means something else: a nonfree driver.  Some BSD distros have the policy of "
+"not including those.  That is the right policy, as regards drivers; but when "
+"the developers say these distros &ldquo;contain no blobs,&rdquo;, it causes "
+"a misunderstanding.  They are not taking about firmware blobs."
+msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"Nonfree firmwares in Linux are called &ldquo;blobs,&rdquo; but the meaning "
-"in BSD parlance is different, as above.  Thus, when BSD developers say their "
-"distributions contains no blobs, it is a miscommunication; they are talking "
-"about something else."
-msgstr ""
-"El firmware que no es libre en Linux se llama Â«<span style=\"font-style:"
-"italic;\">blob</span>Â», pero en el idioma BSD Â«<span style=\"font-style:"
-"italic;\">blob</span>Â» tiene un significado distinto. Por ende, cuando los "
-"desarrolladores de BSD dicen que sus distribuciones no contienen <span style="
-"\"font-style:italic;\">blobs</span>, incurren en un problema de "
-"comunicaciÃ³n: estÃ¡n hablando de otro asunto."
+"No BSD distro has policies against proprietary binary-only firmware that "
+"might be loaded even by free drivers."
+msgstr ""
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -456,6 +507,64 @@
 msgid "Translations of this page"
 msgstr "Traducciones de esta pÃ¡gina"
 
+# type: Content of: <h3>
+#~ msgid "Arch"
+#~ msgstr "Arch"
+
+# type: Content of: <h3>
+#~ msgid "Debian"
+#~ msgstr "Debian"
+
+# type: Content of: <h3>
+#~ msgid "Gentoo"
+#~ msgstr "Gentoo"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "openSUSE offers its users access to a repository of nonfree software."
+#~ msgstr ""
+#~ "openSUSE ofrece a sus usuarios acceso a un repositorio de software que no "
+#~ "es libre."
+
+# type: Content of: <h3>
+#~ msgid "Red Hat"
+#~ msgstr "Red Hat"
+
+# type: Content of: <h3>
+#~ msgid "SUSE"
+#~ msgstr "SUSE"
+
+# type: Content of: <h3>
+#~ msgid "Ubuntu"
+#~ msgstr "Ubuntu"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "BSD systems refer to proprietary drivers as &ldquo;blobs&rdquo; and some "
+#~ "have policies against including these.  That is good, but unfortunately "
+#~ "no BSD system has policies against proprietary binary-only firmware that "
+#~ "might be loaded even by free drivers."
+#~ msgstr ""
+#~ "Los sistemas BSD se denominan a los controladores privativos Â«blobsÂ», y "
+#~ "algunos de ellos tienen polÃticas en contra de su inclusiÃ³n. Eso es "
+#~ "bueno, pero desafortunadamente ningÃºn sistema BSD tiene una polÃtica en "
+#~ "contra del firmware que sÃ³lo estÃ© disponible en formato binario, que "
+#~ "pueda ejecutarse incluso desde controladores libres."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Nonfree firmwares in Linux are called &ldquo;blobs,&rdquo; but the "
+#~ "meaning in BSD parlance is different, as above.  Thus, when BSD "
+#~ "developers say their distributions contains no blobs, it is a "
+#~ "miscommunication; they are talking about something else."
+#~ msgstr ""
+#~ "El firmware que no es libre en Linux se llama Â«<span style=\"font-style:"
+#~ "italic;\">blob</span>Â», pero en el idioma BSD Â«<span style=\"font-style:"
+#~ "italic;\">blob</span>Â» tiene un significado distinto. Por ende, cuando "
+#~ "los desarrolladores de BSD dicen que sus distribuciones no contienen "
+#~ "<span style=\"font-style:italic;\">blobs</span>, incurren en un problema "
+#~ "de comunicaciÃ³n: estÃ¡n hablando de otro asunto."
+
 # type: Content of: <p>
 #~ msgid ""
 #~ "Red Hat's enterprise distribution doesn't seem to have a clear policy "

Index: distros/po/common-distros.fr.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.fr.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- distros/po/common-distros.fr.po     13 Jan 2011 17:27:34 -0000      1.19
+++ distros/po/common-distros.fr.po     30 Jan 2011 17:27:39 -0000      1.20
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2011-01-13 12:27-0500\n"
+"POT-Creation-Date: 2011-01-30 12:27-0500\n"
 "PO-Revision-Date: 2010-02-14 14:51+0100\n"
 "Last-Translator: CÃ©dric Corazza <cedric.corazza AT wanadoo.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -54,9 +54,13 @@
 "libres</a>."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "All of the distributions listed on this page fail to follow the "
+#| "guidelines in at least two important ways:"
 msgid ""
-"All of the distributions listed on this page fail to follow the guidelines "
-"in at least two important ways:"
+"Except where noted, all of the distributions listed on this page fail to "
+"follow the guidelines in at least two important ways:"
 msgstr ""
 "Toutes les distributions listÃ©es dans cette page ne respectent pas les "
 "recommandations pour au moins deux points importants&nbsp;:"
@@ -75,10 +79,15 @@
 "malheureusement pas assez strictes, comme c'est expliquÃ© ci-dessous."
 
 # type: Content of: <ul><li><p>
-msgid ""
-"The version of the kernel Linux that they distribute includes blobs: pieces "
-"of object code, distributed without source, usually to help operate some "
-"device."
+#, fuzzy
+#| msgid ""
+#| "The version of the kernel Linux that they distribute includes blobs: "
+#| "pieces of object code, distributed without source, usually to help "
+#| "operate some device."
+msgid ""
+"The kernel that they distribute (in most cases, Linux) includes <em>blobs</"
+"em>: pieces of object code distributed without source, usually firmware to "
+"run some device."
 msgstr ""
 "La version du noyau Linux qu'elles distribuent contient des blobs&nbsp;: des "
 "morceaux de code objet, distribuÃ©s sans les sources, habituellement pour "
@@ -111,7 +120,7 @@
 msgstr "<a id=\"BSD\"></a>"
 
 # type: Content of: <h3>
-msgid "Arch"
+msgid "Arch GNU/Linux"
 msgstr ""
 
 # type: Content of: <p>
@@ -122,10 +131,10 @@
 #| "blobs are shipped with Linux.  Of course, with no firm policy in place, "
 #| "there might be other nonfree software included that we missed."
 msgid ""
-"Arch has the two common issues listed above: there's no clear policy about "
-"what software can be included, and nonfree blobs are shipped with their "
-"Linux kernel.  Arch also has no policy about not distributing nonfree "
-"software through their normal channels."
+"Arch has the two usual problems: there's no clear policy about what software "
+"can be included, and nonfree blobs are shipped with their Linux kernel.  "
+"Arch also has no policy about not distributing nonfree software through "
+"their normal channels."
 msgstr ""
 "Nous ne connaissons pas de problÃ¨mes dans CentOS hormis les deux ci-"
 "dessus&nbsp;: il n'y a pas de politique claire sur les logiciels qui peuvent "
@@ -142,10 +151,16 @@
 msgstr "CentOS"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "We're not aware of problems in CentOS aside from the two listed above: "
+#| "there's no clear policy about what software can be included, and nonfree "
+#| "blobs are shipped with Linux.  Of course, with no firm policy in place, "
+#| "there might be other nonfree software included that we missed."
 msgid ""
-"We're not aware of problems in CentOS aside from the two listed above: "
-"there's no clear policy about what software can be included, and nonfree "
-"blobs are shipped with Linux.  Of course, with no firm policy in place, "
+"We're not aware of problems in CentOS aside from the two usual ones: there's "
+"no clear policy about what software can be included, and nonfree blobs are "
+"shipped with Linux, the kernel.  Of course, with no firm policy in place, "
 "there might be other nonfree software included that we missed."
 msgstr ""
 "Nous ne connaissons pas de problÃ¨mes dans CentOS hormis les deux ci-"
@@ -159,17 +174,27 @@
 msgstr "<a id=\"Debian\"></a>"
 
 # type: Content of: <h3>
-msgid "Debian"
-msgstr "Debian"
+msgid "Debian GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract does say that all software in the main "
+#| "distribution will be free software.  Unfortunately, that's not always "
+#| "true in practice.  Debian has repeatedly made tacit or explicit "
+#| "exceptions for specific pieces of nonfree software, such as the blobs "
+#| "included in or accompanying Linux.  We're still hopeful that there won't "
+#| "be such exceptions in the future, but we can't turn a blind eye to the "
+#| "situation as it stands today."
 msgid ""
 "Debian's Social Contract does say that all software in the main distribution "
-"will be free software.  Unfortunately, that's not always true in practice.  "
+"will be free software.  At present, that's not always true in practice: "
 "Debian has repeatedly made tacit or explicit exceptions for specific pieces "
 "of nonfree software, such as the blobs included in or accompanying Linux.  "
-"We're still hopeful that there won't be such exceptions in the future, but "
-"we can't turn a blind eye to the situation as it stands today."
+"The next release of Debian will reportedly move these blobs out of Linux.  "
+"That will be a substantial step towards a completely free distro, but won't "
+"get all the way there."
 msgstr ""
 "Le Contrat social de Debian spÃ©cifie que tous les logiciels dans la "
 "distribution principale seront libres. Malheureusement, ce n'est pas "
@@ -234,8 +259,8 @@
 msgstr "<a id=\"Gentoo\"></a>"
 
 # type: Content of: <h3>
-msgid "Gentoo"
-msgstr "Gentoo"
+msgid "Gentoo GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
 msgid ""
@@ -250,7 +275,9 @@
 msgstr "<a id=\"Mandriva\"></a>"
 
 # type: Content of: <h3>
-msgid "Mandriva"
+#, fuzzy
+#| msgid "Mandriva"
+msgid "Mandriva GNU/Linux"
 msgstr "Mandriva"
 
 # type: Content of: <p>
@@ -277,22 +304,26 @@
 msgstr "<a id=\"openSUSE\"></a>"
 
 # type: Content of: <h3>
-msgid "openSUSE"
+#, fuzzy
+#| msgid "openSUSE"
+msgid "openSUSE GNU/Linux"
 msgstr "openSUSE"
 
 # type: Content of: <p>
-msgid "openSUSE offers its users access to a repository of nonfree software."
+msgid ""
+"openSUSE offers its users access to a repository of nonfree software.  This "
+"is an instance of how <a href=\"/philosophy/open-source-misses-the-point."
+"htmlopen-source-misses-the-point.html\"> \"open\" is weaker than \"free\"</"
+"a>."
 msgstr ""
-"openSUSE propose Ã  ces utilisateurs un accÃ¨s Ã  des entrepÃ´ts de logiciels 
"
-"non-libres."
 
 # type: Content of: outside any tag (error?)
 msgid "<a id=\"RedHat\"></a>"
 msgstr "<a id=\"RedHat\"></a>"
 
 # type: Content of: <h3>
-msgid "Red Hat"
-msgstr "Red Hat"
+msgid "Red Hat GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
 msgid ""
@@ -324,11 +355,11 @@
 #| "blobs are shipped with Linux.  Of course, with no firm policy in place, "
 #| "there might be other nonfree software included that we missed."
 msgid ""
-"Slackware has the two problems listed above: there's no clear policy about "
-"what software can be included, and nonfree blobs are shipped with Linux.  It "
-"also ships with the nonfree image-viewing program xv.  Of course, with no "
-"firm policy in place, there might be other nonfree software included that we "
-"missed."
+"Slackware has the two usual problems: there's no clear policy about what "
+"software can be included, and nonfree blobs are included in Linux, the "
+"kernel.  It also ships with the nonfree image-viewing program xv.  Of "
+"course, with no firm policy in place, there might be other nonfree software "
+"included that we missed."
 msgstr ""
 "Nous ne connaissons pas de problÃ¨mes dans Slackware, hormis ceux listÃ©s 
plus "
 "haut&nbsp;: il n'y a pas de politique claire sur les logiciels qui peuvent "
@@ -341,13 +372,17 @@
 msgstr "<a id=\"SUSE\"></a>"
 
 # type: Content of: <h3>
-msgid "SUSE"
-msgstr "SUSE"
+msgid "SUSE GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Several nonfree software programs are available for download from SUSE's "
+#| "official FTP site."
 msgid ""
-"Several nonfree software programs are available for download from SUSE's "
-"official FTP site."
+"In addition to the usual two problens, several nonfree software programs are "
+"available for download from SUSE's official FTP site."
 msgstr ""
 "Plusieurs logiciels non-libres sont disponibles au tÃ©lÃ©chargements sur le "
 "site FTP officiel de SUSE."
@@ -357,8 +392,8 @@
 msgstr "<a id=\"Ubuntu\"></a>"
 
 # type: Content of: <h3>
-msgid "Ubuntu"
-msgstr "Ubuntu"
+msgid "Ubuntu GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
 #, fuzzy
@@ -369,8 +404,10 @@
 msgid ""
 "Ubuntu provides specific repositories of nonfree software, and Canonical "
 "expressly promotes and recommends nonfree software under the Ubuntu name in "
-"some of their distribution channels.  Even if you try to avoid all of that, "
-"the default application installer will advertise nonfree software to you."
+"some of their distribution channels.  Ubuntu offers the option to install "
+"only free packages, which means it also offers the option to install nonfree "
+"packages too.  In addition, the version of Linux included in Ubuntu contains "
+"firmware \"blobs\"."
 msgstr ""
 "Ubuntu propose des entrepÃ´ts de logiciels non-libres. MÃªme si vous ne les "
 "utilisez pas, l'installeur d'application par dÃ©faut vous proposera des "
@@ -385,37 +422,33 @@
 msgstr "Et au sujet des systÃ¨mes BSD&nbsp;?"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "FreeBSD, NetBSD, and OpenBSD all include instructions for obtaining "
+#| "nonfree programs in their ports system."
 msgid ""
 "FreeBSD, NetBSD, and OpenBSD all include instructions for obtaining nonfree "
-"programs in their ports system."
+"programs in their ports system.  In addition, their kernels includes nonfree "
+"firmware blobs."
 msgstr ""
 "FreeBSD, NetBSD et OpenBSD incluent toutes des instructions pour obtenir des "
 "programmes non-libres dans leur systÃ¨me de ports."
 
 # type: Content of: <p>
 msgid ""
-"BSD systems refer to proprietary drivers as &ldquo;blobs&rdquo; and some "
-"have policies against including these.  That is good, but unfortunately no "
-"BSD system has policies against proprietary binary-only firmware that might "
-"be loaded even by free drivers."
-msgstr ""
-"Les systÃ¨mes BSD se rÃ©fÃ¨rent Ã  des pilotes propriÃ©taires comme les 
Â«&nbsp;"
-"blobs&nbsp;Â» et certains ont une politique contre l'inclusions de ceux-ci. "
-"C'est bien, mais malheureusement, aucun systÃ¨me BSD n'a de politique contre "
-"les firmware binaires propriÃ©taires qui pourraient Ãªtre chargÃ©s, mÃªme par 
"
-"des pilotes libres."
+"Nonfree firmware programs in Linux are called &ldquo;blobs,&rdquo; and "
+"that's how we use the term.  In BSD parlance, the term &ldquo;blob&rdquo; "
+"means something else: a nonfree driver.  Some BSD distros have the policy of "
+"not including those.  That is the right policy, as regards drivers; but when "
+"the developers say these distros &ldquo;contain no blobs,&rdquo;, it causes "
+"a misunderstanding.  They are not taking about firmware blobs."
+msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"Nonfree firmwares in Linux are called &ldquo;blobs,&rdquo; but the meaning "
-"in BSD parlance is different, as above.  Thus, when BSD developers say their "
-"distributions contains no blobs, it is a miscommunication; they are talking "
-"about something else."
-msgstr ""
-"Les microcodes non-libres dans Linux sont appelÃ©s Â«&nbsp;blobs&nbsp;Â», 
mais "
-"dans le vocabulaire BSD, Â«&nbsp;blob&nbsp;Â» a un autre sens. Par 
consÃ©quent, "
-"quand les dÃ©veloppeurs BSD disent que leurs distributions ne contiennent pas 
"
-"de blobs, il y a mauvaise communication, car ils parlent d'autre chose."
+"No BSD distro has policies against proprietary binary-only firmware that "
+"might be loaded even by free drivers."
+msgstr ""
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -477,3 +510,56 @@
 # type: Content of: <div><h4>
 msgid "Translations of this page"
 msgstr "Traductions de cette page"
+
+# type: Content of: <h3>
+#~ msgid "Debian"
+#~ msgstr "Debian"
+
+# type: Content of: <h3>
+#~ msgid "Gentoo"
+#~ msgstr "Gentoo"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "openSUSE offers its users access to a repository of nonfree software."
+#~ msgstr ""
+#~ "openSUSE propose Ã  ces utilisateurs un accÃ¨s Ã  des entrepÃ´ts de 
logiciels "
+#~ "non-libres."
+
+# type: Content of: <h3>
+#~ msgid "Red Hat"
+#~ msgstr "Red Hat"
+
+# type: Content of: <h3>
+#~ msgid "SUSE"
+#~ msgstr "SUSE"
+
+# type: Content of: <h3>
+#~ msgid "Ubuntu"
+#~ msgstr "Ubuntu"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "BSD systems refer to proprietary drivers as &ldquo;blobs&rdquo; and some "
+#~ "have policies against including these.  That is good, but unfortunately "
+#~ "no BSD system has policies against proprietary binary-only firmware that "
+#~ "might be loaded even by free drivers."
+#~ msgstr ""
+#~ "Les systÃ¨mes BSD se rÃ©fÃ¨rent Ã  des pilotes propriÃ©taires comme les 
Â«&nbsp;"
+#~ "blobs&nbsp;Â» et certains ont une politique contre l'inclusions de ceux-"
+#~ "ci. C'est bien, mais malheureusement, aucun systÃ¨me BSD n'a de politique "
+#~ "contre les firmware binaires propriÃ©taires qui pourraient Ãªtre chargÃ©s, 
"
+#~ "mÃªme par des pilotes libres."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Nonfree firmwares in Linux are called &ldquo;blobs,&rdquo; but the "
+#~ "meaning in BSD parlance is different, as above.  Thus, when BSD "
+#~ "developers say their distributions contains no blobs, it is a "
+#~ "miscommunication; they are talking about something else."
+#~ msgstr ""
+#~ "Les microcodes non-libres dans Linux sont appelÃ©s Â«&nbsp;blobs&nbsp;Â», "
+#~ "mais dans le vocabulaire BSD, Â«&nbsp;blob&nbsp;Â» a un autre sens. Par "
+#~ "consÃ©quent, quand les dÃ©veloppeurs BSD disent que leurs distributions ne 
"
+#~ "contiennent pas de blobs, il y a mauvaise communication, car ils parlent "
+#~ "d'autre chose."

Index: distros/po/common-distros.pl.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pl.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- distros/po/common-distros.pl.po     15 Jan 2011 01:28:06 -0000      1.10
+++ distros/po/common-distros.pl.po     30 Jan 2011 17:27:39 -0000      1.11
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2011-01-13 12:27-0500\n"
+"POT-Creation-Date: 2011-01-30 12:27-0500\n"
 "PO-Revision-Date: 2011-01-14 10:09+0200\n"
 "Last-Translator: Marcin Wolak <address@hidden>\n"
 "Language-Team: Polish <address@hidden>\n"
@@ -60,9 +60,13 @@
 "dystrybucji GNU/Linux</a>."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "All of the distributions listed on this page fail to follow the "
+#| "guidelines in at least two important ways:"
 msgid ""
-"All of the distributions listed on this page fail to follow the guidelines "
-"in at least two important ways:"
+"Except where noted, all of the distributions listed on this page fail to "
+"follow the guidelines in at least two important ways:"
 msgstr ""
 "Wszystkie dystrybucje wymienione na&nbsp;tej stronie ÅamiÄ przestrzeganie "
 "wytycznych przynajmniej z&nbsp;dwÃ³ch waÅ¼nych powodÃ³w:"
@@ -81,10 +85,15 @@
 "konsekwentne w&nbsp;jej przestrzeganiu, jak wyjaÅniamy poniÅ¼ej."
 
 # type: Content of: <ul><li><p>
-msgid ""
-"The version of the kernel Linux that they distribute includes blobs: pieces "
-"of object code, distributed without source, usually to help operate some "
-"device."
+#, fuzzy
+#| msgid ""
+#| "The version of the kernel Linux that they distribute includes blobs: "
+#| "pieces of object code, distributed without source, usually to help "
+#| "operate some device."
+msgid ""
+"The kernel that they distribute (in most cases, Linux) includes <em>blobs</"
+"em>: pieces of object code distributed without source, usually firmware to "
+"run some device."
 msgstr ""
 "Wersja jÄdra Linux doÅÄczana do&nbsp;ich dystrybucji zawiera maÅe 
kawaÅki "
 "obiektowego kodu, rozprowadzanego bez&nbsp;kodu ÅºrÃ³dÅowego, zazwyczaj "
@@ -115,15 +124,21 @@
 msgstr "<a id=\"Arch\"></a>"
 
 # type: Content of: <h3>
-msgid "Arch"
-msgstr "Arch"
+msgid "Arch GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Arch has the two common issues listed above: there's no clear policy "
+#| "about what software can be included, and nonfree blobs are shipped with "
+#| "their Linux kernel.  Arch also has no policy about not distributing "
+#| "nonfree software through their normal channels."
 msgid ""
-"Arch has the two common issues listed above: there's no clear policy about "
-"what software can be included, and nonfree blobs are shipped with their "
-"Linux kernel.  Arch also has no policy about not distributing nonfree "
-"software through their normal channels."
+"Arch has the two usual problems: there's no clear policy about what software "
+"can be included, and nonfree blobs are shipped with their Linux kernel.  "
+"Arch also has no policy about not distributing nonfree software through "
+"their normal channels."
 msgstr ""
 "Arch ma&nbsp;dwa podobne problemy wymienione powyÅ¼ej:  nie&nbsp;ma czystej "
 "polityki dotyczÄcej tego, co moÅ¼e byÄ doÅÄczane i&nbsp;drobna iloÅÄ "
@@ -140,10 +155,16 @@
 msgstr "CentOS"
 
 # type: Content of: <p>
-msgid ""
-"We're not aware of problems in CentOS aside from the two listed above: "
-"there's no clear policy about what software can be included, and nonfree "
-"blobs are shipped with Linux.  Of course, with no firm policy in place, "
+#, fuzzy
+#| msgid ""
+#| "We're not aware of problems in CentOS aside from the two listed above: "
+#| "there's no clear policy about what software can be included, and nonfree "
+#| "blobs are shipped with Linux.  Of course, with no firm policy in place, "
+#| "there might be other nonfree software included that we missed."
+msgid ""
+"We're not aware of problems in CentOS aside from the two usual ones: there's "
+"no clear policy about what software can be included, and nonfree blobs are "
+"shipped with Linux, the kernel.  Of course, with no firm policy in place, "
 "there might be other nonfree software included that we missed."
 msgstr ""
 "Nie&nbsp;jesteÅmy Åwiadomi problemÃ³w wystÄpujÄcych w&nbsp;CentOS oprÃ³cz 
"
@@ -157,17 +178,27 @@
 msgstr "<a id=\"Debian\"></a>"
 
 # type: Content of: <h3>
-msgid "Debian"
-msgstr "Debian"
+msgid "Debian GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract does say that all software in the main "
+#| "distribution will be free software.  Unfortunately, that's not always "
+#| "true in practice.  Debian has repeatedly made tacit or explicit "
+#| "exceptions for specific pieces of nonfree software, such as the blobs "
+#| "included in or accompanying Linux.  We're still hopeful that there won't "
+#| "be such exceptions in the future, but we can't turn a blind eye to the "
+#| "situation as it stands today."
 msgid ""
 "Debian's Social Contract does say that all software in the main distribution "
-"will be free software.  Unfortunately, that's not always true in practice.  "
+"will be free software.  At present, that's not always true in practice: "
 "Debian has repeatedly made tacit or explicit exceptions for specific pieces "
 "of nonfree software, such as the blobs included in or accompanying Linux.  "
-"We're still hopeful that there won't be such exceptions in the future, but "
-"we can't turn a blind eye to the situation as it stands today."
+"The next release of Debian will reportedly move these blobs out of Linux.  "
+"That will be a substantial step towards a completely free distro, but won't "
+"get all the way there."
 msgstr ""
 "SpoÅeczny kontrakt Debiana mÃ³wi, Å¼e&nbsp;caÅe oprogramowanie 
w&nbsp;gÅÃ³wnej "
 "dystrybucji bÄdzie wolnym oprogramowaniem. Niestety, nie&nbsp;zawsze jest "
@@ -226,8 +257,8 @@
 msgstr "<a id=\"Gentoo\"></a>"
 
 # type: Content of: <h3>
-msgid "Gentoo"
-msgstr "Gentoo"
+msgid "Gentoo GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
 msgid ""
@@ -242,7 +273,9 @@
 msgstr "<a id=\"Mandriva\"></a>"
 
 # type: Content of: <h3>
-msgid "Mandriva"
+#, fuzzy
+#| msgid "Mandriva"
+msgid "Mandriva GNU/Linux"
 msgstr "Mandriva"
 
 # type: Content of: <p>
@@ -270,22 +303,26 @@
 msgstr "<a id=\"openSUSE\"></a>"
 
 # type: Content of: <h3>
-msgid "openSUSE"
+#, fuzzy
+#| msgid "openSUSE"
+msgid "openSUSE GNU/Linux"
 msgstr "openSUSE"
 
 # type: Content of: <p>
-msgid "openSUSE offers its users access to a repository of nonfree software."
+msgid ""
+"openSUSE offers its users access to a repository of nonfree software.  This "
+"is an instance of how <a href=\"/philosophy/open-source-misses-the-point."
+"htmlopen-source-misses-the-point.html\"> \"open\" is weaker than \"free\"</"
+"a>."
 msgstr ""
-"openSUSE oferuje swoim uÅ¼ytkownikom dostÄp do&nbsp;niewolnego 
oprogramowania "
-"w&nbsp;repozytorium."
 
 # type: Content of: outside any tag (error?)
 msgid "<a id=\"RedHat\"></a>"
 msgstr "<a id=\"RedHat\"></a>"
 
 # type: Content of: <h3>
-msgid "Red Hat"
-msgstr "Red Hat"
+msgid "Red Hat GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
 msgid ""
@@ -311,12 +348,19 @@
 msgstr "Slackware"
 
 # type: Content of: <p>
-msgid ""
-"Slackware has the two problems listed above: there's no clear policy about "
-"what software can be included, and nonfree blobs are shipped with Linux.  It "
-"also ships with the nonfree image-viewing program xv.  Of course, with no "
-"firm policy in place, there might be other nonfree software included that we "
-"missed."
+#, fuzzy
+#| msgid ""
+#| "Slackware has the two problems listed above: there's no clear policy "
+#| "about what software can be included, and nonfree blobs are shipped with "
+#| "Linux.  It also ships with the nonfree image-viewing program xv.  Of "
+#| "course, with no firm policy in place, there might be other nonfree "
+#| "software included that we missed."
+msgid ""
+"Slackware has the two usual problems: there's no clear policy about what "
+"software can be included, and nonfree blobs are included in Linux, the "
+"kernel.  It also ships with the nonfree image-viewing program xv.  Of "
+"course, with no firm policy in place, there might be other nonfree software "
+"included that we missed."
 msgstr ""
 "Slackware ma dwa problemy wymienione powyÅ¼ej: nie&nbsp;ma czystej polityki "
 "dotyczÄcej tego, co moÅ¼e byÄ doÅÄczane i&nbsp;drobna iloÅÄ niewolnego "
@@ -330,13 +374,17 @@
 msgstr "<a id=\"SUSE\"></a>"
 
 # type: Content of: <h3>
-msgid "SUSE"
-msgstr "SUSE"
+msgid "SUSE GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Several nonfree software programs are available for download from SUSE's "
+#| "official FTP site."
 msgid ""
-"Several nonfree software programs are available for download from SUSE's "
-"official FTP site."
+"In addition to the usual two problens, several nonfree software programs are "
+"available for download from SUSE's official FTP site."
 msgstr ""
 "Niewielka iloÅÄ niewolnych programÃ³w jest dostÄpna do&nbsp;pobrania 
z&nbsp;"
 "oficjalnego FTP strony SUSE."
@@ -346,15 +394,24 @@
 msgstr "<a id=\"Ubuntu\"></a>"
 
 # type: Content of: <h3>
-msgid "Ubuntu"
-msgstr "Ubuntu"
+msgid "Ubuntu GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels.  Even if you try to avoid all of "
+#| "that, the default application installer will advertise nonfree software "
+#| "to you."
 msgid ""
 "Ubuntu provides specific repositories of nonfree software, and Canonical "
 "expressly promotes and recommends nonfree software under the Ubuntu name in "
-"some of their distribution channels.  Even if you try to avoid all of that, "
-"the default application installer will advertise nonfree software to you."
+"some of their distribution channels.  Ubuntu offers the option to install "
+"only free packages, which means it also offers the option to install nonfree "
+"packages too.  In addition, the version of Linux included in Ubuntu contains "
+"firmware \"blobs\"."
 msgstr ""
 "Ubuntu zapewnia konkretne repozytoria niewolnego oprogramowania i&nbsp;"
 "Cannonical wyraÅºnie promuje oraz&nbsp;zaleca niewolne oprogramowanie "
@@ -371,37 +428,33 @@
 msgstr "Co z&nbsp;systemami BSD?"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "FreeBSD, NetBSD, and OpenBSD all include instructions for obtaining "
+#| "nonfree programs in their ports system."
 msgid ""
 "FreeBSD, NetBSD, and OpenBSD all include instructions for obtaining nonfree "
-"programs in their ports system."
+"programs in their ports system.  In addition, their kernels includes nonfree "
+"firmware blobs."
 msgstr ""
 "FreeBSD, NetBSD i&nbsp;OpenBSD doÅÄczajÄ instrukcje uzyskania niewolnych "
 "programÃ³w w&nbsp;ich systemowych portach."
 
 # type: Content of: <p>
 msgid ""
-"BSD systems refer to proprietary drivers as &ldquo;blobs&rdquo; and some "
-"have policies against including these.  That is good, but unfortunately no "
-"BSD system has policies against proprietary binary-only firmware that might "
-"be loaded even by free drivers."
-msgstr ""
-"Systemy z&nbsp;rodziny BSD nazywajÄ sterowniki wÅasnoÅciowe &bdquo;"
-"<em>blobs</em>&rdquo; (plamki) i&nbsp;niektÃ³re prowadzÄ politykÄ przeciwko 
"
-"doÅÄczaniu ich. To jest dobre, lecz&nbsp;niestety Å¼aden system BSD nie "
-"prowadzi polityki przeciwko prawnie zastrzeÅ¼onym binariom firmware'u, ktÃ³re 
"
-"moÅ¼e byÄ obsÅugiwane nawet przez wolne sterowniki."
+"Nonfree firmware programs in Linux are called &ldquo;blobs,&rdquo; and "
+"that's how we use the term.  In BSD parlance, the term &ldquo;blob&rdquo; "
+"means something else: a nonfree driver.  Some BSD distros have the policy of "
+"not including those.  That is the right policy, as regards drivers; but when "
+"the developers say these distros &ldquo;contain no blobs,&rdquo;, it causes "
+"a misunderstanding.  They are not taking about firmware blobs."
+msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"Nonfree firmwares in Linux are called &ldquo;blobs,&rdquo; but the meaning "
-"in BSD parlance is different, as above.  Thus, when BSD developers say their "
-"distributions contains no blobs, it is a miscommunication; they are talking "
-"about something else."
-msgstr ""
-"Niewolne firmware'y w&nbsp;Linuksie nazywane sÄ &bdquo;plamkami&rdquo; "
-"ale&nbsp;rozumowanie BSD nieco siÄ rÃ³Å¼ni, jak powyÅ¼ej. A&nbsp;zatem kiedy 
"
-"deweloperzy BSD stwierdzÄ, Å¼e&nbsp;ich dystrybucje nie&nbsp;zawierajÄ 
&bdquo;"
-"plamek&rdquo;, bÄdzie to nieporozumienie. Oni mÃ³wiÄ o&nbsp;czymÅ innym."
+"No BSD distro has policies against proprietary binary-only firmware that "
+"might be loaded even by free drivers."
+msgstr ""
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -466,3 +519,60 @@
 # type: Content of: <div><h4>
 msgid "Translations of this page"
 msgstr "TÅumaczenia tej strony"
+
+# type: Content of: <h3>
+#~ msgid "Arch"
+#~ msgstr "Arch"
+
+# type: Content of: <h3>
+#~ msgid "Debian"
+#~ msgstr "Debian"
+
+# type: Content of: <h3>
+#~ msgid "Gentoo"
+#~ msgstr "Gentoo"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "openSUSE offers its users access to a repository of nonfree software."
+#~ msgstr ""
+#~ "openSUSE oferuje swoim uÅ¼ytkownikom dostÄp do&nbsp;niewolnego "
+#~ "oprogramowania w&nbsp;repozytorium."
+
+# type: Content of: <h3>
+#~ msgid "Red Hat"
+#~ msgstr "Red Hat"
+
+# type: Content of: <h3>
+#~ msgid "SUSE"
+#~ msgstr "SUSE"
+
+# type: Content of: <h3>
+#~ msgid "Ubuntu"
+#~ msgstr "Ubuntu"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "BSD systems refer to proprietary drivers as &ldquo;blobs&rdquo; and some "
+#~ "have policies against including these.  That is good, but unfortunately "
+#~ "no BSD system has policies against proprietary binary-only firmware that "
+#~ "might be loaded even by free drivers."
+#~ msgstr ""
+#~ "Systemy z&nbsp;rodziny BSD nazywajÄ sterowniki wÅasnoÅciowe &bdquo;"
+#~ "<em>blobs</em>&rdquo; (plamki) i&nbsp;niektÃ³re prowadzÄ politykÄ "
+#~ "przeciwko doÅÄczaniu ich. To jest dobre, lecz&nbsp;niestety Å¼aden 
system "
+#~ "BSD nie prowadzi polityki przeciwko prawnie zastrzeÅ¼onym binariom "
+#~ "firmware'u, ktÃ³re moÅ¼e byÄ obsÅugiwane nawet przez wolne sterowniki."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Nonfree firmwares in Linux are called &ldquo;blobs,&rdquo; but the "
+#~ "meaning in BSD parlance is different, as above.  Thus, when BSD "
+#~ "developers say their distributions contains no blobs, it is a "
+#~ "miscommunication; they are talking about something else."
+#~ msgstr ""
+#~ "Niewolne firmware'y w&nbsp;Linuksie nazywane sÄ &bdquo;plamkami&rdquo; "
+#~ "ale&nbsp;rozumowanie BSD nieco siÄ rÃ³Å¼ni, jak powyÅ¼ej. A&nbsp;zatem 
kiedy "
+#~ "deweloperzy BSD stwierdzÄ, Å¼e&nbsp;ich dystrybucje nie&nbsp;zawierajÄ "
+#~ "&bdquo;plamek&rdquo;, bÄdzie to nieporozumienie. Oni mÃ³wiÄ 
o&nbsp;czymÅ "
+#~ "innym."

Index: distros/po/common-distros.pot
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pot,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- distros/po/common-distros.pot       13 Jan 2011 17:27:34 -0000      1.12
+++ distros/po/common-distros.pot       30 Jan 2011 17:27:40 -0000      1.13
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-01-13 12:27-0500\n"
+"POT-Creation-Date: 2011-01-30 12:27-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"
@@ -44,8 +44,8 @@
 
 # type: Content of: <p>
 msgid ""
-"All of the distributions listed on this page fail to follow the guidelines "
-"in at least two important ways:"
+"Except where noted, all of the distributions listed on this page fail to "
+"follow the guidelines in at least two important ways:"
 msgstr ""
 
 # type: Content of: <ul><li><p>
@@ -59,9 +59,9 @@
 
 # type: Content of: <ul><li><p>
 msgid ""
-"The version of the kernel Linux that they distribute includes blobs: pieces "
-"of object code, distributed without source, usually to help operate some "
-"device."
+"The kernel that they distribute (in most cases, Linux) includes "
+"<em>blobs</em>: pieces of object code distributed without source, usually "
+"firmware to run some device."
 msgstr ""
 
 # type: Content of: <p>
@@ -80,15 +80,15 @@
 msgstr ""
 
 # type: Content of: <h3>
-msgid "Arch"
+msgid "Arch GNU/Linux"
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"Arch has the two common issues listed above: there's no clear policy about "
-"what software can be included, and nonfree blobs are shipped with their "
-"Linux kernel.  Arch also has no policy about not distributing nonfree "
-"software through their normal channels."
+"Arch has the two usual problems: there's no clear policy about what software "
+"can be included, and nonfree blobs are shipped with their Linux kernel.  "
+"Arch also has no policy about not distributing nonfree software through "
+"their normal channels."
 msgstr ""
 
 # type: Content of: outside any tag (error?)
@@ -101,9 +101,9 @@
 
 # type: Content of: <p>
 msgid ""
-"We're not aware of problems in CentOS aside from the two listed above: "
-"there's no clear policy about what software can be included, and nonfree "
-"blobs are shipped with Linux.  Of course, with no firm policy in place, "
+"We're not aware of problems in CentOS aside from the two usual ones: there's "
+"no clear policy about what software can be included, and nonfree blobs are "
+"shipped with Linux, the kernel.  Of course, with no firm policy in place, "
 "there might be other nonfree software included that we missed."
 msgstr ""
 
@@ -112,17 +112,18 @@
 msgstr ""
 
 # type: Content of: <h3>
-msgid "Debian"
+msgid "Debian GNU/Linux"
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "Debian's Social Contract does say that all software in the main distribution "
-"will be free software.  Unfortunately, that's not always true in practice.  "
+"will be free software.  At present, that's not always true in practice: "
 "Debian has repeatedly made tacit or explicit exceptions for specific pieces "
 "of nonfree software, such as the blobs included in or accompanying Linux.  "
-"We're still hopeful that there won't be such exceptions in the future, but "
-"we can't turn a blind eye to the situation as it stands today."
+"The next release of Debian will reportedly move these blobs out of Linux.  "
+"That will be a substantial step towards a completely free distro, but won't "
+"get all the way there."
 msgstr ""
 
 # type: Content of: <p>
@@ -158,7 +159,7 @@
 msgstr ""
 
 # type: Content of: <h3>
-msgid "Gentoo"
+msgid "Gentoo GNU/Linux"
 msgstr ""
 
 # type: Content of: <p>
@@ -172,7 +173,7 @@
 msgstr ""
 
 # type: Content of: <h3>
-msgid "Mandriva"
+msgid "Mandriva GNU/Linux"
 msgstr ""
 
 # type: Content of: <p>
@@ -193,11 +194,15 @@
 msgstr ""
 
 # type: Content of: <h3>
-msgid "openSUSE"
+msgid "openSUSE GNU/Linux"
 msgstr ""
 
 # type: Content of: <p>
-msgid "openSUSE offers its users access to a repository of nonfree software."
+msgid ""
+"openSUSE offers its users access to a repository of nonfree software.  This "
+"is an instance of how <a "
+"href=\"/philosophy/open-source-misses-the-point.htmlopen-source-misses-the-point.html\">
 "
+"\"open\" is weaker than \"free\"</a>."
 msgstr ""
 
 # type: Content of: outside any tag (error?)
@@ -205,7 +210,7 @@
 msgstr ""
 
 # type: Content of: <h3>
-msgid "Red Hat"
+msgid "Red Hat GNU/Linux"
 msgstr ""
 
 # type: Content of: <p>
@@ -227,11 +232,11 @@
 
 # type: Content of: <p>
 msgid ""
-"Slackware has the two problems listed above: there's no clear policy about "
-"what software can be included, and nonfree blobs are shipped with Linux.  It "
-"also ships with the nonfree image-viewing program xv.  Of course, with no "
-"firm policy in place, there might be other nonfree software included that we "
-"missed."
+"Slackware has the two usual problems: there's no clear policy about what "
+"software can be included, and nonfree blobs are included in Linux, the "
+"kernel.  It also ships with the nonfree image-viewing program xv.  Of "
+"course, with no firm policy in place, there might be other nonfree software "
+"included that we missed."
 msgstr ""
 
 # type: Content of: outside any tag (error?)
@@ -239,13 +244,13 @@
 msgstr ""
 
 # type: Content of: <h3>
-msgid "SUSE"
+msgid "SUSE GNU/Linux"
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"Several nonfree software programs are available for download from SUSE's "
-"official FTP site."
+"In addition to the usual two problens, several nonfree software programs are "
+"available for download from SUSE's official FTP site."
 msgstr ""
 
 # type: Content of: outside any tag (error?)
@@ -253,15 +258,17 @@
 msgstr ""
 
 # type: Content of: <h3>
-msgid "Ubuntu"
+msgid "Ubuntu GNU/Linux"
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "Ubuntu provides specific repositories of nonfree software, and Canonical "
 "expressly promotes and recommends nonfree software under the Ubuntu name in "
-"some of their distribution channels.  Even if you try to avoid all of that, "
-"the default application installer will advertise nonfree software to you."
+"some of their distribution channels.  Ubuntu offers the option to install "
+"only free packages, which means it also offers the option to install nonfree "
+"packages too.  In addition, the version of Linux included in Ubuntu contains "
+"firmware \"blobs\"."
 msgstr ""
 
 # type: Content of: outside any tag (error?)
@@ -275,23 +282,24 @@
 # type: Content of: <p>
 msgid ""
 "FreeBSD, NetBSD, and OpenBSD all include instructions for obtaining nonfree "
-"programs in their ports system."
+"programs in their ports system.  In addition, their kernels includes nonfree "
+"firmware blobs."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"BSD systems refer to proprietary drivers as &ldquo;blobs&rdquo; and some "
-"have policies against including these.  That is good, but unfortunately no "
-"BSD system has policies against proprietary binary-only firmware that might "
-"be loaded even by free drivers."
+"Nonfree firmware programs in Linux are called &ldquo;blobs,&rdquo; and "
+"that's how we use the term.  In BSD parlance, the term &ldquo;blob&rdquo; "
+"means something else: a nonfree driver.  Some BSD distros have the policy of "
+"not including those.  That is the right policy, as regards drivers; but when "
+"the developers say these distros &ldquo;contain no blobs,&rdquo;, it causes "
+"a misunderstanding.  They are not taking about firmware blobs."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"Nonfree firmwares in Linux are called &ldquo;blobs,&rdquo; but the meaning "
-"in BSD parlance is different, as above.  Thus, when BSD developers say their "
-"distributions contains no blobs, it is a miscommunication; they are talking "
-"about something else."
+"No BSD distro has policies against proprietary binary-only firmware that "
+"might be loaded even by free drivers."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.

Index: distros/po/common-distros.ru.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- distros/po/common-distros.ru.po     13 Jan 2011 16:11:46 -0000      1.4
+++ distros/po/common-distros.ru.po     30 Jan 2011 17:27:40 -0000      1.5
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2011-01-12 20:27-0500\n"
+"POT-Creation-Date: 2011-01-30 12:27-0500\n"
 "PO-Revision-Date: 2011-01-13 17:17+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -57,9 +57,13 @@
 "GNU/Linux</a>."
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "All of the distributions listed on this page fail to follow the "
+#| "guidelines in at least two important ways:"
 msgid ""
-"All of the distributions listed on this page fail to follow the guidelines "
-"in at least two important ways:"
+"Except where noted, all of the distributions listed on this page fail to "
+"follow the guidelines in at least two important ways:"
 msgstr ""
 "ÐÑÐµ Ð´Ð¸ÑÑÑÐ¸Ð±ÑÑÐ¸Ð²Ñ, Ð¿ÐµÑÐµÑÐ¸ÑÐ»ÐµÐ½Ð½ÑÐµ Ð½Ð° ÑÑÐ¾Ð¹ 
ÑÑÑÐ°Ð½Ð¸ÑÐµ, Ð¿ÑÐ¾ÑÐ¸Ð²Ð¾ÑÐµÑÐ°Ñ \n"
 "ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´Ð°ÑÐ¸ÑÐ¼ Ð¿Ð¾ Ð¼ÐµÐ½ÑÑÐµÐ¹ Ð¼ÐµÑÐµ Ð² Ð´Ð²ÑÑ 
Ð²Ð°Ð¶Ð½ÑÑ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸ÑÑ:"
@@ -80,10 +84,15 @@
 
 # type: Content of: <ul><li><p>
 #  BTW why "kernel Linux", not "Linux kernel"? is "kernel" an attribute?
-msgid ""
-"The version of the kernel Linux that they distribute includes blobs: pieces "
-"of object code, distributed without source, usually to help operate some "
-"device."
+#, fuzzy
+#| msgid ""
+#| "The version of the kernel Linux that they distribute includes blobs: "
+#| "pieces of object code, distributed without source, usually to help "
+#| "operate some device."
+msgid ""
+"The kernel that they distribute (in most cases, Linux) includes <em>blobs</"
+"em>: pieces of object code distributed without source, usually firmware to "
+"run some device."
 msgstr ""
 "ÐÐµÑÑÐ¸Ñ Linux (ÑÐ´ÑÐ°), ÐºÐ¾ÑÐ¾ÑÑÑ Ð¾Ð½Ð¸ 
ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÑ, Ð²ÐºÐ»ÑÑÐ°ÐµÑ \n"
 "&ldquo;ÐºÐ»ÑÐºÑÑ&rdquo;: Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð² Ð¼Ð°ÑÐ¸Ð½Ð½Ð¾Ð¼ ÐºÐ¾Ð´Ðµ, 
ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÐ¼ÑÐµ \n"
@@ -116,15 +125,22 @@
 msgid "<a id=\"Arch\"></a>"
 msgstr "<a id=\"Arch\"></a>"
 
-msgid "Arch"
-msgstr "Arch"
+# type: Content of: <h3>
+msgid "Arch GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Arch has the two common issues listed above: there's no clear policy "
+#| "about what software can be included, and nonfree blobs are shipped with "
+#| "their Linux kernel.  Arch also has no policy about not distributing "
+#| "nonfree software through their normal channels."
 msgid ""
-"Arch has the two common issues listed above: there's no clear policy about "
-"what software can be included, and nonfree blobs are shipped with their "
-"Linux kernel.  Arch also has no policy about not distributing nonfree "
-"software through their normal channels."
+"Arch has the two usual problems: there's no clear policy about what software "
+"can be included, and nonfree blobs are shipped with their Linux kernel.  "
+"Arch also has no policy about not distributing nonfree software through "
+"their normal channels."
 msgstr ""
 "Ð£ Arch ÐµÑÑÑ Ð´Ð²Ðµ Ð¾Ð±ÑÐ¸Ñ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ, 
Ð¿ÐµÑÐµÑÐ¸ÑÐ»ÐµÐ½Ð½ÑÐµ Ð²ÑÑÐµ: Ð½ÐµÑ ÑÐµÑÐºÐ¸Ñ Ð¿ÑÐ°Ð²Ð¸Ð» Ð¾ 
ÑÐ¾Ð¼, "
 "ÐºÐ°ÐºÐ¸Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÐºÐ»ÑÑÐ°ÑÑ, Ð¸ Ñ Ð¸Ñ 
ÑÐ´ÑÐ¾Ð¼ (Linux) Ð¿Ð¾ÑÑÐ°Ð²Ð»ÑÑÑÑÑ "
@@ -140,10 +156,16 @@
 msgstr "CentOS"
 
 # type: Content of: <p>
-msgid ""
-"We're not aware of problems in CentOS aside from the two listed above: "
-"there's no clear policy about what software can be included, and nonfree "
-"blobs are shipped with Linux.  Of course, with no firm policy in place, "
+#, fuzzy
+#| msgid ""
+#| "We're not aware of problems in CentOS aside from the two listed above: "
+#| "there's no clear policy about what software can be included, and nonfree "
+#| "blobs are shipped with Linux.  Of course, with no firm policy in place, "
+#| "there might be other nonfree software included that we missed."
+msgid ""
+"We're not aware of problems in CentOS aside from the two usual ones: there's "
+"no clear policy about what software can be included, and nonfree blobs are "
+"shipped with Linux, the kernel.  Of course, with no firm policy in place, "
 "there might be other nonfree software included that we missed."
 msgstr ""
 "ÐÑ Ð½Ðµ Ð·Ð½Ð°ÐµÐ¼ Ð¾ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð°Ñ Ð² CentOS, ÐºÑÐ¾Ð¼Ðµ Ð´Ð²ÑÑ 
Ð²ÑÑÐµÑÐºÐ°Ð·Ð°Ð½Ð½ÑÑ: \n"
@@ -157,17 +179,27 @@
 msgstr "<a id=\"Debian\"></a>"
 
 # type: Content of: <h3>
-msgid "Debian"
-msgstr "Debian"
+msgid "Debian GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Debian's Social Contract does say that all software in the main "
+#| "distribution will be free software.  Unfortunately, that's not always "
+#| "true in practice.  Debian has repeatedly made tacit or explicit "
+#| "exceptions for specific pieces of nonfree software, such as the blobs "
+#| "included in or accompanying Linux.  We're still hopeful that there won't "
+#| "be such exceptions in the future, but we can't turn a blind eye to the "
+#| "situation as it stands today."
 msgid ""
 "Debian's Social Contract does say that all software in the main distribution "
-"will be free software.  Unfortunately, that's not always true in practice.  "
+"will be free software.  At present, that's not always true in practice: "
 "Debian has repeatedly made tacit or explicit exceptions for specific pieces "
 "of nonfree software, such as the blobs included in or accompanying Linux.  "
-"We're still hopeful that there won't be such exceptions in the future, but "
-"we can't turn a blind eye to the situation as it stands today."
+"The next release of Debian will reportedly move these blobs out of Linux.  "
+"That will be a substantial step towards a completely free distro, but won't "
+"get all the way there."
 msgstr ""
 "&ldquo;ÐÐ±ÑÐµÑÑÐ²ÐµÐ½Ð½Ð¾Ðµ ÑÐ¾Ð³Ð»Ð°ÑÐµÐ½Ð¸Ðµ Debian&rdquo; \n"
 "Ð½Ð° ÑÐ°Ð¼Ð¾Ð¼ Ð´ÐµÐ»Ðµ Ð³Ð¾Ð²Ð¾ÑÐ¸Ñ, ÑÑÐ¾ Ð²ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½Ð¾Ðµ 
Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð¸Ðµ Ð² Ð³Ð»Ð°Ð²Ð½Ð¾Ð¼ \n"
@@ -226,8 +258,8 @@
 msgstr "<a id=\"Gentoo\"></a>"
 
 # type: Content of: <h3>
-msgid "Gentoo"
-msgstr "Gentoo"
+msgid "Gentoo GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
 msgid ""
@@ -242,7 +274,9 @@
 msgstr "<a id=\"Mandriva\"></a>"
 
 # type: Content of: <h3>
-msgid "Mandriva"
+#, fuzzy
+#| msgid "Mandriva"
+msgid "Mandriva GNU/Linux"
 msgstr "Mandriva"
 
 # type: Content of: <p>
@@ -272,22 +306,26 @@
 msgstr "<a id=\"openSUSE\"></a>"
 
 # type: Content of: <h3>
-msgid "openSUSE"
+#, fuzzy
+#| msgid "openSUSE"
+msgid "openSUSE GNU/Linux"
 msgstr "openSUSE"
 
 # type: Content of: <p>
-msgid "openSUSE offers its users access to a repository of nonfree software."
+msgid ""
+"openSUSE offers its users access to a repository of nonfree software.  This "
+"is an instance of how <a href=\"/philosophy/open-source-misses-the-point."
+"htmlopen-source-misses-the-point.html\"> \"open\" is weaker than \"free\"</"
+"a>."
 msgstr ""
-"openSUSE Ð¿ÑÐµÐ´Ð»Ð°Ð³Ð°ÐµÑ ÑÐ²Ð¾Ð¸Ð¼ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼ 
Ð´Ð¾ÑÑÑÐ¿ \n"
-"Ðº ÑÐ°Ð·Ð´ÐµÐ»Ñ Ñ Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐ¼Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð°Ð¼Ð¸."
 
 # type: Content of: outside any tag (error?)
 msgid "<a id=\"RedHat\"></a>"
 msgstr "<a id=\"RedHat\"></a>"
 
 # type: Content of: <h3>
-msgid "Red Hat"
-msgstr "Red Hat"
+msgid "Red Hat GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
 msgid ""
@@ -314,12 +352,19 @@
 msgstr "Slackware"
 
 # type: Content of: <p>
-msgid ""
-"Slackware has the two problems listed above: there's no clear policy about "
-"what software can be included, and nonfree blobs are shipped with Linux.  It "
-"also ships with the nonfree image-viewing program xv.  Of course, with no "
-"firm policy in place, there might be other nonfree software included that we "
-"missed."
+#, fuzzy
+#| msgid ""
+#| "Slackware has the two problems listed above: there's no clear policy "
+#| "about what software can be included, and nonfree blobs are shipped with "
+#| "Linux.  It also ships with the nonfree image-viewing program xv.  Of "
+#| "course, with no firm policy in place, there might be other nonfree "
+#| "software included that we missed."
+msgid ""
+"Slackware has the two usual problems: there's no clear policy about what "
+"software can be included, and nonfree blobs are included in Linux, the "
+"kernel.  It also ships with the nonfree image-viewing program xv.  Of "
+"course, with no firm policy in place, there might be other nonfree software "
+"included that we missed."
 msgstr ""
 "Ð£ Slackware ÐµÑÑÑ Ð´Ð²Ðµ Ð²ÑÑÐµÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐµ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ: 
Ð½ÐµÑ ÑÐµÑÐºÐ¸Ñ Ð¿ÑÐ°Ð²Ð¸Ð» Ð¾ ÑÐ¾Ð¼, ÐºÐ°ÐºÐ¸Ðµ "
 "Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð¼Ð¾Ð¶Ð½Ð¾ Ð²ÐºÐ»ÑÑÐ°ÑÑ, Ð¸ Ñ Linux 
Ð¿Ð¾ÑÑÐ°Ð²Ð»ÑÑÑÑÑ Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐµ ÐºÐ»ÑÐºÑÑ. \n"
@@ -332,13 +377,17 @@
 msgstr "<a id=\"SUSE\"></a>"
 
 # type: Content of: <h3>
-msgid "SUSE"
-msgstr "SUSE"
+msgid "SUSE GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Several nonfree software programs are available for download from SUSE's "
+#| "official FTP site."
 msgid ""
-"Several nonfree software programs are available for download from SUSE's "
-"official FTP site."
+"In addition to the usual two problens, several nonfree software programs are "
+"available for download from SUSE's official FTP site."
 msgstr ""
 "ÐÐµÑÐºÐ¾Ð»ÑÐºÐ¾ Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼ Ð´Ð¾ÑÑÑÐ¿Ð½Ñ 
Ð´Ð»Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ \n"
 "Ñ Ð¾ÑÐ¸ÑÐ¸Ð°Ð»ÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹ÑÐ° FTP SUSE."
@@ -348,15 +397,24 @@
 msgstr "<a id=\"Ubuntu\"></a>"
 
 # type: Content of: <h3>
-msgid "Ubuntu"
-msgstr "Ubuntu"
+msgid "Ubuntu GNU/Linux"
+msgstr ""
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Ubuntu provides specific repositories of nonfree software, and Canonical "
+#| "expressly promotes and recommends nonfree software under the Ubuntu name "
+#| "in some of their distribution channels.  Even if you try to avoid all of "
+#| "that, the default application installer will advertise nonfree software "
+#| "to you."
 msgid ""
 "Ubuntu provides specific repositories of nonfree software, and Canonical "
 "expressly promotes and recommends nonfree software under the Ubuntu name in "
-"some of their distribution channels.  Even if you try to avoid all of that, "
-"the default application installer will advertise nonfree software to you."
+"some of their distribution channels.  Ubuntu offers the option to install "
+"only free packages, which means it also offers the option to install nonfree "
+"packages too.  In addition, the version of Linux included in Ubuntu contains "
+"firmware \"blobs\"."
 msgstr ""
 "Ubuntu Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð»ÑÐµÑ ÑÐ¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐµ ÑÐ°Ð·Ð´ÐµÐ»Ñ 
Ð´Ð»Ñ Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼, \n"
 "Ð¸ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ñ Canonical Ð¾ÑÐºÑÑÑÐ¾ Ð¿ÑÐ¾Ð¿Ð°Ð³Ð°Ð½Ð´Ð¸ÑÑÐµÑ Ð¸ 
ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑ Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐµ "
@@ -374,38 +432,33 @@
 msgstr "ÐÐ°Ðº Ð½Ð°ÑÑÐµÑ ÑÐ¸ÑÑÐµÐ¼ BSD?"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "FreeBSD, NetBSD, and OpenBSD all include instructions for obtaining "
+#| "nonfree programs in their ports system."
 msgid ""
 "FreeBSD, NetBSD, and OpenBSD all include instructions for obtaining nonfree "
-"programs in their ports system."
+"programs in their ports system.  In addition, their kernels includes nonfree "
+"firmware blobs."
 msgstr ""
 "ÐÑÐµ Ð¾Ð½Ð¸ (FreeBSD, NetBSD Ð¸ OpenBSD) Ð²ÐºÐ»ÑÑÐ°ÑÑ 
ÑÑÐºÐ¾Ð²Ð¾Ð´ÑÑÐ²Ð° Ð¿Ð¾ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ \n"
 "Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼ Ð² Ð¸Ñ ÑÐ¸ÑÑÐµÐ¼Ðµ 
&ldquo;Ð¿Ð¾ÑÑÐ¾Ð²&rdquo;."
 
 # type: Content of: <p>
 msgid ""
-"BSD systems refer to proprietary drivers as &ldquo;blobs&rdquo; and some "
-"have policies against including these.  That is good, but unfortunately no "
-"BSD system has policies against proprietary binary-only firmware that might "
-"be loaded even by free drivers."
-msgstr ""
-"Ð ÑÐ¸ÑÑÐµÐ¼Ð°Ñ BSD Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐµ Ð´ÑÐ°Ð¹Ð²ÐµÑÑ 
Ð½Ð°Ð·ÑÐ²Ð°ÑÑÑÑ &ldquo;ÐºÐ»ÑÐºÑÐ°Ð¼Ð¸&rdquo;, Ð¸ "
-"Ð¿ÑÐ°Ð²Ð¸Ð»Ð° Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÑ Ð¸Ð· ÑÑÐ¸Ñ ÑÐ¸ÑÑÐµÐ¼ 
Ð·Ð°Ð¿ÑÐµÑÐ°ÑÑ Ð²ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ ÑÐ°ÐºÐ¸Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¾Ð². ÐÑÐ¾ "
-"ÑÐ¾ÑÐ¾ÑÐ¾, Ð½Ð¾ Ðº ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, Ð½Ð¸ Ñ ÐºÐ°ÐºÐ¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ñ 
BSD Ð½ÐµÑ Ð¿ÑÐ°Ð²Ð¸Ð»Ð°, Ð¸ÑÐºÐ»ÑÑÐ°ÑÑÐµÐ³Ð¾ "
-"Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð´Ð»Ñ ÑÑÑÑÐ¾Ð¹ÑÑÐ² Ð² 
Ð´Ð²Ð¾Ð¸ÑÐ½Ð¾Ð¼ Ð²Ð¸Ð´Ðµ, ÐºÐ¾ÑÐ¾ÑÑÐµ Ð¼Ð¾Ð³ÑÑ "
-"Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑÑÑ Ð´Ð°Ð¶Ðµ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐ¼Ð¸ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ°Ð¼Ð¸."
+"Nonfree firmware programs in Linux are called &ldquo;blobs,&rdquo; and "
+"that's how we use the term.  In BSD parlance, the term &ldquo;blob&rdquo; "
+"means something else: a nonfree driver.  Some BSD distros have the policy of "
+"not including those.  That is the right policy, as regards drivers; but when "
+"the developers say these distros &ldquo;contain no blobs,&rdquo;, it causes "
+"a misunderstanding.  They are not taking about firmware blobs."
+msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"Nonfree firmwares in Linux are called &ldquo;blobs,&rdquo; but the meaning "
-"in BSD parlance is different, as above.  Thus, when BSD developers say their "
-"distributions contains no blobs, it is a miscommunication; they are talking "
-"about something else."
-msgstr ""
-"ÐÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð´Ð»Ñ ÑÑÑÑÐ¾Ð¹ÑÑÐ² Ð² Linux 
Ð½Ð°Ð·ÑÐ²Ð°ÑÑÑÑ \n"
-"&ldquo;ÐºÐ»ÑÐºÑÐ°Ð¼Ð¸&rdquo;, Ð½Ð¾ Ð½Ð° ÑÐ·ÑÐºÐµ BSD ÑÑÐ¾ ÑÐ»Ð¾Ð²Ð¾ 
Ð¸Ð¼ÐµÐµÑ Ð´ÑÑÐ³Ð¾Ðµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ, \n"
-"ÐºÐ°Ðº ÑÐ¶Ðµ Ð³Ð¾Ð²Ð¾ÑÐ¸Ð»Ð¾ÑÑ. Ð¢Ð°Ðº ÑÑÐ¾, ÐºÐ¾Ð³Ð´Ð° 
ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ¸ BSD Ð³Ð¾Ð²Ð¾ÑÑÑ, ÑÑÐ¾ \n"
-"Ð¸Ñ Ð´Ð¸ÑÑÑÐ¸Ð±ÑÑÐ¸Ð²Ñ Ð½Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð°Ñ ÐºÐ»ÑÐºÑ, ÑÑÐ¾ Ð½Ðµ 
Ð¸Ð¼ÐµÐµÑ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ Ðº Ð½Ð°ÑÐµÐ¼Ñ Ð²Ð¾Ð¿ÑÐ¾ÑÑ; "
-"Ð¾Ð½Ð¸ Ð³Ð¾Ð²Ð¾ÑÑÑ Ð¾ Ð´ÑÑÐ³Ð¾Ð¼."
+"No BSD distro has policies against proprietary binary-only firmware that "
+"might be loaded even by free drivers."
+msgstr ""
 
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -422,11 +475,10 @@
 msgstr ""
 "ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¸ÑÑÐ»Ð°Ð¹ÑÐµ Ð¾Ð±ÑÐ¸Ðµ Ð·Ð°Ð¿ÑÐ¾ÑÑ 
ÑÐ¾Ð½Ð´Ñ Ð¸ GNU Ð¿Ð¾ Ð°Ð´ÑÐµÑÑ \n"
 "<a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>. ÐÑÑÑ 
ÑÐ°ÐºÐ¶Ðµ <a href="
-"\"/contact/\">Ð´ÑÑÐ³Ð¸Ðµ ÑÐ¿Ð¾ÑÐ¾Ð±Ñ ÑÐ²ÑÐ·Ð°ÑÑÑÑ</a> Ñ 
ÑÐ¾Ð½Ð´Ð¾Ð¼. <br /> "
-"ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿ÑÐ¸ÑÑÐ»Ð°Ð¹ÑÐµ Ð¾ÑÑÐµÑÑ Ð¾ 
Ð½ÐµÑÐ°Ð±Ð¾ÑÐ°ÑÑÐ¸Ñ ÑÑÑÐ»ÐºÐ°Ñ Ð¸ "
-"Ð´ÑÑÐ³Ð¸Ðµ Ð¿Ð¾Ð¿ÑÐ°Ð²ÐºÐ¸ Ð¸Ð»Ð¸ Ð¿ÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ Ð°Ð´ÑÐµÑÑ 
<a "
-"href=\"mailto:address@hidden";>&lt;address@hidden&gt;</"
-"a>."
+"\"/contact/\">Ð´ÑÑÐ³Ð¸Ðµ ÑÐ¿Ð¾ÑÐ¾Ð±Ñ ÑÐ²ÑÐ·Ð°ÑÑÑÑ</a> Ñ 
ÑÐ¾Ð½Ð´Ð¾Ð¼. <br /> ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, "
+"Ð¿ÑÐ¸ÑÑÐ»Ð°Ð¹ÑÐµ Ð¾ÑÑÐµÑÑ Ð¾ Ð½ÐµÑÐ°Ð±Ð¾ÑÐ°ÑÑÐ¸Ñ ÑÑÑÐ»ÐºÐ°Ñ 
Ð¸ Ð´ÑÑÐ³Ð¸Ðµ Ð¿Ð¾Ð¿ÑÐ°Ð²ÐºÐ¸ Ð¸Ð»Ð¸ Ð¿ÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ "
+"Ð¿Ð¾ Ð°Ð´ÑÐµÑÑ <a href=\"mailto:address@hidden";>&lt;address@hidden"
+"org&gt;</a>."
 
 # type: Content of: <div><p>
 msgid ""
@@ -473,3 +525,60 @@
 # type: Content of: <div><h4>
 msgid "Translations of this page"
 msgstr "ÐÐµÑÐµÐ²Ð¾Ð´Ñ ÑÑÐ¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ"
+
+#~ msgid "Arch"
+#~ msgstr "Arch"
+
+# type: Content of: <h3>
+#~ msgid "Debian"
+#~ msgstr "Debian"
+
+# type: Content of: <h3>
+#~ msgid "Gentoo"
+#~ msgstr "Gentoo"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "openSUSE offers its users access to a repository of nonfree software."
+#~ msgstr ""
+#~ "openSUSE Ð¿ÑÐµÐ´Ð»Ð°Ð³Ð°ÐµÑ ÑÐ²Ð¾Ð¸Ð¼ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼ 
Ð´Ð¾ÑÑÑÐ¿ \n"
+#~ "Ðº ÑÐ°Ð·Ð´ÐµÐ»Ñ Ñ Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐ¼Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð°Ð¼Ð¸."
+
+# type: Content of: <h3>
+#~ msgid "Red Hat"
+#~ msgstr "Red Hat"
+
+# type: Content of: <h3>
+#~ msgid "SUSE"
+#~ msgstr "SUSE"
+
+# type: Content of: <h3>
+#~ msgid "Ubuntu"
+#~ msgstr "Ubuntu"
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "BSD systems refer to proprietary drivers as &ldquo;blobs&rdquo; and some "
+#~ "have policies against including these.  That is good, but unfortunately "
+#~ "no BSD system has policies against proprietary binary-only firmware that "
+#~ "might be loaded even by free drivers."
+#~ msgstr ""
+#~ "Ð ÑÐ¸ÑÑÐµÐ¼Ð°Ñ BSD Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐµ Ð´ÑÐ°Ð¹Ð²ÐµÑÑ 
Ð½Ð°Ð·ÑÐ²Ð°ÑÑÑÑ &ldquo;ÐºÐ»ÑÐºÑÐ°Ð¼Ð¸&rdquo;, Ð¸ "
+#~ "Ð¿ÑÐ°Ð²Ð¸Ð»Ð° Ð½ÐµÐºÐ¾ÑÐ¾ÑÑÑ Ð¸Ð· ÑÑÐ¸Ñ ÑÐ¸ÑÑÐµÐ¼ 
Ð·Ð°Ð¿ÑÐµÑÐ°ÑÑ Ð²ÐºÐ»ÑÑÐµÐ½Ð¸Ðµ ÑÐ°ÐºÐ¸Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¾Ð². ÐÑÐ¾ "
+#~ "ÑÐ¾ÑÐ¾ÑÐ¾, Ð½Ð¾ Ðº ÑÐ¾Ð¶Ð°Ð»ÐµÐ½Ð¸Ñ, Ð½Ð¸ Ñ ÐºÐ°ÐºÐ¾Ð¹ 
ÑÐ¸ÑÑÐµÐ¼Ñ BSD Ð½ÐµÑ Ð¿ÑÐ°Ð²Ð¸Ð»Ð°, Ð¸ÑÐºÐ»ÑÑÐ°ÑÑÐµÐ³Ð¾ "
+#~ "Ð½ÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð´Ð»Ñ ÑÑÑÑÐ¾Ð¹ÑÑÐ² Ð² 
Ð´Ð²Ð¾Ð¸ÑÐ½Ð¾Ð¼ Ð²Ð¸Ð´Ðµ, ÐºÐ¾ÑÐ¾ÑÑÐµ Ð¼Ð¾Ð³ÑÑ "
+#~ "Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑÑÑ Ð´Ð°Ð¶Ðµ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐ¼Ð¸ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ°Ð¼Ð¸."
+
+# type: Content of: <p>
+#~ msgid ""
+#~ "Nonfree firmwares in Linux are called &ldquo;blobs,&rdquo; but the "
+#~ "meaning in BSD parlance is different, as above.  Thus, when BSD "
+#~ "developers say their distributions contains no blobs, it is a "
+#~ "miscommunication; they are talking about something else."
+#~ msgstr ""
+#~ "ÐÐµÑÐ²Ð¾Ð±Ð¾Ð´Ð½ÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð´Ð»Ñ ÑÑÑÑÐ¾Ð¹ÑÑÐ² Ð² 
Linux Ð½Ð°Ð·ÑÐ²Ð°ÑÑÑÑ \n"
+#~ "&ldquo;ÐºÐ»ÑÐºÑÐ°Ð¼Ð¸&rdquo;, Ð½Ð¾ Ð½Ð° ÑÐ·ÑÐºÐµ BSD ÑÑÐ¾ ÑÐ»Ð¾Ð²Ð¾ 
Ð¸Ð¼ÐµÐµÑ Ð´ÑÑÐ³Ð¾Ðµ "
+#~ "Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ, \n"
+#~ "ÐºÐ°Ðº ÑÐ¶Ðµ Ð³Ð¾Ð²Ð¾ÑÐ¸Ð»Ð¾ÑÑ. Ð¢Ð°Ðº ÑÑÐ¾, ÐºÐ¾Ð³Ð´Ð° 
ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ¸ BSD Ð³Ð¾Ð²Ð¾ÑÑÑ, ÑÑÐ¾ \n"
+#~ "Ð¸Ñ Ð´Ð¸ÑÑÑÐ¸Ð±ÑÑÐ¸Ð²Ñ Ð½Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð°Ñ ÐºÐ»ÑÐºÑ, ÑÑÐ¾ 
Ð½Ðµ Ð¸Ð¼ÐµÐµÑ Ð¾ÑÐ½Ð¾ÑÐµÐ½Ð¸Ñ Ðº Ð½Ð°ÑÐµÐ¼Ñ "
+#~ "Ð²Ð¾Ð¿ÑÐ¾ÑÑ; Ð¾Ð½Ð¸ Ð³Ð¾Ð²Ð¾ÑÑÑ Ð¾ Ð´ÑÑÐ³Ð¾Ð¼."

Index: licenses/translations.es.html
===================================================================
RCS file: /web/www/www/licenses/translations.es.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- licenses/translations.es.html       6 Aug 2010 16:26:41 -0000       1.15
+++ licenses/translations.es.html       30 Jan 2011 17:27:43 -0000      1.16
@@ -92,8 +92,7 @@
   <li><code>[fi]</code> TraducciÃ³n de la GPL al <a
 href="http://www.turre.com/licenses/gpl_fi.html";> finlandÃ©s</a>.</li>
   <li><code>[fr]</code> TraducciÃ³n de la GPL al <a
-href="http://www.april.org/groupes/trad-gpl/doc/GPLv3/www.rodage.org/gpl-3.0.fr.html";>
-francÃ©s</a>.</li>
+href="http://www.rodage.org/gpl-3.0.fr.html";>francÃ©s</a></li>
   <li><code>[gl]</code> TraducciÃ³n de la GPL al <a
 href="http://www.mancomun.org/GPL3_GL/gpl_gl_v3.html";>gallego</a> (<a
 href="http://www.mancomun.org/GPL3_GL/gpl_gl_v3.txt";>texto</a>, y <a
@@ -280,8 +279,8 @@
 </p>
 
 <p>
-Copyright &copy; 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2008, 2009, 2010
-Free Software Foundation, Inc.
+Copyright &copy; 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2008, 2009, 2010,
+2011 Free Software Foundation, Inc.
 </p>
 <p>Verbatim copying and distribution of this entire article is permitted in any
 medium without royalty provided this notice is preserved.
@@ -300,7 +299,7 @@
  <p><!-- timestamp start -->
 Ãltima actualizaciÃ³n: 
 
-$Date: 2010/08/06 16:26:41 $
+$Date: 2011/01/30 17:27:43 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/translations.es.po
===================================================================
RCS file: /web/www/www/licenses/po/translations.es.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- licenses/po/translations.es.po      30 Jan 2011 15:02:13 -0000      1.27
+++ licenses/po/translations.es.po      30 Jan 2011 17:27:49 -0000      1.28
@@ -19,7 +19,8 @@
 
 # type: Content of: <title>
 msgid "Unofficial Translations - GNU Project - Free Software Foundation (FSF)"
-msgstr "Traducciones no oficiales - Proyecto GNU - Free Software Foundation 
(FSF)"
+msgstr ""
+"Traducciones no oficiales - Proyecto GNU - Free Software Foundation (FSF)"
 
 # type: Attribute 'content' of: <meta>
 msgid "GNU, FSF, Free Software Foundation, Linux, Copyleft, Licenses"
@@ -196,15 +197,12 @@
 "licenses/gpl_fi.html\"> finlandÃ©s</a>."
 
 # type: Content of: <ul><li>
-#| msgid ""
-#| "<code>[fr]</code> <a href=\"http://www.april.org/groupes/trad-gpl/doc/";
-#| "GPLv3/www.rodage.org/gpl-3.0.fr.html\"> French</a> translation of the GPL"
 msgid ""
 "<code>[fr]</code> <a href=\"http://www.rodage.org/gpl-3.0.fr.html\";> French</"
 "a> translation of the GPL"
 msgstr ""
-"<code>[fr]</code> TraducciÃ³n de la GPL al <a "
-"href=\"http://www.rodage.org/gpl-3.0.fr.html\";>francÃ©s</a>"
+"<code>[fr]</code> TraducciÃ³n de la GPL al <a href=\"http://www.rodage.org/";
+"gpl-3.0.fr.html\">francÃ©s</a>"
 
 # type: Content of: <ul><li>
 msgid ""
@@ -313,8 +311,10 @@
 "a>, esfuerzo liderado por la FSFLA)"
 
 # type: Content of: <ul><li>
-msgid "<code>[ca]</code> <a 
href=\"http://www.softcatala.cat/wiki/GPL3\";>Catalan</a>"
-msgstr "<code>[ca]</code> <a 
href=\"http://www.softcatala.cat/wiki/GPL3\";>CatalÃ¡n</a>"
+msgid ""
+"<code>[ca]</code> <a href=\"http://www.softcatala.cat/wiki/GPL3\";>Catalan</a>"
+msgstr ""
+"<code>[ca]</code> <a 
href=\"http://www.softcatala.cat/wiki/GPL3\";>CatalÃ¡n</a>"
 
 # type: Content of: <ul><li>
 msgid ""
@@ -605,9 +605,6 @@
 "y enviar traducciones de este artÃculo."
 
 # type: Content of: <div><p>
-#| msgid ""
-#| "Copyright &copy; 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2008, 2009, "
-#| "2010 Free Software Foundation, Inc."
 msgid ""
 "Copyright &copy; 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2008, 2009, 2010, "
 "2011 Free Software Foundation, Inc."

Index: people/po/people.es.po
===================================================================
RCS file: /web/www/www/people/po/people.es.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- people/po/people.es.po      30 Jan 2011 14:58:22 -0000      1.29
+++ people/po/people.es.po      30 Jan 2011 17:27:52 -0000      1.30
@@ -1451,13 +1451,12 @@
 msgstr "Hicham Yamout"
 
 # type: Content of: <p>
-#| msgid "Is a GNU webmaster and the Arabic translation team leader."
 msgid ""
 "Is a computer and communications engineer, is GNU webmaster and is in the "
 "Arabic translation team."
 msgstr ""
-"Es ingeniero informÃ¡tico y de comunicaciones, webmaster de GNU y "
-"pertenece al equipo de traducciÃ³n al Ãrabe."
+"Es ingeniero informÃ¡tico y de comunicaciones, webmaster de GNU y pertenece "
+"al equipo de traducciÃ³n al Ãrabe."
 
 # type: Content of: <h4>
 msgid "<a href=\"http://www.ofset.org\";>Hilaire L. S. Fernandes</a>"
[Prev in Thread]
Current Thread
[Next in Thread]
www distros/po/common-distros.es.po distros/po/..., Yavor Doganov <=
- www distros/po/common-distros.es.po distros/po/..., Yavor Doganov, 2011/01/30
Prev by Date: www/distros common-distros.html
Next by Date: www/distros common-distros.html
Previous by thread: www/prep ftp.html
Next by thread: www distros/po/common-distros.es.po distros/po/...
Index(es):
- Date
- Thread