[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/philosophy compromise.el.html compromise.ml...
|
From: |
GNUN |
|
Subject: |
www/philosophy compromise.el.html compromise.ml... |
|
Date: |
Sat, 10 Jan 2015 12:57:20 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 15/01/10 12:57:20
Modified files:
philosophy : compromise.el.html compromise.ml.html
compromise.zh-cn.html
philosophy/po : compromise.ar.po compromise.bg.po
compromise.de.po compromise.el-diff.html
compromise.el.po compromise.es.po
compromise.fr.po compromise.hr-diff.html
compromise.hr.po compromise.it.po
compromise.ja.po compromise.ml.po
compromise.pl.po compromise.pot
compromise.pt-br.po compromise.ru.po
compromise.uk.po compromise.zh-cn-diff.html
compromise.zh-cn.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/compromise.el.html?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/compromise.ml.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/compromise.zh-cn.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.ar.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.bg.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.de.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.el-diff.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.el.po?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.es.po?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.fr.po?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.hr-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.hr.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.it.po?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.ja.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.ml.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.pl.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.pot?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.pt-br.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.ru.po?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.uk.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.zh-cn-diff.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/compromise.zh-cn.po?cvsroot=www&r1=1.18&r2=1.19
Patches:
Index: compromise.el.html
===================================================================
RCS file: /web/www/www/philosophy/compromise.el.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- compromise.el.html 20 Nov 2014 22:07:33 -0000 1.36
+++ compromise.el.html 10 Jan 2015 12:57:16 -0000 1.37
@@ -1,6 +1,7 @@
<!--#set var="PO_FILE"
value='<a href="/philosophy/po/compromise.el.po">
http://www.gnu.org/philosophy/po/compromise.el.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/compromise.html"
--><!--#set var="DIFF_FILE" value="/philosophy/po/compromise.el-diff.html"
--><!--#set var="OUTDATED_SINCE" value="2014-04-05" -->
<!--#set var="ENGLISH_PAGE" value="/philosophy/compromise.en.html" -->
@@ -13,6 +14,7 @@
<!--#include virtual="/philosophy/po/compromise.translist" -->
<!--#include virtual="/server/banner.el.html" -->
+<!--#include virtual="/server/outdated.el.html" -->
<h2>ÎÏοÏεÏγονÏÎ±Ï Î¿Î»ÎθÏιοÏ
Ï ÏÏ
μβιβαÏμοÏÏ</h2>
<div style="float: right; font-size: 90%; width: 30em; margin: 1em;
@@ -270,7 +272,7 @@
<p class="unprintable"><!-- timestamp start -->
ÎνημεÏÏθηκε:
-$Date: 2014/11/20 22:07:33 $
+$Date: 2015/01/10 12:57:16 $
<!-- timestamp end -->
</p>
Index: compromise.ml.html
===================================================================
RCS file: /web/www/www/philosophy/compromise.ml.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- compromise.ml.html 12 Aug 2014 19:59:03 -0000 1.21
+++ compromise.ml.html 10 Jan 2015 12:57:16 -0000 1.22
@@ -1,5 +1,5 @@
<!--#set var="PO_FILE"
- value='<a href="//philosophy/po/compromise.ml.po">
+ value='<a href="/philosophy/po/compromise.ml.po">
http://www.gnu.org/philosophy/po/compromise.ml.po</a>'
--><!--#set var="ORIGINAL_FILE" value="/philosophy/compromise.html"
--><!--#set var="DIFF_FILE" value=""
@@ -259,7 +259,7 @@
<p class="unprintable"><!-- timestamp start -->
à´ªàµà´¤àµà´àµà´à´¿à´¯à´¤àµàµ:
-$Date: 2014/08/12 19:59:03 $
+$Date: 2015/01/10 12:57:16 $
<!-- timestamp end -->
</p>
Index: compromise.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/compromise.zh-cn.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- compromise.zh-cn.html 1 Sep 2014 07:41:18 -0000 1.22
+++ compromise.zh-cn.html 10 Jan 2015 12:57:17 -0000 1.23
@@ -1,4 +1,9 @@
-
+<!--#set var="PO_FILE"
+ value='<a href="/philosophy/po/compromise.zh-cn.po">
+ http://www.gnu.org/philosophy/po/compromise.zh-cn.po</a>'
+ --><!--#set var="ORIGINAL_FILE" value="/philosophy/compromise.html"
+ --><!--#set var="DIFF_FILE" value="/philosophy/po/compromise.zh-cn-diff.html"
+ --><!--#set var="OUTDATED_SINCE" value="2013-05-05" -->
<!--#include virtual="/server/header.zh-cn.html" -->
@@ -14,13 +19,8 @@
-->
<!--#include virtual="/philosophy/po/compromise.translist" -->
<!--#include virtual="/server/banner.zh-cn.html" -->
-<!--#set var="PO_FILE"
- value='<a href="http://www.gnu.org/philosophy/po/compromise.zh-cn.po";>
- http://www.gnu.org/philosophy/po/compromise.zh-cn.po</a>' -->
- <!--#set var="ORIGINAL_FILE" value="/philosophy/compromise.html" -->
- <!--#set var="DIFF_FILE" value="/philosophy/po/compromise.zh-cn-diff.html" -->
- <!--#set var="OUTDATED_SINCE" value="2013-05-05" -->
- <!--#include virtual="/server/outdated.zh-cn.html" -->
+<!--#include virtual="/server/outdated.zh-cn.html" -->
+
<h2>é¿å
æ¯çæ§ç妥å</h2>
<div style="float: right; font-size: 90%; width: 30em; margin: 1em;
@@ -140,7 +140,7 @@
<p class="unprintable"><!-- timestamp start -->
æ´æ°ï¼
-$Date: 2014/09/01 07:41:18 $
+$Date: 2015/01/10 12:57:17 $
<!-- timestamp end -->
</p>
Index: po/compromise.ar.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.ar.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- po/compromise.ar.po 8 Nov 2014 22:00:14 -0000 1.25
+++ po/compromise.ar.po 10 Jan 2015 12:57:17 -0000 1.26
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2013-05-11 21:22+0200\n"
"Last-Translator: Rafik E. Younan <address@hidden>\n"
"Language-Team: Arabic <address@hidden>\n"
@@ -17,6 +17,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-01-10 12:55+0000\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Lokalize 1.5\n"
@@ -31,18 +32,35 @@
msgid "Avoiding Ruinous Compromises"
msgstr "تجÙب اÙÙ
ساÙÙ
ات اÙÙ
دÙ
رة"
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "بÙÙÙ
<strong>رÙتشارد ستÙÙÙ
Ù</strong>"
+
# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <blockquote><p>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em>”أعÙÙت Ùب٠خÙ
سة ÙعشرÙ٠عاÙ
Ùا <a
href=\"/gnu/initial-announcement."
@@ -56,11 +74,6 @@
# type: Content of: <p>
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "بÙÙÙ
<strong>رÙتشارد ستÙÙÙ
Ù</strong>"
-
-# type: Content of: <p>
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -105,6 +118,10 @@
"اÙعÙ
ÙÙ
ÙØ©</a> (GNU GPL) ÙتساÙÙ
اÙشرÙات اÙÙبÙرة
ÙÙتÙزع اÙبرÙ
جÙات اÙÙ
غطاة "
"باÙإصدار اÙثاÙØ« Ù
Ù GPL ÙÙتضع بعض براءات
اÙاختراع تØت تÙ٠اÙبÙÙد."
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
# type: Content of: <p>
#. type: Content of: <p>
msgid ""
@@ -225,6 +242,10 @@
"ÙÙÙذا ÙØ¥ÙÙا <a
href=\"/philosophy/open-source-misses-the-point.html\">Ùا "
"ÙدعÙ
اÙÙ
صادر اÙÙ
ÙتÙØØ©</a>."
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
# type: Content of: <p>
#. type: Content of: <p>
msgid ""
@@ -379,10 +400,15 @@
"اÙÙ
ساÙÙ
Ø© أساس ÙتØÙÙÙ Ùد٠عاÙÙØ ÙÙ٠اØذر Ù
Ù
اÙÙ
ساÙÙ
ات اÙت٠تبعد ع٠اÙÙدÙ."
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For a similar point in a different area of life, see <a href=\"http://www.";
+#| "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-"
+#| "change\">\"'Nudge' is not enough\"</a>."
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
"ÙÙÙاط شبÙÙØ© Ù٠أÙج٠Ù
ختÙÙØ© Ù٠اÙØÙØ§Ø©Ø Ø£Ùظر
<a href=\"http://www.guardian.co.";
"uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\">\"'ÙÙزة'
"
@@ -436,8 +462,12 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+#| "\">Richard Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr ""
"Copyright © 2008Ø 2009, 2014 <a href=\"http://www.stallman.org/";
Index: po/compromise.bg.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.bg.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- po/compromise.bg.po 29 Dec 2014 09:29:46 -0000 1.25
+++ po/compromise.bg.po 10 Jan 2015 12:57:17 -0000 1.26
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2009-10-28 16:38+0200\n"
"Last-Translator: Yavor Doganov <address@hidden>\n"
"Language-Team: Bulgarian <address@hidden>\n"
@@ -29,18 +29,35 @@
msgid "Avoiding Ruinous Compromises"
msgstr "ÐзбÑгване на гибелни компÑомиÑи"
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "Ð¾Ñ <strong>РиÑаÑд СÑолман</strong>"
+
# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <blockquote><p>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em>âÐÑеди 25 години, <a
href=\"/gnu/initial-announcement.html\">на 27 "
@@ -56,11 +73,6 @@
# type: Content of: <p>
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "Ð¾Ñ <strong>РиÑаÑд СÑолман</strong>"
-
-# type: Content of: <p>
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -108,6 +120,10 @@
"големиÑе компании биÑ
а допÑинаÑÑли кÑм
ÑоÑÑÑÐµÑ Ð¿Ð¾Ð´ ÐÐÐ 3 и биÑ
а го "
"ÑазпÑоÑÑÑанÑвали, и биÑ
а довели нÑкои
паÑенÑи под пÑовизииÑе на Ñези клаÑзи."
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
# type: Content of: <p>
#. type: Content of: <p>
msgid ""
@@ -240,6 +256,10 @@
"ÑенноÑÑи, а Ñова ги заÑвÑÑждава и ÑÑилва.
ÐаÑова ние <a href=\"/philosophy/"
"open-source-misses-the-point.html\">не поддÑÑжаме
оÑвоÑÐµÐ½Ð¸Ñ ÐºÐ¾Ð´</a>."
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
# type: Content of: <p>
#. type: Content of: <p>
msgid ""
@@ -416,7 +436,7 @@
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
# type: Content of: <div>
@@ -466,8 +486,12 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+#| "\">Richard Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr ""
"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
Index: po/compromise.de.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.de.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- po/compromise.de.po 9 Oct 2014 14:33:35 -0000 1.23
+++ po/compromise.de.po 10 Jan 2015 12:57:17 -0000 1.24
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2014-04-14 22:00+0200\n"
"Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German <address@hidden>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-01-10 12:55+0000\n"
#. type: Content of: <title>
msgid "Avoiding Ruinous Compromises - GNU Project - Free Software Foundation"
@@ -23,17 +24,46 @@
msgid "Avoiding Ruinous Compromises"
msgstr "Ruinöse Kompromisse vermeiden"
-#. type: Content of: <div><p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "von <strong>Richard Stallman</strong>"
+
+#. type: Content of: <blockquote><p>
+# | [-<em>“Twenty-five-]{+“Twenty-five+} years ago <a
+# | href=\"/gnu/initial-announcement.html\">on September 27, 1983, I announced
+# | a plan</a> to create a completely free operating system called
+# | GNU—for ‘GNU's Not Unix’. As part of the 25th
+# | anniversary of the GNU system, I have written this article on how our
+# | community can avoid ruinous compromises. In addition to avoiding such
+# | compromises, there are many ways you can <a [-href=\"/help/\">help-]
+# | {+href=\"/help/help.html\">help+} GNU</a> and free software. One basic
+# | way is to <a
+# |
href=\"https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\";>
+# | join the Free Software Foundation</a> as an Associate
+# | [-Member.”</em>—<b>Richard-]
+# | {+Member.”—<b>Richard+} Stallman</b>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em><q>Vor fünfundzwanzig Jahren, <a href=\"/gnu/initial-announcement\">am "
@@ -50,10 +80,6 @@
" <cite>Richard Stallman</cite>"
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "von <strong>Richard Stallman</strong>"
-
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -102,6 +128,10 @@
"GPLv3 abgedeckte Software verbreiten und damit einige Patente unter die "
"Wirkung dieser Bestimmungen bringen."
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"<a href=\"/licenses/lgpl.html\">The Lesser GPL</a>'s purpose is a "
@@ -232,6 +262,10 @@
"\"/philosophy/open-source-misses-the-point\">Open Source nicht unterstützt</"
"a>."
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"To establish a free community fully and lastingly, we need to do more than "
@@ -396,10 +430,19 @@
"zu erreichen, aber Vorsicht vor Kompromissen, die vom Ziel wegführen."
#. type: Content of: <p>
+# | For a similar point in a different area of life, see <a
+# |
[-href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>\"'Nudge'-]
+# |
{+href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>
+# | “Nudge”+} is not [-enough\"</a>.-] {+enough</a>.+}
+#, fuzzy
+#| msgid ""
+#| "For a similar point in a different area of life, see <a href=\"http://www.";
+#| "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-"
+#| "change\">\"'Nudge' is not enough\"</a>."
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
"Für einen ähnlichen Punkt in einem anderen Lebensbereich siehe <a href="
"\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-";
@@ -454,8 +497,14 @@
"standards/README.translations\">LIESMICH für Ãbersetzungen</a>."
#. type: Content of: <div><p>
+# | Copyright © 2008, 2009, [-2014-] {+2014, 2015+} <a
+# | href=\"http://www.stallman.org/\";>Richard Stallman</a>.
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+#| "\">Richard Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr "Copyright © 2008, 2009, 2014 Richard Stallman."
Index: po/compromise.el-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.el-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/compromise.el-diff.html 20 Nov 2014 18:29:55 -0000 1.8
+++ po/compromise.el-diff.html 10 Jan 2015 12:57:17 -0000 1.9
@@ -14,25 +14,47 @@
<!-- Parent-Version: 1.77 -->
<title>Avoiding Ruinous Compromises
- GNU Project - Free Software Foundation</title>
+<span class="inserted"><ins><em><style type="text/css"
media="print,screen">
+<!--
+ .quote {
+ font-size: 90%;
+ max-width: 30em;
+ padding: .5em 1.5em;
+ background-color: #ececec;
+ border-radius: 1em;
+ -moz-border-radius: 1em;
+ -khtml-border-radius: 1em;
+ -webkit-border-radius: 1em;
+ -opera-border-radius: 1em;
+ }
+ .quote.imgright { margin: .3em 1em 1em 1em; }
+ .quote b { font-style: normal; }
+-->
+</style></em></ins></span>
<!--#include virtual="/philosophy/po/compromise.translist" -->
<!--#include virtual="/server/banner.html" -->
<h2>Avoiding Ruinous Compromises</h2>
-<div style="float: right; font-size: 90%; width: 30em; margin: 1em;
+<span class="removed"><del><strong><div style="float: right; font-size:
90%; width: 30em; margin: 1em;
background-color: #ececec; padding: 1em; -moz-border-radius: 1em;
-margin-top: 4em;"><p><em>“Twenty-five years
+margin-top:
4em;"><p><em>“Twenty-five</strong></del></span>
+
+<span class="inserted"><ins><em><p>by <strong>Richard
Stallman</strong></p>
+
+<blockquote class="quote
imgright"><p>“Twenty-five</em></ins></span> years
ago <a href="/gnu/initial-announcement.html">on September 27, 1983, I
announced a plan</a> to create a completely free operating system
called GNU—for ‘GNU's Not Unix’. As part of the
25th anniversary of the GNU system, I have written this article on how
our community can avoid ruinous compromises. In addition to avoiding
-such compromises, there are many ways you can <a href="/help/">help
+such compromises, there are many ways you can <a <span
class="removed"><del><strong>href="/help/">help</strong></del></span> <span
class="inserted"><ins><em>href="/help/help.html">help</em></ins></span>
GNU</a> and free software. One basic way is
to <a
href="https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052">
join the Free Software Foundation</a> as an Associate
-Member.”</em>—<b>Richard
Stallman</b></p></div>
+<span
class="removed"><del><strong>Member.”</em>—<b>Richard
Stallman</b></p></div>
-<p>by <strong>Richard Stallman</strong></p>
+<p>by <strong>Richard
Stallman</strong></p></strong></del></span>
+<span class="inserted"><ins><em>Member.”—<b>Richard
Stallman</b></p></blockquote></em></ins></span>
<p>The free software movement aims for a social
change: <a href="/philosophy/free-sw.html">to make all software
@@ -56,7 +78,7 @@
software and thus bring some patents under the effect of these
provisions. </p>
-<img src="/graphics/gplv3-large.png" alt="" style="float: left;" />
+<img src="/graphics/gplv3-large.png" <span
class="removed"><del><strong>alt="" style="float: left;"</strong></del></span>
<span class="inserted"><ins><em>alt=" [GPLv3 Logo] "
class="imgleft"</em></ins></span> />
<p><a href="/licenses/lgpl.html">The Lesser GPL</a>'s
purpose is a
compromise: we use it on certain chosen free libraries to permit their
@@ -115,7 +137,8 @@
<a href="/philosophy/open-source-misses-the-point.html">do not support
open source.</a></p>
-<img src="/graphics/gnulaptop.png" alt="" style="float: right;" />
+<img src="/graphics/gnulaptop.png" <span
class="removed"><del><strong>alt="" style="float: right;"</strong></del></span>
+ <span class="inserted"><ins><em>alt=" [Levitating Gnu with a laptop] "
class="imgright"</em></ins></span> />
<p>To establish a free community fully and lastingly, we need to do
more than get people to use some free software. We need to spread the
@@ -196,9 +219,11 @@
<p>
For a similar point in a different area of life,
-see <a
href="http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change">";'Nudge'
-is not enough"</a>.
+see <a <span
class="removed"><del><strong>href="http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change">";'Nudge'</strong></del></span>
+<span
class="inserted"><ins><em>href="http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change">
+“Nudge”</em></ins></span> is not <span
class="removed"><del><strong>enough"</a>.</strong></del></span> <span
class="inserted"><ins><em>enough</a>.</em></ins></span>
</p>
+
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
@@ -228,7 +253,7 @@
information on coordinating and submitting translations of this
article.</p>
</div>
-<p>Copyright © 2008, 2009, 2014 <a
href="http://www.stallman.org/">Richard
+<p>Copyright © 2008, 2009, <span
class="removed"><del><strong>2014</strong></del></span> <span
class="inserted"><ins><em>2014, 2015</em></ins></span> <a
href="http://www.stallman.org/">Richard
Stallman</a>.</p>
<p>This page is licensed under a <a rel="license"
@@ -239,7 +264,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/11/20 18:29:55 $
+$Date: 2015/01/10 12:57:17 $
<!-- timestamp end -->
</p>
</div>
Index: po/compromise.el.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.el.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- po/compromise.el.po 20 Nov 2014 18:29:55 -0000 1.36
+++ po/compromise.el.po 10 Jan 2015 12:57:17 -0000 1.37
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2012-01-26 23:26+0200\n"
"Last-Translator: Georgios Zarkadas <address@hidden>\n"
"Language-Team: Greek <address@hidden>\n"
@@ -28,18 +28,35 @@
msgid "Avoiding Ruinous Compromises"
msgstr "ÎÏοÏεÏγονÏÎ±Ï Î¿Î»ÎθÏιοÏ
Ï ÏÏ
μβιβαÏμοÏÏ"
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "αÏÏ Ïον <strong>Richard Stallman</strong>"
+
# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <blockquote><p>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em>“ÎικοÏιÏÎνÏε ÏÏÏνια ÏÏιν <a
href=\"/gnu/initial-announcement.html"
@@ -56,11 +73,6 @@
# type: Content of: <p>
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "αÏÏ Ïον <strong>Richard Stallman</strong>"
-
-# type: Content of: <p>
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -111,6 +123,10 @@
"καλÏ
ÏÏÏμενο αÏÏ Ïην GPLv3 και εÏομÎνÏÏ Î½Î±
ÏÎÏοÏ
ν οÏιÏμÎÎ½ÎµÏ ÏαÏÎνÏÎµÏ Ï
ÏÏ Ïην "
"εÏίδÏαÏη αÏ
ÏÏν ÏÏν ÏÏÏν."
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
# type: Content of: <p>
#. type: Content of: <p>
msgid ""
@@ -253,6 +269,10 @@
"και <a href=\"/philosophy/open-source-misses-the-point.html\">δεν "
"Ï
ÏοÏÏηÏίζοÏ
με Ïον ανοιÏÏÏ ÎºÏδικα.</a>"
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
# type: Content of: <p>
#. type: Content of: <p>
msgid ""
@@ -432,10 +452,15 @@
"αÏÏ Ïον ÏÏÏÏο."
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For a similar point in a different area of life, see <a href=\"http://www.";
+#| "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-"
+#| "change\">\"'Nudge' is not enough\"</a>."
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
"Îια Îνα ÏαÏÏμοιο εÏιÏείÏημα Ï' Îνα
διαÏοÏεÏÎ¹ÎºÏ ÏομÎα ÏÎ·Ï Î¶ÏήÏ, δείÏε Ïο <a "
"href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-";
@@ -488,8 +513,12 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+#| "\">Richard Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr ""
"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
Index: po/compromise.es.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.es.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- po/compromise.es.po 5 Apr 2014 09:40:59 -0000 1.41
+++ po/compromise.es.po 10 Jan 2015 12:57:18 -0000 1.42
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2014-04-05 09:28+0100\n"
"Last-Translator: Dora Scilipoti <dora AT gnu DOT org>\n"
"Language-Team: Spanish <address@hidden>\n"
@@ -17,6 +17,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-01-10 12:55+0000\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"X-Poedit-Language: Spanish\n"
@@ -28,17 +29,46 @@
msgid "Avoiding Ruinous Compromises"
msgstr "Evitar compromisos ruinosos"
-#. type: Content of: <div><p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "por <strong>Richard Stallman</strong>"
+
+#. type: Content of: <blockquote><p>
+# | [-<em>“Twenty-five-]{+“Twenty-five+} years ago <a
+# | href=\"/gnu/initial-announcement.html\">on September 27, 1983, I announced
+# | a plan</a> to create a completely free operating system called
+# | GNU—for ‘GNU's Not Unix’. As part of the 25th
+# | anniversary of the GNU system, I have written this article on how our
+# | community can avoid ruinous compromises. In addition to avoiding such
+# | compromises, there are many ways you can <a [-href=\"/help/\">help-]
+# | {+href=\"/help/help.html\">help+} GNU</a> and free software. One basic
+# | way is to <a
+# |
href=\"https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\";>
+# | join the Free Software Foundation</a> as an Associate
+# | [-Member.”</em>—<b>Richard-]
+# | {+Member.”—<b>Richard+} Stallman</b>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em>«Hace veinticinco años, <a href=\"/gnu/initial-announcement.html\">el
27 "
@@ -53,10 +83,6 @@
"asociado».</em> <br /> <b>Richard Stallman</b>"
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "por <strong>Richard Stallman</strong>"
-
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -104,6 +130,10 @@
"GPLv3, y de ese modo, traer algunas patentes bajo los efectos de estas "
"previsiones."
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"<a href=\"/licenses/lgpl.html\">The Lesser GPL</a>'s purpose is a "
@@ -235,6 +265,10 @@
"refuerza. Este es el motivo por el que <a href=\"/philosophy/open-source-"
"misses-the-point.html\">no damos soporte al «código abierto»</a>."
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"To establish a free community fully and lastingly, we need to do more than "
@@ -399,10 +433,19 @@
"atentos a los compromisos que nos alejan de lo que se quiere alcanzar."
#. type: Content of: <p>
+# | For a similar point in a different area of life, see <a
+# |
[-href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>\"'Nudge'-]
+# |
{+href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>
+# | “Nudge”+} is not [-enough\"</a>.-] {+enough</a>.+}
+#, fuzzy
+#| msgid ""
+#| "For a similar point in a different area of life, see <a href=\"http://www.";
+#| "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-"
+#| "change\">\"'Nudge' is not enough\"</a>."
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
"Para un punto de vista similar, en otro aspecto de la vida, vea «<a href="
"\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-";
@@ -456,8 +499,14 @@
"de este sitio web."
#. type: Content of: <div><p>
+# | Copyright © 2008, 2009, [-2014-] {+2014, 2015+} <a
+# | href=\"http://www.stallman.org/\";>Richard Stallman</a>.
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+#| "\">Richard Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr ""
"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
Index: po/compromise.fr.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.fr.po,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- po/compromise.fr.po 19 Apr 2014 12:21:55 -0000 1.46
+++ po/compromise.fr.po 10 Jan 2015 12:57:18 -0000 1.47
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2014-04-19 13:57+0200\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <address@hidden>\n"
@@ -15,6 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-01-10 12:55+0000\n"
"X-Poedit-Language: French\n"
"X-Poedit-Country: FRANCE\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -29,17 +30,46 @@
msgid "Avoiding Ruinous Compromises"
msgstr "Ãviter les compromis ruineux"
-#. type: Content of: <div><p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "par <strong>Richard Stallman</strong>"
+
+#. type: Content of: <blockquote><p>
+# | [-<em>“Twenty-five-]{+“Twenty-five+} years ago <a
+# | href=\"/gnu/initial-announcement.html\">on September 27, 1983, I announced
+# | a plan</a> to create a completely free operating system called
+# | GNU—for ‘GNU's Not Unix’. As part of the 25th
+# | anniversary of the GNU system, I have written this article on how our
+# | community can avoid ruinous compromises. In addition to avoiding such
+# | compromises, there are many ways you can <a [-href=\"/help/\">help-]
+# | {+href=\"/help/help.html\">help+} GNU</a> and free software. One basic
+# | way is to <a
+# |
href=\"https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\";>
+# | join the Free Software Foundation</a> as an Associate
+# | [-Member.”</em>—<b>Richard-]
+# | {+Member.”—<b>Richard+} Stallman</b>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em>« Il y a vingt-cinq ans, <a href=\"/gnu/initial-announcement.html\">le "
@@ -55,10 +85,6 @@
"Stallman</b>"
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "par <strong>Richard Stallman</strong>"
-
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -108,6 +134,10 @@
"communauté et distribuer des logiciels sous licence GPLv3 et donc amener "
"certains brevets à respecter ces dispositions."
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"<a href=\"/licenses/lgpl.html\">The Lesser GPL</a>'s purpose is a "
@@ -242,6 +272,10 @@
"C'est pourquoi nous <a href=\"/philosophy/open-source-misses-the-point.html"
"\">ne soutenons pas l'open source</a>."
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"To establish a free community fully and lastingly, we need to do more than "
@@ -411,10 +445,19 @@
"atteindre."
#. type: Content of: <p>
+# | For a similar point in a different area of life, see <a
+# |
[-href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>\"'Nudge'-]
+# |
{+href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>
+# | “Nudge”+} is not [-enough\"</a>.-] {+enough</a>.+}
+#, fuzzy
+#| msgid ""
+#| "For a similar point in a different area of life, see <a href=\"http://www.";
+#| "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-"
+#| "change\">\"'Nudge' is not enough\"</a>."
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
"Vous trouverez un point de vue similaire appliqué à un domaine différent
de "
"la vie, dans « <a
href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/";
@@ -472,8 +515,14 @@
"README.translations.html\">guide de traduction</a>."
#. type: Content of: <div><p>
+# | Copyright © 2008, 2009, [-2014-] {+2014, 2015+} <a
+# | href=\"http://www.stallman.org/\";>Richard Stallman</a>.
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+#| "\">Richard Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr ""
"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
Index: po/compromise.hr-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.hr-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/compromise.hr-diff.html 4 Jun 2014 00:29:37 -0000 1.1
+++ po/compromise.hr-diff.html 10 Jan 2015 12:57:18 -0000 1.2
@@ -14,25 +14,47 @@
<!-- Parent-Version: <span
class="removed"><del><strong>1.76</strong></del></span> <span
class="inserted"><ins><em>1.77</em></ins></span> -->
<title>Avoiding Ruinous Compromises
- GNU Project - Free Software Foundation</title>
+<span class="inserted"><ins><em><style type="text/css"
media="print,screen">
+<!--
+ .quote {
+ font-size: 90%;
+ max-width: 30em;
+ padding: .5em 1.5em;
+ background-color: #ececec;
+ border-radius: 1em;
+ -moz-border-radius: 1em;
+ -khtml-border-radius: 1em;
+ -webkit-border-radius: 1em;
+ -opera-border-radius: 1em;
+ }
+ .quote.imgright { margin: .3em 1em 1em 1em; }
+ .quote b { font-style: normal; }
+-->
+</style></em></ins></span>
<!--#include virtual="/philosophy/po/compromise.translist" -->
<!--#include virtual="/server/banner.html" -->
<h2>Avoiding Ruinous Compromises</h2>
-<div style="float: right; font-size: 90%; width: 30em; margin: 1em;
+<span class="removed"><del><strong><div style="float: right; font-size:
90%; width: 30em; margin: 1em;
background-color: #ececec; padding: 1em; -moz-border-radius: 1em;
-margin-top: 4em;"><p><em>“Twenty-five years
+margin-top:
4em;"><p><em>“Twenty-five</strong></del></span>
+
+<span class="inserted"><ins><em><p>by <strong>Richard
Stallman</strong></p>
+
+<blockquote class="quote
imgright"><p>“Twenty-five</em></ins></span> years
ago <a href="/gnu/initial-announcement.html">on September 27, 1983, I
announced a plan</a> to create a completely free operating system
called GNU—for ‘GNU's Not Unix’. As part of the
25th anniversary of the GNU system, I have written this article on how
our community can avoid ruinous compromises. In addition to avoiding
-such compromises, there are many ways you can <a href="/help/">help
+such compromises, there are many ways you can <a <span
class="removed"><del><strong>href="/help/">help</strong></del></span> <span
class="inserted"><ins><em>href="/help/help.html">help</em></ins></span>
GNU</a> and free software. One basic way is
to <a
href="https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052">
join the Free Software Foundation</a> as an Associate
-Member.”</em>—<b>Richard
Stallman</b></p></div>
+<span
class="removed"><del><strong>Member.”</em>—<b>Richard
Stallman</b></p></div>
-<p>by <strong>Richard Stallman</strong></p>
+<p>by <strong>Richard
Stallman</strong></p></strong></del></span>
+<span class="inserted"><ins><em>Member.”—<b>Richard
Stallman</b></p></blockquote></em></ins></span>
<p>The free software movement aims for a social
change: <a href="/philosophy/free-sw.html">to make all software
@@ -56,7 +78,7 @@
software and thus bring some patents under the effect of these
provisions. </p>
-<img src="/graphics/gplv3-large.png" alt="" style="float: left;" />
+<img src="/graphics/gplv3-large.png" <span
class="removed"><del><strong>alt="" style="float: left;"</strong></del></span>
<span class="inserted"><ins><em>alt=" [GPLv3 Logo] "
class="imgleft"</em></ins></span> />
<p><a href="/licenses/lgpl.html">The Lesser GPL</a>'s
purpose is a
compromise: we use it on certain chosen free libraries to permit their
@@ -115,7 +137,8 @@
<a href="/philosophy/open-source-misses-the-point.html">do not support
open source.</a></p>
-<img src="/graphics/gnulaptop.png" alt="" style="float: right;" />
+<img src="/graphics/gnulaptop.png" <span
class="removed"><del><strong>alt="" style="float: right;"</strong></del></span>
+ <span class="inserted"><ins><em>alt=" [Levitating Gnu with a laptop] "
class="imgright"</em></ins></span> />
<p>To establish a free community fully and lastingly, we need to do
more than get people to use some free software. We need to spread the
@@ -196,9 +219,11 @@
<p>
For a similar point in a different area of life,
-see <a
href="http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change">";'Nudge'
-is not enough"</a>.
+see <a <span
class="removed"><del><strong>href="http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change">";'Nudge'</strong></del></span>
+<span
class="inserted"><ins><em>href="http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change">
+“Nudge”</em></ins></span> is not <span
class="removed"><del><strong>enough"</a>.</strong></del></span> <span
class="inserted"><ins><em>enough</a>.</em></ins></span>
</p>
+
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
@@ -228,7 +253,7 @@
information on coordinating and submitting translations of this
article.</p>
</div>
-<p>Copyright © 2008, <span
class="removed"><del><strong>2009</strong></del></span> <span
class="inserted"><ins><em>2009, 2014</em></ins></span> <a
href="http://www.stallman.org/">Richard
+<p>Copyright © 2008, <span
class="removed"><del><strong>2009</strong></del></span> <span
class="inserted"><ins><em>2009, 2014, 2015</em></ins></span> <a
href="http://www.stallman.org/">Richard
Stallman</a>.</p>
<p>This page is licensed under a <a rel="license"
@@ -241,7 +266,7 @@
<span class="inserted"><ins><em><p</em></ins></span>
class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2014/06/04 00:29:37 $
+$Date: 2015/01/10 12:57:18 $
<!-- timestamp end -->
</p>
</div>
Index: po/compromise.hr.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.hr.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- po/compromise.hr.po 5 Apr 2014 00:42:11 -0000 1.14
+++ po/compromise.hr.po 10 Jan 2015 12:57:18 -0000 1.15
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2013-05-06 21:44+0100\n"
"Last-Translator: Marin Rameša <address@hidden>\n"
"Language-Team: www-hr <address@hidden>\n"
@@ -26,17 +26,46 @@
msgid "Avoiding Ruinous Compromises"
msgstr "Izbjegavanje pogubnih kompromisa"
-#. type: Content of: <div><p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "<strong>Richard Stallman</strong>"
+
+#. type: Content of: <blockquote><p>
+# | [-<em>“Twenty-five-]{+“Twenty-five+} years ago <a
+# | href=\"/gnu/initial-announcement.html\">on September 27, 1983, I announced
+# | a plan</a> to create a completely free operating system called
+# | GNU—for ‘GNU's Not Unix’. As part of the 25th
+# | anniversary of the GNU system, I have written this article on how our
+# | community can avoid ruinous compromises. In addition to avoiding such
+# | compromises, there are many ways you can <a [-href=\"/help/\">help-]
+# | {+href=\"/help/help.html\">help+} GNU</a> and free software. One basic
+# | way is to <a
+# |
href=\"https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\";>
+# | join the Free Software Foundation</a> as an Associate
+# | [-Member.”</em>—<b>Richard-]
+# | {+Member.”—<b>Richard+} Stallman</b>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em>“Prije dvadeset i pet godina <a href=\"/gnu/initial-announcement."
@@ -51,10 +80,6 @@
"<b>Richard Stallman</b>"
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "<strong>Richard Stallman</strong>"
-
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -100,6 +125,10 @@
"distribuirale softver pod GPLv3 i time dovele neke od patenata pod efekt tih "
"odredbi."
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"<a href=\"/licenses/lgpl.html\">The Lesser GPL</a>'s purpose is a "
@@ -225,6 +254,10 @@
"vrijednosti, i to ih potvrÄuje i pojaÄava. Zato mi <a href=\"/philosophy/"
"open-source-misses-the-point.html\">ne podržavamo otvoreni izvorni kod.</a>"
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"To establish a free community fully and lastingly, we need to do more than "
@@ -385,10 +418,19 @@
"kompromisa koji vode dalje od cilja. "
#. type: Content of: <p>
+# | For a similar point in a different area of life, see <a
+# |
[-href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>\"'Nudge'-]
+# |
{+href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>
+# | “Nudge”+} is not [-enough\"</a>.-] {+enough</a>.+}
+#, fuzzy
+#| msgid ""
+#| "For a similar point in a different area of life, see <a href=\"http://www.";
+#| "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-"
+#| "change\">\"'Nudge' is not enough\"</a>."
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
"Za sliÄan zakljuÄak u drugaÄijem podruÄju života, pogledajte <a href="
"\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-";
@@ -439,14 +481,14 @@
"prijevode</a>."
#. type: Content of: <div><p>
-# | Copyright © 2008, [-2009-] {+2009, 2014+} <a
+# | Copyright © 2008, [-2009-] {+2009, 2014, 2015+} <a
# | href=\"http://www.stallman.org/\";>Richard Stallman</a>.
#, fuzzy
#| msgid ""
#| "Copyright © 2008, 2009 <a href=\"http://www.stallman.org/\";>Richard "
#| "Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr ""
"Copyright © 2008, 2009 <a href=\"http://www.stallman.org/\";>Richard "
Index: po/compromise.it.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.it.po,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- po/compromise.it.po 12 Apr 2014 15:32:06 -0000 1.43
+++ po/compromise.it.po 10 Jan 2015 12:57:18 -0000 1.44
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2014-04-12 16:20+0100\n"
"Last-Translator: Andrea Pescetti <address@hidden>\n"
"Language-Team: Italian\n"
@@ -13,6 +13,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-01-10 12:55+0000\n"
"X-Generator: Poedit 1.5.4\n"
# type: Content of: <title>
@@ -26,18 +27,48 @@
msgid "Avoiding Ruinous Compromises"
msgstr "Evitare compromessi disastrosi"
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "di <strong>Richard Stallman</strong>"
+
# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <blockquote><p>
+# | [-<em>“Twenty-five-]{+“Twenty-five+} years ago <a
+# | href=\"/gnu/initial-announcement.html\">on September 27, 1983, I announced
+# | a plan</a> to create a completely free operating system called
+# | GNU—for ‘GNU's Not Unix’. As part of the 25th
+# | anniversary of the GNU system, I have written this article on how our
+# | community can avoid ruinous compromises. In addition to avoiding such
+# | compromises, there are many ways you can <a [-href=\"/help/\">help-]
+# | {+href=\"/help/help.html\">help+} GNU</a> and free software. One basic
+# | way is to <a
+# |
href=\"https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\";>
+# | join the Free Software Foundation</a> as an Associate
+# | [-Member.”</em>—<b>Richard-]
+# | {+Member.”—<b>Richard+} Stallman</b>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em>“Venticinque anni fa, <a href=\"/gnu/initial-announcement.it.html"
@@ -54,11 +85,6 @@
# type: Content of: <p>
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "di <strong>Richard Stallman</strong>"
-
-# type: Content of: <p>
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -107,6 +133,10 @@
"dalla GPLv3, così da portare alcuni brevetti sotto l'effetto di queste "
"clausole. "
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
# type: Content of: <p>
#. type: Content of: <p>
msgid ""
@@ -243,6 +273,10 @@
"philosophy/open-source-misses-the-point.it.html\">non sosteniamo l'“"
"open source”</a>."
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
# type: Content of: <p>
#. type: Content of: <p>
msgid ""
@@ -417,10 +451,19 @@
"attenti ai compromessi che allontanano da quell'obiettivo. "
#. type: Content of: <p>
+# | For a similar point in a different area of life, see <a
+# |
[-href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>\"'Nudge'-]
+# |
{+href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>
+# | “Nudge”+} is not [-enough\"</a>.-] {+enough</a>.+}
+#, fuzzy
+#| msgid ""
+#| "For a similar point in a different area of life, see <a href=\"http://www.";
+#| "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-"
+#| "change\">\"'Nudge' is not enough\"</a>."
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
"Per un discorso simile in un contesto diverso, si veda questo <a href="
"\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-";
@@ -475,8 +518,14 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
+# | Copyright © 2008, 2009, [-2014-] {+2014, 2015+} <a
+# | href=\"http://www.stallman.org/\";>Richard Stallman</a>.
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+#| "\">Richard Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr ""
"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
Index: po/compromise.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.ja.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- po/compromise.ja.po 28 Apr 2014 05:24:05 -0000 1.17
+++ po/compromise.ja.po 10 Jan 2015 12:57:18 -0000 1.18
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2014-04-28 14:05+0900\n"
"Last-Translator: NIIBE Yutaka <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-01-10 12:55+0000\n"
#. type: Content of: <title>
msgid "Avoiding Ruinous Compromises - GNU Project - Free Software Foundation"
@@ -25,17 +26,33 @@
msgid "Avoiding Ruinous Compromises"
msgstr "ç ´æ»
çãªæè¡·æ¡ãé¿ãã"
-#. type: Content of: <div><p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "<strong>ãªãã£ã¼ãã»ã¹ãã¼ã«ãã³</strong>è"
+
+#. type: Content of: <blockquote><p>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em>“25å¹´åã®<a
href=\"/gnu/initial-announcement.html\">1983å¹´9æ27æ¥ã"
@@ -50,10 +67,6 @@
"<b>ãªãã£ã¼ãã»ã¹ãã¼ã«ãã³</b>"
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "<strong>ãªãã£ã¼ãã»ã¹ãã¼ã«ãã³</strong>è"
-
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -97,6 +110,10 @@
"ãã¡ã¯å¦¥åããã¾ããã大ããªä¼ç¤¾ãGPLv3ã®ã½ããã¦ã§ã¢ã«è²¢ç®ããé
å¸ããããã"
"ã®æ¡é
ã«ãããã£ã¦ããç¹è¨±ããããããã¨ãã§ããããã«ãã¨èããããã§ãã"
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"<a href=\"/licenses/lgpl.html\">The Lesser GPL</a>'s purpose is a "
@@ -220,6 +237,10 @@
"ãã¦ãããæè¨ããå¼·åºã«ãã¾ããããããããããã¡ã<a
href=\"/philosophy/"
"open-source-misses-the-point.html\">ãªã¼ãã³ã½ã¼ã¹ãæ¯æããªã</a>çç±ã§ãã"
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"To establish a free community fully and lastingly, we need to do more than "
@@ -378,10 +399,15 @@
"æ¡ã«ã¤ãã¦ç¥ãå¿
è¦ãããã¾ãã"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For a similar point in a different area of life, see <a href=\"http://www.";
+#| "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-"
+#| "change\">\"'Nudge' is not enough\"</a>."
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
"人çã«ãããä»ã®é¢ã§ã®åæ§ãªãã¨ã«ã¤ãã¦ã¯ã<a
href=\"http://www.guardian.co.";
"uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\">\"âã²ãã§"
@@ -429,8 +455,12 @@
"translations.html\">翻訳 README</a>ãã覧ãã ããã"
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+#| "\">Richard Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr ""
"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
Index: po/compromise.ml.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.ml.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- po/compromise.ml.po 25 Apr 2014 04:30:55 -0000 1.23
+++ po/compromise.ml.po 10 Jan 2015 12:57:18 -0000 1.24
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2010-07-09 09:12+0530\n"
"Last-Translator: Shyam K <address@hidden>\n"
"Language-Team: Swathanthra Malayalam Computing<address@hidden"
@@ -34,18 +34,48 @@
msgid "Avoiding Ruinous Compromises"
msgstr "à´¦àµà´·à´à´°à´®à´¾à´¯ വിà´àµà´àµà´µàµà´´àµà´à´à´³àµ
à´à´´à´¿à´µà´¾à´àµà´à´²àµâ"
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "à´à´´àµà´¤à´¿à´¯à´¤àµàµ <strong>റിà´àµà´à´¾à´°àµâà´¡àµ
à´¸àµà´±àµà´±à´¾à´³àµâമാനàµâ</strong>"
+
# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <blockquote><p>
+# | [-<em>“Twenty-five-]{+“Twenty-five+} years ago <a
+# | href=\"/gnu/initial-announcement.html\">on September 27, 1983, I announced
+# | a plan</a> to create a completely free operating system called
+# | GNU—for ‘GNU's Not Unix’. As part of the 25th
+# | anniversary of the GNU system, I have written this article on how our
+# | community can avoid ruinous compromises. In addition to avoiding such
+# | compromises, there are many ways you can <a [-href=\"/help/\">help-]
+# | {+href=\"/help/help.html\">help+} GNU</a> and free software. One basic
+# | way is to <a
+# |
href=\"https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\";>
+# | join the Free Software Foundation</a> as an Associate
+# | [-Member.”</em>—<b>Richard-]
+# | {+Member.”—<b>Richard+} Stallman</b>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em>“à´à´°àµà´ªà´¤àµà´¤à´àµà´àµ
വരàµâà´·à´àµà´à´³àµâà´àµà´àµàµ à´®àµà´®àµà´ªàµàµ <a
href=\"/gnu/initial-announcement.html\"> "
@@ -61,11 +91,6 @@
# type: Content of: <p>
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "à´à´´àµà´¤à´¿à´¯à´¤àµàµ <strong>റിà´àµà´à´¾à´°àµâà´¡àµ
à´¸àµà´±àµà´±à´¾à´³àµâമാനàµâ</strong>"
-
-# type: Content of: <p>
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -113,6 +138,10 @@
"à´¸à´à´à´¾à´µà´¨à´à´³àµâ നലàµâà´à´¾à´¨àµà´ à´
വയàµ
വിതരണഠà´àµà´¯àµà´¯à´¾à´¨àµà´
സാധàµà´¯à´®à´¾à´àµà´àµà´¨àµà´¨à´¤à´¿à´¨à´¾à´¯àµà´°àµà´¨àµà´¨àµ
à´à´¤àµàµ. à´
à´¤àµà´µà´´à´¿ à´à´¿à´² "
"à´ªàµà´±àµà´±à´¨àµà´±àµà´à´³àµ à´à´¤à´¿à´¨àµà´±àµ
à´àµà´´à´¿à´²àµâ à´àµà´£àµà´àµà´µà´°à´¾à´¨àµà´."
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
# type: Content of: <p>
#. type: Content of: <p>
msgid ""
@@ -239,6 +268,10 @@
"à´à´àµà´à´³àµâ <a
href=\"/philosophy/open-source-misses-the-point.html\">“à´à´ªàµà´ªà´£àµâ
"
"à´¸àµà´´àµà´¸à´¿à´¨àµ”
പിനàµâതാà´àµà´à´¾à´¤àµà´¤à´¤àµàµ</a>. "
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
# type: Content of: <p>
#. type: Content of: <p>
msgid ""
@@ -448,7 +481,7 @@
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
# type: Content of: <div>
@@ -513,14 +546,14 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
-# | Copyright © 2008, [-2009-] {+2009, 2014+} <a
+# | Copyright © 2008, [-2009-] {+2009, 2014, 2015+} <a
# | href=\"http://www.stallman.org/\";>Richard Stallman</a>.
#, fuzzy
#| msgid ""
#| "Copyright © 2008, 2009 <a href=\"http://www.stallman.org/\";>Richard "
#| "Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr ""
"à´ªà´à´°àµâà´ªàµà´ªà´µà´à´¾à´¶à´ © 2008, 2009 <a
href=\"http://www.stallman.org/\";>റിà´àµà´à´¾à´°àµâഡൠ"
Index: po/compromise.pl.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.pl.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- po/compromise.pl.po 29 Apr 2014 04:04:31 -0000 1.20
+++ po/compromise.pl.po 10 Jan 2015 12:57:18 -0000 1.21
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2014-04-28 21:53-0600\n"
"Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
"Language-Team: Polish <address@hidden>\n"
@@ -15,6 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-01-10 12:55+0000\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Virtaal 0.7.0\n"
@@ -29,17 +30,46 @@
msgid "Avoiding Ruinous Compromises"
msgstr "UnikaÄ zgubnych kompromisów"
-#. type: Content of: <div><p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "<strong>Richard Stallman</strong>"
+
+#. type: Content of: <blockquote><p>
+# | [-<em>“Twenty-five-]{+“Twenty-five+} years ago <a
+# | href=\"/gnu/initial-announcement.html\">on September 27, 1983, I announced
+# | a plan</a> to create a completely free operating system called
+# | GNU—for ‘GNU's Not Unix’. As part of the 25th
+# | anniversary of the GNU system, I have written this article on how our
+# | community can avoid ruinous compromises. In addition to avoiding such
+# | compromises, there are many ways you can <a [-href=\"/help/\">help-]
+# | {+href=\"/help/help.html\">help+} GNU</a> and free software. One basic
+# | way is to <a
+# |
href=\"https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\";>
+# | join the Free Software Foundation</a> as an Associate
+# | [-Member.”</em>—<b>Richard-]
+# | {+Member.”—<b>Richard+} Stallman</b>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em>„DwadzieÅcia piÄÄ lat temu <a
href=\"/gnu/initial-announcement.html"
@@ -55,10 +85,6 @@
"– <b>Richard Stallman</b>"
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "<strong>Richard Stallman</strong>"
-
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -106,6 +132,10 @@
"oprogramowanie na licencji GPLv3 i dziÄki tym przepisom zdobyÄ "
"parÄ patentów."
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"<a href=\"/licenses/lgpl.html\">The Lesser GPL</a>'s purpose is a "
@@ -237,6 +267,10 @@
"to potwierdza i wzmacnia je. Dlatego <a href=\"/philosophy/open-"
"source-misses-the-point.html\">nie popieramy ruchu open source</a>."
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"To establish a free community fully and lastingly, we need to do more than "
@@ -400,10 +434,19 @@
"strzeż siÄ kompromisów które wiodÄ
daleko od celu."
#. type: Content of: <p>
+# | For a similar point in a different area of life, see <a
+# |
[-href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>\"'Nudge'-]
+# |
{+href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>
+# | “Nudge”+} is not [-enough\"</a>.-] {+enough</a>.+}
+#, fuzzy
+#| msgid ""
+#| "For a similar point in a different area of life, see <a href=\"http://www.";
+#| "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-"
+#| "change\">\"'Nudge' is not enough\"</a>."
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
"Podobny punkt widzenia, ale w innej dziedzinie życia znajdziecie
w "
"<a href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-";
@@ -456,8 +499,14 @@
"translations.html\">tÅumaczeÅ</a>."
#. type: Content of: <div><p>
+# | Copyright © 2008, 2009, [-2014-] {+2014, 2015+} <a
+# | href=\"http://www.stallman.org/\";>Richard Stallman</a>.
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+#| "\">Richard Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr ""
"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
Index: po/compromise.pot
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.pot,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po/compromise.pot 5 Apr 2014 00:42:12 -0000 1.18
+++ po/compromise.pot 10 Jan 2015 12:57:19 -0000 1.19
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -23,23 +23,23 @@
msgid "Avoiding Ruinous Compromises"
msgstr ""
-#. type: Content of: <div><p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr ""
+
+#. type: Content of: <blockquote><p>
msgid ""
-"<em>“Twenty-five years ago <a "
-"href=\"/gnu/initial-announcement.html\">on September 27, 1983, I announced a "
-"plan</a> to create a completely free operating system called GNU—for "
-"‘GNU's Not Unix’. As part of the 25th anniversary of the GNU "
-"system, I have written this article on how our community can avoid ruinous "
-"compromises. In addition to avoiding such compromises, there are many ways "
-"you can <a href=\"/help/\">help GNU</a> and free software. One basic way is "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
+"operating system called GNU—for ‘GNU's Not Unix’. As part "
+"of the 25th anniversary of the GNU system, I have written this article on "
+"how our community can avoid ruinous compromises. In addition to avoiding "
+"such compromises, there are many ways you can <a "
+"href=\"/help/help.html\">help GNU</a> and free software. One basic way is "
"to <a "
"href=\"https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\";>
"
"join the Free Software Foundation</a> as an Associate "
-"Member.”</em>—<b>Richard Stallman</b>"
-msgstr ""
-
-#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
+"Member.”—<b>Richard Stallman</b>"
msgstr ""
#. type: Content of: <p>
@@ -71,6 +71,10 @@
"patents under the effect of these provisions."
msgstr ""
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"<a href=\"/licenses/lgpl.html\">The Lesser GPL</a>'s purpose is a "
@@ -150,6 +154,10 @@
"source.</a>"
msgstr ""
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"To establish a free community fully and lastingly, we need to do more than "
@@ -251,8 +259,8 @@
#. type: Content of: <p>
msgid ""
"For a similar point in a different area of life, see <a "
-"href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>\"'Nudge'
"
-"is not enough\"</a>."
+"href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>
"
+"“Nudge” is not enough</a>."
msgstr ""
#. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -292,7 +300,7 @@
#. type: Content of: <div><p>
msgid ""
-"Copyright © 2008, 2009, 2014 <a "
+"Copyright © 2008, 2009, 2014, 2015 <a "
"href=\"http://www.stallman.org/\";>Richard Stallman</a>."
msgstr ""
Index: po/compromise.pt-br.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.pt-br.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- po/compromise.pt-br.po 13 Dec 2014 18:27:56 -0000 1.14
+++ po/compromise.pt-br.po 10 Jan 2015 12:57:19 -0000 1.15
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2012-06-01 16:28-0300\n"
"Last-Translator: Leandro Toledo de Souza <address@hidden>\n"
"Language-Team: Brazilian Portuguese <address@hidden>\n"
@@ -15,6 +15,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-01-10 12:55+0000\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Content of: <title>
@@ -26,17 +27,33 @@
msgid "Avoiding Ruinous Compromises"
msgstr "Evitando Compromissos Ruinosos"
-#. type: Content of: <div><p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "por <strong>Richard Stallman</strong>"
+
+#. type: Content of: <blockquote><p>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em>“Vinte cinco anos atrás, <a href=\"/gnu/initial-announcement.html"
@@ -52,10 +69,6 @@
"Stallman</b>"
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "por <strong>Richard Stallman</strong>"
-
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -102,6 +115,10 @@
"empresas contribuam para e distribuam software sob a GPLv3 trazendo, "
"portanto, algumas patentes sob o efeito dessas disposições."
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"<a href=\"/licenses/lgpl.html\">The Lesser GPL</a>'s purpose is a "
@@ -227,6 +244,10 @@
"philosophy/open-source-misses-the-point.html\">não defendemos o código "
"livre</a>."
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"To establish a free community fully and lastingly, we need to do more than "
@@ -389,10 +410,15 @@
"cuidado com os compromissos que levam para longe do objetivo."
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For a similar point in a different area of life, see <a href=\"http://www.";
+#| "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-"
+#| "change\">\"'Nudge' is not enough\"</a>."
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
"Para uma discussão similar em uma área diferente da vida, veja <a href="
"\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-";
@@ -445,8 +471,12 @@
"envio de traduções das páginas desse site."
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+#| "\">Richard Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr ""
"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
Index: po/compromise.ru.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.ru.po,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- po/compromise.ru.po 5 Apr 2014 05:47:34 -0000 1.28
+++ po/compromise.ru.po 10 Jan 2015 12:57:19 -0000 1.29
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2014-04-05 17:17+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -17,6 +17,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2015-01-10 12:55+0000\n"
# type: Content of: <title>
#. type: Content of: <title>
@@ -30,18 +31,48 @@
msgid "Avoiding Ruinous Compromises"
msgstr "ÐзбегаÑÑ ÑазÑÑÑиÑелÑнÑÑ
компÑомиÑÑов"
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "<strong>РиÑаÑд СÑолмен</strong>"
+
# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <blockquote><p>
+# | [-<em>“Twenty-five-]{+“Twenty-five+} years ago <a
+# | href=\"/gnu/initial-announcement.html\">on September 27, 1983, I announced
+# | a plan</a> to create a completely free operating system called
+# | GNU—for ‘GNU's Not Unix’. As part of the 25th
+# | anniversary of the GNU system, I have written this article on how our
+# | community can avoid ruinous compromises. In addition to avoiding such
+# | compromises, there are many ways you can <a [-href=\"/help/\">help-]
+# | {+href=\"/help/help.html\">help+} GNU</a> and free software. One basic
+# | way is to <a
+# |
href=\"https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\";>
+# | join the Free Software Foundation</a> as an Associate
+# | [-Member.”</em>—<b>Richard-]
+# | {+Member.”—<b>Richard+} Stallman</b>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em>“ÐвадÑаÑÑ Ð¿ÑÑÑ Ð»ÐµÑ Ð½Ð°Ð·Ð°Ð´, <a
href=\"/gnu/initial-announcement.html"
@@ -58,11 +89,6 @@
# type: Content of: <p>
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "<strong>РиÑаÑд СÑолмен</strong>"
-
-# type: Content of: <p>
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -112,6 +138,10 @@
"ÑÑой лиÑензией и Ñаким обÑазом подводили
некоÑоÑÑе паÑенÑÑ Ð¿Ð¾Ð´ дейÑÑвие ÑÑиÑ
"
"ÑÑебований."
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
# type: Content of: <p>
#. type: Content of: <p>
msgid ""
@@ -246,6 +276,10 @@
"href=\"/philosophy/open-source-misses-the-point.html\"> не
поддеÑживаем "
"оÑкÑÑÑÑй иÑÑ
однÑй ÑекÑÑ</a>."
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
# type: Content of: <p>
#. type: Content of: <p>
msgid ""
@@ -422,10 +456,19 @@
"компÑомиÑÑов, коÑоÑÑе Ð¾Ñ Ñели ÑводÑÑ."
#. type: Content of: <p>
+# | For a similar point in a different area of life, see <a
+# |
[-href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>\"'Nudge'-]
+# |
{+href=\"http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\";>
+# | “Nudge”+} is not [-enough\"</a>.-] {+enough</a>.+}
+#, fuzzy
+#| msgid ""
+#| "For a similar point in a different area of life, see <a href=\"http://www.";
+#| "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-"
+#| "change\">\"'Nudge' is not enough\"</a>."
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
"ÐодобнÑй аÑÐ¿ÐµÐºÑ Ð² дÑÑгой ÑÑеÑе жизни
опиÑан в ÑÑаÑÑе <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
@@ -477,8 +520,14 @@
# type: Content of: <div><p>
#. type: Content of: <div><p>
+# | Copyright © 2008, 2009, [-2014-] {+2014, 2015+} <a
+# | href=\"http://www.stallman.org/\";>Richard Stallman</a>.
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+#| "\">Richard Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr ""
"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
Index: po/compromise.uk.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.uk.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/compromise.uk.po 10 Apr 2014 19:10:27 -0000 1.6
+++ po/compromise.uk.po 10 Jan 2015 12:57:19 -0000 1.7
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2014-04-10 21:08+0300\n"
"Last-Translator: Andriy Bandura <address@hidden>\n"
"Language-Team: Ukrainian <address@hidden>\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: ENCODINGLanguage: uk\n"
+"X-Outdated-Since: 2015-01-10 12:55+0000\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n"
@@ -28,17 +29,33 @@
msgid "Avoiding Ruinous Compromises"
msgstr "Ð£Ð½Ð¸ÐºÐ°Ð½Ð½Ñ ÑÑйнÑвниÑ
компÑомÑÑÑв"
-#. type: Content of: <div><p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "<strong>Ð ÑÑаÑд СÑолмен</strong>"
+
+#. type: Content of: <blockquote><p>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em>“ÐвадÑÑÑÑ Ð¿'ÑÑÑ ÑокÑв ÑомÑ, <a
href=\"/gnu/initial-announcement."
@@ -54,10 +71,6 @@
"<b>Ð ÑÑаÑд СÑолмен</b>"
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "<strong>Ð ÑÑаÑд СÑолмен</strong>"
-
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -103,6 +116,10 @@
"Ð²ÐµÐ»Ð¸ÐºÑ ÐºÐ¾Ð¼Ð¿Ð°Ð½ÑÑ Ð´Ð¾Ð¿Ð¾Ð¼Ð°Ð³Ð°Ð»Ð¸ ÑозвиваÑи Ñ
поÑиÑÑвали пÑогÑами пÑд ÑÑÑÑ "
"лÑÑензÑÑÑ Ñ Ñаким Ñином пÑдбивали деÑкÑ
паÑенÑи пÑд дÑÑ ÑиÑ
вимог."
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"<a href=\"/licenses/lgpl.html\">The Lesser GPL</a>'s purpose is a "
@@ -227,6 +244,10 @@
"open-source-misses-the-point.html\"> не пÑдÑÑимÑÑмо
вÑдкÑиÑий виÑ
Ñдний код</"
"a>."
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
#. type: Content of: <p>
msgid ""
"To establish a free community fully and lastingly, we need to do more than "
@@ -389,10 +410,15 @@
"компÑомÑÑÑв, ÑÐºÑ Ð²Ñд меÑи вÑдводÑÑÑ."
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For a similar point in a different area of life, see <a href=\"http://www.";
+#| "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-"
+#| "change\">\"'Nudge' is not enough\"</a>."
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
"ÐодÑбний аÑÐ¿ÐµÐºÑ Ð² ÑнÑÑй ÑÑеÑÑ Ð¶Ð¸ÑÑÑ
опиÑаний Ñ ÑÑаÑÑÑ <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
@@ -445,8 +471,12 @@
"translations.html\">“ÐоÑÑÐ±Ð½Ð¸ÐºÑ Ð·
пеÑекладє</a>."
#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+#| "\">Richard Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr ""
"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
Index: po/compromise.zh-cn-diff.html
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.zh-cn-diff.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- po/compromise.zh-cn-diff.html 12 Apr 2014 13:58:31 -0000 1.7
+++ po/compromise.zh-cn-diff.html 10 Jan 2015 12:57:19 -0000 1.8
@@ -13,26 +13,48 @@
<!--#include virtual="/server/header.html" -->
<span class="inserted"><ins><em><!-- Parent-Version: 1.77
--></em></ins></span>
<title>Avoiding Ruinous Compromises
-- GNU Project - Free Software <span class="removed"><del><strong>Foundation
(FSF)</title></strong></del></span> <span
class="inserted"><ins><em>Foundation</title></em></ins></span>
+- GNU Project - Free Software <span class="removed"><del><strong>Foundation
(FSF)</title></strong></del></span> <span
class="inserted"><ins><em>Foundation</title>
+<style type="text/css" media="print,screen">
+<!--
+ .quote {
+ font-size: 90%;
+ max-width: 30em;
+ padding: .5em 1.5em;
+ background-color: #ececec;
+ border-radius: 1em;
+ -moz-border-radius: 1em;
+ -khtml-border-radius: 1em;
+ -webkit-border-radius: 1em;
+ -opera-border-radius: 1em;
+ }
+ .quote.imgright { margin: .3em 1em 1em 1em; }
+ .quote b { font-style: normal; }
+-->
+</style></em></ins></span>
<!--#include virtual="/philosophy/po/compromise.translist" -->
<!--#include virtual="/server/banner.html" -->
<h2>Avoiding Ruinous Compromises</h2>
-<div style="float: right; font-size: 90%; width: 30em; margin: 1em;
+<span class="removed"><del><strong><div style="float: right; font-size:
90%; width: 30em; margin: 1em;
background-color: #ececec; padding: 1em; -moz-border-radius: 1em;
-margin-top: 4em;"><p><em>“Twenty-five years
+margin-top:
4em;"><p><em>“Twenty-five</strong></del></span>
+
+<span class="inserted"><ins><em><p>by <strong>Richard
Stallman</strong></p>
+
+<blockquote class="quote
imgright"><p>“Twenty-five</em></ins></span> years
ago <a href="/gnu/initial-announcement.html">on September 27, 1983, I
announced a plan</a> to create a completely free operating system
called GNU—for ‘GNU's Not Unix’. As part of the
25th anniversary of the GNU system, I have written this article on how
our community can avoid ruinous compromises. In addition to avoiding
-such compromises, there are many ways you can <a href="/help/">help
+such compromises, there are many ways you can <a <span
class="removed"><del><strong>href="/help/">help</strong></del></span> <span
class="inserted"><ins><em>href="/help/help.html">help</em></ins></span>
GNU</a> and free software. One basic way is
to <a
href="https://www.fsf.org/associate/support_freedom/join_fsf?referrer=4052">
join the Free Software Foundation</a> as an Associate
-Member.”</em>—<b>Richard
Stallman</b></p></div>
+<span
class="removed"><del><strong>Member.”</em>—<b>Richard
Stallman</b></p></div>
-<p>by <strong>Richard Stallman</strong></p>
+<p>by <strong>Richard
Stallman</strong></p></strong></del></span>
+<span class="inserted"><ins><em>Member.”—<b>Richard
Stallman</b></p></blockquote></em></ins></span>
<p>The free software movement aims for a social
change: <a href="/philosophy/free-sw.html">to make all software
@@ -56,7 +78,7 @@
software and thus bring some patents under the effect of these
provisions. </p>
-<img src="/graphics/gplv3-large.png" alt="" style="float: left;" />
+<img src="/graphics/gplv3-large.png" <span
class="removed"><del><strong>alt="" style="float: left;"</strong></del></span>
<span class="inserted"><ins><em>alt=" [GPLv3 Logo] "
class="imgleft"</em></ins></span> />
<p><a href="/licenses/lgpl.html">The Lesser GPL</a>'s
purpose is a
compromise: we use it on certain chosen free libraries to permit their
@@ -115,7 +137,8 @@
<a href="/philosophy/open-source-misses-the-point.html">do not support
open source.</a></p>
-<img src="/graphics/gnulaptop.png" alt="" style="float: right;" />
+<img src="/graphics/gnulaptop.png" <span
class="removed"><del><strong>alt="" style="float: right;"</strong></del></span>
+ <span class="inserted"><ins><em>alt=" [Levitating Gnu with a laptop] "
class="imgright"</em></ins></span> />
<p>To establish a free community fully and lastingly, we need to do
more than get people to use some free software. We need to spread the
@@ -196,11 +219,13 @@
<p>
For a similar point in a different area of life,
-see <a
href="http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change">";'Nudge'
-is not enough"</a>.
+see <a <span
class="removed"><del><strong>href="http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change">";'Nudge'</strong></del></span>
+<span
class="inserted"><ins><em>href="http://www.guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change">
+“Nudge”</em></ins></span> is not <span
class="removed"><del><strong>enough"</a>.</strong></del></span> <span
class="inserted"><ins><em>enough</a>.</em></ins></span>
</p>
<span class="removed"><del><strong></div></strong></del></span>
+
<span class="inserted"><ins><em></div><!-- for id="content", starts
in the include above --></em></ins></span>
<!--#include virtual="/server/footer.html" -->
<div id="footer">
@@ -238,7 +263,7 @@
</p></strong></del></span> <span
class="inserted"><ins><em>article.</p>
</div></em></ins></span>
-<p>Copyright © 2008, <span
class="removed"><del><strong>2009</strong></del></span> <span
class="inserted"><ins><em>2009, 2014</em></ins></span> <a
href="http://www.stallman.org/">Richard
+<p>Copyright © 2008, <span
class="removed"><del><strong>2009</strong></del></span> <span
class="inserted"><ins><em>2009, 2014, 2015</em></ins></span> <a
href="http://www.stallman.org/">Richard
Stallman</a>.</p>
<span class="removed"><del><strong><p>Richard
Stallman</strong></del></span>
@@ -274,7 +299,7 @@
<span class="inserted"><ins><em><p
class="unprintable">Updated:</em></ins></span>
<!-- timestamp start -->
-$Date: 2014/04/12 13:58:31 $
+$Date: 2015/01/10 12:57:19 $
<!-- timestamp end -->
</p>
</div>
Index: po/compromise.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/compromise.zh-cn.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- po/compromise.zh-cn.po 5 Apr 2014 00:42:13 -0000 1.18
+++ po/compromise.zh-cn.po 10 Jan 2015 12:57:19 -0000 1.19
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: compromise.html\n"
-"POT-Creation-Date: 2014-04-05 00:02+0000\n"
+"POT-Creation-Date: 2015-01-10 12:55+0000\n"
"PO-Revision-Date: 2013-01-28 13:49-0500\n"
"Last-Translator: Tony Yet <address@hidden>\n"
"Language-Team: Chinese <address@hidden>\n"
@@ -30,18 +30,35 @@
msgid "Avoiding Ruinous Compromises"
msgstr "é¿å
æ¯çæ§ç妥å"
+# type: Content of: <p>
+#. type: Content of: <p>
+msgid "by <strong>Richard Stallman</strong>"
+msgstr "<strong>çæ¥å¾·Â·æ¯ææ¼</strong> è"
+
# type: Content of: <div><p>
-#. type: Content of: <div><p>
+#. type: Content of: <blockquote><p>
+#, fuzzy
+#| msgid ""
+#| "<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
+#| "\">on September 27, 1983, I announced a plan</a> to create a completely "
+#| "free operating system called GNU—for ‘GNU's Not Unix’. "
+#| "As part of the 25th anniversary of the GNU system, I have written this "
+#| "article on how our community can avoid ruinous compromises. In addition "
+#| "to avoiding such compromises, there are many ways you can <a href=\"/help/"
+#| "\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+#| "www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+#| "Free Software Foundation</a> as an Associate Member.”</em>—"
+#| "<b>Richard Stallman</b>"
msgid ""
-"<em>“Twenty-five years ago <a href=\"/gnu/initial-announcement.html"
-"\">on September 27, 1983, I announced a plan</a> to create a completely free "
+"“Twenty-five years ago <a href=\"/gnu/initial-announcement.html\">on "
+"September 27, 1983, I announced a plan</a> to create a completely free "
"operating system called GNU—for ‘GNU's Not Unix’. As part "
"of the 25th anniversary of the GNU system, I have written this article on "
"how our community can avoid ruinous compromises. In addition to avoiding "
-"such compromises, there are many ways you can <a href=\"/help/\">help GNU</"
-"a> and free software. One basic way is to <a href=\"https://www.fsf.org/";
-"associate/support_freedom/join_fsf?referrer=4052\"> join the Free Software "
-"Foundation</a> as an Associate Member.”</em>—<b>Richard "
+"such compromises, there are many ways you can <a href=\"/help/help.html"
+"\">help GNU</a> and free software. One basic way is to <a href=\"https://";
+"www.fsf.org/associate/support_freedom/join_fsf?referrer=4052\"> join the "
+"Free Software Foundation</a> as an Associate Member.”—<b>Richard "
"Stallman</b>"
msgstr ""
"<em>“äºåäºå¹´åï¼<a
href=\"/gnu/initial-announcement.html\">1983å¹´9æ27"
@@ -55,11 +72,6 @@
# type: Content of: <p>
#. type: Content of: <p>
-msgid "by <strong>Richard Stallman</strong>"
-msgstr "<strong>çæ¥å¾·Â·æ¯ææ¼</strong> è"
-
-# type: Content of: <p>
-#. type: Content of: <p>
msgid ""
"The free software movement aims for a social change: <a href=\"/philosophy/"
"free-sw.html\">to make all software free</a> so that all software users are "
@@ -103,6 +115,10 @@
"大å
¬å¸å¯ä»¥åä¸è¿æ¥ï¼å¹¶åå¸ä»¥GPLv3ææç软件ãå¨æ们çå议书éé¢å°±å
å«äºç¸å
³ç"
"ä¸å©æ¡æ¬¾ã"
+#. type: Attribute 'alt' of: <img>
+msgid "[GPLv3 Logo]"
+msgstr ""
+
# type: Content of: <p>
#. type: Content of: <p>
msgid ""
@@ -217,6 +233,10 @@
"çè¿ä¸ç念ãè¿æ°æ°æ¯æ们<a
href=\"/philosophy/open-source-misses-the-point."
"html\">ä¸è®¤åâå¼æºè½¯ä»¶â</a>çåå ã"
+#. type: Attribute 'alt' of: <img>
+msgid "[Levitating Gnu with a laptop]"
+msgstr ""
+
# type: Content of: <p>
#. type: Content of: <p>
msgid ""
@@ -384,10 +404,15 @@
"åï¼ä½åè®°ä¸ä¸å¯ä½åºå离ç®æ ç妥åã"
#. type: Content of: <p>
+#, fuzzy
+#| msgid ""
+#| "For a similar point in a different area of life, see <a href=\"http://www.";
+#| "guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-"
+#| "change\">\"'Nudge' is not enough\"</a>."
msgid ""
"For a similar point in a different area of life, see <a href=\"http://www.";
"guardian.co.uk/commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change"
-"\">\"'Nudge' is not enough\"</a>."
+"\"> “Nudge” is not enough</a>."
msgstr ""
"æå
³çæ´»ä¸å
¶å®é¢åä¸ç±»ä¼¼çè§ç¹ï¼è¯·åè <a
href=\"http://www.guardian.co.uk/";
"commentisfree/2011/jul/19/nudge-is-not-enough-behaviour-change\">\"'Nudge' "
@@ -445,7 +470,7 @@
#| "Copyright © 2008, 2009 <a href=\"http://www.stallman.org/\";>Richard "
#| "Stallman</a>."
msgid ""
-"Copyright © 2008, 2009, 2014 <a href=\"http://www.stallman.org/";
+"Copyright © 2008, 2009, 2014, 2015 <a href=\"http://www.stallman.org/";
"\">Richard Stallman</a>."
msgstr ""
"çæææ © 2008, 2009 <a href=\"http://www.stallman.org/\";>Richard "
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/philosophy compromise.el.html compromise.ml...,
GNUN <=