[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses gpl-faq.ru.html po/gpl-faq.ru-en.h...
From: |
GNUN |
Subject: |
www/licenses gpl-faq.ru.html po/gpl-faq.ru-en.h... |
Date: |
Tue, 26 Mar 2013 04:28:56 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 13/03/26 04:28:55
Modified files:
licenses : gpl-faq.ru.html
licenses/po : gpl-faq.ru-en.html gpl-faq.ru.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.ru.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru-en.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/gpl-faq.ru.po?cvsroot=www&r1=1.43&r2=1.44
Patches:
Index: gpl-faq.ru.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.ru.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- gpl-faq.ru.html 28 Feb 2013 19:09:51 -0000 1.30
+++ gpl-faq.ru.html 26 Mar 2013 04:28:55 -0000 1.31
@@ -1638,23 +1638,35 @@
ÑÑÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¡ÑандаÑÑной обÑеÑÑвенной
лиÑензии GNU ÑаÑпÑоÑÑÑанÑÑÑÑÑ Ð½Ð°
комбинаÑÐ¸Ñ Ð² Ñелом.</p>
-<p>Рдополнение, как оÑобое иÑклÑÑение,
пÑавообладаÑели ÐÐРдаÑÑ Ð²Ð°Ð¼ ÑазÑеÑение
-комбиниÑоваÑÑ ÐÐÐ Ñо ÑвободнÑми
пÑогÑаммами или библиоÑеками, вÑпÑÑкаемÑми
-под GNU LGPL, и Ñ Ð½ÐµÐ·Ð°Ð²Ð¸ÑимÑми модÑлÑми,
коÑоÑÑе ÑообÑаÑÑÑÑ Ñ ÐÐÐ
-иÑклÑÑиÑелÑно по пÑоÑÐ¾ÐºÐ¾Ð»Ñ ÐÐÐÐÐÐ. ÐÑ
можеÑе копиÑоваÑÑ Ð¸ ÑаÑпÑоÑÑÑанÑÑÑ
-ÑакÑÑ ÑиÑÑемÑ, ÑледÑÑ ÑÑебованиÑм GNU GPL в
оÑноÑении ÐÐРи ÑÑебованиÑм
-лиÑензий дÑÑгиÑ
пÑогÑамм, коÑоÑÑе
иÑполÑзÑÑÑÑÑ, пÑи ÑÑловии, ÑÑо вÑ
-пÑедоÑÑавлÑеÑе иÑÑ
однÑй ÑекÑÑ ÑÑиÑ
дÑÑгиÑ
пÑогÑамм, когда и как GNU GPL
-ÑÑебÑÐµÑ ÑаÑпÑоÑÑÑанÑÑÑ Ð¸ÑÑ
однÑй ÑекÑÑ.</p>
+<p>Ðак оÑобое иÑклÑÑение, пÑавообладаÑели
ÐÐРдаÑÑ Ð²Ð°Ð¼ ÑазÑеÑение комбиниÑоваÑÑ
+ÐÐÐ Ñо ÑвободнÑми пÑогÑаммами или
библиоÑеками, вÑпÑÑкаемÑми под GNU LGPL, и
+Ñ Ð½ÐµÐ·Ð°Ð²Ð¸ÑимÑми модÑлÑми, коÑоÑÑе
ÑообÑаÑÑÑÑ Ñ ÐÐРиÑклÑÑиÑелÑно по
пÑоÑоколÑ
+ÐÐÐÐÐÐ. ÐÑ Ð¼Ð¾Ð¶ÐµÑе копиÑоваÑÑ Ð¸
ÑаÑпÑоÑÑÑанÑÑÑ ÑакÑÑ ÑиÑÑемÑ, ÑледÑÑ
+ÑÑебованиÑм GNU GPL в оÑноÑении ÐÐРи
ÑÑебованиÑм лиÑензий дÑÑгиÑ
пÑогÑамм,
+коÑоÑÑе иÑполÑзÑÑÑÑÑ, пÑи ÑÑловии, ÑÑо вÑ
пÑедоÑÑавлÑеÑе иÑÑ
однÑй ÑекÑÑ ÑÑиÑ
+дÑÑгиÑ
пÑогÑамм, когда и как GNU GPL ÑÑебÑеÑ
ÑаÑпÑоÑÑÑанÑÑÑ Ð¸ÑÑ
однÑй ÑекÑÑ,
+и пÑи ÑÑловии, ÑÑо Ð²Ñ Ð½Ðµ изменÑеÑе пÑоÑокол
ÐÐÐÐÐÐ.</p>
<p>ÐбÑаÑиÑе внимание, ÑÑо Ñе, кÑо делаеÑ
измененнÑÑ Ð²ÐµÑÑÐ¸Ñ ÐÐÐ, не обÑзанÑ
пÑедоÑÑавлÑÑÑ ÑÑо оÑобое иÑклÑÑение длÑ
ÑвоиÑ
измененнÑÑ
веÑÑий; ÑÑо ÑеÑаÑÑ
они. СÑандаÑÑÐ½Ð°Ñ Ð¾Ð±ÑеÑÑÐ²ÐµÐ½Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ GNU
Ð´Ð°ÐµÑ ÑазÑеÑение вÑпÑÑкаÑÑ
измененнÑÑ Ð²ÐµÑÑÐ¸Ñ Ð±ÐµÐ· ÑÑого иÑклÑÑениÑ;
ÑÑо иÑклÑÑение Ñакже ÑоздаеÑ
возможноÑÑÑ Ð²ÑпÑÑка измененной веÑÑии, в
коÑоÑой ÑÑо иÑклÑÑение
-пÑодлеваеÑÑÑ.</p>
+пÑодлеваеÑÑÑ.ÐÑли Ð²Ñ Ð¸Ð·Ð¼ÐµÐ½ÑеÑе пÑоÑокол
ÐÐÐÐÐÐ, ÑÑо иÑклÑÑение не
+ÑаÑпÑоÑÑÑанÑеÑÑÑ Ð½Ð° ваÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð½ÑÑ
веÑÑÐ¸Ñ ÐÐÐ, и Ð²Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ ÑдалиÑÑ ÑÑо
+иÑклÑÑение, когда ÑаÑпÑоÑÑÑанÑеÑе ÑвоÑ
измененнÑÑ Ð²ÐµÑÑиÑ.</p>
+
+<p>ÐÑо иÑклÑÑение ÑвлÑеÑÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑелÑнÑм
ÑазÑеÑением, пÑедÑÑмоÑÑеннÑм
+Ñазделом 7 веÑÑии 3 СÑандаÑÑной
обÑеÑÑвенной лиÑензии GNU
+(“GPLv3”)</p>
+
</blockquote>
+<p>ÐÑо иÑклÑÑение допÑÑÐºÐ°ÐµÑ ÐºÐ¾Ð¼Ð¿Ð¾Ð½Ð¾Ð²ÐºÑ Ñ
лиÑензиÑованнÑми по-дÑÑÐ³Ð¾Ð¼Ñ Ð¼Ð¾Ð´ÑлÑми
+по ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¼Ñ Ð¿ÑоÑÐ¾ÐºÐ¾Ð»Ñ (“ÐÐÐÐÐД),
гаÑанÑиÑÑÑ Ð² Ñо же вÑемÑ,
+ÑÑо полÑзоваÑели по-пÑÐµÐ¶Ð½ÐµÐ¼Ñ Ð±ÑдÑÑ
полÑÑаÑÑ Ð¸ÑÑ
однÑй ÑекÑÑ, как они полÑÑали
+Ð±Ñ ÐµÐ³Ð¾ в обÑÑнÑÑ
ÑÑловиÑÑ
GPL.</p>
+
<p>Ðо Ð·Ð°ÐºÐ¾Ð½Ñ ÑолÑко пÑавообладаÑели
пÑогÑÐ°Ð¼Ð¼Ñ Ð¼Ð¾Ð³ÑÑ ÑанкÑиониÑоваÑÑ ÑÑо
иÑклÑÑение. ÐÑли Ð²Ñ Ð½Ð°Ð¿Ð¸Ñали вÑÑ Ð¿ÑогÑаммÑ
Ñами, Ñо (пÑедполагаÑ, ÑÑо ваÑ
ÑабоÑодаÑÐµÐ»Ñ Ð¸Ð»Ð¸ ÑÑебное заведение не
пÑеÑендÑÐµÑ Ð½Ð° авÑоÑÑкие пÑава) вÑ
@@ -3570,7 +3582,7 @@
<p><!-- timestamp start -->
Ðбновлено:
-$Date: 2013/02/28 19:09:51 $
+$Date: 2013/03/26 04:28:55 $
<!-- timestamp end -->
</p>
Index: po/gpl-faq.ru-en.html
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru-en.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- po/gpl-faq.ru-en.html 28 Feb 2013 19:10:29 -0000 1.27
+++ po/gpl-faq.ru-en.html 26 Mar 2013 04:28:55 -0000 1.28
@@ -1677,23 +1677,35 @@
combined work based on ABC. Thus, the terms and conditions of the GNU
General Public License cover the whole combination.</p>
-<p>In addition, as a special exception, the copyright holders of ABC give
+<p>As a special exception, the copyright holders of ABC give
you permission to combine ABC program with free software programs or
libraries that are released under the GNU LGPL and with independent
modules that communicate with ABC solely through the ABCDEF interface.
You may copy and distribute such a system following the terms of the
GNU GPL for ABC and the licenses of the other code concerned, provided
that you include the source code of that other code when and as the
-GNU GPL requires distribution of source code.</p>
+GNU GPL requires distribution of source code and provided that you do not
modify the ABCDEF interface.</p>
<p>Note that people who make modified versions of ABC are not obligated
to grant this special exception for their modified versions; it is
their choice whether to do so. The GNU General Public License gives
permission to release a modified version without this exception; this
exception also makes it possible to release a modified version which
-carries forward this exception.</p>
+carries forward this exception. If you modify the ABCDEF interface,
+this exception does not apply to your modified version of ABC, and you
+must remove this exception when you distribute your modified
+version.</p>
+
+<p>This exception is an additional permission under section 7 of the
+GNU General Public License, version 3 (“GPLv3”)</p>
+
</blockquote>
+<p>This exception enables linking with differently licensed modules
+over the specified interface (“ABCDEF”), while ensuring
+that users would still receive source code as they normally would
+under the GPL.</p>
+
<p>Only the copyright holders for the program can legally authorize this
exception. If you wrote the whole program yourself, then assuming your
employer or school does not claim the copyright, you are the copyright
@@ -3603,7 +3615,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2013/02/28 19:10:29 $
+$Date: 2013/03/26 04:28:55 $
<!-- timestamp end -->
</p>
</div>
Index: po/gpl-faq.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/gpl-faq.ru.po,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- po/gpl-faq.ru.po 26 Mar 2013 04:09:24 -0000 1.43
+++ po/gpl-faq.ru.po 26 Mar 2013 04:28:55 -0000 1.44
@@ -19,7 +19,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Outdated-Since: 2013-03-25 16:56-0300\n"
#. type: Content of: <title>
msgid ""
@@ -3498,24 +3497,6 @@
"комбинаÑÐ¸Ñ Ð² Ñелом."
#. type: Content of: <dl><dd><blockquote><p>
-# | [-In addition, as-]{+As+} a special exception, the copyright holders of
-# | ABC give you permission to combine ABC program with free software programs
-# | or libraries that are released under the GNU LGPL and with independent
-# | modules that communicate with ABC solely through the ABCDEF interface.
-# | You may copy and distribute such a system following the terms of the GNU
-# | GPL for ABC and the licenses of the other code concerned, provided that
-# | you include the source code of that other code when and as the GNU GPL
-# | requires distribution of source [-code.-] {+code and provided that you do
-# | not modify the ABCDEF interface.+}
-#| msgid ""
-#| "In addition, as a special exception, the copyright holders of ABC give "
-#| "you permission to combine ABC program with free software programs or "
-#| "libraries that are released under the GNU LGPL and with independent "
-#| "modules that communicate with ABC solely through the ABCDEF interface. "
-#| "You may copy and distribute such a system following the terms of the GNU "
-#| "GPL for ABC and the licenses of the other code concerned, provided that "
-#| "you include the source code of that other code when and as the GNU GPL "
-#| "requires distribution of source code."
msgid ""
"As a special exception, the copyright holders of ABC give you permission to "
"combine ABC program with free software programs or libraries that are "
@@ -3526,32 +3507,16 @@
"other code when and as the GNU GPL requires distribution of source code and "
"provided that you do not modify the ABCDEF interface."
msgstr ""
-"Ðак оÑобое иÑклÑÑение, пÑавообладаÑели
ÐÐРдаÑÑ Ð²Ð°Ð¼ ÑазÑеÑение "
-"комбиниÑоваÑÑ ÐÐÐ Ñо ÑвободнÑми
пÑогÑаммами или библиоÑеками,
вÑпÑÑкаемÑми "
-"под GNU LGPL, и Ñ Ð½ÐµÐ·Ð°Ð²Ð¸ÑимÑми модÑлÑми,
коÑоÑÑе ÑообÑаÑÑÑÑ Ñ ÐÐÐ "
-"иÑклÑÑиÑелÑно по пÑоÑÐ¾ÐºÐ¾Ð»Ñ ÐÐÐÐÐÐ. ÐÑ
можеÑе копиÑоваÑÑ Ð¸ ÑаÑпÑоÑÑÑанÑÑÑ "
-"ÑакÑÑ ÑиÑÑемÑ, ÑледÑÑ ÑÑебованиÑм GNU GPL в
оÑноÑении ÐÐРи ÑÑебованиÑм "
-"лиÑензий дÑÑгиÑ
пÑогÑамм, коÑоÑÑе
иÑполÑзÑÑÑÑÑ, пÑи ÑÑловии, ÑÑо Ð²Ñ "
-"пÑедоÑÑавлÑеÑе иÑÑ
однÑй ÑекÑÑ ÑÑиÑ
дÑÑгиÑ
пÑогÑамм, когда и как GNU GPL "
-"ÑÑебÑÐµÑ ÑаÑпÑоÑÑÑанÑÑÑ Ð¸ÑÑ
однÑй ÑекÑÑ, и
пÑи ÑÑловии, ÑÑо Ð²Ñ Ð½Ðµ изменÑеÑе "
-"пÑоÑокол ÐÐÐÐÐÐ."
+"Ðак оÑобое иÑклÑÑение, пÑавообладаÑели
ÐÐРдаÑÑ Ð²Ð°Ð¼ ÑазÑеÑение комбиниÑоваÑÑ "
+"ÐÐÐ Ñо ÑвободнÑми пÑогÑаммами или
библиоÑеками, вÑпÑÑкаемÑми под GNU LGPL, и "
+"Ñ Ð½ÐµÐ·Ð°Ð²Ð¸ÑимÑми модÑлÑми, коÑоÑÑе
ÑообÑаÑÑÑÑ Ñ ÐÐРиÑклÑÑиÑелÑно по
пÑоÑÐ¾ÐºÐ¾Ð»Ñ "
+"ÐÐÐÐÐÐ. ÐÑ Ð¼Ð¾Ð¶ÐµÑе копиÑоваÑÑ Ð¸
ÑаÑпÑоÑÑÑанÑÑÑ ÑакÑÑ ÑиÑÑемÑ, ÑледÑÑ "
+"ÑÑебованиÑм GNU GPL в оÑноÑении ÐÐРи
ÑÑебованиÑм лиÑензий дÑÑгиÑ
пÑогÑамм, "
+"коÑоÑÑе иÑполÑзÑÑÑÑÑ, пÑи ÑÑловии, ÑÑо вÑ
пÑедоÑÑавлÑеÑе иÑÑ
однÑй ÑекÑÑ ÑÑиÑ
"
+"дÑÑгиÑ
пÑогÑамм, когда и как GNU GPL ÑÑебÑеÑ
ÑаÑпÑоÑÑÑанÑÑÑ Ð¸ÑÑ
однÑй ÑекÑÑ, "
+"и пÑи ÑÑловии, ÑÑо Ð²Ñ Ð½Ðµ изменÑеÑе
пÑоÑокол ÐÐÐÐÐÐ."
#. type: Content of: <dl><dd><blockquote><p>
-# | Note that people who make modified versions of ABC are not obligated to
-# | grant this special exception for their modified versions; it is their
-# | choice whether to do so. The GNU General Public License gives permission
-# | to release a modified version without this exception; this exception also
-# | makes it possible to release a modified version which carries forward this
-# | exception. {+If you modify the ABCDEF interface, this exception does not
-# | apply to your modified version of ABC, and you must remove this exception
-# | when you distribute your modified version.+}
-#| msgid ""
-#| "Note that people who make modified versions of ABC are not obligated to "
-#| "grant this special exception for their modified versions; it is their "
-#| "choice whether to do so. The GNU General Public License gives permission "
-#| "to release a modified version without this exception; this exception also "
-#| "makes it possible to release a modified version which carries forward "
-#| "this exception."
msgid ""
"Note that people who make modified versions of ABC are not obligated to "
"grant this special exception for their modified versions; it is their choice "
@@ -3577,8 +3542,8 @@
"General Public License, version 3 (“GPLv3”)"
msgstr ""
"ÐÑо иÑклÑÑение ÑвлÑеÑÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑелÑнÑм
ÑазÑеÑением, пÑедÑÑмоÑÑеннÑм "
-"Ñазделом 7 веÑÑии 3 СÑандаÑÑной
обÑеÑÑвенной лиÑензии GNU "
-"(“GPLv3”)"
+"Ñазделом 7 веÑÑии 3 СÑандаÑÑной
обÑеÑÑвенной лиÑензии GNU (“"
+"GPLv3”)"
#. type: Content of: <dl><dd><p>
msgid ""
@@ -3586,10 +3551,10 @@
"specified interface (“ABCDEF”), while ensuring that users would "
"still receive source code as they normally would under the GPL."
msgstr ""
-"ÐÑо иÑклÑÑение допÑÑÐºÐ°ÐµÑ ÐºÐ¾Ð¼Ð¿Ð¾Ð½Ð¾Ð²ÐºÑ Ñ
лиÑензиÑованнÑми по-дÑÑÐ³Ð¾Ð¼Ñ Ð¼Ð¾Ð´ÑлÑми по "
-"ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¼Ñ Ð¿ÑоÑÐ¾ÐºÐ¾Ð»Ñ (“ÐÐÐÐÐД),
гаÑанÑиÑÑÑ Ð² Ñо же вÑемÑ, ÑÑо "
-"полÑзоваÑели по-пÑÐµÐ¶Ð½ÐµÐ¼Ñ Ð±ÑдÑÑ Ð¿Ð¾Ð»ÑÑаÑÑ
иÑÑ
однÑй ÑекÑÑ, как они полÑÑали Ð±Ñ "
-"его в обÑÑнÑÑ
ÑÑловиÑÑ
GPL."
+"ÐÑо иÑклÑÑение допÑÑÐºÐ°ÐµÑ ÐºÐ¾Ð¼Ð¿Ð¾Ð½Ð¾Ð²ÐºÑ Ñ
лиÑензиÑованнÑми по-дÑÑÐ³Ð¾Ð¼Ñ Ð¼Ð¾Ð´ÑлÑми "
+"по ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¼Ñ Ð¿ÑоÑÐ¾ÐºÐ¾Ð»Ñ (“ÐÐÐÐÐД),
гаÑанÑиÑÑÑ Ð² Ñо же вÑемÑ, "
+"ÑÑо полÑзоваÑели по-пÑÐµÐ¶Ð½ÐµÐ¼Ñ Ð±ÑдÑÑ
полÑÑаÑÑ Ð¸ÑÑ
однÑй ÑекÑÑ, как они полÑÑали "
+"Ð±Ñ ÐµÐ³Ð¾ в обÑÑнÑÑ
ÑÑловиÑÑ
GPL."
#. type: Content of: <dl><dd><p>
msgid ""
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses gpl-faq.ru.html po/gpl-faq.ru-en.h...,
GNUN <=