[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun licenses/po/gpl-faq.pot licens...
|
From: |
Yavor Doganov |
|
Subject: |
trans-coord/gnun licenses/po/gpl-faq.pot licens... |
|
Date: |
Thu, 05 Jan 2012 19:25:37 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Yavor Doganov <yavor> 12/01/05 19:25:37
Modified files:
gnun/licenses/po: gpl-faq.pot gpl-faq.translist license-list.pot
gnun/philosophy/po: java-trap.bg.po java-trap.pot
java-trap.translist
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/po/gpl-faq.pot?cvsroot=trans-coord&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/po/gpl-faq.translist?cvsroot=trans-coord&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/po/license-list.pot?cvsroot=trans-coord&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/po/java-trap.bg.po?cvsroot=trans-coord&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/po/java-trap.pot?cvsroot=trans-coord&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/po/java-trap.translist?cvsroot=trans-coord&r1=1.1&r2=1.2
Patches:
Index: licenses/po/gpl-faq.pot
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/po/gpl-faq.pot,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- licenses/po/gpl-faq.pot 13 Dec 2011 19:25:11 -0000 1.29
+++ licenses/po/gpl-faq.pot 5 Jan 2012 19:25:36 -0000 1.30
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-13 14:25-0500\n"
+"POT-Creation-Date: 2012-01-05 14:25-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -212,9 +212,7 @@
#. type: Content of: <ul><li>
#:
-msgid ""
-"<a href=\"#WhatIfWorkIsShort\">What if the work is not much longer than the "
-"license itself?</a>"
+msgid "<a href=\"#WhatIfWorkIsShort\">What if the work is not very long?</a>"
msgstr ""
#. type: Content of: <ul><li>
@@ -1441,15 +1439,17 @@
#. type: Content of: <dl><dt>
msgid ""
-"What if the work is not much longer than the license itself? <span "
-"class=\"anchor-reference-id\">(<a href=\"#WhatIfWorkIsShort\" "
-">#WhatIfWorkIsShort</a>)</span>"
+"What if the work is not very long? <span class=\"anchor-reference-id\">(<a "
+"href=\"#WhatIfWorkIsShort\" >#WhatIfWorkIsShort</a>)</span>"
msgstr ""
#. type: Content of: <dl><dd><p>
msgid ""
-"If a single program is that short, you may as well use a simple "
-"all-permissive license for it, rather than the GNU GPL."
+"If a whole software package contains very little code—less than 300 "
+"lines is the benchmark we use—you may as well use a simple lax license "
+"for it, rather than a copyleft license like the GNU GPL. We <a "
+"href=\"/licenses/license-recommendations.html#software\">recommend the "
+"Apache License 2.0</a> for such cases."
msgstr ""
#. type: Content of: <dl><dt>
Index: licenses/po/gpl-faq.translist
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/po/gpl-faq.translist,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/po/gpl-faq.translist 20 Sep 2011 18:27:45 -0000 1.1
+++ licenses/po/gpl-faq.translist 5 Jan 2012 19:25:36 -0000 1.2
@@ -2,7 +2,7 @@
<div id="translations">
<ul class="translations-list">
<!-- English -->
-<li><a href="/licenses/gpl-faq.html">English</a> [en]</li>
+<li><a href="/licenses/gpl-faq.en.html">English</a> [en]</li>
</ul>
</div> <!-- id="translations" -->
<!-- end translinks file -->
Index: licenses/po/license-list.pot
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/po/license-list.pot,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- licenses/po/license-list.pot 3 Jan 2012 19:25:09 -0000 1.65
+++ licenses/po/license-list.pot 5 Jan 2012 19:25:37 -0000 1.66
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-03 14:25-0500\n"
+"POT-Creation-Date: 2012-01-05 14:25-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -709,19 +709,19 @@
"This is a free software license. Section 3.3 provides indirect "
"compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
"version 2.1, the GNU AGPL version 3.0, and all later versions of those "
-"licenses. When you receive work under the MPL version 2.0, you may make a "
-"“Larger Work” that combines that work with work under one of "
-"those GNU licenses. When you do, section 3.3 gives you permission to "
-"distribute the MPL-covered work under the terms of that same GNU license, "
-"with one condition: you must make sure that the files that were originally "
-"under the MPL are still available under the MPL's terms as well. In other "
-"words, when you make a combination this way, the files that were originally "
-"under the MPL will be dual licensed under the MPL and the GNU license. The "
-"end result is that the Larger Work, as a whole, will be covered under the "
-"GNU license. People who receive that combination from you will have the "
-"option to use any files that were originally covered by the MPL under that "
-"license's terms, or distribute the Larger Work in whole or in part under the "
-"terms of the GNU license with no further restrictions."
+"licenses. When you receive work under MPL 2.0, you may make a “Larger "
+"Work” that combines that work with work under those GNU licenses. "
+"When you do, section 3.3 gives you permission to distribute the MPL-covered "
+"work under the terms of the same GNU licenses, with one condition: you must "
+"make sure that the files that were originally under the MPL are still "
+"available under the MPL's terms as well. In other words, when you make a "
+"combination this way, the files that were originally under the MPL will be "
+"dual licensed under the MPL and the GNU license(s). The end result is that "
+"the Larger Work, as a whole, will be covered under the GNU license(s). "
+"People who receive that combination from you will have the option to use any "
+"files that were originally covered by the MPL under that license's terms, or "
+"distribute the Larger Work in whole or in part under the GNU licenses' terms "
+"with no further restrictions."
msgstr ""
#. type: Content of: <dl><dd><p>
@@ -729,7 +729,7 @@
"It's important to understand that the condition to distribute files under "
"the MPL's terms only applies to the party that first creates and distributes "
"the Larger Work. If it applied to their recipients as well, it would be a "
-"further restriction and incompatible with the GNU licenses. That said, when "
+"further restriction and incompatible with the GPL and AGPL. That said, when "
"you make contributions to an existing project, we usually <a "
"href=\"/licenses/license-recommendations.html#contributing\">recommend that "
"you keep your changes under the same license</a>, even when you're not "
@@ -741,12 +741,11 @@
#. type: Content of: <dl><dd><p>
msgid ""
"Check the license notices on the MPL-covered software before you make a "
-"Larger Work this way. Parties who release original work under the MPL "
-"version 2.0 may choose to opt out of this compatibility by including a "
-"sentence in the license notices that says that the work is "
-"“Incompatible With Secondary Licenses.” Any software that "
-"includes this notice is <strong>not</strong> compatible with the GPL or "
-"AGPL."
+"Larger Work this way. Parties who release original work under MPL 2.0 may "
+"choose to opt out of this compatibility by including a sentence in the "
+"license notices that says that the work is “Incompatible With "
+"Secondary Licenses.” Any software that includes this notice is "
+"<strong>not</strong> compatible with the GPL or AGPL."
msgstr ""
#. type: Content of: <dl><dd><p>
Index: philosophy/po/java-trap.bg.po
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/po/java-trap.bg.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- philosophy/po/java-trap.bg.po 20 Sep 2011 18:27:48 -0000 1.17
+++ philosophy/po/java-trap.bg.po 5 Jan 2012 19:25:37 -0000 1.18
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: java-trap.html\n"
-"POT-Creation-Date: 2011-09-20 14:25-0300\n"
+"POT-Creation-Date: 2012-01-05 14:25-0500\n"
"PO-Revision-Date: 2008-02-02 09:43+0200\n"
"Last-Translator: Kaloian Doganov <address@hidden>\n"
"Language-Team: Bulgarian <address@hidden>\n"
@@ -117,10 +117,9 @@
"пÑогÑамиÑане може да пÑиÑини подобен
пÑоблем. ТÑÑбва да Ñи вземем поÑка Ð¾Ñ "
"иÑÑоÑиÑÑа на Ðжава, Ñака Ñе да избÑгваме
дÑÑги клопки за в бÑдеÑе."
-# type: Content of: <div><p>
#. 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>
Index: philosophy/po/java-trap.pot
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/po/java-trap.pot,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- philosophy/po/java-trap.pot 20 Sep 2011 18:27:48 -0000 1.14
+++ philosophy/po/java-trap.pot 5 Jan 2012 19:25:37 -0000 1.15
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-09-20 14:25-0300\n"
+"POT-Creation-Date: 2012-01-05 14:25-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -76,7 +76,7 @@
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>
Index: philosophy/po/java-trap.translist
===================================================================
RCS file:
/sources/trans-coord/trans-coord/gnun/philosophy/po/java-trap.translist,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/java-trap.translist 20 Sep 2011 18:27:48 -0000 1.1
+++ philosophy/po/java-trap.translist 5 Jan 2012 19:25:37 -0000 1.2
@@ -2,9 +2,9 @@
<div id="translations">
<ul class="translations-list">
<!-- Bulgarian -->
-<li><a
href="/philosophy/java-trap.bg.html">български</a> [bg]</li>
+<li><a
href="/philosophy/java-trap.bg.html">бÑлгаÑÑки</a> [bg]</li>
<!-- English -->
-<li><a href="/philosophy/java-trap.html">English</a> [en]</li>
+<li><a href="/philosophy/java-trap.en.html">English</a> [en]</li>
</ul>
</div> <!-- id="translations" -->
<!-- end translinks file -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- trans-coord/gnun licenses/po/gpl-faq.pot licens...,
Yavor Doganov <=