[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www server/po/sitemap.ru.po licenses/po/license...
From: |
Pavel Kharitonov |
Subject: |
www server/po/sitemap.ru.po licenses/po/license... |
Date: |
Sun, 17 Jan 2016 14:25:46 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Pavel Kharitonov <ineiev> 16/01/17 14:25:46
Modified files:
server/po : sitemap.ru.po
licenses/po : license-list.ru.po
Log message:
Update.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/po/sitemap.ru.po?cvsroot=www&r1=1.257&r2=1.258
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.228&r2=1.229
Patches:
Index: server/po/sitemap.ru.po
===================================================================
RCS file: /web/www/www/server/po/sitemap.ru.po,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -b -r1.257 -r1.258
--- server/po/sitemap.ru.po 16 Jan 2016 17:59:50 -0000 1.257
+++ server/po/sitemap.ru.po 17 Jan 2016 14:25:46 -0000 1.258
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: sitemap.html\n"
"POT-Creation-Date: 2016-01-16 17:55+0000\n"
-"PO-Revision-Date: 2016-01-12 85:68+0000\n"
+"PO-Revision-Date: 2016-01-17 85:68+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
"Language: ru\n"
@@ -6259,10 +6259,9 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
# | Copyright © 201[-4-]{+6+} Free Software Foundation, Inc.
-#, fuzzy
#| msgid "Copyright © 2014 Free Software Foundation, Inc."
msgid "Copyright © 2016 Free Software Foundation, Inc."
-msgstr "Copyright © 2014 Free Software Foundation, Inc."
+msgstr "Copyright © 2016 Free Software Foundation, Inc."
#. type: Content of: <div><p>
msgid ""
Index: licenses/po/license-list.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru.po,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -b -r1.228 -r1.229
--- licenses/po/license-list.ru.po 16 Jan 2016 16:58:31 -0000 1.228
+++ licenses/po/license-list.ru.po 17 Jan 2016 14:25:46 -0000 1.229
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: license-list.html\n"
"POT-Creation-Date: 2016-01-16 16:55+0000\n"
-"PO-Revision-Date: 2016-01-13 17:17+0000\n"
+"PO-Revision-Date: 2016-01-17 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
"Language: ru\n"
@@ -1197,7 +1197,6 @@
# | covered by the MPL under that license's terms, or distribute the Larger
# | Work in whole or in part under the GNU licenses' terms with no further
# | restrictions.
-#, fuzzy
#| msgid ""
#| "This is a free software license. Section 3.3 provides indirect "
#| "compatibility between this license and the GNU GPL version 2.0, the GNU "
@@ -1236,7 +1235,7 @@
msgstr ""
"ÐÑо лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм. Ð
аздел 3.3 коÑвенно обеÑпеÑÐ¸Ð²Ð°ÐµÑ "
"ÑовмеÑÑимоÑÑÑ ÑÑой лиÑензии Ñ GNU GPL
веÑÑии 2.0, GNU LGPL "
-"веÑÑии 2.1, GNU AGPL веÑÑии 3.0 и вÑеми
более поздними веÑÑиÑми "
+"веÑÑии 2.1, GNU AGPL веÑÑии 3 и вÑеми более
поздними веÑÑиÑми "
"ÑÑиÑ
лиÑензий. Ðогда Ð²Ñ Ð¿Ð¾Ð»ÑÑаеÑе
пÑоизведение под MPL 2.0, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе "
"ÑделаÑÑ “более кÑÑпное
пÑоизведение”, в коÑоÑом ÑÑо
пÑоизведение "
"ÑоÑеÑаеÑÑÑ Ñ Ð¿Ñоизведением под ÑÑими
лиÑензиÑми GNU. Ðогда Ð²Ñ ÑÑо делаеÑе, "
@@ -4729,7 +4728,6 @@
# |
href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\">it
# | <em>should+} not [-recommended for use-] {+be used+} on [-software.-]
# | {+software</em></a>.+}
-#, fuzzy
#| msgid ""
#| "This is a non-copyleft free license that is good for art and "
#| "entertainment works, and educational works. It is compatible with all "
@@ -4744,7 +4742,10 @@
msgstr ""
"ÐÑо ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ð±ÐµÐ· авÑоÑÑкого
лева, она Ñ
оÑоÑа Ð´Ð»Ñ Ñ
ÑдожеÑÑвеннÑÑ
, "
"ÑазвлекаÑелÑнÑÑ
и обÑазоваÑелÑнÑÑ
пÑоизведений. Ðна ÑовмеÑÑима Ñо вÑеми "
-"веÑÑиÑми GNU GPL; однако она не ÑекомендÑеÑÑÑ
Ð´Ð»Ñ Ð¿ÑогÑамм."
+"веÑÑиÑми GNU GPL; однако, как и вÑе лиÑензии
Creative Commons, "
+"<a href=\"https://creativecommons.org/"
+"faq/#can-i-apply-a-creative-commons-license-to-software\">ее <em>не
ÑледÑÐµÑ "
+"пÑименÑÑÑ Ð´Ð»Ñ Ð¿ÑогÑамм</em></a>."
#. type: Content of: <dl><dd><p>
msgid ""
@@ -4790,7 +4791,6 @@
# |
href=\"https://creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software\">it
# | <em>should+} not [-recommended for use-] {+be used+} on [-software.-]
# | {+software</em></a>.+}
-#, fuzzy
#| msgid ""
#| "This is a non-copyleft free license that is good for art and "
#| "entertainment works, and educational works. It is compatible with all "
@@ -4802,9 +4802,12 @@
"creativecommons.org/faq/#can-i-apply-a-creative-commons-license-to-software"
"\">it <em>should not be used on software</em></a>."
msgstr ""
-"ÐÑо ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ð±ÐµÐ· авÑоÑÑкого
лева, она Ñ
оÑоÑа Ð´Ð»Ñ Ñ
ÑдожеÑÑвеннÑÑ
, "
-"ÑазвлекаÑелÑнÑÑ
и обÑазоваÑелÑнÑÑ
пÑоизведений. Ðна ÑовмеÑÑима Ñо вÑеми "
-"веÑÑиÑми GNU GPL; однако она не ÑекомендÑеÑÑÑ
Ð´Ð»Ñ Ð¿ÑогÑамм."
+"ÐÑо ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ñ Ð°Ð²ÑоÑÑким левом,
она Ñ
оÑоÑа Ð´Ð»Ñ Ñ
ÑдожеÑÑвеннÑÑ
, "
+"ÑазвлекаÑелÑнÑÑ
и обÑазоваÑелÑнÑÑ
пÑоизведений. "
+"Ðак и вÑе лиÑензии Creative Commons, "
+"<a href=\"https://creativecommons.org/"
+"faq/#can-i-apply-a-creative-commons-license-to-software\">ее <em>не
ÑледÑÐµÑ "
+"пÑименÑÑÑ Ð´Ð»Ñ Ð¿ÑогÑамм</em></a>."
#. type: Content of: <dl><dd><p>
# | [-This is a copyleft free license that is good for artistic and
@@ -4813,7 +4816,6 @@
# | license your modified versions of CC BY-SA 4.0 materials under GNU GPL
# | version [-3.0,-] {+3,+} but you may not relicense [-GNU-] GPL [-version
# | 3.0-] {+3+} licensed works under CC BY-SA 4.0.
-#, fuzzy
#| msgid ""
#| "This is a copyleft free license that is good for artistic and "
#| "entertainment works, and educational works. CC BY-SA 4.0 is one-way "
@@ -4827,12 +4829,11 @@
"GPL version 3, but you may not relicense GPL 3 licensed works under CC BY-SA "
"4.0."
msgstr ""
-"ÐÑо ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ Ñ Ð°Ð²ÑоÑÑким левом,
коÑоÑÐ°Ñ Ñ
оÑоÑа Ð´Ð»Ñ Ñ
ÑдожеÑÑвеннÑÑ
, "
-"ÑазвлекаÑелÑнÑÑ
и обÑазоваÑелÑнÑÑ
пÑоизведений. CC BY-SA 4.0 "
-"ÑовмеÑÑима в Ð¾Ð´Ð½Ñ ÑÑоÑÐ¾Ð½Ñ Ñ GNU GPL
веÑÑии 3.0: ÑÑо ознаÑаеÑ, ÑÑо Ð²Ñ "
+"CC BY-SA 4.0 "
+"ÑовмеÑÑима в Ð¾Ð´Ð½Ñ ÑÑоÑÐ¾Ð½Ñ Ñ GNU GPL
веÑÑии 3: ÑÑо ознаÑаеÑ, ÑÑо Ð²Ñ "
"можеÑе вÑпÑÑкаÑÑ Ñвои измененнÑе веÑÑии
маÑеÑиалов под CC BY-"
-"SA 4.0 на ÑÑловиÑÑ
GNU GPL веÑÑии 3.0, но вÑ
не можеÑе "
-"пеÑелиÑензиÑоваÑÑ Ñвои ÑабоÑÑ Ð¿Ð¾Ð´ GNU GPL
веÑÑии 3.0 на ÑÑловиÑÑ
"
+"SA 4.0 на ÑÑловиÑÑ
GNU GPL веÑÑии 3, но Ð²Ñ Ð½Ðµ
можеÑе "
+"пеÑелиÑензиÑоваÑÑ Ñвои ÑабоÑÑ Ð¿Ð¾Ð´ GNU GPL
веÑÑии 3 на ÑÑловиÑÑ
"
"CC BY-SA 4.0."
#. type: Content of: <dl><dd><p>
@@ -4852,7 +4853,6 @@
# | so that if and when Creative Commons determines that a future version of
# | the GNU GPL is a compatible license, the adapted and combined work could
# | be used under that later version of the GNU GPL.
-#, fuzzy
#| msgid ""
#| "Because Creative Commons lists only version 3.0 of the GNU GPL on its <a "
#| "href=\"http://creativecommons.org/compatiblelicenses\">compatible "
@@ -4887,15 +4887,15 @@
"GNU GPL is a compatible license, the adapted and combined work could be used "
"under that later version of the GNU GPL."
msgstr ""
-"ÐоÑколÑÐºÑ Creative Commons ÑказÑÐ²Ð°ÐµÑ ÑолÑко
веÑÑÐ¸Ñ 3.0 GNU GPL в Ñвоем "
+"ÐоÑколÑÐºÑ Creative Commons ÑказÑÐ²Ð°ÐµÑ ÑолÑко
веÑÑÐ¸Ñ 3 GNU GPL в Ñвоем "
"<a href=\"http://creativecommons.org/compatiblelicenses\">ÑпиÑке
ÑовмеÑÑимÑÑ
"
"лиÑензий</a>, Ð²Ñ Ð½Ðµ можеÑе лиÑензиÑоваÑÑ
Ñвои доÑабоÑки пÑоизведений под "
"CC BY-SA на ÑÑловиÑÑ
“GNU GPL веÑÑии 3 или
(по ваÑÐµÐ¼Ñ "
"вÑбоÑÑ) более поздней веÑÑии”. Ðднако
Ñаздел 14 GNU GPL "
-"веÑÑии 3.0 позволÑÐµÑ Ð»Ð¸ÑензиÑÑÑÑим
назнаÑиÑÑ Ð¿Ð¾ÑÑедника, коÑоÑÑй бÑÐ´ÐµÑ "
+"веÑÑии 3 позволÑÐµÑ Ð»Ð¸ÑензиÑÑÑÑим
назнаÑиÑÑ Ð¿Ð¾ÑÑедника, коÑоÑÑй бÑÐ´ÐµÑ "
"опÑеделÑÑÑ, можно ли полÑзоваÑÑÑÑ
бÑдÑÑими веÑÑиÑми GNU GPL. Таким обÑазом, "
"еÑли кÑо-Ñо доÑабоÑÐ°ÐµÑ Ð¿Ñоизведение под
CC BY-SA 4.0 и вклÑÑÐ¸Ñ ÐµÐ³Ð¾ "
-"в ÑабоÑÑ, лиÑензиÑÑемÑÑ Ð¿Ð¾ GNU GPL
веÑÑии 3.0, <a href=\"https://wiki."
+"в ÑабоÑÑ, лиÑензиÑÑемÑÑ Ð¿Ð¾ GNU GPL веÑÑии 3,
<a href=\"https://wiki."
"creativecommons.org/wiki/ShareAlike_compatibility:"
"_GPLv3#Option_to_comply_with_later_versions\">они могÑÑ
назнаÑиÑÑ Creative "
"Commons Ñвоим поÑÑедником</a> (в виде <a
href=\"http://creativecommons.org/"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www server/po/sitemap.ru.po licenses/po/license...,
Pavel Kharitonov <=