[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy words-to-avoid.ru.html words-to-...
From: |
GNUN |
Subject: |
www/philosophy words-to-avoid.ru.html words-to-... |
Date: |
Tue, 1 Aug 2017 03:32:28 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 17/08/01 03:32:28
Modified files:
philosophy : words-to-avoid.ru.html words-to-avoid.sq.html
philosophy/po : words-to-avoid.ru-en.html words-to-avoid.ru.po
words-to-avoid.sq-diff.html
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.87&r2=1.88
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.sq.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru-en.html?cvsroot=www&r1=1.72&r2=1.73
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru.po?cvsroot=www&r1=1.194&r2=1.195
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.sq-diff.html?cvsroot=www&r1=1.1&r2=1.2
Patches:
Index: words-to-avoid.ru.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.ru.html,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- words-to-avoid.ru.html 20 Mar 2017 18:31:11 -0000 1.87
+++ words-to-avoid.ru.html 1 Aug 2017 07:32:28 -0000 1.88
@@ -111,6 +111,8 @@
(пиÑаÑÑÑво)</a>” | <!-- GNUN-SORT-NEXT-ITEM -->
“<a href="#PowerPoint"><span xml:lang="en"
lang="en">PowerPoint</span></a>” | <!-- GNUN-SORT-NEXT-ITEM -->
+“<a href="#Product"><span xml:lang="en" lang="en">Product</span>
+(пÑодÑкÑ)</a>” | <!-- GNUN-SORT-NEXT-ITEM -->
“<a href="#Protection"><span xml:lang="en" lang="en">Protection</span>
(заÑиÑа)</a>” | <!-- GNUN-SORT-NEXT-ITEM -->
“<a href="#RAND"><span xml:lang="en" lang="en">RAND</span></a>”
@@ -184,6 +186,12 @@
Ñом оÑобом ÑлÑÑае, когда Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ
Ñже еÑÑÑ ÐºÐ¾Ð¿Ð¸Ñ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð²
неиÑÑ
одной ÑоÑме.</p>
+<blockquote><p>ÐмеÑÑо “когда пÑогÑаммÑ
ÑвободнÑ, Ñ Ð¿Ñблики еÑÑÑ Ð´Ð¾ÑÑÑп к ним”
+Ð¼Ñ Ð¿Ð¾Ð»ÑзÑемÑÑ Ð²ÑÑажениÑми “когда
пÑогÑÐ°Ð¼Ð¼Ñ ÑвободнÑ, Ñ Ð¿Ð¾Ð»ÑзоваÑелей
+еÑÑÑ Ð²Ð°Ð¶Ð½ÐµÐ¹Ñие Ñвободє или “когда
пÑогÑÐ°Ð¼Ð¼Ñ ÑвободнÑ, Ñ
+полÑзоваÑелей еÑÑÑ ÐºÐ¾Ð½ÑÑÐ¾Ð»Ñ Ð½Ð°Ð´ Ñем, ÑÑо
пÑогÑамма Ð´ÐµÐ»Ð°ÐµÑ Ð´Ð»Ñ Ð½Ð¸Ñ
”.</p>
+</blockquote>
+
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
<h3 id="Ad-blocker">“<a href="#Ad-blocker"><span xml:lang="en"
lang="en">Ad-blocker</span>
@@ -751,6 +759,9 @@
еÑли Ð²Ñ Ñ
оÑиÑе показаÑÑ, ÑÑо оÑÑÑаиваеÑе
ÑвободÑ, не полÑзÑйÑеÑÑ Ð½ÐµÐ¹ÑÑалÑнÑм
вÑÑажением.</p>
+<blockquote><p>ÐмеÑÑо “FOSS” Ð¼Ñ Ð³Ð¾Ð²Ð¾Ñим
“ÑвободнÑе пÑогÑаммє.</p>
+</blockquote>
+
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
<h3 id="FreelyAvailable">“<span xml:lang="en" lang="en">Freely
Available</span> (Ñвободно
@@ -966,16 +977,18 @@
<!-- GNUN-SORT-END-KEY -->
<p>
+
+<!-- The MP3 patents will reportedly expire by 2018. -->
РконÑе девÑноÑÑÑÑ
годов XX века ÑÑало
возможнÑм пÑоизводÑÑво
поÑÑаÑивнÑÑ
ÑвеÑдоÑелÑнÑÑ
ÑиÑÑовÑÑ
пÑоигÑÑваÑелей звÑка. ÐолÑÑинÑÑво из ниÑ
-поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ ÐºÐ¾Ð´ÐµÐº MP3, но не вÑе. ÐекоÑоÑÑе
поддеÑживаÑÑ ÑвободнÑе оÑ
-паÑенÑов звÑковÑе кодеки Ðгг ÐоÑÐ±Ð¸Ñ Ð¸ FLAC и
могÑÑ Ð´Ð°Ð¶Ðµ вообÑе не
-поддеÑживаÑÑ ÑÐ°Ð¹Ð»Ñ Ð² ÑоÑмаÑе MP3, как Ñаз
ÑÑÐ¾Ð±Ñ Ð¸Ð·Ð±ÐµÐ¶Ð°ÑÑ ÑÑиÑ
паÑенÑов. ÐÑли
-назÑваÑÑ ÑÑи пÑоигÑÑваÑели
“пÑоигÑÑваÑелÑми MP3”, Ñо ÑÑо не
-ÑолÑко вноÑÐ¸Ñ Ð¿ÑÑаниÑÑ, но и ÑÑÐ°Ð²Ð¸Ñ Ð²
пÑивилегиÑованное положение ÑÐ¾Ñ ÑамÑй
-MP3, Ð¾Ñ ÐºÐ¾ÑоÑого Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¾ÑказаÑÑÑÑ. ÐÑ
пÑедлагаем вÑÑажение
-“ÑиÑÑовой пÑоигÑÑваÑÐµÐ»Ñ Ð·Ð²Ñка” или
пÑоÑÑо “пÑоигÑÑваÑелÑ
-звÑка”, еÑли ÑÑо допÑÑÐºÐ°ÐµÑ ÐºÐ¾Ð½ÑекÑÑ.</p>
+поддеÑживало кодек MP3, но не вÑе. ÐекоÑоÑÑе
пÑоигÑÑваÑели поддеÑживаÑÑ
+ÑвободнÑе Ð¾Ñ Ð¿Ð°ÑенÑов звÑковÑе кодеки Ðгг
ÐоÑÐ±Ð¸Ñ Ð¸ FLAC и могÑÑ Ð´Ð°Ð¶Ðµ вообÑе
+не поддеÑживаÑÑ ÑÐ°Ð¹Ð»Ñ Ð² ÑоÑмаÑе MP3, как Ñаз
ÑÑÐ¾Ð±Ñ Ð¸Ð·Ð±ÐµÐ¶Ð°ÑÑ ÑÑиÑ
+паÑенÑов. ÐÑли назÑваÑÑ ÑÑи пÑоигÑÑваÑели
“пÑоигÑÑваÑелÑми MP3”,
+Ñо ÑÑо не ÑолÑко вноÑÐ¸Ñ Ð¿ÑÑаниÑÑ, но и
ÑÑÐ°Ð²Ð¸Ñ Ð² пÑивилегиÑованное положение
+ÑÐ¾Ñ ÑамÑй ÑоÑÐ¼Ð°Ñ MP3, Ð¾Ñ ÐºÐ¾ÑоÑого Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ
оÑказаÑÑÑÑ. ÐÑ Ð¿Ñедлагаем
+вÑÑажение “ÑиÑÑовой пÑоигÑÑваÑелÑ
звÑка” или пÑоÑÑо
+“пÑоигÑÑваÑÐµÐ»Ñ Ð·Ð²Ñка”, когда ÑÑо и
Ñак ÑÑно.</p>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -997,6 +1010,11 @@
пÑогÑаммаÑ
или наÑиÑ
взглÑдаÑ
— ÑÑо
пÑÐ¸Ð²Ð¾Ð´Ð¸Ñ Ðº ÑомÑ, ÑÑо лÑди
дÑмаÑÑ, бÑдÑо иÑ
и наÑи взглÑÐ´Ñ ÑÑ
однÑ.</p>
+<blockquote>
+<p>ÐмеÑÑо “оÑкÑÑÑого иÑÑ
одного
ÑекÑÑа” Ð¼Ñ Ð³Ð¾Ð²Ð¾Ñим “ÑвободнÑе
+пÑогÑаммє</p>
+</blockquote>
+
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
<h3 id="PC">“<span xml:lang="en" lang="en">PC</span> (ÐÐ)”</h3>
@@ -1069,8 +1087,24 @@
докладов. “PowerPoint” — ÑÑо ÑолÑко
название одной
конкÑеÑной неÑвободной пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð»Ñ
ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð´Ð¾ÐºÐ»Ð°Ð´Ð¾Ð². Ð ÑелÑÑ
ÑобÑÑвенной
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð²Ð°Ð¼ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð³Ð¾Ñовки ÑвоиÑ
докладов
ÑледÑÐµÑ Ð¿ÑименÑÑÑ ÑолÑко ÑвободнÑе
-пÑогÑаммÑ. РекомендÑÑÑÑÑ Ñакие ваÑианÑÑ,
как клаÑÑ <em>beamer</em> из
-ÑиÑÑÐµÐ¼Ñ TeX или пÑогÑамма Impress из пакеÑа
LibreOffice.org.</p>
+пÑогÑÐ°Ð¼Ð¼Ñ — Ñо еÑÑÑ <em>не PowerPoint</em>. Ð
екомендÑÑÑÑÑ Ñакие
+ваÑианÑÑ, как клаÑÑ <em>beamer</em> из ÑиÑÑÐµÐ¼Ñ TeX
или пÑогÑамма Impress из
+пакеÑа LibreOffice.org.</p>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="Product">“<span xml:lang="en" lang="en">Product</span>
(пÑодÑкÑ)”</h3>
+
+<!-- GNUN-SORT-END-KEY -->
+<p>
+ÐÑли Ð²Ñ Ð³Ð¾Ð²Ð¾ÑиÑе о пÑодÑкÑе, назÑвайÑе его
пÑодÑкÑом ÑколÑко Ñгодно. Ðднако
+когда Ð²Ñ Ð¸Ð¼ÐµÐµÑе в Ð²Ð¸Ð´Ñ ÑÑлÑгÑ, не назÑвайÑе
ее, пожалÑйÑÑа,
+“пÑодÑкÑом”. ÐÑли поÑÑавÑик ÑÑлÑги
назÑÐ²Ð°ÐµÑ ÑÑлÑгÑ
+“пÑодÑкÑом”, ÑвеÑдо наÑÑаивайÑе на
Ñом, ÑÑÐ¾Ð±Ñ Ð½Ð°Ð·ÑваÑÑ ÑÑо
+“ÑÑлÑгой”. ÐÑли поÑÑавÑик ÑÑлÑги
назÑÐ²Ð°ÐµÑ ÐºÐ¾Ð¼Ð¿Ð»ÐµÐºÑ ÑÑлÑг
+“пÑодÑкÑом”, ÑвеÑдо наÑÑаивайÑе на
Ñом, ÑÑÐ¾Ð±Ñ Ð½Ð°Ð·ÑваÑÑ ÑÑо
+“комплекÑом ÑÑлÑг”.
+</p>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -1426,7 +1460,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2017/03/20 18:31:11 $
+$Date: 2017/08/01 07:32:28 $
<!-- timestamp end -->
</p>
Index: words-to-avoid.sq.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.sq.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- words-to-avoid.sq.html 19 May 2017 14:29:08 -0000 1.5
+++ words-to-avoid.sq.html 1 Aug 2017 07:32:28 -0000 1.6
@@ -3,7 +3,7 @@
https://www.gnu.org/philosophy/po/words-to-avoid.sq.po</a>'
--><!--#set var="ORIGINAL_FILE" value="/philosophy/words-to-avoid.html"
--><!--#set var="DIFF_FILE" value="/philosophy/po/words-to-avoid.sq-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2017-03-20" --><!--#set
var="ENGLISH_PAGE" value="/philosophy/words-to-avoid.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2017-03-20" -->
<!--#include virtual="/server/header.sq.html" -->
<!-- Parent-Version: 1.79 -->
@@ -1365,7 +1365,7 @@
<p class="unprintable"><!-- timestamp start -->
U përditësua më:
-$Date: 2017/05/19 14:29:08 $
+$Date: 2017/08/01 07:32:28 $
<!-- 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.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- po/words-to-avoid.ru-en.html 20 Mar 2017 18:31:12 -0000 1.72
+++ po/words-to-avoid.ru-en.html 1 Aug 2017 07:32:28 -0000 1.73
@@ -94,6 +94,8 @@
|<span class="gnun-split"></span><!-- GNUN-SORT-NEXT-ITEM --> “<a
href="#PowerPoint">PowerPoint</a>”
|<span class="gnun-split"></span><!-- GNUN-SORT-NEXT-ITEM --> “<a
+ href="#Product">Product</a>”
+|<span class="gnun-split"></span><!-- GNUN-SORT-NEXT-ITEM --> “<a
href="#Protection">Protection</a>”
|<span class="gnun-split"></span><!-- GNUN-SORT-NEXT-ITEM --> “<a
href="#RAND">RAND</a>”
@@ -171,6 +173,13 @@
applies to the special case in which the user already has a copy of
the program in non-source form.</p>
+<blockquote><p>Instead of <b>with free software,
+the public has access to the program</b>,
+we say, <b>with free software, the users have the essential
+freedoms</b> and <b>with free software, the users have control
+of what the program does for them</b>.</p>
+</blockquote>
+
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
<h3 id="Alternative">“Alternative”</h3>
@@ -684,6 +693,10 @@
neutrality is your goal, “FLOSS” is better. But if you
want to show you stand for freedom, don't use a neutral term.</p>
+<blockquote><p>Instead of <b>FOSS</b>,
+we say, <b>free software</b> or <b>free (libre) software</b>.</p>
+</blockquote>
+
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
<h3 id="FreelyAvailable">“Freely available”</h3>
@@ -873,14 +886,16 @@
<h3 id="MP3Player">“MP3 Player”</h3>
<!-- GNUN-SORT-END-KEY -->
<p>
+<!-- The MP3 patents will reportedly expire by 2018. -->
+
In the late 1990s it became feasible to make portable, solid-state
-digital audio players. Most support the patented MP3 codec, but not
-all. Some support the patent-free audio codecs Ogg Vorbis and FLAC,
-and may not even support MP3-encoded files at all, precisely to avoid
-these patents. To call such players “MP3 players” is not
-only confusing, it also privileges the MP3 that we ought to reject.
-We suggest the terms “digital audio player,”
-or simply “audio player” if context permits.</p>
+digital audio players. Most supported the patented MP3 codec, but not
+all. Some players support the patent-free audio codecs Ogg Vorbis and
+FLAC, and may not even support MP3-encoded files at all, precisely to
+avoid these patents. To call such players “MP3 players”
+is not only confusing, it also privileges the MP3 format that we ought
+to reject. We suggest the terms “digital audio player,”
+or simply “audio player” when that's clear enough.</p>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -900,6 +915,11 @@
software, or our views—that leads people to suppose our views
are similar to theirs.</p>
+<blockquote>
+<p>Instead of <b>open source</b>,
+we say, <b>free software</b> or <b>free (libre) software</b>.</p>
+</blockquote>
+
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
<h3 id="PC">“PC”</h3>
@@ -962,8 +982,23 @@
of slide presentation. “PowerPoint” is just the name of
one particular proprietary program to make presentations. For your
freedom's sake, you should use only free software to make your
-presentations. Recommended options include TeX's <tt>beamer</tt>
-class and LibreOffice.org's Impress.</p>
+presentations—which means, <em>not PowerPoint</em>. Recommended
+options include TeX's <tt>beamer</tt> class and LibreOffice.org's
+Impress.</p>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 id="Product">“Product”</h3>
+<!-- GNUN-SORT-END-KEY -->
+<p>
+If you're talking about a product, by all means call it that.
+However, when referring to a service, please do not call it a
+“product.” If a service provider calls the service a
+“product,” please firmly insist on calling it a
+“service.” If a service provider calls a package deal a
+“product,” please firmly insist on calling it a
+“deal.”
+</p>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -1281,7 +1316,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2017/03/20 18:31:12 $
+$Date: 2017/08/01 07:32:28 $
<!-- 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.194
retrieving revision 1.195
diff -u -b -r1.194 -r1.195
--- po/words-to-avoid.ru.po 1 Aug 2017 05:03:49 -0000 1.194
+++ po/words-to-avoid.ru.po 1 Aug 2017 07:32:28 -0000 1.195
@@ -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: 2017-08-01 04:26+0000\n"
#. type: Content of: <title>
msgid ""
@@ -318,13 +317,10 @@
#. GNUN-SORT-NEXT-ITEM
#. type: Content of: <p>
-# | “<a [-href=\"#Protection\">Protection</a>”-]
-# | {+href=\"#Product\">Product</a>”+} |
-#| msgid "“<a href=\"#Protection\">Protection</a>” |"
msgid "“<a href=\"#Product\">Product</a>” |"
msgstr ""
-"“<a href=\"#Product\"><span xml:lang=\"en\" lang=\"en\">Product</"
-"span> (пÑодÑкÑ)</a>” |"
+"“<a href=\"#Product\"><span xml:lang=\"en\" lang=\"en\">Product</span> "
+"(пÑодÑкÑ)</a>” |"
#. GNUN-SORT-NEXT-ITEM
#. type: Content of: <p>
@@ -512,9 +508,9 @@
"them</b>."
msgstr ""
"ÐмеÑÑо “когда пÑогÑÐ°Ð¼Ð¼Ñ ÑвободнÑ, Ñ
пÑблики еÑÑÑ Ð´Ð¾ÑÑÑп к ним” "
-"Ð¼Ñ Ð¿Ð¾Ð»ÑзÑемÑÑ Ð²ÑÑажениÑми “когда
пÑогÑÐ°Ð¼Ð¼Ñ ÑвободнÑ, Ñ Ð¿Ð¾Ð»ÑзоваÑелей еÑÑÑ
важнейÑие "
-"Ñвободє или “когда пÑогÑаммÑ
ÑвободнÑ, Ñ Ð¿Ð¾Ð»ÑзоваÑелей еÑÑÑ "
-"конÑÑÐ¾Ð»Ñ Ð½Ð°Ð´ Ñем, ÑÑо пÑогÑамма Ð´ÐµÐ»Ð°ÐµÑ Ð´Ð»Ñ
ниÑ
”."
+"Ð¼Ñ Ð¿Ð¾Ð»ÑзÑемÑÑ Ð²ÑÑажениÑми “когда
пÑогÑÐ°Ð¼Ð¼Ñ ÑвободнÑ, Ñ Ð¿Ð¾Ð»ÑзоваÑелей "
+"еÑÑÑ Ð²Ð°Ð¶Ð½ÐµÐ¹Ñие Ñвободє или “когда
пÑогÑÐ°Ð¼Ð¼Ñ ÑвободнÑ, Ñ "
+"полÑзоваÑелей еÑÑÑ ÐºÐ¾Ð½ÑÑÐ¾Ð»Ñ Ð½Ð°Ð´ Ñем, ÑÑо
пÑогÑамма Ð´ÐµÐ»Ð°ÐµÑ Ð´Ð»Ñ Ð½Ð¸Ñ
”."
#. type: Content of: <h3>
msgid "“Alternative”"
@@ -1838,24 +1834,6 @@
#. The MP3 patents will reportedly expire by 2018.
#. type: Content of: <p>
-# | In the late 1990s it became feasible to make portable, solid-state digital
-# | audio players. Most [-support-] {+supported+} the patented MP3 codec, but
-# | not all. Some {+players+} support the patent-free audio codecs Ogg Vorbis
-# | and FLAC, and may not even support MP3-encoded files at all, precisely to
-# | avoid these patents. To call such players “MP3 players” is
-# | not only confusing, it also privileges the MP3 {+format+} that we ought to
-# | reject. We suggest the terms “digital audio player,” or
-# | simply “audio player” [-if context permits.-] {+when that's
-# | clear enough.+}
-#| msgid ""
-#| "In the late 1990s it became feasible to make portable, solid-state "
-#| "digital audio players. Most support the patented MP3 codec, but not all. "
-#| "Some support the patent-free audio codecs Ogg Vorbis and FLAC, and may "
-#| "not even support MP3-encoded files at all, precisely to avoid these "
-#| "patents. To call such players “MP3 players” is not only "
-#| "confusing, it also privileges the MP3 that we ought to reject. We "
-#| "suggest the terms “digital audio player,” or simply “"
-#| "audio player” if context permits."
msgid ""
"In the late 1990s it became feasible to make portable, solid-state digital "
"audio players. Most supported the patented MP3 codec, but not all. Some "
@@ -1868,10 +1846,10 @@
msgstr ""
"РконÑе девÑноÑÑÑÑ
годов XX века ÑÑало
возможнÑм пÑоизводÑÑво "
"поÑÑаÑивнÑÑ
ÑвеÑдоÑелÑнÑÑ
ÑиÑÑовÑÑ
пÑоигÑÑваÑелей звÑка. ÐолÑÑинÑÑво из ниÑ
"
-"поддеÑживало кодек MP3, но не вÑе. ÐекоÑоÑÑе
пÑоигÑÑваÑели поддеÑживаÑÑ ÑвободнÑе Ð¾Ñ "
-"паÑенÑов звÑковÑе кодеки Ðгг ÐоÑÐ±Ð¸Ñ Ð¸ FLAC и
могÑÑ Ð´Ð°Ð¶Ðµ вообÑе не "
-"поддеÑживаÑÑ ÑÐ°Ð¹Ð»Ñ Ð² ÑоÑмаÑе MP3, как Ñаз
ÑÑÐ¾Ð±Ñ Ð¸Ð·Ð±ÐµÐ¶Ð°ÑÑ ÑÑиÑ
паÑенÑов. ÐÑли "
-"назÑваÑÑ ÑÑи пÑоигÑÑваÑели
“пÑоигÑÑваÑелÑми MP3”, Ñо ÑÑо не "
+"поддеÑживало кодек MP3, но не вÑе. ÐекоÑоÑÑе
пÑоигÑÑваÑели поддеÑживаÑÑ "
+"ÑвободнÑе Ð¾Ñ Ð¿Ð°ÑенÑов звÑковÑе кодеки Ðгг
ÐоÑÐ±Ð¸Ñ Ð¸ FLAC и могÑÑ Ð´Ð°Ð¶Ðµ вообÑе "
+"не поддеÑживаÑÑ ÑÐ°Ð¹Ð»Ñ Ð² ÑоÑмаÑе MP3, как Ñаз
ÑÑÐ¾Ð±Ñ Ð¸Ð·Ð±ÐµÐ¶Ð°ÑÑ ÑÑиÑ
паÑенÑов. "
+"ÐÑли назÑваÑÑ ÑÑи пÑоигÑÑваÑели
“пÑоигÑÑваÑелÑми MP3”, Ñо ÑÑо не "
"ÑолÑко вноÑÐ¸Ñ Ð¿ÑÑаниÑÑ, но и ÑÑÐ°Ð²Ð¸Ñ Ð²
пÑивилегиÑованное положение ÑÐ¾Ñ ÑамÑй "
"ÑоÑÐ¼Ð°Ñ MP3, Ð¾Ñ ÐºÐ¾ÑоÑого Ð¼Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ
оÑказаÑÑÑÑ. ÐÑ Ð¿Ñедлагаем вÑÑажение “"
"ÑиÑÑовой пÑоигÑÑваÑÐµÐ»Ñ Ð·Ð²Ñка” или
пÑоÑÑо “пÑоигÑÑваÑÐµÐ»Ñ "
@@ -2020,19 +1998,6 @@
msgstr "“<span xml:lang=\"en\" lang=\"en\">PowerPoint</span>”"
#. type: Content of: <p>
-# | Please avoid using the term “PowerPoint” to mean any kind of
-# | slide presentation. “PowerPoint” is just the name of one
-# | particular proprietary program to make presentations. For your freedom's
-# | sake, you should use only free software to make your [-presentations.-]
-# | {+presentations—which means, <em>not PowerPoint</em>.+} Recommended
-# | options include TeX's <tt>beamer</tt> class and LibreOffice.org's Impress.
-#| msgid ""
-#| "Please avoid using the term “PowerPoint” to mean any kind of "
-#| "slide presentation. “PowerPoint” is just the name of one "
-#| "particular proprietary program to make presentations. For your freedom's "
-#| "sake, you should use only free software to make your presentations. "
-#| "Recommended options include TeX's <tt>beamer</tt> class and LibreOffice."
-#| "org's Impress."
msgid ""
"Please avoid using the term “PowerPoint” to mean any kind of "
"slide presentation. “PowerPoint” is just the name of one "
@@ -2046,13 +2011,10 @@
"— ÑÑо ÑолÑко название одной конкÑеÑной
неÑвободной пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð»Ñ "
"ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð´Ð¾ÐºÐ»Ð°Ð´Ð¾Ð². Ð ÑелÑÑ
ÑобÑÑвенной
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð²Ð°Ð¼ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð³Ð¾Ñовки ÑвоиÑ
"
"докладов ÑледÑÐµÑ Ð¿ÑименÑÑÑ ÑолÑко
ÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ — Ñо еÑÑÑ "
-"<em>не PowerPoint</em>. РекомендÑÑÑÑÑ Ñакие "
-"ваÑианÑÑ, как клаÑÑ <em>beamer</em> из ÑиÑÑÐµÐ¼Ñ TeX
или пÑогÑамма Impress из "
-"пакеÑа LibreOffice.org."
+"<em>не PowerPoint</em>. РекомендÑÑÑÑÑ Ñакие
ваÑианÑÑ, как клаÑÑ <em>beamer</"
+"em> из ÑиÑÑÐµÐ¼Ñ TeX или пÑогÑамма Impress из
пакеÑа LibreOffice.org."
#. type: Content of: <h3>
-# | [-“Protection”-]{+“Product”+}
-#| msgid "“Protection”"
msgid "“Product”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Product</span>
(пÑодÑкÑ)”"
@@ -2067,11 +2029,12 @@
"“deal.”"
msgstr ""
"ÐÑли Ð²Ñ Ð³Ð¾Ð²Ð¾ÑиÑе о пÑодÑкÑе, назÑвайÑе его
пÑодÑкÑом ÑколÑко Ñгодно. Ðднако "
-"когда Ð²Ñ Ð¸Ð¼ÐµÐµÑе в Ð²Ð¸Ð´Ñ ÑÑлÑгÑ, не
назÑвайÑе ее, пожалÑйÑÑа,
“пÑодÑкÑом”. "
-"ÐÑли поÑÑавÑик ÑÑлÑги назÑÐ²Ð°ÐµÑ ÑÑлÑгÑ
“пÑодÑкÑом”, ÑвеÑдо наÑÑаивайÑе "
-"на Ñом, ÑÑÐ¾Ð±Ñ Ð½Ð°Ð·ÑваÑÑ ÑÑо “ÑÑлÑгой”.
ÐÑли поÑÑавÑик ÑÑлÑги "
-"назÑÐ²Ð°ÐµÑ ÐºÐ¾Ð¼Ð¿Ð»ÐµÐºÑ ÑÑлÑг
“пÑодÑкÑом”, ÑвеÑдо наÑÑаивайÑе на
Ñом, "
-"ÑÑÐ¾Ð±Ñ Ð½Ð°Ð·ÑваÑÑ ÑÑо “комплекÑом
ÑÑлÑг”."
+"когда Ð²Ñ Ð¸Ð¼ÐµÐµÑе в Ð²Ð¸Ð´Ñ ÑÑлÑгÑ, не
назÑвайÑе ее, пожалÑйÑÑа, “"
+"пÑодÑкÑом”. ÐÑли поÑÑавÑик ÑÑлÑги
назÑÐ²Ð°ÐµÑ ÑÑлÑÐ³Ñ “"
+"пÑодÑкÑом”, ÑвеÑдо наÑÑаивайÑе на Ñом,
ÑÑÐ¾Ð±Ñ Ð½Ð°Ð·ÑваÑÑ ÑÑо “"
+"ÑÑлÑгой”. ÐÑли поÑÑавÑик ÑÑлÑги
назÑÐ²Ð°ÐµÑ ÐºÐ¾Ð¼Ð¿Ð»ÐµÐºÑ ÑÑлÑг “"
+"пÑодÑкÑом”, ÑвеÑдо наÑÑаивайÑе на Ñом,
ÑÑÐ¾Ð±Ñ Ð½Ð°Ð·ÑваÑÑ ÑÑо “"
+"комплекÑом ÑÑлÑг”."
#. type: Content of: <h3>
msgid "“Protection”"
Index: po/words-to-avoid.sq-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.sq-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/words-to-avoid.sq-diff.html 19 May 2017 14:29:09 -0000 1.1
+++ po/words-to-avoid.sq-diff.html 1 Aug 2017 07:32:28 -0000 1.2
@@ -106,6 +106,8 @@
|<span class="gnun-split"></span><!-- GNUN-SORT-NEXT-ITEM
--> “<a
href="#PowerPoint">PowerPoint</a>”
|<span class="gnun-split"></span><!-- GNUN-SORT-NEXT-ITEM
--> “<a
+ <span
class="inserted"><ins><em>href="#Product">Product</a>”
+|<span class="gnun-split"></span><!-- GNUN-SORT-NEXT-ITEM
--> “<a</em></ins></span>
href="#Protection">Protection</a>”
|<span class="gnun-split"></span><!-- GNUN-SORT-NEXT-ITEM
--> “<a
href="#RAND">RAND</a>”
@@ -183,6 +185,13 @@
applies to the special case in which the user already has a copy of
the program in non-source form.</p>
+<span class="inserted"><ins><em><blockquote><p>Instead of
<b>with free software,
+the public has access to the program</b>,
+we say, <b>with free software, the users have the essential
+freedoms</b> and <b>with free software, the users have control
+of what the program does for them</b>.</p>
+</blockquote></em></ins></span>
+
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
<h3 id="Alternative">“Alternative”</h3>
@@ -696,6 +705,10 @@
neutrality is your goal, “FLOSS” is better. But if you
want to show you stand for freedom, don't use a neutral term.</p>
+<span class="inserted"><ins><em><blockquote><p>Instead of
<b>FOSS</b>,
+we say, <b>free software</b> or <b>free (libre)
software</b>.</p>
+</blockquote></em></ins></span>
+
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
<h3 id="FreelyAvailable">“Freely available”</h3>
@@ -885,14 +898,16 @@
<h3 id="MP3Player">“MP3 Player”</h3>
<!-- GNUN-SORT-END-KEY -->
<p>
+<span class="inserted"><ins><em><!-- The MP3 patents will reportedly expire
by 2018. --></em></ins></span>
+
In the late 1990s it became feasible to make portable, solid-state
-digital audio players. Most support the patented MP3 codec, but not
-all. Some support the patent-free audio codecs Ogg Vorbis and FLAC,
-and may not even support MP3-encoded files at all, precisely to avoid
-these patents. To call such players “MP3 players” is not
-only confusing, it also privileges the MP3 that we ought to reject.
-We suggest the terms “digital audio player,”
-or simply “audio player” if context permits.</p>
+digital audio players. Most <span
class="removed"><del><strong>support</strong></del></span> <span
class="inserted"><ins><em>supported</em></ins></span> the patented MP3 codec,
but not
+all. Some <span class="inserted"><ins><em>players</em></ins></span> support
the patent-free audio codecs Ogg Vorbis and
+FLAC, and may not even support MP3-encoded files at all, precisely to
+avoid these patents. To call such players “MP3 players”
+is not only confusing, it also privileges the MP3 <span
class="inserted"><ins><em>format</em></ins></span> that we ought
+to reject. We suggest the terms “digital audio player,”
+or simply “audio player” <span class="removed"><del><strong>if
context permits.</p></strong></del></span> <span
class="inserted"><ins><em>when that's clear enough.</p></em></ins></span>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
@@ -912,6 +927,11 @@
software, or our views—that leads people to suppose our views
are similar to theirs.</p>
+<span class="inserted"><ins><em><blockquote>
+<p>Instead of <b>open source</b>,
+we say, <b>free software</b> or <b>free (libre)
software</b>.</p>
+</blockquote></em></ins></span>
+
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
<h3 id="PC">“PC”</h3>
@@ -974,12 +994,28 @@
of slide presentation. “PowerPoint” is just the name of
one particular proprietary program to make presentations. For your
freedom's sake, you should use only free software to make your
-presentations. Recommended options include TeX's <tt>beamer</tt>
-class and LibreOffice.org's Impress.</p>
+<span class="removed"><del><strong>presentations.</strong></del></span>
+<span class="inserted"><ins><em>presentations—which means, <em>not
PowerPoint</em>.</em></ins></span> Recommended
+options include TeX's <tt>beamer</tt> class and LibreOffice.org's
+Impress.</p>
+
+<!-- GNUN-SORT-NEXT-ITEM -->
+<!-- GNUN-SORT-BEGIN-KEY -->
+<h3 <span
class="inserted"><ins><em>id="Product">“Product”</h3>
+<!-- GNUN-SORT-END-KEY -->
+<p>
+If you're talking about a product, by all means call it that.
+However, when referring to a service, please do not call it a
+“product.” If a service provider calls the service a
+“product,” please firmly insist on calling it a
+“service.” If a service provider calls a package deal a
+“product,” please firmly insist on calling it a
+“deal.”
+</p>
<!-- GNUN-SORT-NEXT-ITEM -->
<!-- GNUN-SORT-BEGIN-KEY -->
-<h3 id="Protection">“Protection”</h3>
+<h3</em></ins></span> id="Protection">“Protection”</h3>
<!-- GNUN-SORT-END-KEY -->
<p>
Publishers' lawyers love to use the term “protection” to
@@ -1293,7 +1329,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2017/05/19 14:29:09 $
+$Date: 2017/08/01 07:32:28 $
<!-- timestamp end -->
</p>
</div>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy words-to-avoid.ru.html words-to-...,
GNUN <=