[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses/po gpl-faq.pot
|
From: |
GNUN |
|
Subject: |
www/licenses/po gpl-faq.pot |
|
Date: |
Mon, 16 Dec 2013 21:56:09 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 13/12/16 21:56:09
Modified files:
licenses/po : gpl-faq.pot
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.pot?cvsroot=www&r1=1.46&r2=1.47
Patches:
Index: gpl-faq.pot
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.pot,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- gpl-faq.pot 11 Jun 2013 04:28:31 -0000 1.46
+++ gpl-faq.pot 16 Dec 2013 21:56:09 -0000 1.47
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: gpl-faq.html\n"
-"POT-Creation-Date: 2013-06-11 04:25+0000\n"
+"POT-Creation-Date: 2013-12-16 21:55+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -4784,7 +4784,7 @@
msgstr ""
#. type: Content of: <dl><dd><table><tbody><tr><th>
-msgid "I want to release a project under:"
+msgid "I want to license my code under:"
msgstr ""
#. type: Content of: <dl><dd><table><tbody><tr><th>
@@ -4837,14 +4837,14 @@
#. type: Content of: <dl><dd><table><tbody><tr><td>
#:
msgid ""
-"OK: Convey project under GPLv2 only <a "
+"OK: Combination is under GPLv2 only <a "
"href=\"#compat-matrix-footnote-7\">[7]</a>"
msgstr ""
#. type: Content of: <dl><dd><table><tbody><tr><td>
#:
msgid ""
-"OK: Convey project under GPLv2 only <a "
+"OK: Combination is under GPLv2 only <a "
"href=\"#compat-matrix-footnote-7\">[7]</a><a "
"href=\"#compat-matrix-footnote-2\">[2]</a>"
msgstr ""
@@ -4857,14 +4857,14 @@
#. type: Content of: <dl><dd><table><tbody><tr><td>
#:
msgid ""
-"OK: Convey project under GPLv2 or later <a "
+"OK: Combination is under GPLv2 or later <a "
"href=\"#compat-matrix-footnote-7\">[7]</a>"
msgstr ""
#. type: Content of: <dl><dd><table><tbody><tr><td>
#:
msgid ""
-"OK: Convey project under GPLv3 <a "
+"OK: Combination is under GPLv3 <a "
"href=\"#compat-matrix-footnote-8\">[8]</a>"
msgstr ""
@@ -4876,34 +4876,33 @@
#. type: Content of: <dl><dd><table><tbody><tr><td>
#:
msgid ""
-"OK: Convey project under GPLv3 <a "
+"OK: Combination is under GPLv3 <a "
"href=\"#compat-matrix-footnote-3\">[3]</a>"
msgstr ""
#. type: Content of: <dl><dd><table><tbody><tr><td>
#:
msgid ""
-"OK: Convey project under GPLv3 <a "
+"OK: Combination is under GPLv3 <a "
"href=\"#compat-matrix-footnote-7\">[7]</a>"
msgstr ""
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Convey code under GPLv2 <a "
+"OK: Convey copied code under GPLv2 <a "
"href=\"#compat-matrix-footnote-7\">[7]</a>"
msgstr ""
#. type: Content of: <dl><dd><table><tbody><tr><td>
#:
msgid ""
-"OK: Convey code under GPLv2 or later <a "
+"OK: Convey copied code under GPLv2 or later <a "
"href=\"#compat-matrix-footnote-7\">[7]</a>"
msgstr ""
#. type: Content of: <dl><dd><table><tbody><tr><td>
-#:
msgid ""
-"OK: Convey code under GPLv3 <a "
+"OK: Convey copied code under GPLv3 <a "
"href=\"#compat-matrix-footnote-7\">[7]</a>"
msgstr ""
@@ -4913,19 +4912,25 @@
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Convey code under GPLv3 <a "
+"OK: Convey copied code under GPLv3 <a "
"href=\"#compat-matrix-footnote-7\">[7]</a><a "
"href=\"#compat-matrix-footnote-8\">[8]</a>"
msgstr ""
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Convey code under GPLv2 <a "
+"OK: Convey copied code under GPLv2 <a "
"href=\"#compat-matrix-footnote-7\">[7]</a><a "
"href=\"#compat-matrix-footnote-1\">[1]</a>"
msgstr ""
#. type: Content of: <dl><dd><table><tbody><tr><td>
+msgid ""
+"OK: Convey code under GPLv3 <a "
+"href=\"#compat-matrix-footnote-7\">[7]</a>"
+msgstr ""
+
+#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid "OK <a href=\"#compat-matrix-footnote-5\">[5]</a>"
msgstr ""
@@ -4936,27 +4941,21 @@
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Convey project and code under GPLv3 <a "
+"OK: Combination is under GPLv3 <a "
"href=\"#compat-matrix-footnote-8\">[8]</a><a "
"href=\"#compat-matrix-footnote-3\">[3]</a>"
msgstr ""
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Convey code under GPLv3 <a "
-"href=\"#compat-matrix-footnote-8\">[8]</a>"
-msgstr ""
-
-#. type: Content of: <dl><dd><table><tbody><tr><td>
-msgid ""
-"OK: Convey project and code under GPLv3 <a "
+"OK: Combination is under GPLv3 <a "
"href=\"#compat-matrix-footnote-7\">[7]</a><a "
"href=\"#compat-matrix-footnote-8\">[8]</a>"
msgstr ""
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Convey project under LGPLv3 <a "
+"OK: Combination is under LGPLv3 <a "
"href=\"#compat-matrix-footnote-4\">[4]</a>"
msgstr ""
@@ -4966,7 +4965,7 @@
#. type: Content of: <dl><dd><table><tbody><tr><td>
msgid ""
-"OK: Convey project under GPLv3 <a "
+"OK: Combination is under GPLv3 <a "
"href=\"#compat-matrix-footnote-9\">[9]</a>"
msgstr ""
@@ -5029,9 +5028,7 @@
msgstr ""
#. type: Content of: <dl><dd><p>
-msgid ""
-"8: LGPLv3 gives you permission to relicense the code under GPLv3. In these "
-"cases, you can combine the code if you convert the LGPLed code to GPLv3."
+msgid "8: LGPLv3 is GPLv3 plus extra permissions that you can ignore in this
case."
msgstr ""
#. type: Content of: <dl><dd><p>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses/po gpl-faq.pot,
GNUN <=