[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www gnu/po/gnu-linux-faq.ru.po licenses/po/bsd....
From: |
Pavel Kharitonov |
Subject: |
www gnu/po/gnu-linux-faq.ru.po licenses/po/bsd.... |
Date: |
Mon, 14 Dec 2015 10:35:40 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Pavel Kharitonov <ineiev> 15/12/14 10:35:39
Modified files:
gnu/po : gnu-linux-faq.ru.po
licenses/po : bsd.ru.po license-list.ru.po licenses.ru.po
philosophy/po : essays-and-articles.ru.po
netscape-npl-old.ru.po netscape-npl.ru.po
words-to-avoid.ru.po x.ru.po
Log message:
Update.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ru.po?cvsroot=www&r1=1.79&r2=1.80
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/bsd.ru.po?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/license-list.ru.po?cvsroot=www&r1=1.219&r2=1.220
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ru.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/essays-and-articles.ru.po?cvsroot=www&r1=1.126&r2=1.127
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/netscape-npl-old.ru.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/netscape-npl.ru.po?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/words-to-avoid.ru.po?cvsroot=www&r1=1.143&r2=1.144
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/x.ru.po?cvsroot=www&r1=1.15&r2=1.16
Patches:
Index: gnu/po/gnu-linux-faq.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ru.po,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- gnu/po/gnu-linux-faq.ru.po 14 Dec 2015 10:03:15 -0000 1.79
+++ gnu/po/gnu-linux-faq.ru.po 14 Dec 2015 10:35:38 -0000 1.80
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gnu-linux-faq.html\n"
"POT-Creation-Date: 2015-12-14 09:56+0000\n"
-"PO-Revision-Date: 2015-06-08 17:17+0000\n"
+"PO-Revision-Date: 2015-12-14 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
"Language: ru\n"
@@ -3375,7 +3375,6 @@
# | {+href=\"/licenses/bsd.html\">+} two different BSD licenses</a>. For
# | clarity's sake, please don't use the term “BSD license”
# | without specifying which one.
-#, fuzzy
#| msgid ""
#| "Please note that there are at least <a href=\"/philosophy/bsd.html\"> two "
#| "different BSD licenses</a>. For clarity's sake, please don't use the "
@@ -3385,7 +3384,7 @@
"different BSD licenses</a>. For clarity's sake, please don't use the term "
"“BSD license” without specifying which one."
msgstr ""
-"ÐбÑаÑиÑе внимание, ÑÑо еÑÑÑ Ð¿Ð¾ менÑÑей
меÑе <a href=\"/philosophy/bsd.html"
+"ÐбÑаÑиÑе внимание, ÑÑо еÑÑÑ Ð¿Ð¾ менÑÑей
меÑе <a href=\"/licenses/bsd.html"
"\"> две ÑазлиÑнÑÑ
лиÑензии BSD</a>. ÐÐ»Ñ ÑÑноÑÑи
не полÑзÑйÑеÑÑ, пожалÑйÑÑа, "
"вÑÑажением “лиÑÐµÐ½Ð·Ð¸Ñ BSD”, не
ÑÐ¿Ð¾Ð¼Ð¸Ð½Ð°Ñ Ð¾ Ñом, ÐºÐ°ÐºÐ°Ñ Ð¸Ð¼ÐµÐ½Ð½Ð¾ ÑÑо "
"лиÑензиÑ."
Index: licenses/po/bsd.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/bsd.ru.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- licenses/po/bsd.ru.po 14 Dec 2015 10:03:17 -0000 1.3
+++ licenses/po/bsd.ru.po 14 Dec 2015 10:35:38 -0000 1.4
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: bsd.html\n"
"POT-Creation-Date: 2015-12-14 09:56+0000\n"
-"PO-Revision-Date: 2015-02-03 17:17+0000\n"
+"PO-Revision-Date: 2015-12-14 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
"Language: ru\n"
@@ -43,7 +43,6 @@
# | href=\"/philosophy/why-copyleft.html\">We recommend copyleft</a>, because
# | it protects freedom for all users, but non-copylefted software can still
# | be free software, and useful to the free software community.
-#, fuzzy
#| msgid ""
#| "The two major categories of free software license are <a href=\"/copyleft/"
#| "copyleft.html\">copyleft</a> and <a href=\"/philosophy/categories."
@@ -68,7 +67,7 @@
msgstr ""
"ÐиÑензии ÑвободнÑÑ
пÑогÑамм делÑÑÑÑ Ð½Ð°
две болÑÑие каÑегоÑии: лиÑензии <a "
"href=\"/copyleft/copyleft.html\"> Ñ Ð°Ð²ÑоÑÑким левом </a> и <a
href=\"/"
-"philosophy/categories.html#Non-CopyleftedFreeSoftware\"> без
авÑоÑÑкого лева "
+"philosophy/categories.html#Non-CopyleftedFreeSoftware\"> без
авÑоÑÑкого лева"
"</a>. <a href=\"/licenses/license-list.html#GPLCompatibleLicenses"
"\">ÐиÑензии Ñ Ð°Ð²ÑоÑÑким левом</a>, Ñакие, как
<a href=\"/licenses/gpl.html"
"\">GNU GPL</a>, ÑÑебÑÑÑ, ÑÑÐ¾Ð±Ñ Ð¼Ð¾Ð´Ð¸ÑиÑиÑованнÑе
веÑÑии пÑогÑÐ°Ð¼Ð¼Ñ Ñоже "
@@ -393,7 +392,6 @@
#. type: Content of: <div><p>
# || No change detected. The change might only be in amounts of spaces.
-#, fuzzy
#| msgid ""
#| "This page is licensed under a <a rel=\"license\" href=\"http://"
#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
Index: licenses/po/license-list.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/license-list.ru.po,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -b -r1.219 -r1.220
--- licenses/po/license-list.ru.po 14 Dec 2015 10:03:19 -0000 1.219
+++ licenses/po/license-list.ru.po 14 Dec 2015 10:35:38 -0000 1.220
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: license-list.html\n"
"POT-Creation-Date: 2015-12-14 09:56+0000\n"
-"PO-Revision-Date: 2015-09-15 17:17+0000\n"
+"PO-Revision-Date: 2015-12-14 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
"Language: ru\n"
@@ -2019,7 +2019,6 @@
# | [-href=\"/philosophy/bsd.html\">practical-]
# | {+href=\"/licenses/bsd.html\">practical+} problems</a> like those of the
# | original BSD license, including incompatibility with the GNU GPL.
-#, fuzzy
#| msgid ""
#| "This is a lax, permissive non-copyleft free software license with an "
#| "advertising clause. This creates <a href=\"/philosophy/bsd.html"
@@ -2032,7 +2031,7 @@
"incompatibility with the GNU GPL."
msgstr ""
"ÐÑо либеÑалÑÐ½Ð°Ñ Ð½ÐµÐ¾Ð³ÑаниÑиÑелÑнаÑ
лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм без
авÑоÑÑкого "
-"лева Ñ Ð¿ÑнкÑом о Ñекламе. ÐÑо ÑÐ¾Ð·Ð´Ð°ÐµÑ <a
href=\"/philosophy/bsd.html"
+"лева Ñ Ð¿ÑнкÑом о Ñекламе. ÐÑо ÑÐ¾Ð·Ð´Ð°ÐµÑ <a
href=\"/licenses/bsd.html"
"\">пÑакÑиÑеÑкие пÑоблемÑ</a>, подобнÑе
пÑоблемам пеÑвонаÑалÑной лиÑензии "
"BSD, в Ñом ÑиÑле неÑовмеÑÑимоÑÑÑ Ñ GNU GPL."
@@ -2101,7 +2100,6 @@
# | it does cause <a [-href=\"/philosophy/bsd.html\">practical-]
# | {+href=\"/licenses/bsd.html\">practical+} problems</a>, including
# | incompatibility with the GNU GPL.
-#, fuzzy
#| msgid ""
#| "This is a lax, permissive non-copyleft free software license with a "
#| "serious flaw: the “obnoxious BSD advertising clause”. The "
@@ -2118,7 +2116,7 @@
"ÐÑо либеÑалÑÐ½Ð°Ñ Ð½ÐµÐ¾Ð³ÑаниÑиÑелÑнаÑ
лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм без
авÑоÑÑкого "
"лева Ñ ÑеÑÑезнÑм недоÑÑаÑком —
“злоÑÑнÑм пÑнкÑом BSD о "
"Ñекламе”. ÐедоÑÑаÑок не кÑиÑиÑен; Ñо
еÑÑÑ, он не Ð´ÐµÐ»Ð°ÐµÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ "
-"неÑвободной. Ðо к <a href=\"/philosophy/bsd.html\">
пÑакÑиÑеÑким пÑоблемам</"
+"неÑвободной. Ðо к <a href=\"/licenses/bsd.html\">
пÑакÑиÑеÑким пÑоблемам</"
"a>, вклÑÑÐ°Ñ Ð½ÐµÑовмеÑÑимоÑÑÑ Ñ GNU GPL, он
пÑиводиÑ."
#. type: Content of: <dl><dd><p>
@@ -3119,7 +3117,6 @@
# | [-href=\"/philosophy/bsd.html\">practical-]
# | {+href=\"/licenses/bsd.html\">practical+} problems</a> like those of the
# | original BSD license.
-#, fuzzy
#| msgid ""
#| "This license is used by one part of PHP4. It is a non-copyleft free "
#| "software license which is incompatible with the GNU GPL, and has <a href="
@@ -3133,7 +3130,7 @@
msgstr ""
"ÐÑа лиÑÐµÐ½Ð·Ð¸Ñ Ð¸ÑполÑзÑеÑÑÑ Ð´Ð»Ñ ÑаÑÑи PHP4.
ÐÑо лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм "
"без авÑоÑÑкого лева, неÑовмеÑÑÐ¸Ð¼Ð°Ñ Ñ GNU GPL,
Ñ Ð½ÐµÐµ еÑÑÑ <a href=\"/"
-"philosophy/bsd.html\">пÑакÑиÑеÑкие пÑоблемÑ</a>,
подобнÑе пÑоблемам "
+"licenses/bsd.html\">пÑакÑиÑеÑкие пÑоблемÑ</a>,
подобнÑе пÑоблемам "
"пеÑвонаÑалÑной лиÑензии BSD."
#. type: Content of: <dl><dd><p>
@@ -3183,7 +3180,6 @@
# | {+href=\"/licenses/bsd.html\">practical+} problems</a> like those of the
# | original BSD license, including incompatibility with the <a
# | href=\"/licenses/gpl.html\">GNU GPL</a>.
-#, fuzzy
#| msgid ""
#| "This is a lax, fairly permissive non-copyleft free software license with "
#| "<a href=\"/philosophy/bsd.html\">practical problems</a> like those of the "
@@ -3196,7 +3192,7 @@
"gpl.html\">GNU GPL</a>."
msgstr ""
"ÐÑо либеÑалÑÐ½Ð°Ñ Ð²ÐµÑÑма неогÑаниÑиÑелÑнаÑ
лиÑÐµÐ½Ð·Ð¸Ñ ÑвободнÑÑ
пÑогÑамм без "
-"авÑоÑÑкого лева Ñ <a
href=\"/philosophy/bsd.html\">пÑакÑиÑеÑкими пÑоблемами</"
+"авÑоÑÑкого лева Ñ <a
href=\"/licenses/bsd.html\">пÑакÑиÑеÑкими пÑоблемами</"
"a>, подобнÑми пÑоблемам пеÑвонаÑалÑной
лиÑензии BSD, в ÑиÑло коÑоÑÑÑ
вÑ
Ð¾Ð´Ð¸Ñ "
"неÑовмеÑÑимоÑÑÑ Ñ <a href=\"/licenses/gpl.html\">GNU GPL</a>."
Index: licenses/po/licenses.ru.po
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ru.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- licenses/po/licenses.ru.po 14 Dec 2015 10:03:21 -0000 1.37
+++ licenses/po/licenses.ru.po 14 Dec 2015 10:35:39 -0000 1.38
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: licenses.html\n"
"POT-Creation-Date: 2015-12-14 09:56+0000\n"
-"PO-Revision-Date: 2015-06-13 17:17+0000\n"
+"PO-Revision-Date: 2015-12-14 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
"Language: ru\n"
@@ -82,7 +82,6 @@
# | We also have a page that discusses <a
# | [-href=\"/philosophy/bsd.html\">the-] {+href=\"/licenses/bsd.html\">the+}
# | BSD License Problem</a>.
-#, fuzzy
#| msgid ""
#| "We also have a page that discusses <a href=\"/philosophy/bsd.html\">the "
#| "BSD License Problem</a>."
@@ -90,7 +89,7 @@
"We also have a page that discusses <a href=\"/licenses/bsd.html\">the BSD "
"License Problem</a>."
msgstr ""
-"У Ð½Ð°Ñ ÐµÑÑÑ Ñакже ÑÑÑаниÑа, на коÑоÑой
обÑÑждаеÑÑÑ <a href=\"/philosophy/bsd."
+"У Ð½Ð°Ñ ÐµÑÑÑ Ñакже ÑÑÑаниÑа, на коÑоÑой
обÑÑждаеÑÑÑ <a href=\"/licenses/bsd."
"html\"> пÑоблема лиÑензии BSD</a>."
#. type: Content of: <h3>
Index: philosophy/po/essays-and-articles.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/essays-and-articles.ru.po,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- philosophy/po/essays-and-articles.ru.po 14 Dec 2015 10:03:24 -0000
1.126
+++ philosophy/po/essays-and-articles.ru.po 14 Dec 2015 10:35:39 -0000
1.127
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: essays-and-articles.html\n"
"POT-Creation-Date: 2015-12-14 09:56+0000\n"
-"PO-Revision-Date: 2015-11-10 17:17+0000\n"
+"PO-Revision-Date: 2015-12-14 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
"Language: ru\n"
@@ -380,10 +380,9 @@
#. type: Content of: <ul><li>
# | <a [-href=\"/philosophy/bsd.html\">The-]
# | {+href=\"/licenses/bsd.html\">The+} BSD License Problem</a>
-#, fuzzy
#| msgid "<a href=\"/philosophy/bsd.html\">The BSD License Problem</a>"
msgid "<a href=\"/licenses/bsd.html\">The BSD License Problem</a>"
-msgstr "<a href=\"/philosophy/bsd.html\">ÐÑоблема лиÑензии
BSD</a>"
+msgstr "<a href=\"/licenses/bsd.html\">ÐÑоблема лиÑензии
BSD</a>"
#. type: Content of: <ul><li>
msgid ""
Index: philosophy/po/netscape-npl-old.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/netscape-npl-old.ru.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- philosophy/po/netscape-npl-old.ru.po 14 Dec 2015 10:03:25 -0000
1.12
+++ philosophy/po/netscape-npl-old.ru.po 14 Dec 2015 10:35:39 -0000
1.13
@@ -1,7 +1,7 @@
# Russian translation for http://www.gnu.org/philosophy/netscape-npl-old.html
# Copyright (C) 2013 Free Software Foundation, Inc.
# This file is distributed under the same license as the original article.
-# Ineiev <address@hidden>, 2011, 2013
+# Ineiev <address@hidden>, 2011, 2013, 2015
# this translation lacks appropriate review
#
# when fixing bugs check also /p/netscape-npl.ru.po
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: netscape-npl-old.html\n"
"POT-Creation-Date: 2015-12-14 09:56+0000\n"
-"PO-Revision-Date: 2013-10-14 17:17+0000\n"
+"PO-Revision-Date: 2015-12-14 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
"Language: ru\n"
@@ -183,7 +183,6 @@
# | use the XFree86 terms instead). Netscape software can also be <a
# | href=\"/philosophy/categories.html\">free software</a> without being
# | copylefted.
-#, fuzzy
#| msgid ""
#| "The lack of real copyleft is not a catastrophe; it does not make the "
#| "software nonfree. For example, the XFree86 distribution terms do not try "
@@ -208,7 +207,7 @@
"Ð´ÐµÐ»Ð°ÐµÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð½ÐµÑвободной. ÐапÑимеÑ,
ÑÑÐ»Ð¾Ð²Ð¸Ñ ÑаÑпÑоÑÑÑÐ°Ð½ÐµÐ½Ð¸Ñ XFree86 даже "
"не пÑÑаÑÑÑÑ Ð¿ÑименÑÑÑ Ð°Ð²ÑоÑÑкое лево, и
Ñем не менее пÑогÑÐ°Ð¼Ð¼Ñ XFree86 "
"ÑвободнÑ. ÐÑогÑÐ°Ð¼Ð¼Ñ BSD Ñоже ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ñ Ð¸ без
авÑоÑÑкого лева, (Ñ
оÑÑ Ñ ÑÑаÑÑÑ
"
-"ÑÑловий BSD еÑÑÑ <a href=\"/philosophy/bsd.html\">важнÑй
недоÑÑаÑок</a>, и "
+"ÑÑловий BSD еÑÑÑ <a href=\"/licenses/bsd.html\">важнÑй
недоÑÑаÑок</a>, и "
"им не ÑледÑÐµÑ Ð¿Ð¾Ð´ÑажаÑÑ — еÑли Ð²Ñ Ñ
оÑиÑе вÑпÑÑкаÑÑ ÑвободнÑе "
"пÑогÑÐ°Ð¼Ð¼Ñ Ð±ÐµÐ· авÑоÑÑкого лева,
полÑзÑйÑеÑÑ, пожалÑйÑÑа, вмеÑÑо ниÑ
ÑÑловиÑми "
"XFree86). ÐÑогÑÐ°Ð¼Ð¼Ñ Netscape Ñоже могÑÑ Ð±ÑÑÑ <a
href=\"/philosophy/"
@@ -542,14 +541,12 @@
#. type: Content of: <div><p>
# | Copyright © 1998, 2007, [-2013-] {+2013, 2015+} Free Software
# | Foundation, Inc.
-#, fuzzy
#| msgid "Copyright © 1998, 2007, 2013 Free Software Foundation, Inc."
msgid "Copyright © 1998, 2007, 2013, 2015 Free Software Foundation, Inc."
-msgstr "Copyright © 1998, 2007, 2011, 2013 Free Software Foundation, Inc."
+msgstr "Copyright © 1998, 2007, 2011, 2013, 2015 Free Software
Foundation, Inc."
#. type: Content of: <div><p>
# || No change detected. The change might only be in amounts of spaces.
-#, fuzzy
#| msgid ""
#| "This page is licensed under a <a rel=\"license\" href=\"http://"
#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
Index: philosophy/po/netscape-npl.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/netscape-npl.ru.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- philosophy/po/netscape-npl.ru.po 14 Dec 2015 10:03:25 -0000 1.13
+++ philosophy/po/netscape-npl.ru.po 14 Dec 2015 10:35:39 -0000 1.14
@@ -1,7 +1,7 @@
# Russian translation for http://www.gnu.org/philosophy/netscape-npl.html
-# Copyright (C) 1998, 2003, 2007, 2011, 2013 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2003, 2007, 2011, 2013, 2015 Free Software Foundation,
Inc.
# This file is distributed under the same license as the original article.
-# Ineiev <address@hidden>, 2011, 2013
+# Ineiev <address@hidden>, 2011, 2013, 2015
# this translation lacks appropriate review
#
# when fixing bugs check also /p/netscape-npl-old.ru.po
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: netscape-npl.html\n"
"POT-Creation-Date: 2015-12-14 09:56+0000\n"
-"PO-Revision-Date: 2013-10-14 17:17+0000\n"
+"PO-Revision-Date: 2015-12-14 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
"Language: ru\n"
@@ -183,7 +183,6 @@
# | href=\"/philosophy/categories.html\">free software</a> without being
# | copylefted, and this by itself does not make the NPL worse than other
# | non-copyleft free software license.
-#, fuzzy
#| msgid ""
#| "The lack of real copyleft is not a catastrophe; it does not make the "
#| "software nonfree. For example, the X.org distribution terms do not try "
@@ -210,7 +209,7 @@
"Ð´ÐµÐ»Ð°ÐµÑ Ð¿ÑогÑÐ°Ð¼Ð¼Ñ Ð½ÐµÑвободной. ÐапÑимеÑ,
ÑÑÐ»Ð¾Ð²Ð¸Ñ ÑаÑпÑоÑÑÑÐ°Ð½ÐµÐ½Ð¸Ñ X.org даже "
"не пÑÑаÑÑÑÑ Ð¿ÑименÑÑÑ Ð°Ð²ÑоÑÑкое лево, и
Ñем не менее пÑогÑÐ°Ð¼Ð¼Ñ X.org "
"ÑвободнÑ. ÐÑогÑÐ°Ð¼Ð¼Ñ BSD Ñоже ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ñ Ð¸ без
авÑоÑÑкого лева, (Ñ
оÑÑ Ñ ÑÑаÑÑÑ
"
-"ÑÑловий BSD еÑÑÑ <a href=\"/philosophy/bsd.html\">важнÑй
недоÑÑаÑок</a>, и "
+"ÑÑловий BSD еÑÑÑ <a href=\"/licenses/bsd.html\">важнÑй
недоÑÑаÑок</a>, и "
"им не ÑледÑÐµÑ Ð¿Ð¾Ð´ÑажаÑÑ — еÑли Ð²Ñ Ñ
оÑиÑе вÑпÑÑкаÑÑ ÑвободнÑе "
"пÑогÑÐ°Ð¼Ð¼Ñ Ð±ÐµÐ· авÑоÑÑкого лева,
полÑзÑйÑеÑÑ, пожалÑйÑÑа, вмеÑÑо ниÑ
ÑÑловиÑми "
"X.org). ÐÑогÑÐ°Ð¼Ð¼Ñ Ð¿Ð¾Ð´ NPL — ÑÑо Ñоже <a
href=\"/philosophy/"
@@ -493,17 +492,15 @@
#. type: Content of: <div><p>
# | Copyright © 1998, 2003, 2007, [-2013-] {+2013, 2015+} Free Software
# | Foundation, Inc.
-#, fuzzy
#| msgid ""
#| "Copyright © 1998, 2003, 2007, 2013 Free Software Foundation, Inc."
msgid ""
"Copyright © 1998, 2003, 2007, 2013, 2015 Free Software Foundation, Inc."
msgstr ""
-"Copyright © 1998, 2003, 2007, 2011, 2013 Free Software Foundation, Inc."
+"Copyright © 1998, 2003, 2007, 2011, 2013, 2015 Free Software Foundation,
Inc."
#. type: Content of: <div><p>
# || No change detected. The change might only be in amounts of spaces.
-#, fuzzy
#| msgid ""
#| "This page is licensed under a <a rel=\"license\" href=\"http://"
#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
Index: philosophy/po/words-to-avoid.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/words-to-avoid.ru.po,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- philosophy/po/words-to-avoid.ru.po 14 Dec 2015 10:03:27 -0000 1.143
+++ philosophy/po/words-to-avoid.ru.po 14 Dec 2015 10:35:39 -0000 1.144
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: words-to-avoid.html\n"
"POT-Creation-Date: 2015-12-14 09:56+0000\n"
-"PO-Revision-Date: 2015-10-26 17:34+0000\n"
+"PO-Revision-Date: 2015-12-14 17:34+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
"Language: ru\n"
@@ -462,7 +462,6 @@
# | important differences</a>. For instance, the original BSD license with
# | the advertising clause is incompatible with the GNU General Public
# | License, but the revised BSD license is compatible with the GPL.
-#, fuzzy
#| msgid ""
#| "The expression “BSD-style license” leads to confusion because "
#| "it <a href=\"/philosophy/bsd.html\">lumps together licenses that have "
@@ -477,7 +476,7 @@
"the revised BSD license is compatible with the GPL."
msgstr ""
"ÐÑÑажение “лиÑÐµÐ½Ð·Ð¸Ñ Ð² ÑÑиле BSD”
пÑÐ¸Ð²Ð¾Ð´Ð¸Ñ Ðº пÑÑаниÑе, поÑÐ¾Ð¼Ñ ÑÑо "
-"она <a href=\"/philosophy/bsd.html\"> ÑÐ²Ð°Ð»Ð¸Ð²Ð°ÐµÑ Ð² однÑ
кÑÑÑ Ð»Ð¸Ñензии, Ñ "
+"она <a href=\"/licenses/bsd.html\"> ÑÐ²Ð°Ð»Ð¸Ð²Ð°ÐµÑ Ð² однÑ
кÑÑÑ Ð»Ð¸Ñензии, Ñ "
"коÑоÑÑÑ
еÑÑÑ Ð²Ð°Ð¶Ð½Ñе ÑазлиÑиÑ</a>. ÐапÑимеÑ,
пеÑвонаÑалÑÐ½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ BSD Ñ "
"пÑнкÑом о Ñекламе неÑовмеÑÑима Ñо
СÑандаÑÑной обÑеÑÑвенной лиÑензией GNU, а "
"пеÑеÑмоÑÑÐµÐ½Ð½Ð°Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ñ BSD ÑовмеÑÑима Ñ
GPL."
Index: philosophy/po/x.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/x.ru.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/po/x.ru.po 14 Dec 2015 10:03:28 -0000 1.15
+++ philosophy/po/x.ru.po 14 Dec 2015 10:35:39 -0000 1.16
@@ -1,15 +1,15 @@
# Russian translation for http://gnu.org/philosophy/x.html
# Copyright (C) 1998, 1999, 2009 Richard M. Stallman
-# Copyright (C) 2013 Free Software Foundation, Inc. (translation)
+# Copyright (C) 2015 Free Software Foundation, Inc. (translation)
# This file is distributed under the same license as the original article.
-# Ineiev <address@hidden>, 2010, 2013.
+# Ineiev <address@hidden>, 2010, 2013, 2015.
# Alexander Barakin <address@hidden>, 2010
#
msgid ""
msgstr ""
"Project-Id-Version: x.html\n"
"POT-Creation-Date: 2015-12-14 09:56+0000\n"
-"PO-Revision-Date: 2013-10-14 17:17+0000\n"
+"PO-Revision-Date: 2015-12-14 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian\n"
"Language: \n"
@@ -81,7 +81,6 @@
# | work as the basis for restricting other people. Noncopyleft licensing
# | does nothing wrong, but it misses the opportunity to actively protect our
# | freedom to change and redistribute software. For that, we need copyleft.
-#, fuzzy
#| msgid ""
#| "Some free software developers prefer noncopyleft distribution. "
#| "Noncopyleft licenses such as the XFree86 and <a href=\"/philosophy/bsd."
@@ -101,7 +100,7 @@
msgstr ""
"ÐекоÑоÑÑе ÑазÑабоÑÑики ÑвободнÑÑ
пÑогÑамм пÑедпоÑиÑаÑÑ ÑаÑпÑоÑÑÑанение без
"
"авÑоÑÑкого лева. Такие лиÑензии без
авÑоÑÑкого лева, как лиÑензии XFree86 и "
-"<a href=\"/philosophy/bsd.html\">BSD</a>, оÑÐ½Ð¾Ð²Ð°Ð½Ñ Ð½Ð°
пÑинÑипе незапÑеÑÐµÐ½Ð¸Ñ "
+"<a href=\"/licenses/bsd.html\">BSD</a>, оÑÐ½Ð¾Ð²Ð°Ð½Ñ Ð½Ð°
пÑинÑипе незапÑеÑÐµÐ½Ð¸Ñ "
"Ñего Ð±Ñ Ñо ни бÑло ÐºÐ¾Ð¼Ñ Ð±Ñ Ñо ни
бÑло — даже ÑомÑ, кÑо ÑÑÑемиÑÑÑ "
"воÑполÑзоваÑÑÑÑ Ð²Ð°Ñей ÑабоÑой как
оÑновой Ð´Ð»Ñ Ð¾Ð³ÑаниÑÐµÐ½Ð¸Ñ Ð´ÑÑгиÑ
. Ð "
"лиÑензиÑовании без авÑоÑÑкого лева неÑ
ниÑего дÑÑного, но оно ÑпÑÑÐºÐ°ÐµÑ "
@@ -406,14 +405,14 @@
#. type: Content of: <div><p>
# | Copyright © 1998, 1999, [-2009-] {+2009, 2015+} Richard M. Stallman
-#, fuzzy
#| msgid "Copyright © 1998, 1999, 2009 Richard M. Stallman"
msgid "Copyright © 1998, 1999, 2009, 2015 Richard M. Stallman"
-msgstr "Copyright © 1998, 1999, 2009 Richard M. Stallman"
+msgstr ""
+"Copyright © 1998, 1999, 2009, 2015 Richard M. Stallman<br />"
+"Copyright © 2015 Free Software Foundation, Inc. (translation)"
#. type: Content of: <div><p>
# || No change detected. The change might only be in amounts of spaces.
-#, fuzzy
#| msgid ""
#| "This page is licensed under a <a rel=\"license\" href=\"http://"
#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www gnu/po/gnu-linux-faq.ru.po licenses/po/bsd....,
Pavel Kharitonov <=