[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www copyleft/po/copyleft.translist doc/doc.zh-c...
|
From: |
GNUN |
|
Subject: |
www copyleft/po/copyleft.translist doc/doc.zh-c... |
|
Date: |
Thu, 16 Feb 2012 09:32:57 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 12/02/16 09:32:57
Modified files:
copyleft/po : copyleft.translist
doc : doc.zh-cn.html
education/misc/po: edu-misc.de.po edu-misc.pot
education/po : edu-software.translist education.ca.po
education.de.po education.es.po education.fr.po
education.it.po education.ja.po education.pl.po
education.ru.po
gnu/po : gnu.translist
licenses : gpl-faq.ru.html licenses.es.html
licenses.ja.html licenses.pl.html
licenses/po : agpl-3.0.ca.po agpl-3.0.translist fdl-1.3.ca.po
fdl-1.3.translist gpl-3.0.ca.po
gpl-3.0.translist gpl-faq.ru-en.html
lgpl-3.0.ca.po lgpl-3.0.translist
licenses.es-en.html licenses.pl-en.html
licenses.zh-cn.po
people : people.es.html
people/po : people.es-en.html
philosophy : compromise.zh-cn.html free-doc.zh-cn.html
free-sw.de.html
philosophy/po : free-sw.de.po
Added files:
copyleft : copyleft.zh-cn.html
copyleft/po : copyleft.zh-cn-en.html
doc/po : doc.zh-cn-en.html
education : edu-software.ja.html
education/po : edu-software.ja-en.html
gnu : gnu.ja.html
gnu/po : gnu.ja-en.html
licenses : agpl-3.0.ca.html fdl-1.3.ca.html
gpl-3.0.ca.html lgpl-3.0.ca.html
licenses/po : agpl-3.0.ca-en.html fdl-1.3.ca-en.html
gpl-3.0.ca-en.html lgpl-3.0.ca-en.html
licenses.ja-en.html
philosophy/po : compromise.zh-cn-en.html free-doc.zh-cn-en.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/copyleft/copyleft.zh-cn.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/copyleft/po/copyleft.translist?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/copyleft/po/copyleft.zh-cn-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/doc.zh-cn.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/doc/po/doc.zh-cn-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-software.ja.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/education/misc/po/edu-misc.de.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/education/misc/po/edu-misc.pot?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-software.translist?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.ca.po?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.de.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.es.po?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.fr.po?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.it.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.ja.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.pl.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/education.ru.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-software.ja-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu.ja.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu.translist?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu.ja-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.ru.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.es.html?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.ja.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.pl.html?cvsroot=www&r1=1.59&r2=1.60
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/agpl-3.0.ca.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/fdl-1.3.ca.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-3.0.ca.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/lgpl-3.0.ca.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/agpl-3.0.ca.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/agpl-3.0.translist?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/fdl-1.3.ca.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/fdl-1.3.translist?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-3.0.ca.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-3.0.translist?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/lgpl-3.0.ca.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/lgpl-3.0.translist?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.es-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.pl-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.zh-cn.po?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/agpl-3.0.ca-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/fdl-1.3.ca-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-3.0.ca-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/lgpl-3.0.ca-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ja-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/people/people.es.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/people/po/people.es-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/compromise.zh-cn.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-doc.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.de.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.de.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.zh-cn-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-doc.zh-cn-en.html?cvsroot=www&rev=1.1
Patches:
Index: copyleft/po/copyleft.translist
===================================================================
RCS file: /web/www/www/copyleft/po/copyleft.translist,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- copyleft/po/copyleft.translist 26 Dec 2011 09:28:02 -0000 1.3
+++ copyleft/po/copyleft.translist 16 Feb 2012 09:27:52 -0000 1.4
@@ -37,6 +37,8 @@
<li><a href="/copyleft/copyleft.ta.html">தமிழà¯</a> [ta]</li>
<!-- Turkish -->
<li><a href="/copyleft/copyleft.tr.html">Türkçe</a> [tr]</li>
+<!-- Chinese (Simplified) -->
+<li><a href="/copyleft/copyleft.zh-cn.html">ç®ä½ä¸æ</a> [zh-cn]</li>
</ul>
</div> <!-- id="translations" -->
<!-- end translinks file -->
Index: doc/doc.zh-cn.html
===================================================================
RCS file: /web/www/www/doc/doc.zh-cn.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- doc/doc.zh-cn.html 30 Dec 2011 05:08:11 -0000 1.3
+++ doc/doc.zh-cn.html 16 Feb 2012 09:28:11 -0000 1.4
@@ -1,448 +1,175 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="GB2312">
-
-<head>
-
-<title>Îĵµ - GNU ¹¤³Ì - ×ÔÓÉÈí¼þ»ù½ð»á£¨FSF£©</title>
-
-<link rev="made" href="mailto:address@hidden"; />
-
-<meta http-equiv="content-type" content='text/html; charset=gb2312' />
-
-</head>
-
-
-
-<body bgcolor="#FFFFFF" text="#000000" link="#1F00FF" alink="#FF0000"
vlink="#9900DD">
-
-<h3>GNU ¹¤³ÌÖ®Îĵµ</h3>
-
-
-
-<p>
-
-<a href="/graphics/agnuhead.zh-cn.html"><img src="/graphics/gnu-head-sm.jpg"
alt="[image of the Head of a GNU]" width="129" height="122" /></a>
-
-</p>
-
-
-
-<!-- Please keep this list alphabetical -->
-
-[
-
- <a href="/doc/doc.ca.html">?¨®¨¬??T?¨¢??¨®?</A>
-
-| <a href="/doc/doc.zh-cn.html">¼òÌåÖÐÎÄ</a>
-
-| <a href="/doc/doc.zh-tw.html">·±ÌåÖÐÎÄ</a>
-
-| <a href="/doc/doc.en.html">Ó¢Óï</a>
-
-| <a href="/doc/doc.es.html">Î÷°àÑÀÓï</a>
-
-]
-
-
-
-<br>
-
-<br>
-
-<br>
-
-
-
-<table style="margin-right: 10px; float: left" frame="box" bgcolor="f2f2f9"
cellspacing="5">
-
-
-
-<tr><td><a href="http://www.gnupress.org";>GNU ³ö°æÉçÖ÷Ò³</a></td></tr>
-
-
-
-<tr><td><a
href="http://www.gnupress.org/gnupresspub.html#Anchor-BOOK-61299";>³ö°æµÄÊé¼®</a></td></tr>
-
-
-
-<tr><td><a href="http://www.gnupress.org/gnupresspub.html#Anchor-Software";>ÒÔ
CD-ROM ÐÎʽɢ²¼µÄÈí¼þ</a></td></tr>
-
-
-
-<tr><td><a href="http://www.gnupress.org/isbn.html";>ISBN Áбí</a></td></tr>
-
-
-
-<tr><td><a href="http://www.gnu.org/gear/gear.html";>GNU Gear Ò³Ãæ</a></td></tr>
-
-
-
-<tr><td><a
href="http://www.gnu.org/gear/gear.html#Anchor-Clothing";>·þ×°</a></td></tr>
-
-
-
-<tr><td><a
href="http://www.gnu.org/gear/gear.html#Anchor-Wall-Art";>±Ú¹Ò</a></td></tr>
-
-
-
-<tr><td><a href="http://www.gnu.org/gear/gear.html#Anchor-Other-Fan-Gear";>ÆäËü
Fan Gear</a></td></tr>
-
-
-
-<tr><td><a href="https://agia.fsf.org/";>¶©µ¥</a></td></tr>
-
-
-
-<tr><td><a
href="http://www.gnupress.org/potentialauthors.html";>Ϊ×÷Õß</a></td></tr>
-
-
-
-<tr><td><a href="http://www.gnupress.org/resellers.html";>Ϊ·ÖÏúÉÌ</a></td></tr>
-
-
-
-<tr><td><a
href="http://www.gnupress.org/teachingprofessionals.html";>Ϊ½Ìʦ</a></td></tr>
-
-
-
-<tr><td><a
href="http://www.gnupress.org/doc/contact.html";>ÁªÏµÎÒÃÇ</a></td></tr>
-
-
-
-<tr><td><a href="http://www.fsf.org";>FSF Ö÷Ò³</a></td></tr>
-
-
-
-<tr><td><a href="http://www.gnu.org";>GNU ¹¤³ÌÖ÷Ò³</a></td></tr>
-
-
-
-</table>
-
-
-
-
-
-<h4>GNU ÎĵµÔÔòÖ®½éÉÜ</h4>
-
-
-
-<p>
-
-GNU
ÎĵµÊǶÀÌصģ¬ÒòΪÎÒÃǶÔËüµÄ̬¶È¡£ÎÒÃÇÏàÐŶÁÕßÓ¦¸Ã¿ÉÒÔÏñÎÒÃǵÄÈí¼þÒ»Ñù£¬×ÔÓɵظ´ÖƺÍÖØÐÂÉ¢²¼Ëü¡£×î³õÎÒÃÇËùÓеÄÎĵµ¶¼ÊÇÔÚ¼ò¶ÌµÄ
<a href="/licenses/licenses.zh-cn.html#WhatIsCopyleft">Copyleft</a>
Ðí¿ÉÏ·¢²¼£¬»òÕßÔÚ <a href="/licenses/licenses.cn.html#GPL">GNU General Public
License (GPL)</a> Ï·¢²¼; ÔÚ2001ÄêµÄʱºò²úÉúÁË <a
href="/licenses/licenses.cn.html#FDL">Free Documentation License (FDL)--
×ÔÓÉÎĵµÐí¿ÉÖ¤</a>
¡£×î³õΪÈí¼þÉè¼ÆµÄÐí¿É²»ÄÜÂú×ãÎĵµµÄijЩҪÇó£¬FDL¾ÍÊÇÕë¶ÔÕâЩҪÇó¶ø²úÉúµÄ¡£¹Øì¶ÎÒÃÇ×ÔÓÉÎĵµÀíÂÛµÄÏêϸÐÅÏ¢Çë²é¿´
<a href="http://www.stallman.org/";>Àí²é£®Ê·ÍÐÂü</a> µÄÂÛÎÄ£¬ “<a
href="/philosophy/free-doc.html">×ÔÓÉÈí¼þºÍ×ÔÓÉÊÖ²á</a>¡£”
Çë°ïÖúÎÒÃÇд¸ü¶àµÄÎĵµ£¡ GNU
¹¤³ÌÊÇÒ»¸öÊÀ½ç·¶Î§µÄÔ˶¯£¬ÎÒÃǵÄÈí¼þ°üÿÌ춼ÔÚÔö³¤¡£¹Øì¶ÈçºÎ°ïÖú£¬ <a
href="/help/help.html#helpgnu">µã»÷´Ë´¦</a>¡£
-
-</p>
-
-
-
-<p>
-
-GNU Îĵµ¿ÉÒÔͨ¹ýÒÔÏ·½Ê½»ñµÃ£º
-
-</p>
-
-<table cellspacing="5"><tr><td>
-
-<h4>
-
-<a href="gnupresspub.html"><img src="gnupresslogo.jpg" width="53" height="88"
alt="GNU Press" /> Ó¡Ë¢µÄÎĵµ</a>, T-ÐôÉÀ£¬ÕÐÌù»£¬Èí¼þµÈ£¡
-
-</h4>
-
-
-
-<p>
-
-Ó¡Ë¢µÄÊéºÍ <a href="http://www.gnu.org/gear/gear.html";>GNU Gear</a> -
T-ÐôÉÀ£¬Ã±×Ó£¬±ðÕ룬¿Û×ӵȡ£
-
-</p>
-
-
-
-<h4>
-
-<a href="/manual/manual.html">ÔÚÏßÎĵµ</a>
-
-</h4>
-
-
-
-<p>
-
-¹Øì¶ÎÒÃÇÖ÷ÌâµÄÐÅÏ¢ºÍÆäËüÎĵµ¿ÉÔÚÏ߲鿴¡£
-
-</p>
-
-
-
-<h4>
-
-<a href="expanding.html">Expanding Bookstore Availability</a>
-
-</h4>
-
-
-
-<p>
-
-ÓйØÈçºÎ×ÔÔ¸°ïÖúÈËÃÇ´Ó±¾µØµÄÊéµê»ñµÃ GNU ³ö°æÉçµÄÊéµÄÐÅÏ¢¡£
-
-</p>
-
-
-
-<h4>
-
-<a href="other-free-books.html">Non-GNU ×ÔÓÉÊé¼®ºÍÎĵµ</a>
-
-</h4>
-
-
-
-<h4>
-
-<a href="contact.html">ÁªÏµ GNU ³ö°æÉç</a>
-
-</h4>
-
-
-
-<!--Superfluous table
-
-<table border="0" cellpadding="0" cellspacing="2" width="520">
-
- <tr>
-
- <td>
-
-<img src="gnupresslogo.jpg" width="53" height="88" alt="GNU Press logo" />
-
- </td>
-
- <td>
-
-<h4><a href="gnupresspub.html">GNU ³ö°æÉç</a>
³ö°æµÄÎĵµ£¬T-ÐôÉÀ£¬ÕÐÌù»£¬Èí¼þµÈ£¡</h4>
-
-
-
-<p>
-
-Printed books and <a href="http://www.gnu.org/gear/gear.html";>GNU Gear</a> -
shirts, hats, pins, buttons and more.
-
-</p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>
-
- </td>
-
- <td>
-
-<h4>
-
-<a href="/manual/manual.html">On-Line Documentation</a>
-
-</h4>
+<!--#include virtual="/server/header.zh-cn.html" -->
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>ææ¡£ - GNU å·¥ç¨ - èªç±è½¯ä»¶åºéä¼ (FSF)</title>
+<!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/doc/po/doc.translist" -->
+<h2>GNU å·¥ç¨çææ¡£</h2>
<p>
-
-Information on our titles and other documentation available on-line.
-
+å¯ä»¥ä»ä»¥ä¸èéè·å GNU ææ¡£åå
¶å®èªç±ææ¡£
</p>
- </td>
+<ul>
+<li>大é¨å <a href="/manual/manual.html">GNU æå</a>
å¯ä»¥å¨çº¿è·åï¼å®ä»¬å¸¸å¸¸ä»¥å¤ç§æ ¼å¼åå¸ã</li>
- </tr>
+<li><a href="http://directory.fsf.org/";>èªç±è½¯ä»¶ç®å½</a>
ä¸ååºäºå¾å¤ææ¡£çé¾æ¥ã</li>
- <tr>
+<li><a href="http://planet.gnu.org";>planet.gnu.org</a> æ¯å
³äº GNU
+软件å
çæ°é»ãå
¬ååæ¥å¿çå
容èåç½ç«ã</li>
- <td>
+<li><a href="http://shop.fsf.org";>FSF
å¨çº¿ååºï¼åºå®å¾ä¹¦ãTæ¤ãæµ·æ¥çååã</a></li>
-
+<li><a href="/doc/other-free-books.html">å
¶å®åºçååºççèªç±å¾ä¹¦</a>ï¼ä½¿ç¨èªç±æ档许å¯è¯åºççå¾ä¹¦ã</li>
+</ul>
- </td>
- </tr>
+<h3>GNU ææ¡£åå</h3>
- <tr>
+<p>æ们åä¿¡ï¼è¯»è
åºå½æ¥æèªç±å¤å¶ãæ´æ°ãååå¸ GNU
ææ¡£çæå©ï¼å°±åæ们对 GNU 软件æè¦æ±çä¸æ ·ã</p>
- <td>
+<p>以åæ们ææçææ¡£é½ä»¥ä¸ä»½ç®çç <a
+href="/licenses/licenses.html#WhatIsCopyleft">Copyleft</a> 许å¯è¯æ <a
+href="/licenses/licenses.html#GPL">GNU éç¨å
Œ
±è®¸å¯è¯ (GPL)</a>
çå½¢å¼åå¸ãç´å°2001å¹´ï¼ <a
+href="/licenses/licenses.html#FDL">GNU èªç±æ档许å¯è¯ (FDL)</a>
+çè¯çå¡«è¡¥äºä»¥åèªç±è½¯ä»¶è®¸å¯è¯ä¸ææ¡£è¯å¯è¯ä¹é´ç空ç½ãæå
³èªç±ææ¡£çæ´å¤ä¿¡æ¯ï¼å¯ä»¥é
读 <a
+href="http://www.stallman.org/";>çæ¥å¾·Â·æ¯ææ¼</a> çæç« ï¼“<a
+href="/philosophy/free-doc.html">èªç±è½¯ä»¶ä¸èªç±æå</a>”ã</p>
-
- </td>
+<h3>è´¡ç®</h3>
- <td>
+<p>请帮å©æ们æ°åæ´å¤çææ¡£ï¼è¿æ¯å¯¹èªç±è½¯ä»¶è¿å¨æéè¦çè´¡ç®æ¹å¼ä¹ä¸ã请
<a
+href="/help/help.html#helpgnu">ç¹å»æ¤å¤</a> æ¥çç»èåå
¶å®ç¸å
³ä¿¡æ¯ã</p>
-<h4>
+<p><b>GNU åºç社ï¼</b> å¦å¤ä¸æ¡å¸®å©æ们çéå¾æ¯è®© <a
href="/doc/gnupresspub.html">GNU åºç社</a>
+åºççå¾ä¹¦ <a href="/doc/expanding.html">åºç°å¨æ´å¤ç书åº</a>
ãå¦ææå
´è¶£ï¼è¯· <a
+href="/doc/contact.html">ä¸ GNU åºç社èç³»</a> ã</p>
-<a href="expanding.html">Expanding Bookstore Availability</a>
-</h4>
+<div style="font-size: small;">
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+<!--#include virtual="/server/footer.zh-cn.html" -->
+<div id="footer">
<p>
-
-Information on how volunteers can help get GNU Press books on the shelves of
their local bookstore.
-
-</p>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>
-
-
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>
-
-
-
- </td>
-
- <td>
-
-<h4>
-
-<a href="other-free-books.html">Non-GNU Free Books and Documentation</a>
-
-</h4>
-
- </td>
-
- </tr>
-
- <tr>
-
- <td>
-
-
-
- </td>
-
- <td>
-
-<h4>
-
-<a href="contact.html">Contacting GNU Press</a>
-
-</h4>
-
- </td>
-
- </tr>
-
-</table>
-
--->
-
-</table></tr></td>
-
-<hr />
-
-
-
-<p>
-
-Ç뽫¹Ø춡¸×ÔÓÉÈí¼þ»ù½ð»á¡¹ÒÔ¼°¡¸GNU ¹¤³Ì¡¹µÄ²éѯË͵½
-
-<a href="mailto:address@hidden";><em>address@hidden</em></a> ¡£Ò²ÓÐ
-
-<a href="/home.zh-cn.html#ContactInfo">ÆäËü·½Ê½¿ÉÒÔÁªÏµ</a> ×ÔÓÉÈí¼þ»ù½ð»á¡£
-
+请å°æå
³èªç±è½¯ä»¶åºéä¼ä¸ GNU
çæ¥è¯¢ä¸é®é¢ï¼ä»¥è±è¯ï¼åéå°<a
+href="mailto:address@hidden";><address@hidden></a>ãæ¨ä¹å¯ä»¥éè¿ <a
+href="/contact/">å
¶å®æ¹æ³</a> èç³»èªç±è½¯ä»¶åºéä¼ã
<br />
-
-Ç뽫ʧЧÁ´½ÓÒÔ¼°ÆäËüÍøÒ³µÄ¸üÕý£¨»ò½¨Ò飩Ë͵½ <a
href="mailto:address@hidden";><em>address@hidden</em></a> ¡£
-
+åç°ä»»ä½é误åé¾æ¥æå
¶å®éè¦æ´æ£çå°æ¹ï¼æä»»ä½å»ºè®®ï¼ï¼è¯·åéé®ä»¶è³ <a
+href="mailto:address@hidden";><address@hidden></a>ã
</p>
-
-
<p>
-
-Çë²éÔÄ <a href="/server/standards/README.translations.html">·Òë¶ÁÎÒ</a>
ÒÔÈ¡µÃ¹Ø춡¸Ðµ÷¡¹Ó롸¼Ä½»¡¹·ÒëµÄÐÅÏ¢¡£
-
+è¥æ¨æ³ç¿»è¯æ¬æï¼è¯·åç <a
href="/server/standards/README.translations.html">ç¿»è¯æå</a>
+è·åæå
³åè°åæ交翻è¯çç¸å
³äºé¡¹ã
</p>
-
-
<p>
-
-Ç뽫ÓйطÒëµÄÎÊÌâË͵½
-
-<a href="http://savannah.gnu.org/projects/chinese/";>GNU/CTT</a> µÄ
-
-<a href="mailto:address@hidden";>·ÒëÈËÔ±</a> ¡£
-
-<br />
-
-·Ò룺ÂÞ Ïæê¿ <<a href="mailto:address@hidden";>address@hidden</a>> ¡£
-
-<br />
-
-ÑéÖ¤£ºÁõ ÕѺê <<A HREF="mailto:address@hidden";>address@hidden</A>> ¡£
-
+çæææ © 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010
èªç±è½¯ä»¶åºéä¼
</p>
-
-
<p>
-
-Copyright (C) 2004 Free Software Foundation, Inc.,
-
-51 Franklin St, Fifth Floor, Boston, MA 02110, USA
-
-<br />
-
-Verbatim copying and distribution of this entire article is
-
-permitted in any medium without royalty provided this notice is
-
-preserved.
-
-<br />
-
-±¾ÎÄÔÊÐíÔÚ²»±ä¸üÎĵµÄÚÈݵÄÇ°ÌáÏ¿¯µÇÔÚÈκÎÐÎʽµÄýÌåÖУ¬µ«Ðè±£Áô´ËÉùÃ÷¡£
-
+æ¬é¡µé¢éç¨ <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
+Attribution-NoDerivs 3.0 United States License</a> 许å¯è¯ææã
</p>
+<div class="translators-credits">
-<P>
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<b>ç¿»è¯</b>ï¼æå¡å¸ 2010</div>
-Updated:
+ <p>
<!-- timestamp start -->
+æåæ´æ°ï¼
-$Date: 2011/12/30 05:08:11 $ $Author: ineiev $
+$Date: 2012/02/16 09:28:11 $
<!-- timestamp end -->
+</p>
+</div>
-
-
-<hr>
-
+<!-- <div id="translations">
+ -->
+<!-- <h4>
+Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text. -->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- <ul class="translations-list">
+ -->
+<!-- Arabic -->
+<!-- <li>
+<a
href="/doc/doc.ar.html">العربية</a> [ar]</li>
-->
+<!-- Catalan -->
+<!-- <li>
+<a href="/doc/doc.ca.html">català</a> [ca]</li> -->
+<!-- Czech -->
+<!-- <li>
+<a href="/doc/doc.cs.html">Česky</a> [cs]</li> -->
+<!-- German -->
+<!-- <li>
+<a href="/doc/doc.de.html">Deutsch</a> [de]</li> -->
+<!-- Greek -->
+<!-- <li>
+<a
href="/doc/doc.el.html">Ελληνικά</a> [el]</li>
-->
+<!-- English -->
+<!-- <li>
+<a href="/doc/doc.html">English</a> [en]</li> -->
+<!-- Spanish -->
+<!-- <li>
+<a href="/doc/doc.es.html">español</a> [es]</li> -->
+<!-- Italian -->
+<!-- <li>
+<a href="/doc/doc.it.html">italiano</a> [it]</li> -->
+<!-- Korean -->
+<!-- <li>
+<a href="/doc/doc.ko.html">한국어</a> [ko]</li> -->
+<!-- Polish -->
+<!-- <li>
+<a href="/doc/doc.pl.html">polski</a> [pl]</li> -->
+<!-- Brazilian Portuguese -->
+<!-- <li>
+<a href="/doc/doc.pt-br.html">português do Brasil</a> [pt-br]</li>
-->
+<!-- Romanian -->
+<!-- <li>
+<a href="/doc/doc.ro.html">română</a> [ro]</li> -->
+<!-- Albanian -->
+<!-- <li>
+<a href="/doc/doc.sq.html">shqip</a> [sq]</li> -->
+<!-- Chinese (Simplified) -->
+<!-- <li>
+<a
href="/doc/doc.zh-cn.html">简体中文</a> [zh-cn]</li>
-->
+<!-- Chinese (Traditional) -->
+<!-- <li>
+<a
href="/doc/doc.zh-tw.html">繁體中文</a> [zh-tw]</li>
-->
+<!-- </ul>
+ -->
+<!-- </div>
+ -->
+</div>
</body>
-
</html>
-
Index: education/misc/po/edu-misc.de.po
===================================================================
RCS file: /web/www/www/education/misc/po/edu-misc.de.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- education/misc/po/edu-misc.de.po 8 Feb 2012 18:27:43 -0000 1.9
+++ education/misc/po/edu-misc.de.po 16 Feb 2012 09:29:14 -0000 1.10
@@ -6,13 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: edu-misc.html\n"
-"POT-Creation-Date: 2012-02-08 12:25-0500\n"
+"POT-Creation-Date: 2012-02-16 04:25-0500\n"
"PO-Revision-Date: 2012-02-08 19:20+0100\n"
"Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-02-16 04:25-0500\n"
#. type: Content of: <title>
msgid ""
@@ -110,16 +111,29 @@
msgstr "Tux Paint"
#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "Tux Paint interface in Malayalam, jpeg <a href=\"/education/misc/tuxpaint-"
+#| "sm.jpg\">46 KB</a>, <a href=\"/education/misc/tuxpaint.jpg\">193 KB</a>"
msgid ""
"Tux Paint interface, jpeg, <a href=\"/education/misc/tuxpaint-start-sm.jpg"
-"\">38 KB</a>, <a href=\"/education/misc/tuxpaint-start.jpg\">100 KB</a> <a "
-"href=\"/education/misc/tuxpaint-start-sm-it.jpg\">40 KB</a>, <a href=\"/"
-"education/misc/tuxpaint-start-it.jpg\">100 KB</a>"
-msgstr ""
-"Tux Paint-Oberfläche (.jpg): <a href=\"/education/misc/tuxpaint-start-sm.jpg"
-"\">38 KB</a>, <a href=\"/education/misc/tuxpaint-start.jpg\">100 KB</a> <a "
-"href=\"/education/misc/tuxpaint-start-sm-it.jpg\">40 KB</a>, <a href=\"/"
-"education/misc/tuxpaint-start-it.jpg\">100 KB</a>"
+"\">38 KB</a>, <a href=\"/education/misc/tuxpaint-start.jpg\">100 KB</a>"
+msgstr ""
+"Tux Paint-Oberfläche in Malayalam (.jpg): <a
href=\"/education/misc/tuxpaint-"
+"sm.jpg\">46 KB</a>, <a href=\"/education/misc/tuxpaint.jpg\">193 KB</a>"
+
+#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "Tux Paint interface in Malayalam, jpeg <a href=\"/education/misc/tuxpaint-"
+#| "sm.jpg\">46 KB</a>, <a href=\"/education/misc/tuxpaint.jpg\">193 KB</a>"
+msgid ""
+"Tux Paint interface Italian, jpeg, <a href=\"/education/misc/tuxpaint-start-"
+"sm.it.jpg\">70 KB</a>, <a href=\"/education/misc/tuxpaint-start.it.jpg\">100 "
+"KB</a>"
+msgstr ""
+"Tux Paint-Oberfläche in Malayalam (.jpg): <a
href=\"/education/misc/tuxpaint-"
+"sm.jpg\">46 KB</a>, <a href=\"/education/misc/tuxpaint.jpg\">193 KB</a>"
#. type: Content of: <ul><li>
msgid ""
@@ -214,10 +228,15 @@
#. Add languages in alphabetical order
#. type: Content of: outside any tag (error?)
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/education/misc/rms-education-es-sub-en.srt\">English</a> | <a "
+#| "href=\"/education/misc/rms-education-es-sub.de.srt\">German</a> | <a href="
+#| "\"/education/misc/rms-education-es-sub-es.srt\">Spanish</a> |"
msgid ""
-"<a href=\"/education/misc/rms-education-es-sub-en.srt\">English</a> | <a "
+"<a href=\"/education/misc/rms-education-es-sub.en.srt\">English</a> | <a "
"href=\"/education/misc/rms-education-es-sub.de.srt\">German</a> | <a href=\"/"
-"education/misc/rms-education-es-sub-es.srt\">Spanish</a> |"
+"education/misc/rms-education-es-sub.es.srt\">Spanish</a> |"
msgstr ""
"<a href=\"/education/misc/rms-education-es-sub.de.srt\">Deutsch</a> | <a "
"href=\"/education/misc/rms-education-es-sub-en.srt\">Englisch</a> | <a href="
@@ -310,5 +329,16 @@
msgid "Updated:"
msgstr "Aktualisierung:"
+#~ msgid ""
+#~ "Tux Paint interface, jpeg, <a href=\"/education/misc/tuxpaint-start-sm.jpg"
+#~ "\">38 KB</a>, <a href=\"/education/misc/tuxpaint-start.jpg\">100 KB</a> "
+#~ "<a href=\"/education/misc/tuxpaint-start-sm-it.jpg\">40 KB</a>, <a href="
+#~ "\"/education/misc/tuxpaint-start-it.jpg\">100 KB</a>"
+#~ msgstr ""
+#~ "Tux Paint-Oberfläche (.jpg): <a href=\"/education/misc/tuxpaint-start-sm."
+#~ "jpg\">38 KB</a>, <a href=\"/education/misc/tuxpaint-start.jpg\">100 KB</"
+#~ "a> <a href=\"/education/misc/tuxpaint-start-sm-it.jpg\">40 KB</a>, <a "
+#~ "href=\"/education/misc/tuxpaint-start-it.jpg\">100 KB</a>"
+
#~ msgid "Translations of this page"
#~ msgstr "Ãbersetzungen dieser Seite"
Index: education/misc/po/edu-misc.pot
===================================================================
RCS file: /web/www/www/education/misc/po/edu-misc.pot,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- education/misc/po/edu-misc.pot 8 Feb 2012 17:26:08 -0000 1.5
+++ education/misc/po/edu-misc.pot 16 Feb 2012 09:29:15 -0000 1.6
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-08 12:25-0500\n"
+"POT-Creation-Date: 2012-02-16 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"
@@ -102,9 +102,14 @@
msgid ""
"Tux Paint interface, jpeg, <a "
"href=\"/education/misc/tuxpaint-start-sm.jpg\">38 KB</a>, <a "
-"href=\"/education/misc/tuxpaint-start.jpg\">100 KB</a> <a "
-"href=\"/education/misc/tuxpaint-start-sm-it.jpg\">40 KB</a>, <a "
-"href=\"/education/misc/tuxpaint-start-it.jpg\">100 KB</a>"
+"href=\"/education/misc/tuxpaint-start.jpg\">100 KB</a>"
+msgstr ""
+
+#. type: Content of: <ul><li>
+msgid ""
+"Tux Paint interface Italian, jpeg, <a "
+"href=\"/education/misc/tuxpaint-start-sm.it.jpg\">70 KB</a>, <a "
+"href=\"/education/misc/tuxpaint-start.it.jpg\">100 KB</a>"
msgstr ""
#. type: Content of: <ul><li>
@@ -187,9 +192,9 @@
#. Add languages in alphabetical order
#. type: Content of: outside any tag (error?)
msgid ""
-"<a href=\"/education/misc/rms-education-es-sub-en.srt\">English</a> | <a "
+"<a href=\"/education/misc/rms-education-es-sub.en.srt\">English</a> | <a "
"href=\"/education/misc/rms-education-es-sub.de.srt\">German</a> | <a "
-"href=\"/education/misc/rms-education-es-sub-es.srt\">Spanish</a> |"
+"href=\"/education/misc/rms-education-es-sub.es.srt\">Spanish</a> |"
msgstr ""
#. type: Content of: <h3>
Index: education/po/edu-software.translist
===================================================================
RCS file: /web/www/www/education/po/edu-software.translist,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- education/po/edu-software.translist 14 Jan 2012 01:26:49 -0000 1.4
+++ education/po/edu-software.translist 16 Feb 2012 09:29:48 -0000 1.5
@@ -7,6 +7,8 @@
<li><a href="/education/edu-software.en.html">English</a> [en]</li>
<!-- French -->
<li><a href="/education/edu-software.fr.html">français</a> [fr]</li>
+<!-- Japanese -->
+<li><a href="/education/edu-software.ja.html">æ¥æ¬èª</a> [ja]</li>
<!-- Polish -->
<li><a href="/education/edu-software.pl.html">polski</a> [pl]</li>
</ul>
Index: education/po/education.ca.po
===================================================================
RCS file: /web/www/www/education/po/education.ca.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- education/po/education.ca.po 6 Feb 2012 09:28:04 -0000 1.34
+++ education/po/education.ca.po 16 Feb 2012 09:29:48 -0000 1.35
@@ -7,13 +7,14 @@
msgstr ""
"Project-Id-Version: education.ca\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-29 12:25-0500\n"
+"POT-Creation-Date: 2012-02-15 20:25-0500\n"
"PO-Revision-Date: 2012-02-06 08:48+0100\n"
"Last-Translator: Miquel Puigpelat <address@hidden>\n"
"Language-Team: Catalan <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-02-15 20:25-0500\n"
# type: Content of: <title>
#. type: Content of: <title>
@@ -142,10 +143,16 @@
#. TRANSLATORS: please add the link to your language here in the first place,
followed by a comma.
#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "SubRip subtitle files are also available for download in <a href=\"/"
+#| "education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
+#| "education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+#| "education/misc/edu-misc.html#subtitles\">other languages</a>."
msgid ""
"SubRip subtitle files are also available for download in <a href=\"/"
-"education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
-"education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+"education/misc/rms-education-es-sub.en.srt\">English</a>, <a href=\"/"
+"education/misc/rms-education-es-sub.es.srt\">Spanish</a>, and <a href=\"/"
"education/misc/edu-misc.html#subtitles\">other languages</a>."
msgstr ""
"Es poden descarregar els subtÃtols en <a href=\"/education/misc//rms-"
Index: education/po/education.de.po
===================================================================
RCS file: /web/www/www/education/po/education.de.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- education/po/education.de.po 30 Jan 2012 03:35:39 -0000 1.11
+++ education/po/education.de.po 16 Feb 2012 09:29:48 -0000 1.12
@@ -7,13 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: education.html\n"
-"POT-Creation-Date: 2012-01-29 12:25-0500\n"
+"POT-Creation-Date: 2012-02-15 20:25-0500\n"
"PO-Revision-Date: 2012-01-30 01:25+0100\n"
"Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-02-15 20:25-0500\n"
#. type: Content of: <title>
msgid "Free Software and Education - GNU Project - Free Software Foundation"
@@ -140,10 +141,16 @@
#. TRANSLATORS: please add the link to your language here in the first place,
followed by a comma.
#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "SubRip subtitle files are also available for download in <a href=\"/"
+#| "education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
+#| "education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+#| "education/misc/edu-misc.html#subtitles\">other languages</a>."
msgid ""
"SubRip subtitle files are also available for download in <a href=\"/"
-"education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
-"education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+"education/misc/rms-education-es-sub.en.srt\">English</a>, <a href=\"/"
+"education/misc/rms-education-es-sub.es.srt\">Spanish</a>, and <a href=\"/"
"education/misc/edu-misc.html#subtitles\">other languages</a>."
msgstr ""
"Untertitel (SubRip) sind ebenfalls in <a href=\"/education/misc/rms-"
Index: education/po/education.es.po
===================================================================
RCS file: /web/www/www/education/po/education.es.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- education/po/education.es.po 1 Feb 2012 01:25:58 -0000 1.21
+++ education/po/education.es.po 16 Feb 2012 09:29:48 -0000 1.22
@@ -8,13 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2012-01-29 12:25-0500\n"
+"POT-Creation-Date: 2012-02-15 20:25-0500\n"
"PO-Revision-Date: 2012-01-31 18:51+0100\n"
"Last-Translator: Xavier Reina <address@hidden>\n"
"Language-Team: Spanish <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bits\n"
+"Outdated-Since: 2012-02-15 20:25-0500\n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
@@ -144,10 +145,16 @@
#. TRANSLATORS: please add the link to your language here in the first place,
followed by a comma.
#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "SubRip subtitle files are also available for download in <a href=\"/"
+#| "education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
+#| "education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+#| "education/misc/edu-misc.html#subtitles\">other languages</a>."
msgid ""
"SubRip subtitle files are also available for download in <a href=\"/"
-"education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
-"education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+"education/misc/rms-education-es-sub.en.srt\">English</a>, <a href=\"/"
+"education/misc/rms-education-es-sub.es.srt\">Spanish</a>, and <a href=\"/"
"education/misc/edu-misc.html#subtitles\">other languages</a>."
msgstr ""
"También están disponibles para la descarga los archivos de los subtÃtulos
en "
Index: education/po/education.fr.po
===================================================================
RCS file: /web/www/www/education/po/education.fr.po,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- education/po/education.fr.po 31 Jan 2012 18:01:16 -0000 1.43
+++ education/po/education.fr.po 16 Feb 2012 09:29:48 -0000 1.44
@@ -8,13 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: education.html\n"
-"POT-Creation-Date: 2012-01-29 12:25-0500\n"
+"POT-Creation-Date: 2012-02-15 20:25-0500\n"
"PO-Revision-Date: 2012-01-29 23:33+0100\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-02-15 20:25-0500\n"
"Language: fr\n"
"X-Poedit-Language: French\n"
"X-Poedit-Country: France\n"
@@ -145,10 +146,22 @@
#. TRANSLATORS: please add the link to your language here in the first place,
followed by a comma.
#. type: Content of: <div><div><p>
+# | SubRip subtitle files are also available for download in <a
+# | href=\"/education/misc/rms-education-es-sub[---]{+.+}en.srt\">English</a>,
+# | <a
+# | href=\"/education/misc/rms-education-es-sub[---]{+.+}es.srt\">Spanish</a>,
+# | and <a href=\"/education/misc/edu-misc.html#subtitles\">other
+# | languages</a>.
+#, fuzzy
+#| msgid ""
+#| "SubRip subtitle files are also available for download in <a href=\"/"
+#| "education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
+#| "education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+#| "education/misc/edu-misc.html#subtitles\">other languages</a>."
msgid ""
"SubRip subtitle files are also available for download in <a href=\"/"
-"education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
-"education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+"education/misc/rms-education-es-sub.en.srt\">English</a>, <a href=\"/"
+"education/misc/rms-education-es-sub.es.srt\">Spanish</a>, and <a href=\"/"
"education/misc/edu-misc.html#subtitles\">other languages</a>."
msgstr ""
"Des fichiers de sous-titres SubRip sont aussi disponibles en <a href=\"/"
Index: education/po/education.it.po
===================================================================
RCS file: /web/www/www/education/po/education.it.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- education/po/education.it.po 4 Feb 2012 17:02:58 -0000 1.10
+++ education/po/education.it.po 16 Feb 2012 09:29:48 -0000 1.11
@@ -8,13 +8,14 @@
msgid ""
msgstr ""
"Project-Id-Version: education.html\n"
-"POT-Creation-Date: 2012-01-29 12:25-0500\n"
+"POT-Creation-Date: 2012-02-15 20:25-0500\n"
"PO-Revision-Date: 2012-01-29 19:04+0100\n"
"Last-Translator: Andrea Pescetti <address@hidden>\n"
"Language-Team: Italian\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-02-15 20:25-0500\n"
#. type: Content of: <title>
msgid "Free Software and Education - GNU Project - Free Software Foundation"
@@ -139,10 +140,22 @@
#. TRANSLATORS: please add the link to your language here in the first place,
followed by a comma.
#. type: Content of: <div><div><p>
+# | SubRip subtitle files are also available for download in <a
+# | href=\"/education/misc/rms-education-es-sub[---]{+.+}en.srt\">English</a>,
+# | <a
+# | href=\"/education/misc/rms-education-es-sub[---]{+.+}es.srt\">Spanish</a>,
+# | and <a href=\"/education/misc/edu-misc.html#subtitles\">other
+# | languages</a>.
+#, fuzzy
+#| msgid ""
+#| "SubRip subtitle files are also available for download in <a href=\"/"
+#| "education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
+#| "education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+#| "education/misc/edu-misc.html#subtitles\">other languages</a>."
msgid ""
"SubRip subtitle files are also available for download in <a href=\"/"
-"education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
-"education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+"education/misc/rms-education-es-sub.en.srt\">English</a>, <a href=\"/"
+"education/misc/rms-education-es-sub.es.srt\">Spanish</a>, and <a href=\"/"
"education/misc/edu-misc.html#subtitles\">other languages</a>."
msgstr ""
"Sono disponibili anche i file SubRip coi sottotitoli in <a href=\"/education/"
Index: education/po/education.ja.po
===================================================================
RCS file: /web/www/www/education/po/education.ja.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- education/po/education.ja.po 5 Feb 2012 09:59:06 -0000 1.1
+++ education/po/education.ja.po 16 Feb 2012 09:29:48 -0000 1.2
@@ -6,13 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: education.html\n"
-"POT-Creation-Date: 2012-01-29 12:25-0500\n"
+"POT-Creation-Date: 2012-02-15 20:25-0500\n"
"PO-Revision-Date: 2012-02-04 00:48+0900\n"
"Last-Translator: Katsuya TANAKA <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-02-15 20:25-0500\n"
"Language: ja\n"
#. type: Content of: <title>
@@ -137,10 +138,16 @@
#. TRANSLATORS: please add the link to your language here in the first place,
followed by a comma.
#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "SubRip subtitle files are also available for download in <a href=\"/"
+#| "education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
+#| "education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+#| "education/misc/edu-misc.html#subtitles\">other languages</a>."
msgid ""
"SubRip subtitle files are also available for download in <a href=\"/"
-"education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
-"education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+"education/misc/rms-education-es-sub.en.srt\">English</a>, <a href=\"/"
+"education/misc/rms-education-es-sub.es.srt\">Spanish</a>, and <a href=\"/"
"education/misc/edu-misc.html#subtitles\">other languages</a>."
msgstr ""
"SubRipã®åå¹ãã¡ã¤ã«ã<a
href=\"/education/misc/rms-education-es-sub-en.srt"
Index: education/po/education.pl.po
===================================================================
RCS file: /web/www/www/education/po/education.pl.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- education/po/education.pl.po 30 Jan 2012 19:29:28 -0000 1.12
+++ education/po/education.pl.po 16 Feb 2012 09:29:48 -0000 1.13
@@ -7,13 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: education.html\n"
-"POT-Creation-Date: 2012-01-29 12:25-0500\n"
+"POT-Creation-Date: 2012-02-15 20:25-0500\n"
"PO-Revision-Date: 2012-01-30 19:32+0200\n"
"Last-Translator: Marcin Wolak <address@hidden>\n"
"Language-Team: Polish\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-02-15 20:25-0500\n"
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
@@ -147,10 +148,22 @@
#. TRANSLATORS: please add the link to your language here in the first place,
followed by a comma.
#. type: Content of: <div><div><p>
+# | SubRip subtitle files are also available for download in <a
+# | href=\"/education/misc/rms-education-es-sub[---]{+.+}en.srt\">English</a>,
+# | <a
+# | href=\"/education/misc/rms-education-es-sub[---]{+.+}es.srt\">Spanish</a>,
+# | and <a href=\"/education/misc/edu-misc.html#subtitles\">other
+# | languages</a>.
+#, fuzzy
+#| msgid ""
+#| "SubRip subtitle files are also available for download in <a href=\"/"
+#| "education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
+#| "education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+#| "education/misc/edu-misc.html#subtitles\">other languages</a>."
msgid ""
"SubRip subtitle files are also available for download in <a href=\"/"
-"education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
-"education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+"education/misc/rms-education-es-sub.en.srt\">English</a>, <a href=\"/"
+"education/misc/rms-education-es-sub.es.srt\">Spanish</a>, and <a href=\"/"
"education/misc/edu-misc.html#subtitles\">other languages</a>."
msgstr ""
"Pliki napisów SubRip sÄ
również dostÄpne w wersji do pobrania "
Index: education/po/education.ru.po
===================================================================
RCS file: /web/www/www/education/po/education.ru.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- education/po/education.ru.po 1 Feb 2012 13:53:19 -0000 1.1
+++ education/po/education.ru.po 16 Feb 2012 09:29:48 -0000 1.2
@@ -7,13 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: education.html\n"
-"POT-Creation-Date: 2012-01-29 12:16+0000\n"
+"POT-Creation-Date: 2012-02-15 20:25-0500\n"
"PO-Revision-Date: 2012-01-28 17:34+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-02-15 20:25-0500\n"
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
@@ -143,10 +144,22 @@
#. TRANSLATORS: please add the link to your language here in the first place,
followed by a comma.
#. type: Content of: <div><div><p>
+# | SubRip subtitle files are also available for download in <a
+# | href=\"/education/misc/rms-education-es-sub[---]{+.+}en.srt\">English</a>,
+# | <a
+# | href=\"/education/misc/rms-education-es-sub[---]{+.+}es.srt\">Spanish</a>,
+# | and <a href=\"/education/misc/edu-misc.html#subtitles\">other
+# | languages</a>.
+#, fuzzy
+#| msgid ""
+#| "SubRip subtitle files are also available for download in <a href=\"/"
+#| "education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
+#| "education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+#| "education/misc/edu-misc.html#subtitles\">other languages</a>."
msgid ""
"SubRip subtitle files are also available for download in <a href=\"/"
-"education/misc/rms-education-es-sub-en.srt\">English</a>, <a href=\"/"
-"education/misc/rms-education-es-sub-es.srt\">Spanish</a>, and <a href=\"/"
+"education/misc/rms-education-es-sub.en.srt\">English</a>, <a href=\"/"
+"education/misc/rms-education-es-sub.es.srt\">Spanish</a>, and <a href=\"/"
"education/misc/edu-misc.html#subtitles\">other languages</a>."
msgstr ""
"Ð¤Ð°Ð¹Ð»Ñ ÑÑбÑиÑÑов в ÑоÑмаÑе SubRip Ñакже
доÑÑÑÐ¿Ð½Ñ Ð½Ð° <a href=\"/education/misc/"
Index: gnu/po/gnu.translist
===================================================================
RCS file: /web/www/www/gnu/po/gnu.translist,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/po/gnu.translist 26 Dec 2011 09:28:29 -0000 1.4
+++ gnu/po/gnu.translist 16 Feb 2012 09:30:35 -0000 1.5
@@ -19,6 +19,8 @@
<li><a href="/gnu/gnu.fr.html">français</a> [fr]</li>
<!-- Italian -->
<li><a href="/gnu/gnu.it.html">italiano</a> [it]</li>
+<!-- Japanese -->
+<li><a href="/gnu/gnu.ja.html">æ¥æ¬èª</a> [ja]</li>
<!-- Kannada -->
<li><a href="/gnu/gnu.kn.html">à²à²¨à³à²¨à²¡</a> [kn]</li>
<!-- Macedonian -->
Index: licenses/gpl-faq.ru.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.ru.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- licenses/gpl-faq.ru.html 2 Feb 2012 02:09:53 -0000 1.7
+++ licenses/gpl-faq.ru.html 16 Feb 2012 09:31:15 -0000 1.8
@@ -170,7 +170,7 @@
GPLv3 Ñо же, ÑÑо в GPLv2 подÑазÑмеваеÑÑÑ Ð¿Ð¾Ð´
“ÑаÑпÑоÑÑÑанением”?</a></li>
- <li><a href="#NoDistributionRequirements">ЧÑо ÑÑебÑÐµÑ Ð¾Ñ
Ð¼ÐµÐ½Ñ Ð»Ð¸ÑензиÑ, еÑли Ñ
+ <li><a href="#NoDistributionRequirements">Чего ÑÑебÑÐµÑ Ð¾Ñ
Ð¼ÐµÐ½Ñ Ð»Ð¸ÑензиÑ, еÑли Ñ
ÑолÑко ÑÐ¾Ð·Ð´Ð°Ñ ÐºÐ¾Ð¿Ð¸Ð¸ пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL и
вÑполнÑÑ Ð¸Ñ
без ÑаÑпÑоÑÑÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸
пеÑедаÑи иÑ
дÑÑгим?</a></li>
@@ -301,7 +301,7 @@
<ul>
<li><a href="#ModifiedJustBinary">ÐÐ¾Ð³Ñ Ñ Ð²ÑпÑÑÑиÑÑ
измененнÑÑ Ð²ÐµÑÑÐ¸Ñ Ð¿ÑогÑаммÑ
-по GPL ÑолÑко в двоиÑном виде?</a></li>
+под GPL ÑолÑко в двоиÑном виде?</a></li>
<li><a href="#UnchangedJustBinary">Я взÑл по ÑеÑи ÑолÑко
двоиÑнÑй Ñайл. ÐÑли Ñ
ÑаÑпÑоÑÑÑанÑÑ ÐºÐ¾Ð¿Ð¸Ð¸, должен ли Ñ Ð¿Ð¾Ð»ÑÑиÑÑ
иÑÑ
однÑй ÑекÑÑ Ð¸ ÑаÑпÑоÑÑÑанÑÑÑ
@@ -330,8 +330,8 @@
опиÑÐ°Ð½Ð¸Ñ Ð¾ÑлиÑий Ð¾Ñ “ÑÑандаÑÑной”
веÑÑии?</a></li>
<li><a href="#AnonFTPAndSendSources">ÐÐ¾Ð³Ñ Ñ
пÑедоÑÑавлÑÑÑ Ð´Ð¾ÑÑÑп к двоиÑнÑм
-Ñайлам на ÑеÑвеÑе в ÑеÑи, но вÑÑÑлаÑÑ Ð¸ÑÑ
однÑе ÑекÑÑÑ ÑолÑко Ñем, кÑо
-Ð·Ð°ÐºÐ°Ð¶ÐµÑ Ð¸Ñ
?</a></li>
+Ñайлам на ÑеÑвеÑе в ÑеÑи, но вÑÑÑлаÑÑ Ð¸ÑÑ
однÑе ÑекÑÑÑ ÑолÑко Ñем, кÑо иÑ
+закажеÑ?</a></li>
<li><a href="#HowCanIMakeSureEachDownloadGetsSource">Ðак мне
гаÑанÑиÑоваÑÑ, ÑÑо
каждÑй полÑзоваÑелÑ, полÑÑаÑÑий по ÑеÑи
двоиÑнÑе ÑайлÑ, полÑÑÐ°ÐµÑ Ñакже
@@ -354,7 +354,8 @@
“ÑаÑпÑоÑÑÑанением”?</a></li>
<li><a href="#StolenCopy">ÐÑли кÑо-нибÑÐ´Ñ ÑкÑадеÑ
компакÑ-диÑк Ñ Ð²ÐµÑÑией
-пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL, Ð´Ð°ÐµÑ Ð»Ð¸ GPL ÐµÐ¼Ñ Ð¿Ñаво
пеÑеÑаÑпÑоÑÑÑанÑÑÑ ÑÑÑ Ð²ÐµÑÑиÑ?</a></li>
+пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL, Ð´Ð°ÐµÑ Ð»Ð¸ GPL ÐµÐ¼Ñ Ð¿Ñаво
ÑаÑпÑоÑÑÑанÑÑÑ ÑÑÑ Ð²ÐµÑÑиÑ
+далÑÑе?</a></li>
<li><a href="#TradeSecretRelease">ЧÑо, еÑли пÑедпÑиÑÑие
пеÑÐµÐ´Ð°ÐµÑ ÐºÐ¾Ð¿Ð¸Ñ ÐºÐ°Ðº
коммеÑÑеÑкÑÑ ÑайнÑ?</a></li>
@@ -376,7 +377,7 @@
<li><a href="#ExportWarranties">ÐаÑÑÑÐ°ÐµÑ Ð»Ð¸ поÑÑавÑик
GPL, еÑли он ÑÑебÑÐµÑ Ð¾Ñ
Ð¼ÐµÐ½Ñ “подÑвеÑдиÑÑ Ð¸ гаÑанÑиÑоваÑÑ”,
ÑÑо Ñ Ð½Ð°Ñ
ожÑÑÑ Ð² СШРили ÑÑо
Ñ ÑобиÑаÑÑÑ ÑаÑпÑоÑÑÑанÑÑÑ Ð¿ÑогÑаммÑ, не
наÑÑÑÐ°Ñ ÑооÑвеÑÑÑвÑÑÑиÑ
законов по
-конÑÑÐ¾Ð»Ñ ÑкÑпоÑÑа.</a></li>
+конÑÑÐ¾Ð»Ñ ÑкÑпоÑÑа?</a></li>
<li><a href="#v3Under4and5">РнаÑале Ñаздела 6 GPLv3
Ñказано, ÑÑо Ñ Ð¼Ð¾Ð³Ñ
пеÑедаваÑÑ Ð¿Ñоизведение, на коÑоÑое
ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð»Ð¸ÑензиÑ, в виде
@@ -435,7 +436,7 @@
ÑÑи ÑазÑабоÑки бÑли ÑвободнÑ?</a></li>
<li><a href="#WhatCaseIsOutputGPL">РкакиÑ
ÑлÑÑаÑÑ
GPL
ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð¸ на
-вÑÑ
однÑе даннÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL?</a></li>
+ÑезÑлÑÑÐ°Ñ ÑабоÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL?</a></li>
<li><a href="#PortProgramToGL">ÐÑли Ñ Ð¿ÐµÑеноÑÑ ÑвоÑ
пÑогÑÐ°Ð¼Ð¼Ñ Ð½Ð° GNU/Linux,
знаÑÐ¸Ñ Ð»Ð¸ ÑÑо, ÑÑо мне необÑ
одимо
вÑпÑÑÑиÑÑ ÐµÐµ как ÑвободнÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´
@@ -478,7 +479,7 @@
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL?</a></li>
<li><a href="#IfLibraryIsGPL">ÐÑли библиоÑека
вÑпÑÑкаеÑÑÑ Ð½Ð° ÑÑловиÑÑ
GPL (не
-LGPL), знаÑÐ¸Ñ Ð»Ð¸ ÑÑо, ÑÑо лÑÐ±Ð°Ñ Ð¿ÑогÑамма,
коÑоÑÐ°Ñ Ð¿Ð¾Ð»ÑзÑеÑÑÑ ÐµÐ¹, должна
+LGPL), знаÑÐ¸Ñ Ð»Ð¸ ÑÑо, ÑÑо лÑÐ±Ð°Ñ Ð¿ÑогÑамма,
коÑоÑÐ°Ñ ÐµÑ Ð¿Ð¾Ð»ÑзÑеÑÑÑ, должна
вÑпÑÑкаÑÑÑÑ Ð½Ð° ÑÑловиÑÑ
GPL или ÑовмеÑÑимой
Ñ GPL лиÑензии?</a></li>
<li><a href="#LinkingWithGPL">У Ð²Ð°Ñ ÐµÑÑÑ Ð¿ÑогÑамма под
GPL, коÑоÑÑÑ Ð¼Ð½Ðµ Ñ
оÑелоÑÑ
@@ -489,7 +490,7 @@
<li><a href="#SwitchToLGPL">Ð Ñаком ÑлÑÑае, еÑÑÑ Ð»Ð¸ Ñ
Ð¼ÐµÐ½Ñ Ñ
оÑÑ ÐºÐ°ÐºÐ°Ñ-Ñо надежда
на полÑÑение Ð¾Ñ Ð²Ð°Ñ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð½Ð° ÑÑловиÑÑ
ÐенÑÑей GPL?</a></li>
- <li><a href="#WillYouMakeAnException">ÐÑименение
опÑеделенное пÑогÑÐ°Ð¼Ð¼Ñ GNU под
+ <li><a href="#WillYouMakeAnException">ÐÑименение
опÑеделенной пÑогÑÐ°Ð¼Ð¼Ñ GNU под
GPL не ÑкладÑваеÑÑÑ Ð² Ð½Ð°Ñ Ð¿ÑÐ¾ÐµÐºÑ Ð¿Ð¾ ÑозданиÑ
неÑвободнÑÑ
пÑогÑамм. Ðе
ÑделаеÑе ли Ð²Ñ Ð´Ð»Ñ Ð½Ð°Ñ Ð¸ÑклÑÑениÑ? ÐÑо
ознаÑало Ð²Ñ Ð±Ð¾Ð»ÑÑее ÑиÑло
полÑзоваÑелей ÑÑой пÑогÑаммÑ.</a></li>
@@ -522,10 +523,10 @@
<li><a href="#GPLWrapper">Ðне Ñ
оÑелоÑÑ Ð±Ñ Ð²ÐºÐ»ÑÑиÑÑ
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL в ÑвоÑ
неÑвободнÑÑ ÑиÑÑемÑ. ÐÐ¾Ð³Ñ Ñ ÑÑо ÑделаÑÑ,
поÑÑавив “обеÑÑÑваÑÑий”
модÑÐ»Ñ Ð¿Ð¾Ð´ ÑовмеÑÑимой Ñ GPL
неогÑаниÑиÑелÑной лиÑензией (как, напÑимеÑ,
-лиÑÐµÐ½Ð·Ð¸Ñ X11) Ð¼ÐµÐ¶Ð´Ñ ÑаÑÑÑÑ,
ÑаÑпÑоÑÑÑанÑемой по GPL и неÑвободной
+лиÑÐµÐ½Ð·Ð¸Ñ X11) Ð¼ÐµÐ¶Ð´Ñ ÑаÑÑÑÑ,
ÑаÑпÑоÑÑÑанÑемой по GPL, и неÑвободной
ÑаÑÑÑÑ?</a></li>
- <li><a href="#FSWithNFLibs">ÐÐ¾Ð³Ñ Ñ Ð½Ð°Ð¿Ð¸ÑаÑÑ
ÑвободнÑÑ Ð¿ÑогÑаммÑ, коÑоÑаÑ
+ <li><a href="#FSWithNFLibs">ÐÐ¾Ð³Ñ Ð»Ð¸ Ñ Ð½Ð°Ð¿Ð¸ÑаÑÑ
ÑвободнÑÑ Ð¿ÑогÑаммÑ, коÑоÑаÑ
полÑзÑеÑÑÑ Ð½ÐµÑвободнÑми
библиоÑеками?</a></li>
<li><a href="#GPLIncompatibleLibs">Ðакие ÑÑидиÑеÑкие
пÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ð²Ð¾Ð·Ð½Ð¸ÐºÐ°ÑÑ, еÑли Ñ
@@ -538,18 +539,18 @@
<li><a href="#MoneyGuzzlerInc">Ðне Ñ
оÑелоÑÑ Ð±Ñ
измениÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL и
ÑвÑзаÑÑ Ð¸Ñ
Ñ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñеками пеÑеноÑимоÑÑи
ÐÐÐ “ÐаÑмоед”. Я не могÑ
-ÑаÑпÑоÑÑÑанÑÑÑ Ð¸ÑÑ
однÑй ÑекÑÑ ÑÑиÑ
библиоÑек, Ñак ÑÑо ÐºÐ°Ð¶Ð´Ð¾Ð¼Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ,
+ÑаÑпÑоÑÑÑанÑÑÑ Ð¸ÑÑ
однÑй ÑекÑÑ ÑÑиÑ
библиоÑек, Ñак ÑÑо ÐºÐ°Ð¶Ð´Ð¾Ð¼Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ,
коÑоÑÑй Ñ
оÑел Ð±Ñ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ ÑÑи веÑÑии,
пÑиÑлоÑÑ Ð±Ñ Ð¿Ð¾Ð»ÑÑиÑÑ ÑÑи библиоÑеки
оÑделÑно. ÐоÑÐµÐ¼Ñ GPL не допÑÑÐºÐ°ÐµÑ ÑÑого?</a></li>
<li><a href="#GPLIncompatibleAlone">ÐÑли в лиÑензии длÑ
модÑÐ»Ñ Ð ÐµÑÑÑ
-ÑÑебование, неÑовмеÑÑимое Ñ GPL, но
ÑÑебование дейÑÑвÑÐµÑ ÑолÑко когда Ð
+ÑÑебование, неÑовмеÑÑимое Ñ GPL, но
ÑÑебование дейÑÑвÑеÑ, ÑолÑко когда Ð
ÑаÑпÑоÑÑÑанÑеÑÑÑ Ñам по Ñебе, а не когда он
вклÑÑаеÑÑÑ Ð² более кÑÑпнÑÑ
пÑогÑаммÑ, Ð´ÐµÐ»Ð°ÐµÑ Ð»Ð¸ ÑÑо лиÑензиÑ
неÑовмеÑÑимой Ñ GPL? ÐÐ¾Ð³Ñ Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð¸ÑоваÑÑ
или ÑвÑзÑваÑÑ Ð Ñ Ð¿ÑогÑаммой под GPL?</a></li>
<li><a href="#OOPLang">ÐÑли в Ñаком
обÑекÑно-оÑиенÑиÑованном ÑзÑке, как Java, Ñ
-иÑполÑзÑÑ ÐºÐ»Ð°ÑÑ Ð¿Ð¾Ð´ GPL без изменений, и
обÑазÑÑ Ð¸Ð· него подклаÑÑ, каким
+иÑполÑзÑÑ ÐºÐ»Ð°ÑÑ Ð¿Ð¾Ð´ GPL без изменений и
обÑазÑÑ Ð¸Ð· него подклаÑÑ, каким
обÑазом GPL влиÑÐµÑ Ð½Ð° более кÑÑпнÑÑ
пÑогÑаммÑ?</a></li>
<li><a href="#LinkingOverControlledInterface">Ðак мне
позволиÑÑ ÐºÐ¾Ð¼Ð¿Ð¾Ð½Ð¾Ð²Ð°ÑÑ
@@ -558,11 +559,11 @@
<li><a href="#Consider">РаÑÑмоÑÑим ÑиÑÑаÑиÑ: 1) X
вÑпÑÑÐºÐ°ÐµÑ Ð²ÐµÑÑÐ¸Ñ V1 пÑоекÑа
под GPL. 2) Y вноÑÐ¸Ñ Ð´Ð¾ÑабоÑки в веÑÑÐ¸Ñ V2,
коÑоÑÑе вклÑÑаÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸
-новÑе ÑекÑÑÑ, оÑнованнÑе на V1. 3) X Ñ
оÑеÑ
вÑпÑÑкаÑÑ V2 под лиÑензией,
-оÑлиÑной Ð¾Ñ GPL. ÐÑжно ли X ÑазÑеÑение Y?</a></li>
+новÑе ÑекÑÑÑ Ð¿ÑогÑамм, оÑнованнÑе на V1. 3) X Ñ
оÑÐµÑ Ð²ÑпÑÑкаÑÑ V2 под
+лиÑензией, оÑлиÑной Ð¾Ñ GPL. ÐÑжно ли X
ÑазÑеÑение Y?</a></li>
<li><a href="#ManyDifferentLicenses">Ðной напиÑано
пÑиложение, коÑоÑое
-компонÑеÑÑÑ Ñ Ð±Ð¾Ð»ÑÑим ÑиÑлом ÑазнÑÑ
компоненÑов Ñ ÑазнÑми лиÑензиÑми. Я
+компонÑеÑÑÑ Ñ Ð±Ð¾Ð»ÑÑим ÑиÑлом ÑазнÑÑ
ÑоÑÑавлÑÑÑиÑ
Ñ ÑазнÑми лиÑензиÑми. Я
никак не Ð¼Ð¾Ð³Ñ Ð¿Ð¾Ð½ÑÑÑ, какие ÑÑебованиÑ
пÑедÑÑвлÑÑÑÑÑ Ðº лиÑензиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¼Ð¾ÐµÐ¹
пÑогÑаммÑ. Ðе бÑли Ð±Ñ Ð²Ñ Ñак лÑбезнÑ
ÑаÑÑказаÑÑ Ð¼Ð½Ðµ, какими лиÑензиÑми Ñ
Ð¼Ð¾Ð³Ñ Ð¿Ð¾Ð»ÑзоваÑÑÑÑ?</a></li>
@@ -597,7 +598,7 @@
<li><a href="#Cure">ЧÑо знаÑÐ¸Ñ “ÑÑÑÑаниÑÑ”
наÑÑÑение GPLv3?</a></li>
<li><a href="#LaptopLoan">ÐÑли кÑо-Ñо ÑÑÑановиÑ
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL на поÑÑаÑивном
-компÑÑÑеÑе а заÑем Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ ÑÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑеÑ
Ð·Ð½Ð°ÐºÐ¾Ð¼Ð¾Ð¼Ñ Ð±ÐµÐ· пÑедоÑÑавлениÑ
+компÑÑÑеÑе, а заÑем Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ ÑÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑеÑ
Ð·Ð½Ð°ÐºÐ¾Ð¼Ð¾Ð¼Ñ Ð±ÐµÐ· пÑедоÑÑавлениÑ
иÑÑ
одного ÑекÑÑа пÑогÑаммÑ, бÑÐ´ÐµÑ Ð»Ð¸ ÑÑо
наÑÑÑением GPL?</a></li>
<li><a href="#TwoPartyTivoization" >ÐÑедположим, ÑÑо две
компании пÑÑаÑÑÑÑ
@@ -630,7 +631,7 @@
ÐовÑе Ð½ÐµÑ — еÑÑÑ Ð¼Ð½Ð¾Ð³Ð¾ дÑÑгиÑ
лиÑензий ÑвободнÑÑ
пÑогÑамм. У наÑ
еÑÑÑ <a href="/licenses/license-list.html">неполнÑй
ÑпиÑок</a>. ÐÑбаÑ
лиÑензиÑ, коÑоÑÐ°Ñ Ð¿ÑедоÑÑавлÑеÑ
полÑзоваÑÐµÐ»Ñ <a
-href="/philosophy/free-sw.html">опÑеделеннÑе оÑобÑе
ÑвободÑ</a> ÑвлÑеÑÑÑ
+href="/philosophy/free-sw.html">опÑеделеннÑе оÑобÑе
ÑвободÑ</a>, ÑвлÑеÑÑÑ
лиÑензией ÑвободнÑÑ
пÑогÑамм.</p></dd>
@@ -700,7 +701,7 @@
веÑÑии пÑоÑ
одили ÑеÑез пеÑвонаÑалÑного
авÑоÑа. Ðока пеÑвонаÑалÑнÑй авÑоÑ
ÑдовлеÑвоÑиÑелÑно поддеÑживаеÑ
пÑогÑаммÑ, ÑÑо Ð¼Ð¾Ð¶ÐµÑ Ñ
оÑоÑо ÑабоÑаÑÑ Ð½Ð°
пÑакÑике, но еÑли авÑÐ¾Ñ Ð¿ÑекÑаÑÐ°ÐµÑ (более
или менее) делаÑÑ ÑÑо-Ñо дÑÑгое
-или не ÑдовлеÑвоÑÑÐµÑ Ð²ÑеÑ
нÑжд
полÑзоваÑелей, ÑÑа в ÑÑой ÑÑ
еме пÑоиÑÑ
одиÑ
+или не ÑдовлеÑвоÑÑÐµÑ Ð²ÑеÑ
нÑжд
полÑзоваÑелей, в ÑÑой ÑÑ
еме пÑоиÑÑ
одиÑ
Ñбой. ÐÑоме пÑакÑиÑеÑкиÑ
пÑоблем, ÑÑа ÑÑ
ема не позволÑÐµÑ Ð¿Ð¾Ð»ÑзоваÑелÑм
помогаÑÑ Ð´ÑÑг дÑÑгÑ.</p>
@@ -891,7 +892,7 @@
заказÑик. ÐÑо ÑазÑеÑаеÑÑÑ, поÑÐ¾Ð¼Ñ ÑÑо в
ÑÑом ÑлÑÑае никакие ÑекÑÑÑ Ð¿Ð¾Ð´ GPL
не ÑаÑпÑоÑÑÑанÑÑÑÑÑ Ð½Ð° ÑÑловиÑÑ
неÑазглаÑениÑ.</p>
-<p>ÐÑ Ð¼Ð¾Ð¶ÐµÑе Ñакже пеÑедаÑÑ Ñвои изменениÑ
заказÑика по GPL, но договоÑиÑÑÑÑ Ð½Ðµ
+<p>ÐÑ Ð¼Ð¾Ð¶ÐµÑе Ñакже пеÑедаÑÑ Ñвои изменениÑ
заказÑÐ¸ÐºÑ Ð¿Ð¾ GPL, но договоÑиÑÑÑÑ Ð½Ðµ
пеÑедаваÑÑ Ð¸Ñ
ÐºÐ¾Ð¼Ñ Ð±Ñ Ñо ни бÑло дÑÑгомÑ
без ÑоглаÑÐ¸Ñ Ð·Ð°ÐºÐ°Ð·Ñика. Ð ÑÑом
ÑлÑÑае Ñоже никакие ÑекÑÑÑ Ð¿Ð¾Ð´ GPL не
ÑаÑпÑоÑÑÑанÑÑÑÑÑ Ð½Ð° ÑÑловиÑÑ
неÑазглаÑÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ какиÑ
-Ñо дополниÑелÑнÑÑ
огÑаниÑений.</p>
@@ -997,7 +998,7 @@
Ñазделе 7.</p></dd>
-<dt id="FSWithNFLibs">ÐÐ¾Ð³Ñ Ñ Ð½Ð°Ð¿Ð¸ÑаÑÑ ÑвободнÑÑ
пÑогÑаммÑ, коÑоÑÐ°Ñ Ð¿Ð¾Ð»ÑзÑеÑÑÑ Ð½ÐµÑвободнÑми
+<dt id="FSWithNFLibs">ÐÐ¾Ð³Ñ Ð»Ð¸ Ñ Ð½Ð°Ð¿Ð¸ÑаÑÑ ÑвободнÑÑ
пÑогÑаммÑ, коÑоÑÐ°Ñ Ð¿Ð¾Ð»ÑзÑеÑÑÑ Ð½ÐµÑвободнÑми
библиоÑеками? <span class="anchor-reference-id">(<a
href="#FSWithNFLibs"
>#FSWithNFLibs</a>)</span></dt>
<dd><p>
@@ -1060,7 +1061,7 @@
иÑклÑÑение Ð´Ð»Ñ ÑиÑÑемнÑÑ
библиоÑек, вам
нÑжно ÑазÑеÑиÑÑ Ð´ÑÑгим делаÑÑ
ÑÑо. Ðиже пÑиводÑÑÑÑ Ð´Ð²Ð° пÑимеÑа
пÑимеÑаний к лиÑензии, коÑоÑÑми Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе
воÑполÑзоваÑÑÑÑ Ð´Ð»Ñ ÑÑого; одно
ÑоÑÑавлено Ð´Ð»Ñ GPLv3, дÑÑгое —
-Ð´Ð»Ñ GPLv2. Рв Ñом, и в дÑÑгом ÑлÑÑае вам
ÑледÑÐµÑ ÑазмеÑаÑÑ ÑÑÐ¾Ñ ÑекÑÑ Ð²
+Ð´Ð»Ñ GPLv2. Рв Ñом, и в дÑÑгом ÑлÑÑае вам
ÑледÑÐµÑ Ð¿Ð¾Ð¼ÐµÑаÑÑ ÑÑÐ¾Ñ ÑекÑÑ Ð²
каждÑй Ñайл, Ð´Ð»Ñ ÐºÐ¾ÑоÑого Ð²Ñ Ð´Ð°ÐµÑе ÑÑо
ÑазÑеÑение.</p>
<p>Ðо Ð·Ð°ÐºÐ¾Ð½Ñ ÑолÑко пÑавообладаÑели
пÑогÑамм могÑÑ Ð²ÑпÑÑкаÑÑ Ñвои пÑогÑÐ°Ð¼Ð¼Ñ Ð½Ð°
@@ -1076,7 +1077,7 @@
Ð´Ð»Ñ ÑвоиÑ
ÑекÑÑов — они Ñами ÑеÑаÑÑ,
ÑделаÑÑ Ð»Ð¸ ÑÑо.</p>
<p>ÐÑли библиоÑеки, Ñ ÐºÐ¾ÑоÑÑми вÑ
ÑобиÑаеÑеÑÑ ÐºÐ¾Ð¼Ð¿Ð¾Ð½Ð¾Ð²Ð°ÑÑ Ð¿ÑогÑаммÑ,
-неÑвободнÑ, поÑÑиÑе, пожалÑйÑÑа, <a
href="#FSWithNFLibs">оÑÐ²ÐµÑ Ð½Ð° вопÑÐ¾Ñ Ð¾
+неÑвободнÑ, пÑоÑÑиÑе, пожалÑйÑÑа, <a
href="#FSWithNFLibs">оÑÐ²ÐµÑ Ð½Ð° вопÑÐ¾Ñ Ð¾
напиÑании ÑвободнÑÑ
пÑогÑамм Ñ
иÑполÑзованием неÑвободнÑÑ
библиоÑек</a>.</p>
<p>ÐÑли Ð²Ñ Ð¿Ð¾Ð»ÑзÑеÑеÑÑ GPLv3, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе
доÑÑигнÑÑÑ ÑÑого, пÑедоÑÑавив
@@ -1119,7 +1120,7 @@
</blockquote>
<p>ÐÑли Ð²Ñ Ð¿Ð¾Ð»ÑзÑеÑеÑÑ GPLv2, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе
пÑедоÑÑавиÑÑ Ñвое ÑобÑÑвенное
-иÑклÑÑение из ÑÑловий лиÑензии.
СледÑÑÑего пÑимеÑание к лиÑензии бÑдеÑ
+иÑклÑÑение из ÑÑловий лиÑензии.
СледÑÑÑего пÑимеÑÐ°Ð½Ð¸Ñ Ðº лиÑензии бÑдеÑ
доÑÑаÑоÑно Ð´Ð»Ñ ÑÑого. Ðак и в пÑоÑлом
ÑлÑÑае, Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð·Ð°Ð¼ÐµÐ½Ð¸ÑÑ Ð²ÐµÑÑ ÑекÑÑ
в квадÑаÑнÑÑ
ÑкобкаÑ
на ÑекÑÑ,
ÑооÑвеÑÑÑвÑÑÑий ваÑей пÑогÑамме. ÐÑли не
вÑе
могÑÑ ÑаÑпÑоÑÑÑанÑÑÑ Ð¸ÑÑ
однÑй ÑекÑÑ
библиоÑек, Ñ ÐºÐ¾ÑоÑÑми Ð²Ñ ÑобиÑаеÑеÑÑ
@@ -1176,7 +1177,7 @@
Ð ÑооÑвеÑÑÑвии Ñ ÐеÑнÑкой конвенÑией вÑе,
ÑÑо напиÑано, авÑомаÑиÑеÑки
Ð¿Ð¾Ð¿Ð°Ð´Ð°ÐµÑ Ð¿Ð¾Ð´ дейÑÑвие авÑоÑÑкого пÑава,
как ÑолÑко оно пÑинимаеÑ
ÑикÑиÑованнÑÑ ÑоÑмÑ. Так ÑÑо вам не нÑжно
делаÑÑ ÑÑо Ð±Ñ Ñо ни бÑло, ÑÑобÑ
-“полÑÑиÑÑ” авÑоÑÑкие пÑава но Ñо, ÑÑо
Ð²Ñ Ð¿Ð¸ÑеÑе — до
+“полÑÑиÑÑ” авÑоÑÑкие пÑава на Ñо, ÑÑо
Ð²Ñ Ð¿Ð¸ÑеÑе — до
ÑеÑ
поÑ, пока никÑо дÑÑгой не можеÑ
заÑвиÑÑ, ÑÑо он —
пÑавообладаÑÐµÐ»Ñ Ð²Ð°Ñей ÑабоÑÑ.</p>
@@ -1261,11 +1262,11 @@
СÑÑого говоÑÑ, GPL — лиÑензиÑ
ÑазÑабоÑÑика Ð´Ð»Ñ Ð¸ÑполÑзованиÑ,
ÑаÑпÑоÑÑÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿ÑогÑаммÑ
дÑÑгими. Сам ÑазÑабоÑÑик не ÑвÑзан
лиÑензией, поÑÑÐ¾Ð¼Ñ Ð½ÐµÐ·Ð°Ð²Ð¸Ñимо Ð¾Ñ Ñого, ÑÑо
Ð´ÐµÐ»Ð°ÐµÑ ÑазÑабоÑÑик, ÑÑо не
-ÑвлÑеÑÑÑ “наÑÑÑением“ GPL.</p>
+ÑвлÑеÑÑÑ “наÑÑÑением” GPL.</p>
<p>Ðднако еÑли ÑазÑабоÑÑик Ð´ÐµÐ»Ð°ÐµÑ ÑÑо-Ñо,
ÑÑо наÑÑÑало Ð±Ñ GPL, еÑли Ð±Ñ ÑÑо
-делал кÑо-Ñо дÑÑгой, Ñо ÑазÑабоÑÑик Ñ
ÑвеÑенноÑÑÑÑ Ð¿Ð¾ÑеÑÑÐµÑ Ð¼Ð¾ÑалÑное
-положение в ÑообÑеÑÑве.</p></dd>
+делал кÑо-Ñо дÑÑгой, Ñо ÑазÑабоÑÑик,
неÑомненно, ÑÑÑаÑÐ¸Ñ Ñвои моÑалÑнÑе
+позиÑии в ÑообÑеÑÑве.</p></dd>
<dt id="CanDeveloperThirdParty">ÐÐ¾Ð¶ÐµÑ Ð»Ð¸ ÑазÑабоÑÑик
пÑогÑаммÑ, ÑаÑпÑоÑÑÑанÑвÑий ее по GPL,
впоÑледÑÑвии
@@ -1300,7 +1301,7 @@
пÑогÑамм — благодаÑÑ ÑомÑ, ÑÑо мÑ
ÑеÑили Ñвно ÑазÑеÑиÑÑ
пÑименение ÑÑандаÑÑной пÑогÑÐ°Ð¼Ð¼Ñ ÐµÐ³Ð¾
ÑинÑакÑиÑеÑкого анализаÑоÑа в вÑÑ
однÑÑ
ÑайлаÑ
без огÑаниÑений. ÐÑ Ð¿ÑинÑли Ñакое
ÑеÑение, поÑÐ¾Ð¼Ñ ÑÑо Ñже бÑли дÑÑгие
-ÑÑедÑÑва, ÑопоÑÑавимÑе Ñ Bison, коÑоÑÑе
ÑазÑеÑали пÑименение Ð´Ð»Ñ Ð½ÐµÑвободнÑÑ
+ÑÑедÑÑва, ÑопоÑÑавимÑе Ñ Bison, коÑоÑÑе
допÑÑкали пÑименение Ð´Ð»Ñ Ð½ÐµÑвободнÑÑ
пÑогÑамм.</p></dd>
@@ -1375,15 +1376,15 @@
ÑлÑÑаÑ.</p>
<p>ÐÑ Ð¼Ð¾Ð³Ð»Ð¸ Ð±Ñ Ð·Ð°ÑÑавиÑÑ Ð¿ÑогÑаммÑ
иÑкÑÑÑÑвенно вÑÑавлÑÑÑ Ð¾Ð¿ÑеделеннÑй ÑекÑÑ
в
-Ñвои вÑÑ
однÑе даннÑе, даже еÑли Ð´Ð»Ñ ÑÑого
Ð½ÐµÑ ÑеÑ
ниÑеÑкой необÑ
одимоÑÑи. Ðн
-еÑли ÑÑÐ¾Ñ Ð²ÑÑавлÑемÑй ÑекÑÑ Ð½Ðµ ÑлÑÐ¶Ð¸Ñ Ð½Ð¸
Ð´Ð»Ñ ÐºÐ°ÐºÐ¾Ð¹ пÑакÑиÑеÑкой Ñели, Ñо
+Ñвои вÑÑ
однÑе даннÑе, даже еÑли Ð´Ð»Ñ ÑÑого
Ð½ÐµÑ ÑеÑ
ниÑеÑкой необÑ
одимоÑÑи. Ðо
+еÑли ÑÑÐ¾Ñ Ð²ÑÑавлÑемÑй ÑекÑÑ Ð½Ðµ ÑлÑжиÑ
никакой пÑакÑиÑеÑкой Ñели, Ñо
полÑзоваÑÐµÐ»Ñ Ð¼Ð¾Ð³ Ð±Ñ Ð¿ÑоÑÑо ÑдалÑÑÑ ÑÑоÑ
ÑекÑÑ Ð¸Ð· вÑÑ
однÑÑ
даннÑÑ
и
полÑзоваÑÑÑÑ ÑолÑко Ñем, ÑÑо оÑÑанеÑÑÑ.
Тогда ÐµÐ¼Ñ Ð½Ðµ пÑиÑлоÑÑ Ð±Ñ Ð¿Ð¾Ð´ÑинÑÑÑÑÑ
ÑÑловиÑм ÑаÑпÑоÑÑÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð²ÑÑавлÑемого
ÑекÑÑа.</p></dd>
-<dt id="WhatCaseIsOutputGPL">РкакиÑ
ÑлÑÑаÑÑ
GPL
ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð¸ на вÑÑ
однÑе даннÑе
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL?
-<span class="anchor-reference-id">(<a href="#WhatCaseIsOutputGPL"
+<dt id="WhatCaseIsOutputGPL">РкакиÑ
ÑлÑÑаÑÑ
GPL
ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð¸ на ÑезÑлÑÑÐ°Ñ ÑабоÑÑ
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´
+GPL? <span class="anchor-reference-id">(<a href="#WhatCaseIsOutputGPL"
>#WhatCaseIsOutputGPL</a>)</span></dt>
<dd><p>
ТолÑко когда пÑогÑамма копиÑÑÐµÑ ÑаÑÑÑ
Ñамой ÑÐµÐ±Ñ Ð² вÑÑ
однÑе даннÑе.</p></dd>
@@ -1406,7 +1407,7 @@
<dt id="IfLibraryIsGPL">ÐÑли библиоÑека вÑпÑÑкаеÑÑÑ
на ÑÑловиÑÑ
GPL (не LGPL), знаÑÐ¸Ñ Ð»Ð¸ ÑÑо, ÑÑо
-лÑÐ±Ð°Ñ Ð¿ÑогÑамма, коÑоÑÐ°Ñ Ð¿Ð¾Ð»ÑзÑеÑÑÑ ÐµÐ¹,
должна вÑпÑÑкаÑÑÑÑ Ð½Ð° ÑÑловиÑÑ
GPL
+лÑÐ±Ð°Ñ Ð¿ÑогÑамма, коÑоÑÐ°Ñ ÐµÑ Ð¿Ð¾Ð»ÑзÑеÑÑÑ,
должна вÑпÑÑкаÑÑÑÑ Ð½Ð° ÑÑловиÑÑ
GPL
или ÑовмеÑÑимой Ñ GPL лиÑензии? <span
class="anchor-reference-id">(<a
href="#IfLibraryIsGPL" >#IfLibraryIsGPL</a>)</span></dt>
<dd><p>
@@ -1428,19 +1429,18 @@
Ð±Ñ Ñо ни бÑло.</p>
<p>Ðднако когда инÑеÑпÑеÑаÑÐ¾Ñ ÑаÑÑиÑÑеÑÑÑ
Ð´Ð»Ñ Ñого, ÑÑÐ¾Ð±Ñ Ð¾Ð±ÐµÑпеÑиÑÑ
-“пеÑенапÑавлениє на дÑÑгие
ÑÑедÑÑва (ÑаÑÑо, но не
-вÑегда — на библиоÑеки),
инÑеÑпÑеÑиÑÑÐµÐ¼Ð°Ñ Ð¿ÑогÑамма ÑакÑиÑеÑки
-компонÑеÑÑÑ Ñо ÑÑедÑÑвами, коÑоÑÑми она
полÑзÑеÑÑÑ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÑÑиÑ
-пеÑенапÑавлений. Так ÑÑо еÑли ÑÑи ÑÑедÑÑва
вÑпÑÑкаÑÑÑÑ Ð¿Ð¾Ð´ GPL, Ñо
-инÑеÑпÑеÑиÑÑÐµÐ¼Ð°Ñ Ð¿ÑогÑамма должна
вÑпÑÑкаÑÑÑÑ ÑовмеÑÑимÑм Ñ GPL обÑазом. JNI
-(Java Native Interface) — пÑÐ¸Ð¼ÐµÑ Ð¼ÐµÑ
анизма
Ñакого
-пеÑенапÑавлениÑ; библиоÑеки, к коÑоÑÑм
пÑедоÑÑавлÑеÑÑÑ Ð´Ð¾ÑÑÑп Ñаким обÑазом,
-компонÑÑÑÑÑ Ð´Ð¸Ð½Ð°Ð¼Ð¸ÑеÑки Ñ Ð¿ÑогÑаммами на
Java, коÑоÑÑе вÑзÑваÑÑ Ð¸Ñ
. ÐÑи
-библиоÑеки компонÑÑÑÑÑ Ñакже Ñ
инÑеÑпÑеÑаÑоÑом. ÐÑли инÑеÑпÑеÑаÑоÑ
-ÑÑаÑиÑеÑки ÑвÑзÑваеÑÑÑ Ñ ÑÑими
библиоÑеками или еÑли он ÑазÑабоÑан Ñак,
-ÑÑÐ¾Ð±Ñ <a href="#GPLPluginsInNF">динамиÑеÑки
компоноваÑÑÑÑ Ñ ÑÑими
-конкÑеÑнÑми библиоÑеками</a>, Ñо он Ñоже
должен вÑпÑÑкаÑÑÑÑ ÑовмеÑÑимÑм Ñ
-GPL обÑазом.</p>
+“пÑивÑзки” к дÑÑгим ÑÑедÑÑвам (ÑаÑÑо,
но не вÑегда —
+к библиоÑекам), инÑеÑпÑеÑиÑÑемаÑ
пÑогÑамма ÑакÑиÑеÑки компонÑеÑÑÑ Ñо
+ÑÑедÑÑвами, коÑоÑÑми она полÑзÑеÑÑÑ Ñ
помоÑÑÑ ÑÑиÑ
пÑивÑзок. Так ÑÑо еÑли
+ÑÑи ÑÑедÑÑва вÑпÑÑкаÑÑÑÑ Ð¿Ð¾Ð´ GPL, Ñо
инÑеÑпÑеÑиÑÑÐµÐ¼Ð°Ñ Ð¿ÑогÑамма должна
+вÑпÑÑкаÑÑÑÑ ÑовмеÑÑимÑм Ñ GPL обÑазом. JNI (Java
Native
+Interface) — пÑÐ¸Ð¼ÐµÑ Ð¼ÐµÑ
анизма Ñакой
пÑивÑзки; библиоÑеки, к
+коÑоÑÑм пÑедоÑÑавлÑеÑÑÑ Ð´Ð¾ÑÑÑп Ñаким
обÑазом, компонÑÑÑÑÑ Ð´Ð¸Ð½Ð°Ð¼Ð¸ÑеÑки Ñ
+пÑогÑаммами на Java, коÑоÑÑе вÑзÑваÑÑ Ð¸Ñ
. ÐÑи
библиоÑеки компонÑÑÑÑÑ Ñакже Ñ
+инÑеÑпÑеÑаÑоÑом. ÐÑли инÑеÑпÑеÑаÑоÑ
ÑÑаÑиÑеÑки ÑвÑзÑваеÑÑÑ Ñ ÑÑими
+библиоÑеками или еÑли он ÑазÑабоÑан Ñак,
ÑÑÐ¾Ð±Ñ <a
+href="#GPLPluginsInNF">динамиÑеÑки компоноваÑÑÑÑ Ñ
ÑÑими конкÑеÑнÑми
+библиоÑеками</a>, Ñо он Ñоже должен
вÑпÑÑкаÑÑÑÑ ÑовмеÑÑимÑм Ñ GPL обÑазом.</p>
<p>ÐÑÑгой ÑÑ
однÑй и оÑÐµÐ½Ñ ÑаÑпÑоÑÑÑаненнÑй
ÑлÑÑай — поÑÑавка Ñ
инÑеÑпÑеÑаÑоÑом библиоÑек, коÑоÑÑе Ñами
инÑеÑпÑеÑиÑÑÑÑÑÑ. ÐапÑимеÑ, Perl
@@ -1644,7 +1644,7 @@
<dt id="ManyDifferentLicenses">Ðной напиÑано пÑиложение,
коÑоÑое компонÑеÑÑÑ Ñ Ð±Ð¾Ð»ÑÑим ÑиÑлом
ÑазнÑÑ
-компоненÑов Ñ ÑазнÑми лиÑензиÑми. Я никак
не Ð¼Ð¾Ð³Ñ Ð¿Ð¾Ð½ÑÑÑ, какие ÑÑебованиÑ
+ÑоÑÑавлÑÑÑиÑ
Ñ ÑазнÑми лиÑензиÑми. Я никак
не Ð¼Ð¾Ð³Ñ Ð¿Ð¾Ð½ÑÑÑ, какие ÑÑебованиÑ
пÑедÑÑвлÑÑÑÑÑ Ðº лиÑензиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¼Ð¾ÐµÐ¹
пÑогÑаммÑ. Ðе бÑли Ð±Ñ Ð²Ñ Ñак лÑбезнÑ
ÑаÑÑказаÑÑ Ð¼Ð½Ðµ, какими лиÑензиÑми Ñ Ð¼Ð¾Ð³Ñ
полÑзоваÑÑÑÑ? <span
class="anchor-reference-id">(<a href="#ManyDifferentLicenses"
@@ -1684,7 +1684,7 @@
<p>ÐÑли модÑли вклÑÑаÑÑÑÑ Ð² один и ÑÐ¾Ñ Ð¶Ðµ
иÑполнÑемÑй Ñайл, они опÑеделенно
комбиниÑÑÑÑÑÑ Ð² одной пÑогÑамме. ÐÑли
модÑли ÑоÑÑавленÑ, ÑÑÐ¾Ð±Ñ ÑабоÑаÑÑ,
-ÑвÑзÑваÑÑÑ Ð¾Ð±Ñем адÑеÑнÑм пÑоÑÑÑанÑÑвом,
ÑÑо поÑÑи навеÑное ознаÑаеÑ, ÑÑо
+ÑвÑзÑваÑÑÑ Ð² обÑем адÑеÑном пÑоÑÑÑанÑÑве,
ÑÑо поÑÑи навеÑное ознаÑаеÑ, ÑÑо
они комбиниÑÑÑÑÑÑ Ð² Ð¾Ð´Ð½Ñ Ð¿ÑогÑаммÑ.</p>
<p>ÐапÑоÑив, ÐºÐ°Ð½Ð°Ð»Ñ Ð¾Ð±Ð¼ÐµÐ½Ð° даннÑми, ÑокеÑÑ Ð¸
аÑгÑменÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¾Ð¹
@@ -1692,8 +1692,8 @@
двÑÐ¼Ñ Ð¾ÑделÑнÑми пÑогÑаммами. Так ÑÑо
когда они пÑименÑÑÑÑÑ Ð´Ð»Ñ
взаимодейÑÑвиÑ, модÑли обÑÑно ÑвлÑÑÑÑÑ
оÑделÑнÑми пÑогÑаммами. Ðо еÑли
ÑодеÑжание взаимодейÑÑÐ²Ð¸Ñ Ð´Ð¾ÑÑаÑоÑно
глÑбоко, еÑли пÑоиÑÑ
Ð¾Ð´Ð¸Ñ Ð¾Ð±Ð¼ÐµÐ½ ÑложнÑми
-внÑÑÑенними ÑÑÑÑкÑÑÑами даннÑÑ
, ÑÑо Ñоже
Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¾Ñновой Ð´Ð»Ñ Ñого, ÑÑобÑ
-ÑÑиÑаÑÑ Ð´Ð²Ðµ ÑаÑÑи ÑоÑÑавлÑÑÑими одной
более кÑÑпной пÑогÑаммÑ.</p></dd>
+внÑÑÑенними ÑÑÑÑкÑÑÑами даннÑÑ
, ÑÑо Ñоже
Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¾Ñнованием Ð´Ð»Ñ Ñого,
+ÑÑÐ¾Ð±Ñ ÑÑиÑаÑÑ Ð´Ð²Ðµ ÑаÑÑи ÑоÑÑавлÑÑÑими
одной более кÑÑпной пÑогÑаммÑ.</p></dd>
<dt id="AssignCopyright">ÐоÑÐµÐ¼Ñ Ð¤Ð¡ÐÐ ÑÑебÑеÑ, ÑÑобÑ
Ñе, кÑо вноÑÐ¸Ñ Ð²ÐºÐ»Ð°Ð´ в пÑогÑаммÑ, авÑоÑÑкие
пÑава
@@ -1764,8 +1764,8 @@
доÑÑÑпнÑм Ð´Ð»Ñ Ð¿Ð¾Ð»ÑзоваÑелей пÑогÑаммÑ,
как опиÑано в GPL, и им должно бÑÑÑ
ÑазÑеÑено изменÑÑÑ Ð¸ пеÑеÑаÑпÑоÑÑÑанÑÑÑ
ее, как опиÑано в GPL.</p>
-<p>ÐÑи ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ — ÑÑÐ»Ð¾Ð²Ð¸Ñ Ð²ÐºÐ»ÑÑениÑ
ÑаÑÑей пÑогÑамм под
-GPL,коÑоÑÑе Ð²Ñ Ð¿Ð¾Ð»ÑÑили, в ÑÐ²Ð¾Ñ ÑобÑÑвеннÑÑ
пÑогÑаммÑ.
+<p>ÐÑи ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ — ÑÑÐ»Ð¾Ð²Ð¸Ñ Ð²ÐºÐ»ÑÑениÑ
ÑаÑÑей пÑогÑамм под GPL,
+коÑоÑÑе Ð²Ñ Ð¿Ð¾Ð»ÑÑили, в ÑÐ²Ð¾Ñ ÑобÑÑвеннÑÑ
пÑогÑаммÑ.
</p></dd>
@@ -1792,10 +1792,10 @@
<dt id="Consider">РаÑÑмоÑÑим ÑиÑÑаÑиÑ: 1) X
вÑпÑÑÐºÐ°ÐµÑ Ð²ÐµÑÑÐ¸Ñ V1 пÑоекÑа под GPL. 2) Y вноÑиÑ
-доÑабоÑки в веÑÑÐ¸Ñ V2, коÑоÑÑе вклÑÑаÑÑ
Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸ новÑе ÑекÑÑÑ, оÑнованнÑе
-на V1. 3) X Ñ
оÑÐµÑ Ð²ÑпÑÑкаÑÑ V2 под лиÑензией,
оÑлиÑной Ð¾Ñ GPL. ÐÑжно ли X
-ÑазÑеÑение Y? <span class="anchor-reference-id">(<a href="#Consider"
->#Consider</a>)</span></dt>
+доÑабоÑки в веÑÑÐ¸Ñ V2, коÑоÑÑе вклÑÑаÑÑ
Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸ новÑе ÑекÑÑÑ Ð¿ÑогÑамм,
+оÑнованнÑе на V1. 3) X Ñ
оÑÐµÑ Ð²ÑпÑÑкаÑÑ V2 под
лиÑензией, оÑлиÑной оÑ
+GPL. ÐÑжно ли X ÑазÑеÑение Y? <span
class="anchor-reference-id">(<a
+href="#Consider" >#Consider</a>)</span></dt>
<dd><p>
Ðа. Y бÑл обÑзан вÑпÑÑÑиÑÑ ÑÐ²Ð¾Ñ Ð²ÐµÑÑÐ¸Ñ Ð¿Ð¾Ð´
GNU GPL как ÑледÑÑвие Ñого, ÑÑо
она бÑла оÑнована на веÑÑии V1, полÑÑенной
Ð¾Ñ X. ÐиÑÑо не ÑÑебовало Ð¾Ñ Y
@@ -1832,14 +1832,14 @@
ÑоÑÑÐ¾Ð¸Ñ Ð² ÑÑÑноÑÑи, а ÑаÑÑиÑно — в
ÑоÑме взаимодейÑÑвиÑ. ЧаÑÑÑ,
коÑоÑÐ°Ñ ÐºÐ°ÑаеÑÑÑ ÑÑÑноÑÑи, Ñакова: еÑли
две пÑогÑÐ°Ð¼Ð¼Ñ ÑоÑеÑаÑÑÑÑ Ñак, ÑÑо
ÑакÑиÑеÑки ÑÑановÑÑÑÑ Ð´Ð²ÑÐ¼Ñ ÑаÑÑÑми одной
пÑогÑаммÑ, Ñо Ð²Ñ Ð½Ðµ можеÑе
-ÑаÑÑмаÑÑиваÑÑ Ð¸Ñ
как к оÑделÑнÑм
пÑогÑаммам. Таким обÑазом, GPL должна
+ÑаÑÑмаÑÑиваÑÑ Ð¸Ñ
как ÑазделÑнÑе
пÑогÑаммÑ. Таким обÑазом, GPL должна
ÑаÑпÑоÑÑÑанÑÑÑÑÑ Ð½Ð° вÑе ÑÑо.</p>
<p>ÐÑли две пÑогÑÐ°Ð¼Ð¼Ñ Ð¾ÑÑаÑÑÑÑ ÐºÐ°Ðº ÑледÑеÑ
ÑазделеннÑми, как компилÑÑÐ¾Ñ Ð¸ ÑдÑо
или как ÑедакÑÐ¾Ñ Ð¸ команднÑй
инÑеÑпÑеÑаÑоÑ, Ñо Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе оÑноÑиÑÑÑÑ Ðº
ним
как к двÑм ÑазделÑнÑм пÑогÑаммам — но
Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð´ÐµÐ»Ð°ÑÑ ÑÑо
ÑооÑвеÑÑÑвÑÑÑим обÑазом. ÐдеÑÑ Ð´ÐµÐ»Ð¾
пÑоÑÑо в ÑоÑме: как Ð²Ñ Ð¾Ð¿Ð¸ÑÑваеÑе Ñо,
-ÑÑо Ð²Ñ Ð´ÐµÐ»Ð°ÐµÑе. ÐоÑÐµÐ¼Ñ Ð½Ð°Ñ ÑÑо не
безÑазлиÑно? ÐоÑÐ¾Ð¼Ñ ÑÑо Ð¼Ñ Ñ
оÑим
+ÑÑо Ð²Ñ Ð´ÐµÐ»Ð°ÐµÑе. ÐоÑÐµÐ¼Ñ Ð´Ð»Ñ Ð½Ð°Ñ ÑÑо не
безÑазлиÑно? ÐоÑÐ¾Ð¼Ñ ÑÑо Ð¼Ñ Ñ
оÑим
гаÑанÑиÑоваÑÑ, ÑÑо полÑзоваÑели ÑÑно
оÑознаÑÑ ÑвободнÑй ÑÑаÑÑÑ Ð¿ÑогÑамм под
GPL в ÑбоÑнике.</p>
@@ -1854,13 +1854,13 @@
<dt id="GPLWrapper">Ðне Ñ
оÑелоÑÑ Ð±Ñ Ð²ÐºÐ»ÑÑиÑÑ
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL в ÑÐ²Ð¾Ñ Ð½ÐµÑвободнÑÑ
ÑиÑÑемÑ. ÐогÑ
Ñ ÑÑо ÑделаÑÑ, поÑÑавив
“обеÑÑÑваÑÑий” модÑÐ»Ñ Ð¿Ð¾Ð´
ÑовмеÑÑимой Ñ
GPL неогÑаниÑиÑелÑной лиÑензией (как,
напÑимеÑ, лиÑÐµÐ½Ð·Ð¸Ñ X11) Ð¼ÐµÐ¶Ð´Ñ ÑаÑÑÑÑ,
-ÑаÑпÑоÑÑÑанÑемой по GPL и неÑвободной
ÑаÑÑÑÑ? <span
+ÑаÑпÑоÑÑÑанÑемой по GPL, и неÑвободной
ÑаÑÑÑÑ? <span
class="anchor-reference-id">(<a href="#GPLWrapper"
>#GPLWrapper</a>)</span></dt>
<dd><p>
ÐеÑ. ÐиÑÐµÐ½Ð·Ð¸Ñ X11 ÑовмеÑÑима Ñ GPL, Ñак ÑÑо вÑ
можеÑе добавлÑÑÑ Ð¼Ð¾Ð´ÑÐ»Ñ Ð²
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL и помеÑаÑÑ ÐµÐ³Ð¾ под
лиÑÐµÐ½Ð·Ð¸Ñ X11. Ðо еÑли Ð±Ñ Ð²Ñ ÑобиÑалиÑÑ
вÑÑÑаиваÑÑ Ð¾Ð±Ðµ ÑаÑÑи в более кÑÑпнÑÑ
пÑогÑаммÑ, Ñо вÑе ÑÑо в Ñелом вклÑÑало
-Ð±Ñ ÑаÑÑÑ, ÑаÑпÑоÑÑÑанÑемÑÑ Ð¿Ð¾ GPL, Ñак ÑÑо
его нÑжно бÑло Ð±Ñ Ð»Ð¸ÑензиÑоваÑÑ
+Ð±Ñ ÑаÑÑÑ, ÑаÑпÑоÑÑÑанÑемÑÑ Ð¿Ð¾ GPL, Ñак ÑÑо
ÑÑо нÑжно бÑло Ð±Ñ Ð»Ð¸ÑензиÑоваÑÑ
<em>в Ñелом</em> по GNU GPL.</p>
<p>Ð¢Ð¾Ñ ÑакÑ, ÑÑо неÑвободнÑй модÑÐ»Ñ Ð
ÑоединÑеÑÑÑ Ñ Ð¼Ð¾Ð´Ñлем Ð, ÑаÑпÑоÑÑÑанÑемÑм
@@ -1880,14 +1880,14 @@
ÑÑловиÑÑ
, неÑмоÑÑÑ Ð½Ð° Ñо, ÑÑо ÑаÑÑи ÑÑиÑ
библиоÑек вклÑÑаÑÑÑÑ Ð² иÑполнÑемÑй
Ñайл в пÑоÑеÑÑе компилÑÑии. ÐодÑобнее
можно пÑоÑеÑÑÑ Ð² <a
href="/licenses/gcc-exception-faq.html">оÑделÑной ÑÑаÑÑе об
иÑклÑÑении длÑ
-библиоÑек вÑемени иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ GCC</a></p></dd>
+библиоÑек вÑемени иÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ GCC</a>.</p></dd>
<dt id="MoneyGuzzlerInc">Ðне Ñ
оÑелоÑÑ Ð±Ñ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL и ÑвÑзаÑÑ Ð¸Ñ
Ñ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñеками
пеÑеноÑимоÑÑи ÐÐÐ “ÐаÑмоед”. Я не
Ð¼Ð¾Ð³Ñ ÑаÑпÑоÑÑÑанÑÑÑ Ð¸ÑÑ
однÑй
-ÑекÑÑ ÑÑиÑ
библиоÑек, Ñак ÑÑо каждомÑ
полÑзоваÑелÑ, коÑоÑÑй Ñ
оÑел бÑ
+ÑекÑÑ ÑÑиÑ
библиоÑек, Ñак ÑÑо каждомÑ
полÑзоваÑелÑ, коÑоÑÑй Ñ
оÑел бÑ
измениÑÑ ÑÑи веÑÑии, пÑиÑлоÑÑ Ð±Ñ Ð¿Ð¾Ð»ÑÑиÑÑ
ÑÑи библиоÑеки оÑделÑно. ÐоÑемÑ
-GPL не допÑÑÐºÐ°ÐµÑ ÑÑого?<span class="anchor-reference-id">(<a
+GPL не допÑÑÐºÐ°ÐµÑ ÑÑого? <span class="anchor-reference-id">(<a
href="#MoneyGuzzlerInc" >#MoneyGuzzlerInc</a>)</span></dt>
<dd><p>
Ðа ÑÑо еÑÑÑ Ð´Ð²Ðµ пÑиÑинÑ. Ðо-пеÑвÑÑ
, обÑаÑ.
ÐÑли Ð±Ñ Ð¼Ñ ÑазÑеÑили компании Ð
@@ -1907,8 +1907,8 @@
<dt id="GPLIncompatibleAlone">ÐÑли в лиÑензии Ð´Ð»Ñ Ð¼Ð¾Ð´ÑлÑ
РеÑÑÑ ÑÑебование, неÑовмеÑÑимое Ñ GPL, но
-ÑÑебование дейÑÑвÑÐµÑ ÑолÑко когда Ð
ÑаÑпÑоÑÑÑанÑеÑÑÑ Ñам по Ñебе, а не когда
-он вклÑÑаеÑÑÑ Ð² более кÑÑпнÑÑ Ð¿ÑогÑаммÑ,
Ð´ÐµÐ»Ð°ÐµÑ Ð»Ð¸ ÑÑо лиÑензиÑ
+ÑÑебование дейÑÑвÑеÑ, ÑолÑко когда Ð
ÑаÑпÑоÑÑÑанÑеÑÑÑ Ñам по Ñебе, а не
+когда он вклÑÑаеÑÑÑ Ð² более кÑÑпнÑÑ
пÑогÑаммÑ, Ð´ÐµÐ»Ð°ÐµÑ Ð»Ð¸ ÑÑо лиÑензиÑ
неÑовмеÑÑимой Ñ GPL? ÐÐ¾Ð³Ñ Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð¸ÑоваÑÑ
или ÑвÑзÑваÑÑ Ð Ñ Ð¿ÑогÑаммой под
GPL? <span class="anchor-reference-id">(<a href="#GPLIncompatibleAlone"
>#GPLIncompatibleAlone</a>)</span></dt>
@@ -1931,7 +1931,7 @@
ÑвÑзÑваÑÑ Ð¸Ð»Ð¸ комбиниÑоваÑÑ Ð Ñ Ð.</p></dd>
-<dt id="ModifiedJustBinary">ÐÐ¾Ð³Ñ Ñ Ð²ÑпÑÑÑиÑÑ
измененнÑÑ Ð²ÐµÑÑÐ¸Ñ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾ GPL ÑолÑко в
двоиÑном виде?
+<dt id="ModifiedJustBinary">ÐÐ¾Ð³Ñ Ñ Ð²ÑпÑÑÑиÑÑ
измененнÑÑ Ð²ÐµÑÑÐ¸Ñ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL ÑолÑко в
двоиÑном виде?
<span class="anchor-reference-id">(<a href="#ModifiedJustBinary"
>#ModifiedJustBinary</a>)</span></dt>
<dd><p>
@@ -2031,7 +2031,7 @@
<dt id="AnonFTPAndSendSources">ÐÐ¾Ð³Ñ Ñ Ð¿ÑедоÑÑавлÑÑÑ
доÑÑÑп к двоиÑнÑм Ñайлам на ÑеÑвеÑе в ÑеÑи,
но вÑÑÑлаÑÑ
-иÑÑ
однÑе ÑекÑÑÑ ÑолÑко Ñем, кÑо Ð·Ð°ÐºÐ°Ð¶ÐµÑ Ð¸Ñ
?
<span
+иÑÑ
однÑе ÑекÑÑÑ ÑолÑко Ñем, кÑо иÑ
закажеÑ?
<span
class="anchor-reference-id">(<a href="#AnonFTPAndSendSources"
>#AnonFTPAndSendSources</a>)</span></dt>
<dd><p>
@@ -2055,9 +2055,9 @@
>#HowCanIMakeSureEachDownloadGetsSource</a>)</span></dt>
<dd><p>
ÐÑ Ð½Ðµ обÑÐ·Ð°Ð½Ñ ÑÑого гаÑанÑиÑоваÑÑ. Ðак
ÑолÑко Ð²Ñ Ð¿ÑедоÑÑавили доÑÑÑп к
-иÑÑ
Ð¾Ð´Ð½Ð¾Ð¼Ñ ÑекÑÑÑ Ð¸ двоиÑнÑм Ñайлам Ñак,
ÑÑо полÑзоваÑели видÑÑ, ÑÑо доÑÑÑпно
-и беÑÑÑ Ñо, ÑÑо им нÑжно, Ð²Ñ Ñделали вÑе, ÑÑо
Ð¾Ñ Ð²Ð°Ñ ÑÑебÑеÑÑÑ. ÐÑаÑÑ Ð»Ð¸ Ñ
-Ð²Ð°Ñ Ð»Ð¸ иÑÑ
однÑй ÑекÑÑ — дело
полÑзоваÑелÑ.</p>
+иÑÑ
Ð¾Ð´Ð½Ð¾Ð¼Ñ ÑекÑÑÑ Ð¸ двоиÑнÑм Ñайлам Ñак,
ÑÑо полÑзоваÑели видÑÑ, ÑÑо
+доÑÑÑпно, и беÑÑÑ Ñо, ÑÑо им нÑжно, вÑ
Ñделали вÑе, ÑÑо Ð¾Ñ Ð²Ð°Ñ
+ÑÑебÑеÑÑÑ. ÐÑаÑÑ Ð»Ð¸ Ñ Ð²Ð°Ñ Ð¸ÑÑ
однÑй
ÑекÑÑ — дело полÑзоваÑелÑ.</p>
<p>ÐаÑи ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ðº ÑаÑпÑоÑÑÑаниÑелÑм
ÑоÑÑÐ°Ð²Ð»ÐµÐ½Ñ Ð´Ð»Ñ Ñого, ÑÑобÑ
гаÑанÑиÑоваÑÑ, ÑÑо полÑзоваÑели могÑÑ
полÑÑиÑÑ Ð¸ÑÑ
однÑй ÑекÑÑ, а не длÑ
@@ -2100,7 +2100,7 @@
<dt id="StolenCopy">ÐÑли кÑо-нибÑÐ´Ñ ÑкÑадеÑ
компакÑ-диÑк Ñ Ð²ÐµÑÑией пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL,
Ð´Ð°ÐµÑ Ð»Ð¸
-GPL ÐµÐ¼Ñ Ð¿Ñаво пеÑеÑаÑпÑоÑÑÑанÑÑÑ ÑÑÑ
веÑÑиÑ? <span
+GPL ÐµÐ¼Ñ Ð¿Ñаво ÑаÑпÑоÑÑÑанÑÑÑ ÑÑÑ Ð²ÐµÑÑиÑ
далÑÑе? <span
class="anchor-reference-id">(<a href="#StolenCopy"
>#StolenCopy</a>)</span></dt>
<dd><p>
ÐÑли ÑÑа веÑÑÐ¸Ñ Ð±Ñла вÑпÑÑена где-Ñо еÑе,
Ñо пÑаво делаÑÑ Ð¸
@@ -2112,7 +2112,7 @@
Ñвоей коммеÑÑеÑкой Ñайной, Ñо пÑбликаÑиÑ
Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð½Ð°ÑÑÑением закона о
коммеÑÑеÑкой Ñайне, в завиÑимоÑÑи оÑ
дÑÑгиÑ
обÑÑоÑÑелÑÑÑв. GPL ÑÑого не
оÑменÑеÑ. ÐÑли Ð±Ñ Ð¿ÑедпÑиÑÑие пÑÑалоÑÑ
вÑпÑÑÑиÑÑ ÑÐ²Ð¾Ñ Ð²ÐµÑÑÐ¸Ñ Ð¸ Ñем не менее
-оÑноÑиÑÑÑ Ðº ней как к коммеÑÑеÑкой Ñайне,
Ñо ÑÑо бÑло Ð±Ñ Ð½Ð°ÑÑÑением GPL, но
+оÑноÑиÑÑÑÑ Ðº ней как к коммеÑÑеÑкой Ñайне,
Ñо ÑÑо бÑло Ð±Ñ Ð½Ð°ÑÑÑением GPL, но
еÑли пÑедпÑиÑÑие ÑÑÑ Ð²ÐµÑÑÐ¸Ñ Ð½Ðµ вÑпÑÑÑило,
Ñо Ñакого наÑÑÑÐµÐ½Ð¸Ñ Ð½Ðµ бÑло.</p></dd>
@@ -2154,7 +2154,7 @@
обÑÑÑнение</a> Ñого, как Ð¼Ñ Ð¿Ñинимаем
ÑеÑение по ÑÑÐ¾Ð¼Ñ Ð²Ð¾Ð¿ÑоÑÑ.</p></dd>
-<dt id="WillYouMakeAnException">ÐÑименение опÑеделенное
пÑогÑÐ°Ð¼Ð¼Ñ GNU под GPL не ÑкладÑваеÑÑÑ Ð² наÑ
пÑоекÑ
+<dt id="WillYouMakeAnException">ÐÑименение опÑеделенной
пÑогÑÐ°Ð¼Ð¼Ñ GNU под GPL не ÑкладÑваеÑÑÑ Ð² наÑ
пÑоекÑ
по ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½ÐµÑвободнÑÑ
пÑогÑамм. Ðе
ÑделаеÑе ли Ð²Ñ Ð´Ð»Ñ Ð½Ð°Ñ Ð¸ÑклÑÑениÑ? ÐÑо
ознаÑало Ð²Ñ Ð±Ð¾Ð»ÑÑее ÑиÑло полÑзоваÑелей
ÑÑой пÑогÑаммÑ. <span
class="anchor-reference-id">(<a href="#WillYouMakeAnException"
@@ -2226,10 +2226,10 @@
href="#OnlyLatestVersion" >#OnlyLatestVersion</a>)</span></dt>
<dd><p>
ÐÑиÑина, по коÑоÑой Ð²Ñ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð´ÐµÐ»Ð°ÑÑ
ÑÑого, ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом, ÑÑо ÑÑо можеÑ
-пÑивеÑÑи к авÑомаÑиÑеÑÐºÐ¾Ð¼Ñ Ð¿ÑекÑаÑениÑ
некоÑоÑÑÑ
ÑазÑеÑений, коÑоÑÑе Ñанее
-бÑли Ñ Ð¿Ð¾Ð»ÑзоваÑелей.</p>
+пÑивеÑÑи к авÑомаÑиÑеÑÐºÐ¾Ð¼Ñ Ð¿ÑекÑаÑениÑ
дейÑÑÐ²Ð¸Ñ Ð½ÐµÐºÐ¾ÑоÑÑÑ
ÑазÑеÑений,
+коÑоÑÑе Ñанее бÑли Ñ Ð¿Ð¾Ð»ÑзоваÑелей.</p>
-<p>ÐÑедположим, в 2000 Ð³Ð¾Ð´Ñ Ð¿ÑогÑамма бÑла
вÑпÑÑена под “Ñамой
+<p>ÐÑедположим, в 2000 Ð³Ð¾Ð´Ñ Ð¿ÑогÑамма бÑла
вÑпÑÑена по “Ñамой
поздней веÑÑии GPL”. Ð Ñо вÑÐµÐ¼Ñ Ð»Ñди,
возможно, иÑполÑзовали ее по
GPLv2. Ð ÑÐ¾Ñ Ð´ÐµÐ½Ñ 2007 года, когда мÑ
опÑбликовали GPLv3, вÑеÑ
вÑнÑдили
Ð±Ñ Ð²Ð´ÑÑг иÑполÑзоваÑÑ ÐµÐµ вмеÑÑо ÑÑого по
GPLv3.</p>
@@ -2240,9 +2240,9 @@
оÑноÑиÑÑÑÑ Ðº лÑдÑм нелÑзÑ.</p>
<p>ÐÑ Ð´Ñмаем, ÑÑо забиÑаÑÑ Ð½Ð°Ð·Ð°Ð´ Ñже
пÑедоÑÑавленнÑе ÑазÑеÑÐµÐ½Ð¸Ñ Ð½ÐµÐ»ÑзÑ, еÑли
-ÑолÑко Ð½ÐµÑ Ð½Ð°ÑÑÑений. ÐÑли Ð±Ñ Ð²Ð°ÑÑ ÑвободÑ
можно бÑло оÑозваÑÑ, Ñо ÑÑо на
+ÑолÑко Ð½ÐµÑ Ð½Ð°ÑÑÑений. ÐÑли ваÑÑ ÑвободÑ
можно бÑло Ð±Ñ Ð¾ÑозваÑÑ, Ñо ÑÑо на
Ñамом деле не Ñвобода. ÐÑак, еÑли вÑ
полÑÑаеÑе ÐºÐ¾Ð¿Ð¸Ñ ÐºÐ°ÐºÐ¾Ð¹-Ñо веÑÑии
-пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾ одной из веÑÑий лиÑензии, вам
<em>вÑегда</em> должно бÑÑÑ
+пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾ одной из веÑÑий лиÑензии, вам
<em>вÑегда</em> Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ
пÑедоÑÑÐ°Ð²Ð»ÐµÐ½Ñ Ð¿Ñава, пÑедоÑÑавлÑемÑе ÑÑой
веÑÑией лиÑензии. ÐÑпÑÑк по
“веÑÑии N GPL или лÑбой более поздней
веÑÑии” ÑоблÑдаеÑ
ÑÑÐ¾Ñ Ð¿ÑинÑип.</p></dd>
@@ -2335,7 +2335,7 @@
<p>ÐÐ¾Ñ Ð¸ÑклÑÑение Ð´Ð»Ñ Ð¿ÑогÑамм на JavaScript,
коÑоÑое ÑÑо делаеÑ:</p>
<blockquote><p>Ðак оÑобое иÑклÑÑение из GPL, лÑбой
Ñайл HTML, коÑоÑÑй пÑоÑÑо вÑзÑваеÑ
-ÑÑнкÑии из ÑÑой пÑогÑÐ°Ð¼Ð¼Ñ Ð¸ вклÑÑÐ°ÐµÑ ÐµÐ³Ð¾ в
ÑÑиÑ
ÑелÑÑ
поÑÑедÑÑвом ÑÑÑлки,
+ÑÑнкÑии из ÑÑой пÑогÑÐ°Ð¼Ð¼Ñ Ð¸ вклÑÑÐ°ÐµÑ ÐµÐµ в
ÑÑиÑ
ÑелÑÑ
поÑÑедÑÑвом ÑÑÑлки,
должен ÑÑиÑаÑÑÑÑ Ð¾ÑделÑной ÑабоÑой Ñ
ÑоÑки зÑÐµÐ½Ð¸Ñ Ð°Ð²ÑоÑÑкого пÑава. Ð
дополнение, пÑавообладаÑели ÑÑой
пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð°ÑÑ Ð²Ð°Ð¼ ÑазÑеÑение
комбиниÑоваÑÑ
ÑекÑÑÑ ÑÑой пÑогÑÐ°Ð¼Ð¼Ñ Ñо ÑвободнÑми
библиоÑеками, вÑпÑÑкаемÑми под GNU
@@ -2381,7 +2381,7 @@
<p>ÐÑли Ð±Ñ Ð¼Ñ ÑобиÑалиÑÑ Ð¾Ð´Ð¾Ð±ÑиÑÑ
(оÑиÑиалÑно) пеÑевод GPL, нам пÑиÑлоÑÑ Ð±Ñ
пÑедоÑÑавиÑÑ Ð²Ñем ÑазÑеÑение на вÑе Ñо,
ÑÑо им ÑазÑеÑено в пеÑеводе. ÐÑли
пеÑевод полноÑÑÑÑ ÑоÑен, ÑÑо не ÑÑÑаÑно. Ðо
еÑли в пеÑеводе еÑÑÑ Ð¾Ñибка,
-ÑезÑлÑÑаÑÑ Ð¼Ð¾Ð³Ð»Ð¸ Ð±Ñ Ð¿ÑивеÑÑи к каÑаÑÑÑоÑе,
ÑезÑлÑÑаÑÑ ÐºÐ¾ÑоÑой Ð¼Ñ Ð½Ðµ Ñмогли
+ÑезÑлÑÑаÑÑ Ð¼Ð¾Ð³Ð»Ð¸ Ð±Ñ Ð¿ÑивеÑÑи к каÑаÑÑÑоÑе,
поÑледÑÑвий коÑоÑой Ð¼Ñ Ð½Ðµ Ñмогли
Ð±Ñ Ð¸ÑпÑавиÑÑ.</p>
<p>ÐÑли в пÑогÑамме еÑÑÑ Ð¾Ñибка, Ð¼Ñ Ð¼Ð¾Ð¶ÐµÐ¼
вÑпÑÑÑиÑÑ Ð½Ð¾Ð²ÑÑ Ð²ÐµÑÑиÑ, и
@@ -2443,26 +2443,26 @@
GPL не огÑаниÑÐ¸Ð²Ð°ÐµÑ Ñого, какими ÑÑедÑÑвами
Ð²Ñ Ð¾Ð±ÑабаÑÑваеÑе пÑогÑаммÑ.</p>
<p>Ðднако когда инÑеÑпÑеÑаÑÐ¾Ñ ÑаÑÑиÑÑеÑÑÑ,
ÑÑÐ¾Ð±Ñ Ð¿ÑедоÑÑавиÑÑ
-“пÑивÑзки” к дÑÑгим ÑлÑжбам (ÑаÑÑо,
но не обÑзаÑелÑно, ÑÑо
+“пÑивÑзки” к дÑÑгим ÑÑедÑÑвам (ÑаÑÑо,
но не обÑзаÑелÑно, ÑÑо
библиоÑеки), Ñо инÑеÑпÑеÑиÑÑемаÑ
пÑогÑамма ÑакÑиÑеÑки ÑвÑзÑваеÑÑÑ Ñо
-ÑлÑжбами, коÑоÑÑми она полÑзÑеÑÑÑ Ñ
помоÑÑÑ ÑÑиÑ
пÑивÑзок. JNI (Java Native
-Interface) — пÑÐ¸Ð¼ÐµÑ Ñакой ÑлÑжбÑ;
библиоÑеки, доÑÑÑп к коÑоÑÑм
-оÑÑÑеÑÑвлÑеÑÑÑ Ñаким обÑазом, динамиÑеÑки
ÑвÑзÑваÑÑÑÑ Ñ Ð¿ÑогÑаммами на Java,
-коÑоÑÑе вÑзÑваÑÑ Ð¸Ñ
пÑоÑедÑÑÑ.</p>
-
-<p>ÐÑак, еÑли ÑÑи ÑлÑÐ¶Ð±Ñ Ð²ÑпÑÑкаÑÑÑÑ Ð¿Ð¾
неÑовмеÑÑимой Ñ GPL лиÑензии, ÑиÑÑаÑиÑ
-подобна ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð»ÑбÑм дÑÑгим ÑпоÑобом
Ñ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñекой, неÑовмеÑÑимой Ñ
-GPL. ÐÑо подÑазÑмеваеÑ, ÑÑо:</p>
+ÑÑедÑÑвами, коÑоÑÑми она полÑзÑеÑÑÑ Ñ
помоÑÑÑ ÑÑиÑ
пÑивÑзок. JNI (Java
+Native Interface) — пÑÐ¸Ð¼ÐµÑ Ñакого ÑÑедÑÑва;
библиоÑеки, доÑÑÑп к
+коÑоÑÑм оÑÑÑеÑÑвлÑеÑÑÑ Ñаким обÑазом,
динамиÑеÑки ÑвÑзÑваÑÑÑÑ Ñ Ð¿ÑогÑаммами
+на Java, коÑоÑÑе вÑзÑваÑÑ Ð¸Ñ
пÑоÑедÑÑÑ.</p>
+
+<p>ÐÑак, еÑли ÑÑи ÑÑедÑÑва вÑпÑÑкаÑÑÑÑ Ð¿Ð¾
неÑовмеÑÑимой Ñ GPL лиÑензии,
+ÑиÑÑаÑÐ¸Ñ Ð¿Ð¾Ð´Ð¾Ð±Ð½Ð° ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð»ÑбÑм дÑÑгим
ÑпоÑобом Ñ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñекой,
+неÑовмеÑÑимой Ñ GPL. ÐÑо подÑазÑмеваеÑ,
ÑÑо:</p>
<ol>
<li>ÐÑли Ð²Ñ Ð¿Ð¸ÑеÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð¸ вÑпÑÑкаеÑе
ее под GPL, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе ÑÑоÑмÑлиÑоваÑÑ
Ñвное иÑклÑÑение, даÑÑее ÑазÑеÑение
ÑоединÑÑÑ ÐµÐµ Ñ ÑÑими неÑовмеÑÑимÑми Ñ
-GPL ÑлÑжбами.</li>
+GPL ÑÑедÑÑвами.</li>
<li>ÐÑли Ð²Ñ Ð½Ð°Ð¿Ð¸Ñали и вÑпÑÑÑили пÑогÑаммÑ
по GPL, и Ð²Ñ ÑоÑÑавили ее ÑпеÑиалÑно
-Ð´Ð»Ñ ÑабоÑÑ Ñ ÑÑими ÑлÑжбами, лÑди могÑÑ
пÑинÑÑÑ ÑÑо как неÑвное иÑклÑÑение,
-ÑазÑеÑаÑÑее им ÑвÑзÑваÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ñ
ÑÑими ÑлÑжбами. Ðо еÑли ваÑе намеÑение
-Ñаково, лÑÑÑе вÑÑазиÑÑ ÑÑо Ñвно.</li>
+Ð´Ð»Ñ ÑабоÑÑ Ñ ÑÑими ÑÑедÑÑвами, лÑди могÑÑ
пÑинÑÑÑ ÑÑо как неÑвное
+иÑклÑÑение, ÑазÑеÑаÑÑее им ÑвÑзÑваÑÑ
пÑогÑÐ°Ð¼Ð¼Ñ Ñ ÑÑими ÑÑедÑÑвами. Ðо еÑли
+ваÑе намеÑение Ñаково, лÑÑÑе вÑÑазиÑÑ ÑÑо
Ñвно.</li>
<li>ÐÑ Ð½Ðµ можеÑе ни взÑÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ ÐºÐ¾Ð³Ð¾-Ñо
дÑÑгого, вÑпÑÑеннÑе под GPL, ни
добавлÑÑÑ Ðº ним Ñакие иÑклÑÑениÑ.
ÐÑклÑÑение могÑÑ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ ÑолÑко
@@ -2484,7 +2484,7 @@
<dt id="OOPLang">ÐÑли в Ñаком
обÑекÑно-оÑиенÑиÑованном ÑзÑке, как Java, Ñ
иÑполÑзÑÑ ÐºÐ»Ð°ÑÑ Ð¿Ð¾Ð´
-GPL без изменений, и обÑазÑÑ Ð¸Ð· него
подклаÑÑ, каким обÑазом GPL влиÑÐµÑ Ð½Ð°
+GPL без изменений и обÑазÑÑ Ð¸Ð· него
подклаÑÑ, каким обÑазом GPL влиÑÐµÑ Ð½Ð°
более кÑÑпнÑÑ Ð¿ÑогÑаммÑ? <span
class="anchor-reference-id">(<a
href="#OOPLang" >#OOPLang</a>)</span></dt>
<dd><p>
@@ -2505,7 +2505,7 @@
иÑполÑзÑÑÑ Ð»Ð¸Ð±Ð¾ <a href="/licenses/lgpl.html">ÐенÑÑÑÑ
GPL</a>, либо GNU GPL
Ñ Ð¸ÑклÑÑением, ÑазÑеÑаÑÑим Ñоединение
библиоÑеки Ñ Ñем Ñгодно. ÐÑи
библиоÑеки можно пÑименÑÑÑ Ð² неÑвободнÑÑ
пÑогÑаммаÑ
; но в ÑлÑÑае Ñ ÐенÑÑей
-GPL в лиÑензии некоÑоÑÑе ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ ÐµÑÑÑ, и
Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¸Ð¼ ÑледоваÑÑ.</p>
+GPL некоÑоÑÑе ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² лиÑензии еÑÑÑ, и
Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¸Ð¼ ÑледоваÑÑ.</p>
<p>ÐекоÑоÑÑе библиоÑеки вÑпÑÑкаÑÑÑÑ ÑолÑко
по GNU GPL; Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¿Ð¾Ð»ÑзоваÑÑÑÑ
лиÑензией, ÑовмеÑÑимой Ñ GPL, ÑÑобÑ
пÑименÑÑÑ ÑÑи библиоÑеки. Ðо ÑÑо, как
@@ -2520,7 +2520,7 @@
поÑеÑÑÑÑ ÑÐ²Ð¾Ñ ÑвободÑ.</p>
<p>ÐÑли Ð²Ñ Ð½Ð°Ð´ÐµÐµÑеÑÑ ÐºÐ¾Ð³Ð´Ð°-нибÑдÑ
оглÑнÑÑÑÑÑ Ð½Ð° Ñвой жизненнÑй пÑÑÑ Ð¸
-поÑÑвÑÑвоваÑÑ, ÑÑо Ð²Ñ Ñделали вклад в
ÑазвиÑие добÑого и Ñвободного
+поÑÑвÑÑвоваÑÑ, ÑÑо Ð²Ñ Ñделали вклад в
ÑазвиÑие поÑÑдоÑного и Ñвободного
обÑеÑÑва, Ñо Ñвои пÑогÑÐ°Ð¼Ð¼Ñ Ð²Ð°Ð¼ нÑжно
делаÑÑ ÑвободнÑми.</p></dd>
@@ -2625,7 +2625,7 @@
оÑвеÑÑÑвенноÑÑи, еÑли они ÑознаÑелÑно
ÑкÑпоÑÑиÑÑÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð² опÑеделеннÑе
ÑÑÑÐ°Ð½Ñ Ð¸Ð»Ð¸ еÑли они пеÑедаÑÑ Ð¿ÑогÑаммÑ
дÑÑгой ÑÑоÑоне, знаÑ, ÑÑо Ñа бÑдеÑ
занимаÑÑÑÑ Ñаким ÑкÑпоÑÑом. ÐапÑаÑиваÑ
Ñакие заÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ ÑвоиÑ
клиенÑов и
-вÑеÑ
ÑеÑ
, ÐºÐ¾Ð¼Ñ Ð¾Ð½Ð¸ поÑÑавлÑÑÑ Ð¿ÑогÑаммÑ,
они заÑиÑаÑÑÑÑ Ð½Ð° ÑлÑÑай, еÑли иÑ
+вÑеÑ
ÑеÑ
, ÐºÐ¾Ð¼Ñ Ð¾Ð½Ð¸ поÑÑавлÑÑÑ Ð¿ÑогÑаммÑ,
они заÑиÑаÑÑÑÑ Ð½Ð° ÑлÑÑай, еÑли
впоÑледÑÑвии конÑÑолиÑÑÑÑие оÑганÑ
ÑпÑоÑÑÑ Ð¸Ñ
, ÑÑо они знали о Ñом, кÑда в
конеÑном ÑÑеÑе попадÑÑ Ð¿ÑогÑаммÑ, коÑоÑÑе
они ÑаÑпÑоÑÑÑанÑÑÑ. Ðни не
огÑаниÑиваÑÑ Ñого, ÑÑо Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе делаÑÑ Ñ
пÑогÑаммами, а ÑолÑко ÑнимаÑÑ Ñ
@@ -2635,7 +2635,7 @@
<p>ФСÐРвÑÑÑÑÐ¿Ð°ÐµÑ Ð¿ÑоÑив пÑименениÑ
законов СШРо конÑÑоле ÑкÑпоÑÑа к ÑвободнÑм
пÑогÑаммам. Такие Ð·Ð°ÐºÐ¾Ð½Ñ Ð½Ðµ ÑолÑко
неÑовмеÑÑÐ¸Ð¼Ñ Ñ Ð¾Ð±Ñей ÑелÑÑ ÑвободÑ
-пÑогÑаммного обеÑпеÑÐµÐ½Ð¸Ñ — не ÑлÑжаÑ
никаким ÑазÑмнÑм
+пÑогÑаммного обеÑпеÑÐµÐ½Ð¸Ñ — они не
ÑлÑÐ¶Ð°Ñ Ð½Ð¸ÐºÐ°ÐºÐ¸Ð¼ ÑазÑмнÑм
гоÑÑдаÑÑÑвеннÑм инÑеÑеÑам, поÑÐ¾Ð¼Ñ ÑÑо
ÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð² наÑÑоÑÑее вÑемÑ
доÑÑÑÐ¿Ð½Ñ Ð¸ вÑегда Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð´Ð¾ÑÑÑÐ¿Ð½Ñ Ð¿Ð¾
ÑазнÑм каналам поÑÑи в каждой
ÑÑÑане, вклÑÑÐ°Ñ ÑÑÑанÑ, в коÑоÑÑÑ
неÑ
законов о конÑÑоле ÑкÑпоÑÑа и коÑоÑÑе
@@ -2671,7 +2671,7 @@
поÑколÑÐºÑ LGPLv3 ÑепеÑÑ ÑоÑÑавлена как набоÑ
дополниÑелÑнÑÑ
ÑазÑеÑений по
оÑноÑÐµÐ½Ð¸Ñ Ðº GPLv3.</p>
-<p>Ðо-вÑоÑÑÑ
, замениÑе вÑе Ñвои ÑÑÑеÑÑвÑÑÑиÑ
замеÑÐ°Ð½Ð¸Ñ Ð¾ веÑÑии 2 лиÑензии
+<p>Ðо-вÑоÑÑÑ
, замениÑе вÑе Ñвои
ÑÑÑеÑÑвÑÑÑие замеÑÐ°Ð½Ð¸Ñ Ð¾ веÑÑии 2
лиÑензии
(обÑÑно — в наÑале каждого Ñайла) на
новÑй ÑекомендованнÑй ÑекÑÑ,
доÑÑÑпнÑй в <a
href="/licenses/gpl-howto.html">ÑÑководÑÑве по лиÑензиÑм
GNU</a>. Ðно менее подвеÑжено бÑдÑÑим
изменениÑм, поÑколÑÐºÑ Ð½Ðµ ÑодеÑжиÑ
@@ -2725,7 +2725,7 @@
вам ÑведениÑ, необÑ
одимÑе Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ
ÑÑиÑ
пÑогÑамм. “ÐолÑзоваÑелÑÑкий
пÑодÑкѓ — ÑÑо ÑеÑмин,
ÑпеÑиалÑно опÑеделÑемÑй в лиÑензии;
пÑимеÑом “полÑзоваÑелÑÑкиÑ
-пÑодÑкÑов” могÑÑ ÑлÑжиÑÑ Ð¿ÐµÑеноÑимÑе
пÑоигÑÑваÑели мÑзÑки, ÑиÑÑовÑе
+пÑодÑкÑов” могÑÑ ÑлÑжиÑÑ Ð¿Ð¾ÑÑаÑивнÑе
пÑоигÑÑваÑели мÑзÑки, ÑиÑÑовÑе
ÑÑÑÑойÑÑва видеозапиÑи, а Ñакже домаÑние
ÑиÑÑÐµÐ¼Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑÑи.</p></dd>
@@ -2739,8 +2739,7 @@
ÑÑиÑаÑÑÑÑ ÑеÑ
ниÑеÑким ÑÑедÑÑвом
“заÑиÑÑ” авÑоÑÑкиÑ
пÑав. ÐÑо
знаÑиÑ, ÑÑо еÑли кÑо-Ñо Ð²Ð·Ð»Ð¾Ð¼Ð°ÐµÑ ÑиÑÑовое
ÑпÑавление огÑаниÑениÑми, Ñо он
Ñоже бÑÐ´ÐµÑ Ð²Ð¿Ñаве ÑаÑпÑоÑÑÑанÑÑÑ Ñвои
пÑогÑÐ°Ð¼Ð¼Ñ Ð±ÐµÐ· пÑепÑÑÑÑвий Ñо ÑÑоÑонÑ
-“ÐкÑа об авÑоÑÑкиÑ
пÑаваÑ
ÑиÑÑового
ÑÑÑÑÑелеÑиє и ÑÐ¾Ð¼Ñ Ð¿Ð¾Ð´Ð¾Ð±Ð½ÑÑ
-законов.</p>
+ÐкÑа об авÑоÑÑком пÑаве ÑиÑÑового
ÑÑÑÑÑелеÑÐ¸Ñ Ð¸ ÑÐ¾Ð¼Ñ Ð¿Ð¾Ð´Ð¾Ð±Ð½ÑÑ
законов.</p>
<p>Ðак обÑÑно, GNU GPL не огÑаниÑÐ¸Ð²Ð°ÐµÑ Ñого, ÑÑо
лÑди менÑÑÑ Ð² пÑогÑаммаÑ
;
лиÑÐµÐ½Ð·Ð¸Ñ Ð¿ÑоÑÑо не Ð´Ð°ÐµÑ Ð¸Ð¼ огÑаниÑиваÑÑ
дÑÑгиÑ
.</p></dd>
@@ -2767,7 +2766,7 @@
class="anchor-reference-id">(<a href="#GiveUpKeys"
>#GiveUpKeys</a>)</span></dt>
<dd><p>
ÐеÑ. ÐдинÑÑвеннÑй ÑлÑÑай, когда Ð¾Ñ Ð²Ð°Ñ
ÑÑебÑеÑÑÑ Ð¿ÐµÑедаваÑÑ ÐºÐ»ÑÑи длÑ
-подпиÑей — когда Ð²Ñ Ð¿Ð¾ÑÑавлÑеÑе
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL в ÑоÑÑаве
+подпиÑей — ÑÑо когда Ð²Ñ Ð¿Ð¾ÑÑавлÑеÑе
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL в ÑоÑÑаве
“полÑзоваÑелÑÑкого пÑодÑкÑа” и его
аппаÑаÑÑÑа не наÑинаеÑ
ÑабоÑаÑÑ, пока не пÑÐ¾Ð¹Ð´ÐµÑ Ð¿ÑовеÑка
кÑипÑогÑаÑиÑеÑкой подпиÑи. Ð ÑÑом оÑобом
ÑлÑÑае Ð¾Ñ Ð²Ð°Ñ ÑÑебÑеÑÑÑ Ð¿ÑедоÑÑавлÑÑÑ
вÑем, кÑо Ð²Ð»Ð°Ð´ÐµÐµÑ ÑÑÑÑойÑÑвом, по иÑ
@@ -2784,7 +2783,7 @@
<dd><p>
ÐеÑ. ÐÑ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ð¹, ÑаÑпÑоÑÑÑанÑÑÑиÑ
ÑÑÑÑойÑÑва, в коÑоÑÑÑ
наÑ
одÑÑÑÑ Ð¿ÑогÑаммÑ
под GPLv3, ÑÑебÑеÑÑÑ Ð½Ðµ более, Ñем
пÑедоÑÑавление иÑÑ
одного ÑекÑÑа и
-Ñведений об ÑÑÑановке Ñем лÑдÑм, кÑо
Ð²Ð»Ð°Ð´ÐµÐµÑ Ð¾ÑÑÑанÑлиÑованной
+Ñведений об ÑÑÑановке Ñем лÑдÑм, кÑо
Ð²Ð»Ð°Ð´ÐµÐµÑ ÐºÐ¾Ð¿Ð¸ÐµÐ¹ оÑÑÑанÑлиÑованной
пÑогÑаммÑ. ÐзбиÑаÑели, полÑзÑÑÑиеÑÑ
ÑÑÑÑойÑÑвом Ð´Ð»Ñ Ð³Ð¾Ð»Ð¾ÑÐ¾Ð²Ð°Ð½Ð¸Ñ (как лÑбÑм
дÑÑгим пÑблиÑнÑм ÑеÑминалом) не полÑÑаÑÑ
его во владение, даже вÑеменно, Ñак
ÑÑо избиÑаÑÐµÐ»Ñ Ñакже не полÑÑÐ°ÐµÑ Ð²Ð¾
владение пÑогÑÐ°Ð¼Ð¼Ñ Ð² двоиÑном виде,
@@ -2826,7 +2825,7 @@
<dd><p>
ÐÑо знаÑиÑ, ÑÑо вÑе ÑазÑеÑÐµÐ½Ð¸Ñ Ð¸ ÑÑловиÑ,
на коÑоÑÑÑ
Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¿ÐµÑедаваÑÑ
иÑÑ
однÑй ÑекÑÑ, дейÑÑвÑÑÑ Ñакже, когда вÑ
пеÑедаеÑе обÑекÑнÑй код: Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе
-взимаÑÑ Ð¿Ð»Ð°ÑÑ, Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑоÑ
ÑанÑÑÑ
замеÑÐ°Ð½Ð¸Ñ Ð¾Ð± авÑоÑÑкиÑ
пÑаваÑ
в ÑелоÑÑи и
+взимаÑÑ Ð¿Ð»Ð°ÑÑ, Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑоÑ
ÑанÑÑÑ
замеÑÐ°Ð½Ð¸Ñ Ð¾Ð± авÑоÑÑкиÑ
пÑаваÑ
в ÑелоÑÑи и
Ñак далее.</p></dd>
@@ -2841,9 +2840,9 @@
ÐеÑ. Ðогда Ð²Ñ Ð¿ÐµÑедаеÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL, вÑ
Ð´Ð¾Ð»Ð¶Ð½Ñ ÑледоваÑÑ ÑÑловиÑм и
ÑÑебованиÑм одной конкÑеÑной веÑÑии
лиÑензии. Ðогда Ð²Ñ ÑÑо делаеÑе, ÑÑа
веÑÑÐ¸Ñ Ð¾Ð¿ÑеделÑÐµÑ Ð²Ð°Ñи обÑзаÑелÑÑÑва.
ÐÑли полÑзоваÑели могÑÑ Ð²ÑбÑаÑÑ Ð´Ð»Ñ
-полÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ поздние веÑÑии GPL, Ñо
ÑÑо — ÑолÑко
-дополниÑелÑное ÑазÑеÑение, коÑоÑое Ñ Ð½Ð¸Ñ
еÑÑÑ — ÑÑо не ÑÑебÑÐµÑ Ð¾Ñ
-Ð²Ð°Ñ Ð¾Ð´Ð½Ð¾Ð²Ñеменного вÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑÑловий
более поздней веÑÑии GPL.</p>
+полÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ поздние веÑÑии GPL, Ñо ÑÑо
ÑолÑко дополниÑелÑное
+ÑазÑеÑение, коÑоÑое Ñ Ð½Ð¸Ñ
еÑÑÑ — ÑÑо
не ÑÑебÑÐµÑ Ð¾Ñ Ð²Ð°Ñ
+одновÑеменного вÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÑÑловий более
поздней веÑÑии GPL.</p>
<p>Ðе дÑмайÑе, ÑÑо ÑÑо знаÑиÑ, бÑдÑо вÑ
можеÑе ÑгÑожаÑÑ ÑообÑеÑÑÐ²Ñ Ñвоими
паÑенÑами. Ðо многиÑ
ÑÑÑанаÑ
ÑаÑпÑоÑÑÑанение пÑогÑамм по GPLv2
пÑедоÑÑавлÑеÑ
@@ -2881,7 +2880,7 @@
<dt id="Cure">ЧÑо знаÑÐ¸Ñ “ÑÑÑÑаниÑÑ”
наÑÑÑение GPLv3? <span
class="anchor-reference-id">(<a href="#Cure" >#Cure</a>)</span></dt>
<dd><p>
-ÐÑпÑавиÑÑ Ð½Ð°ÑÑÑение знаÑÐ¸Ñ Ð¿ÑивеÑÑи ÑвоÑ
пÑакÑÐ¸ÐºÑ Ð² ÑооÑвеÑÑÑвие Ñ
+УÑÑÑаниÑÑ Ð½Ð°ÑÑÑение знаÑÐ¸Ñ Ð¿ÑивеÑÑи ÑвоÑ
пÑакÑÐ¸ÐºÑ Ð² ÑооÑвеÑÑÑвие Ñ
ÑÑебованиÑми лиÑензии.</p></dd>
@@ -2899,7 +2898,7 @@
ÑÑидиÑеÑкиÑ
замеÑаниÑÑ
”? <span
class="anchor-reference-id">(<a
href="#NonvisualLegalNotices" >#NonvisualLegalNotices</a>)</span></dt>
<dd><p>
-ÐÑÑ, ÑÑо Ð¾Ñ Ð²Ð°Ñ ÑÑебÑеÑÑÑ — ÑÑо
гаÑанÑиÑоваÑÑ, ÑÑо
+ÐÑе, ÑÑо Ð¾Ñ Ð²Ð°Ñ ÑÑебÑеÑÑÑ — ÑÑо
гаÑанÑиÑоваÑÑ, ÑÑо
“ÑооÑвеÑÑÑвÑÑÑие ÑÑидиÑеÑкие
замеÑаниє легко доÑÑÑÐ¿Ð½Ñ ÑомÑ, кÑо
полÑзÑеÑÑÑ Ð²Ð°Ñим инÑеÑÑейÑом. ÐапÑимеÑ,
еÑли Ð²Ñ Ð½Ð°Ð¿Ð¸Ñали звÑковой инÑеÑÑейÑ,
Ð²Ñ Ð¼Ð¾Ð³Ð»Ð¸ Ð±Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ, коÑоÑаÑ
ÑиÑÐ°ÐµÑ Ð·Ð°Ð¼ÐµÑÐ°Ð½Ð¸Ñ Ð²ÑлÑÑ
.</p></dd>
@@ -2921,8 +2920,8 @@
class="anchor-reference-id">(<a href="#v3ConditionalWarranty"
>#v3ConditionalWarranty</a>)</span></dt>
<dd><p>
-Ðа. ТоÑно Ñак же, как гаÑанÑÐ¸Ñ Ð¼Ð¾Ð¶ÐµÑ Ð½Ðµ
ÑаÑпÑоÑÑÑанÑÑÑÑÑ Ð½Ð° ÑÑÑÑойÑÑва,
-пÑогÑамм в коÑоÑÑÑ
изменÑÑÑÑÑ
полÑзоваÑелÑми, Ð²Ñ Ð½Ðµ обÑзанÑ
пÑедоÑÑавлÑÑÑ
+Ðа. ТоÑно Ñак же, как гаÑанÑÐ¸Ñ Ð¼Ð¾Ð¶ÐµÑ Ð½Ðµ
ÑаÑпÑоÑÑÑанÑÑÑÑÑ Ð½Ð° ÑÑÑÑойÑÑва, еÑли
+пÑогÑÐ°Ð¼Ð¼Ñ Ð² ниÑ
изменÑÑÑÑÑ
полÑзоваÑелÑми, Ð²Ñ Ð½Ðµ обÑзанÑ
пÑедоÑÑавлÑÑÑ
гаÑанÑиÑ, коÑоÑÐ°Ñ ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð½Ð° вÑе
возможнÑе дейÑÑвиÑ, коÑоÑÑе кÑо-Ñо
мог Ð±Ñ Ð¿ÑедпÑинÑÑÑ Ð² оÑноÑении пÑогÑамм
под GPLv3.</p></dd>
@@ -3017,7 +3016,7 @@
ÑледоваÑÑ ÑÑебованиÑм Ñаздела 6.</p></dd>
-<dt id="LaptopLoan">ÐÑли кÑо-Ñо ÑÑÑÐ°Ð½Ð¾Ð²Ð¸Ñ Ð¿ÑогÑаммÑ
под GPL на поÑÑаÑивном компÑÑÑеÑе а заÑем
+<dt id="LaptopLoan">ÐÑли кÑо-Ñо ÑÑÑÐ°Ð½Ð¾Ð²Ð¸Ñ Ð¿ÑогÑаммÑ
под GPL на поÑÑаÑивном компÑÑÑеÑе, а заÑем
Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ ÑÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð·Ð½Ð°ÐºÐ¾Ð¼Ð¾Ð¼Ñ Ð±ÐµÐ·
пÑедоÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ÑÑ
одного ÑекÑÑа
пÑогÑаммÑ, бÑÐ´ÐµÑ Ð»Ð¸ ÑÑо наÑÑÑением GPL? <span
class="anchor-reference-id">(<a href="#LaptopLoan"
>#LaptopLoan</a>)</span></dt>
@@ -3067,9 +3066,9 @@
гаÑанÑиÑоваÑÑ, ÑÑо непÑеÑÑвное
ÑÑнкÑиониÑование измененного обÑекÑного
кода
ни в коем ÑлÑÑае не пÑеÑÑваеÑÑÑ Ð¸ не
заÑÑÑднÑеÑÑÑ ÑолÑко из-за Ñого, ÑÑо
бÑло внеÑено изменение”. ÐÑли в
ÑÑÑÑойÑÑве каким-Ñо обÑазом
-иÑполÑзÑеÑÑÑ ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð°Ñ Ð°ÑÑеÑÑаÑиÑ,
ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ð¾ ÑÑÑановке должнÑ
-пÑедоÑÑавлÑÑÑ Ð²Ð°Ð¼ ÑÑедÑÑва, Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ
коÑоÑÑÑ
пÑогÑÐ°Ð¼Ð¼Ñ Ñ Ð²Ð°Ñими изменениÑми
-могли Ð±Ñ Ð·Ð°ÑекомендоваÑÑ ÑÐµÐ±Ñ ÐºÐ°Ðº
законнÑе.</p></dd>
+иÑполÑзÑеÑÑÑ ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð°Ñ Ð°ÑÑеÑÑаÑиÑ,
ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ð¾ ÑÑÑановке Ð´Ð¾Ð»Ð¶Ð½Ñ ÑказÑваÑÑ
+вам ÑÑедÑÑво, Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÐºÐ¾ÑоÑого пÑогÑаммÑ
Ñ Ð²Ð°Ñими изменениÑми могли бÑ
+заÑекомендоваÑÑ ÑÐµÐ±Ñ ÐºÐ°Ðº законнÑе.</p></dd>
<dt id="RulesProtocols">ЧÑо в GPLv3 ознаÑÐ°ÐµÑ Ð²ÑÑажение
“пÑавила и пÑоÑÐ¾ÐºÐ¾Ð»Ñ ÑвÑзи по
@@ -3077,8 +3076,8 @@
>#RulesProtocols</a>)</span></dt>
<dd><p>
ÐÑо оÑноÑиÑÑÑ Ðº пÑавилам о колиÑеÑÑве
даннÑÑ
, коÑоÑÑе Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе пеÑеÑÑлаÑÑ
-по ÑеÑи. ÐапÑимеÑ, еÑли огÑаниÑено
колиÑеÑÑво запÑоÑов, коÑоÑÑе Ð¼Ñ ÐºÐ°Ð¶Ð´Ñй
-Ð´ÐµÐ½Ñ Ð¼Ð¾Ð¶ÐµÑе поÑлаÑÑ Ð½Ð° ÑеÑвеÑ, или ÑазмеÑ
Ñайла, коÑоÑÑе Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе поÑлаÑÑ
+по ÑеÑи. ÐапÑимеÑ, еÑли огÑаниÑено
колиÑеÑÑво запÑоÑов, коÑоÑÑе Ð²Ñ ÐºÐ°Ð¶Ð´Ñй
+Ð´ÐµÐ½Ñ Ð¼Ð¾Ð¶ÐµÑе поÑлаÑÑ Ð½Ð° ÑеÑвеÑ, или ÑазмеÑ
Ñайла, коÑоÑÑй Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе поÑлаÑÑ
кÑда-Ñо; Ð²Ð°Ñ Ð´Ð¾ÑÑÑп к ÑÑим маÑеÑиалам можеÑ
бÑÑÑ Ð¿ÑекÑаÑен, еÑли вÑ
пÑевÑÑаеÑе ÑÑи пÑеделÑ.</p>
@@ -3151,8 +3150,8 @@
<dd><p>
ÐÑли пÑогÑамма Ñвно ÑоÑÑавлена Ñак, ÑÑобÑ
пÑинимаÑÑ Ð·Ð°Ð¿ÑоÑÑ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ð¸
вÑÑÑлаÑÑ Ð¾ÑвеÑÑ Ð¿Ð¾ ÑеÑи, Ñо она оÑвеÑаеÑ
ÑÑÐ¾Ð¼Ñ ÐºÑиÑеÑиÑ. РаÑпÑоÑÑÑаненнÑми
-пÑимеÑами пÑогÑамм, коÑоÑÑе попадаÑÑ Ð¿Ð¾Ð´
ÑÑÑ ÐºÐ°ÑегоÑиÑ, ÑвлÑÑÑÑÑ Ð¿ÑогÑаммÑ
-Ð´Ð»Ñ ÑеÑвеÑов ÐÑемиÑной паÑÑÐ¸Ð½Ñ Ð¸ поÑÑовÑÑ
ÑеÑвеÑов, инÑеÑакÑивнÑе пÑиложениÑ
+пÑимеÑами пÑогÑамм, коÑоÑÑе попадаÑÑ Ð² ÑÑÑ
каÑегоÑиÑ, ÑвлÑÑÑÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð»Ñ
+ÑеÑвеÑов ÐÑемиÑной паÑÑÐ¸Ð½Ñ Ð¸ поÑÑовÑÑ
ÑеÑвеÑов, инÑеÑакÑивнÑе пÑиложениÑ
ÐÑемиÑной паÑÑÐ¸Ð½Ñ Ð¸ пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð»Ñ
ÑеÑвеÑов ÑеÑевÑÑ
игÑ.</p>
<p>ÐÑли пÑогÑамма Ñвно не ÑазÑабоÑана длÑ
взаимодейÑÑÐ²Ð¸Ñ Ñ Ð¿Ð¾Ð»ÑзоваÑелем по
@@ -3193,8 +3192,8 @@
пÑогÑамма”</a> Ð´Ð»Ñ ÑеÑ
, кÑо Ñ
оÑел бÑ
ÑзнаÑÑ Ð¾Ð± ÑÑом подÑобнее.</p></dd>
-<dt id="NoDistributionRequirements">ЧÑо ÑÑебÑÐµÑ Ð¾Ñ Ð¼ÐµÐ½Ñ
лиÑензиÑ, еÑли Ñ ÑолÑко ÑÐ¾Ð·Ð´Ð°Ñ ÐºÐ¾Ð¿Ð¸Ð¸
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL и
-вÑполнÑÑ Ð¸Ñ
без ÑаÑпÑоÑÑÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸
пеÑедаÑи иÑ
дÑÑгим? <span
+<dt id="NoDistributionRequirements">Чего ÑÑебÑÐµÑ Ð¾Ñ Ð¼ÐµÐ½Ñ
лиÑензиÑ, еÑли Ñ ÑолÑко ÑÐ¾Ð·Ð´Ð°Ñ ÐºÐ¾Ð¿Ð¸Ð¸
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL
+и вÑполнÑÑ Ð¸Ñ
без ÑаÑпÑоÑÑÑÐ°Ð½ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸
пеÑедаÑи иÑ
дÑÑгим? <span
class="anchor-reference-id">(<a href="#NoDistributionRequirements"
>#NoDistributionRequirements</a>)</span></dt>
<dd><p>
@@ -3232,8 +3231,9 @@
РазлиÑнÑе лиÑензии GNU обладаÑÑ ÑиÑокой
ÑовмеÑÑимоÑÑÑÑ Ð´ÑÑг Ñ
дÑÑгом. ÐдинÑÑвеннÑй ÑлÑÑай, когда вÑ
можеÑе бÑÑÑ Ð½Ðµ в ÑоÑÑоÑнии
комбиниÑоваÑÑ ÑаÑÑи пÑогÑамм под двÑÐ¼Ñ Ð¸Ð·
ÑÑиÑ
лиÑензий — ÑÑо
-когда Ð²Ñ Ñ
оÑиÑе пÑимениÑÑ Ð¸ÑÑ
однÑе ÑекÑÑÑ,
коÑоÑÑе <em>ÑолÑко</em> под более
-ÑÑаÑой веÑÑией лиÑензии, Ñ ÑекÑÑами,
вÑпÑÑеннÑми под более новой веÑÑией.</p>
+когда Ð²Ñ Ñ
оÑиÑе пÑимениÑÑ Ð¸ÑÑ
однÑе ÑекÑÑÑ,
коÑоÑÑе вÑпÑÑÐµÐ½Ñ <em>ÑолÑко</em>
+под более ÑÑаÑой веÑÑией лиÑензии, Ñ
ÑекÑÑами, вÑпÑÑеннÑми под более новой
+веÑÑией.</p>
<p>Ðиже пÑиводиÑÑÑ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð°Ñ ÑаблиÑа длÑ
ÑазлиÑнÑÑ
комбинаÑий лиÑензий GNU,
ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð»ÑÑиÑÑ Ð¿ÑоÑÑÑÑ Ð² иÑполÑзовании
ÑпÑÐ°Ð²ÐºÑ Ð´Ð»Ñ ÐºÐ¾Ð½ÐºÑеÑнÑÑ
ÑлÑÑаев. Ðна
@@ -3434,7 +3434,7 @@
<p><a href="#matrix-skip-target">ÐÑопÑÑÑиÑÑ
пÑимеÑаниÑ</a></p>
-<p id="compat-matrix-footnote-1">1: ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑледоваÑÑ
ÑÑебованиÑм GPLv2 в ÑÑом ÑлÑÑае, когда
вÑÑÑаиваеÑе
+<p id="compat-matrix-footnote-1">1: Ð ÑÑом ÑлÑÑае Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ
ÑледоваÑÑ ÑÑебованиÑм GPLv2, когда
вÑÑÑаиваеÑе
ÑÑи пÑогÑаммÑ. ÐÑ Ð½Ðµ можеÑе полÑзоваÑÑÑÑ
ÑÑловиÑми более поздниÑ
веÑÑий GPL.</p>
<p id="compat-matrix-footnote-2">2: ХоÑÑ Ð² ÑÑом ÑлÑÑае вÑ
можеÑе вÑпÑÑкаÑÑ Ñвой пÑÐ¾ÐµÐºÑ (ÑвоÑ
оÑигиналÑнÑÑ
@@ -3455,7 +3455,7 @@
поздней веÑÑией — и как ÑолÑко вÑ
ÑделаеÑе ÑÑо, Ð²Ñ ÑможеÑе
вклÑÑаÑÑ Ð² него иÑÑ
однÑе под LGPLv3.</p>
-<p id="compat-matrix-footnote-5">5: ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑледоваÑÑ
ÑÑебованиÑм LGPLv2.1 в ÑÑом ÑлÑÑае, когда
вÑÑÑаиваеÑе
+<p id="compat-matrix-footnote-5">5: Ð ÑÑом ÑлÑÑае Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ
ÑледоваÑÑ ÑÑебованиÑм LGPLv2.1, когда
вÑÑÑаиваеÑе
ÑÑи пÑогÑаммÑ. ÐÑ Ð½Ðµ можеÑе полÑзоваÑÑÑÑ
ÑÑловиÑми более поздниÑ
веÑÑий
LGPL.</p>
@@ -3487,7 +3487,7 @@
<h3>ÐÑимеÑÐ°Ð½Ð¸Ñ Ð¿ÐµÑеводÑика</h3><ol><li
id="tfn1">“Ancillary
propagation of a covered work occurring solely as a consequence of using
peer-to-peer transmission to receive a copy likewise does not require
-acceptance”</li></ol></div>
+acceptance”.</li></ol></div>
</div>
<!--#include virtual="/server/footer.ru.html" -->
@@ -3532,7 +3532,7 @@
<!-- timestamp start -->
Ðбновлено:
-$Date: 2012/02/02 02:09:53 $
+$Date: 2012/02/16 09:31:15 $
<!-- timestamp end -->
</p>
Index: licenses/licenses.es.html
===================================================================
RCS file: /web/www/www/licenses/licenses.es.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- licenses/licenses.es.html 11 Feb 2012 17:29:45 -0000 1.36
+++ licenses/licenses.es.html 16 Feb 2012 09:31:15 -0000 1.37
@@ -112,7 +112,7 @@
otro documento.</li>
<li><a href="/licenses/why-not-lgpl.es.html">Por qué no deberÃa usar la
licencia
LGPL para su próxima biblioteca</a>.</li>
- <li><a href="/licenses/old-licenses/old-licenses.html#GPL">Versiones
anteriores
+ <li><a href="/licenses/old-licenses/old-licenses.html#LGPL">Versiones
anteriores
de la LGPL de GNU</a>.</li>
</ul>
@@ -473,7 +473,7 @@
<p><!-- timestamp start -->
Ãltima actualización:
-$Date: 2012/02/11 17:29:45 $
+$Date: 2012/02/16 09:31:15 $
<!-- timestamp end -->
</p>
Index: licenses/licenses.ja.html
===================================================================
RCS file: /web/www/www/licenses/licenses.ja.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- licenses/licenses.ja.html 15 Feb 2012 09:27:04 -0000 1.9
+++ licenses/licenses.ja.html 16 Feb 2012 09:31:15 -0000 1.10
@@ -46,7 +46,7 @@
<li><a
href="/graphics/license-logos.html">GNUã©ã¤ã»ã³ã¹ã»ãã´</a>ãããªãã®ããã¸ã§ã¯ãã«ä½¿ã</li>
<li><a
href="/licenses/license-list.html#LicensingMailingList"><address@hidden>
-ã¡ã¤ãªã³ã°ã»ãªã¹ã</a>ãã©ã¤ã»ã³ã·ã³ã°ã®ãã«ãä¸è¬ã¯ãã¡ãã¸
+ã¡ã¼ãªã³ã°ãªã¹ã</a>ãã©ã¤ã»ã³ã·ã³ã°ã®ãã«ãä¸è¬ã¯ãã¡ãã¸
</li>
</ul>
@@ -124,7 +124,7 @@
<h3 id="Exceptions">GNUã©ã¤ã»ã³ã¹ã®ä¾å¤</h3>
-<p>ããã¤ãã®GNUããã°ã©ã
ã¯ã«ã¯ãã¡ã¤ã³ã®ã©ã¤ã»ã³ã¹ã®ä¸ã¤ã®ç¹å®ã®æ¡é
ã«å¯¾ããä»å
çãªè¨±å¯ãããã¯ç¹å¥ãªä¾å¤ãæãã¾ãããã®ãã¡ã®ããã¤ãã¯ããã使ãããããããèªèº«ããããã®çåãå¼ãèµ·ããããããã®ã§ãããããã¡ã¯ãããã£ãäºæã<a
+<p>ããã¤ãã®GNUããã°ã©ã
ã«ã¯ãã¡ã¤ã³ã®ã©ã¤ã»ã³ã¹ã®ä¸ã¤ã®ç¹å®ã®æ¡é
ã«å¯¾ããä»å
çãªè¨±å¯ãããã¯ç¹å¥ãªä¾å¤ãæãã¾ãããã®ãã¡ã®ããã¤ãã¯ããã使ãããããããèªèº«ããããã®çåãå¼ãèµ·ããããããã®ã§ãããããã¡ã¯ãããã£ãäºæã<a
href="/licenses/exceptions.html">ä¾å¤ã®ãã¼ã¸</a>ã«ã¾ã¨ããããã«ãã¦ãã¾ãã</p>
<h3 id="LicenseURLs">ã©ã¤ã»ã³ã¹ã®URL</h3>
@@ -180,7 +180,8 @@
<p>æ¨æºçãªGNUã¦ã§ããã¼ã¸ã®èä½æ¨©æ¡é
ã¯ä»ã¯<a
href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
-ãã¤ã¦ã¯(ããã¤ãã®ãã¼ã¸ã«ã¤ãã¦ã¯ä»ããªã)ã<em><span
+Attribution-NoDerivs 3.0 United States
+License</a>ã§ãããã¤ã¦ã¯(ããã¤ãã®ãã¼ã¸ã«ã¤ãã¦ã¯ä»ããªã)ã<em><span
class="highlight">æ¬æã«ãã®èä½æ¨©è¡¨ç¤ºãæ®ãéãããã®æç«
å
¨ä½ã®ãããªãåªä½ã«ãããããã®ã¾ã¾ã®è¤è£½ããã³é
å¸ãã使ç¨æãªãã«è¨±å¯ãã</span></em>ãã§ãããã㮓verbatim
license”ã«ã¤ãã¦ã¯ã以ä¸ã®ã¨ãã³ã»ã¢ã°ã¬ã³ã«ãã解説ã«çæãã¦ä¸ãã:</p>
@@ -324,7 +325,7 @@
<p><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2012/02/15 09:27:04 $
+$Date: 2012/02/16 09:31:15 $
<!-- timestamp end -->
</p>
Index: licenses/licenses.pl.html
===================================================================
RCS file: /web/www/www/licenses/licenses.pl.html,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- licenses/licenses.pl.html 2 Feb 2012 02:09:55 -0000 1.59
+++ licenses/licenses.pl.html 16 Feb 2012 09:31:15 -0000 1.60
@@ -113,7 +113,7 @@
do publikowania jako samodzielna caÅoÅÄ.</li>
<li><a href="/licenses/why-not-lgpl.html">Dlaczego nie powinniÅcie
użyÄ
Lesser GPL dla swej kolejnej biblioteki</a></li>
- <li><a href="/licenses/old-licenses/old-licenses.html#GPL">Starsze wersje GNU
+ <li><a href="/licenses/old-licenses/old-licenses.html#LGPL">Starsze wersje
GNU
LGPL</a></li>
</ul>
@@ -465,13 +465,14 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
TÅumaczenie: Wojciech Kotwica 2001, Daniel Oźminkowski 2010; poprawki:
-Wojciech Kotwica 2001, 2002, 2003, 2004, 2005, 2006, Jan Owoc 2010, 2011.</div>
+Wojciech Kotwica 2001, 2002, 2003, 2004, 2005, 2006, Jan Owoc 2010, 2011,
+2012.</div>
<p><!-- timestamp start -->
Aktualizowane:
-$Date: 2012/02/02 02:09:55 $
+$Date: 2012/02/16 09:31:15 $
<!-- timestamp end -->
</p>
Index: licenses/po/agpl-3.0.ca.po
===================================================================
RCS file: /web/www/www/licenses/po/agpl-3.0.ca.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/po/agpl-3.0.ca.po 15 Feb 2012 18:58:02 -0000 1.1
+++ licenses/po/agpl-3.0.ca.po 16 Feb 2012 09:31:27 -0000 1.2
@@ -12,15 +12,15 @@
"Language-Team: Catalan <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <title>
msgid ""
"GNU Affero General Public License - GNU Project - Free Software Foundation "
"(FSF)"
msgstr ""
-"Llicència Pública General Affero de GNU - Projecte GNU - Free Software
Foundation "
-"(FSF)"
+"Llicència Pública General Affero de GNU - Projecte GNU - Free Software "
+"Foundation (FSF)"
#. type: Content of: <h2>
msgid "GNU Affero General Public License"
@@ -28,7 +28,8 @@
#. type: Content of: <ul><li>
msgid "<a href=\"/licenses/why-affero-gpl.html\">Why the Affero GPL</a>"
-msgstr "<a href=\"/licenses/why-affero-gpl.html\">Per què utilitzar l'Affero
GPL</a>"
+msgstr ""
+"<a href=\"/licenses/why-affero-gpl.html\">Per què utilitzar l'Affero GPL</a>"
#. type: Content of: <ul><li>
msgid "<a href=\"/licenses/gpl-faq.html\">Frequently Asked Questions</a>"
@@ -39,38 +40,42 @@
"<a href=\"/licenses/gpl-howto.html\">How to use GNU licenses for your own "
"software</a>"
msgstr ""
-"<a href=\"/licenses/gpl-howto.ca.html\">Com utilitzar les llicències de GNU
en els vostres programes</a>"
+"<a href=\"/licenses/gpl-howto.ca.html\">Com utilitzar les llicències de GNU "
+"en els vostres programes</a>"
#. type: Content of: <ul><li>
-msgid "<a href=\"/licenses/translations.html\">Translations of the GNU
AGPL</a>"
-msgstr "<a href=\"/licenses/translations.ca.html\">Traduccions de la GNU
AGPL</a>"
+msgid ""
+"<a href=\"/licenses/translations.html\">Translations of the GNU AGPL</a>"
+msgstr ""
+"<a href=\"/licenses/translations.ca.html\">Traduccions de la GNU AGPL</a>"
#. type: Content of: <ul><li>
msgid ""
"The GNU AGPL in other formats: <a href=\"/licenses/agpl-3.0.txt\">plain "
-"text</a>, <a href=\"/licenses/agpl-3.0.dbk\">Docbook</a>, <a "
-"href=\"/licenses/agpl-3.0.tex\">LaTeX</a>, <a "
-"href=\"/licenses/agpl-3.0-standalone.html\">standalone HTML</a>, <a "
-"href=\"/licenses/agpl-3.0.texi\">Texinfo</a>"
-msgstr ""
-"La GNU AGPL en altres formats: <a href=\"/licenses/agpl-3.0.txt\">text pla
(TXT)</a>, <a href=\"/licenses/agpl-3.0.dbk\">Docbook</a>, <a "
-"href=\"/licenses/agpl-3.0.tex\">LaTeX</a>, <a "
-"href=\"/licenses/agpl-3.0-standalone.html\">standalone HTML</a>, <a "
-"href=\"/licenses/agpl-3.0.texi\">Texinfo</a>"
+"text</a>, <a href=\"/licenses/agpl-3.0.dbk\">Docbook</a>, <a href=\"/"
+"licenses/agpl-3.0.tex\">LaTeX</a>, <a href=\"/licenses/agpl-3.0-standalone."
+"html\">standalone HTML</a>, <a href=\"/licenses/agpl-3.0.texi\">Texinfo</a>"
+msgstr ""
+"La GNU AGPL en altres formats: <a href=\"/licenses/agpl-3.0.txt\">text pla "
+"(TXT)</a>, <a href=\"/licenses/agpl-3.0.dbk\">Docbook</a>, <a href=\"/"
+"licenses/agpl-3.0.tex\">LaTeX</a>, <a href=\"/licenses/agpl-3.0-standalone."
+"html\">standalone HTML</a>, <a href=\"/licenses/agpl-3.0.texi\">Texinfo</a>"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/graphics/license-logos.html\">GNU AGPL logos</a> to use with your "
"project"
msgstr ""
-"<a href=\"/graphics/license-logos.ca.html\">Logotips de la GNU AGPL</a> per
utilitzar en el vostre projecte"
+"<a href=\"/graphics/license-logos.ca.html\">Logotips de la GNU AGPL</a> per "
+"utilitzar en el vostre projecte"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/licenses/gpl-violation.html\">What to do if you see a possible "
"GNU AGPL violation</a>"
msgstr ""
-"<a href=\"/licenses/gpl-violation.ca.html\">Què podeu fer si veieu una
possible violació de la GNU AGPL</a>"
+"<a href=\"/licenses/gpl-violation.ca.html\">Què podeu fer si veieu una "
+"possible violació de la GNU AGPL</a>"
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
#. type: Content of: <div>
@@ -79,23 +84,31 @@
#. type: Content of: <div><p>
msgid ""
-"Please send FSF & GNU inquiries to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>. There are also <a
"
-"href=\"/contact/\">other ways to contact</a> the FSF."
-msgstr "Envieu les vostres preguntes sobre la FSF i GNU a <a
href=\"mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
href=\"/contact/contact.ca.html\">altres formes de contactar</a> amb la FSF."
+"Please send FSF & GNU inquiries to <a href=\"mailto:address@hidden";
+"\"><em>address@hidden</em></a>. There are also <a href=\"/contact/\">other "
+"ways to contact</a> the FSF."
+msgstr ""
+"Envieu les vostres preguntes sobre la FSF i GNU a <a
href=\"mailto:address@hidden";
+"org\"><em>address@hidden</em></a>. També hi ha <a
href=\"/contact/contact.ca."
+"html\">altres formes de contactar</a> amb la FSF."
#. type: Content of: <div><p>
msgid ""
-"Please send broken links and other corrections or suggestions to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>."
-msgstr "Envieu els enllaços trencats i d'altres correccions o suggeriments a
<a href=\"mailto:address@hidden";><em>address@hidden</em></a>."
+"Please send broken links and other corrections or suggestions to <a href="
+"\"mailto:address@hidden";><em>address@hidden</em></a>."
+msgstr ""
+"Envieu els enllaços trencats i d'altres correccions o suggeriments a <a
href="
+"\"mailto:address@hidden";><em>address@hidden</em></a>."
#. type: Content of: <div><p>
msgid ""
-"Please see the <a "
-"href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
-msgstr "Vegeu la <a
href=\"/server/standards/README.translations.ca.html\">Guia de traducció</a>
per informar-vos sobre la coordinació i publicació de les traduccions
d'aquest article."
+"Please see the <a href=\"/server/standards/README.translations.html"
+"\">Translations README</a> for information on coordinating and submitting "
+"translations of this article."
+msgstr ""
+"Vegeu la <a href=\"/server/standards/README.translations.ca.html\">Guia de "
+"traducció</a> per informar-vos sobre la coordinació i publicació de les "
+"traduccions d'aquest article."
#. type: Content of: <div><p>
msgid "Copyright notice above."
@@ -109,15 +122,18 @@
msgid ""
"Everyone is permitted to copy and distribute verbatim copies of this license "
"document, but changing it is not allowed."
-msgstr "Es permet la còpia i la distribució de còpies literals d'aquest
document de llicència, però sense cap modificació."
+msgstr ""
+"Es permet la còpia i la distribució de còpies literals d'aquest document
de "
+"llicència, però sense cap modificació."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
-msgstr "Traducció: <a href=\"http://www.puigpe.org/\";>puigpe</a>, 15 de
febrer de 2012."
+msgstr ""
+"Traducció: <a href=\"http://www.puigpe.org/\";>puigpe</a>, 15 de febrer de "
+"2012."
#. timestamp start
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "Updated:"
-
Index: licenses/po/agpl-3.0.translist
===================================================================
RCS file: /web/www/www/licenses/po/agpl-3.0.translist,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- licenses/po/agpl-3.0.translist 1 Feb 2012 01:26:14 -0000 1.3
+++ licenses/po/agpl-3.0.translist 16 Feb 2012 09:31:27 -0000 1.4
@@ -1,6 +1,8 @@
<!-- begin translinks file -->
<div id="translations">
<ul class="translations-list">
+<!-- Catalan -->
+<li><a href="/licenses/agpl-3.0.ca.html">català </a> [ca]</li>
<!-- German -->
<li><a href="/licenses/agpl-3.0.de.html">Deutsch</a> [de]</li>
<!-- English -->
Index: licenses/po/fdl-1.3.ca.po
===================================================================
RCS file: /web/www/www/licenses/po/fdl-1.3.ca.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/po/fdl-1.3.ca.po 15 Feb 2012 18:58:02 -0000 1.1
+++ licenses/po/fdl-1.3.ca.po 16 Feb 2012 09:31:27 -0000 1.2
@@ -12,15 +12,15 @@
"Language-Team: Catalan <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <title>
msgid ""
"GNU Free Documentation License v1.3 - GNU Project - Free Software Foundation "
"(FSF)"
msgstr ""
-"Llicència de Documentació Lliure de GNU v1.3 - Projecte GNU - Free Software
Foundation "
-"(FSF)"
+"Llicència de Documentació Lliure de GNU v1.3 - Projecte GNU - Free Software
"
+"Foundation (FSF)"
#. type: Content of: <h2>
msgid "GNU Free Documentation License"
@@ -28,28 +28,31 @@
#. type: Content of: <ul><li>
msgid ""
-"<a href=\"/licenses/fdl-1.3-faq.html\">FDL 1.3 Frequently Asked "
-"Questions</a>"
+"<a href=\"/licenses/fdl-1.3-faq.html\">FDL 1.3 Frequently Asked Questions</a>"
msgstr ""
-"<a href=\"/licenses/fdl-1.3-faq.ca.html\">Preguntes freqüents sobre la FDL
1.3</a>"
+"<a href=\"/licenses/fdl-1.3-faq.ca.html\">Preguntes freqüents sobre la FDL "
+"1.3</a>"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/licenses/fdl-1.3-pdiff.ps\">Marked-up changes between FDL 1.2 and "
"FDL 1.3 (PostScript)</a>"
msgstr ""
-"<a href=\"/licenses/fdl-1.3-pdiff.ps\">Diferències entre la FDL 1.2 i la FDL
1.3 (PostScript)</a>"
+"<a href=\"/licenses/fdl-1.3-pdiff.ps\">Diferències entre la FDL 1.2 i la FDL
"
+"1.3 (PostScript)</a>"
#. type: Content of: <ul><li>
msgid "<a href=\"/licenses/fdl-howto.html\">Tips on how to use the FDL</a>"
-msgstr "<a href=\"/licenses/fdl-howto.ca.html\">Consells sobre l'ús de la
FDL</a>"
+msgstr ""
+"<a href=\"/licenses/fdl-howto.ca.html\">Consells sobre l'ús de la FDL</a>"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/licenses/fdl-howto-opt.html\">How to Use the Optional Features of "
"the GFDL</a>"
msgstr ""
-"<a href=\"/licenses/fdl-howto-opt.ca.html\">Com utilitzar les funcionalitats
opcionals de la GFDL</a>"
+"<a href=\"/licenses/fdl-howto-opt.ca.html\">Com utilitzar les funcionalitats "
+"opcionals de la GFDL</a>"
#. type: Content of: <ul><li>
msgid "<a href=\"/licenses/translations.html\">Translations of the GFDL</a>"
@@ -58,41 +61,45 @@
#. type: Content of: <ul><li>
msgid ""
"The FDL in other formats: <a href=\"/licenses/fdl-1.3.txt\">plain text</a>, "
-"<a href=\"/licenses/fdl-1.3.texi\">Texinfo</a>, <a "
-"href=\"/licenses/fdl-1.3-standalone.html\">standalone HTML</a>, <a "
-"href=\"/licenses/fdl-1.3.xml\">DocBook/XML</a>, <a "
-"href=\"/licenses/fdl-1.3.tex\">LaTeX</a>"
-msgstr ""
-"La FDL en altres formats: <a href=\"/licenses/fdl-1.3.txt\">text pla
(TXT)</a>, "
-"<a href=\"/licenses/fdl-1.3.texi\">Texinfo</a>, <a "
-"href=\"/licenses/fdl-1.3-standalone.html\">standalone HTML</a>, <a "
-"href=\"/licenses/fdl-1.3.xml\">DocBook/XML</a>, <a "
-"href=\"/licenses/fdl-1.3.tex\">LaTeX</a>"
+"<a href=\"/licenses/fdl-1.3.texi\">Texinfo</a>, <a href=\"/licenses/fdl-1.3-"
+"standalone.html\">standalone HTML</a>, <a href=\"/licenses/fdl-1.3.xml"
+"\">DocBook/XML</a>, <a href=\"/licenses/fdl-1.3.tex\">LaTeX</a>"
+msgstr ""
+"La FDL en altres formats: <a href=\"/licenses/fdl-1.3.txt\">text pla (TXT)</"
+"a>, <a href=\"/licenses/fdl-1.3.texi\">Texinfo</a>, <a href=\"/licenses/fdl-"
+"1.3-standalone.html\">standalone HTML</a>, <a href=\"/licenses/fdl-1.3.xml"
+"\">DocBook/XML</a>, <a href=\"/licenses/fdl-1.3.tex\">LaTeX</a>"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/licenses/why-gfdl.html\">Why publishers should use the GNU Free "
"Documentation License</a>"
msgstr ""
-"<a href=\"/licenses/why-gfdl.ca.html\">Per què els editors haurien
d'utilitzar la Llicència de Documentació Lliure de GNU</a>"
+"<a href=\"/licenses/why-gfdl.ca.html\">Per què els editors haurien "
+"d'utilitzar la Llicència de Documentació Lliure de GNU</a>"
#. type: Content of: <ul><li>
-msgid "<a href=\"/philosophy/free-doc.html\">Free Software and Free
Manuals</a>"
-msgstr "<a href=\"/philosophy/free-doc.ca.html\">Programari lliure i manuals
lliures</a>"
+msgid ""
+"<a href=\"/philosophy/free-doc.html\">Free Software and Free Manuals</a>"
+msgstr ""
+"<a href=\"/philosophy/free-doc.ca.html\">Programari lliure i manuals "
+"lliures</a>"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/licenses/old-licenses/old-licenses.html#FDL\">Old versions of the "
"GNU Free Documentation License</a>"
msgstr ""
-"<a href=\"/licenses/old-licenses/old-licenses.ca.html#FDL\">Versions
anteriors de la Llicència de Documentació Lliure de GNU</a>"
+"<a href=\"/licenses/old-licenses/old-licenses.ca.html#FDL\">Versions "
+"anteriors de la Llicència de Documentació Lliure de GNU</a>"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/licenses/gpl-violation.html\">What to do if you see a possible "
"GFDL violation</a>"
msgstr ""
-"<a href=\"/licenses/gpl-violation.ca.html\">Què podeu fer si veieu una
possible violació de la GFDL</a>"
+"<a href=\"/licenses/gpl-violation.ca.html\">Què podeu fer si veieu una "
+"possible violació de la GFDL</a>"
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
#. type: Content of: <div>
@@ -101,23 +108,31 @@
#. type: Content of: <div><p>
msgid ""
-"Please send FSF & GNU inquiries to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>. There are also <a
"
-"href=\"/contact/\">other ways to contact</a> the FSF."
-msgstr "Envieu les vostres preguntes sobre la FSF i GNU a <a
href=\"mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
href=\"/contact/contact.ca.html\">altres formes de contactar</a> amb la FSF."
+"Please send FSF & GNU inquiries to <a href=\"mailto:address@hidden";
+"\"><em>address@hidden</em></a>. There are also <a href=\"/contact/\">other "
+"ways to contact</a> the FSF."
+msgstr ""
+"Envieu les vostres preguntes sobre la FSF i GNU a <a
href=\"mailto:address@hidden";
+"org\"><em>address@hidden</em></a>. També hi ha <a
href=\"/contact/contact.ca."
+"html\">altres formes de contactar</a> amb la FSF."
#. type: Content of: <div><p>
msgid ""
-"Please send broken links and other corrections or suggestions to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>."
-msgstr "Envieu els enllaços trencats i d'altres correccions o suggeriments a
<a href=\"mailto:address@hidden";><em>address@hidden</em></a>."
+"Please send broken links and other corrections or suggestions to <a href="
+"\"mailto:address@hidden";><em>address@hidden</em></a>."
+msgstr ""
+"Envieu els enllaços trencats i d'altres correccions o suggeriments a <a
href="
+"\"mailto:address@hidden";><em>address@hidden</em></a>."
#. type: Content of: <div><p>
msgid ""
-"Please see the <a "
-"href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
-msgstr "Vegeu la <a
href=\"/server/standards/README.translations.ca.html\">Guia de traducció</a>
per informar-vos sobre la coordinació i publicació de les traduccions
d'aquest article."
+"Please see the <a href=\"/server/standards/README.translations.html"
+"\">Translations README</a> for information on coordinating and submitting "
+"translations of this article."
+msgstr ""
+"Vegeu la <a href=\"/server/standards/README.translations.ca.html\">Guia de "
+"traducció</a> per informar-vos sobre la coordinació i publicació de les "
+"traduccions d'aquest article."
#. type: Content of: <div><p>
msgid "Copyright notice above."
@@ -131,15 +146,18 @@
msgid ""
"Everyone is permitted to copy and distribute verbatim copies of this license "
"document, but changing it is not allowed."
-msgstr "Es permet la còpia i la distribució de còpies literals d'aquest
document de llicència, però sense cap modificació."
+msgstr ""
+"Es permet la còpia i la distribució de còpies literals d'aquest document
de "
+"llicència, però sense cap modificació."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
-msgstr "Traducció: <a href=\"http://www.puigpe.org/\";>puigpe</a>, 15 de
febrer de 2012."
+msgstr ""
+"Traducció: <a href=\"http://www.puigpe.org/\";>puigpe</a>, 15 de febrer de "
+"2012."
#. timestamp start
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "Updated:"
-
Index: licenses/po/fdl-1.3.translist
===================================================================
RCS file: /web/www/www/licenses/po/fdl-1.3.translist,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- licenses/po/fdl-1.3.translist 25 Dec 2011 05:21:56 -0000 1.2
+++ licenses/po/fdl-1.3.translist 16 Feb 2012 09:31:27 -0000 1.3
@@ -1,6 +1,8 @@
<!-- begin translinks file -->
<div id="translations">
<ul class="translations-list">
+<!-- Catalan -->
+<li><a href="/licenses/fdl-1.3.ca.html">català </a> [ca]</li>
<!-- German -->
<li><a href="/licenses/fdl-1.3.de.html">Deutsch</a> [de]</li>
<!-- English -->
Index: licenses/po/gpl-3.0.ca.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-3.0.ca.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/po/gpl-3.0.ca.po 15 Feb 2012 18:58:02 -0000 1.1
+++ licenses/po/gpl-3.0.ca.po 16 Feb 2012 09:31:28 -0000 1.2
@@ -12,15 +12,15 @@
"Language-Team: Catalan <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <title>
msgid ""
"The GNU General Public License v3.0 - GNU Project - Free Software Foundation "
"(FSF)"
msgstr ""
-"La Llicència Pública General de GNU v3.0 - Projecte GNU - Free Software
Foundation "
-"(FSF)"
+"La Llicència Pública General de GNU v3.0 - Projecte GNU - Free Software "
+"Foundation (FSF)"
#. type: Content of: <h2>
msgid "GNU General Public License"
@@ -28,25 +28,29 @@
#. type: Content of: <ul><li>
msgid "<a href=\"/licenses/quick-guide-gplv3.html\">A Quick Guide to GPLv3</a>"
-msgstr "<a href=\"/licenses/quick-guide-gplv3.ca.html\">Guia rà pida de la
GPLv3</a>"
+msgstr ""
+"<a href=\"/licenses/quick-guide-gplv3.ca.html\">Guia rà pida de la GPLv3</a>"
#. type: Content of: <ul><li>
msgid "<a href=\"/licenses/rms-why-gplv3.html\">Why Upgrade to GPLv3</a>"
-msgstr "<a href=\"/licenses/rms-why-gplv3.ca.html\">Per què migrar a la
GPLv3</a>"
+msgstr ""
+"<a href=\"/licenses/rms-why-gplv3.ca.html\">Per què migrar a la GPLv3</a>"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/licenses/gpl-faq.html\">Frequently Asked Questions about the GNU "
"licenses</a>"
msgstr ""
-"<a href=\"/licenses/gpl-faq.html\">Preguntes freqüents sobre les llicències
de GNU</a>"
+"<a href=\"/licenses/gpl-faq.html\">Preguntes freqüents sobre les llicències
"
+"de GNU</a>"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/licenses/gpl-howto.html\">How to use GNU licenses for your own "
"software</a>"
msgstr ""
-"<a href=\"/licenses/gpl-howto.ca.html\">Com utilitzar les llicències de GNU
en els vostres programes</a>"
+"<a href=\"/licenses/gpl-howto.ca.html\">Com utilitzar les llicències de GNU "
+"en els vostres programes</a>"
#. type: Content of: <ul><li>
msgid "<a href=\"/licenses/translations.html\">Translations of the GPL</a>"
@@ -55,39 +59,40 @@
#. type: Content of: <ul><li>
msgid ""
"The GPL in other formats: <a href=\"/licenses/gpl-3.0.txt\">plain text</a>, "
-"<a href=\"/licenses/gpl-3.0.texi\">Texinfo</a>, <a "
-"href=\"/licenses/gpl-3.0.tex\">LaTeX</a>, <a "
-"href=\"/licenses/gpl-3.0-standalone.html\">standalone HTML</a>, <a "
-"href=\"/licenses/gpl-3.0.odt\">ODF</a>, <a "
-"href=\"/licenses/gpl-3.0.dbk\">Docbook</a>"
-msgstr ""
-"La GPL en altres formats: <a href=\"/licenses/gpl-3.0.txt\">text pla
(TXT)</a>, "
-"<a href=\"/licenses/gpl-3.0.texi\">Texinfo</a>, <a "
-"href=\"/licenses/gpl-3.0.tex\">LaTeX</a>, <a "
-"href=\"/licenses/gpl-3.0-standalone.html\">standalone HTML</a>, <a "
-"href=\"/licenses/gpl-3.0.odt\">ODF</a>, <a "
-"href=\"/licenses/gpl-3.0.dbk\">Docbook</a>"
+"<a href=\"/licenses/gpl-3.0.texi\">Texinfo</a>, <a href=\"/licenses/gpl-3.0."
+"tex\">LaTeX</a>, <a href=\"/licenses/gpl-3.0-standalone.html\">standalone "
+"HTML</a>, <a href=\"/licenses/gpl-3.0.odt\">ODF</a>, <a href=\"/licenses/gpl-"
+"3.0.dbk\">Docbook</a>"
+msgstr ""
+"La GPL en altres formats: <a href=\"/licenses/gpl-3.0.txt\">text pla (TXT)</"
+"a>, <a href=\"/licenses/gpl-3.0.texi\">Texinfo</a>, <a href=\"/licenses/gpl-"
+"3.0.tex\">LaTeX</a>, <a href=\"/licenses/gpl-3.0-standalone.html"
+"\">standalone HTML</a>, <a href=\"/licenses/gpl-3.0.odt\">ODF</a>, <a href="
+"\"/licenses/gpl-3.0.dbk\">Docbook</a>"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/graphics/license-logos.html\">GPLv3 logos</a> to use with your "
"project"
msgstr ""
-"<a href=\"/graphics/license-logos.ca.html\">Logotips de la GPLv3</a> per
utilitzar en el vostre projecte"
+"<a href=\"/graphics/license-logos.ca.html\">Logotips de la GPLv3</a> per "
+"utilitzar en el vostre projecte"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/licenses/old-licenses/old-licenses.html#GPL\">Old versions of the "
"GNU GPL</a>"
msgstr ""
-"<a href=\"/licenses/old-licenses/old-licenses.ca.html#GPL\">Versions
anteriors de la GNU GPL</a>"
+"<a href=\"/licenses/old-licenses/old-licenses.ca.html#GPL\">Versions "
+"anteriors de la GNU GPL</a>"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/licenses/gpl-violation.html\">What to do if you see a possible "
"GPL violation</a>"
msgstr ""
-"<a href=\"/licenses/gpl-violation.ca.html\">Què podeu fer si veieu una
possible violació de la GPL</a>"
+"<a href=\"/licenses/gpl-violation.ca.html\">Què podeu fer si veieu una "
+"possible violació de la GPL</a>"
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
#. type: Content of: <div>
@@ -96,25 +101,31 @@
#. type: Content of: <div><p>
msgid ""
-"Please send FSF & GNU inquiries to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>. There are also <a
"
-"href=\"/contact/\">other ways to contact</a> the FSF."
+"Please send FSF & GNU inquiries to <a href=\"mailto:address@hidden";
+"\"><em>address@hidden</em></a>. There are also <a href=\"/contact/\">other "
+"ways to contact</a> the FSF."
msgstr ""
-"Envieu les vostres preguntes sobre la FSF i GNU a <a
href=\"mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
href=\"/contact/contact.ca.html\">altres formes de contactar</a> amb la FSF."
+"Envieu les vostres preguntes sobre la FSF i GNU a <a
href=\"mailto:address@hidden";
+"org\"><em>address@hidden</em></a>. També hi ha <a
href=\"/contact/contact.ca."
+"html\">altres formes de contactar</a> amb la FSF."
#. type: Content of: <div><p>
msgid ""
-"Please send broken links and other corrections or suggestions to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>."
+"Please send broken links and other corrections or suggestions to <a href="
+"\"mailto:address@hidden";><em>address@hidden</em></a>."
msgstr ""
-"Envieu els enllaços trencats i d'altres correccions o suggeriments a <a
href=\"mailto:address@hidden";><em>address@hidden</em></a>."
+"Envieu els enllaços trencats i d'altres correccions o suggeriments a <a
href="
+"\"mailto:address@hidden";><em>address@hidden</em></a>."
#. type: Content of: <div><p>
msgid ""
-"Please see the <a "
-"href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
-msgstr "Vegeu la <a
href=\"/server/standards/README.translations.ca.html\">Guia de traducció</a>
per informar-vos sobre la coordinació i publicació de les traduccions
d'aquest article."
+"Please see the <a href=\"/server/standards/README.translations.html"
+"\">Translations README</a> for information on coordinating and submitting "
+"translations of this article."
+msgstr ""
+"Vegeu la <a href=\"/server/standards/README.translations.ca.html\">Guia de "
+"traducció</a> per informar-vos sobre la coordinació i publicació de les "
+"traduccions d'aquest article."
#. type: Content of: <div><p>
msgid "Copyright notice above."
@@ -128,15 +139,18 @@
msgid ""
"Everyone is permitted to copy and distribute verbatim copies of this license "
"document, but changing it is not allowed."
-msgstr "Es permet la còpia i la distribució de còpies literals d'aquest
document de llicència, però sense cap modificació."
+msgstr ""
+"Es permet la còpia i la distribució de còpies literals d'aquest document
de "
+"llicència, però sense cap modificació."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
-msgstr "Traducció: <a href=\"http://www.puigpe.org/\";>puigpe</a>, 15 de
febrer de 2012."
+msgstr ""
+"Traducció: <a href=\"http://www.puigpe.org/\";>puigpe</a>, 15 de febrer de "
+"2012."
#. timestamp start
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "Updated:"
-
Index: licenses/po/gpl-3.0.translist
===================================================================
RCS file: /web/www/www/licenses/po/gpl-3.0.translist,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- licenses/po/gpl-3.0.translist 1 Feb 2012 01:26:15 -0000 1.3
+++ licenses/po/gpl-3.0.translist 16 Feb 2012 09:31:28 -0000 1.4
@@ -3,6 +3,8 @@
<ul class="translations-list">
<!-- Arabic -->
<li><a href="/licenses/gpl-3.0.ar.html">اÙعربÙØ©</a> [ar]</li>
+<!-- Catalan -->
+<li><a href="/licenses/gpl-3.0.ca.html">català </a> [ca]</li>
<!-- German -->
<li><a href="/licenses/gpl-3.0.de.html">Deutsch</a> [de]</li>
<!-- English -->
Index: licenses/po/gpl-faq.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- licenses/po/gpl-faq.ru-en.html 2 Feb 2012 02:10:30 -0000 1.6
+++ licenses/po/gpl-faq.ru-en.html 16 Feb 2012 09:31:28 -0000 1.7
@@ -3574,7 +3574,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2012/02/02 02:10:30 $
+$Date: 2012/02/16 09:31:28 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/lgpl-3.0.ca.po
===================================================================
RCS file: /web/www/www/licenses/po/lgpl-3.0.ca.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- licenses/po/lgpl-3.0.ca.po 15 Feb 2012 18:58:02 -0000 1.1
+++ licenses/po/lgpl-3.0.ca.po 16 Feb 2012 09:31:29 -0000 1.2
@@ -12,7 +12,7 @@
"Language-Team: Catalan <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <title>
msgid ""
@@ -31,21 +31,24 @@
"<a href=\"/licenses/why-not-lgpl.html\">Why you shouldn't use the Lesser GPL "
"for your next library</a>"
msgstr ""
-"<a href=\"/licenses/why-not-lgpl.ca.html\">Per què no haurÃeu d'utilitzar
la Llicència Pública General Reduïda per a la vostra pròxima biblioteca</a>"
+"<a href=\"/licenses/why-not-lgpl.ca.html\">Per què no haurÃeu d'utilitzar
la "
+"Llicència Pública General Reduïda per a la vostra pròxima biblioteca</a>"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/licenses/gpl-faq.html\">Frequently Asked Questions about the GNU "
"licenses</a>"
msgstr ""
-"<a href=\"/licenses/gpl-faq.html\">Preguntes freqüents sobre les llicències
de GNU</a>"
+"<a href=\"/licenses/gpl-faq.html\">Preguntes freqüents sobre les llicències
"
+"de GNU</a>"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/licenses/gpl-howto.html\">How to use GNU licenses for your own "
"software</a>"
msgstr ""
-"<a href=\"/licenses/gpl-howto.ca.html\">Com utilitzar les llicències de GNU
en els vostres programes</a>"
+"<a href=\"/licenses/gpl-howto.ca.html\">Com utilitzar les llicències de GNU "
+"en els vostres programes</a>"
#. type: Content of: <ul><li>
msgid "<a href=\"/licenses/translations.html\">Translations of the LGPL</a>"
@@ -54,46 +57,51 @@
#. type: Content of: <ul><li>
msgid ""
"The GNU LGPL in other formats: <a href=\"/licenses/lgpl-3.0.txt\">plain "
-"text</a>, <a href=\"/licenses/lgpl-3.0.dbk\">Docbook</a>, <a "
-"href=\"/licenses/lgpl-3.0-standalone.html\">standalone HTML</a>, <a "
-"href=\"/licenses/lgpl-3.0.tex\">LaTeX</a>, <a "
-"href=\"/licenses/lgpl-3.0.texi\">Texinfo</a>"
-msgstr ""
-"La GNU LGPL en altres formats: <a href=\"/licenses/lgpl-3.0.txt\">text pla
(TXT)</a>, <a href=\"/licenses/lgpl-3.0.dbk\">Docbook</a>, <a "
-"href=\"/licenses/lgpl-3.0-standalone.html\">standalone HTML</a>, <a "
-"href=\"/licenses/lgpl-3.0.tex\">LaTeX</a>, <a "
-"href=\"/licenses/lgpl-3.0.texi\">Texinfo</a>"
+"text</a>, <a href=\"/licenses/lgpl-3.0.dbk\">Docbook</a>, <a href=\"/"
+"licenses/lgpl-3.0-standalone.html\">standalone HTML</a>, <a href=\"/licenses/"
+"lgpl-3.0.tex\">LaTeX</a>, <a href=\"/licenses/lgpl-3.0.texi\">Texinfo</a>"
+msgstr ""
+"La GNU LGPL en altres formats: <a href=\"/licenses/lgpl-3.0.txt\">text pla "
+"(TXT)</a>, <a href=\"/licenses/lgpl-3.0.dbk\">Docbook</a>, <a href=\"/"
+"licenses/lgpl-3.0-standalone.html\">standalone HTML</a>, <a href=\"/licenses/"
+"lgpl-3.0.tex\">LaTeX</a>, <a href=\"/licenses/lgpl-3.0.texi\">Texinfo</a>"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/graphics/license-logos.html\">LGPLv3 logos</a> to use with your "
"project"
msgstr ""
-"<a href=\"/graphics/license-logos.ca.html\">Logotips de la LGPLv3</a> per
utilitzar en el vostre projecte"
+"<a href=\"/graphics/license-logos.ca.html\">Logotips de la LGPLv3</a> per "
+"utilitzar en el vostre projecte"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/licenses/old-licenses/old-licenses.html#LGPL\">Old versions of "
"the GNU LGPL</a>"
msgstr ""
-"<a href=\"/licenses/old-licenses/old-licenses.ca.html#LGPL\">Versions
anteriors de la GNU LGPL</a>"
+"<a href=\"/licenses/old-licenses/old-licenses.ca.html#LGPL\">Versions "
+"anteriors de la GNU LGPL</a>"
#. type: Content of: <ul><li>
msgid ""
"<a href=\"/licenses/gpl-violation.html\">What to do if you see a possible "
"LGPL violation</a>"
msgstr ""
-"<a href=\"/licenses/gpl-violation.ca.html\">Què podeu fer si veieu una
possible violació de la LGPL</a>"
+"<a href=\"/licenses/gpl-violation.ca.html\">Què podeu fer si veieu una "
+"possible violació de la LGPL</a>"
#. type: Content of: <p>
msgid ""
-"This license is a set of additional permissions added to <a "
-"href=\"/licenses/gpl-3.0.html\">version 3 of the GNU General Public "
-"License</a>. For more information about how to release your own software "
-"under this license, please see our <a href=\"/licenses/gpl-howto.html\">page "
-"of instructions</a>."
-msgstr ""
-"Aquesta llicència és un conjunt de permisos addicionals afegits a la <a
href=\"/licenses/gpl-3.0.ca.html\">versió 3 de la Llicència Pública General
de GNU</a>. Per a més informació sobre com publicar el vostre programari
sota aquesta llicència, vegeu si us plau la nostra <a
href=\"/licenses/gpl-howto.ca.html\">pà gina d'instruccions</a>."
+"This license is a set of additional permissions added to <a href=\"/licenses/"
+"gpl-3.0.html\">version 3 of the GNU General Public License</a>. For more "
+"information about how to release your own software under this license, "
+"please see our <a href=\"/licenses/gpl-howto.html\">page of instructions</a>."
+msgstr ""
+"Aquesta llicència és un conjunt de permisos addicionals afegits a la <a
href="
+"\"/licenses/gpl-3.0.ca.html\">versió 3 de la Llicència Pública General de "
+"GNU</a>. Per a més informació sobre com publicar el vostre programari sota
"
+"aquesta llicència, vegeu si us plau la nostra <a href=\"/licenses/gpl-howto."
+"ca.html\">pà gina d'instruccions</a>."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
#. type: Content of: <div>
@@ -102,23 +110,31 @@
#. type: Content of: <div><p>
msgid ""
-"Please send FSF & GNU inquiries to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>. There are also <a
"
-"href=\"/contact/\">other ways to contact</a> the FSF."
-msgstr "Envieu les vostres preguntes sobre la FSF i GNU a <a
href=\"mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
href=\"/contact/contact.ca.html\">altres formes de contactar</a> amb la FSF."
+"Please send FSF & GNU inquiries to <a href=\"mailto:address@hidden";
+"\"><em>address@hidden</em></a>. There are also <a href=\"/contact/\">other "
+"ways to contact</a> the FSF."
+msgstr ""
+"Envieu les vostres preguntes sobre la FSF i GNU a <a
href=\"mailto:address@hidden";
+"org\"><em>address@hidden</em></a>. També hi ha <a
href=\"/contact/contact.ca."
+"html\">altres formes de contactar</a> amb la FSF."
#. type: Content of: <div><p>
msgid ""
-"Please send broken links and other corrections or suggestions to <a "
-"href=\"mailto:address@hidden";><em>address@hidden</em></a>."
-msgstr "Envieu els enllaços trencats i d'altres correccions o suggeriments a
<a href=\"mailto:address@hidden";><em>address@hidden</em></a>."
+"Please send broken links and other corrections or suggestions to <a href="
+"\"mailto:address@hidden";><em>address@hidden</em></a>."
+msgstr ""
+"Envieu els enllaços trencats i d'altres correccions o suggeriments a <a
href="
+"\"mailto:address@hidden";><em>address@hidden</em></a>."
#. type: Content of: <div><p>
msgid ""
-"Please see the <a "
-"href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
-msgstr "Vegeu la <a
href=\"/server/standards/README.translations.ca.html\">Guia de traducció</a>
per informar-vos sobre la coordinació i publicació de les traduccions
d'aquest article."
+"Please see the <a href=\"/server/standards/README.translations.html"
+"\">Translations README</a> for information on coordinating and submitting "
+"translations of this article."
+msgstr ""
+"Vegeu la <a href=\"/server/standards/README.translations.ca.html\">Guia de "
+"traducció</a> per informar-vos sobre la coordinació i publicació de les "
+"traduccions d'aquest article."
#. type: Content of: <div><p>
msgid "Copyright notice above."
@@ -132,15 +148,18 @@
msgid ""
"Everyone is permitted to copy and distribute verbatim copies of this license "
"document, but changing it is not allowed."
-msgstr "Es permet la còpia i la distribució de còpies literals d'aquest
document de llicència, però sense cap modificació."
+msgstr ""
+"Es permet la còpia i la distribució de còpies literals d'aquest document
de "
+"llicència, però sense cap modificació."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
-msgstr "Traducció: <a href=\"http://www.puigpe.org/\";>puigpe</a>, 15 de
febrer de 2012."
+msgstr ""
+"Traducció: <a href=\"http://www.puigpe.org/\";>puigpe</a>, 15 de febrer de "
+"2012."
#. timestamp start
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "Updated:"
-
Index: licenses/po/lgpl-3.0.translist
===================================================================
RCS file: /web/www/www/licenses/po/lgpl-3.0.translist,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- licenses/po/lgpl-3.0.translist 25 Dec 2011 05:21:55 -0000 1.2
+++ licenses/po/lgpl-3.0.translist 16 Feb 2012 09:31:29 -0000 1.3
@@ -1,6 +1,8 @@
<!-- begin translinks file -->
<div id="translations">
<ul class="translations-list">
+<!-- Catalan -->
+<li><a href="/licenses/lgpl-3.0.ca.html">català </a> [ca]</li>
<!-- German -->
<li><a href="/licenses/lgpl-3.0.de.html">Deutsch</a> [de]</li>
<!-- English -->
Index: licenses/po/licenses.es-en.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.es-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- licenses/po/licenses.es-en.html 11 Feb 2012 17:30:08 -0000 1.6
+++ licenses/po/licenses.es-en.html 16 Feb 2012 09:31:30 -0000 1.7
@@ -109,7 +109,7 @@
are intended to be included in another document.</li>
<li><a href="/licenses/why-not-lgpl.html">Why you shouldn't use
the Lesser GPL for your next library</a></li>
- <li><a href="/licenses/old-licenses/old-licenses.html#GPL">Older
+ <li><a href="/licenses/old-licenses/old-licenses.html#LGPL">Older
versions of the GNU LGPL</a></li>
</ul>
@@ -432,7 +432,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2012/02/11 17:30:08 $
+$Date: 2012/02/16 09:31:30 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/licenses.pl-en.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.pl-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- licenses/po/licenses.pl-en.html 2 Feb 2012 02:10:34 -0000 1.3
+++ licenses/po/licenses.pl-en.html 16 Feb 2012 09:31:30 -0000 1.4
@@ -109,7 +109,7 @@
are intended to be included in another document.</li>
<li><a href="/licenses/why-not-lgpl.html">Why you shouldn't use
the Lesser GPL for your next library</a></li>
- <li><a href="/licenses/old-licenses/old-licenses.html#GPL">Older
+ <li><a href="/licenses/old-licenses/old-licenses.html#LGPL">Older
versions of the GNU LGPL</a></li>
</ul>
@@ -432,7 +432,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2012/02/02 02:10:34 $
+$Date: 2012/02/16 09:31:30 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/licenses.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/licenses.zh-cn.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- licenses/po/licenses.zh-cn.po 16 Feb 2012 07:29:23 -0000 1.2
+++ licenses/po/licenses.zh-cn.po 16 Feb 2012 09:31:30 -0000 1.3
@@ -6,13 +6,14 @@
msgid ""
msgstr ""
"Project-Id-Version: licenses.html\n"
-"POT-Creation-Date: 2011-11-29 04:25-0500\n"
+"POT-Creation-Date: 2012-02-15 12:25-0500\n"
"PO-Revision-Date: 2012-02-16 00:34-0500\n"
"Last-Translator: Li Fanxi <address@hidden>\n"
"Language-Team: Chinese <address@hidden>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-02-15 12:25-0500\n"
"Language: zh\n"
# type: Content of: <title>
@@ -240,8 +241,12 @@
# type: Content of: <ul><li>
#. type: Content of: <ul><li>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"/licenses/old-licenses/old-licenses.html#GPL\">Older versions "
+#| "of the GNU LGPL</a>"
msgid ""
-"<a href=\"/licenses/old-licenses/old-licenses.html#GPL\">Older versions of "
+"<a href=\"/licenses/old-licenses/old-licenses.html#LGPL\">Older versions of "
"the GNU LGPL</a>"
msgstr ""
"<a href=\"/licenses/old-licenses/old-licenses.html#GPL\">GNU LGPL
çæ©æçæ¬"
Index: people/people.es.html
===================================================================
RCS file: /web/www/www/people/people.es.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- people/people.es.html 6 Feb 2012 01:29:45 -0000 1.20
+++ people/people.es.html 16 Feb 2012 09:31:35 -0000 1.21
@@ -86,6 +86,15 @@
mitad de su vida, especialmente GNU/Linux y <a
href="http://www.gnu.org/s/emacs/";>GNU Emacs</a>.</p>
+<h4><a href="http://codeartnow.com";>Adrienne G. Thompson</a> <<a
+href="mailto:address@hidden";>address@hidden</a>></h4>
+<p>Está fascinada por la visión por computador. Es la autora de <a
+href="http://www.gnu.org/software/c-graph/";>C-Graph</a>, el producto de una
+unión imaginária entre la pelÃcula «Blade Runner» y su tesina de
ingenierÃa
+eléctrica de 1983 «Interactive Computer Package Demonstrating: Sampling
+Convolution and the FFT».</p>
+<p>Adrienne vive en Jamaica.</p>
+
<h4><a href="http://www.gostai.com/about/team/";>Akim Demaille</a></h4>
<p>Akim se encargó del mantenimiento de a2ps y Autoconf de GNU, colaboró con
@@ -1898,7 +1907,7 @@
<!-- timestamp start -->
Ãltima actualización:
-$Date: 2012/02/06 01:29:45 $
+$Date: 2012/02/16 09:31:35 $
<!-- timestamp end -->
</p>
Index: people/po/people.es-en.html
===================================================================
RCS file: /web/www/www/people/po/people.es-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- people/po/people.es-en.html 6 Feb 2012 01:29:52 -0000 1.4
+++ people/po/people.es-en.html 16 Feb 2012 09:31:57 -0000 1.5
@@ -83,6 +83,15 @@
over half his life, especially GNU/Linux and <a
href="http://www.gnu.org/s/emacs/";>GNU Emacs</a>.</p>
+<h4><a href="http://codeartnow.com";>Adrienne G. Thompson</a> <<a
+href="mailto:address@hidden";>address@hidden</a>></h4>
+<p>Is fascinated by robot vision. She is the sole author of <a
+href="http://www.gnu.org/software/c-graph/";>GNU C-Graph</a>, the
+product of an imagined nexus between the movie "Blade Runner" and
+her 1983 BSc. Electrical Engineering Honours dissertation "Interactive
+Computer Package Demonstrating: Sampling Convolution and the FFT".</p>
+<p>Adrienne lives in Jamaica.</p>
+
<h4><a href="http://www.gostai.com/about/team/";>Akim Demaille</a></h4>
<p>Akim maintained GNU a2ps and Autoconf, contributed to
@@ -1957,7 +1966,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2012/02/06 01:29:52 $
+$Date: 2012/02/16 09:31:57 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/compromise.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/compromise.zh-cn.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/compromise.zh-cn.html 2 Feb 2012 02:11:36 -0000 1.7
+++ philosophy/compromise.zh-cn.html 16 Feb 2012 09:32:08 -0000 1.8
@@ -6,12 +6,7 @@
<title>é¿å
æ¯çæ§ç妥å - GNU å·¥ç¨ - èªç±è½¯ä»¶åºéä¼
(FSF)</title>
<!--#include virtual="/server/banner.zh-cn.html" -->
-<!--#set var="PO_FILE"
- value='<a href="http://www.gnu.org/philosophy/po/compromise.zh-cn.po";>
- http://www.gnu.org/philosophy/po/compromise.zh-cn.po</a>' -->
- <!--#set var="ORIGINAL_FILE" value="/philosophy/compromise.html" -->
- <!--#set var="DIFF_FILE" value="" -->
- <!--#include virtual="/server/outdated.zh-cn.html" -->
+<!--#include virtual="/philosophy/po/compromise.translist" -->
<div style="float: right; font-size: 90%; width: 30em; margin: 1em;
background-color: #ececec; padding: 1em; -moz-border-radius: 1em;
margin-top: 4em;"><p><em>“äºåäºå¹´åï¼<a
@@ -19,7 +14,7 @@
— æ为‘GNU并éUNIX’ï¼GNU's Not
Unixï¼ãä½ä¸ºGNUç³»ç»25å¨å¹´çºªå¿µçä¸é¨åï¼æåä¸æ¬æï¼æéè¿ä¸ªç¤¾åºçæå们ï¼å¦ä½æè½é¿å
æ¯çæ§ç妥åãé¤äºé¿å
è¿äºå¦¥å以å¤ï¼ä½
è¿æå¾å¤éå¾å¯ä»¥<a
href="/help/">帮å©GNU</a>åèªç±è½¯ä»¶ãå
¶ä¸æç®åçä¸ä¸ªæ¹å¼æ¯<a
-href="https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052";>å
å
¥èªç±è½¯ä»¶åºéä¼</a>æ为åä¼åã”</em>—<b>çæ¥å¾·Â·æ¯ææ¼</b></p></div>
+href="https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052";>å
å
¥èªç±è½¯ä»¶åºéä¼</a>æ为ä¼åã”</em>—<b>çæ¥å¾·Â·æ¯ææ¼</b></p></div>
<h2>é¿å
æ¯çæ§ç妥å</h2>
@@ -62,7 +57,7 @@
<p>è¦æå¡âå
¬æ°ä»·å¼âï¼æ们就è¦å¯¹è¿æ
·çä»·å¼è¿è¡æ¼ç»ï¼å人们说æ为ä½è¿æ¯æ们è¡å¨çåºç³ãæ们å¿
é¡»æµå¶å¡å
åºå¼ç妥åï¼å 为é£æ ·ç妥åæ¯ä»¥æ¶è´¹è
为导åçï¼è¿ä¼å¯¹æ们çè¡å¨äº§çå½±åã</p>
-<p>ä½è¿ä¸æ¯è¯´æ们ä¸å¯æåèªç±è½¯ä»¶çå®ç¨æ§ãæ们æ¯å¯ä»¥è¿ä¹åçï¼æ们已ç»å¨è¿ä¹åäºãä½ä¸æ¦äººä»¬å¿½è§äºèªç±ï¼èåªå¼ºè°å®ç¨æ§çæ¶åï¼é®é¢å°±åºç°äºãæ以å½æ们æå°èªç±è½¯ä»¶çå®ç¨æ§çæ¶åï¼æ们åå¤å¼ºè°çä¸ç¹æ¯ï¼æ¯èµ·æ们çä»·å¼éæ©ï¼å®ç¨æ§åªæ¯<em>次è¦ç</em>ã</p>
+<p>ä½è¿ä¸æ¯è¯´æ们ä¸å¯æåèªç±è½¯ä»¶çå®ç¨æ§ãæ们æ¾ç¶æ¯å¯ä»¥è¿ä¹åçãä½ä¸æ¦äººä»¬å¿½è§äºèªç±ï¼è纯粹åªå¼ºè°å®ç¨æ§çæ¶åï¼é®é¢å°±åºç°äºãæ以å½æ们æå°èªç±è½¯ä»¶çå®ç¨æ§çæ¶åï¼æ们åå¤å¼ºè°çä¸ç¹æ¯ï¼æ¯èµ·æ们çä»·å¼éæ©ï¼å®ç¨æ§åªæ¯<em>次è¦ç</em>ã</p>
<p>æ们ä¸åéè¦å¨è¨è¾ä¸åæ
æ们çææ³ï¼å¨è¡å¨ä¸æ们ä¹è¦è¿ä¹åãæ以ï¼æ们ä¸è½åä¸å°é£äºæ们è´åäºé²é¤çä½ä¸ºå½ä¸å»ï¼ä¹ä¸å¯è®¤åè¿æ
·çä½ä¸ºï¼è¿é½æ¯æ们å¿
é¡»é¿å
ç妥åè¡ä¸ºã</p>
@@ -83,6 +78,14 @@
<p>è¦æ¯æ们åè¾åè¾ï¼èµ°å¾åå¿«ä¹æ¯«æ
æä¹ãè¦å®ç°ä¸ä¸ªä¼å¤§çç®æ
ï¼æ们éè¦ä½åºå¦¥åï¼ä½åè®°ä¸ä¸å¯ä½åºå离ç®æ
ç妥åã</p>
+<hr />
+
+<p>
+æå
³çæ´»ä¸å
¶å®é¢åä¸ç±»ä¼¼çè§ç¹ï¼è¯·åè <a
+href="http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change";>"'Nudge'
+is not enough"</a>.
+</p>
+
<div style="font-size: small;">
@@ -95,7 +98,8 @@
<p>
请å°æå
³èªç±è½¯ä»¶åºéä¼ä¸GNUçæ¥è¯¢ä¸é®é¢ï¼ä»¥è±è¯ï¼åéå°<a
href="mailto:address@hidden";><address@hidden></a>ãæ¨ä¹å¯ä»¥éè¿ <a
-href="/contact/">å
¶å®æ¹æ³</a> èç³»èªç±è½¯ä»¶åºéä¼ã <br />
+href="/contact/">å
¶å®æ¹æ³</a> èç³»èªç±è½¯ä»¶åºéä¼ã
+<br />
åç°ä»»ä½é误åé¾æ¥æå
¶å®éè¦æ´æ£çå°æ¹ï¼æä»»ä½å»ºè®®ï¼ï¼è¯·åéé®ä»¶è³ <a
href="mailto:address@hidden";><address@hidden></a>ã
</p>
@@ -115,6 +119,7 @@
<rdf:RDF xmlns="http://creativecommons.org/ns#";
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
+
<Work rdf:about="">
<license rdf:resource="http://creativecommons.org/licenses/by-nd/3.0/"; />
</Work>
@@ -134,11 +139,13 @@
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
<b>ç¿»è¯</b>: Tony Yet 2010</div>
+
+
<p>
<!-- timestamp start -->
æ´æ°ï¼
-$Date: 2012/02/02 02:11:36 $
+$Date: 2012/02/16 09:32:08 $
<!-- timestamp end -->
</p>
@@ -149,9 +156,11 @@
<!-- with the webmasters first. -->
<!-- Please make sure the copyright date is consistent with the document -->
<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
-<div id="translations">
-<h4>å
¶ä»è¯è¨</h4>
-
+<!-- <div id="translations">
+ -->
+<!-- <h4>
+Translations of this page</h4> -->
+<!-- -->
<!-- Please keep this list alphabetical by language code. -->
<!-- Comment what the language is for each type, i.e. de is German. -->
<!-- Write the language name in its own language (Deutsch) in the text. -->
@@ -166,25 +175,43 @@
<!-- If the 2-letter ISO 639-1 code is not available, -->
<!-- use the 3-letter ISO 639-2. -->
<!-- Please use W3C normative character entities. -->
-<ul class="translations-list">
+<!-- -->
+<!-- <ul class="translations-list">
+ -->
<!-- Bulgarian -->
-<li><a
href="/philosophy/compromise.bg.html">български</a> [bg]</li>
+<!-- <li>
+<a
href="/philosophy/compromise.bg.html">български</a> [bg]</li>
-->
<!-- Greek -->
-<li><a
href="/philosophy/compromise.el.html">ελληνικά</a> [el]</li>
+<!-- <li>
+<a
href="/philosophy/compromise.el.html">ελληνικά</a> [el]</li>
-->
<!-- English -->
-<li><a href="/philosophy/compromise.html">English</a> [en]</li>
+<!-- <li>
+<a href="/philosophy/compromise.html">English</a> [en]</li> -->
<!-- Spanish -->
-<li><a href="/philosophy/compromise.es.html">español</a> [es]</li>
+<!-- <li>
+<a href="/philosophy/compromise.es.html">español</a> [es]</li> -->
<!-- French -->
-<li><a href="/philosophy/compromise.fr.html">français</a> [fr]</li>
+<!-- <li>
+<a href="/philosophy/compromise.fr.html">français</a> [fr]</li> -->
<!-- Italian -->
-<li><a href="/philosophy/compromise.it.html">italiano</a> [it]</li>
+<!-- <li>
+<a href="/philosophy/compromise.it.html">italiano</a> [it]</li> -->
<!-- Malayalam -->
-<li><a
href="/philosophy/compromise.ml.html">മലയാളം</a> [ml]</li>
+<!-- <li>
+<a
href="/philosophy/compromise.ml.html">മലയാളം</a> [ml]</li>
-->
+<!-- Polish -->
+<!-- <li>
+<a href="/philosophy/compromise.pl.html">polski</a> [pl]</li> -->
+<!-- Russian -->
+<!-- <li>
+<a
href="/philosophy/compromise.ru.html">русский</a> [ru]</li>
-->
<!-- Chinese (Simplified) -->
-<li><a
href="/philosophy/compromise.zh-cn.html">简体中文</a> [zh-cn]</li>
-</ul>
-</div>
+<!-- <li>
+<a
href="/philosophy/compromise.zh-cn.html">简体中文</a> [zh-cn]</li>
-->
+<!-- </ul>
+ -->
+<!-- </div>
+ -->
</div>
</body>
</html>
Index: philosophy/free-doc.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-doc.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/free-doc.zh-cn.html 29 Dec 2011 01:26:11 -0000 1.1
+++ philosophy/free-doc.zh-cn.html 16 Feb 2012 09:32:08 -0000 1.2
@@ -3,19 +3,14 @@
<!--#include virtual="/server/header.zh-cn.html" -->
<!-- This file is automatically generated by GNUnited Nations! -->
-<title>Why Free Software needs Free Documentation - GNU Project - Free Software
-Foundation (FSF)</title>
+<title>为ä»ä¹èªç±è½¯ä»¶éè¦èªç±æå - GNU å·¥ç¨ -
èªç±è½¯ä»¶åºéä¼ (FSF)</title>
<!--#include virtual="/server/banner.zh-cn.html" -->
-<!--#set var="PO_FILE"
- value='<a href="http://www.gnu.org/philosophy/po/free-doc.zh-cn.po";>
- http://www.gnu.org/philosophy/po/free-doc.zh-cn.po</a>' -->
- <!--#set var="ORIGINAL_FILE" value="/philosophy/free-doc.html" -->
- <!--#set var="DIFF_FILE" value="" -->
- <!--#include virtual="/server/outdated.zh-cn.html" -->
<!--#include virtual="/philosophy/po/free-doc.translist" -->
<h2>为ä»ä¹èªç±è½¯ä»¶éè¦èªç±æå</h2>
+<div style="text-align: center; font-size: 110%;text-shadow: 0 0 0.2em #fff;
width: 300px; float: right; margin: 12px; background-color: #a0f112; color:
#353831; padding: 1em;"><a href="http://defectivebydesign.org/ebooks.html";>å
³æ³¨æ们æå
³çµå书å±é©æ§çé®ä»¶å表</a> ã</div>
+
<ul>
<li><a href="/copyleft/fdl.html">GNU èªç±æ档许å¯è¯</a></li>
</ul>
@@ -82,10 +77,8 @@
æ°åææ¡£ç人å¯ä»¥å°½æ©ç认è¯å°æä»æåçææ¡£èªç±åå¸çéè¦æ§ã</p>
<p>
-We can also encourage commercial publishers to sell free, copylefted manuals
-instead of proprietary ones. One way you can help this is to check the
-distribution terms of a manual before you buy it, and prefer copylefted
-manuals to noncopylefted ones.</p>
+æ们ä¹å¯ä»¥é¼å±åä¸åºç社åºå®èªç±çæCopyleftçæåæ¥ä»£æ¿éèªç±çæåãæ¨æè½åçå°±æ¯å¨è´ä¹°ä¸æ¬æååæ£æ¥å®çåè¡æ¡æ¬¾ï¼ä¼å
èèè´ä¹°
+Copyleft çæåã</p>
<p>
[é注: æ们维æ¤çä¸ä¸ª <a href="/doc/other-free-books.html">ç½é¡µ</a>
ä¸æä¾äºä¸ä»½æ¥èªå
¶å®åºçæºæçèªç±ä¹¦ç±å表].</p>
@@ -100,21 +93,21 @@
<!--#include virtual="/server/footer.zh-cn.html" -->
<div id="footer">
<p>
-Please send 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.
+请å°æå
³èªç±è½¯ä»¶åºéä¼ä¸GNUçæ¥è¯¢ä¸é®é¢ï¼ä»¥è±è¯ï¼åéå°<a
+href="mailto:address@hidden";><address@hidden></a>ãæ¨ä¹å¯ä»¥éè¿ <a
+href="/contact/">å
¶å®æ¹æ³</a> èç³»èªç±è½¯ä»¶åºéä¼ã
<br />
-Please send broken links and other corrections or suggestions to <a
-href="mailto:address@hidden";><address@hidden></a>.
+åç°ä»»ä½é误åé¾æ¥æå
¶å®éè¦æ´æ£çå°æ¹ï¼æä»»ä½å»ºè®®ï¼ï¼è¯·åéé®ä»¶è³ <a
+href="mailto:address@hidden";><address@hidden></a>ã
</p>
<p>
çæææ © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2006, 2007, 2008, 2009 <a href="http://www.fsf.org";>èªç±è½¯ä»¶åºéä¼</a>
</p>
-<p>This page is licensed under a <a rel="license"
+<p>æ¬é¡µé¢éç¨ <a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
-Attribution-NoDerivs 3.0 United States License</a>.
+Attribution-NoDerivs 3.0 United States License</a> 许å¯è¯ææã
</p>
@@ -129,7 +122,7 @@
<!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2011/12/29 01:26:11 $
+$Date: 2012/02/16 09:32:08 $
<!-- timestamp end -->
</p>
@@ -158,53 +151,73 @@
<!-- Please also check you have the 2 letter language code right versus -->
<!-- http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
<!-- -->
-<!-- <gnun>
-
-<ul class="translations-list"> -->
+<!-- <ul class="translations-list">
+ -->
<!-- Arabic -->
-<!-- <li><a
href="/philosophy/free-doc.ar.html">العربية</a> [ar]</li>
-->
+<!-- <li>
+<a
href="/philosophy/free-doc.ar.html">العربية</a> [ar]</li>
-->
<!-- Bulgarian -->
-<!-- <li><a
href="/philosophy/free-doc.bg.html">български</a> [bg]</li>
-->
+<!-- <li>
+<a
href="/philosophy/free-doc.bg.html">български</a> [bg]</li>
-->
<!-- Catalan -->
-<!-- <li><a
href="/philosophy/free-doc.ca.html">català</a> [ca]</li> -->
+<!-- <li>
+<a href="/philosophy/free-doc.ca.html">català</a> [ca]</li> -->
<!-- Czech -->
-<!-- <li><a
href="/philosophy/free-doc.cs.html">Česky</a> [cs]</li> -->
+<!-- <li>
+<a href="/philosophy/free-doc.cs.html">Česky</a> [cs]</li> -->
<!-- German -->
-<!-- <li><a href="/philosophy/free-doc.de.html">Deutsch</a> [de]</li> -->
+<!-- <li>
+<a href="/philosophy/free-doc.de.html">Deutsch</a> [de]</li> -->
<!-- English -->
-<!-- <li><a href="/philosophy/free-doc.html">English</a> [en]</li> -->
+<!-- <li>
+<a href="/philosophy/free-doc.html">English</a> [en]</li> -->
<!-- Spanish -->
-<!-- <li><a
href="/philosophy/free-doc.es.html">español</a> [es]</li> -->
+<!-- <li>
+<a href="/philosophy/free-doc.es.html">español</a> [es]</li> -->
<!-- French -->
-<!-- <li><a
href="/philosophy/free-doc.fr.html">français</a> [fr]</li> -->
+<!-- <li>
+<a href="/philosophy/free-doc.fr.html">français</a> [fr]</li> -->
<!-- Hebrew -->
-<!-- <li><a
href="/philosophy/free-doc.he.html">עברית</a> [he]</li>
-->
+<!-- <li>
+<a
href="/philosophy/free-doc.he.html">עברית</a> [he]</li>
-->
<!-- Croatian -->
-<!-- <li><a href="/philosophy/free-doc.hr.html">hrvatski</a> [hr]</li> -->
+<!-- <li>
+<a href="/philosophy/free-doc.hr.html">hrvatski</a> [hr]</li> -->
<!-- Indonesian -->
-<!-- <li><a href="/philosophy/free-doc.id.html">Bahasa
Indonesia</a> [id]</li> -->
+<!-- <li>
+<a href="/philosophy/free-doc.id.html">Bahasa Indonesia</a> [id]</li> -->
<!-- Italian -->
-<!-- <li><a href="/philosophy/free-doc.it.html">italiano</a> [it]</li> -->
+<!-- <li>
+<a href="/philosophy/free-doc.it.html">italiano</a> [it]</li> -->
<!-- Japanese -->
-<!-- <li><a
href="/philosophy/free-doc.ja.html">日本語</a> [ja]</li>
-->
+<!-- <li>
+<a
href="/philosophy/free-doc.ja.html">日本語</a> [ja]</li>
-->
<!-- Dutch -->
-<!-- <li><a href="/philosophy/free-doc.nl.html">Nederlands</a> [nl]</li>
-->
+<!-- <li>
+<a href="/philosophy/free-doc.nl.html">Nederlands</a> [nl]</li> -->
<!-- Polish -->
-<!-- <li><a href="/philosophy/free-doc.pl.html">polski</a> [pl]</li> -->
+<!-- <li>
+<a href="/philosophy/free-doc.pl.html">polski</a> [pl]</li> -->
<!-- Brazilian Portuguese -->
-<!-- <li><a href="/philosophy/free-doc.pt-br.html">português do
Brasil</a> [pt-br]</li> -->
+<!-- <li>
+<a href="/philosophy/free-doc.pt-br.html">português do
Brasil</a> [pt-br]</li> -->
<!-- Romanian -->
-<!-- <li><a
href="/philosophy/free-doc.ro.html">română</a> [ro]</li> -->
+<!-- <li>
+<a href="/philosophy/free-doc.ro.html">română</a> [ro]</li>
-->
<!-- Russian -->
-<!-- <li><a
href="/philosophy/free-doc.ru.html">русский</a> [ru]</li>
-->
+<!-- <li>
+<a
href="/philosophy/free-doc.ru.html">русский</a> [ru]</li>
-->
<!-- Serbian -->
-<!-- <li><a
href="/philosophy/free-doc.sr.html">српски</a> [sr]</li>
-->
+<!-- <li>
+<a
href="/philosophy/free-doc.sr.html">српски</a> [sr]</li>
-->
<!-- Tamil -->
-<!-- <li><a
href="/philosophy/free-doc.ta.html">தமிழ்</a> [ta]</li>
-->
+<!-- <li>
+<a
href="/philosophy/free-doc.ta.html">தமிழ்</a> [ta]</li>
-->
<!-- Turkish -->
-<!-- <li><a
href="/philosophy/free-doc.tr.html">Türkçe</a> [tr]</li> -->
+<!-- <li>
+<a href="/philosophy/free-doc.tr.html">Türkçe</a> [tr]</li>
-->
<!-- </ul>
-</gnun> -->
+ -->
<!-- </div>
-->
</div>
Index: philosophy/free-sw.de.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.de.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- philosophy/free-sw.de.html 15 Feb 2012 01:28:24 -0000 1.10
+++ philosophy/free-sw.de.html 16 Feb 2012 09:32:08 -0000 1.11
@@ -3,314 +3,457 @@
<!--#include virtual="/server/header.de.html" -->
<!-- This file is automatically generated by GNUnited Nations! -->
-<title>Die Definition Freier Software - GNU Projekt - Free Software
Foundation</title>
+<title>Was ist Freie Software? - GNU Projekt - Free Software Foundation</title>
<meta http-equiv="Keywords" content=" " />
<meta http-equiv="Description" content=" " />
-<link rel="alternate" title=" " href="http://www.gnu.org/rss/whatsnew.rss";
type="application/rss+xml" />
-<link rel="alternate" title=" " href="http://www.gnu.org/rss/quagga.rss";
type="application/rss+xml" />
+<link rel="alternate" title="Was gibt’s Neues"
href="http://www.gnu.org/rss/whatsnew.rss"; type="application/rss+xml" />
+<link rel="alternate" title="Neue Freie Software"
href="http://www.gnu.org/rss/quagga.rss"; type="application/rss+xml" />
<!--#include virtual="/server/banner.de.html" -->
<!--#include virtual="/philosophy/po/free-sw.translist" -->
-<h2>Die Definition Freier Software</h2>
+<h2>Was ist Freie Software?</h2>
-<h3> </h3>
+<h3>Freie-Software-Definition</h3>
<p>
-Wir pflegen diese Definition Freier Software, um klar zu zeigen, welche
-Kriterien ein einzelnes Software-Programm erfüllen muss, um als Freie
-Software betrachtet zu werden.
+Diese <em>Freie-Software-Definition</em> soll verdeutlichen, welche
+Kriterien ein einzelnes Softwareprogramm erfüllen muss, um als Freie
+Software betrachtet zu werden. Von Zeit zu Zeit wird diese Definition
+überarbeitet, um dies klarzustellen. Weitere Informationen zu gemachten
+Ãnderungen finden Sie unter <a href="#history">Historie</a>.
</p>
<p>
-»Freie Software« hat etwas mit Freiheit zu tun, nicht mit dem Preis. Um das
-Konzept zu verstehen, ist an »frei« wie in »freier Rede«, und nicht wie in
-»Freibier« zu denken.
+<em>Freie Software</em> ist eine Frage der Freiheit, nicht des Preises. Um
+das Konzept von <em>frei</em> zu verstehen, sollte an <em>Redefreiheit</em>
+gedacht werden ‑ nicht an <em>Freibier</em>.
</p>
<p>
-Freie Software bedeutet die Freiheit des Benutzers, die Software zu
-benutzen, zu kopieren, sie zu vertreiben, zu studieren, zu verändern und zu
-verbessern. Genauer gesagt, bezieht sich der Begriff »Freie Software« auf
-vier Arten von Freiheit, die der Benutzer der Software hat:
+<em>Freie Software</em> ist eine Frage der Freiheit des Benutzers, Software
+auszuführen, zu kopieren, zu verbreiten, zu untersuchen, zu ändern und zu
+verbessern. Genauer bedeutet es, dass Programmnutzer vier wesentliche
+Freiheiten haben:
</p>
<ul>
- <li>Die Freiheit, das Programm für jeden Zweck zu benutzen (Freiheit
0).</li>
- <li>Die Freiheit, zu verstehen, wie das Programm funktioniert und wie man es
für
-seine Ansprüche anpassen kann (Freiheit 1). Der Zugang zum Quellcode ist
-dafür Voraussetzung.
+ <li>Die Freiheit, das Programm für jeden Zweck auszuführen <em>(Freiheit
+0)</em>.</li>
+ <li>Die Freiheit, die Funktionsweise des Programms zu untersuchen und eigenen
+Bedürfnissen der Datenverarbeitung anzupassen <em>(Freiheit 1)</em>. Der
+Zugang zum Quellcode ist dafür Voraussetzung.
</li>
- <li>Die Freiheit, Kopien weiterzuverbreiten, so dass man seinem Nächsten
-weiterhelfen kann (Freiheit 2).
+ <li>Die Freiheit, das Programm weiterzuverbreiten und damit seinen
Mitmenschen
+zu helfen <em>(Freiheit 2)</em>.
</li>
- <li>Die Freiheit, das Programm zu verbessern und die Verbesserungen der
-Ãffentlichkeit zur Verfügung zu stellen, damit die ganze Gemeinschaft davon
-profitieren kann (Freiheit 3). Der Zugang zum Quellcode ist dafür
-Voraussetzung.
+ <li>Die Freiheit, das Programm zu verbessern und diese Verbesserungen der
+Ãffentlichkeit freizugeben, damit die gesamte Gemeinschaft davon profitiert
+<em>(Freiheit 3)</em>. Der Zugang zum Quellcode ist dafür Voraussetzung.
</li>
</ul>
<p>
-Ein Programm ist Freie Software, wenn die Benutzer alle diese Freiheiten
-haben. Somit sollte man die Freiheit haben, Kopien weiterzuverbreiten,
-entweder mit oder ohne Veränderungen, gratis oder gegen Erhebung einer
-Gebühr für die Verbreitung, an <a href="#exportcontrol">jeden und
-überall</a>. Frei zu sein in diesen Dingen bedeutet (abgesehen von anderen
-Punkten), dass man nicht nach Erlaubnis fragen oder für eine Erlaubnis
-bezahlen muss.
+Ein Programm ist Freie Software, wenn Nutzer alle diese Freiheiten
+haben. Somit sollte man die Freiheit haben, Kopien an <a
+href="#exportcontrol">jeden und überall</a> weiterzugeben (entweder mit
+oder ohne Modifikationen, gratis oder gegen eine Gebühr für den
+Vertrieb). <em>Frei</em> zu sein bedeutet, diese Dinge (unter anderem) zu
+machen ‑ ohne fragen oder für die Berechtigung zahlen zu
+müssen.
</p>
<p>
-Man sollte ebenso die Freiheit haben, Veränderungen zu machen und diese
-privat - bei der eigenen Arbeit oder beim Spiel - zu verwenden, sogar ohne
-zu erwähnen, dass es diese Ãnderungen gibt. Wenn man seine Veränderungen
-veröffentlicht, sollte nicht verlangt werden, jemand bestimmten oder auf
-eine bestimmte Art zu informieren.
+AuÃerdem sollte man die Freiheit haben, auch privat im eigenen Werk oder
+Spiel Modifikationen vorzunehmen und zu verwenden, ohne auch nur deren
+Existenz zu erwähnen. Veröffentlicht man die Ãnderungen, sollte eine
+bestimmte Person oder eine bestimmte Form der Benachrichtigung nicht
+erforderlich sein.
</p>
<p>
-Die Freiheit, ein Programm zu benutzen heiÃt, dass jede Person oder
-Organisation das Programm auf jeder Art von Computersystem für jede
-Tätigkeit benutzen kann, ohne das verlangt werden kann, sich deshalb mit dem
-Entwickler oder irgendeiner bestimmten Stelle in Verbindung zu setzen.
+Die Freiheit, das Programm auszuführen, bedeutet für irgendeine Person oder
+Organisation die Freiheit zu haben, es auf irgendeinem Rechnersystem für
+irgendeine allgemeine Aufgabe und Zweck zu verwenden, ohne darüber mit dem
+Entwickler oder irgendeinem Unternehmen kommunizieren zu müssen. In dieser
+Freiheit ist der <em>Benutzer</em> das Ziel, nicht der <em>Entwickler</em>!
+Ihnen als Nutzer steht es frei, das Programm für eigene Zwecke auszuführen
+und, wenn an jemand anderes weitergegeben, steht dieser Person dann frei, es
+für eigene Zwecke auszuführen, aber Sie sind nicht berechtigt, ihr eigene
+Zwecke aufzuerlegen.
</p>
<p>
-Die Freiheit, Kopien zu verteilen, muss sowohl für binäre, also ausführbare
-Formen des Programms, als auch für den Quellcode gelten, sowohl für
-veränderte wie für unveränderte Versionen. Es ist in Ordnung, wenn es keine
-Möglichkeit gibt, binäre oder ausführbare Formen herzustellen (da manche
-Sprachen diese Möglichkeit nicht bieten). Aber man muss die Freiheit haben,
-Programme in dieser Form zu verteilen, wenn man eine Möglichkeit gefunden
-hat, sie herzustellen.
+Die Freiheit, Kopien weiterzuverbreiten, muss binäre oder ausführbare Formen
+des Programms als auch Quellcode für modifizierte und unmodifizierte
+Versionen beinhalten (die Verbreitung von Programmen in ausführbarer Form
+ist für bequem installierbare freie Betriebssysteme notwendig). Es ist in
+Ordnung, wenn es für bestimmte Anwendungen keine Möglichkeit gibt, eine
+Binärdatei oder ausführbare Form zu produzieren (da einige
+Programmiersprachen diese Funktion nicht unterstützen), aber Sie müssen die
+Freiheit haben, solche Formen an Dritte weiterzugeben, sollten Sie eine
+Möglichkeit finden oder entwickeln, sie herzustellen.
</p>
<p>
-Damit die Freiheit, Ãnderungen zu machen und verbesserte Versionen zu
-veröffentlichen, sinnvoll ist, muss man Zugang zum Quellcode eines Programms
-haben. Daher ist der Zugang zum Quellcode eine notwendige Bedingung für
-Freie Software.
+Damit Freiheiten 1 und 3 (die Freiheiten, Ãnderungen zu machen und
+verbesserte Versionen zu veröffentlichen) sinnvoll sind, müssen Nutzer
+Zugriff auf den Quellcode des Programms haben. Daher ist die Zugänglichkeit
+des Quellcodes eine notwendige Voraussetzung für Freie
+Software. Verschleierter „Quellcode“ ist nicht wirklich
+Quellcode und zählt nicht als Quellcode.
</p>
<p>
-
+<em>Freiheit 1</em> umfasst die Freiheit, die eigene geänderte Version
+anstelle des Originals zu verwenden. Kommt das Programm in einem Produkt zum
+Einsatz, in dem die modifizierte Version eines Dritten, nicht jedoch die
+eigene ‑ eine als <em>Tivoisierung</em> oder
+<em>Sperrung</em> ‚Lockdown‘ oder (in seiner Praktizierenden
+perversen Terminologie) als <em>Secure Boot</em><sup><a href="#transnote1"
+id="transnote1">1</a></sup> bekannte Praxis ‑  ausgeführt
+wird, wird Freiheit 1 eher zu einer theoretischen Fiktion anstelle
+einer praktischen Freiheit. Das reicht nicht aus! Mit anderen Worten sind
+diese Binärdateien keine freie Software, selbst wenn der Quellcode, von dem
+kompiliert wurde, frei ist.
</p>
<p>
-
+Die Zusammenführung der verfügbaren freien Unterroutinen und -module ist
+eine wichtige Möglichkeit, ein Programm zu modifizieren. Wenn die
+Programmlizenz eines entsprechend lizenzierten vorhandenen Moduls die
+Zusammenführung untersagt ‑ beispielsweise wenn Sie nicht
+der Copyrightinhaber des hinzuzufügenden Quellcodes
+sind ‑ dann ist die Lizenz zu restriktiv, um sich als
+<em>frei</em> zu qualifizieren.
</p>
<p>
-
+<em>Freiheit 3</em> umfasst die Freiheit, eigene modifizierte Versionen als
+Freie Software freizugeben. Eine freie Lizenz kann auch andere Möglichkeiten
+der Freigabe zulassen; mit anderen Worten muss es sich nicht um eine <a
+href="/copyleft/copyleft">Copyleft</a>-Lizenz handeln. Allerdings
+qualifiziert sich eine Lizenz, die von modifizierten Versionen verlangt
+unfrei zu sein, nicht als freie Lizenz.
</p>
<p>
-Damit diese Freiheiten wirklich gelten, müssen sie unwiderruflich sein, so
-lange man nichts Unrechtes macht; hat der Entwickler der Software die
-Möglichkeit, die Lizenzbedingungen zu widerrufen, ohne dass man ihm einen
-Grund dazu gibt, ist die Software nicht frei.
+Damit diese Freiheiten wirklich gelten, müssen diese dauerhaft und
+unwiderruflich sein ‑ so lange man nichts Unrechtes
+anstellt. Sofern der Entwickler der Software befugt ist die Lizenz zu
+widerrufen oder Bedingungen nachträglich zu ändern, ohne dafür Anlass
+gegeben zu haben, ist die Software unfrei.
</p>
<p>
-Allerdings sind bestimmte Richtlinien über die Art und Weise der Verbreitung
-freier Software akzeptabel, sofern sie den grundlegenden Freiheiten nicht
-widersprechen. Copyleft ist (sehr vereinfacht) beispielsweise eine
+Allerdings sind bestimmte Richtlinien über die Art und Weise Freie Software
+zu verbreiten akzeptabel, sofern sie nicht den wesentlichen Freiheiten
+widersprechen. Copyleft ist beispielsweise (sehr vereinfacht) eine
Richtlinie, die verhindert, dass bei einer Weiterverbreitung des Programms
-keine Einschränkungen hinzugefügt werden können, die Anderen grundlegende
-Freiheiten verweigern. Diese Richtlinie widerspricht nicht den grundlegenden
+keine Einschränkungen hinzugefügt werden können, die Anderen wesentliche
+Freiheiten versagen. Diese Richtlinie widerspricht nicht den wesentlichen
Freiheiten ‑ vielmehr schützt es sie.
</p>
<p>
-Man kann also Geld für eine Kopie von GNU Software bezahlt oder sie
-kostenlos erhalten haben. Aber egal, wie man die Kopien bekommen hat, man
-hat immer die Freiheit, die Software zu kopieren, sie zu verändern, sogar
-Kopien davon zu verkaufen.
+<em>Freie Software</em> bedeutet nicht <em>nicht kommerziell</em>. Ein
+freies Programm muss für den kommerziellen Gebrauch, kommerzielle
+Entwicklung und kommerziellen Vertrieb verfügbar sein. Die kommerzielle
+Entwicklung freier Software ist nicht mehr unüblich; freie kommerzielle
+Software ist sehr wichtig. Sie können Geld für den Erhalt von Kopien freier
+Software ausgegeben oder kostenlos erhalten haben. Aber egal wie Sie die
+Kopien bekamen, Sie haben die Freiheit, die Software zu vervielfältigen und
+zu ändern, sogar <a href="/philosophy/selling">Kopien verkaufen</a>.
</p>
<p>
-»Freie Software« heiÃt nicht »unkommerziell«. Ein freies Programm muss
für
-den kommerziellen Gebrauch, die kommerzielle Entwicklung und für die
-kommerzielle Verteilung zur Verfügung stehen. Die kommerzielle Entwicklung
-Freier Software ist nicht mehr unüblich; solche freie kommerzielle Software
-ist sehr wichtig.
+Ob eine Ãnderung eine Verbesserung darstellt, ist eine subjektive
+Angelegenheit. Wenn Modifikationen im Wesentlichen auf Verbesserungen
+beschränkt sind, ist das nicht Freiheit.
</p>
<p>
-
+Richtlinien, wie man eine modifizierte Version verpacken kann, sind
+allerdings akzeptabel, aofern sie nicht substantiell die Freiheit
+beschränken, modifizierte Versionen freizugeben oder modifizierte Versionen
+privat herzustellen und zu nutzen. Somit ist es akzeptabel, wenn die Lizenz
+verlangt, den Namen der modifizierten Version zu ändern, ein Logo zu
+entfernen oder eigene Modifikationen als eigene zu identifizieren. Solange
+diese Bedingungen nicht so aufwändig sind, dass sie die Freigabe der
+Ãnderungen effektiv behindern, sind sie zulässig; Sie nehmen schon andere
+Programmänderungen vor, ein paar mehr sollten keine Probleme machen…
</p>
<p>
-Regelungen über das »Verpacken« von veränderten Versionen sind zulässig,
-solange sie die Freiheit, veränderte Versionen zu veröffentlichen, nicht
-faktisch verhindern. Regelungen, die festlegen, dass wenn ein Programm in
-jener Art verfügbar gemacht wird, es auch in dieser verfügbar gemacht werden
-muss, sind ebenfalls unter der gleichen Bedingung zulässig. Es ist auch
-akzeptabel, wenn eine Lizenz fordert, dass wenn man eine veränderte Version
-vertreibt und ein früherer Entwickler eine Kopie der veränderten Version
-anfordert, man ihm diese zukommen lassen muss.
+Richtlinien wie „Wenn Sie Ihre Version auf diese Weise zur Verfügung
+stellen, müssen Sie sie auch auf diese Weise zur Verfügung stellen.“
+können unter derselben Bedingung ebenfalls akzeptabel sein. Solch eine
+akzeptable Richtlinie wäre beispielsweise, dem früheren Entwickler auf
+dessen Bitte eine Kopie der modifizierten und verbreiteten Version zukommen
+lassen zu müssen (Hinweis: Eine solche Richtlinie lässt Ihnen immer noch die
+Auswahl, ob Sie Ihre Version überhaupt verbreiten möchten). Ebenfalls sind
+Richtlinien akzeptabel, die die Freigabe des Quellcodes für öffentlich
+einsetzbare Programmversionen an Nutzer verlangen.
</p>
<p>
-Im GNU Projekt benutzen wir <a
-href="/copyleft/copyleft.html">»Copyleft«</a>, um diese Freiheiten für jeden
-gesetzlich zu schützen. Aber es gibt auch <a
+Das GNU Projekt benutzt <a href="/copyleft/copyleft">Copyleft</a>, um diese
+Freiheiten rechtlich für jeden zu schützen. Aber es gibt auch <a
href="/philosophy/categories.html#Non-CopyleftedFreeSoftware">nicht unter
-Copyleft stehende Freie Software</a>. Wir glauben, dass es wichtige Gründe
-gibt, <a href="/philosophy/pragmatic.html">warum man besser Copyleft
-benutzt</a>. Aber auch wenn ein freies Programm nicht durch Copyleft
-geschützt ist, können wir es gebrauchen.<br /><br />
-Unter <a href="/philosophy/categories.html">Kategorien Freier Software
-(DateigröÃe 18 KB)</a> findet man eine Beschreibung, wie »Freie Software«,
-»Software unter Copyleft« und andere Kategorien von Software miteinander
-zusammenhängen.
+Copyleft stehende freie Software</a>. Wir glauben, es gibt wichtige Gründe,
+warum es <a href="/philosophy/pragmatic">besser ist Copyleft zu
+benutzen</a>. Aber auch wenn ein Programm freie Software ohne Copyleft ist,
+ist sie grundsätzlich immer noch ethisch vertretbar (siehe auch <a
+href="/philosophy/categories">Kategorien freier und unfreier Software</a>,
+wie sich <em>Freie Software</em>, <em>Software mit Copyleft</em> und andere
+Softwarekategorien auf einander beziehen).
</p>
<p>
-Manchmal können Export-Regulierungen seitens der Regierung und
-Wirtschaftssanktionen die Freiheit, Kopien eines Programms international zu
-verbreiten, einschränken. Software-Entwickler haben keine Möglichkeit, diese
-Restriktionen zu ignorieren oder sich über sie hinwegzusetzen, aber sie
-können und müssen sich weigern, diese Restriktionen durch Aufnahme in die
-Nutzungsbedingungen eines Programmes zu fördern. Dadurch betreffen die
-Restriktionen wenigstens keine Aktivitäten und Menschen auÃerhalb des
-Rechtsbereichs dieser Regierungen.
+Mitunter können staatliche <a
+id="exportcontrol">Ausfuhrkontrollbestimmungen</a> und Handelssanktionen die
+Freiheit einschränken, Programmkopien international zu
+verbreiten. Softwareentwickler haben nicht die Macht, diese Einschränkungen
+zu beseitigen oder auÃer Kraft zu setzen, aber sie können und müssen sich
+widersetzen, sie als Nutzungsbedingungen des Programms aufzuerlegen. Dadurch
+betreffen die Einschränkungen keine Aktivitäten und Menschen auÃerhalb der
+Rechtsordnungen dieser Regierungen. Daher dürfen freie Softwarelizenzen
+keinen Gehorsam gegenüber allen Ausfuhrbestimmungen als Bedingung für eine
+der wesentlichen Freiheiten verlangen.
</p>
<p>
-
+Die meisten freien Softwarelizenzen basieren auf Copyright, und es gibt
+Beschränkungen auf die Arten von Anforderungen, die durch Copyright
+auferlegt werden können. Wenn eine copyrightbasierte Lizenz Freiheit auf die
+oben beschriebene Weise respektiert, ist es unwahrscheinlich, eine andere
+Art von Problem zu haben, das nicht voraussehbar war (obwohl dies
+gelegentlich vorkommt). Einige freie Softwarelizenzen basieren allerdings
+auf Verträgen, und Verträge können eine viel gröÃere Bandbreite möglicher
+Beschränkungen auferlegen. Das bedeutet viele Möglichkeiten, wie solch eine
+Lizenz inakzeptabel restriktiv und unfrei sein könnte.
</p>
<p>
-
+Es ist unmöglich, alle auftretenden Möglichkeiten aufzuführen. Wenn eine
+vertragsbasierte Lizenz den Nutzer auf eine ungewöhnliche Weise beschränkt,
+welches copyrightbasierte Lizenzen nicht können und hier nicht als legitim
+genannt wird, müssen wir darüber nachdenken und wahrscheinlich zu dem
+Schluss kommen, dass sie unfrei ist.
</p>
<p>
-Spricht man über Freie Software, ist es ratsam, Begriffe wie »Geschenk« oder
-»gratis« zu vermeiden, weil diese Begriffe nahelegen, dass es um den Preis
-geht - und nicht um die Freiheit. Einige geläufige Begriffe, wie
-»Software-Piraterie«, verkörpern Meinungen, von denen wir hoffen, dass man
-sie nicht gutheiÃt. Unter <a
-href="/philosophy/words-to-avoid.html">Verwirrende Worte und Ausdrücke, die
-man vermeiden sollte</a> gibt es eine Diskussion dieser Begriffe. Wir führen
-auch eine Liste von Ãbersetzungen von <a
-href="/philosophy/fs-translations.html">Ãbersetzungen von »Freier
-Software«</a> in verschiedene Sprachen.
+Spricht man über Freie Software, empfiehlt es sich Begriffe wie
+<em>verschenken</em> oder <em>kostenlos</em> zu vermeiden, weil diese
+Begriffe implizieren, es würde um den Preis gehen, nicht um Freiheit. Einige
+gebräuchliche Begriffe wie <em>Piraterie</em> stellen Meinungen dar, von
+denen wir hoffen, dass Sie diese nicht unterstützen. Siehe für weitere
+Informationen auch <a href="/philosophy/words-to-avoid">Verwirrende Worte
+und Ausdrücke, die vermieden werden sollten</a> sowie <a
+href="/philosophy/fs-translations">Ãbersetzungen des Begriffs <em>Freie
+Software</em></a> in verschiedenen Sprachen.
</p>
<p>
-Zum Schluà noch der Hinweis, daà Kriterien, wie sie in dieser Definition
-Freier Software genannt wurden, sorgfältiges Nachdenken erfordern, um sie
-interpretieren zu können. Um zu entscheiden, ob eine bestimmte
-Software-Lizenz als eine Lizenz für Freie Software gelten kann, stützen wir
-uns auf diese Kriterien und ermitteln, ob sowohl die Intention wie auch der
-genaue Wortlaut der Lizenz diesen Kriterien genügt. Enthält eine Lizenz
-unzumutbare Einschränkungen, lehnen wir sie ab, auch wenn wir sie nicht in
-diesen Kriterien erwähnt haben. Manchmal führt eine Lizenz-Forderung zu
-einem Punkt, der intensives Nachdenken nötig macht, einschlieÃlich
-Diskussionen mit einem Rechtsanwalt, bevor wir entscheiden können, ob diese
-Forderung akzeptabel ist. Wenn wir eine Entscheidung über einen neuen
-Streitpunkt gefällt haben, aktualisieren wir häufig diese Kriterien, damit
-man einfacher sehen kann, warum eine bestimmte Lizenz angenommen wurde oder
-nicht.
+AbschlieÃend noch der Hinweis, dass die in dieser Freie-Software-Definition
+angegeben Kriterien sorgfältige Ãberlegungen bei ihrer Interpretation
+erfordern. Um zu entscheiden, ob sich eine bestimmte Softwarelizenz als
+freie Softwarelizenz qualifiziert, beurteilen wir basierend auf diesen
+Kriterien, ob ihr Geist sowie der genaue Wortlaut passt. Enthält eine Lizenz
+übertriebene Beschränkungen, wird sie abgelehnt, auch wenn wir das Problem
+in diesen Kriterien nicht erwarteten. Manchmal spricht eine
+Lizenzanforderung ein Punkt an, der umfangreiche Ãberlegungen erfordert,
+einschlieÃlich Diskussionen mit einem Rechtsanwalt, bevor entschieden werden
+kann, ob diese Anforderung annehmbar ist. Wird ein Punkt zum Abschluss
+gebracht, werden diese Kriterien aktualisiert, um verständlicher zu machen,
+warum sich bestimmte Lizenzen qualifizieren oder nicht.
</p>
<p>
-Wenn es dich interessiert, ob eine bestimmte Lizenz den Anforderungen an
-eine Lizenz für Freie Software genügt, dann steht dir unsere <a
-href="/licenses/license-list">Lizenzen-Liste</a> zur Verfügung. Sollte die
-Lizenz, mit der du dich gerade befasst, hier nicht aufgeführt sein, dann
-kannst du bei uns per E-Mail unter <a
-href="mailto:address@hidden";><address@hidden></a> nachfragen.
+Weitere Informationen, ob sich eine bestimmte Lizenz als freie
+Softwarelizenz qualifiziert, siehe <a
+href="/licenses/license-list">Verschiedene Lizenzen und
+Kommentare</a>. Sollte die Lizenz nicht aufgeführt sein, kontaktieren Sie
+uns bitte unter <a
+href="mailto:address@hidden";><address@hidden></a>.
</p>
<p>
-
+Wenn Sie daran denken eine neue Lizenz zu schreiben, wenden Sie sich bitte
+zuerst an die Free Software Foundation. Die starke Zunahme verschiedener
+freier Softwarelizenzen bedeutet erhöhte Arbeit für Nutzer, um die Lizenzen
+zu verstehen; wir können Ihnen helfen, eine vorhandene freie Softwarelizenz
+zu finden, die Ihre Bedürfnisse erfüllt.
</p>
<p>
-
+Ist das nicht möglich, wenn Sie wirklich eine neue Lizenz benötigen, können
+Sie mit unserer Hilfe sicherstellen, dass die Lizenz wirklich eine freie
+Softwarelizenz ist und verschiedene praktische Probleme vermeiden.
</p>
-<h2 id="beyond-software"> </h2>
+<h2 id="beyond-software">Jenseits von Software</h2>
<p>
-
+<a href="/philosophy/free-doc">Software-Handbücher müssen frei sein</a>, aus
+den gleichen Gründen, warum Software frei sein muss und weil Handbücher in
+der Tat Bestandteil der Software sind.
</p>
<p>
-
+Die gleichen Argumente sind auch für andere Arten von Werken im
+Praxiseinsatz sinnvoll ‑ also Werke wie pädagogische Werke
+und Nachschlagewerke, die nützliches Wissen verkörpern. <a
+href="http://de.wikipedia.org";>Wikipedia</a> ist das wohl bekannteste
+Beispiel.
</p>
<p>
-
+Jegliches Werk <em>kann</em> frei sein; und die Freie-Software-Definition
+hat sich als Definition <a href="http://freedomdefined.org/";>freier
+kultureller Werke</a> erwiesen, die auf jede Art von Werken anwendbar sind.
</p>
-<h2 id="open-source"> </h2>
+<h2 id="open-source">Open Source, offener Quellcode?</h2>
<p>
-Eine andere Gruppe begann den Begriff "Open Source" zu benutzen, der etwas
-ähnliches (aber nicht identisches) wie "Freie Software" meint. Wir
-bevorzugen den Begriff "Freie Software", denn wenn man ihn einmal gehört
-hat, verbindet man ihn mit Freiheit, und nicht mit dem Preis â <a
-href="open-source-misses-the-point.html">er weckt Gedanken an Freiheit</a>.
+Eine andere Gruppe begann den Begriff „Open Source“ zu
+verwenden, um etwas ähnliches (aber nicht identisches) wie „freie
+Software“ zu meinen. Die Freie-Software-Gemeinschaft bevorzugt den
+Begriff <em><strong>Freie Software</strong></em>, denn sobald man gehört
+hat, dass er sich auf die Freiheit statt den Preis bezieht, ruft er den
+Geist der Freiheit aus. Das Wort „offen“ <a
+href="/philosophy/open-source-misses-the-point">bezieht sich niemals auf die
+Freiheit</a>.
</p>
-<h2 id="History"> </h2>
+<h2 id="History">Historie</h2>
-<p> </p>
+<p>Von Zeit zu Zeit wird die Freie-Software-Definition zur näheren
Erläuterung
+überarbeitet. Diese Modifikationen sowie Verweise veranschaulichen genau,
+was geändert wurde.</p>
<ul>
-<li> </li>
-
-<li> </li>
-
-<li> </li>
-
-<li> </li>
-
-<li> </li>
-
-<li> </li>
-
-<li>
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.104&r2=1.105";
+hreflang="en">Version 1.105</a>: Spiegelt in einer kurzen Darstellung den
+Punkt von Freiheit 1 wider (bereits in Version 1.80 erwähnt), dass Sie
+tatsächlich Ihre modifizierte Version in Ihrer Datenverarbeitung nutzen
+dürfen.</li>
+
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.91&r2=1.92";
+hreflang="en">Version 1.92</a>: Klarstellung, dass sich verschleierter Code
+nicht als Quellcode qualifiziert.</li>
+
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.89&r2=1.90";
+hreflang="en">Version 1.90</a>: Klarstellung, dass Freiheit 3 ââdas Recht,
+Kopien eigener modifizierter oder verbesserter Version zu verbreiten,
+bedeutet und nicht, sich an einem Entwicklungsprojekt eines Dritten zu
+beteiligen.</li>
+
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.88&r2=1.89";
+hreflang="en">Version 1.89</a>: Freiheit 3 gewährt das Recht, modifizierte
+Versionen als Freie Software freizugeben.</li>
+
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.79&r2=1.80";
+hreflang="en">Version 1.80</a>: Freiheit 1 muss nicht nur theoretisch,
+sondern praktisch sein; d. h. keine Tivoisierung.</li>
+
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.76&r2=1.77";
+hreflang="en">Version 1.77</a>: Klarstellung, dass alle nachträglichen
+Lizenzänderungen inakzeptabel sind, auch wenn nicht als vollständiger Ersatz
+beschrieben.</li>
+
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.73&r2=1.74";
+hreflang="en">Version 1.74</a>: Vier Klarstellungen von Punkten, die nicht
+explizit genug oder an einigen Stellen angegebenen sind, aber nicht überall
+reflektiert werden:
<ul>
-<li> </li>
-<li> </li>
-<li> </li>
-<li> </li>
+<li>„Verbesserungen“ bedeutet nicht, dass die Lizenz inhaltlich
+beschränken kann, welche Arten von modifizierten Versionen freigegeben
+werden können. Freiheit 3 enthält die Verbreitung modifizierter Versionen,
+nicht nur deren Ãnderungen.</li>
+<li>Das Recht, vorhandene Module zusammenzufügen, bezieht sich auf
entsprechend
+lizenzierte Module.</li>
+<li>Ausdrücklich die Schlussfolgerung des Punktes über Exportkontrolle.</li>
+<li>Einführung einer Lizenzänderung führt zur Aufhebung der alten
Lizenz.</li>
</ul>
</li>
-<li> </li>
-
-<li> </li>
-
-<li> </li>
-
-<li> </li>
-
-<li> </li>
-
-<li> </li>
-
-<li> </li>
-
-<li> </li>
-
-<li> </li>
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.56&r2=1.57";
+hreflang="en">Version 1.57</a>: Kapitel <em>Jenseits von Software</em>
+hinzugefügt.</li>
+
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.45&r2=1.46";
+hreflang="en">Version 1.46</a>: Klärung des für die Freiheit bedeutsamen
+Ziels, das Programm für jeden Zweck auszuführen.</li>
+
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.40&r2=1.41";
+hreflang="en">Version 1.41</a>: Klarstellung zum Wortlaut vertraglich
+geregelter Lizenzen.</li>
+
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.39&r2=1.40";
+hreflang="en">Version 1.40</a>: Erklärung, dass eine freie Lizenz erlauben
+muss, andere verfügbare Freie Software, um eigene Ãnderungen zu
erstellen.</li>
+
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.38&r2=1.39";
+hreflang="en">Version 1.39</a>: Es ist akzeptabel, wenn eine Lizenz
+erfordert, den Quellcode für von Ihnen für die öffentliche Nutzung
+bereitgestellte Softwareversionen zur Verfügung zu stellen.</li>
+
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.30&r2=1.31";
+hreflang="en">Version 1.31</a>: Es ist akzeptabel, wenn eine Lizenz
+erfordert, sich als Autor von Modifikationen zu identifizieren sowie weitere
+geringfügige Klarstellungen.</li>
+
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.22&r2=1.23";
+hreflang="en">Version 1.23</a>: Potenzielle Probleme im Zusammenhang mit
+vertragsbasierten Lizenzen.</li>
+
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.15&r2=1.16";
+hreflang="en">Version 1.16</a>: Erklärung, warum der Vertrieb von
+Binärdateien wichtig ist.</li>
+
+<li><a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&r1=1.10&r2=1.11";
+hreflang="en">Version 1.11</a>: Eine freie Lizenz kann verlangen, eine Kopie
+der von Ihnen verbreiteten Versionen an den Autor zu senden.</li>
</ul>
-<p> </p>
+<p>Aufgrund vieler anderer Ãnderungen gibt es Lücken in den Versionsnummern,
+die nicht den Inhalt der Definition selbst änderten. Stattdessen wurden
+Verweise korrigiert, Ãbersetzungen hinzugefügt usw. Eine vollständige
+Ãbersicht aller Ãnderungen finden Sie mittels der <a
+href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&view=log";
+hreflang="en">CVSweb-Oberfläche</a>.</p>
<div style="font-size: small;">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
- </div>
+<strong>Anmerkungen der ÃbersetzerInnen:</strong>
+<ol>
+<li id="transnote1"><em>Secure Boot</em> soll Rechner gegen Angriffe bereits
+vor dem Start des eigentlichen Betriebssystems mit kryptografischen Methoden
+schützen. So sollen etwa nur digital signierte Gerätetreiber geladen und
+digital signierte EFI-Bootloader ausgeführt werden.</li>
+</ol></div>
</div>
<!--#include virtual="/server/footer.de.html" -->
@@ -334,8 +477,8 @@
</p>
<p>
-Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006,
+2007, 2009, 2010 Free Software Foundation, Inc.
</p>
<p>Dieses Werk bzw. Inhalt steht unter einer <a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.de";>Creative
@@ -347,14 +490,14 @@
<div class="translators-credits">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-<strong>Ãbersetzung:</strong> Guido Arnold, 2002.</div>
+<strong>Ãbersetzung:</strong> Guido Arnold, 2002. Joerg Kohne, 2012.</div>
<p>
<!-- timestamp start -->
Aktualisierung:
-$Date: 2012/02/15 01:28:24 $
+$Date: 2012/02/16 09:32:08 $
<!-- timestamp end -->
</p>
Index: philosophy/po/free-sw.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.de.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/free-sw.de.po 16 Feb 2012 01:24:22 -0000 1.5
+++ philosophy/po/free-sw.de.po 16 Feb 2012 09:32:37 -0000 1.6
@@ -12,7 +12,7 @@
"Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German <address@hidden>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <title>
Index: copyleft/copyleft.zh-cn.html
===================================================================
RCS file: copyleft/copyleft.zh-cn.html
diff -N copyleft/copyleft.zh-cn.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ copyleft/copyleft.zh-cn.html 16 Feb 2012 09:27:19 -0000 1.1
@@ -0,0 +1,232 @@
+
+
+<!--#include virtual="/server/header.zh-cn.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>ä»ä¹æ¯Copyleftï¼ - GNU å·¥ç¨ - èªç±è½¯ä»¶åºéä¼ (FSF)</title>
+<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation,
Linux, Copyleft, èªç±è½¯ä»¶åºéä¼" />
+
+<!--#include virtual="/server/banner.zh-cn.html" -->
+<!--#include virtual="/copyleft/po/copyleft.translist" -->
+<h2>ä»ä¹æ¯Copyleftï¼</h2>
+
+<p>
+Copyleft æ¯ä¸ç§è®©ç¨åºæå
¶å®ä½åä¿æèªç±çéç¨æ¹æ³ï¼å¹¶è¦æ±å¯¹Copyleftç¨åºçä»»ä½ä¿®æ¹åæ©å±é½ä¿æèªç±ã</p>
+
+<p>
+让ç¨åºæ为èªç±è½¯ä»¶æç®åçæ¹æ³æ¯æ¾å¼å¯¹å®ççæ并æå®æ¾å°
<a
+href="/philosophy/categories.html#PublicDomainSoftware">å
Œ
񂛆</a>
+ä¸ãè¿ä½¿å¾ä»äººå¨éè¦çæ¶åå¯ä»¥å
±äº«è¿ä¸ªè½¯ä»¶åå
¶å¯¹å®çæ¹è¿ãä½è¿ä¹ä½¿å¾å
¶å®ä¸äºä¸æ¿åä½ç人æå®ä»¬è½¬åæ <a
+href="/philosophy/categories.html#ProprietarySoftware">ç§æ软件</a>
+ãä»ä»¬å¯ä»¥æå¤æå°çè¿è¡ä¿®æ¹ï¼å¹¶æææä½ä¸ºåä¸äº§ååå¸ãè¿äºä¿®æ¹è¿çç¨åºä¸ååå®ä»¬çåå§ä½è
æææçé£æ ·å
许ç¨æ·èªç±ç使ç¨ï¼è¿ç§èªç±è¢«ä¸é´åå¥å¤ºäºã</p>
+
+<p>
+å¨ <a href="/gnu/thegnuproject.html">GNU å·¥ç¨</a> ä¸ï¼æ们çç®æ
æ¯è®© <em>ææç</em>
+ç¨æ·å¯ä»¥èªç±çéæ°ååæä¿®æ¹ GNU
软件ãå¦æä¸é´åå¯ä»¥å¥å¤ºè¿ç§èªç±ï¼æ们å¯è½ä¼æå¾å¤çç¨æ·ï¼ä½è¿äºç¨æ·ä¾¿ä¸åæ¥æèªç±ãæ以æ们并ä¸æ
GNU
+软件åå¸å°å
Œ
±é¢åï¼æ们对å®ä¿çâCopyleftâãæè°
Copyleft
+æ¯æä»»ä½äººé½å¯ä»¥éæ°åå软件ï¼ä¸ç®¡æ没æè¿è¡ä¿®æ¹ï¼ä½å¿
é¡»åæ¶ä¿ç软件æå
·æçèªç±ç¹æ§ãCopyleftæ¯ä¸ºäºä¿è¯ææç¨æ·é½æ¥æèªç±çæåã</p>
+
+<p>
+Copyleft åæ¶ä¹ <a href="/philosophy/pragmatic.html">é¼å±</a>
+äºå
¶å®çç¨åºåå å
¥èªç±è½¯ä»¶å¼åçè¡åãå GNU C++
ç¼è¯å¨è¿æ ·çéè¦ç软件ä¹æ以åå¨ï¼ä¹æ¯ä¸ºäºè¿ä¸ç¹ã</p>
+
+<p>
+é¤æ¤ä¹å¤ï¼Copyleft ä¹å¸®å©é£äºå¸æ对 <a
href="/prep/tasks.html">å®å</a> <a
+href="/philosophy/free-sw.html">èªç±è½¯ä»¶</a>
+ä½åºè´¡ç®çç¨åºåå¾å°è´¡ç®çæåãè¿äºç¨åºåé常æ¯ä¸ºé£äºä¸å¿æ³æ£é±çå
¬å¸æ大å¦å·¥ä½ãç¨åºåå¯è½å¸ææä»çåªåè´¡ç®å°èªç±è½¯ä»¶ç¤¾åºï¼ä½ä»çèæ¿å¯è½å¸ææè¿äºå·¥ä½åæåä¸ç软件产åã</p>
+
+<p>
+å½æ们åèæ¿è§£é说å¦æä¸æè¿äºæ¹è¿ççæ¬ä½ä¸ºèªç±è½¯ä»¶åå¸æ¯éæ³çæ¶åï¼ä»ä»¬å¾å¾ä¼å³å®æå®ä»¬ä½ä¸ºèªç±è½¯ä»¶åå¸èä¸æ¯æå®ä»¬æå¼ã</p>
+
+<p>
+ä¸ä¸ªç¨åºéµå¾ª
+Copyleftï¼æ们é¦å
声æå®æ¯æçæçï¼ç¶åï¼æ们ç»å®å
ä¸åå¸æ¡æ¬¾ï¼è¿ä¸ªæ¡æ¬¾å°±æ¯ä¸ä¸ªæ³å¾å£°æï¼å®èµä¸ææ人æ使ç¨ãä¿®æ¹åéæ°åå¸ç¨åºç代ç
+<em>åå
¶è¡çä½å</em>
çæåï¼ä½è¦æ±å¨è¿ä¸ªè¿ç¨ä¸ä¿æåå¸è§åä¸åãè¿æ
·çè¯ï¼ä»£ç åèªç±æåå¨æ³å¾ä¸å°±ä¸å¯åå²äºã</p>
+
+<p>
+åä¸è½¯ä»¶å¼å人åéè¿çæå¥å¤ºäºç¨æ·çèªç±ï¼æ们使ç¨çææ¥ç»äºä»å®èªç±ãè¿å°±æ¯ä¸ºä»ä¹æ们æâçæ(Copyright)âæ¹ç§°ä¸ºâCopyleftâã</p>
+
+<p>
+Copyleft
æ¯ä¸ç§å¯¹ç¨åºè¿è¡çæä¿æ¤çæ¹æ³ãå®å¹¶ä¸æ¯æ¾å¼çæï¼å
为è¿æ ·ä¼ä½¿ Copyleft
+åå¾ä¸å¯æä½ãâCopyleftâä¸çâleftâï¼å¹¶ä¸ä½¿ç¨å®å¨è±è¯ä¸âä¿çâçææï¼èæ¯æå®ä¸é常çâçæ(Copyright)âå
·æç¸åçææã</p>
+
+<p>
+Copyleft æ¯ä¸ç§æ½è±¡çæ¦å¿µï¼é常ä½
ä¸è½ç´æ¥çå»ä½¿ç¨ä¸ç§æ½è±¡çæ¦å¿µï¼ä½
åªè½éè¿å®ä¹å®çç»èæ¥ä½¿ç¨å®ãå¨ GNU
å·¥ç¨ä¸ï¼è¿ä¸ªä¸ç¨åè¯è¢«ç§°ä¸º <a
+href="/copyleft/gpl.html">GNU éç¨å
Œ
±è®¸å¯è¯ (HTMLæ ¼å¼</a>ï¼ <a
+href="/copyleft/gpl.txt">纯ææ¬</a>ï¼ <a
href="/copyleft/gpl.texi">Texinfo</a>
+æ ¼å¼)ã GNU éç¨å
Œ
±è®¸å¯è¯é常被ç®å为 GNU GPL
ãè¿éæä¸ä¸ªæå
³å®ç<a
+href="/copyleft/gpl-faq.html">常è§é®é¢</a> 页é¢ãä½ ä¹å¯ä»¥åè <a
+href="/copyleft/why-assign.html">为ä»ä¹FSFä»è½¯ä»¶ä½è
å¤è·å¾çæ转让</a>ã</p>
+
+<p>
+å¦ä¸ç§å½¢å¼ç Copyleftï¼æ¯<a href="/licenses/lgpl.html">GNU 宽éç¨å
Œ
±è®¸å¯è¯ (LGPL)
+(HTMLæ ¼å¼</a>ï¼ <a href="/licenses/lgpl.txt">纯ææ¬</a>ï¼<a
+href="/licenses/lgpl.texi">Texinfo</a> æ
¼å¼)ï¼å®è¢«åºç¨äºä¸é¨åï¼ä¸æ¯ææçï¼GNU å½æ°åºã
+è¿ä¸ªè®¸å¯è¯ä»¥å被称为âå½æ°åº
+GPLâï¼æ们修æ¹äºè®¸å¯è¯çååï¼åå
æ¯å®åæ¥çååé¼å±äºå¼å人åè¿å¤ç使ç¨è¿ä¸ªè®¸å¯è¯ã对äºè¿ä¸ªååæ¹åçå¿
è¦æ§ï¼è¯·åèè¿ç¯æç« ï¼<a
+href="/philosophy/why-not-lgpl.html"><cite>为ä»ä¹ä½ ä¸åºè¯¥å¯¹ä½
çä¸ä¸ä¸ªå½æ°åºåºç¨
+LGPL</cite></a>ã</p>
+
+<p>
+<a href="/copyleft/fdl.html">GNU èªç±æ档许å¯è¯ (FDL)ï¼HTMLæ ¼å¼</a>
, <a
+href="/copyleft/fdl.txt">纯ææ¬</a> ï¼<a
+href="/copyleft/fdl.texi">Texinfoæ ¼å¼ï¼</a>
æ¯ä¸ç§é¢åæåãæç§ä¹¦ååç§ææ¡£ç Copyleft
+许å¯è¯ï¼å®ä¿è¯äºææ人é½å¯ä»¥èªç±çå¤å¶åéæ°åå¸è¿äºææ¡£ï¼ä¸ç®¡æ¯å¦è¿äºä¿®æ¹ï¼ä¹ä¸ç®¡æ¯åä¸çè¿æ¯éåä¸çã</p>
+
+<p>
+ç¸åºç许å¯è¯åºå½ä¸ææç GNU 软件æºä»£ç
åæåä¸ååå¸ã</p>
+
+<p>
+åå¦ä½
æ¯çæææ人ï¼ææè¿äºè®¸å¯è¯é½è¢«è®¾è®¡æå¾å®¹æè¿ç¨å°ä½
çä½åä¸ãä½ ä¸ç¨å»ä¿®æ¹è®¸å¯è¯ï¼ä½ åªéè¦å¨ä½ çä½åä¸å
å«è¿æ ·ä¸ä»½è®¸å¯è¯ææ¬ï¼å¹¶å¨æºä»£ç
æ件ä¸éå½ç表æå¼ç¨è¿ä¸ªè®¸å¯è¯å°±å¯ä»¥äºã</p>
+
+<p>
+对å¾å¤ä¸åçç¨åºä½¿ç¨ç¸åçåå¸æ¡æ¬¾å¯ä»¥ä½¿å¾å¨è¿äºç¨åºä¸ç¸äºå¤å¶ä»£ç
åå¾å®¹æãå 为å®ä»¬é½å
·æç¸åçåå¸æ¡æ¬¾ï¼ä½
å°±ä¸éè¦å»èèè¿äºæ¡æ¬¾æ¯å¦ç¸äºå
¼å®¹ãLGPL
+第äºç许å¯è¯å
è®¸ä½ æåå¸æ¡æ¬¾æ¹ä¸ºæ åç GPL
许å¯è¯ï¼æä»¥ä½ å¯ä»¥æ LPGL ç代ç åºç¨å°å
¶å® GPL
çç¨åºä¸å»ãLGPL
+第ä¸çæ¯å为ä¸ä¸ªç¹ä¾å å
¥å° GPL
第ä¸çä¸ï¼æ以å®ä»¬ä¹æ¯ç¸äºå
¼å®¹çã</p>
+
+<p>
+å¦æä½ å¸æå¯¹ä½ çç¨åºéè¿åºç¨ GNU GPL æ GNU LGPL ä¿ç
Copyleft ï¼è¯·åè <a
+href="/copyleft/gpl-howto.html">GPL æå</a>
+页é¢ä¸çå
容ã请注æï¼è®¸å¯è¯æ¯ä¸ä¸ªæ´ä½ï¼ä½
å¨ä½¿ç¨æ¶åªè½æ´ä½å¼ç¨ï¼åªå¼ç¨å
¶ä¸çä¸é¨åæ¯ä¸å
许çã</p>
+
+<p>
+å¦æä½ å¸æå¯¹ä½ æ°åçæåéè¿åºç¨GNU FDLä¿ç
Copyleftï¼è¯·åèFDL <a
+href="/copyleft/fdl.html#SEC4">ç»å°¾é¨å</a> çå
容以å <a
+href="/copyleft/fdl-howto.html">GFDLæå</a> 页é¢ä¸çå
容ãä¸GNU
+GPLä¸æ ·ï¼ä½ å¿
须使ç¨æ´ä¸ªè®¸å¯è¯ï¼èä¸è½æ¯å
¶ä¸çä¸é¨åã</p>
+
+
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!--#include virtual="/server/footer.zh-cn.html" -->
+<div id="footer">
+<p>
+请å°æå
³èªç±è½¯ä»¶åºéä¼ä¸GNUçæ¥è¯¢ä¸é®é¢ï¼ä»¥è±è¯ï¼åéå°<a
+href="mailto:address@hidden";><em>address@hidden</em></a>ãæ¨ä¹å¯ä»¥éè¿
<a
+href="/contact/">å
¶å®æ¹æ³</a> èç³»èªç±è½¯ä»¶åºéä¼ã
+<br />
+åç°ä»»ä½é误åé¾æ¥æå
¶å®éè¦æ´æ£çå°æ¹ï¼æä»»ä½å»ºè®®ï¼ï¼è¯·åéé®ä»¶è³ <a
+href="mailto:address@hidden";><em>address@hidden</em></a>ã
+</p>
+
+<p>
+请åè <a href="/server/standards/README.translations.html">ç¿»è¯è¯´æ</a>
+äºè§£æå
³åè°åæ交æç« ç¿»è¯çä¿¡æ¯ã
+</p>
+
+<p>
+çæææ © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006, 2007, 2008, 2009 <a
href="http://www.fsf.org";>èªç±è½¯ä»¶åºéä¼</a></p>
+
+<p>æ¬é¡µé¢éç¨ <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
+Attribution-NoDerivs 3.0 United States License</a> 许å¯è¯ææã
+</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<b>ç¿»è¯</b>: æå¡å¸ 2007, 2008, 2009, 2010, 2011, 2012</div>
+
+
+ <p>
+<!-- timestamp start -->
+æåæ´æ°ï¼
+
+$Date: 2012/02/16 09:27:19 $
+
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- All pages on the GNU web server should have the section about -->
+<!-- verbatim copying. Please do NOT remove this without talking -->
+<!-- with the webmasters first. -->
+<!-- Please make sure the copyright date is consistent with the document -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
+<!-- <div id="translations">
+ -->
+<!-- <h4>
+Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical, and in the original -->
+<!-- language if possible, otherwise default to English -->
+<!-- If you do not have it English, please comment what the -->
+<!-- English is. If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - in /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
+<!-- - in /home/www/html/server/standards/README.translations.html -->
+<!-- one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the 2 letter language code right versus -->
+<!-- http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
+<!-- -->
+<!-- <ul class="translations-list">
+ -->
+<!-- Arabic -->
+<!-- <li>
+<a
href="/copyleft/copyleft.ar.html">العربية</a> [ar]</li>
-->
+<!-- Bosnian -->
+<!-- <li>
+<a href="/copyleft/copyleft.bs.html">Bosanski</a> [bs]</li> -->
+<!-- Catalan -->
+<!-- <li>
+<a href="/copyleft/copyleft.ca.html">català</a> [ca]</li> -->
+<!-- Czech -->
+<!-- <li>
+<a href="/copyleft/copyleft.cs.html">Česky</a> [cs]</li> -->
+<!-- German -->
+<!-- <li>
+<a href="/copyleft/copyleft.de.html">Deutsch</a> [de]</li> -->
+<!-- English -->
+<!-- <li>
+<a href="/copyleft/copyleft.html">English</a> [en]</li> -->
+<!-- Spanish -->
+<!-- <li>
+<a href="/copyleft/copyleft.es.html">español</a> [es]</li> -->
+<!-- Farsi (Persian) -->
+<!-- <li>
+<a
href="/copyleft/copyleft.fa.html">فارسی</a> [fa]</li>
-->
+<!-- French -->
+<!-- <li>
+<a href="/copyleft/copyleft.fr.html">français</a> [fr]</li> -->
+<!-- Indonesian -->
+<!-- <li>
+<a href="/copyleft/copyleft.id.html">Bahasa Indonesia</a> [id]</li> -->
+<!-- Italian -->
+<!-- <li>
+<a href="/copyleft/copyleft.it.html">italiano</a> [it]</li> -->
+<!-- Japanese -->
+<!-- <li>
+<a
href="/copyleft/copyleft.ja.html">日本語</a> [ja]</li>
-->
+<!-- Polish -->
+<!-- <li>
+<a href="/copyleft/copyleft.pl.html">polski</a> [pl]</li> -->
+<!-- Brazilian Portuguese -->
+<!-- <li>
+<a href="/copyleft/copyleft.pt-br.html">português do
Brasil</a> [pt-br]</li> -->
+<!-- Russian -->
+<!-- <li>
+<a
href="/copyleft/copyleft.ru.html">русский</a> [ru]</li>
-->
+<!-- Serbian -->
+<!-- <li>
+<a
href="/copyleft/copyleft.sr.html">српски</a> [sr]</li>
-->
+<!-- Tamil -->
+<!-- <li>
+<a
href="/copyleft/copyleft.ta.html">தமிழ்</a> [ta]</li>
-->
+<!-- Turkish -->
+<!-- <li>
+<a href="/copyleft/copyleft.tr.html">Türkçe</a> [tr]</li>
-->
+<!-- </ul>
+ -->
+<!-- </div>
+ -->
+</div>
+</body>
+</html>
Index: copyleft/po/copyleft.zh-cn-en.html
===================================================================
RCS file: copyleft/po/copyleft.zh-cn-en.html
diff -N copyleft/po/copyleft.zh-cn-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ copyleft/po/copyleft.zh-cn-en.html 16 Feb 2012 09:27:52 -0000 1.1
@@ -0,0 +1,248 @@
+<!--#include virtual="/server/header.html" -->
+
+<title>What is Copyleft? - GNU Project - Free Software Foundation (FSF)</title>
+<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation,
Linux, Copyleft" />
+
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/copyleft/po/copyleft.translist" -->
+
+<h2>What is Copyleft?</h2>
+
+<p>
+Copyleft is a general method for making a program (or
+other work) free, and requiring all modified and extended versions of the
+program to be free as well.</p>
+
+<p>
+The simplest way to make a program free software is to put it in the
+<a href="/philosophy/categories.html#PublicDomainSoftware">public
+domain</a>, uncopyrighted. This allows people to
+share the program and their improvements, if they are so minded. But
+it also allows uncooperative people to convert the program into
+<a href="/philosophy/categories.html#ProprietarySoftware">proprietary
+software</a>. They can make changes, many or few,
+and distribute the result as a proprietary product. People who
+receive the program in that modified form do not have the freedom that
+the original author gave them; the middleman has stripped it away.</p>
+
+<p>
+In the <a href="/gnu/thegnuproject.html">GNU project</a>, our aim is
+to give <em>all</em> users the freedom to redistribute and change GNU
+software. If middlemen could strip off the freedom, we might have
+many users, but those users would not have freedom. So instead of
+putting GNU software in the public domain, we “copyleft”
+it. Copyleft says that anyone who redistributes the software, with or
+without changes, must pass along the freedom to further copy and
+change it. Copyleft guarantees that every user has freedom.</p>
+
+<p>
+Copyleft also provides an
+<a href="/philosophy/pragmatic.html">incentive</a>
+for other programmers to add to free software.
+Important free programs such as the GNU C++ compiler exist
+only because of this.</p>
+
+<p>
+Copyleft also helps programmers who want to contribute
+<a href="/prep/tasks.html">improvements</a> to
+<a href="/philosophy/free-sw.html">free software</a> get permission to
+do so. These programmers often work for companies or universities
+that would do almost anything to get more money. A programmer may
+want to contribute her changes to the community, but her employer may
+want to turn the changes into a proprietary software product.</p>
+
+<p>
+When we explain to the employer that it is illegal to distribute the
+improved version except as free software, the employer usually decides
+to release it as free software rather than throw it away.</p>
+
+<p>
+To copyleft a program, we first state that it is copyrighted; then we
+add distribution terms, which are a legal instrument that gives
+everyone the rights to use, modify, and redistribute the program's
+code, <em>or any program derived from it</em>, but only if the
+distribution terms are unchanged. Thus, the code and the freedoms
+become legally inseparable.</p>
+
+<p>
+Proprietary software developers use copyright to take away the users'
+freedom; we use copyright to guarantee their freedom. That's why we
+reverse the name, changing “copyright” into
+“copyleft.”</p>
+
+<p>
+Copyleft is a way of using of the copyright on the program. It
+doesn't mean abandoning the copyright; in fact, doing so would make
+copyleft impossible. The “left” in
+“copyleft” is not a reference to the verb “to
+leave”—only to the direction which is the inverse of
+“right”.</p>
+
+<p>
+Copyleft is a general concept, and you can't use a general concept
+directly; you can only use a specific implementation of the concept.
+In the GNU Project, the specific distribution terms that we use for
+most software are contained in the
+<a href="/copyleft/gpl.html">GNU General Public License (available in
+HTML</a>, <a href="/copyleft/gpl.txt">text</a>, and
+<a href="/copyleft/gpl.texi">Texinfo</a> format). The GNU General
+Public License is often called the GNU GPL for short. There is also a
+<a href="/copyleft/gpl-faq.html">Frequently Asked Questions</a> page
+about the GNU GPL. You can also read about
+<a href="/copyleft/why-assign.html">why the FSF gets copyright
+assignments from contributors</a>.</p>
+
+<p>
+An alternate form of copyleft, the <a href="/licenses/lgpl.html">GNU
+Lesser General Public License (LGPL) (available in HTML</a>, <a
+href="/licenses/lgpl.txt">text</a>, and <a
+href="/licenses/lgpl.texi">Texinfo</a> format), applies to a few (but not
+all) GNU libraries. To learn more about properly using the LGPL, please
+read the article <a href="/philosophy/why-not-lgpl.html"><cite>Why you
+shouldn't use the Lesser GPL for your next library</cite></a>.</p>
+
+<p>
+The <a href="/copyleft/fdl.html">GNU Free Documentation License (FDL)
+(available in HTML</a>, <a href="/copyleft/fdl.txt">text</a> and
+<a href="/copyleft/fdl.texi">Texinfo)</a> is a form of copyleft intended
+for use on a manual, textbook or other document to assure everyone the
+effective freedom to copy and redistribute it, with or without
+modifications, either commercially or noncommercially.</p>
+
+<p>
+The appropriate license is included in many manuals and in each GNU
+source code distribution.</p>
+
+<p>
+All these licenses are designed so that you can easily apply them to
+your own works, assuming you are the copyright holder. You don't have
+to modify the license to do this, just include a copy of the license
+in the work, and add notices in the source files that refer properly
+to the license.</p>
+
+<p>
+Using the same distribution terms for many different programs makes it
+easy to copy code between various different programs. When they all
+have the same distribution terms, there is no problem. The Lesser
+GPL, version 2, includes a provision that lets you alter the
+distribution terms to the ordinary GPL, so that you can copy code into
+another program covered by the GPL. Version 3 of the Lesser GPL is
+built as an exception added to GPL version 3, making the compatibility
+automatic.</p>
+
+<p>
+If you would like to copyleft your program with the GNU GPL or the GNU
+LGPL, please see the <a href="/copyleft/gpl-howto.html">license
+instructions page</a> for advice. Please note that you must use the entire
+text of the license you choose. Each is an integral whole, and
+partial copies are not permitted.</p>
+
+<p>
+If you would like to copyleft your manual with the GNU FDL, please
+see the instructions at the
+<a href="/copyleft/fdl.html#SEC4">end</a> of the FDL text, and
+the <a href="/copyleft/fdl-howto.html">GFDL instructions page</a>. Again,
+partial copies are not permitted.</p>
+
+</div>
+
+<!--#include virtual="/server/footer.html" -->
+
+<div id="footer">
+<p>
+Please send FSF & GNU inquiries to
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.
+<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+</p>
+
+<p>
+Please see the
+<a href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting
+translations of this article.
+</p>
+
+<p>
+Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+2005, 2006, 2007, 2008, 2009 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>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2012/02/16 09:27:52 $
+<!-- timestamp end -->
+</p>
+</div>
+<!-- All pages on the GNU web server should have the section about -->
+<!-- verbatim copying. Please do NOT remove this without talking -->
+<!-- with the webmasters first. -->
+<!-- Please make sure the copyright date is consistent with the document -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
+
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical, and in the original -->
+<!-- language if possible, otherwise default to English -->
+<!-- If you do not have it English, please comment what the -->
+<!-- English is. If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - in /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
+<!-- - in /home/www/html/server/standards/README.translations.html -->
+<!-- one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the 2 letter language code right versus -->
+<!-- http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
+<!-- -->
+<!-- <ul class="translations-list"> -->
+<!-- Arabic -->
+<!-- <li><a
href="/copyleft/copyleft.ar.html">العربية</a> [ar]</li>
-->
+<!-- Bosnian -->
+<!-- <li><a href="/copyleft/copyleft.bs.html">Bosanski</a> [bs]</li> -->
+<!-- Catalan -->
+<!-- <li><a href="/copyleft/copyleft.ca.html">català</a> [ca]</li>
-->
+<!-- Czech -->
+<!-- <li><a href="/copyleft/copyleft.cs.html">Česky</a> [cs]</li>
-->
+<!-- German -->
+<!-- <li><a href="/copyleft/copyleft.de.html">Deutsch</a> [de]</li> -->
+<!-- English -->
+<!-- <li><a href="/copyleft/copyleft.html">English</a> [en]</li> -->
+<!-- Spanish -->
+<!-- <li><a
href="/copyleft/copyleft.es.html">español</a> [es]</li> -->
+<!-- Farsi (Persian) -->
+<!-- <li><a
href="/copyleft/copyleft.fa.html">فارسی</a> [fa]</li>
-->
+<!-- French -->
+<!-- <li><a
href="/copyleft/copyleft.fr.html">français</a> [fr]</li> -->
+<!-- Indonesian -->
+<!-- <li><a href="/copyleft/copyleft.id.html">Bahasa
Indonesia</a> [id]</li> -->
+<!-- Italian -->
+<!-- <li><a href="/copyleft/copyleft.it.html">italiano</a> [it]</li> -->
+<!-- Japanese -->
+<!-- <li><a
href="/copyleft/copyleft.ja.html">日本語</a> [ja]</li>
-->
+<!-- Polish -->
+<!-- <li><a href="/copyleft/copyleft.pl.html">polski</a> [pl]</li> -->
+<!-- Brazilian Portuguese -->
+<!-- <li><a href="/copyleft/copyleft.pt-br.html">português do
Brasil</a> [pt-br]</li> -->
+<!-- Russian -->
+<!-- <li><a
href="/copyleft/copyleft.ru.html">русский</a> [ru]</li>
-->
+<!-- Serbian -->
+<!-- <li><a
href="/copyleft/copyleft.sr.html">српски</a> [sr]</li>
-->
+<!-- Tamil -->
+<!-- <li><a
href="/copyleft/copyleft.ta.html">தமிழ்</a> [ta]</li>
-->
+<!-- Turkish -->
+<!-- <li><a
href="/copyleft/copyleft.tr.html">Türkçe</a> [tr]</li> -->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>
Index: doc/po/doc.zh-cn-en.html
===================================================================
RCS file: doc/po/doc.zh-cn-en.html
diff -N doc/po/doc.zh-cn-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ doc/po/doc.zh-cn-en.html 16 Feb 2012 09:28:24 -0000 1.1
@@ -0,0 +1,154 @@
+<!--#include virtual="/server/header.html" -->
+<title>Documentation - GNU Project - Free Software Foundation (FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/doc/po/doc.translist" -->
+<h2>Documentation of the GNU Project</h2>
+
+<p>
+GNU and other free documentation can be obtained by the following methods:
+</p>
+
+<ul>
+<li>Most <a href="/manual/manual.html">GNU manuals</a> are online in
+ various formats.</li>
+
+<li>The <a href="http://directory.fsf.org/";>Free Software Directory</a>
+ includes links to documentation.</li>
+
+<li><a href="http://planet.gnu.org";>planet.gnu.org</a> is an aggregation of
+ blogs and news announcements from GNU packages.</li>
+
+<li><a href="http://shop.fsf.org";>FSF online store: Printed books, T-shirts,
+ posters, and more.</a></li>
+
+<li><a href="/doc/other-free-books.html">Free books from other
+ publishers</a>: Printed books from other publishers using free
+ documentation licenses.</li>
+</ul>
+
+
+<h3>GNU documentation principles</h3>
+
+<p>We believe the reader should be free to copy, update, and
+redistribute GNU documentation, just like GNU software.</p>
+
+<p>Originally, all our documentation was released under a short <a
+href="/licenses/licenses.html#WhatIsCopyleft">copyleft</a> license, or
+under the <a href="/licenses/licenses.html#GPL">GNU General Public
+License (GPL)</a>. In 2001, the <a
+href="/licenses/licenses.html#FDL">GNU Free Documentation License
+(FDL)</a> was created to address needs that were not met by licenses
+originally designed for software. For more information on free
+documentation, please see <a href="http://www.stallman.org/";>Richard
+Stallman's</a> essay, “<a href="/philosophy/free-doc.html">Free
+Software and Free Manuals</a>”.</p>
+
+
+<h3>Contribute</h3>
+
+<p>Please help us write more documentation! This is one of the most
+important ways to contribute to the free software movement. For more
+details on this and other ways to help, <a
+href="/help/help.html#helpgnu">click here</a>.</p>
+
+<p><b>GNU Press:</b> another way to contribute is to help us <a
+href="/doc/expanding.html">expand bookstore availability</a> of <a
+href="/doc/gnupresspub.html">GNU Press</a> books. For this or any
+reason, you can <a href="/doc/contact.html">contact GNU Press</a>.</p>
+
+</div>
+
+<!--#include virtual="/server/footer.html" -->
+
+<div id="footer">
+
+<p>
+Please send 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.
+<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";><address@hidden></a>.
+</p>
+
+<p>
+Please see the
+<a href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting
+translations of this article.
+</p>
+
+<p>
+Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010
+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>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2012/02/16 09:28:24 $
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text. -->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- <ul class="translations-list"> -->
+<!-- Arabic -->
+<!-- <li><a
href="/doc/doc.ar.html">العربية</a> [ar]</li>
-->
+<!-- Catalan -->
+<!-- <li><a href="/doc/doc.ca.html">català</a> [ca]</li> -->
+<!-- Czech -->
+<!-- <li><a href="/doc/doc.cs.html">Česky</a> [cs]</li> -->
+<!-- German -->
+<!-- <li><a href="/doc/doc.de.html">Deutsch</a> [de]</li> -->
+<!-- Greek -->
+<!-- <li><a
href="/doc/doc.el.html">Ελληνικά</a> [el]</li>
-->
+<!-- English -->
+<!-- <li><a href="/doc/doc.html">English</a> [en]</li> -->
+<!-- Spanish -->
+<!-- <li><a href="/doc/doc.es.html">español</a> [es]</li> -->
+<!-- Italian -->
+<!-- <li><a href="/doc/doc.it.html">italiano</a> [it]</li> -->
+<!-- Korean -->
+<!-- <li><a
href="/doc/doc.ko.html">한국어</a> [ko]</li> -->
+<!-- Polish -->
+<!-- <li><a href="/doc/doc.pl.html">polski</a> [pl]</li> -->
+<!-- Brazilian Portuguese -->
+<!-- <li><a href="/doc/doc.pt-br.html">português do
Brasil</a> [pt-br]</li> -->
+<!-- Romanian -->
+<!-- <li><a href="/doc/doc.ro.html">română</a> [ro]</li> -->
+<!-- Albanian -->
+<!-- <li><a href="/doc/doc.sq.html">shqip</a> [sq]</li> -->
+<!-- Chinese (Simplified) -->
+<!-- <li><a
href="/doc/doc.zh-cn.html">简体中文</a> [zh-cn]</li>
-->
+<!-- Chinese (Traditional) -->
+<!-- <li><a
href="/doc/doc.zh-tw.html">繁體中文</a> [zh-tw]</li>
-->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>
Index: education/edu-software.ja.html
===================================================================
RCS file: education/edu-software.ja.html
diff -N education/edu-software.ja.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ education/edu-software.ja.html 16 Feb 2012 09:28:48 -0000 1.1
@@ -0,0 +1,162 @@
+
+
+<!-- Parent-Version: 1.57 -->
+<!--#include virtual="/server/header.ja.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>æè²åãèªç±ã½ããã¦ã§ã¢ - GNUããã¸ã§ã¯ã -
ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³</title>
+
+<!--#include virtual="/server/banner.ja.html" -->
+<!--#include virtual="/education/po/edu-software.translist" -->
+<div id="education-content">
+<h2>æè²åãèªç±ã½ããã¦ã§ã¢</h2>
+
+<!-- begin edu navigation bar -->
+<ul id="edu-navigation">
+<li>
+<a href="/education/edu-contents.html">æè²ã³ã³ãã³ã</a></li>
+
+<li>
+<a href="/education/edu-cases.html">ã±ã¼ã¹ã¹ã¿ãã£</a></li>
+
+<li class="active">
+<a href="/education/edu-resources.html">æè²åããªã½ã¼ã¹</a></li>
+
+<li>
+<a href="/education/edu-projects.html">æè²ããã¸ã§ã¯ã</a></li>
+
+<li>
+<a href="/education/edu-faq.html">FAQ</a></li>
+
+<li>
+<a href="/education/edu-team.html">æè²ãã¼ã </a></li>
+</ul>
+
+<!-- end edu navigation bar -->
+</div>
+
+<!-- id="edu-content" -->
+<p class="edu-breadcrumb">
+<a href="/education/education.html">æè²</a> → <a
+href="/education/edu-resources.html">æè²åããªã½ã¼ã¹</a> →
æè²åãèªç±ã½ããã¦ã§ã¢</p>
+
+<div class="emph-box">
+<p>ãã®ã»ã¯ã·ã§ã³ã®ãã¼ãã«åãçµãåã«ã"Free
+Software"ã®"Free"ã¨ããåèªãã<strong>å¤æ®µã«è¨åãã¦ããã®ã§ã¯ãªã</strong>ã<strong>èªç±</strong>ã«è¨åãã¦ããã®ã
ã¨ãããã¨ãæãåºãã¦ããã
ãããã¨æãã¾ããèªç±ã½ããã¦ã§ã¢ã¯ãããããã¡ã«<strong>èªç±</strong>ãä¸ãã¦ãããã½ããã¦ã§ã¢ã§ããããªãã¡ãã½ããã¦ã§ã¢ãå®è¡ããè¤è£½ããé
å¸ããå¦ç¿ããå¤æ´ããæ¹åããèªç±ãä¸ããããã®ã§ããããã«ç¥ããããã°ã<a
+href="/philosophy/free-sw.html">èªç±ã½ããã¦ã§ã¢ã®å®ç¾©</a>ãã覧ãã
ããã</p>
+</div>
+
+<h3>ãã®ã»ã¯ã·ã§ã³ã§æ¸ããã¦ãããã¨</h3>
+
+<div style="text-align: center; font-size: 110%; width: 300px; float: right;
margin: 12px; background-color: #fcc76f; color: #000000; padding:
1em;">èªç±ãªæè²åãã²ã¼ã ã®éçºè
ãæè²ç®çã§å©ç¨ã§ããèªç±ãªã²ã¼ã ã®æ
å
±ãæ¢ãã¦ãã¾ãã<a
+href="mailto:address@hidden";><address@hidden></a>ã¸ãé£çµ¡ãã
ããã</div>
+
+<p>ãã®ãã¼ã¸ã§ã¯ãæè²åãã«å©ç¨å¯è½ãªèªç±ãªããã°ã©ã
ã®ç¶²ç¾
çãªãªã¹ããä½ããã¨ãã¦ããã®ã§ã¯ããã¾ãããããããã®ç®çã¯ãèªç±ã½ããã¦ã¨ã¢ãä¸ãã¦ãããèªç±ãæè²æ©é¢ãã©ã®ããã«ããã°å®è·µã§ããã¾ãå¹æçã«ç¨ãããã¨ãã§ãããã説æããããã«ãããã¤ãã®äºä¾ãç´¹ä»ãããã¨ã§ããè¨è¼ãããããããã®ããã°ã©ã
ã«ã¤ãã¦ãããããèªç±ãå®éã«ã©ã®ããã«ç¨ãããã¦ãããã示ãã¾ãã
</p>
+
+<p>èªç±ã½ããã¦ã§ã¢ã¸ã®ç§»è¡ããããå
´åãããã¿ã¹ã¯ã®éè¡ã®ããã«èªç±ãªããã°ã©ã
ããæ¢ãã®å ´åã«ã¯ã<a
+href="http://directory.fsf.org";>èªç±ã½ããã¦ã§ã¢ãã£ã¬ã¯ããª</a>ãåç
§ããã¨ããã§ããããããã«ã¯ã<a
+href="http://gnu.org/distros/free-distros.html";>èªç±ãªãªãã¬ã¼ãã£ã³ã°ã·ã¹ãã
</a>ä¸ã§åä½ãã6000以ä¸ã®èªç±ãªããã°ã©ã
ã®ä¸è¦§ãããã¾ããã¨ãããã<a
+href="http://directory.fsf.org/category/educ/";>æè²</a>ã®ã»ã¯ã·ã§ã³ã«ã¯ãä¿è²åãã大å¦ãç
究ãªã©ã®å°éã¬ãã«ã«ããããã¾ãã¾ãªæè²æ°´æºã«ç¹æã®ããã°ã©ã
ããªã¹ãã¢ããããã¦ãã¾ãã</p>
+
+<p>ããã§ç´¹ä»ããããã°ã©ã
ã«ã¯ãGComprisã®ããã«ãGNUããã¸ã§ã¯ãã®ä¸é¨ã§ãããã®ãããã¾ããã¤ã¾ããããããããã°ã©ã
ã®éçºè
ã¯ããã°ã©ã ãGNUã·ã¹ãã
ã®ä»ã®é¨åã¨ãã¾ãåä½ããããã«æ³¨æãæããã¨ã«åæãã¦ããã®ã§ããåã
ã®GNUããã°ã©ã
ã¯ãã¦ã¼ã¶ã®åºæ¬çãªèªç±ãå®ãããã«GNUããã¸ã§ã¯ããæ¨å¥¨ããææ°çã®ã©ã¤ã»ã³ã¹ã使ç¨ãã¦ãã¾ããGNUããã°ã©ã
ã¯ãããªãä¸èªç±ãªããã°ã©ã
ã®ä½¿ç¨ãæ¨å¥¨ãã¦ãã¾ããããã¦ã¼ã¶ãèªç±ã½ããã¦ã§ã¢ã«ã¤ãã¦ã®ãããªãä¸èªç±ãªããã¥ã¡ã³ãã¸ãèªå°ãã¾ãããããã¯ã<a
+href="http://www.gnu.org/philosophy/free-doc.html";>èªç±ãªææ¸</a>éåã«å®ãããã¦ããã¨ããã§ãã</p>
+
+<p>以ä¸ãç´¹ä»ããäºä¾:</p>
+
+<!-- begin adding programs in alphabetical order -->
+<p>
+<a href="/education/edu-software-gcompris.html">GCompris</a> | <a
+href="/education/edu-software-gimp.html"></a> <a
+href="/education/edu-software-tuxpaint.html">Tux Paint</a> |
+</p>
+
+<!-- end adding programs -->
+<p>ãã決ã¾ã£ãç®çã®ããã«æè²æ©é¢ã§ä½¿ããã¦ãããããããã¯æè²çãªãã¼ãºãæºããããã«ã¦ã¼ã¶ã«ãã£ã¦ä¿®æ£ãªããã¯é©ç¨ãããèªç±ã½ããã¦ã§ã¢ããã°ã©ã
ããåç¥ã§ãããã<a
+href="mailto:address@hidden";><address@hidden></a>ã¾ã§é»åã¡ã¼ã«ã§ãç¥ãããã
ããã</p>
+
+<!-- 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". -->
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.ja.html" -->
+<div id="footer">
+
+<p>FSF ããã³ GNU ã«é¢ããåãåãã㯠<a
+href="mailto:address@hidden";><address@hidden></a>ã¾ã§ãé¡ããã¾ã(è±èª)ãFSFã¸ã®é£çµ¡ã¯<a
+href="/contact/">ä»ã®æ¹æ³</a>ãããã¾ãã<br />
+ãªã³ã¯åããä»ã®ä¿®æ£ãææ¡ã¯ã<a
+href="mailto:address@hidden";><address@hidden></a>ã¾ã§ãéããã
ããã</p>
+
+<p>ãã®æç« ã®ç¿»è¨³ã«é¢ãã調æ´ã¨æåºã«ã¤ãã¦ã¯ã<a
+href="/server/standards/README.translations.html">翻訳
README</a>ãã覧ãã ããã</p>
+
+<p>Copyright © 2011, 2012 Free Software Foundation, Inc.</p>
+
+<p>ãã®ãã¼ã¸ã¯ã<a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
+Attribution-NoDerivs 3.0 United States
License</a>ã®æ¡ä»¶ã§è¨±è«¾ããã¾ãã</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+ </div>
+
+
+ <p><!-- timestamp start -->
+æçµæ´æ°:
+
+$Date: 2012/02/16 09:28:48 $
+
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations">
+ -->
+<!-- <h4>
+Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text.
-->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- See also '(web-trans)Capitalization': -->
+<!--
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
-->
+<!-- -->
+<!-- -->
+<!-- <ul class="translations-list">
+ -->
+<!-- German -->
+<!-- <li>
+<a href="/education/edu-software.de.html">Deutsch</a> [de]</li> -->
+<!-- English -->
+<!-- <li>
+<a href="/education/edu-software.html">English</a> [en]</li> -->
+<!-- </ul>
+ -->
+<!-- </div>
+ -->
+</div>
+</body>
+</html>
Index: education/po/edu-software.ja-en.html
===================================================================
RCS file: education/po/edu-software.ja-en.html
diff -N education/po/edu-software.ja-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ education/po/edu-software.ja-en.html 16 Feb 2012 09:29:47 -0000
1.1
@@ -0,0 +1,168 @@
+<!-- Parent-Version: 1.57 -->
+
+<!--#include virtual="/server/header.html" -->
+<title>Educational Free Software - GNU Project - Free Software
Foundation</title>
+
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/education/po/edu-software.translist" -->
+
+<div id="education-content">
+<h2>Educational Free Software</h2>
+
+<!-- begin edu navigation bar -->
+<ul id="edu-navigation">
+<li>
+<a href="/education/edu-contents.html">Education Contents</a></li>
+
+<li>
+<a href="/education/edu-cases.html">Case Studies</a></li>
+
+<li class="active">
+<a href="/education/edu-resources.html">Educational Resources</a></li>
+
+<li>
+<a href="/education/edu-projects.html">Education Projects</a></li>
+
+<li>
+<a href="/education/edu-faq.html">FAQ</a></li>
+
+<li>
+<a href="/education/edu-team.html">The Education Team</a></li>
+</ul>
+<!-- end edu navigation bar -->
+
+</div> <!-- id="edu-content" -->
+
+<p class="edu-breadcrumb">
+<a href="/education/education.html">Education</a> →
+<a href="/education/edu-resources.html">Educational Resources</a> →
+Educational Free Software</p>
+
+<div class="emph-box">
+<p>Before addressing the subject in this section, we would like to
+remind our readers that the word "Free" in "Free Software" <strong>does
+not refer to price</strong> but to <strong>liberty</strong>. Free
+Software is software that grants you <strong>freedom</strong>, namely
+the freedom to run, copy, distribute, study, change and improve the
+software. To learn more, see the <a href="/philosophy/free-sw.html">
+Free Software definition</a>.</p>
+</div>
+
+<h3>What you will find in this section</h3>
+
+<div style="text-align: center; font-size: 110%; width: 300px; float: right;
margin: 12px; background-color: #fcc76f; color: #000000; padding: 1em;">We are
looking for developers of free educational games, or information about free
games that can be used for educational purposes. Contact <a
href="mailto:address@hidden";><address@hidden></a></div>
+
+<p>These pages do not constitute an exhaustive listing of available
+educational free programs. Our aim is to present some examples so as to
+illustrate how educational institutions can put into practice and
+effectively apply the freedoms that Free Software grants them. For each
+program described, we will show how those freedoms were actually
+applied. </p>
+
+<p>People who wish to migrate to Free Software or are looking for a free
+libre program to accomplish a particular task, should refer to the
+<a href="http://directory.fsf.org";>Free Software Directory</a>, which
+consists of a catalog of more than 6,000 free programs that run on
+<a href="http://gnu.org/distros/free-distros.html";>free operating
+systems</a>. In particular, the
+<a href="http://directory.fsf.org/category/educ/";>Education</a> section
+of the Directory lists programs inherent to different levels of
+education, from pre-elementary school to highly specialized levels,
+including university and research.</p>
+
+<p>Some of the programs presented here, like GCompris, are part of the
+GNU Project. This means that developers of these programs agree to pay
+attention to making the program work well with the rest of the
+GNU System. A GNU program uses the latest version of the license that
+the GNU Project recommends in order to protect the users' fundamental
+freedoms. A GNU program does not recommend the use of any non-free
+program, and it does not refer the user to any non-free documentation
+for Free Software, as defined in our campaign for
+<a href="http://www.gnu.org/philosophy/free-doc.html";>
+free documentation</a>.</p>
+
+<p>The following are the examples that we present:</p>
+
+<!-- begin adding programs in alphabetical order -->
+
+<p>
+<a href="/education/edu-software-gcompris.html">GCompris</a> |
+<a href="/education/edu-software-gimp.html"></a>
+<a href="/education/edu-software-tuxpaint.html">Tux Paint</a> |
+</p>
+
+<!-- end adding programs -->
+
+<p>If you know of a Free Software program that is being used by an
+educational institution for specific purposes, or has been modified or
+otherwise adapted by its users to meet their own educational needs,
+please let us know by sending an email to
+<a href="mailto:address@hidden";><address@hidden></a>.</p>
+
+<!-- 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". -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<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.<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";><address@hidden></a>.</p>
+
+<p>Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+
+<p>Copyright © 2011, 2012 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>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2012/02/16 09:29:47 $
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text.
-->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- See also '(web-trans)Capitalization': -->
+<!--
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
-->
+<!-- -->
+<!-- -->
+<!-- <ul class="translations-list"> -->
+<!-- German -->
+<!-- <li><a href="/education/edu-software.de.html">Deutsch</a> [de]</li>
-->
+<!-- English -->
+<!-- <li><a href="/education/edu-software.html">English</a> [en]</li> -->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>
Index: gnu/gnu.ja.html
===================================================================
RCS file: gnu/gnu.ja.html
diff -N gnu/gnu.ja.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/gnu.ja.html 16 Feb 2012 09:30:28 -0000 1.1
@@ -0,0 +1,174 @@
+
+<!--#include virtual="/server/header.ja.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>GNUãªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã - GNUããã¸ã§ã¯ã -
ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³ (FSF)</title>
+
+<!--#include virtual="/server/banner.ja.html" -->
+<!--#include virtual="/gnu/po/gnu.translist" -->
+<h2>GNUãªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã </h2>
+
+<ul>
+ <li><a href="/gnu/about-gnu.html">GNUãªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã
</a></li>
+ <li><a href="/gnu/gnu-history.html">GNUã®æ´å²ãæ¦è¦</a></li>
+ <li><a href="/gnu/thegnuproject.html">GNUã®æ´å²ã詳細</a></li>
+ <li>ããã¸ã§ã¯ãã®<a
href="/gnu/initial-announcement.html">æåã®å£°æ</a></li>
+ <li><a href="/gnu/manifesto.html">GNU宣è¨</a></li>
+ <li><a
href="/gnu/byte-interview.html">ãªãã£ã¼ãã»ã¹ãã¼ã«ãã³ãBYTEã¤ã³ã¿ãã¥ã¼</a>
(1986)</li>
+ <li><a href="/gnu/rms-lisp.html">ãããã®Lispã®çµé¨ã¨GNU
Emacsã®éçº</a> (ãªãã£ã¼ãã»ã¹ãã¼ã«ãã³)</li>
+ <li><a
+href="http://query.nytimes.com/gst/fullpage.html?res=950DEFDE123AF932A25752C0A96F948260&sec=&spon=&pagewanted=1";>
+èªç±ã½ããã¦ã§ã¢ã¸ããã£ãä¸äººã®éã</a>ããªãã£ã¼ãã»ã¹ãã¼ã«ãã³ã¨åæã®GNUéçºã«ã«ã¤ãã¦ã®è¨äºã<cite>ãã¥ã¼ã¨ã¼ã¯ã»ã¿ã¤ã
ãº</cite>ã«1989å¹´1æ11æ¥ã«æ²è¼ããã®è¨äºã®ä¸ã¤ã®åé¡ã¯ããç¥ç財ç£æ¨©ãã¨ãããããã¬ã³ãã®ç¨èªãããããæ´åæ§ã®ãããªã«ããæããã®ã¨ãã¦ä½¿ã£ã¦ãããã¨ã§ãããã®ç¨èªã¯<a
+href="/philosophy/not-ipr.html">ã¾ã£ããæå³ã®ãªã</a>ãã¨ã説ãæ··åãªã®ã§ãããã®è¨äºã¯ã¾ããã·ã³ããªãã¯ã¹ç¤¾ã«ã¤ãã¦ãªã«ãæ··ä¹±ãã¦ãã¾ããã¹ãã¼ã«ãã³ãè¡ã£ãã®ã¯ãã¾ã
MITã«å¨ç±ãã¦ããã¨ãã«ãã·ã³ããªãã¯ã¹ç¤¾çMIT
+Lispãã·ã³ã»ã·ã¹ãã
ã«è¡ãããæ¹è¯ã¨åçã§ãã代æ¿ã®æ¹åãç¬ç«ãã¦æ¸ãããã¨ãããã¨ã§ãã</li>
+ <li><a
href="/philosophy/15-years-of-free-software.html">èªç±ã½ããã¦ã§ã¢ã®15å¹´</a>
(1999)</li>
+</ul>
+
+
+<h3><a id="gnulinux"></a>GNUã¨Linux</h3>
+
+<ul>
+ <li><a href="/gnu/linux-and-gnu.html">GNUã¨Linuxã®é¢ä¿</a></li>
+ <li><a
+href="/gnu/why-gnu-linux.html">‘Linuxã·ã¹ãã
’ãGNU/Linuxã¨å¼ã¶ã¹ãçç±</a></li>
+ <li><a
href="/gnu/gnu-users-never-heard-of-gnu.html">GNUã«ã¤ãã¦èãããã¨ããªãGNUã¦ã¼ã¶</a></li>
+ <li><a href="/gnu/gnu-linux-faq.html">GNU/Linuxã®FAQ</a></li>
+</ul>
+
+
+<h3><a id="misc"></a>ã»ãã®GNUé¢é£ãªã½ã¼ã¹</h3>
+
+<ul>
+ <li><a
+href="http://libreplanet.org/wiki/Group_list";>GNU/LinuxãGNU/Hurdãèªç±ã½ããã¦ã§ã¢ã»ã¦ã¼ã¶ã»ã°ã«ã¼ã</a></li>
+</ul>
+
+<!-- If needed, change the copyright block at the bottom. In general,
+ all pages on the GNU web server should have the section about
+ verbatim copying. Please do NOT remove this without talking
+ with the webmasters first.
+ Please make sure the copyright date is consistent with the document
+ and that it is like this: "2001, 2002", not this: "2001-2002". -->
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.ja.html" -->
+<div id="footer">
+
+<p>FSF ããã³ GNU ã«é¢ããåãåãã㯠<a
+href="mailto:address@hidden";><address@hidden></a>ã¾ã§ãé¡ããã¾ã(è±èª)ãFSFã¸ã®é£çµ¡ã¯<a
+href="/contact/">ä»ã®æ¹æ³</a>ãããã¾ãã<br />
+ãªã³ã¯åããä»ã®ä¿®æ£ãææ¡ã¯<a
+href="mailto:address@hidden";><address@hidden></a>ã¾ã§ãéããã
ããã</p>
+
+<p>ãã®æç« ã®ç¿»è¨³ã®èª¿æ´ã¨æåºã«ã¤ãã¦ã¯ã<a
href="/server/standards/README.translations.html">翻訳
+README</a>ãã覧ãã ããã</p>
+
+<p>Copyright © 2011 Free Software Foundation, Inc.</p>
+
+<p>ãã®ãã¼ã¸ã¯<a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
+Attribution-NoDerivs 3.0 United States
License</a>ã®æ¡ä»¶ã§è¨±è«¾ããã¾ãã
+</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+ </div>
+
+
+ <p><!-- timestamp start -->
+æçµæ´æ°:
+
+$Date: 2012/02/16 09:30:28 $
+
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations">
+ -->
+<!-- <h4>
+Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text.
-->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- See also '(web-trans)Capitalization': -->
+<!--
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
-->
+<!-- -->
+<!-- -->
+<!-- <ul class="translations-list">
+ -->
+<!-- Arabic -->
+<!-- <li>
+<a
href="/gnu/gnu.ar.html">العربية</a> [ar]</li>
-->
+<!-- Bulgarian -->
+<!-- <li>
+<a
href="/gnu/gnu.bg.html">български</a> [bg]</li>
-->
+<!-- Catalan -->
+<!-- <li>
+<a href="/gnu/gnu.ca.html">català</a> [ca]</li> -->
+<!-- German -->
+<!-- <li>
+<a href="/gnu/gnu.de.html">Deutsch</a> [de]</li> -->
+<!-- Greek -->
+<!-- <li>
+<a
href="/gnu/gnu.el.html">ελληνικά</a> [el]</li>
-->
+<!-- English -->
+<!-- <li>
+<a href="/gnu/gnu.html">English</a> [en]</li> -->
+<!-- Spanish -->
+<!-- <li>
+<a href="/gnu/gnu.es.html">español</a> [es]</li> -->
+<!-- French -->
+<!-- <li>
+<a href="/gnu/gnu.fr.html">français</a> [fr]</li> -->
+<!-- Italian -->
+<!-- <li>
+<a href="/gnu/gnu.it.html">italiano</a> [it]</li> -->
+<!-- Kannada -->
+<!-- <li>
+<a
href="/gnu/gnu.kn.html">ಕನ್ನಡ</a> [kn]</li>
-->
+<!-- Macedonian -->
+<!-- <li>
+<a
href="/gnu/gnu.mk.html">македонски</a> [mk]</li>
-->
+<!-- Norwegian (bokmål) -->
+<!-- <li>
+<a href="/gnu/gnu.nb.html">norsk (bokmål)</a> [nb]</li> -->
+<!-- Dutch -->
+<!-- <li>
+<a href="/gnu/gnu.nl.html">Nederlands</a> [nl]</li> -->
+<!-- Polish -->
+<!-- <li>
+<a href="/gnu/gnu.pl.html">polski</a> [pl]</li> -->
+<!-- Russian -->
+<!-- <li>
+<a
href="/gnu/gnu.ru.html">русский</a> [ru]</li>
-->
+<!-- Serbian -->
+<!-- <li>
+<a
href="/gnu/gnu.sr.html">српски</a> [sr]</li>
-->
+<!-- </ul>
+ -->
+<!-- </div>
+ -->
+</div>
+</body>
+</html>
Index: gnu/po/gnu.ja-en.html
===================================================================
RCS file: gnu/po/gnu.ja-en.html
diff -N gnu/po/gnu.ja-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/po/gnu.ja-en.html 16 Feb 2012 09:30:33 -0000 1.1
@@ -0,0 +1,153 @@
+<!--#include virtual="/server/header.html" -->
+<title>The GNU Operating System
+- GNU project - Free Software Foundation (FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/gnu/po/gnu.translist" -->
+
+<h2>The GNU Operating System</h2>
+
+<ul>
+ <li><a href="/gnu/about-gnu.html">About the GNU Operating System</a></li>
+ <li><a href="/gnu/gnu-history.html">A historical overview of GNU</a></li>
+ <li><a href="/gnu/thegnuproject.html">A more detailed history of GNU</a></li>
+ <li><a href="/gnu/initial-announcement.html">The initial announcement</a>
+ of the project</li>
+ <li><a href="/gnu/manifesto.html">The GNU Manifesto</a></li>
+ <li><a href="/gnu/byte-interview.html">BYTE interview with Richard
+ Stallman</a> (1986)</li>
+ <li><a href="/gnu/rms-lisp.html">My Lisp Experiences and the
+ Development of GNU Emacs</a> (by Richard Stallman)</li>
+ <li><a
href="http://query.nytimes.com/gst/fullpage.html?res=950DEFDE123AF932A25752C0A96F948260&sec=&spon=&pagewanted=1";>
+ One Man's Fight for Free Software</a>, an article about Richard
+ Stallman and the early GNU development, published at <cite>The
+ New York Times</cite> on January 11, 1989. One problem with the
+ article is that it uses the propaganda term “intellectual
+ property” as if that referred to something coherent. The
+ term is such a confusion that talking about it <a
+ href="/philosophy/not-ipr.html">makes no sense</a>. The article
+ is also somewhat confused in regard to Symbolics. What Stallman
+ did, while still working at MIT, was to write, independently,
+ replacement improvements comparable to the improvements that
+ Symbolics made in its version of the MIT Lisp Machine
+ System.</li>
+ <li><a href="/philosophy/15-years-of-free-software.html">15 Years
+ of Free Software</a> (1999)</li>
+</ul>
+
+
+<h3><a id="gnulinux"></a>GNU and Linux</h3>
+
+<ul>
+ <li><a href="/gnu/linux-and-gnu.html">The relationship between GNU and
+ Linux</a></li>
+ <li><a href="/gnu/why-gnu-linux.html">Why the ‘Linux
+ system’ should be called GNU/Linux</a></li>
+ <li><a href="/gnu/gnu-users-never-heard-of-gnu.html">GNU Users Who
+ Have Never Heard of GNU</a></li>
+ <li><a href="/gnu/gnu-linux-faq.html">A GNU/Linux FAQ</a></li>
+</ul>
+
+
+<h3><a id="misc"></a>Other GNU-related resources</h3>
+
+<ul>
+ <li><a href="http://libreplanet.org/wiki/Group_list";>GNU/Linux,
+ GNU/Hurd, and free software user groups</a></li>
+</ul>
+
+<!-- If needed, change the copyright block at the bottom. In general,
+ all pages on the GNU web server should have the section about
+ verbatim copying. Please do NOT remove this without talking
+ with the webmasters first.
+ Please make sure the copyright date is consistent with the document
+ and that it is like this: "2001, 2002", not this: "2001-2002". -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<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.<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";><address@hidden></a>.</p>
+
+<p>Please see the <a
+href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
+
+<p>Copyright © 2011 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>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2012/02/16 09:30:33 $
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text.
-->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- See also '(web-trans)Capitalization': -->
+<!--
http://gnu.org/software/trans-coord/manual/web-trans/html_node/Capitalization.html
-->
+<!-- -->
+<!-- -->
+<!-- <ul class="translations-list"> -->
+<!-- Arabic -->
+<!-- <li><a
href="/gnu/gnu.ar.html">العربية</a> [ar]</li>
-->
+<!-- Bulgarian -->
+<!-- <li><a
href="/gnu/gnu.bg.html">български</a> [bg]</li>
-->
+<!-- Catalan -->
+<!-- <li><a href="/gnu/gnu.ca.html">català</a> [ca]</li> -->
+<!-- German -->
+<!-- <li><a href="/gnu/gnu.de.html">Deutsch</a> [de]</li> -->
+<!-- Greek -->
+<!-- <li><a
href="/gnu/gnu.el.html">ελληνικά</a> [el]</li>
-->
+<!-- English -->
+<!-- <li><a href="/gnu/gnu.html">English</a> [en]</li> -->
+<!-- Spanish -->
+<!-- <li><a href="/gnu/gnu.es.html">español</a> [es]</li> -->
+<!-- French -->
+<!-- <li><a href="/gnu/gnu.fr.html">français</a> [fr]</li> -->
+<!-- Italian -->
+<!-- <li><a href="/gnu/gnu.it.html">italiano</a> [it]</li> -->
+<!-- Kannada -->
+<!-- <li><a
href="/gnu/gnu.kn.html">ಕನ್ನಡ</a> [kn]</li>
-->
+<!-- Macedonian -->
+<!-- <li><a
href="/gnu/gnu.mk.html">македонски</a> [mk]</li>
-->
+<!-- Norwegian (bokmål) -->
+<!-- <li><a href="/gnu/gnu.nb.html">norsk (bokmål)</a> [nb]</li> -->
+<!-- Dutch -->
+<!-- <li><a href="/gnu/gnu.nl.html">Nederlands</a> [nl]</li> -->
+<!-- Polish -->
+<!-- <li><a href="/gnu/gnu.pl.html">polski</a> [pl]</li> -->
+<!-- Russian -->
+<!-- <li><a
href="/gnu/gnu.ru.html">русский</a> [ru]</li>
-->
+<!-- Serbian -->
+<!-- <li><a
href="/gnu/gnu.sr.html">српски</a> [sr]</li>
-->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>
Index: licenses/agpl-3.0.ca.html
===================================================================
RCS file: licenses/agpl-3.0.ca.html
diff -N licenses/agpl-3.0.ca.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ licenses/agpl-3.0.ca.html 16 Feb 2012 09:31:02 -0000 1.1
@@ -0,0 +1,123 @@
+
+<!--#include virtual="/server/header.ca.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>Llicència Pública General Affero de GNU - Projecte GNU - Free Software
+Foundation (FSF)</title>
+<link rel="alternate" type="application/rdf+xml"
+ href="/licenses/agpl-3.0.rdf" />
+
+<!--#include virtual="/server/banner.ca.html" -->
+<!--#include virtual="/licenses/po/agpl-3.0.translist" -->
+<h2>Llicència Pública General Affero de GNU</h2>
+
+<img src="/graphics/agplv3-155x51.png" alt="" style="float: right;" />
+
+<ul>
+ <li><a href="/licenses/why-affero-gpl.html">Per què utilitzar l'Affero
GPL</a></li>
+ <li><a href="/licenses/gpl-faq.html">Preguntes freqüents</a></li>
+ <li><a href="/licenses/gpl-howto.ca.html">Com utilitzar les llicències de
GNU en
+els vostres programes</a></li>
+ <li><a href="/licenses/translations.ca.html">Traduccions de la GNU
AGPL</a></li>
+ <li>La GNU AGPL en altres formats: <a href="/licenses/agpl-3.0.txt">text pla
+(TXT)</a>, <a href="/licenses/agpl-3.0.dbk">Docbook</a>, <a
+href="/licenses/agpl-3.0.tex">LaTeX</a>, <a
+href="/licenses/agpl-3.0-standalone.html">standalone HTML</a>, <a
+href="/licenses/agpl-3.0.texi">Texinfo</a></li>
+ <li><a href="/graphics/license-logos.ca.html">Logotips de la GNU AGPL</a> per
+utilitzar en el vostre projecte</li>
+ <li><a href="/licenses/gpl-violation.ca.html">Què podeu fer si veieu una
+possible violació de la GNU AGPL</a></li>
+</ul>
+
+<hr style="clear: both;" />
+
+<!--#include virtual="/licenses/agpl-3.0-body.html" -->
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!--#include virtual="/server/footer.ca.html" -->
+<div id="footer">
+
+<p>
+Envieu les vostres preguntes sobre la FSF i GNU a <a
+href="mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
+href="/contact/contact.ca.html">altres formes de contactar</a> amb la FSF.
+<br />
+Envieu els enllaços trencats i d'altres correccions o suggeriments a <a
+href="mailto:address@hidden";><em>address@hidden</em></a>.
+</p>
+
+<p>
+Vegeu la <a href="/server/standards/README.translations.ca.html">Guia de
+traducció</a> per informar-vos sobre la coordinació i publicació de les
+traduccions d'aquest article.
+</p>
+
+<p>
+Nota de copyright a sobre.</p>
+<address>51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</address>
+<p>
+Es permet la còpia i la distribució de còpies literals d'aquest document de
+llicència, però sense cap modificació.
+</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+Traducció: <a href="http://www.puigpe.org/";>puigpe</a>, 15 de febrer de
+2012.</div>
+
+
+ <p>
+<!-- timestamp start -->
+Updated:
+
+$Date: 2012/02/16 09:31:02 $
+
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations">
+ -->
+<!-- <h4>
+Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text. -->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- <ul class="translations-list">
+ -->
+<!-- German -->
+<!-- <li>
+<a href="/licenses/agpl-3.0.de.html">Deutsch</a> [de]</li> -->
+<!-- English -->
+<!-- <li>
+<a href="/licenses/agpl-3.0.html">English</a> [en]</li> -->
+<!-- Russian -->
+<!-- <li>
+<a
href="/licenses/agpl-3.0.ru.html">русский</a> [ru]</li>
-->
+<!-- </ul>
+ -->
+<!-- </div>
+ -->
+</div>
+</body>
+</html>
Index: licenses/fdl-1.3.ca.html
===================================================================
RCS file: licenses/fdl-1.3.ca.html
diff -N licenses/fdl-1.3.ca.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ licenses/fdl-1.3.ca.html 16 Feb 2012 09:31:11 -0000 1.1
@@ -0,0 +1,134 @@
+
+<!--#include virtual="/server/header.ca.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>Llicència de Documentació Lliure de GNU v1.3 - Projecte GNU - Free
Software
+Foundation (FSF)</title>
+<link rel="alternate" type="application/rdf+xml"
+ href="/licenses/fdl-1.3.rdf" />
+
+<!--#include virtual="/server/banner.ca.html" -->
+<!--#include virtual="/licenses/po/fdl-1.3.translist" -->
+<h2>Llicència de Documentació Lliure de GNU</h2>
+
+<ul>
+ <li><a href="/licenses/fdl-1.3-faq.ca.html">Preguntes freqüents sobre la FDL
+1.3</a></li>
+ <li><a href="/licenses/fdl-1.3-pdiff.ps">Diferències entre la FDL 1.2 i la
FDL
+1.3 (PostScript)</a></li>
+ <li><a href="/licenses/fdl-howto.ca.html">Consells sobre l'ús de la
FDL</a></li>
+ <li><a href="/licenses/fdl-howto-opt.ca.html">Com utilitzar les
funcionalitats
+opcionals de la GFDL</a></li>
+ <li><a href="/licenses/translations.ca.html">Traduccions de la GFDL</a></li>
+
+ <li>La FDL en altres formats: <a href="/licenses/fdl-1.3.txt">text pla
+(TXT)</a>, <a href="/licenses/fdl-1.3.texi">Texinfo</a>, <a
+href="/licenses/fdl-1.3-standalone.html">standalone HTML</a>, <a
+href="/licenses/fdl-1.3.xml">DocBook/XML</a>, <a
+href="/licenses/fdl-1.3.tex">LaTeX</a></li>
+
+ <li><a href="/licenses/why-gfdl.ca.html">Per què els editors haurien
d'utilitzar
+la Llicència de Documentació Lliure de GNU</a></li>
+ <li><a href="/philosophy/free-doc.ca.html">Programari lliure i manuals
+lliures</a></li>
+ <li><a href="/licenses/old-licenses/old-licenses.ca.html#FDL">Versions
anteriors
+de la Llicència de Documentació Lliure de GNU</a></li>
+ <li><a href="/licenses/gpl-violation.ca.html">Què podeu fer si veieu una
+possible violació de la GFDL</a></li>
+</ul>
+
+<hr style="clear: both;" />
+
+<!-- The license text is in English and appears broken in RTL as
+ Arabic, Farsi, etc. Explicitly set the direction to override the
+ one defined in the translation. -->
+<div dir="ltr">
+
+<!--#include virtual="/licenses/fdl-1.3-body.html" -->
+</div>
+
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!--#include virtual="/server/footer.ca.html" -->
+<div id="footer">
+
+<p>
+Envieu les vostres preguntes sobre la FSF i GNU a <a
+href="mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
+href="/contact/contact.ca.html">altres formes de contactar</a> amb la FSF.
+<br />
+Envieu els enllaços trencats i d'altres correccions o suggeriments a <a
+href="mailto:address@hidden";><em>address@hidden</em></a>.
+</p>
+
+<p>
+Vegeu la <a href="/server/standards/README.translations.ca.html">Guia de
+traducció</a> per informar-vos sobre la coordinació i publicació de les
+traduccions d'aquest article.
+</p>
+
+<p>
+Nota de copyright a sobre.</p>
+<address>51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</address>
+<p>
+Es permet la còpia i la distribució de còpies literals d'aquest document de
+llicència, però sense cap modificació.
+</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+Traducció: <a href="http://www.puigpe.org/";>puigpe</a>, 15 de febrer de
+2012.</div>
+
+
+ <p>
+<!-- timestamp start -->
+Updated:
+
+$Date: 2012/02/16 09:31:11 $
+
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations">
+ -->
+<!-- <h4>
+Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text. -->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- <ul class="translations-list">
+ -->
+<!-- German -->
+<!-- <li>
+<a href="/licenses/fdl-1.3.de.html">Deutsch</a> [de]</li> -->
+<!-- English -->
+<!-- <li>
+<a href="/licenses/fdl-1.3.html">English</a> [en]</li> -->
+<!-- </ul>
+ -->
+<!-- </div>
+ -->
+</div>
+</body>
+</html>
Index: licenses/gpl-3.0.ca.html
===================================================================
RCS file: licenses/gpl-3.0.ca.html
diff -N licenses/gpl-3.0.ca.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ licenses/gpl-3.0.ca.html 16 Feb 2012 09:31:14 -0000 1.1
@@ -0,0 +1,134 @@
+
+<!--#include virtual="/server/header.ca.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>La Llicència Pública General de GNU v3.0 - Projecte GNU - Free
Software
+Foundation (FSF)</title>
+<link rel="alternate" type="application/rdf+xml"
+ href="/licenses/gpl-3.0.rdf" />
+
+<!--#include virtual="/server/banner.ca.html" -->
+<!--#include virtual="/licenses/po/gpl-3.0.translist" -->
+<h2>Llicència Pública General de GNU</h2>
+
+<img src="/graphics/gplv3-127x51.png" alt="" style="float: right;" />
+
+<ul>
+ <li><a href="/licenses/quick-guide-gplv3.ca.html">Guia rà pida de la
GPLv3</a></li>
+ <li><a href="/licenses/rms-why-gplv3.ca.html">Per què migrar a la
GPLv3</a></li>
+ <li><a href="/licenses/gpl-faq.html">Preguntes freqüents sobre les
llicències de
+GNU</a></li>
+ <li><a href="/licenses/gpl-howto.ca.html">Com utilitzar les llicències de
GNU en
+els vostres programes</a></li>
+ <li><a href="/licenses/translations.ca.html">Traduccions de la GPL</a></li>
+ <li>La GPL en altres formats: <a href="/licenses/gpl-3.0.txt">text pla
+(TXT)</a>, <a href="/licenses/gpl-3.0.texi">Texinfo</a>, <a
+href="/licenses/gpl-3.0.tex">LaTeX</a>, <a
+href="/licenses/gpl-3.0-standalone.html">standalone HTML</a>, <a
+href="/licenses/gpl-3.0.odt">ODF</a>, <a
+href="/licenses/gpl-3.0.dbk">Docbook</a>
+ </li>
+ <li><a href="/graphics/license-logos.ca.html">Logotips de la GPLv3</a> per
+utilitzar en el vostre projecte</li>
+ <li><a href="/licenses/old-licenses/old-licenses.ca.html#GPL">Versions
anteriors
+de la GNU GPL</a></li>
+ <li><a href="/licenses/gpl-violation.ca.html">Què podeu fer si veieu una
+possible violació de la GPL</a></li>
+</ul>
+
+<hr style="clear: both;" />
+
+<!-- The license text is in English and appears broken in RTL as
+ Arabic, Farsi, etc. Explicitly set the direction to override the
+ one defined in the translation. -->
+<div dir="ltr">
+
+<!--#include virtual="/licenses/gpl-3.0-body.html" -->
+</div>
+
+
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!--#include virtual="/server/footer.ca.html" -->
+<div id="footer">
+<p>
+Envieu les vostres preguntes sobre la FSF i GNU a <a
+href="mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
+href="/contact/contact.ca.html">altres formes de contactar</a> amb la FSF.
+<br />
+Envieu els enllaços trencats i d'altres correccions o suggeriments a <a
+href="mailto:address@hidden";><em>address@hidden</em></a>.
+</p>
+
+<p>
+Vegeu la <a href="/server/standards/README.translations.ca.html">Guia de
+traducció</a> per informar-vos sobre la coordinació i publicació de les
+traduccions d'aquest article.
+</p>
+
+<p>
+Nota de copyright a sobre.</p>
+<address>51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</address>
+
+<p>
+Es permet la còpia i la distribució de còpies literals d'aquest document de
+llicència, però sense cap modificació.
+</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+Traducció: <a href="http://www.puigpe.org/";>puigpe</a>, 15 de febrer de
+2012.</div>
+
+
+ <p>
+<!-- timestamp start -->
+Updated:
+
+$Date: 2012/02/16 09:31:14 $
+
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations">
+ -->
+<!-- <h4>
+Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text. -->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- <ul class="translations-list">
+ -->
+<!-- German -->
+<!-- <li>
+<a href="/licenses/gpl-3.0.de.html">Deutsch</a> [de]</li> -->
+<!-- English -->
+<!-- <li>
+<a href="/licenses/gpl-3.0.html">English</a> [en]</li> -->
+<!-- </ul>
+ -->
+<!-- </div>
+ -->
+</div>
+</body>
+</html>
Index: licenses/lgpl-3.0.ca.html
===================================================================
RCS file: licenses/lgpl-3.0.ca.html
diff -N licenses/lgpl-3.0.ca.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ licenses/lgpl-3.0.ca.html 16 Feb 2012 09:31:15 -0000 1.1
@@ -0,0 +1,137 @@
+
+<!--#include virtual="/server/header.ca.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>Llicència Pública General Reduïda de GNU v3.0 - Projecte GNU - Free
Software
+Foundation (FSF)</title>
+<link rel="alternate" type="application/rdf+xml"
+ href="/licenses/lgpl-3.0.rdf" />
+
+<!--#include virtual="/server/banner.ca.html" -->
+<!--#include virtual="/licenses/po/lgpl-3.0.translist" -->
+<h2>Llicència Pública General Reduïda de GNU</h2>
+
+<img src="/graphics/lgplv3-147x51.png" alt="" style="float: right;" />
+
+<ul>
+ <li><a href="/licenses/why-not-lgpl.ca.html">Per què no haurÃeu
d'utilitzar la
+Llicència Pública General Reduïda per a la vostra pròxima
biblioteca</a></li>
+ <li><a href="/licenses/gpl-faq.html">Preguntes freqüents sobre les
llicències de
+GNU</a></li>
+ <li><a href="/licenses/gpl-howto.ca.html">Com utilitzar les llicències de
GNU en
+els vostres programes</a></li>
+ <li><a href="/licenses/translations.ca.html">Traduccions de la LGPL</a></li>
+ <li>La GNU LGPL en altres formats: <a href="/licenses/lgpl-3.0.txt">text pla
+(TXT)</a>, <a href="/licenses/lgpl-3.0.dbk">Docbook</a>, <a
+href="/licenses/lgpl-3.0-standalone.html">standalone HTML</a>, <a
+href="/licenses/lgpl-3.0.tex">LaTeX</a>, <a
+href="/licenses/lgpl-3.0.texi">Texinfo</a></li>
+ <li><a href="/graphics/license-logos.ca.html">Logotips de la LGPLv3</a> per
+utilitzar en el vostre projecte</li>
+ <li><a href="/licenses/old-licenses/old-licenses.ca.html#LGPL">Versions
+anteriors de la GNU LGPL</a></li>
+ <li><a href="/licenses/gpl-violation.ca.html">Què podeu fer si veieu una
+possible violació de la LGPL</a></li>
+</ul>
+
+<p>Aquesta llicència és un conjunt de permisos addicionals afegits a la <a
+href="/licenses/gpl-3.0.ca.html">versió 3 de la Llicència Pública General de
+GNU</a>. Per a més informació sobre com publicar el vostre programari sota
+aquesta llicència, vegeu si us plau la nostra <a
+href="/licenses/gpl-howto.ca.html">pà gina d'instruccions</a>.</p>
+
+<hr style="clear: both;" />
+
+<!-- The license text is in English and appears broken in RTL as
+ Arabic, Farsi, etc. Explicitly set the direction to override the
+ one defined in the translation. -->
+<div dir="ltr">
+
+<!--#include virtual="/licenses/lgpl-3.0-body.html" -->
+</div>
+
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!--#include virtual="/server/footer.ca.html" -->
+<div id="footer">
+
+<p>
+Envieu les vostres preguntes sobre la FSF i GNU a <a
+href="mailto:address@hidden";><em>address@hidden</em></a>. També hi ha <a
+href="/contact/contact.ca.html">altres formes de contactar</a> amb la FSF.
+<br />
+Envieu els enllaços trencats i d'altres correccions o suggeriments a <a
+href="mailto:address@hidden";><em>address@hidden</em></a>.
+</p>
+
+<p>
+Vegeu la <a href="/server/standards/README.translations.ca.html">Guia de
+traducció</a> per informar-vos sobre la coordinació i publicació de les
+traduccions d'aquest article.
+</p>
+
+<p>
+Nota de copyright a sobre.</p>
+<address>51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</address>
+<p>
+Es permet la còpia i la distribució de còpies literals d'aquest document de
+llicència, però sense cap modificació.
+</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+Traducció: <a href="http://www.puigpe.org/";>puigpe</a>, 15 de febrer de
+2012.</div>
+
+
+ <p>
+<!-- timestamp start -->
+Updated:
+
+$Date: 2012/02/16 09:31:15 $
+
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations">
+ -->
+<!-- <h4>
+Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text. -->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- <ul class="translations-list">
+ -->
+<!-- German -->
+<!-- <li>
+<a href="/licenses/lgpl-3.0.de.html">Deutsch</a> [de]</li> -->
+<!-- English -->
+<!-- <li>
+<a href="/licenses/lgpl-3.0.html">English</a> [en]</li> -->
+<!-- </ul>
+ -->
+<!-- </div>
+ -->
+</div>
+</body>
+</html>
Index: licenses/po/agpl-3.0.ca-en.html
===================================================================
RCS file: licenses/po/agpl-3.0.ca-en.html
diff -N licenses/po/agpl-3.0.ca-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ licenses/po/agpl-3.0.ca-en.html 16 Feb 2012 09:31:27 -0000 1.1
@@ -0,0 +1,100 @@
+<!--#include virtual="/server/header.html" -->
+<title>GNU Affero General Public License - GNU Project - Free Software
Foundation (FSF)</title>
+<link rel="alternate" type="application/rdf+xml"
+ href="/licenses/agpl-3.0.rdf" />
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/licenses/po/agpl-3.0.translist" -->
+<h2>GNU Affero General Public License</h2>
+
+<img src="/graphics/agplv3-155x51.png" alt="" style="float: right;" />
+
+<ul>
+ <li><a href="/licenses/why-affero-gpl.html">Why the Affero GPL</a></li>
+ <li><a href="/licenses/gpl-faq.html">Frequently Asked Questions</a></li>
+ <li><a href="/licenses/gpl-howto.html">How to use GNU licenses for your
+ own software</a></li>
+ <li><a href="/licenses/translations.html">Translations
+ of the GNU AGPL</a></li>
+ <li>The GNU AGPL in other formats:
+ <a href="/licenses/agpl-3.0.txt">plain text</a>,
+ <a href="/licenses/agpl-3.0.dbk">Docbook</a>,
+ <a href="/licenses/agpl-3.0.tex">LaTeX</a>,
+ <a href="/licenses/agpl-3.0-standalone.html">standalone HTML</a>,
+ <a href="/licenses/agpl-3.0.texi">Texinfo</a></li>
+ <li><a href="/graphics/license-logos.html">GNU AGPL logos</a> to use
+ with your project</li>
+ <li><a href="/licenses/gpl-violation.html">What to do if you see a
+ possible GNU AGPL violation</a></li>
+</ul>
+
+<hr style="clear: both;" />
+
+<!--#include virtual="/licenses/agpl-3.0-body.html" -->
+</div>
+<!--#include virtual="/server/footer.html" -->
+
+
+<div id="footer">
+
+<p>
+Please send FSF & GNU inquiries to
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.
+<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+</p>
+
+<p>
+Please see the
+<a href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting
+translations of this article.
+</p>
+
+<p>
+Copyright notice above.</p>
+<address>51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</address>
+<p>
+Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
+</p>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2012/02/16 09:31:27 $
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text. -->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- <ul class="translations-list"> -->
+<!-- German -->
+<!-- <li><a href="/licenses/agpl-3.0.de.html">Deutsch</a> [de]</li> -->
+<!-- English -->
+<!-- <li><a href="/licenses/agpl-3.0.html">English</a> [en]</li> -->
+<!-- Russian -->
+<!-- <li><a
href="/licenses/agpl-3.0.ru.html">русский</a> [ru]</li>
-->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>
Index: licenses/po/fdl-1.3.ca-en.html
===================================================================
RCS file: licenses/po/fdl-1.3.ca-en.html
diff -N licenses/po/fdl-1.3.ca-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ licenses/po/fdl-1.3.ca-en.html 16 Feb 2012 09:31:27 -0000 1.1
@@ -0,0 +1,109 @@
+<!--#include virtual="/server/header.html" -->
+<title>GNU Free Documentation License v1.3 - GNU Project - Free Software
Foundation (FSF)</title>
+<link rel="alternate" type="application/rdf+xml"
+ href="/licenses/fdl-1.3.rdf" />
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/licenses/po/fdl-1.3.translist" -->
+<h2>GNU Free Documentation License</h2>
+
+<ul>
+ <li><a href="/licenses/fdl-1.3-faq.html">FDL 1.3 Frequently Asked
+ Questions</a></li>
+ <li><a href="/licenses/fdl-1.3-pdiff.ps">Marked-up changes between
+ FDL 1.2 and FDL 1.3 (PostScript)</a></li>
+ <li><a href="/licenses/fdl-howto.html">Tips on how to use the FDL</a></li>
+ <li><a href="/licenses/fdl-howto-opt.html">How to Use the Optional
+ Features of the GFDL</a></li>
+ <li><a href="/licenses/translations.html">Translations
+ of the GFDL</a></li>
+
+ <li>The FDL in other formats:
+ <a href="/licenses/fdl-1.3.txt">plain text</a>,
+ <a href="/licenses/fdl-1.3.texi">Texinfo</a>,
+ <a href="/licenses/fdl-1.3-standalone.html">standalone HTML</a>,
+ <a href="/licenses/fdl-1.3.xml">DocBook/XML</a>,
+ <a href="/licenses/fdl-1.3.tex">LaTeX</a></li>
+
+ <li><a href="/licenses/why-gfdl.html">Why publishers should use the
+ GNU Free Documentation License</a></li>
+ <li><a href="/philosophy/free-doc.html">Free Software and Free
+ Manuals</a></li>
+ <li><a href="/licenses/old-licenses/old-licenses.html#FDL">Old versions
+ of the GNU Free Documentation License</a></li>
+ <li><a href="/licenses/gpl-violation.html">What to do if you see a
+ possible GFDL violation</a></li>
+</ul>
+
+<hr style="clear: both;" />
+
+<!-- The license text is in English and appears broken in RTL as
+ Arabic, Farsi, etc. Explicitly set the direction to override the
+ one defined in the translation. -->
+<div dir="ltr">
+<!--#include virtual="/licenses/fdl-1.3-body.html" -->
+</div>
+</div>
+<!--#include virtual="/server/footer.html" -->
+
+<div id="footer">
+
+<p>
+Please send FSF & GNU inquiries to
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.
+<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+</p>
+
+<p>
+Please see the
+<a href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting
+translations of this article.
+</p>
+
+<p>
+Copyright notice above.</p>
+<address>51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</address>
+<p>
+Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
+</p>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2012/02/16 09:31:27 $
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text. -->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- <ul class="translations-list"> -->
+<!-- German -->
+<!-- <li><a href="/licenses/fdl-1.3.de.html">Deutsch</a> [de]</li> -->
+<!-- English -->
+<!-- <li><a href="/licenses/fdl-1.3.html">English</a> [en]</li> -->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>
Index: licenses/po/gpl-3.0.ca-en.html
===================================================================
RCS file: licenses/po/gpl-3.0.ca-en.html
diff -N licenses/po/gpl-3.0.ca-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ licenses/po/gpl-3.0.ca-en.html 16 Feb 2012 09:31:27 -0000 1.1
@@ -0,0 +1,108 @@
+<!--#include virtual="/server/header.html" -->
+<title>The GNU General Public License v3.0 - GNU Project - Free Software
Foundation (FSF)</title>
+<link rel="alternate" type="application/rdf+xml"
+ href="/licenses/gpl-3.0.rdf" />
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/licenses/po/gpl-3.0.translist" -->
+<h2>GNU General Public License</h2>
+
+<img src="/graphics/gplv3-127x51.png" alt="" style="float: right;" />
+
+<ul>
+ <li><a href="/licenses/quick-guide-gplv3.html">A Quick Guide to
GPLv3</a></li>
+ <li><a href="/licenses/rms-why-gplv3.html">Why Upgrade to GPLv3</a></li>
+ <li><a href="/licenses/gpl-faq.html">Frequently Asked Questions about
+ the GNU licenses</a></li>
+ <li><a href="/licenses/gpl-howto.html">How to use GNU licenses for your
+ own software</a></li>
+ <li><a href="/licenses/translations.html">Translations
+ of the GPL</a></li>
+ <li>The GPL in other formats:
+ <a href="/licenses/gpl-3.0.txt">plain text</a>,
+ <a href="/licenses/gpl-3.0.texi">Texinfo</a>,
+ <a href="/licenses/gpl-3.0.tex">LaTeX</a>,
+ <a href="/licenses/gpl-3.0-standalone.html">standalone HTML</a>,
+ <a href="/licenses/gpl-3.0.odt">ODF</a>,
+ <a href="/licenses/gpl-3.0.dbk">Docbook</a>
+ </li>
+ <li><a href="/graphics/license-logos.html">GPLv3 logos</a> to use
+ with your project</li>
+ <li><a href="/licenses/old-licenses/old-licenses.html#GPL">Old
+ versions of the GNU GPL</a></li>
+ <li><a href="/licenses/gpl-violation.html">What to do if you see a
+ possible GPL violation</a></li>
+</ul>
+
+<hr style="clear: both;" />
+
+<!-- The license text is in English and appears broken in RTL as
+ Arabic, Farsi, etc. Explicitly set the direction to override the
+ one defined in the translation. -->
+<div dir="ltr">
+<!--#include virtual="/licenses/gpl-3.0-body.html" -->
+</div>
+
+</div>
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<p>
+Please send FSF & GNU inquiries to
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.
+<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+</p>
+
+<p>
+Please see the
+<a href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting
+translations of this article.
+</p>
+
+<p>
+Copyright notice above.</p>
+<address>51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</address>
+
+<p>
+Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
+</p>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2012/02/16 09:31:27 $
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text. -->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- <ul class="translations-list"> -->
+<!-- German -->
+<!-- <li><a href="/licenses/gpl-3.0.de.html">Deutsch</a> [de]</li> -->
+<!-- English -->
+<!-- <li><a href="/licenses/gpl-3.0.html">English</a> [en]</li> -->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>
Index: licenses/po/lgpl-3.0.ca-en.html
===================================================================
RCS file: licenses/po/lgpl-3.0.ca-en.html
diff -N licenses/po/lgpl-3.0.ca-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ licenses/po/lgpl-3.0.ca-en.html 16 Feb 2012 09:31:28 -0000 1.1
@@ -0,0 +1,112 @@
+<!--#include virtual="/server/header.html" -->
+<title>GNU Lesser General Public License v3.0 - GNU Project - Free Software
Foundation (FSF)</title>
+<link rel="alternate" type="application/rdf+xml"
+ href="/licenses/lgpl-3.0.rdf" />
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/licenses/po/lgpl-3.0.translist" -->
+<h2>GNU Lesser General Public License</h2>
+
+<img src="/graphics/lgplv3-147x51.png" alt="" style="float: right;" />
+
+<ul>
+ <li><a href="/licenses/why-not-lgpl.html">Why you shouldn't use the
+ Lesser GPL for your next library</a></li>
+ <li><a href="/licenses/gpl-faq.html">Frequently Asked Questions about
+ the GNU licenses</a></li>
+ <li><a href="/licenses/gpl-howto.html">How to use GNU licenses for your
+ own software</a></li>
+ <li><a href="/licenses/translations.html">Translations
+ of the LGPL</a></li>
+ <li>The GNU LGPL in other formats:
+ <a href="/licenses/lgpl-3.0.txt">plain text</a>,
+ <a href="/licenses/lgpl-3.0.dbk">Docbook</a>,
+ <a href="/licenses/lgpl-3.0-standalone.html">standalone HTML</a>,
+ <a href="/licenses/lgpl-3.0.tex">LaTeX</a>,
+ <a href="/licenses/lgpl-3.0.texi">Texinfo</a></li>
+ <li><a href="/graphics/license-logos.html">LGPLv3 logos</a> to use
+ with your project</li>
+ <li><a href="/licenses/old-licenses/old-licenses.html#LGPL">Old
+ versions of the GNU LGPL</a></li>
+ <li><a href="/licenses/gpl-violation.html">What to do if you see a
+ possible LGPL violation</a></li>
+</ul>
+
+<p>This license is a set of additional permissions added to <a
+href="/licenses/gpl-3.0.html">version 3 of the GNU General Public
+License</a>. For more information about how to release your own software
+under this license, please see our <a href="/licenses/gpl-howto.html">page
+of instructions</a>.</p>
+
+<hr style="clear: both;" />
+
+<!-- The license text is in English and appears broken in RTL as
+ Arabic, Farsi, etc. Explicitly set the direction to override the
+ one defined in the translation. -->
+<div dir="ltr">
+<!--#include virtual="/licenses/lgpl-3.0-body.html" -->
+</div>
+</div>
+<!--#include virtual="/server/footer.html" -->
+
+<div id="footer">
+
+<p>
+Please send FSF & GNU inquiries to
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF.
+<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.
+</p>
+
+<p>
+Please see the
+<a href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting
+translations of this article.
+</p>
+
+<p>
+Copyright notice above.</p>
+<address>51 Franklin Street, Fifth Floor, Boston, MA 02110, USA</address>
+<p>
+Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
+</p>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2012/02/16 09:31:28 $
+<!-- timestamp end -->
+</p>
+</div>
+
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text. -->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- <ul class="translations-list"> -->
+<!-- German -->
+<!-- <li><a href="/licenses/lgpl-3.0.de.html">Deutsch</a> [de]</li> -->
+<!-- English -->
+<!-- <li><a href="/licenses/lgpl-3.0.html">English</a> [en]</li> -->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>
Index: licenses/po/licenses.ja-en.html
===================================================================
RCS file: licenses/po/licenses.ja-en.html
diff -N licenses/po/licenses.ja-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ licenses/po/licenses.ja-en.html 16 Feb 2012 09:31:30 -0000 1.1
@@ -0,0 +1,441 @@
+<!--#include virtual="/server/header.html" -->
+<title>Licenses - GNU Project - Free Software Foundation (FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/licenses/po/licenses.translist" -->
+<h2>Licenses</h2>
+
+<p>
+Published software should be <a href="/philosophy/free-sw.html">free
+software</a>. To make it free software, you need to release it
+under a free software license. We normally use the <a
+href="#GPL">GNU General Public License</a> (GNU GPL),
+but occasionally we use <a
href="/licenses/license-list.html#SoftwareLicenses">other
+free software licenses</a>. We use only licenses that are compatible
+with the GNU GPL for GNU software.
+</p>
+
+<p>
+Documentation for free software should be
+<a href="/philosophy/free-doc.html">free documentation</a>, so that
+people can redistribute it and improve it along with the software
+it describes. To make it free documentation, you need to release
+it under a free documentation license. We normally use the
+<a href="#FDL">GNU Free Documentation License</a> (GNU
+FDL), but occasionally we use
+<a href="/licenses/license-list.html#DocumentationLicenses">other free
+documentation licenses</a>.
+</p>
+
+<p>If you've started a new project and you're not sure what license to
+use, <a href="/licenses/license-recommendations.html">“How to
+choose a license for your own work”</a> details our
+recommendations in an easy-to-follow guide. If you just want a quick
+list reference, we have a page that names
+our <a href="/licenses/recommended-copylefts.html">recommended
+copyleft licenses</a>.</p>
+
+<p>
+Our documentation licenses are currently being revised, and we welcome
+your comments on the proposed texts. Please
+visit <a href="http://gplv3.fsf.org";>our license update site</a> to
+read the current drafts and participate in the process.
+</p>
+
+<h3>Common Resources for our Software Licenses</h3>
+
+<p>We have a number of resources to help people understand and use our
+various licenses:</p>
+
+<ul>
+
+ <li><a href="/licenses/gpl-faq.html">Frequently Asked
+ Questions about the GNU licenses</a></li>
+ <li><a href="/licenses/gpl-howto.html">How to use GNU licenses for your
+ 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 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="/licenses/license-list.html#LicensingMailingList"><address@hidden>
+mailing list</a> for general licensing help
+ </li>
+
+</ul>
+
+<h3 id="GPL">The GNU General Public License</h3>
+
+<p>
+The GNU General Public License is often called the GNU GPL for short;
+it is used by most GNU programs, and by more than half of all free
+software packages. The latest version is version 3.
+</p>
+
+<ul>
+ <li>The GNU General Public License is available in these formats:
+ <a href="/licenses/gpl.html">HTML</a>,
+ <a href="/licenses/gpl.txt">plain text</a>,
+ <a href="/licenses/gpl.odt">ODF</a>,
+ <a href="/licenses/gpl.dbk">Docbook</a>,
+ <a href="/licenses/gpl.texi">Texinfo</a>, and
+ <a href="/licenses/gpl.tex">LaTeX</a>.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.</li>
+ <li><a href="/licenses/quick-guide-gplv3.html">A Quick Guide to
+ GPLv3</a></li>
+ <li><a href="/licenses/old-licenses/old-licenses.html#GPL">Older
+ versions of the GNU GPL</a></li>
+</ul>
+
+<h3 id="LGPL">The GNU Lesser General Public License</h3>
+
+<p>
+The GNU Lesser General Public License is used by a few (not by any means
+all) GNU libraries. The latest version is version 3.
+</p>
+
+<ul>
+ <li>The GNU Lesser General Public License text is available in
+ these formats:
+ <a href="/licenses/lgpl.html">HTML</a>,
+ <a href="/licenses/lgpl.txt">plain text</a>,
+ <a href="/licenses/lgpl.dbk">Docbook</a>, and
+ <a href="/licenses/lgpl.texi">Texinfo</a>.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.</li>
+ <li><a href="/licenses/why-not-lgpl.html">Why you shouldn't use
+ the Lesser GPL for your next library</a></li>
+ <li><a href="/licenses/old-licenses/old-licenses.html#LGPL">Older
+ versions of the GNU LGPL</a></li>
+</ul>
+
+<h3 id="AGPL">The GNU Affero General Public License</h3>
+
+<p>
+The GNU Affero General Public License is based on the GNU GPL, but has an
+additional term to allow users who interact with the licensed software over
+a network to receive the source for that program. We recommend that people
+consider using the GNU AGPL for any software which will commonly be run
+over a network. The latest version is version 3.
+</p>
+
+<ul>
+ <li>The GNU Affero General Public License text is available in
+ these formats:
+ <a href="/licenses/agpl.html">HTML</a>,
+ <a href="/licenses/agpl.txt">plain text</a>,
+ <a href="/licenses/agpl.dbk">Docbook</a>,
+ <a href="/licenses/agpl.texi">Texinfo</a>, and
+ <a href="/licenses/agpl.tex">LaTeX</a>.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.</li>
+ <li><a href="/licenses/why-affero-gpl.html">Why the Affero GPL</a></li>
+</ul>
+
+<h3 id="FDL">The GNU Free Documentation License</h3>
+
+<p>
+The GNU Free Documentation License is a form of copyleft intended
+for use on a manual, textbook or other document to assure everyone
+the effective freedom to copy and redistribute it, with or without
+modifications, either commercially or non-commercially. The latest version
+is 1.3.
+</p>
+
+<ul>
+ <li>The GNU Free Documentation License text is available in these formats:
+ <a href="/licenses/fdl.html">HTML</a>,
+ <a href="/licenses/fdl.txt">plain text</a>,
+ <a href="/licenses/fdl.xml">Docbook</a>,
+ <a href="/licenses/fdl.texi">Texinfo</a>, and
+ <a href="/licenses/fdl.tex">LaTeX</a>.
+These documents are not formatted for standalone publishing, and
+are intended to be included in another document.</li>
+ <li><a href="/licenses/why-gfdl.html">Why publishers should use
+ the GNU FDL</a></li>
+ <li><a href="/licenses/fdl.html#addendum">How to use
+ the GNU FDL for your documentation</a></li>
+ <li><a href="/licenses/fdl-howto.html">Tips on using the GNU FDL</a></li>
+ <li><a href="/licenses/fdl-howto-opt.html">How to use the optional
+ features of the GNU FDL</a></li>
+ <li><a href="/licenses/old-licenses/old-licenses.html#FDL">
+ Older versions of the GNU FDL</a></li>
+</ul>
+
+<h3 id="Exceptions">Exceptions to GNU Licenses</h3>
+
+<p>Some GNU programs have additional permissions or special exceptions
+ to specific terms in one of the main licenses. Since some of those
+ are commonly used or inspire a lot of questions on their own, we've
+ started collecting them on
+ our <a href="/licenses/exceptions.html">exceptions page</a>.</p>
+
+<h3 id="LicenseURLs">License URLs</h3>
+
+<p>When linking to our licenses, it's usually best to link to the latest
+version; hence the standard URLs such as
+<tt>http://www.gnu.org/licenses/gpl.html</tt> have no version number.
+Occasionally, however, you may want to link to a specific version of a
+given license. In those situations, you can use the following links
+[<a href="#urlskip">skip links</a>]:</p>
+
+<dl>
+<dt>GNU General Public License (GPL)</dt>
+<!-- Please keep these links absolute. I'm depending on that for the
+ XSLT to generate pages on fsf.org. Thanks. -brett -->
+<dd><a href="http://www.gnu.org/licenses/gpl-3.0.html";>GPLv3</a>,
+<a href="http://www.gnu.org/licenses/gpl-2.0.html";>GPLv2</a>,
+<a href="http://www.gnu.org/licenses/gpl-1.0.html";>GPLv1</a></dd>
+
+<dt>GNU Lesser General Public License (LGPL)</dt>
+<dd><a href="http://www.gnu.org/licenses/lgpl-3.0.html";>LGPLv3</a>,
+<a href="http://www.gnu.org/licenses/lgpl-2.1.html";>LGPLv2.1</a></dd>
+
+<dt>GNU Affero General Public License (AGPL)</dt>
+<dd><a href="http://www.gnu.org/licenses/agpl-3.0.html";>GNU
+ AGPLv3</a> (The <a
+ href="http://www.affero.org/oagpl.html";>Affero General
+ Public License version 1</a> is not a GNU license, but it was
+ designed to serve a purpose much like the GNU AGPL's.)</dd>
+
+<dt>GNU Free Documentation License (FDL)</dt>
+<dd><a href="http://www.gnu.org/licenses/fdl-1.3.html";>FDLv1.3</a>,
+<a href="http://www.gnu.org/licenses/fdl-1.2.html";>FDLv1.2</a>,
+<a href="http://www.gnu.org/licenses/fdl-1.1.html";>FDLv1.1</a></dd>
+</dl>
+
+<p><a name="urlskip"></a>Stable links to each license's alternative
+ formats are available on its respective page. Not every version of
+ every license is available in every format. If you need one that is
+ missing, please <a href="mailto:address@hidden";>email us</a>.</p>
+
+<p>See also the <a href="old-licenses/">old licenses page</a>.</p>
+
+
+<h3>Unofficial Translations</h3>
+
+<p>
+Legally speaking, the original (English) version of the licenses is what
+specifies the actual distribution terms for GNU programs and others that
+use them. But to help people better understand the licenses, we give
+permission to publish translations into other languages provided that
+they follow our regulations for unofficial translations:
+</p>
+
+<ul>
+ <li>
+ <a href="/licenses/translations.html">List of unofficial translations</a>
+ </li>
+ <li><a href="/licenses/translations.html#rules">How to create an unofficial
+ translation</a></li>
+</ul>
+
+<h3 id="VerbatimCopying">Verbatim Copying and Distribution</h3>
+
+<p>The standard copyright terms for GNU web pages is now the <a
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>. It used to
+be (and for a few pages still is): <em><span class="highlight">Verbatim
+copying and distribution of this entire article are permitted worldwide,
+without royalty, in any medium, provided this notice is
+preserved</span>.</em> Please note the following commentary about this
+“verbatim license” by Eben Moglen:</p>
+
+<p>
+“Our intention in using the phrase ‘verbatim copying in
+any medium’ is not to require retention of page headings and
+footers or other formatting features. Retention of weblinks in both
+hyperlinked and non-hyperlinked media (as notes or some other form of
+printed URL in non-HTML media) is required”.
+</p>
+
+<h3>List of Free Software Licenses</h3>
+
+<ul>
+ <li>
+ <a href="/licenses/license-list.html">List of Free Software Licenses</a>
+
+<p> If you are contemplating writing a new license, please contact the
+FSF by writing to <a
+href="mailto:address@hidden";><address@hidden></a>. The
+proliferation of different free software licenses means increased work
+for users in understanding the licenses; we may be able to help you
+find an existing Free Software license that meets your needs.
+</p>
+
+<p>
+If that isn't possible, if you really need a new license, with our
+help you can ensure that the license really is a Free Software license
+and avoid various practical problems.
+</p>
+
+ </li>
+ </ul>
+
+
+<h3 id="WhatIsCopyleft">What Is Copyleft?</h3>
+
+<p>
+<a href="/copyleft/copyleft.html"><em>Copyleft</em></a> is a general
+method for making a program free
+software and requiring all modified and extended versions of the
+program to be free software as well.
+</p>
+
+<p>
+The simplest way to make a program free is to put it in the
+<a href="/philosophy/categories.html#PublicDomainSoftware">public
+domain</a>, uncopyrighted. This allows people to share the program
+and their improvements, if they are so minded. But it also allows
+uncooperative people to convert the program into
+<a href="/philosophy/categories.html#ProprietarySoftware">proprietary
+software</a>. They can make changes, many or few, and distribute the
+result as a proprietary product. People who receive the program in
+that modified form do not have the freedom that the original author
+gave them; the middleman has stripped it away.
+</p>
+
+<p>
+In the <a href="/gnu/thegnuproject.html">GNU project</a>, our aim is
+to give <em>all</em> users the freedom to redistribute and change GNU
+software. If middlemen could strip off the freedom, we might have
+many users, but those users would not have freedom. So instead of
+putting GNU software in the public domain, we “copyleft”
+it. Copyleft says that anyone who redistributes the software, with or
+without changes, must pass along the freedom to further copy and
+change it. Copyleft guarantees that every user has freedom.
+</p>
+
+<p>
+Copyleft also provides an
+<a href="/philosophy/pragmatic.html">incentive</a>
+for other programmers to add to free software.
+Important free programs such as the GNU C++ compiler exist
+only because of this.
+</p>
+
+<p>
+Copyleft also helps programmers who want to contribute
+<a href="/software/software.html#HelpWriteSoftware">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
+want to contribute her changes to the community, but her employer may
+want to turn the changes into a proprietary software product.
+</p>
+
+<p>
+When we explain to the employer that it is illegal to distribute the
+improved version except as free software, the employer usually decides
+to release it as free software rather than throw it away.
+</p>
+
+<p>
+To copyleft a program, we first state that it is copyrighted; then
+we add distribution terms, which are a legal instrument that gives
+everyone the rights to use, modify, and redistribute the program's
+code <em>or any program derived from it</em> but only if the
+distribution terms are unchanged. Thus, the code and the freedoms
+become legally inseparable.
+</p>
+
+<p>
+Proprietary software developers use copyright to take away the users'
+freedom; we use copyright to guarantee their freedom. That's why we
+reverse the name, changing “copyright” into
+“copyleft”.
+</p>
+
+<p>
+Copyleft is a general concept; there are many ways to fill in the
+details. In the GNU Project, the specific distribution terms that we
+use are contained in the GNU General Public License, the GNU Lesser
+General Public License and the GNU Free Documentation License.
+</p>
+
+<p>
+The appropriate license is included in many manuals and in each GNU
+source code distribution.
+</p>
+
+<p>
+The GNU GPL is designed so that you can easily apply it to your own
+program if you are the copyright holder. You don't have to modify the
+GNU GPL to do this, just add notices to your program which refer
+properly to the GNU GPL. Please note that you must use the
+entire text of the GPL, if you use it. It is an integral whole, and
+partial copies are not permitted. (Likewise for the LGPL, AGPL, and FDL.)
+</p>
+
+<p>
+Using the same distribution terms for many different programs makes it
+easy to copy code between various different programs. Since they all
+have the same distribution terms, there is no need to think about
+whether the terms are compatible. The Lesser GPL includes a
+provision that lets you alter the distribution terms to the ordinary
+GPL, so that you can copy code into another program covered by the GPL.
+</p>
+
+<h3>Licenses for Other Types of Works</h3>
+
+<p>
+We believe that published software and documentation should be
+<a href="/philosophy/free-doc.html">free software and free documentation</a>.
+We recommend making all sorts of educational and reference works free
+also, using free documentation licenses such as the
+<a href="#FDL">GNU Free Documentation License</a> (GNU FDL).
+</p>
+
+<p>For essays of opinion and scientific papers, we recommend
+either the <a
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>, or the
+simple “verbatim copying only” license stated above.</p>
+
+<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 href="http://artlibre.org/licence/lalgb.html";>Free Art
+License</a>.</p>
+
+<!-- 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". -->
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<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.<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";><em>address@hidden</em></a>.</p>
+
+<p>Please see the
+<a href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting
+translations of this article.</p>
+
+<p>Copyright © 2011 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>
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2012/02/16 09:31:30 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
Index: philosophy/po/compromise.zh-cn-en.html
===================================================================
RCS file: philosophy/po/compromise.zh-cn-en.html
diff -N philosophy/po/compromise.zh-cn-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ philosophy/po/compromise.zh-cn-en.html 16 Feb 2012 09:32:31 -0000
1.1
@@ -0,0 +1,296 @@
+<!--#include virtual="/server/header.html" -->
+
+<title>Avoiding Ruinous Compromises - GNU Project - Free Software Foundation
(FSF)</title>
+
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/po/compromise.translist" -->
+
+<div style="float: right; font-size: 90%; width: 30em; margin: 1em;
+background-color: #ececec; padding: 1em; -moz-border-radius: 1em;
+margin-top: 4em;"><p><em>“Twenty-five years
+ago <a href="/gnu/initial-announcement.html">on September 27, 1983, I
+announced a plan</a> to create a completely free operating system
+called GNU—for ‘GNU's Not Unix’. As part of the
+25th anniversary of the GNU system, I have written this article on how
+our community can avoid ruinous compromises. In addition to avoiding
+such compromises, there are many ways you can <a href="/help/">help
+GNU</a> and free software. One basic way is
+to <a
href="https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052";>
+join the Free Software Foundation</a> as an Associate
+Member.”</em>—<b>Richard Stallman</b></p></div>
+
+<h2>Avoiding Ruinous Compromises</h2>
+
+<p>by <strong>Richard Stallman</strong></p>
+
+<p>The free software movement aims for a social
+change: <a href="/philosophy/free-sw.html">to make all software
+free</a> so that all software users are free and can be part of a
+community of cooperation. Every nonfree program gives its developer
+unjust power over the users. Our goal is to put an end to that
+injustice.</p>
+
+<p>The road to freedom
+is <a
href="http://www.fsf.org/bulletin/2008/spring/the-last-mile-is-always-the-hardest/";>
+a long road</a>. It will take many steps and many years to reach a
+world in which it is normal for software users to have freedom. Some
+of these steps are hard, and require sacrifice. Some of them become easier
+if we make compromises with people that have different goals.</p>
+
+<p>Thus, the <a href="http://www.fsf.org/";>Free Software
+Foundation</a> makes compromises—even major ones. For
+instance, we made compromises in the patent provisions of version 3 of
+the <a href="/licenses/gpl.html">GNU General Public License</a> (GNU GPL) so
+that major companies would contribute to and distribute GPLv3-covered
+software and thus bring some patents under the effect of these
+provisions. </p>
+
+<img src="/graphics/gplv3-large.png" alt="" style="float: left;" />
+
+<p><a href="/licenses/lgpl.html">The Lesser GPL</a>'s purpose is a
+compromise: we use it on certain chosen free libraries to permit their
+use in nonfree programs because we think that legally prohibiting
+this would only drive developers to proprietary libraries instead. We
+accept and install code in GNU programs to make them work together
+with common nonfree programs, and we document and publicize this in
+ways that encourage users of the latter to install the former, but not
+vice versa. We support specific campaigns we agree with, even when we
+don't fully agree with the groups behind them.</p>
+
+<p>But we reject certain compromises even though many others in our
+community are willing to make them. For instance,
+we <a href="/philosophy/free-system-distribution-guidelines.html">
+endorse only the GNU/Linux distributions</a> that have policies not to
+include nonfree software or lead users to install it. To endorse
+nonfree distributions would be a <acronym title="ruinous
+(rū'ə-nəs) adj. 1. Causing or apt to cause ruin;
+destructive. 2. Falling to ruin; dilapidated or
+decayed.">ruinous</acronym> compromise.</p>
+
+<p>Compromises are ruinous if they would work against our aims in the
+long term. That can occur either at the level of ideas or at the level of
+actions.</p>
+
+<p>At the level of ideas, ruinous compromises are those that reinforce
+the premises we seek to change. Our goal is a world in which software
+users are free, but as yet most computer users do not even recognize
+freedom as an issue. They have taken up “consumer”
+values, which means they judge any program only on practical characteristics
+such as price and convenience.</p>
+
+<p>Dale Carnegie's classic self-help book, <cite>How to Win Friends and
+Influence People</cite>, advises that the most effective way to
+persuade someone to do something is to present arguments that appeal
+to his values. There are ways we can appeal to the consumer values
+typical in our society. For instance, free software obtained gratis
+can save the user money. Many free programs are convenient and
+reliable, too. Citing those practical benefits has succeeded in
+persuading many users to adopt various free programs, some of which
+are now quite successful.</p>
+
+<p>If getting more people to use some free programs is as far as you
+aim to go, you might decide to keep quiet about the concept of
+freedom, and focus only on the practical advantages that make sense
+in terms of consumer values. That's what the term “open
+source” and its associated rhetoric do.</p>
+
+<p>That approach can get us only part way to the goal of freedom. People
+who use free software only because it is convenient will stick with it
+only as long as it is convenient. And they will see no reason not to
+use convenient proprietary programs along with it.</p>
+
+<p>The philosophy of open source presupposes and appeals to consumer
+values, and this affirms and reinforces them. That's why we
+<a href="/philosophy/open-source-misses-the-point.html">do not support
+open source.</a></p>
+
+<img src="/graphics/gnulaptop.png" alt="" style="float: right;" />
+
+<p>To establish a free community fully and lastingly, we need to do
+more than get people to use some free software. We need to spread the
+idea of judging software (and other things) on “citizen
+values”, based on whether it respects users' freedom and
+community, not just in terms of convenience. Then people will not
+fall into the trap of a proprietary program baited by an attractive,
+convenient feature.</p>
+
+<p>To promote citizen values, we have to talk about them and show how
+they are the basis of our actions. We must reject the Dale Carnegie
+compromise that would influence their actions by endorsing their
+consumer values.</p>
+
+<p>This is not to say we cannot cite practical advantage at all—we can
+and we do. It becomes a problem only when the practical advantage steals
+the scene and pushes freedom into the background. Therefore,
+when we cite the practical advantages of free software, we reiterate
+frequently that those are just <em>additional, secondary</em> reasons
+to prefer it.</p>
+
+<p>It's not enough to make our words accord with our ideals; our
+actions have to accord with them too. So we must also avoid
+compromises that involve doing or legitimizing the things we aim to
+stamp out.</p>
+
+<p>For instance, experience shows that you can attract some users to
+<a href="/gnu/why-gnu-linux.html">GNU/Linux</a> if you include some
+nonfree programs. This could mean a cute nonfree application that
+will catch some user's eye, or a nonfree programming platform such
+as <a href="/philosophy/java-trap.html">Java</a> (formerly) or the
+Flash runtime (still), or a nonfree device driver that enables
+support for certain hardware models.</p>
+
+<p>These compromises are tempting, but they undermine the goal. If
+you distribute nonfree software, or steer people towards it, you will
+find it hard to say, “Nonfree software is an injustice, a
+social problem, and we must put an end to it.” And even if you
+do continue to say those words, your actions will undermine them.</p>
+
+<p>The issue here is not whether people should be <em>able</em>
+or <em>allowed</em> to install nonfree software; a general-purpose
+system enables and allows users to do whatever they wish. The issue
+is whether we guide users towards nonfree software. What they do on
+their own is their responsibility; what we do for them, and what we
+direct them towards, is ours. We must not direct the
+users towards proprietary software as if it were a solution, because
+proprietary software is the problem.</p>
+
+<p>A ruinous compromise is not just a bad influence on others. It can
+distort your own values, too, through cognitive dissonance. If you
+have certain values, but your actions imply other, conflicting values,
+you are likely to change your values or your actions so as to resolve the
+contradiction. Thus, projects that argue only from practical
+advantages, or direct people toward some nonfree software, nearly
+always shy away from even <em>suggesting</em> that nonfree software
+is unethical. For their participants, as well as for the public, they
+reinforce consumer values. We must reject these compromises if we wish
+to keep our values straight.</p>
+
+<p>If you want to move to free software without compromising the goal
+of freedom, look at <a href="http://www.fsf.org/resources";>the FSF's
+resources area</a>. It lists hardware and machine configurations that
+work with free software, <a href="/distros"> totally free GNU/Linux
+distros</a> to install, and thousands of free software packages that
+work in a 100 percent free software environment. If you want to help the
+community stay on the road to freedom, one important way is to
+publicly uphold citizen values. When people are discussing what is
+good or bad, or what to do, cite the values of freedom and community
+and argue from them.</p>
+
+<p>A road that lets you go faster is no improvement if it leads to the
+wrong place. Compromise is essential to achieve an ambitious goal,
+but beware of compromises that lead away from the goal.</p>
+
+<hr />
+
+<p>
+For a similar point in a different area of life,
+see <a
href="http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change";>"'Nudge'
+is not enough"</a>.
+</p>
+
+</div>
+
+<!--#include virtual="/server/footer.html" -->
+
+<div id="footer">
+<p>
+Please send 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.
+<br />
+Please send broken links and other corrections or suggestions to
+<a href="mailto:address@hidden";><address@hidden></a>.
+</p>
+
+<p>
+Please see the
+<a href="/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting
+translations of this article.
+</p>
+
+<p>Copyright © 2008, 2009 <a href="http://www.stallman.org/";>Richard
+Stallman</a>.</p>
+
+<p>Richard Stallman is the founder of the Free Software Foundation.
+You can copy and redistribute this article under the <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
+Commons Attribution Noderivs 3.0 license</a>.</p>
+
+<!--
+<rdf:RDF xmlns="http://creativecommons.org/ns#";
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
+<Work rdf:about="">
+<license rdf:resource="http://creativecommons.org/licenses/by-nd/3.0/"; />
+</Work>
+
+<License rdf:about="http://creativecommons.org/licenses/by-nd/3.0/";>
+ <requires rdf:resource="http://creativecommons.org/ns#Attribution"; />
+ <permits rdf:resource="http://creativecommons.org/ns#Reproduction"; />
+
+ <permits rdf:resource="http://creativecommons.org/ns#Distribution"; />
+ <requires rdf:resource="http://creativecommons.org/ns#Notice"; />
+</License>
+
+</rdf:RDF>
+
+-->
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2012/02/16 09:32:31 $
+<!-- timestamp end -->
+</p>
+</div>
+<!-- All pages on the GNU web server should have the section about -->
+<!-- verbatim copying. Please do NOT remove this without talking -->
+<!-- with the webmasters first. -->
+<!-- Please make sure the copyright date is consistent with the document -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical by language code. -->
+<!-- Comment what the language is for each type, i.e. de is German. -->
+<!-- Write the language name in its own language (Deutsch) in the text. -->
+<!-- If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - /home/www/html/server/standards/README.translations.html -->
+<!-- - one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the language code right; see: -->
+<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
+<!-- If the 2-letter ISO 639-1 code is not available, -->
+<!-- use the 3-letter ISO 639-2. -->
+<!-- Please use W3C normative character entities. -->
+<!-- -->
+<!-- <ul class="translations-list"> -->
+<!-- Bulgarian -->
+<!-- <li><a
href="/philosophy/compromise.bg.html">български</a> [bg]</li>
-->
+<!-- Greek -->
+<!-- <li><a
href="/philosophy/compromise.el.html">ελληνικά</a> [el]</li>
-->
+<!-- English -->
+<!-- <li><a href="/philosophy/compromise.html">English</a> [en]</li> -->
+<!-- Spanish -->
+<!-- <li><a
href="/philosophy/compromise.es.html">español</a> [es]</li> -->
+<!-- French -->
+<!-- <li><a
href="/philosophy/compromise.fr.html">français</a> [fr]</li> -->
+<!-- Italian -->
+<!-- <li><a href="/philosophy/compromise.it.html">italiano</a> [it]</li>
-->
+<!-- Malayalam -->
+<!-- <li><a
href="/philosophy/compromise.ml.html">മലയാളം</a> [ml]</li>
-->
+<!-- Polish -->
+<!-- <li><a href="/philosophy/compromise.pl.html">polski</a> [pl]</li> -->
+<!-- Russian -->
+<!-- <li><a
href="/philosophy/compromise.ru.html">русский</a> [ru]</li>
-->
+<!-- Chinese (Simplified) -->
+<!-- <li><a
href="/philosophy/compromise.zh-cn.html">简体中文</a> [zh-cn]</li>
-->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>
Index: philosophy/po/free-doc.zh-cn-en.html
===================================================================
RCS file: philosophy/po/free-doc.zh-cn-en.html
diff -N philosophy/po/free-doc.zh-cn-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ philosophy/po/free-doc.zh-cn-en.html 16 Feb 2012 09:32:35 -0000
1.1
@@ -0,0 +1,245 @@
+<!--#include virtual="/server/header.html" -->
+
+<title>Why Free Software needs Free Documentation - GNU Project - Free
Software Foundation (FSF)</title>
+
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/philosophy/po/free-doc.translist" -->
+
+<h2>Why Free Software needs Free Documentation</h2>
+
+<div style="text-align: center; font-size: 110%;text-shadow: 0 0 0.2em #fff;
width: 300px; float: right; margin: 12px; background-color: #a0f112; color:
#353831; padding: 1em;"><a href="http://defectivebydesign.org/ebooks.html";>Join
our mailing list about the dangers of eBooks</a>.</div>
+
+<ul>
+<li><a href="/copyleft/fdl.html">The GNU Free Documentation License</a></li>
+</ul>
+
+<p>
+The biggest deficiency in free operating systems is not in the
+software—it is the lack of good free manuals that we can include
+in these systems. Many of our most important programs do not come
+with full manuals. Documentation is an essential part of any software
+package; when an important free software package does not come with a
+free manual, that is a major gap. We have many such gaps today.</p>
+
+<p>
+Once upon a time, many years ago, I thought I would learn Perl. I got
+a copy of a free manual, but I found it hard to read. When I asked
+Perl users about alternatives, they told me that there were better
+introductory manuals—but those were not free.</p>
+
+<p>
+Why was this? The authors of the good manuals had written them for
+O'Reilly Associates, which published them with restrictive
+terms—no copying, no modification, source files not
+available—which exclude them from the free software
+community.</p>
+
+<p>
+That wasn't the first time this sort of thing has happened, and (to
+our community's great loss) it was far from the last. Proprietary
+manual publishers have enticed a great many authors to restrict their
+manuals since then. Many times I have heard a GNU user eagerly tell
+me about a manual that he is writing, with which he expects to help
+the GNU Project—and then had my hopes dashed, as he proceeded to
+explain that he had signed a contract with a publisher that would
+restrict it so that we cannot use it.</p>
+
+<p>
+Given that writing good English is a rare skill among programmers, we
+can ill afford to lose manuals this way.</p>
+
+<p>
+Free documentation, like free software, is a matter of freedom, not
+price. The problem with these manuals was not that O'Reilly
+Associates charged a price for printed copies—that in itself is
+fine. (The Free Software Foundation
+<a href="/doc/doc.html#DescriptionsOfGNUDocumentation">sells printed
+copies</a> of free <a href="/doc/doc.html">GNU manuals</a>, too.) But
+GNU manuals are available in source code form, while these manuals are
+available only on paper. GNU manuals come with permission to copy and
+modify; the Perl manuals do not. These restrictions are the problems.</p>
+
+<p>
+The criterion for a free manual is pretty much the same as for free
+software: it is a matter of giving all users certain freedoms.
+Redistribution (including commercial redistribution) must be
+permitted, so that the manual can accompany every copy of the program,
+on line or on paper. Permission for modification is crucial too.</p>
+
+<p>
+As a general rule, I don't believe that it is essential for people to
+have permission to modify all sorts of articles and books. The issues
+for writings are not necessarily the same as those for software. For
+example, I don't think you or I are obliged to give permission to
+modify articles like this one, which describe our actions and our
+views.</p>
+
+<p>
+But there is a particular reason why the freedom to modify is crucial
+for documentation for free software. When people exercise their right
+to modify the software, and add or change its features, if they are
+conscientious they will change the manual too—so they can provide
+accurate and usable documentation with the modified program. A manual
+which forbids programmers from being conscientious and finishing the job, or
+more precisely requires them to write a new manual from scratch if
+they change the program, does not fill our community's needs.</p>
+
+<p>
+While a blanket prohibition on modification is unacceptable, some
+kinds of limits on the method of modification pose no problem. For
+example, requirements to preserve the original author's copyright
+notice, the distribution terms, or the list of authors, are OK. It is
+also no problem to require modified versions to include notice that
+they were modified, even to have entire sections that may not be
+deleted or changed, as long as these sections deal with nontechnical
+topics. (Some GNU manuals have them.)</p>
+
+<p>
+These kinds of restrictions are not a problem because, as a practical
+matter, they don't stop the conscientious programmer from adapting the
+manual to fit the modified program. In other words, they don't block
+the free software community from making full use of the manual.</p>
+
+<p>
+However, it must be possible to modify all the <em>technical</em>
+content of the manual, and then distribute the result through all the usual
+media, through all the usual channels; otherwise, the restrictions do
+block the community, the manual is not free, and so we need another
+manual.</p>
+
+<p>
+Unfortunately, it is often hard to find someone to write another
+manual when a proprietary manual exists. The obstacle is that many
+users think that a proprietary manual is good enough—so they
+don't see the need to write a free manual. They do not see that the
+free operating system has a gap that needs filling.</p>
+
+<p>
+Why do users think that proprietary manuals are good enough? Some
+have not considered the issue. I hope this article will do something
+to change that.</p>
+
+<p>
+Other users consider proprietary manuals acceptable for the same
+reason so many people consider proprietary software acceptable: they
+judge in purely practical terms, not using freedom as a criterion.
+These people are entitled to their opinions, but since those opinions
+spring from values which do not include freedom, they are no guide for
+those of us who do value freedom.</p>
+
+<p>
+Please spread the word about this issue. We continue to lose manuals
+to proprietary publishing. If we spread the word that proprietary
+manuals are not sufficient, perhaps the next person who wants to help
+GNU by writing documentation will realize, before it is too late, that
+he must above all make it free.</p>
+
+<p>
+We can also encourage commercial publishers to sell free, copylefted
+manuals instead of proprietary ones. One way you can help this is to
+check the distribution terms of a manual before you buy it, and
+prefer copylefted manuals to noncopylefted ones.</p>
+<p>
+[Note: We maintain a <a href="/doc/other-free-books.html">page
+that lists free books available from other publishers</a>].</p>
+
+</div>
+
+<!--#include virtual="/server/footer.html" -->
+
+<div id="footer">
+<p>
+Please send 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.
+<br />
+Please send broken links and other corrections or suggestions
+to <a href="mailto:address@hidden";><address@hidden></a>.
+</p>
+
+<p>
+Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+2005, 2006, 2007, 2009 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>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2012/02/16 09:32:35 $
+<!-- timestamp end -->
+</p>
+</div>
+<!-- All pages on the GNU web server should have the section about -->
+<!-- verbatim copying. Please do NOT remove this without talking -->
+<!-- with the webmasters first. -->
+<!-- Please make sure the copyright date is consistent with the document -->
+<!-- and that it is like this "2001, 2002" not this "2001-2002." -->
+
+<!-- <div id="translations"> -->
+<!-- <h4>Translations of this page</h4> -->
+<!-- -->
+<!-- Please keep this list alphabetical, and in the original -->
+<!-- language if possible, otherwise default to English -->
+<!-- If you do not have it English, please comment what the -->
+<!-- English is. If you add a new language here, please -->
+<!-- advise address@hidden and add it to -->
+<!-- - in /home/www/bin/nightly-vars either TAGSLANG or WEBLANG -->
+<!-- - in /home/www/html/server/standards/README.translations.html -->
+<!-- one of the lists under the section "Translations Underway" -->
+<!-- - if there is a translation team, you also have to add an alias -->
+<!-- to mail.gnu.org:/com/mailer/aliases -->
+<!-- Please also check you have the 2 letter language code right versus -->
+<!-- http://www.w3.org/WAI/ER/IG/ert/iso639.htm -->
+<!-- -->
+<!-- <ul class="translations-list"> -->
+<!-- Arabic -->
+<!-- <li><a
href="/philosophy/free-doc.ar.html">العربية</a> [ar]</li>
-->
+<!-- Bulgarian -->
+<!-- <li><a
href="/philosophy/free-doc.bg.html">български</a> [bg]</li>
-->
+<!-- Catalan -->
+<!-- <li><a
href="/philosophy/free-doc.ca.html">català</a> [ca]</li> -->
+<!-- Czech -->
+<!-- <li><a
href="/philosophy/free-doc.cs.html">Česky</a> [cs]</li> -->
+<!-- German -->
+<!-- <li><a href="/philosophy/free-doc.de.html">Deutsch</a> [de]</li> -->
+<!-- English -->
+<!-- <li><a href="/philosophy/free-doc.html">English</a> [en]</li> -->
+<!-- Spanish -->
+<!-- <li><a
href="/philosophy/free-doc.es.html">español</a> [es]</li> -->
+<!-- French -->
+<!-- <li><a
href="/philosophy/free-doc.fr.html">français</a> [fr]</li> -->
+<!-- Hebrew -->
+<!-- <li><a
href="/philosophy/free-doc.he.html">עברית</a> [he]</li>
-->
+<!-- Croatian -->
+<!-- <li><a href="/philosophy/free-doc.hr.html">hrvatski</a> [hr]</li> -->
+<!-- Indonesian -->
+<!-- <li><a href="/philosophy/free-doc.id.html">Bahasa
Indonesia</a> [id]</li> -->
+<!-- Italian -->
+<!-- <li><a href="/philosophy/free-doc.it.html">italiano</a> [it]</li> -->
+<!-- Japanese -->
+<!-- <li><a
href="/philosophy/free-doc.ja.html">日本語</a> [ja]</li>
-->
+<!-- Dutch -->
+<!-- <li><a href="/philosophy/free-doc.nl.html">Nederlands</a> [nl]</li>
-->
+<!-- Polish -->
+<!-- <li><a href="/philosophy/free-doc.pl.html">polski</a> [pl]</li> -->
+<!-- Brazilian Portuguese -->
+<!-- <li><a href="/philosophy/free-doc.pt-br.html">português do
Brasil</a> [pt-br]</li> -->
+<!-- Romanian -->
+<!-- <li><a
href="/philosophy/free-doc.ro.html">română</a> [ro]</li> -->
+<!-- Russian -->
+<!-- <li><a
href="/philosophy/free-doc.ru.html">русский</a> [ru]</li>
-->
+<!-- Serbian -->
+<!-- <li><a
href="/philosophy/free-doc.sr.html">српски</a> [sr]</li>
-->
+<!-- Tamil -->
+<!-- <li><a
href="/philosophy/free-doc.ta.html">தமிழ்</a> [ta]</li>
-->
+<!-- Turkish -->
+<!-- <li><a
href="/philosophy/free-doc.tr.html">Türkçe</a> [tr]</li> -->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www copyleft/po/copyleft.translist doc/doc.zh-c...,
GNUN <=