[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www education/edu-schools.ru.html education/po/...
|
From: |
GNUN |
|
Subject: |
www education/edu-schools.ru.html education/po/... |
|
Date: |
Wed, 03 Jun 2015 09:28:04 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/06/03 09:28:04
Modified files:
education : edu-schools.ru.html
education/po : edu-schools.ru-en.html edu-schools.ru.po
gnu : gnu-linux-faq.ru.html
gnu-users-never-heard-of-gnu.ru.html
manifesto.ru.html
gnu/po : gnu-linux-faq.ru-en.html gnu-linux-faq.ru.po
gnu-users-never-heard-of-gnu.ru-en.html
gnu-users-never-heard-of-gnu.ru.po
manifesto.ru-en.html manifesto.ru.po
licenses : gpl-faq.ru.html translations.ru.html
licenses/po : gpl-faq.ru-en.html gpl-faq.ru.po
translations.ru-en.html translations.ru.po
philosophy : is-ever-good-use-nonfree-program.ru.html
philosophy/po : is-ever-good-use-nonfree-program.ru-en.html
is-ever-good-use-nonfree-program.ru.po
proprietary : proprietary-back-doors.ru.html
proprietary/po : proprietary-back-doors.ru-en.html
proprietary-back-doors.ru.po
software : recent-releases-include.ru.html
software/po : recent-releases-include.ru.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-schools.ru.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-schools.ru-en.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-schools.ru.po?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.ru.html?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-users-never-heard-of-gnu.ru.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/manifesto.ru.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ru-en.html?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ru.po?cvsroot=www&r1=1.70&r2=1.71
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ru-en.html?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ru.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.ru-en.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/manifesto.ru.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.ru.html?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/translations.ru.html?cvsroot=www&r1=1.60&r2=1.61
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru-en.html?cvsroot=www&r1=1.44&r2=1.45
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru.po?cvsroot=www&r1=1.87&r2=1.88
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.ru-en.html?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/translations.ru.po?cvsroot=www&r1=1.93&r2=1.94
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/is-ever-good-use-nonfree-program.ru.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/is-ever-good-use-nonfree-program.ru-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/is-ever-good-use-nonfree-program.ru.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-back-doors.ru.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-back-doors.ru-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-back-doors.ru.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/software/recent-releases-include.ru.html?cvsroot=www&r1=1.636&r2=1.637
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/recent-releases-include.ru.po?cvsroot=www&r1=1.846&r2=1.847
Patches:
Index: education/edu-schools.ru.html
===================================================================
RCS file: /web/www/www/education/edu-schools.ru.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- education/edu-schools.ru.html 18 Jun 2014 14:58:46 -0000 1.31
+++ education/edu-schools.ru.html 3 Jun 2015 09:27:57 -0000 1.32
@@ -43,7 +43,8 @@
<p><a href="http://www.stallman.org/";>РиÑаÑд СÑолмен</a></p>
-<p>ÐбÑазоваÑелÑнÑе Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ñ (в Ñом ÑиÑле
ÑколÑ) обÑÐ·Ð°Ð½Ñ <a
+<p>ÐбÑазоваÑелÑнÑе ÑÑÑеждениÑ, в Ñом ÑиÑле
ÑÑебнÑе Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð²ÑеÑ
ÑÑовней оÑ
+деÑÑкиÑ
Ñадов до вÑзов, обÑÐ·Ð°Ð½Ñ <a
href="/education/education.html">пÑеподаваÑÑ ÑолÑко
ÑвободнÑе пÑогÑаммÑ</a>.</p>
<p>ÐÑе полÑзоваÑели компÑÑÑеÑов Ð´Ð¾Ð»Ð¶Ð½Ñ <a
@@ -87,7 +88,8 @@
завиÑимоÑÑи Ð¾Ñ Ð¸Ñ
пÑодÑкÑов, подобно ÑомÑ
как ÑабаÑнÑе компании
ÑаÑпÑоÑÑÑанÑÑÑ Ð±ÐµÑплаÑнÑе ÑигаÑеÑÑ ÑÑеди
ÑколÑников <a
href="#note2">(2)</a>. Ðни не дадÑÑ Ð±ÐµÑплаÑнÑÑ
копий
ни ÑÑаÑимÑÑ, когда Ñе
-пÑойдÑÑ Ð¾Ð±ÑÑение, ни компаниÑм, в коÑоÑÑе
они пойдÑÑ ÑабоÑаÑÑ.</p>
+пÑойдÑÑ Ð¾Ð±ÑÑение, ни компаниÑм, в коÑоÑÑе
они пойдÑÑ ÑабоÑаÑÑ. Ðак ÑолÑко вÑ
+попали в завиÑимоÑÑÑ, Ñ Ð²Ð°Ñ Ð±ÑдÑÑ
ÑÑебоваÑÑ Ð´ÐµÐ½Ñги.</p>
<p>СвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð°ÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑ
ÑÑаÑимÑÑ ÑзнаÑÑ, как пÑогÑаммÑ
ÑабоÑаÑÑ. СÑановÑÑÑ Ð¿Ð¾Ð´ÑоÑÑками,
некоÑоÑÑе деÑи, пÑиÑожденнÑе пÑогÑаммиÑÑÑ,
@@ -203,13 +205,13 @@
пеÑеводам”</a>.</p>
</div>
-<p>Copyright © 2003, 2009, 2014 Richard Stallman</p> <p>Copyright ©
-2014 Free Software Foundation, Inc. (translation)</p>
+<p>Copyright © 2003, 2009, 2014, 2015 Richard Stallman</p> <p>Copyright
+© 2015 Free Software Foundation, Inc. (translation)</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лиÑензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лиÑензии
Creative Commons Attribution-NoDerivs (<em>ÐÑÑибÑÑÐ¸Ñ —
Ðез
-пÑоизводнÑÑ
пÑоизведений</em>) 3.0 СШÐ</a>.</p>
+пÑоизводнÑÑ
пÑоизведений</em>) 4.0
ÐÑемиÑнаÑ</a>.</p>
<!--#include virtual="/server/bottom-notes.ru.html" -->
<div class="translators-credits">
@@ -221,7 +223,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2014/06/18 14:58:46 $
+$Date: 2015/06/03 09:27:57 $
<!-- timestamp end -->
</p>
Index: education/po/edu-schools.ru-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-schools.ru-en.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- education/po/edu-schools.ru-en.html 18 Jun 2014 14:58:47 -0000 1.23
+++ education/po/edu-schools.ru-en.html 3 Jun 2015 09:27:57 -0000 1.24
@@ -38,7 +38,8 @@
<p>by <a href="http://www.stallman.org/";>Richard Stallman</a></p>
-<p>Educational activities (including schools) have a moral duty
+<p>Educational activities, including schools of all levels from
+kindergarten to university, have a moral duty
to <a href="/education/education.html">teach only free
software.</a></p>
@@ -85,7 +86,8 @@
dependence on their products, like tobacco companies distributing
gratis cigarettes to school children<a href="#note2">(2)</a>. They
will not give gratis copies to these students once they've graduated,
-nor to the companies that they go to work for.</p>
+nor to the companies that they go to work for. Once you're dependent,
+you're expected to pay.</p>
<p>Free software permits students to learn how software works. Some
students, natural-born programmers, on reaching their teens yearn to
@@ -189,17 +191,17 @@
information on coordinating and submitting translations of this article.</p>
</div>
-<p>Copyright © 2003, 2009, 2014 Richard Stallman</p>
+<p>Copyright © 2003, 2009, 2014, 2015 Richard Stallman</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>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/06/18 14:58:47 $
+$Date: 2015/06/03 09:27:57 $
<!-- timestamp end -->
</p>
</div>
Index: education/po/edu-schools.ru.po
===================================================================
RCS file: /web/www/www/education/po/edu-schools.ru.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- education/po/edu-schools.ru.po 3 Jun 2015 09:01:28 -0000 1.35
+++ education/po/edu-schools.ru.po 3 Jun 2015 09:27:58 -0000 1.36
@@ -17,7 +17,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
-"X-Outdated-Since: 2015-06-02 12:55+0000\n"
# type: Content of: <title>
#. type: Content of: <title>
@@ -73,20 +72,14 @@
msgstr "<a href=\"http://www.stallman.org/\";>РиÑаÑд СÑолмен</a>"
#. type: Content of: <p>
-# | Educational [-activities (including schools)-] {+activities, including
-# | schools of all levels from kindergarten to university,+} have a moral duty
-# | to <a href=\"/education/education.html\">teach only free software.</a>
-#| msgid ""
-#| "Educational activities (including schools) have a moral duty to <a href="
-#| "\"/education/education.html\">teach only free software.</a>"
msgid ""
"Educational activities, including schools of all levels from kindergarten to "
"university, have a moral duty to <a href=\"/education/education.html\">teach "
"only free software.</a>"
msgstr ""
"ÐбÑазоваÑелÑнÑе ÑÑÑеждениÑ, в Ñом ÑиÑле
ÑÑебнÑе Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð²ÑеÑ
ÑÑовней Ð¾Ñ "
-"деÑÑкиÑ
Ñадов до вÑзов, обÑÐ·Ð°Ð½Ñ <a
href=\"/education/"
-"education.html\">пÑеподаваÑÑ ÑолÑко ÑвободнÑе
пÑогÑаммÑ</a>."
+"деÑÑкиÑ
Ñадов до вÑзов, обÑÐ·Ð°Ð½Ñ <a
href=\"/education/education.html"
+"\">пÑеподаваÑÑ ÑолÑко ÑвободнÑе
пÑогÑаммÑ</a>."
# type: Content of: <p>
#. type: Content of: <p>
@@ -168,21 +161,6 @@
"Ð¸Ð´ÐµÑ Ð²ÑазÑез Ñ ÑоÑиалÑной миÑÑией ÑÑебнÑÑ
заведений."
#. type: Content of: <p>
-# | Why, after all, do some proprietary software developers offer gratis
-# | copies<a href=\"#note1\">(1)</a> of their nonfree programs to schools?
-# | Because they want to <em>use</em> the schools to implant dependence on
-# | their products, like tobacco companies distributing gratis cigarettes to
-# | school children<a href=\"#note2\">(2)</a>. They will not give gratis
-# | copies to these students once they've graduated, nor to the companies that
-# | they go to work for. {+Once you're dependent, you're expected to pay.+}
-#| msgid ""
-#| "Why, after all, do some proprietary software developers offer gratis "
-#| "copies<a href=\"#note1\">(1)</a> of their nonfree programs to schools? "
-#| "Because they want to <em>use</em> the schools to implant dependence on "
-#| "their products, like tobacco companies distributing gratis cigarettes to "
-#| "school children<a href=\"#note2\">(2)</a>. They will not give gratis "
-#| "copies to these students once they've graduated, nor to the companies "
-#| "that they go to work for."
msgid ""
"Why, after all, do some proprietary software developers offer gratis "
"copies<a href=\"#note1\">(1)</a> of their nonfree programs to schools? "
@@ -198,8 +176,8 @@
"завиÑимоÑÑи Ð¾Ñ Ð¸Ñ
пÑодÑкÑов, подобно ÑомÑ
как ÑабаÑнÑе компании "
"ÑаÑпÑоÑÑÑанÑÑÑ Ð±ÐµÑплаÑнÑе ÑигаÑеÑÑ ÑÑеди
ÑколÑников <a href=\"#note2\">"
"(2)</a>. Ðни не дадÑÑ Ð±ÐµÑплаÑнÑÑ
копий ни
ÑÑаÑимÑÑ, когда Ñе пÑойдÑÑ "
-"обÑÑение, ни компаниÑм, в коÑоÑÑе они
пойдÑÑ ÑабоÑаÑÑ. Ðак ÑолÑко Ð²Ñ "
-"попали в завиÑимоÑÑÑ, Ñ Ð²Ð°Ñ Ð±ÑдÑÑ
ÑÑебоваÑÑ Ð´ÐµÐ½Ñги."
+"обÑÑение, ни компаниÑм, в коÑоÑÑе они
пойдÑÑ ÑабоÑаÑÑ. Ðак ÑолÑко Ð²Ñ Ð¿Ð¾Ð¿Ð°Ð»Ð¸ "
+"в завиÑимоÑÑÑ, Ñ Ð²Ð°Ñ Ð±ÑдÑÑ ÑÑебоваÑÑ
денÑги."
# type: Content of: <p>
#. type: Content of: <p>
@@ -409,19 +387,12 @@
"translations.html\">“Ð ÑководÑÑве по
пеÑеводам”</a>."
#. type: Content of: <div><p>
-# | Copyright © 2003, 2009, [-2014-] {+2014, 2015+} Richard Stallman
-#| msgid "Copyright © 2003, 2009, 2014 Richard Stallman"
msgid "Copyright © 2003, 2009, 2014, 2015 Richard Stallman"
msgstr ""
-"Copyright © 2003, 2009, 2014, 2015 Richard Stallman</p> <p>Copyright
© "
-"2015 Free Software Foundation, Inc. (translation)"
+"Copyright © 2003, 2009, 2014, 2015 Richard Stallman</p> <p>Copyright "
+"© 2015 Free Software Foundation, Inc. (translation)"
#. type: Content of: <div><p>
-# || No change detected. The change might only be in amounts of spaces.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
Index: gnu/gnu-linux-faq.ru.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.ru.html,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- gnu/gnu-linux-faq.ru.html 8 Apr 2015 15:58:04 -0000 1.51
+++ gnu/gnu-linux-faq.ru.html 3 Jun 2015 09:27:58 -0000 1.52
@@ -130,6 +130,11 @@
<li><a href="#whyorder" id="TOCwhyorder">ÐоÑÐµÐ¼Ñ “GNU/Linux”,
а не
“Linux/GNU”?</a></li>
+<li><a href="#distronames0" id="TOCdistronames0">РазÑабоÑÑики
моего диÑÑÑибÑÑива
+назÑваÑÑ ÐµÐ³Ð¾ “Foobar Linux”, но ÑÑо ниÑего
не говоÑÐ¸Ñ Ð¾ Ñом, из
+Ñего ÑоÑÑÐ¾Ð¸Ñ ÑиÑÑема. ÐоÑÐµÐ¼Ñ Ð¾Ð½Ð¸ не могÑÑ
назÑваÑÑ ÐµÐ³Ð¾ Ñак, как им
+вздÑмаеÑÑÑ?</a></li>
+
<li><a href="#distronames" id="TOCdistronames">Ðой диÑÑÑибÑÑив
назÑваеÑÑÑ
“Foobar Linux”; Ñазве ÑÑо не показÑваеÑ,
ÑÑо ÑÑо дейÑÑвиÑелÑно
Linux?</a></li>
@@ -177,6 +182,9 @@
<li><a href="#justlinux" id="TOCjustlinux">Разве Linux нелÑзÑ
иÑполÑзоваÑÑ Ð±ÐµÐ·
GNU?</a></li>
+<li><a href="#howmuch" id="TOChowmuch">Ðакое колиÑеÑÑво
ÑиÑÑÐµÐ¼Ñ GNU должна
+ÑодеÑжаÑÑ ÑиÑÑема, ÑÑÐ¾Ð±Ñ Ð±ÑÑÑ GNU/Linux?</a></li>
+
<li><a href="#linuxsyswithoutgnu"
id="TOClinuxsyswithoutgnu">СÑÑеÑÑвÑÑÑ Ð»Ð¸
полнÑе ÑиÑÑÐµÐ¼Ñ Linux (Ñак!) без GNU?</a></li>
@@ -864,6 +872,21 @@
игноÑиÑÑÑÑ GNU и ÑоздаÑÑ Ð²Ð¸Ð´Ð¸Ð¼Ð¾ÑÑÑ, ÑÑо вÑÑ
ÑиÑÑема и еÑÑÑ Linux.</p>
</dd>
+<dt id="distronames0">РазÑабоÑÑики моего
диÑÑÑибÑÑива назÑваÑÑ ÐµÐ³Ð¾ “Foobar Linux”,
но
+ÑÑо ниÑего не говоÑÐ¸Ñ Ð¾ Ñом, из Ñего
ÑоÑÑÐ¾Ð¸Ñ ÑиÑÑема. ÐоÑÐµÐ¼Ñ Ð¾Ð½Ð¸ не могÑÑ
+назÑваÑÑ ÐµÐ³Ð¾ Ñак, как им вздÑмаеÑÑÑ?<span
class="anchor-reference-id">(<a
+href="#distronames0">#distronames0</a>)</span></dt>
+<dd>
+Ðазвание “Foobar Linux” пÑедполагаеÑ, ÑÑо
ÑÑо ÑазновидноÑÑÑ
+“Linux”, и лÑди <a
href="#distronames">воÑпÑинимаÑÑ ÑÑо Ñаким
+обÑазом</a>.
+
+<p>
+ÐÑли Ð±Ñ Ð¾Ð½Ð¸ назвали диÑÑÑибÑÑив GNU/Linux,
“Foobar BSD”, вÑ
+назвали Ð±Ñ ÑÑо оÑибкой. ÐÑ Ñказали Ð±Ñ Ð¸Ð¼:
“ÐÑа ÑиÑÑема не
+BSD”. Так воÑ, ÑÑо и не Linux.</p>
+</dd>
+
<dt id="distronames">Ðой диÑÑÑибÑÑив назÑваеÑÑÑ
“Foobar Linux”; Ñазве ÑÑо не
показÑваеÑ, ÑÑо ÑÑо дейÑÑвиÑелÑно Linux? <span
class="anchor-reference-id">(<a
href="#distronames">#distronames</a>)</span></dt>
@@ -884,8 +907,8 @@
<dd><p>ÐÑли им позволиÑелÑно измениÑÑ
“GNU” на “Foobar
Linux”, Ñо вам позволиÑелÑно измениÑÑ ÐµÐ³Ð¾
обÑаÑно и назÑваÑÑ ÑÑо
-“Foobar GNU/Linux”. Ðменно ÑÑо Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ
делаÑÑ, поÑÐ¾Ð¼Ñ ÑÑо
-инаÑе Ð²Ñ ÑÑали Ð±Ñ ÑазноÑиÑÑ Ð¸Ñ
оÑÐ¸Ð±ÐºÑ Ð¸
неÑпÑаведливоÑÑÑ.</p></dd>
+“Foobar GNU/Linux”. ÐÑо-Ñо Ð²Ñ Ð¸ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð´ÐµÐ»Ð°ÑÑ:
избегаÑÑ Ð¸Ñ
+оÑибки.</p></dd>
<dt id="companies">Разве не бÑло Ð±Ñ Ð±Ð¾Ð»ÐµÐµ
ÑÑÑекÑивно пÑоÑиÑÑ Ñакие компании, как
Mandrake, Red
Hat и IBM, назÑваÑÑ Ñвои диÑÑÑибÑÑивÑ
“GNU/Linux” вмеÑÑо Ñого,
@@ -1212,6 +1235,23 @@
именно оÑÑÑÑÑÑвие GNU.</p>
</dd>
+<dt id="howmuch">Ðакое колиÑеÑÑво ÑиÑÑÐµÐ¼Ñ GNU
должна ÑодеÑжаÑÑ ÑиÑÑема, ÑÑÐ¾Ð±Ñ Ð±ÑÑÑ GNU/Linux?
+<span class="anchor-reference-id">(<a href="#howmuch">#howmuch</a>)</span></dt>
+
+<dd>
+“Ðакое колиÑеÑÑво” — не ÑоÑ
вопÑоÑ.
+<p>
+ÐÑли Ð²Ñ Ð·Ð°Ð¼ÐµÐ½Ð¸Ñе вÑе (или поÑÑи вÑе) ÑаÑÑи
ÑамолеÑа, Ð¾Ð´Ð½Ñ Ð·Ð° дÑÑгой, на
+запаÑнÑе ÑаÑÑи, бÑÐ´ÐµÑ Ð»Ð¸ ÑÑо ÑÐ¾Ñ Ð¶Ðµ
ÑамолеÑ? ÐÑо вопÑÐ¾Ñ ÑилоÑоÑÑкий, но
+обÑепÑинÑÑÑй оÑÐ²ÐµÑ — да.
+</p>
+
+<p>СиÑÑема GNU еÑÑÑ Ð½ÐµÑÑо болÑÑее, Ñем пÑоÑÑо
множеÑÑво компоненÑ, вÑпÑÑеннÑÑ
+пÑоекÑом GNU. ÐÑли Ð²Ñ Ð½Ð°ÑнеÑе Ñ GNU/Linux и
замениÑе поÑÑи вÑе компоненÑÑ Ð½Ð°
+дÑÑгие, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе полÑÑиÑÑ Ð¿Ð¾ÑÑи не
ÑвÑзанное множеÑÑво пÑогÑамм, но ÑÑо вÑе
+Ñавно бÑÐ´ÐµÑ ÑиÑÑема GNU/Linux.</p>
+</dd>
+
<dt id="helplinus">ÐоÑÐµÐ¼Ñ Ð±Ñ Ð²Ñе Ñавно не назÑваÑÑ
ÑиÑÑÐµÐ¼Ñ “Linux”, ÑкÑеплÑÑ ÑÑим
положение ÐинÑÑа ТоÑвалÑдÑа как “паÑнÑ
Ñ Ð¾Ð±Ð»Ð¾Ð¶ÐºÐ¸” наÑего
ÑообÑеÑÑва? <span class="anchor-reference-id">(<a
@@ -1555,7 +1595,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -1574,9 +1614,9 @@
(translation)</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лиÑензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лиÑензии
Creative Commons Attribution-NoDerivs (<em>ÐÑÑибÑÑÐ¸Ñ —
Ðез
-пÑоизводнÑÑ
пÑоизведений</em>) 3.0 СШÐ</a>.</p>
+пÑоизводнÑÑ
пÑоизведений</em>) 4.0
ÐÑемиÑнаÑ</a>.</p>
<!--#include virtual="/server/bottom-notes.ru.html" -->
<div class="translators-credits">
@@ -1587,7 +1627,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2015/04/08 15:58:04 $
+$Date: 2015/06/03 09:27:58 $
<!-- timestamp end -->
</p>
Index: gnu/gnu-users-never-heard-of-gnu.ru.html
===================================================================
RCS file: /web/www/www/gnu/gnu-users-never-heard-of-gnu.ru.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- gnu/gnu-users-never-heard-of-gnu.ru.html 18 May 2015 08:14:54 -0000
1.34
+++ gnu/gnu-users-never-heard-of-gnu.ru.html 3 Jun 2015 09:27:58 -0000
1.35
@@ -23,44 +23,41 @@
</div>
<p>ÐолÑÑинÑÑво лÑдей никогда не ÑлÑÑали о
GNU. Ðаже болÑÑинÑÑво лÑдей,
-иÑполÑзÑÑÑиÑ
ÑиÑÑÐµÐ¼Ñ GNU, никогда не
ÑлÑÑали о GNU, благодаÑÑ ÑомÑ, ÑÑо Ñак
-много лÑдей и компаний пÑиÑÑаÑÑ Ð¸Ñ
назÑваÑÑ ÐµÑ “Linux”. Ðднако
-название GNU вÑзÑÐ²Ð°ÐµÑ Ð¾Ð¿ÑеделÑннÑе
аÑÑоÑиаÑии, поÑвлÑÑÑиеÑÑ Ñ Ð»Ñдей поÑле
-Ñого, как они ÑÑлÑÑÐ°Ñ ÑÑо название. GNU
аÑÑоÑииÑÑеÑÑÑ Ñ Ð¸Ð´ÐµÐ°Ð»Ð°Ð¼Ð¸ ÑвободÑ
-Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð·Ð° Ñвободное пÑогÑаммное
обеÑпеÑение. ÐÑа аÑÑоÑиаÑÐ¸Ñ Ð½Ðµ ÑлÑÑайна;
-ÑелÑÑ ÑазÑабоÑки GNU бÑло именно Ñоздание
возможноÑÑи полÑзоваÑÑÑÑ
-компÑÑÑеÑом, оÑÑаваÑÑÑ ÑвободнÑми.</p>
-
-<p>ÐÑÑоÑиаÑÐ¸Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ GNU Ñ Ð½Ð°Ñими ÑелÑми
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð¸ обÑеÑÑвенной ÑолидаÑноÑÑи
-ÑÑÑеÑÑвÑÐµÑ Ð² ÑмаÑ
ÑоÑен ÑÑÑÑÑ
полÑзоваÑелей GNU/Linux, коÑоÑÑе о GNU
-знаÑÑ. Ðна ÑÑÑеÑÑвÑÐµÑ Ð² Ðикипедии. Ðна
ÑÑÑеÑÑвÑÐµÑ Ð¸ во вÑемиÑной паÑÑине;
-еÑли ÑÑи полÑзоваÑели ÑÑанÑÑ Ð¸ÑкаÑÑ GNU, они
найдÑÑ ÑÐ°Ð¹Ñ <a
-href="http://www.gnu.org";>www.gnu.org</a>, коÑоÑÑй
ÑаÑÑказÑÐ²Ð°ÐµÑ Ð¾ Ñвободе и
-ÑвободнÑÑ
пÑогÑаммаÑ
.</p>
-
-<p>У Ñеловека, впеÑвÑе ÑвидевÑего название
“GNU” в
-“GNU/Linux”, не Ð²Ð¾Ð·Ð½Ð¸ÐºÐ½ÐµÑ ÑÑÐ°Ð·Ñ Ð¶Ðµ
никакой аÑÑоÑиаÑии Ñ
-Ñем-либо. Ðднако когда лÑди знаÑÑ, ÑÑо ÑÑа
ÑиÑÑема в оÑнове
-Ñвоей — GNU, они ÑÑановÑÑÑÑ Ð½Ð° Ñаг
ближе к Ð¾Ð·Ð½Ð°ÐºÐ¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ñ Ð½Ð°Ñими
-идеалами. ÐапÑимеÑ, они могÑÑ
заинÑеÑеÑоваÑÑÑÑ Ð¸ поиÑкаÑÑ Ð±Ð¾Ð»ÐµÐµ
подÑобнÑÑ
-Ñведений о GNU.</p>
-
-<p>ÐÑли они не иÑÑÑ ÑÑого, ÑÑо вÑÑ Ñавно
Ð¼Ð¾Ð¶ÐµÑ Ð¸Ð¼ вÑÑÑеÑиÑÑÑÑ. РиÑоÑика
-“оÑкÑÑÑого иÑÑ
одного ÑекÑÑа” во
многиÑ
ÑлÑÑаÑÑ
оÑвлекаеÑ
-внимание полÑзоваÑелей Ð¾Ñ Ð¿Ñоблем
ÑвободÑ, но не полноÑÑÑÑ; обÑÑждение GNU и
-ÑвободнÑÑ
пÑогÑамм вÑÑ-Ñаки пÑодолжаеÑÑÑ,
и еÑÑÑ Ð½ÐµÐºÐ¾ÑоÑÑй ÑанÑ, ÑÑо лÑди
-наÑкнÑÑÑÑ Ð½Ð° него. Ðогда ÑÑо пÑоиÑÑ
одиÑ,
ÑиÑаÑÐµÐ»Ñ ÑкоÑее обÑаÑÐ¸Ñ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ на
+иÑполÑзÑÑÑиÑ
ÑиÑÑÐµÐ¼Ñ GNU, никогда не
ÑлÑÑали о GNU, поÑколÑÐºÑ Ñак много
+лÑдей и компаний пÑиÑÑаÑÑ Ð¸Ñ
назÑваÑÑ ÐµÐµ
“Linux”. ÐейÑÑвиÑелÑно,
+полÑзоваÑели GNU ÑаÑÑо говоÑÑÑ, ÑÑо они
“ÑабоÑаÑÑ Ð½Ð° Linux”, ÑÑо
+вÑе Ñавно ÑÑо говоÑиÑÑ, ÑÑо Ð²Ñ “едеÑе на
каÑбÑÑаÑоÑе” или
+“едеÑе на коÑобке пеÑедає.</p>
+
+<p>Тем не менее ÑоÑ, кÑо Ð·Ð½Ð°ÐµÑ Ð¾ GNU, ÑвÑзÑваеÑ
ее Ñ Ð¸Ð´ÐµÐ°Ð»Ð°Ð¼Ð¸ ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ
+за ÑвободнÑе пÑогÑаммÑ. ÐÑа ÑвÑÐ·Ñ Ð½Ðµ
ÑлÑÑайна; моÑивом ÑазÑабоÑки GNU бÑло
+именно Ñоздание возможноÑÑи полÑзоваÑÑÑÑ
компÑÑÑеÑом, Ð¾Ð±Ð»Ð°Ð´Ð°Ñ Ñвободой.</p>
+
+<p>Человек, ÑвидевÑий впеÑвÑе название
“GNU” в
+“GNU/Linux”, не ÑÐ·Ð½Ð°ÐµÑ ÑÑÑ Ð¶Ðµ, ÑÑо оно
пÑедÑÑавлÑеÑ, но он
+Ñделал Ñаг к ÑомÑ, ÑÑÐ¾Ð±Ñ ÑзнаÑÑ ÑÑо.
ÐÑÑоÑиаÑÐ¸Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ GNU Ñ Ð½Ð°Ñими ÑелÑми
+ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð¸ обÑеÑÑвенной ÑолидаÑноÑÑи
ÑÑÑеÑÑвÑÐµÑ Ð² ÑмаÑ
ÑоÑен ÑÑÑÑÑ
+полÑзоваÑелей GNU/Linux, коÑоÑÑе о GNU знаÑÑ. Ðна
ÑÑÑеÑÑвÑÐµÑ Ð½Ð° <a
+href="/">gnu.org</a> и в Ðикипедии. Ðна ÑÑÑеÑÑвÑеÑ
во ÐÑемиÑной паÑÑине;
+еÑли полÑзоваÑели ÑÑанÑÑ Ð¸ÑкаÑÑ GNU, они
найдÑÑ Ð¸Ð´ÐµÐ¸, ÑÑоÑÑие за GNU.</p>
+
+<p>ÐÑли они не иÑÑÑ ÑÑого, они вÑе Ñавно
могÑÑ Ð²ÑÑÑеÑиÑÑÑÑ Ñ ÑÑим. ÐозÑнги
+“<a
href="/philosophy/open-source-misses-the-point.html">оÑкÑÑÑого
+иÑÑ
одного ÑекÑÑа</a>” во многиÑ
ÑлÑÑаÑÑ
оÑвлекаÑÑ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ
+полÑзоваÑелей Ð¾Ñ Ð¿Ñоблем ÑвободÑ, но не
полноÑÑÑÑ; обÑÑждение GNU и
+ÑвободнÑÑ
пÑогÑамм вÑе-Ñаки пÑодолжаеÑÑÑ,
и еÑÑÑ Ð½ÐµÐºÐ¾ÑоÑÑй ÑанÑ, ÑÑо лÑди
+наÑкнÑÑÑÑ Ð½Ð° него. Ðогда ÑÑо пÑоиÑÑ
одиÑ,
они ÑкоÑее обÑаÑÑÑ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ на
инÑоÑмаÑÐ¸Ñ Ð¾ GNU (напÑимеÑ, о Ñом, ÑÑо ÑÑо
ÑабоÑа Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð·Ð° ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð¸
-единÑÑво), еÑли он знаеÑ, ÑÑо он —
полÑзоваÑÐµÐ»Ñ ÑиÑÑÐµÐ¼Ñ GNU.</p>
+единÑÑво), еÑли они знаÑÑ, ÑÑо они
полÑзÑÑÑÑÑ ÑиÑÑемой GNU.</p>
<p>ÐазÑÐ²Ð°Ñ ÑÑÑ ÑиÑÑÐµÐ¼Ñ “GNU/Linux”, мÑ
поÑÑепенно повÑÑаем в
-обÑеÑÑве оÑведомлÑнноÑÑÑ Ð¾Ð± идеалаÑ
ÑвободÑ, Ñади коÑоÑой Ð¼Ñ ÑазÑабоÑали
-ÑиÑÑÐµÐ¼Ñ GNU. ÐÑÑ ÑÑо полезно как напоминание
лÑдÑм из наÑего ÑообÑеÑÑва,
+обÑеÑÑве оÑведомленноÑÑÑ Ð¾Ð± идеалаÑ
ÑвободÑ, Ñади коÑоÑой Ð¼Ñ ÑазÑабоÑали
+ÑиÑÑÐµÐ¼Ñ GNU. ÐÑе ÑÑо полезно как напоминание
лÑдÑм из наÑего ÑообÑеÑÑва,
коÑоÑÑе знаÑÑ Ð¾Ð± ÑÑиÑ
идеалаÑ
, в миÑе, где
знаÑиÑелÑÐ½Ð°Ñ ÑаÑÑÑ Ð¾Ð±ÑÑждений
Ñвободного пÑогÑаммного обеÑпеÑениÑ
пÑÐ¸Ð½Ð¸Ð¼Ð°ÐµÑ ÑиÑÑо пÑакÑиÑеÑкий (а поÑомÑ
безнÑавÑÑвеннÑй) обоÑоÑ. Ðогда Ð¼Ñ Ð¿ÑоÑим
Ð²Ð°Ñ Ð½Ð°Ð·ÑваÑÑ ÑиÑÑемÑ
-“GNU/Linux”, Ð¼Ñ Ð´ÐµÐ»Ð°ÐµÐ¼ ÑÑо поÑомÑ, ÑÑо
извеÑÑноÑÑÑ GNU медленно,
-но веÑно неÑÑÑ Ñ Ñобой оÑведомлÑнноÑÑÑ Ð¾
наÑиÑ
идеалаÑ
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð¸ единÑÑва.</p>
+“GNU/Linux”, Ð¼Ñ Ð¿ÑоÑим Ð²Ð°Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ
оÑведомлÑÑÑ Ð¾Ð±ÑеÑÑво об
+идеалаÑ
ÑвободнÑÑ
пÑогÑамм.</p>
<div class="translators-notes">
@@ -105,7 +102,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -119,12 +116,12 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2006, 2007, 2013, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright © 2006, 2007, 2013, 2014, 2015 Free Software Foundation,
Inc.</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лиÑензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лиÑензии
Creative Commons Attribution-NoDerivs (<em>ÐÑÑибÑÑÐ¸Ñ —
Ðез
-пÑоизводнÑÑ
пÑоизведений</em>) 3.0 СШÐ</a>.</p>
+пÑоизводнÑÑ
пÑоизведений</em>) 4.0
ÐÑемиÑнаÑ</a>.</p>
<!--#include virtual="/server/bottom-notes.ru.html" -->
<div class="translators-credits">
@@ -135,7 +132,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2015/05/18 08:14:54 $
+$Date: 2015/06/03 09:27:58 $
<!-- timestamp end -->
</p>
Index: gnu/manifesto.ru.html
===================================================================
RCS file: /web/www/www/gnu/manifesto.ru.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gnu/manifesto.ru.html 18 May 2015 08:15:17 -0000 1.32
+++ gnu/manifesto.ru.html 3 Jun 2015 09:27:59 -0000 1.33
@@ -10,24 +10,33 @@
<!--#include virtual="/server/banner.ru.html" -->
<h2>ÐаниÑеÑÑ GNU</h2>
-<p> ÐаниÑеÑÑ GNU (коÑоÑÑй ÑледÑÐµÑ Ð½Ð¸Ð¶Ðµ) бÑл
напиÑан
-<a href="http://www.stallman.org/";>РиÑаÑдом
-СÑолменом</a>, когда наÑиналÑÑ Ð¿ÑÐ¾ÐµÐºÑ GNU,
ÑÑобÑ
-пÑоÑиÑÑ Ð¾ поддеÑжке и ÑÑаÑÑии. РпеÑвÑе
неÑколÑко
-Ð»ÐµÑ Ð¼Ð°Ð½Ð¸ÑеÑÑ Ð½ÐµÐ·Ð½Ð°ÑиÑелÑно обновлÑлÑÑ,
ÑÑÐ¾Ð±Ñ Ð¾ÑмеÑиÑÑ
-ÑазвиÑие, но ÑейÑÐ°Ñ Ð¿ÑедÑÑавлÑеÑÑÑ
наилÑÑÑим оÑÑавиÑÑ
-его неизменнÑм в Ñом виде, в каком его
видело болÑÑинÑÑво лÑдей.</p>
+<p> ÐаниÑеÑÑ GNU (коÑоÑÑй ÑледÑÐµÑ Ð½Ð¸Ð¶Ðµ) бÑл
напиÑан <a
+href="http://www.stallman.org/";>РиÑаÑдом СÑолменом</a> в
1985 годÑ,
+ÑÑÐ¾Ð±Ñ Ð¿ÑоÑиÑÑ Ð¾ поддеÑжке в ÑазÑабоÑке
опеÑаÑионной ÑиÑÑÐµÐ¼Ñ GNU. ЧаÑÑÑ
+ÑекÑÑа бÑла взÑÑа из пеÑвонаÑалÑного
обÑÑвлениÑ
+1983 года. Ðо 1987 года маниÑеÑÑ
незнаÑиÑелÑно обновлÑлÑÑ,
+ÑÑÐ¾Ð±Ñ Ð¾ÑмеÑиÑÑ ÑазвиÑие; Ñ ÑеÑ
поÑ
пÑедÑÑавлÑеÑÑÑ Ð½Ð°Ð¸Ð»ÑÑÑим оÑÑавиÑÑ ÐµÐ³Ð¾
+неизменнÑм.</p>
<p>С ÑеÑ
Ð¿Ð¾Ñ Ð¼Ñ Ñзнали о ÑаÑпÑоÑÑÑаненнÑÑ
невеÑнÑÑ
ÑолкованиÑÑ
опÑеделеннÑÑ
понÑÑий.
Ðзменение ÑоÑмÑлиÑовок
могло Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ Ð¸Ð·Ð±ÐµÐ¶Ð°ÑÑ Ð¸Ñ
. СноÑки,
добавленнÑе наÑÐ¸Ð½Ð°Ñ Ñ
1993 года, помогаÑÑ Ð¿ÑоÑÑниÑÑ ÑÑи
аÑпекÑÑ.</p>
-<p>Свежие ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ пÑогÑаммаÑ
, доÑÑÑпнÑÑ
в ÑамкаÑ
пÑоекÑа GNU, пожалÑйÑÑа,
-иÑиÑе на наÑем <a href="/home.html">ÑайÑе</a>, в
оÑобенноÑÑи, в наÑем <a
-href="/software/software.html">ÑпиÑке пÑогÑамм</a>. Ðак
помоÑÑ Ð¿ÑоекÑÑ,
-опиÑано на ÑÑÑаниÑе <a
-href="/help/help.html">http://www.gnu.org/help/help.html</a>.</p>
+<p>ÐÑли Ð²Ñ Ð¶ÐµÐ»Ð°ÐµÑе ÑÑÑановиÑÑ ÑиÑÑÐµÐ¼Ñ GNU/Linux,
Ð¼Ñ ÑекомендÑем воÑполÑзоваÑÑÑÑ
+одним из <a href="/distros">ÑÑопÑоÑенÑно ÑвободнÑÑ
диÑÑÑибÑÑивов
+GNU/Linux</a>. Ð Ñом, как помоÑÑ, Ñм. на <a
+href="/help/help.html">http://www.gnu.org/help</a>.</p>
+
+<p>ÐÑÐ¾ÐµÐºÑ GNU — ÑаÑÑÑ Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð·Ð°
ÑвободнÑе пÑогÑаммÑ, вÑÑÑÑпаÑÑего
+за <a href="/philosophy/free-sw.html">ÑвободÑ
полÑзоваÑелей
+пÑогÑамм</a>. ÐÑÑоÑииÑоваÑÑ GNU Ñ Ð²ÑÑажением
“оÑкÑÑÑÑй иÑÑ
однÑй
+ÑекÑÑ” — оÑибка: ÑÑо вÑÑажение
введено в обÑаÑение
+в 1998 Ð³Ð¾Ð´Ñ Ð»ÑдÑми, неÑоглаÑнÑми Ñ
ÑÑиÑеÑкими ÑенноÑÑÑми движениÑ
+за ÑвободнÑе пÑогÑаммÑ. Ðни полÑзÑÑÑÑÑ
ÑÑим вÑÑажением, ÑÑобÑ
+пÑопагандиÑоваÑÑ <a
+href="/philosophy/open-source-misses-the-point.html">амоÑалÑнÑй
подÑ
од</a> к
+Ñой же ÑÑеÑе.</p>
<h3 id="whats-gnu">ЧÑо Ñакое GNU? GNU — не Unix!</h3>
@@ -841,7 +850,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -855,8 +864,8 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014 Free
-Software Foundation, Inc.</p>
+<p>Copyright © 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015
+Free Software Foundation, Inc.</p>
<p>
Permission is granted to anyone to make or distribute verbatim copies of
@@ -887,7 +896,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2015/05/18 08:15:17 $
+$Date: 2015/06/03 09:27:59 $
<!-- timestamp end -->
</p>
Index: gnu/po/gnu-linux-faq.ru-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ru-en.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- gnu/po/gnu-linux-faq.ru-en.html 8 Feb 2015 08:56:55 -0000 1.39
+++ gnu/po/gnu-linux-faq.ru-en.html 3 Jun 2015 09:27:59 -0000 1.40
@@ -126,6 +126,11 @@
<li><a href="#whyorder" id="TOCwhyorder">Why “GNU/Linux”
rather than “Linux/GNU”?</a></li>
+<li><a href="#distronames0" id="TOCdistronames0">My distro's developers call it
+ “Foobar Linux”, but that doesn't say anything about
+ what the system consists of. Why shouldn't they call it whatever
+ they like?</a></li>
+
<li><a href="#distronames" id="TOCdistronames">My distro is called
“Foobar Linux”; doesn't that show it's really
Linux?</a></li>
@@ -173,6 +178,9 @@
<li><a href="#justlinux" id="TOCjustlinux">Can't Linux be used without
GNU?</a></li>
+<li><a href="#howmuch" id="TOChowmuch">How much of the GNU system
+is needed for the system to be GNU/Linux?</a></li>
+
<li><a href="#linuxsyswithoutgnu" id="TOClinuxsyswithoutgnu">Are there
complete Linux systems [sic] without GNU?</a></li>
<li><a href="#helplinus" id="TOChelplinus">Why not call the system
@@ -825,6 +833,21 @@
make it seem that the whole system is Linux.</p>
</dd>
+<dt id="distronames0">My distro's developers call it
+ “Foobar Linux”, but that doesn't say anything about
+ what the system consists of. Why shouldn't they call it whatever
+ they like? <span class="anchor-reference-id">(<a
href="#distronames0">#distronames0</a>)</span></dt>
+<dd>
+Calling a system “Foobar Linux” implies that it's a flavor
+of “Linux,” and people <a href="#distronames">understand
+it that way</a>.
+
+<p>
+If they called a GNU/Linux distro “Foobar BSD,” you would
+call that a mistake. “This system is not BSD,” you
+would tell them. Well, it's not Linux either.</p>
+</dd>
+
<dt id="distronames">My distro is called
“Foobar Linux”; doesn't that show it's really Linux? <span
class="anchor-reference-id">(<a
href="#distronames">#distronames</a>)</span></dt>
@@ -842,7 +865,7 @@
<dd><p>If it's allowed for them to change “GNU” to
“Foobar Linux”, it's allowed for you to change it back and
call it “Foobar GNU/Linux”. This is what you ought to do,
-because otherwise you'd be propagating their error and unfairness.</p></dd>
+to avoid their error.</p></dd>
<dt id="companies">Wouldn't it be more
effective to ask companies such as Mandrake, Red Hat and IBM to
@@ -1145,6 +1168,25 @@
from GNU/Linux is the absence of GNU.</p>
</dd>
+<dt id="howmuch">How much of the GNU system is needed for the system
+to be
+GNU/Linux? <span class="anchor-reference-id">(<a
href="#howmuch">#howmuch</a>)</span></dt>
+
+<dd>
+“How much” is the wrong question.
+<p>
+If you replace all (or nearly all) of the parts of an airplane, one by
+one, with spares, is it still the same plane? That question is a
+philosophical conundrum, but the agreed answer is “yes.”
+</p>
+
+<p>The GNU system is something bigger than just the many components
+that were released by the GNU Project. If you start with GNU/Linux
+replace nearly all the components with others, you may end up with a
+nearly disjoint set of code, but it will still be the GNU/Linux
+system.</p>
+</dd>
+
<dt id="helplinus">Why not call the system
“Linux” anyway, and strengthen Linus Torvalds' role as
posterboy for our
community? <span class="anchor-reference-id">(<a
href="#helplinus">#helplinus</a>)</span></dt>
@@ -1456,7 +1498,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -1475,14 +1517,14 @@
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>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/02/08 08:56:55 $
+$Date: 2015/06/03 09:27:59 $
<!-- timestamp end -->
</p>
</div>
Index: gnu/po/gnu-linux-faq.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ru.po,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- gnu/po/gnu-linux-faq.ru.po 3 Jun 2015 09:01:28 -0000 1.70
+++ gnu/po/gnu-linux-faq.ru.po 3 Jun 2015 09:27:59 -0000 1.71
@@ -16,7 +16,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-06-02 12:55+0000\n"
"X-Poedit-Language: Russian\n"
# type: Content of: <title>
@@ -349,22 +348,15 @@
# type: Content of: <ul><li>
#. type: Content of: <ul><li>
-# | <a [-href=\"#distronames\" id=\"TOCdistronames\">My distro is called-]
-# | {+href=\"#distronames0\" id=\"TOCdistronames0\">My distro's developers
-# | call it+} “Foobar [-Linux”; doesn't-] {+Linux”, but+}
-# | that [-show it's really Linux?</a>-] {+doesn't say anything about what the
-# | system consists of. Why shouldn't they call it whatever they like?</a>+}
-#| msgid ""
-#| "<a href=\"#distronames\" id=\"TOCdistronames\">My distro is called “"
-#| "Foobar Linux”; doesn't that show it's really Linux?</a>"
msgid ""
"<a href=\"#distronames0\" id=\"TOCdistronames0\">My distro's developers call "
"it “Foobar Linux”, but that doesn't say anything about what the "
"system consists of. Why shouldn't they call it whatever they like?</a>"
msgstr ""
-"<a href=\"#distronames0\" id=\"TOCdistronames0\">РазÑабоÑÑики
моего диÑÑÑибÑÑива "
-"назÑваÑÑ ÐµÐ³Ð¾ “Foobar Linux”, но ÑÑо ниÑего
не говоÑÐ¸Ñ Ð¾ Ñом, из Ñего "
-"ÑоÑÑÐ¾Ð¸Ñ ÑиÑÑема. ÐоÑÐµÐ¼Ñ Ð¾Ð½Ð¸ не могÑÑ
назÑваÑÑ ÐµÐ³Ð¾ Ñак, как им вздÑмаеÑÑÑ?</a>"
+"<a href=\"#distronames0\" id=\"TOCdistronames0\">РазÑабоÑÑики
моего "
+"диÑÑÑибÑÑива назÑваÑÑ ÐµÐ³Ð¾ “Foobar Linux”,
но ÑÑо ниÑего не "
+"говоÑÐ¸Ñ Ð¾ Ñом, из Ñего ÑоÑÑÐ¾Ð¸Ñ ÑиÑÑема.
ÐоÑÐµÐ¼Ñ Ð¾Ð½Ð¸ не могÑÑ Ð½Ð°Ð·ÑваÑÑ ÐµÐ³Ð¾ "
+"Ñак, как им вздÑмаеÑÑÑ?</a>"
# type: Content of: <ul><li>
#. type: Content of: <ul><li>
@@ -496,13 +488,6 @@
# type: Content of: <ul><li>
#. type: Content of: <ul><li>
-# | <a [-href=\"#howerror\" id=\"TOChowerror\">How did it come about that most
-# | people call-] {+href=\"#howmuch\" id=\"TOChowmuch\">How much of+} the
-# | {+GNU+} system [-“Linux”?</a>-] {+is needed for the system to
-# | be GNU/Linux?</a>+}
-#| msgid ""
-#| "<a href=\"#howerror\" id=\"TOChowerror\">How did it come about that most "
-#| "people call the system “Linux”?</a>"
msgid ""
"<a href=\"#howmuch\" id=\"TOChowmuch\">How much of the GNU system is needed "
"for the system to be GNU/Linux?</a>"
@@ -2057,25 +2042,16 @@
# type: Content of: <dl><dt>
#. type: Content of: <dl><dt>
-# | My [-distro is called-] {+distro's developers call it+} “Foobar
-# | [-Linux”; doesn't-] {+Linux”, but+} that [-show it's really
-# | Linux?-] {+doesn't say anything about what the system consists of. Why
-# | shouldn't they call it whatever they like?+} <span
-# | class=\"anchor-reference-id\">(<a
-#| msgid ""
-#| "My distro is called “Foobar Linux”; doesn't that show it's "
-#| "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
-#| "\">#distronames</a>)</span>"
msgid ""
"My distro's developers call it “Foobar Linux”, but that doesn't "
"say anything about what the system consists of. Why shouldn't they call it "
"whatever they like? <span class=\"anchor-reference-id\">(<a href="
"\"#distronames0\">#distronames0</a>)</span>"
msgstr ""
-"РазÑабоÑÑики моего диÑÑÑибÑÑива "
-"назÑваÑÑ ÐµÐ³Ð¾ “Foobar Linux”, но ÑÑо ниÑего
не говоÑÐ¸Ñ Ð¾ Ñом, из Ñего "
-"ÑоÑÑÐ¾Ð¸Ñ ÑиÑÑема. ÐоÑÐµÐ¼Ñ Ð¾Ð½Ð¸ не могÑÑ
назÑваÑÑ ÐµÐ³Ð¾ Ñак, как им вздÑмаеÑÑÑ?"
-"<span class=\"anchor-reference-id\">(<a
href=\"#distronames0\">#distronames0</a>)</span>"
+"РазÑабоÑÑики моего диÑÑÑибÑÑива назÑваÑÑ
его “Foobar Linux”, но "
+"ÑÑо ниÑего не говоÑÐ¸Ñ Ð¾ Ñом, из Ñего
ÑоÑÑÐ¾Ð¸Ñ ÑиÑÑема. ÐоÑÐµÐ¼Ñ Ð¾Ð½Ð¸ не могÑÑ "
+"назÑваÑÑ ÐµÐ³Ð¾ Ñак, как им вздÑмаеÑÑÑ?<span
class=\"anchor-reference-id\">(<a "
+"href=\"#distronames0\">#distronames0</a>)</span>"
#. type: Content of: <dl><dd>
msgid ""
@@ -2084,8 +2060,8 @@
"way</a>."
msgstr ""
"Ðазвание “Foobar Linux” пÑедполагаеÑ, ÑÑо
ÑÑо ÑазновидноÑÑÑ "
-"“Linux”, и лÑди <a
href=\"#distronames\">воÑпÑинимаÑÑ ÑÑо "
-"Ñаким обÑазом</a>."
+"“Linux”, и лÑди <a
href=\"#distronames\">воÑпÑинимаÑÑ ÑÑо Ñаким "
+"обÑазом</a>."
#. type: Content of: <dl><dd><p>
msgid ""
@@ -2138,16 +2114,6 @@
# type: Content of: <dl><dd><p>
#. type: Content of: <dl><dd><p>
-# | If it's allowed for them to change “GNU” to “Foobar
-# | Linux”, it's allowed for you to change it back and call it
-# | “Foobar GNU/Linux”. This is what you ought to do, [-because
-# | otherwise you'd be propagating-] {+to avoid+} their [-error and
-# | unfairness.-] {+error.+}
-#| msgid ""
-#| "If it's allowed for them to change “GNU” to “Foobar "
-#| "Linux”, it's allowed for you to change it back and call it “"
-#| "Foobar GNU/Linux”. This is what you ought to do, because otherwise "
-#| "you'd be propagating their error and unfairness."
msgid ""
"If it's allowed for them to change “GNU” to “Foobar "
"Linux”, it's allowed for you to change it back and call it “"
@@ -2155,8 +2121,8 @@
msgstr ""
"ÐÑли им позволиÑелÑно измениÑÑ “GNU”
на “Foobar "
"Linux”, Ñо вам позволиÑелÑно измениÑÑ ÐµÐ³Ð¾
обÑаÑно и назÑваÑÑ ÑÑо "
-"“Foobar GNU/Linux”. ÐÑо-Ñо Ð²Ñ Ð¸ должнÑ
делаÑÑ: "
-"избегаÑÑ Ð¸Ñ
оÑибки."
+"“Foobar GNU/Linux”. ÐÑо-Ñо Ð²Ñ Ð¸ должнÑ
делаÑÑ: избегаÑÑ Ð¸Ñ
"
+"оÑибки."
# type: Content of: <dl><dt>
#. type: Content of: <dl><dt>
@@ -2877,20 +2843,13 @@
# type: Content of: <dl><dt>
#. type: Content of: <dl><dt>
-# | [-Why do you call it GNU/Linux and not Linux?-]{+How much of the GNU
-# | system is needed for the system to be GNU/Linux?+} <span
-# | class=\"anchor-reference-id\">(<a [-href=\"#why\">#why</a>)</span>-]
-# | {+href=\"#howmuch\">#howmuch</a>)</span>+}
-#| msgid ""
-#| "Why do you call it GNU/Linux and not Linux? <span class=\"anchor-"
-#| "reference-id\">(<a href=\"#why\">#why</a>)</span>"
msgid ""
"How much of the GNU system is needed for the system to be GNU/Linux? <span "
"class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
msgstr ""
-"Ðакое колиÑеÑÑво ÑиÑÑÐµÐ¼Ñ GNU должна "
-"ÑодеÑжаÑÑ ÑиÑÑема, ÑÑÐ¾Ð±Ñ Ð±ÑÑÑ GNU/Linux? <span "
-"class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
+"Ðакое колиÑеÑÑво ÑиÑÑÐµÐ¼Ñ GNU должна
ÑодеÑжаÑÑ ÑиÑÑема, ÑÑÐ¾Ð±Ñ Ð±ÑÑÑ GNU/Linux? "
+"<span class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</"
+"span>"
#. type: Content of: <dl><dd>
msgid "“How much” is the wrong question."
@@ -2903,8 +2862,8 @@
"conundrum, but the agreed answer is “yes.”"
msgstr ""
"ÐÑли Ð²Ñ Ð·Ð°Ð¼ÐµÐ½Ð¸Ñе вÑе (или поÑÑи вÑе) ÑаÑÑи
ÑамолеÑа, Ð¾Ð´Ð½Ñ Ð·Ð° дÑÑгой, на "
-"запаÑнÑе ÑаÑÑи, бÑÐ´ÐµÑ Ð»Ð¸ ÑÑо ÑÐ¾Ñ Ð¶Ðµ
ÑамолеÑ? ÐÑо вопÑÐ¾Ñ ÑилоÑоÑÑкий, "
-"но обÑепÑинÑÑÑй оÑÐ²ÐµÑ — да."
+"запаÑнÑе ÑаÑÑи, бÑÐ´ÐµÑ Ð»Ð¸ ÑÑо ÑÐ¾Ñ Ð¶Ðµ
ÑамолеÑ? ÐÑо вопÑÐ¾Ñ ÑилоÑоÑÑкий, но "
+"обÑепÑинÑÑÑй оÑÐ²ÐµÑ — да."
#. type: Content of: <dl><dd><p>
msgid ""
@@ -2914,9 +2873,9 @@
"code, but it will still be the GNU/Linux system."
msgstr ""
"СиÑÑема GNU еÑÑÑ Ð½ÐµÑÑо болÑÑее, Ñем пÑоÑÑо
множеÑÑво компоненÑ, вÑпÑÑеннÑÑ
"
-"пÑоекÑом GNU. ÐÑли Ð²Ñ Ð½Ð°ÑнеÑе Ñ GNU/Linux и
замениÑе поÑÑи вÑе компоненÑÑ "
-"на дÑÑгие, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе полÑÑиÑÑ Ð¿Ð¾ÑÑи не
ÑвÑзанное множеÑÑво пÑогÑамм, но "
-"ÑÑо вÑе Ñавно бÑÐ´ÐµÑ ÑиÑÑема GNU/Linux."
+"пÑоекÑом GNU. ÐÑли Ð²Ñ Ð½Ð°ÑнеÑе Ñ GNU/Linux и
замениÑе поÑÑи вÑе компоненÑÑ Ð½Ð° "
+"дÑÑгие, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе полÑÑиÑÑ Ð¿Ð¾ÑÑи не
ÑвÑзанное множеÑÑво пÑогÑамм, но ÑÑо вÑе "
+"Ñавно бÑÐ´ÐµÑ ÑиÑÑема GNU/Linux."
# type: Content of: <dl><dt>
#. type: Content of: <dl><dt>
@@ -3605,11 +3564,6 @@
"(translation)"
#. type: Content of: <div><p>
-# || No change detected. The change might only be in amounts of spaces.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
Index: gnu/po/gnu-users-never-heard-of-gnu.ru-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.ru-en.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gnu/po/gnu-users-never-heard-of-gnu.ru-en.html 12 Apr 2014 13:53:31
-0000 1.23
+++ gnu/po/gnu-users-never-heard-of-gnu.ru-en.html 3 Jun 2015 09:27:59
-0000 1.24
@@ -16,45 +16,45 @@
</p></blockquote>
</div>
-<p>Most people have never heard of GNU. Even most of the people who use
-the GNU system have never heard of GNU, thanks to so many people and
-companies who teach them to call it “Linux”. Nonetheless,
-the name GNU has certain associations, which people will discover once
-they hear the name. GNU is associated with the ideals of freedom of the
-free software movement. That association is no accident; the motive for
-developing GNU was specifically to make it possible to use a computer
-and have freedom.</p>
-
-<p>The association between the name GNU and our goals of freedom and
-social solidarity exists in the minds of hundreds of thousands of
-GNU/Linux users that do know about GNU. It exists in Wikipedia. And it
-exists around the web; if these users search for GNU, they will find <a
-href="http://www.gnu.org";>www.gnu.org</a>, which talks about free
-software and freedom.</p>
+<p>Most people have never heard of GNU. Even most of the people who
+use the GNU system have never heard of GNU, since so many people and
+companies teach them to call it “Linux”. Indeed, GNU
+users often say they are “running Linux”, which is like
+saying you are “driving your carburettor” or
+“driving your transmission”.</p>
+
+<p>Nonetheless, those who know about GNU associate it with the ideals
+of freedom of the free software movement. That association is no
+accident; the motive for developing GNU was specifically to make it
+possible to use a computer and have freedom.</p>
<p>A person seeing the name “GNU” for the first time in
-“GNU/Linux” won't immediately associate it with anything.
-However, when people know that the system is basically GNU, that brings
-them a step closer to learning about our ideals. For instance, they
-might become curious and look for more information about GNU.</p>
-
-<p>If they don't look for it, they may encounter it anyway. The
-“open source” rhetoric tends to lead people's attention away
-from issues of users' freedom, but not totally; there is still
-discussion of GNU and free software, and people have some chance of
-coming across it. When that happens, the reader is more likely to pay
-attention to information about GNU (such as that it's the work of a
-campaign for freedom and community) if he knows he is a user of the GNU
+“GNU/Linux” won't immediately know what it represents, has
+come one step closer to finding out. The association between the name
+GNU and our goals of freedom and social solidarity exists in the minds
+of hundreds of thousands of GNU/Linux users that do know about GNU.
+It exists in <a href="http://www.gnu.org";>gnu.org</a> and in
+Wikipedia. It exists around the web; if these users search for GNU,
+they will find the ideas GNU stands for.</p>
+
+<p>If they don't search, they may encounter them anyway. The
+<a href="/philosophy/open-source-misses-the-point.html">“open
+source”</a> rhetoric tends to lead people's attention away from
+issues of users' freedom, but not totally; there is still discussion
+of GNU and free software, and people have some chance of coming across
+it. When that happens, they are more likely to pay attention to
+information about GNU (such as that it's the work of a campaign for
+freedom and community) if they know they are users of the GNU
system.</p>
<p>Over time, calling the system “GNU/Linux” spreads
awareness of the ideals of freedom for which we developed the GNU
-system. It is also useful as a reminder for people in our community who
-know about these ideals, in a world where much of discussion of free
-software takes a totally practical (and thus amoral) approach. When we
-ask you to call the system “GNU/Linux”, we do so because
-awareness of GNU slowly but surely brings with it awareness of the free
-software ideals of freedom and community.</p>
+system. It is also useful as a reminder for people in our community
+who know about these ideals, in a world where much of discussion of
+free software takes a totally practical (and thus amoral) approach.
+When we ask you to call the system “GNU/Linux”, we are
+asking you to help in making the public aware of the free software
+ideals.</p>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
@@ -88,7 +88,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -103,17 +103,17 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2006, 2007, 2013, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright © 2006, 2007, 2013, 2014, 2015 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>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/12 13:53:31 $
+$Date: 2015/06/03 09:27:59 $
<!-- timestamp end -->
</p>
</div>
Index: gnu/po/gnu-users-never-heard-of-gnu.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.ru.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gnu/po/gnu-users-never-heard-of-gnu.ru.po 3 Jun 2015 09:01:28 -0000
1.23
+++ gnu/po/gnu-users-never-heard-of-gnu.ru.po 3 Jun 2015 09:27:59 -0000
1.24
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-06-02 12:25+0000\n"
"X-Poedit-Language: Russian\n"
# type: Content of: <title>
@@ -54,26 +53,6 @@
# type: Content of: <p>
#. type: Content of: <p>
-# | Most people have never heard of GNU. Even most of the people who use the
-# | GNU system have never heard of GNU, [-thanks to-] {+since+} so many people
-# | and companies [-who-] teach them to call it “Linux”.
-# | [-Nonetheless, the name-] {+Indeed,+} GNU [-has certain associations,
-# | which people will discover once-] {+users often say+} they [-hear the
-# | name. GNU is associated with the ideals of freedom of the free software
-# | movement. That association-] {+are “running Linux”, which+}
-# | is [-no accident; the motive for developing GNU was specifically to make
-# | it possible to use a computer and have freedom.-] {+like saying you are
-# | “driving your carburettor” or “driving your
-# | transmission”.+}
-#| msgid ""
-#| "Most people have never heard of GNU. Even most of the people who use the "
-#| "GNU system have never heard of GNU, thanks to so many people and "
-#| "companies who teach them to call it “Linux”. Nonetheless, "
-#| "the name GNU has certain associations, which people will discover once "
-#| "they hear the name. GNU is associated with the ideals of freedom of the "
-#| "free software movement. That association is no accident; the motive for "
-#| "developing GNU was specifically to make it possible to use a computer and "
-#| "have freedom."
msgid ""
"Most people have never heard of GNU. Even most of the people who use the "
"GNU system have never heard of GNU, since so many people and companies teach "
@@ -82,32 +61,14 @@
"your carburettor” or “driving your transmission”."
msgstr ""
"ÐолÑÑинÑÑво лÑдей никогда не ÑлÑÑали о GNU.
Ðаже болÑÑинÑÑво лÑдей, "
-"иÑполÑзÑÑÑиÑ
ÑиÑÑÐµÐ¼Ñ GNU, никогда не
ÑлÑÑали о GNU, поÑколÑÐºÑ Ñак "
-"много лÑдей и компаний пÑиÑÑаÑÑ Ð¸Ñ
назÑваÑÑ ÐµÐµ “Linux”. ÐейÑÑвиÑелÑно, "
-"полÑзоваÑели GNU ÑаÑÑо говоÑÑÑ, ÑÑо они
“ÑабоÑаÑÑ Ð½Ð° Linux”, "
-"ÑÑо вÑе Ñавно ÑÑо говоÑиÑÑ, ÑÑо вÑ
“едеÑе на каÑбÑÑаÑоÑе” или "
-"“едеÑе на коÑобке пеÑедає."
+"иÑполÑзÑÑÑиÑ
ÑиÑÑÐµÐ¼Ñ GNU, никогда не
ÑлÑÑали о GNU, поÑколÑÐºÑ Ñак много "
+"лÑдей и компаний пÑиÑÑаÑÑ Ð¸Ñ
назÑваÑÑ ÐµÐµ
“Linux”. ÐейÑÑвиÑелÑно, "
+"полÑзоваÑели GNU ÑаÑÑо говоÑÑÑ, ÑÑо они
“ÑабоÑаÑÑ Ð½Ð° Linux”, ÑÑо "
+"вÑе Ñавно ÑÑо говоÑиÑÑ, ÑÑо Ð²Ñ “едеÑе на
каÑбÑÑаÑоÑе” или “"
+"едеÑе на коÑобке пеÑедає."
# type: Content of: <p>
#. type: Content of: <p>
-# | [-Most people have never heard of GNU. Even most of the
-# | people-]{+Nonetheless, those+} who [-use the-] {+know about+} GNU [-system
-# | have never heard of GNU, thanks to so many people and companies who teach
-# | them to call-] {+associate+} it [-“Linux”. Nonetheless, the
-# | name GNU has certain associations, which people will discover once they
-# | hear the name. GNU is associated-] with the ideals of freedom of the free
-# | software movement. That association is no accident; the motive for
-# | developing GNU was specifically to make it possible to use a computer and
-# | have freedom.
-#| msgid ""
-#| "Most people have never heard of GNU. Even most of the people who use the "
-#| "GNU system have never heard of GNU, thanks to so many people and "
-#| "companies who teach them to call it “Linux”. Nonetheless, "
-#| "the name GNU has certain associations, which people will discover once "
-#| "they hear the name. GNU is associated with the ideals of freedom of the "
-#| "free software movement. That association is no accident; the motive for "
-#| "developing GNU was specifically to make it possible to use a computer and "
-#| "have freedom."
msgid ""
"Nonetheless, those who know about GNU associate it with the ideals of "
"freedom of the free software movement. That association is no accident; the "
@@ -120,22 +81,6 @@
# type: Content of: <p>
#. type: Content of: <p>
-# | {+A person seeing the name “GNU” for the first time in
-# | “GNU/Linux” won't immediately know what it represents, has
-# | come one step closer to finding out.+} The association between the name
-# | GNU and our goals of freedom and social solidarity exists in the minds of
-# | hundreds of thousands of GNU/Linux users that do know about GNU. It
-# | exists in {+<a href=\"http://www.gnu.org\";>gnu.org</a> and in+} Wikipedia.
-# | [-And it-] {+It+} exists around the web; if these users search for GNU,
-# | they will find [-<a href=\"http://www.gnu.org\";>www.gnu.org</a>, which
-# | talks about free software and freedom.-] {+the ideas GNU stands for.+}
-#| msgid ""
-#| "The association between the name GNU and our goals of freedom and social "
-#| "solidarity exists in the minds of hundreds of thousands of GNU/Linux "
-#| "users that do know about GNU. It exists in Wikipedia. And it exists "
-#| "around the web; if these users search for GNU, they will find <a href="
-#| "\"http://www.gnu.org\";>www.gnu.org</a>, which talks about free software "
-#| "and freedom."
msgid ""
"A person seeing the name “GNU” for the first time in “GNU/"
"Linux” won't immediately know what it represents, has come one step "
@@ -145,34 +90,16 @@
"\"http://www.gnu.org\";>gnu.org</a> and in Wikipedia. It exists around the "
"web; if these users search for GNU, they will find the ideas GNU stands for."
msgstr ""
-"Человек, ÑвидевÑий впеÑвÑе название
“GNU” в “GNU/Linux”, "
-"не ÑÐ·Ð½Ð°ÐµÑ ÑÑÑ Ð¶Ðµ, ÑÑо оно пÑедÑÑавлÑеÑ, но
он Ñделал Ñаг к ÑомÑ, ÑÑÐ¾Ð±Ñ ÑзнаÑÑ ÑÑо. "
-"ÐÑÑоÑиаÑÐ¸Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ GNU Ñ Ð½Ð°Ñими ÑелÑми
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð¸ обÑеÑÑвенной ÑолидаÑноÑÑи "
-"ÑÑÑеÑÑвÑÐµÑ Ð² ÑмаÑ
ÑоÑен ÑÑÑÑÑ
полÑзоваÑелей GNU/Linux, коÑоÑÑе о GNU знаÑÑ. "
-"Ðна ÑÑÑеÑÑвÑÐµÑ Ð½Ð° <a href=\"/"
-"\">gnu.org</a> и в Ðикипедии. Ðна ÑÑÑеÑÑвÑÐµÑ Ð²Ð¾
ÐÑемиÑной паÑÑине; еÑли "
-"полÑзоваÑели ÑÑанÑÑ Ð¸ÑкаÑÑ GNU, они найдÑÑ
идеи, ÑÑоÑÑие за GNU."
+"Человек, ÑвидевÑий впеÑвÑе название
“GNU” в “GNU/"
+"Linux”, не ÑÐ·Ð½Ð°ÐµÑ ÑÑÑ Ð¶Ðµ, ÑÑо оно
пÑедÑÑавлÑеÑ, но он Ñделал Ñаг к "
+"ÑомÑ, ÑÑÐ¾Ð±Ñ ÑзнаÑÑ ÑÑо. ÐÑÑоÑиаÑиÑ
Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ GNU Ñ Ð½Ð°Ñими ÑелÑми ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð¸ "
+"обÑеÑÑвенной ÑолидаÑноÑÑи ÑÑÑеÑÑвÑÐµÑ Ð²
ÑмаÑ
ÑоÑен ÑÑÑÑÑ Ð¿Ð¾Ð»ÑзоваÑелей GNU/"
+"Linux, коÑоÑÑе о GNU знаÑÑ. Ðна ÑÑÑеÑÑвÑÐµÑ Ð½Ð° <a
href=\"/\">gnu.org</a> и в "
+"Ðикипедии. Ðна ÑÑÑеÑÑвÑÐµÑ Ð²Ð¾ ÐÑемиÑной
паÑÑине; еÑли полÑзоваÑели ÑÑанÑÑ "
+"иÑкаÑÑ GNU, они найдÑÑ Ð¸Ð´ÐµÐ¸, ÑÑоÑÑие за GNU."
# type: Content of: <p>
#. type: Content of: <p>
-# | If they don't [-look for it,-] {+search,+} they may encounter [-it-]
-# | {+them+} anyway. The [-“open source”-] {+<a
-# | href=\"/philosophy/open-source-misses-the-point.html\">“open
-# | source”</a>+} rhetoric tends to lead people's attention away from
-# | issues of users' freedom, but not totally; there is still discussion of
-# | GNU and free software, and people have some chance of coming across it.
-# | When that happens, [-the reader is-] {+they are+} more likely to pay
-# | attention to information about GNU (such as that it's the work of a
-# | campaign for freedom and community) if [-he knows he is a user-] {+they
-# | know they are users+} of the GNU system.
-#| msgid ""
-#| "If they don't look for it, they may encounter it anyway. The “open "
-#| "source” rhetoric tends to lead people's attention away from issues "
-#| "of users' freedom, but not totally; there is still discussion of GNU and "
-#| "free software, and people have some chance of coming across it. When "
-#| "that happens, the reader is more likely to pay attention to information "
-#| "about GNU (such as that it's the work of a campaign for freedom and "
-#| "community) if he knows he is a user of the GNU system."
msgid ""
"If they don't search, they may encounter them anyway. The <a href=\"/"
"philosophy/open-source-misses-the-point.html\">“open source”</a> "
@@ -183,9 +110,9 @@
"(such as that it's the work of a campaign for freedom and community) if they "
"know they are users of the GNU system."
msgstr ""
-"ÐÑли они не иÑÑÑ ÑÑого, они вÑе Ñавно могÑÑ
вÑÑÑеÑиÑÑÑÑ Ñ ÑÑим. ÐозÑнги “"
-"<a href=\"/"
-"philosophy/open-source-misses-the-point.html\">оÑкÑÑÑого иÑÑ
одного ÑекÑÑа</a>” во многиÑ
ÑлÑÑаÑÑ
оÑвлекаÑÑ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ "
+"ÐÑли они не иÑÑÑ ÑÑого, они вÑе Ñавно могÑÑ
вÑÑÑеÑиÑÑÑÑ Ñ ÑÑим. ÐозÑнги "
+"“<a
href=\"/philosophy/open-source-misses-the-point.html\">оÑкÑÑÑого "
+"иÑÑ
одного ÑекÑÑа</a>” во многиÑ
ÑлÑÑаÑÑ
оÑвлекаÑÑ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ "
"полÑзоваÑелей Ð¾Ñ Ð¿Ñоблем ÑвободÑ, но не
полноÑÑÑÑ; обÑÑждение GNU и "
"ÑвободнÑÑ
пÑогÑамм вÑе-Ñаки пÑодолжаеÑÑÑ,
и еÑÑÑ Ð½ÐµÐºÐ¾ÑоÑÑй ÑанÑ, ÑÑо лÑди "
"наÑкнÑÑÑÑ Ð½Ð° него. Ðогда ÑÑо пÑоиÑÑ
одиÑ,
они ÑкоÑее обÑаÑÑÑ Ð²Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ на "
@@ -194,24 +121,6 @@
# type: Content of: <p>
#. type: Content of: <p>
-# | Over time, calling the system “GNU/Linux” spreads awareness of
-# | the ideals of freedom for which we developed the GNU system. It is also
-# | useful as a reminder for people in our community who know about these
-# | ideals, in a world where much of discussion of free software takes a
-# | totally practical (and thus amoral) approach. When we ask you to call the
-# | system “GNU/Linux”, we [-do so because awareness of GNU slowly
-# | but surely brings with it awareness-] {+are asking you to help in making
-# | the public aware+} of the free software [-ideals of freedom and
-# | community.-] {+ideals.+}
-#| msgid ""
-#| "Over time, calling the system “GNU/Linux” spreads awareness "
-#| "of the ideals of freedom for which we developed the GNU system. It is "
-#| "also useful as a reminder for people in our community who know about "
-#| "these ideals, in a world where much of discussion of free software takes "
-#| "a totally practical (and thus amoral) approach. When we ask you to call "
-#| "the system “GNU/Linux”, we do so because awareness of GNU "
-#| "slowly but surely brings with it awareness of the free software ideals of "
-#| "freedom and community."
msgid ""
"Over time, calling the system “GNU/Linux” spreads awareness of "
"the ideals of freedom for which we developed the GNU system. It is also "
@@ -227,8 +136,8 @@
"коÑоÑÑе знаÑÑ Ð¾Ð± ÑÑиÑ
идеалаÑ
, в миÑе, где
знаÑиÑелÑÐ½Ð°Ñ ÑаÑÑÑ Ð¾Ð±ÑÑждений "
"Ñвободного пÑогÑаммного обеÑпеÑениÑ
пÑÐ¸Ð½Ð¸Ð¼Ð°ÐµÑ ÑиÑÑо пÑакÑиÑеÑкий (а поÑÐ¾Ð¼Ñ "
"безнÑавÑÑвеннÑй) обоÑоÑ. Ðогда Ð¼Ñ Ð¿ÑоÑим
Ð²Ð°Ñ Ð½Ð°Ð·ÑваÑÑ ÑиÑÑÐµÐ¼Ñ “GNU/"
-"Linux”, Ð¼Ñ Ð¿ÑоÑим Ð²Ð°Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ Ð¾ÑведомлÑÑÑ
обÑеÑÑво об "
-"идеалаÑ
ÑвободнÑÑ
пÑогÑамм."
+"Linux”, Ð¼Ñ Ð¿ÑоÑим Ð²Ð°Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ Ð¾ÑведомлÑÑÑ
обÑеÑÑво об идеалаÑ
ÑвободнÑÑ
"
+"пÑогÑамм."
# type: Content of: <div>
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -276,20 +185,12 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
-# | Copyright © 2006, 2007, 2013, [-2014-] {+2014, 2015+} Free Software
-# | Foundation, Inc.
-#| msgid ""
-#| "Copyright © 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
msgid ""
"Copyright © 2006, 2007, 2013, 2014, 2015 Free Software Foundation, Inc."
-msgstr "Copyright © 2006, 2007, 2013, 2014, 2015 Free Software
Foundation, Inc."
+msgstr ""
+"Copyright © 2006, 2007, 2013, 2014, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
-# || No change detected. The change might only be in amounts of spaces.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
Index: gnu/po/manifesto.ru-en.html
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.ru-en.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- gnu/po/manifesto.ru-en.html 12 Apr 2014 13:53:33 -0000 1.24
+++ gnu/po/manifesto.ru-en.html 3 Jun 2015 09:28:00 -0000 1.25
@@ -6,22 +6,29 @@
<!--#include virtual="/server/banner.html" -->
<h2>The GNU Manifesto</h2>
-<p> The GNU Manifesto (which appears below) was written by <a
-href="http://www.stallman.org/";>Richard Stallman</a> at the beginning
-of the GNU Project, to ask for participation and support. For the
-first few years, it was updated in minor ways to account for
-developments, but now it seems best to leave it unchanged as most
-people have seen it.</p>
+<p> The GNU Manifesto (which appears below) was written
+by <a href="http://www.stallman.org/";>Richard Stallman</a> in 1985 to
+ask for support in developing the GNU operating system. Part of the
+text was taken from the original announcement of 1983. Through 1987,
+it was updated in minor ways to account for developments; since then,
+it seems best to leave it unchanged.</p>
<p>Since that time, we have learned about certain common
misunderstandings that different wording could help avoid. Footnotes
added since 1993 help clarify these points.</p>
-<p>For up-to-date information about the available GNU software, please
-see the information available on our <a href="/home.html">web
-server</a>, in particular our <a href="/software/software.html">list
-of software</a>. For how to contribute, see <a
-href="/help/help.html">http://www.gnu.org/help/help.html</a>.</p>
+<p>If you want to install the GNU/Linux system, we recommend you use
+one of the <a href="/distros">100% free software GNU/Linux
+distributions</a>. For how to contribute,
+see <a href="/help/help.html">http://www.gnu.org/help</a>.</p>
+
+<p>The GNU Project is part of the Free Software Movement, a campaign
+for <a href="/philosophy/free-sw.html">freedom for users of
+software</a>. It is a mistake to associate GNU with the term
+“open source”—that term was coined in 1998 by people
+who disagree with the Free Software Movement's ethical values. They
+use it to promote an
+<a href="/philosophy/open-source-misses-the-point.html">amoral approach</a> to
the same field.</p>
<h3 id="whats-gnu">What's GNU? Gnu's Not Unix!</h3>
@@ -692,7 +699,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -707,7 +714,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014
+<p>Copyright © 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015
Free Software Foundation, Inc.</p>
<p>
@@ -724,7 +731,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/12 13:53:33 $
+$Date: 2015/06/03 09:28:00 $
<!-- timestamp end -->
</p>
</div>
Index: gnu/po/manifesto.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/manifesto.ru.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gnu/po/manifesto.ru.po 3 Jun 2015 09:01:29 -0000 1.23
+++ gnu/po/manifesto.ru.po 3 Jun 2015 09:28:00 -0000 1.24
@@ -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: 2015-06-02 12:55+0000\n"
#. type: Content of: <title>
msgid "The GNU Manifesto - GNU Project - Free Software Foundation"
@@ -26,20 +25,6 @@
msgstr "ÐаниÑеÑÑ GNU"
#. type: Content of: <p>
-# | The GNU Manifesto (which appears below) was written by <a
-# | href=\"http://www.stallman.org/\";>Richard Stallman</a> [-at the beginning
-# | of the GNU Project,-] {+in 1985+} to ask for [-participation and support.
-# | For-] {+support in developing+} the [-first few years,-] {+GNU operating
-# | system. Part of the text was taken from the original announcement of
-# | 1983. Through 1987,+} it was updated in minor ways to account for
-# | [-developments, but now-] {+developments; since then,+} it seems best to
-# | leave it [-unchanged as most people have seen it.-] {+unchanged.+}
-#| msgid ""
-#| "The GNU Manifesto (which appears below) was written by <a href=\"http://";
-#| "www.stallman.org/\">Richard Stallman</a> at the beginning of the GNU "
-#| "Project, to ask for participation and support. For the first few years, "
-#| "it was updated in minor ways to account for developments, but now it "
-#| "seems best to leave it unchanged as most people have seen it."
msgid ""
"The GNU Manifesto (which appears below) was written by <a href=\"http://www.";
"stallman.org/\">Richard Stallman</a> in 1985 to ask for support in "
@@ -47,12 +32,12 @@
"original announcement of 1983. Through 1987, it was updated in minor ways "
"to account for developments; since then, it seems best to leave it unchanged."
msgstr ""
-"ÐаниÑеÑÑ GNU (коÑоÑÑй ÑледÑÐµÑ Ð½Ð¸Ð¶Ðµ) бÑл
напиÑан "
-"<a href=\"http://www.stallman.org/\";>РиÑаÑдом "
-"СÑолменом</a> в 1985 годÑ, ÑÑÐ¾Ð±Ñ "
-"пÑоÑиÑÑ Ð¾ поддеÑжке в ÑазÑабоÑке
опеÑаÑионной ÑиÑÑÐµÐ¼Ñ GNU. ЧаÑÑÑ ÑекÑÑа бÑла
взÑÑа "
-"из пеÑвонаÑалÑного обÑÑÐ²Ð»ÐµÐ½Ð¸Ñ 1983 года.
Ðо 1987 года маниÑеÑÑ Ð½ÐµÐ·Ð½Ð°ÑиÑелÑно
обновлÑлÑÑ, ÑÑÐ¾Ð±Ñ Ð¾ÑмеÑиÑÑ "
-"ÑазвиÑие; Ñ ÑеÑ
Ð¿Ð¾Ñ Ð¿ÑедÑÑавлÑеÑÑÑ
наилÑÑÑим оÑÑавиÑÑ ÐµÐ³Ð¾ неизменнÑм."
+"ÐаниÑеÑÑ GNU (коÑоÑÑй ÑледÑÐµÑ Ð½Ð¸Ð¶Ðµ) бÑл
напиÑан <a href=\"http://www.";
+"stallman.org/\">РиÑаÑдом СÑолменом</a> в
1985 годÑ, ÑÑÐ¾Ð±Ñ Ð¿ÑоÑиÑÑ Ð¾ "
+"поддеÑжке в ÑазÑабоÑке опеÑаÑионной
ÑиÑÑÐµÐ¼Ñ GNU. ЧаÑÑÑ ÑекÑÑа бÑла взÑÑа из "
+"пеÑвонаÑалÑного обÑÑÐ²Ð»ÐµÐ½Ð¸Ñ 1983 года.
Ðо 1987 года маниÑеÑÑ "
+"незнаÑиÑелÑно обновлÑлÑÑ, ÑÑÐ¾Ð±Ñ Ð¾ÑмеÑиÑÑ
ÑазвиÑие; Ñ ÑеÑ
Ð¿Ð¾Ñ Ð¿ÑедÑÑавлÑеÑÑÑ "
+"наилÑÑÑим оÑÑавиÑÑ ÐµÐ³Ð¾ неизменнÑм."
#. type: Content of: <p>
msgid ""
@@ -72,10 +57,10 @@
"how to contribute, see <a href=\"/help/help.html\">http://www.gnu.org/help</"
"a>."
msgstr ""
-"ÐÑли Ð²Ñ Ð¶ÐµÐ»Ð°ÐµÑе ÑÑÑановиÑÑ ÑиÑÑÐµÐ¼Ñ GNU/Linux,
Ð¼Ñ ÑекомендÑем воÑполÑзоваÑÑÑÑ Ð¾Ð´Ð½Ð¸Ð¼ из "
-"<a href=\"/distros\">ÑÑопÑоÑенÑно ÑвободнÑÑ
диÑÑÑибÑÑивов GNU/Linux</a>. "
-"Ð Ñом, как помоÑÑ, Ñм. на "
-"<a href=\"/help/help.html\">http://www.gnu.org/help</a>."
+"ÐÑли Ð²Ñ Ð¶ÐµÐ»Ð°ÐµÑе ÑÑÑановиÑÑ ÑиÑÑÐµÐ¼Ñ GNU/Linux,
Ð¼Ñ ÑекомендÑем воÑполÑзоваÑÑÑÑ "
+"одним из <a href=\"/distros\">ÑÑопÑоÑенÑно
ÑвободнÑÑ
диÑÑÑибÑÑивов GNU/"
+"Linux</a>. Ð Ñом, как помоÑÑ, Ñм. на <a
href=\"/help/help.html\">http://www.";
+"gnu.org/help</a>."
#. type: Content of: <p>
msgid ""
@@ -86,13 +71,14 @@
"Movement's ethical values. They use it to promote an <a href=\"/philosophy/"
"open-source-misses-the-point.html\">amoral approach</a> to the same field."
msgstr ""
-"ÐÑÐ¾ÐµÐºÑ GNU — ÑаÑÑÑ Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð·Ð°
ÑвободнÑе пÑогÑаммÑ, вÑÑÑÑпаÑÑего за <a "
-"href=\"/philosophy/free-sw.html\">ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð¿Ð¾Ð»ÑзоваÑелей
пÑогÑамм</a>. ÐÑÑоÑииÑоваÑÑ "
-"GNU Ñ Ð²ÑÑажением “оÑкÑÑÑÑй иÑÑ
однÑй
ÑекÑÑ” — оÑибка: "
-"ÑÑо вÑÑажение введено в обÑаÑение
в 1998 Ð³Ð¾Ð´Ñ Ð»ÑдÑми, неÑоглаÑнÑми Ñ "
-"ÑÑиÑеÑкими ÑенноÑÑÑми Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð·Ð°
ÑвободнÑе пÑогÑаммÑ. "
-"Ðни полÑзÑÑÑÑÑ ÑÑим вÑÑажением, ÑÑобÑ
пÑопагандиÑоваÑÑ <a href=\"/philosophy/"
-"open-source-misses-the-point.html\">амоÑалÑнÑй подÑ
од</a> к
Ñой же ÑÑеÑе."
+"ÐÑÐ¾ÐµÐºÑ GNU — ÑаÑÑÑ Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð·Ð°
ÑвободнÑе пÑогÑаммÑ, вÑÑÑÑпаÑÑего "
+"за <a href=\"/philosophy/free-sw.html\">ÑвободÑ
полÑзоваÑелей пÑогÑамм</a>. "
+"ÐÑÑоÑииÑоваÑÑ GNU Ñ Ð²ÑÑажением
“оÑкÑÑÑÑй иÑÑ
однÑй ÑекÑÑ” "
+"— оÑибка: ÑÑо вÑÑажение введено в
обÑаÑение в 1998 Ð³Ð¾Ð´Ñ "
+"лÑдÑми, неÑоглаÑнÑми Ñ ÑÑиÑеÑкими
ÑенноÑÑÑми Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð·Ð° ÑвободнÑе "
+"пÑогÑаммÑ. Ðни полÑзÑÑÑÑÑ ÑÑим
вÑÑажением, ÑÑÐ¾Ð±Ñ Ð¿ÑопагандиÑоваÑÑ <a href=\"/"
+"philosophy/open-source-misses-the-point.html\">амоÑалÑнÑй подÑ
од</a> к Ñой "
+"же ÑÑеÑе."
#. type: Content of: <h3>
msgid "What's GNU? Gnu's Not Unix!"
@@ -1514,17 +1500,12 @@
"translations.html\">“Ð ÑководÑÑве по
пеÑеводам”</a>."
#. type: Content of: <div><p>
-# | Copyright © 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, [-2014-]
-# | {+2014, 2015+} Free Software Foundation, Inc.
-#| msgid ""
-#| "Copyright © 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014 "
-#| "Free Software Foundation, Inc."
msgid ""
"Copyright © 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
"Free Software Foundation, Inc."
msgstr ""
-"Copyright © 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015
Free "
-"Software Foundation, Inc."
+"Copyright © 1985, 1993, 2003, 2005, 2007, 2008, 2009, 2010, 2014, 2015 "
+"Free Software Foundation, Inc."
#. type: Content of: <div><p>
msgid ""
Index: licenses/gpl-faq.ru.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.ru.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- licenses/gpl-faq.ru.html 13 May 2015 15:27:10 -0000 1.58
+++ licenses/gpl-faq.ru.html 3 Jun 2015 09:28:00 -0000 1.59
@@ -468,7 +468,8 @@
GPL или дÑÑгой лиÑензией ÑвободнÑÑ
пÑогÑамм?</a></li>
<li><a href="#GPLInProprietarySystem">Ðне Ñ
оÑелоÑÑ Ð±Ñ
вклÑÑиÑÑ Ð¿ÑогÑаммÑ,
-ÑаÑпÑоÑÑÑанÑемÑÑ Ð¿Ð¾ GPL, в ÑÐ²Ð¾Ñ Ð½ÐµÑвободнÑÑ
ÑиÑÑемÑ. Ðожно мне ÑÑо
+ÑаÑпÑоÑÑÑанÑемÑÑ Ð¿Ð¾ GPL, в ÑÐ²Ð¾Ñ Ð½ÐµÑвободнÑÑ
ÑиÑÑемÑ. У Ð¼ÐµÐ½Ñ Ð½ÐµÑ ÑазÑеÑениÑ
+на пÑименение ÑÑой пÑогÑаммÑ, кÑоме Ñого,
ÑÑо мне Ð´Ð°ÐµÑ GPL. Ðожно мне ÑÑо
делаÑÑ?</a></li>
<li><a href="#LGPLv3ContributorVersion">ÐÑли Ñ
ÑаÑпÑоÑÑÑанÑÑ Ð½ÐµÑвободнÑÑ
@@ -551,7 +552,8 @@
ÑоÑÑавленнÑÑ Ñак, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð´Ð³ÑÑжаÑÑ
внеÑний модÑÐ»Ñ Ð¿Ð¾Ð´ GPL?</a></li>
<li><a href="#GPLInProprietarySystem">Ðне Ñ
оÑелоÑÑ Ð±Ñ
вклÑÑиÑÑ Ð¿ÑогÑаммÑ,
-ÑаÑпÑоÑÑÑанÑемÑÑ Ð¿Ð¾ GPL, в ÑÐ²Ð¾Ñ Ð½ÐµÑвободнÑÑ
ÑиÑÑемÑ. Ðожно мне ÑÑо
+ÑаÑпÑоÑÑÑанÑемÑÑ Ð¿Ð¾ GPL, в ÑÐ²Ð¾Ñ Ð½ÐµÑвободнÑÑ
ÑиÑÑемÑ. У Ð¼ÐµÐ½Ñ Ð½ÐµÑ ÑазÑеÑениÑ
+на пÑименение ÑÑой пÑогÑаммÑ, кÑоме Ñого,
ÑÑо мне Ð´Ð°ÐµÑ GPL. Ðожно мне ÑÑо
делаÑÑ?</a></li>
<li><a href="#GPLWrapper">Ðне Ñ
оÑелоÑÑ Ð±Ñ Ð²ÐºÐ»ÑÑиÑÑ
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL в ÑвоÑ
@@ -1985,7 +1987,8 @@
<dt id="GPLInProprietarySystem">Ðне Ñ
оÑелоÑÑ Ð±Ñ Ð²ÐºÐ»ÑÑиÑÑ
пÑогÑаммÑ, ÑаÑпÑоÑÑÑанÑемÑÑ Ð¿Ð¾ GPL, в ÑвоÑ
-неÑвободнÑÑ ÑиÑÑемÑ. Ðожно мне ÑÑо делаÑÑ?
<span
+неÑвободнÑÑ ÑиÑÑемÑ. У Ð¼ÐµÐ½Ñ Ð½ÐµÑ ÑазÑеÑениÑ
на пÑименение ÑÑой пÑогÑаммÑ,
+кÑоме Ñого, ÑÑо мне Ð´Ð°ÐµÑ GPL. Ðожно мне ÑÑо
делаÑÑ? <span
class="anchor-reference-id">(<a href="#GPLInProprietarySystem"
>#GPLInProprietarySystem</a>)</span></dt>
<dd><p>
@@ -3742,7 +3745,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -3759,9 +3762,9 @@
<p>Copyright © 2014, 2015 Free Software Foundation, Inc.</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лиÑензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лиÑензии
Creative Commons Attribution-NoDerivs (<em>ÐÑÑибÑÑÐ¸Ñ —
Ðез
-пÑоизводнÑÑ
пÑоизведений</em>) 3.0 СШÐ</a>.</p>
+пÑоизводнÑÑ
пÑоизведений</em>) 4.0
ÐÑемиÑнаÑ</a>.</p>
<!--#include virtual="/server/bottom-notes.ru.html" -->
<div class="translators-credits">
@@ -3776,7 +3779,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2015/05/13 15:27:10 $
+$Date: 2015/06/03 09:28:00 $
<!-- timestamp end -->
</p>
Index: licenses/translations.ru.html
===================================================================
RCS file: /web/www/www/licenses/translations.ru.html,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- licenses/translations.ru.html 9 Feb 2015 16:56:58 -0000 1.60
+++ licenses/translations.ru.html 3 Jun 2015 09:28:00 -0000 1.61
@@ -16,13 +16,17 @@
<h3 id="UnofficialTranslations">Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ неоÑиÑиалÑнÑÑ
пеÑеводаÑ
</h3>
<p>
-ÐÑиÑина, по коÑоÑой ФСÐРне пÑÐ¸Ð·Ð½Ð°ÐµÑ ÑÑи
пеÑÐµÐ²Ð¾Ð´Ñ Ð¾ÑиÑиалÑно
-дейÑÑвиÑелÑнÑми, ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом, ÑÑо
пÑовеÑка иÑ
бÑла Ð±Ñ Ð½ÐµÐ»ÐµÐ³ÐºÐ¾Ð¹ и
-доÑогоÑÑоÑÑей (понадобилаÑÑ Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ
двÑÑзÑÑнÑÑ
ÑÑиÑÑов из дÑÑгиÑ
-ÑÑÑан). Ðолее Ñого, еÑли Ð±Ñ Ð² пеÑевод
вкÑалаÑÑ Ð¾Ñибка, ÑÑо могло Ð±Ñ Ð¸Ð¼ÐµÑÑ
-каÑаÑÑÑоÑиÑеÑкие поÑледÑÑÐ²Ð¸Ñ Ð´Ð»Ñ Ð²Ñего
ÑообÑеÑÑва Ñвободного пÑогÑаммного
-обеÑпеÑениÑ. Ðо ÑеÑ
поÑ, пока пеÑеводÑ
неоÑиÑиалÑнÑ, они не могÑÑ Ð¿ÑинеÑÑи
-никакого вÑеда.</p>
+ФСÐРне пÑÐ¸Ð·Ð½Ð°ÐµÑ Ð¿ÐµÑÐµÐ²Ð¾Ð´Ñ Ð»Ð¸Ñензий
оÑиÑиалÑно дейÑÑвиÑелÑнÑми. ÐÑиÑина
+ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом, ÑÑо пÑовеÑка иÑ
бÑла бÑ
нелегкой и доÑогоÑÑоÑÑей
+(понадобилаÑÑ Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ Ð´Ð²ÑÑзÑÑнÑÑ
ÑÑиÑÑов из дÑÑгиÑ
ÑÑÑан). Ðолее Ñого,
+еÑли Ð±Ñ Ð² пеÑевод вкÑалаÑÑ Ð¾Ñибка, ÑÑо
могло Ð±Ñ Ð¸Ð¼ÐµÑÑ ÐºÐ°ÑаÑÑÑоÑиÑеÑкие
+поÑледÑÑÐ²Ð¸Ñ Ð´Ð»Ñ Ð²Ñего ÑообÑеÑÑва
Ñвободного пÑогÑаммного обеÑпеÑениÑ. Ðо
ÑеÑ
+поÑ, пока пеÑÐµÐ²Ð¾Ð´Ñ Ð½ÐµÐ¾ÑиÑиалÑнÑ, они не
могÑÑ Ð¿ÑинеÑÑи никакого ÑÑидиÑеÑкого
+вÑеда.</p>
+
+<p>ЧÑÐ¾Ð±Ñ Ð¿Ð¾Ð´ÑеÑкнÑÑÑ ÑÐ¾Ñ ÑакÑ, ÑÑо ÑÑи
пеÑÐµÐ²Ð¾Ð´Ñ Ð¾ÑиÑиалÑно не дейÑÑвиÑелÑнÑ, мÑ
+не пÑбликÑем пеÑеводов. ÐÐ»Ñ ÑÑноÑÑи, Ð¼Ñ Ð½Ðµ
пÑбликÑем иÑ
на gnu.org, а ÑолÑко
+ÑÑÑлаемÑÑ Ð½Ð° ниÑ
.</p>
<p>СÑÑлки на пеÑÐµÐ²Ð¾Ð´Ñ Ð¿ÑедназнаÑÐµÐ½Ñ Ð´Ð»Ñ
Ñого, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ Ð±Ð¾Ð»ÑÑÐµÐ¼Ñ ÑиÑÐ»Ñ Ð»Ñдей
понÑÑÑ Ð½Ð°Ñи лиÑензии. ÐÐ»Ñ ÑÑого пеÑеводÑ
Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð² оÑновном ÑоÑнÑ, даже
@@ -453,9 +457,9 @@
2011, 2012, 2014, 2015 Free Software Foundation, Inc.</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лиÑензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лиÑензии
Creative Commons Attribution-NoDerivs (<em>ÐÑÑибÑÑÐ¸Ñ —
Ðез
-пÑоизводнÑÑ
пÑоизведений</em>) 3.0 СШÐ</a>.</p>
+пÑоизводнÑÑ
пÑоизведений</em>) 4.0
ÐÑемиÑнаÑ</a>.</p>
<!--#include virtual="/server/bottom-notes.ru.html" -->
<div class="translators-credits">
@@ -466,7 +470,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2015/02/09 16:56:58 $
+$Date: 2015/06/03 09:28:00 $
<!-- 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.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- licenses/po/gpl-faq.ru-en.html 13 May 2015 15:27:11 -0000 1.44
+++ licenses/po/gpl-faq.ru-en.html 3 Jun 2015 09:28:00 -0000 1.45
@@ -478,7 +478,8 @@
or some other free software license?</a></li>
<li><a href="#GPLInProprietarySystem">I'd like to incorporate
- GPL-covered software in my proprietary system. Can I do
+ GPL-covered software in my proprietary system. I have no permission to use
+ that software except what the GPL gives me. Can I do
this?</a></li>
<li><a href="#LGPLv3ContributorVersion">If I distribute a
@@ -564,7 +565,8 @@
that's designed to load a GPL-covered plug-in?</a></li>
<li><a href="#GPLInProprietarySystem">I'd like to incorporate
- GPL-covered software in my proprietary system. Can I do
+ GPL-covered software in my proprietary system. I have no permission to use
+ that software except what the GPL gives me. Can I do
this?</a></li>
<li><a href="#GPLWrapper">I'd like to incorporate GPL-covered
@@ -2029,7 +2031,8 @@
<dt id="GPLInProprietarySystem">I'd like to incorporate GPL-covered
- software in my proprietary system. Can I do this?
+ software in my proprietary system. I have no permission to use
+ that software except what the GPL gives me. Can I do this?
<span class="anchor-reference-id">(<a href="#GPLInProprietarySystem"
>#GPLInProprietarySystem</a>)</span></dt>
<dd><p>
@@ -3781,7 +3784,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -3800,14 +3803,14 @@
<p>Copyright © 2014, 2015 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>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/05/13 15:27:11 $
+$Date: 2015/06/03 09:28:00 $
<!-- 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.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- licenses/po/gpl-faq.ru.po 3 Jun 2015 09:01:29 -0000 1.87
+++ licenses/po/gpl-faq.ru.po 3 Jun 2015 09:28:01 -0000 1.88
@@ -19,7 +19,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-06-02 12:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -1044,12 +1043,6 @@
"GPL или дÑÑгой лиÑензией ÑвободнÑÑ
пÑогÑамм?</a>"
#. type: Content of: <ul><li>
-# | <a href=\"#GPLInProprietarySystem\">I'd like to incorporate GPL-covered
-# | software in my proprietary system. {+I have no permission to use that
-# | software except what the GPL gives me.+} Can I do this?</a>
-#| msgid ""
-#| "<a href=\"#GPLInProprietarySystem\">I'd like to incorporate GPL-covered "
-#| "software in my proprietary system. Can I do this?</a>"
msgid ""
"<a href=\"#GPLInProprietarySystem\">I'd like to incorporate GPL-covered "
"software in my proprietary system. I have no permission to use that "
@@ -1057,8 +1050,8 @@
msgstr ""
"<a href=\"#GPLInProprietarySystem\">Ðне Ñ
оÑелоÑÑ Ð±Ñ
вклÑÑиÑÑ Ð¿ÑогÑаммÑ, "
"ÑаÑпÑоÑÑÑанÑемÑÑ Ð¿Ð¾ GPL, в ÑÐ²Ð¾Ñ Ð½ÐµÑвободнÑÑ
ÑиÑÑемÑ. У Ð¼ÐµÐ½Ñ Ð½ÐµÑ ÑазÑеÑÐµÐ½Ð¸Ñ "
-"на пÑименение ÑÑой пÑогÑаммÑ, кÑоме Ñого,
ÑÑо мне Ð´Ð°ÐµÑ GPL. Ðожно мне ÑÑо делаÑÑ?</"
-"a>"
+"на пÑименение ÑÑой пÑогÑаммÑ, кÑоме Ñого,
ÑÑо мне Ð´Ð°ÐµÑ GPL. Ðожно мне ÑÑо "
+"делаÑÑ?</a>"
#. type: Content of: <ul><li>
msgid ""
@@ -4249,14 +4242,6 @@
"лиÑензией."
#. type: Content of: <dl><dt>
-# | I'd like to incorporate GPL-covered software in my proprietary system.
-# | {+I have no permission to use that software except what the GPL gives
-# | me.+} Can I do this? <span class=\"anchor-reference-id\">(<a
-# | href=\"#GPLInProprietarySystem\" >#GPLInProprietarySystem</a>)</span>
-#| msgid ""
-#| "I'd like to incorporate GPL-covered software in my proprietary system. "
-#| "Can I do this? <span class=\"anchor-reference-id\">(<a href="
-#| "\"#GPLInProprietarySystem\" >#GPLInProprietarySystem</a>)</span>"
msgid ""
"I'd like to incorporate GPL-covered software in my proprietary system. I "
"have no permission to use that software except what the GPL gives me. Can I "
@@ -4264,9 +4249,10 @@
"\"#GPLInProprietarySystem\" >#GPLInProprietarySystem</a>)</span>"
msgstr ""
"Ðне Ñ
оÑелоÑÑ Ð±Ñ Ð²ÐºÐ»ÑÑиÑÑ Ð¿ÑогÑаммÑ,
ÑаÑпÑоÑÑÑанÑемÑÑ Ð¿Ð¾ GPL, в ÑÐ²Ð¾Ñ "
-"неÑвободнÑÑ ÑиÑÑемÑ. У Ð¼ÐµÐ½Ñ Ð½ÐµÑ
ÑазÑеÑÐµÐ½Ð¸Ñ "
-"на пÑименение ÑÑой пÑогÑаммÑ, кÑоме Ñого,
ÑÑо мне Ð´Ð°ÐµÑ GPL. Ðожно мне ÑÑо делаÑÑ? <span
class=\"anchor-reference-id"
-"\">(<a href=\"#GPLInProprietarySystem\" >#GPLInProprietarySystem</a>)</span>"
+"неÑвободнÑÑ ÑиÑÑемÑ. У Ð¼ÐµÐ½Ñ Ð½ÐµÑ
ÑазÑеÑÐµÐ½Ð¸Ñ Ð½Ð° пÑименение ÑÑой пÑогÑаммÑ, "
+"кÑоме Ñого, ÑÑо мне Ð´Ð°ÐµÑ GPL. Ðожно мне ÑÑо
делаÑÑ? <span class=\"anchor-"
+"reference-id\">(<a href=\"#GPLInProprietarySystem\" "
+">#GPLInProprietarySystem</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -7779,11 +7765,6 @@
msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
-# || No change detected. The change might only be in amounts of spaces.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
Index: licenses/po/translations.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/translations.ru-en.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- licenses/po/translations.ru-en.html 9 Feb 2015 16:56:59 -0000 1.45
+++ licenses/po/translations.ru-en.html 3 Jun 2015 09:28:01 -0000 1.46
@@ -11,12 +11,16 @@
translations</h3>
<p>
-The reason the FSF does not approve these translations as officially
-valid is that checking them would be difficult and expensive (needing
-the help of bilingual lawyers in other countries). Even worse, if an
-error did slip through, the results could be disastrous for the whole
-free software community. As long as the translations are unofficial,
-they can't do any harm.</p>
+The FSF does not approve license translations as officially valid.
+The reason is that checking them would be difficult and expensive
+(needing the help of bilingual lawyers in other countries). Even
+worse, if an error did slip through, the results could be disastrous
+for the whole free software community. As long as the translations
+are unofficial, they can't do any legal harm.</p>
+
+<p>To underscore the fact that these translations are not officially
+valid, we do not publish translations. To make that clear, we don't
+post them on gnu.org, only link to them.</p>
<p>The purpose of linking to translations is to help more people
understand our licenses. In order for them to do that, translations
@@ -390,14 +394,14 @@
2010, 2011, 2014, 2015 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>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/02/09 16:56:59 $
+$Date: 2015/06/03 09:28:01 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/translations.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/translations.ru.po,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- licenses/po/translations.ru.po 3 Jun 2015 09:01:29 -0000 1.93
+++ licenses/po/translations.ru.po 3 Jun 2015 09:28:01 -0000 1.94
@@ -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: 2015-06-02 12:25+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"
@@ -40,19 +39,6 @@
msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ неоÑиÑиалÑнÑÑ
пеÑеводаÑ
"
#. type: Content of: <p>
-# | The [-reason the-] FSF does not approve [-these-] {+license+} translations
-# | as officially [-valid-] {+valid. The reason+} is that checking them would
-# | be difficult and expensive (needing the help of bilingual lawyers in other
-# | countries). Even worse, if an error did slip through, the results could
-# | be disastrous for the whole free software community. As long as the
-# | translations are unofficial, they can't do any {+legal+} harm.
-#| msgid ""
-#| "The reason the FSF does not approve these translations as officially "
-#| "valid is that checking them would be difficult and expensive (needing the "
-#| "help of bilingual lawyers in other countries). Even worse, if an error "
-#| "did slip through, the results could be disastrous for the whole free "
-#| "software community. As long as the translations are unofficial, they "
-#| "can't do any harm."
msgid ""
"The FSF does not approve license translations as officially valid. The "
"reason is that checking them would be difficult and expensive (needing the "
@@ -61,13 +47,13 @@
"community. As long as the translations are unofficial, they can't do any "
"legal harm."
msgstr ""
-"ФСÐРне пÑÐ¸Ð·Ð½Ð°ÐµÑ Ð¿ÐµÑÐµÐ²Ð¾Ð´Ñ Ð»Ð¸Ñензий
оÑиÑиалÑно "
-"дейÑÑвиÑелÑнÑми. ÐÑиÑина ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом,
ÑÑо пÑовеÑка иÑ
бÑла Ð±Ñ Ð½ÐµÐ»ÐµÐ³ÐºÐ¾Ð¹ и "
-"доÑогоÑÑоÑÑей (понадобилаÑÑ Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ
двÑÑзÑÑнÑÑ
ÑÑиÑÑов из дÑÑгиÑ
ÑÑÑан). "
-"Ðолее Ñого, еÑли Ð±Ñ Ð² пеÑевод вкÑалаÑÑ
оÑибка, ÑÑо могло Ð±Ñ Ð¸Ð¼ÐµÑÑ "
-"каÑаÑÑÑоÑиÑеÑкие поÑледÑÑÐ²Ð¸Ñ Ð´Ð»Ñ Ð²Ñего
ÑообÑеÑÑва Ñвободного пÑогÑаммного "
-"обеÑпеÑениÑ. Ðо ÑеÑ
поÑ, пока пеÑеводÑ
неоÑиÑиалÑнÑ, они не могÑÑ Ð¿ÑинеÑÑи "
-"никакого ÑÑидиÑеÑкого вÑеда."
+"ФСÐРне пÑÐ¸Ð·Ð½Ð°ÐµÑ Ð¿ÐµÑÐµÐ²Ð¾Ð´Ñ Ð»Ð¸Ñензий
оÑиÑиалÑно дейÑÑвиÑелÑнÑми. ÐÑиÑина "
+"ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом, ÑÑо пÑовеÑка иÑ
бÑла бÑ
нелегкой и доÑогоÑÑоÑÑей "
+"(понадобилаÑÑ Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ Ð´Ð²ÑÑзÑÑнÑÑ
ÑÑиÑÑов из дÑÑгиÑ
ÑÑÑан). Ðолее Ñого, "
+"еÑли Ð±Ñ Ð² пеÑевод вкÑалаÑÑ Ð¾Ñибка, ÑÑо
могло Ð±Ñ Ð¸Ð¼ÐµÑÑ ÐºÐ°ÑаÑÑÑоÑиÑеÑкие "
+"поÑледÑÑÐ²Ð¸Ñ Ð´Ð»Ñ Ð²Ñего ÑообÑеÑÑва
Ñвободного пÑогÑаммного обеÑпеÑениÑ. Ðо
ÑеÑ
"
+"поÑ, пока пеÑÐµÐ²Ð¾Ð´Ñ Ð½ÐµÐ¾ÑиÑиалÑнÑ, они не
могÑÑ Ð¿ÑинеÑÑи никакого ÑÑидиÑеÑкого "
+"вÑеда."
#. type: Content of: <p>
msgid ""
@@ -604,11 +590,6 @@
"2011, 2012, 2014, 2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
-# || No change detected. The change might only be in amounts of spaces.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
Index: philosophy/is-ever-good-use-nonfree-program.ru.html
===================================================================
RCS file: /web/www/www/philosophy/is-ever-good-use-nonfree-program.ru.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/is-ever-good-use-nonfree-program.ru.html 23 May 2015 05:09:14
-0000 1.5
+++ philosophy/is-ever-good-use-nonfree-program.ru.html 3 Jun 2015 09:28:01
-0000 1.6
@@ -88,8 +88,8 @@
ÑиÑÑемаÑ
. Ðак ÑазÑабоÑÑик Emacs и GCC Ñ
пÑинимал Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑжки
ÑакиÑ
неÑвободнÑÑ
ÑиÑÑем, как VMS, Windows и MacOS.
ÐÐµÑ Ð¿ÑиÑин оÑвеÑгаÑÑ ÑÑи
изменениÑ, но Ñ Ð½Ðµ пÑоÑил лÑдей ÑабоÑаÑÑ Ð½Ð°
неÑвободнÑÑ
ÑиÑÑемаÑ
, ÑÑобÑ
-подгоÑовиÑÑ ÑÑи изменениÑ. Ðни поÑÑÑпали
Ð¾Ñ Ð»Ñдей, коÑоÑÑе и Ñак
-полÑзовалиÑÑ ÑÑими ÑиÑÑемами.</p>
+подгоÑовиÑÑ ÑÑи изменениÑ. Ðни напиÑанÑ
лÑдÑми, коÑоÑÑе и Ñак полÑзовалиÑÑ
+ÑÑими ÑиÑÑемами, и они Ñакже
подгоÑавливали вÑпÑÑки Emacs Ð´Ð»Ñ ÑÑиÑ
ÑиÑÑем.</p>
<p>ÐÑклÑÑение о “ÑазÑабоÑке Ð·Ð°Ð¼ÐµÐ½Ñ ÑÑого
же” ÑпÑаведливо в ÑвоиÑ
пÑеделаÑ
и жизненно важно Ð´Ð»Ñ Ð¿ÑогÑеÑÑа
ÑвободнÑÑ
пÑогÑамм, но Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ
@@ -148,7 +148,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -162,12 +162,13 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2013 Richard Stallman</p>
+<p>Copyright © 2013, 2015 Richard Stallman<br /> Copyright © 2013,
+2015 Free Software Foundation (translation)</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лиÑензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лиÑензии
Creative Commons Attribution-NoDerivs (<em>ÐÑÑибÑÑÐ¸Ñ —
Ðез
-пÑоизводнÑÑ
пÑоизведений</em>) 3.0 СШÐ</a>.</p>
+пÑоизводнÑÑ
пÑоизведений</em>) 4.0
ÐÑемиÑнаÑ</a>.</p>
<!--#include virtual="/server/bottom-notes.ru.html" -->
<div class="translators-credits">
@@ -182,7 +183,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2015/05/23 05:09:14 $
+$Date: 2015/06/03 09:28:01 $
<!-- timestamp end -->
</p>
Index: philosophy/po/is-ever-good-use-nonfree-program.ru-en.html
===================================================================
RCS file:
/web/www/www/philosophy/po/is-ever-good-use-nonfree-program.ru-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- philosophy/po/is-ever-good-use-nonfree-program.ru-en.html 12 Apr 2014
13:59:00 -0000 1.3
+++ philosophy/po/is-ever-good-use-nonfree-program.ru-en.html 3 Jun 2015
09:28:01 -0000 1.4
@@ -83,8 +83,9 @@
developer of Emacs and GCC, I accepted changes to make them support
nonfree systems such as VMS, Windows and MacOS. There was no reason
to reject that code, but I did not ask people to run nonfree systems
-in order to develop it. The changes came from people who were using
-those systems anyway.</p>
+in order to develop it. These changes were written by people who were using
+those systems anyway, and they also did the packaging of Emacs
+releases for those systems.</p>
<p>The “developing its own replacement” exception is valid within
its
limits, and crucial for the progress of free software, but we must
@@ -131,7 +132,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -146,17 +147,17 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2013 Richard Stallman</p>
+<p>Copyright © 2013, 2015 Richard Stallman</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>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/12 13:59:00 $
+$Date: 2015/06/03 09:28:01 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/is-ever-good-use-nonfree-program.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/is-ever-good-use-nonfree-program.ru.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/is-ever-good-use-nonfree-program.ru.po 3 Jun 2015
09:01:29 -0000 1.5
+++ philosophy/po/is-ever-good-use-nonfree-program.ru.po 3 Jun 2015
09:28:02 -0000 1.6
@@ -16,7 +16,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-06-01 17:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -184,23 +183,6 @@
"ÑÑо внÑÑÑеннее пÑоÑивоÑеÑие и оно
подÑÑÐ²Ð°ÐµÑ ÑÑо пÑавое дело."
#. type: Content of: <p>
-# | Even using a nonfree program to develop free software in general is better
-# | to avoid. For instance, we should not ask people to run Windows or MacOS
-# | in order to make free applications run on them. As developer of Emacs and
-# | GCC, I accepted changes to make them support nonfree systems such as VMS,
-# | Windows and MacOS. There was no reason to reject that code, but I did not
-# | ask people to run nonfree systems in order to develop it. [-The-]
-# | {+These+} changes [-came from-] {+were written by+} people who were using
-# | those systems [-anyway.-] {+anyway, and they also did the packaging of
-# | Emacs releases for those systems.+}
-#| msgid ""
-#| "Even using a nonfree program to develop free software in general is "
-#| "better to avoid. For instance, we should not ask people to run Windows or "
-#| "MacOS in order to make free applications run on them. As developer of "
-#| "Emacs and GCC, I accepted changes to make them support nonfree systems "
-#| "such as VMS, Windows and MacOS. There was no reason to reject that code, "
-#| "but I did not ask people to run nonfree systems in order to develop it. "
-#| "The changes came from people who were using those systems anyway."
msgid ""
"Even using a nonfree program to develop free software in general is better "
"to avoid. For instance, we should not ask people to run Windows or MacOS in "
@@ -217,9 +199,8 @@
"Ðак ÑазÑабоÑÑик Emacs и GCC Ñ Ð¿Ñинимал
Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑжки ÑакиÑ
"
"неÑвободнÑÑ
ÑиÑÑем, как VMS, Windows и MacOS. ÐеÑ
пÑиÑин оÑвеÑгаÑÑ ÑÑи "
"изменениÑ, но Ñ Ð½Ðµ пÑоÑил лÑдей ÑабоÑаÑÑ
на неÑвободнÑÑ
ÑиÑÑемаÑ
, ÑÑÐ¾Ð±Ñ "
-"подгоÑовиÑÑ ÑÑи изменениÑ. Ðни напиÑанÑ
лÑдÑми, коÑоÑÑе и Ñак "
-"полÑзовалиÑÑ ÑÑими ÑиÑÑемами, и они Ñакже
подгоÑавливали вÑпÑÑки Emacs "
-"Ð´Ð»Ñ ÑÑиÑ
ÑиÑÑем."
+"подгоÑовиÑÑ ÑÑи изменениÑ. Ðни напиÑанÑ
лÑдÑми, коÑоÑÑе и Ñак полÑзовалиÑÑ "
+"ÑÑими ÑиÑÑемами, и они Ñакже
подгоÑавливали вÑпÑÑки Emacs Ð´Ð»Ñ ÑÑиÑ
ÑиÑÑем."
#. type: Content of: <p>
msgid ""
@@ -293,19 +274,12 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
-# | Copyright © [-2013-] {+2013, 2015+} Richard Stallman
-#| msgid "Copyright © 2013 Richard Stallman"
msgid "Copyright © 2013, 2015 Richard Stallman"
msgstr ""
-"Copyright © 2013, 2015 Richard Stallman<br /> "
-"Copyright © 2013, 2015 Free Software Foundation (translation)"
+"Copyright © 2013, 2015 Richard Stallman<br /> Copyright © 2013, "
+"2015 Free Software Foundation (translation)"
#. type: Content of: <div><p>
-# || No change detected. The change might only be in amounts of spaces.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
Index: proprietary/proprietary-back-doors.ru.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-back-doors.ru.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- proprietary/proprietary-back-doors.ru.html 15 Apr 2015 13:02:13 -0000
1.1
+++ proprietary/proprietary-back-doors.ru.html 3 Jun 2015 09:28:02 -0000
1.2
@@ -44,6 +44,11 @@
<p><a href="http://slated.org/windows_by_stealth_the_updates_you_dont_want";>
ÐодÑобноÑÑи о ÑлÑÑаÑÑ
пÑÐ¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑеÑного Ñ
ода в Windows</a>.
</p>
+<p>Ð Windows 10 ÑнивеÑÑалÑнÑй ÑеÑнÑй Ñ
од болÑÑе
не ÑкÑÑваÑÑ; вÑе
+“обновлениє бÑдÑÑ <a
+href="http://www.appy-geek.com/Web/ArticleWeb.aspx?regionid=1&articleid=42633691&source=googleplus";>пÑинÑдиÑелÑно
+и немедленно навÑзÑваÑÑÑÑ</a>.
+</p>
</li>
<li>
@@ -249,9 +254,9 @@
<p>Copyright © 2014-2015 Free Software Foundation, Inc.</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лиÑензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru";>лиÑензии
Creative Commons Attribution-NoDerivs (<em>ÐÑÑибÑÑÐ¸Ñ —
Ðез
-пÑоизводнÑÑ
пÑоизведений</em>) 3.0 СШÐ</a>.</p>
+пÑоизводнÑÑ
пÑоизведений</em>) 4.0
ÐÑемиÑнаÑ</a>.</p>
<!--#include virtual="/server/bottom-notes.ru.html" -->
<div class="translators-credits">
@@ -266,7 +271,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2015/04/15 13:02:13 $
+$Date: 2015/06/03 09:28:02 $
<!-- timestamp end -->
</p>
Index: proprietary/po/proprietary-back-doors.ru-en.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-back-doors.ru-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- proprietary/po/proprietary-back-doors.ru-en.html 15 Apr 2015 13:02:38
-0000 1.1
+++ proprietary/po/proprietary-back-doors.ru-en.html 3 Jun 2015 09:28:03
-0000 1.2
@@ -36,6 +36,11 @@
<a href="http://slated.org/windows_by_stealth_the_updates_you_dont_want";>
this was used</a>.
</p>
+<p>In Windows 10, the universal back door is no longer hidden; all
+“upgrades” will
+be <a
href="http://www.appy-geek.com/Web/ArticleWeb.aspx?regionid=1&articleid=42633691&source=googleplus";>forcibly
+and immediately imposed</a>.
+</p>
</li>
<li>
@@ -221,14 +226,14 @@
<p>Copyright © 2014-2015 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>
+href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/04/15 13:02:38 $
+$Date: 2015/06/03 09:28:03 $
<!-- timestamp end -->
</p>
</div>
Index: proprietary/po/proprietary-back-doors.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-back-doors.ru.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- proprietary/po/proprietary-back-doors.ru.po 3 Jun 2015 09:01:30 -0000
1.3
+++ proprietary/po/proprietary-back-doors.ru.po 3 Jun 2015 09:28:03 -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"
-"X-Outdated-Since: 2015-06-02 17:57+0000\n"
#. type: Content of: <title>
msgid "Proprietary Back Doors - GNU Project - Free Software Foundation"
@@ -389,11 +388,6 @@
msgstr "Copyright © 2014-2015 Free Software Foundation, Inc."
#. type: Content of: <div><p>
-# || No change detected. The change might only be in amounts of spaces.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://";
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
Index: software/recent-releases-include.ru.html
===================================================================
RCS file: /web/www/www/software/recent-releases-include.ru.html,v
retrieving revision 1.636
retrieving revision 1.637
diff -u -b -r1.636 -r1.637
--- software/recent-releases-include.ru.html 2 Jun 2015 18:00:41 -0000
1.636
+++ software/recent-releases-include.ru.html 3 Jun 2015 09:28:03 -0000
1.637
@@ -1,9 +1,9 @@
<ul>
-<li><strong>June 02, 2015</strong>
+<li><strong>03 иÑÐ½Ñ 2015</strong>
<ul>
<li><a
-href="http://lists.gnu.org/archive/html/info-gnu/2015-06/msg00000.html";>GnuPG
-2.0.28 "stable" released</a>, <i>Werner Koch</i>, <tt>12:00</tt></li>
+href="http://lists.gnu.org/archive/html/info-gnu/2015-06/msg00000.html";>ÐÑпÑÑен
+GnuPG 2.0.28</a>, <i>ÐеÑÐ½ÐµÑ ÐоÑ
</i>, <tt>12:00</tt></li>
</ul></li>
</ul>
<ul>
Index: software/po/recent-releases-include.ru.po
===================================================================
RCS file: /web/www/www/software/po/recent-releases-include.ru.po,v
retrieving revision 1.846
retrieving revision 1.847
diff -u -b -r1.846 -r1.847
--- software/po/recent-releases-include.ru.po 3 Jun 2015 09:01:30 -0000
1.846
+++ software/po/recent-releases-include.ru.po 3 Jun 2015 09:28:04 -0000
1.847
@@ -14,25 +14,12 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-06-02 17:58+0000\n"
#. type: Content of: <ul><li>
-# | <strong>June 02, 201[-4-]{+5+}</strong>
-#| msgid "<strong>June 02, 2014</strong>"
msgid "<strong>June 02, 2015</strong>"
msgstr "<strong>03 иÑÐ½Ñ 2015</strong>"
#. type: Content of: <ul><li><ul><li>
-# | <a
-# |
[-href=\"http://lists.gnu.org/archive/html/info-gnu/2015-02/msg00008.html\";>GnuPG
-# | 2.0.27-]
-# |
{+href=\"http://lists.gnu.org/archive/html/info-gnu/2015-06/msg00000.html\";>GnuPG
-# | 2.0.28+} "stable" released</a>, <i>Werner Koch</i>,
-# | [-<tt>13:24</tt>-] {+<tt>12:00</tt>+}
-#| msgid ""
-#| "<a href=\"http://lists.gnu.org/archive/html/info-gnu/2015-02/msg00008.html";
-#| "\">GnuPG 2.0.27 "stable" released</a>, <i>Werner Koch</i>, "
-#| "<tt>13:24</tt>"
msgid ""
"<a href=\"http://lists.gnu.org/archive/html/info-gnu/2015-06/msg00000.html";
"\">GnuPG 2.0.28 "stable" released</a>, <i>Werner Koch</i>, "
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www education/edu-schools.ru.html education/po/...,
GNUN <=