[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/distros common-distros.pl.html po/common-di...
From: |
GNUN |
Subject: |
www/distros common-distros.pl.html po/common-di... |
Date: |
Sun, 31 May 2015 01:58:21 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/05/31 01:58:21
Modified files:
distros : common-distros.pl.html
distros/po : common-distros.pl-en.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.pl.html?cvsroot=www&r1=1.61&r2=1.62
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pl-en.html?cvsroot=www&r1=1.37&r2=1.38
Patches:
Index: common-distros.pl.html
===================================================================
RCS file: /web/www/www/distros/common-distros.pl.html,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- common-distros.pl.html 9 May 2015 21:27:27 -0000 1.61
+++ common-distros.pl.html 31 May 2015 01:58:20 -0000 1.62
@@ -207,12 +207,6 @@
Linuksa doÅÄ
czana wraz z Ubuntu zawiera plamki firmware.</p>
<p>
-Znak towarowy Ubuntu i jego polityka zakazujÄ
komercyjnego
-rozpowszechniania dokÅadnych kopii Ubuntu, zaprzeczajÄ
c tym samym ważnej
-wolnoÅci.
-</p>
-
-<p>
Od października 2012 Ubuntu <a
href="http://www.omgubuntu.co.uk/2012/10/does-ubuntus-amazon-lens-break-eu-law">wysyÅa
dane o wyszukiwaniach</a> do serwera Canonical, które wysyÅa reklamy
@@ -226,6 +220,22 @@
deweloper wolnego oprogramowania utrzymuje niepożÄ
danÄ
cechÄ w jego
wersji programu.</p>
+<p>Zdaje siÄ, że Ubuntu <a
+href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu">zezwala
+na komercyjne rozprowadzanie wiernych kopii zachowujÄ
cych znaki
+handlowe</a>; usuwanie znaków handlowych jest wymagane tylko dla
+zmodyfikowanych wersji. To jest akceptowalna polityka wzglÄdem znaków
+handlowych. Ta sama strona, niżej, niejasno i groźnie pisze
+o „Ubuntu patents”, bez dodatkowych szczegóÅów
+aby stwierdziÄ czy to jest agresywne czy nie.</p>
+
+<p>Ta strona sieje niejasnoÅÄ używajÄ
c zwodniczego terminu <a
+href="/philosophy/not-ipr.html">„wÅasnoÅÄ intelektualna”</a>,
+który bÅÄdnie zakÅada, że prawa znaków towarowych, prawa patentowe
+i wiele innych praw to to samo pojÄcie. Używanie tego terminu jest,
+bez wyjÄ
tku, szkodliwe, wiÄc zawsze musimy to potÄpiÄ. Jednakże,
+nie jest to ważnym zagadnieniem o Ubuntu jako dystrybucji GNU/Linux.</p>
+
<h2>Kilka pozostaÅych dystrybucji</h2>
<p>Tu omawiamy kilka dobrze-znanych lub znacznych nie-GNU/Linuksowych
@@ -323,7 +333,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -340,9 +350,9 @@
<p>Copyright © 2014, 2015 Free Software Foundation, Inc.</p>
<p>Ten utwór objÄty jest licencjÄ
Creative Commons Uznanie autorstwa-Bez
-utworów zależnych 3.0 Stany Zjednoczone. Aby zobaczyÄ kopiÄ niniejszej
+utworów zależnych 4.0 Stany Zjednoczone. Aby zobaczyÄ kopiÄ niniejszej
licencji przejdź na stronÄ <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">http://creativecommons.org/licenses/by-nd/3.0/us/</a>
+href="http://creativecommons.org/licenses/by-nd/4.0/us/">http://creativecommons.org/licenses/by-nd/4.0/us/</a>
lub napisz do Creative Commons, 171 Second Street, Suite 300, San
Francisco, California 94105, USA.</p>
@@ -350,14 +360,13 @@
<div class="translators-credits">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-TÅumaczenie: Jan Owoc 2012, 2013, 2014, Marcin Wolak 2010, 2011, 2012;
-poprawki: Mariusz Libera 2010, Jan Owoc 2010, 2011, 2012, 2015, Daniel
-Oźminkowski 2010.</div>
+TÅumaczenie: Jan Owoc 2012, 2013, 2014, 2015, Marcin Wolak 2010, 2011, 2012;
+poprawki: Mariusz Libera 2010, Jan Owoc 2010, 2011, Daniel Oźminkowski
2010.</div>
<p class="unprintable"><!-- timestamp start -->
Aktualizowane:
-$Date: 2015/05/09 21:27:27 $
+$Date: 2015/05/31 01:58:20 $
<!-- timestamp end -->
</p>
Index: po/common-distros.pl-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pl-en.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- po/common-distros.pl-en.html 9 May 2015 21:27:28 -0000 1.37
+++ po/common-distros.pl-en.html 31 May 2015 01:58:21 -0000 1.38
@@ -192,11 +192,6 @@
Linux, the kernel, included in Ubuntu contains firmware blobs.</p>
<p>
-Ubuntu's trademark policy prohibits commercial redistribution of exact
-copies of Ubuntu, denying an 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
@@ -210,6 +205,23 @@
developer persists in keeping a malicious feature in its version of a
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
+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>
+
+<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>
+
<h2>Some Other Distros</h2>
<p>Here we discuss some well-known or significant non-GNU/Linux system
@@ -292,7 +304,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 3.0 US. Please do NOT change or remove this
+ be under CC BY-ND 4.0. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -310,14 +322,14 @@
<p>Copyright © 2014, 2015 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/05/09 21:27:28 $
+$Date: 2015/05/31 01:58:21 $
<!-- timestamp end -->
</p>
</div>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/distros common-distros.pl.html po/common-di...,
GNUN <=