[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www distros/free-system-distribution-guidelines...
From: |
GNUN |
Subject: |
www distros/free-system-distribution-guidelines... |
Date: |
Fri, 06 Jun 2014 04:57:06 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 14/06/06 04:57:06
Modified files:
distros : free-system-distribution-guidelines.ru.html
distros/po : free-system-distribution-guidelines.ru-en.html
free-system-distribution-guidelines.ru.po
philosophy : surveillance-vs-democracy.ru.html
philosophy/po : surveillance-vs-democracy.ru-en.html
surveillance-vs-democracy.ru.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-system-distribution-guidelines.ru.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-system-distribution-guidelines.ru-en.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-system-distribution-guidelines.ru.po?cvsroot=www&r1=1.55&r2=1.56
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/surveillance-vs-democracy.ru.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.ru-en.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.ru.po?cvsroot=www&r1=1.17&r2=1.18
Patches:
Index: distros/free-system-distribution-guidelines.ru.html
===================================================================
RCS file: /web/www/www/distros/free-system-distribution-guidelines.ru.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- distros/free-system-distribution-guidelines.ru.html 31 May 2014 18:27:43
-0000 1.46
+++ distros/free-system-distribution-guidelines.ru.html 6 Jun 2014 04:57:04
-0000 1.47
@@ -4,15 +4,15 @@
<!-- Parent-Version: 1.77 -->
<!-- This file is automatically generated by GNUnited Nations! -->
-<title>РекомендаÑии Ð´Ð»Ñ ÑвободнÑÑ
диÑÑÑибÑÑивов ÑиÑÑем - ÐÑÐ¾ÐµÐºÑ GNU - Фонд
-Ñвободного пÑогÑаммного обеÑпеÑениÑ</title>
+<title>РекомендаÑии Ð´Ð»Ñ ÑвободнÑÑ
диÑÑÑибÑÑивов ÑиÑÑем (РСÐС GNU) - ÐÑÐ¾ÐµÐºÑ GNU -
+Фонд Ñвободного пÑогÑаммного
обеÑпеÑениÑ</title>
<link rel="alternate" title="СвободнÑе диÑÑÑибÑÑивÑ
GNU/Linux"
href="http://www.gnu.org/distros/distros.rss"
type="application/rss+xml" />
<!--#include
virtual="/distros/po/free-system-distribution-guidelines.translist" -->
<!--#include virtual="/server/banner.ru.html" -->
-<h2>РекомендаÑии Ð´Ð»Ñ ÑвободнÑÑ
диÑÑÑибÑÑивов ÑиÑÑем</h2>
+<h2>РекомендаÑии Ð´Ð»Ñ ÑвободнÑÑ
диÑÑÑибÑÑивов ÑиÑÑем (РСÐС GNU)</h2>
<h3 id="introduction">Ðведение</h3>
@@ -50,14 +50,15 @@
доÑÑÑпна в иÑÑ
одной ÑоÑме. (“ÐÑÑ
однаÑ
ÑоÑма” ознаÑÐ°ÐµÑ ÑоÑмÑ
инÑоÑмаÑии, пÑедпоÑÑиÑелÑнÑÑ Ð´Ð»Ñ Ð²Ð½ÐµÑениÑ
в нее изменений.)</p>
-<p>ÐнÑоÑмаÑÐ¸Ñ Ð¸ ее иÑÑ
Ð¾Ð´Ð½Ð°Ñ ÑоÑма должнÑ
пÑедоÑÑавлÑÑÑÑÑ Ð¿Ð¾Ð´ ÑооÑвеÑÑÑвÑÑÑей
-Ñвободной лиÑензией. ÐÑ Ð¿ÐµÑеÑиÑлÑем Ñе
лиÑензии, коÑоÑÑе Ð¼Ñ Ð¾Ñенили, в <a
-class="reference" href="/licenses/license-list.html">наÑем ÑпиÑке
+<p>ÐнÑоÑмаÑÐ¸Ñ Ð¸ ее иÑÑ
Ð¾Ð´Ð½Ð°Ñ ÑоÑма должнÑ
пÑедоÑÑавлÑÑÑÑÑ Ð¿Ð¾Ð´ ÑооÑвеÑÑÑвÑÑÑей <a
+href="/philosophy/free-sw.html"> лиÑензией ÑвободнÑÑ
пÑогÑамм</a>. ÐÑ
+оÑениваем конкÑеÑнÑе лиÑензии и заноÑим
наÑи заклÑÑÐµÐ½Ð¸Ñ Ð² <a
+class="reference" href="/licenses/license-list.html">Ð½Ð°Ñ ÑпиÑок
лиÑензий</a>, где оÑделÑно пеÑеÑиÑленÑ
лиÑензии, подÑ
одÑÑие Ð´Ð»Ñ Ð¿ÑогÑамм,
докÑменÑаÑии, ÑÑиÑÑов и дÑÑгиÑ
полезнÑÑ
ÑабоÑ. ÐÑли ÑÐ°ÐºÐ°Ñ ÑабоÑа вÑпÑÑкаеÑÑÑ
-под неÑколÑкими лиÑензиÑми, по менÑÑей
меÑе одна из коÑоÑÑÑ
Ñвободна, ее
-можно вклÑÑаÑÑ Ð² ÑиÑÑемÑ; ÑазÑабоÑÑики
ÑиÑÑÐµÐ¼Ñ Ð¿ÑоÑÑо Ð´Ð¾Ð»Ð¶Ð½Ñ ÑледоваÑÑ
-ÑÑловиÑм доÑÑÑпнÑÑ
ÑвободнÑÑ
лиÑензий,
когда они ÑаÑпÑоÑÑÑанÑÑÑ Ð¸Ð»Ð¸
+под дизÑÑнкÑией лиÑензий, она Ñвободна,
еÑли Ñвободна по менÑÑей меÑе одна
+из ее лиÑензий; ÑазÑабоÑÑики ÑиÑÑемÑ
Ð´Ð¾Ð»Ð¶Ð½Ñ ÑледоваÑÑ ÑÑловиÑм
+ÑооÑвеÑÑÑвÑÑÑиÑ
лиÑензий ÑвободнÑÑ
пÑогÑамм, когда ÑаÑпÑоÑÑÑанÑÑÑ Ð¸Ð»Ð¸
модиÑиÑиÑÑÑÑ ÑÑÑ ÑабоÑÑ.</p>
<p>ÐиÑÑÑибÑÑив Ñвободной ÑиÑÑÐµÐ¼Ñ Ð½Ðµ должен
ни подÑалкиваÑÑ Ð¿Ð¾Ð»ÑзоваÑелей к
@@ -352,7 +353,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2014/05/31 18:27:43 $
+$Date: 2014/06/06 04:57:04 $
<!-- timestamp end -->
</p>
Index: distros/po/free-system-distribution-guidelines.ru-en.html
===================================================================
RCS file:
/web/www/www/distros/po/free-system-distribution-guidelines.ru-en.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- distros/po/free-system-distribution-guidelines.ru-en.html 31 May 2014
18:27:44 -0000 1.30
+++ distros/po/free-system-distribution-guidelines.ru-en.html 6 Jun 2014
04:57:05 -0000 1.31
@@ -1,12 +1,12 @@
<!--#include virtual="/server/header.html" -->
<!-- Parent-Version: 1.77 -->
-<title>Guidelines for Free System Distributions - GNU Project - Free Software
Foundation</title>
+<title>Free System Distribution Guidelines (GNU FSDG) - GNU Project - Free
Software Foundation</title>
<link rel="alternate" title="Free GNU/Linux distributions"
href="http://www.gnu.org/distros/distros.rss"
type="application/rss+xml" />
<!--#include
virtual="/distros/po/free-system-distribution-guidelines.translist" -->
<!--#include virtual="/server/banner.html" -->
-<h2>Guidelines for Free System Distributions</h2>
+<h2>Free System Distribution Guidelines (GNU FSDG)</h2>
<h3 id="introduction">Introduction</h3>
@@ -45,13 +45,14 @@
information that is preferred for making changes to it.)</p>
<p>The information, and the source, must be provided under an
-appropriate free license. We list the ones we have evaluated
-on <a class="reference" href="/licenses/license-list.html">our license
+appropriate <a href="/philosophy/free-sw.html">free license</a>. We
+evaluate specific licenses and list our determinations
+in <a class="reference" href="/licenses/license-list.html">our license
list</a>, with separate sections for licenses that are suitable for
software, documentation, fonts, and other useful works. If such a
-work is released under multiple licenses, at least one of which is
-free, it can be included in the system; the system developers just
-need to follow the terms of the available free license(s) when they
+work is released under a disjunction of licenses, the work is free as
+long as at least one of its licenses is free; the system developers
+should follow the terms of the applicable free license(s) when they
distribute and/or modify it.</p>
<p>A free system distribution must not steer users towards obtaining
@@ -323,7 +324,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/05/31 18:27:44 $
+$Date: 2014/06/06 04:57:05 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/free-system-distribution-guidelines.ru.po
===================================================================
RCS file: /web/www/www/distros/po/free-system-distribution-guidelines.ru.po,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- distros/po/free-system-distribution-guidelines.ru.po 6 Jun 2014
04:33:33 -0000 1.55
+++ distros/po/free-system-distribution-guidelines.ru.po 6 Jun 2014
04:57:05 -0000 1.56
@@ -15,20 +15,14 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2014-06-05 10:25+0000\n"
#. type: Content of: <title>
-# | [-Guidelines for-]Free System [-Distributions-] {+Distribution Guidelines
-# | (GNU FSDG)+} - GNU Project - Free Software Foundation
-#| msgid ""
-#| "Guidelines for Free System Distributions - GNU Project - Free Software "
-#| "Foundation"
msgid ""
"Free System Distribution Guidelines (GNU FSDG) - GNU Project - Free Software "
"Foundation"
msgstr ""
-"РекомендаÑии Ð´Ð»Ñ ÑвободнÑÑ
диÑÑÑибÑÑивов
ÑиÑÑем (РСÐС GNU) - ÐÑÐ¾ÐµÐºÑ GNU - Фонд "
-"Ñвободного пÑогÑаммного обеÑпеÑениÑ"
+"РекомендаÑии Ð´Ð»Ñ ÑвободнÑÑ
диÑÑÑибÑÑивов
ÑиÑÑем (РСÐС GNU) - ÐÑÐ¾ÐµÐºÑ GNU - "
+"Фонд Ñвободного пÑогÑаммного обеÑпеÑениÑ"
#. type: Attribute 'title' of: <link>
msgid "Free GNU/Linux distributions"
@@ -121,28 +115,6 @@
"инÑоÑмаÑии, пÑедпоÑÑиÑелÑнÑÑ Ð´Ð»Ñ
внеÑÐµÐ½Ð¸Ñ Ð² нее изменений.)"
#. type: Content of: <p>
-# | The information, and the source, must be provided under an appropriate
-# | [-free license.-] {+<a href=\"/philosophy/free-sw.html\">free
-# | license</a>.+} We {+evaluate specific licenses and+} list [-the ones we
-# | have evaluated on-] {+our determinations in+} <a class=\"reference\"
-# | href=\"/licenses/license-list.html\">our license list</a>, with separate
-# | sections for licenses that are suitable for software, documentation,
-# | fonts, and other useful works. If such a work is released under
-# | [-multiple-] {+a disjunction of+} licenses, {+the work is free as long
-# | as+} at least one of [-which-] {+its licenses+} is [-free, it can be
-# | included in the system;-] {+free;+} the system developers [-just need to-]
-# | {+should+} follow the terms of the [-available-] {+applicable+} free
-# | license(s) when they distribute and/or modify it.
-#| msgid ""
-#| "The information, and the source, must be provided under an appropriate "
-#| "free license. We list the ones we have evaluated on <a class=\"reference"
-#| "\" href=\"/licenses/license-list.html\">our license list</a>, with "
-#| "separate sections for licenses that are suitable for software, "
-#| "documentation, fonts, and other useful works. If such a work is released "
-#| "under multiple licenses, at least one of which is free, it can be "
-#| "included in the system; the system developers just need to follow the "
-#| "terms of the available free license(s) when they distribute and/or modify "
-#| "it."
msgid ""
"The information, and the source, must be provided under an appropriate <a "
"href=\"/philosophy/free-sw.html\">free license</a>. We evaluate specific "
@@ -154,16 +126,16 @@
"developers should follow the terms of the applicable free license(s) when "
"they distribute and/or modify it."
msgstr ""
-"ÐнÑоÑмаÑÐ¸Ñ Ð¸ ее иÑÑ
Ð¾Ð´Ð½Ð°Ñ ÑоÑма должнÑ
пÑедоÑÑавлÑÑÑÑÑ Ð¿Ð¾Ð´ ÑооÑвеÑÑÑвÑÑÑей "
-"<a href=\"/philosophy/free-sw.html\"> лиÑензией ÑвободнÑÑ
пÑогÑамм</a>. "
-"ÐÑ Ð¾Ñениваем конкÑеÑнÑе лиÑензии и
заноÑим наÑи заклÑÑÐµÐ½Ð¸Ñ Ð² <a "
-"class=\"reference\" href=\"/licenses/license-list.html\">Ð½Ð°Ñ ÑпиÑок "
-"лиÑензий</a>, где оÑделÑно пеÑеÑиÑленÑ
лиÑензии, подÑ
одÑÑие Ð´Ð»Ñ Ð¿ÑогÑамм, "
-"докÑменÑаÑии, ÑÑиÑÑов и дÑÑгиÑ
полезнÑÑ
ÑабоÑ. ÐÑли ÑÐ°ÐºÐ°Ñ ÑабоÑа вÑпÑÑкаеÑÑÑ "
-"под дизÑÑнкÑией лиÑензий, она Ñвободна,
еÑли Ñвободна по менÑÑей меÑе "
-"одна из ее лиÑензий; ÑазÑабоÑÑики ÑиÑÑемÑ
Ð´Ð¾Ð»Ð¶Ð½Ñ ÑледоваÑÑ ÑÑловиÑм "
-"ÑооÑвеÑÑÑвÑÑÑиÑ
лиÑензий ÑвободнÑÑ
пÑогÑамм, когда ÑаÑпÑоÑÑÑанÑÑÑ Ð¸Ð»Ð¸ "
-"модиÑиÑиÑÑÑÑ ÑÑÑ ÑабоÑÑ."
+"ÐнÑоÑмаÑÐ¸Ñ Ð¸ ее иÑÑ
Ð¾Ð´Ð½Ð°Ñ ÑоÑма должнÑ
пÑедоÑÑавлÑÑÑÑÑ Ð¿Ð¾Ð´ ÑооÑвеÑÑÑвÑÑÑей <a "
+"href=\"/philosophy/free-sw.html\"> лиÑензией ÑвободнÑÑ
пÑогÑамм</a>. ÐÑ "
+"оÑениваем конкÑеÑнÑе лиÑензии и заноÑим
наÑи заклÑÑÐµÐ½Ð¸Ñ Ð² <a class="
+"\"reference\" href=\"/licenses/license-list.html\">Ð½Ð°Ñ ÑпиÑок
лиÑензий</a>, "
+"где оÑделÑно пеÑеÑиÑÐ»ÐµÐ½Ñ Ð»Ð¸Ñензии, подÑ
одÑÑие Ð´Ð»Ñ Ð¿ÑогÑамм, докÑменÑаÑии, "
+"ÑÑиÑÑов и дÑÑгиÑ
полезнÑÑ
ÑабоÑ. ÐÑли
ÑÐ°ÐºÐ°Ñ ÑабоÑа вÑпÑÑкаеÑÑÑ Ð¿Ð¾Ð´ "
+"дизÑÑнкÑией лиÑензий, она Ñвободна, еÑли
Ñвободна по менÑÑей меÑе одна из ее "
+"лиÑензий; ÑазÑабоÑÑики ÑиÑÑÐµÐ¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ
ÑледоваÑÑ ÑÑловиÑм ÑооÑвеÑÑÑвÑÑÑиÑ
"
+"лиÑензий ÑвободнÑÑ
пÑогÑамм, когда
ÑаÑпÑоÑÑÑанÑÑÑ Ð¸Ð»Ð¸ модиÑиÑиÑÑÑÑ ÑÑÑ "
+"ÑабоÑÑ."
#. type: Content of: <p>
msgid ""
Index: philosophy/surveillance-vs-democracy.ru.html
===================================================================
RCS file: /web/www/www/philosophy/surveillance-vs-democracy.ru.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/surveillance-vs-democracy.ru.html 31 May 2014 18:27:46
-0000 1.6
+++ philosophy/surveillance-vs-democracy.ru.html 6 Jun 2014 04:57:05
-0000 1.7
@@ -407,7 +407,9 @@
пÑиÑ
одом ÐнÑеÑнеÑа полномоÑие
пÑоÑлÑÑиваÑÑ ÑелеÑоннÑе пеÑеговоÑÑ
еÑÑеÑÑвенно
ÑаÑÑиÑÑеÑÑÑ Ð½Ð° полномоÑие подклÑÑаÑÑÑÑ Ðº
ÑоединениÑм по ÐнÑеÑнеÑÑ. ÐÑими
полномоÑиÑми легко злоÑпоÑÑеблÑÑÑ Ð²
полиÑиÑеÑкиÑ
ÑелÑÑ
, но они необÑ
одимÑ. Ð
-ÑÑаÑÑÑÑ, ÑÑо не Ð´Ð°ÐµÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑи наÑ
одиÑÑ
оÑведомиÑелей задним ÑиÑлом.</p>
+ÑÑаÑÑÑÑ, ÑÑо не Ð´Ð°ÐµÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑи наÑ
одиÑÑ
оÑведомиÑелей задним ÑиÑлом, еÑли
+(как Ñ Ñекомендовал) Ð¼Ñ Ð¿ÑедоÑвÑаÑим
пÑедваÑиÑелÑное маÑÑовое накопление
+доÑÑе ÑиÑÑовÑми ÑиÑÑемами.</p>
<p>ÐиÑа Ñ Ð¾ÑобÑми полномоÑиÑми, вÑданнÑми
гоÑÑдаÑÑÑвом, Ñакие как ÑабоÑники
полиÑии, ÑÑÑаÑиваÑÑ Ñвое пÑаво на
конÑиденÑиалÑноÑÑÑ, и за ними должно
@@ -528,7 +530,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2014/05/31 18:27:46 $
+$Date: 2014/06/06 04:57:05 $
<!-- timestamp end -->
</p>
Index: philosophy/po/surveillance-vs-democracy.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.ru-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/surveillance-vs-democracy.ru-en.html 31 May 2014 18:27:47
-0000 1.6
+++ philosophy/po/surveillance-vs-democracy.ru-en.html 6 Jun 2014 04:57:05
-0000 1.7
@@ -400,7 +400,8 @@
naturally extend to the power to tap Internet connections. This power
is easy to abuse for political reasons, but it is also necessary.
Fortunately, this won't make it possible to find whistleblowers after
-the fact.</p>
+the fact, if (as I recommend) we prevent digital systems from accumulating
+massive dossiers before the fact.</p>
<p>Individuals with special state-granted power, such as police,
forfeit their right to privacy and must be monitored. (In fact,
@@ -500,7 +501,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/05/31 18:27:47 $
+$Date: 2014/06/06 04:57:05 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/surveillance-vs-democracy.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.ru.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- philosophy/po/surveillance-vs-democracy.ru.po 6 Jun 2014 04:33:34
-0000 1.17
+++ philosophy/po/surveillance-vs-democracy.ru.po 6 Jun 2014 04:57:05
-0000 1.18
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2014-06-05 12:28+0000\n"
#. type: Content of: <title>
msgid ""
@@ -860,22 +859,6 @@
msgstr "Ðо иногда Ñлежка необÑ
одима"
#. type: Content of: <p>
-# | For the state to find criminals, it needs to be able to investigate
-# | specific crimes, or specific suspected planned crimes, under a court
-# | order. With the Internet, the power to tap phone conversations would
-# | naturally extend to the power to tap Internet connections. This power is
-# | easy to abuse for political reasons, but it is also necessary.
-# | Fortunately, this won't make it possible to find whistleblowers after the
-# | {+fact, if (as I recommend) we prevent digital systems from accumulating
-# | massive dossiers before the+} fact.
-#| msgid ""
-#| "For the state to find criminals, it needs to be able to investigate "
-#| "specific crimes, or specific suspected planned crimes, under a court "
-#| "order. With the Internet, the power to tap phone conversations would "
-#| "naturally extend to the power to tap Internet connections. This power is "
-#| "easy to abuse for political reasons, but it is also necessary. "
-#| "Fortunately, this won't make it possible to find whistleblowers after the "
-#| "fact."
msgid ""
"For the state to find criminals, it needs to be able to investigate specific "
"crimes, or specific suspected planned crimes, under a court order. With the "
- www distros/free-system-distribution-guidelines..., GNUN, 2014/06/05
- www distros/free-system-distribution-guidelines...,
GNUN <=
- www distros/free-system-distribution-guidelines..., GNUN, 2014/06/06
- www distros/free-system-distribution-guidelines..., GNUN, 2014/06/23
- www distros/free-system-distribution-guidelines..., GNUN, 2014/06/27
- www distros/free-system-distribution-guidelines..., GNUN, 2014/06/27
- www distros/free-system-distribution-guidelines..., GNUN, 2014/06/27
- www distros/free-system-distribution-guidelines..., GNUN, 2014/06/27
- www distros/free-system-distribution-guidelines..., GNUN, 2014/06/27