[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www licenses/old-licenses/gpl-2.0-faq.ru.html l...
From: |
GNUN |
Subject: |
www licenses/old-licenses/gpl-2.0-faq.ru.html l... |
Date: |
Thu, 1 Aug 2019 07:01:02 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 19/08/01 07:01:02
Modified files:
licenses/old-licenses: gpl-2.0-faq.ru.html
licenses/old-licenses/po: gpl-2.0-faq.ru-en.html
philosophy/po : stallmans-law.ms.po
server/gnun/compendia: compendium.ms.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/gpl-2.0-faq.ru.html?cvsroot=www&r1=1.49&r2=1.50
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.ru-en.html?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/stallmans-law.ms.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ms.po?cvsroot=www&r1=1.1&r2=1.2
Patches:
Index: licenses/old-licenses/gpl-2.0-faq.ru.html
===================================================================
RCS file: /web/www/www/licenses/old-licenses/gpl-2.0-faq.ru.html,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- licenses/old-licenses/gpl-2.0-faq.ru.html 13 Jun 2019 16:31:59 -0000
1.49
+++ licenses/old-licenses/gpl-2.0-faq.ru.html 1 Aug 2019 11:01:02 -0000
1.50
@@ -279,7 +279,12 @@
ÑаÑпÑоÑÑÑанÑÑÑ ÑÑÑ Ð²ÐµÑÑÐ¸Ñ Ð´Ð°Ð»ÑÑе?</a></li>
<li><a href="#TradeSecretRelease" name="TOCTradeSecretRelease">ЧÑо,
еÑли
-пÑедпÑиÑÑие пеÑÐµÐ´Ð°ÐµÑ ÐºÐ¾Ð¿Ð¸Ñ ÐºÐ°Ðº
коммеÑÑеÑкÑÑ ÑайнÑ?</a></li>
+пÑедпÑиÑÑие пеÑÐµÐ´Ð°ÐµÑ Ð¼Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ ÑабоÑÑ
какиÑ
-Ñо дÑÑгиÑ
ÑазÑабоÑÑиков,
+ÑаÑпÑоÑÑÑанÑемой под GPL, как коммеÑÑеÑкÑÑ
ÑайнÑ?</a></li>
+
+ <li><a href="#TradeSecretRelease2" name="TOCTradeSecretRelease2">ЧÑо,
еÑли
+пÑедпÑиÑÑие пеÑÐµÐ´Ð°ÐµÑ ÐºÐ¾Ð¿Ð¸Ñ Ñвоей
ÑобÑÑвенной ÑабоÑÑ, ÑаÑпÑоÑÑÑанÑемой под
+GPL, как коммеÑÑеÑкÑÑ ÑайнÑ?</a></li>
<li><a href="#DistributeSubsidiary"
name="TOCDistributeSubsidiary">ЯвлÑеÑÑÑ Ð»Ð¸
ÑаÑпÑоÑÑÑанением пеÑедаÑа копии в
конÑÑолиÑÑемое доÑеÑнее пÑедпÑиÑÑие?</a></li>
@@ -1971,16 +1976,34 @@
еÑли пÑедпÑиÑÑие ÑÑÑ Ð²ÐµÑÑÐ¸Ñ Ð½Ðµ вÑпÑÑÑило,
Ñо Ñакого наÑÑÑÐµÐ½Ð¸Ñ Ð½Ðµ бÑло.
</p></dd>
-<dt><a name="TradeSecretRelease">ЧÑо, еÑли пÑедпÑиÑÑие
пеÑÐµÐ´Ð°ÐµÑ ÐºÐ¾Ð¿Ð¸Ñ ÐºÐ°Ðº
-коммеÑÑеÑкÑÑ ÑайнÑ?</a></dt>
+
+<dt><a name="TradeSecretRelease">ЧÑо, еÑли пÑедпÑиÑÑие
пеÑÐµÐ´Ð°ÐµÑ Ð¼Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ ÑабоÑÑ
+какиÑ
-Ñо дÑÑгиÑ
ÑазÑабоÑÑиков,
ÑаÑпÑоÑÑÑанÑемой под GPL, как коммеÑÑеÑкÑÑ
+ÑайнÑ?</a></dt>
+
<dd>
-ÐÑли пÑедпÑиÑÑие пеÑÐµÐ´Ð°ÐµÑ Ð²Ð°Ð¼ ÐºÐ¾Ð¿Ð¸Ñ Ð¸
заÑвлÑеÑ, ÑÑо она ÑвлÑеÑÑÑ
-коммеÑÑеÑкой Ñайной, ÑÑо пÑедпÑиÑÑие
наÑÑÑило GPL и должно бÑÐ´ÐµÑ Ð¿ÑекÑаÑиÑÑ
-ÑаÑпÑоÑÑÑанение. ÐбÑаÑиÑе внимание, ÑÑо
ÑÑо оÑлиÑаеÑÑÑ Ð¾Ñ Ð¿ÑедÑдÑÑего ÑлÑÑаÑ
-Ñ ÐºÑажей: пÑедпÑиÑÑие не ÑаÑпÑоÑÑÑанÑеÑ
ÐºÐ¾Ð¿Ð¸Ñ Ð¿ÑеднамеÑенно, когда ее
-кÑадÑÑ, Ñак ÑÑо в ÑÑом ÑлÑÑае пÑедпÑиÑÑие
не наÑÑÑÐ°ÐµÑ GPL.
+ÐÑо пÑедпÑиÑÑие наÑÑÑило GPL и должно бÑдеÑ
пÑекÑаÑиÑÑ ÑаÑпÑоÑÑÑанение ÑÑой
+пÑогÑаммÑ. ÐбÑаÑиÑе внимание, ÑÑо ÑÑо
оÑлиÑаеÑÑÑ Ð¾Ñ Ð¿ÑедÑдÑÑего ÑлÑÑÐ°Ñ Ñ
+кÑажей: пÑедпÑиÑÑие не ÑаÑпÑоÑÑÑанÑеÑ
ÐºÐ¾Ð¿Ð¸Ñ Ð¿ÑеднамеÑенно, когда ее кÑадÑÑ,
+Ñак ÑÑо в ÑÑом ÑлÑÑае пÑедпÑиÑÑие не
наÑÑÑÐ°ÐµÑ GPL.
</dd>
+
+<dt><a name="TradeSecretRelease2">ЧÑо, еÑли пÑедпÑиÑÑие
пеÑÐµÐ´Ð°ÐµÑ ÐºÐ¾Ð¿Ð¸Ñ Ñвоей
+ÑобÑÑвенной ÑабоÑÑ, ÑаÑпÑоÑÑÑанÑемой под
GPL, как коммеÑÑеÑкÑÑ ÑайнÑ?</a></dt>
+
+<dd>
+ÐÑли ÑаÑпÑоÑÑÑанÑÐµÐ¼Ð°Ñ Ð¿ÑогÑамма не
вклÑÑÐ°ÐµÑ Ð² ÑÐµÐ±Ñ Ð½Ð¸ÐºÐ°ÐºÑÑ ÑабоÑÑ ÐºÐ¾Ð³Ð¾-Ñо
+еÑе, ÑаÑпÑоÑÑÑанÑемÑÑ Ð¿Ð¾ GPL, Ñо пÑедпÑиÑÑие
не наÑÑÑÐ°ÐµÑ GPL (подÑобнее
+Ñм. <a href="#DeveloperViolate">СвÑзан ли ÑазÑабоÑÑик
пÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ GPL
+ÑекÑÑом лиÑензии? ÐогÑÑ Ð»Ð¸ бÑÑÑ Ð´ÐµÐ¹ÑÑвиÑ
ÑазÑабоÑÑика наÑÑÑением
+GPL?</a>). Ðо пÑедпÑиÑÑие Ð´ÐµÐ»Ð°ÐµÑ Ð´Ð²Ð°
пÑоÑивоÑеÑивÑÑ
заÑÐ²Ð»ÐµÐ½Ð¸Ñ Ð¾ Ñом, ÑÑо вам
+можно делаÑÑ Ñ ÑÑой пÑогÑаммой: ÑÑо вам
можно ее ÑаÑпÑоÑÑÑанÑÑÑ Ð¸ ÑÑо вам
+ÑÑого нелÑзÑ. Ðмело Ð±Ñ ÑмÑÑл поÑÑебоваÑÑ
ÑазÑÑÑниÑÑ ÑÑÐ»Ð¾Ð²Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÑой
+пÑогÑаммой пеÑед Ñем, как Ð²Ñ Ð¿ÑимиÑе копиÑ.
+</dd>
+
+
<dt><a name="WhySomeGPLAndNotLGPL">ÐоÑÐµÐ¼Ñ Ð½ÐµÐºÐ¾ÑоÑÑе
библиоÑеки GNU вÑпÑÑкаÑÑÑÑ
по обÑÑной GPL, а не по ÐенÑÑей GPL?</a></dt>
@@ -2157,8 +2180,8 @@
пÑовеÑÑи ÑеÑÑÑ Ð¼ÐµÐ¶Ð´Ñ Ð¿ÑогÑаммами на Javascript
(Ñ Ð°Ð²ÑоÑÑким левом) и ÑекÑÑом
полÑзоваÑÐµÐ»Ñ (обÑÑно под неÑовмеÑÑимÑми
ÑÑловиÑми). </p>
-<!-- GNUN: localize URL /licenses/template-diagram.ru.png -->
-<p><a href="/licenses/template-diagram.ru.png"><img
src="/licenses/template-diagram.ru.png" alt="СÑ
ема опиÑанного
вÑÑе" /></a></p>
+<!-- GNUN: localize URL /licenses/template-diagram.png -->
+<p><a href="/licenses/template-diagram.png"><img
src="/licenses/template-diagram.png" alt="СÑ
ема опиÑанного
вÑÑе" /></a></p>
<p>ÐÐ¾Ñ Ð¸ÑклÑÑение Ð´Ð»Ñ Ð¿ÑогÑамм на Javascript,
коÑоÑое ÑÑо делаеÑ:</p>
@@ -2482,8 +2505,8 @@
пеÑеводам”</a>.</p>
</div>
-<p>Copyright © 2001, 2006, 2007, 2008, 2011, 2014, 2015, 2017, 2018 Free
-Software Foundation, Inc.</p>
+<p>Copyright © 2001, 2006, 2007, 2008, 2011, 2014, 2015, 2017, 2018, 2019
+Free Software Foundation, Inc.</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru">лиÑензии
@@ -2499,7 +2522,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2019/06/13 16:31:59 $
+$Date: 2019/08/01 11:01:02 $
<!-- timestamp end -->
</p>
Index: licenses/old-licenses/po/gpl-2.0-faq.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.ru-en.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- licenses/old-licenses/po/gpl-2.0-faq.ru-en.html 15 Dec 2018 14:46:17
-0000 1.38
+++ licenses/old-licenses/po/gpl-2.0-faq.ru-en.html 1 Aug 2019 11:01:02
-0000 1.39
@@ -277,7 +277,12 @@
version?</a></li>
<li><a href="#TradeSecretRelease" name="TOCTradeSecretRelease">
- What if a company distributes a copy as a trade secret?</a></li>
+ What if a company distributes a copy of some other developers'
+ GPL-covered work to me as a trade secret?</a></li>
+
+ <li><a href="#TradeSecretRelease2" name="TOCTradeSecretRelease2">
+ What if a company distributes a copy of its own GPL-covered work to
+ me as a trade secret?</a></li>
<li><a href="#DistributeSubsidiary" name="TOCDistributeSubsidiary">
Does moving a copy to a majority-owned, and controlled, subsidiary
@@ -1959,17 +1964,36 @@
hasn't released this version, no such violation has occurred.
</p></dd>
+
<dt><b><a href="#TOCTradeSecretRelease"
- name="TradeSecretRelease">What if a company distributes a copy as
- a trade secret?</a></b></dt>
+ name="TradeSecretRelease">What if a company distributes a copy of
+ some other developers' GPL-covered work to me as a trade
+ secret?</a></b></dt>
+
<dd>
-If a company distributes a copy to you and claims it is a trade
-secret, the company has violated the GPL and will have to cease
-distribution. Note how this differs from the theft case above; the
+The company has violated the GPL and will have to cease distribution
+of that program. Note how this differs from the theft case above; the
company does not intentionally distribute a copy when a copy is
stolen, so in that case the company has not violated the GPL.
</dd>
+
+<dt><b><a href="#TOCTradeSecretRelease2"
+ name="TradeSecretRelease2">What if a company distributes a copy
+ of its own GPL-covered work to me as a trade secret?</a></b></dt>
+
+<dd>
+If the program distributed does not incorporate anyone else's
+GPL-covered work, then the company is not violating the GPL (see
+“<a href="#DeveloperViolate">Is the developer of a GPL-covered
+program bound by the GPL?</a>” for more information). But it is
+making two contradictory statements about what you can do with that
+program: that you can redistribute it, and that you can't. It would
+make sense to demand clarification of the terms for use of that program
+before you accept a copy.
+</dd>
+
+
<dt><b><a href="#TOCWhySomeGPLAndNotLGPL"
name="WhySomeGPLAndNotLGPL">Why are some GNU libraries released under
the ordinary GPL rather than the Lesser GPL?</a></b></dt>
@@ -2472,7 +2496,7 @@
information on coordinating and submitting translations of this article.</p>
</div>
-<p>Copyright © 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018 Free
Software Foundation, Inc.</p>
+<p>Copyright © 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019 Free
Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
@@ -2482,7 +2506,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/12/15 14:46:17 $
+$Date: 2019/08/01 11:01:02 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/stallmans-law.ms.po
===================================================================
RCS file: /web/www/www/philosophy/po/stallmans-law.ms.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- philosophy/po/stallmans-law.ms.po 1 Aug 2019 10:35:39 -0000 1.1
+++ philosophy/po/stallmans-law.ms.po 1 Aug 2019 11:01:02 -0000 1.2
@@ -30,10 +30,10 @@
"change in technology is an opening for them to further restrict or mistreat "
"its users."
msgstr ""
-"Disebabkan syarikat-syarikat besar mendominasikan masyarakat dan menentukan"
-" undang-undang, setiap kemajuan atau perubahan dalam teknologi ialah satu"
-" ruang baharu bagi mereka untuk menyekat kebebasan atau menganiaya para"
-" pengguna."
+"Disebabkan syarikat-syarikat besar mendominasikan masyarakat dan menentukan "
+"undang-undang, setiap kemajuan atau perubahan dalam teknologi ialah satu "
+"ruang baharu bagi mereka untuk menyekat kebebasan atau menganiaya para "
+"pengguna."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
#. type: Content of: <div>
@@ -42,43 +42,41 @@
#. type: Content of: <div><div><p>
msgid ""
-"Please send general FSF & GNU inquiries to <a "
-"href=\"mailto:address@hidden\"><address@hidden></a>. There are also <a
"
-"href=\"/contact/\">other ways to contact</a> the FSF. Broken links and "
-"other corrections or suggestions can be sent to <a "
-"href=\"mailto:address@hidden\"><address@hidden></a>."
+"Please send general FSF & GNU inquiries to <a
href=\"mailto:address@hidden"
+"\"><address@hidden></a>. There are also <a href=\"/contact/\">other
ways "
+"to contact</a> the FSF. Broken links and other corrections or suggestions "
+"can be sent to <a href=\"mailto:address@hidden\"><webmasters@gnu."
+"org></a>."
msgstr ""
-"Tolong hantar pertanyaan umum tentang FSF & GNU kepada <a "
-"href=\"mailto:address@hidden\"><address@hidden></a>. Terdapat juga <a "
-"href=\"/contact/\">cara yang lain untuk menghubungi</a> FSF. Pautan rosak"
-" dan "
-"ralat lain atau sebarang cadangan boleh dihantar kepada <a "
-"href=\"mailto:address@hidden\"><address@hidden></a>."
+"Tolong hantar pertanyaan umum tentang FSF & GNU kepada <a href=\"mailto:"
+"address@hidden\"><address@hidden></a>. Terdapat juga <a
href=\"/contact/"
+"\">cara yang lain untuk menghubungi</a> FSF. Pautan rosak dan ralat lain "
+"atau sebarang cadangan boleh dihantar kepada <a href=\"mailto:webmasters@gnu."
+"org\"><address@hidden></a>."
+#
+#
+#
#. TRANSLATORS: Ignore the original text in this paragraph,
#. replace it with the translation of these two:
-#
#. We work hard and do our best to provide accurate, good quality
#. translations. However, we are not exempt from imperfection.
#. Please send your comments and general suggestions in this regard
#. to <a href="mailto:address@hidden">
-#
#. <address@hidden></a>.</p>
-#
#. <p>For information on coordinating and submitting translations of
#. our web pages, see <a
#. href="/server/standards/README.translations.html">Translations
#. README</a>.
#. type: Content of: <div><div><p>
msgid ""
-"Please see the <a "
-"href=\"/server/standards/README.translations.html\">Translations README</a> "
-"for information on coordinating and submitting translations of this article."
+"Please see the <a href=\"/server/standards/README.translations.html"
+"\">Translations README</a> for information on coordinating and submitting "
+"translations of this article."
msgstr ""
-"Tolong lihat <a "
-"href=\"/server/standards/README.translations.html\">Translations README</a>"
-" untuk maklumat mengenai penyelerasan dan penghantaran teks terjemahan bagi"
-" artikel ini."
+"Tolong lihat <a href=\"/server/standards/README.translations.html"
+"\">Translations README</a> untuk maklumat mengenai penyelerasan dan "
+"penghantaran teks terjemahan bagi artikel ini."
#. type: Content of: <div><p>
msgid "Copyright © 2012, 2016 Free Software Foundation, Inc."
@@ -86,23 +84,22 @@
#. type: Content of: <div><p>
msgid ""
-"This page is licensed under a <a rel=\"license\" "
-"href=\"http://creativecommons.org/licenses/by-nd/4.0/\">Creative Commons "
-"Attribution-NoDerivatives 4.0 International License</a>."
+"This page is licensed under a <a rel=\"license\" href=\"http://"
+"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
+"NoDerivatives 4.0 International License</a>."
msgstr ""
-"Teks ini disediakan di bawah lesen <a rel=\"license\" "
-"href=\"https://creativecommons.org/licenses/by-nd/4.0/deed.ms\">Atribusi-TiadaTerbitan
4.0 Antarabangsa (CC BY-ND 4.0) </a>."
+"Teks ini disediakan di bawah lesen <a rel=\"license\" href=\"https://"
+"creativecommons.org/licenses/by-nd/4.0/deed.ms\">Atribusi-TiadaTerbitan 4.0 "
+"Antarabangsa (CC BY-ND 4.0) </a>."
#. TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.
#. type: Content of: <div><div>
msgid "*GNUN-SLOT: TRANSLATOR'S CREDITS*"
msgstr ""
-"<b>Penyampaian</b>: Muhammad Amir Faizal"
-"<a href=\"mailto:address@hidden\"><address@hidden></a>, 2019."
+"<b>Penyampaian</b>: Muhammad Amir Faizal<a href=\"mailto:address@hidden"
+"\"><address@hidden></a>, 2019."
#. timestamp start
#. type: Content of: <div><p>
msgid "Updated:"
msgstr "Terkini:"
-
-
Index: server/gnun/compendia/compendium.ms.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ms.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/gnun/compendia/compendium.ms.po 31 Jul 2019 16:59:25 -0000
1.1
+++ server/gnun/compendia/compendium.ms.po 1 Aug 2019 11:01:02 -0000
1.2
@@ -25,6 +25,11 @@
"can be sent to <a href=\"mailto:address@hidden\"><webmasters@gnu."
"org></a>."
msgstr ""
+"Tolong hantar pertanyaan umum tentang FSF & GNU kepada <a href=\"mailto:"
+"address@hidden\"><address@hidden></a>. Terdapat juga <a
href=\"/contact/"
+"\">cara yang lain untuk menghubungi</a> FSF. Pautan rosak dan ralat lain "
+"atau sebarang cadangan boleh dihantar kepada <a href=\"mailto:webmasters@gnu."
+"org\"><address@hidden></a>."
#. TRANSLATORS: Ignore the original text in this paragraph,
#. replace it with the translation of these two:
@@ -58,11 +63,14 @@
"creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
"NoDerivatives 4.0 International License</a>."
msgstr ""
+"Teks ini disediakan di bawah lesen <a rel=\"license\" href=\"https://"
+"creativecommons.org/licenses/by-nd/4.0/deed.ms\">Atribusi-TiadaTerbitan 4.0 "
+"Antarabangsa (CC BY-ND 4.0) </a>."
#. timestamp start
#. type: Content of: <div><p>
msgid "Updated:"
-msgstr ""
+msgstr "Terkini:"
#. type: Content of: <div><p>
msgid ""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www licenses/old-licenses/gpl-2.0-faq.ru.html l...,
GNUN <=