[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: |
Tue, 02 Apr 2013 06:35:33 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 13/04/02 06:35:33
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/po : gnu-linux-faq.ru-en.html gnu-linux-faq.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.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-schools.ru-en.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-schools.ru.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.ru.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ru-en.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ru.po?cvsroot=www&r1=1.31&r2=1.32
Patches:
Index: education/edu-schools.ru.html
===================================================================
RCS file: /web/www/www/education/edu-schools.ru.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- education/edu-schools.ru.html 20 Feb 2013 16:30:36 -0000 1.14
+++ education/edu-schools.ru.html 2 Apr 2013 06:35:28 -0000 1.15
@@ -1,14 +1,16 @@
+
<!--#include virtual="/server/header.ru.html" -->
+<!-- Parent-Version: 1.75 -->
<!-- This file is automatically generated by GNUnited Nations! -->
<!--#set var="ENGLISH_PAGE" value="/education/edu-schools.en.html" -->
-<title>СвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð² ÑÑебнÑÑ
заведениÑÑ
- пÑÐ¾ÐµÐºÑ GNU - Фонд Ñвободного
-пÑогÑаммного обеÑпеÑÐµÐ½Ð¸Ñ (FSF)</title>
+<title>СвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð² ÑÑебнÑÑ
заведениÑÑ
- ÐÑÐ¾ÐµÐºÑ GNU - Фонд Ñвободного
+пÑогÑаммного обеÑпеÑениÑ</title>
-<!--#include virtual="/server/banner.ru.html" -->
<!--#include virtual="/education/po/edu-schools.translist" -->
+<!--#include virtual="/server/banner.ru.html" -->
<div id="education-content">
<h2>СвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð² ÑÑебнÑÑ
заведениÑÑ
</h2>
@@ -47,8 +49,7 @@
<p>ÐбÑазоваÑелÑнÑе Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ñ (в Ñом ÑиÑле
ÑколÑ) <a
href="/education/education.html">обÑÐ·Ð°Ð½Ñ Ð¿ÑеподаваÑÑ
ÑолÑко ÑвободнÑе
-пÑогÑаммÑ.</a> Ð Ð²Ð¾Ñ Ð¿Ð¾ÑемÑ.
-</p>
+пÑогÑаммÑ.</a> Ð Ð²Ð¾Ñ Ð¿Ð¾ÑемÑ.</p>
<p>Ðо-пеÑвÑÑ
, ÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð¼Ð¾Ð³ÑÑ
ÑбеÑеÑÑ ÑÑÐµÐ±Ð½Ð¾Ð¼Ñ Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ñ
денÑги. СвободнÑе
@@ -135,10 +136,11 @@
Ð·Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð²ÑеÑ
ÑÑовней Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¿ÑименÑÑÑ
ÑвободнÑе пÑогÑаммÑ.</p>
<ol>
-<li><cite><a id="note1"></a>ТабаÑÐ½Ð°Ñ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ñ Ð
. Ðж. РейнолÑдÑа бÑла
+<li><a id="note1"></a>ТабаÑÐ½Ð°Ñ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ñ Ð . Ðж. Ð
ейнолÑдÑа бÑла
оÑÑÑаÑована на 15 миллионов доллаÑов в 2002
Ð³Ð¾Ð´Ñ Ð·Ð°
-ÑаздаÑÑ Ð±ÐµÑплаÑнÑÑ
обÑазÑов ÑигаÑÐµÑ Ð½Ð°
меÑопÑиÑÑиÑÑ
, поÑеÑаемÑÑ
деÑÑми. (<a
-href="http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm";>http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm</a>)</cite></li>
+ÑаздаÑÑ Ð±ÐµÑплаÑнÑÑ
обÑазÑов ÑигаÑÐµÑ Ð½Ð°
меÑопÑиÑÑиÑÑ
, поÑеÑаемÑÑ
деÑÑми
+(Ñм. <a
+href="http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm";>http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm</a>).</li>
</ol>
@@ -148,41 +150,48 @@
</div>
</div>
+<!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.ru.html" -->
<div id="footer">
-<p>
-ÐожалÑйÑÑа, пÑиÑÑлайÑе запÑоÑÑ ÑÐ¾Ð½Ð´Ñ Ð¸ GNU
по адÑеÑÑ <a
+<p>ÐожалÑйÑÑа, пÑиÑÑлайÑе обÑие запÑоÑÑ
ÑÐ¾Ð½Ð´Ñ Ð¸ GNU по адÑеÑÑ <a
href="mailto:address@hidden";><address@hidden></a>. ÐÑÑÑ Ñакже <a
-href="/contact/">дÑÑгие ÑпоÑÐ¾Ð±Ñ ÑвÑзаÑÑÑÑ</a> Ñ
Ñондом.
-<br />
-
-ÐожалÑйÑÑа, пÑиÑÑлайÑе оÑÑеÑÑ Ð¾
неÑабоÑаÑÑиÑ
ÑÑÑлкаÑ
и дÑÑгие попÑавки или
-пÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ адÑеÑÑ <a
-href="mailto:address@hidden";><address@hidden></a>.
-</p>
+href="/contact/">дÑÑгие ÑпоÑÐ¾Ð±Ñ ÑвÑзаÑÑÑÑ</a> Ñ
Ñондом. ÐÑÑеÑÑ Ð¾
+неÑабоÑаÑÑиÑ
ÑÑÑлкаÑ
и дÑÑгие попÑавки
или пÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶Ð½Ð¾ пÑиÑÑлаÑÑ Ð¿Ð¾
+адÑеÑÑ <a href="mailto:address@hidden";><address@hidden></a>.</p>
<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden";>
+
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
ÐÑ ÑÑаÑалиÑÑ ÑделаÑÑ ÑÑÐ¾Ñ Ð¿ÐµÑевод ÑоÑнÑм и
каÑеÑÑвеннÑм, но иÑклÑÑиÑÑ
возможноÑÑÑ Ð¾Ñибки Ð¼Ñ Ð½Ðµ можем.
ÐÑиÑÑлайÑе, пожалÑйÑÑа, Ñвои замеÑÐ°Ð½Ð¸Ñ Ð¸
пÑÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾ пеÑÐµÐ²Ð¾Ð´Ñ Ð¿Ð¾ адÑеÑÑ <a
href="mailto:address@hidden";><address@hidden></a>.
</p><p>Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ð¾ кооÑдинаÑии и
пÑедложениÑм пеÑеводов наÑиÑ
ÑÑаÑей Ñм. в
<a href="/server/standards/README.translations.html">“Ð
ÑководÑÑве по
-пеÑеводам”</a>.
-</p>
+пеÑеводам”</a>.</p>
-<p>
-Copyright © 2003, 2009 Richard Stallman</p> <p>Copyright © 2010,
-2011 Free Software Foundation, Inc. (translation)
-<br />
-ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
+<p>Copyright © 2003, 2009 Richard Stallman</p> <p>Copyright © 2010,
+2011 Free Software Foundation, Inc. (translation)</p>
+
+<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru";>лиÑензии
Creative Commons Attribution-NoDerivs (<em>ÐÑÑибÑÑÐ¸Ñ —
Ðез
-пÑоизводнÑÑ
пÑоизведений</em>) 3.0 СШÐ</a>.
-</p>
-
+пÑоизводнÑÑ
пÑоизведений</em>) 3.0 СШÐ</a>.</p>
+<!--#include virtual="/server/bottom-notes.ru.html" -->
<div class="translators-credits">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
@@ -194,92 +203,11 @@
<!-- timestamp start -->
Ðбновлено:
-$Date: 2013/02/20 16:30:36 $
+$Date: 2013/04/02 06:35:28 $
<!-- timestamp end -->
</p>
</div>
-
-<!-- <div id="translations">
- -->
-<!-- <h4>
-Translations of this page</h4> -->
-<!-- -->
-<!-- Please keep this list alphabetical by language code. -->
-<!-- Comment what the language is for each type, i.e. de is German. -->
-<!-- Write the language name in its own language (Deutsch) in the text. -->
-<!-- If you add a new language here, please -->
-<!-- advise address@hidden and add it to -->
-<!-- - /home/www/html/server/standards/README.translations.html -->
-<!-- - one of the lists under the section "Translations Underway" -->
-<!-- - if there is a translation team, you also have to add an alias -->
-<!-- to mail.gnu.org:/com/mailer/aliases -->
-<!-- Please also check you have the language code right; see: -->
-<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
-<!-- If the 2-letter ISO 639-1 code is not available, -->
-<!-- use the 3-letter ISO 639-2. -->
-<!-- Please use W3C normative character entities. -->
-<!-- -->
-<!-- <ul class="translations-list">
- -->
-<!-- Arabic -->
-<!-- <li>
-<a
href="/education/edu-schools.ar.html">العربية</a> [ar]</li>
-->
-<!-- Bulgarian -->
-<!-- <li>
-<a
href="/education/edu-schools.bg.html">български</a> [bg]</li>
-->
-<!-- Catalan -->
-<!-- <li>
-<a href="/education/edu-schools.html">català</a> [ca]</li> -->
-<!-- German -->
-<!-- <li>
-<a href="/education/edu-schools.de.html">Deutsch</a> [de]</li> -->
-<!-- Greek -->
-<!-- <li>
-<a
href="/education/edu-schools.el.html">ελληνικά</a> [el]</li>
-->
-<!-- English -->
-<!-- <li>
-<a href="/education/edu-schools.html">English</a> [en]</li> -->
-<!-- Spanish -->
-<!-- <li>
-<a href="/education/edu-schools.es.html">español</a> [es]</li> -->
-<!-- Farsi (Persian) -->
-<!-- <li>
-<a
href="/education/edu-schools.fa.html">فارسی</a> [fa]</li>
-->
-<!-- French -->
-<!-- <li>
-<a href="/education/edu-schools.fr.html">français</a> [fr]</li> -->
-<!-- Hebrew -->
-<!-- <li>
-<a
href="/education/edu-schools.he.html">עברית</a> [he]</li>
-->
-<!-- Italian -->
-<!-- <li>
-<a href="/education/edu-schools.it.html">italiano</a> [it]</li> -->
-<!-- Malayalam -->
-<!-- <li>
-<a
href="/education/edu-schools.ml.html">മലയാളം</a> [ml]</li>
-->
-<!-- Dutch -->
-<!-- <li>
-<a href="/education/edu-schools.nl.html">Nederlands</a> [nl]</li> -->
-<!-- Polish -->
-<!-- <li>
-<a href="/educatio/edu-schools.pl.html">polski</a> [pl]</li> -->
-<!-- Brazilian Portuguese -->
-<!-- <li>
-<a href="/education/edu-schools.pt-br.html">português do
Brasil</a> [pt-br]</li> -->
-<!-- Russian -->
-<!-- <li>
-<a
href="/education/edu-schools.ru.html">русский</a> [ru]</li>
-->
-<!-- Tamil -->
-<!-- <li>
-<a
href="/education/edu-schools.ta.html">தமிழ்</a> [ta]</li>
-->
-<!-- Uzbek -->
-<!-- <li>
-<a href="/education/edu-schools.uz.html">O'zbekcha</a> [uz]</li> -->
-<!-- </ul>
- -->
-<!-- </div>
- -->
</div>
</body>
</html>
Index: education/po/edu-schools.ru-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-schools.ru-en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- education/po/edu-schools.ru-en.html 20 Feb 2013 16:30:36 -0000 1.9
+++ education/po/edu-schools.ru-en.html 2 Apr 2013 06:35:29 -0000 1.10
@@ -1,7 +1,9 @@
<!--#include virtual="/server/header.html" -->
-<title>Why Schools Should Exclusively Use Free Software - GNU Project - Free
Software Foundation (FSF)</title>
-<!--#include virtual="/server/banner.html" -->
+<!-- Parent-Version: 1.75 -->
+<title>Why Schools Should Exclusively Use Free Software - GNU Project -
+Free Software Foundation</title>
<!--#include virtual="/education/po/edu-schools.translist" -->
+<!--#include virtual="/server/banner.html" -->
<div id="education-content">
<h2>Why Schools Should Exclusively Use Free Software</h2>
@@ -37,8 +39,7 @@
<p>Educational activities (including schools) have
a <a href="/education/education.html">duty to teach only free
-software.</a> Here are the reasons.
-</p>
+software.</a> Here are the reasons.</p>
<p>First, free software can save schools money. Free software gives
schools, like other users, the freedom to copy and redistribute the
@@ -105,107 +106,53 @@
<ol>
<li><cite><a id="note1"></a>RJ Reynolds Tobacco Company was
fined $15m in 2002 for handing out free samples of cigarettes at
-events attended by children. See <a
href="http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm";>http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm</a>.
-</cite></li>
+events attended by children. See <a
href="http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm";>http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm</a>.</cite></li>
</ol>
-</div>
+</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
-<p>
-Please send FSF & GNU inquiries to
-<a href="mailto:address@hidden";><address@hidden></a>.
-There are also <a href="/contact/">other ways to contact</a>
-the FSF.
-<br />
+<p>Please send general FSF & GNU inquiries to <a
+href="mailto:address@hidden";><address@hidden></a>. There are also <a
+href="/contact/">other ways to contact</a> the FSF. Broken links and other
+corrections or suggestions can be sent to <a
+href="mailto:address@hidden";><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden";>
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations README</a> for
+information on coordinating and submitting translations of this article.</p>
-Please send broken links and other corrections or suggestions to
-<a href="mailto:address@hidden";><address@hidden></a>.
-</p>
+<p>Copyright © 2003, 2009 Richard Stallman</p>
-<p>
-Please see the
-<a href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting
-translations of this article.
-</p>
-
-<p>
-Copyright © 2003, 2009 Richard Stallman
-<br />
-This page is licensed under a <a rel="license"
+<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>
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
<p>
Updated:
<!-- timestamp start -->
-$Date: 2013/02/20 16:30:36 $
+$Date: 2013/04/02 06:35:29 $
<!-- timestamp end -->
</p>
</div>
-
-<!-- <div id="translations"> -->
-<!-- <h4>Translations of this page</h4> -->
-<!-- -->
-<!-- Please keep this list alphabetical by language code. -->
-<!-- Comment what the language is for each type, i.e. de is German. -->
-<!-- Write the language name in its own language (Deutsch) in the text. -->
-<!-- If you add a new language here, please -->
-<!-- advise address@hidden and add it to -->
-<!-- - /home/www/html/server/standards/README.translations.html -->
-<!-- - one of the lists under the section "Translations Underway" -->
-<!-- - if there is a translation team, you also have to add an alias -->
-<!-- to mail.gnu.org:/com/mailer/aliases -->
-<!-- Please also check you have the language code right; see: -->
-<!-- http://www.loc.gov/standards/iso639-2/php/code_list.php -->
-<!-- If the 2-letter ISO 639-1 code is not available, -->
-<!-- use the 3-letter ISO 639-2. -->
-<!-- Please use W3C normative character entities. -->
-<!-- -->
-<!-- <ul class="translations-list"> -->
-<!-- Arabic -->
-<!-- <li><a
href="/education/edu-schools.ar.html">العربية</a> [ar]</li>
-->
-<!-- Bulgarian -->
-<!-- <li><a
href="/education/edu-schools.bg.html">български</a> [bg]</li>
-->
-<!-- Catalan -->
-<!-- <li><a
href="/education/edu-schools.html">català</a> [ca]</li> -->
-<!-- German -->
-<!-- <li><a href="/education/edu-schools.de.html">Deutsch</a> [de]</li>
-->
-<!-- Greek -->
-<!-- <li><a
href="/education/edu-schools.el.html">ελληνικά</a> [el]</li>
-->
-<!-- English -->
-<!-- <li><a href="/education/edu-schools.html">English</a> [en]</li> -->
-<!-- Spanish -->
-<!-- <li><a
href="/education/edu-schools.es.html">español</a> [es]</li> -->
-<!-- Farsi (Persian) -->
-<!-- <li><a
href="/education/edu-schools.fa.html">فارسی</a> [fa]</li>
-->
-<!-- French -->
-<!-- <li><a
href="/education/edu-schools.fr.html">français</a> [fr]</li> -->
-<!-- Hebrew -->
-<!-- <li><a
href="/education/edu-schools.he.html">עברית</a> [he]</li>
-->
-<!-- Italian -->
-<!-- <li><a href="/education/edu-schools.it.html">italiano</a> [it]</li>
-->
-<!-- Malayalam -->
-<!-- <li><a
href="/education/edu-schools.ml.html">മലയാളം</a> [ml]</li>
-->
-<!-- Dutch -->
-<!-- <li><a
href="/education/edu-schools.nl.html">Nederlands</a> [nl]</li> -->
-<!-- Polish -->
-<!-- <li><a href="/educatio/edu-schools.pl.html">polski</a> [pl]</li> -->
-<!-- Brazilian Portuguese -->
-<!-- <li><a href="/education/edu-schools.pt-br.html">português do
Brasil</a> [pt-br]</li> -->
-<!-- Russian -->
-<!-- <li><a
href="/education/edu-schools.ru.html">русский</a> [ru]</li>
-->
-<!-- Tamil -->
-<!-- <li><a
href="/education/edu-schools.ta.html">தமிழ்</a> [ta]</li>
-->
-<!-- Uzbek -->
-<!-- <li><a href="/education/edu-schools.uz.html">O'zbekcha</a> [uz]</li>
-->
-<!-- </ul> -->
-<!-- </div> -->
</div>
</body>
</html>
Index: education/po/edu-schools.ru.po
===================================================================
RCS file: /web/www/www/education/po/edu-schools.ru.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- education/po/edu-schools.ru.po 2 Apr 2013 06:02:05 -0000 1.18
+++ education/po/edu-schools.ru.po 2 Apr 2013 06:35:31 -0000 1.19
@@ -17,15 +17,9 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8-bit\n"
-"Outdated-Since: 2013-04-01 18:25-0300\n"
# type: Content of: <title>
#. type: Content of: <title>
-# | Why Schools Should Exclusively Use Free Software - GNU Project - Free
-# | Software Foundation [-(FSF)-]
-#| msgid ""
-#| "Why Schools Should Exclusively Use Free Software - GNU Project - Free "
-#| "Software Foundation (FSF)"
msgid ""
"Why Schools Should Exclusively Use Free Software - GNU Project - Free "
"Software Foundation"
@@ -280,20 +274,6 @@
# type: Content of: <ol><li>
#. type: Content of: <ol><li>
-# | <cite><a id=\"note1\"></a>RJ Reynolds Tobacco Company was fined $15m in
-# | 2002 for handing out free samples of cigarettes at events attended by
-# | children. See <a
-# |
[-href=\"http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm\";>http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobaccotrial/usa.htm</a>.
-# | </cite>-]
-# | {+href=\"http://www.bbc.co.uk/worldservice/sci_tech/features/health/tobacco
-# | trial/usa.htm\">http://www.bbc.co.uk/worldservice/sci_tech/features/health/
-# | tobaccotrial/usa.htm</a>.</cite>+}
-#| msgid ""
-#| "<cite><a id=\"note1\"></a>RJ Reynolds Tobacco Company was fined $15m in "
-#| "2002 for handing out free samples of cigarettes at events attended by "
-#| "children. See <a href=\"http://www.bbc.co.uk/worldservice/sci_tech/";
-#| "features/health/tobaccotrial/usa.htm\">http://www.bbc.co.uk/worldservice/";
-#| "sci_tech/features/health/tobaccotrial/usa.htm</a>. </cite>"
msgid ""
"<cite><a id=\"note1\"></a>RJ Reynolds Tobacco Company was fined $15m in 2002 "
"for handing out free samples of cigarettes at events attended by children. "
@@ -303,8 +283,8 @@
msgstr ""
"<a id=\"note1\"></a>ТабаÑÐ½Ð°Ñ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ñ Ð . Ðж. Ð
ейнолÑдÑа бÑла "
"оÑÑÑаÑована на 15 миллионов доллаÑов в 2002
Ð³Ð¾Ð´Ñ Ð·Ð°\n"
-"ÑаздаÑÑ Ð±ÐµÑплаÑнÑÑ
обÑазÑов ÑигаÑÐµÑ Ð½Ð°
меÑопÑиÑÑиÑÑ
, поÑеÑаемÑÑ
деÑÑми (Ñм. <a "
-"href=\"http://www.bbc.co.uk/worldservice/sci_tech/features/health/";
+"ÑаздаÑÑ Ð±ÐµÑплаÑнÑÑ
обÑазÑов ÑигаÑÐµÑ Ð½Ð°
меÑопÑиÑÑиÑÑ
, поÑеÑаемÑÑ
деÑÑми (Ñм. "
+"<a href=\"http://www.bbc.co.uk/worldservice/sci_tech/features/health/";
"tobaccotrial/usa.htm\">http://www.bbc.co.uk/worldservice/sci_tech/features/";
"health/tobaccotrial/usa.htm</a>)."
@@ -316,13 +296,6 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
-# || No change detected. The change might only be in amounts of spaces.
-#| msgid ""
-#| "Please send general FSF & GNU inquiries to <a
href=\"mailto:address@hidden";
-#| "org\"><address@hidden></a>. There are also <a href=\"/contact/"
-#| "\">other ways to contact</a> the FSF. Broken links and other corrections "
-#| "or suggestions can be sent to <a href=\"mailto:address@hidden";><"
-#| "address@hidden></a>."
msgid ""
"Please send general FSF & GNU inquiries to <a
href=\"mailto:address@hidden";
"\"><address@hidden></a>. There are also <a href=\"/contact/\">other
ways "
Index: gnu/gnu-linux-faq.ru.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.ru.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- gnu/gnu-linux-faq.ru.html 10 Mar 2013 07:16:43 -0000 1.31
+++ gnu/gnu-linux-faq.ru.html 2 Apr 2013 06:35:32 -0000 1.32
@@ -84,6 +84,10 @@
в Ñом, ÑÑо название ÑлиÑком длинно. Ðе
пÑедложиÑе ли Ð²Ñ ÑÑо-нибÑдÑ
коÑоÑе?</a></li>
+<li><a href="#long" id="TOClong2">ÐÑоблема Ñ
+“GNU/Linux” — в Ñом, ÑÑо название
ÑлиÑком
+длинно. ÐаÑем мне мÑÑиÑÑÑÑ Ð¸ говоÑиÑÑ
“GNU”?</a></li>
+
<li><a href="#justgnu" id="TOCjustgnu">ÐоÑколÑÐºÑ Linux —
ÑÑо
вÑоÑоÑÑÐµÐ¿ÐµÐ½Ð½Ð°Ñ ÑоÑÑавлÑÑÑаÑ, бÑло Ð±Ñ Ð»Ð¸
ÑакÑиÑеÑки невеÑно назÑваÑÑ ÑиÑÑемÑ
пÑоÑÑо “GNU”?</a></li>
@@ -592,8 +596,18 @@
“GNU/Linux”.
<p>
Самое коÑоÑкое допÑÑÑимое название длÑ
ÑÑой ÑиÑÑÐµÐ¼Ñ —
-“GNU”, однако Ð¼Ñ Ð½Ð°Ð·Ñваем ее
“GNU/Linux” по
-пÑиÑинам, изложеннÑм ниже.</p>
+“GNU”, однако Ð¼Ñ Ð½Ð°Ð·Ñваем ее
“GNU/Linux” <a
+href="#justgnu"> по пÑиÑинам, изложеннÑм ниже</a>.</p>
+</dd>
+
+<dt id="long2">ÐÑоблема Ñ “GNU/Linux” — в
Ñом, ÑÑо название ÑлиÑком
+длинно. ÐаÑем мне мÑÑиÑÑÑÑ Ð¸ говоÑиÑÑ
“GNU”? <span
+class="anchor-reference-id">(<a href="#long2">#long2</a>)</span></dt>
+
+<dd>
+<p>СказаÑÑ “GNU” можно за какÑÑ-нибÑдÑ
ÑекÑндÑ. ÐÑли Ð²Ñ ÑениÑе
+ÑиÑÑемÑ, коÑоÑÑÑ Ð¼Ñ ÑазÑабоÑали, Ñазве вÑ
не можеÑе ÑделиÑÑ Ð¾Ð´Ð½Ñ ÑекÑндÑ
+ÑомÑ, ÑÑÐ¾Ð±Ñ Ð²ÑÑазиÑÑ Ð¿Ñизнание наÑей
ÑабоÑÑ?</p>
</dd>
<dt id="justgnu">ÐоÑколÑÐºÑ Linux — ÑÑо
вÑоÑоÑÑÐµÐ¿ÐµÐ½Ð½Ð°Ñ ÑоÑÑавлÑÑÑаÑ, бÑло Ð±Ñ Ð»Ð¸
@@ -1329,6 +1343,12 @@
ÐÑло Ð±Ñ Ð»Ð¸ÑемеÑием ÑделаÑÑ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ GNU/Linux
ÑÑебованием лиÑензии, и мÑ
ÑÑого не делаем. ÐÑ ÑолÑко <em>пÑоÑим</em> о
пÑизнании, коÑоÑого мÑ
заÑлÑживаем.
+
+<p>
+ÐбÑаÑиÑе внимание, ÑÑо еÑÑÑ Ð¿Ð¾ менÑÑей
меÑе <a href="/philosophy/bsd.html">
+две ÑазлиÑнÑÑ
лиÑензии BSD</a>. ÐÐ»Ñ ÑÑноÑÑи не
полÑзÑйÑеÑÑ, пожалÑйÑÑа,
+вÑÑажением “лиÑÐµÐ½Ð·Ð¸Ñ BSD”, не ÑпоминаÑ
о Ñом, ÐºÐ°ÐºÐ°Ñ Ð¸Ð¼ÐµÐ½Ð½Ð¾ ÑÑо
+лиÑензиÑ.</p>
</dd>
<dt id="deserve">ÐоÑколÑÐºÑ Ð²Ñ Ð½Ðµ внеÑли в GNU GPL
ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð°Ð·ÑваÑÑ ÑиÑÑемÑ
@@ -1463,7 +1483,7 @@
<p><!-- timestamp start -->
Ðбновлено:
-$Date: 2013/03/10 07:16:43 $
+$Date: 2013/04/02 06:35:32 $
<!-- 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.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gnu/po/gnu-linux-faq.ru-en.html 10 Mar 2013 07:17:00 -0000 1.22
+++ gnu/po/gnu-linux-faq.ru-en.html 2 Apr 2013 06:35:32 -0000 1.23
@@ -77,6 +77,10 @@
“GNU/Linux” is that it is too long. How about
recommending a shorter name?</a></li>
+<li><a href="#long2" id="TOClong2">The problem with
+ “GNU/Linux” is that it is too long. Why should
+ I go to the trouble of saying "GNU/"?</a></li>
+
<li><a href="#justgnu" id="TOCjustgnu">Since Linux is a secondary
contribution, would it be false to the facts to call the system
simply “GNU”?</a></li>
@@ -556,8 +560,18 @@
and “Linux”. The reaction was very bad. People accept
“GNU/Linux”
much better.
<p>
-The shortest legitimate name for this system is “GNU”, but we call
it
-“GNU/Linux” for the reasons given below.</p>
+The shortest legitimate name for this system is “GNU”, but
+we call it “GNU/Linux” <a href="#justgnu"> for the reasons
+given below</a>.</p>
+</dd>
+
+<dt id="long2">The problem with “GNU/Linux” is that it is too long.
+ Why should I go to the trouble of saying "GNU/"? <span
class="anchor-reference-id">(<a href="#long2">#long2</a>)</span></dt>
+
+<dd>
+<p>It only takes a second to say or type "GNU/". If you appreciate the
+system that we developed, can't you take one one second to recognize
+our work?</p>
</dd>
<dt id="justgnu">Since Linux is a secondary
@@ -1249,6 +1263,11 @@
It would be hypocritical to make the name GNU/Linux a license
requirement, and we don't. We only <em>ask</em> you to give us the
credit we deserve.
+
+<p>
+Please note that there are at least <a href="/philosophy/bsd.html">
+two different BSD licenses</a>. For clarity's sake, please don't use
+the term “BSD license” without specifying which one.</p>
</dd>
<dt id="deserve">Since you failed to put
@@ -1357,7 +1376,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/03/10 07:17:00 $
+$Date: 2013/04/02 06:35:32 $
<!-- 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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- gnu/po/gnu-linux-faq.ru.po 2 Apr 2013 06:02:04 -0000 1.31
+++ gnu/po/gnu-linux-faq.ru.po 2 Apr 2013 06:35:33 -0000 1.32
@@ -16,7 +16,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2013-04-01 19:25-0300\n"
"X-Poedit-Language: Russian\n"
# type: Content of: <title>
@@ -219,13 +218,6 @@
# type: Content of: <ul><li>
#. type: Content of: <ul><li>
-# | <a [-href=\"#long\" id=\"TOClong\">The-] {+href=\"#long2\"
-# | id=\"TOClong2\">The+} problem with “GNU/Linux” is that it is
-# | too long. [-How about recommending a shorter name?</a>-] {+Why should I
-# | go to the trouble of saying \"GNU/\"?</a>+}
-#| msgid ""
-#| "<a href=\"#long\" id=\"TOClong\">The problem with “GNU/Linux” "
-#| "is that it is too long. How about recommending a shorter name?</a>"
msgid ""
"<a href=\"#long2\" id=\"TOClong2\">The problem with “GNU/Linux” "
"is that it is too long. Why should I go to the trouble of saying \"GNU/\"?</"
@@ -1432,39 +1424,25 @@
# type: Content of: <dl><dd><p>
#. type: Content of: <dl><dd><p>
-# | The shortest legitimate name for this system is “GNU”, but we
-# | call it “GNU/Linux” {+<a href=\"#justgnu\">+} for the reasons
-# | given [-below.-] {+below</a>.+}
-#| msgid ""
-#| "The shortest legitimate name for this system is “GNU”, but we "
-#| "call it “GNU/Linux” for the reasons given below."
msgid ""
"The shortest legitimate name for this system is “GNU”, but we "
"call it “GNU/Linux” <a href=\"#justgnu\"> for the reasons given "
"below</a>."
msgstr ""
"Самое коÑоÑкое допÑÑÑимое название длÑ
ÑÑой ÑиÑÑÐµÐ¼Ñ — “"
-"GNU”, однако Ð¼Ñ Ð½Ð°Ð·Ñваем ее “GNU/Linux”
<a href=\"#justgnu\"> по пÑиÑинам, "
-"изложеннÑм ниже</a>."
+"GNU”, однако Ð¼Ñ Ð½Ð°Ð·Ñваем ее “GNU/Linux”
<a href=\"#justgnu"
+"\"> по пÑиÑинам, изложеннÑм ниже</a>."
# type: Content of: <dl><dt>
#. type: Content of: <dl><dt>
-# | The problem with “GNU/Linux” is that it is too long. [-How
-# | about recommending a shorter name?-] {+Why should I go to the trouble of
-# | saying \"GNU/\"?+} <span class=\"anchor-reference-id\">(<a
-# | [-href=\"#long\">#long</a>)</span>-] {+href=\"#long2\">#long2</a>)</span>+}
-#| msgid ""
-#| "The problem with “GNU/Linux” is that it is too long. How "
-#| "about recommending a shorter name? <span class=\"anchor-reference-id\">"
-#| "(<a href=\"#long\">#long</a>)</span>"
msgid ""
"The problem with “GNU/Linux” is that it is too long. Why should "
"I go to the trouble of saying \"GNU/\"? <span class=\"anchor-reference-id\">"
"(<a href=\"#long2\">#long2</a>)</span>"
msgstr ""
"ÐÑоблема Ñ “GNU/Linux” — в Ñом, ÑÑо
название ÑлиÑком "
-"длинно. ÐаÑем мне мÑÑиÑÑÑÑ Ð¸ говоÑиÑÑ
“GNU”? <span class=\"anchor-"
-"reference-id\">(<a href=\"#long2\">#long2</a>)</span>"
+"длинно. ÐаÑем мне мÑÑиÑÑÑÑ Ð¸ говоÑиÑÑ
“GNU”? <span class="
+"\"anchor-reference-id\">(<a href=\"#long2\">#long2</a>)</span>"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3082,8 +3060,8 @@
"different BSD licenses</a>. For clarity's sake, please don't use the term "
"“BSD license” without specifying which one."
msgstr ""
-"ÐбÑаÑиÑе внимание, ÑÑо еÑÑÑ Ð¿Ð¾ менÑÑей
меÑе <a href=\"/philosophy/bsd.html\"> "
-"две ÑазлиÑнÑÑ
лиÑензии BSD</a>. ÐÐ»Ñ ÑÑноÑÑи
не полÑзÑйÑеÑÑ, пожалÑйÑÑа, "
+"ÐбÑаÑиÑе внимание, ÑÑо еÑÑÑ Ð¿Ð¾ менÑÑей
меÑе <a href=\"/philosophy/bsd.html"
+"\"> две ÑазлиÑнÑÑ
лиÑензии BSD</a>. ÐÐ»Ñ ÑÑноÑÑи
не полÑзÑйÑеÑÑ, пожалÑйÑÑа, "
"вÑÑажением “лиÑÐµÐ½Ð·Ð¸Ñ BSD”, не
ÑÐ¿Ð¾Ð¼Ð¸Ð½Ð°Ñ Ð¾ Ñом, ÐºÐ°ÐºÐ°Ñ Ð¸Ð¼ÐµÐ½Ð½Ð¾ ÑÑо "
"лиÑензиÑ."
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www education/edu-schools.ru.html education/po/...,
GNUN <=