[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www licenses/gpl-faq.ru.html licenses/po/gpl-fa...
From: |
GNUN |
Subject: |
www licenses/gpl-faq.ru.html licenses/po/gpl-fa... |
Date: |
Fri, 21 Sep 2012 08:29:24 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 12/09/21 08:29:24
Modified files:
licenses : gpl-faq.ru.html
licenses/po : gpl-faq.ru-en.html gpl-faq.ru.po
philosophy : categories.ru.html
government-free-software.ru.html
nonfree-games.ru.html right-to-read.ru.html
philosophy/po : categories.ru-en.html categories.ru.po
government-free-software.ru-en.html
government-free-software.ru.po
nonfree-games.ru-en.html nonfree-games.ru.po
right-to-read.ru-en.html right-to-read.ru.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.ru.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru-en.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/categories.ru.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/government-free-software.ru.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/nonfree-games.ru.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/right-to-read.ru.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ru-en.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/categories.ru.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/government-free-software.ru-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/government-free-software.ru.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/nonfree-games.ru-en.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/nonfree-games.ru.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/right-to-read.ru-en.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/right-to-read.ru.po?cvsroot=www&r1=1.16&r2=1.17
Patches:
Index: licenses/gpl-faq.ru.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.ru.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- licenses/gpl-faq.ru.html 16 Sep 2012 09:19:20 -0000 1.17
+++ licenses/gpl-faq.ru.html 21 Sep 2012 08:28:19 -0000 1.18
@@ -2755,11 +2755,16 @@
бÑÑÑ Ð»Ð¸ÑензиÑован по GPL. GPLv3 можно
пÑименÑÑÑ Ñакже Ð´Ð»Ñ Ð»Ð¸ÑензиÑованиÑ
маÑеÑиалов, на коÑоÑÑе ÑаÑпÑоÑÑÑанÑÑÑÑÑ
дÑÑгие ÑÑ
однÑе Ñ Ð°Ð²ÑоÑÑким пÑавом
законÑ, Ñакие, как ÑÐ¾Ð¿Ð¾Ð»Ð¾Ð³Ð¸Ñ Ð¸Ð½ÑегÑалÑнÑÑ
ÑÑ
ем. Таким обÑазом, напÑимеÑ, вÑ
-можеÑе вÑпÑÑÑиÑÑ ÑеÑÑежи аппаÑаÑÑÑÑ Ð½Ð°
ÑÑловиÑÑ
GPL. Ðднако еÑли кÑо-Ñо
-воÑполÑзовалÑÑ ÑÑими ÑведениÑми длÑ
ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑизиÑеÑкой аппаÑаÑÑÑÑ, Ñо на
-ниÑ
не бÑÐ´ÐµÑ Ð²Ð¾Ð·Ð»Ð°Ð³Ð°ÑÑÑÑ Ð½Ð¸ÐºÐ°ÐºÐ¸Ñ
лиÑензионнÑÑ
обÑзаÑелÑÑÑв пÑи
-ÑаÑпÑоÑÑÑанении или пÑодаже ÑÑого
ÑÑÑÑойÑÑва: ÑÑо не вÑ
Ð¾Ð´Ð¸Ñ Ð² ÑÑеÑÑ Ð´ÐµÐ¹ÑÑвиÑ
-авÑоÑÑкого пÑава и, ÑледоваÑелÑно, Ñамой
GPL.</p></dd>
+можеÑе вÑпÑÑÑиÑÑ ÑеÑÑежи ÑизиÑеÑкого
обÑекÑа или ÑлекÑÑиÑеÑкой ÑÑ
ÐµÐ¼Ñ Ð½Ð°
+ÑÑловиÑÑ
GPL.</p>
+
+<p>Ðо многиÑ
ÑиÑÑаÑиÑÑ
авÑоÑÑкое пÑаво не
ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð½Ð° изгоÑовление
+ÑизиÑеÑкой аппаÑаÑÑÑÑ Ð¿Ð¾ ÑеÑÑежÑ. Ð ÑÑиÑ
ÑлÑÑаÑÑ
ваÑа лиÑÐµÐ½Ð·Ð¸Ñ Ð½Ð° ÑеÑÑеж
+пÑоÑÑо никоим обÑазом не можеÑ
конÑÑолиÑоваÑÑ Ð¸Ð·Ð³Ð¾Ñовление или пÑодажÑ
+ÑизиÑеÑкой аппаÑаÑÑÑÑ, незавиÑимо Ð¾Ñ Ñого,
какой лиÑензией вÑ
+полÑзÑеÑеÑÑ. Ðогда же авÑоÑÑкое пÑаво
ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð½Ð° изгоÑовление
+аппаÑаÑÑÑÑ (напÑимеÑ, в ÑлÑÑае Ñ
Ñопологией инÑегÑалÑнÑÑ
ÑÑ
ем), GPL можеÑ
+бÑÑÑ Ð¿Ð¾Ð»ÐµÐ·Ð½Ð°.</p></dd>
<dt id="GiveUpKeys">Я полÑзÑÑÑÑ ÑиÑÑованием Ñ
оÑкÑÑÑÑм клÑÑом Ð´Ð»Ñ Ñого, ÑÑобÑ
подпиÑÑваÑÑ Ñвои
@@ -3538,7 +3543,7 @@
<!-- timestamp start -->
Ðбновлено:
-$Date: 2012/09/16 09:19:20 $
+$Date: 2012/09/21 08:28:19 $
<!-- timestamp end -->
</p>
Index: licenses/po/gpl-faq.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru-en.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- licenses/po/gpl-faq.ru-en.html 16 Sep 2012 09:20:33 -0000 1.15
+++ licenses/po/gpl-faq.ru-en.html 21 Sep 2012 08:28:37 -0000 1.16
@@ -2826,11 +2826,15 @@
Any material that can be copyrighted can be licensed under the GPL.
GPLv3 can also be used to license materials covered by other
copyright-like laws, such as semiconductor masks. So, as an example,
-you can release a drawing of a hardware design under the GPL.
-However, if someone used that information to create physical hardware,
-they would have no license obligations when distributing or selling
-that device: it falls outside the scope of copyright and thus the GPL
-itself.</p></dd>
+you can release a drawing of a physical object or circuit under the
+GPL.</p>
+
+<p>In many situations, copyright does not cover making physical
+hardware from a drawing. In these situations, your license for the
+drawing simply can't exert any control over making or selling physical
+hardware, regardless of the license you use. When copyright does
+cover making hardware, for instance with IC masks, the GPL handles
+that case in a useful way.</p></dd>
<dt id="GiveUpKeys">I use public key cryptography to sign my code to
@@ -3574,7 +3578,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2012/09/16 09:20:33 $
+$Date: 2012/09/21 08:28:37 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/gpl-faq.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- licenses/po/gpl-faq.ru.po 21 Sep 2012 05:17:11 -0000 1.24
+++ licenses/po/gpl-faq.ru.po 21 Sep 2012 08:28:37 -0000 1.25
@@ -19,7 +19,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-09-20 12:26-0300\n"
#. type: Content of: <title>
msgid ""
@@ -5869,22 +5868,6 @@
"\"anchor-reference-id\">(<a href=\"#GPLHardware\" >#GPLHardware</a>)</span>"
#. type: Content of: <dl><dd><p>
-# | Any material that can be copyrighted can be licensed under the GPL. GPLv3
-# | can also be used to license materials covered by other copyright-like
-# | laws, such as semiconductor masks. So, as an example, you can release a
-# | drawing of a [-hardware design under the GPL. However, if someone used
-# | that information to create-] physical [-hardware, they would have no
-# | license obligations when distributing-] {+object+} or [-selling that
-# | device: it falls outside the scope of copyright and thus-] {+circuit
-# | under+} the [-GPL itself.-] {+GPL.+}
-#| msgid ""
-#| "Any material that can be copyrighted can be licensed under the GPL. "
-#| "GPLv3 can also be used to license materials covered by other copyright-"
-#| "like laws, such as semiconductor masks. So, as an example, you can "
-#| "release a drawing of a hardware design under the GPL. However, if "
-#| "someone used that information to create physical hardware, they would "
-#| "have no license obligations when distributing or selling that device: it "
-#| "falls outside the scope of copyright and thus the GPL itself."
msgid ""
"Any material that can be copyrighted can be licensed under the GPL. GPLv3 "
"can also be used to license materials covered by other copyright-like laws, "
Index: philosophy/categories.ru.html
===================================================================
RCS file: /web/www/www/philosophy/categories.ru.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- philosophy/categories.ru.html 16 Sep 2012 09:23:12 -0000 1.21
+++ philosophy/categories.ru.html 21 Sep 2012 08:28:50 -0000 1.22
@@ -3,7 +3,7 @@
<!-- This file is automatically generated by GNUnited Nations! -->
<title>ÐаÑегоÑии ÑвободнÑÑ
и неÑвободнÑÑ
пÑогÑамм - пÑÐ¾ÐµÐºÑ GNU - Фонд Ñвободного
-пÑогÑаммного обеÑпеÑÐµÐ½Ð¸Ñ (ФСÐÐ)</title>
+пÑогÑаммного обеÑпеÑениÑ</title>
<!--#include virtual="/server/banner.ru.html" -->
<!--#include virtual="/philosophy/po/categories.translist" -->
@@ -18,7 +18,7 @@
</p>
<p>ÐÑа диагÑамма иллÑÑÑÑиÑÑÐµÑ Ð¾ÑноÑение
ÑазлиÑнÑÑ
каÑегоÑий пÑогÑамм дÑÑг к
-дÑÑгÑ. Ðе пеÑвонаÑалÑнÑй авÑÐ¾Ñ —
Чао-ÐÑей; впоÑледÑÑвии ее
+дÑÑгÑ. Ðе пеÑвонаÑалÑнÑй авÑÐ¾Ñ —
Чао-ÐÑÑй; впоÑледÑÑвии ее
обновлÑло еÑе неÑколÑко Ñеловек.
ÐиагÑÐ°Ð¼Ð¼Ñ Ð¼Ð¾Ð¶Ð½Ð¾ полÑÑиÑÑ Ñакже в ÑоÑмаÑе <a
href="/philosophy/category.ru.svg">SVG</a> и на ÑÑловиÑÑ
(по
ваÑÐµÐ¼Ñ Ð²ÑбоÑÑ)
GNU GPL v2 или более поздней, GNU FDL v1.2 или более
поздней, либо Creative
@@ -332,14 +332,19 @@
полÑзоваÑÐµÐ»Ñ (как пÑавило, оÑганизаÑии или
пÑедпÑиÑÑиÑ). ÐÑÐ¾Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ
Ñ
ÑÐ°Ð½Ð¸Ñ Ð¸Ñ
и полÑзÑеÑÑÑ Ð¸Ð¼Ð¸, не пÑбликÑÑ Ð¸Ñ
ни в виде иÑÑ
одного ÑекÑÑа, ни в
виде двоиÑнÑÑ
Ñайлов.</p>
- <p>ÐÐ°ÐºÐ°Ð·Ð½Ð°Ñ Ð¿ÑогÑамма Ñвободна в
ÑÑивиалÑном ÑмÑÑле, еÑли Ñ ÐµÐµ единÑÑвенного
-полÑзоваÑÐµÐ»Ñ ÐµÑÑÑ Ð²Ñе пÑава на нее.</p>
- <p>ÐообÑе говоÑÑ, Ð¼Ñ Ð½Ðµ дÑмаем, ÑÑо
ÑазÑабоÑаÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð¸ не пÑбликоваÑÑ ÐµÐµ
-дÑÑно. ÐÑваÑÑ ÑлÑÑаи, когда пÑогÑамма
наÑÑолÑко полезна, ÑÑо не пÑбликоваÑÑ
-ее неÑпÑаведливо по оÑноÑÐµÐ½Ð¸Ñ Ðº
ÑеловеÑеÑÑвÑ. Ðднако болÑÑинÑÑво пÑогÑамм
не
-наÑÑолÑко важнÑ, Ñак ÑÑо Ð¾Ñ Ñого, ÑÑо иÑ
не
вÑпÑÑÑÑÑ, оÑобого вÑеда не
-бÑдеÑ. Таким обÑазом, Ð¼ÐµÐ¶Ð´Ñ ÑазÑабоÑкой
пÑогÑамм на заказ и пÑинÑипами
-Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð·Ð° Ñвободное пÑогÑаммное
обеÑпеÑение пÑоÑивоÑеÑÐ¸Ñ Ð½ÐµÑ.</p>
+ <p>ÐÐ°ÐºÐ°Ð·Ð½Ð°Ñ Ð¿ÑогÑамма Ñвободна (в
некоем ÑÑивиалÑном ÑмÑÑле), еÑли Ñ ÐµÐµ
+единÑÑвенного полÑзоваÑÐµÐ»Ñ ÐµÑÑÑ ÑеÑÑÑе
ÑвободÑ. Ð ÑаÑÑноÑÑи, еÑли Ñ
+полÑзоваÑÐµÐ»Ñ ÐµÑÑÑ Ð²Ñе пÑава на заказнÑÑ
пÑогÑаммÑ, Ñо пÑогÑамма
+Ñвободна. Ðднако еÑли полÑзоваÑелÑ
ÑаÑпÑоÑÑÑанÑÐµÑ ÐºÐ¾Ð¿Ð¸Ð¸ ÑÑеди дÑÑгиÑ
и не
+пÑедоÑÑавлÑÐµÑ ÑеÑÑÑеÑ
Ñвобод вмеÑÑе Ñ
ÑÑими копиÑми, Ñо ÑÑи копии не
+ÑвлÑÑÑÑÑ ÑвободнÑми пÑогÑаммами.</p>
+ <p>Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿ÑогÑамма подÑазÑмеваеÑ
ÑвободÑ, а не доÑÑÑп. ÐообÑе говоÑÑ, Ð¼Ñ Ð½Ðµ
+дÑмаем, ÑÑо ÑазÑабоÑаÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð¸ не
пÑбликоваÑÑ ÐµÐµ дÑÑно. ÐÑваÑÑ ÑлÑÑаи,
+когда пÑогÑамма наÑÑолÑко полезна, ÑÑо не
пÑбликоваÑÑ ÐµÐµ неÑеÑÑно по
+оÑноÑÐµÐ½Ð¸Ñ Ðº ÑеловеÑеÑÑвÑ. Ðднако
болÑÑинÑÑво пÑогÑамм не наÑÑолÑко важнÑ,
+Ñак ÑÑо Ð¾Ñ Ñого, ÑÑо иÑ
не вÑпÑÑÑÑÑ, оÑобого
вÑеда не бÑдеÑ. Таким обÑазом,
+Ð¼ÐµÐ¶Ð´Ñ ÑазÑабоÑкой пÑогÑамм на заказ и
пÑинÑипами Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð·Ð° Ñвободное
+пÑогÑаммное обеÑпеÑение пÑоÑивоÑеÑиÑ
неÑ.</p>
<p>ÐоÑÑи вÑе пÑогÑаммиÑÑÑ Ð·Ð°Ð½ÑÑÑ Ð²
ÑазÑабоÑке заказнÑÑ
пÑогÑамм;
ÑледоваÑелÑно,
болÑÑÐ°Ñ ÑаÑÑÑ ÑабоÑÑ Ð¿Ð¾ пÑогÑаммиÑованиÑ
пÑоизводиÑÑÑ Ð¸Ð»Ð¸ могла бÑ
пÑоизводиÑÑÑÑ ÑовмеÑÑимÑм Ñ Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸ÐµÐ¼ за
Ñвободное пÑогÑаммное обеÑпеÑение
@@ -347,13 +352,12 @@
<h3 id="commercialSoftware">ÐоммеÑÑеÑкие пÑогÑаммÑ</h3>
- <p>ÐоммеÑÑеÑÐºÐ°Ñ Ð¿ÑогÑамма — ÑÑо
пÑогÑамма, ÑазÑабаÑÑваемаÑ
-пÑедпÑиÑÑием Ñ ÑелÑÑ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð¿ÑибÑли оÑ
иÑполÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÑой
-пÑогÑаммÑ. “ÐоммеÑÑеÑкає и
-“неÑвободнає — не одно и Ñо же!
ÐолÑÑинÑÑво
-коммеÑÑеÑкиÑ
пÑогÑамм — <a
-href="#ProprietarySoftware">неÑвободнÑе</a>, но
ÑÑÑеÑÑвÑÑÑ ÐºÐ°Ðº ÑвободнÑе
-коммеÑÑеÑкие пÑогÑаммÑ, Ñак и неÑвободнÑе
некоммеÑÑеÑкие пÑогÑаммÑ.</p>
+ <p> “ÐоммеÑÑеÑкає и
“неÑвободнає — не одно
+и Ñо же! ÐоммеÑÑеÑÐºÐ°Ñ Ð¿ÑогÑамма — ÑÑо
пÑогÑамма, ÑазÑабаÑÑваемаÑ
+пÑедпÑиÑÑием в пÑоÑеÑÑе Ñвоей
коммеÑÑеÑкой деÑÑелÑноÑÑи. ÐолÑÑинÑÑво
+коммеÑÑеÑкиÑ
пÑогÑамм — <a
href="#ProprietarySoftware">
+неÑвободнÑе</a>, но ÑÑÑеÑÑвÑÑÑ ÐºÐ°Ðº
ÑвободнÑе коммеÑÑеÑкие пÑогÑаммÑ, Ñак и
+неÑвободнÑе некоммеÑÑеÑкие пÑогÑаммÑ.</p>
<p>ÐапÑимеÑ, компилÑÑÐ¾Ñ GNU Ada
ÑазÑабаÑÑваеÑÑÑ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸ÐµÐ¹. Ðн вÑегда
ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð½Ð° ÑÑловиÑÑ
GNU GPL, и
ÐºÐ°Ð¶Ð´Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ ÐµÐ³Ð¾ ÑвлÑеÑÑÑ Ñвободной
@@ -362,8 +366,8 @@
“ÐÑ ÑÑвÑÑвовали Ð±Ñ ÑÐµÐ±Ñ ÑвеÑеннее Ñ
коммеÑÑеÑким
компилÑÑоÑом”. ÐÑодавÑÑ Ð¾ÑвеÑаÑÑ: “GNU
Ada и еÑÑÑ ÐºÐ¾Ð¼Ð¼ÐµÑÑеÑкий
компилÑÑоÑ; он Ñакже ÑвлÑеÑÑÑ Ñвободной
пÑогÑаммой”.</p>
- <p>ÐÐ»Ñ Ð¿ÑоекÑа GNU ÑдаÑениÑ
ÑаÑÑÑавлÑÑÑÑÑ Ð² дÑÑгом поÑÑдке: важно Ñо,
ÑÑо GNU
-Ada — ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿ÑогÑамма;
коммеÑÑеÑÐºÐ°Ñ Ð¾Ð½Ð° или Ð½ÐµÑ —
+ <p>ÐÐ»Ñ Ð¿ÑоекÑа GNU пÑиоÑиÑеÑÑ ÑÑоÑÑ Ð²
дÑÑгом поÑÑдке: важно Ñо, ÑÑо GNU
+Ada — ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿ÑогÑамма; Ñо, ÑÑо она
коммеÑÑеÑÐºÐ°Ñ —
вÑоÑоÑÑÐµÐ¿ÐµÐ½Ð½Ð°Ñ Ð¿Ð¾Ð´ÑобноÑÑÑ. Ðднако
дополниÑелÑное ÑазвиÑие компилÑÑоÑа GNU
Ada благодаÑÑ ÑомÑ, ÑÑо он ÑвлÑеÑÑÑ
коммеÑÑеÑкой пÑогÑаммой, безÑÑловно,
полезно.</p>
@@ -428,7 +432,7 @@
<!-- timestamp start -->
Ðбновлено:
-$Date: 2012/09/16 09:23:12 $
+$Date: 2012/09/21 08:28:50 $
<!-- timestamp end -->
</p>
Index: philosophy/government-free-software.ru.html
===================================================================
RCS file: /web/www/www/philosophy/government-free-software.ru.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/government-free-software.ru.html 16 Sep 2012 09:23:24 -0000
1.6
+++ philosophy/government-free-software.ru.html 21 Sep 2012 08:28:50 -0000
1.7
@@ -69,11 +69,12 @@
<li><p>ÐÑÑкий Ñаз, когда гоÑÑдаÑÑÑвенное
ÑÑÑеждение пеÑÐµÐ´Ð°ÐµÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð² обÑее
полÑзование, в Ñом ÑиÑле пÑогÑаммÑ,
вклÑÑаемÑе в ÑÑÑаниÑÑ ÐµÐ³Ð¾ ÑайÑов или
ÑказаннÑе на ниÑ
, ÑÑи пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ
ÑаÑпÑоÑÑÑанÑÑÑÑÑ ÐºÐ°Ðº ÑвободнÑе и
-Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ ÑабоÑоÑпоÑÐ¾Ð±Ð½Ñ Ð² Ñвободной на
100% ÑÑеде.</p></li>
+Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ ÑабоÑоÑпоÑÐ¾Ð±Ð½Ñ Ð½Ð° плаÑÑоÑме,
ÑодеÑжаÑей иÑклÑÑиÑелÑно ÑвободнÑе
+пÑогÑаммÑ.</p></li>
-<li><p>СайÑÑ Ð¸ ÑеÑвеÑÑ Ð³Ð¾ÑÑдаÑÑÑвеннÑÑ
ÑÑÑеждений Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¾ÑÐ³Ð°Ð½Ð¸Ð·Ð¾Ð²Ð°Ð½Ñ Ñак,
-ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð»Ð½Ð¾ÑÑÑÑ ÑÑнкÑиониÑоваÑÑ Ð²
ÑоÑеÑании Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑеÑами полÑзоваÑелей,
-ÑÑеда на коÑоÑÑÑ
Ñвободна на 100%.</p></li>
+<li><p>СайÑÑ Ð¸ ÑеÑевÑе ÑлÑÐ¶Ð±Ñ Ð³Ð¾ÑÑдаÑÑÑвеннÑÑ
ÑÑÑеждений Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð¾ÑганизованÑ
+Ñак, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð»ÑзоваÑели могли ими
полÑзоваÑÑÑÑ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ Ð¸ÑклÑÑиÑелÑно
+ÑвободнÑÑ
пÑогÑамм, не иÑпÑÑÑÐ²Ð°Ñ Ð¾Ñ ÑÑого
какиÑ
-либо недоÑÑаÑков.</p></li>
<li><p>ÐоÑÑдаÑÑÑвеннÑе ÑÑÑÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ
пÑименÑÑÑ ÑолÑко Ñе ÑоÑмаÑÑ Ñайлов и
пÑоÑÐ¾ÐºÐ¾Ð»Ñ ÑвÑзи, коÑоÑÑе Ñ
оÑоÑо
поддеÑживаÑÑÑÑ ÑвободнÑми пÑогÑаммами,
@@ -214,7 +215,7 @@
<!-- timestamp start -->
Ðбновлено:
-$Date: 2012/09/16 09:23:24 $
+$Date: 2012/09/21 08:28:50 $
<!-- timestamp end -->
</p>
Index: philosophy/nonfree-games.ru.html
===================================================================
RCS file: /web/www/www/philosophy/nonfree-games.ru.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/nonfree-games.ru.html 16 Sep 2012 09:23:33 -0000 1.8
+++ philosophy/nonfree-games.ru.html 21 Sep 2012 08:28:50 -0000 1.9
@@ -24,11 +24,19 @@
Ñом, ÑÑÐ¾Ð±Ñ Ð¿ÑинеÑÑи полÑзоваÑелÑм ÑвободÑ.
Таким обÑазом, вопÑÐ¾Ñ Ð² Ñом, как
ÑÑа пеÑемена влиÑÐµÑ Ð½Ð° ÑвободÑ
полÑзоваÑелей.</p>
+<p>ÐÑоблема Ñ ÑÑими игÑами не в Ñом, ÑÑо <a
+href="/philosophy/words-to-avoid.html"> они коммеÑÑеÑкие</a>
(Ð¼Ñ Ð½Ðµ видим в
+ÑÑом ниÑего плоÑ
ого). Ðна не в Ñом, ÑÑо <a
href="/philosophy/selling.html">
+ÑазÑабоÑÑики пÑодаÑÑ ÐºÐ¾Ð¿Ð¸Ð¸</a>; ÑÑо Ñоже не
плоÑ
о. ÐÑоблема в Ñом, ÑÑо игÑÑ
+ÑодеÑÐ¶Ð°Ñ Ð¿ÑогÑаммÑ, коÑоÑÑе <a
href="/philosophy/free-sw.html"> не
+ÑвободнÑ</a> (в ÑмÑÑле ÑвободÑ, конеÑно).</p>
+
<p>ÐеÑвободнÑе пÑогÑаммÑ-игÑÑ (как и дÑÑгие
неÑвободнÑе пÑогÑаммÑ) неÑÑиÑнÑ,
поÑÐ¾Ð¼Ñ ÑÑо они оÑказÑваÑÑ Ñвоим
полÑзоваÑелÑм в Ñвободе. (Ð¥ÑдожеÑÑвенное
ÑопÑовождение Ð¸Ð³Ñ — ÑÑо дÑÑгой
вопÑоÑ, поÑÐ¾Ð¼Ñ ÑÑо ÑÑо не
пÑогÑаммÑ.) ÐÑли Ð²Ñ Ñ
оÑиÑе ÑвободÑ, Ñо
одним из ÑÑловий ÑвлÑеÑÑÑ Ð¾ÑÑÑÑÑÑвие
-неÑвободнÑÑ
пÑогÑамм на ваÑем компÑÑÑеÑе.
Ðо ÑиÑ
Ð¿Ð¾Ñ Ð²Ñе ÑÑно.</p>
+неÑвободнÑÑ
пÑогÑамм на ваÑем
компÑÑÑеÑе — как ÑÑÑановленнÑÑ
, Ñак
+и вÑполнÑÑÑиÑ
ÑÑ. Ðо ÑиÑ
Ð¿Ð¾Ñ Ð²Ñе ÑÑно.</p>
<p>Ðднако еÑли Ð²Ñ ÑобиÑаеÑеÑÑ Ð¿Ð¾Ð»ÑзоваÑÑÑÑ
ÑÑими игÑами, вам лÑÑÑе делаÑÑ ÑÑо
на GNU/Linux, а не на Microsoft Windows. ÐÑ Ñ
оÑÑ Ð±Ñ
избежиÑе <a
@@ -48,11 +56,29 @@
диÑÑÑибÑÑиваÑ
GNU/Linux</a> Ñже ÑабоÑаÑÑ Ð¿ÑоÑив
Ñелей ÑвободÑ. Ðобавление
ÑÑиÑ
Ð¸Ð³Ñ Ð² диÑÑÑибÑÑив ÑÑÐ¸Ð»Ð¸Ñ ÑÑоÑ
ÑÑÑекÑ.</p>
-<p>ÐÑли Ð²Ñ Ñ
оÑиÑе ÑодейÑÑвоваÑÑ Ñвободе,
позабоÑÑÑеÑÑ, пожалÑйÑÑа, о Ñом, ÑÑобÑ
-не говоÑиÑÑ Ð¾ доÑÑÑпноÑÑи ÑÑиÑ
Ð¸Ð³Ñ Ð¿Ð¾Ð´
GNU/Linux как о поддеÑжке наÑего
-дела. ÐмеÑÑо ÑÑого Ð²Ñ Ð¼Ð¾Ð³Ð»Ð¸ бÑ
ÑаÑÑказÑваÑÑ Ð»ÑдÑм о ÑоÑевнованиÑÑ
по
-ÑвободнÑм игÑам на <a href="http://lpc.opengameart.org/">
ÐÑбок
-оÑвобожденного пикÑела</a>, <a
+<p>Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿ÑогÑамма подÑазÑмеваеÑ
ÑвободÑ, а не ÑÑоимоÑÑÑ. Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¸Ð³Ñа не
+обÑзаÑелÑно должна бÑÑÑ Ð±ÐµÑплаÑной. ÐÑÑÑ
ÑеалÑÐ½Ð°Ñ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ ÑазÑабаÑÑваÑÑ
+ÑвободнÑе игÑÑ Ð½Ð° коммеÑÑеÑкой оÑнове,
ÑÐ²Ð°Ð¶Ð°Ñ Ð² Ñо же вÑÐµÐ¼Ñ Ð²Ð°ÑÑ ÑвободÑ
+изменÑÑÑ Ð¿ÑогÑаммÑ, коÑоÑÑми вÑ
полÑзÑеÑеÑÑ. ÐоÑколÑÐºÑ Ð³ÑаÑика и мÑзÑка в
+игÑе не ÑвлÑÑÑÑÑ Ð¿ÑогÑаммами, они не
обÑзаÑелÑно Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ ÑвободнÑ. Ðа
+Ñамом деле еÑÑÑ ÑвободнÑе пÑогÑаммÑ-игÑÑ,
ÑазÑабаÑÑваемÑе компаниÑми, ÑоÑно
+Ñак же, как ÑвободнÑе игÑÑ,
ÑазÑабаÑÑваемÑе добÑоволÑÑами на
некоммеÑÑеÑкой
+оÑнове. РазÑабоÑка, ÑинанÑиÑÑемаÑ
добÑоволÑнÑми взноÑами, ÑÑÐ°Ð½ÐµÑ ÑолÑко
+легÑе.</p>
+
+<p>Ðо еÑли Ð¼Ñ Ð¿Ñедположим, ÑÑо
ÑазÑабаÑÑваÑÑ ÐºÐ°ÐºÐ¾Ð³Ð¾-Ñо Ñода ÑвободнÑÑ
игÑÑ
+<em>невозможно</em> — ÑÑо Ð±Ñ Ð¸Ð· ÑÑого
Ñледовало? ÐÐµÑ Ð½Ð¸Ñего
+Ñ
оÑоÑего в Ñом, ÑÑÐ¾Ð±Ñ Ð¿Ð¸ÑаÑÑ ÐµÐµ как
неÑвободнÑÑ Ð¸Ð³ÑÑ. ЧÑÐ¾Ð±Ñ Ñ Ð²Ð°Ñ Ð±Ñла
+Ñвобода в ÑобÑÑвеннÑÑ
вÑÑиÑлениÑÑ
, необÑ
одимо оÑказаÑÑÑÑ Ð¾Ñ Ð½ÐµÑвободнÑÑ
+пÑогÑамм — ÑÑо пÑоÑÑо и ÑÑно.
СледоваÑелÑно, Ð²Ñ ÐºÐ°Ðº лиÑноÑÑÑ,
+лÑбÑÑÐ°Ñ ÑвободÑ, не бÑдеÑе полÑзоваÑÑÑÑ
неÑвободной пÑогÑаммой, еÑли она
+бÑÐ´ÐµÑ ÑÑÑеÑÑвоваÑÑ, Ñак ÑÑо Ð²Ñ Ð½Ð¸Ñего не
поÑеÑÑеÑе, еÑли ее не бÑдеÑ.</p>
+
+<p>ÐÑли Ð²Ñ Ñ
оÑиÑе ÑодейÑÑвоваÑÑ Ð´ÐµÐ»Ñ
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð² облаÑÑи вÑÑиÑлений,
+позабоÑÑÑеÑÑ, пожалÑйÑÑа, о Ñом, ÑÑÐ¾Ð±Ñ Ð½Ðµ
говоÑиÑÑ Ð¾ доÑÑÑпноÑÑи ÑÑиÑ
игÑ
+под GNU/Linux как о поддеÑжке наÑего дела.
ÐмеÑÑо ÑÑого Ð²Ñ Ð¼Ð¾Ð³Ð»Ð¸ бÑ
+ÑаÑÑказÑваÑÑ Ð»ÑдÑм о ÑоÑевнованиÑÑ
по
ÑвободнÑм игÑам на <a
+href="http://lpc.opengameart.org/"> ÐÑбок оÑвобожденного
пикÑела</a>, <a
href="http://forum.freegamedev.net/index.php"> ФоÑÑме
ÑазÑабоÑÑиков
ÑвободнÑÑ
игÑ</a> и веÑеÑе ÑвободнÑÑ
Ð¸Ð³Ñ <a
href="http://libreplanet.org/wiki/Group:LibrePlanet_Gaming_Collective">
@@ -130,7 +156,7 @@
<p><!-- timestamp start -->
Ðбновлено:
-$Date: 2012/09/16 09:23:33 $
+$Date: 2012/09/21 08:28:50 $
<!-- timestamp end -->
</p>
Index: philosophy/right-to-read.ru.html
===================================================================
RCS file: /web/www/www/philosophy/right-to-read.ru.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/right-to-read.ru.html 16 Sep 2012 09:23:43 -0000 1.11
+++ philosophy/right-to-read.ru.html 21 Sep 2012 08:28:51 -0000 1.12
@@ -340,7 +340,7 @@
“УайеÑед”, ÑнваÑÑ 1996.</li>
<li><a
-href="http://www.law.duke.edu/boylesite/sold_out.htm">Ð
аÑпÑодано</a>. ÐжеймÑ
+href="http://www.law.duke.edu/boylesite/Sold_out.htm">Ð
аÑпÑодано</a>. ÐжеймÑ
ÐойлÑ, “ÐÑÑ-ÐоÑк Ñаймє 31 маÑÑа
1996 года.</li>
<li><a
@@ -423,7 +423,7 @@
<!-- timestamp start -->
Ðбновлено:
-$Date: 2012/09/16 09:23:43 $
+$Date: 2012/09/21 08:28:51 $
<!-- 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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/po/categories.ru-en.html 16 Sep 2012 09:24:32 -0000 1.11
+++ philosophy/po/categories.ru-en.html 21 Sep 2012 08:29:06 -0000 1.12
@@ -344,11 +344,16 @@
(typically an organization or company). That user keeps it and uses
it, and does not release it to the public either as source code or
as binaries.</p>
- <p>A private program is free software in a trivial sense if its
- sole user has full rights to it.</p>
- <p>In general we do not believe it is wrong to develop a program
+ <p>A private program is free software (in a somewhat trivial
+ sense) if its sole user has the four freedoms. In particular,
+ if the user has full rights to the private program, the program is
+ free. However, if the user distributes copies to others and does
+ not provide the four freedoms with those copies, those copies
+ are not free software.</p>
+ <p>Free software is a matter of freedom, not access.
+ In general we do not believe it is wrong to develop a program
and not release it. There are occasions when a program is so useful
- that withholding it from release is treating humanity badly.
+ that withholding it from release is doing wrong to humanity.
However, most programs are not that important, so not releasing them
is not particularly harmful. Thus, there is no conflict between the
development of private or custom software and the principles of the
@@ -359,11 +364,9 @@
<h3 id="commercialSoftware">Commercial software</h3>
- <p>Commercial software is software being developed by a
- business which aims to make money from the use of the
- software. “Commercial” and
- “proprietary” are not the same thing! Most
- commercial software
+ <p> “Commercial” and “proprietary” are
+ not the same! Commercial software is software developed by a
+ business as part of its business. Most commercial software
is <a href="#ProprietarySoftware">proprietary</a>, but there
is commercial free software, and there is noncommercial
nonfree software.</p>
@@ -376,8 +379,8 @@
compiler.” The salesmen reply, “GNU
Ada <em>is</em> a commercial compiler; it happens to be free
software.”</p>
- <p>For the GNU Project, the emphasis is in the other order:
- the important thing is that GNU Ada is free software; whether
+ <p>For the GNU Project, the priorities are in the other order:
+ the important thing is that GNU Ada is free software; that
it is commercial is just a detail. However, the additional
development of GNU Ada that results from its being commercial
is definitely beneficial.</p>
@@ -424,7 +427,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2012/09/16 09:24:32 $
+$Date: 2012/09/21 08:29:06 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/categories.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/categories.ru.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/po/categories.ru.po 21 Sep 2012 05:17:36 -0000 1.16
+++ philosophy/po/categories.ru.po 21 Sep 2012 08:29:09 -0000 1.17
@@ -16,7 +16,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-09-20 12:26-0300\n"
# type: Content of: <title>
#. type: Content of: <title>
@@ -803,27 +802,12 @@
"ÐÐ°ÐºÐ°Ð·Ð½Ð°Ñ Ð¿ÑогÑамма Ñвободна (в некоем
ÑÑивиалÑном ÑмÑÑле), еÑли Ñ ÐµÐµ "
"единÑÑвенного полÑзоваÑÐµÐ»Ñ ÐµÑÑÑ ÑеÑÑÑе
ÑвободÑ. Ð ÑаÑÑноÑÑи, еÑли Ñ "
"полÑзоваÑÐµÐ»Ñ ÐµÑÑÑ Ð²Ñе пÑава на заказнÑÑ
пÑогÑаммÑ, Ñо пÑогÑамма Ñвободна. "
-"Ðднако еÑли полÑзоваÑÐµÐ»Ñ ÑаÑпÑоÑÑÑанÑеÑ
копии ÑÑеди дÑÑгиÑ
и не пÑедоÑÑавлÑÐµÑ "
-"ÑеÑÑÑеÑ
Ñвобод вмеÑÑе Ñ ÑÑими копиÑми, Ñо
ÑÑи копии не ÑвлÑÑÑÑÑ ÑвободнÑми "
-"пÑогÑаммами."
+"Ðднако еÑли полÑзоваÑÐµÐ»Ñ ÑаÑпÑоÑÑÑанÑеÑ
копии ÑÑеди дÑÑгиÑ
и не "
+"пÑедоÑÑавлÑÐµÑ ÑеÑÑÑеÑ
Ñвобод вмеÑÑе Ñ
ÑÑими копиÑми, Ñо ÑÑи копии не "
+"ÑвлÑÑÑÑÑ ÑвободнÑми пÑогÑаммами."
# type: Content of: <p>
#. type: Content of: <p>
-# | {+Free software is a matter of freedom, not access.+} In general we do
-# | not believe it is wrong to develop a program and not release it. There are
-# | occasions when a program is so useful that withholding it from release is
-# | [-treating humanity badly.-] {+doing wrong to humanity.+} However, most
-# | programs are not that important, so not releasing them is not particularly
-# | harmful. Thus, there is no conflict between the development of private or
-# | custom software and the principles of the free software movement.
-#| msgid ""
-#| "In general we do not believe it is wrong to develop a program and not "
-#| "release it. There are occasions when a program is so useful that "
-#| "withholding it from release is treating humanity badly. However, most "
-#| "programs are not that important, so not releasing them is not "
-#| "particularly harmful. Thus, there is no conflict between the development "
-#| "of private or custom software and the principles of the free software "
-#| "movement."
msgid ""
"Free software is a matter of freedom, not access. In general we do not "
"believe it is wrong to develop a program and not release it. There are "
@@ -833,13 +817,13 @@
"between the development of private or custom software and the principles of "
"the free software movement."
msgstr ""
-"Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿ÑогÑамма подÑазÑмеваеÑ
ÑвободÑ, а не доÑÑÑп. "
-"ÐообÑе говоÑÑ, Ð¼Ñ Ð½Ðµ дÑмаем, ÑÑо
ÑазÑабоÑаÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð¸ не пÑбликоваÑÑ ÐµÐµ "
-"дÑÑно. ÐÑваÑÑ ÑлÑÑаи, когда пÑогÑамма
наÑÑолÑко полезна, ÑÑо не пÑбликоваÑÑ "
-"ее неÑеÑÑно по оÑноÑÐµÐ½Ð¸Ñ Ðº ÑеловеÑеÑÑвÑ.
Ðднако болÑÑинÑÑво пÑогÑамм не "
-"наÑÑолÑко важнÑ, Ñак ÑÑо Ð¾Ñ Ñого, ÑÑо иÑ
не
вÑпÑÑÑÑÑ, оÑобого вÑеда не "
-"бÑдеÑ. Таким обÑазом, Ð¼ÐµÐ¶Ð´Ñ ÑазÑабоÑкой
пÑогÑамм на заказ и пÑинÑипами "
-"Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð·Ð° Ñвободное пÑогÑаммное
обеÑпеÑение пÑоÑивоÑеÑÐ¸Ñ Ð½ÐµÑ."
+"Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿ÑогÑамма подÑазÑмеваеÑ
ÑвободÑ, а не доÑÑÑп. ÐообÑе говоÑÑ, Ð¼Ñ Ð½Ðµ "
+"дÑмаем, ÑÑо ÑазÑабоÑаÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð¸ не
пÑбликоваÑÑ ÐµÐµ дÑÑно. ÐÑваÑÑ ÑлÑÑаи, "
+"когда пÑогÑамма наÑÑолÑко полезна, ÑÑо не
пÑбликоваÑÑ ÐµÐµ неÑеÑÑно по "
+"оÑноÑÐµÐ½Ð¸Ñ Ðº ÑеловеÑеÑÑвÑ. Ðднако
болÑÑинÑÑво пÑогÑамм не наÑÑолÑко важнÑ, "
+"Ñак ÑÑо Ð¾Ñ Ñого, ÑÑо иÑ
не вÑпÑÑÑÑÑ,
оÑобого вÑеда не бÑдеÑ. Таким обÑазом, "
+"Ð¼ÐµÐ¶Ð´Ñ ÑазÑабоÑкой пÑогÑамм на заказ и
пÑинÑипами Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð·Ð° Ñвободное "
+"пÑогÑаммное обеÑпеÑение пÑоÑивоÑеÑиÑ
неÑ."
# type: Content of: <p>
#. type: Content of: <p>
@@ -860,19 +844,6 @@
# type: Content of: <p>
#. type: Content of: <p>
-# | {+“Commercial” and “proprietary” are not the
-# | same!+} Commercial software is software [-being-] developed by a business
-# | [-which aims to make money from the use-] {+as part+} of [-the software.
-# | “Commercial” and “proprietary” are not the same
-# | thing!-] {+its business.+} Most commercial software is <a
-# | href=\"#ProprietarySoftware\">proprietary</a>, but there is commercial
-# | free software, and there is noncommercial nonfree software.
-#| msgid ""
-#| "Commercial software is software being developed by a business which aims "
-#| "to make money from the use of the software. “Commercial” and "
-#| "“proprietary” are not the same thing! Most commercial "
-#| "software is <a href=\"#ProprietarySoftware\">proprietary</a>, but there "
-#| "is commercial free software, and there is noncommercial nonfree software."
msgid ""
"“Commercial” and “proprietary” are not the same! "
"Commercial software is software developed by a business as part of its "
@@ -882,10 +853,10 @@
msgstr ""
"“ÐоммеÑÑеÑкає и
“неÑвободнає — не одно "
"и Ñо же! ÐоммеÑÑеÑÐºÐ°Ñ Ð¿ÑогÑамма — ÑÑо
пÑогÑамма, ÑазÑабаÑÑÐ²Ð°ÐµÐ¼Ð°Ñ "
-"пÑедпÑиÑÑием в пÑоÑеÑÑе Ñвоей
коммеÑÑеÑкой деÑÑелÑноÑÑи. "
-"ÐолÑÑинÑÑво коммеÑÑеÑкиÑ
пÑогÑамм —
<a href="
-"\"#ProprietarySoftware\"> неÑвободнÑе</a>, но
ÑÑÑеÑÑвÑÑÑ ÐºÐ°Ðº ÑвободнÑе "
-"коммеÑÑеÑкие пÑогÑаммÑ, Ñак и неÑвободнÑе
некоммеÑÑеÑкие пÑогÑаммÑ."
+"пÑедпÑиÑÑием в пÑоÑеÑÑе Ñвоей
коммеÑÑеÑкой деÑÑелÑноÑÑи. ÐолÑÑинÑÑво "
+"коммеÑÑеÑкиÑ
пÑогÑамм — <a
href=\"#ProprietarySoftware\"> "
+"неÑвободнÑе</a>, но ÑÑÑеÑÑвÑÑÑ ÐºÐ°Ðº
ÑвободнÑе коммеÑÑеÑкие пÑогÑаммÑ, Ñак и "
+"неÑвободнÑе некоммеÑÑеÑкие пÑогÑаммÑ."
# type: Content of: <p>
#. type: Content of: <p>
@@ -907,16 +878,6 @@
# type: Content of: <p>
#. type: Content of: <p>
-# | For the GNU Project, the [-emphasis is-] {+priorities are+} in the other
-# | order: the important thing is that GNU Ada is free software; [-whether-]
-# | {+that+} it is commercial is just a detail. However, the additional
-# | development of GNU Ada that results from its being commercial is
-# | definitely beneficial.
-#| msgid ""
-#| "For the GNU Project, the emphasis is in the other order: the important "
-#| "thing is that GNU Ada is free software; whether it is commercial is just "
-#| "a detail. However, the additional development of GNU Ada that results "
-#| "from its being commercial is definitely beneficial."
msgid ""
"For the GNU Project, the priorities are in the other order: the important "
"thing is that GNU Ada is free software; that it is commercial is just a "
Index: philosophy/po/government-free-software.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/government-free-software.ru-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/government-free-software.ru-en.html 16 Sep 2012 09:24:44
-0000 1.6
+++ philosophy/po/government-free-software.ru-en.html 21 Sep 2012 08:29:09
-0000 1.7
@@ -62,10 +62,11 @@
<li><p>Whenever a state entity distributes software to the public,
including programs included in or specified by its web pages, it must
be distributed as free software, and must be capable of running on a
-100% free environment.</p></li>
+platform containing exclusively free software.</p></li>
-<li><p>State entity web sites and servers must be designed to function fully
-with 100% free environments on the user's computer.</p></li>
+<li><p>State entity web sites and network services must be designed so
+that users can use them, without disadvantage, by means of free
+software exclusively.</p></li>
<li><p>State entities must use only file formats and communication
protocols that are well supported by free software, preferably with
@@ -180,7 +181,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2012/09/16 09:24:44 $
+$Date: 2012/09/21 08:29:09 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/government-free-software.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/government-free-software.ru.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/po/government-free-software.ru.po 21 Sep 2012 05:17:36
-0000 1.7
+++ philosophy/po/government-free-software.ru.po 21 Sep 2012 08:29:09
-0000 1.8
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-09-20 12:26-0300\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
@@ -151,15 +150,6 @@
"огÑаниÑениÑми</a>)."
#. type: Content of: <ul><li><p>
-# | Whenever a state entity distributes software to the public, including
-# | programs included in or specified by its web pages, it must be distributed
-# | as free software, and must be capable of running on a [-100%-] {+platform
-# | containing exclusively+} free [-environment.-] {+software.+}
-#| msgid ""
-#| "Whenever a state entity distributes software to the public, including "
-#| "programs included in or specified by its web pages, it must be "
-#| "distributed as free software, and must be capable of running on a 100% "
-#| "free environment."
msgid ""
"Whenever a state entity distributes software to the public, including "
"programs included in or specified by its web pages, it must be distributed "
@@ -173,13 +163,6 @@
"пÑогÑаммÑ."
#. type: Content of: <ul><li><p>
-# | State entity web sites and [-servers-] {+network services+} must be
-# | designed [-to function fully with 100%-] {+so that users can use them,
-# | without disadvantage, by means of+} free [-environments on the user's
-# | computer.-] {+software exclusively.+}
-#| msgid ""
-#| "State entity web sites and servers must be designed to function fully "
-#| "with 100% free environments on the user's computer."
msgid ""
"State entity web sites and network services must be designed so that users "
"can use them, without disadvantage, by means of free software exclusively."
Index: philosophy/po/nonfree-games.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/nonfree-games.ru-en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/nonfree-games.ru-en.html 16 Sep 2012 09:25:09 -0000
1.8
+++ philosophy/po/nonfree-games.ru-en.html 21 Sep 2012 08:29:09 -0000
1.9
@@ -19,10 +19,19 @@
the users. Thus, the question is how this development affects users'
freedom.</p>
+<p>The problem with these games
+is not that <a href="/philosophy/words-to-avoid.html"> they are
+commercial</a>. (We see nothing wrong with that.) It
+is not that <a href="/philosophy/selling.html"> the developers
+sell copies</a>; that's not wrong either. The problem is that the
+games contain software that is
+<a href="/philosophy/free-sw.html">not free</a>
+(free in the sense of freedom, of course).</p>
+
<p>Nonfree game programs (like other nonfree programs) are unethical
-because they deny freedom to their users. (Game art is a
-different issue, because it isn't software.) If you want freedom, one
-requisite for it is not having nonfree programs on your computer.
+because they deny freedom to their users. (Game art is a different
+issue, because it isn't software.) If you want freedom, one requisite
+for it is not having or running nonfree programs on your computer.
That much is clear.</p>
<p>However, if you're going to use these games, you're better off using
@@ -43,12 +52,28 @@
distros</a> already works against the goal of freedom. Adding these
games to a distro would augment that effect.</p>
-<p>If you want to promote freedom, please take care not to talk about
-the availability of these games on GNU/Linux as support for our cause.
-Instead you could tell people about
-the <a href="http://lpc.opengameart.org/"> Liberated Pixel Cup</a>
-free game contest, <a href="http://forum.freegamedev.net/index.php">
-the Free Game Dev Forum</a>, and the LibrePlanet Gaming
+<p>Free software is a matter of freedom, not price. A free game need
+not be gratis. It is feasible to develop free games commercially,
+while respecting your freedom to change the software you use.
+Since the art in the game is not software, it does not need to be
+free. There is in fact free game software developed by companies, as
+well as free games developed noncommercially by volunteers.
+Crowdfunding development will only get easier.</p>
+
+<p>But if we suppose that it is <em>impossible</em> to develop some
+kind of free game — what would follow then? There's no good in
+writing it as a nonfree game. To have freedom in your computing,
+rejecting nonfree software is necessary, pure and simple. Therefore,
+you as a freedom-lover won't use the nonfree game if it exists, so
+you won't lose anything if it does not exist.</p>
+
+<p>If you want to promote the cause of freedom in computing, please
+take care not to talk about the availability of these games on
+GNU/Linux as support for our cause. Instead you could tell people
+about the <a href="http://lpc.opengameart.org/"> Liberated Pixel
+Cup</a> free game
+contest, <a href="http://forum.freegamedev.net/index.php"> the Free
+Game Dev Forum</a>, and the LibrePlanet Gaming
Collective's <a
href="http://libreplanet.org/wiki/Group:LibrePlanet_Gaming_Collective">
free gaming night.</a> </p>
@@ -106,7 +131,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2012/09/16 09:25:09 $
+$Date: 2012/09/21 08:29:09 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/nonfree-games.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/nonfree-games.ru.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- philosophy/po/nonfree-games.ru.po 21 Sep 2012 05:17:37 -0000 1.12
+++ philosophy/po/nonfree-games.ru.po 21 Sep 2012 08:29:10 -0000 1.13
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-09-20 12:26-0300\n"
#. type: Content of: <title>
msgid ""
@@ -67,24 +66,14 @@
"software that is <a href=\"/philosophy/free-sw.html\">not free</a> (free in "
"the sense of freedom, of course)."
msgstr ""
-"ÐÑоблема Ñ ÑÑими игÑами не в Ñом, ÑÑо <a "
-"href=\"/philosophy/words-to-avoid.html\"> они коммеÑÑеÑкие</a>
(Ð¼Ñ Ð½Ðµ видим в "
-"ÑÑом ниÑего плоÑ
ого). Ðна не в Ñом, ÑÑо <a
href=\"/philosophy/selling.html\"> "
-"ÑазÑабоÑÑики пÑодаÑÑ ÐºÐ¾Ð¿Ð¸Ð¸</a>; ÑÑо Ñоже не
плоÑ
о. ÐÑоблема в Ñом, ÑÑо игÑÑ "
-"ÑодеÑÐ¶Ð°Ñ Ð¿ÑогÑаммÑ, коÑоÑÑе <a
href=\"/philosophy/free-sw.html\"> не "
-"ÑвободнÑ</a> (в ÑмÑÑле ÑвободÑ, конеÑно)."
-
-#. type: Content of: <p>
-# | Nonfree game programs (like other nonfree programs) are unethical because
-# | they deny freedom to their users. (Game art is a different issue, because
-# | it isn't software.) If you want freedom, one requisite for it is not
-# | having {+or running+} nonfree programs on your computer. That much is
-# | clear.
-#| msgid ""
-#| "Nonfree game programs (like other nonfree programs) are unethical because "
-#| "they deny freedom to their users. (Game art is a different issue, "
-#| "because it isn't software.) If you want freedom, one requisite for it is "
-#| "not having nonfree programs on your computer. That much is clear."
+"ÐÑоблема Ñ ÑÑими игÑами не в Ñом, ÑÑо <a
href=\"/philosophy/words-to-avoid."
+"html\"> они коммеÑÑеÑкие</a> (Ð¼Ñ Ð½Ðµ видим в ÑÑом
ниÑего плоÑ
ого). Ðна не в "
+"Ñом, ÑÑо <a href=\"/philosophy/selling.html\"> ÑазÑабоÑÑики
пÑодаÑÑ ÐºÐ¾Ð¿Ð¸Ð¸</"
+"a>; ÑÑо Ñоже не плоÑ
о. ÐÑоблема в Ñом, ÑÑо
игÑÑ ÑодеÑÐ¶Ð°Ñ Ð¿ÑогÑаммÑ, коÑоÑÑе "
+"<a href=\"/philosophy/free-sw.html\"> не ÑвободнÑ</a> (в
ÑмÑÑле ÑвободÑ, "
+"конеÑно)."
+
+#. type: Content of: <p>
msgid ""
"Nonfree game programs (like other nonfree programs) are unethical because "
"they deny freedom to their users. (Game art is a different issue, because "
@@ -178,22 +167,6 @@
"бÑÐ´ÐµÑ ÑÑÑеÑÑвоваÑÑ, Ñак ÑÑо Ð²Ñ Ð½Ð¸Ñего не
поÑеÑÑеÑе, еÑли ее не бÑдеÑ."
#. type: Content of: <p>
-# | If you want to promote [-freedom,-] {+the cause of freedom in computing,+}
-# | please take care not to talk about the availability of these games on
-# | GNU/Linux as support for our cause. Instead you could tell people about
-# | the <a href=\"http://lpc.opengameart.org/\"> Liberated Pixel Cup</a> free
-# | game contest, <a href=\"http://forum.freegamedev.net/index.php\"> the Free
-# | Game Dev Forum</a>, and the LibrePlanet Gaming Collective's <a
-# | href=\"http://libreplanet.org/wiki/Group:LibrePlanet_Gaming_Collective\">
-# | free gaming night.</a>
-#| msgid ""
-#| "If you want to promote freedom, please take care not to talk about the "
-#| "availability of these games on GNU/Linux as support for our cause. "
-#| "Instead you could tell people about the <a href=\"http://lpc.opengameart."
-#| "org/\"> Liberated Pixel Cup</a> free game contest, <a href=\"http://forum."
-#| "freegamedev.net/index.php\"> the Free Game Dev Forum</a>, and the "
-#| "LibrePlanet Gaming Collective's <a href=\"http://libreplanet.org/wiki/"
-#| "Group:LibrePlanet_Gaming_Collective\"> free gaming night.</a>"
msgid ""
"If you want to promote the cause of freedom in computing, please take care "
"not to talk about the availability of these games on GNU/Linux as support "
@@ -203,14 +176,15 @@
"the LibrePlanet Gaming Collective's <a href=\"http://libreplanet.org/wiki/"
"Group:LibrePlanet_Gaming_Collective\"> free gaming night.</a>"
msgstr ""
-"ÐÑли Ð²Ñ Ñ
оÑиÑе ÑодейÑÑвоваÑÑ Ð´ÐµÐ»Ñ ÑвободÑ
в облаÑÑи вÑÑиÑлений, позабоÑÑÑеÑÑ,
пожалÑйÑÑа, о Ñом, ÑÑÐ¾Ð±Ñ "
-"не говоÑиÑÑ Ð¾ доÑÑÑпноÑÑи ÑÑиÑ
Ð¸Ð³Ñ Ð¿Ð¾Ð´
GNU/Linux как о поддеÑжке наÑего "
-"дела. ÐмеÑÑо ÑÑого Ð²Ñ Ð¼Ð¾Ð³Ð»Ð¸ бÑ
ÑаÑÑказÑваÑÑ Ð»ÑдÑм о ÑоÑевнованиÑÑ
по "
-"ÑвободнÑм игÑам на <a href=\"http://lpc.opengameart.org/\">
ÐÑбок "
-"оÑвобожденного пикÑела</a>, <a
href=\"http://forum.freegamedev.net/index.php"
-"\"> ФоÑÑме ÑазÑабоÑÑиков ÑвободнÑÑ
игÑ</a> и
веÑеÑе ÑвободнÑÑ
Ð¸Ð³Ñ <a href="
-"\"http://libreplanet.org/wiki/Group:LibrePlanet_Gaming_Collective\"> "
-"ÐгÑового обÑеÑÑва “Свободной
планеÑÑ”</a>."
+"ÐÑли Ð²Ñ Ñ
оÑиÑе ÑодейÑÑвоваÑÑ Ð´ÐµÐ»Ñ ÑвободÑ
в облаÑÑи вÑÑиÑлений, "
+"позабоÑÑÑеÑÑ, пожалÑйÑÑа, о Ñом, ÑÑÐ¾Ð±Ñ Ð½Ðµ
говоÑиÑÑ Ð¾ доÑÑÑпноÑÑи ÑÑиÑ
Ð¸Ð³Ñ "
+"под GNU/Linux как о поддеÑжке наÑего дела.
ÐмеÑÑо ÑÑого Ð²Ñ Ð¼Ð¾Ð³Ð»Ð¸ Ð±Ñ "
+"ÑаÑÑказÑваÑÑ Ð»ÑдÑм о ÑоÑевнованиÑÑ
по
ÑвободнÑм игÑам на <a href=\"http://"
+"lpc.opengameart.org/\"> ÐÑбок оÑвобожденного
пикÑела</a>, <a href=\"http://"
+"forum.freegamedev.net/index.php\"> ФоÑÑме ÑазÑабоÑÑиков
ÑвободнÑÑ
игÑ</a> и "
+"веÑеÑе ÑвободнÑÑ
Ð¸Ð³Ñ <a
href=\"http://libreplanet.org/wiki/Group:"
+"LibrePlanet_Gaming_Collective\"> ÐгÑового обÑеÑÑва
“Свободной "
+"планеÑÑ”</a>."
# type: Content of: <div><div>
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
Index: philosophy/po/right-to-read.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/right-to-read.ru-en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/po/right-to-read.ru-en.html 16 Sep 2012 09:25:18 -0000
1.9
+++ philosophy/po/right-to-read.ru-en.html 21 Sep 2012 08:29:10 -0000
1.10
@@ -321,7 +321,7 @@
explanation of the White Paper:
The Copyright Grab</a>, Pamela Samuelson, Wired, Jan. 1996</li>
- <li><a href="http://www.law.duke.edu/boylesite/sold_out.htm">Sold Out</a>,
+ <li><a href="http://www.law.duke.edu/boylesite/Sold_out.htm">Sold Out</a>,
James Boyle, New York Times, 31 March 1996</li>
<li><a
href="http://www.interesting-people.org/archives/interesting-people/199611/msg00012.html">Public
Data or Private Data</a>,
@@ -381,7 +381,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2012/09/16 09:25:18 $
+$Date: 2012/09/21 08:29:10 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/right-to-read.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/right-to-read.ru.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/po/right-to-read.ru.po 21 Sep 2012 05:17:37 -0000 1.16
+++ philosophy/po/right-to-read.ru.po 21 Sep 2012 08:29:10 -0000 1.17
@@ -16,7 +16,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2012-09-20 12:26-0300\n"
#. type: Content of: <title>
msgid "The Right to Read - GNU Project - Free Software Foundation (FSF)"
@@ -660,11 +659,6 @@
"“УайеÑед”, ÑнваÑÑ 1996."
#. type: Content of: <ul><li>
-# | <a href=\"http://www.law.duke.edu/boylesite/[-s-]{+S+}old_out.htm\">Sold
-# | Out</a>, James Boyle, New York Times, 31 March 1996
-#| msgid ""
-#| "<a href=\"http://www.law.duke.edu/boylesite/sold_out.htm\">Sold Out</a>, "
-#| "James Boyle, New York Times, 31 March 1996"
msgid ""
"<a href=\"http://www.law.duke.edu/boylesite/Sold_out.htm\">Sold Out</a>, "
"James Boyle, New York Times, 31 March 1996"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www licenses/gpl-faq.ru.html licenses/po/gpl-fa...,
GNUN <=