[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun licenses/po/license-list.pot p...
|
From: |
Yavor Doganov |
|
Subject: |
trans-coord/gnun licenses/po/license-list.pot p... |
|
Date: |
Sat, 21 Apr 2012 18:25:15 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Yavor Doganov <yavor> 12/04/21 18:25:15
Modified files:
gnun/licenses/po: license-list.pot
gnun/philosophy/po: words-to-avoid.pot
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/po/license-list.pot?cvsroot=trans-coord&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/po/words-to-avoid.pot?cvsroot=trans-coord&r1=1.39&r2=1.40
Patches:
Index: licenses/po/license-list.pot
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/po/license-list.pot,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- licenses/po/license-list.pot 24 Feb 2012 19:25:10 -0000 1.68
+++ licenses/po/license-list.pot 21 Apr 2012 18:25:15 -0000 1.69
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-24 14:25-0500\n"
+"POT-Creation-Date: 2012-04-21 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"
@@ -50,7 +50,7 @@
msgstr ""
#. type: Content of: <ul><li><ul><li>
-msgid "<a href=\"#NonFreeSoftwareLicenses\">Non-Free Software Licenses</a>"
+msgid "<a href=\"#NonFreeSoftwareLicenses\">Nonfree Software Licenses</a>"
msgstr ""
#. type: Content of: <ul><li>
@@ -63,7 +63,7 @@
#. type: Content of: <ul><li><ul><li>
msgid ""
-"<a href=\"#NonFreeDocumentationLicenses\"> Non-Free Documentation "
+"<a href=\"#NonFreeDocumentationLicenses\"> Nonfree Documentation "
"Licenses</a>"
msgstr ""
@@ -238,7 +238,7 @@
#. type: Content of: <dl><dd><p>
msgid ""
"This is the latest version of the LGPL: a free software license, but not a "
-"strong copyleft license, because it permits linking with non-free modules. "
+"strong copyleft license, because it permits linking with nonfree modules. "
"It is compatible with GPLv3. We recommend it for <a "
"href=\"/licenses/why-not-lgpl.html\">special circumstances only</a>."
msgstr ""
@@ -263,7 +263,7 @@
#. type: Content of: <dl><dd><p>
msgid ""
"This is the previous version of the LGPL: a free software license, but not a "
-"strong copyleft license, because it permits linking with non-free modules. "
+"strong copyleft license, because it permits linking with nonfree modules. "
"It is compatible with GPLv2 and GPLv3. We generally recommend <a "
"href=\"#LGPL\">the latest version of the LGPL</a>, <a "
"href=\"/licenses/why-not-lgpl.html\">for special circumstances only</a>. To "
@@ -457,13 +457,13 @@
#. type: Content of: <dl><dd><p>
msgid ""
"The text of the CeCILL uses a couple of biased terms that ought to be "
-"avoided: “intellectual property” (see <a "
-"href=\"/philosophy/not-ipr.xhtml\">this article</a>) and "
-"“protection” (see <a "
-"href=\"/philosophy/words-to-avoid.html\">this article</a>); this decision "
-"was unfortunate, because reading the license tends to spread the "
-"presuppositions of those terms. However, this does not cause any particular "
-"problem for the programs released under the CeCILL."
+"avoided: <a href=\"/philosophy/not-ipr.html\">“intellectual "
+"property”</a> and <a "
+"href=\"/philosophy/words-to-avoid.html#Protection\"> "
+"“protection”</a>; this decision was unfortunate, because reading "
+"the license tends to spread the presuppositions of those terms. However, "
+"this does not cause any particular problem for the programs released under "
+"the CeCILL."
msgstr ""
#. type: Content of: <dl><dd><p>
@@ -1278,9 +1278,9 @@
msgid ""
"This is a simple, permissive non-copyleft free software license with a "
"serious flaw: the “obnoxious BSD advertising clause”. The flaw "
-"is not fatal; that is, it does not render the software non-free. But it "
-"does cause <a href=\"/philosophy/bsd.html\">practical problems</a>, "
-"including incompatibility with the GNU GPL."
+"is not fatal; that is, it does not render the software nonfree. But it does "
+"cause <a href=\"/philosophy/bsd.html\">practical problems</a>, including "
+"incompatibility with the GNU GPL."
msgstr ""
#. type: Content of: <dl><dd><p>
@@ -1357,7 +1357,7 @@
#. type: Content of: <dl><dd><p>
msgid ""
"Recent versions of Condor (from 6.9.5 on) are released under the <a "
-"href=\"#Apache2\">Apache License 2.0</a>. Only older versions of Condor use "
+"href=\"#apache2\">Apache License 2.0</a>. Only older versions of Condor use "
"this license."
msgstr ""
@@ -1500,7 +1500,7 @@
"facility to allow you to map file names, to specify “use file bar when "
"file foo is requested”. With this facility, the requirement is merely "
"annoying; without the facility, the same requirement would be a serious "
-"obstacle, and we would have to conclude it makes the program non-free."
+"obstacle, and we would have to conclude it makes the program nonfree."
msgstr ""
#. type: Content of: <dl><dd><p>
@@ -1517,7 +1517,7 @@
#. type: Content of: <dl><dd><p>
msgid ""
"The LPPL says that some files, in certain versions of LaTeX, may have "
-"additional restrictions, which could render them non-free. For this reason, "
+"additional restrictions, which could render them nonfree. For this reason, "
"it may take some careful checking to produce a version of LaTeX that is free "
"software."
msgstr ""
@@ -1733,8 +1733,8 @@
"The license of OpenSSL is a conjunction of two licenses, one of them being "
"the license of SSLeay. You must follow both. The combination results in a "
"copyleft free software license that is incompatible with the GNU GPL. It "
-"also has an advertising clause like the original BSD license and the Apache "
-"license."
+"also has an advertising clause like the <a href=\"#OriginalBSD\">original "
+"BSD license</a> and the <a href=\"#apache1\">Apache 1 license</a>."
msgstr ""
#. type: Content of: <dl><dd><p>
@@ -1989,27 +1989,27 @@
#. type: Content of: <h3>
msgid ""
"<a id=\"NonFreeSoftwareLicense\"></a> <a id=\"NonFreeSoftwareLicenses\"> "
-"Non-Free Software Licenses</a> <span class=\"anchor-reference-id\"> (<a "
+"Nonfree Software Licenses</a> <span class=\"anchor-reference-id\"> (<a "
"href=\"#NonFreeSoftwareLicenses\">#NonFreeSoftwareLicenses</a>)</span>"
msgstr ""
#. type: Content of: <p>
msgid ""
"<strong>The following licenses <em>do not qualify</em> as <a "
-"href=\"/philosophy/free-sw.html\">free software</a> licenses. A non-free "
+"href=\"/philosophy/free-sw.html\">free software</a> licenses. A nonfree "
"license is automatically incompatible with the <a href=\"#GNUGPL\">GNU "
"GPL</a>.</strong>"
msgstr ""
#. type: Content of: <p>
msgid ""
-"Of course, we urge you to avoid using non-free software licenses, and to "
-"avoid non-free software in general."
+"Of course, we urge you to avoid using nonfree software licenses, and to "
+"avoid nonfree software in general."
msgstr ""
#. type: Content of: <p>
msgid ""
-"There is no way we could list all the known non-free software licenses here; "
+"There is no way we could list all the known nonfree software licenses here; "
"after all, every proprietary software company has its own. We focus here on "
"licenses that are often mistaken for free software licenses but are, in "
"fact, <strong>not</strong> free software licenses."
@@ -2019,8 +2019,8 @@
msgid ""
"We have provided links to these licenses when we can do so without violating "
"our general policy: that we do not make links to sites that promote, "
-"encourage or facilitate the use of non-free software packages. The last "
-"thing we want to do is give any non-free program some gratis publicity that "
+"encourage or facilitate the use of nonfree software packages. The last "
+"thing we want to do is give any nonfree program some gratis publicity that "
"might encourage more people to use it. For the same reason, we have avoided "
"naming the programs for which a license is used, unless we think that for "
"specific reasons it won't backfire."
@@ -2050,10 +2050,10 @@
#. type: Content of: <dl><dd><p>
msgid ""
"Versions 1.0, 1.1 and 1.2 are <a "
-"href=\"/philosophy/historical-apsl.html\">not free software licenses (follow "
-"the link for more explanation)</a>. Please don't use these licenses, and we "
-"urge you to avoid any software that has been released under them. <a "
-"href=\"#apsl2\">Version 2.0 of the APSL</a> is a free software license."
+"href=\"/philosophy/historical-apsl.html\">not free software licenses</a>. "
+"Please don't use these licenses, and we urge you to avoid any software that "
+"has been released under them. <a href=\"#apsl2\">Version 2.0 of the "
+"APSL</a> is a free software license."
msgstr ""
#. type: Content of: <dl><dt>
@@ -2080,7 +2080,7 @@
#. type: Content of: <dl><dd><p>
msgid ""
-"The AT&T Public License is a non-free license. It has several serious "
+"The AT&T Public License is a nonfree license. It has several serious "
"problems:"
msgstr ""
@@ -2133,7 +2133,7 @@
"It asserts one needs a license from AT&T to make a link to their web "
"site. This is not an immediate practical problem, since the license says it "
"gives permission to make such a link. (Anyway, people shouldn't make links "
-"to sites about non-free software.) But such a claim should not be made or "
+"to sites about nonfree software.) But such a claim should not be made or "
"propagated."
msgstr ""
@@ -2169,7 +2169,7 @@
#. type: Content of: <dl><dd><p>
msgid ""
"Today <a href=\"#eCos20\">eCos is available</a> under the GNU GPL with "
-"additional permission for linking with non-free programs."
+"additional permission for linking with nonfree programs."
msgstr ""
#. type: Content of: <dl><dt>
@@ -2184,7 +2184,7 @@
msgid ""
"The GPL-PA (whose original name in Portuguese is “Licença "
"Pública Geral para Administração Pública”) "
-"is non-free for several reasons:"
+"is nonfree for several reasons:"
msgstr ""
#. type: Content of: <dl><dd><ul><li>
@@ -2273,7 +2273,7 @@
#. type: Content of: <dl><dd><p>
msgid ""
-"The lha license must be considered non-free because it is so vague that you "
+"The lha license must be considered nonfree because it is so vague that you "
"cannot be sure what permissions you have."
msgstr ""
@@ -2389,7 +2389,7 @@
#. type: Content of: <dl><dd><p>
msgid ""
-"The Reciprocal Public License is a non-free license because of three "
+"The Reciprocal Public License is a nonfree license because of three "
"problems. 1. It puts limits on prices charged for an initial copy. "
"2. It requires notification of the original developer for publication "
"of a modified version. 3. It requires publication of any modified "
@@ -2418,7 +2418,7 @@
#. type: Content of: <dl><dd><p>
msgid ""
-"Despite the name, this is a software license, and it's non-free for several "
+"Despite the name, this is a software license, and it's nonfree for several "
"reasons:"
msgstr ""
@@ -2509,8 +2509,8 @@
#. type: Content of: <dl><dt>
msgid ""
"<a id=\"SystemC-3.0\" "
-"href=\"http://www.systemc.org/about/org_docs/license/\";> SystemC "Open "
-"Source" License, Version 3.0</a> <span class=\"anchor-reference-id\"> "
+"href=\"http://www.systemc.org/about/org_docs/license/\";> SystemC “Open "
+"Source” License, Version 3.0</a> <span class=\"anchor-reference-id\"> "
"(<a href=\"#SystemC-3.0\">#SystemC-3.0</a>)</span>"
msgstr ""
@@ -2518,9 +2518,9 @@
msgid ""
"This license requires all recipients to proactively help the licensor "
"enforce its trademarks. This is an unreasonable condition to place on "
-"users' rights, so the license is non-free. It also has other practical "
+"users' rights, so the license is nonfree. It also has other practical "
"problems: some of the requirements are vague, and it uses the term <a "
-"href=\"/philosophy/not-ipr.xhtml\">“intellectual property”</a>."
+"href=\"/philosophy/not-ipr.html\">“intellectual property”</a>."
msgstr ""
#. type: Content of: <dl><dd><p>
@@ -2539,7 +2539,7 @@
#. type: Content of: <dl><dd><p>
msgid ""
-"The University of Utah Public License is a non-free license because it does "
+"The University of Utah Public License is a nonfree license because it does "
"not allow commercial redistribution. It also purports to restrict "
"commercially running the software and even commercially giving consultation "
"about it. Those restrictions are probably not legally enforceable under US "
@@ -2578,7 +2578,7 @@
"This is not a free software license. The license prohibits distribution for "
"a fee, and that makes it impossible for the software to be included in the "
"many CD-ROM free software collections that are sold by companies and by "
-"organizations such as the FSF."
+"organizations."
msgstr ""
#. type: Content of: <dl><dd><p>
@@ -2589,8 +2589,8 @@
#. type: Content of: <dl><dd><p>
msgid ""
-"(The YaST software itself no longer uses this non-free YaST license; "
-"happily, it is now free software, released under the GNU GPL.)"
+"(The YaST software itself no longer uses this nonfree YaST license; happily, "
+"it is now free software, released under the GNU GPL.)"
msgstr ""
#. type: Content of: <h2>
@@ -2635,7 +2635,7 @@
#. type: Content of: <dl><dd><p>
msgid ""
-"This is a Free Documentation license that is incompatible with the GNU FDL. "
+"This is a free documentation license that is incompatible with the GNU FDL. "
"It is incompatible because Section (2c) says “You add no other "
"terms or conditions to those of this License”, and the GNU FDL has "
"additional terms not accounted for in the Common Documentation License."
@@ -2670,7 +2670,7 @@
"It is a copyleft free documentation license <strong>provided</strong> the "
"copyright holder does not exercise any of the “LICENSE OPTIONS” "
"listed in Section VI of the license. But if either of the options is "
-"invoked, the license becomes non-free. In any case, it is incompatible with "
+"invoked, the license becomes nonfree. In any case, it is incompatible with "
"the GNU FDL."
msgstr ""
@@ -2680,7 +2680,7 @@
"you recommend “Use the Open Publication License, Version 1.0 but don't "
"enable the options”, it would be easy for the second half of that "
"recommendation to get forgotten; someone might use the license with the "
-"options, making a manual non-free, and yet think he or she is following your "
+"options, making a manual nonfree, and yet think he or she is following your "
"advice."
msgstr ""
@@ -2689,7 +2689,7 @@
"Likewise, if you use this license without either of the options to make your "
"manual free, someone else might decide to imitate you, then change his or "
"her mind about the options thinking that that is just a detail; the result "
-"would be that his or her manual is non-free."
+"would be that his or her manual is nonfree."
msgstr ""
#. type: Content of: <dl><dd><p>
@@ -2712,7 +2712,7 @@
#. type: Content of: <h3>
msgid ""
-"<a id=\"NonFreeDocumentationLicenses\"> Non-Free Documentation Licenses</a> "
+"<a id=\"NonFreeDocumentationLicenses\"> Nonfree Documentation Licenses</a> "
"<span class=\"anchor-reference-id\"> (<a "
"href=\"#NonFreeDocumentationLicenses\">#NonFreeDocumentationLicenses</a>) "
"</span>"
Index: philosophy/po/words-to-avoid.pot
===================================================================
RCS file:
/sources/trans-coord/trans-coord/gnun/philosophy/po/words-to-avoid.pot,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- philosophy/po/words-to-avoid.pot 20 Apr 2012 18:25:44 -0000 1.39
+++ philosophy/po/words-to-avoid.pot 21 Apr 2012 18:25:15 -0000 1.40
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-04-20 14:25-0300\n"
+"POT-Creation-Date: 2012-04-21 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"
@@ -779,7 +779,7 @@
"Please avoid using the term “PowerPoint” to mean any kind of "
"slide presentation. “PowerPoint” is just the name of one "
"particular proprietary program to make presentations, and there are plenty "
-"of free alternatives, such as TeX's <tt>beamer</tt> class and "
+"of free program for presentations, such as TeX's <tt>beamer</tt> class and "
"OpenOffice.org's Impress."
msgstr ""
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- trans-coord/gnun licenses/po/license-list.pot p...,
Yavor Doganov <=