www gnu/linux-and-gnu.sq.html licenses/po/gpl-f...

[Yavor Doganov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   11/01/08 09:27:23

Modified files:
        gnu            : linux-and-gnu.sq.html 
        licenses/po    : gpl-faq.pot 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/linux-and-gnu.sq.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.pot?cvsroot=www&r1=1.15&r2=1.16

Patches:
Index: gnu/linux-and-gnu.sq.html
===================================================================
RCS file: /web/www/www/gnu/linux-and-gnu.sq.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gnu/linux-and-gnu.sq.html   8 Jan 2011 01:27:03 -0000       1.14
+++ gnu/linux-and-gnu.sq.html   8 Jan 2011 09:27:10 -0000       1.15
@@ -292,7 +292,7 @@
  <p><!-- timestamp start -->
 U përditësua:
 
-$Date: 2011/01/08 01:27:03 $
+$Date: 2011/01/08 09:27:10 $
 
 <!-- timestamp end -->
 </p>

Index: licenses/po/gpl-faq.pot
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.pot,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- licenses/po/gpl-faq.pot     5 Jan 2011 09:26:49 -0000       1.15
+++ licenses/po/gpl-faq.pot     8 Jan 2011 09:27:15 -0000       1.16
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-01-05 04:25-0500\n"
+"POT-Creation-Date: 2011-01-08 04: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"
@@ -4418,14 +4418,14 @@
 # type: Content of: <dl><dd><table><tbody><tr><td>
 #:   
 msgid ""
-"OK if you convert to GPLv2&nbsp;<a "
+"OK: Convey project under GPLv2 only&nbsp;<a "
 "href=\"#compat-matrix-footnote-7\">[7]</a>"
 msgstr ""
 
 # type: Content of: <dl><dd><table><tbody><tr><td>
 #:  
 msgid ""
-"OK if you convert to GPLv2&nbsp;<a "
+"OK: Convey project under GPLv2 only&nbsp;<a "
 "href=\"#compat-matrix-footnote-7\">[7]</a><a "
 "href=\"#compat-matrix-footnote-2\">[2]</a>"
 msgstr ""
@@ -4437,13 +4437,14 @@
 
 # type: Content of: <dl><dd><table><tbody><tr><td>
 #:    
-msgid "OK if you convert to GPL&nbsp;<a 
href=\"#compat-matrix-footnote-7\">[7]</a>"
+msgid ""
+"OK: Convey project under GPLv2 or later&nbsp;<a "
+"href=\"#compat-matrix-footnote-7\">[7]</a>"
 msgstr ""
 
 # type: Content of: <dl><dd><table><tbody><tr><td>
-#:      
 msgid ""
-"OK if you convert to GPLv3&nbsp;<a "
+"OK: Convey project under GPLv3 or later&nbsp;<a "
 "href=\"#compat-matrix-footnote-8\">[8]</a>"
 msgstr ""
 
@@ -4455,51 +4456,77 @@
 # type: Content of: <dl><dd><table><tbody><tr><td>
 #:  
 msgid ""
-"OK if you upgrade to GPLv3&nbsp;<a "
+"OK: Convey project under GPLv3&nbsp;<a "
 "href=\"#compat-matrix-footnote-3\">[3]</a>"
 msgstr ""
 
 # type: Content of: <dl><dd><table><tbody><tr><td>
 #:    
 msgid ""
-"OK if you convert to GPLv3&nbsp;<a "
+"OK: Convey project under GPLv3&nbsp;<a "
 "href=\"#compat-matrix-footnote-7\">[7]</a>"
 msgstr ""
 
 # type: Content of: <dl><dd><table><tbody><tr><td>
 #:  
 msgid ""
-"OK if you convert to GPLv3&nbsp;<a "
+"OK: Convey project under GPLv3&nbsp;<a "
 "href=\"#compat-matrix-footnote-7\">[7]</a><a "
 "href=\"#compat-matrix-footnote-3\">[3]</a>"
 msgstr ""
 
 # type: Content of: <dl><dd><table><tbody><tr><td>
+#:   
+msgid ""
+"OK: Convey project under GPLv3&nbsp;<a "
+"href=\"#compat-matrix-footnote-8\">[8]</a>"
+msgstr ""
+
+# type: Content of: <dl><dd><table><tbody><tr><td>
 msgid ""
-"OK if you convert to GPL&nbsp;<a "
+"OK: Convey code under GPLv2&nbsp;<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&nbsp;<a "
 "href=\"#compat-matrix-footnote-7\">[7]</a><a "
 "href=\"#compat-matrix-footnote-2\">[2]</a>"
 msgstr ""
 
 # type: Content of: <dl><dd><table><tbody><tr><td>
+#:  
+msgid ""
+"OK: Convey code under GPLv3&nbsp;<a "
+"href=\"#compat-matrix-footnote-7\">[7]</a>"
+msgstr ""
+
+# type: Content of: <dl><dd><table><tbody><tr><td>
 msgid "OK&nbsp;<a href=\"#comat-matrix-footnote-6\">[6]</a>"
 msgstr ""
 
 # type: Content of: <dl><dd><table><tbody><tr><td>
 msgid ""
-"OK if you convert to GPLv3&nbsp;<a "
+"OK: Convey code under GPLv3&nbsp;<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 if you convert to GPLv2&nbsp;<a "
+"OK: Convey code under GPLv2&nbsp;<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 GPLv2 or later&nbsp;<a "
+"href=\"#compat-matrix-footnote-7\">[7]</a>"
+msgstr ""
+
+# type: Content of: <dl><dd><table><tbody><tr><td>
 msgid "OK&nbsp;<a href=\"#comat-matrix-footnote-5\">[5]</a>"
 msgstr ""
 
@@ -4510,14 +4537,26 @@
 
 # type: Content of: <dl><dd><table><tbody><tr><td>
 msgid ""
-"OK if you upgrade and convert to GPLv3&nbsp;<a "
+"OK: Convey project and code under GPLv3&nbsp;<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 if you upgrade to LGPLv3&nbsp;<a "
+"OK: Convey code under GPLv3&nbsp;<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&nbsp;<a "
+"href=\"#compat-matrix-footnote-8\">[8]</a>"
+msgstr ""
+
+# type: Content of: <dl><dd><table><tbody><tr><td>
+msgid ""
+"OK: Convey project under LGPLv3&nbsp;<a "
 "href=\"#comat-matrix-footnote-4\">[4]</a>"
 msgstr ""
 
@@ -4527,7 +4566,7 @@
 
 # type: Content of: <dl><dd><table><tbody><tr><td>
 msgid ""
-"OK if you convert to GPL&nbsp;<a "
+"OK: Convey project under GPLv2 or later&nbsp;<a "
 "href=\"#compat-matrix-footnote-7\">[7]</a><a "
 "href=\"#compat-matrix-footnote-1\">[1]</a>"
 msgstr ""