[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www planetfeeds.ru.html distros/free-system-dis...
From: |
GNUN |
Subject: |
www planetfeeds.ru.html distros/free-system-dis... |
Date: |
Mon, 13 Apr 2015 12:58:35 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/04/13 12:58:35
Modified files:
. : planetfeeds.ru.html
distros : free-system-distribution-guidelines.ru.html
distros/po : free-system-distribution-guidelines.ru-en.html
free-system-distribution-guidelines.ru.po
po : planetfeeds.ru.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/planetfeeds.ru.html?cvsroot=www&r1=1.381&r2=1.382
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-system-distribution-guidelines.ru.html?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-system-distribution-guidelines.ru-en.html?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-system-distribution-guidelines.ru.po?cvsroot=www&r1=1.65&r2=1.66
http://web.cvs.savannah.gnu.org/viewcvs/www/po/planetfeeds.ru.po?cvsroot=www&r1=1.555&r2=1.556
Patches:
Index: planetfeeds.ru.html
===================================================================
RCS file: /web/www/www/planetfeeds.ru.html,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -b -r1.381 -r1.382
--- planetfeeds.ru.html 13 Apr 2015 09:58:33 -0000 1.381
+++ planetfeeds.ru.html 13 Apr 2015 12:58:33 -0000 1.382
@@ -2,8 +2,8 @@
<!-- Autogenerated by planetrss.pl 1.10 -->
<p><a
href='http://www.fsf.org/blogs/licensing/friday-free-software-directory-irc-meetup-april-10'>
-Friday Free Software Directory IRC meetup: April 10</a>: Join the FSF and
friends today, Friday, April 10, from 2pm to 5pm EDT
-(18:00 to 21:00 UTC) to help improve the Free Software Directory by a...
+ÐÑÑниÑное ÑобÑание ÐаÑалога ÑвободнÑÑ
пÑогÑамм на IRC: 10 апÑелÑ</a>: ÐÑиÑоединÑйÑеÑÑ
к ФСÐÐ Ñо ÑоваÑиÑи в пÑÑниÑÑ, 10 апÑелÑ, Ñ 18:00
до 21:00
+по ÐÑинвиÑÑ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð¼Ð¾ÑÑ ÑлÑÑÑиÑÑ ÐаÑалог
ÑвободнÑÑ
пÑогÑамм...
<a
href='http://www.fsf.org/blogs/licensing/friday-free-software-directory-irc-meetup-april-10'>далее</a></p>
<p><a href='http://www.gnutls.org/news.html#2015-04-08'>
Index: distros/free-system-distribution-guidelines.ru.html
===================================================================
RCS file: /web/www/www/distros/free-system-distribution-guidelines.ru.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- distros/free-system-distribution-guidelines.ru.html 23 Aug 2014 10:27:27
-0000 1.49
+++ distros/free-system-distribution-guidelines.ru.html 13 Apr 2015 12:58:33
-0000 1.50
@@ -238,6 +238,23 @@
пÑедполагаем, ÑÑо ÑазлиÑие Ð¼ÐµÐ¶Ð´Ñ ÑÑими
двÑÐ¼Ñ Ð´Ð¸ÑÑÑибÑÑивами бÑÐ´ÐµÑ Ð¿Ð¾ÑеÑÑно в
пÑоÑеÑÑе пеÑедаÑи ÑообÑениÑ.</p>
+<p>Ð ÑаÑÑноÑÑи, оÑнова Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ñвободного
диÑÑÑибÑÑива (в данном пÑимеÑе
+“Foobar”) не должно бÑÑÑ ÑаÑÑÑÑ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ
никакого неÑвободного
+диÑÑÑибÑÑива.</p>
+
+<p>У некоÑоÑÑÑ
возникала мÑÑÐ»Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ
название “GNU” к названиÑ
+Ñвободного диÑÑÑибÑÑива, ÑÑÐ¾Ð±Ñ Ð¾ÑлиÑаÑÑ
его Ð¾Ñ Ð½ÐµÑвободного. ÐдеÑÑ ÐµÑÑÑ Ð´Ð²Ðµ
+пÑоблемÑ. Ðо-пеÑвÑÑ
, два Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð½Ðµ бÑли
Ð±Ñ Ð´Ð¾ÑÑаÑоÑно ÑазлиÑнÑ, поÑколÑкÑ
+Ñлово-оÑнова в обоиÑ
названиÑÑ
бÑла бÑ
одна и Ñа же.</p>
+
+<p>Ðо-вÑоÑÑÑ
, ÑÑо ÑаÑпÑоÑÑÑанÑло бÑ
невеÑное понимание Ñого, ÑÑо ознаÑаеÑ
+“GNU”. <a href="/gnu/linux-and-gnu.html">GNU — ÑÑо
+опеÑаÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑиÑÑема</a>, ÑипиÑно
пÑименÑÐµÐ¼Ð°Ñ Ñ Linux в каÑеÑÑве ÑдÑа, и по
+ÑÑÑеÑÑÐ²Ñ Ð²Ñе Ñак назÑваемÑе диÑÑÑибÑÑивÑ
“Linux” в
+дейÑÑвиÑелÑноÑÑи ÑвлÑÑÑÑÑ Ð´Ð¸ÑÑÑибÑÑивами
GNU/Linux. Ð ÑаÑÑмаÑÑиваемом ÑлÑÑае
+<em>обе</em> ÑиÑÑÐµÐ¼Ñ ÑвлÑÑÑÑÑ GNU/Linux, еÑли бÑ
“GNU” в
+названии одного из ниÑ
опÑÑкалоÑÑ, ÑÑо
вводило Ð±Ñ Ð² заблÑждение.</p>
+
<h3 id="upstream">СвÑÐ·Ñ ÑаÑпÑоÑÑÑаниÑелей Ñ
ÑазÑабоÑÑиками</h3>
<p>ÐÐ»Ñ ÑазÑабоÑÑиков диÑÑÑибÑÑива или
кого-нибÑÐ´Ñ ÐµÑе, кÑо пÑиÑÑÐ»Ð°ÐµÑ Ð²Ð°Ð¶Ð½Ñй
@@ -342,7 +359,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014 Free Software Foundation, Inc.</p>
+<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">лиÑензии
@@ -362,7 +379,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2014/08/23 10:27:27 $
+$Date: 2015/04/13 12:58:33 $
<!-- timestamp end -->
</p>
Index: distros/po/free-system-distribution-guidelines.ru-en.html
===================================================================
RCS file:
/web/www/www/distros/po/free-system-distribution-guidelines.ru-en.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- distros/po/free-system-distribution-guidelines.ru-en.html 23 Aug 2014
10:27:29 -0000 1.33
+++ distros/po/free-system-distribution-guidelines.ru-en.html 13 Apr 2015
12:58:34 -0000 1.34
@@ -229,6 +229,23 @@
Foobar Light. This is because we expect that the distinction between
the two would be lost in the process of communicating the message.</p>
+<p>In particular, the principal name of the free distribution
+(“Foobar”, in this example) should not be part of the name
+of any nonfree distribution.</p>
+
+<p>Some people have thought of adding the name “GNU” to a
+free distro name to distinguish it from a nonfree one. This has two
+problems. First, the two names would not be sufficiently different,
+since the principal word in both names would be the same.</p>
+
+<p>Second, this would promote a misunderstanding of what
+“GNU” means. <a href="/gnu/linux-and-gnu.html">GNU is an
+operating system</a>, typically used with Linux as the kernel, and
+essentially all so-called “Linux” distributions are really
+GNU/Linux distributions. In this scenario,
+<em>both</em> versions are GNU/Linux, and it would be misleading to
+omit “GNU” from the name of one of them.</p>
+
<h3 id="upstream">Contacting Upstream If You're Downstream</h3>
<p>For distro developers (or anyone else) who have sent an important bug
@@ -323,7 +340,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2014 Free Software Foundation, Inc.</p>
+<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
@@ -333,7 +350,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/08/23 10:27:29 $
+$Date: 2015/04/13 12:58:34 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/free-system-distribution-guidelines.ru.po
===================================================================
RCS file: /web/www/www/distros/po/free-system-distribution-guidelines.ru.po,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- distros/po/free-system-distribution-guidelines.ru.po 13 Apr 2015
12:40:13 -0000 1.65
+++ distros/po/free-system-distribution-guidelines.ru.po 13 Apr 2015
12:58:34 -0000 1.66
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: free-system-distribution-guidelines.html\n"
-"POT-Creation-Date: 2015-04-13 09:55+0000\n"
+"POT-Creation-Date: 2015-04-13 11:55+0000\n"
"PO-Revision-Date: 2015-04-13 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -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-04-13 09:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -557,8 +556,8 @@
"опеÑаÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑиÑÑема</a>, ÑипиÑно
пÑименÑÐµÐ¼Ð°Ñ Ñ Linux в каÑеÑÑве ÑдÑа, и по "
"ÑÑÑеÑÑÐ²Ñ Ð²Ñе Ñак назÑваемÑе диÑÑÑибÑÑивÑ
“Linux” в "
"дейÑÑвиÑелÑноÑÑи ÑвлÑÑÑÑÑ
диÑÑÑибÑÑивами GNU/Linux. Ð ÑаÑÑмаÑÑиваемом
ÑлÑÑае "
-"<em>обе</em> ÑиÑÑÐµÐ¼Ñ ÑвлÑÑÑÑÑ GNU/Linux, еÑли бÑ
“GNU” в названии "
-"одного из ниÑ
опÑÑкалоÑÑ, ÑÑо вводило Ð±Ñ Ð²
заблÑждение."
+"<em>обе</em> ÑиÑÑÐµÐ¼Ñ ÑвлÑÑÑÑÑ GNU/Linux, еÑли бÑ
“GNU” в "
+"названии одного из ниÑ
опÑÑкалоÑÑ, ÑÑо
вводило Ð±Ñ Ð² заблÑждение."
#. type: Content of: <h3>
msgid "Contacting Upstream If You're Downstream"
@@ -707,8 +706,6 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
-# || No change detected. The change might only be in amounts of spaces.
-#| msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
msgid "Copyright © 2014, 2015 Free Software Foundation, Inc."
msgstr "Copyright © 2014, 2015 Free Software Foundation, Inc."
Index: po/planetfeeds.ru.po
===================================================================
RCS file: /web/www/www/po/planetfeeds.ru.po,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -b -r1.555 -r1.556
--- po/planetfeeds.ru.po 13 Apr 2015 12:40:13 -0000 1.555
+++ po/planetfeeds.ru.po 13 Apr 2015 12:58:34 -0000 1.556
@@ -14,16 +14,8 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-04-13 09:56+0000\n"
#. type: Content of: <p><a>
-# | <a
-# |
[-href='http://www.fsf.org/blogs/directory/friday-free-software-directory-irc-meetup-april-3'>-]
-# | {+href='http://www.fsf.org/blogs/licensing/friday-free-software-directory-i
-# | rc-meetup-april-10'>+}
-#| msgid ""
-#| "<a href='http://www.fsf.org/blogs/directory/friday-free-software-"
-#| "directory-irc-meetup-april-3'>"
msgid ""
"<a href='http://www.fsf.org/blogs/licensing/friday-free-software-directory-"
"irc-meetup-april-10'>"
@@ -32,8 +24,6 @@
"irc-meetup-april-10'>"
#. type: Content of: <p><a>
-# | Friday Free Software Directory IRC meetup: April [-3-] {+10+}
-#| msgid "Friday Free Software Directory IRC meetup: April 3"
msgid "Friday Free Software Directory IRC meetup: April 10"
msgstr "ÐÑÑниÑное ÑобÑание ÐаÑалога ÑвободнÑÑ
пÑогÑамм на IRC: 10 апÑелÑ"
@@ -42,12 +32,6 @@
msgstr "</a>"
#. type: Content of: <p>
-# | : Join the FSF and friends [-on-] {+today,+} Friday, April [-3,-] {+10,+}
-# | from 2pm to 5pm EDT (18:00 to 21:00 UTC) to help improve the Free Software
-# | Directory by [-adding...-] {+a...+}
-#| msgid ""
-#| ": Join the FSF and friends on Friday, April 3, from 2pm to 5pm EDT (18:00 "
-#| "to 21:00 UTC) to help improve the Free Software Directory by adding..."
msgid ""
": Join the FSF and friends today, Friday, April 10, from 2pm to 5pm EDT "
"(18:00 to 21:00 UTC) to help improve the Free Software Directory by a..."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www planetfeeds.ru.html distros/free-system-dis...,
GNUN <=