[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www fun/jokes/po/10-kinds-of-people.ru.po fun/j...
|
From: |
GNUN |
|
Subject: |
www fun/jokes/po/10-kinds-of-people.ru.po fun/j... |
|
Date: |
Wed, 08 Aug 2012 16:28:12 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 12/08/08 16:28:12
Modified files:
fun/jokes/po : 10-kinds-of-people.ru.po
10-kinds-of-people.translist
licenses : license-list.it.html
licenses/po : license-list.it-en.html license-list.it.po
philosophy : android-and-users-freedom.pl.html
philosophy/po : android-and-users-freedom.pl-en.html
server/gnun/compendia: compendium.ru.po
Added files:
fun/jokes : 10-kinds-of-people.ru.html
fun/jokes/po : 10-kinds-of-people.ru-en.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/10-kinds-of-people.ru.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/10-kinds-of-people.ru.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/10-kinds-of-people.translist?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/fun/jokes/po/10-kinds-of-people.ru-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.it.html?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it-en.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it.po?cvsroot=www&r1=1.66&r2=1.67
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/android-and-users-freedom.pl.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/android-and-users-freedom.pl-en.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ru.po?cvsroot=www&r1=1.12&r2=1.13
Patches:
Index: fun/jokes/po/10-kinds-of-people.ru.po
===================================================================
RCS file: /web/www/www/fun/jokes/po/10-kinds-of-people.ru.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- fun/jokes/po/10-kinds-of-people.ru.po 8 Aug 2012 13:49:38 -0000
1.1
+++ fun/jokes/po/10-kinds-of-people.ru.po 8 Aug 2012 16:27:03 -0000
1.2
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: 10-kinds-of-people.html\n"
-"POT-Creation-Date: 2011-09-20 12:26-0300\n"
+"POT-Creation-Date: 2012-06-10 04:26-0300\n"
"PO-Revision-Date: 2012-04-06 13:30+0400\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -25,8 +25,8 @@
"There are 10 kinds of people in the world — those who understand "
"binary and those who don't."
msgstr ""
-"РмиÑе 10 Ñипов лÑдей — Ñе, кÑо
Ð·Ð½Ð°ÐµÑ Ð´Ð²Ð¾Ð¸ÑнÑе ÑиÑла, и "
-"Ñе, кÑо не знаеÑ."
+"РмиÑе 10 Ñипов лÑдей — Ñе, кÑо
Ð·Ð½Ð°ÐµÑ Ð´Ð²Ð¾Ð¸ÑнÑе ÑиÑла, и Ñе, "
+"кÑо не знаеÑ."
#. type: Content of: <blockquote><p>
msgid ""
@@ -56,8 +56,8 @@
#. type: Content of: <p>
msgid "The Free Software Foundation claims no copyright on this joke."
msgstr ""
-"Фонд Ñвободного пÑогÑаммного обеÑпеÑениÑ
не заÑвлÑÐµÑ Ð°Ð²ÑоÑÑкиÑ
пÑав на "
-"ÑÑÑ ÑÑÑкÑ."
+"Фонд Ñвободного пÑогÑаммного обеÑпеÑениÑ
не заÑвлÑÐµÑ Ð°Ð²ÑоÑÑкиÑ
пÑав на ÑÑÑ "
+"ÑÑÑкÑ."
# type: Content of: <div><div>
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -86,16 +86,18 @@
"пÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ адÑеÑÑ <a
href=\"mailto:address@hidden";><"
"address@hidden></a>."
-# type: Content of: <div><p>
#. 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 ""
-"Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ð¾ кооÑдинаÑии и пÑедложениÑм
пеÑеводов ÑÑой ÑÑаÑÑи Ñм. в <a href="
-"\"/server/standards/README.translations.html\">“Ð ÑководÑÑве
по "
-"пеÑеводам”</a>."
+"ÐÑ ÑÑаÑалиÑÑ ÑделаÑÑ ÑÑÐ¾Ñ Ð¿ÐµÑевод ÑоÑнÑм
и каÑеÑÑвеннÑм, но иÑклÑÑиÑÑ "
+"возможноÑÑÑ Ð¾Ñибки Ð¼Ñ Ð½Ðµ можем.
ÐÑиÑÑлайÑе, пожалÑйÑÑа, Ñвои замеÑÐ°Ð½Ð¸Ñ Ð¸ "
+"пÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ пеÑÐµÐ²Ð¾Ð´Ñ Ð¿Ð¾ адÑеÑÑ <a
href=\"mailto:address@hidden";
+"\"><address@hidden></a>. </p><p>Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ð¾
кооÑдинаÑии и "
+"пÑедложениÑм пеÑеводов наÑиÑ
ÑÑаÑей Ñм. в
<a href=\"/server/standards/README."
+"translations.html\">“Ð ÑководÑÑве по
пеÑеводам”</a>."
# type: Content of: <div><div>
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
@@ -107,7 +109,6 @@
"найденнÑÑ
оÑибкаÑ
в <a
href=\"http://savannah.gnu.org/projects/www-ru";
"\">ÑÑÑÑкой гÑÑппе пеÑеводов gnu.org</a>.</em>"
-# type: Content of: <div><p>
#. timestamp start
#. type: Content of: <div><p>
msgid "Updated:"
Index: fun/jokes/po/10-kinds-of-people.translist
===================================================================
RCS file: /web/www/www/fun/jokes/po/10-kinds-of-people.translist,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- fun/jokes/po/10-kinds-of-people.translist 16 Jul 2012 00:28:47 -0000
1.4
+++ fun/jokes/po/10-kinds-of-people.translist 8 Aug 2012 16:27:03 -0000
1.5
@@ -6,6 +6,8 @@
<li><a href="/fun/jokes/10-kinds-of-people.en.html">English</a> [en]</li>
<!-- French -->
<li><a
href="/fun/jokes/10-kinds-of-people.fr.html">français</a> [fr]</li>
+<!-- Russian -->
+<li><a
href="/fun/jokes/10-kinds-of-people.ru.html">ÑÑÑÑкий</a> [ru]</li>
</ul>
</div> <!-- id="translations" -->
<div class="netscape4" id="skiptrans"></div>
Index: licenses/license-list.it.html
===================================================================
RCS file: /web/www/www/licenses/license-list.it.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- licenses/license-list.it.html 22 Jul 2012 16:27:38 -0000 1.33
+++ licenses/license-list.it.html 8 Aug 2012 16:27:14 -0000 1.34
@@ -209,8 +209,8 @@
class="anchor-reference-id"> (<a
href="#GNUAllPermissive">#GNUAllPermissive</a>)</span></dt>
<dd>
-<p>Questa è una semplice licenza di software libero, che lascia molti permessi
-ed è compatibile con la GNU GPL; la consigliamo per i file README e altri
+<p>Questa è una licenza di software libero debole, che lascia molti permessi
ed
+è compatibile con la GNU GPL; la consigliamo per i file README e altri
piccoli file di supporto distribuiti con i programmi GNU. Tutti gli
sviluppatori possono sentirsi liberi di utilizzarla in situazioni simili.</p>
@@ -225,12 +225,14 @@
</dt>
<dd>
<p>Questa è una licenza di software libero, compatibile con la versione 3
della
-GPL.</p>
+GNU GPL.</p>
<p>Notate che questa licenza non è compatibile con la versione 2 della GPL,
-perché ha requisiti che mancavano nella versione più vecchia della GPL: ad
-esempio, terminazioni dei brevetti e compensazioni.</p></dd>
-
+perché ha requisiti che mancavano in quella versione della GPL: ad esempio,
+terminazioni dei brevetti e compensazioni. La protezione dai tranelli
+brevettuali è importante, e per questo motivo per programmi di una certa
+consistenza consigliamo la licenza Apache 2.0 anziché altre licenze
+permissive.</p></dd>
<dt><a id="ArtisticLicense2"
href="http://www.perlfoundation.org/artistic_license_2_0";> Licenza Artistica
@@ -265,7 +267,7 @@
Boost</a> <span class="anchor-reference-id">(<a
href="#boost">#boost</a>)</span></dt>
<dd>
-<p>Questa è una semplice licenza di software libero, permissiva, senza
+<p>Questa è una licenza di software libero, debole e permissiva, senza
copyleft, compatibile con la GNU GPL.</p></dd>
@@ -276,17 +278,21 @@
<p>(Nota: in questo link, la licenza BSD modificata è elencata nella sezione
<em>General</em>).</p>
<p>Questa è la licenza BSD originale, modificata rimuovendo la clausola
-pubblicitaria. Ã una licenza per software libero semplice, permissiva, senza
+pubblicitaria. Ã una licenza per software libero debole e permissiva, senza
copyleft, compatibile con la GNU GPL.</p>
-<p>Se desiderate una licenza per software libero semplice, permissiva e senza
-copyleft, allora la licenza BSD modificata è una buona scelta. Ad ogni modo,
-è rischioso raccomandare l'uso della "licenza BSD", per una possibile
-confusione che può portare all'uso della <a href="#OriginalBSD">licenza BSD
+<p>Talvolta questa licenza è denominata "la licenza BSD con 3 clausole".</p>
+
+<p>La licenza BSD modificata è una buona scelta nell'ambito delle licenze
+deboli e permissive, anche se la licenza Apache 2.0 è preferibile. Ad ogni
+modo, è rischioso raccomandare l'uso della "licenza BSD", anche per casi
+speciali come programmi molto brevi, per una possibile confusione che può
+portare all'uso della problematica <a href="#OriginalBSD">licenza BSD
<em>originale</em></a>. Per evitare questo rischio suggerite la licenza
X11. La licenza X11 e la BSD modificata sono più o meno equivalenti.</p>
-<p>Talvolta questa licenza è denominata "la licenza BSD con 3
clausole".</p></dd>
+<p>Comunque la licenza Apache 2.0 è migliore per programmi di una certa
+consistenza, perché previene tranelli brevettuali.</p></dd>
<dt><a id="CC0"
@@ -297,7 +303,7 @@
rilasciata sotto CC0 è di pubblico dominio per l'interpretazione più ampia
possibile che la legge permette di questo termine. Se per qualche motivo
questo non è possibile, CC0 permette in subordine di ripiegare su una
-semplice licenza permissiva. Sono compatibili con la GNU GPL entrambe le
+licenza debole e permissiva. Sono compatibili con la GNU GPL entrambe le
licenze comprese in CC0.</p>
<p>Se volete che il vostro lavoro sia di dominio pubblico, vi consigliamo di
@@ -347,7 +353,7 @@
licenza generica Cryptix</a> <span class="anchor-reference-id"> (<a
href="#CryptixGeneralLicense">#CryptixGeneralLicense</a>)</span></dt>
<dd>
-<p>Questa è una semplice licenza per software libero permissiva, senza
+<p>Questa è una licenza per software libero debole e permissiva, senza
copyleft, compatibile con la GNU GPL. Ã molto simile alla licenza
X11.</p></dd>
@@ -408,7 +414,7 @@
software EU DataGrid</a> <span class="anchor-reference-id"> (<a
href="#EUDataGrid">#EUDataGrid</a>)</span></dt>
<dd>
-<p>Questa è una semplice licenza di software libero, permissiva, senza
+<p>Questa è una licenza di software libero, debole e permissiva, senza
copyleft, compatibile con la GNU GPL.</p></dd>
@@ -416,10 +422,12 @@
Expat</a> <span class="anchor-reference-id">(<a
href="#Expat">#Expat</a>)</span></dt>
<dd>
-<p>Questa è una semplice licenza per software libero permissiva, senza
+<p>Questa è una semplice licenza per software libero debole e permissiva,
senza
copyleft, compatibile con la GNU GPL. A volte viene ambiguamente chiamata
-con il nome di <em>Licenza MIT</em>.</p></dd>
+con il nome di <em>Licenza MIT</em>.</p>
+<p>Per programmi di una certa consistenza è meglio usare la licenza Apache
2.0,
+perché previene tranelli brevettuali.</p></dd>
<dt><a id="FreeBSD"
href="http://www.freebsd.org/copyright/freebsd-license.html";> Licenza di
@@ -428,14 +436,11 @@
<dd>
<p>Questa è la licenza BSD originale, a cui sono state tolte la clausola di
pubblicità e un'altra; a volte è chiamata la “licenza BSD con 2
-clausole”. E' una semplice licenza per software libero permissiva,
+clausole”. E' una licenza per software libero debole e permissiva,
senza copyleft, compatibile con la GNU GPL. </p>
-<p>Se desiderate una semplice licenza per software libero permissiva, senza
-copyleft, la licenza di FreeBSD è una scelta ragionevole. Tuttavia, cercate
-di non chiamarla “BSD” o “stile BSD”, perché
-potreste facilmente creare confusione che potrebbe portare all'uso della
-inappropriata <a href="#OriginalBSD">licenza BSD
<em>originale</em></a>.</p></dd>
+<p>I nostri commenti sulla <a href="#ModifiedBSD">Licenza BSD modificata</a> si
+applicano anche a questa licenza.</p></dd>
<dt><a id="freetype" href="http://freetype.fis.uniroma2.it/FTL.TXT";> Freetype
@@ -488,7 +493,7 @@
<span class="anchor-reference-id">(<a href="#ISC">#ISC</a>)</span></dt>
<dd>
<p>Questa licenza è anche nota come licenza di OpenBSD. E' una licenza di
-software libero, compatibile con la GNU GPL.</p>
+software libero debole e permissiva, compatibile con la GNU GPL.</p>
<p>Questa licenza ha una scelta lessicale discutibile: dà a chi riceve il
software il "Permesso di usare, copiare, modificare, e/o distribuire
@@ -560,8 +565,8 @@
<dd>
<p>Questa licenza è basata sulle condizioni delle licenze <a
href="#Expat">Expat</a> e <a href="#ModifiedBSD">BSD modificata</a>. E' una
-licenza di software libero semplice, senza copyleft, compatibile con la GNU
-GPL.</p></dd>
+licenza di software libero debole e permissiva, senza copyleft, compatibile
+con la GNU GPL.</p></dd>
<dt><!-- lc `s', leave for compatibility -->
@@ -668,7 +673,7 @@
New Jersey Copyright License</a> <span class="anchor-reference-id"> (<a
href="#StandardMLofNJ">#StandardMLofNJ</a>)</span></dt>
<dd>
-<p>Questa è una semplice licenza di software libero, permissiva, senza
+<p>Questa è una licenza di software libero, debole e permissiva, senza
copyleft, compatibile con la GNU GPL.</p></dd>
@@ -679,7 +684,7 @@
<p>Questa è una licenza che Unicode, Inc. ha applicato al suo Unicode
Character
Database: vari file di dati che gli sviluppatori possono usare per
semplificare l'implementazione dello standard Unicode nei propri
-programmi. E' una semplice licenza permissiva, compatibile con tutte le
+programmi. E' una licenza debole e permissiva, compatibile con tutte le
versioni della GPL.</p>
<p>Se volete utilizzare file coperti da questo accordo di licenza nel vostro
@@ -698,9 +703,10 @@
dell'accordo di licenza spiega a quali file esso si applica.</p>
<p>Vi sconsigliamo di utilizzare questo accordo di licenza per il software che
-scrivete. Se volete usare una semplice licenza permissiva, <a
-href="#Expat">la licenza di Expat</a> è molto più comune e ha riconoscimento
-più ampio nella comunità .</p></dd>
+scrivete. Se volete usare una licenza debole e permissiva, considerate <a
+href="#Expat">la licenza di Expat</a> per programmi brevi e la licenza
+Apache 2.0 per programmi consistenti. Queste due licenze sono molto più
+comuni e hanno riconoscimento più ampio nella comunità del software
libero.</p></dd>
<dt><a id="Unlicense" href="http://unlicense.org/";> Unlicense</a> <span
@@ -708,7 +714,7 @@
<dd>
<p>La Unlicense è una donazione in pubblico dominio. Un lavoro rilasciato
sotto
la Unlicense diventa di dominio pubblico nella più ampia accezione del
-termine permessa dalla legge, e ha inoltre una semplice licenza permissiva
+termine permessa dalla legge, e ha inoltre una licenza debole e permissiva
aggiuntiva che copre i casi in cui la donazione è problematica. Entrambe le
licenze comprese in Unlicense sono compatibili con la GNU GPL.</p>
@@ -752,15 +758,20 @@
<dt><a id="WTFPL" href="http://sam.zoy.org/wtfpl/COPYING";> WTFPL, versione
2</a>
<span class="anchor-reference-id">(<a href="#WTFPL">#WTFPL</a>)</span></dt>
<dd>
-<p>Questa è una licenza di software libero, molto permissiva e compatibile con
-la GPL.</p></dd>
+<p>Questa è una licenza di software libero, debole e permissiva, senza
+copyleft, compatibile con la GNU GPL.</p>
+<p>Sconsigliamo questa licenza. Se volete una licenza permissiva per un piccolo
+programma, consigliamo la <a href="#X11License">licenza X11</a>. Per un
+programma più grande suggeriremmo una licenza copyleft o, se desiderate
+usare una licenza permissiva, consigliamo la licenza Apache 2.0 perché
+protegge gli utenti da tranelli brevettuali.</p></dd>
<dt><a id="X11License" href="http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3";>
La
licenza di X11</a> <span class="anchor-reference-id"> (<a
href="#X11License">#X11License</a>)</span></dt>
<dd>
-<p>Questa è una semplice licenza per software libero permissiva, senza
+<p>Questa è una licenza per software libero debole e permissiva, senza
copyleft, compatibile con la GNU GPL. Le vecchie versioni di XFree86
utilizzavano la stessa licenza, e così pure alcune varianti attuali di
XFree86. Le versioni successive di XFree86, comunque, sono distribuite sotto
@@ -768,7 +779,12 @@
<p>Questa licenza è a volte chiamata <em>licenza MIT</em>, ma questo termine
è
improprio, perché il MIT ha usato molte diverse licenze per il proprio
-software.</p></dd>
+software.</p>
+
+<p>Questa licenza va bene per un piccolo programma. Per un programma più
+grande suggeriremmo una licenza copyleft o, se desiderate usare una licenza
+permissiva, consigliamo la licenza Apache 2.0 perché protegge gli utenti da
+tranelli brevettuali.</p></dd>
<dt><a id="XFree861.1License"
@@ -776,8 +792,8 @@
<span class="anchor-reference-id"> (<a
href="#XFree861.1License">#XFree861.1License</a>)</span></dt>
<dd>
-<p>Questa è una licenza di software libero semplice, permissiva, senza
-copyleft, compatibile con la versione 3 della GPL.</p>
+<p>Questa è una licenza di software libero debole e permissiva, senza
copyleft,
+compatibile con la versione 3 della GPL.</p>
<p>Notate che questa licenza è incompatibile con la versione 2 della GPL, a
causa di requisiti imposti a tutta la documentazione distribuita che
@@ -802,8 +818,8 @@
Zope, versione 2.0 e 2.1</a> <span class="anchor-reference-id"> (<a
href="#Zope2.0">#Zope2.0</a>)</span></dt>
<dd>
-<p>Questa è una licenza di software libero semplice, permissiva, senza
-copyleft, compatibile con la GNU GPL.</p></dd>
+<p>Questa è una licenza di software libero debole e permissiva, senza
copyleft,
+compatibile con la GNU GPL.</p></dd>
</dl>
@@ -859,7 +875,7 @@
licenza Apache, versione 1.0</a> <span class="anchor-reference-id"> (<a
href="#apache1">#apache1</a>)</span></dt>
<dd>
-<p>Questa è una licenza di software libero semplice, permissiva, senza
copyleft
+<p>Questa è una licenza di software libero debole e permissiva, senza copyleft
con una clausola di pubblicità . Questa clausola crea <a
href="/philosophy/bsd.html">problemi pratici</a> come quelli della licenza
BSD originale, compresa l'incompatibilità con la GNU GPL.</p></dd>
@@ -893,18 +909,21 @@
<em>UCB/LBL</em>. Questa licenza è anche chiamata, a volte, “licenza
BSD a 4 clausole”.)</p>
-<p>Questa è una semplice licenza permissiva per software libero, senza
copyleft
+<p>Questa è una licenza per software libero debole e permissiva, senza
copyleft
con un problema serio: la "fastidiosa clausola pubblicitaria BSD". Il
problema non è determinante: non rende il software non libero. Ma causa
molti <a href="/philosophy/bsd.html">problemi pratici</a>, inclusa
l'incompatibilità con la GNU GPL.</p>
<p>Vi chiediamo di non utilizzare la licenza BSD originale per il vostro
-software. Se desiderate una licenza per software libero semplice,
-permissiva, senza copyleft vi consigliamo l'uso della <a
-href="#ModifiedBSD">licenza BSD modificata</a> oppure della licenza X11. In
-ogni caso, non sussiste una valida per ragione per non utilizzare programmi
-rilasciati sotto la licenza BSD originale.</p></dd>
+software. Se desiderate una licenza per software libero debole e permissiva,
+senza copyleft vi consigliamo l'uso della <a href="#ModifiedBSD">licenza BSD
+modificata</a> della licenza X11 o della licenza Expat. E per programmi
+significativi è meglio utilizzare la licenza Apache 2.0 che protegge da
+tranelli brevettuali.</p>
+
+<p>Ad ogni modo, non sussiste una valida ragione per evitare di utilizzare
+programmi rilasciati sotto la licenza BSD originale.</p></dd>
<dt><a id="CDDL"
href="http://www.opensolaris.org/os/licensing/cddllicense.txt";>
@@ -1361,10 +1380,10 @@
La licenza pubblica Zope versione 1</a> <span class="anchor-reference-id">
(<a href="#Zope">#Zope</a>)</span></dt>
<dd>
-<p>Questa è una licenza per software libero semplice, leggermente permissiva e
-senza permesso d'autore con <a href="/philosophy/bsd.html">problemi
-pratici</a> come quelli riscontrati nella licenza originale BSD, inclusa
-l'incompatibilità con la <a href="/licenses/gpl.html">GNU GPL</a>.</p>
+<p>Questa è una licenza per software libero debole, piuttosto permissiva e
+senza copyleft con <a href="/philosophy/bsd.html">problemi pratici</a> come
+quelli riscontrati nella licenza originale BSD, inclusa l'incompatibilitÃ
+con la <a href="/licenses/gpl.html">GNU GPL</a>.</p>
<p>Vi invitiamo a non utilizzare la ZPL versione 1 per il vostro software. Ad
ogni modo, non esiste una valida ragione per non utilizzare programmi
@@ -2102,7 +2121,7 @@
<p><!-- timestamp start -->
Ultimo aggiornamento:
-$Date: 2012/07/22 16:27:38 $
+$Date: 2012/08/08 16:27:14 $
<!-- timestamp end -->
</p>
Index: licenses/po/license-list.it-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it-en.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- licenses/po/license-list.it-en.html 22 Jul 2012 16:27:48 -0000 1.16
+++ licenses/po/license-list.it-en.html 8 Aug 2012 16:27:22 -0000 1.17
@@ -218,7 +218,7 @@
<span class="anchor-reference-id">
(<a href="#GNUAllPermissive">#GNUAllPermissive</a>)</span></dt>
<dd>
-<p>This is a simple permissive free software license, compatible with
+<p>This is a lax, permissive free software license, compatible with
the GNU GPL, which we recommend GNU packages use for README and other
small supporting files. All developers can feel free to use it in
similar situations.</p>
@@ -233,12 +233,15 @@
<span class="anchor-reference-id">(<a href="#apache2">#apache2</a>)</span>
</dt>
<dd>
-<p>This is a free software license, compatible with version 3 of the GPL.</p>
-
-<p>Please note that this license is not compatible with GPL version 2, because
-it has some requirements that are not in the older version. These include
-certain patent termination and indemnification provisions.</p></dd>
+<p>This is a free software license, compatible with version 3 of the
+GNU GPL.</p>
+<p>Please note that this license is not compatible with GPL version 2,
+because it has some requirements that are not in the that GPL version.
+These include certain patent termination and indemnification
+provisions. The patent termination provision is a good thing, which
+is why we recommend the Apache 2.0 license for substantial programs
+over other lax permissive licenses.</p></dd>
<dt><a id="ArtisticLicense2"
href="http://www.perlfoundation.org/artistic_license_2_0";>
@@ -278,7 +281,7 @@
Boost Software License</a>
<span class="anchor-reference-id">(<a href="#boost">#boost</a>)</span></dt>
<dd>
-<p>This is a simple, permissive non-copyleft free software license,
+<p>This is a lax, permissive non-copyleft free software license,
compatible with the GNU GPL.</p></dd>
@@ -290,18 +293,22 @@
<p>(Note: on the preceding link, the modified BSD license is
listed in the <em>General</em> section.)</p>
<p>This is the original BSD license, modified by removal of the
-advertising clause. It is a simple, permissive non-copyleft free
+advertising clause. It is a lax, permissive non-copyleft free
software license, compatible with the GNU GPL.</p>
-<p>If you want a simple, permissive non-copyleft free software license,
-the modified BSD license is a reasonable choice. However, it is risky
-to recommend use of “the BSD license”, because confusion
-could easily occur and lead to use of the flawed <a
-href="#OriginalBSD"><em>original</em> BSD license</a>. To avoid this
-risk, you can suggest the X11 license instead. The X11 license and the
-revised BSD license are more or less equivalent.</p>
+<p>This license is sometimes referred to as the 3-clause BSD license.</p>
-<p>This license is sometimes referred to as the 3-clause BSD license.</p></dd>
+<p>The modified BSD license is not bad, as lax permissive licenses go,
+though the Apache 2.0 license is preferable. However, it is risky to
+recommend use of “the BSD license”, even for special cases
+such as small programs, because confusion could easily occur and lead
+to use of the flawed <a href="#OriginalBSD"><em>original</em> BSD
+license</a>. To avoid this risk, you can suggest the X11 license
+instead. The X11 license and the modified revised BSD license are
+more or less equivalent.</p>
+
+<p>However, the Apache 2.0 license is better for substantial programs,
+since it prevents patent treachery.</p></dd>
<dt><a id="CC0"
@@ -312,8 +319,8 @@
<p>CC0 is a public domain dedication from Creative Commons. A
work released under CC0 is dedicated to the public domain to the
fullest extent permitted by law. If that is not possible for any
-reason, CC0 also provides a simple permissive license as a fallback.
-Both public domain works and the simple license provided by CC0 are
+reason, CC0 also provides a lax, permissive license as a fallback.
+Both public domain works and the lax license provided by CC0 are
compatible with the GNU GPL.</p>
<p>If you want to release your work to the public domain, we recommend
@@ -352,12 +359,12 @@
<dd>
<p>This is a free software license, compatible with both GPLv2 and
GPLv3. It is based on the <a href="#ModifiedBSD">modified BSD
-license</a>, and adds a term expressly stating it does not grant you any
-patent licenses. Because of this, we encourage you to be careful about
-using software under this license; you should first consider whether the
-licensor might want to sue you for patent infringement. If the
-developer is disclaiming patent licenses to set up a trap for you, it
-would be wise to avoid the program.</p></dd>
+license</a>, and adds a term expressly stating it does not grant you
+any patent licenses. Because of this, we encourage you to be careful
+about using software under this license; you should first consider
+whether the licensor might want to sue you for patent infringement.
+If the developer is refusing users patent licenses to set up a trap
+for you, it would be wise to avoid the program.</p></dd>
<dt><a id="CryptixGeneralLicense" href="http://www.cryptix.org/LICENSE.TXT";>
@@ -365,7 +372,7 @@
<span class="anchor-reference-id">
(<a href="#CryptixGeneralLicense">#CryptixGeneralLicense</a>)</span></dt>
<dd>
-<p>This is a simple, permissive non-copyleft free software license,
+<p>This is a lax, permissive non-copyleft free software license,
compatible with the GNU GPL. It is very similar to the X11 license.</p></dd>
@@ -434,7 +441,7 @@
<span class="anchor-reference-id">
(<a href="#EUDataGrid">#EUDataGrid</a>)</span></dt>
<dd>
-<p>This is a simple, permissive non-copyleft free software license,
+<p>This is a lax, permissive non-copyleft free software license,
compatible with the GNU GPL.</p></dd>
@@ -442,10 +449,12 @@
Expat License</a>
<span class="anchor-reference-id">(<a href="#Expat">#Expat</a>)</span></dt>
<dd>
-<p>This is a simple, permissive non-copyleft free software license,
+<p>This is a lax, permissive non-copyleft free software license,
compatible with the GNU GPL. It is sometimes ambiguously referred to as
-the <em>MIT License</em>.</p></dd>
+the <em>MIT License</em>.</p>
+<p>For substantial programs it is better to use the Apache 2.0 license
+since it blocks patent treachery.</p></dd>
<dt><a id="FreeBSD"
href="http://www.freebsd.org/copyright/freebsd-license.html";>
@@ -455,14 +464,11 @@
<dd>
<p>This is the original BSD license with the advertising clause and
another clause removed. (It is also sometimes called the
-“2-clause BSD license”.) It is a simple, permissive
+“2-clause BSD license”.) It is a lax, permissive
non-copyleft free software license, compatible with the GNU GPL.</p>
-<p>If you want a simple, permissive non-copyleft free software license,
-the FreeBSD license is a reasonable choice. However, please don't call
-it a “BSD” or “BSD-style” license, because that
-is likely to cause confusion which could lead to use of the flawed <a
-href="#OriginalBSD"><em>original</em> BSD license</a>.</p></dd>
+<p>Our comments about the <a href="#ModifiedBSD">Modified BSD license</a>
+apply to this license too.</p></dd>
<dt><a id="freetype" href="http://freetype.fis.uniroma2.it/FTL.TXT";>
@@ -518,7 +524,7 @@
<span class="anchor-reference-id">(<a href="#ISC">#ISC</a>)</span></dt>
<dd>
<p>This license is sometimes also known as the OpenBSD License. It is a
-free software license, and compatible with the GNU GPL.</p>
+lax, permissive free software license, and compatible with the GNU GPL.</p>
<p>This license does have an unfortunate wording choice: it provides
recipients with "Permission to use, copy, modify, and/or distribute
@@ -589,7 +595,7 @@
<span class="anchor-reference-id">(<a href="#NCSA">#NCSA</a>)</span></dt>
<dd>
<p>This license is based on the terms of the <a href="#Expat">Expat</a>
-and <a href="#ModifiedBSD">modified BSD</a> licenses. It is a simple,
+and <a href="#ModifiedBSD">modified BSD</a> licenses. It is a lax,
permissive non-copyleft free software license, compatible with the GNU
GPL.</p></dd>
@@ -706,7 +712,7 @@
<span class="anchor-reference-id">
(<a href="#StandardMLofNJ">#StandardMLofNJ</a>)</span></dt>
<dd>
-<p>This is a simple, permissive non-copyleft free software license,
+<p>This is a lax, permissive non-copyleft free software license,
compatible with the GNU GPL.</p></dd>
@@ -718,7 +724,7 @@
<p>This is a license that Unicode, Inc. has applied to the Unicode
Character Database—various data files that developers can use to
help implement the Unicode standard in their own programs. It is a
-simple permissive license, compatible with all versions of the GPL.</p>
+lax permissive license, compatible with all versions of the GPL.</p>
<p>If you want to use files covered by this License Agreement in your
own software, that shouldn't be any problem, but we recommend that
@@ -738,8 +744,9 @@
which files it covers.</p>
<p>Please do not use this License Agreement for your own software. If
-you want to use a simple permissive license for your project, please
-use the <a href="#Expat">Expat license</a>; it is by far more
+you want to use a lax permissive license for your project, please use
+the <a href="#Expat">Expat license</a> for a small program and the
+Apache 2.0 license for a substantial program. These are far more
common, and widely recognized in the free software community.</p></dd>
@@ -750,9 +757,9 @@
<dd>
<p>The Unlicense is a public domain dedication. A work released
under the Unlicense is dedicated to the public domain to the fullest
-extent permitted by law, and also comes with an additional simple
+extent permitted by law, and also comes with an additional lax
license that helps cover any cases where the dedication is inadequate.
-Both public domain works and the simple license provided by the
+Both public domain works and the lax license provided by the
Unlicense are compatible with the GNU GPL.</p>
<p>If you want to release your work to the public domain, we recommend
@@ -796,16 +803,22 @@
WTFPL, Version 2</a>
<span class="anchor-reference-id">(<a href="#WTFPL">#WTFPL</a>)</span></dt>
<dd>
-<p>This is a free software license, very permissive and
-GPL-compatible.</p></dd>
+<p>This is lax permissive non-copyleft free software license,
+compatible with the GNU GPL.</p>
+<p>We do not recommend this license. If you want a lax permissive
+license for a small program, we recommend
+the <a href="#X11License">X11 license</a>. A larger program usually
+ought to be copyleft; but if you are set on using a lax permissive
+license for one, we recommend the Apache 2.0 license since it protects
+users from patent treachery.</p></dd>
<dt><a id="X11License" href="http://www.xfree86.org/3.3.6/COPYRIGHT2.html#3";>
X11 License</a>
<span class="anchor-reference-id">
(<a href="#X11License">#X11License</a>)</span></dt>
<dd>
-<p>This is a simple, permissive non-copyleft free software license,
+<p>This is a lax permissive non-copyleft free software license,
compatible with the GNU GPL. Older versions of XFree86 used the same
license, and some of the current variants of XFree86 also do. Later
versions of XFree86 are distributed under the <a
@@ -813,7 +826,12 @@
<p>This license is sometimes called the <em>MIT license</em>, but that
term is misleading, since MIT has used many licenses for
-software.</p></dd>
+software.</p>
+
+<p>This is a fine license for a small program. A larger program
+usually ought to be copyleft; but if you are set on a lax permissive
+license for one, we recommend the Apache 2.0 license since it protects
+users from patent treachery.</p></dd>
<dt><a id="XFree861.1License"
@@ -822,7 +840,7 @@
<span class="anchor-reference-id">
(<a href="#XFree861.1License">#XFree861.1License</a>)</span></dt>
<dd>
-<p>This is a simple, permissive non-copyleft free software license,
+<p>This is a lax, permissive non-copyleft free software license,
compatible with version 3 of the GPL.</p>
<p>Please note that this license is incompatible with version 2 of the GPL,
@@ -847,7 +865,7 @@
<span class="anchor-reference-id">
(<a href="#Zope2.0">#Zope2.0</a>)</span></dt>
<dd>
-<p>This is a simple, permissive non-copyleft free software license
+<p>This is a lax, permissive non-copyleft free software license
which is compatible with the GNU GPL.</p></dd>
</dl>
@@ -909,7 +927,7 @@
<span class="anchor-reference-id">
(<a href="#apache1">#apache1</a>)</span></dt>
<dd>
-<p>This is a simple, permissive non-copyleft free software license with an
+<p>This is a lax, permissive non-copyleft free software license with an
advertising clause. This creates <a
href="/philosophy/bsd.html">practical problems</a> like
those of the original BSD license, including incompatibility with the GNU
@@ -947,7 +965,7 @@
the <em>UCB/LBL</em> section. This license is also sometimes called the
“4-clause BSD license”.)</p>
-<p>This is a simple, permissive non-copyleft free software license with
+<p>This is a lax, permissive non-copyleft free software license with
a serious flaw: the “obnoxious BSD advertising clause”. The
flaw is not fatal; that is, it does not render the software nonfree.
But it does cause <a
@@ -955,10 +973,13 @@
including incompatibility with the GNU GPL.</p>
<p>We urge you not to use the original BSD license for software you
-write. If you want to use a simple, permissive non-copyleft free
+write. If you want to use a lax, permissive non-copyleft free
software license, it is much better to use the <a
-href="#ModifiedBSD">modified BSD license</a> or the X11 license.
-However, there is no reason not to use programs that have been released
+href="#ModifiedBSD">modified BSD license</a>, the X11 license
+or the Expat license. Even better, for a substantial program,
+use the Apache 2.0 license since it takes action against patent treachery.</p>
+
+<p>However, there is no reason not to use programs that have been released
under the original BSD license.</p></dd>
@@ -1437,7 +1458,7 @@
<span class="anchor-reference-id">
(<a href="#Zope">#Zope</a>)</span></dt>
<dd>
-<p>This is a simple, fairly permissive non-copyleft free software
+<p>This is a lax, fairly permissive non-copyleft free software
license with <a href="/philosophy/bsd.html">practical
problems</a> like those of the original BSD license, including
incompatibility with the <a
@@ -2219,7 +2240,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2012/07/22 16:27:48 $
+$Date: 2012/08/08 16:27:22 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/license-list.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it.po,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- licenses/po/license-list.it.po 8 Aug 2012 13:20:49 -0000 1.66
+++ licenses/po/license-list.it.po 8 Aug 2012 16:27:22 -0000 1.67
@@ -16,7 +16,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-08-01 04:33-0300\n"
# type: Content of: <title>
#. type: Content of: <title>
@@ -478,16 +477,7 @@
"\"#GNUAllPermissive\">#GNUAllPermissive</a>)</span>"
# type: Content of: <dl><dd><p>
-# | This is a [-simple-] {+lax,+} permissive free software license, compatible
-# | with the GNU GPL, which we recommend GNU packages use for README and other
-# | small supporting files. All developers can feel free to use it in similar
-# | situations.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is a simple permissive free software license, compatible with the "
-#| "GNU GPL, which we recommend GNU packages use for README and other small "
-#| "supporting files. All developers can feel free to use it in similar "
-#| "situations."
+#. type: Content of: <dl><dd><p>
msgid ""
"This is a lax, permissive free software license, compatible with the GNU "
"GPL, which we recommend GNU packages use for README and other small "
@@ -598,12 +588,7 @@
"\">#boost</a>)</span>"
# type: Content of: <dl><dd><p>
-# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
-# | license, compatible with the GNU GPL.
#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is a simple, permissive non-copyleft free software license, "
-#| "compatible with the GNU GPL."
msgid ""
"This is a lax, permissive non-copyleft free software license, compatible "
"with the GNU GPL."
@@ -632,14 +617,7 @@
"<em>General</em>)."
# type: Content of: <dl><dd><p>
-# | This is the original BSD license, modified by removal of the advertising
-# | clause. It is a [-simple,-] {+lax,+} permissive non-copyleft free
-# | software license, compatible with the GNU GPL.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is the original BSD license, modified by removal of the advertising "
-#| "clause. It is a simple, permissive non-copyleft free software license, "
-#| "compatible with the GNU GPL."
+#. type: Content of: <dl><dd><p>
msgid ""
"This is the original BSD license, modified by removal of the advertising "
"clause. It is a lax, permissive non-copyleft free software license, "
@@ -656,24 +634,7 @@
"Talvolta questa licenza è denominata \"la licenza BSD con 3 clausole\"."
# type: Content of: <dl><dd><p>
-# | [-If you want a simple, permissive non-copyleft free software license,
-# | the-]{+The+} modified BSD license is [-a reasonable choice.-] {+not bad,
-# | as lax permissive licenses go, though the Apache 2.0 license is
-# | preferable.+} However, it is risky to recommend use of “the BSD
-# | license”, {+even for special cases such as small programs,+} because
-# | confusion could easily occur and lead to use of the flawed <a
-# | href=\"#OriginalBSD\"><em>original</em> BSD license</a>. To avoid this
-# | risk, you can suggest the X11 license instead. The X11 license and the
-# | {+modified+} revised BSD license are more or less equivalent.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "If you want a simple, permissive non-copyleft free software license, the "
-#| "modified BSD license is a reasonable choice. However, it is risky to "
-#| "recommend use of “the BSD license”, because confusion could "
-#| "easily occur and lead to use of the flawed <a href=\"#OriginalBSD"
-#| "\"><em>original</em> BSD license</a>. To avoid this risk, you can "
-#| "suggest the X11 license instead. The X11 license and the revised BSD "
-#| "license are more or less equivalent."
+#. type: Content of: <dl><dd><p>
msgid ""
"The modified BSD license is not bad, as lax permissive licenses go, though "
"the Apache 2.0 license is preferable. However, it is risky to recommend use "
@@ -710,20 +671,7 @@
"legalcode\"> CC0</a> <span class=\"anchor-reference-id\">(<a href="
"\"#CC0\">#CC0</a>)</span>"
-# | CC0 is a public domain dedication from Creative Commons. A work released
-# | under CC0 is dedicated to the public domain to the fullest extent
-# | permitted by law. If that is not possible for any reason, CC0 also
-# | provides a [-simple-] {+lax,+} permissive license as a fallback. Both
-# | public domain works and the [-simple-] {+lax+} license provided by CC0 are
-# | compatible with the GNU GPL.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "CC0 is a public domain dedication from Creative Commons. A work released "
-#| "under CC0 is dedicated to the public domain to the fullest extent "
-#| "permitted by law. If that is not possible for any reason, CC0 also "
-#| "provides a simple permissive license as a fallback. Both public domain "
-#| "works and the simple license provided by CC0 are compatible with the GNU "
-#| "GPL."
+#. type: Content of: <dl><dd><p>
msgid ""
"CC0 is a public domain dedication from Creative Commons. A work released "
"under CC0 is dedicated to the public domain to the fullest extent permitted "
@@ -843,13 +791,7 @@
"href=\"#CryptixGeneralLicense\">#CryptixGeneralLicense</a>)</span>"
# type: Content of: <dl><dd><p>
-# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
-# | license, compatible with the GNU GPL. It is very similar to the X11
-# | license.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is a simple, permissive non-copyleft free software license, "
-#| "compatible with the GNU GPL. It is very similar to the X11 license."
+#. type: Content of: <dl><dd><p>
msgid ""
"This is a lax, permissive non-copyleft free software license, compatible "
"with the GNU GPL. It is very similar to the X11 license."
@@ -996,14 +938,7 @@
"a>)</span>"
# type: Content of: <dl><dd><p>
-# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
-# | license, compatible with the GNU GPL. It is sometimes ambiguously
-# | referred to as the <em>MIT License</em>.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is a simple, permissive non-copyleft free software license, "
-#| "compatible with the GNU GPL. It is sometimes ambiguously referred to as "
-#| "the <em>MIT License</em>."
+#. type: Content of: <dl><dd><p>
msgid ""
"This is a lax, permissive non-copyleft free software license, compatible "
"with the GNU GPL. It is sometimes ambiguously referred to as the <em>MIT "
@@ -1033,16 +968,7 @@
"href=\"#FreeBSD\">#FreeBSD</a>)</span>"
# type: Content of: <dl><dd><p>
-# | This is the original BSD license with the advertising clause and another
-# | clause removed. (It is also sometimes called the “2-clause BSD
-# | license”.) It is a [-simple,-] {+lax,+} permissive non-copyleft
-# | free software license, compatible with the GNU GPL.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is the original BSD license with the advertising clause and another "
-#| "clause removed. (It is also sometimes called the “2-clause BSD "
-#| "license”.) It is a simple, permissive non-copyleft free software "
-#| "license, compatible with the GNU GPL."
+#. type: Content of: <dl><dd><p>
msgid ""
"This is the original BSD license with the advertising clause and another "
"clause removed. (It is also sometimes called the “2-clause BSD "
@@ -1164,12 +1090,7 @@
"<span class=\"anchor-reference-id\">(<a href=\"#ISC\">#ISC</a>)</span>"
# type: Content of: <dl><dd><p>
-# | This license is sometimes also known as the OpenBSD License. It is a
-# | {+lax, permissive+} free software license, and compatible with the GNU GPL.
#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This license is sometimes also known as the OpenBSD License. It is a "
-#| "free software license, and compatible with the GNU GPL."
msgid ""
"This license is sometimes also known as the OpenBSD License. It is a lax, "
"permissive free software license, and compatible with the GNU GPL."
@@ -1327,16 +1248,7 @@
"reference-id\">(<a href=\"#NCSA\">#NCSA</a>)</span>"
# type: Content of: <dl><dd><p>
-# | This license is based on the terms of the <a href=\"#Expat\">Expat</a> and
-# | <a href=\"#ModifiedBSD\">modified BSD</a> licenses. It is a [-simple,-]
-# | {+lax,+} permissive non-copyleft free software license, compatible with
-# | the GNU GPL.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This license is based on the terms of the <a href=\"#Expat\">Expat</a> "
-#| "and <a href=\"#ModifiedBSD\">modified BSD</a> licenses. It is a simple, "
-#| "permissive non-copyleft free software license, compatible with the GNU "
-#| "GPL."
+#. type: Content of: <dl><dd><p>
msgid ""
"This license is based on the terms of the <a href=\"#Expat\">Expat</a> and "
"<a href=\"#ModifiedBSD\">modified BSD</a> licenses. It is a lax, permissive "
@@ -1598,16 +1510,7 @@
"\"anchor-reference-id\"> (<a href=\"#Unicode\">#Unicode</a>)</span>"
# type: Content of: <dl><dd><p>
-# | This is a license that Unicode, Inc. has applied to the Unicode Character
-# | Database—various data files that developers can use to help
-# | implement the Unicode standard in their own programs. It is a [-simple-]
-# | {+lax+} permissive license, compatible with all versions of the GPL.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is a license that Unicode, Inc. has applied to the Unicode Character "
-#| "Database—various data files that developers can use to help "
-#| "implement the Unicode standard in their own programs. It is a simple "
-#| "permissive license, compatible with all versions of the GPL."
+#. type: Content of: <dl><dd><p>
msgid ""
"This is a license that Unicode, Inc. has applied to the Unicode Character "
"Database—various data files that developers can use to help implement "
@@ -1657,18 +1560,7 @@
"dell'accordo di licenza spiega a quali file esso si applica."
# type: Content of: <dl><dd><p>
-# | Please do not use this License Agreement for your own software. If you
-# | want to use a [-simple-] {+lax+} permissive license for your project,
-# | please use the <a href=\"#Expat\">Expat [-license</a>; it is by-]
-# | {+license</a> for a small program and the Apache 2.0 license for a
-# | substantial program. These are+} far more common, and widely recognized
-# | in the free software community.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "Please do not use this License Agreement for your own software. If you "
-#| "want to use a simple permissive license for your project, please use the "
-#| "<a href=\"#Expat\">Expat license</a>; it is by far more common, and "
-#| "widely recognized in the free software community."
+#. type: Content of: <dl><dd><p>
msgid ""
"Please do not use this License Agreement for your own software. If you want "
"to use a lax permissive license for your project, please use the <a href="
@@ -1691,20 +1583,7 @@
"<a id=\"Unlicense\" href=\"http://unlicense.org/\";> Unlicense</a> <span "
"class=\"anchor-reference-id\"> (<a href=\"#Unlicense\">#Unlicense</a>)</span>"
-# | The Unlicense is a public domain dedication. A work released under the
-# | Unlicense is dedicated to the public domain to the fullest extent
-# | permitted by law, and also comes with an additional [-simple-] {+lax+}
-# | license that helps cover any cases where the dedication is inadequate.
-# | Both public domain works and the [-simple-] {+lax+} license provided by
-# | the Unlicense are compatible with the GNU GPL.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "The Unlicense is a public domain dedication. A work released under the "
-#| "Unlicense is dedicated to the public domain to the fullest extent "
-#| "permitted by law, and also comes with an additional simple license that "
-#| "helps cover any cases where the dedication is inadequate. Both public "
-#| "domain works and the simple license provided by the Unlicense are "
-#| "compatible with the GNU GPL."
+#. type: Content of: <dl><dd><p>
msgid ""
"The Unlicense is a public domain dedication. A work released under the "
"Unlicense is dedicated to the public domain to the fullest extent permitted "
@@ -1804,12 +1683,7 @@
"span>"
# type: Content of: <dl><dd><p>
-# | This is [-a simple,-] {+lax+} permissive non-copyleft free software
-# | license, compatible with the GNU GPL.
#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is a simple, permissive non-copyleft free software license, "
-#| "compatible with the GNU GPL."
msgid ""
"This is lax permissive non-copyleft free software license, compatible with "
"the GNU GPL."
@@ -1843,18 +1717,7 @@
"href=\"#X11License\">#X11License</a>)</span>"
# type: Content of: <dl><dd><p>
-# | This is a [-simple,-] {+lax+} permissive non-copyleft free software
-# | license, compatible with the GNU GPL. Older versions of XFree86 used the
-# | same license, and some of the current variants of XFree86 also do. Later
-# | versions of XFree86 are distributed under the <a
-# | href=\"#XFree861.1License\">XFree86 1.1 license</a>.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is a simple, permissive non-copyleft free software license, "
-#| "compatible with the GNU GPL. Older versions of XFree86 used the same "
-#| "license, and some of the current variants of XFree86 also do. Later "
-#| "versions of XFree86 are distributed under the <a href=\"#XFree861.1License"
-#| "\">XFree86 1.1 license</a>."
+#. type: Content of: <dl><dd><p>
msgid ""
"This is a lax permissive non-copyleft free software license, compatible with "
"the GNU GPL. Older versions of XFree86 used the same license, and some of "
@@ -1901,12 +1764,7 @@
"href=\"#XFree861.1License\">#XFree861.1License</a>)</span>"
# type: Content of: <dl><dd><p>
-# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
-# | license, compatible with version 3 of the GPL.
#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is a simple, permissive non-copyleft free software license, "
-#| "compatible with version 3 of the GPL."
msgid ""
"This is a lax, permissive non-copyleft free software license, compatible "
"with version 3 of the GPL."
@@ -1966,12 +1824,7 @@
"class=\"anchor-reference-id\"> (<a href=\"#Zope2.0\">#Zope2.0</a>)</span>"
# type: Content of: <dl><dd><p>
-# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
-# | license which is compatible with the GNU GPL.
#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is a simple, permissive non-copyleft free software license which is "
-#| "compatible with the GNU GPL."
msgid ""
"This is a lax, permissive non-copyleft free software license which is "
"compatible with the GNU GPL."
@@ -2097,16 +1950,7 @@
"href=\"#apache1\">#apache1</a>)</span>"
# type: Content of: <dl><dd><p>
-# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
-# | license with an advertising clause. This creates <a
-# | href=\"/philosophy/bsd.html\">practical problems</a> like those of the
-# | original BSD license, including incompatibility with the GNU GPL.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is a simple, permissive non-copyleft free software license with an "
-#| "advertising clause. This creates <a href=\"/philosophy/bsd.html"
-#| "\">practical problems</a> like those of the original BSD license, "
-#| "including incompatibility with the GNU GPL."
+#. type: Content of: <dl><dd><p>
msgid ""
"This is a lax, permissive non-copyleft free software license with an "
"advertising clause. This creates <a href=\"/philosophy/bsd.html\">practical "
@@ -2186,19 +2030,7 @@
"BSD a 4 clausole”.)"
# type: Content of: <dl><dd><p>
-# | This is a [-simple,-] {+lax,+} permissive non-copyleft free software
-# | license with a serious flaw: the “obnoxious BSD advertising
-# | clause”. The flaw is not fatal; that is, it does not render the
-# | software nonfree. But it does cause <a
-# | href=\"/philosophy/bsd.html\">practical problems</a>, including
-# | incompatibility with the GNU GPL.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is a simple, permissive non-copyleft free software license with a "
-#| "serious flaw: the “obnoxious BSD advertising clause”. The "
-#| "flaw is not fatal; that is, it does not render the software nonfree. But "
-#| "it does cause <a href=\"/philosophy/bsd.html\">practical problems</a>, "
-#| "including incompatibility with the GNU GPL."
+#. type: Content of: <dl><dd><p>
msgid ""
"This is a lax, permissive non-copyleft free software license with a serious "
"flaw: the “obnoxious BSD advertising clause”. The flaw is not "
@@ -2213,21 +2045,7 @@
"l'incompatibilità con la GNU GPL."
# type: Content of: <dl><dd><p>
-# | We urge you not to use the original BSD license for software you write.
-# | If you want to use a [-simple,-] {+lax,+} permissive non-copyleft free
-# | software license, it is much better to use the <a
-# | href=\"#ModifiedBSD\">modified BSD [-license</a> or-] {+license</a>,+} the
-# | X11 {+license or the Expat+} license. [-However, there is no reason not
-# | to-] {+Even better, for a substantial program,+} use [-programs that have
-# | been released under-] the [-original BSD license.-] {+Apache 2.0 license
-# | since it takes action against patent treachery.+}
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "We urge you not to use the original BSD license for software you write. "
-#| "If you want to use a simple, permissive non-copyleft free software "
-#| "license, it is much better to use the <a href=\"#ModifiedBSD\">modified "
-#| "BSD license</a> or the X11 license. However, there is no reason not to "
-#| "use programs that have been released under the original BSD license."
+#. type: Content of: <dl><dd><p>
msgid ""
"We urge you not to use the original BSD license for software you write. If "
"you want to use a lax, permissive non-copyleft free software license, it is "
@@ -3311,16 +3129,7 @@
"class=\"anchor-reference-id\"> (<a href=\"#Zope\">#Zope</a>)</span>"
# type: Content of: <dl><dd><p>
-# | This is a [-simple,-] {+lax,+} fairly permissive non-copyleft free
-# | software license with <a href=\"/philosophy/bsd.html\">practical
-# | problems</a> like those of the original BSD license, including
-# | incompatibility with the <a href=\"/licenses/gpl.html\">GNU GPL</a>.
-#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "This is a simple, fairly permissive non-copyleft free software license "
-#| "with <a href=\"/philosophy/bsd.html\">practical problems</a> like those "
-#| "of the original BSD license, including incompatibility with the <a href="
-#| "\"/licenses/gpl.html\">GNU GPL</a>."
+#. type: Content of: <dl><dd><p>
msgid ""
"This is a lax, fairly permissive non-copyleft free software license with <a "
"href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
Index: philosophy/android-and-users-freedom.pl.html
===================================================================
RCS file: /web/www/www/philosophy/android-and-users-freedom.pl.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/android-and-users-freedom.pl.html 10 Jun 2012 09:18:30
-0000 1.11
+++ philosophy/android-and-users-freedom.pl.html 8 Aug 2012 16:27:45
-0000 1.12
@@ -101,17 +101,28 @@
<p>Przede wszystkim, wiÄkszoÅÄ z nich zawiera niewolne aplikacje Google
do poÅÄ
czeÅ z serwisami takimi jak YouTube i Google Maps. Nie
-sÄ
one oficjalnie czÄÅciÄ
Androida, ale nie usprawiedliwia to
-produktu. SÄ
także niewolne biblioteki; czy sÄ
one czÄÅciÄ
Androida,
-jest kwestiÄ
ubocznÄ
. Co jest istotne, to fakt, że różne czÄÅÄ
-funkcjonalnoÅci Androida je potrzebuje.</p>
+sÄ
one oficjalnie czÄÅciÄ
Androida, ale nie usprawiedliwia to
produktu.
+</p>
+
+<p>WiÄkszoÅÄ urzÄ
dzeÅ z Androidem jest sprzedawana z niewolnym
+oprogramowaniem Android Market. Oprogramowanie to zachÄca użytkowników
+posiadajÄ
cych konto Google do instalowania niewolnych
+aplikacji. Posiada także tylne drzwi (backdoor) pozwalajÄ
ce Google
+do wymuszenia odinstalowania aplikacji. Oficjalnie nie jest ono czÄÅciÄ
+Androida, ale to nie czyni sprawy ani odrobinÄ mniej zÅÄ
.
+</p>
+
+<p>Produktom Androida również towarzyszÄ
niewolne biblioteki. Oficjalnie
nie sÄ
+one czÄÅciÄ
Androida, ale odkÄ
d różne funkcjonalnoÅci Androida
zależÄ
+od nich, sÄ
one czÄÅciÄ
każdej rzeczywistej instalacji Androida.</p>
<p>Nawet pliki wykonywalne, które sÄ
oficjalnie czÄÅciÄ
Androida, mogÄ
nie
-odpowiadaÄ wydaniom kodu źródÅowego Google. Producenci mogÄ
zmieniaÄ ten
-kod, i czÄsto nie publikujÄ
kodu źródÅowego dla swoich wersji. GNU
GPL
-wymaga od nich dystrybucji kodu ich wersji Linuksa, jeÅli to
-uszanujÄ
. Reszta kodu, na licencji Apache, nie zobowiÄ
zuje ich
-do publikowania używanego przez nich kodu źródÅowego.</p>
+odpowiadaÄ wydawanemu przez Google kodowi źródÅowemu. Producenci mogÄ
+zmieniaÄ ten kod, i czÄsto nie publikujÄ
kodu źródÅowego dla swoich
+wersji. GNU GPL wymaga od nich dystrybucji kodu ich wersji Linuksa,
+jeÅli to uszanujÄ
. Reszta kodu, na luźnej licencji Apache, nie
+zobowiÄ
zuje ich do publikowania kodu źródÅowego, który jest
faktycznie
+używany.</p>
<p>Niektórzy producenci zmieniajÄ
Androida na przykÅad dodajÄ
c <a
href="http://androidsecuritytest.com/features/logs-and-services/loggers/carrieriq/";>ukryty
@@ -251,7 +262,7 @@
<p><!-- timestamp start -->
Aktualizowane:
-$Date: 2012/06/10 09:18:30 $
+$Date: 2012/08/08 16:27:45 $
<!-- timestamp end -->
</p>
Index: philosophy/po/android-and-users-freedom.pl-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/android-and-users-freedom.pl-en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/android-and-users-freedom.pl-en.html 10 Jun 2012 09:19:43
-0000 1.7
+++ philosophy/po/android-and-users-freedom.pl-en.html 8 Aug 2012 16:27:57
-0000 1.8
@@ -92,17 +92,27 @@
<p>First of all, most of them contain nonfree Google applications for
talking to services such as YouTube and Google Maps. These are
officially not part of Android, but that doesn't make the product ok.
-There are also nonfree libraries; whether they are part of Android is
-a moot point. What matters is that various functionalities need
-them.</p>
+</p>
+
+<p>Most Android devices come with the nonfree Android Market software.
+This software invites users with a Google account to install nonfree
+apps. It also has a back door with which Google can forcibly install
+or deinstall apps. This is officially not part of Android, but that
+doesn't make it any less bad.
+</p>
+
+<p>Android products also come with nonfree libraries. These are
+officially not part of Android, but that since various Android
+functionalities depend on them, they are part of any real Android
+installation.</p>
-<p>Even the executables that are officially part of Android may not
+<p>Even the programs that are officially part of Android may not
correspond to the source code Google releases. Manufacturers may
change this code, and often they don't release the source code for
their versions. The GNU GPL requires them to distribute the code for
-their versions of Linux, if they comply. The rest of the code, under
-the lax Apache license, does not require them to release the source
-version that they really use.</p>
+their versions of Linux, assuming they comply. The rest of the code,
+under the lax Apache license, does not require them to release the
+source version that they really use.</p>
<p>One change that some manufacturers make in Android is the addition
of <a
@@ -217,7 +227,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2012/06/10 09:19:43 $
+$Date: 2012/08/08 16:27:57 $
<!-- timestamp end -->
</p>
</div>
Index: server/gnun/compendia/compendium.ru.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ru.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/gnun/compendia/compendium.ru.po 2 Aug 2012 00:34:30 -0000
1.12
+++ server/gnun/compendia/compendium.ru.po 8 Aug 2012 16:28:08 -0000
1.13
@@ -201,7 +201,7 @@
#. type: Content of: <h2>
msgid "Disclaimer"
-msgstr ""
+msgstr "ÐÑедÑпÑеждение"
#. type: Content of: <p>
#, fuzzy
@@ -216,6 +216,8 @@
#. type: Content of: <p>
msgid "The Free Software Foundation claims no copyright on this joke."
msgstr ""
+"Фонд Ñвободного пÑогÑаммного обеÑпеÑениÑ
не заÑвлÑÐµÑ Ð°Ð²ÑоÑÑкиÑ
пÑав на ÑÑÑ "
+"ÑÑÑкÑ."
#. type: Content of: <p>
msgid ""
Index: fun/jokes/10-kinds-of-people.ru.html
===================================================================
RCS file: fun/jokes/10-kinds-of-people.ru.html
diff -N fun/jokes/10-kinds-of-people.ru.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ fun/jokes/10-kinds-of-people.ru.html 8 Aug 2012 16:26:50 -0000
1.1
@@ -0,0 +1,75 @@
+
+<!--#include virtual="/server/header.ru.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>РмиÑе 10 Ñипов лÑдей</title>
+
+<!--#include virtual="/server/banner.ru.html" -->
+<!--#include virtual="/fun/jokes/po/10-kinds-of-people.translist" -->
+<h2>РмиÑе 10 Ñипов лÑдей</h2>
+
+<blockquote><p>РмиÑе 10 Ñипов лÑдей — Ñе,
кÑо Ð·Ð½Ð°ÐµÑ Ð´Ð²Ð¾Ð¸ÑнÑе ÑиÑла, и Ñе,
+кÑо не знаеÑ.</p>
+<p>РмиÑе 10 Ñипов лÑдей — Ñе, кÑо
Ð·Ð½Ð°ÐµÑ ÑÑоиÑнÑе ÑиÑла, Ñе,
+кÑо не Ð·Ð½Ð°ÐµÑ ÑÑоиÑнÑÑ
ÑиÑел, и Ñе, кÑо
пÑÑÐ°ÐµÑ Ð¸Ñ
Ñ Ð´Ð²Ð¾Ð¸ÑнÑми.</p></blockquote>
+
+<p><a href="/fun/humor.html">ÐÑÑгой ÑмоÑ</a> в
ÑмоÑиÑÑиÑеÑкой коллекÑии GNU.</p>
+
+<h4 id="Disclaimer">ÐÑедÑпÑеждение</h4>
+<p>ÐеÑвÑÑ ÑÑÑÐºÑ Ð¿ÑиÑлал Ðолин ШаÑп,
вÑоÑÑÑ — ФÑанÑÑа СелÑе.</p>
+<p>Фонд Ñвободного пÑогÑаммного
обеÑпеÑÐµÐ½Ð¸Ñ Ð½Ðµ заÑвлÑÐµÑ Ð°Ð²ÑоÑÑкиÑ
пÑав на
ÑÑÑ
+ÑÑÑкÑ.</p>
+
+
+<div style="font-size: small;">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!--#include virtual="/server/footer.ru.html" -->
+<div id="footer">
+<p>
+ÐожалÑйÑÑа, пÑиÑÑлайÑе запÑоÑÑ ÑÐ¾Ð½Ð´Ñ Ð¸ GNU
по адÑеÑÑ <a
+href="mailto:address@hidden";><address@hidden></a>. ÐÑÑÑ Ñакже <a
+href="/contact/">дÑÑгие ÑпоÑÐ¾Ð±Ñ ÑвÑзаÑÑÑÑ</a> Ñ
Ñондом.
+<br />
+ÐожалÑйÑÑа, пÑиÑÑлайÑе оÑÑеÑÑ Ð¾
неÑабоÑаÑÑиÑ
ÑÑÑлкаÑ
и дÑÑгие попÑавки или
+пÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ адÑеÑÑ <a
+href="mailto:address@hidden";><address@hidden></a>.
+</p>
+
+<p>
+ÐÑ ÑÑаÑалиÑÑ ÑделаÑÑ ÑÑÐ¾Ñ Ð¿ÐµÑевод ÑоÑнÑм и
каÑеÑÑвеннÑм, но иÑклÑÑиÑÑ
+возможноÑÑÑ Ð¾Ñибки Ð¼Ñ Ð½Ðµ можем.
ÐÑиÑÑлайÑе, пожалÑйÑÑа, Ñвои замеÑÐ°Ð½Ð¸Ñ Ð¸
+пÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ пеÑÐµÐ²Ð¾Ð´Ñ Ð¿Ð¾ адÑеÑÑ <a
+href="mailto:address@hidden";><address@hidden></a>.
+</p><p>Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ð¾ кооÑдинаÑии и
пÑедложениÑм пеÑеводов наÑиÑ
ÑÑаÑей Ñм. в
+<a href="/server/standards/README.translations.html">“Ð
ÑководÑÑве по
+пеÑеводам”</a>.
+</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<em>Ðнимание! РподгоÑовке ÑÑого пеÑевода
ÑÑаÑÑвовал ÑолÑко один Ñеловек. ÐÑ
+можеÑе ÑÑÑеÑÑвенно ÑлÑÑÑиÑÑ Ð¿ÐµÑевод, еÑли
пÑовеÑиÑе его и ÑаÑÑкажеÑе о
+найденнÑÑ
оÑибкаÑ
в <a
+href="http://savannah.gnu.org/projects/www-ru";>ÑÑÑÑкой гÑÑппе
пеÑеводов
+gnu.org</a>.</em></div>
+
+
+ <p>
+<!-- timestamp start -->
+Ðбновлено:
+
+$Date: 2012/08/08 16:26:50 $
+
+<!-- timestamp end -->
+</p>
+</div>
+
+</div>
+</body>
+</html>
Index: fun/jokes/po/10-kinds-of-people.ru-en.html
===================================================================
RCS file: fun/jokes/po/10-kinds-of-people.ru-en.html
diff -N fun/jokes/po/10-kinds-of-people.ru-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ fun/jokes/po/10-kinds-of-people.ru-en.html 8 Aug 2012 16:27:03 -0000
1.1
@@ -0,0 +1,54 @@
+<!--#include virtual="/server/header.html" -->
+<title>10 Kinds of People in the World</title>
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/fun/jokes/po/10-kinds-of-people.translist" -->
+
+<h2>10 Kinds of People in the World</h2>
+
+<blockquote><p>There are 10 kinds of people in the world —
+those who understand binary and those who don't.</p>
+<p>There are 10 kinds of people in the world — those who
+understand trinary, those who don't understand trinary and those who
+mistake it for binary.</p></blockquote>
+
+<p><a href="/fun/humor.html">Other humor</a> in the GNU Humor
+Collection.</p>
+
+<h4 id="Disclaimer">Disclaimer</h4>
+<p>The first joke was submitted by Colin Sharpe and the second by
+François Celliers.</p>
+<p>The Free Software Foundation claims no copyright on this joke.</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>
+Updated:
+<!-- timestamp start -->
+$Date: 2012/08/08 16:27:03 $
+<!-- timestamp end -->
+</p>
+</div>
+
+</div>
+</body>
+</html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www fun/jokes/po/10-kinds-of-people.ru.po fun/j...,
GNUN <=