[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/distros common-distros.de.html common-distr...
|
From: |
GNUN |
|
Subject: |
www/distros common-distros.de.html common-distr... |
|
Date: |
Wed, 8 Jun 2016 14:28:40 +0000 (UTC) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 16/06/08 14:28:40
Modified files:
distros : common-distros.de.html common-distros.es.html
common-distros.fr.html common-distros.it.html
common-distros.ja.html common-distros.nl.html
common-distros.ru.html common-distros.uk.html
distros/po : common-distros.ar-diff.html
common-distros.ar.po common-distros.de-en.html
common-distros.de.po common-distros.es-en.html
common-distros.es.po common-distros.fr-en.html
common-distros.fr.po
common-distros.hr-diff.html
common-distros.hr.po common-distros.it-en.html
common-distros.it.po common-distros.ja-en.html
common-distros.ja.po
common-distros.lt-diff.html
common-distros.lt.po common-distros.nl-en.html
common-distros.nl.po
common-distros.pl-diff.html
common-distros.pl.po common-distros.pot
common-distros.pt-br-diff.html
common-distros.pt-br.po
common-distros.ro-diff.html
common-distros.ro.po common-distros.ru-en.html
common-distros.ru.po common-distros.uk-en.html
common-distros.uk.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.de.html?cvsroot=www&r1=1.68&r2=1.69
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.es.html?cvsroot=www&r1=1.75&r2=1.76
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.fr.html?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.it.html?cvsroot=www&r1=1.52&r2=1.53
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.ja.html?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.nl.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.ru.html?cvsroot=www&r1=1.72&r2=1.73
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.uk.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ar-diff.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ar.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.de-en.html?cvsroot=www&r1=1.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.de.po?cvsroot=www&r1=1.101&r2=1.102
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.es-en.html?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.es.po?cvsroot=www&r1=1.110&r2=1.111
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.fr-en.html?cvsroot=www&r1=1.54&r2=1.55
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.fr.po?cvsroot=www&r1=1.120&r2=1.121
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.hr-diff.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.hr.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.it-en.html?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.it.po?cvsroot=www&r1=1.109&r2=1.110
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ja-en.html?cvsroot=www&r1=1.44&r2=1.45
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ja.po?cvsroot=www&r1=1.90&r2=1.91
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.lt-diff.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.lt.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.nl-en.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.nl.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pl-diff.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pl.po?cvsroot=www&r1=1.114&r2=1.115
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pot?cvsroot=www&r1=1.69&r2=1.70
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pt-br-diff.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pt-br.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ro-diff.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ro.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ru-en.html?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ru.po?cvsroot=www&r1=1.127&r2=1.128
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.uk-en.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.uk.po?cvsroot=www&r1=1.39&r2=1.40
Patches:
Index: common-distros.de.html
===================================================================
RCS file: /web/www/www/distros/common-distros.de.html,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- common-distros.de.html 7 Jun 2016 16:29:57 -0000 1.68
+++ common-distros.de.html 8 Jun 2016 14:28:38 -0000 1.69
@@ -207,10 +207,6 @@
tatsächlich frei sind</a>, da proprietäre Programme zum kostenfreien
Herunterladen als <em>âfreiâ</em> gekennzeichnet sind. </p>
-<p>Diese werbefinanzierte Nutzung ist einer der seltenen Fälle, in denen ein
-Freie-Software-Entwickler weiterhin darauf beharrt, eine böswillige Funktion
-in seiner Version eines freien Programms zu behalten.</p>
-
<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";
title="Intellectual property rights policy, unter: ubuntu.com 2013.">scheint
@@ -388,7 +384,7 @@
<p class="unprintable"><!-- timestamp start -->
Aktualisierung:
-$Date: 2016/06/07 16:29:57 $
+$Date: 2016/06/08 14:28:38 $
<!-- timestamp end -->
</p>
Index: common-distros.es.html
===================================================================
RCS file: /web/www/www/distros/common-distros.es.html,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- common-distros.es.html 7 Jun 2016 16:29:58 -0000 1.75
+++ common-distros.es.html 8 Jun 2016 14:28:38 -0000 1.76
@@ -211,10 +211,6 @@
pueden descargarse de manera gratuita como los programas libres están
etiquetados como «gratuito».</p>
-<p>La inclusión de publicidad involuntaria [<cite>adware</cite>] es uno de los
-raros casos en que un desarrollador de software libre persiste en conservar
-una funcionalidad maligna en su versión de un programa libre.</p>
-
<p>Parece que Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>
permite la redistribución comercial de copias exactas, incluyendo las marcas
@@ -361,7 +357,7 @@
<p class="unprintable"><!-- timestamp start -->
Ãltima actualización:
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:38 $
<!-- timestamp end -->
</p>
Index: common-distros.fr.html
===================================================================
RCS file: /web/www/www/distros/common-distros.fr.html,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- common-distros.fr.html 7 Jun 2016 16:29:58 -0000 1.71
+++ common-distros.fr.html 8 Jun 2016 14:28:38 -0000 1.72
@@ -206,10 +206,6 @@
pouvant être téléchargés gratuitement sont étiquetés <cite>free</cite><a
id="TransNote2-rev" href="#TransNote2"><sup>2</sup></a>.</p>
-<p>Cet adware est l'un des rares cas où un développeur de logiciel libre
-persiste à garder une fonctionnalité malveillante dans sa version d'un
-programme libre.</p>
-
<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>
semble autoriser la redistribution commerciale de copies exactes avec les
@@ -360,7 +356,7 @@
<p class="unprintable"><!-- timestamp start -->
Dernière mise à jour :
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:38 $
<!-- timestamp end -->
</p>
Index: common-distros.it.html
===================================================================
RCS file: /web/www/www/distros/common-distros.it.html,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- common-distros.it.html 7 Jun 2016 16:29:58 -0000 1.52
+++ common-distros.it.html 8 Jun 2016 14:28:39 -0000 1.53
@@ -200,10 +200,6 @@
capire quali siano liberi</a> dato che i programmi proprietari gratuiti sono
indicati come “free”.</p>
-<p>Questo software pubblicitario è uno dei rari casi in cui uno sviluppatore
di
-software libero persiste nel voler mantenere una funzionalità malevola nella
-sua versione di un programma libero.</p>
-
<p>Pare che Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>consenta
la ridistribuzione commerciale di copie non modificate, con i marchi
@@ -349,7 +345,7 @@
<p class="unprintable"><!-- timestamp start -->
Ultimo aggiornamento:
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:39 $
<!-- timestamp end -->
</p>
Index: common-distros.ja.html
===================================================================
RCS file: /web/www/www/distros/common-distros.ja.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- common-distros.ja.html 7 Jun 2016 16:29:58 -0000 1.49
+++ common-distros.ja.html 8 Jun 2016 14:28:39 -0000 1.50
@@ -120,8 +120,6 @@
Center”ã¯ãããã©ã¤ã¨ã¿ãªã®ããã°ã©ã
ã¨èªç±ã®ããã°ã©ã
ããã¡ãã¾ãã«ãã¦æ²ç¤ºãã¾ããããã§ã¯ã<a
href="http://www.freesoftwaremagazine.com/articles/ubuntu_software_center_proprietary_and_free_software_mixed_confusing_ui";>ã©ããèªç±ããè¦æ¥µããã®ã¯å°é£ã§ã</a>ããªããªããç¡åã§ãã¦ã³ãã¼ãã§ãããããã©ã¤ã¨ã¿ãªã®ããã°ã©ã
㯓free”ã¨ã©ãã«ä»ãããã¦ã¾ãããã</p>
-<p>ãã®ã¢ãã¦ã§ã¢ã¯èªç±ã½ããã¦ã§ã¢ã®éçºè
ããããèªç±ãªããã°ã©ã ã®æ¹é
ã«æªæããæ©è½ãæããããã¨ã«å·çããã¾ããªã±ã¼ã¹ã®ä¸ã¤ã§ãã</p>
-
<p>Ubuntuã¯<a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>åæ¨ãä»ãã¦ããã®ã¾ã¾ã®ã³ãã¼ã®åç¨åé
å¸ãèªãã¦ããããã«ã¿ãã¾ã</a>ãåæ¨ã®é¤å»ã¯æ¹å¤ãã¼ã¸ã§ã³ã«ã
ãè¦è«ããã¦ãã¾ããããã¯åæ¨ã«ã¤ãã¦å®¹èªã§ããããªã·ã¼ã§ããåããã¼ã¸ã®ãä¸ã®æ¹ã«ã¯ãææ§ã§éºæªãªæç«
ããUbuntuç¹è¨±ãã«ã¤ãã¦ããããã®ç¹è¨±ã«ã¤ãã¦æ»æçãªã®ãã©ããã®è©³ç´°ã¯ç¤ºããã¦ã¾ããã</p>
@@ -225,7 +223,7 @@
<p class="unprintable"><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:39 $
<!-- timestamp end -->
</p>
Index: common-distros.nl.html
===================================================================
RCS file: /web/www/www/distros/common-distros.nl.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- common-distros.nl.html 7 Jun 2016 16:29:58 -0000 1.2
+++ common-distros.nl.html 8 Jun 2016 14:28:39 -0000 1.3
@@ -200,10 +200,6 @@
programma's die gratis gedownload kunnen worden met het woord
“free” aangeduid worden.</p>
-<p>Deze advertentie-software is één van de zeldzame gevallen
-waarbij een ontwikkelaar van vrije software volhardt in het behouden van een
-stiekeme functie in zijn versie van een vrij programma.</p>
-
<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>lijkt
commerciële verspreiding van exacte kopieën met de handelsmerken
@@ -344,7 +340,7 @@
<p class="unprintable"><!-- timestamp start -->
Bijgewerkt:
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:39 $
<!-- timestamp end -->
</p>
Index: common-distros.ru.html
===================================================================
RCS file: /web/www/www/distros/common-distros.ru.html,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- common-distros.ru.html 7 Jun 2016 16:29:58 -0000 1.72
+++ common-distros.ru.html 8 Jun 2016 14:28:39 -0000 1.73
@@ -206,10 +206,6 @@
ÑказаÑÑ, какие из ниÑ
ÑвободнÑ</a>,
поÑколÑÐºÑ Ð±ÐµÑплаÑно ÑаÑпÑоÑÑÑанÑемÑе
неÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð¾Ð±Ð¾Ð·Ð½Ð°ÑаÑÑÑÑ ÐºÐ°Ðº
“ÑвободнÑе”.</p>
-<p>ÐÑи ÑекламнÑе пÑогÑÐ°Ð¼Ð¼Ñ — один из
ÑедкиÑ
ÑлÑÑаев, когда
-ÑазÑабоÑÑик ÑвободнÑÑ
пÑогÑамм ÑпоÑно ÑоÑ
ÑанÑÐµÑ Ð²ÑедоноÑнÑÑ Ð¾ÑобенноÑÑÑ
-в Ñвоей веÑÑии Ñвободной пÑогÑаммÑ.</p>
-
<p>ÐказÑваеÑÑÑ, <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>Ubuntu
ÑазÑеÑÐ°ÐµÑ ÐºÐ¾Ð¼Ð¼ÐµÑÑеÑкое
пеÑеÑаÑпÑоÑÑÑанение ÑоÑнÑÑ
копий Ñ
ÑоваÑнÑми
@@ -357,7 +353,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:39 $
<!-- timestamp end -->
</p>
Index: common-distros.uk.html
===================================================================
RCS file: /web/www/www/distros/common-distros.uk.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- common-distros.uk.html 7 Jun 2016 16:29:58 -0000 1.14
+++ common-distros.uk.html 8 Jun 2016 14:28:39 -0000 1.15
@@ -199,10 +199,6 @@
ÑказаÑи, ÑÐºÑ Ð· ниÑ
вÑлÑнÑ</a>, бо безкоÑÑовно
поÑиÑÑÐ²Ð°Ð½Ñ Ð½ÐµÐ²ÑлÑÐ½Ñ Ð¿ÑогÑами
познаÑаÑÑÑÑÑ Ñк “вÑлÑнє.</p>
-<p>Ð¦Ñ ÑÐµÐºÐ»Ð°Ð¼Ð½Ñ Ð¿ÑогÑами - один з ÑÑдкÑÑниÑ
випадкÑв, коли ÑозÑобник вÑлÑниÑ
-пÑогÑам впеÑÑо збеÑÑÐ³Ð°Ñ ÑкÑдливÑ
оÑобливÑÑÑÑ Ñ ÑвоÑй веÑÑÑÑ Ð²ÑлÑноÑ
-пÑогÑами.</p>
-
<p>ÐиÑвлÑÑÑÑÑÑ, <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>Ubuntu
дозволÑÑ ÐºÐ¾Ð¼ÐµÑÑÑйне ÑозповÑÑÐ´Ð¶ÐµÐ½Ð½Ñ ÑоÑниÑ
копÑй з ÑоваÑними знаками</a>;
@@ -346,7 +342,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðновлено:
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:39 $
<!-- timestamp end -->
</p>
Index: po/common-distros.ar-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ar-diff.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- po/common-distros.ar-diff.html 7 Jun 2016 16:29:58 -0000 1.5
+++ po/common-distros.ar-diff.html 8 Jun 2016 14:28:39 -0000 1.6
@@ -206,46 +206,45 @@
Linux, the kernel, included in Ubuntu contains firmware blobs.</p>
<span class="removed"><del><strong><p>
-Ubuntu's trademark policy prohibits commercial redistribution of exact
-copies of Ubuntu, denying an important freedom.
+Ubuntu's trademark policy prohibits</strong></del></span>
+
+<span class="inserted"><ins><em><p>The “Ubuntu Software
Center” lists proprietary programs
+and free programs jumbled together. It
+is <a
href="http://www.freesoftwaremagazine.com/articles/ubuntu_software_center_proprietary_and_free_software_mixed_confusing_ui">hard
+to tell which ones are free</a> since proprietary programs for
+download at no charge are labelled “free”.</p>
+
+<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu">appears
+to permit</em></ins></span> commercial redistribution of exact copies <span
class="inserted"><ins><em>with the
+trademarks</a>; removal</em></ins></span> of <span
class="removed"><del><strong>Ubuntu, denying</strong></del></span> <span
class="inserted"><ins><em>the trademarks is required only for
+modified versions. That is</em></ins></span> an <span
class="removed"><del><strong>important freedom.
</p>
<p>
As of October 2012, Ubuntu
<a
href="http://www.omgubuntu.co.uk/2012/10/does-ubuntus-amazon-lens-break-eu-law">
-sends personal data about users' searches</a> to a server belonging to
-Canonical, which sends back ads to buy things from Amazon. This does
-not, strictly speaking, affect whether Ubuntu is</strong></del></span>
-
-<span class="inserted"><ins><em><p>The “Ubuntu Software
Center” lists proprietary programs
-and</em></ins></span> free <span class="removed"><del><strong>software, but it
-is a violation of users' privacy.</strong></del></span> <span
class="inserted"><ins><em>programs jumbled together.</em></ins></span> It
<span class="removed"><del><strong>also encourages buying from
-Amazon, a company</strong></del></span>
-<span class="inserted"><ins><em>is</em></ins></span> <a <span
class="removed"><del><strong>href="http://DefectiveByDesign.org/">associated
-with DRM</a> as well as mistreatment of workers, authors and
publishers.</p></strong></del></span> <span
class="inserted"><ins><em>href="http://www.freesoftwaremagazine.com/articles/ubuntu_software_center_proprietary_and_free_software_mixed_confusing_ui">hard
-to tell which ones are free</a> since proprietary programs for
-download at no charge are labelled
“free”.</p></em></ins></span>
-
-<p>This adware is one of the rare occasions in which a free software
-developer persists in keeping a malicious feature in its version of a
-<span class="inserted"><ins><em>free</em></ins></span> program.</p>
-
-<span class="inserted"><ins><em><p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu">appears
-to permit commercial redistribution of exact copies with the
-trademarks</a>; removal of the trademarks is required only for
-modified versions. That is an acceptable policy for trademarks. The
-same page, further down, makes a vague and ominous statement about
-“Ubuntu patents,” without giving enough details to show
-whether that constitutes aggression or not.</p>
+sends personal data about users' searches</a> to</strong></del></span>
<span class="inserted"><ins><em>acceptable policy for trademarks. The
+same page, further down, makes</em></ins></span> a <span
class="removed"><del><strong>server belonging to
+Canonical, which sends back ads</strong></del></span> <span
class="inserted"><ins><em>vague and ominous statement about
+“Ubuntu patents,” without giving enough details</em></ins></span>
to <span class="removed"><del><strong>buy things from Amazon. This does
+not, strictly speaking, affect</strong></del></span> <span
class="inserted"><ins><em>show</em></ins></span>
+whether <span class="removed"><del><strong>Ubuntu is free software, but it
+is a violation of users' privacy. It also encourages buying from
+Amazon, a company</strong></del></span> <span class="inserted"><ins><em>that
constitutes aggression or not.</p>
<p>That page spreads confusion by using the misleading
-term <a href="/philosophy/not-ipr.html">“intellectual property
-rights”</a>, which falsely presumes that trademark law and patent
law
-and several other laws belong in one single conceptual framework. Use
-of that term is harmful, without exception, so after making a
-reference to someone else's use of the term, we should always reject
-it. However, that is not a substantive issue about Ubuntu as a
-GNU/Linux distribution.</p></em></ins></span>
+term</em></ins></span> <a <span
class="removed"><del><strong>href="http://DefectiveByDesign.org/">associated
+with DRM</a> as well as mistreatment of workers,
authors</strong></del></span> <span
class="inserted"><ins><em>href="/philosophy/not-ipr.html">“intellectual
property
+rights”</a>, which falsely presumes that trademark
law</em></ins></span> and <span
class="removed"><del><strong>publishers.</p>
+
+<p>This adware is</strong></del></span> <span
class="inserted"><ins><em>patent law
+and several other laws belong in</em></ins></span> one <span
class="inserted"><ins><em>single conceptual framework. Use</em></ins></span>
+of <span class="removed"><del><strong>the rare occasions in which a free
software
+developer persists in keeping</strong></del></span> <span
class="inserted"><ins><em>that term is harmful, without exception, so after
making</em></ins></span> a <span class="removed"><del><strong>malicious feature
in its version</strong></del></span>
+<span class="inserted"><ins><em>reference to someone else's
use</em></ins></span> of <span class="inserted"><ins><em>the term, we should
always reject
+it. However, that is not a substantive issue about Ubuntu
as</em></ins></span> a
+<span class="removed"><del><strong>program.</p></strong></del></span>
+<span class="inserted"><ins><em>GNU/Linux
distribution.</p></em></ins></span>
<h2>Some Other Distros</h2>
@@ -355,7 +354,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:39 $
<!-- timestamp end -->
</p>
</div>
Index: po/common-distros.ar.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ar.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- po/common-distros.ar.po 7 Jun 2016 16:29:58 -0000 1.10
+++ po/common-distros.ar.po 8 Jun 2016 14:28:39 -0000 1.11
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+0000\n"
"PO-Revision-Date: 2015-02-04 21:24+0100\n"
"Last-Translator: faycal <address@hidden>\n"
"Language-Team: Arabic <>\n"
@@ -437,19 +437,6 @@
msgstr ""
#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "This adware is one of the rare occasions in which a free software "
-#| "developer persists in keeping a malicious feature in its version of a "
-#| "program."
-msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-"Ùذا اÙبرÙاÙ
ج اÙدعائ٠ÙØ´ÙÙ ÙاØدة Ù
Ù
اÙØاÙات اÙشاذة اÙت٠Ùصر ÙÙÙا Ù
Ø·Ùر "
-"اÙبرÙ
جÙات اÙØرة عÙ٠اÙØÙاظ عÙÙ Ù
Ùزة خبÙثة
ÙÙ Ùسخة برÙاÙ
جÙ."
-
-#. type: Content of: <p>
msgid ""
"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
"property-policy#your-use-of-ubuntu\">appears to permit commercial "
@@ -659,6 +646,19 @@
#, fuzzy
#~| msgid ""
+#~| "This adware is one of the rare occasions in which a free software "
+#~| "developer persists in keeping a malicious feature in its version of a "
+#~| "program."
+#~ msgid ""
+#~ "This adware is one of the rare occasions in which a free software "
+#~ "developer persists in keeping a malicious feature in its version of a "
+#~ "free program."
+#~ msgstr ""
+#~ "Ùذا اÙبرÙاÙ
ج اÙدعائ٠ÙØ´ÙÙ ÙاØدة Ù
Ù
اÙØاÙات اÙشاذة اÙت٠Ùصر ÙÙÙا Ù
Ø·Ùر "
+#~ "اÙبرÙ
جÙات اÙØرة عÙ٠اÙØÙاظ عÙÙ Ù
Ùزة
خبÙثة ÙÙ Ùسخة برÙاÙ
جÙ."
+
+#, fuzzy
+#~| msgid ""
#~| "As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/";
#~| "does-ubuntus-amazon-lens-break-eu-law\"> sends personal data about "
#~| "users' searches</a> to a server belonging to Canonical, which sends back "
Index: po/common-distros.de-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.de-en.html,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- po/common-distros.de-en.html 7 Jun 2016 16:29:58 -0000 1.53
+++ po/common-distros.de-en.html 8 Jun 2016 14:28:39 -0000 1.54
@@ -193,10 +193,6 @@
to tell which ones are free</a> since proprietary programs for
download at no charge are labelled “free”.</p>
-<p>This adware is one of the rare occasions in which a free software
-developer persists in keeping a malicious feature in its version of a
-free program.</p>
-
<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>appears
to permit commercial redistribution of exact copies with the
trademarks</a>; removal of the trademarks is required only for
@@ -321,7 +317,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:39 $
<!-- timestamp end -->
</p>
</div>
Index: po/common-distros.de.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.de.po,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- po/common-distros.de.po 7 Jun 2016 16:29:58 -0000 1.101
+++ po/common-distros.de.po 8 Jun 2016 14:28:39 -0000 1.102
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: common-distros.html\n"
"Report-Msgid-Bugs-To: Webmasters <address@hidden>\n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+0000\n"
"PO-Revision-Date: 2016-03-26 22:00+0200\n"
"Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
"Language-Team: www-de <address@hidden>\n"
@@ -445,15 +445,6 @@
#. type: Content of: <p>
msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-"Diese werbefinanzierte Nutzung ist einer der seltenen Fälle, in denen ein "
-"Freie-Software-Entwickler weiterhin darauf beharrt, eine böswillige Funktion
"
-"in seiner Version eines freien Programms zu behalten."
-
-#. type: Content of: <p>
-msgid ""
"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
"property-policy#your-use-of-ubuntu\">appears to permit commercial "
"redistribution of exact copies with the trademarks</a>; removal of the "
@@ -707,6 +698,15 @@
msgid "Updated:"
msgstr "Aktualisierung:"
+#~ msgid ""
+#~ "This adware is one of the rare occasions in which a free software "
+#~ "developer persists in keeping a malicious feature in its version of a "
+#~ "free program."
+#~ msgstr ""
+#~ "Diese werbefinanzierte Nutzung ist einer der seltenen Fälle, in denen ein
"
+#~ "Freie-Software-Entwickler weiterhin darauf beharrt, eine böswillige "
+#~ "Funktion in seiner Version eines freien Programms zu behalten."
+
# ##Translation deviating slightly (for non-IT experts)
# Ubuntu [ab 12.10] überträgt standardmäÃig jeden eingegebenen Suchbegriff
# [zusammen mit der IP-Adresse des Rechners per HTTPS] an einen
Canonical-Server
Index: po/common-distros.es-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.es-en.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- po/common-distros.es-en.html 7 Jun 2016 16:29:58 -0000 1.45
+++ po/common-distros.es-en.html 8 Jun 2016 14:28:39 -0000 1.46
@@ -193,10 +193,6 @@
to tell which ones are free</a> since proprietary programs for
download at no charge are labelled “free”.</p>
-<p>This adware is one of the rare occasions in which a free software
-developer persists in keeping a malicious feature in its version of a
-free program.</p>
-
<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>appears
to permit commercial redistribution of exact copies with the
trademarks</a>; removal of the trademarks is required only for
@@ -321,7 +317,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:39 $
<!-- timestamp end -->
</p>
</div>
Index: po/common-distros.es.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.es.po,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- po/common-distros.es.po 7 Jun 2016 16:29:58 -0000 1.110
+++ po/common-distros.es.po 8 Jun 2016 14:28:39 -0000 1.111
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: common-distros.es.html\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+0000\n"
"PO-Revision-Date: 2016-03-29 09:41+0100\n"
"Last-Translator: Javier Fdez. Retenaga <address@hidden>\n"
"Language-Team: Spanish <address@hidden>\n"
@@ -483,15 +483,6 @@
#. type: Content of: <p>
msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-"La inclusión de publicidad involuntaria [<cite>adware</cite>] es uno de los "
-"raros casos en que un desarrollador de software libre persiste en conservar "
-"una funcionalidad maligna en su versión de un programa libre."
-
-#. type: Content of: <p>
-msgid ""
"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
"property-policy#your-use-of-ubuntu\">appears to permit commercial "
"redistribution of exact copies with the trademarks</a>; removal of the "
@@ -724,6 +715,15 @@
msgstr "Ãltima actualización:"
#~ msgid ""
+#~ "This adware is one of the rare occasions in which a free software "
+#~ "developer persists in keeping a malicious feature in its version of a "
+#~ "free program."
+#~ msgstr ""
+#~ "La inclusión de publicidad involuntaria [<cite>adware</cite>] es uno de "
+#~ "los raros casos en que un desarrollador de software libre persiste en "
+#~ "conservar una funcionalidad maligna en su versión de un programa libre."
+
+#~ msgid ""
#~ "Since October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/";
#~ "does-ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
#~ "searches</a> to a server belonging to Canonical, which sends back ads to "
Index: po/common-distros.fr-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.fr-en.html,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- po/common-distros.fr-en.html 7 Jun 2016 16:29:58 -0000 1.54
+++ po/common-distros.fr-en.html 8 Jun 2016 14:28:39 -0000 1.55
@@ -193,10 +193,6 @@
to tell which ones are free</a> since proprietary programs for
download at no charge are labelled “free”.</p>
-<p>This adware is one of the rare occasions in which a free software
-developer persists in keeping a malicious feature in its version of a
-free program.</p>
-
<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>appears
to permit commercial redistribution of exact copies with the
trademarks</a>; removal of the trademarks is required only for
@@ -321,7 +317,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:39 $
<!-- timestamp end -->
</p>
</div>
Index: po/common-distros.fr.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.fr.po,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- po/common-distros.fr.po 7 Jun 2016 16:29:58 -0000 1.120
+++ po/common-distros.fr.po 8 Jun 2016 14:28:39 -0000 1.121
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+0000\n"
"PO-Revision-Date: 2016-03-26 21:11+0100\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <address@hidden>\n"
@@ -443,15 +443,6 @@
#. type: Content of: <p>
msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-"Cet adware est l'un des rares cas où un développeur de logiciel libre "
-"persiste à garder une fonctionnalité malveillante dans sa version d'un "
-"programme libre."
-
-#. type: Content of: <p>
-msgid ""
"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
"property-policy#your-use-of-ubuntu\">appears to permit commercial "
"redistribution of exact copies with the trademarks</a>; removal of the "
@@ -681,6 +672,15 @@
msgstr "Dernière mise à jour :"
#~ msgid ""
+#~ "This adware is one of the rare occasions in which a free software "
+#~ "developer persists in keeping a malicious feature in its version of a "
+#~ "free program."
+#~ msgstr ""
+#~ "Cet adware est l'un des rares cas où un développeur de logiciel libre "
+#~ "persiste à garder une fonctionnalité malveillante dans sa version d'un "
+#~ "programme libre."
+
+#~ msgid ""
#~ "Since October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/";
#~ "does-ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
#~ "searches</a> to a server belonging to Canonical, which sends back ads to "
Index: po/common-distros.hr-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.hr-diff.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/common-distros.hr-diff.html 7 Jun 2016 16:29:58 -0000 1.11
+++ po/common-distros.hr-diff.html 8 Jun 2016 14:28:39 -0000 1.12
@@ -206,45 +206,44 @@
Linux, the kernel, included in Ubuntu contains firmware blobs.</p>
<span class="removed"><del><strong><p>
-Ubuntu's trademark policy prohibits commercial redistribution of exact
-copies of Ubuntu, denying an important freedom.
+Ubuntu's trademark policy prohibits</strong></del></span>
+
+<span class="inserted"><ins><em><p>The “Ubuntu Software
Center” lists proprietary programs
+and free programs jumbled together. It
+is <a
href="http://www.freesoftwaremagazine.com/articles/ubuntu_software_center_proprietary_and_free_software_mixed_confusing_ui">hard
+to tell which ones are free</a> since proprietary programs for
+download at no charge are labelled “free”.</p>
+
+<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu">appears
+to permit</em></ins></span> commercial redistribution of exact copies <span
class="inserted"><ins><em>with the
+trademarks</a>; removal</em></ins></span> of <span
class="removed"><del><strong>Ubuntu, denying</strong></del></span> <span
class="inserted"><ins><em>the trademarks is required only for
+modified versions. That is</em></ins></span> an <span
class="removed"><del><strong>important freedom.
</p>
<p>
As of October 2012, Ubuntu
<a
href="http://www.omgubuntu.co.uk/2012/10/does-ubuntus-amazon-lens-break-eu-law">
-sends personal data about users' searches</a> to a server belonging to
-Canonical, which sends back ads to buy things from Amazon. This does
-not, strictly speaking, affect whether Ubuntu is</strong></del></span>
-
-<span class="inserted"><ins><em><p>The “Ubuntu Software
Center” lists proprietary programs
-and</em></ins></span> free <span class="removed"><del><strong>software, but it
-is a violation of users' privacy.</strong></del></span> <span
class="inserted"><ins><em>programs jumbled together.</em></ins></span> It
<span class="removed"><del><strong>also encourages buying from
-Amazon, a company</strong></del></span>
-<span class="inserted"><ins><em>is</em></ins></span> <a <span
class="removed"><del><strong>href="http://DefectiveByDesign.org/">associated
-with DRM</a> as well as mistreatment of workers, authors and
publishers.</p></strong></del></span> <span
class="inserted"><ins><em>href="http://www.freesoftwaremagazine.com/articles/ubuntu_software_center_proprietary_and_free_software_mixed_confusing_ui">hard
-to tell which ones are free</a> since proprietary programs for
-download at no charge are labelled
“free”.</p></em></ins></span>
-
-<p>This adware is one of the rare occasions in which a free software
-developer persists in keeping a malicious feature in its version of a
-<span class="inserted"><ins><em>free</em></ins></span> program.</p>
-
-<span class="inserted"><ins><em><p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu">appears
-to permit commercial redistribution of exact copies with the
-trademarks</a>; removal of the trademarks is required only for
-modified versions. That is an acceptable policy for trademarks. The
-same page, further down, makes a vague and ominous statement about
-“Ubuntu patents,” without giving enough details to show
-whether that constitutes aggression or not.</p>
+sends personal data about users' searches</a> to</strong></del></span>
<span class="inserted"><ins><em>acceptable policy for trademarks. The
+same page, further down, makes</em></ins></span> a <span
class="removed"><del><strong>server belonging to
+Canonical, which sends back ads</strong></del></span> <span
class="inserted"><ins><em>vague and ominous statement about
+“Ubuntu patents,” without giving enough details</em></ins></span>
to <span class="removed"><del><strong>buy things from Amazon. This does
+not, strictly speaking, affect</strong></del></span> <span
class="inserted"><ins><em>show</em></ins></span>
+whether <span class="removed"><del><strong>Ubuntu is free software, but it
+is a violation of users' privacy. It also encourages buying from
+Amazon, a company</strong></del></span> <span class="inserted"><ins><em>that
constitutes aggression or not.</p>
<p>That page spreads confusion by using the misleading
-term <a href="/philosophy/not-ipr.html">“intellectual property
-rights”</a>, which falsely presumes that trademark law and patent
law
-and several other laws belong in one single conceptual framework. Use
-of that term is harmful, without exception, so after making a
-reference to someone else's use of the term, we should always reject
-it. However, that is not a substantive issue about Ubuntu as a
+term</em></ins></span> <a <span
class="removed"><del><strong>href="http://DefectiveByDesign.org/">associated
+with DRM</a> as well as mistreatment of workers,
authors</strong></del></span> <span
class="inserted"><ins><em>href="/philosophy/not-ipr.html">“intellectual
property
+rights”</a>, which falsely presumes that trademark
law</em></ins></span> and <span
class="removed"><del><strong>publishers.</p>
+
+<p>This adware is</strong></del></span> <span
class="inserted"><ins><em>patent law
+and several other laws belong in</em></ins></span> one <span
class="inserted"><ins><em>single conceptual framework. Use</em></ins></span>
+of <span class="removed"><del><strong>the rare occasions in which a free
software
+developer persists in keeping</strong></del></span> <span
class="inserted"><ins><em>that term is harmful, without exception, so after
making</em></ins></span> a <span class="removed"><del><strong>malicious feature
in its version</strong></del></span>
+<span class="inserted"><ins><em>reference to someone else's
use</em></ins></span> of <span class="inserted"><ins><em>the term, we should
always reject
+it. However, that is not</em></ins></span> a
+<span class="removed"><del><strong>program.</p></strong></del></span>
<span class="inserted"><ins><em>substantive issue about Ubuntu as a
GNU/Linux distribution.</p></em></ins></span>
<h2>Some Other Distros</h2>
@@ -355,7 +354,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:39 $
<!-- timestamp end -->
</p>
</div>
Index: po/common-distros.hr.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.hr.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- po/common-distros.hr.po 7 Jun 2016 16:29:58 -0000 1.31
+++ po/common-distros.hr.po 8 Jun 2016 14:28:39 -0000 1.32
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+0000\n"
"PO-Revision-Date: 2014-04-10 23:22+0100\n"
"Last-Translator: Martina Bebek <address@hidden>\n"
"Language-Team: GNU Croatian Translation Team <address@hidden>\n"
@@ -475,23 +475,6 @@
msgstr ""
#. type: Content of: <p>
-# | This adware is one of the rare occasions in which a free software
-# | developer persists in keeping a malicious feature in its version of a
-# | {+free+} program.
-#, fuzzy
-#| msgid ""
-#| "This adware is one of the rare occasions in which a free software "
-#| "developer persists in keeping a malicious feature in its version of a "
-#| "program."
-msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-"Ovaj oglasni program (<i>adware</i>) je jedna od rijetkih prilika u kojoj "
-"razvijatelj slobodnog softvera ustraje u Äuvanju maliciozne znaÄajke u "
-"svojoj inaÄici programa."
-
-#. type: Content of: <p>
msgid ""
"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
"property-policy#your-use-of-ubuntu\">appears to permit commercial "
@@ -706,6 +689,20 @@
#, fuzzy
#~| msgid ""
+#~| "This adware is one of the rare occasions in which a free software "
+#~| "developer persists in keeping a malicious feature in its version of a "
+#~| "program."
+#~ msgid ""
+#~ "This adware is one of the rare occasions in which a free software "
+#~ "developer persists in keeping a malicious feature in its version of a "
+#~ "free program."
+#~ msgstr ""
+#~ "Ovaj oglasni program (<i>adware</i>) je jedna od rijetkih prilika u kojoj "
+#~ "razvijatelj slobodnog softvera ustraje u Äuvanju maliciozne znaÄajke u "
+#~ "svojoj inaÄici programa."
+
+#, fuzzy
+#~| msgid ""
#~| "As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/";
#~| "does-ubuntus-amazon-lens-break-eu-law\"> sends personal data about "
#~| "users' searches</a> to a server belonging to Canonical, which sends back "
Index: po/common-distros.it-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.it-en.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- po/common-distros.it-en.html 7 Jun 2016 16:29:58 -0000 1.40
+++ po/common-distros.it-en.html 8 Jun 2016 14:28:39 -0000 1.41
@@ -193,10 +193,6 @@
to tell which ones are free</a> since proprietary programs for
download at no charge are labelled “free”.</p>
-<p>This adware is one of the rare occasions in which a free software
-developer persists in keeping a malicious feature in its version of a
-free program.</p>
-
<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>appears
to permit commercial redistribution of exact copies with the
trademarks</a>; removal of the trademarks is required only for
@@ -321,7 +317,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:39 $
<!-- timestamp end -->
</p>
</div>
Index: po/common-distros.it.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.it.po,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- po/common-distros.it.po 7 Jun 2016 16:29:58 -0000 1.109
+++ po/common-distros.it.po 8 Jun 2016 14:28:39 -0000 1.110
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+0000\n"
"PO-Revision-Date: 2016-04-01 21:51+0100\n"
"Last-Translator: Andrea Pescetti <address@hidden>\n"
"Language-Team: Italian\n"
@@ -432,15 +432,6 @@
#. type: Content of: <p>
msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-"Questo software pubblicitario è uno dei rari casi in cui uno sviluppatore di
"
-"software libero persiste nel voler mantenere una funzionalità malevola nella
"
-"sua versione di un programma libero."
-
-#. type: Content of: <p>
-msgid ""
"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
"property-policy#your-use-of-ubuntu\">appears to permit commercial "
"redistribution of exact copies with the trademarks</a>; removal of the "
@@ -666,6 +657,15 @@
msgstr "Ultimo aggiornamento:"
#~ msgid ""
+#~ "This adware is one of the rare occasions in which a free software "
+#~ "developer persists in keeping a malicious feature in its version of a "
+#~ "free program."
+#~ msgstr ""
+#~ "Questo software pubblicitario è uno dei rari casi in cui uno sviluppatore
"
+#~ "di software libero persiste nel voler mantenere una funzionalità malevola
"
+#~ "nella sua versione di un programma libero."
+
+#~ msgid ""
#~ "Since October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/";
#~ "does-ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
#~ "searches</a> to a server belonging to Canonical, which sends back ads to "
Index: po/common-distros.ja-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ja-en.html,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- po/common-distros.ja-en.html 7 Jun 2016 16:29:58 -0000 1.44
+++ po/common-distros.ja-en.html 8 Jun 2016 14:28:39 -0000 1.45
@@ -193,10 +193,6 @@
to tell which ones are free</a> since proprietary programs for
download at no charge are labelled “free”.</p>
-<p>This adware is one of the rare occasions in which a free software
-developer persists in keeping a malicious feature in its version of a
-free program.</p>
-
<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>appears
to permit commercial redistribution of exact copies with the
trademarks</a>; removal of the trademarks is required only for
@@ -321,7 +317,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:39 $
<!-- timestamp end -->
</p>
</div>
Index: po/common-distros.ja.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ja.po,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- po/common-distros.ja.po 7 Jun 2016 16:29:58 -0000 1.90
+++ po/common-distros.ja.po 8 Jun 2016 14:28:39 -0000 1.91
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+0000\n"
"PO-Revision-Date: 2016-04-05 14:18+0900\n"
"Last-Translator: NIIBE Yutaka <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
@@ -429,14 +429,6 @@
#. type: Content of: <p>
msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-"ãã®ã¢ãã¦ã§ã¢ã¯èªç±ã½ããã¦ã§ã¢ã®éçºè
ããããèªç±ãªããã°ã©ã ã®æ¹é ã«æªæ"
-"ããæ©è½ãæããããã¨ã«å·çããã¾ããªã±ã¼ã¹ã®ä¸ã¤ã§ãã"
-
-#. type: Content of: <p>
-msgid ""
"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
"property-policy#your-use-of-ubuntu\">appears to permit commercial "
"redistribution of exact copies with the trademarks</a>; removal of the "
@@ -648,6 +640,14 @@
msgstr "æçµæ´æ°:"
#~ msgid ""
+#~ "This adware is one of the rare occasions in which a free software "
+#~ "developer persists in keeping a malicious feature in its version of a "
+#~ "free program."
+#~ msgstr ""
+#~ "ãã®ã¢ãã¦ã§ã¢ã¯èªç±ã½ããã¦ã§ã¢ã®éçºè
ããããèªç±ãªããã°ã©ã ã®æ¹é ã«æª"
+#~
"æããæ©è½ãæããããã¨ã«å·çããã¾ããªã±ã¼ã¹ã®ä¸ã¤ã§ãã"
+
+#~ msgid ""
#~ "Since October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/";
#~ "does-ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
#~ "searches</a> to a server belonging to Canonical, which sends back ads to "
Index: po/common-distros.lt-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.lt-diff.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/common-distros.lt-diff.html 7 Jun 2016 16:29:58 -0000 1.2
+++ po/common-distros.lt-diff.html 8 Jun 2016 14:28:39 -0000 1.3
@@ -213,11 +213,11 @@
not, strictly speaking, affect whether Ubuntu is free software, but it
is a violation of users' privacy. It also encourages buying from
Amazon, a company <a href="http://DefectiveByDesign.org/">associated
-with DRM</a> as well as mistreatment of workers, authors and
publishers.</p></strong></del></span>
+with DRM</a> as well as mistreatment of workers, authors and
publishers.</p>
<p>This adware is one of the rare occasions in which a free software
developer persists in keeping a malicious feature in its version of a
-free program.</p>
+free program.</p></strong></del></span>
<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu">appears
to permit commercial redistribution of exact copies with the
@@ -343,7 +343,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:39 $
<!-- timestamp end -->
</p>
</div>
Index: po/common-distros.lt.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.lt.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/common-distros.lt.po 7 Jun 2016 16:29:58 -0000 1.8
+++ po/common-distros.lt.po 8 Jun 2016 14:28:39 -0000 1.9
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+0000\n"
"PO-Revision-Date: 2016-01-25 20:36+0200\n"
"Last-Translator: Donatas Klimašauskas <address@hidden>\n"
"Language-Team: Lithuanian <address@hidden>\n"
@@ -443,15 +443,6 @@
#. type: Content of: <p>
msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-"Å i reklaminÄ programinÄ Ä¯ranga yra vienas iÅ¡ tų retų atvejų, kai
laisvos "
-"programinÄs įrangos autorius užsispyrusiai laiko savo laisvos programos "
-"versijoje žalingÄ
ypatybÄ."
-
-#. type: Content of: <p>
-msgid ""
"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
"property-policy#your-use-of-ubuntu\">appears to permit commercial "
"redistribution of exact copies with the trademarks</a>; removal of the "
@@ -679,6 +670,15 @@
msgstr "Atnaujinta:"
#~ msgid ""
+#~ "This adware is one of the rare occasions in which a free software "
+#~ "developer persists in keeping a malicious feature in its version of a "
+#~ "free program."
+#~ msgstr ""
+#~ "Å i reklaminÄ programinÄ Ä¯ranga yra vienas iÅ¡ tų retų atvejų, kai
laisvos "
+#~ "programinÄs įrangos autorius užsispyrusiai laiko savo laisvos programos
"
+#~ "versijoje žalingÄ
ypatybÄ."
+
+#~ msgid ""
#~ "Since October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/";
#~ "does-ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
#~ "searches</a> to a server belonging to Canonical, which sends back ads to "
Index: po/common-distros.nl-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.nl-en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/common-distros.nl-en.html 7 Jun 2016 16:29:58 -0000 1.2
+++ po/common-distros.nl-en.html 8 Jun 2016 14:28:40 -0000 1.3
@@ -193,10 +193,6 @@
to tell which ones are free</a> since proprietary programs for
download at no charge are labelled “free”.</p>
-<p>This adware is one of the rare occasions in which a free software
-developer persists in keeping a malicious feature in its version of a
-free program.</p>
-
<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>appears
to permit commercial redistribution of exact copies with the
trademarks</a>; removal of the trademarks is required only for
@@ -321,7 +317,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:40 $
<!-- timestamp end -->
</p>
</div>
Index: po/common-distros.nl.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.nl.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/common-distros.nl.po 7 Jun 2016 16:29:58 -0000 1.3
+++ po/common-distros.nl.po 8 Jun 2016 14:28:40 -0000 1.4
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+0000\n"
"PO-Revision-Date: 2016-05-13 20:18+0100\n"
"Last-Translator: Tom Uijldert <address@hidden>\n"
"Language-Team: Dutch <address@hidden>\n"
@@ -433,15 +433,6 @@
#. type: Content of: <p>
msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-"Deze advertentie-software is één van de zeldzame gevallen "
-"waarbij een ontwikkelaar van vrije software volhardt in het behouden van een "
-"stiekeme functie in zijn versie van een vrij programma."
-
-#. type: Content of: <p>
-msgid ""
"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
"property-policy#your-use-of-ubuntu\">appears to permit commercial "
"redistribution of exact copies with the trademarks</a>; removal of the "
@@ -658,6 +649,15 @@
msgstr "Bijgewerkt:"
#~ msgid ""
+#~ "This adware is one of the rare occasions in which a free software "
+#~ "developer persists in keeping a malicious feature in its version of a "
+#~ "free program."
+#~ msgstr ""
+#~ "Deze advertentie-software is één van de zeldzame gevallen "
+#~ "waarbij een ontwikkelaar van vrije software volhardt in het behouden van "
+#~ "een stiekeme functie in zijn versie van een vrij programma."
+
+#~ msgid ""
#~ "Since October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/";
#~ "does-ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
#~ "searches</a> to a server belonging to Canonical, which sends back ads to "
Index: po/common-distros.pl-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pl-diff.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- po/common-distros.pl-diff.html 7 Jun 2016 16:29:58 -0000 1.2
+++ po/common-distros.pl-diff.html 8 Jun 2016 14:28:40 -0000 1.3
@@ -213,11 +213,11 @@
not, strictly speaking, affect whether Ubuntu is free software, but it
is a violation of users' privacy. It also encourages buying from
Amazon, a company <a href="http://DefectiveByDesign.org/">associated
-with DRM</a> as well as mistreatment of workers, authors and
publishers.</p></strong></del></span>
+with DRM</a> as well as mistreatment of workers, authors and
publishers.</p>
<p>This adware is one of the rare occasions in which a free software
developer persists in keeping a malicious feature in its version of a
-free program.</p>
+free program.</p></strong></del></span>
<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu">appears
to permit commercial redistribution of exact copies with the
@@ -343,7 +343,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:40 $
<!-- timestamp end -->
</p>
</div>
Index: po/common-distros.pl.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pl.po,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- po/common-distros.pl.po 7 Jun 2016 16:29:58 -0000 1.114
+++ po/common-distros.pl.po 8 Jun 2016 14:28:40 -0000 1.115
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: common-distros.html\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+0000\n"
"PO-Revision-Date: 2015-10-25 12:44-0600\n"
"Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
"Language-Team: Polish <address@hidden>\n"
@@ -464,15 +464,6 @@
#. type: Content of: <p>
msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-"Ten element adware jest jednym z nielicznych przypadków, gdzie "
-"deweloper wolnego oprogramowania utrzymuje niepożÄ
danÄ
cechÄ w jego "
-"wersji wolnego programu."
-
-#. type: Content of: <p>
-msgid ""
"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
"property-policy#your-use-of-ubuntu\">appears to permit commercial "
"redistribution of exact copies with the trademarks</a>; removal of the "
@@ -699,6 +690,15 @@
msgstr "Aktualizowane:"
#~ msgid ""
+#~ "This adware is one of the rare occasions in which a free software "
+#~ "developer persists in keeping a malicious feature in its version of a "
+#~ "free program."
+#~ msgstr ""
+#~ "Ten element adware jest jednym z nielicznych przypadków, gdzie "
+#~ "deweloper wolnego oprogramowania utrzymuje niepożÄ
danÄ
cechÄ
w jego "
+#~ "wersji wolnego programu."
+
+#~ msgid ""
#~ "Since October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/";
#~ "does-ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
#~ "searches</a> to a server belonging to Canonical, which sends back ads to "
Index: po/common-distros.pot
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pot,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- po/common-distros.pot 7 Jun 2016 16:29:58 -0000 1.69
+++ po/common-distros.pot 8 Jun 2016 14:28:40 -0000 1.70
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+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"
@@ -310,12 +310,6 @@
#. type: Content of: <p>
msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-
-#. type: Content of: <p>
-msgid ""
"Ubuntu <a "
"href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu\";>appears
"
"to permit commercial redistribution of exact copies with the trademarks</a>; "
Index: po/common-distros.pt-br-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pt-br-diff.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- po/common-distros.pt-br-diff.html 7 Jun 2016 16:29:58 -0000 1.24
+++ po/common-distros.pt-br-diff.html 8 Jun 2016 14:28:40 -0000 1.25
@@ -201,46 +201,45 @@
Linux, the kernel, included in Ubuntu contains firmware blobs.</p>
<span class="removed"><del><strong><p>
-Ubuntu's trademark policy prohibits commercial redistribution of exact
-copies of Ubuntu, denying an important freedom.
+Ubuntu's trademark policy prohibits</strong></del></span>
+
+<span class="inserted"><ins><em><p>The “Ubuntu Software
Center” lists proprietary programs
+and free programs jumbled together. It
+is <a
href="http://www.freesoftwaremagazine.com/articles/ubuntu_software_center_proprietary_and_free_software_mixed_confusing_ui">hard
+to tell which ones are free</a> since proprietary programs for
+download at no charge are labelled “free”.</p>
+
+<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu">appears
+to permit</em></ins></span> commercial redistribution of exact copies <span
class="inserted"><ins><em>with the
+trademarks</a>; removal</em></ins></span> of <span
class="removed"><del><strong>Ubuntu, denying</strong></del></span> <span
class="inserted"><ins><em>the trademarks is required only for
+modified versions. That is</em></ins></span> an <span
class="removed"><del><strong>important freedom.
</p>
<p>
As of October 2012, Ubuntu
<a
href="http://www.omgubuntu.co.uk/2012/10/does-ubuntus-amazon-lens-break-eu-law">
-sends personal data about users' searches</a> to a server belonging to
-Canonical, which sends back ads to buy things from Amazon. This does
-not, strictly speaking, affect whether Ubuntu is</strong></del></span>
-
-<span class="inserted"><ins><em><p>The “Ubuntu Software
Center” lists proprietary programs
-and</em></ins></span> free <span class="removed"><del><strong>software, but it
-is a violation of users' privacy.</strong></del></span> <span
class="inserted"><ins><em>programs jumbled together.</em></ins></span> It
<span class="removed"><del><strong>also encourages buying from
-Amazon, a company</strong></del></span>
-<span class="inserted"><ins><em>is</em></ins></span> <a <span
class="removed"><del><strong>href="http://DefectiveByDesign.org/">associated
-with DRM</a> as well as mistreatment of workers, authors and
publishers.</p></strong></del></span> <span
class="inserted"><ins><em>href="http://www.freesoftwaremagazine.com/articles/ubuntu_software_center_proprietary_and_free_software_mixed_confusing_ui">hard
-to tell which ones are free</a> since proprietary programs for
-download at no charge are labelled
“free”.</p></em></ins></span>
-
-<p>This adware is one of the rare occasions in which a free software
-developer persists in keeping a malicious feature in its version of a
-<span class="inserted"><ins><em>free</em></ins></span> program.</p>
-
-<span class="inserted"><ins><em><p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu">appears
-to permit commercial redistribution of exact copies with the
-trademarks</a>; removal of the trademarks is required only for
-modified versions. That is an acceptable policy for trademarks. The
-same page, further down, makes a vague and ominous statement about
-“Ubuntu patents,” without giving enough details to show
-whether that constitutes aggression or not.</p>
+sends personal data about users' searches</a> to</strong></del></span>
<span class="inserted"><ins><em>acceptable policy for trademarks. The
+same page, further down, makes</em></ins></span> a <span
class="removed"><del><strong>server belonging to
+Canonical, which sends back ads</strong></del></span> <span
class="inserted"><ins><em>vague and ominous statement about
+“Ubuntu patents,” without giving enough details</em></ins></span>
to <span class="removed"><del><strong>buy things from Amazon. This does
+not, strictly speaking, affect</strong></del></span> <span
class="inserted"><ins><em>show</em></ins></span>
+whether <span class="removed"><del><strong>Ubuntu is free software, but it
+is a violation of users' privacy. It also encourages buying from
+Amazon, a company</strong></del></span> <span class="inserted"><ins><em>that
constitutes aggression or not.</p>
<p>That page spreads confusion by using the misleading
-term <a href="/philosophy/not-ipr.html">“intellectual property
-rights”</a>, which falsely presumes that trademark law and patent
law
-and several other laws belong in one single conceptual framework. Use
-of that term is harmful, without exception, so after making a
-reference to someone else's use of the term, we should always reject
-it. However, that is not a substantive issue about Ubuntu as a
-GNU/Linux distribution.</p></em></ins></span>
+term</em></ins></span> <a <span
class="removed"><del><strong>href="http://DefectiveByDesign.org/">associated
+with DRM</a> as well as mistreatment of workers,
authors</strong></del></span> <span
class="inserted"><ins><em>href="/philosophy/not-ipr.html">“intellectual
property
+rights”</a>, which falsely presumes that trademark
law</em></ins></span> and <span
class="removed"><del><strong>publishers.</p>
+
+<p>This adware is</strong></del></span> <span
class="inserted"><ins><em>patent law
+and several other laws belong in</em></ins></span> one <span
class="inserted"><ins><em>single conceptual framework. Use</em></ins></span>
+of <span class="removed"><del><strong>the rare occasions in which a free
software
+developer persists in keeping</strong></del></span> <span
class="inserted"><ins><em>that term is harmful, without exception, so after
making</em></ins></span> a <span class="removed"><del><strong>malicious feature
in its version</strong></del></span>
+<span class="inserted"><ins><em>reference to someone else's
use</em></ins></span> of <span class="inserted"><ins><em>the term, we should
always reject
+it. However, that is not a substantive issue about Ubuntu
as</em></ins></span> a
+<span class="removed"><del><strong>program.</p></strong></del></span>
+<span class="inserted"><ins><em>GNU/Linux
distribution.</p></em></ins></span>
<h2>Some Other Distros</h2>
@@ -352,7 +351,7 @@
<span class="inserted"><ins><em><p
class="unprintable">Updated:</em></ins></span>
<!-- timestamp start -->
-$Date: 2016/06/07 16:29:58 $
+$Date: 2016/06/08 14:28:40 $
<!-- timestamp end -->
</p>
</div>
Index: po/common-distros.pt-br.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pt-br.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- po/common-distros.pt-br.po 7 Jun 2016 16:29:59 -0000 1.28
+++ po/common-distros.pt-br.po 8 Jun 2016 14:28:40 -0000 1.29
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+0000\n"
"PO-Revision-Date: 2012-11-26 19:31-0200\n"
"Last-Translator: Rafael Beraldo <address@hidden>\n"
"Language-Team: Brazilian Portuguese <address@hidden>\n"
@@ -441,19 +441,6 @@
msgstr ""
#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "This adware is one of the rare occasions in which a free software "
-#| "developer persists in keeping a malicious feature in its version of a "
-#| "program."
-msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-"Esse adware é uma das raras ocasiões na qual um desenvolvedor de software "
-"livre persiste em manter funções maliciosas nas versões de um programa."
-
-#. type: Content of: <p>
msgid ""
"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
"property-policy#your-use-of-ubuntu\">appears to permit commercial "
@@ -661,6 +648,19 @@
#, fuzzy
#~| msgid ""
+#~| "This adware is one of the rare occasions in which a free software "
+#~| "developer persists in keeping a malicious feature in its version of a "
+#~| "program."
+#~ msgid ""
+#~ "This adware is one of the rare occasions in which a free software "
+#~ "developer persists in keeping a malicious feature in its version of a "
+#~ "free program."
+#~ msgstr ""
+#~ "Esse adware é uma das raras ocasiões na qual um desenvolvedor de
software "
+#~ "livre persiste em manter funções maliciosas nas versões de um programa."
+
+#, fuzzy
+#~| msgid ""
#~| "As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/";
#~| "does-ubuntus-amazon-lens-break-eu-law\"> sends personal data about "
#~| "users' searches</a> to a server belonging to Canonical, which sends back "
Index: po/common-distros.ro-diff.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ro-diff.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- po/common-distros.ro-diff.html 7 Jun 2016 16:29:59 -0000 1.20
+++ po/common-distros.ro-diff.html 8 Jun 2016 14:28:40 -0000 1.21
@@ -206,46 +206,45 @@
Linux, the kernel, included in Ubuntu contains firmware blobs.</p>
<span class="removed"><del><strong><p>
-Ubuntu's trademark policy prohibits commercial redistribution of exact
-copies of Ubuntu, denying an important freedom.
+Ubuntu's trademark policy prohibits</strong></del></span>
+
+<span class="inserted"><ins><em><p>The “Ubuntu Software
Center” lists proprietary programs
+and free programs jumbled together. It
+is <a
href="http://www.freesoftwaremagazine.com/articles/ubuntu_software_center_proprietary_and_free_software_mixed_confusing_ui">hard
+to tell which ones are free</a> since proprietary programs for
+download at no charge are labelled “free”.</p>
+
+<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu">appears
+to permit</em></ins></span> commercial redistribution of exact copies <span
class="inserted"><ins><em>with the
+trademarks</a>; removal</em></ins></span> of <span
class="removed"><del><strong>Ubuntu, denying</strong></del></span> <span
class="inserted"><ins><em>the trademarks is required only for
+modified versions. That is</em></ins></span> an <span
class="removed"><del><strong>important freedom.
</p>
<p>
As of October 2012, Ubuntu
<a
href="http://www.omgubuntu.co.uk/2012/10/does-ubuntus-amazon-lens-break-eu-law">
-sends personal data about users' searches</a> to a server belonging to
-Canonical, which sends back ads to buy things from Amazon. This does
-not, strictly speaking, affect whether Ubuntu is</strong></del></span>
-
-<span class="inserted"><ins><em><p>The “Ubuntu Software
Center” lists proprietary programs
-and</em></ins></span> free <span class="removed"><del><strong>software, but it
-is a violation of users' privacy.</strong></del></span> <span
class="inserted"><ins><em>programs jumbled together.</em></ins></span> It
<span class="removed"><del><strong>also encourages buying from
-Amazon, a company</strong></del></span>
-<span class="inserted"><ins><em>is</em></ins></span> <a <span
class="removed"><del><strong>href="http://DefectiveByDesign.org/">associated
-with DRM</a> as well as mistreatment of workers, authors and
publishers.</p></strong></del></span> <span
class="inserted"><ins><em>href="http://www.freesoftwaremagazine.com/articles/ubuntu_software_center_proprietary_and_free_software_mixed_confusing_ui">hard
-to tell which ones are free</a> since proprietary programs for
-download at no charge are labelled
“free”.</p></em></ins></span>
-
-<p>This adware is one of the rare occasions in which a free software
-developer persists in keeping a malicious feature in its version of a
-<span class="inserted"><ins><em>free</em></ins></span> program.</p>
-
-<span class="inserted"><ins><em><p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu">appears
-to permit commercial redistribution of exact copies with the
-trademarks</a>; removal of the trademarks is required only for
-modified versions. That is an acceptable policy for trademarks. The
-same page, further down, makes a vague and ominous statement about
-“Ubuntu patents,” without giving enough details to show
-whether that constitutes aggression or not.</p>
+sends personal data about users' searches</a> to</strong></del></span>
<span class="inserted"><ins><em>acceptable policy for trademarks. The
+same page, further down, makes</em></ins></span> a <span
class="removed"><del><strong>server belonging to
+Canonical, which sends back ads</strong></del></span> <span
class="inserted"><ins><em>vague and ominous statement about
+“Ubuntu patents,” without giving enough details</em></ins></span>
to <span class="removed"><del><strong>buy things from Amazon. This does
+not, strictly speaking, affect</strong></del></span> <span
class="inserted"><ins><em>show</em></ins></span>
+whether <span class="removed"><del><strong>Ubuntu is free software, but it
+is a violation of users' privacy. It also encourages buying from
+Amazon, a company</strong></del></span> <span class="inserted"><ins><em>that
constitutes aggression or not.</p>
<p>That page spreads confusion by using the misleading
-term <a href="/philosophy/not-ipr.html">“intellectual property
-rights”</a>, which falsely presumes that trademark law and patent
law
-and several other laws belong in one single conceptual framework. Use
-of that term is harmful, without exception, so after making a
-reference to someone else's use of the term, we should always reject
-it. However, that is not a substantive issue about Ubuntu as a
-GNU/Linux distribution.</p></em></ins></span>
+term</em></ins></span> <a <span
class="removed"><del><strong>href="http://DefectiveByDesign.org/">associated
+with DRM</a> as well as mistreatment of workers,
authors</strong></del></span> <span
class="inserted"><ins><em>href="/philosophy/not-ipr.html">“intellectual
property
+rights”</a>, which falsely presumes that trademark
law</em></ins></span> and <span
class="removed"><del><strong>publishers.</p>
+
+<p>This adware is</strong></del></span> <span
class="inserted"><ins><em>patent law
+and several other laws belong in</em></ins></span> one <span
class="inserted"><ins><em>single conceptual framework. Use</em></ins></span>
+of <span class="removed"><del><strong>the rare occasions in which a free
software
+developer persists in keeping</strong></del></span> <span
class="inserted"><ins><em>that term is harmful, without exception, so after
making</em></ins></span> a <span class="removed"><del><strong>malicious feature
in its version</strong></del></span>
+<span class="inserted"><ins><em>reference to someone else's
use</em></ins></span> of <span class="inserted"><ins><em>the term, we should
always reject
+it. However, that is not a substantive issue about Ubuntu
as</em></ins></span> a
+<span class="removed"><del><strong>program.</p></strong></del></span>
+<span class="inserted"><ins><em>GNU/Linux
distribution.</p></em></ins></span>
<h2>Some Other Distros</h2>
@@ -357,7 +356,7 @@
<span class="inserted"><ins><em><p
class="unprintable">Updated:</em></ins></span>
<!-- timestamp start -->
-$Date: 2016/06/07 16:29:59 $
+$Date: 2016/06/08 14:28:40 $
<!-- timestamp end -->
</p>
</div>
Index: po/common-distros.ro.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ro.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- po/common-distros.ro.po 7 Jun 2016 16:29:59 -0000 1.28
+++ po/common-distros.ro.po 8 Jun 2016 14:28:40 -0000 1.29
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+0000\n"
"PO-Revision-Date: 2013-12-11 12:59+0200\n"
"Last-Translator: Tiberiu C. Turbureanu <address@hidden>\n"
"Language-Team: Romanian <address@hidden>\n"
@@ -454,20 +454,6 @@
msgstr ""
#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "This adware is one of the rare occasions in which a free software "
-#| "developer persists in keeping a malicious feature in its version of a "
-#| "program."
-msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-"Acest program publicitar reprezintÄ una din rarele ocazii în care un "
-"dezvoltator de programe libere continuÄ sÄ pÄstreze o funcÈionalitate "
-"maliÈioasÄ Ã®n versiunea sa de program."
-
-#. type: Content of: <p>
msgid ""
"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
"property-policy#your-use-of-ubuntu\">appears to permit commercial "
@@ -672,6 +658,20 @@
#, fuzzy
#~| msgid ""
+#~| "This adware is one of the rare occasions in which a free software "
+#~| "developer persists in keeping a malicious feature in its version of a "
+#~| "program."
+#~ msgid ""
+#~ "This adware is one of the rare occasions in which a free software "
+#~ "developer persists in keeping a malicious feature in its version of a "
+#~ "free program."
+#~ msgstr ""
+#~ "Acest program publicitar reprezintÄ una din rarele ocazii în care un "
+#~ "dezvoltator de programe libere continuÄ sÄ pÄstreze o funcÈionalitate "
+#~ "maliÈioasÄ Ã®n versiunea sa de program."
+
+#, fuzzy
+#~| msgid ""
#~| "As of October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/";
#~| "does-ubuntus-amazon-lens-break-eu-law\"> sends personal data about "
#~| "users' searches</a> to a server belonging to Canonical, which sends back "
Index: po/common-distros.ru-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ru-en.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- po/common-distros.ru-en.html 7 Jun 2016 16:29:59 -0000 1.49
+++ po/common-distros.ru-en.html 8 Jun 2016 14:28:40 -0000 1.50
@@ -193,10 +193,6 @@
to tell which ones are free</a> since proprietary programs for
download at no charge are labelled “free”.</p>
-<p>This adware is one of the rare occasions in which a free software
-developer persists in keeping a malicious feature in its version of a
-free program.</p>
-
<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>appears
to permit commercial redistribution of exact copies with the
trademarks</a>; removal of the trademarks is required only for
@@ -321,7 +317,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/06/07 16:29:59 $
+$Date: 2016/06/08 14:28:40 $
<!-- timestamp end -->
</p>
</div>
Index: po/common-distros.ru.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ru.po,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- po/common-distros.ru.po 7 Jun 2016 16:29:59 -0000 1.127
+++ po/common-distros.ru.po 8 Jun 2016 14:28:40 -0000 1.128
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+0000\n"
"PO-Revision-Date: 2016-04-27 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -476,15 +476,6 @@
#. type: Content of: <p>
msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-"ÐÑи ÑекламнÑе пÑогÑÐ°Ð¼Ð¼Ñ — один из
ÑедкиÑ
ÑлÑÑаев, когда "
-"ÑазÑабоÑÑик ÑвободнÑÑ
пÑогÑамм ÑпоÑно ÑоÑ
ÑанÑÐµÑ Ð²ÑедоноÑнÑÑ Ð¾ÑобенноÑÑÑ "
-"в Ñвоей веÑÑии Ñвободной пÑогÑаммÑ."
-
-#. type: Content of: <p>
-msgid ""
"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
"property-policy#your-use-of-ubuntu\">appears to permit commercial "
"redistribution of exact copies with the trademarks</a>; removal of the "
@@ -716,6 +707,15 @@
msgstr "Ðбновлено:"
#~ msgid ""
+#~ "This adware is one of the rare occasions in which a free software "
+#~ "developer persists in keeping a malicious feature in its version of a "
+#~ "free program."
+#~ msgstr ""
+#~ "ÐÑи ÑекламнÑе пÑогÑÐ°Ð¼Ð¼Ñ — один из
ÑедкиÑ
ÑлÑÑаев, когда "
+#~ "ÑазÑабоÑÑик ÑвободнÑÑ
пÑогÑамм ÑпоÑно
ÑоÑ
ÑанÑÐµÑ Ð²ÑедоноÑнÑÑ Ð¾ÑобенноÑÑÑ "
+#~ "в Ñвоей веÑÑии Ñвободной пÑогÑаммÑ."
+
+#~ msgid ""
#~ "Since October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/";
#~ "does-ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
#~ "searches</a> to a server belonging to Canonical, which sends back ads to "
Index: po/common-distros.uk-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.uk-en.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- po/common-distros.uk-en.html 7 Jun 2016 16:29:59 -0000 1.14
+++ po/common-distros.uk-en.html 8 Jun 2016 14:28:40 -0000 1.15
@@ -193,10 +193,6 @@
to tell which ones are free</a> since proprietary programs for
download at no charge are labelled “free”.</p>
-<p>This adware is one of the rare occasions in which a free software
-developer persists in keeping a malicious feature in its version of a
-free program.</p>
-
<p>Ubuntu <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>appears
to permit commercial redistribution of exact copies with the
trademarks</a>; removal of the trademarks is required only for
@@ -321,7 +317,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2016/06/07 16:29:59 $
+$Date: 2016/06/08 14:28:40 $
<!-- timestamp end -->
</p>
</div>
Index: po/common-distros.uk.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.uk.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- po/common-distros.uk.po 7 Jun 2016 16:29:59 -0000 1.39
+++ po/common-distros.uk.po 8 Jun 2016 14:28:40 -0000 1.40
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2016-06-07 16:25+0000\n"
+"POT-Creation-Date: 2016-06-08 14:25+0000\n"
"PO-Revision-Date: 2016-04-01 11:31+0200\n"
"Last-Translator: Andriy Bandura <address@hidden>\n"
"Language-Team: Ukrainian <>\n"
@@ -429,14 +429,6 @@
#. type: Content of: <p>
msgid ""
-"This adware is one of the rare occasions in which a free software developer "
-"persists in keeping a malicious feature in its version of a free program."
-msgstr ""
-"Ð¦Ñ ÑÐµÐºÐ»Ð°Ð¼Ð½Ñ Ð¿ÑогÑами - один з ÑÑдкÑÑниÑ
випадкÑв, коли ÑозÑобник вÑлÑниÑ
"
-"пÑогÑам впеÑÑо збеÑÑÐ³Ð°Ñ ÑкÑдливÑ
оÑобливÑÑÑÑ Ñ ÑвоÑй веÑÑÑÑ Ð²ÑлÑноÑ
пÑогÑами."
-
-#. type: Content of: <p>
-msgid ""
"Ubuntu <a href=\"http://www.ubuntu.com/legal/terms-and-policies/intellectual-";
"property-policy#your-use-of-ubuntu\">appears to permit commercial "
"redistribution of exact copies with the trademarks</a>; removal of the "
@@ -660,6 +652,15 @@
msgstr "Ðновлено:"
#~ msgid ""
+#~ "This adware is one of the rare occasions in which a free software "
+#~ "developer persists in keeping a malicious feature in its version of a "
+#~ "free program."
+#~ msgstr ""
+#~ "Ð¦Ñ ÑÐµÐºÐ»Ð°Ð¼Ð½Ñ Ð¿ÑогÑами - один з ÑÑдкÑÑниÑ
випадкÑв, коли ÑозÑобник вÑлÑниÑ
"
+#~ "пÑогÑам впеÑÑо збеÑÑÐ³Ð°Ñ ÑкÑдливÑ
оÑобливÑÑÑÑ Ñ ÑвоÑй веÑÑÑÑ Ð²ÑлÑÐ½Ð¾Ñ "
+#~ "пÑогÑами."
+
+#~ msgid ""
#~ "Since October 2012, Ubuntu <a href=\"http://www.omgubuntu.co.uk/2012/10/";
#~ "does-ubuntus-amazon-lens-break-eu-law\"> sends personal data about users' "
#~ "searches</a> to a server belonging to Canonical, which sends back ads to "
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/distros common-distros.de.html common-distr...,
GNUN <=