[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www distros/screenshot.pl.html licenses/gpl-faq...
|
From: |
GNUN |
|
Subject: |
www distros/screenshot.pl.html licenses/gpl-faq... |
|
Date: |
Sat, 18 Apr 2015 10:27:51 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/04/18 10:27:51
Modified files:
distros : screenshot.pl.html
licenses : gpl-faq.es.html
licenses/po : gpl-faq.es-en.html
server/po : sitemap.es-en.html
Added files:
distros/po : screenshot.pl-diff.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/screenshot.pl.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/screenshot.pl-diff.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.es.html?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.es-en.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.es-en.html?cvsroot=www&r1=1.34&r2=1.35
Patches:
Index: distros/screenshot.pl.html
===================================================================
RCS file: /web/www/www/distros/screenshot.pl.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- distros/screenshot.pl.html 14 Feb 2015 21:03:59 -0000 1.32
+++ distros/screenshot.pl.html 18 Apr 2015 10:27:49 -0000 1.33
@@ -1,4 +1,9 @@
-<!--#set var="ENGLISH_PAGE" value="/distros/screenshot.en.html" -->
+<!--#set var="PO_FILE"
+ value='<a href="/distros/po/screenshot.pl.po">
+ http://www.gnu.org/distros/po/screenshot.pl.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/distros/screenshot.html"
+ --><!--#set var="DIFF_FILE" value="/distros/po/screenshot.pl-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2015-02-17" --><!--#set
var="ENGLISH_PAGE" value="/distros/screenshot.en.html" -->
<!--#include virtual="/server/header.pl.html" -->
<!-- Parent-Version: 1.77 -->
@@ -9,6 +14,7 @@
<!--#include virtual="/distros/po/screenshot.translist" -->
<!--#include virtual="/server/banner.pl.html" -->
+<!--#include virtual="/server/outdated.pl.html" -->
<h2>Zrzut wolnej dystrybucji</h2>
<p><img src="/graphics/t-desktop-4.jpg" alt="[ Pulpit z edytorem tekstu
i arkuszem kalkulacyjnym ]" width="100%" /></p>
@@ -98,7 +104,7 @@
<p class="unprintable"><!-- timestamp start -->
Aktualizowane:
-$Date: 2015/02/14 21:03:59 $
+$Date: 2015/04/18 10:27:49 $
<!-- timestamp end -->
</p>
Index: licenses/gpl-faq.es.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.es.html,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- licenses/gpl-faq.es.html 8 Dec 2014 05:29:22 -0000 1.48
+++ licenses/gpl-faq.es.html 18 Apr 2015 10:27:50 -0000 1.49
@@ -130,6 +130,10 @@
que la gente conozca lo que he escrito. ¿Puedo obtener reconocimiento si uso
la GPL?</a></li>
+ <li><a href="#RequireCitation">¿Me autoriza la GPL a añadir condiciones
+exigiendo la cita o reconocimiento en trabajos de investigación que empleen
+software cubierto por la GPL o su resultado?</a></li>
+
<li><a href="#GPLOmitPreamble">¿Puedo omitir el preámbulo de la GPL, o
las
instrucciones acerca de la manera de utilizarla en los programas propios,
para ahorrar espacio?</a></li>
@@ -973,6 +977,22 @@
copyright). La GPL exige que en todas las copias figure una nota apropiada
sobre el copyright.</p></dd>
+<dt id="RequireCitation">¿Me autoriza la GPL a añadir condiciones exigiendo
la cita o reconocimiento
+en trabajos de investigación que empleen software cubierto por la GPL o su
+resultado? <span class="anchor-reference-id">(<a
+href="#RequireCitation">#RequireCitation</a>)</span>
+</dt>
+<dd><p> No, los términos de la GPL no lo permiten. Si bien reconocemos que la
+citación apropiada es una parte importante de las publicaciones académicas,
+la cita no se puede añadir a la GPL como una exigencia adicional. Exigir la
+cita en trabajos de investigación que emplean software bajo la GPL excede lo
+que serÃa una exigencia adicional aceptable según la sección 7(b) de la
+GPLv3, y por tanto se considerarÃa una restricción adicional según la
+sección 7 de la GPL. Y la ley de copyright no permite imponer tal <a
+href="#GPLOutput">exigencia al resultado del software</a>, indepedientemente
+de que que esté licenciado bajo los términos de la GPL o de cualquier otra
+licencia.</p>
+</dd>
<dt id="WhyMustIInclude">¿Por qué exige la GPL que en toda copia del
programa se incluya una copia de
la GPL? <span class="anchor-reference-id">(<a href="#WhyMustIInclude"
@@ -3872,7 +3892,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014 Free Software Foundation, Inc.</p>
+<p>Copyright © 2014, 2015 Free Software Foundation, Inc.</p>
<p>Esta página está bajo una <a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.es";>licencia
@@ -3888,7 +3908,7 @@
<p class="unprintable"><!-- timestamp start -->
Ãltima actualización:
-$Date: 2014/12/08 05:29:22 $
+$Date: 2015/04/18 10:27:50 $
<!-- timestamp end -->
</p>
Index: licenses/po/gpl-faq.es-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.es-en.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- licenses/po/gpl-faq.es-en.html 19 Oct 2014 08:57:29 -0000 1.27
+++ licenses/po/gpl-faq.es-en.html 18 Apr 2015 10:27:50 -0000 1.28
@@ -130,6 +130,10 @@
people to know what I wrote. Can I still get credit if I use the
GPL?</a></li>
+ <li><a href="#RequireCitation">Does the GPL allow me to add terms
+ that would require citation or acknowledgment in research papers
+ which use the GPL-covered software or its output?</a></li>
+
<li><a href="#GPLOmitPreamble">Can I omit the preamble of the GPL,
or the instructions for how to use it on your own programs, to save
space?</a></li>
@@ -1001,6 +1005,23 @@
(assuming you are the copyright holder). The GPL requires all copies
to carry an appropriate copyright notice.</p></dd>
+<dt id="RequireCitation">Does the GPL allow me to add terms
+ that would require citation or acknowledgment in research papers
+ which use the GPL-covered software or its output?
+<span class="anchor-reference-id">(<a
href="#RequireCitation">#RequireCitation</a>)</span>
+</dt>
+<dd><p> No, this is not permitted under the terms of the GPL. While we
+recognize that proper citation is an important part academic
+publication, citation cannot be added as an additional requirement to
+the GPL. Requiring citation in research papers which made use of GPL'd
+software goes beyond what would be an acceptable additional
+requirement under section 7(b) of GPLv3, and therefore would be
+considered an additional restriction under Section 7 of the GPL. And
+copyright law does not allow you to place such
+a <a href="#GPLOutput">requirement on the output of software</a>,
+regardless of whether it is licensed under the terms of the GPL or
+some other license.</p>
+</dd>
<dt id="WhyMustIInclude">Why does the GPL
require including a copy of the GPL with every copy of the program?
@@ -3776,7 +3797,7 @@
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014 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
@@ -3786,7 +3807,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/10/19 08:57:29 $
+$Date: 2015/04/18 10:27:50 $
<!-- timestamp end -->
</p>
</div>
Index: server/po/sitemap.es-en.html
===================================================================
RCS file: /web/www/www/server/po/sitemap.es-en.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/po/sitemap.es-en.html 14 Apr 2015 18:27:33 -0000 1.34
+++ server/po/sitemap.es-en.html 18 Apr 2015 10:27:51 -0000 1.35
@@ -57,6 +57,7 @@
<a href="#directory-philosophy">philosophy</a>
<a href="#directory-prep">prep</a>
<a href="#directory-press">press</a>
+ <a href="#directory-proprietary">proprietary</a>
<a href="#directory-server">server</a>
<a href="#directory-software">software</a>
<a href="#directory-testimonials">testimonials</a>
@@ -1419,38 +1420,6 @@
</dd></dl>
</div>
-<div id="directory-philosophy-proprietary">
-<dl><dt><a
href="/philosophy/proprietary/proprietary.html">philosophy/proprietary</a></dt>
- <dd>Proprietary Software Is Often Malware
-<dl>
- <dt><a
href="/philosophy/proprietary/malware-apple.html">malware-apple.html</a></dt>
- <dd>Apple's Operating Systems Are Malware</dd>
- <dt><a
href="/philosophy/proprietary/malware-kindle-swindle.html">malware-kindle-swindle.html</a></dt>
- <dd>Malware in the Kindle Swindle</dd>
- <dt><a
href="/philosophy/proprietary/malware-microsoft.html">malware-microsoft.html</a></dt>
- <dd>Microsoft's Software is Malware</dd>
- <dt><a
href="/philosophy/proprietary/malware-mobiles.html">malware-mobiles.html</a></dt>
- <dd>Malware in Mobile Devices</dd>
- <dt><a
href="/philosophy/proprietary/proprietary-back-doors.html">proprietary-back-doors.html</a></dt>
- <dd>Proprietary Back Doors</dd>
- <dt><a
href="/philosophy/proprietary/proprietary-censorship.html">proprietary-censorship.html</a></dt>
- <dd>Proprietary Censorship</dd>
- <dt><a
href="/philosophy/proprietary/proprietary-drm.html">proprietary-drm.html</a></dt>
- <dd>Proprietary DRM</dd>
- <dt><a
href="/philosophy/proprietary/proprietary-insecurity.html">proprietary-insecurity.html</a></dt>
- <dd>Proprietary Insecurity</dd>
- <dt><a
href="/philosophy/proprietary/proprietary-jails.html">proprietary-jails.html</a></dt>
- <dd>Proprietary Jails</dd>
- <dt><a
href="/philosophy/proprietary/proprietary-sabotage.html">proprietary-sabotage.html</a></dt>
- <dd>Proprietary Sabotage</dd>
- <dt><a
href="/philosophy/proprietary/proprietary-surveillance.html">proprietary-surveillance.html</a></dt>
- <dd>Proprietary Surveillance</dd>
- <dt><a
href="/philosophy/proprietary/proprietary-tyrants.html">proprietary-tyrants.html</a></dt>
- <dd>Proprietary Tyrants</dd>
-</dl>
-</dd></dl>
-</div>
-
<div id="directory-philosophy-sco">
<dl><dt><a href="/philosophy/sco/sco.html">philosophy/sco</a></dt>
<dd>FSF's Position regarding SCO's attacks on Free Software
@@ -1602,6 +1571,42 @@
<hr />
+<div id="directory-proprietary">
+<dl><dt><a class="topmost-title"
href="/proprietary/proprietary.html">proprietary</a></dt>
+ <dd><span class="topmost-title"><span class="gnun-split"></span>
+Proprietary Software Is Often Malware<span class="gnun-split"></span>
+</span>
+<dl>
+ <dt><a href="/proprietary/malware-apple.html">malware-apple.html</a></dt>
+ <dd>Apple's Operating Systems Are Malware</dd>
+ <dt><a
href="/proprietary/malware-kindle-swindle.html">malware-kindle-swindle.html</a></dt>
+ <dd>Malware in the Kindle Swindle</dd>
+ <dt><a
href="/proprietary/malware-microsoft.html">malware-microsoft.html</a></dt>
+ <dd>Microsoft's Software is Malware</dd>
+ <dt><a href="/proprietary/malware-mobiles.html">malware-mobiles.html</a></dt>
+ <dd>Malware in Mobile Devices</dd>
+ <dt><a
href="/proprietary/proprietary-back-doors.html">proprietary-back-doors.html</a></dt>
+ <dd>Proprietary Back Doors</dd>
+ <dt><a
href="/proprietary/proprietary-censorship.html">proprietary-censorship.html</a></dt>
+ <dd>Proprietary Censorship</dd>
+ <dt><a href="/proprietary/proprietary-drm.html">proprietary-drm.html</a></dt>
+ <dd>Proprietary DRM</dd>
+ <dt><a
href="/proprietary/proprietary-insecurity.html">proprietary-insecurity.html</a></dt>
+ <dd>Proprietary Insecurity</dd>
+ <dt><a
href="/proprietary/proprietary-jails.html">proprietary-jails.html</a></dt>
+ <dd>Proprietary Jails</dd>
+ <dt><a
href="/proprietary/proprietary-sabotage.html">proprietary-sabotage.html</a></dt>
+ <dd>Proprietary Sabotage</dd>
+ <dt><a
href="/proprietary/proprietary-surveillance.html">proprietary-surveillance.html</a></dt>
+ <dd>Proprietary Surveillance</dd>
+ <dt><a
href="/proprietary/proprietary-tyrants.html">proprietary-tyrants.html</a></dt>
+ <dd>Proprietary Tyrants</dd>
+</dl>
+</dd></dl>
+</div>
+
+<hr />
+
<div id="directory-server">
<dl><dt><a class="topmost-title" href="/server/server.html">server</a></dt>
<dd><span class="topmost-title"><span class="gnun-split"></span>
@@ -1809,6 +1814,7 @@
<a href="#directory-philosophy">philosophy</a>
<a href="#directory-prep">prep</a>
<a href="#directory-press">press</a>
+ <a href="#directory-proprietary">proprietary</a>
<a href="#directory-server">server</a>
<a href="#directory-software">software</a>
<a href="#directory-testimonials">testimonials</a>
@@ -1873,7 +1879,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/04/14 18:27:33 $
+$Date: 2015/04/18 10:27:51 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/screenshot.pl-diff.html
===================================================================
RCS file: distros/po/screenshot.pl-diff.html
diff -N distros/po/screenshot.pl-diff.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ distros/po/screenshot.pl-diff.html 18 Apr 2015 10:27:49 -0000 1.1
@@ -0,0 +1,95 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!-- Generated by GNUN -->
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>/distros/screenshot.html-diff</title>
+<style type="text/css">
+span.removed { background-color: #f22; color: #000; }
+span.inserted { background-color: #2f2; color: #000; }
+</style></head>
+<body><pre>
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>Screenshot of a Free Distro
+- GNU Project - Free Software Foundation</title>
+<!--#include virtual="/distros/po/screenshot.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>Screenshot of a Free Distro</h2>
+
+<p><img src="/graphics/t-desktop-4.jpg" alt="[ Desktop with text
+ processor and spreadsheet windows ]" width="100%" /></p>
+
+<p class="c"><small>Screenshot of the Trisquel GNU/Linux
distribution
+running LibreOffice, a free software office suite comparable to
+Microsoft Office or Apple iWork</small></p>
+
+<h3 class="c"><a <span
class="removed"><del><strong>href="/distros/free-distros.html">Ready-to-use
GNU system variants</a></h3></strong></del></span> <span
class="inserted"><ins><em>href="/distros/free-distros.html">Try
GNU/Linux</a></h3></em></ins></span>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<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 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:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden">
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</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>
+</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
+ 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
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ 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. -->
+
+<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>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2015/04/18 10:27:49 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
+</pre></body></html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www distros/screenshot.pl.html licenses/gpl-faq...,
GNUN <=