[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy floss-and-foss.ru.html po/floss-...
From: |
GNUN |
Subject: |
www/philosophy floss-and-foss.ru.html po/floss-... |
Date: |
Mon, 09 Nov 2015 17:58:59 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/11/09 17:58:59
Modified files:
philosophy : floss-and-foss.ru.html
philosophy/po : floss-and-foss.ru-en.html floss-and-foss.ru.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/floss-and-foss.ru.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/floss-and-foss.ru-en.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/floss-and-foss.ru.po?cvsroot=www&r1=1.7&r2=1.8
Patches:
Index: floss-and-foss.ru.html
===================================================================
RCS file: /web/www/www/philosophy/floss-and-foss.ru.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- floss-and-foss.ru.html 23 May 2015 06:10:53 -0000 1.3
+++ floss-and-foss.ru.html 9 Nov 2015 17:58:58 -0000 1.4
@@ -55,9 +55,16 @@
иÑÑ
однÑй ÑекÑÑ”, но оÑÑеÑнÑÐµÑ Ð² ÑÑоÑонÑ
“ÑвободнÑе
пÑогÑаммє.</p>
+<p>ÐÑÑажение “ÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð¸
пÑогÑÐ°Ð¼Ð¼Ñ Ñ Ð¾ÑкÑÑÑÑм иÑÑ
однÑм
+ÑекÑÑом” ÑÐ±Ð¸Ð²Ð°ÐµÑ Ñ ÑÐ¾Ð»ÐºÑ Ð¸ по дÑÑгой
пÑиÑине: можно подÑмаÑÑ, ÑÑо оно
+ознаÑÐ°ÐµÑ ÐµÐ´Ð¸Ð½ÑÑ ÑоÑÐºÑ Ð·ÑениÑ, а не
ÑказÑÐ²Ð°ÐµÑ Ð½Ð° две ÑазнÑÑ
позиÑии. ТакаÑ
+ÑоÑмÑлиÑовка пÑедмеÑа меÑÐ°ÐµÑ Ð¿Ð¾Ð½ÑÑÑ ÑоÑ
ÑакÑ, ÑÑо ÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð¸
+оÑкÑÑÑÑй иÑÑ
однÑй ÑекÑÑ Ð¿ÑедÑÑавлÑÑÑ
ÑазлиÑнÑе полиÑиÑеÑкие взглÑдÑ, коÑоÑÑе
+в коÑне неÑовмеÑÑимÑ.</p>
+
<p>ÐÑак, еÑли Ð²Ñ Ñ
оÑиÑе пÑидеÑживаÑÑÑÑ
нейÑÑалиÑеÑа Ð¼ÐµÐ¶Ð´Ñ ÑвободнÑми
-пÑогÑаммами и оÑкÑÑÑÑм иÑÑ
однÑм ÑекÑÑом,
Ñо ÑÑого ÑледÑÐµÑ Ð´Ð¾ÑÑигаÑÑ
-вÑÑажением “FLOSS”, а не “FOSS”.</p>
+пÑогÑаммами и оÑкÑÑÑÑм иÑÑ
однÑм ÑекÑÑом,
ÑÑно вÑÑажаÑÑÑ Ð¾ ÑеÑ
и дÑÑгиÑ
, Ñо
+доÑÑиÑÑ ÑÑого можно вÑÑажением “FLOSS”,
а не “FOSS”.</p>
<p>ÐÑ, ÑÑаÑÑники Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð·Ð° ÑвободнÑе
пÑогÑаммÑ, не полÑзÑемÑÑ Ð½Ð¸ Ñем, ни
дÑÑгим вÑÑажением, поÑÐ¾Ð¼Ñ ÑÑо Ð¼Ñ Ð½Ðµ Ñ
оÑим
бÑÑÑ Ð½ÐµÐ¹ÑÑалÑнÑми по ÑÑомÑ
@@ -106,13 +113,13 @@
пеÑеводам”</a>.</p>
</div>
-<p>Copyright © 2013 Richard Stallman<br />Copyright © 2014 Free
+<p>Copyright © 2013, 2015 Richard Stallman<br />Copyright © 2015 Free
Software Foundation, Inc. (translation)</p>
<p>ÐÑо пÑоизведение доÑÑÑпно по <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/deed.ru">лиÑензии
+href="http://creativecommons.org/licenses/by-nd/4.0/deed.ru">лиÑензии
Creative Commons Attribution-NoDerivs (<em>ÐÑÑибÑÑÐ¸Ñ —
Ðез
-пÑоизводнÑÑ
пÑоизведений</em>) 3.0 СШÐ</a>.</p>
+пÑоизводнÑÑ
пÑоизведений</em>) 4.0
ÐÑемиÑнаÑ</a>.</p>
<!--#include virtual="/server/bottom-notes.ru.html" -->
<div class="translators-credits">
@@ -127,7 +134,7 @@
<p class="unprintable"><!-- timestamp start -->
Ðбновлено:
-$Date: 2015/05/23 06:10:53 $
+$Date: 2015/11/09 17:58:58 $
<!-- timestamp end -->
</p>
Index: po/floss-and-foss.ru-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/floss-and-foss.ru-en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po/floss-and-foss.ru-en.html 12 Apr 2014 13:58:39 -0000 1.3
+++ po/floss-and-foss.ru-en.html 9 Nov 2015 17:58:59 -0000 1.4
@@ -39,9 +39,16 @@
“open source,” since it presents “open source”
prominently but splits “free software” apart.</p>
+<p>“Free and Open Source Software” is misleading in
+another way: it suggests that “free and open source” names
+a single point of view, rather than mentioning two different ones.
+This conceptualization of the field is an obstacle to understanding
+the fact that free software and open source are different political
+positions that disagree fundamentally.</p>
+
<p>Thus, if you want to be neutral between free software and open
-source, the way to achieve that is to say “FLOSS,” not
-“FOSS.”</p>
+source, and clear about them, the way to achieve that is to say
+“FLOSS,” not “FOSS.”</p>
<p>We in the free software movement don't use either of these
terms, because we don't want to be neutral on the political question.
@@ -81,17 +88,17 @@
of this article.</p>
</div>
-<p>Copyright © 2013 Richard Stallman</p>
+<p>Copyright © 2013, 2015 Richard Stallman</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
-Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
+Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/04/12 13:58:39 $
+$Date: 2015/11/09 17:58:59 $
<!-- timestamp end -->
</p>
</div>
Index: po/floss-and-foss.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/floss-and-foss.ru.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/floss-and-foss.ru.po 9 Nov 2015 17:49:40 -0000 1.7
+++ po/floss-and-foss.ru.po 9 Nov 2015 17:58:59 -0000 1.8
@@ -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: 2015-11-09 12:59+0000\n"
#. type: Content of: <title>
msgid "FLOSS and FOSS - GNU Project - Free Software Foundation"
@@ -121,26 +120,18 @@
"ÑекÑÑом” ÑÐ±Ð¸Ð²Ð°ÐµÑ Ñ ÑÐ¾Ð»ÐºÑ Ð¸ по дÑÑгой
пÑиÑине: можно подÑмаÑÑ, ÑÑо оно "
"ознаÑÐ°ÐµÑ ÐµÐ´Ð¸Ð½ÑÑ ÑоÑÐºÑ Ð·ÑениÑ, а не
ÑказÑÐ²Ð°ÐµÑ Ð½Ð° две ÑазнÑÑ
позиÑии. Ð¢Ð°ÐºÐ°Ñ "
"ÑоÑмÑлиÑовка пÑедмеÑа меÑÐ°ÐµÑ Ð¿Ð¾Ð½ÑÑÑ ÑоÑ
ÑакÑ, ÑÑо ÑвободнÑе пÑогÑÐ°Ð¼Ð¼Ñ Ð¸ "
-"оÑкÑÑÑÑй иÑÑ
однÑй ÑекÑÑ Ð¿ÑедÑÑавлÑÑÑ
ÑазлиÑнÑе полиÑиÑеÑкие взглÑдÑ, "
-"коÑоÑÑе в коÑне неÑовмеÑÑимÑ."
+"оÑкÑÑÑÑй иÑÑ
однÑй ÑекÑÑ Ð¿ÑедÑÑавлÑÑÑ
ÑазлиÑнÑе полиÑиÑеÑкие взглÑдÑ, коÑоÑÑе "
+"в коÑне неÑовмеÑÑимÑ."
#. type: Content of: <p>
-# | Thus, if you want to be neutral between free software and open source,
-# | {+and clear about them,+} the way to achieve that is to say
-# | “FLOSS,” not “FOSS.”
-#| msgid ""
-#| "Thus, if you want to be neutral between free software and open source, "
-#| "the way to achieve that is to say “FLOSS,” not “FOSS."
-#| "”"
msgid ""
"Thus, if you want to be neutral between free software and open source, and "
"clear about them, the way to achieve that is to say “FLOSS,” not "
"“FOSS.”"
msgstr ""
"ÐÑак, еÑли Ð²Ñ Ñ
оÑиÑе пÑидеÑживаÑÑÑÑ
нейÑÑалиÑеÑа Ð¼ÐµÐ¶Ð´Ñ ÑвободнÑми "
-"пÑогÑаммами и оÑкÑÑÑÑм иÑÑ
однÑм ÑекÑÑом,
ÑÑно вÑÑажаÑÑÑ Ð¾ ÑеÑ
и дÑÑгиÑ
, "
-"Ñо доÑÑиÑÑ ÑÑого можно "
-"вÑÑажением “FLOSS”, а не “FOSS”."
+"пÑогÑаммами и оÑкÑÑÑÑм иÑÑ
однÑм ÑекÑÑом,
ÑÑно вÑÑажаÑÑÑ Ð¾ ÑеÑ
и дÑÑгиÑ
, Ñо "
+"доÑÑиÑÑ ÑÑого можно вÑÑажением
“FLOSS”, а не “FOSS”."
#. type: Content of: <p>
msgid ""
@@ -200,19 +191,12 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
-# | Copyright © [-2013-] {+2013, 2015+} Richard Stallman
-#| msgid "Copyright © 2013 Richard Stallman"
msgid "Copyright © 2013, 2015 Richard Stallman"
msgstr ""
"Copyright © 2013, 2015 Richard 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.
-#| msgid ""
-#| "This page is licensed under a <a rel=\"license\" href=\"http://"
-#| "creativecommons.org/licenses/by-nd/4.0/\">Creative Commons Attribution-"
-#| "NoDerivatives 4.0 International License</a>."
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/philosophy floss-and-foss.ru.html po/floss-...,
GNUN <=