www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/philosophy words-to-avoid.ar.html words-to-...


From: GNUN
Subject: www/philosophy words-to-avoid.ar.html words-to-...
Date: Mon, 16 Jun 2014 12:28:55 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     14/06/16 12:28:55

Modified files:
        philosophy     : words-to-avoid.ar.html words-to-avoid.sr.html 
                         words-to-avoid.tr.html 
        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 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.ar.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.sr.html?cvsroot=www&r1=1.44&r2=1.45
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/words-to-avoid.tr.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ar-diff.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ar.po?cvsroot=www&r1=1.63&r2=1.64
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.de.po?cvsroot=www&r1=1.84&r2=1.85
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.es.po?cvsroot=www&r1=1.132&r2=1.133
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.fr.po?cvsroot=www&r1=1.159&r2=1.160
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.it.po?cvsroot=www&r1=1.114&r2=1.115
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ja.po?cvsroot=www&r1=1.61&r2=1.62
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.pot?cvsroot=www&r1=1.77&r2=1.78
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru.po?cvsroot=www&r1=1.70&r2=1.71
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.sq.po?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.sr.po?cvsroot=www&r1=1.83&r2=1.84
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.tr.po?cvsroot=www&r1=1.56&r2=1.57

Patches:
Index: words-to-avoid.ar.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.ar.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- words-to-avoid.ar.html      23 May 2014 07:02:20 -0000      1.22
+++ words-to-avoid.ar.html      16 Jun 2014 12:28:49 -0000      1.23
@@ -1,3 +1,9 @@
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/words-to-avoid.ar.po">
+ http://www.gnu.org/philosophy/po/words-to-avoid.ar.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/words-to-avoid.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/words-to-avoid.ar-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2013-02-11" -->
 
 
 <!--#include virtual="/server/header.ar.html" -->
@@ -684,7 +690,7 @@
  <p><!-- timestamp start -->
 حُدّثت:
 
-$Date: 2014/05/23 07:02:20 $
+$Date: 2014/06/16 12:28:49 $
 
 <!-- timestamp end -->
 </p>

Index: words-to-avoid.sr.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.sr.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- words-to-avoid.sr.html      23 May 2014 07:02:21 -0000      1.44
+++ words-to-avoid.sr.html      16 Jun 2014 12:28:49 -0000      1.45
@@ -1,3 +1,9 @@
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/words-to-avoid.sr.po">
+ http://www.gnu.org/philosophy/po/words-to-avoid.sr.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/words-to-avoid.html"
+ --><!--#set var="DIFF_FILE" value=""
+ --><!--#set var="OUTDATED_SINCE" value="2011-08-04" -->
 
 
 <!--#include virtual="/server/header.sr.html" -->
@@ -663,7 +669,7 @@
 <!-- timestamp start -->
 Ажурирано:
 
-$Date: 2014/05/23 07:02:21 $
+$Date: 2014/06/16 12:28:49 $
 
 <!-- timestamp end -->
 </p>

Index: words-to-avoid.tr.html
===================================================================
RCS file: /web/www/www/philosophy/words-to-avoid.tr.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- words-to-avoid.tr.html      23 May 2014 07:02:21 -0000      1.15
+++ words-to-avoid.tr.html      16 Jun 2014 12:28:50 -0000      1.16
@@ -1,3 +1,9 @@
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/words-to-avoid.tr.po">
+ http://www.gnu.org/philosophy/po/words-to-avoid.tr.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/words-to-avoid.html"
+ --><!--#set var="DIFF_FILE" value=""
+ --><!--#set var="OUTDATED_SINCE" value="2011-08-04" -->
 
 
 <!--#include virtual="/server/header.tr.html" -->
@@ -676,7 +682,7 @@
 <!-- timestamp start -->
 Son Güncelleme:
 
-$Date: 2014/05/23 07:02:21 $
+$Date: 2014/06/16 12:28:50 $
 
 <!-- timestamp end -->
 </p>

Index: po/words-to-avoid.ar-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ar-diff.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- po/words-to-avoid.ar-diff.html      23 May 2014 07:02:22 -0000      1.32
+++ po/words-to-avoid.ar-diff.html      16 Jun 2014 12:28:51 -0000      1.33
@@ -517,8 +517,9 @@
 
 &lt;h4 <span 
class="inserted"><ins><em>id="FLOSS"&gt;&ldquo;FLOSS&rdquo;&lt;/h4&gt;
 &lt;p&gt;
-The term &ldquo;FLOSS&rdquo; was coined as a way
-to &lt;a href="/philosophy/floss-and-foss.html"&gt; be neutral between free
+The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open
+Source Software,&rdquo; was coined as a way
+to &lt;a href="/philosophy/floss-and-foss.html"&gt;be neutral between free
 software and open source&lt;/a&gt;.  If neutrality is your goal,
 &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you want to
 show you stand for freedom, don't use a neutral term.&lt;/p&gt;
@@ -542,10 +543,10 @@
 &lt;h4 <span 
class="removed"><del><strong>id="FreelyAvailable"&gt;&ldquo;Freely 
available&rdquo;&lt;/h4&gt;</strong></del></span> <span 
class="inserted"><ins><em>id="FOSS"&gt;&ldquo;FOSS&rdquo;&lt;/h4&gt;</em></ins></span>
 &lt;p&gt;
 <span class="removed"><del><strong>Don't use &ldquo;freely available 
software&rdquo;</strong></del></span>
-<span class="inserted"><ins><em>The term &ldquo;FOSS&rdquo; was 
coined</em></ins></span> as a <span class="removed"><del><strong>synonym for 
&ldquo;free
-software.&rdquo; The terms are not equivalent.  Software is &ldquo;freely
-available&rdquo;</strong></del></span> <span class="inserted"><ins><em>way
-to &lt;a href="/philosophy/floss-and-foss.html"&gt; be neutral between free
+<span class="inserted"><ins><em>The term &ldquo;FOSS,&rdquo; meaning 
&ldquo;Free and Open Source
+Software,&rdquo; was coined</em></ins></span> as a <span 
class="removed"><del><strong>synonym for &ldquo;free
+software.&rdquo; The terms are not equivalent.</strong></del></span> <span 
class="inserted"><ins><em>way
+to &lt;a href="/philosophy/floss-and-foss.html"&gt;be neutral between free
 software and open source&lt;/a&gt;, but it doesn't really do that.  If
 neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  But if you
 want to show you stand for freedom, don't use a neutral term.&lt;/p&gt;
@@ -553,8 +554,8 @@
 &lt;h4 id="FreelyAvailable"&gt;&ldquo;Freely available&rdquo;&lt;/h4&gt;
 &lt;p&gt;
 Don't use &ldquo;freely available software&rdquo; as a synonym for &ldquo;free
-software.&rdquo; The terms are not equivalent.  Software is &ldquo;freely
-available&rdquo;</em></ins></span> if anyone can easily get a copy.  
&ldquo;Free
+software.&rdquo; The terms are not equivalent.</em></ins></span>  Software is 
&ldquo;freely
+available&rdquo; if anyone can easily get a copy.  &ldquo;Free
 software&rdquo; is defined in terms of the freedom of users that have
 a copy of it.  These are answers to different questions.
 &lt;/p&gt;
@@ -907,11 +908,11 @@
 distributed, but the text confuses this with the development
 methodology.  It distinguishes &ldquo;open source&rdquo; and
 &rdquo;shared source&rdquo; as answers, but they overlap &mdash;
-Microsoft uses that marketing term to cover a range of practices, some
-of which are &ldquo;open source&rdquo;.  Thus, this term seems to
-convey no coherent information, but it provides an opportunity to say
-&ldquo;open source&rdquo; in pages describing free software
-programs.&lt;/p&gt;
+Microsoft uses the latter as a marketing term to cover a range of
+practices, some of which are &ldquo;open source&rdquo;.  Thus, this
+term really conveys no coherent information, but it provides an
+opportunity to say &ldquo;open source&rdquo; in pages describing free
+software programs.&lt;/p&gt;
 
 &lt;h4</em></ins></span> id="Theft"&gt;&ldquo;Theft&rdquo;&lt;/h4&gt;
 &lt;p&gt;
@@ -1045,7 +1046,7 @@
 
 <span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
 &lt;!-- timestamp start --&gt;
-$Date: 2014/05/23 07:02:22 $
+$Date: 2014/06/16 12:28:51 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: po/words-to-avoid.ar.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ar.po,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- po/words-to-avoid.ar.po     23 May 2014 07:02:23 -0000      1.63
+++ po/words-to-avoid.ar.po     16 Jun 2014 12:28:51 -0000      1.64
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid\n"
-"POT-Creation-Date: 2014-05-23 06:57+0000\n"
+"POT-Creation-Date: 2014-06-16 12:27+0000\n"
 "PO-Revision-Date: 2013-01-16 14:00+0200\n"
 "Last-Translator: Rafik E. Younan <address@hidden>\n"
 "Language-Team: Arabic <>\n"
@@ -1115,11 +1115,11 @@
 
 #. type: Content of: <p>
 msgid ""
-"The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</"
-"a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to be "
-"neutral.  But if you want to show you stand for freedom, don't use a neutral "
-"term."
+"The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
+"Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
+"html\">be neutral between free software and open source</a>.  If neutrality "
+"is your goal, &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you "
+"want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 
 # type: Content of: <h4>
@@ -1170,11 +1170,11 @@
 
 #. type: Content of: <p>
 msgid ""
-"The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</a>, "
-"but it doesn't really do that.  If neutrality is your goal, &ldquo;"
-"FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
-"don't use a neutral term."
+"The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
+"&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
+"\">be neutral between free software and open source</a>, but it doesn't "
+"really do that.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  "
+"But if you want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 
 # type: Content of: <h4>
@@ -1907,11 +1907,11 @@
 "ambiguous way.  Ostensibly it refers to how a program's source is "
 "distributed, but the text confuses this with the development methodology.  "
 "It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo; "
-"as answers, but they overlap &mdash; Microsoft uses that marketing term to "
-"cover a range of practices, some of which are &ldquo;open source&rdquo;.  "
-"Thus, this term seems to convey no coherent information, but it provides an "
-"opportunity to say &ldquo;open source&rdquo; in pages describing free "
-"software programs."
+"as answers, but they overlap &mdash; Microsoft uses the latter as a "
+"marketing term to cover a range of practices, some of which are &ldquo;open "
+"source&rdquo;.  Thus, this term really conveys no coherent information, but "
+"it provides an opportunity to say &ldquo;open source&rdquo; in pages "
+"describing free software programs."
 msgstr ""
 
 # type: Content of: <h4>

Index: po/words-to-avoid.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.de.po,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- po/words-to-avoid.de.po     5 Jun 2014 14:29:31 -0000       1.84
+++ po/words-to-avoid.de.po     16 Jun 2014 12:28:51 -0000      1.85
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-05-23 06:57+0000\n"
+"POT-Creation-Date: 2014-06-16 12:27+0000\n"
 "PO-Revision-Date: 2014-06-01 22:00+0200\n"
 "Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2014-06-16 12:27+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -1070,12 +1071,25 @@
 msgstr "<em>FLOSS</em>"
 
 #. type: Content of: <p>
-msgid ""
-"The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</"
-"a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to be "
-"neutral.  But if you want to show you stand for freedom, don't use a neutral "
-"term."
+# | The term [-&ldquo;FLOSS&rdquo;-] {+&ldquo;FLOSS,&rdquo; meaning
+# | &ldquo;Free/Libre and Open Source Software,&rdquo;+} was coined as a way
+# | to <a href=\"/philosophy/floss-and-foss.html\">[- -]be neutral between
+# | free software and open source</a>.  If neutrality is your goal,
+# | &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you want to
+# | show you stand for freedom, don't use a neutral term.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
+#| "floss-and-foss.html\"> be neutral between free software and open source</"
+#| "a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to "
+#| "be neutral.  But if you want to show you stand for freedom, don't use a "
+#| "neutral term."
+msgid ""
+"The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
+"Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
+"html\">be neutral between free software and open source</a>.  If neutrality "
+"is your goal, &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you "
+"want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 "Der Begriff <em>„FLOSS“</em> (engl. für <em>„<span xml:lang=\"en\" 
lang=\"en"
 "\">Free/Libre and Open Source Software</span>“</em>) wurde als eine "
@@ -1130,12 +1144,25 @@
 msgstr "<em>FOSS</em>"
 
 #. type: Content of: <p>
-msgid ""
-"The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</a>, "
-"but it doesn't really do that.  If neutrality is your goal, &ldquo;"
-"FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
-"don't use a neutral term."
+# | The term [-&ldquo;FOSS&rdquo;-] {+&ldquo;FOSS,&rdquo; meaning &ldquo;Free
+# | and Open Source Software,&rdquo;+} was coined as a way to <a
+# | href=\"/philosophy/floss-and-foss.html\">[- -]be neutral between free
+# | software and open source</a>, but it doesn't really do that.  If
+# | neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  But if you want
+# | to show you stand for freedom, don't use a neutral term.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
+#| "floss-and-foss.html\"> be neutral between free software and open source</"
+#| "a>, but it doesn't really do that.  If neutrality is your goal, &ldquo;"
+#| "FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
+#| "don't use a neutral term."
+msgid ""
+"The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
+"&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
+"\">be neutral between free software and open source</a>, but it doesn't "
+"really do that.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  "
+"But if you want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 "Der Begriff <em>„FOSS“</em> (engl. für <em>„<span xml:lang=\"en\" 
lang=\"en"
 "\">Free and Open Source Software</span>“</em>) wurde als eine Möglichkeit "
@@ -1898,16 +1925,36 @@
 "Source-Modell</em>)"
 
 #. type: Content of: <p>
+# | Wikipedia uses the term &ldquo;source model&rdquo; in a confused and
+# | ambiguous way.  Ostensibly it refers to how a program's source is
+# | distributed, but the text confuses this with the development methodology. 
+# | It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo;
+# | as answers, but they overlap &mdash; Microsoft uses [-that-] {+the latter
+# | as a+} marketing term to cover a range of practices, some of which are
+# | &ldquo;open source&rdquo;.  Thus, this term [-seems to convey-] {+really
+# | conveys+} no coherent information, but it provides an opportunity to say
+# | &ldquo;open source&rdquo; in pages describing free software programs.
+#, fuzzy
+#| msgid ""
+#| "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
+#| "ambiguous way.  Ostensibly it refers to how a program's source is "
+#| "distributed, but the text confuses this with the development "
+#| "methodology.  It distinguishes &ldquo;open source&rdquo; and &rdquo;"
+#| "shared source&rdquo; as answers, but they overlap &mdash; Microsoft uses "
+#| "that marketing term to cover a range of practices, some of which are "
+#| "&ldquo;open source&rdquo;.  Thus, this term seems to convey no coherent "
+#| "information, but it provides an opportunity to say &ldquo;open "
+#| "source&rdquo; in pages describing free software programs."
 msgid ""
 "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
 "ambiguous way.  Ostensibly it refers to how a program's source is "
 "distributed, but the text confuses this with the development methodology.  "
 "It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo; "
-"as answers, but they overlap &mdash; Microsoft uses that marketing term to "
-"cover a range of practices, some of which are &ldquo;open source&rdquo;.  "
-"Thus, this term seems to convey no coherent information, but it provides an "
-"opportunity to say &ldquo;open source&rdquo; in pages describing free "
-"software programs."
+"as answers, but they overlap &mdash; Microsoft uses the latter as a "
+"marketing term to cover a range of practices, some of which are &ldquo;open "
+"source&rdquo;.  Thus, this term really conveys no coherent information, but "
+"it provides an opportunity to say &ldquo;open source&rdquo; in pages "
+"describing free software programs."
 msgstr ""
 "Wikipedia verwendet den Begriff <em>„<span xml:lang=\"en\" lang=\"en"
 "\">Source Model“</span></em> (deu. „[Open-]Source-Modell“) auf eine 
konfuse "

Index: po/words-to-avoid.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.es.po,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- po/words-to-avoid.es.po     30 May 2014 11:58:48 -0000      1.132
+++ po/words-to-avoid.es.po     16 Jun 2014 12:28:51 -0000      1.133
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-23 06:57+0000\n"
+"POT-Creation-Date: 2014-06-16 12:27+0000\n"
 "PO-Revision-Date: 2014-05-30 13:36+0100\n"
 "Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\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: 2014-06-16 12:27+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Language: Spanish\n"
 
@@ -1020,12 +1021,25 @@
 msgstr "«FLOSS»"
 
 #. type: Content of: <p>
-msgid ""
-"The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</"
-"a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to be "
-"neutral.  But if you want to show you stand for freedom, don't use a neutral "
-"term."
+# | The term [-&ldquo;FLOSS&rdquo;-] {+&ldquo;FLOSS,&rdquo; meaning
+# | &ldquo;Free/Libre and Open Source Software,&rdquo;+} was coined as a way
+# | to <a href=\"/philosophy/floss-and-foss.html\">[- -]be neutral between
+# | free software and open source</a>.  If neutrality is your goal,
+# | &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you want to
+# | show you stand for freedom, don't use a neutral term.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
+#| "floss-and-foss.html\"> be neutral between free software and open source</"
+#| "a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to "
+#| "be neutral.  But if you want to show you stand for freedom, don't use a "
+#| "neutral term."
+msgid ""
+"The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
+"Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
+"html\">be neutral between free software and open source</a>.  If neutrality "
+"is your goal, &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you "
+"want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 "El término «FLOSS» se ideó como una forma de expresar <a 
href=\"/philosophy/"
 "floss-and-foss.html\">neutralidad entre el software libre y el código "
@@ -1080,12 +1094,25 @@
 msgstr "«FOSS»"
 
 #. type: Content of: <p>
-msgid ""
-"The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</a>, "
-"but it doesn't really do that.  If neutrality is your goal, &ldquo;"
-"FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
-"don't use a neutral term."
+# | The term [-&ldquo;FOSS&rdquo;-] {+&ldquo;FOSS,&rdquo; meaning &ldquo;Free
+# | and Open Source Software,&rdquo;+} was coined as a way to <a
+# | href=\"/philosophy/floss-and-foss.html\">[- -]be neutral between free
+# | software and open source</a>, but it doesn't really do that.  If
+# | neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  But if you want
+# | to show you stand for freedom, don't use a neutral term.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
+#| "floss-and-foss.html\"> be neutral between free software and open source</"
+#| "a>, but it doesn't really do that.  If neutrality is your goal, &ldquo;"
+#| "FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
+#| "don't use a neutral term."
+msgid ""
+"The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
+"&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
+"\">be neutral between free software and open source</a>, but it doesn't "
+"really do that.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  "
+"But if you want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 "El término «FOSS» se ideó como una forma de expresar <a 
href=\"/philosophy/"
 "floss-and-foss.html\">neutralidad entre el software libre y el código "
@@ -1846,16 +1873,36 @@
 msgstr "«Modelo de código»"
 
 #. type: Content of: <p>
+# | Wikipedia uses the term &ldquo;source model&rdquo; in a confused and
+# | ambiguous way.  Ostensibly it refers to how a program's source is
+# | distributed, but the text confuses this with the development methodology. 
+# | It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo;
+# | as answers, but they overlap &mdash; Microsoft uses [-that-] {+the latter
+# | as a+} marketing term to cover a range of practices, some of which are
+# | &ldquo;open source&rdquo;.  Thus, this term [-seems to convey-] {+really
+# | conveys+} no coherent information, but it provides an opportunity to say
+# | &ldquo;open source&rdquo; in pages describing free software programs.
+#, fuzzy
+#| msgid ""
+#| "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
+#| "ambiguous way.  Ostensibly it refers to how a program's source is "
+#| "distributed, but the text confuses this with the development "
+#| "methodology.  It distinguishes &ldquo;open source&rdquo; and &rdquo;"
+#| "shared source&rdquo; as answers, but they overlap &mdash; Microsoft uses "
+#| "that marketing term to cover a range of practices, some of which are "
+#| "&ldquo;open source&rdquo;.  Thus, this term seems to convey no coherent "
+#| "information, but it provides an opportunity to say &ldquo;open "
+#| "source&rdquo; in pages describing free software programs."
 msgid ""
 "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
 "ambiguous way.  Ostensibly it refers to how a program's source is "
 "distributed, but the text confuses this with the development methodology.  "
 "It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo; "
-"as answers, but they overlap &mdash; Microsoft uses that marketing term to "
-"cover a range of practices, some of which are &ldquo;open source&rdquo;.  "
-"Thus, this term seems to convey no coherent information, but it provides an "
-"opportunity to say &ldquo;open source&rdquo; in pages describing free "
-"software programs."
+"as answers, but they overlap &mdash; Microsoft uses the latter as a "
+"marketing term to cover a range of practices, some of which are &ldquo;open "
+"source&rdquo;.  Thus, this term really conveys no coherent information, but "
+"it provides an opportunity to say &ldquo;open source&rdquo; in pages "
+"describing free software programs."
 msgstr ""
 "En la Wikipedia se usa la expresión «modelo de código» (<cite>source 
model</"
 "cite>) de forma confusa y ambigua. Aparentemente se refiere a la manera en "

Index: po/words-to-avoid.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.fr.po,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -b -r1.159 -r1.160
--- po/words-to-avoid.fr.po     23 May 2014 19:27:00 -0000      1.159
+++ po/words-to-avoid.fr.po     16 Jun 2014 12:28:52 -0000      1.160
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-05-23 06:57+0000\n"
+"POT-Creation-Date: 2014-06-16 12:27+0000\n"
 "PO-Revision-Date: 2014-05-23 21:21+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: 2014-06-16 12:27+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -956,12 +957,25 @@
 msgstr "« FLOSS »"
 
 #. type: Content of: <p>
-msgid ""
-"The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</"
-"a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to be "
-"neutral.  But if you want to show you stand for freedom, don't use a neutral "
-"term."
+# | The term [-&ldquo;FLOSS&rdquo;-] {+&ldquo;FLOSS,&rdquo; meaning
+# | &ldquo;Free/Libre and Open Source Software,&rdquo;+} was coined as a way
+# | to <a href=\"/philosophy/floss-and-foss.html\">[- -]be neutral between
+# | free software and open source</a>.  If neutrality is your goal,
+# | &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you want to
+# | show you stand for freedom, don't use a neutral term.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
+#| "floss-and-foss.html\"> be neutral between free software and open source</"
+#| "a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to "
+#| "be neutral.  But if you want to show you stand for freedom, don't use a "
+#| "neutral term."
+msgid ""
+"The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
+"Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
+"html\">be neutral between free software and open source</a>.  If neutrality "
+"is your goal, &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you "
+"want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 "Le terme « FLOSS » a été inventé comme moyen <a 
href=\"/philosophy/floss-and-"
 "foss.html\">de rester neutre vis-à-vis du logiciel libre et du logiciel open 
"
@@ -1013,12 +1027,25 @@
 msgstr "« FOSS »"
 
 #. type: Content of: <p>
-msgid ""
-"The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</a>, "
-"but it doesn't really do that.  If neutrality is your goal, &ldquo;"
-"FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
-"don't use a neutral term."
+# | The term [-&ldquo;FOSS&rdquo;-] {+&ldquo;FOSS,&rdquo; meaning &ldquo;Free
+# | and Open Source Software,&rdquo;+} was coined as a way to <a
+# | href=\"/philosophy/floss-and-foss.html\">[- -]be neutral between free
+# | software and open source</a>, but it doesn't really do that.  If
+# | neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  But if you want
+# | to show you stand for freedom, don't use a neutral term.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
+#| "floss-and-foss.html\"> be neutral between free software and open source</"
+#| "a>, but it doesn't really do that.  If neutrality is your goal, &ldquo;"
+#| "FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
+#| "don't use a neutral term."
+msgid ""
+"The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
+"&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
+"\">be neutral between free software and open source</a>, but it doesn't "
+"really do that.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  "
+"But if you want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 "Le terme « FOSS » été inventé comme moyen <a 
href=\"/philosophy/floss-and-"
 "foss.html\">de rester neutre vis-à-vis du logiciel libre et du logiciel open 
"
@@ -1721,16 +1748,36 @@
 msgstr "« Modèle de code source »"
 
 #. type: Content of: <p>
+# | Wikipedia uses the term &ldquo;source model&rdquo; in a confused and
+# | ambiguous way.  Ostensibly it refers to how a program's source is
+# | distributed, but the text confuses this with the development methodology. 
+# | It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo;
+# | as answers, but they overlap &mdash; Microsoft uses [-that-] {+the latter
+# | as a+} marketing term to cover a range of practices, some of which are
+# | &ldquo;open source&rdquo;.  Thus, this term [-seems to convey-] {+really
+# | conveys+} no coherent information, but it provides an opportunity to say
+# | &ldquo;open source&rdquo; in pages describing free software programs.
+#, fuzzy
+#| msgid ""
+#| "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
+#| "ambiguous way.  Ostensibly it refers to how a program's source is "
+#| "distributed, but the text confuses this with the development "
+#| "methodology.  It distinguishes &ldquo;open source&rdquo; and &rdquo;"
+#| "shared source&rdquo; as answers, but they overlap &mdash; Microsoft uses "
+#| "that marketing term to cover a range of practices, some of which are "
+#| "&ldquo;open source&rdquo;.  Thus, this term seems to convey no coherent "
+#| "information, but it provides an opportunity to say &ldquo;open "
+#| "source&rdquo; in pages describing free software programs."
 msgid ""
 "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
 "ambiguous way.  Ostensibly it refers to how a program's source is "
 "distributed, but the text confuses this with the development methodology.  "
 "It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo; "
-"as answers, but they overlap &mdash; Microsoft uses that marketing term to "
-"cover a range of practices, some of which are &ldquo;open source&rdquo;.  "
-"Thus, this term seems to convey no coherent information, but it provides an "
-"opportunity to say &ldquo;open source&rdquo; in pages describing free "
-"software programs."
+"as answers, but they overlap &mdash; Microsoft uses the latter as a "
+"marketing term to cover a range of practices, some of which are &ldquo;open "
+"source&rdquo;.  Thus, this term really conveys no coherent information, but "
+"it provides an opportunity to say &ldquo;open source&rdquo; in pages "
+"describing free software programs."
 msgstr ""
 "Wikipedia utilise l'expression « modèle de code source » de manière 
confuse "
 "et ambiguë. Ostensiblement, il s'agit de la manière dont le code source 
d'un "

Index: po/words-to-avoid.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.it.po,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- po/words-to-avoid.it.po     23 May 2014 21:29:05 -0000      1.114
+++ po/words-to-avoid.it.po     16 Jun 2014 12:28:52 -0000      1.115
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-05-23 06:57+0000\n"
+"POT-Creation-Date: 2014-06-16 12:27+0000\n"
 "PO-Revision-Date: 2014-05-23 23:08+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian\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: 2014-06-16 12:27+0000\n"
 "X-Generator: Poedit 1.5.4\n"
 
 #. type: Content of: <title>
@@ -928,12 +929,25 @@
 msgstr "&ldquo;FLOSS&rdquo;"
 
 #. type: Content of: <p>
-msgid ""
-"The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</"
-"a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to be "
-"neutral.  But if you want to show you stand for freedom, don't use a neutral "
-"term."
+# | The term [-&ldquo;FLOSS&rdquo;-] {+&ldquo;FLOSS,&rdquo; meaning
+# | &ldquo;Free/Libre and Open Source Software,&rdquo;+} was coined as a way
+# | to <a href=\"/philosophy/floss-and-foss.html\">[- -]be neutral between
+# | free software and open source</a>.  If neutrality is your goal,
+# | &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you want to
+# | show you stand for freedom, don't use a neutral term.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
+#| "floss-and-foss.html\"> be neutral between free software and open source</"
+#| "a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to "
+#| "be neutral.  But if you want to show you stand for freedom, don't use a "
+#| "neutral term."
+msgid ""
+"The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
+"Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
+"html\">be neutral between free software and open source</a>.  If neutrality "
+"is your goal, &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you "
+"want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 "Il termine &ldquo;FLOSS&rdquo; è stato creato come opzione per essere <a "
 "href=\"/philosophy/floss-and-foss.html\"> neutrali tra software libero e "
@@ -984,12 +998,25 @@
 msgstr "&ldquo;FOSS&rdquo;"
 
 #. type: Content of: <p>
-msgid ""
-"The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</a>, "
-"but it doesn't really do that.  If neutrality is your goal, &ldquo;"
-"FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
-"don't use a neutral term."
+# | The term [-&ldquo;FOSS&rdquo;-] {+&ldquo;FOSS,&rdquo; meaning &ldquo;Free
+# | and Open Source Software,&rdquo;+} was coined as a way to <a
+# | href=\"/philosophy/floss-and-foss.html\">[- -]be neutral between free
+# | software and open source</a>, but it doesn't really do that.  If
+# | neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  But if you want
+# | to show you stand for freedom, don't use a neutral term.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
+#| "floss-and-foss.html\"> be neutral between free software and open source</"
+#| "a>, but it doesn't really do that.  If neutrality is your goal, &ldquo;"
+#| "FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
+#| "don't use a neutral term."
+msgid ""
+"The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
+"&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
+"\">be neutral between free software and open source</a>, but it doesn't "
+"really do that.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  "
+"But if you want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 "Il termine &ldquo;FOSS&rdquo; è stato creato come opzione per essere <a 
href="
 "\"/philosophy/floss-and-foss.html\"> neutrali tra software libero e open "
@@ -1690,16 +1717,36 @@
 msgstr "&ldquo;Modello di sorgente (Source model)&rdquo;"
 
 #. type: Content of: <p>
+# | Wikipedia uses the term &ldquo;source model&rdquo; in a confused and
+# | ambiguous way.  Ostensibly it refers to how a program's source is
+# | distributed, but the text confuses this with the development methodology. 
+# | It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo;
+# | as answers, but they overlap &mdash; Microsoft uses [-that-] {+the latter
+# | as a+} marketing term to cover a range of practices, some of which are
+# | &ldquo;open source&rdquo;.  Thus, this term [-seems to convey-] {+really
+# | conveys+} no coherent information, but it provides an opportunity to say
+# | &ldquo;open source&rdquo; in pages describing free software programs.
+#, fuzzy
+#| msgid ""
+#| "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
+#| "ambiguous way.  Ostensibly it refers to how a program's source is "
+#| "distributed, but the text confuses this with the development "
+#| "methodology.  It distinguishes &ldquo;open source&rdquo; and &rdquo;"
+#| "shared source&rdquo; as answers, but they overlap &mdash; Microsoft uses "
+#| "that marketing term to cover a range of practices, some of which are "
+#| "&ldquo;open source&rdquo;.  Thus, this term seems to convey no coherent "
+#| "information, but it provides an opportunity to say &ldquo;open "
+#| "source&rdquo; in pages describing free software programs."
 msgid ""
 "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
 "ambiguous way.  Ostensibly it refers to how a program's source is "
 "distributed, but the text confuses this with the development methodology.  "
 "It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo; "
-"as answers, but they overlap &mdash; Microsoft uses that marketing term to "
-"cover a range of practices, some of which are &ldquo;open source&rdquo;.  "
-"Thus, this term seems to convey no coherent information, but it provides an "
-"opportunity to say &ldquo;open source&rdquo; in pages describing free "
-"software programs."
+"as answers, but they overlap &mdash; Microsoft uses the latter as a "
+"marketing term to cover a range of practices, some of which are &ldquo;open "
+"source&rdquo;.  Thus, this term really conveys no coherent information, but "
+"it provides an opportunity to say &ldquo;open source&rdquo; in pages "
+"describing free software programs."
 msgstr ""
 "Wikipedia usa il termine &ldquo;modello di sorgente&rdquo; in modo confuso e "
 "ambiguo. Apparentemente si riferisce a come è distribuito il codice sorgente 
"

Index: po/words-to-avoid.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ja.po,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- po/words-to-avoid.ja.po     2 Jun 2014 03:44:35 -0000       1.61
+++ po/words-to-avoid.ja.po     16 Jun 2014 12:28:52 -0000      1.62
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-05-23 06:57+0000\n"
+"POT-Creation-Date: 2014-06-16 12:27+0000\n"
 "PO-Revision-Date: 2014-06-02 12:40+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: 2014-06-16 12:27+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -877,12 +878,19 @@
 msgstr "&ldquo;FLOSS&rdquo;"
 
 #. type: Content of: <p>
-msgid ""
-"The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</"
-"a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to be "
-"neutral.  But if you want to show you stand for freedom, don't use a neutral "
-"term."
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
+#| "floss-and-foss.html\"> be neutral between free software and open source</"
+#| "a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to "
+#| "be neutral.  But if you want to show you stand for freedom, don't use a "
+#| "neutral term."
+msgid ""
+"The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
+"Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
+"html\">be neutral between free software and open source</a>.  If neutrality "
+"is your goal, &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you "
+"want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 "&ldquo;FLOSS&rdquo;は<a 
href=\"/philosophy/floss-and-foss.html\">自由ソフト"
 
"ウェアとオープンソースの間で中立</a>であるための方法として思いつかれたもので"
@@ -931,12 +939,19 @@
 msgstr "&ldquo;FOSS&rdquo;"
 
 #. type: Content of: <p>
-msgid ""
-"The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</a>, "
-"but it doesn't really do that.  If neutrality is your goal, &ldquo;"
-"FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
-"don't use a neutral term."
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
+#| "floss-and-foss.html\"> be neutral between free software and open source</"
+#| "a>, but it doesn't really do that.  If neutrality is your goal, &ldquo;"
+#| "FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
+#| "don't use a neutral term."
+msgid ""
+"The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
+"&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
+"\">be neutral between free software and open source</a>, but it doesn't "
+"really do that.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  "
+"But if you want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 "&ldquo;FOSS&rdquo;は<a 
href=\"/philosophy/floss-and-foss.html\">自由ソフト"
 
"ウェアとオープンソースの間で中立</a>であるための方法として思いつかれたもので"
@@ -1608,16 +1623,27 @@
 msgstr "「ソース・モデル」"
 
 #. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
+#| "ambiguous way.  Ostensibly it refers to how a program's source is "
+#| "distributed, but the text confuses this with the development "
+#| "methodology.  It distinguishes &ldquo;open source&rdquo; and &rdquo;"
+#| "shared source&rdquo; as answers, but they overlap &mdash; Microsoft uses "
+#| "that marketing term to cover a range of practices, some of which are "
+#| "&ldquo;open source&rdquo;.  Thus, this term seems to convey no coherent "
+#| "information, but it provides an opportunity to say &ldquo;open "
+#| "source&rdquo; in pages describing free software programs."
 msgid ""
 "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
 "ambiguous way.  Ostensibly it refers to how a program's source is "
 "distributed, but the text confuses this with the development methodology.  "
 "It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo; "
-"as answers, but they overlap &mdash; Microsoft uses that marketing term to "
-"cover a range of practices, some of which are &ldquo;open source&rdquo;.  "
-"Thus, this term seems to convey no coherent information, but it provides an "
-"opportunity to say &ldquo;open source&rdquo; in pages describing free "
-"software programs."
+"as answers, but they overlap &mdash; Microsoft uses the latter as a "
+"marketing term to cover a range of practices, some of which are &ldquo;open "
+"source&rdquo;.  Thus, this term really conveys no coherent information, but "
+"it provides an opportunity to say &ldquo;open source&rdquo; in pages "
+"describing free software programs."
 msgstr ""
 
"ウィキペディアがこの「ソース・モデル」の用語をまぎらわしく曖昧な方法で使いま"
 "す。表向きは、これは、プログラム
のソースがどのように配布されるかを指します"

Index: po/words-to-avoid.pot
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.pot,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- po/words-to-avoid.pot       23 May 2014 07:02:25 -0000      1.77
+++ po/words-to-avoid.pot       16 Jun 2014 12:28:52 -0000      1.78
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-05-23 06:57+0000\n"
+"POT-Creation-Date: 2014-06-16 12:27+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"
@@ -679,8 +679,9 @@
 
 #. type: Content of: <p>
 msgid ""
-"The term &ldquo;FLOSS&rdquo; was coined as a way to <a "
-"href=\"/philosophy/floss-and-foss.html\"> be neutral between free software "
+"The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
+"Software,&rdquo; was coined as a way to <a "
+"href=\"/philosophy/floss-and-foss.html\">be neutral between free software "
 "and open source</a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the "
 "best way to be neutral.  But if you want to show you stand for freedom, "
 "don't use a neutral term."
@@ -718,8 +719,9 @@
 
 #. type: Content of: <p>
 msgid ""
-"The term &ldquo;FOSS&rdquo; was coined as a way to <a "
-"href=\"/philosophy/floss-and-foss.html\"> be neutral between free software "
+"The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source "
+"Software,&rdquo; was coined as a way to <a "
+"href=\"/philosophy/floss-and-foss.html\">be neutral between free software "
 "and open source</a>, but it doesn't really do that.  If neutrality is your "
 "goal, &ldquo;FLOSS&rdquo; is better.  But if you want to show you stand for "
 "freedom, don't use a neutral term."
@@ -1205,11 +1207,11 @@
 "ambiguous way.  Ostensibly it refers to how a program's source is "
 "distributed, but the text confuses this with the development methodology.  "
 "It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo; "
-"as answers, but they overlap &mdash; Microsoft uses that marketing term to "
-"cover a range of practices, some of which are &ldquo;open source&rdquo;.  "
-"Thus, this term seems to convey no coherent information, but it provides an "
-"opportunity to say &ldquo;open source&rdquo; in pages describing free "
-"software programs."
+"as answers, but they overlap &mdash; Microsoft uses the latter as a "
+"marketing term to cover a range of practices, some of which are &ldquo;open "
+"source&rdquo;.  Thus, this term really conveys no coherent information, but "
+"it provides an opportunity to say &ldquo;open source&rdquo; in pages "
+"describing free software programs."
 msgstr ""
 
 #. type: Content of: <h4>

Index: po/words-to-avoid.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ru.po,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- po/words-to-avoid.ru.po     23 May 2014 07:44:01 -0000      1.70
+++ po/words-to-avoid.ru.po     16 Jun 2014 12:28:52 -0000      1.71
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-05-23 06:57+0000\n"
+"POT-Creation-Date: 2014-06-16 12:27+0000\n"
 "PO-Revision-Date: 2014-05-23 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: 2014-06-16 12:27+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -1026,12 +1027,25 @@
 msgstr "&ldquo;FLOSS&rdquo;"
 
 #. type: Content of: <p>
-msgid ""
-"The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</"
-"a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to be "
-"neutral.  But if you want to show you stand for freedom, don't use a neutral "
-"term."
+# | The term [-&ldquo;FLOSS&rdquo;-] {+&ldquo;FLOSS,&rdquo; meaning
+# | &ldquo;Free/Libre and Open Source Software,&rdquo;+} was coined as a way
+# | to <a href=\"/philosophy/floss-and-foss.html\">[- -]be neutral between
+# | free software and open source</a>.  If neutrality is your goal,
+# | &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you want to
+# | show you stand for freedom, don't use a neutral term.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
+#| "floss-and-foss.html\"> be neutral between free software and open source</"
+#| "a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to "
+#| "be neutral.  But if you want to show you stand for freedom, don't use a "
+#| "neutral term."
+msgid ""
+"The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
+"Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
+"html\">be neutral between free software and open source</a>.  If neutrality "
+"is your goal, &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you "
+"want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 "Выражение &ldquo;FLOSS&rdquo; придумано как способ 
<a href=\"/philosophy/"
 "floss-and-foss.html\"> сохранять нейтралитет между 
свободными программами и "
@@ -1082,12 +1096,25 @@
 msgstr "&ldquo;FOSS&rdquo;"
 
 #. type: Content of: <p>
-msgid ""
-"The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</a>, "
-"but it doesn't really do that.  If neutrality is your goal, &ldquo;"
-"FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
-"don't use a neutral term."
+# | The term [-&ldquo;FOSS&rdquo;-] {+&ldquo;FOSS,&rdquo; meaning &ldquo;Free
+# | and Open Source Software,&rdquo;+} was coined as a way to <a
+# | href=\"/philosophy/floss-and-foss.html\">[- -]be neutral between free
+# | software and open source</a>, but it doesn't really do that.  If
+# | neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  But if you want
+# | to show you stand for freedom, don't use a neutral term.
+#, fuzzy
+#| msgid ""
+#| "The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
+#| "floss-and-foss.html\"> be neutral between free software and open source</"
+#| "a>, but it doesn't really do that.  If neutrality is your goal, &ldquo;"
+#| "FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
+#| "don't use a neutral term."
+msgid ""
+"The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
+"&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
+"\">be neutral between free software and open source</a>, but it doesn't "
+"really do that.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  "
+"But if you want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 "Выражение &ldquo;FOSS&rdquo; придумано как способ 
<a href=\"/philosophy/"
 "floss-and-foss.html\"> сохранять нейтралитет между 
свободными программами и "
@@ -1835,16 +1862,36 @@
 "исходного текста)&rdquo;"
 
 #. type: Content of: <p>
+# | Wikipedia uses the term &ldquo;source model&rdquo; in a confused and
+# | ambiguous way.  Ostensibly it refers to how a program's source is
+# | distributed, but the text confuses this with the development methodology. 
+# | It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo;
+# | as answers, but they overlap &mdash; Microsoft uses [-that-] {+the latter
+# | as a+} marketing term to cover a range of practices, some of which are
+# | &ldquo;open source&rdquo;.  Thus, this term [-seems to convey-] {+really
+# | conveys+} no coherent information, but it provides an opportunity to say
+# | &ldquo;open source&rdquo; in pages describing free software programs.
+#, fuzzy
+#| msgid ""
+#| "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
+#| "ambiguous way.  Ostensibly it refers to how a program's source is "
+#| "distributed, but the text confuses this with the development "
+#| "methodology.  It distinguishes &ldquo;open source&rdquo; and &rdquo;"
+#| "shared source&rdquo; as answers, but they overlap &mdash; Microsoft uses "
+#| "that marketing term to cover a range of practices, some of which are "
+#| "&ldquo;open source&rdquo;.  Thus, this term seems to convey no coherent "
+#| "information, but it provides an opportunity to say &ldquo;open "
+#| "source&rdquo; in pages describing free software programs."
 msgid ""
 "Wikipedia uses the term &ldquo;source model&rdquo; in a confused and "
 "ambiguous way.  Ostensibly it refers to how a program's source is "
 "distributed, but the text confuses this with the development methodology.  "
 "It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo; "
-"as answers, but they overlap &mdash; Microsoft uses that marketing term to "
-"cover a range of practices, some of which are &ldquo;open source&rdquo;.  "
-"Thus, this term seems to convey no coherent information, but it provides an "
-"opportunity to say &ldquo;open source&rdquo; in pages describing free "
-"software programs."
+"as answers, but they overlap &mdash; Microsoft uses the latter as a "
+"marketing term to cover a range of practices, some of which are &ldquo;open "
+"source&rdquo;.  Thus, this term really conveys no coherent information, but "
+"it provides an opportunity to say &ldquo;open source&rdquo; in pages "
+"describing free software programs."
 msgstr ""
 "В Википедии выражение &ldquo;модель исх
одного текста&rdquo; употребляется "
 "неоднозначным и непонятным образом. Оно 
как будто относится к тому, как "

Index: po/words-to-avoid.sq.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.sq.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- po/words-to-avoid.sq.po     23 May 2014 07:02:26 -0000      1.30
+++ po/words-to-avoid.sq.po     16 Jun 2014 12:28:52 -0000      1.31
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-05-23 06:57+0000\n"
+"POT-Creation-Date: 2014-06-16 12:27+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"
@@ -686,11 +686,11 @@
 
 #. type: Content of: <p>
 msgid ""
-"The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</"
-"a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to be "
-"neutral.  But if you want to show you stand for freedom, don't use a neutral "
-"term."
+"The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
+"Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
+"html\">be neutral between free software and open source</a>.  If neutrality "
+"is your goal, &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you "
+"want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 
 #. type: Content of: <h4>
@@ -725,11 +725,11 @@
 
 #. type: Content of: <p>
 msgid ""
-"The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</a>, "
-"but it doesn't really do that.  If neutrality is your goal, &ldquo;"
-"FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
-"don't use a neutral term."
+"The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
+"&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
+"\">be neutral between free software and open source</a>, but it doesn't "
+"really do that.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  "
+"But if you want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 
 #. type: Content of: <h4>
@@ -1209,11 +1209,11 @@
 "ambiguous way.  Ostensibly it refers to how a program's source is "
 "distributed, but the text confuses this with the development methodology.  "
 "It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo; "
-"as answers, but they overlap &mdash; Microsoft uses that marketing term to "
-"cover a range of practices, some of which are &ldquo;open source&rdquo;.  "
-"Thus, this term seems to convey no coherent information, but it provides an "
-"opportunity to say &ldquo;open source&rdquo; in pages describing free "
-"software programs."
+"as answers, but they overlap &mdash; Microsoft uses the latter as a "
+"marketing term to cover a range of practices, some of which are &ldquo;open "
+"source&rdquo;.  Thus, this term really conveys no coherent information, but "
+"it provides an opportunity to say &ldquo;open source&rdquo; in pages "
+"describing free software programs."
 msgstr ""
 
 #. type: Content of: <h4>

Index: po/words-to-avoid.sr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.sr.po,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- po/words-to-avoid.sr.po     23 May 2014 07:02:26 -0000      1.83
+++ po/words-to-avoid.sr.po     16 Jun 2014 12:28:53 -0000      1.84
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-05-23 06:57+0000\n"
+"POT-Creation-Date: 2014-06-16 12:27+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"
@@ -1077,11 +1077,11 @@
 
 #. type: Content of: <p>
 msgid ""
-"The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</"
-"a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to be "
-"neutral.  But if you want to show you stand for freedom, don't use a neutral "
-"term."
+"The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
+"Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
+"html\">be neutral between free software and open source</a>.  If neutrality "
+"is your goal, &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you "
+"want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 
 # type: Content of: <h4>
@@ -1134,11 +1134,11 @@
 
 #. type: Content of: <p>
 msgid ""
-"The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</a>, "
-"but it doesn't really do that.  If neutrality is your goal, &ldquo;"
-"FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
-"don't use a neutral term."
+"The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
+"&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
+"\">be neutral between free software and open source</a>, but it doesn't "
+"really do that.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  "
+"But if you want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 
 # type: Content of: <h4>
@@ -1953,11 +1953,11 @@
 "ambiguous way.  Ostensibly it refers to how a program's source is "
 "distributed, but the text confuses this with the development methodology.  "
 "It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo; "
-"as answers, but they overlap &mdash; Microsoft uses that marketing term to "
-"cover a range of practices, some of which are &ldquo;open source&rdquo;.  "
-"Thus, this term seems to convey no coherent information, but it provides an "
-"opportunity to say &ldquo;open source&rdquo; in pages describing free "
-"software programs."
+"as answers, but they overlap &mdash; Microsoft uses the latter as a "
+"marketing term to cover a range of practices, some of which are &ldquo;open "
+"source&rdquo;.  Thus, this term really conveys no coherent information, but "
+"it provides an opportunity to say &ldquo;open source&rdquo; in pages "
+"describing free software programs."
 msgstr ""
 
 # type: Content of: <h4>

Index: po/words-to-avoid.tr.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.tr.po,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- po/words-to-avoid.tr.po     23 May 2014 07:02:27 -0000      1.56
+++ po/words-to-avoid.tr.po     16 Jun 2014 12:28:53 -0000      1.57
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: words-to-avoid.html\n"
-"POT-Creation-Date: 2014-05-23 06:57+0000\n"
+"POT-Creation-Date: 2014-06-16 12:27+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"
@@ -1085,11 +1085,11 @@
 
 #. type: Content of: <p>
 msgid ""
-"The term &ldquo;FLOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</"
-"a>.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is the best way to be "
-"neutral.  But if you want to show you stand for freedom, don't use a neutral "
-"term."
+"The term &ldquo;FLOSS,&rdquo; meaning &ldquo;Free/Libre and Open Source "
+"Software,&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss."
+"html\">be neutral between free software and open source</a>.  If neutrality "
+"is your goal, &ldquo;FLOSS&rdquo; is the best way to be neutral.  But if you "
+"want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 
 # type: Content of: <h4>
@@ -1143,11 +1143,11 @@
 
 #. type: Content of: <p>
 msgid ""
-"The term &ldquo;FOSS&rdquo; was coined as a way to <a href=\"/philosophy/"
-"floss-and-foss.html\"> be neutral between free software and open source</a>, "
-"but it doesn't really do that.  If neutrality is your goal, &ldquo;"
-"FLOSS&rdquo; is better.  But if you want to show you stand for freedom, "
-"don't use a neutral term."
+"The term &ldquo;FOSS,&rdquo; meaning &ldquo;Free and Open Source Software,"
+"&rdquo; was coined as a way to <a href=\"/philosophy/floss-and-foss.html"
+"\">be neutral between free software and open source</a>, but it doesn't "
+"really do that.  If neutrality is your goal, &ldquo;FLOSS&rdquo; is better.  "
+"But if you want to show you stand for freedom, don't use a neutral term."
 msgstr ""
 
 # type: Content of: <h4>
@@ -1964,11 +1964,11 @@
 "ambiguous way.  Ostensibly it refers to how a program's source is "
 "distributed, but the text confuses this with the development methodology.  "
 "It distinguishes &ldquo;open source&rdquo; and &rdquo;shared source&rdquo; "
-"as answers, but they overlap &mdash; Microsoft uses that marketing term to "
-"cover a range of practices, some of which are &ldquo;open source&rdquo;.  "
-"Thus, this term seems to convey no coherent information, but it provides an "
-"opportunity to say &ldquo;open source&rdquo; in pages describing free "
-"software programs."
+"as answers, but they overlap &mdash; Microsoft uses the latter as a "
+"marketing term to cover a range of practices, some of which are &ldquo;open "
+"source&rdquo;.  Thus, this term really conveys no coherent information, but "
+"it provides an opportunity to say &ldquo;open source&rdquo; in pages "
+"describing free software programs."
 msgstr ""
 
 # type: Content of: <h4>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]