[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses licenses.ca.html licenses.el.html ...
|
From: |
GNUN |
|
Subject: |
www/licenses licenses.ca.html licenses.el.html ... |
|
Date: |
Tue, 11 Aug 2015 21:58:09 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/08/11 21:58:09
Modified files:
licenses : licenses.ca.html licenses.el.html
licenses/po : licenses.ca-diff.html licenses.el-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.ca.html?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.el.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ca-diff.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.el-diff.html?cvsroot=www&r1=1.21&r2=1.22
Patches:
Index: licenses.ca.html
===================================================================
RCS file: /web/www/www/licenses/licenses.ca.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- licenses.ca.html 25 May 2015 10:27:13 -0000 1.49
+++ licenses.ca.html 11 Aug 2015 21:58:07 -0000 1.50
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/licenses.ca.po">
+ http://www.gnu.org/licenses/po/licenses.ca.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/licenses.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/licenses.ca-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-06-12" --><!--#set
var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
<!--#include virtual="/server/header.ca.html" -->
<!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
<!--#include virtual="/licenses/po/licenses.translist" -->
<!--#include virtual="/server/banner.ca.html" -->
+<!--#include virtual="/server/outdated.ca.html" -->
<h2>Llicències</h2>
<p>
@@ -496,7 +502,7 @@
<p class="unprintable"><!-- timestamp start -->
Updated:
-$Date: 2015/05/25 10:27:13 $
+$Date: 2015/08/11 21:58:07 $
<!-- timestamp end -->
</p>
Index: licenses.el.html
===================================================================
RCS file: /web/www/www/licenses/licenses.el.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- licenses.el.html 17 Apr 2015 22:58:43 -0000 1.25
+++ licenses.el.html 11 Aug 2015 21:58:07 -0000 1.26
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/licenses/po/licenses.el.po">
+ http://www.gnu.org/licenses/po/licenses.el.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/licenses/licenses.html"
+ --><!--#set var="DIFF_FILE" value="/licenses/po/licenses.el-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-06-12" --><!--#set
var="ENGLISH_PAGE" value="/licenses/licenses.en.html" -->
<!--#include virtual="/server/header.el.html" -->
<!-- Parent-Version: 1.77 -->
@@ -8,6 +13,7 @@
<!--#include virtual="/licenses/po/licenses.translist" -->
<!--#include virtual="/server/banner.el.html" -->
+<!--#include virtual="/server/outdated.el.html" -->
<h2>ÎδειεÏ</h2>
<p>
@@ -507,7 +513,7 @@
<p class="unprintable"><!-- timestamp start -->
ÎνημεÏÏθηκε:
-$Date: 2015/04/17 22:58:43 $
+$Date: 2015/08/11 21:58:07 $
<!-- timestamp end -->
</p>
Index: po/licenses.ca-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ca-diff.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/licenses.ca-diff.html 22 May 2015 06:07:08 -0000 1.3
+++ po/licenses.ca-diff.html 11 Aug 2015 21:58:08 -0000 1.4
@@ -50,6 +50,18 @@
<p>We also have a page that discusses <a
href="/philosophy/bsd.html">the BSD License Problem</a>.</p>
+<span class="inserted"><ins><em><h3>Evaluating Licenses</h3>
+
+<p>If you come across a license not mentioned in our
+<a href="/licenses/license-list.html">license list</a>, you can
ask us
+to evaluate whether it is a free license. Please email a copy of the
+license (and the URL where you found it)
+to <a href="mailto:address@hidden">address@hidden</a>. Our
+licensing experts in the staff and the board of directors will review
+it. If the license has some unusual conditions, they may pose
+difficult philosophical problems, so we can't promise to decide
+quickly.</p></em></ins></span>
+
<h3>Common Resources for our Software Licenses</h3>
<p>We have a number of resources to help people understand and use our
@@ -330,7 +342,7 @@
<p>
Copyleft also helps programmers who want to contribute
-<a <span
class="removed"><del><strong>href="/help/software.html#develop">improvements</a></strong></del></span>
<span
class="inserted"><ins><em>href="/software/software.html#develop">improvements</a></em></ins></span>
to
+<a href="/software/software.html#develop">improvements</a> to
<a href="/philosophy/free-sw.html">free software</a> get
permission to
do that. These programmers often work for companies or universities
that would do almost anything to get more money. A programmer may
@@ -444,7 +456,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -462,14 +474,15 @@
<p>Copyright © 2014, 2015 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/05/22 06:07:08 $
+$Date: 2015/08/11 21:58:08 $
<!-- timestamp end -->
</p>
</div>
Index: po/licenses.el-diff.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.el-diff.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- po/licenses.el-diff.html 8 Mar 2015 09:57:14 -0000 1.21
+++ po/licenses.el-diff.html 11 Aug 2015 21:58:08 -0000 1.22
@@ -11,11 +11,11 @@
</style></head>
<body><pre>
<!--#include virtual="/server/header.html" -->
-<span class="inserted"><ins><em><!-- Parent-Version: 1.77
--></em></ins></span>
+<!-- Parent-Version: 1.77 -->
<title>Licenses
-- GNU Project - Free Software <span class="removed"><del><strong>Foundation
(FSF)</title></strong></del></span> <span
class="inserted"><ins><em>Foundation</title></em></ins></span>
-<!--#include <span
class="removed"><del><strong>virtual="/server/banner.html"</strong></del></span>
<span
class="inserted"><ins><em>virtual="/licenses/po/licenses.translist"</em></ins></span>
-->
-<!--#include <span
class="removed"><del><strong>virtual="/licenses/po/licenses.translist"</strong></del></span>
<span
class="inserted"><ins><em>virtual="/server/banner.html"</em></ins></span> -->
+- GNU Project - Free Software Foundation</title>
+<!--#include virtual="/licenses/po/licenses.translist" -->
+<!--#include virtual="/server/banner.html" -->
<h2>Licenses</h2>
<p>
@@ -48,14 +48,19 @@
our <a href="/licenses/recommended-copylefts.html">recommended
copyleft licenses</a>.</p>
-<span class="removed"><del><strong><p>
-Our documentation licenses are currently being revised, and we welcome
-your comments on the proposed texts. Please
-visit</strong></del></span>
-
-<span class="inserted"><ins><em><p>We also have a page that
discusses</em></ins></span> <a <span
class="removed"><del><strong>href="http://gplv3.fsf.org">our license update
site</a> to
-read the current drafts and participate in the process.
-</p></strong></del></span> <span
class="inserted"><ins><em>href="/philosophy/bsd.html">the BSD License
Problem</a>.</p></em></ins></span>
+<p>We also have a page that discusses <a
href="/philosophy/bsd.html">the BSD License Problem</a>.</p>
+
+<span class="inserted"><ins><em><h3>Evaluating Licenses</h3>
+
+<p>If you come across a license not mentioned in our
+<a href="/licenses/license-list.html">license list</a>, you can
ask us
+to evaluate whether it is a free license. Please email a copy of the
+license (and the URL where you found it)
+to <a href="mailto:address@hidden">address@hidden</a>. Our
+licensing experts in the staff and the board of directors will review
+it. If the license has some unusual conditions, they may pose
+difficult philosophical problems, so we can't promise to decide
+quickly.</p></em></ins></span>
<h3>Common Resources for our Software Licenses</h3>
@@ -70,18 +75,16 @@
own software</a></li>
<li><a href="/licenses/gpl-violation.html">What to do if you see
a
violation of a GNU license</a></li>
- <li><a <span
class="inserted"><ins><em>href="/licenses/license-list.html">List of Free
Software Licenses</a></li>
- <li><a</em></ins></span>
href="/philosophy/university.html">Releasing Free Software if
+ <li><a href="/licenses/license-list.html">List of Free Software
Licenses</a></li>
+ <li><a href="/philosophy/university.html">Releasing Free
Software if
you work at a university</a></li>
<li><a href="/licenses/why-assign.html">Why the FSF gets
copyright
assignments from contributors</a></li>
<li><a href="/graphics/license-logos.html">GNU license
logos</a> to use
with your project</li>
+ <li><a href="http://www.fsf.org/licensing">The FSF Licensing
& Compliance Lab</a></li>
<li><a
-<span
class="removed"><del><strong>href="/licenses/license-list.html#LicensingMailingList"><address@hidden>
-mailing list</a></strong></del></span> <span
class="inserted"><ins><em>href="http://www.fsf.org/licensing">The FSF
Licensing & Compliance Lab</a></li>
- <li><a
-href="/licenses/license-list.html#LicensingEmailAddress"><address@hidden></a></em></ins></span>
for general licensing help
+href="/licenses/license-list.html#LicensingEmailAddress"><address@hidden></a>
for general licensing help
</li>
</ul>
@@ -339,7 +342,7 @@
<p>
Copyleft also helps programmers who want to contribute
-<a <span
class="removed"><del><strong>href="/software/software.html#HelpWriteSoftware">improvements</a></strong></del></span>
<span
class="inserted"><ins><em>href="/software/software.html#develop">improvements</a></em></ins></span>
to
+<a href="/software/software.html#develop">improvements</a> to
<a href="/philosophy/free-sw.html">free software</a> get
permission to
do that. These programmers often work for companies or universities
that would do almost anything to get more money. A programmer may
@@ -418,29 +421,19 @@
<p>
We don't take the position that artistic or entertainment works must
be free, but if you want to make one free, we recommend
-the <a <span
class="removed"><del><strong>href="http://artlibre.org/licence/lalgb.html">Free</strong></del></span>
<span
class="inserted"><ins><em>href="//directory.fsf.org/wiki/License:Free-Art-L-v1.3">Free</em></ins></span>
Art
+the <a href="//directory.fsf.org/wiki/License:Free-Art-L-v1.3">Free Art
License</a>.</p>
-<span class="removed"><del><strong><!-- If needed, change the copyright
block at the bottom. In general,
- pages on the GNU web server should be under CC BY-ND 3.0 US.
- Please do NOT change or remove this without talking
- with the webmasters or licensing team first.
- Please make sure the copyright date is consistent with the document
- and that it is like this: "2001, 2002", not this: "2001-2002".
--></strong></del></span>
-
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
-<span class="inserted"><ins><em><div
class="unprintable"></em></ins></span>
+<div class="unprintable">
<p>Please send general FSF & GNU inquiries to
<a href="mailto:address@hidden"><address@hidden></a>.
There are also <a href="/contact/">other ways to contact</a>
-the <span class="removed"><del><strong>FSF.<br />
-Please send broken</strong></del></span> <span class="inserted"><ins><em>FSF.
Broken</em></ins></span> links and other corrections or suggestions <span
class="inserted"><ins><em>can be sent</em></ins></span>
-to <a <span
class="removed"><del><strong>href="mailto:address@hidden"><em>address@hidden</em></a>.</p>
-
-<p>Please</strong></del></span> <span
class="inserted"><ins><em>href="mailto:address@hidden"><address@hidden></a>.</p>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a
href="mailto:address@hidden"><address@hidden></a>.</p>
<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
replace it with the translation of these two:
@@ -455,15 +448,15 @@
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
-Please</em></ins></span> see the <a
+Please see the <a
href="/server/standards/README.translations.html">Translations
README</a> for information on coordinating and submitting translations
of this article.</p>
-<span class="inserted"><ins><em></div>
+</div>
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND <span class="removed"><del><strong>3.0
US.</strong></del></span> <span
class="inserted"><ins><em>4.0.</em></ins></span> Please do NOT change or
remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -476,21 +469,20 @@
being publicly visible on the web or in a revision control system).
There is more detail about copyright years in the GNU Maintainers
- Information document, www.gnu.org/prep/maintain. --></em></ins></span>
+ Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © <span
class="removed"><del><strong>2011</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> Free Software
Foundation, Inc.</p>
+<p>Copyright © 2014, 2015 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
-
-<span class="removed"><del><strong><p>Updated:</strong></del></span>
+<span
class="removed"><del><strong>href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative</strong></del></span>
+<span
class="inserted"><ins><em>href="http://creativecommons.org/licenses/by-nd/4.0/">Creative</em></ins></span>
+Commons <span class="removed"><del><strong>Attribution-NoDerivs 3.0 United
States</strong></del></span> <span
class="inserted"><ins><em>Attribution-NoDerivatives 4.0
International</em></ins></span> License</a>.</p>
-<span class="inserted"><ins><em><!--#include
virtual="/server/bottom-notes.html" -->
+<!--#include virtual="/server/bottom-notes.html" -->
-<p class="unprintable">Updated:</em></ins></span>
+<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/03/08 09:57:14 $
+$Date: 2015/08/11 21:58:08 $
<!-- timestamp end -->
</p>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses licenses.ca.html licenses.el.html ...,
GNUN <=