[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses license-list.ru.html po/license-li...
From: |
GNUN |
Subject: |
www/licenses license-list.ru.html po/license-li... |
Date: |
Fri, 7 Apr 2023 03:30:11 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 23/04/07 03:30:11
Modified files:
licenses : license-list.ru.html
licenses/po : license-list.ru-en.html license-list.ru.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.ru.html?cvsroot=www&r1=1.156&r2=1.157
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru-en.html?cvsroot=www&r1=1.144&r2=1.145
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.401&r2=1.402
Patches:
Index: license-list.ru.html
===================================================================
RCS file: /web/www/www/licenses/license-list.ru.html,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- license-list.ru.html 6 Mar 2023 08:01:31 -0000 1.156
+++ license-list.ru.html 7 Apr 2023 07:30:10 -0000 1.157
@@ -767,14 +767,12 @@
ÑовмеÑÑÐ¸Ð¼Ñ Ñ GNU GPL.</p>
<p>ÐÑли Ð²Ñ Ð¶ÐµÐ»Ð°ÐµÑе помеÑÑиÑÑ ÑÐ²Ð¾Ñ ÑабоÑÑ Ð²
обÑеÑÑвенное доÑÑоÑние, мÑ
-ÑекомендÑем вам воÑполÑзоваÑÑÑÑ Ð´Ð»Ñ ÑÑого
ÑоÑмалÑнÑми ÑÑедÑÑвами. ÐÑ Ð¿ÑоÑим
-лÑдей, коÑоÑÑе делаÑÑ Ð½ÐµÐ±Ð¾Ð»ÑÑие доÑабоÑки
Ð´Ð»Ñ GNU, подпиÑаÑÑ Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ Ñ
-оÑказом Ð¾Ñ Ð°Ð²ÑоÑÑкиÑ
пÑав; ÑÑо одно из
ÑеÑений. ÐÑли Ð²Ñ ÑабоÑаеÑе над
-пÑоекÑом, в коÑоÑом Ð½ÐµÑ ÑоÑмалÑнÑÑ
пÑавил,
подобнÑÑ
ÑÑомÑ, Ñо <a
-href="#CC0">лиÑÐµÐ½Ð·Ð¸Ñ CC0</a> — Ñ
оÑоÑее
ÑÑедÑÑво, коÑоÑÑм можеÑ
-воÑполÑзоваÑÑÑÑ ÐºÐ°Ð¶Ð´Ñй. Ðна ÑоÑмалÑно
пеÑÐµÐ²Ð¾Ð´Ð¸Ñ ÑабоÑÑ Ð² обÑеÑÑвенное
-доÑÑоÑние и пÑедоÑÑавлÑÐµÑ Ð·Ð°Ð¿Ð°ÑнÑÑ
лиÑÐµÐ½Ð·Ð¸Ñ Ð´Ð»Ñ ÑлÑÑаев, когда ÑÑо
-ÑÑидиÑеÑки невозможно.</p></dd>
+ÑекомендÑем вам воÑполÑзоваÑÑÑÑ Ð´Ð»Ñ ÑÑого
ÑоÑмалÑнÑми ÑÑедÑÑвами. ÐаÑа
+пÑоÑедÑÑа ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом, ÑÑÐ¾Ð±Ñ Ð»Ñдей,
коÑоÑÑе делаÑÑ Ð½ÐµÐ±Ð¾Ð»ÑÑие доÑабоÑки длÑ
+GNU, подпиÑаÑÑ Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ Ñ Ð¾Ñказом оÑ
авÑоÑÑкиÑ
пÑав. ÐÑли Ð²Ñ ÑабоÑаеÑе над
+пÑоекÑом, в коÑоÑом Ð½ÐµÑ ÑоÑмалÑнÑÑ
пÑавил
о пÑиеме доÑабоÑок, обÑаÑиÑеÑÑ Ð²
+ÑÑÐ¾Ñ Ð¿ÑÐ¾ÐµÐºÑ Ð¸ обÑÑдиÑе, как наилÑÑÑим
обÑазом внеÑÑи вклад в ÑамкаÑ
модели
+лиÑензиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿ÑоекÑа.</p></dd>
<dt><a id="Python"
href="https://directory.fsf.org/wiki?title=License:Python2.0.1">
ÐиÑензиÑ
@@ -895,12 +893,7 @@
дополнÑеÑÑÑ Ð±ÐµÐ·Ð²Ð¾Ð»Ñной лиÑензией, коÑоÑаÑ
Ð¿Ð¾Ð¼Ð¾Ð³Ð°ÐµÑ Ð¾Ñ
ваÑиÑÑ Ð²Ñе ÑлÑÑаи, длÑ
коÑоÑÑÑ
ÑоÑмÑла не подÑ
одиÑ. Ðак ÑÑловиÑ
ÑаÑпÑоÑÑÑÐ°Ð½ÐµÐ½Ð¸Ñ ÑÐ°Ð±Ð¾Ñ Ð²
обÑеÑÑвенном доÑÑоÑнии, Ñак и безволÑнаÑ
лиÑензиÑ, пÑедоÑÑавлÑемаÑ
-РазлиÑензией, ÑовмеÑÑÐ¸Ð¼Ñ Ñ GNU GPL.</p>
-
-<p>ÐÑли Ð²Ñ Ñ
оÑиÑе пеÑедаÑÑ ÑÐ²Ð¾Ñ ÑабоÑÑ Ð²
обÑеÑÑвенное доÑÑоÑние, Ð¼Ñ ÑекомендÑем
-вам воÑполÑзоваÑÑÑÑ <a href="#CC0">CC0</a>. CC0 Ñакже
пÑедоÑÑавлÑÐµÑ ÑоÑмÑлÑ
-пеÑедаÑи в обÑеÑÑвенное доÑÑоÑние Ñ
запаÑной лиÑензией, и она пÑоÑабоÑана
-подÑобнее и ÑÑаÑелÑнее, Ñем Ð
азлиÑензиÑ.</p></dd>
+РазлиÑензией, ÑовмеÑÑÐ¸Ð¼Ñ Ñ GNU GPL.</p></dd>
<dt><a id="Vim" href="https://directory.fsf.org/wiki/License:Vim7.2">
ÐиÑензиÑ
Vim, веÑÑии 6.1 или более поздниÑ
</a> <span
class="anchor-reference-id">(<a
@@ -1799,13 +1792,10 @@
ÑвободнÑÑ
пÑогÑамм.</p>
<p>РнекоÑоÑÑÑ
ÑÑÑанаÑ
авÑоÑам позволено
помеÑаÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð² обÑеÑÑвенное
-доÑÑоÑние, но ÑÑо ÑÑебÑÐµÑ ÑвнÑÑ
дейÑÑвий.
ÐÑли Ð²Ñ Ñ
оÑиÑе ÑделаÑÑ ÑÑо, мÑ
-ÑекомендÑем воÑполÑзоваÑÑÑÑ <a href="#CC0">CC0</a>,
ÑÑо ÑабоÑÐ°ÐµÑ Ñакже в
-дÑÑгиÑ
ÑÑÑанаÑ
, поÑколÑÐºÑ Ð² ней ÑодеÑжиÑÑÑ
лиÑензиÑ, более или менее
-ÑквиваленÑÐ½Ð°Ñ Ð¾Ð±ÑеÑÑÐ²ÐµÐ½Ð½Ð¾Ð¼Ñ Ð´Ð¾ÑÑоÑниÑ.
Ðднако в болÑÑинÑÑве ÑлÑÑаев <a
-href="/licenses/license-recommendations.html"> лÑÑÑе пÑимениÑÑ
к ваÑей
-пÑогÑамме авÑоÑÑкое лево</a>, ÑÑобÑ
гаÑанÑиÑоваÑÑ, ÑÑо Ñвобода Ð´Ð¾Ð¹Ð´ÐµÑ Ð´Ð¾
-вÑеÑ
полÑзоваÑелей пÑогÑаммÑ.</p>
+доÑÑоÑние, но ÑÑо ÑÑебÑÐµÑ ÑвнÑÑ
дейÑÑвий,
коÑоÑÑе завиÑÑÑ Ð¾Ñ ÑÑиÑдикÑии. Ð
+болÑÑинÑÑве ÑлÑÑаев <a
href="/licenses/license-recommendations.html"> лÑÑÑе
+пÑимениÑÑ Ðº ваÑей пÑогÑамме авÑоÑÑкое
лево</a>, ÑÑÐ¾Ð±Ñ Ð³Ð°ÑанÑиÑоваÑÑ, ÑÑо
+Ñвобода Ð´Ð¾Ð¹Ð´ÐµÑ Ð´Ð¾ вÑеÑ
полÑзоваÑелей
пÑогÑаммÑ.</p>
<p>ÐÑогÑаммÑ, напиÑаннÑе ÑоÑÑÑдниками
гоÑÑдаÑÑÑвеннÑÑ
оÑганов СШÐ, пÑедÑÑавлÑÑÑ
оÑобое иÑклÑÑение, поÑколÑÐºÑ Ð·Ð°ÐºÐ¾Ð½Ñ Ð¾Ð±
авÑоÑÑком пÑаве СШРÑвно помеÑаÑÑ Ð¸Ñ
@@ -2822,7 +2812,7 @@
<p>ÐÐ»Ð°Ð½Ñ Ð¾Ð±ÑекÑов Ð´Ð»Ñ ÑÑеÑ
меÑнÑÑ
пÑинÑеÑов,
пÑедназнаÑеннÑе Ð´Ð»Ñ Ð¿ÑакÑиÑеÑкого
пÑименениÑ, Ñакже Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ ÑвободнÑ. ÐÑ
ÑекомендÑем GNU GPL или Ñе из
-лиÑензий Creative Commons, коÑоÑÑе ÑвободнÑ: CC-BY,
CC-BY-SA или CC0.</p>
+лиÑензий Creative Commons, коÑоÑÑе ÑвободнÑ: CC-BY
или CC-BY-SA.</p>
<p>ÐÐ»Ð°Ð½Ñ Ð´ÐµÐºÐ¾ÑаÑивнÑÑ
обÑекÑов Ð´Ð»Ñ ÑÑеÑ
меÑнÑÑ
пÑинÑеÑов пÑедÑÑавлÑÑÑ Ñобой
Ñ
ÑдожеÑÑвеннÑе пÑоизведениÑ; Ð´Ð»Ñ Ð½Ð¸Ñ
подÑ
одÑÑ Ð»ÑбÑе лиÑензии Creative
@@ -2890,7 +2880,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2023/03/06 08:01:31 $
+$Date: 2023/04/07 07:30:10 $
<!-- timestamp end -->
</p>
Index: po/license-list.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru-en.html,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- po/license-list.ru-en.html 6 Mar 2023 08:01:31 -0000 1.144
+++ po/license-list.ru-en.html 7 Apr 2023 07:30:10 -0000 1.145
@@ -768,13 +768,11 @@
domain material is compatible with the GNU GPL.</p>
<p>If you want to release your work to the public domain, we encourage
-you to use formal tools to do so. We ask people who make small
-contributions to GNU to sign a disclaimer form; that's one solution.
-If you're working on a project that doesn't have formal contribution
-policies like that, <a href="#CC0">CC0</a> is a good tool that anyone
-can use. It formally dedicates your work to the public domain, and
-provides a fallback license for cases where that is not legally
-possible.</p></dd>
+you to use formal tools to do so. Our solution is to ask people who
+make small contributions to GNU to sign a disclaimer form. If you're
+working on a project that doesn't have formal contribution policies,
+contact the project to discuss how best to contribute within the
+project's licensing model.</p></dd>
<dt><a id="Python"
href="https://directory.fsf.org/wiki?title=License:Python2.0.1">
License of Python 2.0.1, 2.1.1, and newer versions</a>
@@ -890,12 +888,7 @@
extent permitted by law, and also comes with an additional lax
license that helps cover any cases where the dedication is inadequate.
Both public domain works and the lax license provided by the
-Unlicense are compatible with the GNU GPL.</p>
-
-<p>If you want to release your work to the public domain, we recommend
-you use <a href="#CC0">CC0</a>. CC0 also provides a public domain
-dedication with a fallback license, and is more thorough and
-mature than the Unlicense.</p></dd>
+Unlicense are compatible with the GNU GPL.</p></dd>
<dt><a id="Vim" href="https://directory.fsf.org/wiki/License:Vim7.2">
License of Vim, Version 6.1 or later</a>
@@ -1802,13 +1795,10 @@
licenses are for.</p>
<p>Some countries allow authors to put code in the public domain, but
-that requires explicit action. If you wish to do that, the method we
-recommend is to use <a href="#CC0">CC0</a>, which also works in other
-countries by putting on a license that is more or less equivalent to
-public domain. However, in most cases it
-is <a href="/licenses/license-recommendations.html"> better to
-copyleft your code</a> to assure that freedom reaches all users of the
-code.</p>
+that requires explicit action which can vary among jurisdictions. In
+most cases it is <a href="/licenses/license-recommendations.html">
+better to copyleft your code</a> to assure that freedom reaches all
+users of the code.</p>
<p>Code written by employees of the US government is a special
exception, since US copyright law explicitly puts that in the public
@@ -2809,8 +2799,8 @@
use.</p>
<p>3D-printer plans for objects meant for practical use should also be
-free. We recommend the GNU GPL or one of the Creative Commons
-licenses that are free: CC-BY, CC-BY-SA, or CC0.</p>
+free. We recommend the GNU GPL or one of the Creative Commons licenses
+that are free such as CC-BY or CC-BY-SA.</p>
<p>3D-printer plans for decorative objects are artistic works; any of the
Creative Commons licenses is ok for them.</p>
@@ -2855,7 +2845,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2023/03/06 08:01:31 $
+$Date: 2023/04/07 07:30:10 $
<!-- timestamp end -->
</p>
</div>
Index: po/license-list.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru.po,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -b -r1.401 -r1.402
--- po/license-list.ru.po 7 Apr 2023 07:12:26 -0000 1.401
+++ po/license-list.ru.po 7 Apr 2023 07:30:10 -0000 1.402
@@ -16,7 +16,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2023-04-06 21:25+0000\n"
#. type: Content of: <title>
msgid ""
@@ -1396,23 +1395,6 @@
"ÑовмеÑÑÐ¸Ð¼Ñ Ñ GNU GPL."
#. type: Content of: <div><dl><dd><p>
-# | If you want to release your work to the public domain, we encourage you to
-# | use formal tools to do so. [-We-] {+Our solution is to+} ask people who
-# | make small contributions to GNU to sign a disclaimer [-form; that's one
-# | solution.-] {+form.+} If you're working on a project that doesn't have
-# | formal contribution [-policies like that, <a href=\"#CC0\">CC0</a> is a
-# | good tool that anyone can use. It formally dedicates your work-]
-# | {+policies, contact the project to discuss how best+} to {+contribute
-# | within+} the [-public domain, and provides a fallback license for cases
-# | where that is not legally possible.-] {+project's licensing model.+}
-#| msgid ""
-#| "If you want to release your work to the public domain, we encourage you "
-#| "to use formal tools to do so. We ask people who make small contributions "
-#| "to GNU to sign a disclaimer form; that's one solution. If you're working "
-#| "on a project that doesn't have formal contribution policies like that, <a "
-#| "href=\"#CC0\">CC0</a> is a good tool that anyone can use. It formally "
-#| "dedicates your work to the public domain, and provides a fallback license "
-#| "for cases where that is not legally possible."
msgid ""
"If you want to release your work to the public domain, we encourage you to "
"use formal tools to do so. Our solution is to ask people who make small "
@@ -1422,11 +1404,11 @@
msgstr ""
"ÐÑли Ð²Ñ Ð¶ÐµÐ»Ð°ÐµÑе помеÑÑиÑÑ ÑÐ²Ð¾Ñ ÑабоÑÑ Ð²
обÑеÑÑвенное доÑÑоÑние, Ð¼Ñ "
"ÑекомендÑем вам воÑполÑзоваÑÑÑÑ Ð´Ð»Ñ
ÑÑого ÑоÑмалÑнÑми ÑÑедÑÑвами. ÐаÑа "
-"пÑоÑедÑÑа ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом, ÑÑÐ¾Ð±Ñ Ð»Ñдей,
коÑоÑÑе делаÑÑ Ð½ÐµÐ±Ð¾Ð»ÑÑие доÑабоÑки "
-"Ð´Ð»Ñ GNU, подпиÑаÑÑ Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ Ñ Ð¾Ñказом оÑ
авÑоÑÑкиÑ
пÑав. ÐÑли Ð²Ñ "
-"ÑабоÑаеÑе над пÑоекÑом, в коÑоÑом неÑ
ÑоÑмалÑнÑÑ
пÑавил о пÑиеме "
-"доÑабоÑок, обÑаÑиÑеÑÑ Ð² ÑÑÐ¾Ñ Ð¿ÑÐ¾ÐµÐºÑ Ð¸
обÑÑдиÑе, как наилÑÑÑим обÑазом "
-"внеÑÑи вклад в ÑамкаÑ
модели
лиÑензиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿ÑоекÑа."
+"пÑоÑедÑÑа ÑоÑÑÐ¾Ð¸Ñ Ð² Ñом, ÑÑÐ¾Ð±Ñ Ð»Ñдей,
коÑоÑÑе делаÑÑ Ð½ÐµÐ±Ð¾Ð»ÑÑие доÑабоÑки Ð´Ð»Ñ "
+"GNU, подпиÑаÑÑ Ð´Ð¾ÐºÑÐ¼ÐµÐ½Ñ Ñ Ð¾Ñказом оÑ
авÑоÑÑкиÑ
пÑав. ÐÑли Ð²Ñ ÑабоÑаеÑе над "
+"пÑоекÑом, в коÑоÑом Ð½ÐµÑ ÑоÑмалÑнÑÑ
пÑавил
о пÑиеме доÑабоÑок, обÑаÑиÑеÑÑ Ð² "
+"ÑÑÐ¾Ñ Ð¿ÑÐ¾ÐµÐºÑ Ð¸ обÑÑдиÑе, как наилÑÑÑим
обÑазом внеÑÑи вклад в ÑамкаÑ
модели "
+"лиÑензиÑÐ¾Ð²Ð°Ð½Ð¸Ñ Ð¿ÑоекÑа."
#. type: Content of: <div><dl><dt>
msgid ""
@@ -3548,22 +3530,6 @@
"ÑвободнÑÑ
пÑогÑамм."
#. type: Content of: <div><dl><dd><p>
-# | Some countries allow authors to put code in the public domain, but that
-# | requires explicit [-action. If you wish to do that, the method we
-# | recommend is to use <a href=\"#CC0\">CC0</a>,-] {+action+} which [-also
-# | works in other countries by putting on a license that is more or less
-# | equivalent to public domain. However, in-] {+can vary among
-# | jurisdictions. In+} most cases it is <a
-# | href=\"/licenses/license-recommendations.html\"> better to copyleft your
-# | code</a> to assure that freedom reaches all users of the code.
-#| msgid ""
-#| "Some countries allow authors to put code in the public domain, but that "
-#| "requires explicit action. If you wish to do that, the method we "
-#| "recommend is to use <a href=\"#CC0\">CC0</a>, which also works in other "
-#| "countries by putting on a license that is more or less equivalent to "
-#| "public domain. However, in most cases it is <a href=\"/licenses/license-"
-#| "recommendations.html\"> better to copyleft your code</a> to assure that "
-#| "freedom reaches all users of the code."
msgid ""
"Some countries allow authors to put code in the public domain, but that "
"requires explicit action which can vary among jurisdictions. In most cases "
@@ -3571,11 +3537,10 @@
"your code</a> to assure that freedom reaches all users of the code."
msgstr ""
"РнекоÑоÑÑÑ
ÑÑÑанаÑ
авÑоÑам позволено
помеÑаÑÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð² обÑеÑÑвенное "
-"доÑÑоÑние, но ÑÑо ÑÑебÑÐµÑ ÑвнÑÑ
дейÑÑвий,
коÑоÑÑе завиÑÑÑ Ð¾Ñ ÑÑиÑдикÑии. "
-"РболÑÑинÑÑве ÑлÑÑаев <a href="
-"\"/licenses/license-recommendations.html\"> лÑÑÑе пÑимениÑÑ Ðº
ваÑей "
-"пÑогÑамме авÑоÑÑкое лево</a>, ÑÑобÑ
гаÑанÑиÑоваÑÑ, ÑÑо Ñвобода Ð´Ð¾Ð¹Ð´ÐµÑ Ð´Ð¾ "
-"вÑеÑ
полÑзоваÑелей пÑогÑаммÑ."
+"доÑÑоÑние, но ÑÑо ÑÑебÑÐµÑ ÑвнÑÑ
дейÑÑвий,
коÑоÑÑе завиÑÑÑ Ð¾Ñ ÑÑиÑдикÑии. Ð "
+"болÑÑинÑÑве ÑлÑÑаев <a
href=\"/licenses/license-recommendations.html\"> "
+"лÑÑÑе пÑимениÑÑ Ðº ваÑей пÑогÑамме
авÑоÑÑкое лево</a>, ÑÑÐ¾Ð±Ñ Ð³Ð°ÑанÑиÑоваÑÑ, "
+"ÑÑо Ñвобода Ð´Ð¾Ð¹Ð´ÐµÑ Ð´Ð¾ вÑеÑ
полÑзоваÑелей
пÑогÑаммÑ."
#. type: Content of: <div><dl><dd><p>
msgid ""
@@ -5631,13 +5596,6 @@
"ÐеÑÑÐ¸Ñ 3 бÑла ÑоÑÑавлена Ð´Ð»Ñ ÑакиÑ
пÑименений."
#. type: Content of: <div><p>
-# | 3D-printer plans for objects meant for practical use should also be free.
-# | We recommend the GNU GPL or one of the Creative Commons licenses that are
-# | [-free: CC-BY, CC-BY-SA,-] {+free such as CC-BY+} or [-CC0.-] {+CC-BY-SA.+}
-#| msgid ""
-#| "3D-printer plans for objects meant for practical use should also be "
-#| "free. We recommend the GNU GPL or one of the Creative Commons licenses "
-#| "that are free: CC-BY, CC-BY-SA, or CC0."
msgid ""
"3D-printer plans for objects meant for practical use should also be free. We "
"recommend the GNU GPL or one of the Creative Commons licenses that are free "
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses license-list.ru.html po/license-li...,
GNUN <=