[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www philosophy/free-sw.zh-cn.html philosophy/po...
|
From: |
GNUN |
|
Subject: |
www philosophy/free-sw.zh-cn.html philosophy/po... |
|
Date: |
Tue, 24 Apr 2018 08:31:13 -0400 (EDT) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 18/04/24 08:31:13
Modified files:
philosophy : free-sw.zh-cn.html
philosophy/po : free-sw.zh-cn-en.html free-sw.zh-cn.po
proprietary/po : proprietary-interference.de.po
proprietary-interference.fr.po
proprietary-interference.ja-diff.html
proprietary-interference.ja.po
proprietary-interference.pot
proprietary-interference.ru.po
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.zh-cn.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn.po?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-interference.de.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-interference.fr.po?cvsroot=www&r1=1.44&r2=1.45
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-interference.ja-diff.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-interference.ja.po?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-interference.pot?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/proprietary-interference.ru.po?cvsroot=www&r1=1.56&r2=1.57
Patches:
Index: philosophy/free-sw.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.zh-cn.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- philosophy/free-sw.zh-cn.html 3 Apr 2018 11:59:03 -0000 1.12
+++ philosophy/free-sw.zh-cn.html 24 Apr 2018 12:31:11 -0000 1.13
@@ -49,7 +49,7 @@
<h4> å项åºæ¬èªç±</h4>
<p>
-å¦æä¸ä¸ªè½¯ä»¶æ¯èªç±è½¯ä»¶ï¼é£ä¹å®å¿
须为ç¨æ·æä¾ä»¥ä¸å项åºæ¬èªç±ï¼
+å¦æä¸ä¸ªè½¯ä»¶æ¯èªç±è½¯ä»¶ï¼é£ä¹å®å¿
须为ç¨æ·æä¾ä»¥ä¸å项åºæ¬èªç±ï¼<a href="#f1">[1]</a>
</p>
<ul>
@@ -355,6 +355,10 @@
<p>该å表并éå
æ¬å
¨é¨ä¿®æ¹è®°å½ï¼èä»
ä»
æ¯å
å«äºä¸äºéè¦ä¿®æ£ãæ¯å¦ï¼æ¬å表ä¸ä¼å
æ¬å¯¹æ¼åé误ï¼éå«åçå°é®é¢çä¿®æ¹ãå¦ææ³è¦çå°å
¨é¨çä¿®æ¹éæ¶ï¼è¯·åè§<a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&view=log";>CVSæ¥å¿</a>ã</p>
+<h3 style="font-size:1em">è注</h3>
+<ol>
+<li id="f1">使ç¨0ã1ã2å3æåè¿äºèªç±æåå²çåå
ãå¨1990å¹´å·¦å³ï¼ååºæ¥çèªç±æ¯1ã2å3ãç¶åï¼æ们æè¯å°è¿è¡è½¯ä»¶çèªç±ä¹åºè¯¥æç¡®ååºæ¥ãè¿ä¸ªèªç±æ¾ç¶æ¯å¦å¤3个èªç±æ´åºæ¬ï¼æ以åºè¯¥åå¨åé¢ãæ们没æä¿®æ¹å
¶ä»3个èªç±çåºå·ï¼èæ¯å°è¿è¡è½¯ä»¶çèªç±å为 0ã</li>
+</ol>
<div class="translators-notes">
@@ -417,7 +421,7 @@
<div class="translators-credits">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
-<b>ç¿»è¯</b>ï¼éæ¥ <a
+<b>ç¿»è¯</b>ï¼éæ¥ <a
href="mailto:address@hidden";><address@hidden></a>ï¼2015ã<br></br>
<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
href="https://savannah.gnu.org/projects/www-zh-cn/";><CTT></a>ï¼2017ï¼2018ã</div>
@@ -425,7 +429,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2018/04/03 11:59:03 $
+$Date: 2018/04/24 12:31:11 $
<!-- timestamp end -->
</p>
Index: philosophy/po/free-sw.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/free-sw.zh-cn-en.html 3 Apr 2018 11:59:03 -0000 1.5
+++ philosophy/po/free-sw.zh-cn-en.html 24 Apr 2018 12:31:12 -0000 1.6
@@ -68,7 +68,7 @@
<p>
A program is free software if the program's users have the
-four essential freedoms:
+four essential freedoms: <a href="#f1">[1]</a>
</p>
<ul>
@@ -554,6 +554,14 @@
the <a
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&view=log";>cvsweb
interface</a>.</p>
+<h3 style="font-size:1em">Footnote</h3>
+<ol>
+<li id="f1">The reason they are numbered 0, 1, 2 and 3 is historical. Around
+1990 there were three freedoms, numbered 1, 2 and 3. Then we realized that
+the freedom to run the program needed to be mentioned explicitly.
+It was clearly more basic than the other three, so it properly should
+precede them. Rather than renumber the others, we made it freedom 0.</li>
+</ol>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
@@ -613,7 +621,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/04/03 11:59:03 $
+$Date: 2018/04/24 12:31:12 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/free-sw.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- philosophy/po/free-sw.zh-cn.po 24 Apr 2018 12:14:43 -0000 1.30
+++ philosophy/po/free-sw.zh-cn.po 24 Apr 2018 12:31:12 -0000 1.31
@@ -15,7 +15,6 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2018-04-23 18:26+0000\n"
"X-Generator: Poedit 1.7.5\n"
#. type: Content of: <title>
Index: proprietary/po/proprietary-interference.de.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-interference.de.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- proprietary/po/proprietary-interference.de.po 22 Mar 2018 12:03:31
-0000 1.37
+++ proprietary/po/proprietary-interference.de.po 24 Apr 2018 12:31:12
-0000 1.38
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: proprietary-interference.html\n"
"Report-Msgid-Bugs-To: Webmasters <address@hidden>\n"
-"POT-Creation-Date: 2018-03-22 11:56+0000\n"
+"POT-Creation-Date: 2018-04-24 12:26+0000\n"
"PO-Revision-Date: 2017-03-29 22:00+0200\n"
"Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German <address@hidden>\n"
@@ -55,6 +55,14 @@
#. type: Content of: <ul><li><p>
msgid ""
+"Pearson's proprietary educational software <a href=\"https://gizmodo.com/";
+"pearson-embedded-a-social-psychological-experiment-in-s-1825367784\"> did an "
+"experiment on real students</a>, treating students differently to observe "
+"the results."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
+msgid ""
"Microsoft is planning to make Windows <a href=\"https://www.theguardian.com/";
"technology/2018/mar/19/windows-10-microsoft-force-people-edge-browser-"
"windows-mail-chrome-firefox\"> impose use of its browser, Edge, in certain "
Index: proprietary/po/proprietary-interference.fr.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-interference.fr.po,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- proprietary/po/proprietary-interference.fr.po 22 Mar 2018 15:36:00
-0000 1.44
+++ proprietary/po/proprietary-interference.fr.po 24 Apr 2018 12:31:12
-0000 1.45
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: proprietary-interference.html\n"
-"POT-Creation-Date: 2018-03-22 11:56+0000\n"
+"POT-Creation-Date: 2018-04-24 12:26+0000\n"
"PO-Revision-Date: 2018-03-22 16:35+0100\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <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: 2018-04-24 12:26+0000\n"
"Plural-Forms: \n"
#. type: Content of: <title>
@@ -52,6 +53,14 @@
#. type: Content of: <ul><li><p>
msgid ""
+"Pearson's proprietary educational software <a href=\"https://gizmodo.com/";
+"pearson-embedded-a-social-psychological-experiment-in-s-1825367784\"> did an "
+"experiment on real students</a>, treating students differently to observe "
+"the results."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
+msgid ""
"Microsoft is planning to make Windows <a href=\"https://www.theguardian.com/";
"technology/2018/mar/19/windows-10-microsoft-force-people-edge-browser-"
"windows-mail-chrome-firefox\"> impose use of its browser, Edge, in certain "
Index: proprietary/po/proprietary-interference.ja-diff.html
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-interference.ja-diff.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- proprietary/po/proprietary-interference.ja-diff.html 22 Mar 2018
12:03:31 -0000 1.3
+++ proprietary/po/proprietary-interference.ja-diff.html 24 Apr 2018
12:31:12 -0000 1.4
@@ -32,7 +32,12 @@
</p>
<ul>
- <span class="inserted"><ins><em><li><p>Microsoft is planning to
make Windows <a
+<span class="inserted"><ins><em><li><p>Pearson's proprietary
educational software <a
+href="https://gizmodo.com/pearson-embedded-a-social-psychological-experiment-in-s-1825367784">
+did an experiment on real students</a>, treating students differently to
+observe the results.</p></li>
+
+ <li><p>Microsoft is planning to make Windows <a
href="https://www.theguardian.com/technology/2018/mar/19/windows-10-microsoft-force-people-edge-browser-windows-mail-chrome-firefox">
impose use of its browser, Edge, in certain
circumstances</a>.</p>
<p>The reason Microsoft can force things on users is that Windows is
@@ -183,7 +188,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/03/22 12:03:31 $
+$Date: 2018/04/24 12:31:12 $
<!-- timestamp end -->
</p>
</div>
Index: proprietary/po/proprietary-interference.ja.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-interference.ja.po,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- proprietary/po/proprietary-interference.ja.po 22 Mar 2018 12:03:31
-0000 1.40
+++ proprietary/po/proprietary-interference.ja.po 24 Apr 2018 12:31:12
-0000 1.41
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: proprietary-interference.html\n"
-"POT-Creation-Date: 2018-03-22 11:56+0000\n"
+"POT-Creation-Date: 2018-04-24 12:26+0000\n"
"PO-Revision-Date: 2016-10-31 12:53+0900\n"
"Last-Translator: NIIBE Yutaka <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
@@ -53,6 +53,14 @@
#. type: Content of: <ul><li><p>
msgid ""
+"Pearson's proprietary educational software <a href=\"https://gizmodo.com/";
+"pearson-embedded-a-social-psychological-experiment-in-s-1825367784\"> did an "
+"experiment on real students</a>, treating students differently to observe "
+"the results."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
+msgid ""
"Microsoft is planning to make Windows <a href=\"https://www.theguardian.com/";
"technology/2018/mar/19/windows-10-microsoft-force-people-edge-browser-"
"windows-mail-chrome-firefox\"> impose use of its browser, Edge, in certain "
Index: proprietary/po/proprietary-interference.pot
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-interference.pot,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- proprietary/po/proprietary-interference.pot 22 Mar 2018 12:03:31 -0000
1.21
+++ proprietary/po/proprietary-interference.pot 24 Apr 2018 12:31:12 -0000
1.22
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: proprietary-interference.html\n"
-"POT-Creation-Date: 2018-03-22 11:56+0000\n"
+"POT-Creation-Date: 2018-04-24 12:26+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"
@@ -43,6 +43,14 @@
#. type: Content of: <ul><li><p>
msgid ""
+"Pearson's proprietary educational software <a "
+"href=\"https://gizmodo.com/pearson-embedded-a-social-psychological-experiment-in-s-1825367784\";>
"
+"did an experiment on real students</a>, treating students differently to "
+"observe the results."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
+msgid ""
"Microsoft is planning to make Windows <a "
"href=\"https://www.theguardian.com/technology/2018/mar/19/windows-10-microsoft-force-people-edge-browser-windows-mail-chrome-firefox\";>
"
"impose use of its browser, Edge, in certain circumstances</a>."
Index: proprietary/po/proprietary-interference.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/proprietary-interference.ru.po,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- proprietary/po/proprietary-interference.ru.po 22 Mar 2018 16:59:18
-0000 1.56
+++ proprietary/po/proprietary-interference.ru.po 24 Apr 2018 12:31:12
-0000 1.57
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: proprietary-interference.html\n"
-"POT-Creation-Date: 2018-03-22 11:56+0000\n"
+"POT-Creation-Date: 2018-04-24 12:26+0000\n"
"PO-Revision-Date: 2018-03-22 06:11+0000\n"
"Last-Translator: Ineiev <address@hidden>\n"
"Language-Team: Russian <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: 2018-04-24 12:26+0000\n"
#. type: Content of: <title>
msgid "Proprietary Interference - GNU Project - Free Software Foundation"
@@ -54,6 +55,14 @@
#. type: Content of: <ul><li><p>
msgid ""
+"Pearson's proprietary educational software <a href=\"https://gizmodo.com/";
+"pearson-embedded-a-social-psychological-experiment-in-s-1825367784\"> did an "
+"experiment on real students</a>, treating students differently to observe "
+"the results."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
+msgid ""
"Microsoft is planning to make Windows <a href=\"https://www.theguardian.com/";
"technology/2018/mar/19/windows-10-microsoft-force-people-edge-browser-"
"windows-mail-chrome-firefox\"> impose use of its browser, Edge, in certain "
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www philosophy/free-sw.zh-cn.html philosophy/po...,
GNUN <=