[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www licenses/why-affero-gpl.ru.html licenses/po...
|
From: |
GNUN |
|
Subject: |
www licenses/why-affero-gpl.ru.html licenses/po... |
|
Date: |
Thu, 21 Nov 2013 07:11:31 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 13/11/21 07:11:31
Modified files:
licenses : why-affero-gpl.ru.html
licenses/po : why-affero-gpl.ru-en.html why-affero-gpl.ru.po
philosophy : essays-and-articles.ru.html
latest-articles.ru.html
open-source-misses-the-point.ru.html
words-to-avoid.ru.html
philosophy/po : essays-and-articles.ru-en.html
essays-and-articles.ru.po
free-open-overlap.ru.po
free-open-overlap.translist
latest-articles.ru-en.html
latest-articles.ru.po
open-source-misses-the-point.ru-en.html
open-source-misses-the-point.ru.po
words-to-avoid.ru-en.html words-to-avoid.ru.po
server : home-pkgblurbs.ru.html
server/po : home-pkgblurbs.ru.po
Added files:
philosophy : free-open-overlap.ru.html
philosophy/po : free-open-overlap.ru-en.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/why-affero-gpl.ru.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/why-affero-gpl.ru-en.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/why-affero-gpl.ru.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/essays-and-articles.ru.html?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/latest-articles.ru.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/open-source-misses-the-point.ru.html?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.ru.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-open-overlap.ru.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ru-en.html?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ru.po?cvsroot=www&r1=1.77&r2=1.78
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-open-overlap.ru.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-open-overlap.translist?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/latest-articles.ru-en.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/latest-articles.ru.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.ru-en.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/open-source-misses-the-point.ru.po?cvsroot=www&r1=1.57&r2=1.58
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru-en.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru.po?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-open-overlap.ru-en.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/server/home-pkgblurbs.ru.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/home-pkgblurbs.ru.po?cvsroot=www&r1=1.7&r2=1.8
Patches:
Index: licenses/why-affero-gpl.ru.html
===================================================================
RCS file: /web/www/www/licenses/why-affero-gpl.ru.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- licenses/why-affero-gpl.ru.html 31 Aug 2013 20:11:25 -0000 1.19
+++ licenses/why-affero-gpl.ru.html 21 Nov 2013 07:07:43 -0000 1.20
@@ -51,25 +51,38 @@
позволÑÑÑий вам компоноваÑÑ Ð²Ð¼ÐµÑÑе модÑли
под ÑÑими двÑÐ¼Ñ Ð»Ð¸ÑензиÑми в однÑ
пÑогÑаммÑ.</p>
-<!-- Added a link to rms' article here. If it can be improved, please do it!
-->
-<p>Ðдна из пÑоблем, коÑоÑÑÑ
GNU GPL ÐÑÑеÑо не
ÑеÑаеÑ,—
-пÑогÑаммÑ-ÑÑлÑги. ÐаÑколÑко Ð¼Ñ Ð·Ð½Ð°ÐµÐ¼,
ÑеÑиÑÑ ÑÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ð»Ð¸Ñензией на
-пÑогÑÐ°Ð¼Ð¼Ñ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾. <a
-href="/philosophy/who-does-that-server-really-serve.html"> [1] </a></p>
-
-<p>ÐÑогÑамма-ÑÑлÑга подÑазÑмеваеÑ, ÑÑо лÑди
полÑзÑÑÑÑÑ ÑÑим-Ñо ÑÑжим ÑеÑвеÑом
-Ð´Ð»Ñ Ñого, ÑÑÐ¾Ð±Ñ Ð´ÐµÐ»Ð°ÑÑ ÑабоÑÑ,
заклÑÑаÑÑÑÑÑÑ Ð² иÑ
ÑобÑÑвеннÑÑ
-вÑÑиÑлениÑÑ
. Ðм пÑиÑ
одиÑÑÑ Ð¿Ð¾ÑÑлаÑÑ Ñвои
даннÑе на ÑеÑвеÑ, коÑоÑÑй вÑполнÑеÑ
-Ð´Ð»Ñ Ð½Ð¸Ñ
обÑабоÑÐºÑ Ð¸ поÑÑÐ»Ð°ÐµÑ Ð¸Ð¼ назад
ÑезÑлÑÑаÑÑ. ÐÑогÑаммÑ-ÑÑлÑги
-пÑедÑÑавлÑÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ð¿Ð¾ÑомÑ, ÑÑо
полÑзоваÑели не могÑÑ ÐºÐ¾Ð½ÑÑолиÑоваÑÑ
-вÑÑиÑлениÑ, коÑоÑÑе Ð´Ð»Ñ Ð½Ð¸Ñ
пÑоводиÑ
ÑеÑвеÑ.</p>
-
-<p>ÐÑли какаÑ-Ñо пÑогÑамма на Ñаком ÑеÑвеÑе
вÑпÑÑкаеÑÑÑ Ð¿Ð¾Ð´ GNU GPL ÐÑÑеÑо, Ñо
-лиÑÐµÐ½Ð·Ð¸Ñ ÑÑебÑеÑ, ÑÑÐ¾Ð±Ñ Ñ Ð¿Ð¾Ð»ÑзоваÑелей
бÑла возможноÑÑÑ Ð¿Ð¾Ð»ÑÑиÑÑ
-ÑооÑвеÑÑÑвÑÑÑий иÑÑ
однÑй ÑекÑÑ ÑÑой
пÑогÑаммÑ. ÐÑо Ñ
оÑоÑо, но ÑÑо не Ð´Ð°ÐµÑ Ð¸Ð¼
-конÑÑÐ¾Ð»Ñ Ð½Ð°Ð´ вÑÑиÑлениÑми, коÑоÑÑе Ð´Ð»Ñ Ð½Ð¸Ñ
пÑÐ¾Ð²Ð¾Ð´Ð¸Ñ ÑеÑвеÑ. ÐÑого Ñакже
-недоÑÑаÑоÑно, ÑÑÐ¾Ð±Ñ Ð¾Ð½Ð¸ могли знаÑÑ, какие
дÑÑгие пÑогÑÐ°Ð¼Ð¼Ñ Ð¼Ð¾Ð³ÑÑ Ð½Ð° ÑÑом
-ÑеÑвеÑе попÑÑно вÑполнÑÑÑÑÑ, а Ñакже
инÑпекÑиÑоваÑÑ Ð¸Ð»Ð¸ изменÑÑÑ Ð¸Ñ
даннÑе.</p>
+<p>GNU GPL не ÑеÑÐ°ÐµÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ <a
+href="/philosophy/who-does-that-server-really-serve.html">
ÑÑлÑги-заменÑ
+пÑогÑамм</a>.</p>
+
+<p>УÑлÑга-замена пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ÑазÑмеваеÑ,
ÑÑо лÑди полÑзÑÑÑÑÑ ÑÑим-Ñо ÑÑжим
+ÑеÑвеÑом Ð´Ð»Ñ Ñого, пÑоводиÑÑ Ñвои
ÑобÑÑвеннÑе вÑÑиÑлениÑ. ÐÐ»Ñ ÑÑого
+ÑÑебÑеÑÑÑ, ÑÑÐ¾Ð±Ñ Ð¾Ð½Ð¸Ð¿Ð¾ÑÑлали Ñвои даннÑе
на ÑеÑвеÑ, коÑоÑÑй вÑполнÑÐµÑ Ð´Ð»Ñ
+ниÑ
обÑабоÑÐºÑ Ð¸ поÑÑÐ»Ð°ÐµÑ Ð¸Ð¼ назад
ÑезÑлÑÑаÑÑ. УÑлÑги-заменÑ
+пÑогÑамм — ÑÑо неÑпÑаведливоÑÑÑ,
поÑÐ¾Ð¼Ñ ÑÑо полÑзоваÑели не могÑÑ
+конÑÑолиÑоваÑÑ Ñвои вÑÑиÑлениÑ, когда они
пÑоводÑÑÑÑ Ñаким обÑазом.</p>
+
+<p>ÐÑли какаÑ-Ñо пÑогÑамма на Ñаком ÑеÑвеÑе
вÑпÑÑкаеÑÑÑ Ð¿Ð¾Ð´ GNU GPL ÐÑÑеÑо,
+ÑеÑÐ²ÐµÑ Ð´Ð¾Ð»Ð¶ÐµÐ½ пÑедлагаÑÑ Ð¿Ð¾Ð»ÑзоваÑелÑм
ÑооÑвеÑÑÑвÑÑÑий иÑÑ
однÑй ÑекÑÑ ÑÑой
+пÑогÑаммÑ. ÐÑо Ñ
оÑоÑо, но ÑÑо не Ð´Ð°ÐµÑ Ð¸Ð¼
конÑÑÐ¾Ð»Ñ Ð½Ð°Ð´ вÑÑиÑлениÑми, коÑоÑÑе
+пÑоводÑÑÑÑ Ð½Ð° ÑÑом ÑеÑвеÑе. ÐÑого Ñакже не
доÑÑаÑоÑно, ÑÑÐ¾Ð±Ñ Ð¾Ð½Ð¸ могли
+знаÑÑ, какие дÑÑгие пÑогÑÐ°Ð¼Ð¼Ñ Ð¼Ð¾Ð³ÑÑ Ð½Ð°
ÑÑом ÑеÑвеÑе вÑполнÑÑÑÑÑ,
+инÑпекÑиÑоваÑÑ Ð¸Ð»Ð¸ изменÑÑÑ Ð¸Ñ
даннÑе.</p>
+
+<p>ÐÑ Ð½Ðµ знаем никакого ÑазÑмного ÑпоÑоба
ÑеÑиÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ ÑÑлÑг-замен пÑогÑамм
+Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÑÑловий лиÑензиÑованиÑ
конкÑеÑнÑÑ
пÑогÑамм. Ðаже ÑоÑÑавиÑÑ
+ÑÑидиÑеÑкие ÑÑловиÑ, в коÑоÑÑÑ
ÑÑлÑги-Ð·Ð°Ð¼ÐµÐ½Ñ Ð¿ÑогÑамм оÑгÑаниÑиваÑÑÑÑ Ð¾Ñ
+вÑего оÑÑалÑного, бÑло Ð±Ñ Ð½ÐµÐ»ÐµÐ³ÐºÐ¾, и еÑли
Ð±Ñ Ñ Ð½Ð°Ñ Ð¾Ð½Ð¸ бÑли, неÑÑно, ÑÑо
+нÑжно ÑÑебоваÑÑ Ð² ÑлÑÑае ÑÑлÑг-замен
пÑогÑамм. Таким обÑазом, наÑе ÑеÑение
+пÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ð¿ÑоÑÑо: оÑказÑваÑÑÑÑ Ð¾Ñ
полÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñакими ÑÑлÑгами.</p>
+
+<p>ÐÑли пÑогÑамма пÑедназнаÑена ÑпеÑиалÑно
и иÑклÑÑиÑелÑно Ð´Ð»Ñ ÑÑлÑги-заменÑ
+пÑогÑаммÑ, Ð²Ñ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ñ ÐµÐµ пиÑаÑÑ. Ðо
многие пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð»ÐµÐ·Ð½Ñ Ð´Ð»Ñ
+некоÑоÑого ÑпекÑÑа ÑÑлÑг, некоÑоÑÑе из
коÑоÑÑÑ
ÑвлÑÑÑÑÑ ÑÑлÑгами-заменами
+пÑогÑамм, а некоÑоÑÑе не ÑвлÑÑÑÑÑ. Такие
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð»ÐµÐ·Ð½Ð¾ пиÑаÑÑ Ð¸
+вÑпÑÑкаÑÑ Ñ Ñем, ÑÑÐ¾Ð±Ñ Ð»Ñди могли
оÑганизовÑваÑÑ Ñ Ð¸Ñ
помоÑÑÑ ÑлÑжбÑ, не
+ÑвлÑÑÑиеÑÑ ÑÑлÑгами-заменами пÑогÑамм; в
ÑÑом ÑлÑÑае пÑогÑÐ°Ð¼Ð¼Ñ Ñ
оÑоÑо
+вÑпÑÑкаÑÑ Ð¿Ð¾Ð´ AGPL.</p>
<div style="font-size: small;">
@@ -144,7 +157,7 @@
<p><!-- timestamp start -->
Ðбновлено:
-$Date: 2013/08/31 20:11:25 $
+$Date: 2013/11/21 07:07:43 $
<!-- timestamp end -->
</p>
Index: licenses/po/why-affero-gpl.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/why-affero-gpl.ru-en.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- licenses/po/why-affero-gpl.ru-en.html 29 Jul 2013 13:09:54 -0000
1.16
+++ licenses/po/why-affero-gpl.ru-en.html 21 Nov 2013 07:07:55 -0000
1.17
@@ -42,26 +42,36 @@
text allowing you to link together modules under these two licenses in
one program.</p>
-<!-- Added a link to rms' article here. If it can be improved, please do it!
-->
-<p>One problem which the GNU Affero GPL does not address is the
-problem of Software as a Service (SaaS). It is impossible, as far as
-we know, to address this problem with a software
-license. <a href="/philosophy/who-does-that-server-really-serve.html">
-[1] </a></p>
-
-<p>SaaS means the use of someone's network server, by others, to do
-work which is their own computing. They have to send their data to
-the server, which does their computing for them, and sends the results
-back to them. SaaS is a problem because the users cannot control the
-computing which the server does for them.</p>
+<p>The GNU Affero GPL does not address the problem
+of <a href="/philosophy/who-does-that-server-really-serve.html">
+Service as a Software Substitute (SaaSS)</a>.</p>
+
+<p>SaaSS means that users use someone else's web server to do their
+own computing. This requires them to send their data to the server,
+which does their computing for them and sends the results back to
+them. SaaSS is an injustice because the users cannot control their
+computing when it's done that way.</p>
<p>If some program on this server is released under the GNU Affero
-GPL, it requires that the users have a way to download the
-corresponding source of that program. That is good, but having this
-source code does not give them control over the computing the server
-does for them. It also does not tell them what other software may be
-running on that server, examining or changing their data in other
-ways.</p>
+GPL, the server is required to offer the users the corresponding
+source of that program. That is good, but having this source code
+does not give them control over the computing done on that server. It
+also does not tell them what other software may be running on that
+server, examining or changing their data in other ways.</p>
+
+<p>We don't see any sensible way to address the SaaSS problem with
+license conditions on particular programs. Even to write a legal
+condition to distinguish between SaaSS use and non-SaaSS use would be
+a challenge, and if we had that, it is not clear what we would want to
+require in the SaaSS case. Thus, our solution to the problem of SaaSS
+is simple: refuse to use it.</p>
+
+<p>If a program is meant specifically and only for SaaSS, you
+shouldn't write it. But many programs are useful for a variety of
+kinds of services, including some that are SaaSS and some that are
+not. It's useful to write and release these programs so people can
+set up non-SaaSS services with them, and good to release them under
+the AGPL.</p>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
@@ -118,7 +128,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/07/29 13:09:54 $
+$Date: 2013/11/21 07:07:55 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/why-affero-gpl.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/why-affero-gpl.ru.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- licenses/po/why-affero-gpl.ru.po 21 Nov 2013 06:44:12 -0000 1.11
+++ licenses/po/why-affero-gpl.ru.po 21 Nov 2013 07:08:02 -0000 1.12
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2013-11-20 16:32+0000\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"
@@ -118,23 +117,10 @@
"does-that-server-really-serve.html\"> Service as a Software Substitute "
"(SaaSS)</a>."
msgstr ""
-"GNU GPL не ÑеÑÐ°ÐµÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ <a href=\"/philosophy/who-"
-"does-that-server-really-serve.html\"> ÑÑлÑги-заменÑ
пÑогÑамм</a>."
+"GNU GPL не ÑеÑÐ°ÐµÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ <a
href=\"/philosophy/who-does-that-server-really-"
+"serve.html\"> ÑÑлÑги-Ð·Ð°Ð¼ÐµÐ½Ñ Ð¿ÑогÑамм</a>."
#. type: Content of: <p>
-# | SaaS{+S+} means [-the-] {+that users+} use [-of someone's network server,
-# | by others,-] {+someone else's web server+} to do [-work which is-] their
-# | own computing. [-They have-] {+This requires them+} to send their data
-# | to the server, which does their computing for them[-,-] and sends the
-# | results back to them. SaaS{+S+} is [-a problem-] {+an injustice+} because
-# | the users cannot control [-the-] {+their+} computing [-which the server
-# | does for them.-] {+when it's done that way.+}
-#| msgid ""
-#| "SaaS means the use of someone's network server, by others, to do work "
-#| "which is their own computing. They have to send their data to the "
-#| "server, which does their computing for them, and sends the results back "
-#| "to them. SaaS is a problem because the users cannot control the "
-#| "computing which the server does for them."
msgid ""
"SaaSS means that users use someone else's web server to do their own "
"computing. This requires them to send their data to the server, which does "
@@ -142,28 +128,14 @@
"injustice because the users cannot control their computing when it's done "
"that way."
msgstr ""
-"УÑлÑга-замена пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ÑазÑмеваеÑ,
ÑÑо лÑди полÑзÑÑÑÑÑ ÑÑим-Ñо ÑÑжим ÑеÑвеÑом "
-"Ð´Ð»Ñ Ñого, пÑоводиÑÑ Ñвои ÑобÑÑвеннÑе
вÑÑиÑлениÑ. ÐÐ»Ñ ÑÑого ÑÑебÑеÑÑÑ, ÑÑÐ¾Ð±Ñ Ð¾Ð½Ð¸"
-"поÑÑлали Ñвои даннÑе на ÑеÑвеÑ, коÑоÑÑй
вÑполнÑÐµÑ Ð´Ð»Ñ Ð½Ð¸Ñ
"
-"обÑабоÑÐºÑ Ð¸ поÑÑÐ»Ð°ÐµÑ Ð¸Ð¼ назад ÑезÑлÑÑаÑÑ.
УÑлÑги-Ð·Ð°Ð¼ÐµÐ½Ñ Ð¿ÑогÑамм — "
-"ÑÑо неÑпÑаведливоÑÑÑ, поÑÐ¾Ð¼Ñ ÑÑо
полÑзоваÑели не могÑÑ ÐºÐ¾Ð½ÑÑолиÑоваÑÑ Ñвои "
-"вÑÑиÑлениÑ, когда они пÑоводÑÑÑÑ Ñаким
обÑазом."
-
-#. type: Content of: <p>
-# | If some program on this server is released under the GNU Affero GPL, [-it
-# | requires that-] the [-users have a way-] {+server is required+} to
-# | [-download-] {+offer the users+} the corresponding source of that program.
-# | That is good, but having this source code does not give them control over
-# | the computing [-the server does for them.-] {+done on that server.+} It
-# | also does not tell them what other software may be running on that server,
-# | examining or changing their data in other ways.
-#| msgid ""
-#| "If some program on this server is released under the GNU Affero GPL, it "
-#| "requires that the users have a way to download the corresponding source "
-#| "of that program. That is good, but having this source code does not give "
-#| "them control over the computing the server does for them. It also does "
-#| "not tell them what other software may be running on that server, "
-#| "examining or changing their data in other ways."
+"УÑлÑга-замена пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ÑазÑмеваеÑ,
ÑÑо лÑди полÑзÑÑÑÑÑ ÑÑим-Ñо ÑÑжим "
+"ÑеÑвеÑом Ð´Ð»Ñ Ñого, пÑоводиÑÑ Ñвои
ÑобÑÑвеннÑе вÑÑиÑлениÑ. ÐÐ»Ñ ÑÑого "
+"ÑÑебÑеÑÑÑ, ÑÑÐ¾Ð±Ñ Ð¾Ð½Ð¸Ð¿Ð¾ÑÑлали Ñвои даннÑе
на ÑеÑвеÑ, коÑоÑÑй вÑполнÑÐµÑ Ð´Ð»Ñ "
+"ниÑ
обÑабоÑÐºÑ Ð¸ поÑÑÐ»Ð°ÐµÑ Ð¸Ð¼ назад
ÑезÑлÑÑаÑÑ. УÑлÑги-Ð·Ð°Ð¼ÐµÐ½Ñ Ð¿ÑогÑамм "
+"— ÑÑо неÑпÑаведливоÑÑÑ, поÑÐ¾Ð¼Ñ ÑÑо
полÑзоваÑели не могÑÑ "
+"конÑÑолиÑоваÑÑ Ñвои вÑÑиÑлениÑ, когда они
пÑоводÑÑÑÑ Ñаким обÑазом."
+
+#. type: Content of: <p>
msgid ""
"If some program on this server is released under the GNU Affero GPL, the "
"server is required to offer the users the corresponding source of that "
@@ -173,11 +145,11 @@
"their data in other ways."
msgstr ""
"ÐÑли какаÑ-Ñо пÑогÑамма на Ñаком ÑеÑвеÑе
вÑпÑÑкаеÑÑÑ Ð¿Ð¾Ð´ GNU GPL ÐÑÑеÑо, "
-"ÑеÑÐ²ÐµÑ Ð´Ð¾Ð»Ð¶ÐµÐ½ пÑедлагаÑÑ Ð¿Ð¾Ð»ÑзоваÑелÑм "
-"ÑооÑвеÑÑÑвÑÑÑий иÑÑ
однÑй ÑекÑÑ ÑÑой
пÑогÑаммÑ. ÐÑо Ñ
оÑоÑо, но ÑÑо не Ð´Ð°ÐµÑ Ð¸Ð¼ "
-"конÑÑÐ¾Ð»Ñ Ð½Ð°Ð´ вÑÑиÑлениÑми, коÑоÑÑе
пÑоводÑÑÑÑ Ð½Ð° ÑÑом ÑеÑвеÑе. ÐÑого Ñакже "
-"не доÑÑаÑоÑно, ÑÑÐ¾Ð±Ñ Ð¾Ð½Ð¸ могли знаÑÑ,
какие дÑÑгие пÑогÑÐ°Ð¼Ð¼Ñ Ð¼Ð¾Ð³ÑÑ Ð½Ð° ÑÑом "
-"ÑеÑвеÑе вÑполнÑÑÑÑÑ, инÑпекÑиÑоваÑÑ Ð¸Ð»Ð¸
изменÑÑÑ Ð¸Ñ
даннÑе."
+"ÑеÑÐ²ÐµÑ Ð´Ð¾Ð»Ð¶ÐµÐ½ пÑедлагаÑÑ Ð¿Ð¾Ð»ÑзоваÑелÑм
ÑооÑвеÑÑÑвÑÑÑий иÑÑ
однÑй ÑекÑÑ ÑÑой "
+"пÑогÑаммÑ. ÐÑо Ñ
оÑоÑо, но ÑÑо не Ð´Ð°ÐµÑ Ð¸Ð¼
конÑÑÐ¾Ð»Ñ Ð½Ð°Ð´ вÑÑиÑлениÑми, коÑоÑÑе "
+"пÑоводÑÑÑÑ Ð½Ð° ÑÑом ÑеÑвеÑе. ÐÑого Ñакже не
доÑÑаÑоÑно, ÑÑÐ¾Ð±Ñ Ð¾Ð½Ð¸ могли "
+"знаÑÑ, какие дÑÑгие пÑогÑÐ°Ð¼Ð¼Ñ Ð¼Ð¾Ð³ÑÑ Ð½Ð°
ÑÑом ÑеÑвеÑе вÑполнÑÑÑÑÑ, "
+"инÑпекÑиÑоваÑÑ Ð¸Ð»Ð¸ изменÑÑÑ Ð¸Ñ
даннÑе."
#. type: Content of: <p>
msgid ""
@@ -188,8 +160,8 @@
"case. Thus, our solution to the problem of SaaSS is simple: refuse to use "
"it."
msgstr ""
-"ÐÑ Ð½Ðµ знаем никакого ÑазÑмного ÑпоÑоба
ÑеÑиÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ ÑÑлÑг-замен пÑогÑамм Ñ "
-"помоÑÑÑ ÑÑловий лиÑензиÑованиÑ
конкÑеÑнÑÑ
пÑогÑамм. Ðаже ÑоÑÑавиÑÑ "
+"ÐÑ Ð½Ðµ знаем никакого ÑазÑмного ÑпоÑоба
ÑеÑиÑÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ ÑÑлÑг-замен пÑогÑамм "
+"Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÑÑловий лиÑензиÑованиÑ
конкÑеÑнÑÑ
пÑогÑамм. Ðаже ÑоÑÑавиÑÑ "
"ÑÑидиÑеÑкие ÑÑловиÑ, в коÑоÑÑÑ
ÑÑлÑги-Ð·Ð°Ð¼ÐµÐ½Ñ Ð¿ÑогÑамм оÑгÑаниÑиваÑÑÑÑ Ð¾Ñ "
"вÑего оÑÑалÑного, бÑло Ð±Ñ Ð½ÐµÐ»ÐµÐ³ÐºÐ¾, и еÑли
Ð±Ñ Ñ Ð½Ð°Ñ Ð¾Ð½Ð¸ бÑли, неÑÑно, ÑÑо "
"нÑжно ÑÑебоваÑÑ Ð² ÑлÑÑае ÑÑлÑг-замен
пÑогÑамм. Таким обÑазом, наÑе ÑеÑение "
@@ -204,12 +176,12 @@
"them, and good to release them under the AGPL."
msgstr ""
"ÐÑли пÑогÑамма пÑедназнаÑена ÑпеÑиалÑно
и иÑклÑÑиÑелÑно Ð´Ð»Ñ ÑÑлÑги-Ð·Ð°Ð¼ÐµÐ½Ñ "
-"пÑогÑаммÑ, Ð²Ñ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ñ ÐµÐµ пиÑаÑÑ. Ðо
многие пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð»ÐµÐ·Ð½Ñ Ð´Ð»Ñ Ð½ÐµÐºÐ¾ÑоÑого "
-"ÑпекÑÑа ÑÑлÑг, некоÑоÑÑе из коÑоÑÑÑ
ÑвлÑÑÑÑÑ ÑÑлÑгами-заменами пÑогÑамм, а "
-"некоÑоÑÑе не ÑвлÑÑÑÑÑ. Такие пÑогÑаммÑ
полезно пиÑаÑÑ Ð¸ вÑпÑÑкаÑÑ Ñ Ñем, "
-"ÑÑÐ¾Ð±Ñ Ð»Ñди могли оÑганизовÑваÑÑ Ñ Ð¸Ñ
помоÑÑÑ ÑлÑжбÑ, не ÑвлÑÑÑиеÑÑ "
-"ÑÑлÑгами-заменами пÑогÑамм; в ÑÑом ÑлÑÑае
пÑогÑÐ°Ð¼Ð¼Ñ Ñ
оÑоÑо вÑпÑÑкаÑÑ Ð¿Ð¾Ð´ "
-"AGPL."
+"пÑогÑаммÑ, Ð²Ñ Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ñ ÐµÐµ пиÑаÑÑ. Ðо
многие пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð»ÐµÐ·Ð½Ñ Ð´Ð»Ñ "
+"некоÑоÑого ÑпекÑÑа ÑÑлÑг, некоÑоÑÑе из
коÑоÑÑÑ
ÑвлÑÑÑÑÑ ÑÑлÑгами-заменами "
+"пÑогÑамм, а некоÑоÑÑе не ÑвлÑÑÑÑÑ. Такие
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð»ÐµÐ·Ð½Ð¾ пиÑаÑÑ Ð¸ "
+"вÑпÑÑкаÑÑ Ñ Ñем, ÑÑÐ¾Ð±Ñ Ð»Ñди могли
оÑганизовÑваÑÑ Ñ Ð¸Ñ
помоÑÑÑ ÑлÑжбÑ, не "
+"ÑвлÑÑÑиеÑÑ ÑÑлÑгами-заменами пÑогÑамм; в
ÑÑом ÑлÑÑае пÑогÑÐ°Ð¼Ð¼Ñ Ñ
оÑоÑо "
+"вÑпÑÑкаÑÑ Ð¿Ð¾Ð´ AGPL."
# type: Content of: <div><div>
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
Index: philosophy/essays-and-articles.ru.html
===================================================================
RCS file: /web/www/www/philosophy/essays-and-articles.ru.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- philosophy/essays-and-articles.ru.html 6 Nov 2013 13:29:57 -0000
1.40
+++ philosophy/essays-and-articles.ru.html 21 Nov 2013 07:08:44 -0000
1.41
@@ -55,6 +55,7 @@
допÑÑÑима!</li>
<li><a href="/philosophy/categories.html">ÐаÑегоÑии
ÑвободнÑÑ
и неÑвободнÑÑ
пÑогÑамм</a></li>
+ <li><a href="/philosophy/floss-and-foss.html"> FLOSS и FOSS</a></li>
<li><a href="/software/reliability.html">СвободнÑе
пÑогÑÐ°Ð¼Ð¼Ñ Ð½Ð°Ð´ÐµÐ¶Ð½ÐµÐµ!</a></li>
<li><a href="/philosophy/when_free_software_isnt_practically_better.html">
Ðогда
ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿ÑогÑамма (пÑакÑиÑеÑки) не
лÑÑÑе</a></li>
@@ -569,7 +570,7 @@
<p><!-- timestamp start -->
Ðбновлено:
-$Date: 2013/11/06 13:29:57 $
+$Date: 2013/11/21 07:08:44 $
<!-- timestamp end -->
</p>
Index: philosophy/latest-articles.ru.html
===================================================================
RCS file: /web/www/www/philosophy/latest-articles.ru.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- philosophy/latest-articles.ru.html 6 Nov 2013 13:29:57 -0000 1.26
+++ philosophy/latest-articles.ru.html 21 Nov 2013 07:08:50 -0000 1.27
@@ -19,6 +19,7 @@
<!-- id="education-content" -->
<p>ÐÑÑмо из-под пÑеÑÑа: поÑледние ÑÑаÑÑи о
ÑвободнÑÑ
пÑогÑаммаÑ
и пÑоекÑе GNU.</p>
<ul>
+<li><a href="/philosophy/floss-and-foss.html"> FLOSS и FOSS</a></li>
<li><a href="/philosophy/free-software-even-more-important.html"> СейÑаÑ
ÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ ÐµÑе важнее</a></li>
<li><a href="/philosophy/surveillance-vs-democracy.html">СколÑко
Ñлежки можеÑ
@@ -149,7 +150,7 @@
<p><!-- timestamp start -->
Ðбновлено:
-$Date: 2013/11/06 13:29:57 $
+$Date: 2013/11/21 07:08:50 $
<!-- timestamp end -->
</p>
Index: philosophy/open-source-misses-the-point.ru.html
===================================================================
RCS file: /web/www/www/philosophy/open-source-misses-the-point.ru.html,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- philosophy/open-source-misses-the-point.ru.html 1 Nov 2013 08:29:11
-0000 1.48
+++ philosophy/open-source-misses-the-point.ru.html 21 Nov 2013 07:08:50
-0000 1.49
@@ -374,6 +374,15 @@
ÑÑкÑ, поддеÑÐ¶Ð¸Ð²Ð°Ñ Ð´ÑÑг дÑÑга. ЧÑобÑ
пÑеодолеÑÑ ÑÑÑ ÑенденÑиÑ, нам нÑжно
болÑÑе, а не менÑÑе, говоÑиÑÑ Ð¾ Ñвободе.</p>
+<h3>“FLOSS” и “FOSS”</h3>
+
+<p> ÐÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ “FLOSS” и “FOSS”
иÑполÑзÑÑÑÑÑ, ÑÑобÑ
+ÑоÑ
ÑанÑÑÑ <a href="/philosophy/floss-and-foss.html">
нейÑÑалиÑÐµÑ Ð¼ÐµÐ¶Ð´Ñ
+ÑвободнÑми пÑогÑаммими и оÑкÑÑÑÑм иÑÑ
однÑм ÑекÑÑом</a>. ÐÑли ваÑа
+ÑÐµÐ»Ñ — нейÑÑалиÑеÑ, Ñо “FLOSS”
доÑÑÐ¸Ð³Ð°ÐµÑ ÑÑого
+лÑÑÑе. Ðо еÑли Ð²Ñ Ñ
оÑиÑе оÑÑÑаиваÑÑ
ÑвободÑ, Ñо ÑÑи нейÑÑалÑнÑе вÑÑажениÑ
+вам не подойдÑÑ.</p>
+
<h3>ÐаклÑÑение</h3>
<p>Ðогда ÑÑоÑонники оÑкÑÑÑого иÑÑ
одного
ÑекÑÑа вÑÑгиваÑÑ Ð½Ð¾Ð²ÑÑ
полÑзоваÑелей в
@@ -462,7 +471,7 @@
<p><!-- timestamp start -->
Ðбновлено:
-$Date: 2013/11/01 08:29:11 $
+$Date: 2013/11/21 07:08:50 $
<!-- timestamp end -->
</p>
Index: philosophy/words-to-avoid.ru.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.ru.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- philosophy/words-to-avoid.ru.html 1 Nov 2013 08:29:12 -0000 1.31
+++ philosophy/words-to-avoid.ru.html 21 Nov 2013 07:08:51 -0000 1.32
@@ -52,8 +52,9 @@
lang="en">Digital Rights Management</span> (ÑиÑÑовое
ÑпÑавление
пÑавами)</a>” | “ <a href="#Ecosystem"> <span xml:lang="en"
lang="en">Ecosystem</span> (ÑкоÑиÑÑема)</a>” | “<a
-href="#ForFree"><span xml:lang="en" lang="en">For Free</span>
-(беÑплаÑно)</a>” | “<a href="#FreelyAvailable"><span
+href="#FLOSS">FLOSS</a>” | “<a href="#ForFree"><span
+xml:lang="en" lang="en">For Free</span> (беÑплаÑно)</a>” |
“<a
+href="#FOSS">FOSS</a>” | “<a href="#FreelyAvailable"><span
xml:lang="en" lang="en">Freely Available</span> (Ñвободно
доÑÑÑпнÑй)</a>” | “<a href="#Freeware"><span xml:lang="en"
lang="en">Freeware</span> (беÑплаÑнÑе пÑогÑаммÑ)</a>”
| “<a
@@ -430,6 +431,14 @@
иÑÑезаÑÑие видÑ, наÑоднÑе пÑомÑÑлÑ... и
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð¿Ð¾Ð»ÑзоваÑелей компÑÑÑеÑов.
</p>
+<h4 id="FLOSS">“FLOSS”</h4>
+<p>
+ÐÑÑажение “FLOSS” пÑидÑмано как ÑпоÑоб
<a
+href="/philosophy/floss-and-foss.html"> ÑоÑ
ÑанÑÑÑ
нейÑÑалиÑÐµÑ Ð¼ÐµÐ¶Ð´Ñ
+ÑвободнÑми пÑогÑаммами и оÑкÑÑÑÑм иÑÑ
однÑм ÑекÑÑом</a>. ÐÑли ваÑа
+ÑÐµÐ»Ñ — нейÑÑалиÑеÑ, Ñо лÑÑÑе вÑего
ÑÑого доÑÑÐ¸Ð³Ð°ÐµÑ Ð²ÑÑажение
+“FLOSS”. Ðо еÑли Ð²Ñ Ñ
оÑиÑе показаÑÑ, ÑÑо
оÑÑÑаиваеÑе ÑвободÑ, не
+полÑзÑйÑеÑÑ Ð½ÐµÐ¹ÑÑалÑнÑм вÑÑажением.</p>
<h4 id="ForFree">“<span xml:lang="en" lang="en">For Free</span>
(беÑплаÑно)”</h4>
<p>
@@ -447,6 +456,14 @@
ЧÑÐ¾Ð±Ñ Ð¸Ð·Ð±ÐµÐ¶Ð°ÑÑ Ð¿ÑÑаниÑÑ, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе
говоÑиÑÑ, ÑÑо пÑогÑамма доÑÑÑпна
“как ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿ÑогÑамма”.</p>
+<h4 id="FOSS">“FOSS”</h4>
+<p>
+ÐÑÑажение “FOSS” пÑидÑмано как ÑпоÑоб <a
+href="/philosophy/floss-and-foss.html"> ÑоÑ
ÑанÑÑÑ
нейÑÑалиÑÐµÑ Ð¼ÐµÐ¶Ð´Ñ
+ÑвободнÑми пÑогÑаммами и оÑкÑÑÑÑм иÑÑ
однÑм ÑекÑÑом</a>, но в
+дейÑÑвиÑелÑноÑÑи ÑÑого не пÑоиÑÑ
одиÑ.
ÐÑли ваÑа ÑÐµÐ»Ñ —
+нейÑÑалиÑеÑ, Ñо вÑÑажение “FLOSS“
лÑÑÑе. Ðо еÑли Ð²Ñ Ñ
оÑиÑе
+показаÑÑ, ÑÑо оÑÑÑаиваеÑе ÑвободÑ, не
полÑзÑйÑеÑÑ Ð½ÐµÐ¹ÑÑалÑнÑм вÑÑажением.</p>
<h4 id="FreelyAvailable">“<span xml:lang="en" lang="en">Freely
Available</span> (Ñвободно
доÑÑÑпнÑй)”</h4>
@@ -923,7 +940,7 @@
<p><!-- timestamp start -->
Ðбновлено:
-$Date: 2013/11/01 08:29:12 $
+$Date: 2013/11/21 07:08:51 $
<!-- timestamp end -->
</p>
Index: philosophy/po/essays-and-articles.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ru-en.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- philosophy/po/essays-and-articles.ru-en.html 6 Nov 2013 13:29:57
-0000 1.37
+++ philosophy/po/essays-and-articles.ru-en.html 21 Nov 2013 07:09:22
-0000 1.38
@@ -47,6 +47,7 @@
<li><a href="/philosophy/selling.html">Selling Free Software</a> is OK!</li>
<li><a href="/philosophy/categories.html">Categories of Free and
Non-Free Software</a></li>
+ <li><a href="/philosophy/floss-and-foss.html"> FLOSS and FOSS</a></li>
<li><a href="/software/reliability.html">Free Software is More
Reliable!</a></li>
<li><a href="/philosophy/when_free_software_isnt_practically_better.html">When
Free Software Isn't (Practically) Better</a></li>
<li><a href="/philosophy/open-source-misses-the-point.html">Why
@@ -507,7 +508,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/11/06 13:29:57 $
+$Date: 2013/11/21 07:09:22 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/essays-and-articles.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ru.po,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- philosophy/po/essays-and-articles.ru.po 21 Nov 2013 06:44:11 -0000
1.77
+++ philosophy/po/essays-and-articles.ru.po 21 Nov 2013 07:09:59 -0000
1.78
@@ -16,7 +16,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2013-11-21 04:25+0000\n"
#. type: Content of: <title>
msgid "Essays and Articles - GNU Project - Free Software Foundation"
@@ -118,10 +117,6 @@
"пÑогÑамм</a>"
#. type: Content of: <ul><li>
-# | <a [-href=\"/philosophy/my_doom.html\">MyDoom-]
-# | {+href=\"/philosophy/floss-and-foss.html\"> FLOSS+} and [-You</a>-]
-# | {+FOSS</a>+}
-#| msgid "<a href=\"/philosophy/my_doom.html\">MyDoom and You</a>"
msgid "<a href=\"/philosophy/floss-and-foss.html\"> FLOSS and FOSS</a>"
msgstr "<a href=\"/philosophy/floss-and-foss.html\"> FLOSS и FOSS</a>"
Index: philosophy/po/free-open-overlap.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-open-overlap.ru.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/free-open-overlap.ru.po 21 Nov 2013 06:47:12 -0000
1.3
+++ philosophy/po/free-open-overlap.ru.po 21 Nov 2013 07:10:17 -0000
1.4
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2013-07-13 18:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -30,64 +29,16 @@
msgstr "СооÑноÑение ÑвободнÑÑ
пÑогÑамм и
оÑкÑÑÑого иÑÑ
одного ÑекÑÑа "
#. type: Content of: <p>
-# | Here's how [-free-] {+<a
-# | href=\"/philosophy/open-source-misses-the-point.html\">free+} software and
-# | open [-source-] {+source</a>+} relate as categories of programs:
-#| msgid ""
-#| "Here's how free software and open source relate as categories of programs:"
msgid ""
"Here's how <a href=\"/philosophy/open-source-misses-the-point.html\">free "
"software and open source</a> relate as categories of programs:"
msgstr ""
-"ÐÐ¾Ñ ÐºÐ°Ðº ÑооÑноÑÑÑÑÑ Ð´ÑÑг Ñ Ð´ÑÑгом
множеÑÑва <a
href=\"/philosophy/open-source-misses-the-point.html\">ÑвободнÑÑ
пÑогÑамм и оÑкÑÑÑого "
-"иÑÑ
одного ÑекÑÑа</a>:"
+"ÐÐ¾Ñ ÐºÐ°Ðº ÑооÑноÑÑÑÑÑ Ð´ÑÑг Ñ Ð´ÑÑгом
множеÑÑва <a href=\"/philosophy/open-"
+"source-misses-the-point.html\">ÑвободнÑÑ
пÑогÑамм и
оÑкÑÑÑого иÑÑ
одного "
+"ÑекÑÑа</a>:"
#. type: Content of: <pre>
-# | <code>\n [-----------------------------------------------\n-]
-# | {+/----------------------------------------------\\n+} / |
-# | | [-\ \n-] {+\\n+} / |
-# | | [-\ \n-] {+\\n |+}
-# | | {+\\n+} | {+|+}\n |
-# | {+|\n+} | [-\n-]
-# | {+|\nfree+} |
-# | {+|\n+} | {+|+}\n |
-# | | open source\n |
-# | {+|\n+} | [-\nfree |
-# | | \n | |
-# | \n |-] {+|\n \+} |
-# | [-\n-] {+|\n \+} |
-# | {+|\n
-# | \----------------------------------------------\n+} | [-\n-]
-# | | | {+/+}\n |
-# | {+tivoized (tyrant) devices+} | [-\n \-] {+O+} | {+/\n+}
-# | | [-\n \-] | |
-# | [-\n -----------------------------------------------] /\n [-|
-# | tivoized devices |o| /
-# | \n ----------------------------------------------\n</code>\n-]
-# | {+----------------------------------------------/\n</code>\n+}
#, no-wrap
-#| msgid ""
-#| "<code>\n"
-#| " ----------------------------------------------\n"
-#| " / | | \\ \n"
-#| " / | | \\ \n"
-#| "\t| | \n"
-#| "\t| | \n"
-#| "\t| | \n"
-#| "\t| | open source\n"
-#| "\t| | \n"
-#| "free\t| | \n"
-#| "\t| | \n"
-#| "\t| | \n"
-#| "\t| | \n"
-#| "\t| | \n"
-#| "\t| | \n"
-#| " \\ | | \n"
-#| " \\ | | \n"
-#| " ---------------------------------------------- /\n"
-#| "\t| tivoized devices |o| / \n"
-#| "\t----------------------------------------------\n"
-#| "</code>\n"
msgid ""
"<code>\n"
" /----------------------------------------------\\\n"
@@ -145,22 +96,15 @@
"ÑиÑаниÑеÑкими, но некоÑоÑÑе ÑаковÑми не
ÑвлÑÑÑÑÑ."
#. type: Content of: <p>
-# | “O” stands for “other” and refers to programs
-# | whose source is under [-licenses-] {+<a
-# | href=\"/licenses/license-list.html#NonFreeSoftwareLicenses\">licenses+}
-# | which are open source but not [-free.-] {+free</a>.+}
-#| msgid ""
-#| "“O” stands for “other” and refers to programs "
-#| "whose source is under licenses which are open source but not free."
msgid ""
"“O” stands for “other” and refers to programs whose "
"source is under <a href=\"/licenses/license-list.html#NonFreeSoftwareLicenses"
"\">licenses which are open source but not free</a>."
msgstr ""
"“ÐÑоÑие” обознаÑÐ°ÐµÑ Ð¿ÑогÑаммÑ, иÑÑ
однÑй ÑекÑÑ ÐºÐ¾ÑоÑÑÑ
"
-"ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð¿Ð¾Ð´ лиÑензиÑми, коÑоÑÑе
ÑвлÑÑÑÑÑ <a href=\"/licenses/license-list.html#NonFreeSoftwareLicenses"
-"\">лиÑензиÑми оÑкÑÑÑого "
-"иÑÑ
одного ÑекÑÑа, но не ÑвлÑÑÑÑÑ
лиÑензиÑми ÑвободнÑÑ
пÑогÑамм</a>."
+"ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð¿Ð¾Ð´ лиÑензиÑми, коÑоÑÑе
ÑвлÑÑÑÑÑ <a href=\"/licenses/"
+"license-list.html#NonFreeSoftwareLicenses\">лиÑензиÑми
оÑкÑÑÑого иÑÑ
одного "
+"ÑекÑÑа, но не ÑвлÑÑÑÑÑ Ð»Ð¸ÑензиÑми
ÑвободнÑÑ
пÑогÑамм</a>."
# type: Content of: <div><div>
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
Index: philosophy/po/free-open-overlap.translist
===================================================================
RCS file: /web/www/www/philosophy/po/free-open-overlap.translist,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/free-open-overlap.translist 17 Jul 2013 19:33:15 -0000
1.3
+++ philosophy/po/free-open-overlap.translist 21 Nov 2013 07:10:17 -0000
1.4
@@ -5,6 +5,7 @@
<span dir="ltr" class="original"><a lang="en" hreflang="en"
href="/philosophy/free-open-overlap.en.html">English</a> [en]</span>
<span dir="ltr"><a lang="de" hreflang="de"
href="/philosophy/free-open-overlap.de.html">Deutsch</a> [de]</span>
<span dir="ltr"><a lang="fr" hreflang="fr"
href="/philosophy/free-open-overlap.fr.html">français</a> [fr]</span>
+<span dir="ltr"><a lang="ru" hreflang="ru"
href="/philosophy/free-open-overlap.ru.html">ÑÑÑÑкий</a> [ru]</span>
</p>
</div>' -->
<!--#if expr="$HTML_BODY = yes" -->
Index: philosophy/po/latest-articles.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/latest-articles.ru-en.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/po/latest-articles.ru-en.html 6 Nov 2013 13:29:58 -0000
1.23
+++ philosophy/po/latest-articles.ru-en.html 21 Nov 2013 07:10:18 -0000
1.24
@@ -15,6 +15,7 @@
<p>Hot off the presses, here are the latest published articles on free
software and the GNU project.</p>
<ul>
+<li><a href="/philosophy/floss-and-foss.html"> FLOSS and FOSS</a></li>
<li><a href="/philosophy/free-software-even-more-important.html">
Free Software Is Even More Important Now</a></li>
<li><a href="/philosophy/surveillance-vs-democracy.html">How Much
@@ -120,7 +121,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/11/06 13:29:58 $
+$Date: 2013/11/21 07:10:18 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/latest-articles.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/latest-articles.ru.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- philosophy/po/latest-articles.ru.po 21 Nov 2013 06:44:11 -0000 1.38
+++ philosophy/po/latest-articles.ru.po 21 Nov 2013 07:10:18 -0000 1.39
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2013-11-21 04:25+0000\n"
#. type: Content of: <title>
msgid "Latest Articles - GNU Project - Free Software Foundation"
@@ -33,9 +32,6 @@
"ÐÑÑмо из-под пÑеÑÑа: поÑледние ÑÑаÑÑи о
ÑвободнÑÑ
пÑогÑаммаÑ
и пÑоекÑе GNU."
#. type: Content of: <ul><li>
-# | <a [-href=\"/philosophy/stallmans-law.html\">Stallman's Law</a>-]
-# | {+href=\"/philosophy/floss-and-foss.html\"> FLOSS and FOSS</a>+}
-#| msgid "<a href=\"/philosophy/stallmans-law.html\">Stallman's Law</a>"
msgid "<a href=\"/philosophy/floss-and-foss.html\"> FLOSS and FOSS</a>"
msgstr "<a href=\"/philosophy/floss-and-foss.html\"> FLOSS и FOSS</a>"
Index: philosophy/po/open-source-misses-the-point.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/open-source-misses-the-point.ru-en.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- philosophy/po/open-source-misses-the-point.ru-en.html 22 Sep 2013
04:29:18 -0000 1.27
+++ philosophy/po/open-source-misses-the-point.ru-en.html 21 Nov 2013
07:10:18 -0000 1.28
@@ -337,6 +337,14 @@
about freedom go hand in hand, each promoting the other. To overcome
this tendency, we need more, not less, talk about freedom.</p>
+<h3>“FLOSS” and “FOSS”</h3>
+
+<p> The terms “FLOSS” and “FOSS” are used to
+be <a href="/philosophy/floss-and-foss.html"> neutral between free
+software and open source</a>. If neutrality is your goal,
+“FLOSS” does it better. But if you want to stand up for
+freedom, using these neutral terms is not the way to do it.</p>
+
<h3>Conclusion</h3>
<p>As the advocates of open source draw new users into our community,
@@ -404,7 +412,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/09/22 04:29:18 $
+$Date: 2013/11/21 07:10:18 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/open-source-misses-the-point.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/open-source-misses-the-point.ru.po,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- philosophy/po/open-source-misses-the-point.ru.po 21 Nov 2013 06:44:10
-0000 1.57
+++ philosophy/po/open-source-misses-the-point.ru.po 21 Nov 2013 07:10:19
-0000 1.58
@@ -18,7 +18,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2013-11-20 19:25+0000\n"
# type: Content of: <title>
#. type: Content of: <title>
@@ -829,10 +828,9 @@
msgstr ""
"ÐÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ “FLOSS” и “FOSS”
иÑполÑзÑÑÑÑÑ, ÑÑÐ¾Ð±Ñ "
"ÑоÑ
ÑанÑÑÑ <a href=\"/philosophy/floss-and-foss.html\">
нейÑÑалиÑÐµÑ Ð¼ÐµÐ¶Ð´Ñ "
-"ÑвободнÑми пÑогÑаммими и оÑкÑÑÑÑм иÑÑ
однÑм ÑекÑÑом</a>. ÐÑли ваÑа "
-"ÑÐµÐ»Ñ — нейÑÑалиÑеÑ, Ñо “FLOSS”
доÑÑÐ¸Ð³Ð°ÐµÑ ÑÑого лÑÑÑе. "
-"Ðо еÑли Ð²Ñ Ñ
оÑиÑе оÑÑÑаиваÑÑ ÑвободÑ, Ñо
ÑÑи нейÑÑалÑнÑе вÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð²Ð°Ð¼ не "
-"подойдÑÑ."
+"ÑвободнÑми пÑогÑаммими и оÑкÑÑÑÑм иÑÑ
однÑм ÑекÑÑом</a>. ÐÑли ваÑа ÑÐµÐ»Ñ "
+"— нейÑÑалиÑеÑ, Ñо “FLOSS” доÑÑигаеÑ
ÑÑого лÑÑÑе. Ðо еÑли "
+"Ð²Ñ Ñ
оÑиÑе оÑÑÑаиваÑÑ ÑвободÑ, Ñо ÑÑи
нейÑÑалÑнÑе вÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð²Ð°Ð¼ не подойдÑÑ."
# type: Content of: <h3>
#. type: Content of: <h3>
Index: philosophy/po/words-to-avoid.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ru-en.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- philosophy/po/words-to-avoid.ru-en.html 20 Nov 2013 15:10:17 -0000
1.25
+++ philosophy/po/words-to-avoid.ru-en.html 21 Nov 2013 07:10:19 -0000
1.26
@@ -50,8 +50,12 @@
| “<a
href="#Ecosystem">Ecosystem</a>”
| “<a
+ href="#FLOSS">FLOSS</a>”
+| “<a
href="#ForFree">For free</a>”
| “<a
+ href="#FOSS">FOSS</a>”
+| “<a
href="#FreelyAvailable">Freely available</a>”
| “<a
href="#Freeware">Freeware</a>”
@@ -417,6 +421,13 @@
freedom.
</p>
+<h4 id="FLOSS">“FLOSS”</h4>
+<p>
+The term “FLOSS” was coined as a way
+to <a href="/philosophy/floss-and-foss.html"> be neutral between free
+software and open source</a>. If neutrality is your goal,
+“FLOSS” is the best way to be neutral. But if you want to
+show you stand for freedom, don't use a neutral term.</p>
<h4 id="ForFree">“For free”</h4>
<p>
@@ -434,6 +445,13 @@
To avoid confusion, you can say that the program is available
“as free software.”</p>
+<h4 id="FOSS">“FOSS”</h4>
+<p>
+The term “FOSS” was coined as a way
+to <a href="/philosophy/floss-and-foss.html"> be neutral between free
+software and open source</a>, but it doesn't really do that. If
+neutrality is your goal, “FLOSS” is better. But if you
+want to show you stand for freedom, don't use a neutral term.</p>
<h4 id="FreelyAvailable">“Freely available”</h4>
<p>
@@ -846,7 +864,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/11/20 15:10:17 $
+$Date: 2013/11/21 07:10:19 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/words-to-avoid.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ru.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- philosophy/po/words-to-avoid.ru.po 21 Nov 2013 06:44:11 -0000 1.41
+++ philosophy/po/words-to-avoid.ru.po 21 Nov 2013 07:10:37 -0000 1.42
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2013-11-20 19:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -55,75 +54,6 @@
"\"> ÐаÑем назÑваÑÑ ÑÑо “Swindle”?</a>."
#. type: Content of: <p>
-# | <a href=\"/philosophy/philosophy.html\">Other Texts to Read</a> |
-# | “<a href=\"#Alternative\">Alternative</a>” | “<a
-# | href=\"#BSD-style\">BSD-style</a>” | “<a
-# | href=\"#Closed\">Closed</a>” | “<a
-# | href=\"#CloudComputing\">Cloud Computing</a>” | “<a
-# | href=\"#Commercial\">Commercial</a>” | “<a
-# | href=\"#Compensation\">Compensation</a>” | “<a
-# | href=\"#Consume\">Consume</a>” | “<a
-# | href=\"#Consumer\">Consumer</a>” | “<a
-# | href=\"#Content\">Content</a>” | “<a
-# | href=\"#Creator\">Creator</a>” | “<a
-# | href=\"#DigitalGoods\">Digital Goods</a>” | “<a
-# | href=\"#DigitalLocks\">Digital Locks</a>” | “<a
-# | href=\"#DigitalRightsManagement\">Digital Rights Management</a>” |
-# | “<a href=\"#Ecosystem\">Ecosystem</a>” | “<a
-# | {+href=\"#FLOSS\">FLOSS</a>” | “<a+} href=\"#ForFree\">For
-# | free</a>” | “<a {+href=\"#FOSS\">FOSS</a>” | “<a+}
-# | href=\"#FreelyAvailable\">Freely available</a>” | “<a
-# | href=\"#Freeware\">Freeware</a>” | “<a
-# | href=\"#GiveAwaySoftware\">Give away software</a>” | “<a
-# | href=\"#Hacker\">Hacker</a>” | “<a
-# | href=\"#IntellectualProperty\">Intellectual property</a>” |
-# | “<a href=\"#LAMP\">LAMP system</a>” | “<a
-# | href=\"#Linux\">Linux system</a>” | “<a
-# | href=\"#Market\">Market</a>” | “<a
-# | href=\"#Monetize\">Monetize</a>” | “<a href=\"#MP3Player\">MP3
-# | player</a>” | “<a href=\"#Open\">Open</a>” | “<a
-# | href=\"#PC\">PC</a>” | “<a
-# | href=\"#Photoshop\">Photoshop</a>” | “<a
-# | href=\"#Piracy\">Piracy</a>” | “<a
-# | href=\"#PowerPoint\">PowerPoint</a>” | “<a
-# | href=\"#Protection\">Protection</a>” | “<a
-# | href=\"#RAND\">RAND</a>” | “<a href=\"#SellSoftware\">Sell
-# | software</a>” | “<a href=\"#SoftwareIndustry\">Software
-# | Industry</a>” | “<a href=\"#Theft\">Theft</a>” |
-# | “<a href=\"#TrustedComputing\">Trusted Computing</a>” |
-# | “<a href=\"#Vendor\">Vendor</a>”
-#| msgid ""
-#| "<a href=\"/philosophy/philosophy.html\">Other Texts to Read</a> | “"
-#| "<a href=\"#Alternative\">Alternative</a>” | “<a href=\"#BSD-"
-#| "style\">BSD-style</a>” | “<a href=\"#Closed\">Closed</"
-#| "a>” | “<a href=\"#CloudComputing\">Cloud Computing</a>” "
-#| "| “<a href=\"#Commercial\">Commercial</a>” | “<a href="
-#| "\"#Compensation\">Compensation</a>” | “<a href=\"#Consume"
-#| "\">Consume</a>” | “<a href=\"#Consumer\">Consumer</a>” "
-#| "| “<a href=\"#Content\">Content</a>” | “<a href="
-#| "\"#Creator\">Creator</a>” | “<a href=\"#DigitalGoods"
-#| "\">Digital Goods</a>” | “<a href=\"#DigitalLocks\">Digital "
-#| "Locks</a>” | “<a href=\"#DigitalRightsManagement\">Digital "
-#| "Rights Management</a>” | “<a href=\"#Ecosystem\">Ecosystem</"
-#| "a>” | “<a href=\"#ForFree\">For free</a>” | “<a "
-#| "href=\"#FreelyAvailable\">Freely available</a>” | “<a href="
-#| "\"#Freeware\">Freeware</a>” | “<a href=\"#GiveAwaySoftware"
-#| "\">Give away software</a>” | “<a href=\"#Hacker\">Hacker</"
-#| "a>” | “<a href=\"#IntellectualProperty\">Intellectual "
-#| "property</a>” | “<a href=\"#LAMP\">LAMP system</a>” | "
-#| "“<a href=\"#Linux\">Linux system</a>” | “<a href="
-#| "\"#Market\">Market</a>” | “<a href=\"#Monetize\">Monetize</"
-#| "a>” | “<a href=\"#MP3Player\">MP3 player</a>” | “"
-#| "<a href=\"#Open\">Open</a>” | “<a href=\"#PC\">PC</a>” "
-#| "| “<a href=\"#Photoshop\">Photoshop</a>” | “<a href="
-#| "\"#Piracy\">Piracy</a>” | “<a href=\"#PowerPoint"
-#| "\">PowerPoint</a>” | “<a href=\"#Protection\">Protection</"
-#| "a>” | “<a href=\"#RAND\">RAND</a>” | “<a href="
-#| "\"#SellSoftware\">Sell software</a>” | “<a href="
-#| "\"#SoftwareIndustry\">Software Industry</a>” | “<a href="
-#| "\"#Theft\">Theft</a>” | “<a href=\"#TrustedComputing"
-#| "\">Trusted Computing</a>” | “<a href=\"#Vendor\">Vendor</"
-#| "a>”"
msgid ""
"<a href=\"/philosophy/philosophy.html\">Other Texts to Read</a> | “<a "
"href=\"#Alternative\">Alternative</a>” | “<a href=\"#BSD-style"
@@ -178,12 +108,12 @@
"\"#DigitalRightsManagement\"><span xml:lang=\"en\" lang=\"en\">Digital "
"Rights Management</span> (ÑиÑÑовое ÑпÑавление
пÑавами)</a>” | “ "
"<a href=\"#Ecosystem\"> <span xml:lang=\"en\" lang=\"en\">Ecosystem</span> "
-"(ÑкоÑиÑÑема)</a>” | “<a href=\"#FLOSS"
-"\">FLOSS</a>” | “<a href=\"#ForFree\"><span xml:lang=\"en\" "
-"lang=\"en\">For Free</span> (беÑплаÑно)</a>” | “<a
href=\"#FOSS\">FOSS</a>” | “<a href="
-"\"#FreelyAvailable\"><span xml:lang=\"en\" lang=\"en\">Freely Available</"
-"span> (Ñвободно доÑÑÑпнÑй)</a>” | “<a
href=\"#Freeware\"><span "
-"xml:lang=\"en\" lang=\"en\">Freeware</span> (беÑплаÑнÑе
пÑогÑаммÑ)</"
+"(ÑкоÑиÑÑема)</a>” | “<a
href=\"#FLOSS\">FLOSS</a>” | "
+"“<a href=\"#ForFree\"><span xml:lang=\"en\" lang=\"en\">For Free</"
+"span> (беÑплаÑно)</a>” | “<a
href=\"#FOSS\">FOSS</a>” | "
+"“<a href=\"#FreelyAvailable\"><span xml:lang=\"en\" lang=\"en\">Freely "
+"Available</span> (Ñвободно доÑÑÑпнÑй)</a>” | “<a
href=\"#Freeware"
+"\"><span xml:lang=\"en\" lang=\"en\">Freeware</span> (беÑплаÑнÑе
пÑогÑаммÑ)</"
"a>” | “<a href=\"#GiveAwaySoftware\"><span xml:lang=\"en\" lang="
"\"en\">Give Away Software</span> (ÑаздаваÑÑ
пÑогÑаммÑ)</a>” | “ "
"<a href=\"#Hacker\"><span xml:lang=\"en\" lang=\"en\">Hacker</span> (Ñ
акеÑ)</"
@@ -902,8 +832,6 @@
"иÑÑезаÑÑие видÑ, наÑоднÑе пÑомÑÑлÑ... и
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð¿Ð¾Ð»ÑзоваÑелей компÑÑÑеÑов."
#. type: Content of: <h4>
-# | [-“Open”-]{+“FLOSS”+}
-#| msgid "“Open”"
msgid "“FLOSS”"
msgstr "“FLOSS”"
@@ -915,12 +843,11 @@
"neutral. But if you want to show you stand for freedom, don't use a neutral "
"term."
msgstr ""
-"ÐÑÑажение “FLOSS” пÑидÑмано как ÑпоÑоб
<a "
-"href=\"/philosophy/floss-and-foss.html\"> ÑоÑ
ÑанÑÑÑ
нейÑÑалиÑÐµÑ Ð¼ÐµÐ¶Ð´Ñ "
-"ÑвободнÑми пÑогÑаммами и оÑкÑÑÑÑм иÑÑ
однÑм ÑекÑÑом</a>. ÐÑли ваÑа "
-"ÑÐµÐ»Ñ — нейÑÑалиÑеÑ, Ñо лÑÑÑе вÑего
ÑÑого доÑÑÐ¸Ð³Ð°ÐµÑ Ð²ÑÑажение "
-"“FLOSS”. Ðо еÑли Ð²Ñ Ñ
оÑиÑе показаÑÑ, ÑÑо
оÑÑÑаиваеÑе ÑвободÑ, не "
-"полÑзÑйÑеÑÑ Ð½ÐµÐ¹ÑÑалÑнÑм вÑÑажением."
+"ÐÑÑажение “FLOSS” пÑидÑмано как ÑпоÑоб
<a href=\"/philosophy/"
+"floss-and-foss.html\"> ÑоÑ
ÑанÑÑÑ Ð½ÐµÐ¹ÑÑалиÑÐµÑ Ð¼ÐµÐ¶Ð´Ñ
ÑвободнÑми пÑогÑаммами и "
+"оÑкÑÑÑÑм иÑÑ
однÑм ÑекÑÑом</a>. ÐÑли ваÑа
ÑÐµÐ»Ñ — нейÑÑалиÑеÑ, Ñо "
+"лÑÑÑе вÑего ÑÑого доÑÑÐ¸Ð³Ð°ÐµÑ Ð²ÑÑажение
“FLOSS”. Ðо еÑли Ð²Ñ Ñ
оÑиÑе "
+"показаÑÑ, ÑÑо оÑÑÑаиваеÑе ÑвободÑ, не
полÑзÑйÑеÑÑ Ð½ÐµÐ¹ÑÑалÑнÑм вÑÑажением."
#. type: Content of: <h4>
msgid "“For free”"
@@ -961,8 +888,6 @@
"как ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿ÑогÑамма”."
#. type: Content of: <h4>
-# | [-“Open”-]{+“FOSS”+}
-#| msgid "“Open”"
msgid "“FOSS”"
msgstr "“FOSS”"
@@ -974,12 +899,12 @@
"FLOSS” is better. But if you want to show you stand for freedom, "
"don't use a neutral term."
msgstr ""
-"ÐÑÑажение “FOSS” пÑидÑмано как ÑпоÑоб
<a "
-"href=\"/philosophy/floss-and-foss.html\"> ÑоÑ
ÑанÑÑÑ
нейÑÑалиÑÐµÑ Ð¼ÐµÐ¶Ð´Ñ "
-"ÑвободнÑми пÑогÑаммами и оÑкÑÑÑÑм иÑÑ
однÑм ÑекÑÑом</a>, но в дейÑÑвиÑелÑноÑÑи "
-"ÑÑого не пÑоиÑÑ
одиÑ. ÐÑли ваÑа ÑÐµÐ»Ñ —
нейÑÑалиÑеÑ, Ñо вÑÑажение "
-"“FLOSS“ лÑÑÑе. Ðо еÑли Ð²Ñ Ñ
оÑиÑе
показаÑÑ, ÑÑо оÑÑÑаиваеÑе "
-"ÑвободÑ, не полÑзÑйÑеÑÑ Ð½ÐµÐ¹ÑÑалÑнÑм
вÑÑажением."
+"ÐÑÑажение “FOSS” пÑидÑмано как ÑпоÑоб
<a href=\"/philosophy/"
+"floss-and-foss.html\"> ÑоÑ
ÑанÑÑÑ Ð½ÐµÐ¹ÑÑалиÑÐµÑ Ð¼ÐµÐ¶Ð´Ñ
ÑвободнÑми пÑогÑаммами и "
+"оÑкÑÑÑÑм иÑÑ
однÑм ÑекÑÑом</a>, но в
дейÑÑвиÑелÑноÑÑи ÑÑого не пÑоиÑÑ
одиÑ. "
+"ÐÑли ваÑа ÑÐµÐ»Ñ — нейÑÑалиÑеÑ, Ñо
вÑÑажение “FLOSS“ "
+"лÑÑÑе. Ðо еÑли Ð²Ñ Ñ
оÑиÑе показаÑÑ, ÑÑо
оÑÑÑаиваеÑе ÑвободÑ, не полÑзÑйÑеÑÑ "
+"нейÑÑалÑнÑм вÑÑажением."
#. type: Content of: <h4>
msgid "“Freely available”"
Index: server/home-pkgblurbs.ru.html
===================================================================
RCS file: /web/www/www/server/home-pkgblurbs.ru.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/home-pkgblurbs.ru.html 20 Nov 2013 15:10:17 -0000 1.8
+++ server/home-pkgblurbs.ru.html 21 Nov 2013 07:10:58 -0000 1.9
@@ -929,10 +929,10 @@
<!--#if expr="$pkg_selection = /:(gimp|ALL):/" -->
<h4 id="gimp"><a href="/software/gimp/">GIMP</a></h4><p>
GIMP — пÑиложение Ð´Ð»Ñ Ñакой
манипÑлÑÑии изобÑажениÑми, как
-ÑеÑÑÑиÑование ÑоÑогÑаÑий, наложение и
ÑилÑÑÑаÑиÑ. GIMP поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð²Ñе
-ÑаÑпÑоÑÑÑаненнÑе ÑоÑмаÑÑ Ð¸Ð·Ð¾Ð±Ñажений, а
Ñакже ÑпеÑиализиÑованнÑе ÑоÑмаÑÑ. Ðн
-оÑлиÑаеÑÑÑ Ð²ÐµÑÑма гибгим инÑеÑÑейÑом,
коÑоÑÑй можно ÑаÑÑиÑÑÑÑ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ
-ÑиÑÑÐµÐ¼Ñ Ð²Ð½ÐµÑниÑ
модÑлей. <small>(<a
+ÑеÑÑÑиÑование ÑоÑогÑаÑий, наложение и
Ñоздание инÑеÑакÑивнÑÑ
+пÑиложений. GIMP поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð²Ñе
ÑаÑпÑоÑÑÑаненнÑе ÑоÑмаÑÑ Ð¸Ð·Ð¾Ð±Ñажений, а
+Ñакже ÑпеÑиализиÑованнÑе ÑоÑмаÑÑ. Ðн
оÑлиÑаеÑÑÑ Ð²ÐµÑÑма гибгим инÑеÑÑейÑом,
+коÑоÑÑй можно ÑаÑÑиÑÑÑÑ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÑиÑÑемÑ
внеÑниÑ
модÑлей. <small>(<a
href="/manual/manual.html#gimp">док</a>)</small></p>
<!--#endif -->
@@ -1826,22 +1826,23 @@
<!--#endif -->
<!--#if expr="$pkg_selection = /:(less|ALL):/" -->
<h4 id="less"><a href="/software/less/">Less</a></h4><p>
-GNU less is a pager, a program that allows you to view large amounts of text
-in page-sized chunks. Unlike traditional pagers, it allows both backwards
-and forwards movement through the document. It also does not have to read
-the entire input file before starting, so it starts faster than most text
-editors. <small>(<a href="/manual/manual.html#less">doc</a>)</small></p>
+GNU less — пÑогÑамма поÑÑÑаниÑного
пÑоÑмоÑÑа, позволÑÑÑаÑ
+пÑоÑмаÑÑиваÑÑ Ð±Ð¾Ð»ÑÑие обÑÐµÐ¼Ñ ÑекÑÑа по
ÑаÑÑÑм. РоÑлиÑие Ð¾Ñ ÑÑадиÑионнÑÑ
+пÑогÑамм поÑÑÑаниÑного пÑоÑмоÑÑа, она
допÑÑÐºÐ°ÐµÑ ÐºÐ°Ðº пÑÑмое, Ñак и обÑаÑное
+движение по докÑменÑÑ. Ðй Ñакже не нÑжно
ÑÑиÑÑваÑÑ Ð² наÑале ÑабоÑÑ Ð²ÐµÑÑ
+Ñайл, Ñак ÑÑо она запÑÑкаеÑÑÑ Ð±ÑÑÑÑее
болÑÑинÑÑва ÑекÑÑовÑÑ
ÑедакÑоÑов.
+<small>(<a href="/manual/manual.html#less">док</a>)</small></p>
<!--#endif -->
<!--#if expr="$pkg_selection = /:(libc|ALL):/" -->
-<h4 id="libc"><a href="/software/libc/">GNU C Library</a></h4><p>
-The GNU C Library is the standard C library of the GNU system. It defines
-the system calls and other basic functionality necessary to write programs
-in the C language. It handles low-level functionality that communicates
-with the kernel, such as process and file management, as well as
-higher-level functionality such as string manipulation or command-line
-argument handling. <small>(<a
-href="/manual/manual.html#libc">doc</a>)</small></p>
+<h4 id="libc"><a href="/software/libc/">ÐиблиоÑека Си
GNU</a></h4><p>
+ÐиблиоÑека Си GNU — ÑÑандаÑÑнаÑ
библиоÑека Си ÑиÑÑÐµÐ¼Ñ GNU. Рней
+опÑеделÑÑÑÑÑ ÑиÑÑемнÑе вÑÐ·Ð¾Ð²Ñ Ð¸ дÑÑгие
оÑновнÑе ÑÑнкÑии, необÑ
одимÑе длÑ
+напиÑÐ°Ð½Ð¸Ñ Ð¿ÑогÑамм на ÑзÑке Си. Ðна
обеÑпеÑÐ¸Ð²Ð°ÐµÑ Ð½Ð¸Ð·ÐºÐ¾ÑÑовневÑе ÑÑнкÑии,
+обÑаÑÑиеÑÑ Ñ ÑдÑом, Ñакие как ÑпÑавление
пÑоÑеÑÑами и Ñайлами, а Ñакже более
+вÑÑокоÑÑовневÑе ÑÑнкÑии, Ñакие как
манипÑлÑÑии ÑÑÑоками или обÑабоÑка
+аÑгÑменÑов командной ÑÑÑоки. <small>(<a
+href="/manual/manual.html#libc">док</a>)</small></p>
<!--#endif -->
<!--#if expr="$pkg_selection = /:(libcdio|ALL):/" -->
@@ -1914,11 +1915,11 @@
<!--#endif -->
<!--#if expr="$pkg_selection = /:(librejs|ALL):/" -->
<h4 id="librejs"><a href="/software/librejs/">Librejs</a></h4><p>
-LibreJS is an add-on for GNU Icecat and other Firefox-based browsers. It
-detects non-trivial and non-free JavaScript code from being loaded without
-your consent when you browse the web. JavaScript code that is free or
-trivial is allowed to be loaded. <small>(<a
-href="/manual/manual.html#librejs">doc</a>)</small></p>
+LibreJS — внеÑний модÑÐ»Ñ Ð´Ð»Ñ GNU Icecat или
дÑÑгиÑ
бÑаÑзеÑов на
+базе Firefox. Ðн обнаÑÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð½ÐµÑÑивиалÑнÑе
неÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð½Ð°
+JavaScript, не позволÑÑ Ð·Ð°Ð³ÑÑжаÑÑ Ð¸Ñ
без ваÑего
ÑоглаÑиÑ, когда Ð²Ñ Ð²ÑÑ
одиÑе
+в ÐнÑеÑнеÑ. ÐопÑÑкаеÑÑÑ Ð·Ð°Ð³ÑÑÑка пÑогÑамм
JavaScript, коÑоÑÑе ÑÑивиалÑÐ½Ñ Ð¸Ð»Ð¸
+ÑвободнÑ. <small>(<a
href="/manual/manual.html#librejs">док</a>)</small></p>
<!--#endif -->
<!--#if expr="$pkg_selection = /:(libsigsegv|ALL):/" -->
@@ -2038,12 +2039,13 @@
<!--#endif -->
<!--#if expr="$pkg_selection = /:(m4|ALL):/" -->
<h4 id="m4"><a href="/software/m4/">M4</a></h4><p>
-GNU M4 is an implementation of the M4 macro language, which features some
-extensions over other implementations, some of which are required by GNU
-Autoconf. It is used as a macro processor, which means it processes text,
-expanding macros as it encounters them. It also has some built-in
-functions, for example to run shell commands or to do arithmetic.
-<small>(<a href="/manual/manual.html#m4">doc</a>)</small></p>
+GNU M4 — ÑеализаÑÐ¸Ñ Ð¼Ð°ÐºÑоÑзÑка M4,
оÑлиÑаÑÑаÑÑÑ Ð¾Ñ Ð´ÑÑгиÑ
+ÑеализаÑий некоÑоÑÑми ÑаÑÑиÑениÑми,
некоÑоÑÑÑ
из коÑоÑÑÑ
ÑÑебÑÐµÑ GNU
+Autoconf. M4 пÑименÑеÑÑÑ ÐºÐ°Ðº макÑопÑоÑеÑÑоÑ,
ÑÑо ознаÑÐ°ÐµÑ Ð¾Ð±ÑабоÑÐºÑ ÑекÑÑа Ñ
+подÑÑановкой макÑоÑов по меÑе иÑ
поÑÑÑплениÑ. Ð M4 еÑÑÑ Ñакже неÑколÑко
+вÑÑÑоеннÑÑ
ÑÑнкÑий, напÑимеÑ, длÑ
вÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ командного
+инÑеÑпÑеÑаÑоÑа или аÑиÑмеÑиÑеÑкиÑ
вÑÑиÑлений. <small>(<a
+href="/manual/manual.html#m4">док</a>)</small></p>
<!--#endif -->
<!--#if expr="$pkg_selection = /:(macchanger|ALL):/" -->
@@ -2076,13 +2078,14 @@
<!--#endif -->
<!--#if expr="$pkg_selection = /:(make|ALL):/" -->
<h4 id="make"><a href="/software/make/">Make</a></h4><p>
-Make is a program that is used to control the production of executables or
-other files from their source files. The process is controlled from a
-Makefile, in which the developer specifies how each file is generated from
-its source. It has powerful dependency resolution and the ability to
-determine when files have to be regenerated after their sources change. GNU
-make offers many powerful extensions over the standard utility. <small>(<a
-href="/manual/manual.html#make">doc</a>)</small></p>
+Make — пÑогÑамма, пÑименÑÐµÐ¼Ð°Ñ Ð´Ð»Ñ
ÑпÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿ÑоизводÑÑвом
+вÑполнÑемÑÑ
и пÑоÑиÑ
Ñайлов из иÑÑ
однÑÑ
ÑекÑÑов. ÐÑоÑеÑÑ ÐºÐ¾Ð½ÑÑолиÑÑеÑÑÑ Ð¸Ð·
+Ñайла заданиÑ, в коÑоÑом ÑазÑабоÑÑик
ÑказÑваеÑ, как каждÑй из Ñайлов
+генеÑиÑÑеÑÑÑ Ð¸Ð· его иÑÑ
одного ÑекÑÑа. Make
ÑÑÑекÑивно ÑаÑÑÑиÑÑваеÑ
+завиÑимоÑÑи и опÑеделÑеÑ, когда ÑайлÑ
нÑжно пеÑегенеÑиÑоваÑÑ Ð¿Ð¾Ñле изменениÑ
+иÑ
иÑÑ
однÑÑ
ÑекÑÑов. GNU make пÑедлагаеÑ
множеÑÑво ÑÑÑекÑивнÑÑ
ÑаÑÑиÑений по
+ÑÑÐ°Ð²Ð½ÐµÐ½Ð¸Ñ Ñо ÑÑандаÑÑной пÑогÑаммой.
<small>(<a
+href="/manual/manual.html#make">док</a>)</small></p>
<!--#endif -->
<!--#if expr="$pkg_selection = /:(marst|ALL):/" -->
@@ -2137,20 +2140,21 @@
<!--#endif -->
<!--#if expr="$pkg_selection = /:(mdk|ALL):/" -->
<h4 id="mdk"><a href="/software/mdk/">MIX Development Kit</a></h4><p>
-GNU MDK is the Mix Development Kit, an emulation of the pedagogical computer
-MIX and its assembly language MIXAL. MIX has a virtual CPU with standard
-features such as registers, memory cells, an overflow toggle, comparison
-flags, input-output devices, and a set of binary instructions. The package
-includes a compiler, a virtual machine, a GUI for the virtual machine, and
-more. <small>(<a href="/manual/manual.html#mdk">doc</a>)</small></p>
+GNU MDK — Ð½Ð°Ð±Ð¾Ñ ÑазÑабоÑÑика MIX, ÑмÑлÑÑоÑ
ÑÑебного компÑÑÑеÑа
+MIX и его ÑзÑка ÐÑÑемблеÑа MIXAL. Ð MIX еÑÑÑ
виÑÑÑалÑнÑй пÑоÑеÑÑÐ¾Ñ Ñ Ñакими
+ÑÑандаÑÑнÑми ÑеÑÑами, как ÑегиÑÑÑÑ, ÑÑейки
памÑÑи, Ñлаги пеÑÐµÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¸
+ÑÑавнениÑ, ÑÑÑÑойÑÑва ввода-вÑвода, а
Ñакже Ð½Ð°Ð±Ð¾Ñ Ð´Ð²Ð¾Ð¸ÑнÑÑ
команд. РпакеÑ
+вÑ
Ð¾Ð´Ð¸Ñ ÐºÐ¾Ð¼Ð¿Ð¸Ð»ÑÑоÑ, виÑÑÑалÑÐ½Ð°Ñ Ð¼Ð°Ñина,
гÑаÑиÑеÑÐºÐ°Ñ Ð¾Ð±Ð¾Ð»Ð¾Ñка Ð´Ð»Ñ Ð²Ð¸ÑÑÑалÑной
+маÑÐ¸Ð½Ñ Ð¸ многое дÑÑгое. <small>(<a
+href="/manual/manual.html#mdk">док</a>)</small></p>
<!--#endif -->
<!--#if expr="$pkg_selection = /:(mediagoblin|ALL):/" -->
<h4 id="mediagoblin"><a href="/software/mediagoblin/">Mediagoblin</a></h4><p>
-GNU MediaGoblin is a free media publishing platform. It runs in a
-federalized manner, freeing the user from centralized web services. It
-supports pictures, videos and audio. <small>(<a
-href="/manual/manual.html#mediagoblin">doc</a>)</small></p>
+GNU MediaGoblin — ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿Ð»Ð°ÑÑоÑма длÑ
пÑбликаÑий. Ðна
+ÑабоÑÐ°ÐµÑ Ð½Ð° ÑедеÑализиÑованнÑй манеÑ,
оÑÐ²Ð¾Ð±Ð¾Ð¶Ð´Ð°Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ð¾Ñ
+ÑенÑÑализованнÑÑ
ÑлÑжб ÐÑемиÑной паÑÑинÑ.
Ðна поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð¸Ð·Ð¾Ð±ÑажениÑ, звÑк
+и видео. <small>(<a
href="/manual/manual.html#mediagoblin">док</a>)</small></p>
<!--#endif -->
<!--#if expr="$pkg_selection = /:(melting|ALL):/" -->
Index: server/po/home-pkgblurbs.ru.po
===================================================================
RCS file: /web/www/www/server/po/home-pkgblurbs.ru.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/po/home-pkgblurbs.ru.po 21 Nov 2013 06:44:13 -0000 1.7
+++ server/po/home-pkgblurbs.ru.po 21 Nov 2013 07:11:29 -0000 1.8
@@ -1415,11 +1415,11 @@
"html#gimp\">doc</a>)</small>"
msgstr ""
"GIMP — пÑиложение Ð´Ð»Ñ Ñакой
манипÑлÑÑии изобÑажениÑми, как "
-"ÑеÑÑÑиÑование ÑоÑогÑаÑий, наложение и
Ñоздание инÑеÑакÑивнÑÑ
пÑиложений. GIMP
поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð²Ñе "
-"ÑаÑпÑоÑÑÑаненнÑе ÑоÑмаÑÑ Ð¸Ð·Ð¾Ð±Ñажений, а
Ñакже ÑпеÑиализиÑованнÑе ÑоÑмаÑÑ. Ðн "
-"оÑлиÑаеÑÑÑ Ð²ÐµÑÑма гибгим инÑеÑÑейÑом,
коÑоÑÑй можно ÑаÑÑиÑÑÑÑ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ "
-"ÑиÑÑÐµÐ¼Ñ Ð²Ð½ÐµÑниÑ
модÑлей. <small>(<a
href=\"/manual/manual.html#gimp\">док</"
-"a>)</small>"
+"ÑеÑÑÑиÑование ÑоÑогÑаÑий, наложение и
Ñоздание инÑеÑакÑивнÑÑ
пÑиложений. "
+"GIMP поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð²Ñе ÑаÑпÑоÑÑÑаненнÑе
ÑоÑмаÑÑ Ð¸Ð·Ð¾Ð±Ñажений, а Ñакже "
+"ÑпеÑиализиÑованнÑе ÑоÑмаÑÑ. Ðн
оÑлиÑаеÑÑÑ Ð²ÐµÑÑма гибгим инÑеÑÑейÑом,
коÑоÑÑй "
+"можно ÑаÑÑиÑÑÑÑ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ ÑиÑÑÐµÐ¼Ñ Ð²Ð½ÐµÑниÑ
модÑлей. <small>(<a href=\"/manual/"
+"manual.html#gimp\">док</a>)</small>"
#. type: Content of: <h4>
msgid "<a href=\"/software/gleem/\">Gleem</a>"
@@ -2712,9 +2712,9 @@
"GNU less — пÑогÑамма поÑÑÑаниÑного
пÑоÑмоÑÑа, позволÑÑÑÐ°Ñ "
"пÑоÑмаÑÑиваÑÑ Ð±Ð¾Ð»ÑÑие обÑÐµÐ¼Ñ ÑекÑÑа по
ÑаÑÑÑм. РоÑлиÑие Ð¾Ñ ÑÑадиÑионнÑÑ
"
"пÑогÑамм поÑÑÑаниÑного пÑоÑмоÑÑа, она
допÑÑÐºÐ°ÐµÑ ÐºÐ°Ðº пÑÑмое, Ñак и обÑаÑное "
-"движение по докÑменÑÑ. Ðй Ñакже не нÑжно
ÑÑиÑÑваÑÑ Ð² наÑале ÑабоÑÑ Ð²ÐµÑÑ Ñайл, "
-"Ñак ÑÑо она запÑÑкаеÑÑÑ Ð±ÑÑÑÑее
болÑÑинÑÑва ÑекÑÑовÑÑ
ÑедакÑоÑов. <small>(<a "
-"href=\"/manual/manual.html#less\">док</a>)</small>"
+"движение по докÑменÑÑ. Ðй Ñакже не нÑжно
ÑÑиÑÑваÑÑ Ð² наÑале ÑабоÑÑ Ð²ÐµÑÑ "
+"Ñайл, Ñак ÑÑо она запÑÑкаеÑÑÑ Ð±ÑÑÑÑее
болÑÑинÑÑва ÑекÑÑовÑÑ
ÑедакÑоÑов. "
+"<small>(<a href=\"/manual/manual.html#less\">док</a>)</small>"
#. type: Content of: <h4>
msgid "<a href=\"/software/libc/\">GNU C Library</a>"
@@ -2734,8 +2734,8 @@
"напиÑÐ°Ð½Ð¸Ñ Ð¿ÑогÑамм на ÑзÑке Си. Ðна
обеÑпеÑÐ¸Ð²Ð°ÐµÑ Ð½Ð¸Ð·ÐºÐ¾ÑÑовневÑе ÑÑнкÑии, "
"обÑаÑÑиеÑÑ Ñ ÑдÑом, Ñакие как ÑпÑавление
пÑоÑеÑÑами и Ñайлами, а Ñакже более "
"вÑÑокоÑÑовневÑе ÑÑнкÑии, Ñакие как
манипÑлÑÑии ÑÑÑоками или обÑабоÑка "
-"аÑгÑменÑов командной ÑÑÑоки. <small>(<a "
-"href=\"/manual/manual.html#libc\">док</a>)</small>"
+"аÑгÑменÑов командной ÑÑÑоки. <small>(<a
href=\"/manual/manual.html#libc"
+"\">док</a>)</small>"
#. type: Content of: <h4>
msgid "<a href=\"/software/libcdio/\">Libcdio</a>"
@@ -2851,8 +2851,8 @@
msgstr ""
"LibreJS — внеÑний модÑÐ»Ñ Ð´Ð»Ñ GNU Icecat или
дÑÑгиÑ
бÑаÑзеÑов на "
"базе Firefox. Ðн обнаÑÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð½ÐµÑÑивиалÑнÑе
неÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð½Ð° "
-"JavaScript, не позволÑÑ Ð·Ð°Ð³ÑÑжаÑÑ Ð¸Ñ
без ваÑего
ÑоглаÑиÑ, когда Ð²Ñ Ð²ÑÑ
одиÑе в "
-"ÐнÑеÑнеÑ. ÐопÑÑкаеÑÑÑ Ð·Ð°Ð³ÑÑÑка пÑогÑамм
JavaScript, коÑоÑÑе ÑÑивиалÑÐ½Ñ Ð¸Ð»Ð¸ "
+"JavaScript, не позволÑÑ Ð·Ð°Ð³ÑÑжаÑÑ Ð¸Ñ
без ваÑего
ÑоглаÑиÑ, когда Ð²Ñ Ð²ÑÑ
одиÑе "
+"в ÐнÑеÑнеÑ. ÐопÑÑкаеÑÑÑ Ð·Ð°Ð³ÑÑÑка пÑогÑамм
JavaScript, коÑоÑÑе ÑÑивиалÑÐ½Ñ Ð¸Ð»Ð¸ "
"ÑвободнÑ. <small>(<a
href=\"/manual/manual.html#librejs\">док</a>)</small>"
#. type: Content of: <h4>
@@ -3042,9 +3042,9 @@
"ÑеализаÑий некоÑоÑÑми ÑаÑÑиÑениÑми,
некоÑоÑÑÑ
из коÑоÑÑÑ
ÑÑебÑÐµÑ GNU "
"Autoconf. M4 пÑименÑеÑÑÑ ÐºÐ°Ðº макÑопÑоÑеÑÑоÑ,
ÑÑо ознаÑÐ°ÐµÑ Ð¾Ð±ÑабоÑÐºÑ ÑекÑÑа Ñ "
"подÑÑановкой макÑоÑов по меÑе иÑ
поÑÑÑплениÑ. Ð M4 еÑÑÑ Ñакже неÑколÑко "
-"вÑÑÑоеннÑÑ
ÑÑнкÑий, напÑимеÑ, длÑ
вÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ командного
инÑеÑпÑеÑаÑоÑа "
-"или аÑиÑмеÑиÑеÑкиÑ
вÑÑиÑлений. <small>(<a "
-"href=\"/manual/manual.html#m4\">док</a>)</small>"
+"вÑÑÑоеннÑÑ
ÑÑнкÑий, напÑимеÑ, длÑ
вÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ командного "
+"инÑеÑпÑеÑаÑоÑа или аÑиÑмеÑиÑеÑкиÑ
вÑÑиÑлений. <small>(<a href=\"/manual/"
+"manual.html#m4\">док</a>)</small>"
#. type: Content of: <h4>
msgid "<a href=\"/software/macchanger/\">MAC Changer</a>"
@@ -3106,8 +3106,8 @@
"генеÑиÑÑеÑÑÑ Ð¸Ð· его иÑÑ
одного ÑекÑÑа. Make
ÑÑÑекÑивно ÑаÑÑÑиÑÑÐ²Ð°ÐµÑ "
"завиÑимоÑÑи и опÑеделÑеÑ, когда ÑайлÑ
нÑжно пеÑегенеÑиÑоваÑÑ Ð¿Ð¾Ñле Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ "
"иÑ
иÑÑ
однÑÑ
ÑекÑÑов. GNU make пÑедлагаеÑ
множеÑÑво ÑÑÑекÑивнÑÑ
ÑаÑÑиÑений по "
-"ÑÑÐ°Ð²Ð½ÐµÐ½Ð¸Ñ Ñо ÑÑандаÑÑной пÑогÑаммой.
<small>(<a "
-"href=\"/manual/manual.html#make\">док</a>)</small>"
+"ÑÑÐ°Ð²Ð½ÐµÐ½Ð¸Ñ Ñо ÑÑандаÑÑной пÑогÑаммой.
<small>(<a href=\"/manual/manual."
+"html#make\">док</a>)</small>"
#. type: Content of: <h4>
msgid "<a href=\"/software/marst/\">MARST</a>"
@@ -3191,13 +3191,13 @@
"includes a compiler, a virtual machine, a GUI for the virtual machine, and "
"more. <small>(<a href=\"/manual/manual.html#mdk\">doc</a>)</small>"
msgstr ""
-"GNU MDK — Ð½Ð°Ð±Ð¾Ñ ÑазÑабоÑÑика MIX,
ÑмÑлÑÑÐ¾Ñ ÑÑебного компÑÑÑеÑа MIX "
-"и его ÑзÑка ÐÑÑемблеÑа MIXAL. Ð MIX еÑÑÑ
виÑÑÑалÑнÑй пÑоÑеÑÑÐ¾Ñ Ñ Ñакими "
+"GNU MDK — Ð½Ð°Ð±Ð¾Ñ ÑазÑабоÑÑика MIX,
ÑмÑлÑÑÐ¾Ñ ÑÑебного компÑÑÑеÑа "
+"MIX и его ÑзÑка ÐÑÑемблеÑа MIXAL. Ð MIX еÑÑÑ
виÑÑÑалÑнÑй пÑоÑеÑÑÐ¾Ñ Ñ Ñакими "
"ÑÑандаÑÑнÑми ÑеÑÑами, как ÑегиÑÑÑÑ,
ÑÑейки памÑÑи, Ñлаги пеÑÐµÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¸ "
"ÑÑавнениÑ, ÑÑÑÑойÑÑва ввода-вÑвода, а
Ñакже Ð½Ð°Ð±Ð¾Ñ Ð´Ð²Ð¾Ð¸ÑнÑÑ
команд. Ð Ð¿Ð°ÐºÐµÑ "
"вÑ
Ð¾Ð´Ð¸Ñ ÐºÐ¾Ð¼Ð¿Ð¸Ð»ÑÑоÑ, виÑÑÑалÑÐ½Ð°Ñ Ð¼Ð°Ñина,
гÑаÑиÑеÑÐºÐ°Ñ Ð¾Ð±Ð¾Ð»Ð¾Ñка Ð´Ð»Ñ Ð²Ð¸ÑÑÑалÑной "
-"маÑÐ¸Ð½Ñ Ð¸ многое дÑÑгое. <small>(<a "
-"href=\"/manual/manual.html#mdk\">док</a>)</small>"
+"маÑÐ¸Ð½Ñ Ð¸ многое дÑÑгое. <small>(<a
href=\"/manual/manual.html#mdk\">док</a>)"
+"</small>"
#. type: Content of: <h4>
msgid "<a href=\"/software/mediagoblin/\">Mediagoblin</a>"
@@ -3210,10 +3210,10 @@
"supports pictures, videos and audio. <small>(<a href=\"/manual/manual."
"html#mediagoblin\">doc</a>)</small>"
msgstr ""
-"GNU MediaGoblin — ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿Ð»Ð°ÑÑоÑма длÑ
пÑбликаÑий. Ðна ÑабоÑÐ°ÐµÑ "
-"на ÑедеÑализиÑованнÑй манеÑ, оÑвобождаÑ
полÑзоваÑÐµÐ»Ñ Ð¾Ñ ÑенÑÑализованнÑÑ
"
-"ÑлÑжб ÐÑемиÑной паÑÑинÑ. Ðна поддеÑживаеÑ
изобÑажениÑ, звÑк и видео. "
-"<small>(<a href=\"/manual/manual.html#mediagoblin\">док</a>)</small>"
+"GNU MediaGoblin — ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿Ð»Ð°ÑÑоÑма длÑ
пÑбликаÑий. Ðна "
+"ÑабоÑÐ°ÐµÑ Ð½Ð° ÑедеÑализиÑованнÑй манеÑ,
оÑÐ²Ð¾Ð±Ð¾Ð¶Ð´Ð°Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ð¾Ñ "
+"ÑенÑÑализованнÑÑ
ÑлÑжб ÐÑемиÑной
паÑÑинÑ. Ðна поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð¸Ð·Ð¾Ð±ÑажениÑ,
звÑк "
+"и видео. <small>(<a
href=\"/manual/manual.html#mediagoblin\">док</a>)</small>"
#. TRANSLATORS: stale
#. type: Content of: <h4>
Index: philosophy/free-open-overlap.ru.html
===================================================================
RCS file: philosophy/free-open-overlap.ru.html
diff -N philosophy/free-open-overlap.ru.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ philosophy/free-open-overlap.ru.html 21 Nov 2013 07:08:48 -0000
1.1
@@ -0,0 +1,123 @@
+
+
+<!--#include virtual="/server/header.ru.html" -->
+<!-- Parent-Version: 1.75 -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+ <!--#set var="ENGLISH_PAGE" value="/philosophy/free-open-overlap.en.html" -->
+
+<title>СвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð¸ оÑкÑÑÑÑй иÑÑ
однÑй ÑекÑÑ - ÐÑÐ¾ÐµÐºÑ GNU - Фонд Ñвободного
+пÑогÑаммного обеÑпеÑениÑ</title>
+
+<!--#include virtual="/philosophy/po/free-open-overlap.translist" -->
+<!--#include virtual="/server/banner.ru.html" -->
+<h2>СооÑноÑение ÑвободнÑÑ
пÑогÑамм и
оÑкÑÑÑого иÑÑ
одного ÑекÑÑа </h2>
+
+<p>ÐÐ¾Ñ ÐºÐ°Ðº ÑооÑноÑÑÑÑÑ Ð´ÑÑг Ñ Ð´ÑÑгом
множеÑÑва <a
+href="/philosophy/open-source-misses-the-point.html">ÑвободнÑÑ
пÑогÑамм и
+оÑкÑÑÑого иÑÑ
одного ÑекÑÑа</a>:</p>
+
+<pre>
+<code>
+ -------------------------------------
+ / | | \
+ | | | |
+ | | | |
+ | | | |
+ | | | |
+ | | | |
+ | | | |
+ÑвободнÑе < | | |
оÑкÑÑÑÑй
+ | | | > иÑÑ
однÑй
+ | | | | ÑекÑÑ
+ | | | |
+ | | | |
+ | | | |
+ | | | |
+ \ | | |
+ ------------------------------------- |
+ | ÑивоизованнÑе ÑÑÑÑойÑÑва | пÑоÑие
| /
+ -------------------------------------
+</code>
+</pre>
+
+<p>ТивоизованнÑе (“ÑиÑаниÑеÑкие”)
ÑÑÑÑойÑÑва ÑодеÑÐ¶Ð°Ñ Ð½ÐµÑвободнÑе
+иÑполнÑемÑе ÑайлÑ, ÑделаннÑе из иÑÑ
одного
ÑекÑÑа, коÑоÑÑй
+Ñвободен. Ðа 2013 год многие ÑÑÑÑойÑÑва
на базе Android ÑвлÑÑÑÑÑ
+ÑиÑаниÑеÑкими, но некоÑоÑÑе ÑаковÑми не
ÑвлÑÑÑÑÑ.</p>
+
+<p>“ÐÑоÑие” обознаÑÐ°ÐµÑ Ð¿ÑогÑаммÑ, иÑÑ
однÑй ÑекÑÑ ÐºÐ¾ÑоÑÑÑ
+ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð¿Ð¾Ð´ лиÑензиÑми, коÑоÑÑе
ÑвлÑÑÑÑÑ <a
+href="/licenses/license-list.html#NonFreeSoftwareLicenses">лиÑензиÑми
+оÑкÑÑÑого иÑÑ
одного ÑекÑÑа, но не ÑвлÑÑÑÑÑ
лиÑензиÑми ÑвободнÑÑ
+пÑогÑамм</a>.</p>
+
+
+<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.ru.html" -->
+<div id="footer">
+
+<p>ÐожалÑйÑÑа, пÑиÑÑлайÑе обÑие запÑоÑÑ
ÑÐ¾Ð½Ð´Ñ Ð¸ GNU по адÑеÑÑ <a
+href="mailto:address@hidden";><address@hidden></a>. ÐÑÑÑ Ñакже <a
+href="/contact/">дÑÑгие ÑпоÑÐ¾Ð±Ñ ÑвÑзаÑÑÑÑ</a> Ñ
Ñондом. ÐÑÑеÑÑ Ð¾
+неÑабоÑаÑÑиÑ
ÑÑÑлкаÑ
и дÑÑгие попÑавки
или пÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶Ð½Ð¾ пÑиÑÑлаÑÑ Ð¿Ð¾
+адÑеÑÑ <a href="mailto:address@hidden";><address@hidden></a>.</p>
+
+<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden";>
+
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+ÐÑ ÑÑаÑалиÑÑ ÑделаÑÑ ÑÑÐ¾Ñ Ð¿ÐµÑевод ÑоÑнÑм и
каÑеÑÑвеннÑм, но иÑклÑÑиÑÑ
+возможноÑÑÑ Ð¾Ñибки Ð¼Ñ Ð½Ðµ можем.
ÐÑиÑÑлайÑе, пожалÑйÑÑа, Ñвои замеÑÐ°Ð½Ð¸Ñ Ð¸
+пÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ пеÑÐµÐ²Ð¾Ð´Ñ Ð¿Ð¾ адÑеÑÑ <a
+href="mailto:address@hidden";><address@hidden></a>.
+</p><p>Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ð¾ кооÑдинаÑии и
пÑедложениÑм пеÑеводов наÑиÑ
ÑÑаÑей Ñм. в
+<a href="/server/standards/README.translations.html">“Ð
ÑководÑÑве по
+пеÑеводам”</a>.</p>
+
+<p>Copyright © 2013 Free Software Foundation, Inc.</p>
+
+<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лиÑензии
+Creative Commons Attribution-NoDerivs (<em>ÐÑÑибÑÑÐ¸Ñ —
Ðез
+пÑоизводнÑÑ
пÑоизведений</em>) 3.0 СШÐ</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.ru.html" -->
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<em>Ðнимание! РподгоÑовке ÑÑого пеÑевода
ÑÑаÑÑвовал ÑолÑко один Ñеловек. ÐÑ
+можеÑе ÑÑÑеÑÑвенно ÑлÑÑÑиÑÑ Ð¿ÐµÑевод, еÑли
пÑовеÑиÑе его и ÑаÑÑкажеÑе о
+найденнÑÑ
оÑибкаÑ
в <a
+href="http://savannah.gnu.org/projects/www-ru";>ÑÑÑÑкой гÑÑппе
пеÑеводов
+gnu.org</a>.</em></div>
+
+
+ <p><!-- timestamp start -->
+Ðбновлено:
+
+$Date: 2013/11/21 07:08:48 $
+
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
Index: philosophy/po/free-open-overlap.ru-en.html
===================================================================
RCS file: philosophy/po/free-open-overlap.ru-en.html
diff -N philosophy/po/free-open-overlap.ru-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ philosophy/po/free-open-overlap.ru-en.html 21 Nov 2013 07:10:04 -0000
1.1
@@ -0,0 +1,89 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.75 -->
+<title>How Free Software and Open Source Relate as Categories of
+Programs
+- GNU Project - Free Software Foundation</title>
+ <!--#include virtual="/philosophy/po/free-open-overlap.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>How Free Software and Open Source Relate as Categories of Programs</h2>
+
+<p>Here's how <a href="/philosophy/open-source-misses-the-point.html">free
software and open source</a> relate as categories of
+programs:</p>
+
+<pre>
+<code>
+ /----------------------------------------------\
+ / | | \
+ / | | \
+ | | \
+ | |
+ | |
+ | |
+free | |
+ | |
+ | | open source
+ | |
+ | |
+ \ | |
+ \ | |
+ \----------------------------------------------
+ | | | /
+ | tivoized (tyrant) devices | O | /
+ | | | /
+ ----------------------------------------------/
+</code>
+</pre>
+
+<p>Tivoized or “tyrant” devices contain nonfree
+executables made from source code that is free. As of 2013, many
+Android devices are tyrant, but some are not.</p>
+
+<p>“O” stands for “other” and refers to
+programs whose source is under
+<a href="/licenses/license-list.html#NonFreeSoftwareLicenses">licenses which
are open source but not free</a>.</p>
+
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden";><address@hidden></a>.
+There are also <a href="/contact/">other ways to contact</a>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden";>
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+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 © 2013 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>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p>Updated:
+<!-- timestamp start -->
+$Date: 2013/11/21 07:10:04 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www licenses/why-affero-gpl.ru.html licenses/po...,
GNUN <=