[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/gnu gnu-linux-faq.ru.html po/gnu-linux-faq....
From: |
GNUN |
Subject: |
www/gnu gnu-linux-faq.ru.html po/gnu-linux-faq.... |
Date: |
Thu, 18 Aug 2016 21:28:02 +0000 (UTC) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 16/08/18 21:28:02
Modified files:
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/gnu/gnu-linux-faq.ru.html?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ru-en.html?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ru.po?cvsroot=www&r1=1.84&r2=1.85
Patches:
Index: gnu-linux-faq.ru.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.ru.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- gnu-linux-faq.ru.html 14 Dec 2015 11:00:44 -0000 1.56
+++ gnu-linux-faq.ru.html 18 Aug 2016 21:28:01 -0000 1.57
@@ -1,7 +1,7 @@
<!--#set var="ENGLISH_PAGE" value="/gnu/gnu-linux-faq.en.html" -->
<!--#include virtual="/server/header.ru.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.79 -->
<!-- This file is automatically generated by GNUnited Nations! -->
<title>ÐопÑоÑÑ Ð¾ GNU/Linux - ÐÑÐ¾ÐµÐºÑ GNU - Фонд
Ñвободного пÑогÑаммного обеÑпеÑениÑ</title>
@@ -89,6 +89,9 @@
в Ñом, ÑÑо название ÑлиÑком длинно. Ðе
пÑедложиÑе ли Ð²Ñ ÑÑо-нибÑдÑ
коÑоÑе?</a></li>
+<li><a href="#long1" id="TOClong1">ЧÑо, еÑли Ñ Ð±ÑдÑ
назÑваÑÑ ÑиÑÑемÑ
+“GliNUx” (вмеÑÑо “GNU/Linux”)?</a></li>
+
<li><a href="#long2" id="TOClong2">ÐÑоблема Ñ
“GNU/Linux” — в Ñом, ÑÑо название
ÑлиÑком
длинно. ÐаÑем мне мÑÑиÑÑÑÑ Ð¸ говоÑиÑÑ
“GNU”?</a></li>
@@ -141,7 +144,7 @@
<li><a href="#distronames1" id="TOCdistronames1">ÐÑиÑиалÑное
название моего
диÑÑÑибÑÑива — “Foobar Linux”; Ñазве
можно назÑваÑÑ
-его как-нибÑдÑ, кÑоме “Linux”?</a></li>
+его как-нибÑдÑ, кÑоме “Foobar Linux”?</a></li>
<li><a href="#companies" id="TOCcompanies">Разве не бÑло бÑ
более ÑÑÑекÑивно
пÑоÑиÑÑ Ñакие компании, как Mandrake, Red Hat и IBM,
назÑваÑÑ Ñвои
@@ -675,6 +678,21 @@
href="#justgnu"> по пÑиÑинам, изложеннÑм ниже</a>.</p>
</dd>
+<dt id="long1">ЧÑо, еÑли Ñ Ð±ÑÐ´Ñ Ð½Ð°Ð·ÑваÑÑ ÑиÑÑемÑ
“GliNUx” (вмеÑÑо
+“GNU/Linux”)? <span class="anchor-reference-id">(<a
+href="#long1">#long1</a>)</span></dt>
+
+<dd>
+<p>Ðазвание “GNU” в “Glinux” ÑÑÑдно
ÑазлиÑимо, Ñак ÑÑо
+болÑÑинÑÑво лÑдей его в нем не замеÑало бÑ.
Ðаже еÑли пиÑаÑÑ Ð¿ÑопиÑнÑми
+бÑквами (“GliNUx”) болÑÑинÑÑво лÑдей не
бÑÐ´ÐµÑ Ð¾ÑознаваÑÑ, ÑÑо
+здеÑÑ ÑодеÑжиÑÑÑ ÑÑÑлка на GNU.</p>
+
+<p>ÐÑо бÑло Ð±Ñ ÑÑавнимо Ñ Ñем, как еÑли бÑ
пиÑали “GNU/Linux”, но
+“GNU/” набиÑали Ð±Ñ Ñаким мелким
ÑÑиÑÑом, ÑÑо лÑди не могли бÑ
+ÑÑо пÑоÑеÑÑÑ.</p>
+</dd>
+
<dt id="long2">ÐÑоблема Ñ “GNU/Linux” — в
Ñом, ÑÑо название ÑлиÑком
длинно. ÐаÑем мне мÑÑиÑÑÑÑ Ð¸ говоÑиÑÑ
“GNU”? <span
class="anchor-reference-id">(<a href="#long2">#long2</a>)</span></dt>
@@ -902,14 +920,14 @@
</dd>
<dt id="distronames1">ÐÑиÑиалÑное название моего
диÑÑÑибÑÑива — “Foobar
-Linux”; Ñазве можно назÑваÑÑ ÐµÐ³Ð¾
как-нибÑдÑ, кÑоме
-“Linux”? <span class="anchor-reference-id">(<a
+Linux”; Ñазве можно назÑваÑÑ ÐµÐ³Ð¾
как-нибÑдÑ, кÑоме “Foobar
+Linux”? <span class="anchor-reference-id">(<a
href="#distronames1">#distronames1</a>)</span></dt>
-<dd><p>ÐÑли им позволиÑелÑно измениÑÑ
“GNU” на “Foobar
-Linux”, Ñо вам позволиÑелÑно измениÑÑ ÐµÐ³Ð¾
обÑаÑно и назÑваÑÑ ÑÑо
-“Foobar GNU/Linux”. ÐÑо-Ñо Ð²Ñ Ð¸ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð´ÐµÐ»Ð°ÑÑ:
избегаÑÑ Ð¸Ñ
-оÑибки.</p></dd>
+<dd><p>Ðогда они ÑаÑпÑоÑÑÑанÑÑÑ Ð»Ð¾Ð¶Ð½ÑÑ
инÑоÑмаÑиÑ, менÑÑ “GNU” на
+“Linux”, и назÑваÑÑ ÑÐ²Ð¾Ñ Ð²ÐµÑÑÐ¸Ñ “Foobar
Linux”, длÑ
+Ð²Ð°Ñ Ð¿ÑавилÑно бÑÐ´ÐµÑ ÑÑÑÑанÑÑÑ Ð»Ð¾Ð¶Ð½ÑÑ
инÑоÑмаÑиÑ, назÑÐ²Ð°Ñ ÑÑо “Foobar
+GNU/Linux”.</p></dd>
<dt id="companies">Разве не бÑло Ð±Ñ Ð±Ð¾Ð»ÐµÐµ
ÑÑÑекÑивно пÑоÑиÑÑ Ñакие компании, как
Mandrake, Red
Hat и IBM, назÑваÑÑ Ñвои диÑÑÑибÑÑивÑ
“GNU/Linux” вмеÑÑо Ñого,
@@ -1613,9 +1631,9 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2001, 2006, 2007, 2008, 2010, 2011, 2012, 2013, 2014, 2015
-Free Software Foundation, Inc.<br />Copyright © 2010 Vladimir Smolyar
-(translation)</p>
+<p>Copyright © 2001, 2006, 2007, 2008, 2010, 2011, 2012, 2013, 2014, 2015,
+2016 Free Software Foundation, Inc.<br />Copyright © 2010 Vladimir
+Smolyar (translation)</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru">лиÑензии
@@ -1631,7 +1649,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2015/12/14 11:00:44 $
+$Date: 2016/08/18 21:28:01 $
<!-- timestamp end -->
</p>
Index: po/gnu-linux-faq.ru-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ru-en.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- po/gnu-linux-faq.ru-en.html 14 Dec 2015 11:00:44 -0000 1.43
+++ po/gnu-linux-faq.ru-en.html 18 Aug 2016 21:28:02 -0000 1.44
@@ -1,5 +1,5 @@
<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.79 -->
<title>GNU/Linux FAQ
- GNU Project - Free Software Foundation</title>
<!--#include virtual="/gnu/po/gnu-linux-faq.translist" -->
@@ -84,6 +84,9 @@
“GNU/Linux” is that it is too long. How about
recommending a shorter name?</a></li>
+<li><a href="#long1" id="TOClong1">How about calling the system
+ “GliNUx” (instead of “GNU/Linux”)?</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>
@@ -137,7 +140,7 @@
<li><a href="#distronames1" id="TOCdistronames1">My distro's official
name is “Foobar Linux”; isn't it wrong to call the
- distro anything but “Linux”?</a></li>
+ distro anything but “Foobar Linux”?</a></li>
<li><a href="#companies" id="TOCcompanies">Wouldn't it be more
effective to ask companies such as Mandrake, Red Hat and IBM to
@@ -640,6 +643,21 @@
given below</a>.</p>
</dd>
+<dt id="long1">How about calling the system
+ “GliNUx” (instead of “GNU/Linux”)?
+ <span class="anchor-reference-id">(<a href="#long1">#long1</a>)</span></dt>
+
+<dd>
+<p>The name “GNU” does not visibly appear in
+“Glinux,” so most people would not notice it is there.
+Even if it is capitalized as “GliNUx,” most people would
+not realize that it contains a reference to GNU.</p>
+
+<p>It would be comparable to writing “GNU/Linux,” but
+putting “GNU/” in print so small that most people could
+not read it.</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>
@@ -861,12 +879,12 @@
<dt id="distronames1">My distro's official name is “Foobar
Linux”; isn't it wrong to call the distro
- anything but “Linux”? <span class="anchor-reference-id">(<a
href="#distronames1">#distronames1</a>)</span></dt>
+ anything but “Foobar Linux”? <span
class="anchor-reference-id">(<a
href="#distronames1">#distronames1</a>)</span></dt>
-<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,
-to avoid their error.</p></dd>
+<dd><p>When they spread misinformation by changing “GNU”
+to “Linux”, and call their version of it “Foobar
+Linux”, it's proper for you to correct the misinformation by
+calling it “Foobar GNU/Linux”.</p></dd>
<dt id="companies">Wouldn't it be more
effective to ask companies such as Mandrake, Red Hat and IBM to
@@ -1516,7 +1534,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015
+<p>Copyright © 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, 2016
Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -1527,7 +1545,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/12/14 11:00:44 $
+$Date: 2016/08/18 21:28:02 $
<!-- timestamp end -->
</p>
</div>
Index: po/gnu-linux-faq.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ru.po,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- po/gnu-linux-faq.ru.po 18 Aug 2016 20:55:16 -0000 1.84
+++ po/gnu-linux-faq.ru.po 18 Aug 2016 21:28:02 -0000 1.85
@@ -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: 2016-08-18 16:55+0000\n"
"X-Poedit-Language: Russian\n"
# type: Content of: <title>
@@ -239,13 +238,6 @@
# type: Content of: <ul><li>
#. type: Content of: <ul><li>
-# | <a [-href=\"#whyslash\" id=\"TOCwhyslash\">Why do you write
-# | “GNU/Linux” instead-] {+href=\"#long1\" id=\"TOClong1\">How
-# | about calling the system “GliNUx” (instead+} of [-“GNU
-# | Linux”?</a>-] {+“GNU/Linux”)?</a>+}
-#| msgid ""
-#| "<a href=\"#whyslash\" id=\"TOCwhyslash\">Why do you write “GNU/"
-#| "Linux” instead of “GNU Linux”?</a>"
msgid ""
"<a href=\"#long1\" id=\"TOClong1\">How about calling the system “"
"GliNUx” (instead of “GNU/Linux”)?</a>"
@@ -387,13 +379,6 @@
# type: Content of: <ul><li>
#. type: Content of: <ul><li>
-# | <a href=\"#distronames1\" id=\"TOCdistronames1\">My distro's official name
-# | is “Foobar Linux”; isn't it wrong to call the distro anything
-# | but [-“Linux”?</a>-] {+“Foobar Linux”?</a>+}
-#| msgid ""
-#| "<a href=\"#distronames1\" id=\"TOCdistronames1\">My distro's official "
-#| "name is “Foobar Linux”; isn't it wrong to call the distro "
-#| "anything but “Linux”?</a>"
msgid ""
"<a href=\"#distronames1\" id=\"TOCdistronames1\">My distro's official name "
"is “Foobar Linux”; isn't it wrong to call the distro anything "
@@ -1628,22 +1613,12 @@
# type: Content of: <dl><dt>
#. type: Content of: <dl><dt>
-# | [-Why do you write “GNU/Linux” instead-]{+How about calling
-# | the system “GliNUx” (instead+} of [-“GNU Linux”?-]
-# | {+“GNU/Linux”)?+} <span class=\"anchor-reference-id\">(<a
-# | [-href=\"#whyslash\">#whyslash</a>)</span>-]
-# | {+href=\"#long1\">#long1</a>)</span>+}
-#| msgid ""
-#| "Why do you write “GNU/Linux” instead of “GNU "
-#| "Linux”? <span class=\"anchor-reference-id\">(<a href=\"#whyslash"
-#| "\">#whyslash</a>)</span>"
msgid ""
"How about calling the system “GliNUx” (instead of “GNU/"
"Linux”)? <span class=\"anchor-reference-id\">(<a href="
"\"#long1\">#long1</a>)</span>"
msgstr ""
-"ЧÑо, еÑли Ñ Ð±ÑÐ´Ñ Ð½Ð°Ð·ÑваÑÑ ÑиÑÑÐµÐ¼Ñ “"
-"GliNUx” (вмеÑÑо “GNU/"
+"ЧÑо, еÑли Ñ Ð±ÑÐ´Ñ Ð½Ð°Ð·ÑваÑÑ ÑиÑÑемÑ
“GliNUx” (вмеÑÑо “GNU/"
"Linux”)? <span class=\"anchor-reference-id\">(<a href="
"\"#long1\">#long1</a>)</span>"
@@ -1665,8 +1640,8 @@
"“GNU/” in print so small that most people could not read it."
msgstr ""
"ÐÑо бÑло Ð±Ñ ÑÑавнимо Ñ Ñем, как еÑли бÑ
пиÑали “GNU/Linux”, но "
-"“GNU/” набиÑали Ð±Ñ Ñаким мелким
ÑÑиÑÑом, ÑÑо лÑди не могли "
-"Ð±Ñ ÑÑо пÑоÑеÑÑÑ."
+"“GNU/” набиÑали Ð±Ñ Ñаким мелким
ÑÑиÑÑом, ÑÑо лÑди не могли Ð±Ñ "
+"ÑÑо пÑоÑеÑÑÑ."
# type: Content of: <dl><dt>
#. type: Content of: <dl><dt>
@@ -2171,22 +2146,14 @@
# type: Content of: <dl><dt>
#. type: Content of: <dl><dt>
-# | My distro's official name is “Foobar Linux”; isn't it wrong to
-# | call the distro anything but [-“Linux”?-] {+“Foobar
-# | Linux”?+} <span class=\"anchor-reference-id\">(<a
-# | href=\"#distronames1\">#distronames1</a>)</span>
-#| msgid ""
-#| "My distro's official name is “Foobar Linux”; isn't it wrong "
-#| "to call the distro anything but “Linux”? <span class=\"anchor-"
-#| "reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
msgid ""
"My distro's official name is “Foobar Linux”; isn't it wrong to "
"call the distro anything but “Foobar Linux”? <span class="
"\"anchor-reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
msgstr ""
"ÐÑиÑиалÑное название моего
диÑÑÑибÑÑива — “Foobar "
-"Linux”; Ñазве можно назÑваÑÑ ÐµÐ³Ð¾
как-нибÑдÑ, кÑоме “"
-"Foobar Linux”? <span class=\"anchor-reference-id\">(<a href="
+"Linux”; Ñазве можно назÑваÑÑ ÐµÐ³Ð¾
как-нибÑдÑ, кÑоме “Foobar "
+"Linux”? <span class=\"anchor-reference-id\">(<a href="
"\"#distronames1\">#distronames1</a>)</span>"
#. type: Content of: <dl><dd><p>
@@ -2197,9 +2164,9 @@
"Linux”."
msgstr ""
"Ðогда они ÑаÑпÑоÑÑÑанÑÑÑ Ð»Ð¾Ð¶Ð½ÑÑ
инÑоÑмаÑиÑ, менÑÑ “GNU” на "
-"“Linux”, и назÑваÑÑ ÑÐ²Ð¾Ñ Ð²ÐµÑÑÐ¸Ñ “Foobar
Linux”, "
-"Ð´Ð»Ñ Ð²Ð°Ñ Ð¿ÑавилÑно бÑÐ´ÐµÑ ÑÑÑÑанÑÑÑ Ð»Ð¾Ð¶Ð½ÑÑ
инÑоÑмаÑиÑ, назÑÐ²Ð°Ñ ÑÑо "
-"“Foobar GNU/Linux”."
+"“Linux”, и назÑваÑÑ ÑÐ²Ð¾Ñ Ð²ÐµÑÑÐ¸Ñ “Foobar
Linux”, Ð´Ð»Ñ "
+"Ð²Ð°Ñ Ð¿ÑавилÑно бÑÐ´ÐµÑ ÑÑÑÑанÑÑÑ Ð»Ð¾Ð¶Ð½ÑÑ
инÑоÑмаÑиÑ, назÑÐ²Ð°Ñ ÑÑо “Foobar "
+"GNU/Linux”."
# type: Content of: <dl><dt>
#. type: Content of: <dl><dt>
@@ -3640,18 +3607,13 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
-# | Copyright © 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, [-2015-]
-# | {+2015, 2016+} Free Software Foundation, Inc.
-#| msgid ""
-#| "Copyright © 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015 "
-#| "Free Software Foundation, Inc."
msgid ""
"Copyright © 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, 2016 "
"Free Software Foundation, Inc."
msgstr ""
-"Copyright © 2001, 2006, 2007, 2008, 2010, 2011, 2012, 2013, 2014, 2015,
2016 "
-"Free Software Foundation, Inc.<br />Copyright © 2010 Vladimir Smolyar "
-"(translation)"
+"Copyright © 2001, 2006, 2007, 2008, 2010, 2011, 2012, 2013, 2014, 2015, "
+"2016 Free Software Foundation, Inc.<br />Copyright © 2010 Vladimir "
+"Smolyar (translation)"
#. type: Content of: <div><p>
msgid ""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/gnu gnu-linux-faq.ru.html po/gnu-linux-faq....,
GNUN <=