[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www philosophy/po/words-to-avoid.ar-diff.html p...
From: |
GNUN |
Subject: |
www philosophy/po/words-to-avoid.ar-diff.html p... |
Date: |
Sat, 06 Jun 2015 09:58:15 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/06/06 09:58:15
Modified files:
philosophy/po : words-to-avoid.ar-diff.html
words-to-avoid.ar.po words-to-avoid.de.po
words-to-avoid.es.po words-to-avoid.fr.po
words-to-avoid.it.po words-to-avoid.ja.po
words-to-avoid.pot words-to-avoid.ru.po
words-to-avoid.sq.po words-to-avoid.sr.po
words-to-avoid.tr.po
software : recent-releases-include.ru.html
software/po : recent-releases-include.ru.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ar-diff.html?cvsroot=www&r1=1.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ar.po?cvsroot=www&r1=1.81&r2=1.82
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.de.po?cvsroot=www&r1=1.120&r2=1.121
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.es.po?cvsroot=www&r1=1.191&r2=1.192
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.fr.po?cvsroot=www&r1=1.194&r2=1.195
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.it.po?cvsroot=www&r1=1.156&r2=1.157
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ja.po?cvsroot=www&r1=1.97&r2=1.98
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.pot?cvsroot=www&r1=1.93&r2=1.94
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru.po?cvsroot=www&r1=1.120&r2=1.121
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.sq.po?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.sr.po?cvsroot=www&r1=1.101&r2=1.102
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.tr.po?cvsroot=www&r1=1.74&r2=1.75
http://web.cvs.savannah.gnu.org/viewcvs/www/software/recent-releases-include.ru.html?cvsroot=www&r1=1.641&r2=1.642
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/recent-releases-include.ru.po?cvsroot=www&r1=1.853&r2=1.854
Patches:
Index: philosophy/po/words-to-avoid.ar-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ar-diff.html,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- philosophy/po/words-to-avoid.ar-diff.html 28 May 2015 17:29:30 -0000
1.53
+++ philosophy/po/words-to-avoid.ar-diff.html 6 Jun 2015 09:58:12 -0000
1.54
@@ -153,7 +153,13 @@
<span class="removed"><del><strong>|</strong></del></span>
<span class="inserted"><ins><em>|<span class="gnun-split"></span>
“<a
href="#SourceModel">Source model</a>”
-|<span class="gnun-split"></span></em></ins></span> “<a
+|<span class="gnun-split"></span><!--#if expr="$LANGUAGE_SUFFIX
= /^.()$/" -->
+<!-- TRANSLATORS: translate if this word is used often in your
+ language to refer to mobile computers; otherwise,
+ fill the translation with a space. -->
+“<a
+ href="#Terminal">Terminal</a>”
+|<span class="gnun-split"></span><!--#endif
--></em></ins></span> “<a
href="#Theft">Theft</a>”
<span class="removed"><del><strong>|</strong></del></span>
<span class="inserted"><ins><em>|<span
class="gnun-split"></span></em></ins></span> “<a
@@ -163,7 +169,9 @@
href="#Vendor">Vendor</a>”
</p>
-<h4 id="Alternative">“Alternative”</h4>
+<span class="removed"><del><strong><h4
id="Alternative">“Alternative”</h4></strong></del></span>
+
+<span class="inserted"><ins><em><h3
id="Alternative">“Alternative”</h3></em></ins></span>
<p>
We don't <span class="removed"><del><strong>present</strong></del></span>
<span class="inserted"><ins><em>describe</em></ins></span> free software as an
<span
class="removed"><del><strong>“alternative”,</strong></del></span>
<span class="inserted"><ins><em>“alternative” to
proprietary,</em></ins></span> because <span class="inserted"><ins><em>that
word presumes all the “alternatives” are
@@ -188,7 +196,9 @@
software.</em></ins></span>
</p>
-<h4 id="BSD-style">“BSD-style”</h4>
+<span class="removed"><del><strong><h4
id="BSD-style">“BSD-style”</h4></strong></del></span>
+
+<span class="inserted"><ins><em><h3
id="BSD-style">“BSD-style”</h3></em></ins></span>
<p>
The expression “BSD-style license” leads to confusion because it
<a href="/philosophy/bsd.html">lumps together licenses that have
@@ -202,7 +212,10 @@
question</a> and avoid the vague term “BSD-style.”</p>
-<h4 id="Closed">“Closed”</h4>
+<span class="removed"><del><strong><h4
id="Closed">“Closed”</h4></strong></del></span>
+
+
+<span class="inserted"><ins><em><h3
id="Closed">“Closed”</h3></em></ins></span>
<p>
Describing nonfree software as “closed” clearly refers to
the term “open <span
class="removed"><del><strong>source”.</strong></del></span> <span
class="inserted"><ins><em>source.”</em></ins></span> In the free
software movement,
@@ -216,7 +229,10 @@
“proprietary”</a>.</p>
-<h4 id="CloudComputing">“Cloud Computing”</h4>
+<span class="removed"><del><strong><h4</strong></del></span>
+
+
+<span class="inserted"><ins><em><h3</em></ins></span>
id="CloudComputing">“Cloud <span
class="removed"><del><strong>Computing”</h4></strong></del></span>
<span class="inserted"><ins><em>Computing”</h3></em></ins></span>
<p>
The term “cloud computing” <span class="inserted"><ins><em>(or
just <a name="Cloud">“cloud”</a>, in the context of
@@ -266,6 +282,8 @@
These <span class="removed"><del><strong>can be</strong></del></span> <span
class="inserted"><ins><em>practices are</em></ins></span> ok under certain
circumstances.
</p>
+<span class="removed"><del><strong><h4
id="Commercial">“Commercial”</h4></strong></del></span>
+
<span class="inserted"><ins><em><p>
Another meaning is accessing your own server from your own mobile device.
That raises no particular ethical issues.
@@ -297,9 +315,9 @@
noted the vacuity of the term “cloud computing.”</a> He
decided to use the term anyway because, as a proprietary software
developer, he isn't motivated by the same ideals as we are.
-</p></em></ins></span>
+</p>
-<h4 id="Commercial">“Commercial”</h4>
+<h3 id="Commercial">“Commercial”</h3></em></ins></span>
<p>
Please don't use “commercial” as a synonym for
“nonfree.” That confuses two entirely different
@@ -326,7 +344,10 @@
to use the word “commercial” in that way.</p>
-<h4 id="Compensation">“Compensation”</h4>
+<span class="removed"><del><strong><h4
id="Compensation">“Compensation”</h4></strong></del></span>
+
+
+<span class="inserted"><ins><em><h3
id="Compensation">“Compensation”</h3></em></ins></span>
<p>
To speak of “compensation for authors” in connection with
copyright carries the assumptions that (1) copyright exists for the
@@ -343,13 +364,16 @@
same publishing companies that are pushing unjust laws on us.
</p>
-<h4 id="Consume">“Consume”</h4>
+<span class="removed"><del><strong><h4
id="Consume">“Consume”</h4></strong></del></span>
+
+<span class="inserted"><ins><em><h3
id="Consume">“Consume”</h3></em></ins></span>
<p>
“Consume” refers to what we do with food: we ingest it, and use it
in
a way that uses it up. By analogy, we employ the same word to describe
using other things in a way that uses them up. However, it is
-erroneous to <span class="removed"><del><strong>speak of
“consuming” digital information, music,
-software, etc., since using them does not consume them.
See</strong></del></span> <span class="inserted"><ins><em>speak of
“consuming” information, music, books,
+<span class="removed"><del><strong>erroneous to speak of
“consuming” digital information, music,
+software, etc., since using them does not consume them.
See</strong></del></span>
+<span class="inserted"><ins><em>erroneous to speak of “consuming”
information, music, books,
software, etc., since using them does not use them up.</p>
<p>Why is this perverse usage spreading? Some may feel that they
@@ -361,7 +385,9 @@
<p>See</em></ins></span> also the following entry.</p>
-<h4 id="Consumer">“Consumer”</h4>
+<span class="removed"><del><strong><h4
id="Consumer">“Consumer”</h4></strong></del></span>
+
+<span class="inserted"><ins><em><h3
id="Consumer">“Consumer”</h3></em></ins></span>
<p>
The term “consumer,” when used to refer to the users of
computing, is loaded with assumptions we should reject. Playing a <span
class="removed"><del><strong>digital</strong></del></span>
@@ -397,15 +423,18 @@
<p>
To describe people who are not limited to passive use of works, we
suggest terms such as “individuals” and
-<span
class="removed"><del><strong>“citizens”.</p></strong></del></span>
+<span class="removed"><del><strong>“citizens”.</p>
+
+
+<h4 id="Content">“Content”</h4></strong></del></span>
<span class="inserted"><ins><em>“citizens” — not
“consumers.”</p>
<p>
The problem with the word “consumer” has
been <a
href="http://www.theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-williams">
noted before</a>.
-</p></em></ins></span>
+</p>
-<h4 id="Content">“Content”</h4>
+<h3 id="Content">“Content”</h3></em></ins></span>
<p>
If you want to describe a feeling of comfort and satisfaction, by all
means say you are “content,” but using the word as a
@@ -445,7 +474,10 @@
system” (WRS).</p>
-<h4 <span
class="inserted"><ins><em>id="CreativeCommonsLicensed">“Creative
Commons licensed”</h4>
+<span class="removed"><del><strong><h4
id="Creator">“Creator”</h4></strong></del></span>
+
+
+<span class="inserted"><ins><em><h3
id="CreativeCommonsLicensed">“Creative Commons
licensed”</h3>
<p>
The most important licensing characteristic of a work is whether it is
free. Creative Commons publishes seven licenses; three are free
@@ -464,7 +496,7 @@
statement.
</p>
-<h4</em></ins></span> id="Creator">“Creator”</h4>
+<h3 id="Creator">“Creator”</h3></em></ins></span>
<p>
The term “creator” as applied to authors implicitly
compares them to a deity (“the creator”). The term is
@@ -477,7 +509,10 @@
author.</p>
-<h4 id="DigitalGoods">“Digital Goods”</h4>
+<span class="removed"><del><strong><h4</strong></del></span>
+
+
+<span class="inserted"><ins><em><h3</em></ins></span>
id="DigitalGoods">“Digital <span
class="removed"><del><strong>Goods”</h4></strong></del></span>
<span class="inserted"><ins><em>Goods”</h3></em></ins></span>
<p>
The term “digital goods,” as applied to copies of works of
authorship, identifies them with physical goods—which cannot be
@@ -488,7 +523,10 @@
shallow and limited values don't include freedom and community.</p>
-<h4 id="DigitalLocks">“Digital Locks”</h4>
+<span class="removed"><del><strong><h4</strong></del></span>
+
+
+<span class="inserted"><ins><em><h3</em></ins></span>
id="DigitalLocks">“Digital <span
class="removed"><del><strong>Locks”</h4></strong></del></span>
<span class="inserted"><ins><em>Locks”</h3></em></ins></span>
<p>
“Digital locks” is used to refer to Digital Restrictions
Management by some who criticize it. The problem with this term is
@@ -519,7 +557,10 @@
replace the term with “digital handcuffs” and say why.</p>
-<h4 id="DigitalRightsManagement">“Digital Rights
Management”</h4>
+<span class="removed"><del><strong><h4</strong></del></span>
+
+
+<span class="inserted"><ins><em><h3</em></ins></span>
id="DigitalRightsManagement">“Digital Rights <span
class="removed"><del><strong>Management”</h4></strong></del></span>
<span class="inserted"><ins><em>Management”</h3></em></ins></span>
<p>
“Digital Rights Management” <span
class="inserted"><ins><em>(abbreviated
“DRM”)</em></ins></span> refers to technical <span
class="removed"><del><strong>schemes</strong></del></span> <span
class="inserted"><ins><em>mechanisms</em></ins></span> designed to impose
@@ -531,11 +572,14 @@
<p>
Good alternatives include “Digital Restrictions
Management,” and “digital handcuffs.”</p>
+
+
+<span class="removed"><del><strong><h4
id="Ecosystem">“Ecosystem”</h4></strong></del></span>
<span class="inserted"><ins><em><p>
Please sign up to support our <a href="http://DefectiveByDesign.org/">
-campaign to abolish DRM</a>.</p></em></ins></span>
+campaign to abolish DRM</a>.</p>
-<h4 id="Ecosystem">“Ecosystem”</h4>
+<h3 id="Ecosystem">“Ecosystem”</h3></em></ins></span>
<p>
It is inadvisable to describe the free software community, or any human
community, as an “ecosystem,” because that word implies
@@ -561,7 +605,10 @@
freedom.
</p>
-<h4 <span
class="inserted"><ins><em>id="FLOSS">“FLOSS”</h4>
+
+<span class="removed"><del><strong><h4</strong></del></span>
+
+<span class="inserted"><ins><em><h3
id="FLOSS">“FLOSS”</h3>
<p>
The term “FLOSS,” meaning “Free/Libre and Open
Source Software,” was coined as a way
@@ -570,7 +617,7 @@
“FLOSS” is the best way to be neutral. But if you want to
show you stand for freedom, don't use a neutral term.</p>
-<h4</em></ins></span> id="ForFree">“For free”</h4>
+<h3</em></ins></span> id="ForFree">“For <span
class="removed"><del><strong>free”</h4></strong></del></span> <span
class="inserted"><ins><em>free”</h3></em></ins></span>
<p>
If you want to say that a program is free software, please don't say
that it is available “for free.” That term specifically
@@ -586,7 +633,10 @@
To avoid confusion, you can say that the program is available
“as free software.”</p>
-<h4 <span
class="inserted"><ins><em>id="FOSS">“FOSS”</h4>
+
+<span class="removed"><del><strong><h4</strong></del></span>
+
+<span class="inserted"><ins><em><h3
id="FOSS">“FOSS”</h3>
<p>
The term “FOSS,” meaning “Free and Open Source
Software,” was coined as a way
@@ -595,7 +645,7 @@
neutrality is your goal, “FLOSS” is better. But if you
want to show you stand for freedom, don't use a neutral term.</p>
-<h4</em></ins></span> id="FreelyAvailable">“Freely
available”</h4>
+<h3</em></ins></span> id="FreelyAvailable">“Freely <span
class="removed"><del><strong>available”</h4></strong></del></span>
<span class="inserted"><ins><em>available”</h3></em></ins></span>
<p>
Don't use “freely available software” as a synonym for “free
software.” The terms are not equivalent. Software is “freely
@@ -605,7 +655,10 @@
</p>
-<h4 id="Freeware">“Freeware”</h4>
+<span class="removed"><del><strong><h4
id="Freeware">“Freeware”</h4></strong></del></span>
+
+
+<span class="inserted"><ins><em><h3
id="Freeware">“Freeware”</h3></em></ins></span>
<p>
Please don't use the term “freeware” as a synonym for
“free software.” The term “freeware” was used
@@ -629,7 +682,10 @@
</p>
-<h4 id="GiveAwaySoftware">“Give away software”</h4>
+<span class="removed"><del><strong><h4</strong></del></span>
+
+
+<span class="inserted"><ins><em><h3</em></ins></span>
id="GiveAwaySoftware">“Give away <span
class="removed"><del><strong>software”</h4></strong></del></span>
<span class="inserted"><ins><em>software”</h3></em></ins></span>
<p>
It's misleading to use the term “give away” to mean
“distribute a program as free software.”
@@ -639,7 +695,10 @@
free software.”</p>
-<h4 <span
class="inserted"><ins><em>id="Google">“Google”</h4>
+<span class="removed"><del><strong><h4
id="Hacker">“Hacker”</h4></strong></del></span>
+
+
+<span class="inserted"><ins><em><h3
id="Google">“Google”</h3>
<p>
Please avoid using the term “google” as a verb, meaning to
search for something on the internet. “Google” is just the
@@ -650,7 +709,7 @@
its users, although we cannot confirm.</p>
-<h4</em></ins></span> id="Hacker">“Hacker”</h4>
+<h3 id="Hacker">“Hacker”</h3></em></ins></span>
<p>
A hacker is someone
who <a href="http://stallman.org/articles/on-hacking.html"> enjoys
@@ -666,7 +725,10 @@
People who break security are “crackers.”</p>
-<h4 id="IntellectualProperty">“Intellectual
property”</h4>
+<span class="removed"><del><strong><h4</strong></del></span>
+
+
+<span class="inserted"><ins><em><h3</em></ins></span>
id="IntellectualProperty">“Intellectual <span
class="removed"><del><strong>property”</h4></strong></del></span>
<span class="inserted"><ins><em>property”</h3></em></ins></span>
<p>
Publishers and lawyers like to describe copyright as
“intellectual property”—a term also applied to
@@ -696,7 +758,10 @@
Organization embarrassed</a>.</p>
-<h4 id="LAMP">“LAMP system”</h4>
+<span class="removed"><del><strong><h4</strong></del></span>
+
+
+<span class="inserted"><ins><em><h3</em></ins></span>
id="LAMP">“LAMP <span
class="removed"><del><strong>system”</h4></strong></del></span>
<span class="inserted"><ins><em>system”</h3></em></ins></span>
<p>
“LAMP” stands for “Linux, Apache, MySQL and
PHP”—a common combination of software to use on a web
@@ -707,7 +772,10 @@
</p>
-<h4 id="Linux">“Linux system”</h4>
+<span class="removed"><del><strong><h4</strong></del></span>
+
+
+<span class="inserted"><ins><em><h3</em></ins></span>
id="Linux">“Linux <span
class="removed"><del><strong>system”</h4></strong></del></span>
<span class="inserted"><ins><em>system”</h3></em></ins></span>
<p>
Linux is the name of the kernel that Linus Torvalds developed starting
in 1991. The operating system in which Linux is used is basically GNU
@@ -719,7 +787,10 @@
</p>
-<h4 id="Market">“Market”</h4>
+<span class="removed"><del><strong><h4
id="Market">“Market”</h4></strong></del></span>
+
+
+<span class="inserted"><ins><em><h3
id="Market">“Market”</h3></em></ins></span>
<p>
It is misleading to describe the users of free software, or the
software users in general, as a “market.”</p>
@@ -738,7 +809,10 @@
and legitimize proprietary software.</p>
-<h4 id="Monetize">“Monetize”</h4>
+<span class="removed"><del><strong><h4
id="Monetize">“Monetize”</h4></strong></del></span>
+
+
+<span class="inserted"><ins><em><h3
id="Monetize">“Monetize”</h3></em></ins></span>
<p>
The <span class="removed"><del><strong>natural meaning</strong></del></span>
<span class="inserted"><ins><em>proper definition</em></ins></span> of
“monetize” is <span class="removed"><del><strong>“convert into
money”. If you make</strong></del></span> <span
class="inserted"><ins><em>“to use</em></ins></span>
@@ -760,11 +834,14 @@
A</em></ins></span> productive and ethical business <span
class="removed"><del><strong>does not convert</strong></del></span> <span
class="inserted"><ins><em>can make money, but if it
subordinates</em></ins></span> all <span class="removed"><del><strong>of
its product into money. Part of</strong></del></span> <span
class="inserted"><ins><em>else to profit,</em></ins></span> it is <span
class="removed"><del><strong>a contribution</strong></del></span> <span
class="inserted"><ins><em>not likely</em></ins></span> to <span
class="removed"><del><strong>the rest of
-the world.</p></strong></del></span> <span
class="inserted"><ins><em>remain
-ethical.</p></em></ins></span>
+the world.</p>
+
+<h4</strong></del></span> <span class="inserted"><ins><em>remain
+ethical.</p>
-<h4 id="MP3Player">“MP3 Player”</h4>
+
+<h3</em></ins></span> id="MP3Player">“MP3 <span
class="removed"><del><strong>Player”</h4></strong></del></span>
<span class="inserted"><ins><em>Player”</h3></em></ins></span>
<p>
In the late 1990s it became feasible to make portable, solid-state
digital audio players. Most support the patented MP3 codec, but not
@@ -777,7 +854,10 @@
or simply “audio player” if context permits.</p>
-<h4 id="Open">“Open”</h4>
+<span class="removed"><del><strong><h4
id="Open">“Open”</h4></strong></del></span>
+
+
+<span class="inserted"><ins><em><h3
id="Open">“Open”</h3></em></ins></span>
<p>
Please avoid using the term “open” or “open
source” as a substitute for “free <span
class="removed"><del><strong>software”.</strong></del></span> <span
class="inserted"><ins><em>software.”</em></ins></span> Those terms
@@ -789,7 +869,9 @@
appropriate; but please do not use it to label us or our work—that
leads people to think we share those views.</p>
-<h4 id="PC">“PC”</h4>
+<span class="removed"><del><strong><h4
id="PC">“PC”</h4></strong></del></span>
+
+<span class="inserted"><ins><em><h3
id="PC">“PC”</h3></em></ins></span>
<p>
It's OK to use the abbreviation “PC” to refer to a certain
kind of computer hardware, but please don't use it with the
@@ -800,7 +882,9 @@
The term “WC” has been suggested for a computer running
Windows.</p>
-<h4 id="Photoshop">“Photoshop”</h4>
+<span class="removed"><del><strong><h4
id="Photoshop">“Photoshop”</h4></strong></del></span>
+
+<span class="inserted"><ins><em><h3
id="Photoshop">“Photoshop”</h3></em></ins></span>
<p>
Please avoid using the term “photoshop” as a verb, meaning
any kind of photo manipulation or image editing in general. Photoshop
@@ -808,7 +892,9 @@
be avoided since it is proprietary. There are plenty of free programs
for editing images, such as the <a
href="/software/gimp">GIMP</a>.</p>
-<h4 id="Piracy">“Piracy”</h4>
+<span class="removed"><del><strong><h4
id="Piracy">“Piracy”</h4></strong></del></span>
+
+<span class="inserted"><ins><em><h3
id="Piracy">“Piracy”</h3></em></ins></span>
<p>
Publishers often refer to copying they don't approve of as
“piracy.” In this way, they imply that it is ethically
@@ -827,13 +913,16 @@
for use instead. Some of us might even prefer to use a positive term
such as “sharing information with your neighbor.”</p>
+
+<span class="removed"><del><strong><h4
id="PowerPoint">“PowerPoint”</h4></strong></del></span>
+
<span class="inserted"><ins><em><p>
A US judge, presiding over a trial for copyright infringement,
recognized that
<a
href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/">“piracy”
-and “theft” are smear-words.</a></p></em></ins></span>
+and “theft” are smear-words.</a></p>
-<h4 id="PowerPoint">“PowerPoint”</h4>
+<h3 id="PowerPoint">“PowerPoint”</h3></em></ins></span>
<p>
Please avoid using the term “PowerPoint” to mean any kind
of slide presentation. “PowerPoint” is just the name of
@@ -844,7 +933,10 @@
class and <span
class="removed"><del><strong>OpenOffice.org's</strong></del></span> <span
class="inserted"><ins><em>LibreOffice.org's</em></ins></span> Impress.</p>
-<h4 id="Protection">“Protection”</h4>
+<span class="removed"><del><strong><h4
id="Protection">“Protection”</h4></strong></del></span>
+
+
+<span class="inserted"><ins><em><h3
id="Protection">“Protection”</h3></em></ins></span>
<p>
Publishers' lawyers love to use the term “protection” to
describe copyright. This word carries the implication of preventing
@@ -875,7 +967,9 @@
<a href="http://DefectiveByDesign.org"> Defective by Design</a>
campaign.</p>
-<h4 id="RAND">“RAND (Reasonable and
Non-Discriminatory)”</h4>
+<span class="removed"><del><strong><h4</strong></del></span>
+
+<span class="inserted"><ins><em><h3</em></ins></span>
id="RAND">“RAND (Reasonable and <span
class="removed"><del><strong>Non-Discriminatory)”</h4></strong></del></span>
<span
class="inserted"><ins><em>Non-Discriminatory)”</h3></em></ins></span>
<p>
Standards bodies that promulgate patent-restricted standards that
prohibit free software typically have a policy of obtaining patent
@@ -903,7 +997,10 @@
the only condition in these licenses is a uniform royalty fee.</p>
-<h4 <span class="inserted"><ins><em>id="SaaS">“SaaS” or
“Software as a Service”</h4>
+<span class="removed"><del><strong><h4</strong></del></span>
+
+
+<span class="inserted"><ins><em><h3 id="SaaS">“SaaS” or
“Software as a Service”</h3>
<p>
We used to say that SaaS (short for “Software as a
Service”) is an injustice, but then we found that there was a
@@ -922,7 +1019,7 @@
to give up.</p>
-<h4</em></ins></span> id="SellSoftware">“Sell
software”</h4>
+<h3</em></ins></span> id="SellSoftware">“Sell <span
class="removed"><del><strong>software”</h4></strong></del></span>
<span class="inserted"><ins><em>software”</h3></em></ins></span>
<p>
The term “sell software” is ambiguous. Strictly speaking,
exchanging a copy of a free program for a sum of money
@@ -932,16 +1029,19 @@
associate the term
<span class="removed"><del><strong>“sell”</strong></del></span>
<span class="inserted"><ins><em>“selling
software”</em></ins></span> with proprietary
restrictions on the subsequent use of the software. You can be <span
class="removed"><del><strong>more precise,</strong></del></span> <span
class="inserted"><ins><em>clear,</em></ins></span>
-and prevent confusion, by saying either “distributing copies of <span
class="removed"><del><strong>a program for a fee”
-or “imposing</strong></del></span>
-<span class="inserted"><ins><em>a program for a fee” or “imposing
proprietary restrictions
-on the use of a program.”</p>
+and prevent confusion, by saying either “distributing copies of
+a program for a fee” or “imposing proprietary restrictions
+on the use of a
+<span class="removed"><del><strong>program,” depending on what you
mean.</p></strong></del></span> <span
class="inserted"><ins><em>program.”</p></em></ins></span>
<p>
See <a href="/philosophy/selling.html">Selling Free Software</a>
for
further discussion of this issue.</p>
-<h4 id="SharingEconomy">“Sharing economy”</h4>
+<span class="removed"><del><strong><h4</strong></del></span>
+
+
+<span class="inserted"><ins><em><h3 id="SharingEconomy">“Sharing
economy”</h3>
<p>
The term “sharing economy” is not a good way to refer to
services such as Uber and Airbnb that arrange business transactions
@@ -955,24 +1055,20 @@
“piecework service economy.”</p>
-<h4 id="Skype">“Skype”</h4>
+<h3 id="Skype">“Skype”</h3>
<p>
Please avoid using the term “Skype” as a verb, meaning any
kind of video communication or telephony over the Internet in general.
-“Skype” is just the name of one particular</em></ins></span>
proprietary <span
class="removed"><del><strong>restrictions</strong></del></span>
-<span class="inserted"><ins><em>program, one that <a
+“Skype” is just the name of one particular proprietary
+program, one that <a
href="/philosophy/proprietary/proprietary-surveillance.html#SpywareInSkype">
-spies</em></ins></span> on <span class="inserted"><ins><em>its
users</a>. If you want to make video and voice calls
over</em></ins></span> the <span class="removed"><del><strong>use
of</strong></del></span>
-<span class="inserted"><ins><em>Internet in</em></ins></span> a
-<span class="removed"><del><strong>program,” depending on what you
mean.</p>
-<p>
-See <a href="/philosophy/selling.html">Selling Free Software</a>
for
-further discussion</strong></del></span> <span class="inserted"><ins><em>way
that respects both your freedom and your privacy, try
-one</em></ins></span> of <span class="removed"><del><strong>this
issue.</p></strong></del></span> <span class="inserted"><ins><em>the
<a href="https://libreplanet.org/wiki/Group:Skype_Replacement">
-numerous free Skype replacements</a>.</p></em></ins></span>
+spies on its users</a>. If you want to make video and voice calls over
the
+Internet in a way that respects both your freedom and your privacy, try
+one of the <a
href="https://libreplanet.org/wiki/Group:Skype_Replacement">
+numerous free Skype replacements</a>.</p>
-<h4 id="SoftwareIndustry">“Software Industry”</h4>
+<h3</em></ins></span> id="SoftwareIndustry">“Software <span
class="removed"><del><strong>Industry”</h4></strong></del></span>
<span class="inserted"><ins><em>Industry”</h3></em></ins></span>
<p>
The term “software industry” encourages people to imagine
that software is always developed by a sort of factory and then
@@ -990,7 +1086,10 @@
define “industry” as “automated production of
material goods.”</a></p>
-<h4 <span class="inserted"><ins><em>id="SourceModel">“Source
model”</h4>
+
+<span class="removed"><del><strong><h4
id="Theft">“Theft”</h4></strong></del></span>
+
+<span class="inserted"><ins><em><h3 id="SourceModel">“Source
model”</h3>
<p>
Wikipedia uses the term “source model” in a confused and
ambiguous way. Ostensibly it refers to how a program's source is
@@ -1003,7 +1102,20 @@
opportunity to say “open source” in pages describing free
software programs.</p>
-<h4</em></ins></span> id="Theft">“Theft”</h4>
+<!--#if expr="$LANGUAGE_SUFFIX = /^.()$/" -->
+<!-- TRANSLATORS: translate if this word is used often in your
+ language to refer to mobile computers; otherwise,
+ fill the translation with a space. -->
+
+<h3 id="Terminal">“Terminal”</h3>
+
+<p>Mobile phones and tablets are computers, and people should be
+able to do their computing on them using free software.
+To call them “terminals” supposes that all they are good for
+is to connect to servers, which is a bad way to do your own
computing.</p>
+<!--#endif -->
+
+<h3 id="Theft">“Theft”</h3></em></ins></span>
<p>
<span class="removed"><del><strong>Copyright apologists</strong></del></span>
<span class="inserted"><ins><em>The supporters of a too-strict, repressive
form of copyright</em></ins></span> often use
@@ -1028,13 +1140,15 @@
fit our ideas of right and wrong (the spec), the laws are what should
change.</p>
+<span class="removed"><del><strong><h4</strong></del></span>
+
<span class="inserted"><ins><em><p>
A US judge, presiding over a trial for copyright infringement,
recognized that
<a
href="http://torrentfreak.com/mpaa-banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/">“piracy”
-and “theft” are smear-words.</a></p></em></ins></span>
+and “theft” are smear-words.</a></p>
-<h4 id="TrustedComputing">“Trusted Computing”</h4>
+<h3</em></ins></span> id="TrustedComputing">“Trusted <span
class="removed"><del><strong>Computing”</h4></strong></del></span>
<span class="inserted"><ins><em>Computing”</h3></em></ins></span>
<p>
<a href="/philosophy/can-you-trust.html">“Trusted
computing”</a> is
the proponents' name for a scheme to redesign computers so that
@@ -1044,7 +1158,10 @@
</p>
-<h4 id="Vendor">“Vendor”</h4>
+<span class="removed"><del><strong><h4
id="Vendor">“Vendor”</h4></strong></del></span>
+
+
+<span class="inserted"><ins><em><h3
id="Vendor">“Vendor”</h3></em></ins></span>
<p>
Please don't use the term “vendor” to refer generally to
anyone that develops or packages software. Many programs
@@ -1136,7 +1253,7 @@
<span class="inserted"><ins><em><p
class="unprintable">Updated:</em></ins></span>
<!-- timestamp start -->
-$Date: 2015/05/28 17:29:30 $
+$Date: 2015/06/06 09:58:12 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/words-to-avoid.ar.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ar.po,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- philosophy/po/words-to-avoid.ar.po 28 May 2015 17:29:30 -0000 1.81
+++ philosophy/po/words-to-avoid.ar.po 6 Jun 2015 09:58:12 -0000 1.82
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-05-28 17:27+0000\n"
+"POT-Creation-Date: 2015-06-06 09:55+0000\n"
"PO-Revision-Date: 2013-01-16 14:00+0200\n"
"Last-Translator: Rafik E. Younan <address@hidden>\n"
"Language-Team: Arabic <>\n"
@@ -300,6 +300,18 @@
msgstr ""
# type: Content of: <h4>
+#. #if expr="$LANGUAGE_SUFFIX = /^.()$/"
+#. TRANSLATORS: translate if this word is used often in your
+#. language to refer to mobile computers; otherwise,
+#. fill the translation with a space.
+#. type: Content of: <p>
+#, fuzzy
+#| msgid "“<a href=\"#Commercial\">Commercial</a>” |"
+msgid "“<a href=\"#Terminal\">Terminal</a>” |"
+msgstr "”<a href=\"#Commercial\">تجارÙ</a>“ |"
+
+# type: Content of: <h4>
+#. #endif
#. type: Content of: <p>
msgid "“<a href=\"#Theft\">Theft</a>” |"
msgstr "”<a href=\"#Theft\">سرÙØ©</a>“ |"
@@ -317,7 +329,7 @@
msgstr "”<a href=\"#Vendor\">بائع</a>“"
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Alternative”"
msgstr "”بدÙÙ“"
@@ -358,7 +370,7 @@
"عاÙÙ
Ù٠برÙ
جÙات٠ØØ±Ø©Ø Øت٠ÙÙÙÙ Ù٠اÙÙ
ستخدÙ
Ù٠أØرار."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“BSD-style”"
msgstr "”ÙÙ
Ø· BSD“"
@@ -387,7 +399,7 @@
"اÙÙ
عÙÙØ©</a> ÙتجÙب اÙÙ
صطÙØ Ø§ÙغاÙ
ض ”ÙÙ
Ø·
BSD“."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Closed”"
msgstr "”Ù
غÙÙ“"
@@ -412,7 +424,7 @@
"categories.html#ProprietarySoftware\">Ù
ØتÙرة</a> (Ø£Ù Ù
Ù
ÙÙÙØ©)."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Cloud Computing”"
msgstr "”ØÙسبة سØابÙØ©“"
@@ -546,7 +558,7 @@
"برÙ
جÙات Ù
ØتÙرة- Ùا تØÙز٠ÙÙس اÙÙ
بادئ اÙتÙ
ÙتبÙاÙا."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Commercial”"
msgstr "”تجارٓ"
@@ -603,7 +615,7 @@
"استخداÙ
ÙÙÙ
Ø© ”تجارٓ عÙÙ Ùذا اÙÙØÙ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Compensation”"
msgstr "”تعÙضÙات“"
@@ -636,7 +648,7 @@
"اÙدÙع بÙÙاÙÙ٠جائرة."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consume”"
msgstr "”استÙÙÙ“"
@@ -677,7 +689,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consumer”"
msgstr "”Ù
ستÙÙÙ“"
@@ -784,7 +796,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Content”"
msgstr "”Ù
ØتÙÙ“"
@@ -882,7 +894,7 @@
"اÙØºØ±Ø¶Ø ÙÙØÙ ÙÙص٠باستخداÙ
اÙÙ
صطÙØ ”ÙظاÙ
Ù
راجعة Ù
ÙÙع اÙÙب“ (WRS)."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
#, fuzzy
#| msgid "“Creator”"
msgid "“Creative Commons licensed”"
@@ -907,7 +919,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creator”"
msgstr "”Ù
Ùشئ“"
@@ -932,7 +944,7 @@
"ÙÙس اÙÙ
ؤÙÙ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Goods”"
msgstr "”Ù
Ùتجات رÙÙ
ÙØ©“"
@@ -954,7 +966,7 @@
"Ù
شاÙ٠باÙÙسبة ÙÙØ¥ÙØªØµØ§Ø¯Ø Ø§ÙØ°Ù Ùا تتضÙ
Ù ÙÙÙ
٠اÙسطØÙØ© ÙاÙÙ
ØدÙØ©Ø Ø§ÙØرÙØ© ÙاÙÙ
جتÙ
ع."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Locks”"
msgstr "”اÙÙÙÙد اÙرÙÙ
ÙØ©“"
@@ -1034,7 +1046,7 @@
"باÙأصÙاد اÙرÙÙ
ÙØ©“ بشÙÙ ÙاضØØ ÙÙÙضØ
اÙسبب. "
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Rights Management”"
msgstr "”إدارة اÙØÙÙ٠اÙرÙÙ
ÙØ©“"
@@ -1077,7 +1089,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Ecosystem”"
msgstr "”Ù
ÙظÙÙ
Ø© بÙئÙØ©“"
@@ -1126,7 +1138,7 @@
"Ù
ستخدÙ
٠اÙØاسÙب."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FLOSS”"
msgstr ""
@@ -1140,7 +1152,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“For free”"
msgstr "”For free“"
@@ -1179,7 +1191,7 @@
"ÙتجÙب اÙÙØ¨Ø³Ø ÙÙ
ÙÙ٠أ٠تÙÙÙ: “Ùذا اÙبرÙاÙ
ج Ù
تÙÙر ÙبرÙ
جÙات Øرة.”."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FOSS”"
msgstr ""
@@ -1193,7 +1205,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freely available”"
msgstr "”Freely available“"
@@ -1214,7 +1226,7 @@
"Ø¥Ù ÙاتÙÙ ÙضÙتÙÙ Ù
ختÙÙتÙÙ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freeware”"
msgstr "”برÙ
جÙات Ù
جاÙÙØ©“"
@@ -1260,7 +1272,7 @@
"Ø¥ÙÙ Ù
عÙاÙØ ÙسÙÙ ÙÙÙÙ
Ù٠اÙÙضÙØ©."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Give away software”"
msgstr "”Give away software“"
@@ -1280,7 +1292,7 @@
"free software.“"
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
#, fuzzy
#| msgid "“Closed”"
msgid "“Google”"
@@ -1297,7 +1309,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Hacker”"
msgstr "”ÙاÙر“"
@@ -1328,7 +1340,7 @@
"Ù
Ù ÙضÙÙ Ùا تÙشر Ùذا اÙخطأ. إ٠اÙØ°ÙÙ ÙÙسرÙÙ
اÙØÙ
اÙØ© ”ÙراÙر“."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Intellectual property”"
msgstr "”Ù
ÙÙÙØ© ÙÙرÙØ©“"
@@ -1395,7 +1407,7 @@
"اÙÙÙرÙØ©“ اÙعاÙÙ
ÙØ© ÙÙ Øرج</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“LAMP system”"
msgstr "”ÙظاÙ
LAMP“"
@@ -1415,7 +1427,7 @@
"ÙÙÙÙÙس Ùأباتش٠ÙÙ
ا٠إس ÙÙ٠إ٠Ùب٠إتش
بٓ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Linux system”"
msgstr "”ÙظاÙ
Linux“"
@@ -1436,7 +1448,7 @@
"ÙÙتÙر٠بÙ٠اÙÙظاÙ
اÙÙاÙ
Ù ÙاÙÙÙاة ÙØدÙا."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Market”"
msgstr "”سÙÙ“"
@@ -1477,7 +1489,7 @@
"ÙتشرÙع ÙÙبرÙ
جÙات اÙÙ
ØتÙرة."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Monetize”"
msgstr "”ÙÙÙد“"
@@ -1521,7 +1533,7 @@
"تشار٠اÙعاÙÙ
بجزء Ù
ÙÙا."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“MP3 Player”"
msgstr "”Ù
شغ٠MP3“"
@@ -1557,7 +1569,7 @@
"رÙÙ
Ù“ أ٠ببساطة ”Ù
شغ٠صÙت“ إذا
Ùاسب اÙسÙاÙ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Open”"
msgstr "”Ù
ÙتÙØ“"
@@ -1581,7 +1593,7 @@
"اÙآراء."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PC”"
msgstr "”PC“"
@@ -1604,7 +1616,7 @@
msgstr "اÙØªØ±Ø Ø§Ùاختصار ”WC“ ÙÙØÙاسÙب اÙتÙ
تÙشغÙÙ ÙÙÙدÙز."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Photoshop”"
msgstr "”Photoshop“"
@@ -1623,7 +1635,7 @@
"اÙصÙر ÙتعدÙÙÙا Ù
ÙÙا <a href=\"/software/gimp\">جÙ
بGIMP
</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Piracy”"
msgstr "”ÙرصÙØ©“"
@@ -1668,7 +1680,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PowerPoint”"
msgstr "”PowerPoint“"
@@ -1695,7 +1707,7 @@
"LibreOffice.org Impress."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Protection”"
msgstr "”ØÙ
اÙØ©“"
@@ -1762,7 +1774,7 @@
"</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“RAND (Reasonable and Non-Discriminatory)”"
msgstr "”RAND (Ù
عÙÙÙØ© ÙغÙر تÙ
ÙزÙØ©)“"
@@ -1820,7 +1832,7 @@
"Ø¥ÙÙا ÙÙØªØ±Ø ÙÙÙ
Ø© ”رسÙ
Ù
ÙØد ÙÙØ·“ Ø£Ù
ÙÙاختصار ”UFO“. Ø¥Ù "
"Ùذ٠اÙÙÙÙ
Ø© دÙÙØ© Ùأ٠اÙشرط اÙØÙد Ù٠تÙÙ
اÙرخص أ٠تÙÙÙ Ù
ÙØدة اÙرسÙÙ
."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“SaaS” or “Software as a Service”"
msgstr ""
@@ -1852,7 +1864,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sell software”"
msgstr "”بÙع اÙبراÙ
ج“"
@@ -1893,7 +1905,7 @@
"اÙØ´Ø±Ø Ø¹Ù Ùذ٠اÙÙضÙØ©."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sharing economy”"
msgstr ""
@@ -1914,7 +1926,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
#, fuzzy
#| msgid "“Open”"
msgid "“Skype”"
@@ -1933,7 +1945,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Software Industry”"
msgstr "”صÙاعة اÙبرÙ
جÙات“"
@@ -1974,7 +1986,7 @@
"اÙÙ
ادÙØ©“</a>"
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Source model”"
msgstr ""
@@ -1992,7 +2004,22 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "“Commercial”"
+msgid "“Terminal”"
+msgstr "”تجارٓ"
+
+#. type: Content of: <p>
+msgid ""
+"Mobile phones and tablets are computers, and people should be able to do "
+"their computing on them using free software. To call them “"
+"terminals” supposes that all they are good for is to connect to "
+"servers, which is a bad way to do your own computing."
+msgstr ""
+
+# type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Theft”"
msgstr "”سرÙØ©“"
@@ -2054,7 +2081,7 @@
"اÙÙÙاÙÙ٠أ٠تتغÙر."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Trusted Computing”"
msgstr "”اÙØÙسبة اÙÙ
ÙØ«ÙÙØ©“"
@@ -2073,7 +2100,7 @@
"خائٓ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Vendor”"
msgstr "”بائع“"
Index: philosophy/po/words-to-avoid.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.de.po,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- philosophy/po/words-to-avoid.de.po 28 May 2015 17:29:30 -0000 1.120
+++ philosophy/po/words-to-avoid.de.po 6 Jun 2015 09:58:12 -0000 1.121
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-05-28 17:27+0000\n"
+"POT-Creation-Date: 2015-06-06 09:55+0000\n"
"PO-Revision-Date: 2015-04-04 22:00+0200\n"
"Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German <address@hidden>\n"
@@ -323,7 +323,23 @@
"<a xml:lang=\"en\" lang=\"en\" href=\"#SourceModel\"><em>Source Model</em></"
"a> | "
+# <!-- <a href="#Commercial"><em>Kommerziell</em></a> |-->
+#. #if expr="$LANGUAGE_SUFFIX = /^.()$/"
+#. TRANSLATORS: translate if this word is used often in your
+#. language to refer to mobile computers; otherwise,
+#. fill the translation with a space.
+#. type: Content of: <p>
+# | “<a [-href=\"#Commercial\">Commercial</a>”-]
+# | {+href=\"#Terminal\">Terminal</a>”+} |
+#, fuzzy
+#| msgid "“<a href=\"#Commercial\">Commercial</a>” |"
+msgid "“<a href=\"#Terminal\">Terminal</a>” |"
+msgstr ""
+"<a xml:lang=\"en\" lang=\"en\" href=\"#Commercial\"><em>Commercial</em></a> |"
+" "
+
# <!-- <a href="#Theft"><em>Diebstahl</em></a> |-->
+#. #endif
#. type: Content of: <p>
msgid "“<a href=\"#Theft\">Theft</a>” |"
msgstr ""
@@ -342,7 +358,7 @@
msgstr ""
"<a xml:lang=\"en\" lang=\"en\" href=\"#Vendor\"><em>Vendor</em></a> | "
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Alternative”"
msgstr "<em>Alternative</em>"
@@ -378,7 +394,7 @@
"nicht für gut Nutzern jene <em>âAlternativenâ</em> zu freier Software "
"anzubieten."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“BSD-style”"
msgstr "<em>BSD-Style</em> (<em>BSD-artig</em>, <em>BSD-Stil</em>)"
@@ -408,7 +424,7 @@
"list\">die betreffende Lizenz</a> zu benennen und den vagen Begriff
<em>âBSD-"
"artigâ</em> o. Ã¤. zu vermeiden."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Closed”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Closed</em></span> (<em>Geschlossen[er "
@@ -437,7 +453,7 @@
"Software."
# Datenspeicherung und Arbeitsprozesse im Netzwerk/Internet
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Cloud Computing”"
msgstr "<em>Cloud-Computing</em> (<em>Datenwolke</em>)"
@@ -577,7 +593,7 @@
"Software ‑ nicht von denselben Idealen motiviert wird wie "
"wir."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Commercial”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Commercial</em></span> "
@@ -638,7 +654,7 @@
"und tun diese Möglichkeit ab. Achten wir darauf, das Wort
<em>âKommerziellâ</"
"em> nicht auf diese Weise zu verwenden."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Compensation”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Compensation</em></span> "
@@ -672,7 +688,7 @@
"passiert; aber meistens bedeutet es eine Subventionierung derselben Verlage, "
"die uns rücksichtslos Gesetze aufdrängen."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consume”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Consume</em></span> (<em>aufbrauchen</"
@@ -714,7 +730,7 @@
msgid "See also the following entry."
msgstr "Siehe auch den folgenden Eintrag."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consumer”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Consumer</em></span> (<em>Konsument</"
@@ -811,7 +827,7 @@
"\"Owen Hatherley: Be a user, not a consumer. The Guardian 2013."
"\">anderweitig festgestellt</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Content”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Content</em></span> (<em>Inhalt</em>)"
@@ -902,7 +918,7 @@
"Begriff <span xml:lang=\"en\" lang=\"en\"><em>Website Revision System</em></"
"span> (WRS)."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creative Commons licensed”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Creative Commons licensed</em></span> "
@@ -938,7 +954,7 @@
"man nicht welche Lizenz ein bestimmtes Werk verwendet, sollte es "
"herausgefunden und dann angegeben werden."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creator”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Creator</em></span>
(<em>Schöpfer</em>)"
@@ -965,7 +981,7 @@
"zwei Begriffe sind nicht äquivalent: oft ist der Urheberrechtsinhaber nicht "
"der Autor."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Goods”"
msgstr ""
"<em>Digital Goods</em> (<em>Digitale Güter</em>, <em>Digitale Waren</em>)"
@@ -989,7 +1005,7 @@
"ebenfalls Probleme im Hinblick auf Ãkonomie, deren oberflächlichen und "
"begrenzten Werte nicht Freiheit und Gemeinschaft umfassen."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Locks”"
msgstr "<em>Digital Locks</em> (<em>Digitale Schlösser</em>)"
@@ -1076,7 +1092,7 @@
"allerdings, wenn wir unsere Unterstützung erklären, ersetzen wir diesen "
"Begriff deutlich durch <em>Digitale Handschellen</em> und sagen warum."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Rights Management”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Digital Rights Management</em></span> "
@@ -1119,7 +1135,7 @@
"\">Kampagne zur Abschaffung von DRM</a><a href=\"#tn01\" class=\"transnote\">"
"[1]</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Ecosystem”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Ecosystem</em></span> (<em>Ãkosystem</"
@@ -1172,7 +1188,7 @@
"saubere Luft und Wasser, Artenschutz, traditionelle Künste … und "
"Freiheit von Rechnernutzern."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FLOSS”"
msgstr "<em>FLOSS</em>"
@@ -1192,7 +1208,7 @@
"möchte, dass man für Freiheit eintritt, sollte kein neutraler Begriff "
"verwendet werden."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“For free”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>For free</em></span> (<em>für frei</"
@@ -1232,7 +1248,7 @@
"Um eine Verwechslung zu umgehen, kann man sagen, dass das Programm <em>als "
"Freie Software</em> erhältlich ist."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FOSS”"
msgstr "<em>FOSS</em>"
@@ -1252,7 +1268,7 @@
"a> besser dafür geeignet. Aber wenn man zeigen möchte, dass man für
Freiheit "
"eintritt, sollte kein neutraler Begriff verwendet werden."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freely available”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Freely available</em></span> (<em>frei "
@@ -1273,7 +1289,7 @@
"definiert, die eine Kopie davon haben. Dies sind Antworten auf verschiedene "
"Fragen."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freeware”"
msgstr "<span xml:lang=\"en\" lang=\"en\"><em>Freeware</em></span>"
@@ -1319,7 +1335,7 @@
"für Landsleute befremdlich oder störend erscheint; aber sobald erkannt
wird, "
"dass er genau das bedeutet, wird wirklich verstanden, worum es geht."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Give away software”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Give away software</em></span> "
@@ -1339,7 +1355,7 @@
"Preis geht, nicht um Freiheit. Eine Möglichkeit zur Vermeidung einer "
"Verwechslung wäre es <em>Freigabe als Freie Software</em> zu nennen."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Google”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\">to <em>Google</em></span> (<em>googeln</"
@@ -1365,7 +1381,7 @@
"Weitere sind <a href=\"https://Ixquick.com/\" title=\"Ixquick\">Ixquick</a> "
"und <a href=\"https://Startpage.com/\" title=\"Startpage\">Startpage</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Hacker”"
msgstr "<em>Hacker</em>"
@@ -1395,7 +1411,7 @@
"Bitte verbreiten Sie diesen Fehler nicht. Personen, die "
"Sicherheitsmechanismen umgehen, sind <em>Cracker</em>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Intellectual property”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Intellectual Property</em></span> "
@@ -1464,7 +1480,7 @@
"Organization\" xml:lang=\"en\" lang=\"en\">WIPO</span>) peinlich zu "
"berühren</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“LAMP system”"
msgstr ""
"<span title=\"Linux, Apache, MySQL und PHP\"><em>LAMP-System</em></span>"
@@ -1484,7 +1500,7 @@
"âLAMPâ</em> sollte es stattdessen <em>GLAMP</em> heiÃen: <em>GNU, Linux,
"
"Apache MySQL und PHP</em>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Linux system”"
msgstr "<em>Linux-System</em>"
@@ -1506,7 +1522,7 @@
"Gesamtsystem bitte <a href=\"/gnu/linux-and-gnu\"><strong>GNU/Linux</"
"strong></a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Market”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Market</em></span> (<em>Markt</em>)"
@@ -1550,7 +1566,7 @@
"gleichzusetzen, bedeutet die Wichtigkeit der Freiheit zu leugnen und "
"proprietäre Software zu legitimieren."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Monetize”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Monetize</em></span> "
@@ -1595,7 +1611,7 @@
"aber wenn es alles andere dem Gewinn unterordnet, dürfte es wahrscheinlich "
"nicht ethisch bleiben."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“MP3 Player”"
msgstr "<em>MP3-Player</em>"
@@ -1622,7 +1638,7 @@
"werden Begriffe wie <em>digitales Audio-Wiedergabegerät</em> oder einfach "
"nur <em>Audio-Wiedergabegerät</em>, wenn es der Zusammenhang erlaubt."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Open”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Open</em></span> (<em>Offen[er "
@@ -1651,7 +1667,7 @@
"GNU-Projekt oder unsere Arbeit damit abzustempeln ‑ das "
"führt dazu anzunehmen, wir würden diese Ansichten teilen."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PC”"
msgstr "<em>PC</em>"
@@ -1676,7 +1692,7 @@
"Für einen Rechner, der Windows ausführt, wurde der Begriff <em>WC</em> "
"vorgeschlagen."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Photoshop”"
msgstr "<em>Photoshop</em>"
@@ -1695,7 +1711,7 @@
"ist. Es gibt viele freie Programme zur Bearbeitung von Bildern, wie <a href="
"\"/software/gimp\">GIMP</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Piracy”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Piracy</em></span> (<em>Piraterie</"
@@ -1749,7 +1765,7 @@
"banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/\"><em>"
"âPiraterieâ</em> und <em>âDiebstahlâ</em> verleumderische Wörter</a>
sind."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PowerPoint”"
msgstr "<em>PowerPoint</em>"
@@ -1769,7 +1785,7 @@
"Präsentationen zu erstellen. Empfohlene Optionen sind unter anderem die "
"Beamer-Klasse von TeX sowie LibreOffice Impress."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Protection”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Protection</em></span> (<em>Schutz</"
@@ -1839,7 +1855,7 @@
"Kampagne <a href=\"http://DefectiveByDesign.org\" xml:lang=\"en\" lang=\"en"
"\"><cite>Defective-by-Design</cite></a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“RAND (Reasonable and Non-Discriminatory)”"
msgstr ""
"<abbr title=\"Reasonable and Non-Discriminatory\" xml:lang=\"en\" lang=\"en"
@@ -1908,7 +1924,7 @@
"<i>UFO</i>) empfohlen. Das ist präziser, weil die einzige Bedingung in "
"diesen Lizenzen eine einheitliche Lizenzgebühr ist."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“SaaS” or “Software as a Service”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Software as a Service</em></span> oder "
@@ -1953,7 +1969,7 @@
"xml:lang=\"es\" lang=\"es\"><em>software como ser vicio</em></span> zu gut "
"ist, um ihn aufzugeben."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sell software”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Sell Software</em></span> "
@@ -1988,7 +2004,7 @@
"Weitere Informationen zu diesem Thema finden Sie in <a href=\"/philosophy/"
"selling\"><cite>Freie Software verkaufen</cite></a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sharing economy”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Sharing Economy</em></span>
(sinnÂgeÂmäà "
@@ -2025,7 +2041,7 @@
"\"en\" lang=\"en\">Piecework Service Economy</"
"span>â (âAkkorddienstleistungswirtschaftâ)</em>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Skype”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\">to <em>skype</em></span> (<em>skypen</em>)"
@@ -2052,7 +2068,7 @@
"a>, wenn Sie Video- und Sprachanrufe über das Internet auf eine Weise machen
"
"wollen, die Freiheit und Privatsphäre respektiert."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Software Industry”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Software Industry</em></span> "
@@ -2095,7 +2111,7 @@
"em> [im Sinne des Patentrechts] als âautomatisierte Herstellung materieller
"
"Güterâ zu definieren.</a>"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Source model”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Source Model</em></span> (<em>[Open-]"
@@ -2125,7 +2141,24 @@
"vermitteln, bietet aber eine Möglichkeit, âOpen Sourceâ in Webseiten "
"anzuführen, die <ins>eigentlich</ins> freie Softwareprogramme beschreiben."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
+# | [-“Commercial”-]{+“Terminal”+}
+#, fuzzy
+#| msgid "“Commercial”"
+msgid "“Terminal”"
+msgstr ""
+"<span xml:lang=\"en\" lang=\"en\"><em>Commercial</em></span> "
+"(<em>Kommerziell</em>)"
+
+#. type: Content of: <p>
+msgid ""
+"Mobile phones and tablets are computers, and people should be able to do "
+"their computing on them using free software. To call them “"
+"terminals” supposes that all they are good for is to connect to "
+"servers, which is a bad way to do your own computing."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "“Theft”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Theft</em></span> (<em>Diebstahl</em>)"
@@ -2183,7 +2216,7 @@
"Recht und Unrecht (dem Verdacht) entsprechen, sind die Gesetze das, was sich "
"ändern sollte."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Trusted Computing”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Trusted Computing</em></span> "
@@ -2204,7 +2237,7 @@
" anstelle des Nutzers! Aus deren Sicht ist es
<em>âvertrauenswürdigâ</"
"em>, aus Sicht des Nutzers <em>verräterisch</em>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Vendor”"
msgstr ""
"<span xml:lang=\"en\" lang=\"en\"><em>Vendor</em></span>
(<em>Verkäufer</em>)"
Index: philosophy/po/words-to-avoid.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.es.po,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -b -r1.191 -r1.192
--- philosophy/po/words-to-avoid.es.po 5 Jun 2015 12:07:07 -0000 1.191
+++ philosophy/po/words-to-avoid.es.po 6 Jun 2015 09:58:12 -0000 1.192
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-28 17:27+0000\n"
+"POT-Creation-Date: 2015-06-06 09:55+0000\n"
"PO-Revision-Date: 2015-05-29 11:06+0100\n"
"Last-Translator: Javier Fdez. Retenaga <address@hidden>\n"
"Language-Team: Spanish <address@hidden>\n"
@@ -23,6 +23,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-06-06 09:55+0000\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"X-Poedit-Language: Spanish\n"
@@ -284,6 +285,20 @@
msgstr "«<a href=\"#SourceModel\">Modelo de código</a>» |"
# type: Content of: <h4>
+#. #if expr="$LANGUAGE_SUFFIX = /^.()$/"
+#. TRANSLATORS: translate if this word is used often in your
+#. language to refer to mobile computers; otherwise,
+#. fill the translation with a space.
+#. type: Content of: <p>
+# | “<a [-href=\"#Commercial\">Commercial</a>”-]
+# | {+href=\"#Terminal\">Terminal</a>”+} |
+#, fuzzy
+#| msgid "“<a href=\"#Commercial\">Commercial</a>” |"
+msgid "“<a href=\"#Terminal\">Terminal</a>” |"
+msgstr "«<a href=\"#Commercial\">Comercial</a>» |"
+
+# type: Content of: <h4>
+#. #endif
#. type: Content of: <p>
msgid "“<a href=\"#Theft\">Theft</a>” |"
msgstr "«<a href=\"#Theft\">Robo</a>» |"
@@ -299,7 +314,7 @@
msgstr "«<a href=\"#Vendor\">Vendedor</a>»"
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Alternative”"
msgstr "«Alternativo»"
@@ -335,7 +350,7 @@
"bueno ofrecer a los usuarios esas «alternativas» al software libre."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“BSD-style”"
msgstr "«Tipo BSD»"
@@ -366,7 +381,7 @@
"expresión «de tipo BSD»."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Closed”"
msgstr "«Cerrado»"
@@ -393,7 +408,7 @@
"\">«software privativo»</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Cloud Computing”"
msgstr "«Computación en la nube»"
@@ -524,7 +539,7 @@
"mismos ideales que a nosotros."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Commercial”"
msgstr "«Comercial»"
@@ -586,7 +601,7 @@
"posibilidad. Evitemos emplear la palabra «comercial» en ese sentido."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Compensation”"
msgstr "«Compensación»"
@@ -619,7 +634,7 @@
"mismas compañÃas editoriales que nos imponen leyes injustas."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consume”"
msgstr "«Consumir»"
@@ -659,7 +674,7 @@
msgstr "Véase también la siguiente entrada."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consumer”"
msgstr "«Consumidor»"
@@ -757,7 +772,7 @@
"williams\">ha sido ya señalado con anterioridad</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Content”"
msgstr "«Contenido»"
@@ -847,7 +862,7 @@
"<cite>Web site Revision System</cite>)."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creative Commons licensed”"
msgstr "«Bajo licencia Creative Commons»"
@@ -881,7 +896,7 @@
"averiguarlo antes de mencionarla."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creator”"
msgstr "«Creador»"
@@ -908,7 +923,7 @@
"equivalentes, a menudo el titular del copyright no es el autor."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Goods”"
msgstr "«Bienes digitales»"
@@ -933,7 +948,7 @@
"libertad y la comunidad."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Locks”"
msgstr "«Candados digitales»"
@@ -999,7 +1014,7 @@
"explicamos las razones."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Rights Management”"
msgstr "«Gestión digital de derechos»"
@@ -1039,7 +1054,7 @@
"\">campaña para abolir el DRM</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Ecosystem”"
msgstr "«Ecosistema»"
@@ -1092,7 +1107,7 @@
"tradicionales… y la libertad de los usuarios de ordenadores."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FLOSS”"
msgstr "«FLOSS»"
@@ -1112,7 +1127,7 @@
"libertad, no utilicemos un término neutral."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“For free”"
msgstr "«Gratuito»"
@@ -1152,7 +1167,7 @@
"software libre»."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FOSS”"
msgstr "«FOSS»"
@@ -1172,7 +1187,7 @@
"defendemos la libertad, no utilicemos un término neutral."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freely available”"
msgstr "«Disponible libremente»"
@@ -1192,7 +1207,7 @@
"respuestas a preguntas diferentes."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freeware”"
msgstr "«Freeware»"
@@ -1243,7 +1258,7 @@
"de qué se trata."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Give away software”"
msgstr "«Regalar software»"
@@ -1263,7 +1278,7 @@
"como software libre»."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Google”"
msgstr "«Google»"
@@ -1285,7 +1300,7 @@
"los usuarios."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Hacker”"
msgstr "«Hacker»"
@@ -1319,7 +1334,7 @@
"un sistema son «crackers»."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Intellectual property”"
msgstr "«Propiedad intelectual»"
@@ -1387,7 +1402,7 @@
"a la propia Organización Mundial de la «Propiedad Intelectual»</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“LAMP system”"
msgstr "«Sistema LAMP»"
@@ -1406,7 +1421,7 @@
"en lugar de «LAMP» deberÃa ser «GLAMP»: «GNU, Linux, Apache, MySQL y
PHP»."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Linux system”"
msgstr "«Sistema Linux»"
@@ -1429,7 +1444,7 @@
"entero y el núcleo en sÃ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Market”"
msgstr "«Mercado»"
@@ -1474,7 +1489,7 @@
"libertad y legitimar el software privativo."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Monetize”"
msgstr "«Monetizar»"
@@ -1516,7 +1531,7 @@
"ética."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“MP3 Player”"
msgstr "«Reproductor MP3»"
@@ -1543,7 +1558,7 @@
"audio», si el contexto lo permite."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Open”"
msgstr "«Abierto»"
@@ -1568,7 +1583,7 @@
"trabajo o de nosotros, pues eso lleva a pensar que compartimos sus ideas."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PC”"
msgstr "«PC»"
@@ -1594,7 +1609,7 @@
"expresión «WC»."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Photoshop”"
msgstr "«Photoshop»"
@@ -1616,7 +1631,7 @@
"\">GIMP</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Piracy”"
msgstr "«PiraterÃa»"
@@ -1669,7 +1684,7 @@
"son términos peyorativos</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PowerPoint”"
msgstr "«PowerPoint»"
@@ -1691,7 +1706,7 @@
"<tt>beamer</tt> de TeX y el Impress de LibreOffice.org."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Protection”"
msgstr "«Protección»"
@@ -1763,7 +1778,7 @@
"\">Defective by Design</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“RAND (Reasonable and Non-Discriminatory)”"
msgstr "«RAND» (razonable y no discriminatorio)"
@@ -1828,7 +1843,7 @@
"tarifa uniforme) o su abreviación, «UFO». Es más precisa porque la única
"
"condición de estas licencias es el pago de una tarifa de regalÃas uniforme."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“SaaS” or “Software as a Service”"
msgstr "«SaaS» o «Software como servicio»"
@@ -1870,7 +1885,7 @@
"bueno como para dejarlo de lado."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sell software”"
msgstr "«Vender software»"
@@ -1905,7 +1920,7 @@
"selling.html\">vender software libre</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sharing economy”"
msgstr "«EconomÃa del compartir»"
@@ -1936,7 +1951,7 @@
"de Uber es «economÃa de servicios a destajo»."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Skype”"
msgstr "«Skype»"
@@ -1961,7 +1976,7 @@
"\">numerosos programas libres sustitutivos de Skype</a>. "
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Software Industry”"
msgstr "«Industria del software»"
@@ -2005,7 +2020,7 @@
"bienes materiales»</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Source model”"
msgstr "«Modelo de código»"
@@ -2035,7 +2050,23 @@
"programas de software libre."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
+# | [-“Commercial”-]{+“Terminal”+}
+#, fuzzy
+#| msgid "“Commercial”"
+msgid "“Terminal”"
+msgstr "«Comercial»"
+
+#. type: Content of: <p>
+msgid ""
+"Mobile phones and tablets are computers, and people should be able to do "
+"their computing on them using free software. To call them “"
+"terminals” supposes that all they are good for is to connect to "
+"servers, which is a bad way to do your own computing."
+msgstr ""
+
+# type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Theft”"
msgstr "«Robo»"
@@ -2091,7 +2122,7 @@
"especificación), lo que se deberÃa cambiar son las leyes."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Trusted Computing”"
msgstr "«Computación confiable»"
@@ -2112,7 +2143,7 @@
"de vista de los usuarios, es «traicionera»."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Vendor”"
msgstr "«Vendedor»"
Index: philosophy/po/words-to-avoid.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.fr.po,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -b -r1.194 -r1.195
--- philosophy/po/words-to-avoid.fr.po 30 May 2015 21:04:51 -0000 1.194
+++ philosophy/po/words-to-avoid.fr.po 6 Jun 2015 09:58:12 -0000 1.195
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-05-28 17:27+0000\n"
+"POT-Creation-Date: 2015-06-06 09:55+0000\n"
"PO-Revision-Date: 2015-05-30 23:03+0200\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <address@hidden>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-06-06 09:55+0000\n"
"Plural-Forms: \n"
"X-Generator: Gtranslator 2.91.5\n"
@@ -245,6 +246,19 @@
msgid "“<a href=\"#SourceModel\">Source model</a>” |"
msgstr "“<a href=\"#SourceModel\">Modèle de source</a>” |"
+#. #if expr="$LANGUAGE_SUFFIX = /^.()$/"
+#. TRANSLATORS: translate if this word is used often in your
+#. language to refer to mobile computers; otherwise,
+#. fill the translation with a space.
+#. type: Content of: <p>
+# | “<a [-href=\"#Commercial\">Commercial</a>”-]
+# | {+href=\"#Terminal\">Terminal</a>”+} |
+#, fuzzy
+#| msgid "“<a href=\"#Commercial\">Commercial</a>” |"
+msgid "“<a href=\"#Terminal\">Terminal</a>” |"
+msgstr "« <a href=\"#Commercial\">commercial</a> » |"
+
+#. #endif
#. type: Content of: <p>
msgid "“<a href=\"#Theft\">Theft</a>” |"
msgstr "« <a href=\"#Theft\">vol</a> » |"
@@ -257,7 +271,7 @@
msgid "“<a href=\"#Vendor\">Vendor</a>”"
msgstr "« <a href=\"#Vendor\">vendeur</a> »"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Alternative”"
msgstr "« Alternative »"
@@ -293,7 +307,7 @@
"assujettissent leurs utilisateurs. Nous ne pensons pas que ce soit une bonne "
"chose de proposer aux utilisateurs ces « alternatives » au logiciel
libre."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“BSD-style”"
msgstr "« Type BSD »"
@@ -321,7 +335,7 @@
"license-list.html\">la licence spécifique en question</a> et d'éviter le "
"terme vague « de type BSD »."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Closed”"
msgstr "« Fermé »"
@@ -347,7 +361,7 @@
"\">privateur</a> ».<a id=\"TransNote1-rev\" href=\"#TransNote1\"><sup>1</"
"sup></a>"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Cloud Computing”"
msgstr ""
"« <cite>Cloud computing</cite> », « informatique dans les nuages » et
"
@@ -482,7 +496,7 @@
"décidé de l'utiliser quand même, car en tant que développeur de logiciels
"
"privateurs, il n'est pas motivé par les mêmes idéaux que nous."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Commercial”"
msgstr "« Commercial »"
@@ -539,7 +553,7 @@
"contient une contradiction interne et la rejettent. Faisons attention à ne "
"pas utiliser le mot « commercial » dans ce sens."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Compensation”"
msgstr "« Compensation »"
@@ -571,7 +585,7 @@
"cas parfois, mais la plupart du temps cela induit des subsides pour les "
"mêmes sociétés d'édition qui nous assomment de lois injustes."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consume”"
msgstr "« Consommer »"
@@ -612,7 +626,7 @@
msgid "See also the following entry."
msgstr "Voir également la rubrique suivante."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consumer”"
msgstr "« Consommateur »"
@@ -704,7 +718,7 @@
"theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-"
"williams\">déjà été signalé</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Content”"
msgstr "« Contenu »"
@@ -787,7 +801,7 @@
"Ã jour des pages sur un site web. Pour cela, nous recommandons le terme "
"« système de révision pour site web »."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creative Commons licensed”"
msgstr "« Sous licence Creative Commons »"
@@ -820,7 +834,7 @@
"vous ne savez pas quelle licence régit une Åuvre donnée, renseignez-vous
et "
"alors seulement formulez votre phrase."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creator”"
msgstr "« Créateur »"
@@ -845,7 +859,7 @@
"réellement dire. Ces deux termes ne sont pas équivalents. Il arrive souvent
"
"que le détenteur du copyright ne soit pas l'auteur."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Goods”"
msgstr "« Biens numériques »"
@@ -868,7 +882,7 @@
"ces questions dans le cadre de l'économie, dont les valeurs superficielles "
"et limitées ne comportent pas les notions de liberté et de communauté."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Locks”"
msgstr "« Verrous (ou serrures) numériques »"
@@ -936,7 +950,7 @@
"déclarons notre soutien, nous remplaçons ostensiblement cette expression
par "
"« menottes numériques » et nous disons pourquoi."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Rights Management”"
msgstr "« Gestion numérique des droits »"
@@ -974,7 +988,7 @@
"Merci d'apporter votre soutien à notre <a href=\"http://DefectiveByDesign."
"org/\">campagne pour abolir les DRM</a> en vous inscrivant sur ce site."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Ecosystem”"
msgstr "« Ãcosystème »"
@@ -1024,7 +1038,7 @@
"du climat, la propreté de l'air et de l'eau, les espèces en danger, les
arts "
"traditionnels… et la liberté des utilisateurs de l'informatique."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FLOSS”"
msgstr "« FLOSS »"
@@ -1043,7 +1057,7 @@
"choix. Mais si vous voulez montrez que vous êtes partisan de la liberté, "
"n'employez pas de terme neutre."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“For free”"
msgstr "« Gratuitement »"
@@ -1082,7 +1096,7 @@
"Pour éviter toute confusion, vous pouvez dire que le programme est "
"disponible « en tant que logiciel libre »."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FOSS”"
msgstr "« FOSS »"
@@ -1101,7 +1115,7 @@
"recherchez, « FLOSS » est un meilleur choix. Mais si vous voulez montrez
que "
"vous êtes partisan de la liberté, n'employez pas de terme neutre."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freely available”"
msgstr "« Disponible gratuitement »"
@@ -1120,7 +1134,7 @@
"accordée aux utilisateurs qui en ont une copie. Ce sont des réponses à des
"
"questions différentes."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freeware”"
msgstr "« Graticiel » ou « <cite>freeware</cite> »"
@@ -1167,7 +1181,7 @@
"que le logiciel libre fait exactement ce qu'il dit, ils comprendront "
"vraiment le message qu'il véhicule."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Give away software”"
msgstr "« Donner des logiciels »"
@@ -1185,7 +1199,7 @@
"liberté. Une façon d'éviter la confusion est de dire « distribuer en
tant "
"que logiciel libre »."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Google”"
msgstr "“Google”"
@@ -1206,7 +1220,7 @@
"com/\">DuckDuckGo</a> déclare ne pas pister ses utilisateurs, bien que nous "
"ne puissions pas le confirmer."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Hacker”"
msgstr "« Hacker »"
@@ -1236,7 +1250,7 @@
"Veuillez ne pas répandre cette erreur. Les personnes qui cassent la
sécurité "
"sont des « crackers »."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Intellectual property”"
msgstr "« Propriété intellectuelle »"
@@ -1299,7 +1313,7 @@
"PublicAwarenessOfCopyright-2002.html\">commence à embarrasser l'Organisation
"
"mondiale de la « propriété intellectuelle »</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“LAMP system”"
msgstr "« Système LAMP »"
@@ -1316,7 +1330,7 @@
"réalité le système GNU/Linux. Donc, au lieu de « LAMP » ce devrait
être "
"« GLAMP » : « GNU, Linux, Apache, MySQL and PHP »."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Linux system”"
msgstr "« Système Linux »"
@@ -1336,7 +1350,7 @@
"href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, pour en donner crédit au "
"projet GNU et pour distinguer le système complet du noyau seul."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Market”"
msgstr "« Marché »"
@@ -1376,7 +1390,7 @@
"la liberté à une campagne commerciale nie l'importance de la liberté et "
"légitime le logiciel privateur."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Monetize”"
msgstr "« Monétiser »"
@@ -1417,7 +1431,7 @@
"conditionne tout le reste au profit, il est peu probable qu'elle reste "
"éthique."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“MP3 Player”"
msgstr "« Lecteur MP3 »"
@@ -1442,7 +1456,7 @@
"« lecteur audio numérique », ou simplement « lecteur audio » si le
contexte "
"le permet."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Open”"
msgstr "« Ouvert » ou « <cite>open</cite> »"
@@ -1466,7 +1480,7 @@
"notre travail (cela conduit les gens à penser que nous partageons leurs "
"vues)."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PC”"
msgstr "« PC »"
@@ -1487,7 +1501,7 @@
"The term “WC” has been suggested for a computer running Windows."
msgstr "Le terme « WC » a été suggéré pour un ordinateur exécutant
Windows."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Photoshop”"
msgstr "« Photoshop »"
@@ -1506,7 +1520,7 @@
"beaucoup de programmes libres pour l'édition d'images, comme <a href=\"/"
"software/gimp\">GIMP</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Piracy”"
msgstr "« Piratage » et « piraterie »"
@@ -1557,7 +1571,7 @@
"and-theft-terms-in-hotfile-trial-131129/\">« piratage » and « vol »
étaient "
"diffamatoires.</a>"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PowerPoint”"
msgstr "« PowerPoint »"
@@ -1577,7 +1591,7 @@
"pour les vôtres. Parmi les choix recommandés, il y a la classe <tt>beamer</"
"tt> de TeX, et « Impress » de LibreOffice."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Protection”"
msgstr "« Protection »"
@@ -1642,7 +1656,7 @@
"\"Digital Restrictions Management\">DRM</acronym>. Voir la campagne <a href="
"\"http://DefectiveByDesign.org\"> Defective by Design</a>Â [en]."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“RAND (Reasonable and Non-Discriminatory)”"
msgstr "« RAND (raisonnable et non discriminatoire) »"
@@ -1703,7 +1717,7 @@
"[uniform fee only]</cite>, ou « UFO » en abrégé. Il est approprié car
la "
"seule clause de ces licences est une redevance uniforme."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“SaaS” or “Software as a Service”"
msgstr "« SaaS » ou <cite>Software as a Service</cite>"
@@ -1743,7 +1757,7 @@
"servicio</cite> parce que le jeu de mots <cite>software como ser vicio</"
"cite> est trop bon pour qu'on l'abandonne."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sell software”"
msgstr "« Vendre des logiciels »"
@@ -1776,7 +1790,7 @@
"Consulter l'article <a href=\"/philosophy/selling.html\">vendre des "
"logiciels libres</a> pour une discussion plus détaillée sur le sujet."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sharing economy”"
msgstr "« Ãconomie de partage »"
@@ -1805,7 +1819,7 @@
"Pour définir des entreprises bomme Uber, il y a une expression plus "
"appropriée : « économie de service à la pièce ». "
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Skype”"
msgstr "« Skype »"
@@ -1829,7 +1843,7 @@
"et votre vie privée, essayez l'un des <a
href=\"https://libreplanet.org/wiki/"
"Group:Skype_Replacement\"> nombreux programmes libres remplaçant Skype</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Software Industry”"
msgstr "« Industrie du logiciel »"
@@ -1870,7 +1884,7 @@
"la définition de l'« industrie » comme « production automatisée de
biens "
"matériels »</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Source model”"
msgstr "« Modèle de code source »"
@@ -1897,7 +1911,22 @@
"d'information cohérente, mais en revanche elle donne l'occasion de parler "
"d'« open source » dans des pages qui décrivent des programmes libres."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
+# | [-“Commercial”-]{+“Terminal”+}
+#, fuzzy
+#| msgid "“Commercial”"
+msgid "“Terminal”"
+msgstr "« Commercial »"
+
+#. type: Content of: <p>
+msgid ""
+"Mobile phones and tablets are computers, and people should be able to do "
+"their computing on them using free software. To call them “"
+"terminals” supposes that all they are good for is to connect to "
+"servers, which is a bad way to do your own computing."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "“Theft”"
msgstr "« Vol »"
@@ -1951,7 +1980,7 @@
"(l'implémentation) ne se conforment pas à nos idées du bien et du mal (les
"
"specs), ce sont les lois qui doivent changer."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Trusted Computing”"
msgstr "« Informatique de confiance »"
@@ -1970,7 +1999,7 @@
"s'agit « d'informatique de confiance ». De votre point de vue, elle est "
"« déloyale »."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Vendor”"
msgstr "« Vendeur »"
Index: philosophy/po/words-to-avoid.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.it.po,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- philosophy/po/words-to-avoid.it.po 30 May 2015 20:27:49 -0000 1.156
+++ philosophy/po/words-to-avoid.it.po 6 Jun 2015 09:58:13 -0000 1.157
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-05-28 17:27+0000\n"
+"POT-Creation-Date: 2015-06-06 09:55+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: Andrea Pescetti <address@hidden>\n"
"Language-Team: \n"
@@ -17,6 +17,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-06-06 09:55+0000\n"
"X-Generator: Poedit 1.5.4\n"
#. type: Content of: <title>
@@ -243,6 +244,19 @@
"“<a href=\"#SourceModel\">Modello di sorgente (Source model)</"
"a>” |"
+#. #if expr="$LANGUAGE_SUFFIX = /^.()$/"
+#. TRANSLATORS: translate if this word is used often in your
+#. language to refer to mobile computers; otherwise,
+#. fill the translation with a space.
+#. type: Content of: <p>
+# | “<a [-href=\"#Commercial\">Commercial</a>”-]
+# | {+href=\"#Terminal\">Terminal</a>”+} |
+#, fuzzy
+#| msgid "“<a href=\"#Commercial\">Commercial</a>” |"
+msgid "“<a href=\"#Terminal\">Terminal</a>” |"
+msgstr "“<a href=\"#Commercial\">Commerciale</a>” |"
+
+#. #endif
#. type: Content of: <p>
msgid "“<a href=\"#Theft\">Theft</a>” |"
msgstr "“<a href=\"#Theft\">Furto</a>” |"
@@ -257,7 +271,7 @@
msgid "“<a href=\"#Vendor\">Vendor</a>”"
msgstr "“<a href=\"#Vendor\">Venditore</a>”"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Alternative”"
msgstr "“Alternativa”"
@@ -291,7 +305,7 @@
"del software</a> non danno libertà agli utenti. Pensiamo che non si debbano "
"offrire agli utenti queste \"alternative\" al software libero."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“BSD-style”"
msgstr "“Licenze tipo-BSD”"
@@ -319,7 +333,7 @@
"html\">la specifica licenza cui ci si riferisce</a> evitando la vaga "
"locuzione \"di tipo BSD\"."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Closed”"
msgstr "“Chiuso”"
@@ -344,7 +358,7 @@
"\"non-libero\" o <a href= \"/philosophy/categories.html#ProprietarySoftware"
"\"> \"proprietario\"</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Cloud Computing”"
msgstr "“Cloud Computing”"
@@ -468,7 +482,7 @@
"essendo uno sviluppatore di software proprietario, non condivide gli ideali "
"che animano la nostra azione."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Commercial”"
msgstr "“Commerciale”"
@@ -527,7 +541,7 @@
"combinazione \"libero commerciale\", scartando questa possibilità . Bisogna "
"stare attenti a non utilizzare il termine \"commerciale\" in tal senso."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Compensation”"
msgstr "“Compenso”"
@@ -558,7 +572,7 @@
"in certe occasioni è vero, ma il più delle volte è un pagamento verso le "
"stesse case editrici che fanno pressione per imporci leggi ingiuste."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consume”"
msgstr "“Consumare”"
@@ -596,7 +610,7 @@
msgid "See also the following entry."
msgstr "Vedere anche la voce seguente."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consumer”"
msgstr "“Consumatore”"
@@ -684,7 +698,7 @@
"<a href=\"http://www.theguardian.com/commentisfree/2013/aug/11/capitalism-"
"language-raymond-williams\"> trattato da altri</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Content”"
msgstr "“Contenuto”"
@@ -768,7 +782,7 @@
"“sistema di revisione di siti web”, o “web site revision "
"system” (WRS) in quei casi."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creative Commons licensed”"
msgstr "“Sotto licenza Creative Commons”"
@@ -799,7 +813,7 @@
"Commons è in uso, ad esempio \"rilasciato con licenza CC BY-SA\". Se non si "
"sa quale licenza precisa è usata da una certa opera, occorre determinarla."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creator”"
msgstr "“Creatore”"
@@ -823,7 +837,7 @@
"copyright\" è ciò che si intende. Questi due termini non sono equivalenti:
"
"è piuttosto comune che il detentore del copyright non sia l'autore."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Goods”"
msgstr "“Beni digitali (Digital Goods)”"
@@ -845,7 +859,7 @@
"problema in termini economici, che sono troppo poco approfonditi e limitati "
"per cogliere i valori della libertà e della comunità ."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Locks”"
msgstr "“Lucchetti digitali (Digital Locks)”"
@@ -910,7 +924,7 @@
"d'accordo con la causa; ma quando capiterà sostituiremo il termine con "
"“manette digitali”, spiegandone le ragioni."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Rights Management”"
msgstr ""
"“Digital Rights Management (Gestione digitale dei diritti)”"
@@ -947,7 +961,7 @@
"Partecipate alla nostra <a href=\"http://DefectiveByDesign.org/\"> campagna "
"per abolire DRM</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Ecosystem”"
msgstr "“Ecosistema”"
@@ -996,7 +1010,7 @@
"salute pubblica, un clima stabile, l'aria e l'acqua pulite, le specie in "
"pericolo, le arti tradizionali... e la libertà degli utenti di computer."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FLOSS”"
msgstr "“FLOSS”"
@@ -1015,7 +1029,7 @@
"migliore; ma chi vuole difendere la libertà non dovrebbe usare termini "
"neutrali."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“For free”"
msgstr "“For free”"
@@ -1053,7 +1067,7 @@
"Onde evitare confusioni, si può dire che il programma è disponibile \"come
"
"software libero\"."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FOSS”"
msgstr "“FOSS”"
@@ -1072,7 +1086,7 @@
"neutrale, è meglio usare “FLOSS”; ma chi vuole difendere la "
"libertà non dovrebbe usare termini neutrali."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freely available”"
msgstr "“Liberamente disponibile”"
@@ -1091,7 +1105,7 @@
"della libertà degli utenti che ne hanno una copia. Queste sono risposte a "
"domande diverse."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freeware”"
msgstr "“Freeware”"
@@ -1137,7 +1151,7 @@
"quando ne considereranno il significato preciso, capiranno veramente di "
"cosa si tratta."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Give away software”"
msgstr "“Regalare software”"
@@ -1155,7 +1169,7 @@
"questione sia il prezzo, non la libertà . Un modo per evitare questa "
"confusione consiste nel dire: \"rilasciare come software libero\"."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Google”"
msgstr "“Googlare”"
@@ -1176,7 +1190,7 @@
"\">DuckDuckGo</a> garantisce (anche se noi non possiamo verificarlo in prima "
"persona) di non tracciare i propri utenti."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Hacker”"
msgstr "“Hacker”"
@@ -1205,7 +1219,7 @@
"crackers.”"
msgstr "Non diffondete questo errore: chi viola la sicurezza è un
\"cracker\"."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Intellectual property”"
msgstr "“Proprietà intellettuale”"
@@ -1268,7 +1282,7 @@
"philosophy/wipo-PublicAwarenessOfCopyright-2002.html\">provocando imbarazzo "
"nel WIPO</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“LAMP system”"
msgstr "“Sistema LAMP”"
@@ -1286,7 +1300,7 @@
"invece di “LAMP” dovrebbe essere “GLAMP”: “"
"GNU, Linux, Apache, MySQL e PHP”."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Linux system”"
msgstr "“Sistema Linux”"
@@ -1307,7 +1321,7 @@
"riconoscere i meriti di GNU sia per distinguere l'intero sistema dal "
"semplice kernel."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Market”"
msgstr "“Mercato”"
@@ -1347,7 +1361,7 @@
"libertà alla campagna di un'impresa per il suo successo è sminuire la "
"libertà ."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Monetize”"
msgstr "“Monetizzare”"
@@ -1387,7 +1401,7 @@
"Un'azienda produttiva ed etica può certamente fare denaro, ma se fa "
"dipendere tutto dal profitto è difficile che rimanga etica."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“MP3 Player”"
msgstr "“MP3 Player”"
@@ -1412,7 +1426,7 @@
"riproduttore audio digitale” o semplicamente “riproduttore "
"audio” se adatto al contesto."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Open”"
msgstr "“Aperto”"
@@ -1434,7 +1448,7 @@
"confondete con loro né descrivete il nostro lavoro con le loro etichette - "
"ciò porta le persone a pensare che noi siamo loro sostenitori."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PC”"
msgstr "“PC”"
@@ -1456,7 +1470,7 @@
msgstr ""
"Per un computer con Windows è stato suggerito il termine “WC”."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Photoshop”"
msgstr "“Photoshop”"
@@ -1474,7 +1488,7 @@
"programmi liberi per manipolare immagini, come <a href=\"/software/gimp"
"\">GIMP</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Piracy”"
msgstr "“Pirateria”"
@@ -1525,7 +1539,7 @@
"\">“pirateria” e “furto” sono parole diffamatorie</"
"a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PowerPoint”"
msgstr "“PowerPoint”"
@@ -1545,7 +1559,7 @@
"sono molte possibilità libere, ad esempio <tt>beamer</tt> per TeX e Impress,
"
"incluso anche in LibreOffice.org."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Protection”"
msgstr "“Protezione”"
@@ -1611,7 +1625,7 @@
"si veda la campagna <a href=\"http://DefectiveByDesign.org\"> Defective by "
"Design</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“RAND (Reasonable and Non-Discriminatory)”"
msgstr "“RAND (Reasonable and Non-Discriminatory)”"
@@ -1675,7 +1689,7 @@
"descrizione accurata perché la sola condizione per queste licenze è il "
"pagamento di una tariffa uniforme per le royalty."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“SaaS” or “Software as a Service”"
msgstr "“SaaS” o “Software as a Service”"
@@ -1714,7 +1728,7 @@
"perché il gioco di parole con “software como ser vicio” "
"(software come se fosse un vizio) è troppo azzeccato per abbandonarlo."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sell software”"
msgstr "“Vendere software”"
@@ -1746,7 +1760,7 @@
"Vedere <a href=\"/philosophy/selling.html\">Vendere Software Libero</a> per "
"altre discussioni sull'argomento."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sharing economy”"
msgstr "“Economia di condivisione (Sharing economy)”"
@@ -1773,7 +1787,7 @@
"Un termine più adatto per descrivere il caso di aziende come Uber è quello "
"di \"economia di servizi su transazioni singole\"."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Skype”"
msgstr "“Skypare”"
@@ -1797,7 +1811,7 @@
"\"https://libreplanet.org/wiki/Group:Skype_Replacement\"> programmi "
"equivalenti a Skype</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Software Industry”"
msgstr "“Industria del software”"
@@ -1836,7 +1850,7 @@
"respingendo i brevetti software nel 2003, ha stabilito con votazione che "
"\"industria\" è \"produzione automatica di beni materiali\"</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Source model”"
msgstr "“Modello di sorgente (Source model)”"
@@ -1862,7 +1876,22 @@
"informazione chiara, ma dà l'opportunità di usare “open source”
"
"in pagine dedicate al software libero."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
+# | [-“Commercial”-]{+“Terminal”+}
+#, fuzzy
+#| msgid "“Commercial”"
+msgid "“Terminal”"
+msgstr "“Commerciale”"
+
+#. type: Content of: <p>
+msgid ""
+"Mobile phones and tablets are computers, and people should be able to do "
+"their computing on them using free software. To call them “"
+"terminals” supposes that all they are good for is to connect to "
+"servers, which is a bad way to do your own computing."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "“Theft”"
msgstr "“Furto”"
@@ -1917,7 +1946,7 @@
"(l'applicazione) non rispettano le nostre idee di giusto e sbagliato (la "
"specifica), allora le leggi dovrebbero essere cambiate."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Trusted Computing”"
msgstr "“Trusted Computing (informatica fidata)”"
@@ -1936,7 +1965,7 @@
"punto di vista, è “fidato”; dal punto di vista dell'utente è "
"“infido”."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Vendor”"
msgstr "“Venditore”"
Index: philosophy/po/words-to-avoid.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ja.po,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- philosophy/po/words-to-avoid.ja.po 1 Jun 2015 07:12:02 -0000 1.97
+++ philosophy/po/words-to-avoid.ja.po 6 Jun 2015 09:58:13 -0000 1.98
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-05-28 17:27+0000\n"
+"POT-Creation-Date: 2015-06-06 09:55+0000\n"
"PO-Revision-Date: 2015-06-01 15:19+0900\n"
"Last-Translator: NIIBE Yutaka <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-06-06 09:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -230,6 +231,17 @@
msgid "“<a href=\"#SourceModel\">Source model</a>” |"
msgstr "ã<a href=\"#SourceModel\">ã½ã¼ã¹ã»ã¢ãã«</a>ã |"
+#. #if expr="$LANGUAGE_SUFFIX = /^.()$/"
+#. TRANSLATORS: translate if this word is used often in your
+#. language to refer to mobile computers; otherwise,
+#. fill the translation with a space.
+#. type: Content of: <p>
+#, fuzzy
+#| msgid "“<a href=\"#Commercial\">Commercial</a>” |"
+msgid "“<a href=\"#Terminal\">Terminal</a>” |"
+msgstr "ã<a href=\"#Commercial\">åç¨</a>ã |"
+
+#. #endif
#. type: Content of: <p>
msgid "“<a href=\"#Theft\">Theft</a>” |"
msgstr "ã<a href=\"#Theft\">çªç</a>ã |"
@@ -243,7 +255,7 @@
msgid "“<a href=\"#Vendor\">Vendor</a>”"
msgstr "ã<a href=\"#Vendor\">ãã³ãã¼</a>ã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Alternative”"
msgstr "ã代æ¿ç©ã"
@@ -276,7 +288,7 @@
"ã¢ä»£æ¿ã¨ãã¦ã®ãµã¼ãã¹</a>ã¯ãã¦ã¼ã¶ãå¾å±ããã¾ãããã®ãããªèªç±ã½ããã¦ã§"
"ã¢ã®ã代æ¿ç©ããã¦ã¼ã¶ã«æä¾ãããã¨ãè¯ããã¨ã¯ãããããã¡ã¯èãã¾ããã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“BSD-style”"
msgstr "ãBSDã¹ã¿ã¤ã«ã"
@@ -303,7 +315,7 @@
"ã»ã³ã¹ã®ç¹å®ã®å称</a>ã使ãããBSDã¹ã¿ã¤ã«ãã¨ãã£ãææ§ãªç¨èªãé¿ãããã¨ã"
"æé©ã§ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Closed”"
msgstr "ãã¯ãã¼ãºãã"
@@ -326,7 +338,7 @@
"ãã¨ãé¿ãã¾ããããããã¡ã¯ããããä¸èªç±ããããã¯<a
href=\"/philosophy/"
"categories.html#ProprietarySoftware\">ããããã©ã¤ã¨ã¿ãªã</a>ã¨å¼ã³ã¾ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Cloud Computing”"
msgstr "ãã¯ã©ã¦ãã»ã³ã³ãã¥ã¼ãã£ã³ã°ã"
@@ -447,7 +459,7 @@
"ãã®ã«ã¯ããããã©ã¤ã¨ã¿ãªã»ã½ããã¦ã§ã¢éçºè
ã¨ãã¦ãããã¯ãã£ã¦ããªããã"
"ã§ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Commercial”"
msgstr "ãåç¨ã"
@@ -501,7 +513,7 @@
"ç¨ãã®çµã¿åãããèªå·±æçãããã®ã§ããã¨èããå¾åãããããã®å¯è½æ§ã失ã"
"ãã¾ãããã®ããã«ãåç¨ãã使ããã¨ã®ãªããã注æãã¾ãããã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Compensation”"
msgstr "è£åé"
@@ -529,7 +541,7 @@
"ããã¨ããªãã¯æ³åããã§ããããããããã«æã«ã¯ããã§ãããã»ã¨ãã©ã®å
´åã"
"ããã¯ä¸å
¬æ£ãªæ³å¾ãããããã¡ã«æ¼ãä»ããåºç社ã¸ã®è£å©éãæå³ãã¾ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consume”"
msgstr "ãæ¶è²»ã"
@@ -566,7 +578,7 @@
msgid "See also the following entry."
msgstr "以ä¸ã®ã¨ã³ããªããèªã¿ãã ããã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consumer”"
msgstr "ãæ¶è²»è
ã"
@@ -650,7 +662,7 @@
"commentisfree/2013/aug/11/capitalism-language-raymond-williams\">以åã«è¨åã"
"ãã¦ãã¾ãã</a>"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Content”"
msgstr "ãã³ã³ãã³ãã"
@@ -726,7 +738,7 @@
"ããã«ã¯ãããããã¡ã¯ãã¦ã§ããµã¤ãã»ãªãã¸ã§ã³ç®¡çã·ã¹ãã
ã(WRS)ã®ç¨èªãæ¨"
"奨ãã¾ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creative Commons licensed”"
msgstr "ãã¯ãªã¨ã¤ãã£ãã»ã³ã¢ã³ãºã§ã©ã¤ã»ã³ã¹ã"
@@ -757,7 +769,7 @@
"ã¤ã»ã³ã¹ãã®ããã«æ¸ãã¾ãããããããããä½åã使ã£ã¦ããã®ãã©ã®ã©ã¤ã»ã³ã¹"
"ãåãããªãå ´åã調ã¹ã¦ããè¨æãã¾ãããã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creator”"
msgstr "ãã¯ãªã¨ã¼ã¿ã¼ã"
@@ -780,7 +792,7 @@
"ãããã®äºã¤ã®ç¨èªã¯åçã§ã¯ããã¾ããããã°ãã°ãèä½æ¨©è
ã¯èè
ã§ã¯ããã¾ã"
"ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Goods”"
msgstr "ããã£ã¸ã¿ã«ä½åã"
@@ -800,7 +812,7 @@
"ãªåç©ã¨ãã¦ã®è¦æ¹ã¨æè¦ã«ãã¨ã¥ãã¦å¤æãããã¨ãä¿ãã¾ããããã¯ã¾ãçµæ¸ã®"
"ç¨èªã§ç©äºãã¨ããããã®çãéå®çãªä¾¡å¤ã¯èªç±ã¨ã³ãã¥ããã£ãå«ã¿ã¾ããã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Locks”"
msgstr "ããã£ã¸ã¿ã«é ã"
@@ -862,7 +874,7 @@
"ã«é
ãã«å対ãããã£ã³ãã¼ã³ãæ¯æãããã¨ã¯ã§ãã¾ãããããããã¡ã®æ¯æã表"
"æããå ´åãé¡èã«ããã£ã¸ã¿ã«æé
ãã¨ç¨èªãç½®ãæãããã®çç±ãè¿°ã¹ã¾ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Rights Management”"
msgstr "ããã£ã¸ã¿ã«æ¨©é管çã"
@@ -895,7 +907,7 @@
"ã©ãããããããã¡ã®<a href=\"http://DefectiveByDesign.org/\">
DRMãå»æ¢ãã"
"ãã£ã³ãã¼ã³</a>ã«åå ãã¦æ¯æãã¦ãã ããã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Ecosystem”"
msgstr "ãã¨ã³ã·ã¹ãã ã"
@@ -942,7 +954,7 @@
"人権ãå¹³åãå
¬è¡è¡çãå®å®ããæ°åãããããªç©ºæ°ã¨æ°´ã絶æ»
å±æ§ç¨®ãä¼çµ±è¸è½ãª"
"ã©ããã³ã³ãã¥ã¼ã¿ã®ã¦ã¼ã¶ã®èªç±ããã§ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FLOSS”"
msgstr "“FLOSS”"
@@ -960,7 +972,7 @@
"ã¨ãç®çãªãã°ã“FLOSS”ã¯è¯ãæ¹æ³ã§ããããããããèªç±ã«ç«èãã¦"
"ãããã¨ã示ãã«ã¯ä¸ç«ã®ç¨èªã使ããªãããã«ãã¾ãããã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“For free”"
msgstr "ãããªã¼ã§ã"
@@ -997,7 +1009,7 @@
"æ··ä¹±ãé¿ããããã«ããã®ããã°ã©ã
ã¯ãèªç±ã½ããã¦ã§ã¢ã¨ãã¦ãå©ç¨å¯è½ã§ãã"
"ã¨è¨ããã¨ãã§ãã¾ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FOSS”"
msgstr "“FOSS”"
@@ -1015,7 +1027,7 @@
"ãããä¸ç«ã§ãããã¨ãç®çãªãã°ã“FLOSS”ãè¯ãæ¹æ³ã§ãããããã"
"ããèªç±ã«ç«èãã¦ãããã¨ã示ãã«ã¯ä¸ç«ã®ç¨èªã使ããªãããã«ãã¾ãããã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freely available”"
msgstr "ãããªã¼ã«å©ç¨å¯è½ã"
@@ -1032,7 +1044,7 @@
"åããããªã¼ã«å©ç¨å¯è½ãã§ãããèªç±ã½ããã¦ã§ã¢ãã¯ã³ãã¼ãæã¤ã¦ã¼ã¶ã®èªç±"
"ã¨ãã¦å®ç¾©ããã¾ãããããã¯ç°ãªãåé¡ã«å¯¾ãã¦è¿°ã¹ã¦ããã®ã§ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freeware”"
msgstr "ãããªã¼ã¦ã§ã¢ã"
@@ -1076,7 +1088,7 @@
"ãã¾ãããããããããã«æ
£ããã§ãããããèªç±ã½ããã¦ã§ã¢ããã¤æ¬å½ã®æå³ã"
"è¦ãåºãã§ãããã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Give away software”"
msgstr "ãã½ããã¦ã§ã¢ããããã"
@@ -1094,7 +1106,7 @@
"èªç±ã§ã¯ãªãã¨ããæå³ãå«ã¾ãã¦ãã¾ãããã®æ··ä¹±ãé¿ããã«ã¯ãèªç±ã½ããã¦ã¨"
"ã¢ã¨ãã¦ãªãªã¼ã¹ãã¾ããã¨ããã°ããã®ã§ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Google”"
msgstr "ãã°ã¼ã°ã«ã"
@@ -1114,7 +1126,7 @@
"\"https://duckduckgo.com/\">DuckDuckGo</a>ã¯ã¦ã¼ã¶ããã©ãã¯ããªãã¨ä¸»å¼µãã¦"
"ãã¾ããããããã¡ã¯ç¢ºèªã§ãã¦ãã¾ããããã©ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Hacker”"
msgstr "ãããã«ã¼ã"
@@ -1142,7 +1154,7 @@
msgstr ""
"ãã®ééããåºããªãã§ãã ãããã»ãã¥ãªãã£ãç
´ãã®ã¯ãã¯ã©ãã«ã¼ãã§ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Intellectual property”"
msgstr "ãç¥ç財ç£ã"
@@ -1202,7 +1214,7 @@
"PublicAwarenessOfCopyright-2002.html\">ä¸çãç¥ç財ç£ãæ©æ§(WIPO)ãå½æããå§"
"ãã¦ãã¾ã</a>ã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“LAMP system”"
msgstr "ãLAMPã·ã¹ãã ã"
@@ -1220,7 +1232,7 @@
"ã¯ããã¾ãããã§ãããã“LAMP”ã®ä»£ããã«“GLAMP”ã"
"“GNU, Linux, Apache, MySQL 㨠PHP.”ã¨å¼ã¶ã¹ãã§ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Linux system”"
msgstr "ãLinuxã·ã¹ãã ã"
@@ -1239,7 +1251,7 @@
"ãªã·ã¹ãã ã<a
href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>ã¨å¼ã³ãGNUãã"
"ã¸ã§ã¯ãã«è¬æã表ããåã«ã«ã¼ãã«ã ãã¨å
¨ä½ã®ã·ã¹ãã ãåºå¥ãã¦ãã ããã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Market”"
msgstr "ããã¼ã±ããã"
@@ -1279,7 +1291,7 @@
"åªåãåä¸è¦ãããã¨ã¯ãèªç±ã®éè¦æ§ãå¦å®ãããããã©ã¤ã¨ã¿ãªã»ã½ããã¦ã§ã¢"
"ã妥å½ã¨ãã¾ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Monetize”"
msgstr "ãããã¿ã¤ãºã"
@@ -1317,7 +1329,7 @@
"建è¨çã§å«ççãªãã¸ãã¹ã¯ãéãå¾ããã¨ãã§ãã¾ãããå©çã«ã»ãã®ãã¹ã¦ãå¾"
"å±ããããªãã°ãå«ççã®ã¾ã¾ã§ãããã¨ã¯ããããããªãã§ãããã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“MP3 Player”"
msgstr "ãMP3ãã¬ã¤ã¤ã¼ã"
@@ -1341,7 +1353,7 @@
"ããããã¡ã¯ããã£ã¸ã¿ã«ã»ãªã¼ãã£ãªãã¬ã¤ã¤ã¼ããããã¯æèã許ãã°åã«"
"ããªã¼ãã£ãªãã¬ã¤ã¤ã¼ãã®ç¨èªãææ¡ãã¾ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Open”"
msgstr "ããªã¼ãã³ã"
@@ -1363,7 +1375,7 @@
"ããã¡ã®ä»äºã«å¯¾ãã¦ã©ãã«ä»ããã®ã«ããã®ç¨èªã使ããªãã§ãã
ãããããã¯"
"人ã
ã«ããããã¡ããã®è¦è§£ãå
±æãã¦ããã¨èãããã¦ãã¾ãã¾ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PC”"
msgstr "“PC”"
@@ -1386,7 +1398,7 @@
"“WC”ã¨ããç¨èªããã¦ã£ã³ãã¦ãºãåãã¦ããã³ã³ãã¥ã¼ã¿ã«ææ¡ãã"
"ã¦ãã¾ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Photoshop”"
msgstr "ããã©ãã·ã§ããã"
@@ -1403,7 +1415,7 @@
"ã®ååã§ãããããã¯ãããã©ã¤ã¨ã¿ãªã§ãããé¿ããã¹ãã§ããç»åç·¨éã®èªç±ãª"
"ããã°ã©ã ã¯ã<a
href=\"/software/gimp\">GIMP</a>ã®ããã«ãããããããã¾ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Piracy”"
msgstr "ãæµ·è³è¡çºã"
@@ -1450,7 +1462,7 @@
"banned-from-using-piracy-and-theft-terms-in-hotfile-trial-131129/\">ãæµ·è³è¡"
"çºãã¨ãçªçãã¯æªå£ã§ãã</a>ã¨èªèãã¦ãã¾ããã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PowerPoint”"
msgstr "ããã¯ã¼ãã¤ã³ãã"
@@ -1470,7 +1482,7 @@
"ããæ¨å¥¨ããããªãã·ã§ã³ã«ã¯ãTeXã®<tt>beamer</tt>ã¯ã©ã¹ãLibreOffice.orgã®"
"Impressãªã©ãããã¾ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Protection”"
msgstr "ãä¿è·ã"
@@ -1532,7 +1544,7 @@
"ãã®å ´åã¯ãããã¯ãã£ã¸ã¿ã«å¶é管ç(DRM)ã§ãã<a
href=\"http://"
"DefectiveByDesign.org\">Defective by
Design</a>ãã£ã³ãã¼ã³ãã覧ãã ããã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“RAND (Reasonable and Non-Discriminatory)”"
msgstr "ã妥å½ã§å
¬æ£ãªã"
@@ -1589,7 +1601,7 @@
"”ã®ç¨èªã使ããã¨ãææ¡ãã¾ãããã®ãããªã©ã¤ã»ã³ã¹ã®ãã
ä¸ã¤ã®æ¡ä»¶ã¯å"
"ä¸ã®ãã¤ã¤ãªãã£æéã§ããããããã¯æ£ç¢ºã§ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“SaaS” or “Software as a Service”"
msgstr
"“SaaS”ãããã¯ããµã¼ãã¹ã¨ãã¦ã®ã½ããã¦ã§ã¢ã"
@@ -1629,7 +1641,7 @@
"ã¤ã¥ãã¾ãããªããªã“software como ser
vicio”ã®ã¸ã§ã¼ã¯ã¯ãããã"
"ãã«ã¯ãã¾ãã«ãè¯ããã®ã ããã§ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sell software”"
msgstr "ãã½ããã¦ã§ã¢ã販売ããã"
@@ -1661,7 +1673,7 @@
"ãã®åé¡ã«é¢ãããã詳ããè°è«ã«ã¤ãã¦ã¯ <a href=
\"/philosophy/selling.html"
"\">èªç±ã½ããã¦ã§ã¢ã販売ãã</a> ãã覧ãã ããã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sharing economy”"
msgstr "ãå
±æçµæ¸ã"
@@ -1687,7 +1699,7 @@
msgstr ""
"Uberã®ãããªãã¸ãã¹ã«ããé©ããç¨èªã¯ããåºæ¥é«æãä½æ¥ãµã¼ãã¹çµæ¸ãã§ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Skype”"
msgstr "ãã¹ã«ã¤ãã"
@@ -1711,7 +1723,7 @@
"Skype_Replacement\">ããããã®èªç±ãªã¹ã«ã¤ã代æ¿</a>ã®ä¸ã¤ã試ãã¦ã¿ã¦ãã
ã"
"ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Software Industry”"
msgstr "ãã½ããã¦ã§ã¢ç£æ¥ã"
@@ -1750,7 +1762,7 @@
"è°ä¼ã¯2003å¹´ã«ã½ããã¦ã§ã¢ç¹è¨±ãå¦æ±ºãããç£æ¥ããã製åã®èªåçç£ãã¨å®ç¾©ã"
"ã票決ããã¾ããã</a>"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Source model”"
msgstr "ãã½ã¼ã¹ã»ã¢ãã«ã"
@@ -1775,7 +1787,21 @@
"å ±ãéã°ããèªç±ã½ããã¦ã§ã¢ã®ããã°ã©ã
ãè¨è¿°ãããã¼ã¸ã§ããªã¼ãã³ã½ã¼ã¹ã"
"ã¨ããæ©ä¼ãæä¾ããã ãã§ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "“Commercial”"
+msgid "“Terminal”"
+msgstr "ãåç¨ã"
+
+#. type: Content of: <p>
+msgid ""
+"Mobile phones and tablets are computers, and people should be able to do "
+"their computing on them using free software. To call them “"
+"terminals” supposes that all they are good for is to connect to "
+"servers, which is a bad way to do your own computing."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "“Theft”"
msgstr "ãçªçã"
@@ -1826,7 +1852,7 @@
"(å®è£
)ãããããã¡ã®è¯ãæªã(ä»æ§)ã«åããªãã¨ããæ³å¾ã®æ¹ãå¤ããããã¹ããª"
"ã®ã§ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Trusted Computing”"
msgstr "ããã©ã¹ãããã»ã³ã³ãã¥ã¼ãã£ã³ã°ã"
@@ -1844,7 +1870,7 @@
"å¾ãããã«ã§ãããããªæ
çµã¿ãæå±ãã¦ãã¾ãããããã®è¦ç¹ã§ã¯ãããã¯ãä¿¡"
"ç¨ãã§ãããããªãã®è¦ç¹ã§ã¯ãããã¯ãè£åããã§ãã"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Vendor”"
msgstr "ããã³ãã¼ã"
Index: philosophy/po/words-to-avoid.pot
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.pot,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- philosophy/po/words-to-avoid.pot 28 May 2015 17:29:31 -0000 1.93
+++ philosophy/po/words-to-avoid.pot 6 Jun 2015 09:58:13 -0000 1.94
@@ -7,13 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-05-28 17:27+0000\n"
+"POT-Creation-Date: 2015-06-06 09:55+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <title>
msgid ""
@@ -34,7 +35,6 @@
msgstr ""
#. type: Content of: <div><blockquote><p>
-#:
msgid ""
"Also note <a href=\"/philosophy/categories.html\">Categories of Free "
"Software</a> and <a href=\"/philosophy/why-call-it-the-swindle.html\">Why "
@@ -217,6 +217,15 @@
msgid "“<a href=\"#SourceModel\">Source model</a>” |"
msgstr ""
+#. #if expr="$LANGUAGE_SUFFIX = /^.()$/"
+#. TRANSLATORS: translate if this word is used often in your
+#. language to refer to mobile computers; otherwise,
+#. fill the translation with a space.
+#. type: Content of: <p>
+msgid "“<a href=\"#Terminal\">Terminal</a>” |"
+msgstr ""
+
+#. #endif
#. type: Content of: <p>
msgid "“<a href=\"#Theft\">Theft</a>” |"
msgstr ""
@@ -229,7 +238,7 @@
msgid "“<a href=\"#Vendor\">Vendor</a>”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Alternative”"
msgstr ""
@@ -253,7 +262,7 @@
"to offer users those “alternatives” to free software."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“BSD-style”"
msgstr ""
@@ -273,7 +282,7 @@
"and avoid the vague term “BSD-style.”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Closed”"
msgstr ""
@@ -290,7 +299,7 @@
"“proprietary”</a>."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Cloud Computing”"
msgstr ""
@@ -371,7 +380,7 @@
"by the same ideals as we are."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Commercial”"
msgstr ""
@@ -410,7 +419,7 @@
"in that way."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Compensation”"
msgstr ""
@@ -432,7 +441,7 @@
"that are pushing unjust laws on us."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consume”"
msgstr ""
@@ -459,7 +468,7 @@
msgid "See also the following entry."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consumer”"
msgstr ""
@@ -519,7 +528,7 @@
"noted before</a>."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Content”"
msgstr ""
@@ -572,7 +581,7 @@
"system” (WRS)."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creative Commons licensed”"
msgstr ""
@@ -594,7 +603,7 @@
"certain work uses, find out and then make your statement."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creator”"
msgstr ""
@@ -610,7 +619,7 @@
"the author."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Goods”"
msgstr ""
@@ -625,7 +634,7 @@
"don't include freedom and community."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Locks”"
msgstr ""
@@ -666,7 +675,7 @@
"handcuffs” and say why."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Rights Management”"
msgstr ""
@@ -692,7 +701,7 @@
"campaign to abolish DRM</a>."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Ecosystem”"
msgstr ""
@@ -724,7 +733,7 @@
"traditional arts…and computer users' freedom."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FLOSS”"
msgstr ""
@@ -738,7 +747,7 @@
"don't use a neutral term."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“For free”"
msgstr ""
@@ -764,7 +773,7 @@
"software.”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FOSS”"
msgstr ""
@@ -778,7 +787,7 @@
"freedom, don't use a neutral term."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freely available”"
msgstr ""
@@ -791,7 +800,7 @@
"of it. These are answers to different questions."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freeware”"
msgstr ""
@@ -821,7 +830,7 @@
"understand what the issue is."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Give away software”"
msgstr ""
@@ -834,7 +843,7 @@
"software.”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Google”"
msgstr ""
@@ -848,7 +857,7 @@
"to track its users, although we cannot confirm."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Hacker”"
msgstr ""
@@ -869,7 +878,7 @@
"“crackers.”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Intellectual property”"
msgstr ""
@@ -913,7 +922,7 @@
"embarrassed</a>."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“LAMP system”"
msgstr ""
@@ -926,7 +935,7 @@
"“GLAMP”: “GNU, Linux, Apache, MySQL and PHP.”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Linux system”"
msgstr ""
@@ -940,7 +949,7 @@
"Project credit and to distinguish the whole system from the kernel alone."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Market”"
msgstr ""
@@ -968,7 +977,7 @@
"software."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Monetize”"
msgstr ""
@@ -995,7 +1004,7 @@
"else to profit, it is not likely to remain ethical."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“MP3 Player”"
msgstr ""
@@ -1011,7 +1020,7 @@
"context permits."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Open”"
msgstr ""
@@ -1026,7 +1035,7 @@
"label us or our work—that leads people to think we share those views."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PC”"
msgstr ""
@@ -1042,7 +1051,7 @@
msgid "The term “WC” has been suggested for a computer running
Windows."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Photoshop”"
msgstr ""
@@ -1055,7 +1064,7 @@
"images, such as the <a href=\"/software/gimp\">GIMP</a>."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Piracy”"
msgstr ""
@@ -1081,7 +1090,6 @@
msgstr ""
#. type: Content of: <p>
-#:
msgid ""
"A US judge, presiding over a trial for copyright infringement, recognized "
"that <a "
@@ -1089,7 +1097,7 @@
"and “theft” are smear-words.</a>"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PowerPoint”"
msgstr ""
@@ -1103,7 +1111,7 @@
"LibreOffice.org's Impress."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Protection”"
msgstr ""
@@ -1148,7 +1156,7 @@
"Design</a> campaign."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“RAND (Reasonable and Non-Discriminatory)”"
msgstr ""
@@ -1188,7 +1196,7 @@
"licenses is a uniform royalty fee."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“SaaS” or “Software as a Service”"
msgstr ""
@@ -1216,7 +1224,7 @@
"give up."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sell software”"
msgstr ""
@@ -1238,7 +1246,7 @@
"further discussion of this issue."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sharing economy”"
msgstr ""
@@ -1258,7 +1266,7 @@
"service economy.”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Skype”"
msgstr ""
@@ -1275,7 +1283,7 @@
"numerous free Skype replacements</a>."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Software Industry”"
msgstr ""
@@ -1302,7 +1310,7 @@
"goods.”</a>"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Source model”"
msgstr ""
@@ -1319,7 +1327,19 @@
"describing free software programs."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
+msgid "“Terminal”"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Mobile phones and tablets are computers, and people should be able to do "
+"their computing on them using free software. To call them "
+"“terminals” supposes that all they are good for is to connect to "
+"servers, which is a bad way to do your own computing."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "“Theft”"
msgstr ""
@@ -1356,7 +1376,7 @@
"wrong (the spec), the laws are what should change."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Trusted Computing”"
msgstr ""
@@ -1369,7 +1389,7 @@
"from your point of view, it is “treacherous.”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Vendor”"
msgstr ""
Index: philosophy/po/words-to-avoid.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ru.po,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- philosophy/po/words-to-avoid.ru.po 29 May 2015 07:52:28 -0000 1.120
+++ philosophy/po/words-to-avoid.ru.po 6 Jun 2015 09:58:13 -0000 1.121
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-05-28 17:27+0000\n"
+"POT-Creation-Date: 2015-06-06 09:55+0000\n"
"PO-Revision-Date: 2015-05-29 17:34+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -15,6 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-06-06 09:55+0000\n"
#. type: Content of: <title>
msgid ""
@@ -309,6 +310,21 @@
"“<a href=\"#SourceModel\"><span xml:lang=\"en\" lang=\"en\">Source "
"model</span> (Ð¼Ð¾Ð´ÐµÐ»Ñ Ð¸ÑÑ
одного ÑекÑÑа)</a>” |"
+#. #if expr="$LANGUAGE_SUFFIX = /^.()$/"
+#. TRANSLATORS: translate if this word is used often in your
+#. language to refer to mobile computers; otherwise,
+#. fill the translation with a space.
+#. type: Content of: <p>
+# | “<a [-href=\"#Commercial\">Commercial</a>”-]
+# | {+href=\"#Terminal\">Terminal</a>”+} |
+#, fuzzy
+#| msgid "“<a href=\"#Commercial\">Commercial</a>” |"
+msgid "“<a href=\"#Terminal\">Terminal</a>” |"
+msgstr ""
+"“<a href=\"#Commercial\"><span xml:lang=\"en\" lang=\"en\">Commercial</"
+"span> (коммеÑÑеÑкий)</a>” |"
+
+#. #endif
#. type: Content of: <p>
msgid "“<a href=\"#Theft\">Theft</a>” |"
msgstr ""
@@ -327,7 +343,7 @@
"“<a href=\"#Vendor\"><span xml:lang=\"en\" lang=\"en\">Vendor</span> "
"(ÑоваÑопÑоизводиÑелÑ)</a>”"
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Alternative”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Alternative</span>
(алÑÑеÑнаÑивнÑй)"
@@ -364,7 +380,7 @@
"a>, поÑабоÑаÑÑ ÑвоиÑ
полÑзоваÑелей. ÐÑ Ð½Ðµ
дÑмаем, ÑÑо пÑедлагаÑÑ "
"полÑзоваÑелÑм Ñакие “алÑÑеÑнаÑивє
ÑвободнÑм пÑогÑаммам Ñ
оÑоÑо."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“BSD-style”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">BSD-style</span> (в ÑÑиле BSD)"
@@ -394,7 +410,7 @@
"list.html\"> конкÑеÑнÑÑ Ð»Ð¸ÑензиÑ, о коÑоÑой
Ð¸Ð´ÐµÑ ÑеÑÑ</a> и избегаÑÑ "
"ÑаÑплÑвÑаÑого вÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ “в ÑÑиле
BSD”."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Closed”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Closed</span>
(закÑÑÑÑй)”"
@@ -420,7 +436,7 @@
"href=\"/philosophy/categories.html#ProprietarySoftware\">неÑвободнÑми</"
"a>”."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Cloud Computing”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Cloud Computing</span>
(облаÑнÑе "
@@ -549,7 +565,7 @@
"ÑазÑабоÑÑиком неÑвободнÑÑ
пÑогÑамм, он не
моÑивиÑÑеÑÑÑ Ñеми идеалами, "
"коÑоÑÑе моÑивиÑÑÑÑ Ð½Ð°Ñ."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Commercial”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Commercial</span>
(коммеÑÑеÑкий)"
@@ -611,7 +627,7 @@
"возможноÑÑÑ. ÐавайÑе ÑÑаÑелÑно избегаÑÑ
ÑпоÑÑÐµÐ±Ð»ÐµÐ½Ð¸Ñ Ñлова “"
"коммеÑÑеÑкий” в ÑÑом ÑмÑÑле."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Compensation”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Compensation</span>
(компенÑаÑиÑ)"
@@ -644,7 +660,7 @@
"изÑедка Ñак оно и еÑÑÑ, но в болÑÑинÑÑве
ÑлÑÑаев ÑÑо ознаÑÐ°ÐµÑ ÑÑбÑидиÑование "
"ÑеÑ
же издаÑелÑÑкиÑ
компаний, коÑоÑÑе
навÑзÑваÑÑ Ð½Ð°Ð¼ неÑпÑаведливÑе законÑ."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consume”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Consume</span>
(поÑÑеблÑÑÑ)”"
@@ -685,7 +701,7 @@
msgid "See also the following entry."
msgstr "См. Ñакже ÑледÑÑÑÐ¸Ñ ÑÑаÑÑÑ."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consumer”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Consumer</span>
(поÑÑебиÑелÑ)”"
@@ -776,7 +792,7 @@
"theguardian.com/commentisfree/2013/aug/11/capitalism-language-raymond-"
"williams\"> оÑмеÑалаÑÑ Ð¸ Ñанее</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Content”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Content</span>
(конÑенÑ)”"
@@ -860,7 +876,7 @@
"ÑÑÑÐ°Ð½Ð¸Ñ Ð½Ð° ÑайÑе ÐÑемиÑной паÑÑинÑ. ÐлÑ
ÑÑого Ð¼Ñ ÑекомендÑем вÑÑажение "
"“ÑиÑÑема ÑедакÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ ÑайÑов”."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creative Commons licensed”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Creative Commons licensed</span> "
@@ -895,7 +911,7 @@
"лиÑÐµÐ½Ð·Ð¸Ñ Ð¸ÑполÑзÑеÑÑÑ Ð´Ð»Ñ Ð¾Ð¿Ñеделенного
пÑоизведениÑ, ÑзнайÑе ÑÑо, а заÑем "
"говоÑиÑе."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creator”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Creator</span>
(ÑоздаÑелÑ)”"
@@ -920,7 +936,7 @@
"дейÑÑвиÑелÑноÑÑи — ÑÑо
“пÑавообладаÑелє. ÐÑи "
"вÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑквиваленÑнÑ: ÑаÑÑо
пÑавообладаÑÐµÐ»Ñ Ð½Ðµ ÑвлÑеÑÑÑ Ð°Ð²ÑоÑом."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Goods”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Digital Goods</span>
(ÑиÑÑовÑе "
@@ -945,7 +961,7 @@
"Ñакже ÑоÑмÑлиÑÑÐµÑ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ð² ÑеÑминаÑ
Ñкономики, неглÑбокие и огÑаниÑеннÑе "
"ÑенноÑÑи коÑоÑÑÑ
не вклÑÑаÑÑ Ð² ÑебÑ
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð¸ ÑообÑеÑÑво."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Locks”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Digital Locks</span>
(ÑиÑÑовÑе "
@@ -1013,7 +1029,7 @@
"демонÑÑÑаÑивно заменÑем ÑÑо вÑÑажение на
“ÑиÑÑовÑе наÑÑÑники” и "
"говоÑим, поÑÐµÐ¼Ñ Ð¼Ñ Ñак поÑÑÑпаем."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Rights Management”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Digital Rights Management</span> "
@@ -1053,7 +1069,7 @@
"DefectiveByDesign.org/\"> кампании за ÑпÑазднение
ÑиÑÑового ÑпÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ "
"огÑаниÑениÑми</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Ecosystem”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Ecosystem</span>
(ÑкоÑиÑÑема)”"
@@ -1102,7 +1118,7 @@
"Ñеловека, миÑ, здоÑовÑе обÑеÑÑва,
ÑÑабилÑнÑй климаÑ, ÑиÑÑÑй воздÑÑ
и водÑ, "
"иÑÑезаÑÑие видÑ, наÑоднÑе пÑомÑÑлÑ... и
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð¿Ð¾Ð»ÑзоваÑелей компÑÑÑеÑов."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FLOSS”"
msgstr "“FLOSS”"
@@ -1121,7 +1137,7 @@
"FLOSS”. Ðо еÑли Ð²Ñ Ñ
оÑиÑе показаÑÑ, ÑÑо
оÑÑÑаиваеÑе ÑвободÑ, не "
"полÑзÑйÑеÑÑ Ð½ÐµÐ¹ÑÑалÑнÑм вÑÑажением."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“For free”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">For Free</span>
(беÑплаÑно)”"
@@ -1159,7 +1175,7 @@
"ЧÑÐ¾Ð±Ñ Ð¸Ð·Ð±ÐµÐ¶Ð°ÑÑ Ð¿ÑÑаниÑÑ, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе
говоÑиÑÑ, ÑÑо пÑогÑамма доÑÑÑпна “"
"как ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿ÑогÑамма”."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FOSS”"
msgstr "“FOSS”"
@@ -1178,7 +1194,7 @@
"нейÑÑалиÑеÑ, Ñо вÑÑажение “FLOSS“
лÑÑÑе. Ðо еÑли Ð²Ñ Ñ
оÑиÑе "
"показаÑÑ, ÑÑо оÑÑÑаиваеÑе ÑвободÑ, не
полÑзÑйÑеÑÑ Ð½ÐµÐ¹ÑÑалÑнÑм вÑÑажением."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freely available”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Freely Available</span>
(Ñвободно "
@@ -1198,7 +1214,7 @@
"копиÑ. “Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð¿ÑогÑамма”
опÑеделÑеÑÑÑ Ð² ÑеÑминаÑ
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ "
"полÑзоваÑелей, Ñ ÐºÐ¾ÑоÑÑÑ
еÑÑÑ ÐµÐµ копиÑ.
ÐÑо оÑвеÑÑ Ð½Ð° ÑазнÑе вопÑоÑÑ."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freeware”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Freeware</span>
(беÑплаÑнÑе "
@@ -1249,7 +1265,7 @@
"ознаÑÐ°ÐµÑ Ð² ÑоÑноÑÑи Ñо, ÑÑо говоÑиÑÑÑ, они
по-наÑÑоÑÑÐµÐ¼Ñ Ð¿Ð¾Ð¹Ð¼ÑÑ, в Ñем "
"ÑоÑÑÐ¾Ð¸Ñ Ð¿Ñоблема."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Give away software”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Give Away Software</span> "
@@ -1270,7 +1286,7 @@
"ÑпоÑобов избежаÑÑ Ð¿ÑÑаниÑÑ —
говоÑиÑÑ “вÑпÑÑкаÑÑ Ð² каÑеÑÑве "
"Ñвободной пÑогÑаммє."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Google”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Google</span>
(гÑглиÑÑ)”"
@@ -1292,7 +1308,7 @@
"<a href=\"https://duckduckgo.com/\">DuckDuckGo</a> ÑÑвеÑждаеÑ,
ÑÑо не "
"оÑÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÐµÑ ÑвоиÑ
полÑзоваÑелей, Ñ
оÑÑ Ð¼Ñ
не можем ÑÑого подÑвеÑдиÑÑ."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Hacker”"
msgstr "“<span xml:lang=\"en\" lang=\"en\">Hacker</span> (Ñ
акеÑ)”"
@@ -1322,7 +1338,7 @@
"Ðе ÑаÑпÑоÑÑÑанÑйÑе, пожалÑйÑÑа, ÑÑой
оÑибки. ÐÑди, коÑоÑÑе взламÑваÑÑ "
"ÑиÑÑÐµÐ¼Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑÑи — ÑÑо
“взломÑики”."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Intellectual property”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Intellectual Property</span> "
@@ -1389,7 +1405,7 @@
"philosophy/wipo-PublicAwarenessOfCopyright-2002.html\"> наÑинаеÑ
ÑмÑÑаÑÑ "
"ÐÑемиÑнÑÑ Ð¾ÑганизаÑиÑ
“инÑеллекÑÑалÑной ÑобÑÑвенноÑÑи”</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“LAMP system”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">LAMP System</span> (ÑиÑÑема
LAMP)"
@@ -1409,7 +1425,7 @@
"ознаÑÐ°ÐµÑ ÑиÑÑÐµÐ¼Ñ GNU/Linux. Так ÑÑо вмеÑÑо
“LAMP” ÑÑо должно "
"бÑÑÑ “GLAMP”: “GNU, Linux, Apache, MySQL, PHP”."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Linux system”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Linux System</span> (ÑиÑÑема
Linux)"
@@ -1432,7 +1448,7 @@
"GNU/Linux</a>, как Ð´Ð»Ñ Ñого, ÑÑÐ¾Ð±Ñ Ð¾ÑдаÑÑ Ð´Ð¾Ð»Ð¶Ð½Ð¾Ðµ
пÑоекÑÑ GNU, Ñак и Ð´Ð»Ñ "
"Ñого, ÑÑÐ¾Ð±Ñ Ð¾ÑлиÑаÑÑ ÑиÑÑÐµÐ¼Ñ Ð² Ñелом оÑ
ÑдÑа, взÑÑого в оÑделÑноÑÑи."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Market”"
msgstr "“<span xml:lang=\"en\" lang=\"en\">Market</span>
(ÑÑнок)”"
@@ -1473,7 +1489,7 @@
"ÐºÐ°Ð¼Ð¿Ð°Ð½Ð¸Ñ Ð·Ð° ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ðº попÑÑкам
пÑедпÑиÑÑÐ¸Ñ Ð·Ð°Ð²Ð¾ÐµÐ²Ð°ÑÑ Ð¿ÑоÑÑой ÑÑпеÑ
знаÑÐ¸Ñ "
"оÑÑиÑаÑÑ Ð²Ð°Ð¶Ð½Ð¾ÑÑÑ ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ð¸ опÑавдÑваÑÑ
неÑвободное пÑогÑаммное обеÑпеÑение."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Monetize”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Monetize</span>
(ÑеализовÑваÑÑ, "
@@ -1516,7 +1532,7 @@
"ÐÑоизводиÑелÑное и ÑÑиÑное пÑедпÑиÑÑие
Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°ÑабаÑÑваÑÑ Ð´ÐµÐ½Ñги, но еÑли "
"оно подÑинÑÐµÑ Ð¿ÑибÑли вÑе оÑÑалÑное, Ñо
оно едва ли оÑÑанеÑÑÑ ÑÑиÑнÑм."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“MP3 Player”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">MP3 Player</span>
(пÑоигÑÑваÑÐµÐ»Ñ "
@@ -1544,7 +1560,7 @@
"ÑиÑÑовой пÑоигÑÑваÑÐµÐ»Ñ Ð·Ð²Ñка” или
пÑоÑÑо “пÑоигÑÑваÑÐµÐ»Ñ "
"звÑка”, еÑли ÑÑо допÑÑÐºÐ°ÐµÑ ÐºÐ¾Ð½ÑекÑÑ."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Open”"
msgstr "“<span xml:lang=\"en\" lang=\"en\">Open</span>
(оÑкÑÑÑÑй)”"
@@ -1568,7 +1584,7 @@
"ÑпоÑÑеблÑйÑе его, пожалÑйÑÑа, ÑÑобÑ
помеÑиÑÑ Ð½Ð°Ñ Ð¸Ð»Ð¸ наÑÑ ÑабоÑÑ "
"— ÑÑо заÑÑавлÑÐµÑ Ð»Ñдей дÑмаÑÑ, ÑÑо мÑ
ÑазделÑем ÑÑи взглÑдÑ."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PC”"
msgstr "“<span xml:lang=\"en\" lang=\"en\">PC</span> (ÐÐ)”"
@@ -1592,7 +1608,7 @@
"ÐÐ»Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑеÑа под ÑпÑавлением Windows
пÑедложено ÑокÑаÑение “<span "
"xml:lang=\"en\" lang=\"en\">WC</span>”."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Photoshop”"
msgstr "“<span xml:lang=\"en\" lang=\"en\">Photoshop</span>”"
@@ -1612,7 +1628,7 @@
"пÑогÑамм Ð´Ð»Ñ ÑедакÑиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð·Ð¾Ð±Ñажений,
ÑакиÑ
, как <a href=\"/software/gimp"
"\">GIMP</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Piracy”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Piracy</span>
(пиÑаÑÑÑво)”"
@@ -1665,7 +1681,7 @@
"from-using-piracy-and-theft-terms-in-hotfile-trial-131129/\"> “"
"пиÑаÑÑÑво” и “кÑажа” —
гÑÑзнÑе вÑÑажениÑ</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PowerPoint”"
msgstr "“<span xml:lang=\"en\" lang=\"en\">PowerPoint</span>”"
@@ -1686,7 +1702,7 @@
"РекомендÑÑÑÑÑ Ñакие ваÑианÑÑ, как клаÑÑ
<em>beamer</em> из ÑиÑÑÐµÐ¼Ñ TeX или "
"пÑогÑамма Impress из пакеÑа LibreOffice.org."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Protection”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Protection</span>
(заÑиÑа)”"
@@ -1755,7 +1771,7 @@
"огÑаниÑениÑми (DRM) — Ñм. ÑÐ°Ð¹Ñ ÐºÐ°Ð¼Ð¿Ð°Ð½Ð¸Ð¸
“<a href=\"http://"
"DefectiveByDesign.org\">ÐеÑÐµÐºÑ Ð³Ð°ÑанÑиÑован</a>”."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“RAND (Reasonable and Non-Discriminatory)”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">RAND (Reasonable and Non-"
@@ -1819,7 +1835,7 @@
"или “ÐÐД, в каÑеÑÑве заменÑ. Ðно
ÑоÑно, поÑÐ¾Ð¼Ñ ÑÑо единÑÑвеннÑм "
"ÑÑловием Ð´Ð»Ñ ÑÑиÑ
лиÑензий ÑвлÑеÑÑÑ
единообÑазнÑе лиÑензионнÑе оÑÑиÑлениÑ."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“SaaS” or “Software as a Service”"
msgstr "“SaaS” или
“пÑогÑамма-ÑÑлÑга”"
@@ -1860,7 +1876,7 @@
"“<span xml:lang=\"es\" lang=\"es\">software como ser vicio</"
"span>” ÑлиÑком Ñ
оÑоÑа, ÑÑÐ¾Ð±Ñ Ð¾Ñ Ð½ÐµÐµ
оÑказÑваÑÑÑÑ."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sell software”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Sell Software</span>
(пÑодаваÑÑ "
@@ -1894,7 +1910,7 @@
"ÐалÑнейÑее обÑÑждение пÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ñм. в
ÑÑаÑÑе “<a href=\"/philosophy/"
"selling.html\">ÐÑодажа ÑвободнÑÑ
пÑогÑамм</a>”."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sharing economy”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Sharing economy</span>
(Ñкономика "
@@ -1925,7 +1941,7 @@
"ÐÐ»Ñ ÑакиÑ
пÑедпÑиÑÑий как Uber лÑÑÑе подÑ
Ð¾Ð´Ð¸Ñ Ð²ÑÑажение “Ñкономика "
"ÑделÑнÑÑ
ÑÑлÑг”."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Skype”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Skype</span> (обÑаÑÑÑÑ Ð¿Ð¾
СкайпÑ)"
@@ -1951,7 +1967,7 @@
"Ñвобода, и ваÑа конÑиденÑиалÑноÑÑÑ,
попÑобÑйÑе Ð¾Ð´Ð½Ñ Ð¸Ð· <a href=\"https://"
"libreplanet.org/wiki/Group:Skype_Replacement\"> ÑвободнÑÑ
замен
Скайпа</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Software Industry”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Software Industry</span> "
@@ -1994,7 +2010,7 @@
"годÑ, пÑоголоÑовал за Ñо, ÑÑÐ¾Ð±Ñ Ð¾Ð¿ÑеделÑÑÑ
“индÑÑÑÑиє как "
"“авÑомаÑизиÑованное пÑоизводÑÑво
маÑеÑиалÑнÑÑ
благ”</a>."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Source model”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Source model</span> (Ð¼Ð¾Ð´ÐµÐ»Ñ "
@@ -2023,7 +2039,24 @@
"ÑвÑзной инÑоÑмаÑии, но оно даеÑ
возможноÑÑÑ ÑказаÑÑ “оÑкÑÑÑÑй иÑÑ
однÑй "
"ÑекÑÑ” на ÑÑÑаниÑаÑ
, опиÑÑваÑÑиÑ
ÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð»Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑеÑов."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
+# | [-“Commercial”-]{+“Terminal”+}
+#, fuzzy
+#| msgid "“Commercial”"
+msgid "“Terminal”"
+msgstr ""
+"“<span xml:lang=\"en\" lang=\"en\">Commercial</span>
(коммеÑÑеÑкий)"
+"”"
+
+#. type: Content of: <p>
+msgid ""
+"Mobile phones and tablets are computers, and people should be able to do "
+"their computing on them using free software. To call them “"
+"terminals” supposes that all they are good for is to connect to "
+"servers, which is a bad way to do your own computing."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "“Theft”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Theft</span>
(воÑовÑÑво)”"
@@ -2078,7 +2111,7 @@
"ÑооÑвеÑÑÑвÑÑÑ Ð½Ð°Ñим пÑедÑÑавлениÑм о
добÑе и зле (ÑпеÑиÑикаÑии), Ñо именно "
"Ð·Ð°ÐºÐ¾Ð½Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑÑÑ."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Trusted Computing”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Trusted Computing</span> "
@@ -2099,7 +2132,7 @@
"“довеÑеннÑй”, а Ñ Ð²Ð°Ñей ÑоÑки
зÑÐµÐ½Ð¸Ñ — “"
"веÑоломнÑй”."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Vendor”"
msgstr ""
"“<span xml:lang=\"en\" lang=\"en\">Vendor</span>
(ÑоваÑопÑоизводиÑелÑ)"
Index: philosophy/po/words-to-avoid.sq.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.sq.po,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- philosophy/po/words-to-avoid.sq.po 28 May 2015 17:29:32 -0000 1.47
+++ philosophy/po/words-to-avoid.sq.po 6 Jun 2015 09:58:14 -0000 1.48
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-05-28 17:27+0000\n"
+"POT-Creation-Date: 2015-06-06 09:55+0000\n"
"PO-Revision-Date: 2013-01-05 20:03+0200\n"
"Last-Translator: Besnik Bleta <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -226,6 +226,15 @@
msgid "“<a href=\"#SourceModel\">Source model</a>” |"
msgstr ""
+#. #if expr="$LANGUAGE_SUFFIX = /^.()$/"
+#. TRANSLATORS: translate if this word is used often in your
+#. language to refer to mobile computers; otherwise,
+#. fill the translation with a space.
+#. type: Content of: <p>
+msgid "“<a href=\"#Terminal\">Terminal</a>” |"
+msgstr ""
+
+#. #endif
#. type: Content of: <p>
msgid "“<a href=\"#Theft\">Theft</a>” |"
msgstr ""
@@ -238,7 +247,7 @@
msgid "“<a href=\"#Vendor\">Vendor</a>”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Alternative”"
msgstr ""
@@ -261,7 +270,7 @@
"to offer users those “alternatives” to free software."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“BSD-style”"
msgstr ""
@@ -281,7 +290,7 @@
"style.”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Closed”"
msgstr ""
@@ -297,7 +306,7 @@
"html#ProprietarySoftware\"> “proprietary”</a>."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Cloud Computing”"
msgstr ""
@@ -377,7 +386,7 @@
"the same ideals as we are."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Commercial”"
msgstr ""
@@ -416,7 +425,7 @@
"in that way."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Compensation”"
msgstr ""
@@ -438,7 +447,7 @@
"that are pushing unjust laws on us."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consume”"
msgstr ""
@@ -465,7 +474,7 @@
msgid "See also the following entry."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consumer”"
msgstr ""
@@ -525,7 +534,7 @@
"williams\"> noted before</a>."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Content”"
msgstr ""
@@ -577,7 +586,7 @@
"system” (WRS)."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creative Commons licensed”"
msgstr ""
@@ -599,7 +608,7 @@
"work uses, find out and then make your statement."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creator”"
msgstr ""
@@ -615,7 +624,7 @@
"the author."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Goods”"
msgstr ""
@@ -630,7 +639,7 @@
"don't include freedom and community."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Locks”"
msgstr ""
@@ -672,7 +681,7 @@
"handcuffs” and say why."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Rights Management”"
msgstr ""
@@ -698,7 +707,7 @@
"campaign to abolish DRM</a>."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Ecosystem”"
msgstr ""
@@ -730,7 +739,7 @@
"traditional arts…and computer users' freedom."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FLOSS”"
msgstr ""
@@ -743,7 +752,7 @@
"want to show you stand for freedom, don't use a neutral term."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“For free”"
msgstr ""
@@ -769,7 +778,7 @@
"software.”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FOSS”"
msgstr ""
@@ -782,7 +791,7 @@
"But if you want to show you stand for freedom, don't use a neutral term."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freely available”"
msgstr ""
@@ -795,7 +804,7 @@
"of it. These are answers to different questions."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freeware”"
msgstr ""
@@ -825,7 +834,7 @@
"understand what the issue is."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Give away software”"
msgstr ""
@@ -838,7 +847,7 @@
"software.”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Google”"
msgstr ""
@@ -852,7 +861,7 @@
"to track its users, although we cannot confirm."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Hacker”"
msgstr ""
@@ -873,7 +882,7 @@
"crackers.”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Intellectual property”"
msgstr ""
@@ -916,7 +925,7 @@
"World “Intellectual Property” Organization embarrassed</a>."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“LAMP system”"
msgstr ""
@@ -929,7 +938,7 @@
"GNU, Linux, Apache, MySQL and PHP.”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Linux system”"
msgstr ""
@@ -943,7 +952,7 @@
"distinguish the whole system from the kernel alone."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Market”"
msgstr ""
@@ -971,7 +980,7 @@
"software."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Monetize”"
msgstr ""
@@ -998,7 +1007,7 @@
"else to profit, it is not likely to remain ethical."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“MP3 Player”"
msgstr ""
@@ -1014,7 +1023,7 @@
"permits."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Open”"
msgstr ""
@@ -1029,7 +1038,7 @@
"work—that leads people to think we share those views."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PC”"
msgstr ""
@@ -1046,7 +1055,7 @@
"The term “WC” has been suggested for a computer running Windows."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Photoshop”"
msgstr ""
@@ -1059,7 +1068,7 @@
"images, such as the <a href=\"/software/gimp\">GIMP</a>."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Piracy”"
msgstr ""
@@ -1092,7 +1101,7 @@
"theft” are smear-words.</a>"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PowerPoint”"
msgstr ""
@@ -1106,7 +1115,7 @@
"org's Impress."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Protection”"
msgstr ""
@@ -1151,7 +1160,7 @@
"Design</a> campaign."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“RAND (Reasonable and Non-Discriminatory)”"
msgstr ""
@@ -1190,7 +1199,7 @@
"licenses is a uniform royalty fee."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“SaaS” or “Software as a Service”"
msgstr ""
@@ -1217,7 +1226,7 @@
"give up."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sell software”"
msgstr ""
@@ -1239,7 +1248,7 @@
"further discussion of this issue."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sharing economy”"
msgstr ""
@@ -1259,7 +1268,7 @@
"service economy.”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Skype”"
msgstr ""
@@ -1275,7 +1284,7 @@
"Skype_Replacement\"> numerous free Skype replacements</a>."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Software Industry”"
msgstr ""
@@ -1301,7 +1310,7 @@
"automated production of material goods.”</a>"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Source model”"
msgstr ""
@@ -1318,7 +1327,19 @@
"describing free software programs."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
+msgid "“Terminal”"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Mobile phones and tablets are computers, and people should be able to do "
+"their computing on them using free software. To call them “"
+"terminals” supposes that all they are good for is to connect to "
+"servers, which is a bad way to do your own computing."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "“Theft”"
msgstr ""
@@ -1354,7 +1375,7 @@
"wrong (the spec), the laws are what should change."
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Trusted Computing”"
msgstr ""
@@ -1367,7 +1388,7 @@
"view, it is “treacherous.”"
msgstr ""
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Vendor”"
msgstr ""
Index: philosophy/po/words-to-avoid.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.sr.po,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- philosophy/po/words-to-avoid.sr.po 28 May 2015 17:29:32 -0000 1.101
+++ philosophy/po/words-to-avoid.sr.po 6 Jun 2015 09:58:14 -0000 1.102
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-05-28 17:27+0000\n"
+"POT-Creation-Date: 2015-06-06 09:55+0000\n"
"PO-Revision-Date: 2009-10-18 17:51+0200\n"
"Last-Translator: Strahinya Radich <address@hidden>\n"
"Language-Team: Serbian <address@hidden>\n"
@@ -300,6 +300,18 @@
msgstr ""
# type: Content of: <h4>
+#. #if expr="$LANGUAGE_SUFFIX = /^.()$/"
+#. TRANSLATORS: translate if this word is used often in your
+#. language to refer to mobile computers; otherwise,
+#. fill the translation with a space.
+#. type: Content of: <p>
+#, fuzzy
+#| msgid "“<a href=\"#Commercial\">Commercial</a>” |"
+msgid "“<a href=\"#Terminal\">Terminal</a>” |"
+msgstr "â<a href=\"#Commercial\">ÐомеÑÑиÑално</a>â |"
+
+# type: Content of: <h4>
+#. #endif
#. type: Content of: <p>
msgid "“<a href=\"#Theft\">Theft</a>” |"
msgstr "â<a href=\"#Theft\">ÐÑаÑа</a>â |"
@@ -315,7 +327,7 @@
msgstr "â<a href=\"#Vendor\">ÐÑодаваÑ</a>â"
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Alternative”"
msgstr ""
@@ -339,7 +351,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“BSD-style”"
msgstr "âУ ÑÑÐ¸Ð»Ñ ÐСÐ-аâ"
@@ -369,7 +381,7 @@
"ÑÑÐ¸Ð»Ñ ÐСÐ-аâ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Closed”"
msgstr "âÐаÑвоÑеноâ"
@@ -395,7 +407,7 @@
"categories.html#ProprietarySoftware\">âвлаÑниÑкимâ</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Cloud Computing”"
msgstr "âРаÑÑнаÑÑÑво Ñ Ð¾Ð±Ð»Ð°ÐºÑ (енгл. <em>cloud
computing</em>)â"
@@ -508,7 +520,7 @@
"моÑивиÑани ми."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Commercial”"
msgstr "âÐомеÑÑиÑалноâ"
@@ -569,7 +581,7 @@
"âкомеÑÑиÑалноâ на ÑÐ°Ñ Ð½Ð°Ñин."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Compensation”"
msgstr "âÐомпензаÑиÑаâ"
@@ -599,7 +611,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consume”"
msgstr ""
@@ -627,7 +639,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consumer”"
msgstr "âÐоÑÑоÑаÑâ"
@@ -743,7 +755,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Content”"
msgstr "âСадÑжаÑâ"
@@ -846,7 +858,7 @@
"WRS</em>)."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
#, fuzzy
#| msgid "“Creator”"
msgid "“Creative Commons licensed”"
@@ -871,7 +883,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creator”"
msgstr "âТвоÑаÑâ"
@@ -903,7 +915,7 @@
"âаÑÑоÑâ. ÐеÑÑÑим, ÑеÑÑо Ñе оно на ÑÑа
миÑлиÑе âноÑÐ¸Ð»Ð°Ñ Ð°ÑÑоÑÑкиÑ
пÑаваâ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Goods”"
msgstr "âÐигиÑална Ñобаâ"
@@ -928,7 +940,7 @@
"пÑоизводиÑи и пÑодаваÑи."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Locks”"
msgstr ""
@@ -971,7 +983,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Rights Management”"
msgstr "âУпÑавÑаÑе дигиÑалним пÑавимаâ"
@@ -1013,7 +1025,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Ecosystem”"
msgstr "âÐкоÑиÑÑемâ"
@@ -1076,7 +1088,7 @@
"ÑаÑÑнаÑа."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FLOSS”"
msgstr ""
@@ -1090,7 +1102,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“For free”"
msgstr "âÐеÑплаÑноâ"
@@ -1131,7 +1143,7 @@
"ÑоÑÑвеÑâ (енгл. <em>as free software</em>)."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FOSS”"
msgstr ""
@@ -1145,7 +1157,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freely available”"
msgstr "âСлободно доÑÑÑпан (енгл. <em>freely
available</em>)â"
@@ -1165,7 +1177,7 @@
"поÑедÑÑÑ Ð¿ÑимеÑак. То ÑÑ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñи на два
ÑазлиÑиÑа пиÑаÑа."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freeware”"
msgstr "âФÑивеÑâ"
@@ -1213,7 +1225,7 @@
"знаÑи ÑаÑно оно ÑÑо ÑеÑÑе, заиÑÑа Ñе
ÑазÑмеÑи о ÑÐµÐ¼Ñ Ñе Ñади."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Give away software”"
msgstr "âСоÑÑÐ²ÐµÑ Ð½Ð° поклон (енгл. <em>give away</em>)â"
@@ -1232,7 +1244,7 @@
"да Ñе говоÑи âобÑавÑен Ñ Ð²Ð¸Ð´Ñ Ñлободног
ÑоÑÑвеÑаâ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
#, fuzzy
#| msgid "“Closed”"
msgid "“Google”"
@@ -1249,7 +1261,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Hacker”"
msgstr "âХакеÑâ"
@@ -1281,7 +1293,7 @@
"âкÑакеÑиâ (енгл. <em>crackers</em>)."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Intellectual property”"
msgstr "âÐнÑелекÑÑална ÑвоÑинаâ"
@@ -1348,7 +1360,7 @@
"âинÑелекÑÑалне ÑвоÑинеâ (енг. <em>WIPO</em>)</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“LAMP system”"
msgstr "âÐÐÐÐ ÑиÑÑемâ"
@@ -1367,7 +1379,7 @@
"ÑÑебало би говоÑиÑи âÐÐÐÐÐâ: âÐÐУ,
ÐинÑкÑ, ÐпаÑ, ÐаÑеÑкÑел и ÐеÑ
апеâ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Linux system”"
msgstr "âÐинÑÐºÑ ÑиÑÑемâ"
@@ -1389,7 +1401,7 @@
"ÑезгÑа."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Market”"
msgstr "âТÑжиÑÑеâ"
@@ -1432,7 +1444,7 @@
"негиÑаÑе важноÑÑи Ñлободе и опÑавдаваÑе
влаÑниÑког ÑоÑÑвеÑа."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Monetize”"
msgstr ""
@@ -1460,7 +1472,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“MP3 Player”"
msgstr "âÐÐ3 плеÑеÑâ"
@@ -1498,7 +1510,7 @@
"звÑÑни плеÑеÑâ или пÑоÑÑо âзвÑÑни
плеÑеÑâ, Ñ ÑÐºÐ»Ð°Ð´Ñ Ñа конÑекÑÑом."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Open”"
msgstr "âÐÑвоÑеноâ"
@@ -1523,7 +1535,7 @@
"миÑле како иÑ
ми подÑжавамо."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PC”"
msgstr "âÐиÑи (енг. <em>PC</em>)â"
@@ -1550,7 +1562,7 @@
"Computer</em>)."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Photoshop”"
msgstr "âФоÑоÑоп (енгл. <em>Photoshop</em>)â"
@@ -1577,7 +1589,7 @@
"поÑÑоÑе бÑоÑне алÑеÑнаÑиве, као ÑÑо Ñе <a
href=\"/software/gimp\">Ðимп</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Piracy”"
msgstr "âÐиÑаÑеÑиÑаâ"
@@ -1625,7 +1637,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PowerPoint”"
msgstr "âÐаÑÐµÑ Ð¿Ð¾Ð¸Ð½Ñ (енгл. <em>PowerPoint</em>)â"
@@ -1654,7 +1666,7 @@
"ÐпенÐÑиÑ.оÑгов ÐмпÑеÑ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Protection”"
msgstr "âÐаÑÑиÑаâ"
@@ -1730,7 +1742,7 @@
"Ð¾Ð´Ð»Ð¸ÐºÑ âопÑÑÑÑкÑиÑом копиÑаÑаâ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“RAND (Reasonable and Non-Discriminatory)”"
msgstr ""
"âÐ ÐÐ â ÑазÑмно и недиÑкÑиминиÑаÑÑÑе
(енгл. <em>RAND â reasonable and "
@@ -1795,7 +1807,7 @@
"href=\"#TransNote5\">[5]</a></sup>. Ð¢Ð°Ñ Ð¸Ð·Ñаз Ñе ÑаÑан ÑеÑ
Ñе Ñедини ÑÑлов "
"код ÑиÑ
лиÑенÑи плаÑаÑе Ñеднаке Ñене."
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“SaaS” or “Software as a Service”"
msgstr ""
@@ -1824,7 +1836,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sell software”"
msgstr "âÐÑодаÑа ÑоÑÑвеÑаâ"
@@ -1866,7 +1878,7 @@
"ÑоÑÑвеÑа</a> за даÑÑ Ð´Ð¸ÑкÑÑиÑÑ Ð¾ овом
пÑоблемÑ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sharing economy”"
msgstr ""
@@ -1887,7 +1899,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
#, fuzzy
#| msgid "“Open”"
msgid "“Skype”"
@@ -1906,7 +1918,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Software Industry”"
msgstr "âÐндÑÑÑÑиÑа ÑоÑÑвеÑаâ"
@@ -1957,7 +1969,7 @@
"пÑоизводÑа маÑеÑиÑалниÑ
добаÑаâ.</a>"
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Source model”"
msgstr ""
@@ -1975,7 +1987,22 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "“Commercial”"
+msgid "“Terminal”"
+msgstr "âÐомеÑÑиÑалноâ"
+
+#. type: Content of: <p>
+msgid ""
+"Mobile phones and tablets are computers, and people should be able to do "
+"their computing on them using free software. To call them “"
+"terminals” supposes that all they are good for is to connect to "
+"servers, which is a bad way to do your own computing."
+msgstr ""
+
+# type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Theft”"
msgstr "âÐÑаÑаâ"
@@ -2041,7 +2068,7 @@
"деÑиниÑÑ Ð¿ÑÐ°Ð²Ð´Ñ Ð¸Ð»Ð¸ еÑиÑко понаÑаÑе
пÑедÑÑавÑа обÑÑаÑе ÑÑваÑи наглавÑе."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Trusted Computing”"
msgstr "âРаÑÑнаÑÑÑво Ñа повеÑеÑемâ"
@@ -2060,7 +2087,7 @@
"гледиÑÑа, Ñо Ñе âповеÑеÑеâ. Са ваÑе ÑаÑке
гледиÑÑа, Ñо Ñе âиздаÑаâ."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Vendor”"
msgstr "âÐÑодаваÑâ"
Index: philosophy/po/words-to-avoid.tr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.tr.po,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- philosophy/po/words-to-avoid.tr.po 28 May 2015 17:29:32 -0000 1.74
+++ philosophy/po/words-to-avoid.tr.po 6 Jun 2015 09:58:14 -0000 1.75
@@ -12,7 +12,7 @@
msgid ""
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2015-05-28 17:27+0000\n"
+"POT-Creation-Date: 2015-06-06 09:55+0000\n"
"PO-Revision-Date: 2010-01-25 16:11+0100\n"
"Last-Translator: Tahir Emre Kalaycı <address@hidden>\n"
"Language-Team: Turkish <address@hidden>\n"
@@ -306,6 +306,18 @@
msgstr ""
# type: Content of: <h4>
+#. #if expr="$LANGUAGE_SUFFIX = /^.()$/"
+#. TRANSLATORS: translate if this word is used often in your
+#. language to refer to mobile computers; otherwise,
+#. fill the translation with a space.
+#. type: Content of: <p>
+#, fuzzy
+#| msgid "“<a href=\"#Commercial\">Commercial</a>” |"
+msgid "“<a href=\"#Terminal\">Terminal</a>” |"
+msgstr "“<a href=\"#Commercial\">Ticari</a>” |"
+
+# type: Content of: <h4>
+#. #endif
#. type: Content of: <p>
msgid "“<a href=\"#Theft\">Theft</a>” |"
msgstr "“<a href=\"#Theft\">Hırsızlık</a>” |"
@@ -321,7 +333,7 @@
msgstr "“<a href=\"#Vendor\">SaÄlayıcı</a>”"
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Alternative”"
msgstr ""
@@ -345,7 +357,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“BSD-style”"
msgstr "“BSD-stili”"
@@ -375,7 +387,7 @@
"önlenmesi en iyisidir."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Closed”"
msgstr "“Kapalı”"
@@ -401,7 +413,7 @@
"</a> olarak adlandırırız."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Cloud Computing”"
msgstr "“Bulut Hesaplama”"
@@ -513,7 +525,7 @@
"ideallerimizle aynı ideallerle güdülenmiyor."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Commercial”"
msgstr "âTicariâ"
@@ -575,7 +587,7 @@
"âticariâ ifadesini bu Åekilde kullanmamaya özen gösterelim."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Compensation”"
msgstr "âMükafatâ"
@@ -604,7 +616,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consume”"
msgstr ""
@@ -632,7 +644,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Consumer”"
msgstr "âTüketiciâ"
@@ -741,7 +753,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Content”"
msgstr "âİçerikâ"
@@ -843,7 +855,7 @@
"site revision systemâ - WRS) terimini öneriyoruz."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creative Commons licensed”"
msgstr ""
@@ -866,7 +878,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Creator”"
msgstr "âYaratıcıâ"
@@ -900,7 +912,7 @@
"sahipâ (âcopyright holderâ) anlamına gelmektedir."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Goods”"
msgstr "âSayısal metaâ"
@@ -925,7 +937,7 @@
"metalar kopyalanamaz ve bu yüzden üretilmeli ve satılmalıdır."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Locks”"
msgstr ""
@@ -968,7 +980,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Digital Rights Management”"
msgstr "âSayısal Haklar Yönetimiâ"
@@ -1012,7 +1024,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Ecosystem”"
msgstr "âEkosistemâ"
@@ -1077,7 +1089,7 @@
"verebilirler."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FLOSS”"
msgstr ""
@@ -1091,7 +1103,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“For free”"
msgstr "âBedavaâ"
@@ -1133,7 +1145,7 @@
"olduÄunu söyleyebilirsiniz. "
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“FOSS”"
msgstr ""
@@ -1147,7 +1159,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freely available”"
msgstr "âÃzgürce edinilebilen yazılımâ"
@@ -1167,7 +1179,7 @@
"tanımlanmıÅtır. Bunlar farklı sorulara farklı yanıtlardır."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Freeware”"
msgstr "âÃcretsiz Yazılım [:freeware]â"
@@ -1217,7 +1229,7 @@
"de anlayacaklardır. "
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Give away software”"
msgstr "âBaÄıŠyazılımâ"
@@ -1236,7 +1248,7 @@
"karıÅıklıÄını önlemenin bir yolu âözgür yazılım olarak
yayınlaâ demektir. "
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
#, fuzzy
#| msgid "“Closed”"
msgid "“Google”"
@@ -1253,7 +1265,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Hacker”"
msgstr "âHackerâ"
@@ -1286,7 +1298,7 @@
"âcrackerâlardır."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Intellectual property”"
msgstr "âFikri Mülkiyetâ"
@@ -1354,7 +1366,7 @@
"Mülkiyetâ Ãrgütünü utandırmaya baÅlamıÅtır</a>."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“LAMP system”"
msgstr "âLAMP Sistemâ"
@@ -1373,7 +1385,7 @@
"âGLAMPâ - âGNU, Linux, Apache, MySql ve PHPâ - olmalıdır."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Linux system”"
msgstr "âLinux Sistemâ"
@@ -1395,7 +1407,7 @@
"itibarını vermek hem de bütün sistemi çekirdekten ayırdetmek için."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Market”"
msgstr "âPazarâ"
@@ -1439,7 +1451,7 @@
"meÅrulaÅtırmak anlamına gelir."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Monetize”"
msgstr ""
@@ -1467,7 +1479,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“MP3 Player”"
msgstr "âMP3 Ãalarâ"
@@ -1505,7 +1517,7 @@
"kapsam izin veriyorsa basitçe âses çalarâ terimini öneriyoruz."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Open”"
msgstr "âAçıkâ"
@@ -1529,7 +1541,7 @@
"insanların aynı bakıÅlara sahip olduÄumuzu düÅünmesine neden
olmaktadır."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PC”"
msgstr "âPCâ"
@@ -1553,7 +1565,7 @@
msgstr "Windows çalıÅtıran bilgisayar için âWCâ terimi
önerilmiÅtir."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Photoshop”"
msgstr "âPhotoshopâ"
@@ -1580,7 +1592,7 @@
"a> gibi."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Piracy”"
msgstr "âKorsanlıkâ"
@@ -1628,7 +1640,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“PowerPoint”"
msgstr "âPowerPointâ"
@@ -1655,7 +1667,7 @@
"TeX'in <tt>beamer</tt> sınıfı ve OpenOffice.org'un Impress'i gibi."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Protection”"
msgstr "âKorumaâ"
@@ -1732,7 +1744,7 @@
"korumaâya kötü niyetli özellik diyebiliriz."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“RAND (Reasonable and Non-Discriminatory)”"
msgstr "âRAND (makul ve ayrım yapmayan)â"
@@ -1804,7 +1816,7 @@
"kullanılmasını tavsiye ederim. Bu, doÄrudur çünkü bu lisanslardaki tek
Åart, "
"tek biçimli bir hak sahibine verilen ücrettir. "
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“SaaS” or “Software as a Service”"
msgstr ""
@@ -1833,7 +1845,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sell software”"
msgstr "âYazılımın satılmasıâ"
@@ -1877,7 +1889,7 @@
"\">Ãzgür Yazılımın Satılması</a>â bölümüne bakınız. "
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Sharing economy”"
msgstr ""
@@ -1898,7 +1910,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
#, fuzzy
#| msgid "“Open”"
msgid "“Skype”"
@@ -1917,7 +1929,7 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Software Industry”"
msgstr "âYazılım Endüstrisiâ"
@@ -1969,7 +1981,7 @@
"üretimiâ olarak tanımlamak üzere oy kullandı.</a>"
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Source model”"
msgstr ""
@@ -1987,7 +1999,22 @@
msgstr ""
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
+#, fuzzy
+#| msgid "“Commercial”"
+msgid "“Terminal”"
+msgstr "âTicariâ"
+
+#. type: Content of: <p>
+msgid ""
+"Mobile phones and tablets are computers, and people should be able to do "
+"their computing on them using free software. To call them “"
+"terminals” supposes that all they are good for is to connect to "
+"servers, which is a bad way to do your own computing."
+msgstr ""
+
+# type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Theft”"
msgstr "âHırsızlıkâ"
@@ -2055,7 +2082,7 @@
"söylemek olayları tersine çevirmektir."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Trusted Computing”"
msgstr "âGüvenli Ä°Åletimâ"
@@ -2075,7 +2102,7 @@
"âhainâdir."
# type: Content of: <h4>
-#. type: Content of: <h4>
+#. type: Content of: <h3>
msgid "“Vendor”"
msgstr "âSaÄlayıcıâ"
Index: software/recent-releases-include.ru.html
===================================================================
RCS file: /web/www/www/software/recent-releases-include.ru.html,v
retrieving revision 1.641
retrieving revision 1.642
diff -u -b -r1.641 -r1.642
--- software/recent-releases-include.ru.html 5 Jun 2015 20:58:16 -0000
1.641
+++ software/recent-releases-include.ru.html 6 Jun 2015 09:58:14 -0000
1.642
@@ -1,9 +1,9 @@
<ul>
-<li><strong>June 05, 2015</strong>
+<li><strong>05 иÑÐ½Ñ 2015</strong>
<ul>
<li><a
-href="http://lists.gnu.org/archive/html/info-gnu/2015-06/msg00003.html">IceCat
-31.7.0 release</a>, <i>Rubén RodrÃguez</i>, <tt>16:31</tt></li>
+href="http://lists.gnu.org/archive/html/info-gnu/2015-06/msg00003.html">ÐÑпÑÑк
+GNU IceCat 31.7.0</a>, <i>Ð Ñбен РодÑигеÑ</i>, <tt>16:31</tt></li>
</ul></li>
<li><strong>04 иÑÐ½Ñ 2015</strong>
<ul>
Index: software/po/recent-releases-include.ru.po
===================================================================
RCS file: /web/www/www/software/po/recent-releases-include.ru.po,v
retrieving revision 1.853
retrieving revision 1.854
diff -u -b -r1.853 -r1.854
--- software/po/recent-releases-include.ru.po 6 Jun 2015 09:28:22 -0000
1.853
+++ software/po/recent-releases-include.ru.po 6 Jun 2015 09:58:14 -0000
1.854
@@ -14,24 +14,12 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-06-05 20:56+0000\n"
#. type: Content of: <ul><li>
-# | <strong>June 0[-4-]{+5+}, 2015</strong>
-#| msgid "<strong>June 04, 2015</strong>"
msgid "<strong>June 05, 2015</strong>"
msgstr "<strong>05 иÑÐ½Ñ 2015</strong>"
#. type: Content of: <ul><li><ul><li>
-# | <a
-# |
[-href=\"http://lists.gnu.org/archive/html/info-gnu/2015-04/msg00001.html\">IceCat
-# | 31.6.0-]
-# |
{+href=\"http://lists.gnu.org/archive/html/info-gnu/2015-06/msg00003.html\">IceCat
-# | 31.7.0+} release</a>, <i>Rubén RodrÃguez</i>, [-<tt>10:04</tt>-]
-# | {+<tt>16:31</tt>+}
-#| msgid ""
-#| "<a href=\"http://lists.gnu.org/archive/html/info-gnu/2015-04/msg00001.html"
-#| "\">IceCat 31.6.0 release</a>, <i>Rubén RodrÃguez</i>, <tt>10:04</tt>"
msgid ""
"<a href=\"http://lists.gnu.org/archive/html/info-gnu/2015-06/msg00003.html"
"\">IceCat 31.7.0 release</a>, <i>Rubén RodrÃguez</i>, <tt>16:31</tt>"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www philosophy/po/words-to-avoid.ar-diff.html p...,
GNUN <=