[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www distros/common-distros.uk.html distros/free...
|
From: |
GNUN |
|
Subject: |
www distros/common-distros.uk.html distros/free... |
|
Date: |
Thu, 02 Jul 2015 09:28:04 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/07/02 09:28:04
Modified files:
distros : common-distros.uk.html free-distros.uk.html
free-non-gnu-distros.uk.html
free-system-distribution-guidelines.uk.html
distros/po : common-distros.uk-en.html common-distros.uk.po
free-distros.uk-en.html free-distros.uk.po
free-non-gnu-distros.uk-en.html
free-non-gnu-distros.uk.po
free-system-distribution-guidelines.uk-en.html
free-system-distribution-guidelines.uk.po
education : edu-schools.uk.html
education/po : edu-schools.uk-en.html edu-schools.uk.po
gnu : gnu-linux-faq.uk.html
gnu-users-never-heard-of-gnu.uk.html
gnu/po : gnu-linux-faq.uk-en.html gnu-linux-faq.uk.po
gnu-users-never-heard-of-gnu.uk-en.html
gnu-users-never-heard-of-gnu.uk.po
philosophy : surveillance-vs-democracy.uk.html
philosophy/po : surveillance-vs-democracy.uk-en.html
surveillance-vs-democracy.uk.po
server : sitemap.uk.html
server/po : sitemap.uk-en.html sitemap.uk.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/common-distros.uk.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-distros.uk.html?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-non-gnu-distros.uk.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/free-system-distribution-guidelines.uk.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.uk-en.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.uk.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.uk-en.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-distros.uk.po?cvsroot=www&r1=1.57&r2=1.58
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-non-gnu-distros.uk-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-non-gnu-distros.uk.po?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-system-distribution-guidelines.uk-en.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/free-system-distribution-guidelines.uk.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/education/edu-schools.uk.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-schools.uk-en.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/education/po/edu-schools.uk.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-linux-faq.uk.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/gnu-users-never-heard-of-gnu.uk.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.uk-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.uk.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.uk-en.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.uk.po?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/surveillance-vs-democracy.uk.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.uk-en.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/surveillance-vs-democracy.uk.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/server/sitemap.uk.html?cvsroot=www&r1=1.186&r2=1.187
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.uk-en.html?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.uk.po?cvsroot=www&r1=1.209&r2=1.210
Patches:
Index: distros/common-distros.uk.html
===================================================================
RCS file: /web/www/www/distros/common-distros.uk.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- distros/common-distros.uk.html 1 Jun 2015 06:33:43 -0000 1.10
+++ distros/common-distros.uk.html 2 Jul 2015 09:27:56 -0000 1.11
@@ -196,6 +196,12 @@
невÑлÑÐ½Ñ Ð¿Ð°ÐºÐµÑи. ÐÑÑм Ñого, веÑÑÑÑ ÑдÑа
(Linux), Ñка вклÑÑаÑÑÑÑÑ Ð² Ubuntu,
мÑÑÑиÑÑ Ð»Ñпки з мÑкÑопÑогÑамами длÑ
пÑиÑÑÑоÑв.</p>
+<p>“ÐÑогÑамний ÑенÑÑ Ubuntu” пеÑеÑаÑ
овÑÑ
невÑлÑÐ½Ñ Ð¿ÑогÑами впеÑемÑж
+Ñз вÑлÑними. <a
+href="http://www.freesoftwaremagazine.com/articles/ubuntu_software_center_proprietary_and_free_software_mixed_confusing_ui";>Ðажко
+ÑказаÑи, ÑÐºÑ Ð· ниÑ
вÑлÑнÑ</a>, бо безкоÑÑовно
поÑиÑÑÐ²Ð°Ð½Ñ Ð½ÐµÐ²ÑлÑÐ½Ñ Ð¿ÑогÑами
+познаÑаÑÑÑÑÑ Ñк “вÑлÑнє.</p>
+
<p>
Ðа жовÑÐµÐ½Ñ 2012 ÑÐ¾ÐºÑ Ubuntu <a
href="http://www.omgubuntu.co.uk/2012/10/does-ubuntus-amazon-lens-break-eu-law";>
@@ -204,11 +210,12 @@
кажÑÑи, не Ð²Ð¿Ð»Ð¸Ð²Ð°Ñ Ð½Ð° Ñе, Ñи Ñ Ð¿ÑогÑами Ubuntu
вÑлÑними, але Ñе поÑÑÑÑÑ
конÑÑденÑÑйнÑÑÑÑ ÐºÐ¾ÑиÑÑÑваÑÑв. ÐÑÑм Ñого,
Ñе заоÑ
оÑÑÑ Ð¿Ð¾ÐºÑпки в Amazon,
компанÑÑ, <a href="http://DefectiveByDesign.org/";>
аÑоÑÑÐ¹Ð¾Ð²Ð°Ð½Ð¾Ñ Ð· ÑиÑÑовим
-ÑпÑавлÑннÑм обмеженнÑми</a>, а Ñакож з
неÑпÑаведливоÑÑÑми Ñодо пÑаÑÑвникÑв,
-авÑоÑÑв Ñ Ð²Ð¸Ð´Ð°Ð²ÑÑв.</p>
+ÑпÑавлÑннÑм обмеженнÑми (DRM)</a>, а Ñакож з
неÑпÑаведливоÑÑÑми Ñодо
+пÑаÑÑвникÑв, авÑоÑÑв Ñ Ð²Ð¸Ð´Ð°Ð²ÑÑв.</p>
<p>Ð¦Ñ ÑÐµÐºÐ»Ð°Ð¼Ð½Ñ Ð¿ÑогÑами - один з ÑÑдкÑÑниÑ
випадкÑв, коли ÑозÑобник вÑлÑниÑ
-пÑогÑам впеÑÑо збеÑÑÐ³Ð°Ñ ÑкÑдливÑ
оÑобливÑÑÑÑ Ñ ÑвоÑй веÑÑÑÑ Ð¿ÑогÑами.</p>
+пÑогÑам впеÑÑо збеÑÑÐ³Ð°Ñ ÑкÑдливÑ
оÑобливÑÑÑÑ Ñ ÑвоÑй веÑÑÑÑ Ð²ÑлÑноÑ
+пÑогÑами.</p>
<p>ÐиÑвлÑÑÑÑÑÑ, <a
href="http://www.ubuntu.com/legal/terms-and-policies/intellectual-property-policy#your-use-of-ubuntu";>Ubuntu
@@ -352,7 +359,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðновлено:
-$Date: 2015/06/01 06:33:43 $
+$Date: 2015/07/02 09:27:56 $
<!-- timestamp end -->
</p>
Index: distros/free-distros.uk.html
===================================================================
RCS file: /web/www/www/distros/free-distros.uk.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- distros/free-distros.uk.html 2 May 2015 12:28:28 -0000 1.19
+++ distros/free-distros.uk.html 2 Jul 2015 09:27:57 -0000 1.20
@@ -204,9 +204,9 @@
href="/distros/free-system-distribution-guidelines.html">Ð
екомендаÑÑй длÑ
вÑлÑниÑ
диÑÑÑибÑÑивÑв ÑиÑÑем</a> Ñ Ñ
оÑеÑе,
аби вÑн бÑв ÑÑÑ Ð·Ð³Ð°Ð´Ð°Ð½Ð¸Ð¹,
надÑÑлÑÑÑ, бÑÐ´Ñ Ð»Ð°Ñка, нам за адÑеÑÐ¾Ñ <a
-href="mailto:address@hidden";><address@hidden></a> коÑоÑкий
-Ð¾Ð¿Ð¸Ñ Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° ÑÐ°Ð¹Ñ Ð¿ÑоекÑÑ. ÐÑÑлÑ
ÑÑого ми ÑозповÑмо вам деÑалÑнÑÑе
-пÑо Ð½Ð°Ñ Ð¿ÑоÑÐµÑ Ð¾ÑÑнки Ñ Ð½ÐµÐ·Ð°Ð±Ð°Ñом
пÑиÑÑÑпимо до нÑого. ЧекаÑмо ваÑиÑ
лиÑÑÑв!</p>
+href="mailto:address@hidden";><address@hidden></a> коÑоÑкий
опиÑ
+Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° ÑÐ°Ð¹Ñ Ð¿ÑоекÑÑ. ÐÑÑÐ»Ñ ÑÑого ми
ÑозповÑмо вам деÑалÑнÑÑе пÑо наÑ
+пÑоÑÐµÑ Ð¾ÑÑнки Ñ Ð½ÐµÐ·Ð°Ð±Ð°Ñом пÑиÑÑÑпимо до
нÑого. ЧекаÑмо ваÑиÑ
лиÑÑÑв!</p>
<div class="translators-notes">
@@ -251,7 +251,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
@@ -268,9 +268,9 @@
<p>Copyright © 2014, 2015 Фонд вÑлÑного
пÑогÑамного забезпеÑеннÑ, Inc.</p>
<p>Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.uk";>
лÑÑензÑÑ
-Creative Commons Attribution-NoDerivs (<em>Ðз зазнаÑеннÑм
-авÑоÑÑÑва — Ðез поÑ
ÑдниÑ
ÑвоÑÑв</em>) 3.0
СполÑÑÐµÐ½Ñ Ð¨ÑаÑи</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> лÑÑензÑÑ
+Creative Commons Attribution-NoDerivatives 4.0 International (<em>Ðз
+зазнаÑеннÑм авÑоÑÑÑва â Ðез поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>.</p>
<!--#include virtual="/server/bottom-notes.uk.html" -->
<div class="translators-credits">
@@ -282,7 +282,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðновлено:
-$Date: 2015/05/02 12:28:28 $
+$Date: 2015/07/02 09:27:57 $
<!-- timestamp end -->
</p>
Index: distros/free-non-gnu-distros.uk.html
===================================================================
RCS file: /web/www/www/distros/free-non-gnu-distros.uk.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- distros/free-non-gnu-distros.uk.html 15 Jan 2015 07:43:03 -0000
1.3
+++ distros/free-non-gnu-distros.uk.html 2 Jul 2015 09:27:57 -0000
1.4
@@ -27,6 +27,16 @@
</li>
</ul>
+<p>ЯкÑо ви пÑдÑÑимÑÑÑе диÑÑÑибÑÑив
опеÑаÑÑÐ¹Ð½Ð¾Ñ ÑиÑÑеми, вÑдмÑÐ½Ð½Ð¾Ñ Ð²Ñд GNU, Ñкий
+доÑÑимÑÑÑÑÑÑ<a
+href="/distros/free-system-distribution-guidelines.html">Ð
екомендаÑÑй длÑ
+диÑÑÑибÑÑивÑв вÑлÑниÑ
ÑиÑÑем</a> Ñ Ñ
оÑÑли б
поÑÑапиÑи Ñ Ñей ÑпиÑок, напиÑÑÑÑ
+нам, бÑÐ´Ñ Ð»Ð°Ñка, за адÑеÑÐ¾Ñ <a
+href="mailto:address@hidden";><address@hidden></a>; опиÑÑÑÑ
ÑвÑй
+диÑÑÑибÑÑив Ñ Ð²ÐºÐ°Ð¶ÑÑÑ Ð¹Ð¾Ð³Ð¾ ÑайÑ. Ðи
ознайомимо Ð²Ð°Ñ Ð´ÐµÑалÑнÑÑе з наÑим
+пÑоÑеÑом оÑÑнки диÑÑÑибÑÑивÑв Ñ Ð²
Ð½ÐµÐ´Ð°Ð»ÐµÐºÐ¾Ð¼Ñ Ð¼Ð°Ð¹Ð±ÑÑнÑÐ¾Ð¼Ñ Ð¿Ð¾Ñнемо
+його. ЧекаÑмо ваÑиÑ
заÑвок!</p>
+
<div class="translators-notes">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -70,7 +80,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
@@ -87,9 +97,9 @@
<p>Copyright © 2015 Фонд вÑлÑного пÑогÑамного
забезпеÑеннÑ, Inc.</p>
<p>Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.uk";>
лÑÑензÑÑ
-Creative Commons Attribution-NoDerivs (<em>Ðз зазнаÑеннÑм
-авÑоÑÑÑва — Ðез поÑ
ÑдниÑ
ÑвоÑÑв</em>) 3.0
СполÑÑÐµÐ½Ñ Ð¨ÑаÑи</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> лÑÑензÑÑ
+Creative Commons Attribution-NoDerivatives 4.0 International (<em>Ðз
+зазнаÑеннÑм авÑоÑÑÑва â Ðез поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>.</p>
<!--#include virtual="/server/bottom-notes.uk.html" -->
<div class="translators-credits">
@@ -101,7 +111,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðновлено:
-$Date: 2015/01/15 07:43:03 $
+$Date: 2015/07/02 09:27:57 $
<!-- timestamp end -->
</p>
Index: distros/free-system-distribution-guidelines.uk.html
===================================================================
RCS file: /web/www/www/distros/free-system-distribution-guidelines.uk.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- distros/free-system-distribution-guidelines.uk.html 2 May 2015 12:28:29
-0000 1.10
+++ distros/free-system-distribution-guidelines.uk.html 2 Jul 2015 09:27:57
-0000 1.11
@@ -276,10 +276,10 @@
<h3 id="final-notes">ÐÑикÑнÑÐµÐ²Ñ Ð·Ð°ÑваженнÑ</h3>
<p>Ðи пÑдÑÑимÑÑмо пеÑелÑк <a
href="/distros/free-distros.html">вÑлÑниÑ
-диÑÑÑибÑÑивÑв ÑиÑÑем</a>, пÑо ÑÐºÑ Ð½Ð°Ð¼
вÑдомо. ЯкÑо ви знаÑÑе пÑо вÑлÑний
+диÑÑÑибÑÑивÑв ÑиÑÑем GNU</a>, пÑо ÑÐºÑ Ð½Ð°Ð¼
вÑдомо. ЯкÑо ви знаÑÑе пÑо вÑлÑний
диÑÑÑибÑÑивÑ, Ñкого Ñам немаÑ, Ñо, бÑдÑ
лаÑка, попÑоÑÑÑÑ Ð½Ð°Ð´ÑÑлаÑи
ÑозÑобникÑв нам за адÑеÑÐ¾Ñ <<a class="reference"
-href="mailto:address@hidden";>address@hidden</a>> повÑдомленнÑ
з
+href="mailto:address@hidden";>address@hidden</a>> повÑдомленнÑ
з
опиÑом ÑÑ
нÑÐ¾Ñ ÑиÑÑеми Ñ Ð¿Ð¾ÑиланнÑм на ÑÑ
нÑй ÑайÑ.</p>
<p>Ðи Ñакож пеÑеÑаÑ
овÑÑмо <a
href="/distros/free-non-gnu-distros.html">вÑлÑнÑ
@@ -287,7 +287,7 @@
<p>ЯкÑо Ñ Ð²Ð°Ñ Ñ Ð¿Ð¸ÑÐ°Ð½Ð½Ñ Ð°Ð±Ð¾ заÑÐ²Ð°Ð¶ÐµÐ½Ð½Ñ Ñз ÑиÑ
ÑекомендаÑÑй, надÑилайÑе ÑÑ
за
адÑеÑÐ¾Ñ <<a class="reference"
-href="mailto:address@hidden";>address@hidden</a>>. Ðи
ÑподÑваÑмоÑÑ,
+href="mailto:address@hidden";>address@hidden</a>>. Ðи
ÑподÑваÑмоÑÑ,
Ñо вони допоможÑÑÑ Ð²ÑÑм кÑаÑе зÑозÑмÑÑи
пиÑаннÑ, Ð²Ð°Ð¶Ð»Ð¸Ð²Ñ Ð´Ð»Ñ Ð´Ð¸ÑÑÑибÑÑивÑв
вÑлÑниÑ
ÑиÑÑем, Ñ Ð¼Ð¸ з неÑеÑпÑннÑм ÑекаÑмо
ÑпÑиÑÐ½Ð½Ñ Ð±ÑлÑÑоÑÑÑ Ð· ниÑ
Ñ
майбÑÑнÑомÑ. </p>
@@ -335,7 +335,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
@@ -352,9 +352,9 @@
<p>Copyright © 2014, 2015 Фонд вÑлÑного
пÑогÑамного забезпеÑеннÑ, Inc.</p>
<p>Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.uk";>
лÑÑензÑÑ
-Creative Commons Attribution-NoDerivs (<em>Ðз зазнаÑеннÑм
-авÑоÑÑÑва — Ðез поÑ
ÑдниÑ
ÑвоÑÑв</em>) 3.0
СполÑÑÐµÐ½Ñ Ð¨ÑаÑи</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> лÑÑензÑÑ
+Creative Commons Attribution-NoDerivatives 4.0 International (<em>Ðз
+зазнаÑеннÑм авÑоÑÑÑва â Ðез поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>.</p>
<!--#include virtual="/server/bottom-notes.uk.html" -->
<div class="translators-credits">
@@ -366,7 +366,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðновлено:
-$Date: 2015/05/02 12:28:29 $
+$Date: 2015/07/02 09:27:57 $
<!-- timestamp end -->
</p>
Index: distros/po/common-distros.uk-en.html
===================================================================
RCS file: /web/www/www/distros/po/common-distros.uk-en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- distros/po/common-distros.uk-en.html 1 Jun 2015 06:33:51 -0000
1.10
+++ distros/po/common-distros.uk-en.html 2 Jul 2015 09:27:57 -0000
1.11
@@ -191,8 +191,14 @@
option to install nonfree packages too. In addition, the version of
Linux, the kernel, included in Ubuntu contains firmware blobs.</p>
+<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>
-As of October 2012, Ubuntu
+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 buy things from Amazon. This does
@@ -203,7 +209,7 @@
<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
-program.</p>
+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
@@ -329,7 +335,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/06/01 06:33:51 $
+$Date: 2015/07/02 09:27:57 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/common-distros.uk.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.uk.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- distros/po/common-distros.uk.po 2 Jul 2015 09:09:58 -0000 1.31
+++ distros/po/common-distros.uk.po 2 Jul 2015 09:27:58 -0000 1.32
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-06-14 08:55+0000\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
@@ -428,24 +427,13 @@
"\">hard to tell which ones are free</a> since proprietary programs for "
"download at no charge are labelled “free”."
msgstr ""
-"“ÐÑогÑамний ÑенÑÑ Ubuntu” пеÑеÑаÑ
овÑÑ
невÑлÑÐ½Ñ Ð¿ÑогÑами "
-"впеÑемÑж Ñз вÑлÑними. <a
href=\"http://www.freesoftwaremagazine.com/";
-"articles/"
+"“ÐÑогÑамний ÑенÑÑ Ubuntu” пеÑеÑаÑ
овÑÑ
невÑлÑÐ½Ñ Ð¿ÑогÑами впеÑемÑж "
+"Ñз вÑлÑними. <a
href=\"http://www.freesoftwaremagazine.com/articles/";
"ubuntu_software_center_proprietary_and_free_software_mixed_confusing_ui"
-"\">Ðажко ÑказаÑи, ÑÐºÑ Ð· ниÑ
вÑлÑнÑ</a>, бо
безкоÑÑовно "
-"поÑиÑÑÐ²Ð°Ð½Ñ Ð½ÐµÐ²ÑлÑÐ½Ñ Ð¿ÑогÑами
познаÑаÑÑÑÑÑ Ñк “"
-"вÑлÑнє."
+"\">Ðажко ÑказаÑи, ÑÐºÑ Ð· ниÑ
вÑлÑнÑ</a>, бо
безкоÑÑовно поÑиÑÑÐ²Ð°Ð½Ñ Ð½ÐµÐ²ÑлÑÐ½Ñ "
+"пÑогÑами познаÑаÑÑÑÑÑ Ñк “вÑлÑнє."
#. type: Content of: <p>
-#| 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 ads to "
-#| "buy things from Amazon. This does 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."
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' "
@@ -463,14 +451,9 @@
"пÑогÑами Ubuntu вÑлÑними, але Ñе поÑÑÑÑÑ
конÑÑденÑÑйнÑÑÑÑ ÐºÐ¾ÑиÑÑÑваÑÑв. ÐÑÑм "
"Ñого, Ñе заоÑ
оÑÑÑ Ð¿Ð¾ÐºÑпки в Amazon, компанÑÑ,
<a href=\"http://";
"DefectiveByDesign.org/\"> аÑоÑÑÐ¹Ð¾Ð²Ð°Ð½Ð¾Ñ Ð· ÑиÑÑовим
ÑпÑавлÑннÑм обмеженнÑми "
-"(DRM)</"
-"a>, а Ñакож з неÑпÑаведливоÑÑÑми Ñодо
пÑаÑÑвникÑв, авÑоÑÑв Ñ Ð²Ð¸Ð´Ð°Ð²ÑÑв."
+"(DRM)</a>, а Ñакож з неÑпÑаведливоÑÑÑми Ñодо
пÑаÑÑвникÑв, авÑоÑÑв Ñ Ð²Ð¸Ð´Ð°Ð²ÑÑв."
#. 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 "
-#| "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."
Index: distros/po/free-distros.uk-en.html
===================================================================
RCS file: /web/www/www/distros/po/free-distros.uk-en.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- distros/po/free-distros.uk-en.html 2 May 2015 12:28:30 -0000 1.18
+++ distros/po/free-distros.uk-en.html 2 Jul 2015 09:27:58 -0000 1.19
@@ -199,7 +199,7 @@
the <a href="/distros/free-system-distribution-guidelines.html">Free
System Distribution Guidelines</a> and would like to be listed here,
please write to us
-at <a href="mailto:address@hidden";><address@hidden></a>
+at <a href="mailto:address@hidden";><address@hidden></a>
with an introduction and a link to the project Web site. When you do,
we'll explain more about our evaluation process to you, and get
started on it quickly. We look forward to hearing from you!</p>
@@ -236,7 +236,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
@@ -254,14 +254,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/02 12:28:30 $
+$Date: 2015/07/02 09:27:58 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/free-distros.uk.po
===================================================================
RCS file: /web/www/www/distros/po/free-distros.uk.po,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- distros/po/free-distros.uk.po 2 Jul 2015 09:09:58 -0000 1.57
+++ distros/po/free-distros.uk.po 2 Jul 2015 09:27:58 -0000 1.58
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-06-25 16:28+0000\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
@@ -431,14 +430,6 @@
"поговоÑиÑи."
#. type: Content of: <p>
-#| msgid ""
-#| "If you maintain a distribution that follows the <a href=\"/distros/free-"
-#| "system-distribution-guidelines.html\">Free System Distribution "
-#| "Guidelines</a> and would like to be listed here, please write to us at <a "
-#| "href=\"mailto:address@hidden";><address@hidden></a> with an "
-#| "introduction and a link to the project Web site. When you do, we'll "
-#| "explain more about our evaluation process to you, and get started on it "
-#| "quickly. We look forward to hearing from you!"
msgid ""
"If you maintain a distribution that follows the <a href=\"/distros/free-"
"system-distribution-guidelines.html\">Free System Distribution Guidelines</"
@@ -451,8 +442,7 @@
"ЯкÑо ви пÑдÑÑимÑÑÑе диÑÑÑибÑÑив, Ñкий
доÑÑимÑÑÑÑÑÑ <a href=\"/distros/free-"
"system-distribution-guidelines.html\">РекомендаÑÑй длÑ
вÑлÑниÑ
диÑÑÑибÑÑивÑв "
"ÑиÑÑем</a> Ñ Ñ
оÑеÑе, аби вÑн бÑв ÑÑÑ
згаданий, надÑÑлÑÑÑ, бÑÐ´Ñ Ð»Ð°Ñка, нам за "
-"адÑеÑÐ¾Ñ <a href=\"mailto:";
-"address@hidden"><address@hidden></a> "
+"адÑеÑÐ¾Ñ <a href=\"mailto:address@hidden";><address@hidden></a> "
"коÑоÑкий Ð¾Ð¿Ð¸Ñ Ñ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° ÑÐ°Ð¹Ñ Ð¿ÑоекÑÑ.
ÐÑÑÐ»Ñ ÑÑого ми ÑозповÑмо вам "
"деÑалÑнÑÑе пÑо Ð½Ð°Ñ Ð¿ÑоÑÐµÑ Ð¾ÑÑнки Ñ
незабаÑом пÑиÑÑÑпимо до нÑого. ЧекаÑмо "
"ваÑиÑ
лиÑÑÑв!"
@@ -509,10 +499,6 @@
"Copyright © 2014, 2015 Фонд вÑлÑного пÑогÑамного
забезпеÑеннÑ, Inc."
#. type: Content of: <div><p>
-#| msgid ""
-#| "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>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
@@ -520,9 +506,8 @@
msgstr ""
"Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/deed.uk\"> лÑÑензÑÑ Creative
Commons "
-"Attribution-"
-"NoDerivatives 4.0 International (<em>Ðз зазнаÑеннÑм
авÑоÑÑÑва â Ðез "
-"поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>."
+"Attribution-NoDerivatives 4.0 International (<em>Ðз зазнаÑеннÑм
авÑоÑÑÑва â "
+"Ðез поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
Index: distros/po/free-non-gnu-distros.uk-en.html
===================================================================
RCS file: /web/www/www/distros/po/free-non-gnu-distros.uk-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- distros/po/free-non-gnu-distros.uk-en.html 15 Jan 2015 07:43:05 -0000
1.3
+++ distros/po/free-non-gnu-distros.uk-en.html 2 Jul 2015 09:27:58 -0000
1.4
@@ -22,6 +22,15 @@
</li>
</ul>
+<p>If you maintain a non-GNU distribution that follows
+the <a href="/distros/free-system-distribution-guidelines.html">Free
+System Distribution Guidelines</a> and would like to be listed here,
+please write to us
+at <a href="mailto:address@hidden";><address@hidden></a>
+with an introduction and a link to the project Web site. When you do,
+we'll explain more about our evaluation process to you, and get
+started on it quickly. We look forward to hearing from you!</p>
+
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
@@ -54,7 +63,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
@@ -72,14 +81,14 @@
<p>Copyright © 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/01/15 07:43:05 $
+$Date: 2015/07/02 09:27:58 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/free-non-gnu-distros.uk.po
===================================================================
RCS file: /web/www/www/distros/po/free-non-gnu-distros.uk.po,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- distros/po/free-non-gnu-distros.uk.po 2 Jul 2015 09:09:58 -0000
1.10
+++ distros/po/free-non-gnu-distros.uk.po 2 Jul 2015 09:27:58 -0000
1.11
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODINGLanguage: uk\n"
-"X-Outdated-Since: 2015-06-25 16:55+0000\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
@@ -64,14 +63,12 @@
"look forward to hearing from you!"
msgstr ""
"ЯкÑо ви пÑдÑÑимÑÑÑе диÑÑÑибÑÑив
опеÑаÑÑÐ¹Ð½Ð¾Ñ ÑиÑÑеми, вÑдмÑÐ½Ð½Ð¾Ñ Ð²Ñд GNU, Ñкий "
-"доÑÑимÑÑÑÑÑÑ"
-"<a href=\"/distros/free-system-distribution-guidelines.html\">Ð
екомендаÑÑй "
-"Ð´Ð»Ñ Ð´Ð¸ÑÑÑибÑÑивÑв вÑлÑниÑ
ÑиÑÑем</a> Ñ Ñ
оÑÑли б поÑÑапиÑи Ñ Ñей ÑпиÑок, "
-"напиÑÑÑÑ Ð½Ð°Ð¼, бÑÐ´Ñ Ð»Ð°Ñка, за адÑеÑÐ¾Ñ <a
href=\"mailto:address@hidden";><"
-"address@hidden></a>; опиÑÑÑÑ ÑвÑй диÑÑÑибÑÑив Ñ
вкажÑÑÑ Ð¹Ð¾Ð³Ð¾ ÑайÑ. Ðи "
-"ознайомимо Ð²Ð°Ñ Ð´ÐµÑалÑнÑÑе з наÑим
пÑоÑеÑом оÑÑнки диÑÑÑибÑÑивÑв Ñ Ð² "
-"Ð½ÐµÐ´Ð°Ð»ÐµÐºÐ¾Ð¼Ñ "
-"майбÑÑнÑÐ¾Ð¼Ñ Ð¿Ð¾Ñнемо його. ЧекаÑмо ваÑиÑ
заÑвок!"
+"доÑÑимÑÑÑÑÑÑ<a
href=\"/distros/free-system-distribution-guidelines.html"
+"\">РекомендаÑÑй Ð´Ð»Ñ Ð´Ð¸ÑÑÑибÑÑивÑв вÑлÑниÑ
ÑиÑÑем</a> Ñ Ñ
оÑÑли б поÑÑапиÑи Ñ "
+"Ñей ÑпиÑок, напиÑÑÑÑ Ð½Ð°Ð¼, бÑÐ´Ñ Ð»Ð°Ñка, за
адÑеÑÐ¾Ñ <a href=\"mailto:";
+"address@hidden"><address@hidden></a>; опиÑÑÑÑ ÑвÑй
диÑÑÑибÑÑив "
+"Ñ Ð²ÐºÐ°Ð¶ÑÑÑ Ð¹Ð¾Ð³Ð¾ ÑайÑ. Ðи ознайомимо ваÑ
деÑалÑнÑÑе з наÑим пÑоÑеÑом оÑÑнки "
+"диÑÑÑибÑÑивÑв Ñ Ð² Ð½ÐµÐ´Ð°Ð»ÐµÐºÐ¾Ð¼Ñ Ð¼Ð°Ð¹Ð±ÑÑнÑомÑ
поÑнемо його. ЧекаÑмо ваÑиÑ
заÑвок!"
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
#. type: Content of: <div>
@@ -124,10 +121,6 @@
msgstr "Copyright © 2015 Фонд вÑлÑного пÑогÑамного
забезпеÑеннÑ, Inc."
#. type: Content of: <div><p>
-#| msgid ""
-#| "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>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
@@ -135,9 +128,8 @@
msgstr ""
"Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/deed.uk\"> лÑÑензÑÑ Creative
Commons "
-"Attribution-"
-"NoDerivatives 4.0 International (<em>Ðз зазнаÑеннÑм
авÑоÑÑÑва â Ðез "
-"поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>."
+"Attribution-NoDerivatives 4.0 International (<em>Ðз зазнаÑеннÑм
авÑоÑÑÑва â "
+"Ðез поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
Index: distros/po/free-system-distribution-guidelines.uk-en.html
===================================================================
RCS file:
/web/www/www/distros/po/free-system-distribution-guidelines.uk-en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- distros/po/free-system-distribution-guidelines.uk-en.html 2 May 2015
12:28:30 -0000 1.10
+++ distros/po/free-system-distribution-guidelines.uk-en.html 2 Jul 2015
09:27:58 -0000 1.11
@@ -280,7 +280,7 @@
GNU system distributions</a> we know about. If you know about a free
distribution that isn't listed there, please ask its developers write
to <<a class="reference"
-href="mailto:address@hidden";>address@hidden</a>> with a description of
+href="mailto:address@hidden";>address@hidden</a>> with a description of
their system and a link to their web page.</p>
<p>We also list <a href="/distros/free-non-gnu-distros.html">free
@@ -288,7 +288,7 @@
<p>If you have questions or comments about these guidelines
themselves, feel free to send those to <<a class="reference"
-href="mailto:address@hidden";>address@hidden</a>>. We hope
+href="mailto:address@hidden";>address@hidden</a>>. We hope
that they help everyone better understand the issues that are important
for free system distributions, and we look forward to promoting more
of them in the future.</p>
@@ -325,7 +325,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
@@ -343,14 +343,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/02 12:28:30 $
+$Date: 2015/07/02 09:27:58 $
<!-- timestamp end -->
</p>
</div>
Index: distros/po/free-system-distribution-guidelines.uk.po
===================================================================
RCS file: /web/www/www/distros/po/free-system-distribution-guidelines.uk.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- distros/po/free-system-distribution-guidelines.uk.po 2 Jul 2015
09:09:58 -0000 1.33
+++ distros/po/free-system-distribution-guidelines.uk.po 2 Jul 2015
09:27:58 -0000 1.34
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-06-25 16:55+0000\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
@@ -614,13 +613,6 @@
msgstr "ÐÑикÑнÑÐµÐ²Ñ Ð·Ð°ÑваженнÑ"
#. type: Content of: <p>
-#| msgid ""
-#| "We maintain a list of the <a href=\"/distros/free-distros.html\">free GNU "
-#| "system distributions</a> we know about. If you know about a free "
-#| "distribution that isn't listed there, please ask its developers write to "
-#| "<<a class=\"reference\" href=\"mailto:address@hidden";
-#| "\">address@hidden</a>> with a description of their system and a "
-#| "link to their web page."
msgid ""
"We maintain a list of the <a href=\"/distros/free-distros.html\">free GNU "
"system distributions</a> we know about. If you know about a free "
@@ -632,8 +624,8 @@
"диÑÑÑибÑÑивÑв ÑиÑÑем GNU</a>, пÑо ÑÐºÑ Ð½Ð°Ð¼
вÑдомо. ЯкÑо ви знаÑÑе пÑо вÑлÑний "
"диÑÑÑибÑÑивÑ, Ñкого Ñам немаÑ, Ñо, бÑдÑ
лаÑка, попÑоÑÑÑÑ Ð½Ð°Ð´ÑÑлаÑи "
"ÑозÑобникÑв нам за адÑеÑÐ¾Ñ <<a class=\"reference\"
href=\"mailto:";
-"address@hidden">address@hidden</a>> повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð·
опиÑом "
-"ÑÑ
нÑÐ¾Ñ ÑиÑÑеми Ñ Ð¿Ð¾ÑиланнÑм на ÑÑ
нÑй ÑайÑ."
+"address@hidden">address@hidden</a>> повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð·
опиÑом ÑÑ
нÑÐ¾Ñ "
+"ÑиÑÑеми Ñ Ð¿Ð¾ÑиланнÑм на ÑÑ
нÑй ÑайÑ."
#. type: Content of: <p>
msgid ""
@@ -644,13 +636,6 @@
"диÑÑÑибÑÑиви ÑиÑÑем, вÑдмÑнниÑ
вÑд GNU</a>,
на ÑиÑ
же еÑиÑниÑ
пÑдÑÑаваÑ
."
#. type: Content of: <p>
-#| msgid ""
-#| "If you have questions or comments about these guidelines themselves, feel "
-#| "free to send those to <<a class=\"reference\" href=\"mailto:";
-#| "address@hidden">address@hidden</a>>. We hope that they help "
-#| "everyone better understand the issues that are important for free system "
-#| "distributions, and we look forward to promoting more of them in the "
-#| "future."
msgid ""
"If you have questions or comments about these guidelines themselves, feel "
"free to send those to <<a class=\"reference\" href=\"mailto:address@hidden";
@@ -716,10 +701,6 @@
"Copyright © 2014, 2015 Фонд вÑлÑного пÑогÑамного
забезпеÑеннÑ, Inc."
#. type: Content of: <div><p>
-#| msgid ""
-#| "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>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
@@ -727,9 +708,8 @@
msgstr ""
"Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/deed.uk\"> лÑÑензÑÑ Creative
Commons "
-"Attribution-"
-"NoDerivatives 4.0 International (<em>Ðз зазнаÑеннÑм
авÑоÑÑÑва â Ðез "
-"поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>."
+"Attribution-NoDerivatives 4.0 International (<em>Ðз зазнаÑеннÑм
авÑоÑÑÑва â "
+"Ðез поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
Index: education/edu-schools.uk.html
===================================================================
RCS file: /web/www/www/education/edu-schools.uk.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- education/edu-schools.uk.html 2 Aug 2014 07:37:29 -0000 1.8
+++ education/edu-schools.uk.html 2 Jul 2015 09:27:59 -0000 1.9
@@ -43,9 +43,9 @@
<p><a href="http://www.stallman.org/";>Ð ÑÑаÑд СÑолмен</a></p>
-<p>ÐÑвÑÑÐ½Ñ Ð·Ð°ÐºÐ»Ð°Ð´Ð¸ (Ñ ÑÐ¾Ð¼Ñ ÑиÑÐ»Ñ Ñколи)
моÑалÑно <a
-href="/education/education.html">зобов'ÑÐ·Ð°Ð½Ñ Ð²Ð¸ÐºÐ»Ð°Ð´Ð°Ñи
ÑÑлÑки вÑлÑнÑ
-пÑогÑами.</a> </p>
+<p>ÐÑвÑÑÐ½Ñ ÑÑÑанови, в ÑÐ¾Ð¼Ñ ÑиÑÐ»Ñ Ð½Ð°Ð²ÑалÑнÑ
заклади ÑÑÑÑ
ÑÑвнÑв вÑд диÑÑадоÑка
+до ÑнÑвеÑÑиÑеÑÑ Ð¼Ð¾ÑалÑно <a
href="/education/education.html">зобов'ÑзанÑ
+викладаÑи ÑÑлÑки вÑлÑÐ½Ñ Ð¿ÑогÑами.</a> </p>
<p>УÑÑ ÐºÐ¾ÑиÑÑÑваÑÑ ÐºÐ¾Ð¼Ð¿'ÑÑеÑÑв Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ <a
href="/philosophy/free-software-even-more-important.html">наполÑгаÑи
на
@@ -88,7 +88,7 @@
ÑÐºÑ ÑозповÑÑджÑÑÑÑ Ð½Ð° безоплаÑнÑй оÑновÑ
ÑигаÑеÑи ÑеÑед ÑколÑÑÑв <a
href="#note2"> (2) </a>. Ðони не даваÑимÑÑÑ
безоплаÑно копÑÑ Ð½Ñ Ñим ÑÑнÑм Ñи
ÑÑÑденÑам пÑÑÐ»Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð½Ñ Ð½Ð°Ð²ÑаннÑ, а нÑ
компанÑÑм, кÑди вони пÑдÑÑÑ
-пÑаÑÑваÑи.</p>
+пÑаÑÑваÑи. Щойно ви поÑÑапиÑи Ñ
залежнÑÑÑÑ, Ñз Ð²Ð°Ñ Ð¿Ð¾ÑнÑÑÑ Ð²Ð¸Ð¼Ð°Ð³Ð°Ñи
гÑоÑÑ.</p>
<p>ÐÑлÑÐ½Ñ Ð¿ÑогÑами даÑÑÑ Ð¼Ð¾Ð¶Ð»Ð¸Ð²ÑÑÑÑ ÑÑнÑм
дÑзнаÑиÑÑ, Ñк пÑогÑами
пÑаÑÑÑÑÑ. СÑавÑи пÑдлÑÑками, деÑÐºÑ Ð´ÑÑи Ñ
оÑÑÑÑ Ð²Ð¸Ð²ÑиÑи вÑе, Ñо можна
@@ -199,12 +199,12 @@
Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð¿ÐµÑÐµÐºÐ»Ð°Ð´Ñ ÑÑÑÑ ÑÑаÑÑÑ.</p>
</div>
-<p>Copyright © 2003, 2009, 2014 Ð ÑÑаÑд СÑолмен</p>
+<p>Copyright © 2003, 2009, 2014, 2015 Ð ÑÑаÑд СÑолмен</p>
<p>Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.uk";>
лÑÑензÑÑ
-Creative Commons Attribution-NoDerivs (<em>Ðз зазнаÑеннÑм
-авÑоÑÑÑва — Ðез поÑ
ÑдниÑ
ÑвоÑÑв</em>) 3.0
СполÑÑÐµÐ½Ñ Ð¨ÑаÑи</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> лÑÑензÑÑ
+Creative Commons Attribution-NoDerivatives 4.0 International (<em>Ðз
+зазнаÑеннÑм авÑоÑÑÑва â Ðез поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>.</p>
<!--#include virtual="/server/bottom-notes.uk.html" -->
<div class="translators-credits">
@@ -216,7 +216,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðновлено:
-$Date: 2014/08/02 07:37:29 $
+$Date: 2015/07/02 09:27:59 $
<!-- timestamp end -->
</p>
Index: education/po/edu-schools.uk-en.html
===================================================================
RCS file: /web/www/www/education/po/edu-schools.uk-en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- education/po/edu-schools.uk-en.html 2 Aug 2014 07:37:30 -0000 1.8
+++ education/po/edu-schools.uk-en.html 2 Jul 2015 09:27:59 -0000 1.9
@@ -38,7 +38,8 @@
<p>by <a href="http://www.stallman.org/";>Richard Stallman</a></p>
-<p>Educational activities (including schools) have a moral duty
+<p>Educational activities, including schools of all levels from
+kindergarten to university, have a moral duty
to <a href="/education/education.html">teach only free
software.</a></p>
@@ -85,7 +86,8 @@
dependence on their products, like tobacco companies distributing
gratis cigarettes to school children<a href="#note2">(2)</a>. They
will not give gratis copies to these students once they've graduated,
-nor to the companies that they go to work for.</p>
+nor to the companies that they go to work for. Once you're dependent,
+you're expected to pay.</p>
<p>Free software permits students to learn how software works. Some
students, natural-born programmers, on reaching their teens yearn to
@@ -189,17 +191,17 @@
information on coordinating and submitting translations of this article.</p>
</div>
-<p>Copyright © 2003, 2009, 2014 Richard Stallman</p>
+<p>Copyright © 2003, 2009, 2014, 2015 Richard Stallman</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: 2014/08/02 07:37:30 $
+$Date: 2015/07/02 09:27:59 $
<!-- timestamp end -->
</p>
</div>
Index: education/po/edu-schools.uk.po
===================================================================
RCS file: /web/www/www/education/po/edu-schools.uk.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- education/po/edu-schools.uk.po 2 Jul 2015 09:09:56 -0000 1.27
+++ education/po/edu-schools.uk.po 2 Jul 2015 09:27:59 -0000 1.28
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-06-02 12:55+0000\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
@@ -70,18 +69,14 @@
msgstr "<a href=\"http://www.stallman.org/\";>Ð ÑÑаÑд СÑолмен</a>"
#. type: Content of: <p>
-#| msgid ""
-#| "Educational activities (including schools) have a moral duty to <a href="
-#| "\"/education/education.html\">teach only free software.</a>"
msgid ""
"Educational activities, including schools of all levels from kindergarten to "
"university, have a moral duty to <a href=\"/education/education.html\">teach "
"only free software.</a>"
msgstr ""
"ÐÑвÑÑÐ½Ñ ÑÑÑанови, в ÑÐ¾Ð¼Ñ ÑиÑÐ»Ñ Ð½Ð°Ð²ÑалÑнÑ
заклади ÑÑÑÑ
ÑÑвнÑв вÑд диÑÑадоÑка "
-"до "
-"ÑнÑвеÑÑиÑеÑÑ Ð¼Ð¾ÑалÑно <a href=\"/education/education."
-"html\">зобов'ÑÐ·Ð°Ð½Ñ Ð²Ð¸ÐºÐ»Ð°Ð´Ð°Ñи ÑÑлÑки вÑлÑнÑ
пÑогÑами.</a> "
+"до ÑнÑвеÑÑиÑеÑÑ Ð¼Ð¾ÑалÑно <a
href=\"/education/education.html\">зобов'ÑÐ·Ð°Ð½Ñ "
+"викладаÑи ÑÑлÑки вÑлÑÐ½Ñ Ð¿ÑогÑами.</a> "
#. type: Content of: <p>
msgid ""
@@ -159,14 +154,6 @@
"Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ ÑпÑиÑÑи ÑÑомÑ."
#. type: Content of: <p>
-#| msgid ""
-#| "Why, after all, do some proprietary software developers offer gratis "
-#| "copies<a href=\"#note1\">(1)</a> of their nonfree programs to schools? "
-#| "Because they want to <em>use</em> the schools to implant dependence on "
-#| "their products, like tobacco companies distributing gratis cigarettes to "
-#| "school children<a href=\"#note2\">(2)</a>. They will not give gratis "
-#| "copies to these students once they've graduated, nor to the companies "
-#| "that they go to work for."
msgid ""
"Why, after all, do some proprietary software developers offer gratis "
"copies<a href=\"#note1\">(1)</a> of their nonfree programs to schools? "
@@ -386,15 +373,10 @@
"пÑо кооÑдинÑÐ²Ð°Ð½Ð½Ñ Ñ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð¿ÐµÑекладÑ
ÑÑÑÑ ÑÑаÑÑÑ."
#. type: Content of: <div><p>
-#| msgid "Copyright © 2003, 2009, 2014 Richard Stallman"
msgid "Copyright © 2003, 2009, 2014, 2015 Richard Stallman"
msgstr "Copyright © 2003, 2009, 2014, 2015 Ð ÑÑаÑд СÑолмен"
#. type: Content of: <div><p>
-#| msgid ""
-#| "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>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
@@ -402,9 +384,8 @@
msgstr ""
"Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/deed.uk\"> лÑÑензÑÑ Creative
Commons "
-"Attribution-"
-"NoDerivatives 4.0 International (<em>Ðз зазнаÑеннÑм
авÑоÑÑÑва â Ðез "
-"поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>."
+"Attribution-NoDerivatives 4.0 International (<em>Ðз зазнаÑеннÑм
авÑоÑÑÑва â "
+"Ðез поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
Index: gnu/gnu-linux-faq.uk.html
===================================================================
RCS file: /web/www/www/gnu/gnu-linux-faq.uk.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/gnu-linux-faq.uk.html 5 May 2015 11:30:39 -0000 1.1
+++ gnu/gnu-linux-faq.uk.html 2 Jul 2015 09:27:59 -0000 1.2
@@ -128,6 +128,11 @@
<li><a href="#whyorder" id="TOCwhyorder">Ð§Ð¾Ð¼Ñ “GNU/Linux”, а
не
“Linux/GNU”?</a></li>
+<li><a href="#distronames0" id="TOCdistronames0">РозÑобники мого
диÑÑÑибÑÑива
+називаÑÑÑ Ð¹Ð¾Ð³Ð¾ “Foobar Linux”, але Ñе
нÑÑого не говоÑиÑÑ Ð¿Ñо Ñе,
+з Ñого ÑкладаÑÑÑÑÑ ÑиÑÑема. Ð§Ð¾Ð¼Ñ Ð²Ð¾Ð½Ð¸ не
можÑÑÑ Ð½Ð°Ð·Ð¸Ð²Ð°Ñи його Ñак, Ñк Ñм
+заманеÑÑÑÑ?</a></li>
+
<li><a href="#distronames" id="TOCdistronames">ÐÑй диÑÑÑибÑÑив
називаÑÑÑÑÑ
“Foobar Linux”; Ñ
Ñба Ñе не ÑвÑдÑиÑÑ, Ñо Ñе
дÑйÑно Linux?</a></li>
@@ -172,6 +177,9 @@
<li><a href="#justlinux" id="TOCjustlinux">Ð¥Ñба не можна
викоÑиÑÑовÑваÑи Linux
без GNU?</a></li>
+<li><a href="#howmuch" id="TOChowmuch">Ð¯ÐºÑ ÑаÑÑÐºÑ ÑиÑÑеми GNU
повинна мÑÑÑиÑи
+ÑиÑÑема, Ñоб бÑÑи GNU/Linux?</a></li>
+
<li><a href="#linuxsyswithoutgnu" id="TOClinuxsyswithoutgnu">Чи
ÐÑнÑÑÑÑ Ð¿Ð¾Ð²Ð½Ñ
ÑиÑÑеми Linux (Ñак!) без GNU?</a></li>
@@ -591,8 +599,10 @@
комбÑнаÑÑÑ Ñк Debian GNU/Hurd.</p>
<p>
-ÐаÑаз ми ÑозÑоблÑÑмо пÑогÑеÑÐ¸Ð²Ð½Ñ ÑиÑÑемÑ
кеÑÑÐ²Ð°Ð½Ð½Ñ Ð¿Ð°ÐºÑнками пÑд Ð½Ð°Ð·Ð²Ð¾Ñ GUIX
-на Ð±Ð°Ð·Ñ Scheme, Ñе пеÑедбаÑÐ°Ñ Ð¿ÐµÑеÑпакÑваннÑ
ÑÑÑоÑÐ½Ð¾Ñ ÑаÑÑини ÑиÑÑеми GNU.</p>
+ÐаÑаз ми ÑозÑоблÑÑмо пÑогÑеÑÐ¸Ð²Ð½Ñ ÑиÑÑемÑ
кеÑÑÐ²Ð°Ð½Ð½Ñ Ð¿Ð°ÐºÑнками пÑд Ð½Ð°Ð·Ð²Ð¾Ñ Ð½Ð°
+Ð±Ð°Ð·Ñ Scheme Ñ Ð¿Ð¾Ð²Ð½Ð¸Ð¹ диÑÑÑибÑÑив опеÑаÑÑйноÑ
ÑиÑÑеми пÑд Ð½Ð°Ð·Ð²Ð¾Ñ <a
+href="/software/guix">ÑиÑÑемний диÑÑÑибÑÑив Guix</a>
або GuixSD. Це
+пеÑедбаÑÐ°Ñ Ð¿ÐµÑепакÑÐ²Ð°Ð½Ð½Ñ ÑÑÑоÑноÑ
ÑаÑÑини ÑиÑÑеми GNU.</p>
<p>
Ðи Ñак Ñ Ð½Ðµ зÑобили оÑÑаннÑого кÑокÑ
випÑÑÐºÑ Ð´Ð¸ÑÑÑибÑÑÐ¸Ð²Ñ GNU пÑд назвоÑ
@@ -839,6 +849,21 @@
повнÑÑÑÑ ÑгноÑÑÑÑÑ GNU Ñ ÑÑвоÑÑÑÑÑ
видимÑÑÑÑ, Ñо вÑÑ ÑиÑÑема Ñ Ñ Linux.</p>
</dd>
+<dt id="distronames0">РозÑобники мого диÑÑÑибÑÑива
називаÑÑÑ Ð¹Ð¾Ð³Ð¾ “Foobar Linux”, але
+Ñе нÑÑого не говоÑиÑÑ Ð¿Ñо Ñе, з Ñого
ÑкладаÑÑÑÑÑ ÑиÑÑема. Ð§Ð¾Ð¼Ñ Ð²Ð¾Ð½Ð¸ не
+можÑÑÑ Ð½Ð°Ð·Ð¸Ð²Ð°Ñи його Ñак, Ñк Ñм
заманеÑÑÑÑ?<span
+class="anchor-reference-id"><a
href="#distronames0">#distronames0</a></span></dt>
+<dd>
+Ðазва “Foobar Linux” пÑипÑÑкаÑ, Ñо Ñе
ÑÑзновид
+“Linux”, Ñ Ð»Ñди <a href="#distronames">ÑпÑиймаÑÑÑ
Ñе Ñаким
+Ñином</a>.
+
+<p>
+Якби вони назвали диÑÑÑибÑÑив GNU/Linux,
“Foobar BSD”, ви
+назвали б Ñе помилкоÑ. Ðи Ñказали Ñм: “ЦÑ
ÑиÑÑема не BSD”. Так
+оÑ, Ñе Ñ Ð½Ðµ Linux.</p>
+</dd>
+
<dt id="distronames">ÐÑй диÑÑÑибÑÑив називаÑÑÑÑÑ
“Foobar Linux”; Ñ
Ñба Ñе не показÑÑ,
Ñо Ñе дÑйÑно Linux? <span class="anchor-reference-id"><a
href="#distronames">#distronames</a></span></dt>
@@ -855,10 +880,9 @@
Ñ
Ñба можна називаÑи його Ñк-небÑдÑ, кÑÑм
“Linux”? <span
class="anchor-reference-id"><a
href="#distronames1">#distronames1</a></span></dt>
-<dd><p>ЯкÑо Ñм дозволено змÑнÑваÑи “GNU”
“Foobar Linux”, Ñо
-вам дозволено змÑниÑи його назад Ñ
називаÑи Ñе “Foobar
-GNU/Linux”. Саме Ñе ви Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ ÑобиÑи, ÑомÑ
Ñо ÑнакÑе ви б поÑали
-ÑозноÑиÑи ÑÑ
Ð½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸ Ñа
неÑпÑаведливÑÑÑÑ.</p></dd>
+<dd><p>ЯкÑо Ñм дозволено змÑнÑваÑи “GNU”
на “Foobar Linux”,
+Ñо вам дозволено змÑниÑи ÑÑ Ð½Ð°Ð·Ð°Ð´ Ñ
називаÑи Ñе “Foobar
+GNU/Linux”. Це ви Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ ÑобиÑи: ÑникаÑи ÑÑ
нÑÐ¾Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸.</p></dd>
<dt id="companies">Ð¥Ñба не бÑло б еÑекÑивнÑÑе
пÑоÑиÑи ÑÐ°ÐºÑ ÐºÐ¾Ð¼Ð¿Ð°Ð½ÑÑ, Ñк Mandrake, Red Hat Ñ
IBM, називаÑи ÑÐ²Ð¾Ñ Ð´Ð¸ÑÑÑибÑÑиви
“GNU/Linux” замÑÑÑÑ Ñого, Ñоб
@@ -1171,6 +1195,26 @@
вÑдÑÑÑнÑÑÑÑ GNU.</p>
</dd>
+<dt id="howmuch">Ð¯ÐºÑ ÑаÑÑÐºÑ ÑиÑÑеми GNU повинна
мÑÑÑиÑи ÑиÑÑема, Ñоб бÑÑи GNU/Linux? <span
+class="anchor-reference-id"><a href="#howmuch">#howmuch</a></span></dt>
+
+<dd>
+ÐиÑÐ°Ð½Ð½Ñ “Ñка ÑаÑÑка?” не Ð¼Ð°Ñ ÑенÑÑ,
ÑÐ¾Ð¼Ñ Ñо Ñ ÑиÑÑеми GNU немаÑ
+ÑоÑниÑ
меж.
+<p>
+GNU — опеÑаÑÑйна ÑиÑÑема, ÑкÑ
пÑдÑÑимÑÑ Ð³Ñомада. Ðона вклÑÑаÑ
+набагаÑо бÑлÑÑе, нÑж пÑоÑÑо пакеÑи пÑогÑам
GNU (конкÑеÑний ÑпиÑок ÑкиÑ
Ñ Ð½Ð°Ñ
+Ñ), Ñ Ð»Ñди поÑÑÑйно додаÑÑÑ Ð½Ð¾Ð²Ñ Ð¿Ð°ÐºÐµÑи.
ÐезважаÑÑи на ÑÑ Ð·Ð¼Ñни, вона
+залиÑаÑÑÑÑÑ ÑиÑÑÐµÐ¼Ð¾Ñ GNU, Ñ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Linux до
ÑÑого Ð´Ð°Ñ GNU/Linux. ЯкÑо ви
+коÑиÑÑÑÑÑеÑÑ ÑаÑÑÐ¸Ð½Ð¾Ñ ÑиÑÑеми GNU, а
ÑаÑÑÐ¸Ð½Ñ Ð¾Ð¿ÑÑкаÑÑе, не можна оÑмиÑлено
+ÑказаÑи, “ÑÐºÐ¾Ñ ÑаÑÑкоє ви
коÑиÑÑÑÑÑеÑÑ.</p>
+<p>
+ЯкÑо дивиÑиÑÑ Ð½Ð° ÑÑÐ²Ð½Ñ Ð¿Ð°ÐºÐµÑÑв, Linux —
один з важливиÑ
пакеÑÑв
+ÑиÑÑеми GNU/Linux. ÐклÑÑÐµÐ½Ð½Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ важливого
пакеÑÑ GNU доÑÑаÑнÑо, Ñоб
+випÑавдаÑи наÑе пÑоÑ
Ð°Ð½Ð½Ñ Ð¿Ñо Ð·Ð³Ð°Ð´ÐºÑ Ð½Ð°
ÑÑвниÑ
пÑаваÑ
.
+</p>
+</dd>
+
<dt id="helplinus">Ð§Ð¾Ð¼Ñ Ð± вÑе одно не називаÑи
ÑиÑÑÐµÐ¼Ñ “Linux”, змÑÑнÑÑÑи Ñим
Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ ÐÑнÑÑа ТоÑвалÑдÑа Ñк “Ñ
лопÑÑ
з обкладинки” наÑоÑ
ÑпÑлÑноÑи? <span class="anchor-reference-id"><a
@@ -1501,7 +1545,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
@@ -1519,9 +1563,9 @@
вÑлÑного пÑогÑамного забезпеÑеннÑ, Inc.</p>
<p>Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.uk";>
лÑÑензÑÑ
-Creative Commons Attribution-NoDerivs (<em>Ðз зазнаÑеннÑм
-авÑоÑÑÑва — Ðез поÑ
ÑдниÑ
ÑвоÑÑв</em>) 3.0
СполÑÑÐµÐ½Ñ Ð¨ÑаÑи</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> лÑÑензÑÑ
+Creative Commons Attribution-NoDerivatives 4.0 International (<em>Ðз
+зазнаÑеннÑм авÑоÑÑÑва â Ðез поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>.</p>
<!--#include virtual="/server/bottom-notes.uk.html" -->
<div class="translators-credits">
@@ -1533,7 +1577,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðновлено:
-$Date: 2015/05/05 11:30:39 $
+$Date: 2015/07/02 09:27:59 $
<!-- timestamp end -->
</p>
Index: gnu/gnu-users-never-heard-of-gnu.uk.html
===================================================================
RCS file: /web/www/www/gnu/gnu-users-never-heard-of-gnu.uk.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/gnu-users-never-heard-of-gnu.uk.html 18 May 2015 08:14:55 -0000
1.2
+++ gnu/gnu-users-never-heard-of-gnu.uk.html 2 Jul 2015 09:27:59 -0000
1.3
@@ -22,43 +22,41 @@
</p></blockquote>
</div>
-<p>ÐÑлÑÑÑÑÑÑ Ð»Ñдей нÑколи не ÑÑли пÑо GNU.
ÐавÑÑÑ Ð±ÑлÑÑÑÑÑÑ Ð»Ñдей, ÑкÑ
-викоÑиÑÑовÑÑÑÑ ÑиÑÑÐµÐ¼Ñ GNU, нÑколи не ÑÑли
пÑо GNU, завдÑки ÑомÑ, Ñо Ñак
-багаÑо лÑдей Ñ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ñй пÑивÑаÑÑÑ ÑÑ
називаÑи ÑÑ “Linux”. Ðднак
-назва GNU Ð²Ð¸ÐºÐ»Ð¸ÐºÐ°Ñ Ð¿ÐµÐ²Ð½Ñ Ð°ÑоÑÑаÑÑÑ, ÑкÑ
з'ÑвлÑÑÑÑÑÑ Ñ Ð»Ñдей пÑÑÐ»Ñ Ñого, Ñк
-вони поÑÑÑÑÑ ÑÑ Ð½Ð°Ð·Ð²Ñ. GNU аÑоÑÑÑÑÑÑÑÑ Ð·
Ñдеалами Ñвободи ÑÑÑ
Ñ Ð·Ð° вÑлÑне
-пÑогÑамне забезпеÑеннÑ. Ð¦Ñ Ð°ÑоÑÑаÑÑÑ Ð½Ðµ
випадкова; меÑÐ¾Ñ ÑозÑобки GNU бÑло
-Ñаме ÑÑвоÑÐµÐ½Ð½Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ ÐºÐ¾ÑиÑÑÑваÑиÑÑ
комп'ÑÑеÑом, залиÑаÑÑиÑÑ Ð²ÑлÑними.</p>
-
-<p>ÐÑоÑÑаÑÑÑ Ð½Ð°Ð·Ð²Ð¸ GNU з наÑими ÑÑлÑми
Ñвободи Ñ ÑÑÑпÑлÑÐ½Ð¾Ñ ÑолÑдаÑноÑÑÑ ÑÑнÑÑ
-в ÑмаÑ
ÑоÑÐµÐ½Ñ ÑиÑÑÑ ÐºÐ¾ÑиÑÑÑваÑÑв GNU/Linux, ÑкÑ
пÑо GNU знаÑÑÑ. Ðона ÑÑнÑÑ Ñ
-ÐÑкÑпедÑÑ. Ðона ÑÑнÑÑ Ñ Ñ Ð²ÑеÑвÑÑнÑй
павÑÑинÑÑ; ÑкÑо ÑÑ ÐºÐ¾ÑиÑÑÑваÑÑ ÑÑанÑÑÑ
-ÑÑкаÑи GNU, вони знайдÑÑÑ ÑÐ°Ð¹Ñ <a
href="http://www.gnu.org";>www.gnu.org</a>,
-Ñкий ÑозповÑÐ´Ð°Ñ Ð¿Ñо ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ñ Ð²ÑлÑниÑ
пÑогÑамаÑ
.</p>
-
-<p>У лÑдини, Ñка впеÑÑе побаÑила назвÑ
“GNU”
-“GNU/Linux”, не виникне вÑдÑÐ°Ð·Ñ Ð¶ нÑÑкоÑ
аÑоÑÑаÑÑÑ Ð·
-Ñим-небÑдÑ. Ðднак коли лÑди знаÑÑÑ, Ñо ÑÑ
ÑиÑÑема в оÑÐ½Ð¾Ð²Ñ ÑвоÑй
-GNU, вони ÑÑаÑÑÑ Ð½Ð° кÑок ближÑе до
Ð¾Ð·Ð½Ð°Ð¹Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· наÑими
-Ñдеалами. ÐапÑиклад, вони можÑÑÑ
заÑÑкавиÑиÑÑ Ñ Ð¿Ð¾ÑÑкаÑи докладнÑÑÑ
-вÑдомоÑÑÑ Ð¿Ñо GNU.</p>
-
-<p>ЯкÑо вони не ÑÑкаÑÑÑ ÑÑого, Ñе вÑе одно
може Ñм зÑÑÑÑÑÑиÑÑ. РиÑоÑика
-“вÑдкÑиÑого виÑ
Ñдного кодє Ñ
багаÑÑоÑ
випадкаÑ
вÑдволÑÐºÐ°Ñ ÑвагÑ
+<p>ÐÑлÑÑÑÑÑÑ Ð»Ñдей нÑколи не ÑÑли пÑо GNU.
ÐавÑÑÑ Ð±ÑлÑÑÑÑÑÑ Ð»Ñдей,
+викоÑиÑÑовÑÑÑÑ ÑиÑÑÐµÐ¼Ñ GNU, нÑколи не ÑÑли
пÑо GNU, оÑкÑлÑки Ñак багаÑо
+лÑдей Ñ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ñй пÑивÑаÑÑÑ ÑÑ
називаÑи ÑÑ
“Linux”. ÐÑйÑно,
+коÑиÑÑÑваÑÑ GNU ÑаÑÑо говоÑÑÑÑ, Ñо вони
“пÑаÑÑÑÑÑ Ð½Ð° Linux”, Ñе
+вÑе одно Ñо говоÑиÑи, Ñо ви “ÑдеÑе на
каÑбÑÑаÑоÑÑ” “ÑдеÑе
+на коÑобÑÑ Ð¿ÐµÑедає.</p>
+
+<p>Тим не Ð¼ÐµÐ½Ñ Ñой, Ñ
Ñо Ð·Ð½Ð°Ñ Ð¿Ñо GNU, пов'ÑзÑÑ
ÑÑ Ð· Ñдеалами Ñвободи ÑÑÑ
Ñ Ð·Ð°
+вÑлÑÐ½Ñ Ð¿ÑогÑами. Цей зв'Ñзок не випадкова;
моÑивом ÑозÑобки GNU бÑло Ñаме
+ÑÑвоÑÐµÐ½Ð½Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ ÐºÐ¾ÑиÑÑÑваÑиÑÑ
комп'ÑÑеÑом, володÑÑÑи ÑвободоÑ.</p>
+
+<p>ÐÑдина, Ñка побаÑила впеÑÑе назвÑ
“GNU” Ñ
+“GNU/Linux”, не дÑзнаÑÑÑÑÑ Ð¾Ð´ÑазÑ, Ñо воно
Ñ, але вона зÑобиÑÑ
+кÑок до Ñого, Ñоб дÑзнаÑиÑÑ Ð¿Ñо Ñе.
ÐÑоÑÑаÑÑÑ Ð½Ð°Ð·Ð²Ð¸ GNU з наÑими ÑÑлÑми Ñ
+Ñвободи ÑÑÑпÑлÑÐ½Ð¾Ñ ÑолÑдаÑноÑÑÑ ÑÑнÑÑ Ð²
ÑмаÑ
ÑоÑÐµÐ½Ñ ÑиÑÑÑ ÐºÐ¾ÑиÑÑÑваÑÑв
+GNU/Linux, ÑÐºÑ Ð¿Ñо GNU знаÑÑÑ. Ðона ÑÑнÑÑ Ð½Ð° <a
href="/">gnu.org</a> Ñа
+ÐÑкÑпедÑÑ. Ðона ÑÑнÑÑ Ñ ÐÑеÑвÑÑнÑй
павÑÑинÑ; ÑкÑо коÑиÑÑÑваÑÑ ÑÑанÑÑÑ ÑÑкаÑи
+GNU, вони знайдÑÑÑ ÑдеÑ, на ÑкиÑ
ÑÑоÑÑÑ GNU.</p>
+
+<p>ЯкÑо вони не ÑÑкаÑÑÑ ÑÑого, вони вÑе одно
можÑÑÑ Ð·ÑÑÑÑÑÑиÑÑ Ð· Ñим. ÐаÑла
+“<a href="/philosophy/open-source-misses the
point.html">вÑдкÑиÑого
+виÑ
Ñдного ÑекÑÑÑ</a>” Ñ Ð±Ð°Ð³Ð°ÑÑоÑ
випадкаÑ
вÑдволÑкаÑÑÑ ÑвагÑ
коÑиÑÑÑваÑÑв вÑд пÑоблем волÑ, але не
повнÑÑÑÑ; обговоÑÐµÐ½Ð½Ñ GNU Ñ Ð²ÑлÑниÑ
пÑогÑам вÑе-Ñаки ÑÑиваÑ, Ñ Ñ Ð¿ÐµÐ²Ð½Ð¸Ð¹ ÑанÑ, Ñо
лÑди наÑкнÑÑÑÑÑ Ð½Ð° нÑого. Ðоли
-Ñе вÑдбÑваÑÑÑÑÑ, ÑиÑÐ°Ñ ÑвидÑе звеÑне ÑвагÑ
на ÑнÑоÑмаÑÑÑ Ð¿Ñо GNU (напÑиклад,
-пÑо Ñе, Ñо Ñе ÑобоÑа ÑÑÑ
Ñ Ð·Ð° ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ñ
ÑднÑÑÑÑ), ÑкÑо вÑн знаÑ, Ñо
-вÑн коÑиÑÑÑÐ²Ð°Ñ ÑиÑÑеми GNU.</p>
+Ñе вÑдбÑваÑÑÑÑÑ, вони ÑвидÑе звеÑнÑÑÑ
ÑÐ²Ð°Ð³Ñ Ð½Ð° ÑнÑоÑмаÑÑÑ Ð¿Ñо GNU
+(напÑиклад, пÑо Ñе, Ñо Ñе ÑобоÑа ÑÑÑ
Ñ Ð·Ð°
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ñ ÑднÑÑÑÑ), ÑкÑо вони
+знаÑÑÑ, Ñо вони коÑиÑÑÑÑÑÑÑÑ ÑиÑÑÐµÐ¼Ð¾Ñ GNU.</p>
-<p>ÐазиваÑÑи ÑÑ ÑиÑÑÐµÐ¼Ñ “GNU/Linux”, ми
поÑÑÑпово пÑдвиÑÑÑмо Ñ
+<p>ÐазиваÑÑи ÑÑ ÑиÑÑÐµÐ¼Ñ “GNU/Linux”, ми
поÑÑÑпово пÑдвиÑÑÑмо
ÑÑÑпÑлÑÑÑÐ²Ñ Ð¾Ð±ÑзнанÑÑÑÑ Ð¿Ñо Ñдеали
Ñвободи, заÑади ÑÐºÐ¾Ñ Ð¼Ð¸ ÑозÑобили ÑиÑÑемÑ
-GNU. Це коÑиÑне Ñк нагадÑÐ²Ð°Ð½Ð½Ñ Ð»ÑдÑм з наÑоÑ
ÑпÑлÑноÑи, ÑÐºÑ Ð·Ð½Ð°ÑÑÑ Ð¿Ñо ÑÑ
-Ñдеали, Ñ ÑвÑÑÑ, де знаÑна ÑаÑÑина
обговоÑÐµÐ½Ñ Ð²ÑлÑного пÑогÑамного
-забезпеÑÐµÐ½Ð½Ñ Ð¿ÑÐ¸Ð¹Ð¼Ð°Ñ ÑÑÑо пÑакÑиÑний (а
ÑÐ¾Ð¼Ñ Ð°Ð¼Ð¾ÑалÑний) пÑдÑ
Ñд. Ðоли ми
-пÑоÑимо Ð²Ð°Ñ Ð½Ð°Ð·Ð¸Ð²Ð°Ñи ÑиÑÑÐµÐ¼Ñ “GNU/Linux”,
ми Ñобимо Ñе ÑомÑ, Ñо
-попÑлÑÑнÑÑÑÑ GNU повÑлÑно, але вÑÑно неÑе з
ÑÐ¾Ð±Ð¾Ñ Ð¾Ð±ÑзнанÑÑÑÑ Ð¿Ñо наÑÑ
-Ñдеали Ñвободи Ñ ÑдноÑÑÑ.</p>
+GNU. Ще Ñе коÑиÑно Ñк нагадÑÐ²Ð°Ð½Ð½Ñ Ð»ÑдÑм з
наÑого ÑпÑвÑоваÑиÑÑва, ÑÐºÑ Ð·Ð½Ð°ÑÑÑ
+пÑо ÑиÑ
ÑдеалаÑ
, Ñ ÑвÑÑÑ, де знаÑна ÑаÑÑина
обговоÑÐµÐ½Ñ Ð²ÑлÑного пÑогÑамного
+забезпеÑÐµÐ½Ð½Ñ Ð¿ÑÐ¸Ð¹Ð¼Ð°Ñ ÑÑÑо пÑакÑиÑний (а
ÑÐ¾Ð¼Ñ Ð°Ð¼Ð¾ÑалÑний) обÑг. Ðоли ми
+пÑоÑимо Ð²Ð°Ñ Ð½Ð°Ð·Ð¸Ð²Ð°Ñи ÑиÑÑÐµÐ¼Ñ “GNU/Linux”,
ми пÑоÑимо ваÑ
+допомогÑи ÑнÑоÑмÑваÑи ÑÑÑпÑлÑÑÑво пÑо
Ñдеали вÑлÑниÑ
пÑогÑам.</p>
<div class="translators-notes">
@@ -103,7 +101,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
@@ -117,13 +115,13 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2006, 2007, 2013, 2014 Фонд вÑлÑного
пÑогÑамного
+<p>Copyright © 2006, 2007, 2013, 2014, 2015 Фонд вÑлÑного
пÑогÑамного
забезпеÑеннÑ, Inc.</p>
<p>Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.uk";>
лÑÑензÑÑ
-Creative Commons Attribution-NoDerivs (<em>Ðз зазнаÑеннÑм
-авÑоÑÑÑва — Ðез поÑ
ÑдниÑ
ÑвоÑÑв</em>) 3.0
СполÑÑÐµÐ½Ñ Ð¨ÑаÑи</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> лÑÑензÑÑ
+Creative Commons Attribution-NoDerivatives 4.0 International (<em>Ðз
+зазнаÑеннÑм авÑоÑÑÑва â Ðез поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>.</p>
<!--#include virtual="/server/bottom-notes.uk.html" -->
<div class="translators-credits">
@@ -135,7 +133,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðновлено:
-$Date: 2015/05/18 08:14:55 $
+$Date: 2015/07/02 09:27:59 $
<!-- timestamp end -->
</p>
Index: gnu/po/gnu-linux-faq.uk-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.uk-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/po/gnu-linux-faq.uk-en.html 5 May 2015 11:30:40 -0000 1.1
+++ gnu/po/gnu-linux-faq.uk-en.html 2 Jul 2015 09:28:00 -0000 1.2
@@ -126,6 +126,11 @@
<li><a href="#whyorder" id="TOCwhyorder">Why “GNU/Linux”
rather than “Linux/GNU”?</a></li>
+<li><a href="#distronames0" id="TOCdistronames0">My distro's developers call it
+ “Foobar Linux”, but that doesn't say anything about
+ what the system consists of. Why shouldn't they call it whatever
+ they like?</a></li>
+
<li><a href="#distronames" id="TOCdistronames">My distro is called
“Foobar Linux”; doesn't that show it's really
Linux?</a></li>
@@ -173,6 +178,9 @@
<li><a href="#justlinux" id="TOCjustlinux">Can't Linux be used without
GNU?</a></li>
+<li><a href="#howmuch" id="TOChowmuch">How much of the GNU system
+is needed for the system to be GNU/Linux?</a></li>
+
<li><a href="#linuxsyswithoutgnu" id="TOClinuxsyswithoutgnu">Are there
complete Linux systems [sic] without GNU?</a></li>
<li><a href="#helplinus" id="TOChelplinus">Why not call the system
@@ -579,8 +587,9 @@
<p>
We are now developing an advanced Scheme-based package manager called
-GUIX, and this includes repackaging a substantial part of the GNU
-system.</p>
+Guix and a complete system distribution based on it called the
+<a href="/software/guix">Guix System Distribution</a> or GuixSD.
+This includes repackaging a substantial part of the GNU system.</p>
<p>
We never took the last step of packaging GNU under the name
@@ -825,6 +834,21 @@
make it seem that the whole system is Linux.</p>
</dd>
+<dt id="distronames0">My distro's developers call it
+ “Foobar Linux”, but that doesn't say anything about
+ what the system consists of. Why shouldn't they call it whatever
+ they like? <span class="anchor-reference-id">(<a
href="#distronames0">#distronames0</a>)</span></dt>
+<dd>
+Calling a system “Foobar Linux” implies that it's a flavor
+of “Linux,” and people <a href="#distronames">understand
+it that way</a>.
+
+<p>
+If they called a GNU/Linux distro “Foobar BSD,” you would
+call that a mistake. “This system is not BSD,” you
+would tell them. Well, it's not Linux either.</p>
+</dd>
+
<dt id="distronames">My distro is called
“Foobar Linux”; doesn't that show it's really Linux? <span
class="anchor-reference-id">(<a
href="#distronames">#distronames</a>)</span></dt>
@@ -842,7 +866,7 @@
<dd><p>If it's allowed for them to change “GNU” to
“Foobar Linux”, it's allowed for you to change it back and
call it “Foobar GNU/Linux”. This is what you ought to do,
-because otherwise you'd be propagating their error and unfairness.</p></dd>
+to avoid their error.</p></dd>
<dt id="companies">Wouldn't it be more
effective to ask companies such as Mandrake, Red Hat and IBM to
@@ -1145,6 +1169,27 @@
from GNU/Linux is the absence of GNU.</p>
</dd>
+<dt id="howmuch">How much of the GNU system is needed for the system
+to be
+GNU/Linux? <span class="anchor-reference-id">(<a
href="#howmuch">#howmuch</a>)</span></dt>
+
+<dd>
+“How much” is not a meaningful question because the GNU
+system does not have precise boundaries.
+<p>
+GNU is an operating system maintained by a community. It includes far
+more than just the GNU software packages (of which we have a specific
+list), and people add more packages constantly. Despite these
+changes, it remains the GNU system, and adding Linux to that yields
+GNU/Linux. If you use part of the GNU system and omit part, there is
+no meaningful way to say “how much” you used.</p>
+<p>
+If we look at the level of packages, Linux is one important package in
+the GNU/Linux system. The inclusion of one important GNU package is
+enough to justify our request for equal mention.
+</p>
+</dd>
+
<dt id="helplinus">Why not call the system
“Linux” anyway, and strengthen Linus Torvalds' role as
posterboy for our
community? <span class="anchor-reference-id">(<a
href="#helplinus">#helplinus</a>)</span></dt>
@@ -1456,7 +1501,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
@@ -1475,14 +1520,14 @@
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/05 11:30:40 $
+$Date: 2015/07/02 09:28:00 $
<!-- timestamp end -->
</p>
</div>
Index: gnu/po/gnu-linux-faq.uk.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.uk.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gnu/po/gnu-linux-faq.uk.po 2 Jul 2015 09:09:58 -0000 1.18
+++ gnu/po/gnu-linux-faq.uk.po 2 Jul 2015 09:28:00 -0000 1.19
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODINGLanguage: uk\n"
-"X-Outdated-Since: 2015-06-02 12:55+0000\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
@@ -313,9 +312,6 @@
"“Linux/GNU”?</a>"
#. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"#distronames\" id=\"TOCdistronames\">My distro is called “"
-#| "Foobar Linux”; doesn't that show it's really Linux?</a>"
msgid ""
"<a href=\"#distronames0\" id=\"TOCdistronames0\">My distro's developers call "
"it “Foobar Linux”, but that doesn't say anything about what the "
@@ -324,8 +320,7 @@
"<a href=\"#distronames0\" id=\"TOCdistronames0\">РозÑобники
мого "
"диÑÑÑибÑÑива називаÑÑÑ Ð¹Ð¾Ð³Ð¾ “Foobar
Linux”, але Ñе нÑÑого не "
"говоÑиÑÑ Ð¿Ñо Ñе, з Ñого ÑкладаÑÑÑÑÑ
ÑиÑÑема. Ð§Ð¾Ð¼Ñ Ð²Ð¾Ð½Ð¸ не можÑÑÑ Ð½Ð°Ð·Ð¸Ð²Ð°Ñи "
-"його "
-"Ñак, Ñк Ñм заманеÑÑÑÑ?</a>"
+"його Ñак, Ñк Ñм заманеÑÑÑÑ?</a>"
#. type: Content of: <ul><li>
msgid ""
@@ -441,9 +436,6 @@
"Linux без GNU?</a>"
#. type: Content of: <ul><li>
-#| msgid ""
-#| "<a href=\"#howerror\" id=\"TOChowerror\">How did it come about that most "
-#| "people call the system “Linux”?</a>"
msgid ""
"<a href=\"#howmuch\" id=\"TOChowmuch\">How much of the GNU system is needed "
"for the system to be GNU/Linux?</a>"
@@ -1351,20 +1343,16 @@
"комбÑнаÑÑÑ Ñк Debian GNU/Hurd."
#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "We are now developing an advanced Scheme-based package manager called "
-#| "GUIX, and this includes repackaging a substantial part of the GNU system."
msgid ""
"We are now developing an advanced Scheme-based package manager called Guix "
"and a complete system distribution based on it called the <a href=\"/"
"software/guix\">Guix System Distribution</a> or GuixSD. This includes "
"repackaging a substantial part of the GNU system."
msgstr ""
-"ÐаÑаз ми ÑозÑоблÑÑмо пÑогÑеÑÐ¸Ð²Ð½Ñ ÑиÑÑемÑ
кеÑÑÐ²Ð°Ð½Ð½Ñ Ð¿Ð°ÐºÑнками пÑд "
-"Ð½Ð°Ð·Ð²Ð¾Ñ Ð½Ð° Ð±Ð°Ð·Ñ Scheme Ñ Ð¿Ð¾Ð²Ð½Ð¸Ð¹ диÑÑÑибÑÑив
опеÑаÑÑÐ¹Ð½Ð¾Ñ ÑиÑÑеми пÑд Ð½Ð°Ð·Ð²Ð¾Ñ <a "
-"href="
-"\"/software/guix\">ÑиÑÑемний диÑÑÑибÑÑив Guix</a> або
GuixSD. Це "
-"пеÑедбаÑÐ°Ñ Ð¿ÐµÑепакÑÐ²Ð°Ð½Ð½Ñ ÑÑÑоÑноÑ
ÑаÑÑини ÑиÑÑеми GNU."
+"ÐаÑаз ми ÑозÑоблÑÑмо пÑогÑеÑÐ¸Ð²Ð½Ñ ÑиÑÑемÑ
кеÑÑÐ²Ð°Ð½Ð½Ñ Ð¿Ð°ÐºÑнками пÑд Ð½Ð°Ð·Ð²Ð¾Ñ Ð½Ð° "
+"Ð±Ð°Ð·Ñ Scheme Ñ Ð¿Ð¾Ð²Ð½Ð¸Ð¹ диÑÑÑибÑÑив опеÑаÑÑйноÑ
ÑиÑÑеми пÑд Ð½Ð°Ð·Ð²Ð¾Ñ <a href=\"/"
+"software/guix\">ÑиÑÑемний диÑÑÑибÑÑив Guix</a> або
GuixSD. Це пеÑедбаÑÐ°Ñ "
+"пеÑепакÑÐ²Ð°Ð½Ð½Ñ ÑÑÑоÑÐ½Ð¾Ñ ÑаÑÑини ÑиÑÑеми
GNU."
#. type: Content of: <dl><dd><p>
msgid ""
@@ -1876,10 +1864,6 @@
"повнÑÑÑÑ ÑгноÑÑÑÑÑ GNU Ñ ÑÑвоÑÑÑÑÑ
видимÑÑÑÑ, Ñо вÑÑ ÑиÑÑема Ñ Ñ Linux."
#. type: Content of: <dl><dt>
-#| msgid ""
-#| "My distro is called “Foobar Linux”; doesn't that show it's "
-#| "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
-#| "\">#distronames</a>)</span>"
msgid ""
"My distro's developers call it “Foobar Linux”, but that doesn't "
"say anything about what the system consists of. Why shouldn't they call it "
@@ -1887,9 +1871,9 @@
"\"#distronames0\">#distronames0</a>)</span>"
msgstr ""
"РозÑобники мого диÑÑÑибÑÑива називаÑÑÑ
його “Foobar Linux”, але "
-"Ñе нÑÑого не говоÑиÑÑ Ð¿Ñо Ñе, з Ñого
ÑкладаÑÑÑÑÑ ÑиÑÑема. Ð§Ð¾Ð¼Ñ Ð²Ð¾Ð½Ð¸ не можÑÑÑ "
-"називаÑи його Ñак, Ñк Ñм заманеÑÑÑÑ?<span
class=\"anchor-reference-id\"><a "
-"href=\"#distronames0\">#distronames0</a></span>"
+"Ñе нÑÑого не говоÑиÑÑ Ð¿Ñо Ñе, з Ñого
ÑкладаÑÑÑÑÑ ÑиÑÑема. Ð§Ð¾Ð¼Ñ Ð²Ð¾Ð½Ð¸ не "
+"можÑÑÑ Ð½Ð°Ð·Ð¸Ð²Ð°Ñи його Ñак, Ñк Ñм
заманеÑÑÑÑ?<span class=\"anchor-reference-id"
+"\"><a href=\"#distronames0\">#distronames0</a></span>"
#. type: Content of: <dl><dd>
msgid ""
@@ -1897,9 +1881,8 @@
"“Linux,” and people <a href=\"#distronames\">understand it that "
"way</a>."
msgstr ""
-"Ðазва “Foobar Linux” пÑипÑÑкаÑ, Ñо Ñе
ÑÑзновид "
-"“Linux”, Ñ Ð»Ñди <a
href=\"#distronames\">ÑпÑиймаÑÑÑ Ñе Ñаким "
-"Ñином</a>."
+"Ðазва “Foobar Linux” пÑипÑÑкаÑ, Ñо Ñе
ÑÑзновид “"
+"Linux”, Ñ Ð»Ñди <a href=\"#distronames\">ÑпÑиймаÑÑÑ Ñе
Ñаким Ñином</a>."
#. type: Content of: <dl><dd><p>
msgid ""
@@ -1908,8 +1891,8 @@
"Well, it's not Linux either."
msgstr ""
"Якби вони назвали диÑÑÑибÑÑив GNU/Linux,
“Foobar BSD”, ви "
-"назвали б Ñе помилкоÑ. Ðи Ñказали Ñм:
“Ð¦Ñ ÑиÑÑема не BSD”. "
-"Так оÑ, Ñе Ñ Ð½Ðµ Linux."
+"назвали б Ñе помилкоÑ. Ðи Ñказали Ñм:
“Ð¦Ñ ÑиÑÑема не BSD”. Так "
+"оÑ, Ñе Ñ Ð½Ðµ Linux."
#. type: Content of: <dl><dt>
msgid ""
@@ -1946,20 +1929,14 @@
"\"anchor-reference-id\"><a href=\"#distronames1\">#distronames1</a></span>"
#. type: Content of: <dl><dd><p>
-#| msgid ""
-#| "If it's allowed for them to change “GNU” to “Foobar "
-#| "Linux”, it's allowed for you to change it back and call it “"
-#| "Foobar GNU/Linux”. This is what you ought to do, because otherwise "
-#| "you'd be propagating their error and unfairness."
msgid ""
"If it's allowed for them to change “GNU” to “Foobar "
"Linux”, it's allowed for you to change it back and call it “"
"Foobar GNU/Linux”. This is what you ought to do, to avoid their error."
msgstr ""
-"ЯкÑо Ñм дозволено змÑнÑваÑи “GNU” на
“Foobar "
-"Linux”, Ñо вам дозволено змÑниÑи ÑÑ Ð½Ð°Ð·Ð°Ð´
Ñ Ð½Ð°Ð·Ð¸Ð²Ð°Ñи Ñе "
-"“Foobar GNU/Linux”. Це ви Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ ÑобиÑи:
ÑникаÑи ÑÑ
нÑÐ¾Ñ "
-"помилки."
+"ЯкÑо Ñм дозволено змÑнÑваÑи “GNU” на
“Foobar Linux”, "
+"Ñо вам дозволено змÑниÑи ÑÑ Ð½Ð°Ð·Ð°Ð´ Ñ
називаÑи Ñе “Foobar GNU/"
+"Linux”. Це ви Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ ÑобиÑи: ÑникаÑи ÑÑ
нÑÐ¾Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸."
#. type: Content of: <dl><dt>
msgid ""
@@ -2625,24 +2602,20 @@
"вÑдÑÑÑнÑÑÑÑ GNU."
#. type: Content of: <dl><dt>
-#| msgid ""
-#| "Why do you call it GNU/Linux and not Linux? <span class=\"anchor-"
-#| "reference-id\">(<a href=\"#why\">#why</a>)</span>"
msgid ""
"How much of the GNU system is needed for the system to be GNU/Linux? <span "
"class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
msgstr ""
-"Ð¯ÐºÑ ÑаÑÑÐºÑ ÑиÑÑеми GNU повинна мÑÑÑиÑи
ÑиÑÑема, Ñоб бÑÑи GNU/Linux? "
-"<span class=\"anchor-reference-id\"><a href=\"#howmuch\">#howmuch</a></"
-"span>"
+"Ð¯ÐºÑ ÑаÑÑÐºÑ ÑиÑÑеми GNU повинна мÑÑÑиÑи
ÑиÑÑема, Ñоб бÑÑи GNU/Linux? <span "
+"class=\"anchor-reference-id\"><a href=\"#howmuch\">#howmuch</a></span>"
#. type: Content of: <dl><dd>
msgid ""
"“How much” is not a meaningful question because the GNU system "
"does not have precise boundaries."
msgstr ""
-"ÐиÑÐ°Ð½Ð½Ñ “Ñка ÑаÑÑка?” не Ð¼Ð°Ñ ÑенÑÑ,
ÑÐ¾Ð¼Ñ Ñо Ñ ÑиÑÑеми "
-"GNU Ð½ÐµÐ¼Ð°Ñ ÑоÑниÑ
меж."
+"ÐиÑÐ°Ð½Ð½Ñ “Ñка ÑаÑÑка?” не Ð¼Ð°Ñ ÑенÑÑ,
ÑÐ¾Ð¼Ñ Ñо Ñ ÑиÑÑеми GNU Ð½ÐµÐ¼Ð°Ñ "
+"ÑоÑниÑ
меж."
#. type: Content of: <dl><dd><p>
msgid ""
@@ -2653,13 +2626,12 @@
"the GNU system and omit part, there is no meaningful way to say “how "
"much” you used."
msgstr ""
-"GNU — опеÑаÑÑйна ÑиÑÑема, ÑкÑ
пÑдÑÑимÑÑ Ð³Ñомада. Ðона "
-"вклÑÑÐ°Ñ Ð½Ð°Ð±Ð°Ð³Ð°Ñо бÑлÑÑе, нÑж пÑоÑÑо
пакеÑи пÑогÑам GNU (конкÑеÑний ÑпиÑок "
-"ÑкиÑ
Ñ Ð½Ð°Ñ Ñ), Ñ Ð»Ñди поÑÑÑйно додаÑÑÑ Ð½Ð¾Ð²Ñ
пакеÑи. ÐезважаÑÑи на "
-"ÑÑ Ð·Ð¼Ñни, вона залиÑаÑÑÑÑÑ ÑиÑÑÐµÐ¼Ð¾Ñ GNU, Ñ
Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Linux до ÑÑого Ð´Ð°Ñ "
-"GNU/Linux. ЯкÑо ви коÑиÑÑÑÑÑеÑÑ ÑаÑÑиноÑ
ÑиÑÑеми GNU, а ÑаÑÑÐ¸Ð½Ñ Ð¾Ð¿ÑÑкаÑÑе, не "
-"можна "
-"оÑмиÑлено ÑказаÑи, “ÑÐºÐ¾Ñ ÑаÑÑкоє ви
коÑиÑÑÑÑÑеÑÑ."
+"GNU — опеÑаÑÑйна ÑиÑÑема, ÑкÑ
пÑдÑÑимÑÑ Ð³Ñомада. Ðона вклÑÑÐ°Ñ "
+"набагаÑо бÑлÑÑе, нÑж пÑоÑÑо пакеÑи
пÑогÑам GNU (конкÑеÑний ÑпиÑок ÑкиÑ
Ñ Ð½Ð°Ñ "
+"Ñ), Ñ Ð»Ñди поÑÑÑйно додаÑÑÑ Ð½Ð¾Ð²Ñ Ð¿Ð°ÐºÐµÑи.
ÐезважаÑÑи на ÑÑ Ð·Ð¼Ñни, вона "
+"залиÑаÑÑÑÑÑ ÑиÑÑÐµÐ¼Ð¾Ñ GNU, Ñ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Linux до
ÑÑого Ð´Ð°Ñ GNU/Linux. ЯкÑо ви "
+"коÑиÑÑÑÑÑеÑÑ ÑаÑÑÐ¸Ð½Ð¾Ñ ÑиÑÑеми GNU, а
ÑаÑÑÐ¸Ð½Ñ Ð¾Ð¿ÑÑкаÑÑе, не можна оÑмиÑлено "
+"ÑказаÑи, “ÑÐºÐ¾Ñ ÑаÑÑкоє ви
коÑиÑÑÑÑÑеÑÑ."
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3300,10 +3272,6 @@
"вÑлÑного пÑогÑамного забезпеÑеннÑ, Inc."
#. type: Content of: <div><p>
-#| msgid ""
-#| "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>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
@@ -3311,9 +3279,8 @@
msgstr ""
"Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/deed.uk\"> лÑÑензÑÑ Creative
Commons "
-"Attribution-"
-"NoDerivatives 4.0 International (<em>Ðз зазнаÑеннÑм
авÑоÑÑÑва â Ðез "
-"поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>."
+"Attribution-NoDerivatives 4.0 International (<em>Ðз зазнаÑеннÑм
авÑоÑÑÑва â "
+"Ðез поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
@@ -3325,4 +3292,3 @@
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "Ðновлено:"
-
Index: gnu/po/gnu-users-never-heard-of-gnu.uk-en.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.uk-en.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/po/gnu-users-never-heard-of-gnu.uk-en.html 13 Apr 2014 11:32:49
-0000 1.1
+++ gnu/po/gnu-users-never-heard-of-gnu.uk-en.html 2 Jul 2015 09:28:00
-0000 1.2
@@ -16,45 +16,45 @@
</p></blockquote>
</div>
-<p>Most people have never heard of GNU. Even most of the people who use
-the GNU system have never heard of GNU, thanks to so many people and
-companies who teach them to call it “Linux”. Nonetheless,
-the name GNU has certain associations, which people will discover once
-they hear the name. GNU is associated with the ideals of freedom of the
-free software movement. That association is no accident; the motive for
-developing GNU was specifically to make it possible to use a computer
-and have freedom.</p>
-
-<p>The association between the name GNU and our goals of freedom and
-social solidarity exists in the minds of hundreds of thousands of
-GNU/Linux users that do know about GNU. It exists in Wikipedia. And it
-exists around the web; if these users search for GNU, they will find <a
-href="http://www.gnu.org";>www.gnu.org</a>, which talks about free
-software and freedom.</p>
+<p>Most people have never heard of GNU. Even most of the people who
+use the GNU system have never heard of GNU, since so many people and
+companies teach them to call it “Linux”. Indeed, GNU
+users often say they are “running Linux”, which is like
+saying you are “driving your carburettor” or
+“driving your transmission”.</p>
+
+<p>Nonetheless, those who know about GNU associate it with the ideals
+of freedom of the free software movement. That association is no
+accident; the motive for developing GNU was specifically to make it
+possible to use a computer and have freedom.</p>
<p>A person seeing the name “GNU” for the first time in
-“GNU/Linux” won't immediately associate it with anything.
-However, when people know that the system is basically GNU, that brings
-them a step closer to learning about our ideals. For instance, they
-might become curious and look for more information about GNU.</p>
-
-<p>If they don't look for it, they may encounter it anyway. The
-“open source” rhetoric tends to lead people's attention away
-from issues of users' freedom, but not totally; there is still
-discussion of GNU and free software, and people have some chance of
-coming across it. When that happens, the reader is more likely to pay
-attention to information about GNU (such as that it's the work of a
-campaign for freedom and community) if he knows he is a user of the GNU
+“GNU/Linux” won't immediately know what it represents, has
+come one step closer to finding out. The association between the name
+GNU and our goals of freedom and social solidarity exists in the minds
+of hundreds of thousands of GNU/Linux users that do know about GNU.
+It exists in <a href="http://www.gnu.org";>gnu.org</a> and in
+Wikipedia. It exists around the web; if these users search for GNU,
+they will find the ideas GNU stands for.</p>
+
+<p>If they don't search, they may encounter them anyway. The
+<a href="/philosophy/open-source-misses-the-point.html">“open
+source”</a> rhetoric tends to lead people's attention away from
+issues of users' freedom, but not totally; there is still discussion
+of GNU and free software, and people have some chance of coming across
+it. When that happens, they are more likely to pay attention to
+information about GNU (such as that it's the work of a campaign for
+freedom and community) if they know they are users of the GNU
system.</p>
<p>Over time, calling the system “GNU/Linux” spreads
awareness of the ideals of freedom for which we developed the GNU
-system. It is also useful as a reminder for people in our community who
-know about these ideals, in a world where much of discussion of free
-software takes a totally practical (and thus amoral) approach. When we
-ask you to call the system “GNU/Linux”, we do so because
-awareness of GNU slowly but surely brings with it awareness of the free
-software ideals of freedom and community.</p>
+system. It is also useful as a reminder for people in our community
+who know about these ideals, in a world where much of discussion of
+free software takes a totally practical (and thus amoral) approach.
+When we ask you to call the system “GNU/Linux”, we are
+asking you to help in making the public aware of the free software
+ideals.</p>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
@@ -88,7 +88,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
@@ -103,17 +103,17 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 2006, 2007, 2013, 2014 Free Software Foundation, Inc.</p>
+<p>Copyright © 2006, 2007, 2013, 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: 2014/04/13 11:32:49 $
+$Date: 2015/07/02 09:28:00 $
<!-- timestamp end -->
</p>
</div>
Index: gnu/po/gnu-users-never-heard-of-gnu.uk.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.uk.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- gnu/po/gnu-users-never-heard-of-gnu.uk.po 2 Jul 2015 09:09:58 -0000
1.4
+++ gnu/po/gnu-users-never-heard-of-gnu.uk.po 2 Jul 2015 09:28:00 -0000
1.5
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODINGLanguage: uk\n"
-"X-Outdated-Since: 2015-06-02 12:25+0000\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
@@ -51,15 +50,6 @@
"\">“Linux Ñ Ð¿ÑÐ¾ÐµÐºÑ GNU»,</a>."
#. type: Content of: <p>
-#| msgid ""
-#| "Most people have never heard of GNU. Even most of the people who use the "
-#| "GNU system have never heard of GNU, thanks to so many people and "
-#| "companies who teach them to call it “Linux”. Nonetheless, "
-#| "the name GNU has certain associations, which people will discover once "
-#| "they hear the name. GNU is associated with the ideals of freedom of the "
-#| "free software movement. That association is no accident; the motive for "
-#| "developing GNU was specifically to make it possible to use a computer and "
-#| "have freedom."
msgid ""
"Most people have never heard of GNU. Even most of the people who use the "
"GNU system have never heard of GNU, since so many people and companies teach "
@@ -71,37 +61,21 @@
"викоÑиÑÑовÑÑÑÑ ÑиÑÑÐµÐ¼Ñ GNU, нÑколи не ÑÑли
пÑо GNU, оÑкÑлÑки Ñак багаÑо "
"лÑдей Ñ ÐºÐ¾Ð¼Ð¿Ð°Ð½Ñй пÑивÑаÑÑÑ ÑÑ
називаÑи ÑÑ
“Linux”. ÐÑйÑно, "
"коÑиÑÑÑваÑÑ GNU ÑаÑÑо говоÑÑÑÑ, Ñо вони
“пÑаÑÑÑÑÑ Ð½Ð° Linux”, Ñе "
-"вÑе одно Ñо говоÑиÑи, Ñо ви “ÑдеÑе на
каÑбÑÑаÑоÑÑ” “"
-"ÑдеÑе на коÑобÑÑ Ð¿ÐµÑедає."
+"вÑе одно Ñо говоÑиÑи, Ñо ви “ÑдеÑе на
каÑбÑÑаÑоÑÑ” “ÑдеÑе "
+"на коÑобÑÑ Ð¿ÐµÑедає."
#. type: Content of: <p>
-#| msgid ""
-#| "Most people have never heard of GNU. Even most of the people who use the "
-#| "GNU system have never heard of GNU, thanks to so many people and "
-#| "companies who teach them to call it “Linux”. Nonetheless, "
-#| "the name GNU has certain associations, which people will discover once "
-#| "they hear the name. GNU is associated with the ideals of freedom of the "
-#| "free software movement. That association is no accident; the motive for "
-#| "developing GNU was specifically to make it possible to use a computer and "
-#| "have freedom."
msgid ""
"Nonetheless, those who know about GNU associate it with the ideals of "
"freedom of the free software movement. That association is no accident; the "
"motive for developing GNU was specifically to make it possible to use a "
"computer and have freedom."
msgstr ""
-"Тим не Ð¼ÐµÐ½Ñ Ñой, Ñ
Ñо Ð·Ð½Ð°Ñ Ð¿Ñо GNU, пов'ÑзÑÑ ÑÑ
з Ñдеалами Ñвободи ÑÑÑ
Ñ "
-"за вÑлÑÐ½Ñ Ð¿ÑогÑами. Цей зв'Ñзок не
випадкова; моÑивом ÑозÑобки GNU бÑло "
-"Ñаме ÑÑвоÑÐµÐ½Ð½Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ ÐºÐ¾ÑиÑÑÑваÑиÑÑ
комп'ÑÑеÑом, володÑÑÑи ÑвободоÑ."
+"Тим не Ð¼ÐµÐ½Ñ Ñой, Ñ
Ñо Ð·Ð½Ð°Ñ Ð¿Ñо GNU, пов'ÑзÑÑ ÑÑ
з Ñдеалами Ñвободи ÑÑÑ
Ñ Ð·Ð° "
+"вÑлÑÐ½Ñ Ð¿ÑогÑами. Цей зв'Ñзок не випадкова;
моÑивом ÑозÑобки GNU бÑло Ñаме "
+"ÑÑвоÑÐµÐ½Ð½Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ ÐºÐ¾ÑиÑÑÑваÑиÑÑ
комп'ÑÑеÑом, володÑÑÑи ÑвободоÑ."
#. type: Content of: <p>
-#| msgid ""
-#| "The association between the name GNU and our goals of freedom and social "
-#| "solidarity exists in the minds of hundreds of thousands of GNU/Linux "
-#| "users that do know about GNU. It exists in Wikipedia. And it exists "
-#| "around the web; if these users search for GNU, they will find <a href="
-#| "\"http://www.gnu.org\";>www.gnu.org</a>, which talks about free software "
-#| "and freedom."
msgid ""
"A person seeing the name “GNU” for the first time in “GNU/"
"Linux” won't immediately know what it represents, has come one step "
@@ -114,20 +88,12 @@
"ÐÑдина, Ñка побаÑила впеÑÑе назвÑ
“GNU” Ñ “GNU/"
"Linux”, не дÑзнаÑÑÑÑÑ Ð¾Ð´ÑазÑ, Ñо воно Ñ,
але вона зÑобиÑÑ ÐºÑок до "
"Ñого, Ñоб дÑзнаÑиÑÑ Ð¿Ñо Ñе. ÐÑоÑÑаÑÑÑ
назви GNU з наÑими ÑÑлÑми Ñ Ñвободи "
-"ÑÑÑпÑлÑÐ½Ð¾Ñ ÑолÑдаÑноÑÑÑ ÑÑнÑÑ Ð² ÑмаÑ
ÑоÑÐµÐ½Ñ ÑиÑÑÑ ÐºÐ¾ÑиÑÑÑваÑÑв GNU/"
-"Linux, ÑÐºÑ Ð¿Ñо GNU знаÑÑÑ. Ðона ÑÑнÑÑ Ð½Ð° <a
href=\"/\">gnu.org</a> Ñа "
-"ÐÑкÑпедÑÑ. Ðона ÑÑнÑÑ Ñ ÐÑеÑвÑÑнÑй
павÑÑинÑ; ÑкÑо коÑиÑÑÑваÑÑ ÑÑанÑÑÑ "
-"ÑÑкаÑи GNU, вони знайдÑÑÑ ÑдеÑ, на ÑкиÑ
ÑÑоÑÑÑ GNU."
+"ÑÑÑпÑлÑÐ½Ð¾Ñ ÑолÑдаÑноÑÑÑ ÑÑнÑÑ Ð² ÑмаÑ
ÑоÑÐµÐ½Ñ ÑиÑÑÑ ÐºÐ¾ÑиÑÑÑваÑÑв GNU/Linux, "
+"ÑÐºÑ Ð¿Ñо GNU знаÑÑÑ. Ðона ÑÑнÑÑ Ð½Ð° <a
href=\"/\">gnu.org</a> Ñа ÐÑкÑпедÑÑ. "
+"Ðона ÑÑнÑÑ Ñ ÐÑеÑвÑÑнÑй павÑÑинÑ; ÑкÑо
коÑиÑÑÑваÑÑ ÑÑанÑÑÑ ÑÑкаÑи GNU, вони "
+"знайдÑÑÑ ÑдеÑ, на ÑкиÑ
ÑÑоÑÑÑ GNU."
#. type: Content of: <p>
-#| msgid ""
-#| "If they don't look for it, they may encounter it anyway. The “open "
-#| "source” rhetoric tends to lead people's attention away from issues "
-#| "of users' freedom, but not totally; there is still discussion of GNU and "
-#| "free software, and people have some chance of coming across it. When "
-#| "that happens, the reader is more likely to pay attention to information "
-#| "about GNU (such as that it's the work of a campaign for freedom and "
-#| "community) if he knows he is a user of the GNU system."
msgid ""
"If they don't search, they may encounter them anyway. The <a href=\"/"
"philosophy/open-source-misses-the-point.html\">“open source”</a> "
@@ -141,22 +107,13 @@
"ЯкÑо вони не ÑÑкаÑÑÑ ÑÑого, вони вÑе одно
можÑÑÑ Ð·ÑÑÑÑÑÑиÑÑ Ð· Ñим. ÐаÑла "
"“<a href=\"/philosophy/open-source-misses the
point.html\">вÑдкÑиÑого "
"виÑ
Ñдного ÑекÑÑÑ</a>” Ñ Ð±Ð°Ð³Ð°ÑÑоÑ
випадкаÑ
вÑдволÑкаÑÑÑ ÑÐ²Ð°Ð³Ñ "
-"коÑиÑÑÑваÑÑв вÑд пÑоблем волÑ, але не
повнÑÑÑÑ; обговоÑÐµÐ½Ð½Ñ GNU Ñ "
-"вÑлÑниÑ
пÑогÑам вÑе-Ñаки ÑÑиваÑ, Ñ Ñ
певний ÑанÑ, Ñо лÑди "
-"наÑкнÑÑÑÑÑ Ð½Ð° нÑого. Ðоли Ñе вÑдбÑваÑÑÑÑÑ,
вони ÑвидÑе звеÑнÑÑÑ ÑÐ²Ð°Ð³Ñ Ð½Ð° "
-"ÑнÑоÑмаÑÑÑ Ð¿Ñо GNU (напÑиклад, пÑо Ñе, Ñо Ñе
ÑобоÑа ÑÑÑ
Ñ Ð·Ð° ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ñ "
-"ÑднÑÑÑÑ), ÑкÑо вони знаÑÑÑ, Ñо вони
коÑиÑÑÑÑÑÑÑÑ ÑиÑÑÐµÐ¼Ð¾Ñ GNU."
+"коÑиÑÑÑваÑÑв вÑд пÑоблем волÑ, але не
повнÑÑÑÑ; обговоÑÐµÐ½Ð½Ñ GNU Ñ Ð²ÑлÑниÑ
"
+"пÑогÑам вÑе-Ñаки ÑÑиваÑ, Ñ Ñ Ð¿ÐµÐ²Ð½Ð¸Ð¹ ÑанÑ,
Ñо лÑди наÑкнÑÑÑÑÑ Ð½Ð° нÑого. Ðоли "
+"Ñе вÑдбÑваÑÑÑÑÑ, вони ÑвидÑе звеÑнÑÑÑ
ÑÐ²Ð°Ð³Ñ Ð½Ð° ÑнÑоÑмаÑÑÑ Ð¿Ñо GNU "
+"(напÑиклад, пÑо Ñе, Ñо Ñе ÑобоÑа ÑÑÑ
Ñ Ð·Ð°
ÑÐ²Ð¾Ð±Ð¾Ð´Ñ Ñ ÑднÑÑÑÑ), ÑкÑо вони "
+"знаÑÑÑ, Ñо вони коÑиÑÑÑÑÑÑÑÑ ÑиÑÑÐµÐ¼Ð¾Ñ GNU."
#. type: Content of: <p>
-#| msgid ""
-#| "Over time, calling the system “GNU/Linux” spreads awareness "
-#| "of the ideals of freedom for which we developed the GNU system. It is "
-#| "also useful as a reminder for people in our community who know about "
-#| "these ideals, in a world where much of discussion of free software takes "
-#| "a totally practical (and thus amoral) approach. When we ask you to call "
-#| "the system “GNU/Linux”, we do so because awareness of GNU "
-#| "slowly but surely brings with it awareness of the free software ideals of "
-#| "freedom and community."
msgid ""
"Over time, calling the system “GNU/Linux” spreads awareness of "
"the ideals of freedom for which we developed the GNU system. It is also "
@@ -167,14 +124,12 @@
"aware of the free software ideals."
msgstr ""
"ÐазиваÑÑи ÑÑ ÑиÑÑÐµÐ¼Ñ “GNU/Linux”, ми
поÑÑÑпово пÑдвиÑÑÑмо "
-"ÑÑÑпÑлÑÑÑÐ²Ñ Ð¾Ð±ÑзнанÑÑÑÑ Ð¿Ñо Ñдеали
Ñвободи, заÑади ÑÐºÐ¾Ñ Ð¼Ð¸ ÑозÑобили "
-"ÑиÑÑÐµÐ¼Ñ GNU. Ще Ñе коÑиÑно Ñк нагадÑваннÑ
лÑдÑм з наÑого ÑпÑвÑоваÑиÑÑва, "
-"ÑÐºÑ Ð·Ð½Ð°ÑÑÑ Ð¿Ñо ÑиÑ
ÑдеалаÑ
, Ñ ÑвÑÑÑ, де
знаÑна ÑаÑÑина обговоÑÐµÐ½Ñ "
-"вÑлÑного пÑогÑамного забезпеÑеннÑ
пÑÐ¸Ð¹Ð¼Ð°Ñ ÑÑÑо пÑакÑиÑний (а ÑÐ¾Ð¼Ñ "
-"амоÑалÑний) обÑг. Ðоли ми пÑоÑимо ваÑ
називаÑи ÑиÑÑÐµÐ¼Ñ “GNU/"
-"Linux”, ми пÑоÑимо Ð²Ð°Ñ Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ñи
ÑнÑоÑмÑваÑи ÑÑÑпÑлÑÑÑво пÑо Ñдеали "
-"вÑлÑниÑ
"
-"пÑогÑам."
+"ÑÑÑпÑлÑÑÑÐ²Ñ Ð¾Ð±ÑзнанÑÑÑÑ Ð¿Ñо Ñдеали
Ñвободи, заÑади ÑÐºÐ¾Ñ Ð¼Ð¸ ÑозÑобили ÑиÑÑÐµÐ¼Ñ "
+"GNU. Ще Ñе коÑиÑно Ñк нагадÑÐ²Ð°Ð½Ð½Ñ Ð»ÑдÑм з
наÑого ÑпÑвÑоваÑиÑÑва, ÑÐºÑ Ð·Ð½Ð°ÑÑÑ "
+"пÑо ÑиÑ
ÑдеалаÑ
, Ñ ÑвÑÑÑ, де знаÑна ÑаÑÑина
обговоÑÐµÐ½Ñ Ð²ÑлÑного пÑогÑамного "
+"забезпеÑÐµÐ½Ð½Ñ Ð¿ÑÐ¸Ð¹Ð¼Ð°Ñ ÑÑÑо пÑакÑиÑний (а
ÑÐ¾Ð¼Ñ Ð°Ð¼Ð¾ÑалÑний) обÑг. Ðоли ми "
+"пÑоÑимо Ð²Ð°Ñ Ð½Ð°Ð·Ð¸Ð²Ð°Ñи ÑиÑÑемÑ
“GNU/Linux”, ми пÑоÑимо Ð²Ð°Ñ "
+"допомогÑи ÑнÑоÑмÑваÑи ÑÑÑпÑлÑÑÑво пÑо
Ñдеали вÑлÑниÑ
пÑогÑам."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
#. type: Content of: <div>
@@ -223,8 +178,6 @@
"translations.html\">“ÐоÑÑÐ±Ð½Ð¸ÐºÑ Ð·
пеÑекладє</a>."
#. type: Content of: <div><p>
-#| msgid ""
-#| "Copyright © 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
msgid ""
"Copyright © 2006, 2007, 2013, 2014, 2015 Free Software Foundation, Inc."
msgstr ""
@@ -232,10 +185,6 @@
"забезпеÑеннÑ, Inc."
#. type: Content of: <div><p>
-#| msgid ""
-#| "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>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
@@ -243,9 +192,8 @@
msgstr ""
"Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/deed.uk\"> лÑÑензÑÑ Creative
Commons "
-"Attribution-"
-"NoDerivatives 4.0 International (<em>Ðз зазнаÑеннÑм
авÑоÑÑÑва â Ðез "
-"поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>."
+"Attribution-NoDerivatives 4.0 International (<em>Ðз зазнаÑеннÑм
авÑоÑÑÑва â "
+"Ðез поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
Index: philosophy/surveillance-vs-democracy.uk.html
===================================================================
RCS file: /web/www/www/philosophy/surveillance-vs-democracy.uk.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/surveillance-vs-democracy.uk.html 15 Jan 2015 07:43:06
-0000 1.8
+++ philosophy/surveillance-vs-democracy.uk.html 2 Jul 2015 09:28:00
-0000 1.9
@@ -121,8 +121,13 @@
з ÐвÑопи</a> Ñ <a
href="https://en.wikipedia.org/wiki/Japanese_American_internment";>СШÐ</a>.</p>
+<p>ÐÑобиÑÑÑ Ð´Ð°Ð½Ñ, зÑбÑÐ°Ð½Ñ Ð´ÐµÑжавоÑ, неÑÑдко
ÑÑаÑÑÑ Ð·Ð´Ð¾Ð±Ð¸ÑÑÑ Ñ
акеÑÑв, ÑкÑ
+зламÑÑÑÑ Ð·Ð°Ñ
иÑÑ ÑеÑвеÑÑв, вклÑÑаÑÑи <a
+href="https://www.techdirt.com/articles/20150612/16334231330/second-opm-hack-revealed-even-worse-than-first.shtml";>зломлÑваÑÑв,
+ÑÐºÑ Ð¿ÑаÑÑÑÑÑ Ð½Ð° воÑÐ¾Ð¶Ñ Ð´ÐµÑжави</a>.</p>
+
<p>ТоÑалÑне ÑÑÐµÐ¶ÐµÐ½Ð½Ñ Ð² поÑÐ´Ð½Ð°Ð½Ð½Ñ Ð·
ÑозпливÑаÑÑими ÑоÑмÑлÑваннÑми законÑв
-вÑдкÑÐ¸Ð²Ð°Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ Ð¼Ð°Ñового полÑваннÑ
пÑоÑи ÑÐºÐ¾Ñ Ð·Ð°Ð²Ð³Ð¾Ð´Ð½Ð¾ меÑи. Щоб
+вÑдкÑÐ¸Ð²Ð°Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ Ð¼Ð°Ñового полÑваннÑ
пÑоÑи ÑÐºÐ¾Ñ Ð·Ð°Ð²Ð³Ð¾Ð´Ð½Ð¾ оÑоби. Щоб
ÑбезпеÑиÑи жÑÑналÑÑÑÐ¸ÐºÑ Ñа демокÑаÑÑÑ, ми
Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ Ð¾Ð±Ð¼ÐµÐ¶Ð¸Ñи збÑÑ Ð´Ð°Ð½Ð¸Ñ
, ÑкÑ
бÑдÑÑÑ Ð»ÐµÐ³ÐºÐ¾ доÑÑÑÐ¿Ð½Ñ Ð´ÐµÑжавÑ.</p>
@@ -494,7 +499,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
@@ -511,9 +516,9 @@
<p>Copyright © 2015 Ð ÑÑаÑд СÑолмен</p>
<p>Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.uk";>
лÑÑензÑÑ
-Creative Commons Attribution-NoDerivs (<em>Ðз зазнаÑеннÑм
-авÑоÑÑÑва — Ðез поÑ
ÑдниÑ
ÑвоÑÑв</em>) 3.0
СполÑÑÐµÐ½Ñ Ð¨ÑаÑи</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.uk";> лÑÑензÑÑ
+Creative Commons Attribution-NoDerivatives 4.0 International (<em>Ðз
+зазнаÑеннÑм авÑоÑÑÑва â Ðез поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>.</p>
<!--#include virtual="/server/bottom-notes.uk.html" -->
<div class="translators-credits">
@@ -525,7 +530,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðновлено:
-$Date: 2015/01/15 07:43:06 $
+$Date: 2015/07/02 09:28:00 $
<!-- timestamp end -->
</p>
Index: philosophy/po/surveillance-vs-democracy.uk-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.uk-en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- philosophy/po/surveillance-vs-democracy.uk-en.html 15 Jan 2015 07:43:07
-0000 1.8
+++ philosophy/po/surveillance-vs-democracy.uk-en.html 2 Jul 2015 09:28:01
-0000 1.9
@@ -118,10 +118,15 @@
and <a href="https://en.wikipedia.org/wiki/Japanese_American_internment";>the
US </a>.</p>
-<p>Total surveillance plus vague law provides an opening for a massive
-fishing expedition against any desired target. To make journalism and
-democracy safe, we must limit the accumulation of data that is easily
-accessible to the state.</p>
+<p>Personal data collected by the state is also likely to be obtained
+by crackers that break the security of the servers, even
+by <a
href="https://www.techdirt.com/articles/20150612/16334231330/second-opm-hack-revealed-even-worse-than-first.shtml";>crackers
+working for hostile states</a>.</p>
+
+<p>Total surveillance plus weak legal protections enable the state to
+launch a massive fishing expedition against any person. To make
+journalism and democracy safe, we must limit the accumulation of data
+that is easily accessible to the state.</p>
<h3>Robust Protection for Privacy Must Be Technical</h3>
@@ -480,7 +485,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
@@ -498,14 +503,14 @@
<p>Copyright © 2015 Richard Stallman</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/01/15 07:43:07 $
+$Date: 2015/07/02 09:28:01 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/surveillance-vs-democracy.uk.po
===================================================================
RCS file: /web/www/www/philosophy/po/surveillance-vs-democracy.uk.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- philosophy/po/surveillance-vs-democracy.uk.po 2 Jul 2015 09:09:57
-0000 1.23
+++ philosophy/po/surveillance-vs-democracy.uk.po 2 Jul 2015 09:28:01
-0000 1.24
@@ -14,7 +14,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODINGLanguage: uk\n"
-"X-Outdated-Since: 2015-06-21 14:26+0000\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
@@ -269,18 +268,12 @@
"www.techdirt.com/articles/20150612/16334231330/second-opm-hack-revealed-even-"
"worse-than-first.shtml\">crackers working for hostile states</a>."
msgstr ""
-"ÐÑобиÑÑÑ Ð´Ð°Ð½Ñ, зÑбÑÐ°Ð½Ñ Ð´ÐµÑжавоÑ, неÑÑдко
ÑÑаÑÑÑ Ð·Ð´Ð¾Ð±Ð¸ÑÑÑ "
-"Ñ
акеÑÑв, ÑÐºÑ Ð·Ð»Ð°Ð¼ÑÑÑÑ Ð·Ð°Ñ
иÑÑ ÑеÑвеÑÑв,
вклÑÑаÑÑи <a href="
-"\"https://www.techdirt.com/articles/20150612/16334231330/second-opm-hack-";
-"revealed-even-worse-than-first.shtml\">зломлÑваÑÑв, ÑкÑ
пÑаÑÑÑÑÑ Ð½Ð° воÑÐ¾Ð¶Ñ "
-"деÑжави</a>."
+"ÐÑобиÑÑÑ Ð´Ð°Ð½Ñ, зÑбÑÐ°Ð½Ñ Ð´ÐµÑжавоÑ, неÑÑдко
ÑÑаÑÑÑ Ð·Ð´Ð¾Ð±Ð¸ÑÑÑ Ñ
акеÑÑв, ÑÐºÑ "
+"зламÑÑÑÑ Ð·Ð°Ñ
иÑÑ ÑеÑвеÑÑв, вклÑÑаÑÑи <a
href=\"https://www.techdirt.com/";
+"articles/20150612/16334231330/second-opm-hack-revealed-even-worse-than-first."
+"shtml\">зломлÑваÑÑв, ÑÐºÑ Ð¿ÑаÑÑÑÑÑ Ð½Ð° воÑожÑ
деÑжави</a>."
#. type: Content of: <p>
-#| msgid ""
-#| "Total surveillance plus vague law provides an opening for a massive "
-#| "fishing expedition against any desired target. To make journalism and "
-#| "democracy safe, we must limit the accumulation of data that is easily "
-#| "accessible to the state."
msgid ""
"Total surveillance plus weak legal protections enable the state to launch a "
"massive fishing expedition against any person. To make journalism and "
@@ -1036,10 +1029,6 @@
msgstr "Copyright © 2015 Ð ÑÑаÑд СÑолмен"
#. type: Content of: <div><p>
-#| msgid ""
-#| "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>."
msgid ""
"This page is licensed under a <a rel=\"license\" href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
@@ -1047,9 +1036,8 @@
msgstr ""
"Ð¦Ñ ÑÑоÑÑнка доÑÑÑпна на ÑмоваÑ
<a rel=\"license\"
href=\"http://";
"creativecommons.org/licenses/by-nd/4.0/deed.uk\"> лÑÑензÑÑ Creative
Commons "
-"Attribution-"
-"NoDerivatives 4.0 International (<em>Ðз зазнаÑеннÑм
авÑоÑÑÑва â Ðез "
-"поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>."
+"Attribution-NoDerivatives 4.0 International (<em>Ðз зазнаÑеннÑм
авÑоÑÑÑва â "
+"Ðез поÑ
ÑдниÑ
ÑвоÑÑв 4.0 ÐÑжнаÑодна</em>)</a>."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
Index: server/sitemap.uk.html
===================================================================
RCS file: /web/www/www/server/sitemap.uk.html,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- server/sitemap.uk.html 29 Jun 2015 17:02:44 -0000 1.186
+++ server/sitemap.uk.html 2 Jul 2015 09:28:01 -0000 1.187
@@ -1721,7 +1721,7 @@
<dd>ÐÑазливÑÑÑÑ Ð½ÐµÐ²ÑлÑниÑ
пÑогÑам</dd>
<dt><a
href="/proprietary/proprietary-interference.html">proprietary-interference.html</a></dt>
- <dd>Proprietary Interference</dd>
+ <dd>ÐеÑеÑкоди вÑд невÑлÑниÑ
пÑогÑам</dd>
<dt><a
href="/proprietary/proprietary-jails.html">proprietary-jails.html</a></dt>
<dd>ÐевÑлÑÐ½Ñ Ð¿ÑогÑами-в'ÑзниÑÑ</dd>
<dt><a
@@ -2042,7 +2042,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðновлено:
-$Date: 2015/06/29 17:02:44 $
+$Date: 2015/07/02 09:28:01 $
<!-- timestamp end -->
</p>
Index: server/po/sitemap.uk-en.html
===================================================================
RCS file: /web/www/www/server/po/sitemap.uk-en.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/po/sitemap.uk-en.html 1 Jun 2015 06:34:05 -0000 1.37
+++ server/po/sitemap.uk-en.html 2 Jul 2015 09:28:01 -0000 1.38
@@ -1596,6 +1596,8 @@
<dd>Proprietary DRM</dd>
<dt><a
href="/proprietary/proprietary-insecurity.html">proprietary-insecurity.html</a></dt>
<dd>Proprietary Insecurity</dd>
+ <dt><a
href="/proprietary/proprietary-interference.html">proprietary-interference.html</a></dt>
+ <dd>Proprietary Interference</dd>
<dt><a
href="/proprietary/proprietary-jails.html">proprietary-jails.html</a></dt>
<dd>Proprietary Jails</dd>
<dt><a
href="/proprietary/proprietary-sabotage.html">proprietary-sabotage.html</a></dt>
@@ -1882,7 +1884,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/06/01 06:34:05 $
+$Date: 2015/07/02 09:28:01 $
<!-- timestamp end -->
</p>
</div>
Index: server/po/sitemap.uk.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.uk.po,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -b -r1.209 -r1.210
--- server/po/sitemap.uk.po 2 Jul 2015 09:09:59 -0000 1.209
+++ server/po/sitemap.uk.po 2 Jul 2015 09:28:03 -0000 1.210
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2015-06-29 16:59+0000\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
@@ -5533,7 +5532,6 @@
"interference.html</a>"
#. type: Content of: <div><dl><dd><dl><dd>
-#| msgid "Proprietary Surveillance"
msgid "Proprietary Interference"
msgstr "ÐеÑеÑкоди вÑд невÑлÑниÑ
пÑогÑам"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www distros/common-distros.uk.html distros/free...,
GNUN <=