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

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   10/04/05 18:25:09

Modified files:
        gnun/philosophy/po: categories.ca.po categories.pot 
                            java-trap.bg.po java-trap.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.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/po/categories.pot?cvsroot=trans-coord&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/po/java-trap.bg.po?cvsroot=trans-coord&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/po/java-trap.pot?cvsroot=trans-coord&r1=1.6&r2=1.7

Patches:
Index: categories.ca.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/po/categories.ca.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- categories.ca.po    4 Mar 2010 19:25:12 -0000       1.7
+++ categories.ca.po    5 Apr 2010 18:25:09 -0000       1.8
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: categories.html\n"
-"POT-Creation-Date: 2010-03-04 14:25-0500\n"
+"POT-Creation-Date: 2010-04-05 14:25-0300\n"
 "PO-Revision-Date: 2008-05-24 20:39+0100\n"
 "Last-Translator: Miquel Puigpelat <address@hidden>\n"
 "Language-Team: Catalan <address@hidden>\n"
@@ -23,12 +23,18 @@
 "Foundation (FSF)"
 
 # type: Content of: <h2>
-msgid "Categories of Free and Non-Free Software"
+#, fuzzy
+#| msgid "Categories of Free and Non-Free Software"
+msgid "Categories of free and non-free software"
 msgstr "Categories de programari lliure i no lliure"
 
 # type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Also note <a href=\"/philosophy/words-to-avoid.html\">Confusing Words "
+#| "which You Might Want to Avoid</a>."
 msgid ""
-"Also note <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
+"Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
 msgstr ""
 "Vegeu tamb&eacute; <a href=\"/philosophy/words-to-avoid.ca.html\">Paraules "
@@ -37,11 +43,12 @@
 # type: Content of: <p>
 #, fuzzy
 msgid ""
-"This diagram by Chao-Kuei explains the different categories of software. "
-"It's also available as an <a href=\"/philosophy/category.svg\">Scalable "
-"Vector Graphic</a> and as an <a href=\"/philosophy/category.fig\">XFig "
-"document</a>, under the terms of any of the GNU GPL v2 or later, the GNU FDL "
-"v1.2 or later, or the Creative Commons Attribution-Share Alike v2.0 or later."
+"This diagram, originally by Chao-Kuei and updated in 2010 by Ineiev, "
+"explains the different categories of software. It's also available as an <a "
+"href=\"/philosophy/category.svg\">Scalable Vector Graphic</a> and as an <a "
+"href=\"/philosophy/category.fig\">XFig document</a>, under the terms of any "
+"of the GNU GPL v2 or later, the GNU FDL v1.2 or later, or the Creative "
+"Commons Attribution-Share Alike v2.0 or later."
 msgstr ""
 "Aquest <a id=\"diagram\" name=\"diagram\">diagrama</a> de Chao-Kuei "
 "il&middot;lustra les diferents categories de programari. Est&agrave; "
@@ -58,13 +65,21 @@
 msgstr "<strong>Programari lliure</strong>"
 
 # type: Content of: <dl><dd>
+#, fuzzy
+#| msgid ""
+#| "Free software is software that comes with permission for anyone to use, "
+#| "copy, and distribute, either verbatim or with modifications, either "
+#| "gratis or for a fee. In particular, this means that source code must be "
+#| "available. &ldquo;If it's not source, it's not software.&rdquo; This is a "
+#| "simplified definition; see also the <a href=\"/philosophy/free-sw.html"
+#| "\">full definition</a>."
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
-"copy, and distribute, either verbatim or with modifications, either gratis "
-"or for a fee. In particular, this means that source code must be available. "
-"&ldquo;If it's not source, it's not software.&rdquo; This is a simplified "
-"definition; see also the <a href=\"/philosophy/free-sw.html\">full "
-"definition</a>."
+"copy, and/or distribute, either verbatim or with modifications, either "
+"gratis or for a fee. In particular, this means that source code must be "
+"available. &ldquo;If it's not source, it's not software.&rdquo; This is a "
+"simplified description; see also the <a href=\"/philosophy/free-sw.html"
+"\">full definition</a>."
 msgstr ""
 "Programari lliure &eacute;s aquell programari que concedeix a tothom "
 "perm&iacute;s per utilitzar-lo, copiar-lo i distribuir-lo amb o sense "
@@ -110,11 +125,11 @@
 #| "in the GNU project."
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
-"companies sometimes use the term &ldquo;free software&rdquo; to refer to "
+"companies typically use the term &ldquo;free software&rdquo; to refer to "
 "price. Sometimes they mean that you can obtain a binary copy at no charge; "
 "sometimes they mean that a copy is bundled with a computer that you are "
-"buying, and the price includes both.  Either way, this has nothing to do "
-"with what we mean by free software in the GNU project."
+"buying, and the price includes both.  Either way, it has nothing to do with "
+"what we mean by free software in the GNU project."
 msgstr ""
 "L'ess&egrave;ncia del programari lliure &eacute;s la llibertat, no el preu. "
 "Les empreses de programari privatiu sovint utilitzen el terme &ldquo;free "
@@ -183,7 +198,7 @@
 # type: Content of: <dl><dt>
 #, fuzzy
 #| msgid "<strong>Open Source software</strong>"
-msgid "Open Source software"
+msgid "Open source software"
 msgstr "<strong>Programari de codi obert</strong>"
 
 # type: Content of: <dl><dd>
@@ -316,19 +331,27 @@
 "s&egrave;rie limitada de requeriments per protegir-los) i estableixen que el "
 "codi font ha de continuar estant disponible."
 
-# type: Content of: <dl><dd><p>
+# type: Content of: <p>
 msgid ""
-"Some copyleft licenses, such as GPL version 3, block other means of turning "
-"software proprietary."
+"Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
+"turning software proprietary, such as <a href=\"http://www.gnu.org/licenses/";
+"rms-why-gplv3.html\">tivoization</a>."
 msgstr ""
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "In the GNU Project, we copyleft almost all the software we write, because "
+#| "our goal is to give <em>every</em> user the freedoms implied by the term "
+#| "&ldquo;free software.&rdquo; See <a href= \"/copyleft/copyleft.html"
+#| "\">Copylefted</a> for more explanation of how copyleft works and why we "
+#| "use it."
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
-"&ldquo;free software.&rdquo; See <a href= \"/copyleft/copyleft.html"
-"\">Copylefted</a> for more explanation of how copyleft works and why we use "
-"it."
+"&ldquo;free software.&rdquo; See our <a href= \"/copyleft/copyleft.html"
+"\">copyleft article</a> for more explanation of how copyleft works and why "
+"we use it."
 msgstr ""
 "Al projecte GNU publiquem amb copyleft gaireb&eacute; tot el programari que "
 "escrivim, perqu&egrave; el nostre objectiu &eacute;s donar a <em>tots</em> "
@@ -338,8 +361,19 @@
 "com funciona i per qu&egrave; el fem servir."
 
 # type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Copyleft is a general concept; to actually copyleft a program, you need "
+#| "to use a specific set of distribution terms. There are many possible ways "
+#| "to write copyleft distribution terms, so in principle there can be many "
+#| "copyleft free software licenses.  However, in actual practice nearly all "
+#| "copylefted software uses the <a href=\"/copyleft/gpl.html\">GNU General "
+#| "Public License</a>. Two different copyleft licenses are usually &ldquo;"
+#| "incompatible&rdquo;, which means it is illegal to merge the code using "
+#| "one license with the code using the other license; therefore, it is good "
+#| "for the community if people use a single copyleft license."
 msgid ""
-"Copyleft is a general concept; to actually copyleft a program, you need to "
+"Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
 "write copyleft distribution terms, so in principle there can be many "
 "copyleft free software licenses.  However, in actual practice nearly all "
@@ -825,7 +859,7 @@
 # type: Content of: <dl><dt>
 #, fuzzy
 #| msgid "<strong>Commercial Software</strong>"
-msgid "Commercial Software"
+msgid "Commercial software"
 msgstr "<strong>Programari comercial</strong>"
 
 # type: Content of: <dl><dd>

Index: categories.pot
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/po/categories.pot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- categories.pot      4 Mar 2010 19:25:12 -0000       1.7
+++ categories.pot      5 Apr 2010 18:25:09 -0000       1.8
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-03-04 14:25-0500\n"
+"POT-Creation-Date: 2010-04-05 14:25-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -22,19 +22,19 @@
 msgstr ""
 
 # type: Content of: <h2>
-msgid "Categories of Free and Non-Free Software"
+msgid "Categories of free and non-free software"
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"Also note <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
+"Also see <a href=\"/philosophy/words-to-avoid.html\">Confusing Words which "
 "You Might Want to Avoid</a>."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"This diagram by Chao-Kuei explains the different categories of "
-"software. It's also available as an <a "
+"This diagram, originally by Chao-Kuei and updated in 2010 by Ineiev, "
+"explains the different categories of software. It's also available as an <a "
 "href=\"/philosophy/category.svg\">Scalable Vector Graphic</a> and as an <a "
 "href=\"/philosophy/category.fig\">XFig document</a>, under the terms of any "
 "of the GNU GPL v2 or later, the GNU FDL v1.2 or later, or the Creative "
@@ -48,10 +48,10 @@
 # type: Content of: <p>
 msgid ""
 "Free software is software that comes with permission for anyone to use, "
-"copy, and distribute, either verbatim or with modifications, either gratis "
-"or for a fee. In particular, this means that source code must be "
+"copy, and/or distribute, either verbatim or with modifications, either "
+"gratis or for a fee. In particular, this means that source code must be "
 "available. &ldquo;If it's not source, it's not software.&rdquo; This is a "
-"simplified definition; see also the <a "
+"simplified description; see also the <a "
 "href=\"/philosophy/free-sw.html\">full definition</a>."
 msgstr ""
 
@@ -74,11 +74,11 @@
 # type: Content of: <p>
 msgid ""
 "Free software is a matter of freedom, not price. But proprietary software "
-"companies sometimes use the term &ldquo;free software&rdquo; to refer to "
+"companies typically use the term &ldquo;free software&rdquo; to refer to "
 "price. Sometimes they mean that you can obtain a binary copy at no charge; "
 "sometimes they mean that a copy is bundled with a computer that you are "
-"buying, and the price includes both.  Either way, this has nothing to do "
-"with what we mean by free software in the GNU project."
+"buying, and the price includes both.  Either way, it has nothing to do with "
+"what we mean by free software in the GNU project."
 msgstr ""
 
 # type: Content of: <p>
@@ -109,7 +109,7 @@
 msgstr ""
 
 # type: Content of: <h3>
-msgid "Open Source software"
+msgid "Open source software"
 msgstr ""
 
 # type: Content of: <p>
@@ -189,22 +189,23 @@
 
 # type: Content of: <p>
 msgid ""
-"Some copyleft licenses, such as GPL version 3, block other means of turning "
-"software proprietary."
+"Some copyleft licenses, such as GPL version&nbsp;3, block other means of "
+"turning software proprietary, such as <a "
+"href=\"http://www.gnu.org/licenses/rms-why-gplv3.html\";>tivoization</a>."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
 "In the GNU Project, we copyleft almost all the software we write, because "
 "our goal is to give <em>every</em> user the freedoms implied by the term "
-"&ldquo;free software.&rdquo; See <a href= "
-"\"/copyleft/copyleft.html\">Copylefted</a> for more explanation of how "
+"&ldquo;free software.&rdquo; See our <a href= "
+"\"/copyleft/copyleft.html\">copyleft article</a> for more explanation of how "
 "copyleft works and why we use it."
 msgstr ""
 
 # type: Content of: <p>
 msgid ""
-"Copyleft is a general concept; to actually copyleft a program, you need to "
+"Copyleft is a general concept; to copyleft an actual program, you need to "
 "use a specific set of distribution terms. There are many possible ways to "
 "write copyleft distribution terms, so in principle there can be many "
 "copyleft free software licenses.  However, in actual practice nearly all "
@@ -475,7 +476,7 @@
 msgstr ""
 
 # type: Content of: <h3>
-msgid "Commercial Software"
+msgid "Commercial software"
 msgstr ""
 
 # type: Content of: <p>

Index: java-trap.bg.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/po/java-trap.bg.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- java-trap.bg.po     4 Apr 2010 18:25:07 -0000       1.9
+++ java-trap.bg.po     5 Apr 2010 18:25:09 -0000       1.10
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2010-04-04 14:25-0300\n"
+"POT-Creation-Date: 2010-04-05 14:25-0300\n"
 "PO-Revision-Date: 2008-02-02 09:43+0200\n"
 "Last-Translator: Kaloian Doganov <address@hidden>\n"
 "Language-Team: Bulgarian <address@hidden>\n"
@@ -76,10 +76,11 @@
 
 # type: Content of: <div><p>
 msgid ""
-"In addition, there are nonfree programs with ``Java'' in their name, such as "
-"JavaFX, and there are nonfree Java packages you might find tempting but need "
-"to reject.  So check the licenses of whatever packages you plan to use.  If "
-"you use Swing, make sure to use the free version, which comes with IcedTea.,"
+"In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
+"name, such as JavaFX, and there are nonfree Java packages you might find "
+"tempting but need to reject.  So check the licenses of whatever packages you "
+"plan to use.  If you use Swing, make sure to use the free version, which "
+"comes with IcedTea."
 msgstr ""
 
 # type: Content of: <div><p>
@@ -93,7 +94,7 @@
 #| "platform can cause a similar problem. We must learn a lesson from the "
 #| "history of Java, so we can avoid other traps in the future."
 msgid ""
-"Aside from those Java specifics, general issue described here remains "
+"Aside from those Java specifics, the general issue described here remains "
 "important, because any nonfree library or programming platform can cause a "
 "similar problem.  We must learn a lesson from the history of Java, so we can "
 "avoid other traps in the future."
@@ -108,7 +109,7 @@
 
 # type: Content of: <div><p>
 msgid ""
-"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>"
+"Please also see: <a href=\"javascript-trap.html\">The Javascript Trap</a>."
 msgstr ""
 
 # type: Content of: <p>
@@ -549,7 +550,9 @@
 "тази статия."
 
 # type: Content of: <div><p>
-msgid "Copyright &copy; 2004 Richard Stallman"
+#, fuzzy
+#| msgid "Copyright &copy; 2004 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010 Richard Stallman"
 msgstr "Авторски права &copy; 2004 Ричард Столман"
 
 # type: Content of: <div><p>

Index: java-trap.pot
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/po/java-trap.pot,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- java-trap.pot       4 Apr 2010 18:25:07 -0000       1.6
+++ java-trap.pot       5 Apr 2010 18:25:09 -0000       1.7
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-04-04 14:25-0300\n"
+"POT-Creation-Date: 2010-04-05 14:25-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -60,22 +60,23 @@
 
 # type: Content of: <div><p>
 msgid ""
-"In addition, there are nonfree programs with ``Java'' in their name, such as "
-"JavaFX, and there are nonfree Java packages you might find tempting but need "
-"to reject.  So check the licenses of whatever packages you plan to use.  If "
-"you use Swing, make sure to use the free version, which comes with IcedTea.,"
+"In addition, there are nonfree programs with &ldquo;Java&rdquo; in their "
+"name, such as JavaFX, and there are nonfree Java packages you might find "
+"tempting but need to reject.  So check the licenses of whatever packages you "
+"plan to use.  If you use Swing, make sure to use the free version, which "
+"comes with IcedTea."
 msgstr ""
 
 # type: Content of: <div><p>
 msgid ""
-"Aside from those Java specifics, general issue described here remains "
+"Aside from those Java specifics, the general issue described here remains "
 "important, because any nonfree library or programming platform can cause a "
 "similar problem.  We must learn a lesson from the history of Java, so we can "
 "avoid other traps in the future."
 msgstr ""
 
 # type: Content of: <div><p>
-msgid "Please also see: <a href=\"javascript-trap.html\">The Javascript 
Trap</a>"
+msgid "Please also see: <a href=\"javascript-trap.html\">The Javascript 
Trap</a>."
 msgstr ""
 
 # type: Content of: <p>
@@ -274,7 +275,7 @@
 msgstr ""
 
 # type: Content of: <div><p>
-msgid "Copyright &copy; 2004 Richard Stallman"
+msgid "Copyright &copy; 2004, 2010 Richard Stallman"
 msgstr ""
 
 # type: Content of: <div><p>