[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses po/license-compatibility.ru.po old...
From: |
Ineiev |
Subject: |
www/licenses po/license-compatibility.ru.po old... |
Date: |
Wed, 29 Dec 2021 11:19:21 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: Ineiev <ineiev> 21/12/29 11:19:21
Modified files:
licenses/po : license-compatibility.ru.po
licenses/old-licenses/po: gpl-2.0-faq.ru.po
Log message:
Update.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-compatibility.ru.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/old-licenses/po/gpl-2.0-faq.ru.po?cvsroot=www&r1=1.70&r2=1.71
Patches:
Index: po/license-compatibility.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-compatibility.ru.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/license-compatibility.ru.po 29 Dec 2021 16:01:03 -0000 1.11
+++ po/license-compatibility.ru.po 29 Dec 2021 16:19:21 -0000 1.12
@@ -1,14 +1,14 @@
# Russian translation of http://www.gnu.org/licenses/license-compatibility.html
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2016, 2018, 2020, 2021 Free Software Foundation, Inc.
# This file is distributed under the same license as the original article.
-# Ineiev <ineiev@gnu.org>, 2016, 2018, 2020
+# Ineiev <ineiev@gnu.org>, 2016, 2018, 2020, 2021
# this translation lacks appropriate review
#
msgid ""
msgstr ""
"Project-Id-Version: license-compatibility.html\n"
"POT-Creation-Date: 2021-12-29 15:55+0000\n"
-"PO-Revision-Date: 2019-11-20 10:17+0000\n"
+"PO-Revision-Date: 2021-12-29 10:17+0000\n"
"Last-Translator: Ineiev <ineiev@gnu.org>\n"
"Language-Team: Russian <www-ru-list@gnu.org>\n"
"Language: ru\n"
@@ -39,7 +39,6 @@
# | into the other, this raises the question of whether their licenses allow
# | combining them, or prohibit combining them.<a [-href=\"#f1\">(*)</a>-]
# | {+href=\"#f1\">[1]</a>+}
-#, fuzzy
#| msgid ""
#| "If you want to combine two free programs into one, or merge code from one "
#| "into the other, this raises the question of whether their licenses allow "
@@ -51,13 +50,12 @@
msgstr ""
"ÐÑли Ð²Ñ Ñ
оÑиÑе ÑложиÑÑ Ð´Ð²Ðµ ÑвободнÑÑ
пÑогÑÐ°Ð¼Ð¼Ñ Ð² Ð¾Ð´Ð½Ñ Ð¸Ð»Ð¸ влиÑÑ Ð¸ÑÑ
однÑй "
"ÑекÑÑ Ð¸Ð· одной в дÑÑгÑÑ, вÑÑÐ°ÐµÑ Ð²Ð¾Ð¿ÑоÑ,
позволÑÑÑ Ð»Ð¸ иÑ
лиÑензии "
-"комбиниÑоваÑÑ Ð¸Ñ
, или они ÑÑо запÑеÑаÑÑ.<a
href=\"#f1\">(*)</a>"
+"комбиниÑоваÑÑ Ð¸Ñ
, или они ÑÑо запÑеÑаÑÑ.<a
href=\"#f1\">[1]</a>"
#. type: Content of: <div><p>
# | There is no problem merging programs that have the same license, if it is
# | a reasonably behaved license, as nearly all free licenses are.<a
# | [-href=\"#f2\">(**)</a>-] {+href=\"#f2\">[2]</a>+}
-#, fuzzy
#| msgid ""
#| "There is no problem merging programs that have the same license, if it is "
#| "a reasonably behaved license, as nearly all free licenses are.<a href="
@@ -69,7 +67,7 @@
msgstr ""
"ÐÑли Ñ Ð¿ÑогÑамм одна и Ñа же лиÑензиÑ,
пÑоблем не возникаеÑ, еÑли лиÑÐµÐ½Ð·Ð¸Ñ "
"ÑоÑÑавлена ÑазÑмно, как поÑÑи вÑе
лиÑензии ÑвободнÑÑ
пÑогÑамм.<a href="
-"\"#f2\">(**)</a>"
+"\"#f2\">[2]</a>"
#. type: Content of: <div><p>
msgid ""
@@ -133,7 +131,6 @@
# | licenses of the merged parts. Since all the licenses are lax anyway, this
# | causes no practical problem except that the list of licenses gets long.<a
# | [-href=\"#f3\">(***)</a>-] {+href=\"#f3\">[3]</a>+}
-#, fuzzy
#| msgid ""
#| "In a combination of programs under lax licenses, each part carries the "
#| "license it came with. When the code is merged to the point that the "
@@ -154,7 +151,7 @@
"Ñже невозможно ÑазлиÑиÑÑ, ÑÑи ÑлиÑÑе
ÑекÑÑÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð½ÐµÑÑи на Ñебе вÑе "
"лиÑензии ÑоединеннÑÑ
ÑаÑÑей. ÐоÑколÑкÑ
вÑе ÑÑи лиÑензии вÑе Ñавно безволÑнÑ, "
"ÑÑо не пÑедÑÑавлÑÐµÑ Ð¿ÑакÑиÑеÑкой
пÑоблемÑ, Ñазве ÑÑо ÑпиÑок лиÑензий "
-"ÑазÑаÑÑаеÑÑÑ.<a href=\"#f3\">(***)</a>"
+"ÑазÑаÑÑаеÑÑÑ.<a href=\"#f3\">[3]</a>"
#. type: Content of: <div><p>
msgid ""
@@ -261,7 +258,6 @@
# | later” with code under “GPL 2 or [-later”,-]
# | {+later,”+} the license of the combination is their intersection,
# | which is “GPL 3 or [-later”.-] {+later.”+}
-#, fuzzy
#| msgid ""
#| "The FSF uses the approach of asking people to release programs under "
#| "“GNU GPL version N or any later version.” This licensing is "
@@ -336,7 +332,6 @@
# | {+href=\"#f4\">[4]</a>+} If we ever make a GPL version 4, perhaps we
# | should include an upgrade clause that automatically permits relicensing to
# | higher-numbered versions, 5 and up.
-#, fuzzy
#| msgid ""
#| "Since then, I have come to question the wisdom of that decision. "
#| "Programs such as Linux, which allow only one GNU GPL version and reject "
@@ -354,7 +349,7 @@
"ÐÑоÑло вÑемÑ, и Ñ ÑÑал ÑомневаÑÑÑÑ Ð²
мÑдÑоÑÑи ÑÑого ÑеÑениÑ. Такие "
"пÑогÑаммÑ, как Linux, коÑоÑÑе допÑÑкаÑÑ
ÑолÑко Ð¾Ð´Ð½Ñ Ð²ÐµÑÑÐ¸Ñ GNU GPL и "
"оÑвеÑгаÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ, на пÑакÑике
пÑиводÑÑ Ðº неÑовмеÑÑимоÑÑи.<a href=\"#f4\">"
-"(****)</a> ÐÑли Ð¼Ñ ÐºÐ¾Ð³Ð´Ð°-нибÑÐ´Ñ Ð½Ð°Ð¿Ð¸Ñем GPL
веÑÑии 4, возможно, нам ÑледÑÐµÑ "
+"[4]</a> ÐÑли Ð¼Ñ ÐºÐ¾Ð³Ð´Ð°-нибÑÐ´Ñ Ð½Ð°Ð¿Ð¸Ñем GPL веÑÑии
4, возможно, нам ÑледÑÐµÑ "
"вклÑÑиÑÑ Ð¿ÑÐ½ÐºÑ Ð¾Ð± обновлении, коÑоÑÑй
авÑомаÑиÑеÑки ÑазÑеÑÐ°ÐµÑ "
"пеÑелиÑензиÑование на веÑÑии Ñ
повÑÑением номеÑа — 5 и вÑÑе."
@@ -408,7 +403,6 @@
# | might have occasion to merge material released under CC-BY-SA with
# | material released under the GNU GPL. This can be done through CC[---]{+
# | +}BY-SA's explicit relicensing permission.
-#, fuzzy
#| msgid ""
#| "Likewise, CC-BY-SA 4.0 explicitly permits relicensing modified versions "
#| "to GNU GPL version 3, but GPL version 3 does not permit relicensing to CC-"
@@ -450,7 +444,6 @@
# | to GPL version 4, you as proxy will be able to retroactively authorize use
# | of that relicensed material under GPL version 4. (Alternatively, you can
# | ask the authors of that material to give permission right away.)
-#, fuzzy
#| msgid ""
#| "Unfortunately, CC-BY-SA 4.0 does not permit relicensing to future GPL "
#| "versions. What you should do, when you relicense material under CC-BY-SA "
@@ -573,7 +566,6 @@
# | or the other, or under both in disjunction like the Perl release itself.
# | A disjunction is compatible with a set of other licenses if any one of the
# | license choices in the disjunction is compatible with that set.
-#, fuzzy
#| msgid ""
#| "Finally, what about dual licensing?<a href=\"#f5\">(*****)</a> A dual "
#| "license is a disjunction: it means that the same program carries a choice "
@@ -595,7 +587,7 @@
"a set of other licenses if any one of the license choices in the disjunction "
"is compatible with that set."
msgstr ""
-"ÐаконеÑ, ÑÑо можно ÑказаÑÑ Ð¾ двойном
лиÑензиÑовании?<a href=\"#f5\">(*****)</"
+"ÐаконеÑ, ÑÑо можно ÑказаÑÑ Ð¾ двойном
лиÑензиÑовании?<a href=\"#f5\">[5]</"
"a> ÐÐ²Ð¾Ð¹Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ð¿ÑедÑÑавлÑеÑ
дизÑÑнкÑиÑ: ÑÑо знаÑиÑ, ÑÑо пÑогÑамма "
"пÑедоÑÑавлÑÐµÑ Ð½Ð° вÑÐ±Ð¾Ñ Ð´Ð²Ðµ или более
ÑазлиÑнÑÑ
лиÑензий. ÐапÑимеÑ, ÑÑаÑÑе "
"веÑÑии Perl пÑедоÑÑавлÑли две лиÑензии:
дизÑÑнкÑÐ¸Ñ Ð¡ÑандаÑÑной обÑеÑÑвенной "
@@ -699,7 +691,6 @@
# | The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0
# | licenses. BSD 3 clause subsumes BSD 2 clause. The BSD licenses subsume
# | the Expat, X11 and ISC licenses and CC[---]0.
-#, fuzzy
#| msgid ""
#| "The Apache 2.0 license subsumes the BSD, Expat, X11, ISC and CC-0 "
#| "licenses. BSD 3 clause subsumes BSD 2 clause. The BSD licenses subsume "
@@ -739,7 +730,6 @@
# | about a specific combination of programs, issues not related to the
# | copyright licenses of the programs to be combined. We discuss only the
# | implications of the licenses themselves.
-#, fuzzy
#| msgid ""
#| "<b>*</b> It is not inconceivable that other legal issues might arise "
#| "about a specific combination of programs, issues not related to the "
@@ -751,7 +741,7 @@
"programs to be combined. We discuss only the implications of the licenses "
"themselves."
msgstr ""
-"<b>*</b> ÐаловеÑоÑÑно, ÑÑо пÑи конкÑеÑном
ÑоÑеÑании пÑогÑамм могÑÑ "
+"ÐаловеÑоÑÑно, ÑÑо пÑи конкÑеÑном
ÑоÑеÑании пÑогÑамм могÑÑ "
"возникнÑÑÑ Ð´ÑÑгие ÑÑидиÑеÑкие пÑоблемÑ,
не ÑвÑзаннÑе Ñ Ð»Ð¸ÑензиÑми авÑоÑÑкого "
"пÑава на пÑогÑаммÑ, коÑоÑÑе ÑоÑеÑаÑÑÑÑ. ÐÑ
обÑÑждаем ÑолÑко ÑледÑÑÐ²Ð¸Ñ ÑамиÑ
"
"лиÑензий."
@@ -760,7 +750,6 @@
# | [-<b>**</b>-]The main license in actual use that isn't reasonably behaved
# | is the license of TeX: if two programs are licensed just the way TeX is,
# | there is no authorized way to distribute a merged version of them.
-#, fuzzy
#| msgid ""
#| "<b>**</b> The main license in actual use that isn't reasonably behaved is "
#| "the license of TeX: if two programs are licensed just the way TeX is, "
@@ -770,7 +759,7 @@
"of TeX: if two programs are licensed just the way TeX is, there is no "
"authorized way to distribute a merged version of them."
msgstr ""
-"<b>**</b> ÐÐ»Ð°Ð²Ð½Ð°Ñ Ð¸Ð· пÑименÑемÑÑ
в наÑÑоÑÑее
вÑÐµÐ¼Ñ Ð»Ð¸Ñензий, коÑоÑÐ°Ñ "
+"ÐÐ»Ð°Ð²Ð½Ð°Ñ Ð¸Ð· пÑименÑемÑÑ
в наÑÑоÑÑее вÑемÑ
лиÑензий, коÑоÑÐ°Ñ "
"неÑовмеÑÑима Ñама Ñ Ñобой — лиÑензиÑ
TeXа: еÑли две пÑогÑÐ°Ð¼Ð¼Ñ "
"лиÑензиÑÐ¾Ð²Ð°Ð½Ñ Ñак, как TeX, неÑ
ÑазÑеÑенного ÑпоÑоба ÑаÑпÑоÑÑÑанÑÑÑ Ð¸Ñ
"
"обÑединеннÑÑ Ð²ÐµÑÑиÑ."
@@ -804,7 +793,6 @@
# | sufficient to leave the license notices in the source code as they stand;
# | extra license notice requirements typically only come up for lax licenses
# | when distributing binaries without the source code.
-#, fuzzy
#| msgid ""
#| "<b>***</b> When distributing in source code form, it is usually "
#| "sufficient to leave the license notices in the source code as they stand; "
@@ -816,7 +804,7 @@
"requirements typically only come up for lax licenses when distributing "
"binaries without the source code."
msgstr ""
-"<b>***</b> ÐÑи ÑаÑпÑоÑÑÑанении в ÑоÑме иÑÑ
одного ÑекÑÑа обÑÑно доÑÑаÑоÑно "
+"ÐÑи ÑаÑпÑоÑÑÑанении в ÑоÑме иÑÑ
одного
ÑекÑÑа обÑÑно доÑÑаÑоÑно "
"оÑÑавлÑÑÑ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ лиÑензиÑÑ
в иÑÑ
одном ÑекÑÑе в Ñом виде, в каком они "
"еÑÑÑ; ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾ дополниÑелÑнÑÑ
лиÑензионнÑÑ
ÑведомлениÑÑ
в безволÑнÑÑ
"
"лиÑензиÑÑ
, как пÑавило, дейÑÑвÑÑÑ Ð¿Ñи
ÑаÑпÑоÑÑÑанении ÑкомпилиÑованнÑÑ
"
@@ -828,7 +816,6 @@
# | still does not allow distribution of binaries by torrent. <a
# | href=\"/licenses/rms-why-gplv3.html\">We fixed those problems, and others,
# | in version 3</a>, but we can't change version 2.
-#, fuzzy
#| msgid ""
#| "<b>****</b> In addition, GPL version 2 still allows binaries to be made "
#| "nonfree by hardware that rejects all but special signed binaries, and "
@@ -842,7 +829,7 @@
"gplv3.html\">We fixed those problems, and others, in version 3</a>, but we "
"can't change version 2."
msgstr ""
-"<b>****</b> Рдополнение, GPL веÑÑии 2 вÑе же
позволÑÐµÑ Ð´ÐµÐ»Ð°ÑÑ Ð´Ð²Ð¾Ð¸ÑнÑе "
+"Рдополнение, GPL веÑÑии 2 вÑе же
позволÑÐµÑ Ð´ÐµÐ»Ð°ÑÑ Ð´Ð²Ð¾Ð¸ÑнÑе "
"ÑÐ°Ð¹Ð»Ñ Ð½ÐµÑвободнÑми Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ Ð°Ð¿Ð¿Ð°ÑаÑÑÑÑ,
коÑоÑÐ°Ñ ÑабоÑÐ°ÐµÑ ÑолÑко Ñо "
"ÑпеÑиалÑно подпиÑаннÑми Ñайлами
пÑогÑамм; кÑоме Ñого, GPL веÑÑии 2 не "
"допÑÑÐºÐ°ÐµÑ ÑаÑпÑоÑÑÑанение двоиÑнÑÑ
Ñайлов ÑоÑÑенÑами. <a href=\"/licenses/"
@@ -856,7 +843,6 @@
# | Note that if the program on which the license is sold includes any code
# | that is not in the free (libre) release, that's not selling exceptions,
# | that's nonfree software.
-#, fuzzy
#| msgid ""
#| "<b>*****</b> Some use the term “dual licensing” to refer to "
#| "selling exceptions, but that is a misnomer. See <a href=\"/philosophy/"
@@ -871,7 +857,7 @@
"which the license is sold includes any code that is not in the free (libre) "
"release, that's not selling exceptions, that's nonfree software."
msgstr ""
-"<b>*****</b> ÐекоÑоÑÑе ÑпоÑÑеблÑÑÑ Ð²ÑÑажение
“двойное "
+"ÐекоÑоÑÑе ÑпоÑÑеблÑÑÑ Ð²ÑÑажение
“двойное "
"лиÑензиÑование” Ð´Ð»Ñ Ð¾Ð±Ð¾Ð·Ð½Ð°ÑениÑ
пÑодажи иÑклÑÑений, но ÑÑо непÑавлÑное "
"название. См. <a href=\"/philosophy/selling-exceptions.html\">
ÐÑодажа "
"иÑклÑÑений</a>. ÐбÑаÑиÑе внимание, ÑÑо еÑли
в пÑогÑаммÑ, лиÑÐµÐ½Ð·Ð¸Ñ Ð½Ð° коÑоÑÑÑ "
@@ -912,7 +898,6 @@
#. README</a>.
#. type: Content of: <div><div><p>
# || No change detected. The change might only be in amounts of spaces.
-#, fuzzy
#| msgid ""
#| "Please see the <a href=\"/server/standards/README.translations.html"
#| "\">Translations README</a> for information on coordinating and "
Index: old-licenses/po/gpl-2.0-faq.ru.po
===================================================================
RCS file: /web/www/www/licenses/old-licenses/po/gpl-2.0-faq.ru.po,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- old-licenses/po/gpl-2.0-faq.ru.po 29 Dec 2021 16:01:03 -0000 1.70
+++ old-licenses/po/gpl-2.0-faq.ru.po 29 Dec 2021 16:19:21 -0000 1.71
@@ -1,7 +1,8 @@
# Russian translation for
http://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.html
-# Copyright (C) 2020 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2007, 2008, 2011, 2014, 2015, 2017, 2018, 2019,
+# 2021 Free Software Foundation, Inc.
# This file is distributed under the same license as the original article.
-# Ineiev <ineiev@gnu.org>, 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019, 2020
+# Ineiev <ineiev@gnu.org>, 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019,
2020, 2021
# nebuhada <kovit@yandex.ru>, 2011, 2012 (proofreading)
#
# When fixing bugs in this translation check also licenses/gpl-faq.ru.po
@@ -9,7 +10,7 @@
msgstr ""
"Project-Id-Version: gpl-2.0-faq.html\n"
"POT-Creation-Date: 2021-12-29 15:55+0000\n"
-"PO-Revision-Date: 2020-07-09 17:17+0000\n"
+"PO-Revision-Date: 2021-12-29 17:17+0000\n"
"Last-Translator: Ineiev <ineiev@gnu.org>\n"
"Language-Team: Russian <www-ru-list@gnu.org>\n"
"Language: ru\n"
@@ -5146,7 +5147,6 @@
#. README</a>.
#. type: Content of: <div><div><p>
# || No change detected. The change might only be in amounts of spaces.
-#, fuzzy
#| msgid ""
#| "Please see the <a href=\"/server/standards/README.translations.html"
#| "\">Translations README</a> for information on coordinating and "
@@ -5168,7 +5168,6 @@
# | Copyright © [-2001, 2006, 2007, 2008,-] {+2001-2007, 2009, 2011,+}
# | 2014, 2015, 2017, [-2018,-] 2019, 202[-0-]{+1+} Free Software Foundation,
# | Inc.
-#, fuzzy
#| msgid ""
#| "Copyright © 2001, 2006, 2007, 2008, 2014, 2015, 2017, 2018, 2019, "
#| "2020 Free Software Foundation, Inc."
@@ -5177,7 +5176,7 @@
"Software Foundation, Inc."
msgstr ""
"Copyright © 2001, 2006, 2007, 2008, 2011, 2014, 2015, 2017, 2018, 2019, "
-"2020 Free Software Foundation, Inc."
+"2021 Free Software Foundation, Inc."
#. type: Content of: <div><p>
msgid ""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses po/license-compatibility.ru.po old...,
Ineiev <=