www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www gnu/linux-and-gnu.ru.html gnu/po/about-gnu....


From: Yavor Doganov
Subject: www gnu/linux-and-gnu.ru.html gnu/po/about-gnu....
Date: Tue, 03 Jan 2012 17:27:17 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   12/01/03 17:27:16

Modified files:
        gnu            : linux-and-gnu.ru.html 
        gnu/po         : about-gnu.sq.po about-gnu.translist 
                         linux-and-gnu.ru-en.html 
        licenses/po    : license-list.de.po license-list.fr.po 
                         license-list.it.po license-list.pot 
        philosophy     : categories.ru.html 
        philosophy/po  : categories.ru-en.html 
Added files:
        gnu            : about-gnu.sq.html 
        gnu/po         : about-gnu.sq-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/linux-and-gnu.ru.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/about-gnu.sq.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/about-gnu.sq.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/about-gnu.translist?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ru-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/about-gnu.sq-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.de.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.fr.po?cvsroot=www&r1=1.98&r2=1.99
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.it.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.pot?cvsroot=www&r1=1.62&r2=1.63
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.ru.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ru-en.html?cvsroot=www&r1=1.2&r2=1.3

Patches:
Index: gnu/linux-and-gnu.ru.html
===================================================================
RCS file: /web/www/www/gnu/linux-and-gnu.ru.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnu/linux-and-gnu.ru.html   26 Dec 2011 09:28:20 -0000      1.8
+++ gnu/linux-and-gnu.ru.html   3 Jan 2012 17:26:32 -0000       1.9
@@ -134,10 +134,10 @@
 
 <p>
 К счастью, благодаря Linux нам не пришлось 
ждать Hurd. Когда Торвальдс
-написал Linux, это заполнило последний 
серьезный пробел в системе GNU. Тогда
-люди смогли сочетать Linux с системой GNU&nbsp;<a 
href="#ft1">[1]</a>, чтобы
-составить полную свободную систему: 
версию GNU на базе Linux; короче говоря,
-систему GNU/Linux.</p>
+освободил Linux в 1992&nbsp;году, это заполнило 
последний серьезный пробел в
+системе GNU. Тогда люди смогли сочетать Linux с 
системой GNU&nbsp;<a
+href="#ft1">[1]</a>, чтобы составить полную 
свободную систему: версию GNU на
+базе Linux; короче говоря, систему GNU/Linux.</p>
 
 <p>
 Заставить их как следует работать вместе 
не было простой задачей. Некоторые
@@ -306,14 +306,14 @@
 
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
 Перевод на русский язык: <br /> Copyright &copy; 1999 
Сергей Короп <a
-href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. <br />Copyright 
&copy; 2010
-Free Software Foundation, Inc.</div>
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>. <br />Copyright &copy;
+2010, 2011, 2012 Free Software Foundation, Inc.</div>
 
 
  <p><!-- timestamp start -->
 Обновлено:
 
-$Date: 2011/12/26 09:28:20 $
+$Date: 2012/01/03 17:26:32 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/po/about-gnu.sq.po
===================================================================
RCS file: /web/www/www/gnu/po/about-gnu.sq.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/po/about-gnu.sq.po      3 Jan 2012 12:00:20 -0000       1.1
+++ gnu/po/about-gnu.sq.po      3 Jan 2012 17:26:50 -0000       1.2
@@ -15,40 +15,133 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <title>
-msgid "About the GNU Operating System - GNU Project - Free Software Foundation 
(FSF)"
-msgstr "Rreth Sistemit Operativ GNU - Projekti GNU - Free Software Foundation 
(FSF)"
+msgid ""
+"About the GNU Operating System - GNU Project - Free Software Foundation (FSF)"
+msgstr ""
+"Rreth Sistemit Operativ GNU - Projekti GNU - Free Software Foundation (FSF)"
 
 #. type: Content of: <h2>
 msgid "About the GNU Operating System"
 msgstr "Rreth Sistemit Operativ GNU"
 
 #. type: Content of: <p>
-msgid "[<a href=\"/gnu/gnu.html\">Other historical and general articles about 
GNU.</a>]"
-msgstr "[<a href=\"/gnu/gnu.html\">Të tjerë artikuj historikë dhe të 
përgjithshëm mbi GNU-në.</a>]"
-
-#. type: Content of: <p>
-msgid "GNU was launched by Richard Stallman (rms) in 1983, as an operating 
system which would be put together by people working together for the freedom 
of all software users to control their computing.  rms remains the Chief 
GNUisance today."
-msgstr "GNU-ja u nis nga Richard Stallman (rms) më 1983, si një sistem 
operativ që do të krijohej nga njerëz që do të punonin tok me synimin që 
tërë përdoruesit e kopmjuterit të ishin të lirë të kontrollonin 
kompjuterin e tyre.  Deri sot rms mbetet ende Chief GNUisance."
-
-#. type: Content of: <p>
-msgid "The primary and continuing goal of GNU is to offer a Unix-compatible 
system that would be 100% <a href=\"/philosophy/free-sw.html\">free 
software</a>.  Not 95% free, not 99.5%, but 100%.  The name of the system, GNU, 
is a recursive acronym meaning GNU's Not Unix&mdash;a way of paying tribute to 
the technical ideas of Unix, while at the same time saying that GNU is 
something different.  Technically, GNU is like Unix.  But unlike Unix, GNU 
gives its users freedom."
-msgstr "Synimi fillestar dhe i vazhdueshëm i GNU-së mbetet ofrimi i një 
sistemi të përputhshëm me Unix-inin, i cili do të ishte 100% <a 
href=\"/philosophy/free-sw.html\">software i lirë</a>.  Jo 95% i lirë, jo 
99.5%, 100%. Emri i sistemit, GNU, është një akronim rekursiv që do të 
thotë GNU-ja Nuk është Unix&mdash;një mënyrë për t'i dhënë hakën 
ideve teknike të Unix-it, teksa në të njëjtën kohë pohohet që GNU-ja 
është diçka tjetër.  Teknikisht, GNU-ja ngjan me Unix-in.  Por ndryshe nga 
Unix-i, GNU-ja u jep liri përdoruesve të vet."
-
-#. type: Content of: <p>
-msgid "<a href=\"/distros/free-distros.html\">Completely free system 
distributions</a> (&ldquo;distros&rdquo;) meeting this goal are available 
today, many using the <a href=\"http://linux-libre.fsfla.org\";>Linux-libre 
kernel</a> (the <a href=\"/gnu/linux-and-gnu.html\">relationship between GNU 
and the Linux kernel</a> is described more fully elsewhere).  The <a 
href=\"/software/software.html\">GNU packages</a> have been designed to work 
together so we could have a functioning GNU system.  It has turned out that 
they also serve as a common &ldquo;upstream&rdquo; for many distros, so 
contributions to GNU packages help the free software community as a whole.  
Naturally, work on GNU is ongoing, with the goal to create a system that gives 
the greatest freedom to computer users.  GNU packages include user-oriented 
applications, utilities, tools, libraries, even games&mdash;all the programs 
that an operating system can usefully offer to its users.  <a 
href=\"/help/evaluation.html\">New packages are welcome.</a>"
-msgstr "Sot mund të kihen <a href=\"/distros/free-distros.html\">shpërndarje 
sistemi krejtësisht të lirë</a> (&ldquo;distros&rdquo;) që e plotësojnë 
këtë synim, me shumë prej tyre që përdorin <a 
href=\"http://linux-libre.fsfla.org\";>kernelin Linux-libre</a> (<a 
href=\"/gnu/linux-and-gnu.html\">marrëdhëniet mes GNU-së dhe kernelit 
Linux</a> përshkruhen më në hollësi diku tjetër).  <a 
href=\"/software/software.html\">Paketat GNU</a> janë hartuar që të punojnë 
tok, për të pasur një sistem GNU funksional.  Më vonë u pa që ato 
shërbejnë gjithashtu si &ldquo;upstream&rdquo; i përbashkët për shumë 
shpërndarje, ndaj kontributi te paketat GNU ndihmon bashkësinë e software-it 
të lirë në përgjithësi.  Kuptohet që puna për GNU-në është e 
pandërprerë, me synim krijimin e një sistemi që u jep përdoruesve lirinë 
më të madhe në kompjuter.  Paketat GNU përfshijnë zbatime përdoruesi, 
programe të dobishme, mjete, librari, madje dhe lojra&mdash;krejt programet 
që një sistem operativ mund t'u ofrojë përdoruesve të vet.  <a 
href=\"/help/evaluation.html\">Mirëpresim paketa të reja.</a>"
-
-#. type: Content of: <p>
-msgid "Thousands of people have joined in to make GNU the success it is today, 
and there are <a href=\"/help/help.html\">many ways to contribute</a>, both 
technical and non-technical.  GNU developers gather from time to time in <a 
href=\"/ghm/ghm.html\">GNU Hackers Meetings</a>, sometimes as part of the 
larger free software community <a 
href=\"http://libreplanet.org/\";>LibrePlanet</a> conferences."
-msgstr "Për ta bërë GNU-në atë sukses që përfaqëson sot, kanë punuar 
me mijëra vetë, dhe ka <a href=\"/help/help.html\">plot rrugë për të 
kontribuar</a>, si teknike, ashtu edhe joteknike.  Zhvilluesit e GNU-së 
takohen herë pas here gjatë <a href=\"/ghm/ghm.html\">GNU Hackers 
Meetings</a>, ndonjëherë edhe si pjesë e konferencave të një bashkësie 
më të gjerë të software-it të lirë, asaj <a 
href=\"http://libreplanet.org/\";>LibrePlanet</a>."
-
-#. type: Content of: <p>
-msgid "GNU has been supported in several ways by the <a 
href=\"http://www.fsf.org/\";>Free Software Foundation</a>, the nonprofit 
organization also founded by rms to advocate free software ideals.  Among other 
things, the FSF accepts copyright assignments and disclaimers, so it can act in 
court on behalf of GNU programs.  (To be clear, contributing a program to GNU 
does <em>not</em> require transferring copyright to the FSF.  If you do assign 
copyright, the FSF will enforce the GPL for the program if someone violates it; 
if you keep the copyright, enforcement will be up to you.)"
-msgstr "GNU-ja është përkrahur në rrugë të ndryshme nga <a 
href=\"http://www.fsf.org/\";>Free Software Foundation</a>, organizmi 
jofitimprurës edhe ky i themeluar nga RMS për mbrojtjen e idealeve të 
software-it të lirë.  Mes të tjerash, FSF-ja pranon dhënie të drejtash 
kopjimi dhe klauzola rreth tyre, ndaj mund të përfaqësojë programe GNU në 
çështje gjyqësore.  (Për të qenë të qartë, dhënie e një programi te 
GNU-ja <em>nuk</em> lyp transferim te FSF-ja të të drejtave të kopjimit.  
Nëse i jepni të drejtat e kopjimit, FSF-ja do të zbatojë GPL-në për 
programin, nëse dikush e shkel atë; nëse i ruani vetë të drejtat e 
kopjimit, zbatimi ju mebtet juvee.)"
-
-#. type: Content of: <p>
-msgid "The ultimate goal is to provide free software to do all of the jobs 
computer users want to do&mdash;and thus make proprietary software a thing of 
the past."
-msgstr "Synimi përfundimtar është të ofrohet software i lirë që të mund 
të kryejë tërë gjërat që duan të bëjnë përdoruesit me 
kopmjuterin&mdash;dhe për t'i bërë kështu software-et e lirë kujtim të 
të shkuarës."
+msgid ""
+"[<a href=\"/gnu/gnu.html\">Other historical and general articles about GNU.</"
+"a>]"
+msgstr ""
+"[<a href=\"/gnu/gnu.html\">Të tjerë artikuj historikë dhe të 
përgjithshëm "
+"mbi GNU-në.</a>]"
+
+#. type: Content of: <p>
+msgid ""
+"GNU was launched by Richard Stallman (rms) in 1983, as an operating system "
+"which would be put together by people working together for the freedom of "
+"all software users to control their computing.  rms remains the Chief "
+"GNUisance today."
+msgstr ""
+"GNU-ja u nis nga Richard Stallman (rms) më 1983, si një sistem operativ që 
"
+"do të krijohej nga njerëz që do të punonin tok me synimin që tërë "
+"përdoruesit e kopmjuterit të ishin të lirë të kontrollonin kompjuterin e 
"
+"tyre.  Deri sot rms mbetet ende Chief GNUisance."
+
+#. type: Content of: <p>
+msgid ""
+"The primary and continuing goal of GNU is to offer a Unix-compatible system "
+"that would be 100% <a href=\"/philosophy/free-sw.html\">free software</a>.  "
+"Not 95% free, not 99.5%, but 100%.  The name of the system, GNU, is a "
+"recursive acronym meaning GNU's Not Unix&mdash;a way of paying tribute to "
+"the technical ideas of Unix, while at the same time saying that GNU is "
+"something different.  Technically, GNU is like Unix.  But unlike Unix, GNU "
+"gives its users freedom."
+msgstr ""
+"Synimi fillestar dhe i vazhdueshëm i GNU-së mbetet ofrimi i një sistemi 
të "
+"përputhshëm me Unix-inin, i cili do të ishte 100% <a 
href=\"/philosophy/free-"
+"sw.html\">software i lirë</a>.  Jo 95% i lirë, jo 99.5%, 100%. Emri i "
+"sistemit, GNU, është një akronim rekursiv që do të thotë GNU-ja Nuk 
është "
+"Unix&mdash;një mënyrë për t'i dhënë hakën ideve teknike të Unix-it, 
teksa në "
+"të njëjtën kohë pohohet që GNU-ja është diçka tjetër.  Teknikisht, 
GNU-ja "
+"ngjan me Unix-in.  Por ndryshe nga Unix-i, GNU-ja u jep liri përdoruesve të 
"
+"vet."
+
+#. type: Content of: <p>
+msgid ""
+"<a href=\"/distros/free-distros.html\">Completely free system distributions</"
+"a> (&ldquo;distros&rdquo;) meeting this goal are available today, many using "
+"the <a href=\"http://linux-libre.fsfla.org\";>Linux-libre kernel</a> (the <a "
+"href=\"/gnu/linux-and-gnu.html\">relationship between GNU and the Linux "
+"kernel</a> is described more fully elsewhere).  The <a href=\"/software/"
+"software.html\">GNU packages</a> have been designed to work together so we "
+"could have a functioning GNU system.  It has turned out that they also serve "
+"as a common &ldquo;upstream&rdquo; for many distros, so contributions to GNU "
+"packages help the free software community as a whole.  Naturally, work on "
+"GNU is ongoing, with the goal to create a system that gives the greatest "
+"freedom to computer users.  GNU packages include user-oriented applications, "
+"utilities, tools, libraries, even games&mdash;all the programs that an "
+"operating system can usefully offer to its users.  <a href=\"/help/"
+"evaluation.html\">New packages are welcome.</a>"
+msgstr ""
+"Sot mund të kihen <a href=\"/distros/free-distros.html\">shpërndarje 
sistemi "
+"krejtësisht të lirë</a> (&ldquo;distros&rdquo;) që e plotësojnë këtë 
synim, "
+"me shumë prej tyre që përdorin <a href=\"http://linux-libre.fsfla.org";
+"\">kernelin Linux-libre</a> (<a href=\"/gnu/linux-and-gnu.html"
+"\">marrëdhëniet mes GNU-së dhe kernelit Linux</a> përshkruhen më në 
hollësi "
+"diku tjetër).  <a href=\"/software/software.html\">Paketat GNU</a> janë "
+"hartuar që të punojnë tok, për të pasur një sistem GNU funksional.  Më 
vonë "
+"u pa që ato shërbejnë gjithashtu si &ldquo;upstream&rdquo; i përbashkët 
për "
+"shumë shpërndarje, ndaj kontributi te paketat GNU ndihmon bashkësinë e "
+"software-it të lirë në përgjithësi.  Kuptohet që puna për GNU-në 
është e "
+"pandërprerë, me synim krijimin e një sistemi që u jep përdoruesve 
lirinë më "
+"të madhe në kompjuter.  Paketat GNU përfshijnë zbatime përdoruesi, 
programe "
+"të dobishme, mjete, librari, madje dhe lojra&mdash;krejt programet që një "
+"sistem operativ mund t'u ofrojë përdoruesve të vet.  <a href=\"/help/"
+"evaluation.html\">Mirëpresim paketa të reja.</a>"
+
+#. type: Content of: <p>
+msgid ""
+"Thousands of people have joined in to make GNU the success it is today, and "
+"there are <a href=\"/help/help.html\">many ways to contribute</a>, both "
+"technical and non-technical.  GNU developers gather from time to time in <a "
+"href=\"/ghm/ghm.html\">GNU Hackers Meetings</a>, sometimes as part of the "
+"larger free software community <a href=\"http://libreplanet.org/";
+"\">LibrePlanet</a> conferences."
+msgstr ""
+"Për ta bërë GNU-në atë sukses që përfaqëson sot, kanë punuar me 
mijëra vetë, "
+"dhe ka <a href=\"/help/help.html\">plot rrugë për të kontribuar</a>, si "
+"teknike, ashtu edhe joteknike.  Zhvilluesit e GNU-së takohen herë pas here "
+"gjatë <a href=\"/ghm/ghm.html\">GNU Hackers Meetings</a>, ndonjëherë edhe 
si "
+"pjesë e konferencave të një bashkësie më të gjerë të software-it të 
lirë, "
+"asaj <a href=\"http://libreplanet.org/\";>LibrePlanet</a>."
+
+#. type: Content of: <p>
+msgid ""
+"GNU has been supported in several ways by the <a href=\"http://www.fsf.org/";
+"\">Free Software Foundation</a>, the nonprofit organization also founded by "
+"rms to advocate free software ideals.  Among other things, the FSF accepts "
+"copyright assignments and disclaimers, so it can act in court on behalf of "
+"GNU programs.  (To be clear, contributing a program to GNU does <em>not</em> "
+"require transferring copyright to the FSF.  If you do assign copyright, the "
+"FSF will enforce the GPL for the program if someone violates it; if you keep "
+"the copyright, enforcement will be up to you.)"
+msgstr ""
+"GNU-ja është përkrahur në rrugë të ndryshme nga <a 
href=\"http://www.fsf.org/";
+"\">Free Software Foundation</a>, organizmi jofitimprurës edhe ky i themeluar 
"
+"nga RMS për mbrojtjen e idealeve të software-it të lirë.  Mes të 
tjerash, "
+"FSF-ja pranon dhënie të drejtash kopjimi dhe klauzola rreth tyre, ndaj mund 
"
+"të përfaqësojë programe GNU në çështje gjyqësore.  (Për të qenë 
të qartë, "
+"dhënie e një programi te GNU-ja <em>nuk</em> lyp transferim te FSF-ja të 
të "
+"drejtave të kopjimit.  Nëse i jepni të drejtat e kopjimit, FSF-ja do të "
+"zbatojë GPL-në për programin, nëse dikush e shkel atë; nëse i ruani 
vetë të "
+"drejtat e kopjimit, zbatimi ju mebtet juvee.)"
+
+#. type: Content of: <p>
+msgid ""
+"The ultimate goal is to provide free software to do all of the jobs computer "
+"users want to do&mdash;and thus make proprietary software a thing of the "
+"past."
+msgstr ""
+"Synimi përfundimtar është të ofrohet software i lirë që të mund të 
kryejë "
+"tërë gjërat që duan të bëjnë përdoruesit me kopmjuterin&mdash;dhe 
për t'i "
+"bërë kështu software-et e lirë kujtim të të shkuarës."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -56,24 +149,46 @@
 msgstr "  "
 
 #. type: Content of: <div><p>
-msgid "Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  There are also <a 
href=\"/contact/\">other ways to contact</a> the FSF."
-msgstr "Ju lutemi, pyetjet dhe kërkesat e përgjithshme rreth FSF &amp; GNU 
dërgoji te <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  Ka 
gjithashtu dhe <a href=\"/contact/\">rrugë të tjera për t'u lidhur</a> me 
FSF-në."
-
-#. type: Content of: <div><p>
-msgid "Please send broken links and other corrections or suggestions to <a 
href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
-msgstr "Ju lutem, lidhjet e dëmtuara, këshillat dhe ndreqjet dërgojini te 
<a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</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 "Për të dhëna mbi bashkërendimin dhe parashtrimin e përkthimeve 
të këtij artikulli, ju lutem, shihni <a 
href=\"/server/standards/README.translations.html\">README për 
përkthimet</a>."
+msgid ""
+"Please send general FSF &amp; GNU inquiries to <a 
href=\"mailto:address@hidden";
+"\">&lt;address@hidden&gt;</a>.  There are also <a href=\"/contact/\">other 
ways "
+"to contact</a> the FSF."
+msgstr ""
+"Ju lutemi, pyetjet dhe kërkesat e përgjithshme rreth FSF &amp; GNU dërgoji 
"
+"te <a href=\"mailto:address@hidden";>&lt;address@hidden&gt;</a>.  Ka 
gjithashtu "
+"dhe <a href=\"/contact/\">rrugë të tjera për t'u lidhur</a> me FSF-në."
+
+#. type: Content of: <div><p>
+msgid ""
+"Please send broken links and other corrections or suggestions to <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</a>."
+msgstr ""
+"Ju lutem, lidhjet e dëmtuara, këshillat dhe ndreqjet dërgojini te <a href="
+"\"mailto:address@hidden";>&lt;address@hidden&gt;</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 ""
+"Për të dhëna mbi bashkërendimin dhe parashtrimin e përkthimeve të 
këtij "
+"artikulli, ju lutem, shihni <a href=\"/server/standards/README.translations."
+"html\">README për përkthimet</a>."
 
 #. type: Content of: <div><p>
 msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
 msgstr "Të drejta Kopjimi &copy; 2011 Free Software Foundation, Inc.,"
 
 #. type: Content of: <div><p>
-msgid "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>."
-msgstr "Kjo faqe mund të përdoret sipas një <a rel=\"license\" 
href=\"http://creativecommons.org/licenses/by-nd/3.0/us/\";>Lejeje Creative 
Commons Attribution-NoDerivs 3.0 United States</a>."
+msgid ""
+"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>."
+msgstr ""
+"Kjo faqe mund të përdoret sipas një <a rel=\"license\" href=\"http://";
+"creativecommons.org/licenses/by-nd/3.0/us/\">Lejeje Creative Commons "
+"Attribution-NoDerivs 3.0 United States</a>."
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
 #. type: Content of: <div><div>
@@ -84,4 +199,3 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "U përditësua më:"
-

Index: gnu/po/about-gnu.translist
===================================================================
RCS file: /web/www/www/gnu/po/about-gnu.translist,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gnu/po/about-gnu.translist  25 Dec 2011 05:16:56 -0000      1.3
+++ gnu/po/about-gnu.translist  3 Jan 2012 17:26:50 -0000       1.4
@@ -8,7 +8,9 @@
 <!-- Polish -->
 <li><a href="/gnu/about-gnu.pl.html">polski</a>&nbsp;[pl]</li>
 <!-- Russian -->
-<li><a 
href="/gnu/about-gnu.ru.html">&#x0440;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;</a>&nbsp;[ru]</li>
+<li><a href="/gnu/about-gnu.ru.html">русский</a>&nbsp;[ru]</li>
+<!-- Albanian -->
+<li><a href="/gnu/about-gnu.sq.html">Shqip</a>&nbsp;[sq]</li>
 </ul>
 </div> <!-- id="translations" -->
 <!-- end translinks file -->

Index: gnu/po/linux-and-gnu.ru-en.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ru-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/po/linux-and-gnu.ru-en.html     26 Dec 2011 09:28:29 -0000      1.2
+++ gnu/po/linux-and-gnu.ru-en.html     3 Jan 2012 17:26:50 -0000       1.3
@@ -128,12 +128,12 @@
 
 <p>
 Fortunately, we didn't have to wait for the Hurd, because of Linux.
-Once Torvalds wrote Linux, it fit into the last major gap in the GNU
-system.  People could then <a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
-combine Linux with the GNU system</a> to make a complete free
-system: a Linux-based version of the GNU system; the GNU/Linux system,
-for short.</p>
+Once Torvalds freed Linux in 1992, it fit into the last major gap in
+the GNU system.  People could
+then <a 
href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01";>
+combine Linux with the GNU system</a> to make a complete free system:
+a Linux-based version of the GNU system; the GNU/Linux system, for
+short.</p>
 
 <p>
 Making them work well together was not a trivial job.  Some GNU
@@ -287,7 +287,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2011/12/26 09:28:29 $
+$Date: 2012/01/03 17:26:50 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/po/license-list.de.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.de.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- licenses/po/license-list.de.po      24 Dec 2011 01:26:26 -0000      1.14
+++ licenses/po/license-list.de.po      3 Jan 2012 17:26:57 -0000       1.15
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2011-12-23 20:25-0500\n"
+"POT-Creation-Date: 2012-01-03 12:25-0500\n"
 "PO-Revision-Date: 2011-12-22 00:35+0100\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online (PUNKT) de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -993,6 +993,74 @@
 "kurz."
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
+#| "Public License (MPL)</a> <span class=\"anchor-reference-id\">(<a href="
+#| "\"#MPL\">#MPL</a>)</span>"
+msgid ""
+"<a id=\"MPL-2.0\" href=\"http://www.mozilla.org/MPL/2.0/\";>Mozilla Public "
+"License (MPL) version 2.0</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#MPL-2.0\">#MPL-2.0</a>)</span>"
+msgstr ""
+"<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";>Mozilla "
+"Public License (MPL)</a> <span class=\"anchor-reference-id\">(<a href=\"#MPL"
+"\">#MPL</a>)</span>"
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This is a free software license.  Section 3.3 provides indirect "
+"compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
+"version 2.1, the GNU AGPL version 3.0, and all later versions of those "
+"licenses.  When you receive work under the MPL version 2.0, you may make a "
+"&ldquo;Larger Work&rdquo; that combines that work with work under one of "
+"those GNU licenses.  When you do, section 3.3 gives you permission to "
+"distribute the MPL-covered work under the terms of that same GNU license, "
+"with one condition: you must make sure that the files that were originally "
+"under the MPL are still available under the MPL's terms as well.  In other "
+"words, when you make a combination this way, the files that were originally "
+"under the MPL will be dual licensed under the MPL and the GNU license.  The "
+"end result is that the Larger Work, as a whole, will be covered under the "
+"GNU license.  People who receive that combination from you will have the "
+"option to use any files that were originally covered by the MPL under that "
+"license's terms, or distribute the Larger Work in whole or in part under the "
+"terms of the GNU license with no further restrictions."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"It's important to understand that the condition to distribute files under "
+"the MPL's terms only applies to the party that first creates and distributes "
+"the Larger Work.  If it applied to their recipients as well, it would be a "
+"further restriction and incompatible with the GNU licenses.  That said, when "
+"you make contributions to an existing project, we usually <a href=\"/"
+"licenses/license-recommendations.html#contributing\">recommend that you keep "
+"your changes under the same license</a>, even when you're not required to do "
+"so.  If you receive a work under a GNU license where some files are also "
+"under the MPL, you should only remove the MPL from those files when there's "
+"a strong reason to justify it."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Check the license notices on the MPL-covered software before you make a "
+"Larger Work this way.  Parties who release original work under the MPL "
+"version 2.0 may choose to opt out of this compatibility by including a "
+"sentence in the license notices that says that the work is &ldquo;"
+"Incompatible With Secondary Licenses.&rdquo; Any software that includes this "
+"notice is <strong>not</strong> compatible with the GPL or AGPL."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Software under previous versions of the MPL can be upgraded to version 2.0, "
+"but any software that isn't already available under one of the listed GNU "
+"licenses <strong>must</strong> be marked as Incompatible With Secondary "
+"Licenses.  This means that software that's only available under previous "
+"versions of the MPL is still incompatible with the GPL and AGPL."
+msgstr ""
+
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"NCSA\" href=\"http://www.opensource.org/licenses/UoI-NCSA.php\";> "
 "NCSA/University of Illinois Open Source License</a> <span class=\"anchor-"
@@ -1035,27 +1103,6 @@
 "und der <a href=\"/licenses/gpl-3.0\">GNU GPL</a>. Deswegen ist es eine mit "
 "der GNU GPL kompatible freie Softwarelizenz, aber ohne strengem Copyleft."
 
-#. type: Content of: <dl><dd><p>
-msgid ""
-"This disjunctive license is a good choice if you want to make your package "
-"GPL-compatible and MPL-compatible.  However, you can also accomplish that by "
-"using the LGPL or the Guile license."
-msgstr ""
-"Diese disjunktive Lizenz ist eine gute Wahl, wenn Ihr Paket GPL- und MPL-"
-"kompatibel sein soll. Allerdings kann das auch mithilfe der LGPL- oder der "
-"Guile-Lizenz erreicht werden."
-
-#. type: Content of: <dl><dd><p>
-msgid ""
-"Such a disjunctive license might be a good choice if you have been using the "
-"MPL, and want to change to a GPL-compatible license without subtracting any "
-"permission you have given for previous versions."
-msgstr ""
-"Eine solche disjunktive Lizenz könnte möglicherweise eine gute Wahl sein, "
-"wenn Sie die MPL nutzen und auf eine GPL-kompatible Lizenz wechseln möchten, 
"
-"ohne jede Berechtigung zu subtrahieren, die Sie für frühere Versionen "
-"gegeben haben."
-
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"newOpenLDAP\" href=\"http://www.openldap.org/software/release/";
@@ -1784,12 +1831,19 @@
 "\">(<a href=\"#CPAL\">#CPAL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  It is based on the <a href=\"#MPL"
+#| "\">Mozilla Public License</a>, and is incompatible with the GPL for the "
+#| "same reasons: it has several requirements for modified versions that do "
+#| "not exist in the GPL.  It also requires you to publish the source of the "
+#| "program if you allow others to use it."
 msgid ""
 "This is a free software license.  It is based on the <a href=\"#MPL"
-"\">Mozilla Public License</a>, and is incompatible with the GPL for the same "
-"reasons: it has several requirements for modified versions that do not exist "
-"in the GPL.  It also requires you to publish the source of the program if "
-"you allow others to use it."
+"\">Mozilla Public License</a> version 1, and is incompatible with the GPL "
+"for the same reasons: it has several requirements for modified versions that "
+"do not exist in the GPL.  It also requires you to publish the source of the "
+"program if you allow others to use it."
 msgstr ""
 "Dies ist eine freie Softwarelizenz, basierend auf der <a href=\"#MPL"
 "\">Mozilla Public License</a>, und mit der GPL aus den gleichen Gründen "
@@ -2162,10 +2216,15 @@
 "GNU GPL, und wir mahnen, die MS RL aus diesen Gründen nicht zu nutzen."
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
+#| "Public License (MPL)</a> <span class=\"anchor-reference-id\">(<a href="
+#| "\"#MPL\">#MPL</a>)</span>"
 msgid ""
 "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
-"Public License (MPL)</a> <span class=\"anchor-reference-id\">(<a href=\"#MPL"
-"\">#MPL</a>)</span>"
+"Public License (MPL) version 1.1</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"#MPL\">#MPL</a>)</span>"
 msgstr ""
 "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";>Mozilla "
 "Public License (MPL)</a> <span class=\"anchor-reference-id\">(<a href=\"#MPL"
@@ -2212,9 +2271,17 @@
 "reference-id\">(<a href=\"#NOSL\">#NOSL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license that is essentially the same as the "
+#| "Mozilla Public License, Version 1.1.  Like the MPL, the NOSL has some "
+#| "complex restrictions that make it incompatible with the GNU GPL.  That "
+#| "is, a module covered by the GPL and a module covered by the NOSL cannot "
+#| "legally be linked together.  We urge you not to use the NOSL for this "
+#| "reason."
 msgid ""
 "This is a free software license that is essentially the same as the Mozilla "
-"Public License, Version 1.1.  Like the MPL, the NOSL has some complex "
+"Public License version 1.1.  Like the MPL, the NOSL has some complex "
 "restrictions that make it incompatible with the GNU GPL.  That is, a module "
 "covered by the GPL and a module covered by the NOSL cannot legally be linked "
 "together.  We urge you not to use the NOSL for this reason."
@@ -2237,13 +2304,21 @@
 "reference-id\">(<a href=\"#NPL\">#NPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, not a strong copyleft, and incompatible "
+#| "with the GNU GPL.  It consists of the Mozilla Public License with an "
+#| "added clause that permits Netscape to use your added code <em>even in "
+#| "their proprietary versions of the program</em>.  Of course, they do not "
+#| "give <em>you</em> permission to use <em>their</em> code in the analogous "
+#| "way.  We urge you not to use the NPL."
 msgid ""
 "This is a free software license, not a strong copyleft, and incompatible "
-"with the GNU GPL.  It consists of the Mozilla Public License with an added "
-"clause that permits Netscape to use your added code <em>even in their "
-"proprietary versions of the program</em>.  Of course, they do not give "
-"<em>you</em> permission to use <em>their</em> code in the analogous way.  We "
-"urge you not to use the NPL."
+"with the GNU GPL.  It consists of the Mozilla Public License version 1.1 "
+"with an added clause that permits Netscape to use your added code <em>even "
+"in their proprietary versions of the program</em>.  Of course, they do not "
+"give <em>you</em> permission to use <em>their</em> code in the analogous "
+"way.  We urge you not to use the NPL."
 msgstr ""
 "Dies ist eine freie Softwarelizenz, ohne strenges Copyleft, die inkompatibel "
 "mit der GNU GPL ist. It consists of the Mozilla Public License with an added "
@@ -2263,9 +2338,13 @@
 "\">#Nokia</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is similar to the Mozilla Public License: a free software license "
+#| "incompatible with the GNU GPL."
 msgid ""
-"This is similar to the Mozilla Public License: a free software license "
-"incompatible with the GNU GPL."
+"This is similar to the Mozilla Public License version 1: a free software "
+"license incompatible with the GNU GPL."
 msgstr ""
 "Vergleichbar mit der Mozilla Public License: Eine freie Softwarelizenz, "
 "nicht kompatibel mit der GNU GPL."
@@ -2578,11 +2657,17 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#SPL\">#SPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This is essentially the same as the Mozilla Public License: a free software "
-"license incompatible with the GNU GPL.  Please do not confuse this with the "
-"<a href=\"#SunCommunitySourceLicense\">Sun Community Source License</a>, "
-"which is not a free software license."
+#, fuzzy
+#| msgid ""
+#| "This is essentially the same as the Mozilla Public License: a free "
+#| "software license incompatible with the GNU GPL.  Please do not confuse "
+#| "this with the <a href=\"#SunCommunitySourceLicense\">Sun Community Source "
+#| "License</a>, which is not a free software license."
+msgid ""
+"This is essentially the same as the Mozilla Public License version 1: a free "
+"software license incompatible with the GNU GPL.  Please do not confuse this "
+"with the <a href=\"#SunCommunitySourceLicense\">Sun Community Source "
+"License</a>, which is not a free software license."
 msgstr ""
 "Dies entspricht im Wesentlichen der Mozilla Public License: Einer freien "
 "Softwarelizenz, nicht kompatibel mit der GNU GPL.  Please do not confuse "
@@ -4239,6 +4324,25 @@
 msgstr "Aktualisierung:"
 
 #~ msgid ""
+#~ "This disjunctive license is a good choice if you want to make your "
+#~ "package GPL-compatible and MPL-compatible.  However, you can also "
+#~ "accomplish that by using the LGPL or the Guile license."
+#~ msgstr ""
+#~ "Diese disjunktive Lizenz ist eine gute Wahl, wenn Ihr Paket GPL- und MPL-"
+#~ "kompatibel sein soll. Allerdings kann das auch mithilfe der LGPL- oder "
+#~ "der Guile-Lizenz erreicht werden."
+
+#~ msgid ""
+#~ "Such a disjunctive license might be a good choice if you have been using "
+#~ "the MPL, and want to change to a GPL-compatible license without "
+#~ "subtracting any permission you have given for previous versions."
+#~ msgstr ""
+#~ "Eine solche disjunktive Lizenz könnte möglicherweise eine gute Wahl 
sein, "
+#~ "wenn Sie die MPL nutzen und auf eine GPL-kompatible Lizenz wechseln "
+#~ "möchten, ohne jede Berechtigung zu subtrahieren, die Sie für frühere "
+#~ "Versionen gegeben haben."
+
+#~ msgid ""
 #~ "<a id=\"Sybase\" href=\"http://www.opensource.org/licenses/Watcom-1.0";
 #~ "\">Sybase Open Watcom Public License version 1.0</a>"
 #~ msgstr ""

Index: licenses/po/license-list.fr.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.fr.po,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- licenses/po/license-list.fr.po      2 Jan 2012 09:28:26 -0000       1.98
+++ licenses/po/license-list.fr.po      3 Jan 2012 17:26:57 -0000       1.99
@@ -9,13 +9,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2011-12-23 20:25-0500\n"
+"POT-Creation-Date: 2012-01-03 12:25-0500\n"
 "PO-Revision-Date: 2011-12-30 15:59+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-01-03 12:25-0500\n"
 "Language: fr\n"
 "Plural-Forms:  \n"
 
@@ -998,6 +999,74 @@
 "aussi permissives et brèves."
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
+#| "Public License (MPL)</a> <span class=\"anchor-reference-id\">(<a href="
+#| "\"#MPL\">#MPL</a>)</span>"
+msgid ""
+"<a id=\"MPL-2.0\" href=\"http://www.mozilla.org/MPL/2.0/\";>Mozilla Public "
+"License (MPL) version 2.0</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#MPL-2.0\">#MPL-2.0</a>)</span>"
+msgstr ""
+"<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
+"Public License (MPL)</a> [EN] <span class=\"anchor-reference-id\">(<a href="
+"\"#MPL\">#MPL</a>)</span>"
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This is a free software license.  Section 3.3 provides indirect "
+"compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
+"version 2.1, the GNU AGPL version 3.0, and all later versions of those "
+"licenses.  When you receive work under the MPL version 2.0, you may make a "
+"&ldquo;Larger Work&rdquo; that combines that work with work under one of "
+"those GNU licenses.  When you do, section 3.3 gives you permission to "
+"distribute the MPL-covered work under the terms of that same GNU license, "
+"with one condition: you must make sure that the files that were originally "
+"under the MPL are still available under the MPL's terms as well.  In other "
+"words, when you make a combination this way, the files that were originally "
+"under the MPL will be dual licensed under the MPL and the GNU license.  The "
+"end result is that the Larger Work, as a whole, will be covered under the "
+"GNU license.  People who receive that combination from you will have the "
+"option to use any files that were originally covered by the MPL under that "
+"license's terms, or distribute the Larger Work in whole or in part under the "
+"terms of the GNU license with no further restrictions."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"It's important to understand that the condition to distribute files under "
+"the MPL's terms only applies to the party that first creates and distributes "
+"the Larger Work.  If it applied to their recipients as well, it would be a "
+"further restriction and incompatible with the GNU licenses.  That said, when "
+"you make contributions to an existing project, we usually <a href=\"/"
+"licenses/license-recommendations.html#contributing\">recommend that you keep "
+"your changes under the same license</a>, even when you're not required to do "
+"so.  If you receive a work under a GNU license where some files are also "
+"under the MPL, you should only remove the MPL from those files when there's "
+"a strong reason to justify it."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Check the license notices on the MPL-covered software before you make a "
+"Larger Work this way.  Parties who release original work under the MPL "
+"version 2.0 may choose to opt out of this compatibility by including a "
+"sentence in the license notices that says that the work is &ldquo;"
+"Incompatible With Secondary Licenses.&rdquo; Any software that includes this "
+"notice is <strong>not</strong> compatible with the GPL or AGPL."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Software under previous versions of the MPL can be upgraded to version 2.0, "
+"but any software that isn't already available under one of the listed GNU "
+"licenses <strong>must</strong> be marked as Incompatible With Secondary "
+"Licenses.  This means that software that's only available under previous "
+"versions of the MPL is still incompatible with the GPL and AGPL."
+msgstr ""
+
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"NCSA\" href=\"http://www.opensource.org/licenses/UoI-NCSA.php\";> "
 "NCSA/University of Illinois Open Source License</a> <span class=\"anchor-"
@@ -1041,28 +1110,6 @@
 "licence de logiciel libre compatible avec la GNU GPL, mais elle est faible "
 "en tant que copyleft."
 
-#. type: Content of: <dl><dd><p>
-msgid ""
-"This disjunctive license is a good choice if you want to make your package "
-"GPL-compatible and MPL-compatible.  However, you can also accomplish that by "
-"using the LGPL or the Guile license."
-msgstr ""
-"Cette licence de juxtaposition est un bon choix si vous souhaitez rendre "
-"votre paquet logiciel compatible à la fois avec la GPL et avec la MPL. "
-"Cependant vous obtiendrez le même résultat avec la LGPL ou bien la licence "
-"de Guile."
-
-#. type: Content of: <dl><dd><p>
-msgid ""
-"Such a disjunctive license might be a good choice if you have been using the "
-"MPL, and want to change to a GPL-compatible license without subtracting any "
-"permission you have given for previous versions."
-msgstr ""
-"Une telle licence de juxtaposition peut être un bon choix si jusque-là vous 
"
-"avez utilisé la MPL et que vous voulez évoluer vers une licence compatible "
-"GPL sans retirer pour autant les permissions que vous avez accordées pour "
-"les précédentes versions."
-
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"newOpenLDAP\" href=\"http://www.openldap.org/software/release/";
@@ -1808,12 +1855,19 @@
 "reference-id\"> (<a href=\"#CPAL\">#CPAL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  It is based on the <a href=\"#MPL"
+#| "\">Mozilla Public License</a>, and is incompatible with the GPL for the "
+#| "same reasons: it has several requirements for modified versions that do "
+#| "not exist in the GPL.  It also requires you to publish the source of the "
+#| "program if you allow others to use it."
 msgid ""
 "This is a free software license.  It is based on the <a href=\"#MPL"
-"\">Mozilla Public License</a>, and is incompatible with the GPL for the same "
-"reasons: it has several requirements for modified versions that do not exist "
-"in the GPL.  It also requires you to publish the source of the program if "
-"you allow others to use it."
+"\">Mozilla Public License</a> version 1, and is incompatible with the GPL "
+"for the same reasons: it has several requirements for modified versions that "
+"do not exist in the GPL.  It also requires you to publish the source of the "
+"program if you allow others to use it."
 msgstr ""
 "C'est une licence de logiciel libre. Elle est basée sur la <a href=\"#MPL"
 "\">Mozilla Public License</a>, et elle est incompatible avec la GPL pour les "
@@ -2203,10 +2257,15 @@
 "Ms-RL."
 
 #. type: Content of: <dl><dt>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
+#| "Public License (MPL)</a> <span class=\"anchor-reference-id\">(<a href="
+#| "\"#MPL\">#MPL</a>)</span>"
 msgid ""
 "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
-"Public License (MPL)</a> <span class=\"anchor-reference-id\">(<a href=\"#MPL"
-"\">#MPL</a>)</span>"
+"Public License (MPL) version 1.1</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"#MPL\">#MPL</a>)</span>"
 msgstr ""
 "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
 "Public License (MPL)</a> [EN] <span class=\"anchor-reference-id\">(<a href="
@@ -2254,9 +2313,17 @@
 "\"anchor-reference-id\">(<a href=\"#NOSL\">#NOSL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license that is essentially the same as the "
+#| "Mozilla Public License, Version 1.1.  Like the MPL, the NOSL has some "
+#| "complex restrictions that make it incompatible with the GNU GPL.  That "
+#| "is, a module covered by the GPL and a module covered by the NOSL cannot "
+#| "legally be linked together.  We urge you not to use the NOSL for this "
+#| "reason."
 msgid ""
 "This is a free software license that is essentially the same as the Mozilla "
-"Public License, Version 1.1.  Like the MPL, the NOSL has some complex "
+"Public License version 1.1.  Like the MPL, the NOSL has some complex "
 "restrictions that make it incompatible with the GNU GPL.  That is, a module "
 "covered by the GPL and a module covered by the NOSL cannot legally be linked "
 "together.  We urge you not to use the NOSL for this reason."
@@ -2279,13 +2346,21 @@
 "reference-id\">(<a href=\"#NPL\">#NPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, not a strong copyleft, and incompatible "
+#| "with the GNU GPL.  It consists of the Mozilla Public License with an "
+#| "added clause that permits Netscape to use your added code <em>even in "
+#| "their proprietary versions of the program</em>.  Of course, they do not "
+#| "give <em>you</em> permission to use <em>their</em> code in the analogous "
+#| "way.  We urge you not to use the NPL."
 msgid ""
 "This is a free software license, not a strong copyleft, and incompatible "
-"with the GNU GPL.  It consists of the Mozilla Public License with an added "
-"clause that permits Netscape to use your added code <em>even in their "
-"proprietary versions of the program</em>.  Of course, they do not give "
-"<em>you</em> permission to use <em>their</em> code in the analogous way.  We "
-"urge you not to use the NPL."
+"with the GNU GPL.  It consists of the Mozilla Public License version 1.1 "
+"with an added clause that permits Netscape to use your added code <em>even "
+"in their proprietary versions of the program</em>.  Of course, they do not "
+"give <em>you</em> permission to use <em>their</em> code in the analogous "
+"way.  We urge you not to use the NPL."
 msgstr ""
 "C'est une licence de logiciel libre, pas très stricte en tant que copyleft, "
 "et incompatible avec la GNU GPL. Elle est formée de la Mozilla Public "
@@ -2306,9 +2381,13 @@
 "\"#Nokia\">#Nokia</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "This is similar to the Mozilla Public License: a free software license "
+#| "incompatible with the GNU GPL."
 msgid ""
-"This is similar to the Mozilla Public License: a free software license "
-"incompatible with the GNU GPL."
+"This is similar to the Mozilla Public License version 1: a free software "
+"license incompatible with the GNU GPL."
 msgstr ""
 "Dans l'esprit de la Licence publique de Mozilla&nbsp;: une licence de "
 "logiciel libre incompatible avec la GNU GPL."
@@ -2628,11 +2707,17 @@
 "[EN] <span class=\"anchor-reference-id\">(<a href=\"#SPL\">#SPL</a>)</span>"
 
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This is essentially the same as the Mozilla Public License: a free software "
-"license incompatible with the GNU GPL.  Please do not confuse this with the "
-"<a href=\"#SunCommunitySourceLicense\">Sun Community Source License</a>, "
-"which is not a free software license."
+#, fuzzy
+#| msgid ""
+#| "This is essentially the same as the Mozilla Public License: a free "
+#| "software license incompatible with the GNU GPL.  Please do not confuse "
+#| "this with the <a href=\"#SunCommunitySourceLicense\">Sun Community Source "
+#| "License</a>, which is not a free software license."
+msgid ""
+"This is essentially the same as the Mozilla Public License version 1: a free "
+"software license incompatible with the GNU GPL.  Please do not confuse this "
+"with the <a href=\"#SunCommunitySourceLicense\">Sun Community Source "
+"License</a>, which is not a free software license."
 msgstr ""
 "Identique, pour l'essentiel, à la licence publique de Mozilla&nbsp;: une "
 "licence de logiciel libre incompatible avec la GNU GPL. Attention à ne pas "
@@ -4329,6 +4414,26 @@
 msgstr "Dernière mise à jour&nbsp;:"
 
 #~ msgid ""
+#~ "This disjunctive license is a good choice if you want to make your "
+#~ "package GPL-compatible and MPL-compatible.  However, you can also "
+#~ "accomplish that by using the LGPL or the Guile license."
+#~ msgstr ""
+#~ "Cette licence de juxtaposition est un bon choix si vous souhaitez rendre "
+#~ "votre paquet logiciel compatible à la fois avec la GPL et avec la MPL. "
+#~ "Cependant vous obtiendrez le même résultat avec la LGPL ou bien la "
+#~ "licence de Guile."
+
+#~ msgid ""
+#~ "Such a disjunctive license might be a good choice if you have been using "
+#~ "the MPL, and want to change to a GPL-compatible license without "
+#~ "subtracting any permission you have given for previous versions."
+#~ msgstr ""
+#~ "Une telle licence de juxtaposition peut être un bon choix si jusque-là "
+#~ "vous avez utilisé la MPL et que vous voulez évoluer vers une licence "
+#~ "compatible GPL sans retirer pour autant les permissions que vous avez "
+#~ "accordées pour les précédentes versions."
+
+#~ msgid ""
 #~ "<a id=\"GPLCompatibleLicenses\"> GPL-Compatible Free Software Licenses</a>"
 #~ msgstr ""
 #~ "<a id=\"GPLCompatibleLicenses\">Les licences logicielles libres "

Index: licenses/po/license-list.it.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.it.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- licenses/po/license-list.it.po      25 Dec 2011 01:26:08 -0000      1.32
+++ licenses/po/license-list.it.po      3 Jan 2012 17:26:58 -0000       1.33
@@ -8,13 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: license-list.html\n"
-"POT-Creation-Date: 2011-12-23 20:25-0500\n"
+"POT-Creation-Date: 2012-01-03 12:25-0500\n"
 "PO-Revision-Date: 2011-12-24 23:21+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-01-03 12:25-0500\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -1079,6 +1080,81 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
+# | <a [-id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";>
+# | Mozilla-] {+id=\"MPL-2.0\"
+# | href=\"http://www.mozilla.org/MPL/2.0/\";>Mozilla+} Public License
+# | [-(MPL)</a>-] {+(MPL) version 2.0</a>+} <span
+# | class=\"anchor-reference-id\">(<a [-href=\"#MPL\">#MPL</a>)</span>-]
+# | {+href=\"#MPL-2.0\">#MPL-2.0</a>)</span>+}
+#, fuzzy
+#| msgid ""
+#| "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
+#| "Public License (MPL)</a> <span class=\"anchor-reference-id\">(<a href="
+#| "\"#MPL\">#MPL</a>)</span>"
+msgid ""
+"<a id=\"MPL-2.0\" href=\"http://www.mozilla.org/MPL/2.0/\";>Mozilla Public "
+"License (MPL) version 2.0</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#MPL-2.0\">#MPL-2.0</a>)</span>"
+msgstr ""
+"<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> La Licenza "
+"Pubblica Mozilla (MPL)</a> <span class=\"anchor-reference-id\">(<a href="
+"\"#MPL\">#MPL</a>)</span>"
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This is a free software license.  Section 3.3 provides indirect "
+"compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
+"version 2.1, the GNU AGPL version 3.0, and all later versions of those "
+"licenses.  When you receive work under the MPL version 2.0, you may make a "
+"&ldquo;Larger Work&rdquo; that combines that work with work under one of "
+"those GNU licenses.  When you do, section 3.3 gives you permission to "
+"distribute the MPL-covered work under the terms of that same GNU license, "
+"with one condition: you must make sure that the files that were originally "
+"under the MPL are still available under the MPL's terms as well.  In other "
+"words, when you make a combination this way, the files that were originally "
+"under the MPL will be dual licensed under the MPL and the GNU license.  The "
+"end result is that the Larger Work, as a whole, will be covered under the "
+"GNU license.  People who receive that combination from you will have the "
+"option to use any files that were originally covered by the MPL under that "
+"license's terms, or distribute the Larger Work in whole or in part under the "
+"terms of the GNU license with no further restrictions."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"It's important to understand that the condition to distribute files under "
+"the MPL's terms only applies to the party that first creates and distributes "
+"the Larger Work.  If it applied to their recipients as well, it would be a "
+"further restriction and incompatible with the GNU licenses.  That said, when "
+"you make contributions to an existing project, we usually <a href=\"/"
+"licenses/license-recommendations.html#contributing\">recommend that you keep "
+"your changes under the same license</a>, even when you're not required to do "
+"so.  If you receive a work under a GNU license where some files are also "
+"under the MPL, you should only remove the MPL from those files when there's "
+"a strong reason to justify it."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Check the license notices on the MPL-covered software before you make a "
+"Larger Work this way.  Parties who release original work under the MPL "
+"version 2.0 may choose to opt out of this compatibility by including a "
+"sentence in the license notices that says that the work is &ldquo;"
+"Incompatible With Secondary Licenses.&rdquo; Any software that includes this "
+"notice is <strong>not</strong> compatible with the GPL or AGPL."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Software under previous versions of the MPL can be upgraded to version 2.0, "
+"but any software that isn't already available under one of the listed GNU "
+"licenses <strong>must</strong> be marked as Incompatible With Secondary "
+"Licenses.  This means that software that's only available under previous "
+"versions of the MPL is still incompatible with the GPL and AGPL."
+msgstr ""
+
+# type: Content of: <dl><dt>
+#. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"NCSA\" href=\"http://www.opensource.org/licenses/UoI-NCSA.php\";> "
 "NCSA/University of Illinois Open Source License</a> <span class=\"anchor-"
@@ -1123,29 +1199,6 @@
 "motivo è una licenza per software libero, compatibile con la GNU GPL, ma "
 "senza un forte copyleft."
 
-# type: Content of: <dl><dd><p>
-#. type: Content of: <dl><dd><p>
-msgid ""
-"This disjunctive license is a good choice if you want to make your package "
-"GPL-compatible and MPL-compatible.  However, you can also accomplish that by "
-"using the LGPL or the Guile license."
-msgstr ""
-"Questa licenza disgiunta è una buona scelte se desiderate rendere il vostro "
-"pacchetto compatibile con la GPL ed anche con la MPL. In ogni caso questo si "
-"può raggiungere questo scopo anche utilizzando la licenza LGPL o la licenza "
-"di Guile."
-
-# type: Content of: <dl><dd><p>
-#. type: Content of: <dl><dd><p>
-msgid ""
-"Such a disjunctive license might be a good choice if you have been using the "
-"MPL, and want to change to a GPL-compatible license without subtracting any "
-"permission you have given for previous versions."
-msgstr ""
-"Questa licenza disgiunta può essere una buona scelta se avete utilizzato la "
-"MPL e desiderate passare a una licenza compatibile con la GPL senza togliere "
-"nessun permesso attribuito per le versioni precedenti."
-
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
 msgid ""
@@ -1942,12 +1995,25 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a free software license.  It is based on the <a
+# | href=\"#MPL\">Mozilla Public [-License</a>,-] {+License</a> version 1,+}
+# | and is incompatible with the GPL for the same reasons: it has several
+# | requirements for modified versions that do not exist in the GPL.  It also
+# | requires you to publish the source of the program if you allow others to
+# | use it.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license.  It is based on the <a href=\"#MPL"
+#| "\">Mozilla Public License</a>, and is incompatible with the GPL for the "
+#| "same reasons: it has several requirements for modified versions that do "
+#| "not exist in the GPL.  It also requires you to publish the source of the "
+#| "program if you allow others to use it."
 msgid ""
 "This is a free software license.  It is based on the <a href=\"#MPL"
-"\">Mozilla Public License</a>, and is incompatible with the GPL for the same "
-"reasons: it has several requirements for modified versions that do not exist "
-"in the GPL.  It also requires you to publish the source of the program if "
-"you allow others to use it."
+"\">Mozilla Public License</a> version 1, and is incompatible with the GPL "
+"for the same reasons: it has several requirements for modified versions that "
+"do not exist in the GPL.  It also requires you to publish the source of the "
+"program if you allow others to use it."
 msgstr ""
 "Questa è una licenza di software libero. E' basata sulla <a href=\"#MPL"
 "\">Mozilla Public License</a> ed è incompatibile con la GPL per gli stessi "
@@ -2359,10 +2425,18 @@
 
 # type: Content of: <dl><dt>
 #. type: Content of: <dl><dt>
+# | <a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla
+# | Public License [-(MPL)</a>-] {+(MPL) version 1.1</a>+} <span
+# | class=\"anchor-reference-id\">(<a href=\"#MPL\">#MPL</a>)</span>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
+#| "Public License (MPL)</a> <span class=\"anchor-reference-id\">(<a href="
+#| "\"#MPL\">#MPL</a>)</span>"
 msgid ""
 "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
-"Public License (MPL)</a> <span class=\"anchor-reference-id\">(<a href=\"#MPL"
-"\">#MPL</a>)</span>"
+"Public License (MPL) version 1.1</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"#MPL\">#MPL</a>)</span>"
 msgstr ""
 "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> La Licenza "
 "Pubblica Mozilla (MPL)</a> <span class=\"anchor-reference-id\">(<a href="
@@ -2413,9 +2487,23 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a free software license that is essentially the same as the
+# | Mozilla Public [-License, Version-] {+License version+} 1.1.  Like the
+# | MPL, the NOSL has some complex restrictions that make it incompatible with
+# | the GNU GPL.  That is, a module covered by the GPL and a module covered by
+# | the NOSL cannot legally be linked together.  We urge you not to use the
+# | NOSL for this reason.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license that is essentially the same as the "
+#| "Mozilla Public License, Version 1.1.  Like the MPL, the NOSL has some "
+#| "complex restrictions that make it incompatible with the GNU GPL.  That "
+#| "is, a module covered by the GPL and a module covered by the NOSL cannot "
+#| "legally be linked together.  We urge you not to use the NOSL for this "
+#| "reason."
 msgid ""
 "This is a free software license that is essentially the same as the Mozilla "
-"Public License, Version 1.1.  Like the MPL, the NOSL has some complex "
+"Public License version 1.1.  Like the MPL, the NOSL has some complex "
 "restrictions that make it incompatible with the GNU GPL.  That is, a module "
 "covered by the GPL and a module covered by the NOSL cannot legally be linked "
 "together.  We urge you not to use the NOSL for this reason."
@@ -2439,13 +2527,27 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is a free software license, not a strong copyleft, and incompatible
+# | with the GNU GPL.  It consists of the Mozilla Public License {+version
+# | 1.1+} with an added clause that permits Netscape to use your added code
+# | <em>even in their proprietary versions of the program</em>.  Of course,
+# | they do not give <em>you</em> permission to use <em>their</em> code in the
+# | analogous way.  We urge you not to use the NPL.
+#, fuzzy
+#| msgid ""
+#| "This is a free software license, not a strong copyleft, and incompatible "
+#| "with the GNU GPL.  It consists of the Mozilla Public License with an "
+#| "added clause that permits Netscape to use your added code <em>even in "
+#| "their proprietary versions of the program</em>.  Of course, they do not "
+#| "give <em>you</em> permission to use <em>their</em> code in the analogous "
+#| "way.  We urge you not to use the NPL."
 msgid ""
 "This is a free software license, not a strong copyleft, and incompatible "
-"with the GNU GPL.  It consists of the Mozilla Public License with an added "
-"clause that permits Netscape to use your added code <em>even in their "
-"proprietary versions of the program</em>.  Of course, they do not give "
-"<em>you</em> permission to use <em>their</em> code in the analogous way.  We "
-"urge you not to use the NPL."
+"with the GNU GPL.  It consists of the Mozilla Public License version 1.1 "
+"with an added clause that permits Netscape to use your added code <em>even "
+"in their proprietary versions of the program</em>.  Of course, they do not "
+"give <em>you</em> permission to use <em>their</em> code in the analogous "
+"way.  We urge you not to use the NPL."
 msgstr ""
 "Questa è una licenza per software libero, con un debole copyleft, "
 "incompatibile con la GNU GPL. Consiste nella Licenza Pubblica Mozilla con "
@@ -2467,9 +2569,15 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
+# | This is similar to the Mozilla Public [-License:-] {+License version 1:+}
+# | a free software license incompatible with the GNU GPL.
+#, fuzzy
+#| msgid ""
+#| "This is similar to the Mozilla Public License: a free software license "
+#| "incompatible with the GNU GPL."
 msgid ""
-"This is similar to the Mozilla Public License: a free software license "
-"incompatible with the GNU GPL."
+"This is similar to the Mozilla Public License version 1: a free software "
+"license incompatible with the GNU GPL."
 msgstr ""
 "Questa licenza è molto simile alla Licenza Pubblica Mozilla: una licenza per 
"
 "software libero incompatibile con la GNU GPL. "
@@ -2815,11 +2923,22 @@
 
 # type: Content of: <dl><dd><p>
 #. type: Content of: <dl><dd><p>
-msgid ""
-"This is essentially the same as the Mozilla Public License: a free software "
-"license incompatible with the GNU GPL.  Please do not confuse this with the "
-"<a href=\"#SunCommunitySourceLicense\">Sun Community Source License</a>, "
-"which is not a free software license."
+# | This is essentially the same as the Mozilla Public [-License:-] {+License
+# | version 1:+} a free software license incompatible with the GNU GPL. 
+# | Please do not confuse this with the <a
+# | href=\"#SunCommunitySourceLicense\">Sun Community Source License</a>,
+# | which is not a free software license.
+#, fuzzy
+#| msgid ""
+#| "This is essentially the same as the Mozilla Public License: a free "
+#| "software license incompatible with the GNU GPL.  Please do not confuse "
+#| "this with the <a href=\"#SunCommunitySourceLicense\">Sun Community Source "
+#| "License</a>, which is not a free software license."
+msgid ""
+"This is essentially the same as the Mozilla Public License version 1: a free "
+"software license incompatible with the GNU GPL.  Please do not confuse this "
+"with the <a href=\"#SunCommunitySourceLicense\">Sun Community Source "
+"License</a>, which is not a free software license."
 msgstr ""
 "Questa licenza è essenzialmente uguale alla Licenza Pubblica Mozilla: una "
 "licenza per software libero incompatibile con la GNU GPL. Non confondetela "
@@ -4607,6 +4726,27 @@
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
 
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "This disjunctive license is a good choice if you want to make your "
+#~ "package GPL-compatible and MPL-compatible.  However, you can also "
+#~ "accomplish that by using the LGPL or the Guile license."
+#~ msgstr ""
+#~ "Questa licenza disgiunta è una buona scelte se desiderate rendere il "
+#~ "vostro pacchetto compatibile con la GPL ed anche con la MPL. In ogni caso "
+#~ "questo si può raggiungere questo scopo anche utilizzando la licenza LGPL "
+#~ "o la licenza di Guile."
+
+# type: Content of: <dl><dd><p>
+#~ msgid ""
+#~ "Such a disjunctive license might be a good choice if you have been using "
+#~ "the MPL, and want to change to a GPL-compatible license without "
+#~ "subtracting any permission you have given for previous versions."
+#~ msgstr ""
+#~ "Questa licenza disgiunta può essere una buona scelta se avete utilizzato "
+#~ "la MPL e desiderate passare a una licenza compatibile con la GPL senza "
+#~ "togliere nessun permesso attribuito per le versioni precedenti."
+
 #~ msgid ""
 #~ "<a id=\"Sybase\" href=\"http://www.opensource.org/licenses/Watcom-1.0";
 #~ "\">Sybase Open Watcom Public License version 1.0</a>"

Index: licenses/po/license-list.pot
===================================================================
RCS file: /web/www/www/licenses/po/license-list.pot,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- licenses/po/license-list.pot        24 Dec 2011 01:26:27 -0000      1.62
+++ licenses/po/license-list.pot        3 Jan 2012 17:26:58 -0000       1.63
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-23 20:25-0500\n"
+"POT-Creation-Date: 2012-01-03 12: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"
@@ -699,6 +699,67 @@
 
 #. type: Content of: <dl><dt>
 msgid ""
+"<a id=\"MPL-2.0\" href=\"http://www.mozilla.org/MPL/2.0/\";>Mozilla Public "
+"License (MPL) version 2.0</a> <span class=\"anchor-reference-id\">(<a "
+"href=\"#MPL-2.0\">#MPL-2.0</a>)</span>"
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"This is a free software license.  Section 3.3 provides indirect "
+"compatibility between this license and the GNU GPL version 2.0, the GNU LGPL "
+"version 2.1, the GNU AGPL version 3.0, and all later versions of those "
+"licenses.  When you receive work under the MPL version 2.0, you may make a "
+"&ldquo;Larger Work&rdquo; that combines that work with work under one of "
+"those GNU licenses.  When you do, section 3.3 gives you permission to "
+"distribute the MPL-covered work under the terms of that same GNU license, "
+"with one condition: you must make sure that the files that were originally "
+"under the MPL are still available under the MPL's terms as well.  In other "
+"words, when you make a combination this way, the files that were originally "
+"under the MPL will be dual licensed under the MPL and the GNU license.  The "
+"end result is that the Larger Work, as a whole, will be covered under the "
+"GNU license.  People who receive that combination from you will have the "
+"option to use any files that were originally covered by the MPL under that "
+"license's terms, or distribute the Larger Work in whole or in part under the "
+"terms of the GNU license with no further restrictions."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"It's important to understand that the condition to distribute files under "
+"the MPL's terms only applies to the party that first creates and distributes "
+"the Larger Work.  If it applied to their recipients as well, it would be a "
+"further restriction and incompatible with the GNU licenses.  That said, when "
+"you make contributions to an existing project, we usually <a "
+"href=\"/licenses/license-recommendations.html#contributing\">recommend that "
+"you keep your changes under the same license</a>, even when you're not "
+"required to do so.  If you receive a work under a GNU license where some "
+"files are also under the MPL, you should only remove the MPL from those "
+"files when there's a strong reason to justify it."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Check the license notices on the MPL-covered software before you make a "
+"Larger Work this way.  Parties who release original work under the MPL "
+"version 2.0 may choose to opt out of this compatibility by including a "
+"sentence in the license notices that says that the work is "
+"&ldquo;Incompatible With Secondary Licenses.&rdquo; Any software that "
+"includes this notice is <strong>not</strong> compatible with the GPL or "
+"AGPL."
+msgstr ""
+
+#. type: Content of: <dl><dd><p>
+msgid ""
+"Software under previous versions of the MPL can be upgraded to version 2.0, "
+"but any software that isn't already available under one of the listed GNU "
+"licenses <strong>must</strong> be marked as Incompatible With Secondary "
+"Licenses.  This means that software that's only available under previous "
+"versions of the MPL is still incompatible with the GPL and AGPL."
+msgstr ""
+
+#. type: Content of: <dl><dt>
+msgid ""
 "<a id=\"NCSA\" href=\"http://www.opensource.org/licenses/UoI-NCSA.php\";> "
 "NCSA/University of Illinois Open Source License</a> <span "
 "class=\"anchor-reference-id\">(<a href=\"#NCSA\">#NCSA</a>)</span>"
@@ -727,20 +788,6 @@
 "copyleft."
 msgstr ""
 
-#. type: Content of: <dl><dd><p>
-msgid ""
-"This disjunctive license is a good choice if you want to make your package "
-"GPL-compatible and MPL-compatible.  However, you can also accomplish that by "
-"using the LGPL or the Guile license."
-msgstr ""
-
-#. type: Content of: <dl><dd><p>
-msgid ""
-"Such a disjunctive license might be a good choice if you have been using the "
-"MPL, and want to change to a GPL-compatible license without subtracting any "
-"permission you have given for previous versions."
-msgstr ""
-
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"newOpenLDAP\" "
@@ -1253,10 +1300,10 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license.  It is based on the <a "
-"href=\"#MPL\">Mozilla Public License</a>, and is incompatible with the GPL "
-"for the same reasons: it has several requirements for modified versions that "
-"do not exist in the GPL.  It also requires you to publish the source of the "
-"program if you allow others to use it."
+"href=\"#MPL\">Mozilla Public License</a> version 1, and is incompatible with "
+"the GPL for the same reasons: it has several requirements for modified "
+"versions that do not exist in the GPL.  It also requires you to publish the "
+"source of the program if you allow others to use it."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -1516,7 +1563,7 @@
 #. type: Content of: <dl><dt>
 msgid ""
 "<a id=\"MPL\" href=\"http://www.mozilla.org/MPL/MPL-1.1.html\";> Mozilla "
-"Public License (MPL)</a> <span class=\"anchor-reference-id\">(<a "
+"Public License (MPL) version 1.1</a> <span class=\"anchor-reference-id\">(<a "
 "href=\"#MPL\">#MPL</a>)</span>"
 msgstr ""
 
@@ -1549,7 +1596,7 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license that is essentially the same as the Mozilla "
-"Public License, Version 1.1.  Like the MPL, the NOSL has some complex "
+"Public License version 1.1.  Like the MPL, the NOSL has some complex "
 "restrictions that make it incompatible with the GNU GPL.  That is, a module "
 "covered by the GPL and a module covered by the NOSL cannot legally be linked "
 "together.  We urge you not to use the NOSL for this reason."
@@ -1565,11 +1612,11 @@
 #. type: Content of: <dl><dd><p>
 msgid ""
 "This is a free software license, not a strong copyleft, and incompatible "
-"with the GNU GPL.  It consists of the Mozilla Public License with an added "
-"clause that permits Netscape to use your added code <em>even in their "
-"proprietary versions of the program</em>.  Of course, they do not give "
-"<em>you</em> permission to use <em>their</em> code in the analogous way.  We "
-"urge you not to use the NPL."
+"with the GNU GPL.  It consists of the Mozilla Public License version 1.1 "
+"with an added clause that permits Netscape to use your added code <em>even "
+"in their proprietary versions of the program</em>.  Of course, they do not "
+"give <em>you</em> permission to use <em>their</em> code in the analogous "
+"way.  We urge you not to use the NPL."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -1581,8 +1628,8 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is similar to the Mozilla Public License: a free software license "
-"incompatible with the GNU GPL."
+"This is similar to the Mozilla Public License version 1: a free software "
+"license incompatible with the GNU GPL."
 msgstr ""
 
 #. type: Content of: <dl><dt>
@@ -1805,10 +1852,10 @@
 
 #. type: Content of: <dl><dd><p>
 msgid ""
-"This is essentially the same as the Mozilla Public License: a free software "
-"license incompatible with the GNU GPL.  Please do not confuse this with the "
-"<a href=\"#SunCommunitySourceLicense\">Sun Community Source License</a>, "
-"which is not a free software license."
+"This is essentially the same as the Mozilla Public License version 1: a free "
+"software license incompatible with the GNU GPL.  Please do not confuse this "
+"with the <a href=\"#SunCommunitySourceLicense\">Sun Community Source "
+"License</a>, which is not a free software license."
 msgstr ""
 
 #. type: Content of: <dl><dt>

Index: philosophy/categories.ru.html
===================================================================
RCS file: /web/www/www/philosophy/categories.ru.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- philosophy/categories.ru.html       26 Dec 2011 09:29:12 -0000      1.12
+++ philosophy/categories.ru.html       3 Jan 2012 17:27:05 -0000       1.13
@@ -203,9 +203,10 @@
 полностью свободная операционная система 
типа Unix, которую мы развиваем в
 рамках проекта GNU с 1984&nbsp;года.</p>
 
-       <p>Операционная система типа Unix состоит 
из множества программ. Система GNU
-включает все программы GNU, а также много 
других пакетов, таких, как система
-X&nbsp;Window и TeX, которые не являются 
программами GNU.</p>
+       <p>Операционная система типа Unix состоит 
из множества программ. В систему GNU
+входят все <a href="#GNUsoftware">официальные пакеты 
GNU</a>. В нее входит
+также много других пакетов, таких, как 
система X&nbsp;Window и TeX, которые
+не являются программами GNU.</p>
 
        <p>Первый пробный выпуск полной системы 
GNU был в 1996&nbsp;году. Он включал
 GNU Hurd, наше ядро, разработка которого 
ведется с 1990&nbsp;года. В
@@ -214,16 +215,17 @@
 так что широко его не используют. Между тем 
<a
 href="/gnu/linux-and-gnu.html">система GNU/Linux</a>, 
ответвление
 операционной системы GNU, в котором в 
качестве ядра вместо GNU Hurd
-применяется Linux, пользуется большим успех
ом начиная с девяностых годов.</p>
+применяется Linux, пользуется большим успех
ом начиная с девяностых годов. Из
+этого видно, что система GNU&nbsp;&mdash; это не 
какой-то один статичный
+набор программ; пользователи и поставщики 
могут выбирать разные пакеты в
+соответствии со своими желаниями и 
нуждами. В результате все равно
+получается вариант системы GNU.</p>
 
        <p>Поскольку цель GNU&nbsp;&mdash; свобода, 
каждая отдельная составляющая в
-операционной системе GNU должна быть 
свободной программой. Однако не
-требуется, чтобы на них распространялось 
авторское лево; любого рода
-свободные программы юридически подходят 
для присоединения к системе, если
-они помогают решать технические задачи. 
Также нет необходимости, чтобы
-каждая отдельная составляющая была 
программой GNU. GNU может включать и
-включает свободные программы без 
авторского лева, такие, как система
-X&nbsp;Window, которые разработаны в других 
проектах.</p>
+операционной системе GNU является 
свободной программой. Однако не требуется,
+чтобы на них распространялось авторское 
лево; любого рода свободные
+программы юридически подходят для 
присоединения к системе, если они помогают
+решать технические задачи.</p>
 
 <h3 id="GNUprograms"> </h3>
 
@@ -419,7 +421,7 @@
 <!-- timestamp start -->
 Обновлено:
 
-$Date: 2011/12/26 09:29:12 $
+$Date: 2012/01/03 17:27:05 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/categories.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/categories.ru-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- philosophy/po/categories.ru-en.html 26 Dec 2011 09:29:26 -0000      1.2
+++ philosophy/po/categories.ru-en.html 3 Jan 2012 17:27:11 -0000       1.3
@@ -207,29 +207,29 @@
        Unix-like operating system, which is entirely free software, that
        we in the GNU Project have developed since 1984.</p>
 
-       <p>A Unix-like operating system consists of many programs. The GNU
-       system includes all the GNU software, as well as many other
-       packages such as the X Window System and TeX which are not GNU
-       software.</p>
+       <p>A Unix-like operating system consists of many programs. The
+       GNU system includes all of the <a href="#GNUsoftware">offical
+       GNU packages</a>.  It also includes many other packages, such as
+       the X Window System and TeX, which are not GNU software.</p>
 
        <p>The first test release of the complete GNU system was in
        1996.  This includes the GNU Hurd, our kernel, developed since
        1990. In 2001 the GNU system (including the GNU Hurd) began
        working fairly reliably, but the Hurd still lacks some
        important features, so it is not widely used. Meanwhile,
-       the <a href= "/gnu/linux-and-gnu.html">GNU/Linux system</a>,
+       the <a href="/gnu/linux-and-gnu.html">GNU/Linux system</a>,
        an offshoot of the GNU operating system which uses Linux as
        the kernel instead of the GNU Hurd, has been a great success
-       since the 90s.</p>
+       since the 90s.  As this shows, the GNU system is not a single
+        static set of programs; users and distributors may select
+        different packages according to their needs and desires.  The
+        result is still a variant of the GNU system.</p>
 
        <p>Since the purpose of GNU is to be free, every single
-       component in the GNU operating system has to be free
+       component in the GNU operating system is free
        software. They don't all have to be copylefted, however; any
        kind of free software is legally suitable to include if it
-       helps meet technical goals. And it isn't necessary for all the
-       components to be GNU software, individually.  GNU can and does
-       include noncopylefted free software such as the X Window
-       System that were developed by other projects.</p>
+       helps meet technical goals.</p>
 
 <h3 id="GNUprograms">GNU programs</h3>
 
@@ -421,7 +421,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/12/26 09:29:26 $
+$Date: 2012/01/03 17:27:11 $
 <!-- timestamp end -->
 </p>
 </div>

Index: gnu/about-gnu.sq.html
===================================================================
RCS file: gnu/about-gnu.sq.html
diff -N gnu/about-gnu.sq.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gnu/about-gnu.sq.html       3 Jan 2012 17:26:32 -0000       1.1
@@ -0,0 +1,155 @@
+
+<!--#include virtual="/server/header.sq.html" -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>Rreth Sistemit Operativ GNU - Projekti GNU - Free Software Foundation 
(FSF)</title>
+
+<!--#include virtual="/server/banner.sq.html" -->
+<!--#include virtual="/gnu/po/about-gnu.translist" -->
+<h2>Rreth Sistemit Operativ GNU</h2>
+
+<p>[<a href="/gnu/gnu.html">Të tjerë artikuj historikë dhe të 
përgjithshëm mbi
+GNU-në.</a>]</p>
+
+<p>GNU-ja u nis nga Richard Stallman (rms) më 1983, si një sistem operativ 
që
+do të krijohej nga njerëz që do të punonin tok me synimin që tërë
+përdoruesit e kopmjuterit të ishin të lirë të kontrollonin kompjuterin e
+tyre.  Deri sot rms mbetet ende Chief GNUisance.</p>
+
+<p>Synimi fillestar dhe i vazhdueshëm i GNU-së mbetet ofrimi i një sistemi 
të
+përputhshëm me Unix-inin, i cili do të ishte 100% <a
+href="/philosophy/free-sw.html">software i lirë</a>.  Jo 95% i lirë, jo
+99.5%, 100%. Emri i sistemit, GNU, është një akronim rekursiv që do të 
thotë
+GNU-ja Nuk është Unix&mdash;një mënyrë për t'i dhënë hakën ideve 
teknike të
+Unix-it, teksa në të njëjtën kohë pohohet që GNU-ja është diçka 
tjetër.
+Teknikisht, GNU-ja ngjan me Unix-in.  Por ndryshe nga Unix-i, GNU-ja u jep
+liri përdoruesve të vet.</p>
+
+<p>Sot mund të kihen <a href="/distros/free-distros.html">shpërndarje sistemi
+krejtësisht të lirë</a> (&ldquo;distros&rdquo;) që e plotësojnë këtë 
synim,
+me shumë prej tyre që përdorin <a
+href="http://linux-libre.fsfla.org";>kernelin Linux-libre</a> (<a
+href="/gnu/linux-and-gnu.html">marrëdhëniet mes GNU-së dhe kernelit
+Linux</a> përshkruhen më në hollësi diku tjetër).  <a
+href="/software/software.html">Paketat GNU</a> janë hartuar që të punojnë
+tok, për të pasur një sistem GNU funksional.  Më vonë u pa që ato 
shërbejnë
+gjithashtu si &ldquo;upstream&rdquo; i përbashkët për shumë shpërndarje,
+ndaj kontributi te paketat GNU ndihmon bashkësinë e software-it të lirë në
+përgjithësi.  Kuptohet që puna për GNU-në është e pandërprerë, me 
synim
+krijimin e një sistemi që u jep përdoruesve lirinë më të madhe në
+kompjuter.  Paketat GNU përfshijnë zbatime përdoruesi, programe të 
dobishme,
+mjete, librari, madje dhe lojra&mdash;krejt programet që një sistem operativ
+mund t'u ofrojë përdoruesve të vet.  <a
+href="/help/evaluation.html">Mirëpresim paketa të reja.</a> </p>
+
+<p>Për ta bërë GNU-në atë sukses që përfaqëson sot, kanë punuar me 
mijëra vetë,
+dhe ka <a href="/help/help.html">plot rrugë për të kontribuar</a>, si
+teknike, ashtu edhe joteknike.  Zhvilluesit e GNU-së takohen herë pas here
+gjatë <a href="/ghm/ghm.html">GNU Hackers Meetings</a>, ndonjëherë edhe si
+pjesë e konferencave të një bashkësie më të gjerë të software-it të 
lirë,
+asaj <a href="http://libreplanet.org/";>LibrePlanet</a>.</p>
+
+<p>GNU-ja është përkrahur në rrugë të ndryshme nga <a
+href="http://www.fsf.org/";>Free Software Foundation</a>, organizmi
+jofitimprurës edhe ky i themeluar nga RMS për mbrojtjen e idealeve të
+software-it të lirë.  Mes të tjerash, FSF-ja pranon dhënie të drejtash
+kopjimi dhe klauzola rreth tyre, ndaj mund të përfaqësojë programe GNU në
+çështje gjyqësore.  (Për të qenë të qartë, dhënie e një programi te 
GNU-ja
+<em>nuk</em> lyp transferim te FSF-ja të të drejtave të kopjimit.  Nëse i
+jepni të drejtat e kopjimit, FSF-ja do të zbatojë GPL-në për programin, 
nëse
+dikush e shkel atë; nëse i ruani vetë të drejtat e kopjimit, zbatimi ju
+mebtet juvee.)</p>
+
+<p>Synimi përfundimtar është të ofrohet software i lirë që të mund të 
kryejë
+tërë gjërat që duan të bëjnë përdoruesit me kopmjuterin&mdash;dhe për 
t'i
+bërë kështu software-et e lirë kujtim të të shkuarës.</p>
+
+<!-- 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.sq.html" -->
+<div id="footer">
+
+<p>Ju lutemi, pyetjet dhe kërkesat e përgjithshme rreth FSF &amp; GNU 
dërgoji
+te <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.  Ka gjithashtu 
dhe
+<a href="/contact/">rrugë të tjera për t'u lidhur</a> me FSF-në.<br />
+Ju lutem, lidhjet e dëmtuara, këshillat dhe ndreqjet dërgojini te <a
+href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
+
+<p>Për të dhëna mbi bashkërendimin dhe parashtrimin e përkthimeve të 
këtij
+artikulli, ju lutem, shihni <a
+href="/server/standards/README.translations.html">README për 
përkthimet</a>.</p>
+
+<p>Të drejta Kopjimi &copy; 2011 Free Software Foundation, Inc.,</p>
+
+<p>Kjo faqe mund të përdoret sipas një <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Lejeje Creative
+Commons Attribution-NoDerivs 3.0 United States</a>.
+</p>
+
+
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+  </div>
+
+
+ <p><!-- timestamp start -->
+U përditësua më:
+
+$Date: 2012/01/03 17:26:32 $
+
+<!-- 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
 -->
+<!--      -->
+<!--  -->
+<!-- <gnun>
+
+<ul class="translations-list"> -->
+<!-- German -->
+<!-- <li><a href="/gnu/about-gnu.de.html">Deutsch</a>&nbsp;[de]</li> -->
+<!-- English -->
+<!-- <li><a href="/gnu/about-gnu.html">English</a>&nbsp;[en]</li> -->
+<!-- Polish -->
+<!-- <li><a href="/gnu/about-gnu.pl.html">Polish</a>&nbsp;[pl]</li> -->
+<!-- </ul>
+</gnun> -->
+<!-- </div>
+ -->
+</div>
+</body>
+</html>

Index: gnu/po/about-gnu.sq-en.html
===================================================================
RCS file: gnu/po/about-gnu.sq-en.html
diff -N gnu/po/about-gnu.sq-en.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gnu/po/about-gnu.sq-en.html 3 Jan 2012 17:26:50 -0000       1.1
@@ -0,0 +1,132 @@
+<!--#include virtual="/server/header.html" -->
+<title>About the GNU Operating System
+- GNU Project - Free Software Foundation (FSF)</title>
+<!--#include virtual="/server/banner.html" -->
+<!--#include virtual="/gnu/po/about-gnu.translist" -->
+
+<h2>About the GNU Operating System</h2>
+
+<p>[<a href="/gnu/gnu.html">Other historical and general articles about
+GNU.</a>]</p>
+
+<p>GNU was launched by Richard Stallman (rms) in 1983, as an
+operating system which would be put together by people working
+together for the freedom of all software users to control their
+computing.  rms remains the Chief GNUisance today.</p>
+
+<p>The primary and continuing goal of GNU is to offer a Unix-compatible
+system that would be 100% <a href="/philosophy/free-sw.html">free
+software</a>.  Not 95% free, not 99.5%, but 100%.  The name of the
+system, GNU, is a recursive acronym meaning GNU's Not Unix&mdash;a way
+of paying tribute to the technical ideas of Unix, while at the same time
+saying that GNU is something different.  Technically, GNU is like Unix.
+But unlike Unix, GNU gives its users freedom.</p>
+
+<p><a href="/distros/free-distros.html">Completely free system
+distributions</a> (&ldquo;distros&rdquo;) meeting this goal are
+available today, many using the <a
+href="http://linux-libre.fsfla.org";>Linux-libre kernel</a> (the <a
+href="/gnu/linux-and-gnu.html">relationship between GNU and the Linux
+kernel</a> is described more fully elsewhere).  The <a
+href="/software/software.html">GNU packages</a> have been designed to
+work together so we could have a functioning GNU system.  It has turned
+out that they also serve as a common &ldquo;upstream&rdquo; for many
+distros, so contributions to GNU packages help the free software
+community as a whole.  Naturally, work on GNU is ongoing, with the goal
+to create a system that gives the greatest freedom to computer users.
+GNU packages include user-oriented applications, utilities, tools,
+libraries, even games&mdash;all the programs that an operating system
+can usefully offer to its users.  <a href="/help/evaluation.html">New
+packages are welcome.</a> </p>
+
+<p>Thousands of people have joined in to make GNU the success it is
+today, and there are <a href="/help/help.html">many ways to
+contribute</a>, both technical and non-technical.  GNU developers gather
+from time to time in <a href="/ghm/ghm.html">GNU Hackers Meetings</a>,
+sometimes as part of the larger free software community <a
+href="http://libreplanet.org/";>LibrePlanet</a> conferences.</p>
+
+<p>GNU has been supported in several ways by the <a
+href="http://www.fsf.org/";>Free Software Foundation</a>, the nonprofit
+organization also founded by rms to advocate free software ideals.
+Among other things, the FSF accepts copyright assignments and
+disclaimers, so it can act in court on behalf of GNU programs.  (To be
+clear, contributing a program to GNU does <em>not</em> require
+transferring copyright to the FSF.  If you do assign copyright, the FSF
+will enforce the GPL for the program if someone violates it; if you keep
+the copyright, enforcement will be up to you.)</p>
+
+<p>The ultimate goal is to provide free software to do all of the
+jobs computer users want to do&mdash;and thus make proprietary software
+a thing of the past.</p>
+
+<!-- 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 &amp; GNU inquiries to
+<a href="mailto:address@hidden";>&lt;address@hidden&gt;</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";>&lt;address@hidden&gt;</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 &copy; 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/01/03 17:26:50 $
+<!-- 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="/gnu/about-gnu.de.html">Deutsch</a>&nbsp;[de]</li> -->
+<!-- English -->
+<!-- <li><a href="/gnu/about-gnu.html">English</a>&nbsp;[en]</li> -->
+<!-- Polish -->
+<!-- <li><a href="/gnu/about-gnu.pl.html">Polish</a>&nbsp;[pl]</li> -->
+<!-- </ul> -->
+<!-- </div> -->
+</div>
+</body>
+</html>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]