[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy words-to-avoid.ru.html po/words-...
From: |
GNUN |
Subject: |
www/philosophy words-to-avoid.ru.html po/words-... |
Date: |
Thu, 22 Nov 2012 05:29:00 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 12/11/22 05:29:00
Modified files:
philosophy : words-to-avoid.ru.html
philosophy/po : words-to-avoid.ru-en.html words-to-avoid.ru.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.ru.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru.po?cvsroot=www&r1=1.2&r2=1.3
Patches:
Index: words-to-avoid.ru.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.ru.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- words-to-avoid.ru.html 22 Nov 2012 04:27:23 -0000 1.4
+++ words-to-avoid.ru.html 22 Nov 2012 05:28:59 -0000 1.5
@@ -27,53 +27,53 @@
<p>
<a href="/philosophy/philosophy.html">ÐÑÑгие ÑекÑÑÑ</a> |
“<a
-href="#Alternative"> <span xml:lang="en" lang="en">Alternative</span>
-(алÑÑеÑнаÑивнÑй)</a>” | “<a href="#BSD-style"> <span
+href="#Alternative"><span xml:lang="en" lang="en">Alternative</span>
+(алÑÑеÑнаÑивнÑй)</a>” | “<a href="#BSD-style"><span
xml:lang="en" lang="en">BSD-style</span> (в ÑÑиле BSD)</a>” |
-“<a href="#Closed"> <span xml:lang="en" lang="en">Closed</span>
-(закÑÑÑÑй)</a>” | “<a href="#CloudComputing"> <span
-xml:lang="en" lang="en">Cloud Computing</span> (облаÑнÑе
-вÑÑиÑлениÑ)</a>” | “<a href="#Commercial"> <span
xml:lang="en"
-lang="en">Commercial</span> (коммеÑÑеÑкий)</a>” | “<a
-href="#Compensation"> <span xml:lang="en" lang="en">Compensation</span>
-(компенÑаÑиÑ)</a>” | “<a href="#Consume"> <span
xml:lang="en"
-lang="en">Consume</span> (поÑÑеблÑÑÑ)</a>” | “<a
-href="#Consumer"> <span xml:lang="en" lang="en">Consumer</span>
-(поÑÑебиÑелÑ)</a>” | “<a href="#Content"> <span
xml:lang="en"
-lang="en">Content</span> (конÑенÑ)</a>” | “<a
href="#Creator">
-<span xml:lang="en" lang="en">Creator</span> (ÑоздаÑелÑ)</a>” |
-“<a href="#DigitalGoods"> <span xml:lang="en" lang="en">Digital
-Goods</span> (ÑиÑÑовÑе ÑоваÑÑ)</a>” | “<a
href="#DigitalLocks">
-<span xml:lang="en" lang="en">Digital Locks</span> (ÑиÑÑовÑе
-замки)</a>” | “<a href="#DigitalRightsManagement"><span
-xml:lang="en" lang="en">Digital Rights Management</span> (ÑиÑÑовое
-ÑпÑавление пÑавами</a>” | “ <a href="#Ecosystem">
<span
-xml:lang="en" lang="en">Ecosystem</span> (ÑкоÑиÑÑема)</a>” |
“<a
+“<a href="#Closed"><span xml:lang="en" lang="en">Closed</span>
+(закÑÑÑÑй)</a>” | “<a href="#CloudComputing"><span
xml:lang="en"
+lang="en">Cloud Computing</span> (облаÑнÑе
вÑÑиÑлениÑ)</a>” |
+“<a href="#Commercial"><span xml:lang="en" lang="en">Commercial</span>
+(коммеÑÑеÑкий)</a>” | “<a href="#Compensation"><span
+xml:lang="en" lang="en">Compensation</span>
(компенÑаÑиÑ)</a>” |
+“<a href="#Consume"><span xml:lang="en" lang="en">Consume</span>
+(поÑÑеблÑÑÑ)</a>” | “<a href="#Consumer"><span
xml:lang="en"
+lang="en">Consumer</span> (поÑÑебиÑелÑ)</a>” | “<a
+href="#Content"><span xml:lang="en" lang="en">Content</span>
+(конÑенÑ)</a>” | “<a href="#Creator"><span xml:lang="en"
+lang="en">Creator</span> (ÑоздаÑелÑ)</a>” | “<a
+href="#DigitalGoods"><span xml:lang="en" lang="en">Digital Goods</span>
+(ÑиÑÑовÑе ÑоваÑÑ)</a>” | “<a
href="#DigitalLocks"><span
+xml:lang="en" lang="en">Digital Locks</span> (ÑиÑÑовÑе
замки)</a>” |
+“<a href="#DigitalRightsManagement"><span xml:lang="en"
+lang="en">Digital Rights Management</span> (ÑиÑÑовое
ÑпÑавление
+пÑавами</a>” | “ <a href="#Ecosystem"> <span xml:lang="en"
+lang="en">Ecosystem</span> (ÑкоÑиÑÑема)</a>” | “<a
href="#ForFree"><span xml:lang="en" lang="en">For Free</span>
-(беÑплаÑно)</a>” | “<a href="#FreelyAvailable"> <span
+(беÑплаÑно)</a>” | “<a href="#FreelyAvailable"><span
xml:lang="en" lang="en">Freely Available</span> (Ñвободно
-доÑÑÑпнÑй)</a>” | “<a href="#Freeware"> <span
xml:lang="en"
+доÑÑÑпнÑй)</a>” | “<a href="#Freeware"><span xml:lang="en"
lang="en">Freeware</span> (беÑплаÑнÑе пÑогÑаммÑ)</a>”
| “<a
-href="#GiveAwaySoftware"> <span xml:lang="en" lang="en">Give Away
+href="#GiveAwaySoftware"><span xml:lang="en" lang="en">Give Away
Software</span> (ÑаздаваÑÑ Ð¿ÑогÑаммÑ)</a>” | “ <a
href="#Hacker"><span xml:lang="en" lang="en">Hacker</span>
-(Ñ
акеÑ)</a>” | “<a href="#IntellectualProperty"> <span
+(Ñ
акеÑ)</a>” | “<a href="#IntellectualProperty"><span
xml:lang="en" lang="en">Intellectual Property</span>
(инÑеллекÑÑалÑнаÑ
-ÑобÑÑвенноÑÑÑ)</a>” | “<a href="#LAMP"> <span
xml:lang="en"
+ÑобÑÑвенноÑÑÑ)</a>” | “<a href="#LAMP"><span
xml:lang="en"
lang="en">LAMP System</span> (ÑиÑÑема LAMP)</a>” | “<a
-href="#Linux"> <span xml:lang="en" lang="en">Linux System</span>
(ÑиÑÑема
-Linux)</a>” | “<a href="#Market"> <span xml:lang="en"
-lang="en">Market</span> (ÑÑнок)</a>” | “<a href="#Monetize">
-<span xml:lang="en" lang="en">Monetize</span> (ÑеализовÑваÑÑ,
обÑаÑаÑÑ Ð²
-денÑги)</a>” | “<a href="#MP3Player"> <span xml:lang="en"
-lang="en">MP3 Player</span> (пÑоигÑÑваÑÐµÐ»Ñ MP3)</a>” |
“<a
-href="#Open"> <span xml:lang="en" lang="en">Open</span>
-(оÑкÑÑÑÑй)</a>” | “<a href="#PC"><span xml:lang="en"
-lang="en">PC</span> (ÐÐ)</a>” | “<a href="#Photoshop"> <span
-xml:lang="en" lang="en">Photoshop</span></a>” | “<a
-href="#Piracy"> <span xml:lang="en" lang="en">Piracy</span>
-(пиÑаÑÑÑво)</a>” | “<a href="#PowerPoint"> <span
xml:lang="en"
-lang="en">PowerPoint</span></a>” | “<a href="#Protection"> <span
+href="#Linux"><span xml:lang="en" lang="en">Linux System</span> (ÑиÑÑема
+Linux)</a>” | “<a href="#Market"><span xml:lang="en"
+lang="en">Market</span> (ÑÑнок)</a>” | “<a
+href="#Monetize"><span xml:lang="en" lang="en">Monetize</span>
+(ÑеализовÑваÑÑ, обÑаÑаÑÑ Ð² денÑги)</a>” |
“<a
+href="#MP3Player"><span xml:lang="en" lang="en">MP3 Player</span>
+(пÑоигÑÑваÑÐµÐ»Ñ MP3)</a>” | “<a href="#Open"><span
xml:lang="en"
+lang="en">Open</span> (оÑкÑÑÑÑй)</a>” | “<a
href="#PC"><span
+xml:lang="en" lang="en">PC</span> (ÐÐ)</a>” | “<a
+href="#Photoshop"> <span xml:lang="en" lang="en">Photoshop</span></a>”
+| “<a href="#Piracy"><span xml:lang="en" lang="en">Piracy</span>
+(пиÑаÑÑÑво)</a>” | “<a href="#PowerPoint"><span
xml:lang="en"
+lang="en">PowerPoint</span></a>” | “<a href="#Protection"><span
xml:lang="en" lang="en">Protection</span> (заÑиÑа)</a>” | “<a
href="#RAND"><span xml:lang="en" lang="en">RAND</span></a>” | “
<a href="#SellSoftware"> <span xml:lang="en" lang="en">Sell Software</span>
@@ -105,9 +105,9 @@
<h4 id="BSD-style">“<span xml:lang="en" lang="en">BSD-style</span> (в
ÑÑиле BSD)”</h4>
<p>
ÐÑÑажение “лиÑÐµÐ½Ð·Ð¸Ñ Ð² ÑÑиле BSD”
пÑÐ¸Ð²Ð¾Ð´Ð¸Ñ Ðº пÑÑаниÑе, поÑÐ¾Ð¼Ñ ÑÑо
-она <a href="/philosophy/bsd.html"> ÑÐ²Ð°Ð»Ð¸Ð²Ð°ÐµÑ Ð² кÑÑÑ
лиÑензии, Ñ ÐºÐ¾ÑоÑÑÑ
-еÑÑÑ Ð²Ð°Ð¶Ð½Ñе ÑазлиÑиÑ</a>. ÐапÑимеÑ,
пеÑвонаÑалÑÐ½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ BSD Ñ Ð¿ÑнкÑом о
-Ñекламе неÑовмеÑÑима Ñо СÑандаÑÑной
обÑеÑÑвенной лиÑензией GNU, а
+она <a href="/philosophy/bsd.html"> ÑÐ²Ð°Ð»Ð¸Ð²Ð°ÐµÑ Ð² Ð¾Ð´Ð½Ñ ÐºÑÑÑ
лиÑензии, Ñ
+коÑоÑÑÑ
еÑÑÑ Ð²Ð°Ð¶Ð½Ñе ÑазлиÑиÑ</a>. ÐапÑимеÑ,
пеÑвонаÑалÑÐ½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ BSD Ñ
+пÑнкÑом о Ñекламе неÑовмеÑÑима Ñо
СÑандаÑÑной обÑеÑÑвенной лиÑензией GNU, а
пеÑеÑмоÑÑÐµÐ½Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ BSD ÑовмеÑÑима Ñ
GPL.</p>
<p>
ЧÑÐ¾Ð±Ñ Ð¸Ð·Ð±ÐµÐ¶Ð°ÑÑ Ð¿ÑÑаниÑÑ, лÑÑÑе вÑего
назÑваÑÑ <a
@@ -125,8 +125,7 @@
ÑÑаÑелÑно избегаем говоÑиÑÑ Ñо, ÑÑо
пооÑÑÑло Ð±Ñ Ð»Ñдей ÑваливаÑÑ Ð½Ð°Ñ Ñ Ð½Ð¸Ð¼Ð¸
в Ð¾Ð´Ð½Ñ ÐºÑÑÑ. ÐапÑимеÑ, Ð¼Ñ Ð¸Ð·Ð±ÐµÐ³Ð°ÐµÐ¼
опиÑÐ°Ð½Ð¸Ñ Ð½ÐµÑвободнÑÑ
пÑогÑамм как
“закÑÑÑÑÑ
”. ÐÑ Ð½Ð°Ð·Ñваем иÑ
“<a
-href="/philosophy/categories.html#ProprietarySoftware">
-неÑвободнÑми</a>”.</p>
+href="/philosophy/categories.html#ProprietarySoftware">неÑвободнÑми</a>”.</p>
<h4 id="CloudComputing">“<span xml:lang="en" lang="en">Cloud
Computing</span> (облаÑнÑе
@@ -680,7 +679,7 @@
пÑепÑÑÑÑвие. Так ÑÑо Ð¼Ñ Ð¼Ð¾Ð³Ð»Ð¸ Ð±Ñ Ð½Ð°Ð·Ð²Ð°ÑÑ
ÑÑÑ Ð²ÑеднÑÑ Ð¾ÑобенноÑÑÑ
“пÑепÑÑÑÑвием копиÑованиѓ. ЧаÑе ÑÑо
назÑваеÑÑÑ ÑиÑÑовÑм
ÑпÑавлением огÑаниÑениÑми (DRM) — Ñм.
ÑÐ°Ð¹Ñ ÐºÐ°Ð¼Ð¿Ð°Ð½Ð¸Ð¸ “<a
-href="http://DefectiveByDesign.org"> ÐеÑекÑ
гаÑанÑиÑован</a>”.</p>
+href="http://DefectiveByDesign.org">ÐеÑекÑ
гаÑанÑиÑован</a>”.</p>
<h4 id="RAND">“<span xml:lang="en" lang="en">RAND (Reasonable and
Non-Discriminatory)</span> (обоÑнованнÑй и
недиÑкÑиминаÑионнÑй)”</h4>
@@ -725,7 +724,7 @@
пÑогÑаммѓ, в завиÑимоÑÑи Ð¾Ñ Ñого, ÑÑо
Ð²Ñ Ð¸Ð¼ÐµÐµÑе в видÑ.</p>
<p>
ÐалÑнейÑее обÑÑждение пÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ñм. в
ÑÑаÑÑе “<a
-href="/philosophy/selling.html"> ÐÑодажа ÑвободнÑÑ
пÑогÑамм</a>”.</p>
+href="/philosophy/selling.html">ÐÑодажа ÑвободнÑÑ
пÑогÑамм</a>”.</p>
<h4 id="SoftwareIndustry">“<span xml:lang="en" lang="en">Software
Industry</span> (пÑогÑаммнаÑ
@@ -880,7 +879,7 @@
<!-- timestamp start -->
Ðбновлено:
-$Date: 2012/11/22 04:27:23 $
+$Date: 2012/11/22 05:28:59 $
<!-- timestamp end -->
</p>
Index: po/words-to-avoid.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ru-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/words-to-avoid.ru-en.html 22 Nov 2012 04:27:24 -0000 1.1
+++ po/words-to-avoid.ru-en.html 22 Nov 2012 05:28:59 -0000 1.2
@@ -803,7 +803,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2012/11/22 04:27:24 $
+$Date: 2012/11/22 05:28:59 $
<!-- timestamp end -->
</p>
</div>
Index: po/words-to-avoid.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ru.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/words-to-avoid.ru.po 22 Nov 2012 04:52:14 -0000 1.2
+++ po/words-to-avoid.ru.po 22 Nov 2012 05:28:59 -0000 1.3
@@ -86,19 +86,19 @@
"\"#Alternative\"><span xml:lang=\"en\" lang=\"en\">Alternative</span> "
"(алÑÑеÑнаÑивнÑй)</a>” | “<a
href=\"#BSD-style\"><span xml:lang="
"\"en\" lang=\"en\">BSD-style</span> (в ÑÑиле BSD)</a>” |
“<a "
-"href=\"#Closed\"><span xml:lang=\"en\" lang=\"en\">Closed</span>
(закÑÑÑÑй)"
-"</a>” | “<a href=\"#CloudComputing\"><span xml:lang=\"en\" lang="
+"href=\"#Closed\"><span xml:lang=\"en\" lang=\"en\">Closed</span>
(закÑÑÑÑй)</"
+"a>” | “<a href=\"#CloudComputing\"><span xml:lang=\"en\" lang="
"\"en\">Cloud Computing</span> (облаÑнÑе
вÑÑиÑлениÑ)</a>” | “<a "
"href=\"#Commercial\"><span xml:lang=\"en\" lang=\"en\">Commercial</span> "
"(коммеÑÑеÑкий)</a>” | “<a
href=\"#Compensation\"><span xml:lang="
"\"en\" lang=\"en\">Compensation</span> (компенÑаÑиÑ)</a>” |
“<a "
"href=\"#Consume\"><span xml:lang=\"en\" lang=\"en\">Consume</span> "
-"(поÑÑеблÑÑÑ)</a>” | “<a href=\"#Consumer\"><span
xml:lang=\"en"
-"\" lang=\"en\">Consumer</span> (поÑÑебиÑелÑ)</a>” |
“<a href="
+"(поÑÑеблÑÑÑ)</a>” | “<a href=\"#Consumer\"><span
xml:lang=\"en\" "
+"lang=\"en\">Consumer</span> (поÑÑебиÑелÑ)</a>” | “<a
href="
"\"#Content\"><span xml:lang=\"en\" lang=\"en\">Content</span>
(конÑенÑ)</"
"a>” | “<a href=\"#Creator\"><span xml:lang=\"en\" lang=\"en"
-"\">Creator</span> (ÑоздаÑелÑ)</a>” | “<a
href=\"#DigitalGoods\">"
-"<span xml:lang=\"en\" lang=\"en\">Digital Goods</span> (ÑиÑÑовÑе
ÑоваÑÑ)</"
+"\">Creator</span> (ÑоздаÑелÑ)</a>” | “<a
href=\"#DigitalGoods"
+"\"><span xml:lang=\"en\" lang=\"en\">Digital Goods</span> (ÑиÑÑовÑе
ÑоваÑÑ)</"
"a>” | “<a href=\"#DigitalLocks\"><span xml:lang=\"en\" lang=\"en"
"\">Digital Locks</span> (ÑиÑÑовÑе замки)</a>” | “<a
href="
"\"#DigitalRightsManagement\"><span xml:lang=\"en\" lang=\"en\">Digital "
@@ -118,17 +118,17 @@
"System</span> (ÑиÑÑема LAMP)</a>” | “<a
href=\"#Linux\"><span "
"xml:lang=\"en\" lang=\"en\">Linux System</span> (ÑиÑÑема
Linux)</a>” | "
"“<a href=\"#Market\"><span xml:lang=\"en\" lang=\"en\">Market</span> "
-"(ÑÑнок)</a>” | “<a href=\"#Monetize\"><span xml:lang=\"en\" "
-"lang=\"en\">Monetize</span> (ÑеализовÑваÑÑ, обÑаÑаÑÑ Ð²
денÑги)</a>” | "
+"(ÑÑнок)</a>” | “<a href=\"#Monetize\"><span xml:lang=\"en\"
lang="
+"\"en\">Monetize</span> (ÑеализовÑваÑÑ, обÑаÑаÑÑ Ð²
денÑги)</a>” | "
"“<a href=\"#MP3Player\"><span xml:lang=\"en\" lang=\"en\">MP3 Player</"
"span> (пÑоигÑÑваÑÐµÐ»Ñ MP3)</a>” | “<a
href=\"#Open\"><span xml:"
"lang=\"en\" lang=\"en\">Open</span> (оÑкÑÑÑÑй)</a>” | “<a
href="
"\"#PC\"><span xml:lang=\"en\" lang=\"en\">PC</span> (ÐÐ)</a>” |
“"
"<a href=\"#Photoshop\"> <span xml:lang=\"en\" lang=\"en\">Photoshop</span></"
"a>” | “<a href=\"#Piracy\"><span xml:lang=\"en\" lang=\"en"
-"\">Piracy</span> (пиÑаÑÑÑво)</a>” | “<a
href=\"#PowerPoint\">"
-"<span xml:lang=\"en\" lang=\"en\">PowerPoint</span></a>” | “<a "
-"href=\"#Protection\"><span xml:lang=\"en\" lang=\"en\">Protection</span> "
+"\">Piracy</span> (пиÑаÑÑÑво)</a>” | “<a
href=\"#PowerPoint"
+"\"><span xml:lang=\"en\" lang=\"en\">PowerPoint</span></a>” | “"
+"<a href=\"#Protection\"><span xml:lang=\"en\" lang=\"en\">Protection</span> "
"(заÑиÑа)</a>” | “<a href=\"#RAND\"><span xml:lang=\"en\"
lang="
"\"en\">RAND</span></a>” | “ <a href=\"#SellSoftware\"> <span xml:"
"lang=\"en\" lang=\"en\">Sell Software</span> (пÑодаваÑÑ
пÑогÑаммÑ)</"
@@ -184,9 +184,9 @@
"the revised BSD license is compatible with the GPL."
msgstr ""
"ÐÑÑажение “лиÑÐµÐ½Ð·Ð¸Ñ Ð² ÑÑиле BSD”
пÑÐ¸Ð²Ð¾Ð´Ð¸Ñ Ðº пÑÑаниÑе, поÑÐ¾Ð¼Ñ ÑÑо "
-"она <a href=\"/philosophy/bsd.html\"> ÑÐ²Ð°Ð»Ð¸Ð²Ð°ÐµÑ Ð² однÑ
кÑÑÑ Ð»Ð¸Ñензии, Ñ ÐºÐ¾ÑоÑÑÑ
"
-"еÑÑÑ Ð²Ð°Ð¶Ð½Ñе ÑазлиÑиÑ</a>. ÐапÑимеÑ,
пеÑвонаÑалÑÐ½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ BSD Ñ Ð¿ÑнкÑом о "
-"Ñекламе неÑовмеÑÑима Ñо СÑандаÑÑной
обÑеÑÑвенной лиÑензией GNU, а "
+"она <a href=\"/philosophy/bsd.html\"> ÑÐ²Ð°Ð»Ð¸Ð²Ð°ÐµÑ Ð² однÑ
кÑÑÑ Ð»Ð¸Ñензии, Ñ "
+"коÑоÑÑÑ
еÑÑÑ Ð²Ð°Ð¶Ð½Ñе ÑазлиÑиÑ</a>. ÐапÑимеÑ,
пеÑвонаÑалÑÐ½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ BSD Ñ "
+"пÑнкÑом о Ñекламе неÑовмеÑÑима Ñо
СÑандаÑÑной обÑеÑÑвенной лиÑензией GNU, а "
"пеÑеÑмоÑÑÐµÐ½Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ BSD ÑовмеÑÑима Ñ
GPL."
#. type: Content of: <p>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy words-to-avoid.ru.html po/words-...,
GNUN <=