[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www distros/po/common-distros.de.po distros/po/...
|
From: |
GNUN |
|
Subject: |
www distros/po/common-distros.de.po distros/po/... |
|
Date: |
Mon, 03 Sep 2012 00:29:15 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 12/09/03 00:29:14
Modified files:
distros/po : common-distros.de.po common-distros.es.po
common-distros.fr.po common-distros.it.po
common-distros.ja.po common-distros.pl.po
common-distros.pot common-distros.ru.po
licenses : licenses.ja.html
licenses/po : licenses.ja-en.html licenses.ja.po
philosophy : bsd.ja.html
philosophy/po : bsd.ja-en.html bsd.ja.po
software : software.ja.html
software/po : software.ja-en.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.de.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.es.po?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.fr.po?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.it.po?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ja.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pl.po?cvsroot=www&r1=1.69&r2=1.70
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.pot?cvsroot=www&r1=1.39&r2=1.40
http://web.cvs.savannah.gnu.org/viewcvs/www/distros/po/common-distros.ru.po?cvsroot=www&r1=1.58&r2=1.59
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/licenses.ja.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ja-en.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/licenses.ja.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/bsd.ja.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/bsd.ja-en.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/bsd.ja.po?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/software/software.ja.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/software/po/software.ja-en.html?cvsroot=www&r1=1.5&r2=1.6
Patches:
Index: distros/po/common-distros.de.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.de.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- distros/po/common-distros.de.po 3 Jul 2012 16:37:14 -0000 1.38
+++ distros/po/common-distros.de.po 3 Sep 2012 00:27:59 -0000 1.39
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2012-06-10 04:25-0300\n"
+"POT-Creation-Date: 2012-09-02 20:25-0300\n"
"PO-Revision-Date: 2012-05-13 12:05+0200\n"
"Last-Translator: Joerg Kohne <joeko (AT) online [PUNKT] de>\n"
"Language-Team: German address@hidden"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-09-02 20:25-0300\n"
#. type: Content of: <title>
msgid ""
@@ -134,6 +135,25 @@
"im Umgang mit unfreier Software durch seine normalen Paketarchive."
#. type: Content of: <h3>
+msgid "Canaima"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Canaima GNU/Linux is a distribution made by Venezuela's government to "
+"distribute computers with GNU/Linux. While the overall plan is admirable, "
+"Canaima is flawed by the inclusion of nonfree software."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Its main menu has an option, “Install non-free software”, which "
+"installs all the non-free drivers (even the ones that are not necessary). "
+"The distro also provides blobs for Linux, and invites installing non-free "
+"applications including Flash Player."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "CentOS"
msgstr "CentOS"
Index: distros/po/common-distros.es.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.es.po,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- distros/po/common-distros.es.po 10 Jun 2012 09:06:37 -0000 1.56
+++ distros/po/common-distros.es.po 3 Sep 2012 00:28:00 -0000 1.57
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: common-distros.es.html\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-10 04:25-0300\n"
+"POT-Creation-Date: 2012-09-02 20:25-0300\n"
"PO-Revision-Date: 2012-05-22 12:06+0100\n"
"Last-Translator: Dora Scilipoti <address@hidden>\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"
+"Outdated-Since: 2012-09-02 20:25-0300\n"
"X-Poedit-Language: Spanish\n"
"X-Poedit-SourceCharset: utf-8\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
@@ -149,6 +150,25 @@
"no son libres. Arch tampoco tiene una polÃtica acerca de no distribuir "
"software privativo a través de sus canales habituales."
+#. type: Content of: <h3>
+msgid "Canaima"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Canaima GNU/Linux is a distribution made by Venezuela's government to "
+"distribute computers with GNU/Linux. While the overall plan is admirable, "
+"Canaima is flawed by the inclusion of nonfree software."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Its main menu has an option, “Install non-free software”, which "
+"installs all the non-free drivers (even the ones that are not necessary). "
+"The distro also provides blobs for Linux, and invites installing non-free "
+"applications including Flash Player."
+msgstr ""
+
# type: Content of: <h3>
#. type: Content of: <h3>
msgid "CentOS"
Index: distros/po/common-distros.fr.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.fr.po,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- distros/po/common-distros.fr.po 17 Aug 2012 20:04:35 -0000 1.71
+++ distros/po/common-distros.fr.po 3 Sep 2012 00:28:00 -0000 1.72
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2012-06-10 04:25-0300\n"
+"POT-Creation-Date: 2012-09-02 20:25-0300\n"
"PO-Revision-Date: 2012-08-16 14:46+0200\n"
"Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
"Language-Team: French <address@hidden>\n"
@@ -16,6 +16,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-09-02 20:25-0300\n"
"Plural-Forms: \n"
#. type: Content of: <title>
@@ -138,6 +139,25 @@
"distribuer des logiciels non libres dans ses canaux de distribution normaux."
#. type: Content of: <h3>
+msgid "Canaima"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Canaima GNU/Linux is a distribution made by Venezuela's government to "
+"distribute computers with GNU/Linux. While the overall plan is admirable, "
+"Canaima is flawed by the inclusion of nonfree software."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Its main menu has an option, “Install non-free software”, which "
+"installs all the non-free drivers (even the ones that are not necessary). "
+"The distro also provides blobs for Linux, and invites installing non-free "
+"applications including Flash Player."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "CentOS"
msgstr "CentOS"
Index: distros/po/common-distros.it.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.it.po,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- distros/po/common-distros.it.po 10 Jun 2012 09:06:37 -0000 1.48
+++ distros/po/common-distros.it.po 3 Sep 2012 00:28:00 -0000 1.49
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2012-06-10 04:25-0300\n"
+"POT-Creation-Date: 2012-09-02 20:25-0300\n"
"PO-Revision-Date: 2012-05-14 10:48+0100\n"
"Last-Translator: Andrea Pescetti <address@hidden>\n"
"Language-Team: Italian\n"
@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-09-02 20:25-0300\n"
#. type: Content of: <title>
msgid ""
@@ -132,6 +133,25 @@
"distribuzione di software non libero tramite i propri canali normali."
#. type: Content of: <h3>
+msgid "Canaima"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Canaima GNU/Linux is a distribution made by Venezuela's government to "
+"distribute computers with GNU/Linux. While the overall plan is admirable, "
+"Canaima is flawed by the inclusion of nonfree software."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Its main menu has an option, “Install non-free software”, which "
+"installs all the non-free drivers (even the ones that are not necessary). "
+"The distro also provides blobs for Linux, and invites installing non-free "
+"applications including Flash Player."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "CentOS"
msgstr "CentOS"
Index: distros/po/common-distros.ja.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ja.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- distros/po/common-distros.ja.po 12 Jun 2012 08:32:47 -0000 1.24
+++ distros/po/common-distros.ja.po 3 Sep 2012 00:28:00 -0000 1.25
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2012-06-10 04:25-0300\n"
+"POT-Creation-Date: 2012-09-02 20:25-0300\n"
"PO-Revision-Date: 2012-05-15 15:01+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"
+"Outdated-Since: 2012-09-02 20:25-0300\n"
#. type: Content of: <title>
msgid ""
@@ -134,6 +135,25 @@
"ã¨ãããã¨ã«ã¤ãã¦ããªãã®ããªã·ã¼ãããã¾ããã"
#. type: Content of: <h3>
+msgid "Canaima"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Canaima GNU/Linux is a distribution made by Venezuela's government to "
+"distribute computers with GNU/Linux. While the overall plan is admirable, "
+"Canaima is flawed by the inclusion of nonfree software."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Its main menu has an option, “Install non-free software”, which "
+"installs all the non-free drivers (even the ones that are not necessary). "
+"The distro also provides blobs for Linux, and invites installing non-free "
+"applications including Flash Player."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "CentOS"
msgstr "CentOS"
Index: distros/po/common-distros.pl.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pl.po,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- distros/po/common-distros.pl.po 10 Jun 2012 09:06:38 -0000 1.69
+++ distros/po/common-distros.pl.po 3 Sep 2012 00:28:00 -0000 1.70
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: common-distros.html\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-10 04:25-0300\n"
+"POT-Creation-Date: 2012-09-02 20:25-0300\n"
"PO-Revision-Date: 2012-05-12 16:22+0200\n"
"Last-Translator: Marcin Wolak <address@hidden>\n"
"Language-Team: Polish\n"
@@ -17,6 +17,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-09-02 20:25-0300\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"
@@ -150,6 +151,25 @@
"posiada również polityki dotyczÄ
cej niedystrybuowania niewolnego "
"oprogramowania poprzez ich normalne kanaÅy dystrybucji."
+#. type: Content of: <h3>
+msgid "Canaima"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Canaima GNU/Linux is a distribution made by Venezuela's government to "
+"distribute computers with GNU/Linux. While the overall plan is admirable, "
+"Canaima is flawed by the inclusion of nonfree software."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Its main menu has an option, “Install non-free software”, which "
+"installs all the non-free drivers (even the ones that are not necessary). "
+"The distro also provides blobs for Linux, and invites installing non-free "
+"applications including Flash Player."
+msgstr ""
+
# type: Content of: <h3>
#. type: Content of: <h3>
msgid "CentOS"
Index: distros/po/common-distros.pot
===================================================================
RCS file: /web/www/www/distros/po/common-distros.pot,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- distros/po/common-distros.pot 10 Jun 2012 09:06:38 -0000 1.39
+++ distros/po/common-distros.pot 3 Sep 2012 00:28:00 -0000 1.40
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2012-06-10 04:25-0300\n"
+"POT-Creation-Date: 2012-09-02 20:25-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -98,6 +98,25 @@
msgstr ""
#. type: Content of: <h3>
+msgid "Canaima"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Canaima GNU/Linux is a distribution made by Venezuela's government to "
+"distribute computers with GNU/Linux. While the overall plan is admirable, "
+"Canaima is flawed by the inclusion of nonfree software."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Its main menu has an option, “Install non-free software”, which "
+"installs all the non-free drivers (even the ones that are not "
+"necessary). The distro also provides blobs for Linux, and invites installing "
+"non-free applications including Flash Player."
+msgstr ""
+
+#. type: Content of: <h3>
msgid "CentOS"
msgstr ""
Index: distros/po/common-distros.ru.po
===================================================================
RCS file: /web/www/www/distros/po/common-distros.ru.po,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- distros/po/common-distros.ru.po 13 Jun 2012 16:31:10 -0000 1.58
+++ distros/po/common-distros.ru.po 3 Sep 2012 00:28:00 -0000 1.59
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: common-distros.html\n"
-"POT-Creation-Date: 2012-06-10 04:25-0300\n"
+"POT-Creation-Date: 2012-09-02 20:25-0300\n"
"PO-Revision-Date: 2012-05-12 17:17+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"
+"Outdated-Since: 2012-09-02 20:25-0300\n"
# type: Content of: <title>
#. type: Content of: <title>
@@ -147,6 +148,25 @@
"клÑкÑÑ. РпÑавила Arch Ñакже не вÑ
одиÑ
неÑаÑпÑоÑÑÑанение неÑвободнÑÑ
"
"пÑогÑамм по обÑÑнÑм каналам диÑÑÑибÑÑива."
+#. type: Content of: <h3>
+msgid "Canaima"
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Canaima GNU/Linux is a distribution made by Venezuela's government to "
+"distribute computers with GNU/Linux. While the overall plan is admirable, "
+"Canaima is flawed by the inclusion of nonfree software."
+msgstr ""
+
+#. type: Content of: <p>
+msgid ""
+"Its main menu has an option, “Install non-free software”, which "
+"installs all the non-free drivers (even the ones that are not necessary). "
+"The distro also provides blobs for Linux, and invites installing non-free "
+"applications including Flash Player."
+msgstr ""
+
# type: Content of: <h3>
#. type: Content of: <h3>
msgid "CentOS"
Index: licenses/licenses.ja.html
===================================================================
RCS file: /web/www/www/licenses/licenses.ja.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- licenses/licenses.ja.html 12 Jun 2012 08:36:46 -0000 1.13
+++ licenses/licenses.ja.html 3 Sep 2012 00:28:11 -0000 1.14
@@ -44,9 +44,9 @@
<li><a href="/philosophy/university.html">大å¦ã§åãã¦ããå
´åã«ãèªç±ã½ããã¦ã§ã¢ãå
¬éããã«ã¯</a></li>
<li><a href="/licenses/why-assign.html">FSFãè²¢ç®è
ããèä½æ¨©ç§»è²ãå¾ãçç±</a></li>
<li><a
href="/graphics/license-logos.html">GNUã©ã¤ã»ã³ã¹ã»ãã´</a>ãããªãã®ããã¸ã§ã¯ãã«ä½¿ã</li>
- <li><a
-href="/licenses/license-list.html#LicensingMailingList"><address@hidden>
-ã¡ã¼ãªã³ã°ãªã¹ã</a>ãã©ã¤ã»ã³ã·ã³ã°ã®ãã«ãä¸è¬ã¯ãã¡ãã¸
+ <li><a href="http://www.fsf.org/licensing";>FSF ã©ã¤ã»ã³ã·ã³ã° &
ã³ã³ãã©ã¤ã¢ã³ã¹ã»ã©ã</a></li>
+ <li>ã©ã¤ã»ã³ã·ã³ã°ã®ãã«ãä¸è¬ã¯ãã¡ãã¸: <a
+href="/licenses/license-list.html#LicensingMailingList"><address@hidden></a>
</li>
</ul>
@@ -326,7 +326,7 @@
<p><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2012/06/12 08:36:46 $
+$Date: 2012/09/03 00:28:11 $
<!-- timestamp end -->
</p>
Index: licenses/po/licenses.ja-en.html
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ja-en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- licenses/po/licenses.ja-en.html 12 Jun 2012 08:38:00 -0000 1.4
+++ licenses/po/licenses.ja-en.html 3 Sep 2012 00:28:20 -0000 1.5
@@ -60,9 +60,9 @@
assignments from contributors</a></li>
<li><a href="/graphics/license-logos.html">GNU license logos</a> to use
with your project</li>
+ <li><a href="http://www.fsf.org/licensing";>The FSF Licensing &
Compliance Lab</a></li>
<li><a
-href="/licenses/license-list.html#LicensingMailingList"><address@hidden>
-mailing list</a> for general licensing help
+href="/licenses/license-list.html#LicensingEmailAddress"><address@hidden></a>
for general licensing help
</li>
</ul>
@@ -432,7 +432,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2012/06/12 08:38:00 $
+$Date: 2012/09/03 00:28:20 $
<!-- timestamp end -->
</p>
</div>
Index: licenses/po/licenses.ja.po
===================================================================
RCS file: /web/www/www/licenses/po/licenses.ja.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- licenses/po/licenses.ja.po 3 Sep 2012 00:13:02 -0000 1.16
+++ licenses/po/licenses.ja.po 3 Sep 2012 00:28:20 -0000 1.17
@@ -151,8 +151,8 @@
"<a href=\"http://www.fsf.org/licensing\";>The FSF Licensing & Compliance "
"Lab</a>"
msgstr ""
-"<a href=\"http://www.fsf.org/licensing\";>FSF ã©ã¤ã»ã³ã·ã³ã° &
ã³ã³ãã©ã¤ã¢ã³ã¹"
-"ã»ã©ã</a>"
+"<a href=\"http://www.fsf.org/licensing\";>FSF ã©ã¤ã»ã³ã·ã³ã° &
ã³ã³ãã©ã¤"
+"ã¢ã³ã¹ã»ã©ã</a>"
#. type: Content of: <ul><li>
msgid ""
Index: philosophy/bsd.ja.html
===================================================================
RCS file: /web/www/www/philosophy/bsd.ja.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- philosophy/bsd.ja.html 12 Jun 2012 08:39:27 -0000 1.9
+++ philosophy/bsd.ja.html 3 Sep 2012 00:28:30 -0000 1.10
@@ -74,7 +74,12 @@
ãBSDã¹ã¿ã¤ã«ãã¨ããç¨èªã使ãããã¾ããä¸ã¤ããããããªããã®ããã«ãBSDã©ã¤ã»ã³ã¹ãã¨è¨ããªããã¨ã§ãããã®åé¡ã¸ã®èªç¥ãåºãããã¨ãã§ãã¾ãããã¹ã¦ã®ã³ãã¼ã¬ããã§ãªãèªç±ã½ããã¦ã§ã¢ã»ã©ã¤ã»ã³ã¹ããBSDã©ã¤ã»ã³ã¹ãã¨ãã¦åç
§ããã¨ãã³ãã¼ã¬ããã§ãªãèªç±ã½ããã¦ã§ã¢ã®ã©ã¤ã»ã³ã¹ã使ããã¨æã£ã¦ããæ°å
¥ãã®èªç±ã½ããã¦ã§ã¢éçºè
ã¯ãã©ã¤ã»ã³ã¹ãBSDããåã£ã¦ããã°è¯ãã¨æãè¾¼ãã§ãã¾ãããããã¾ããããã®éçºè
ã¯ã宣ä¼æ¡é
ä»ãã®ã©ã¤ã»ã³ã¹ãã確åºã¨ããæå³ã§ã¯ãªãããã¾ãã¾ã³ãã¼ãã¦ãã¾ãããããã¾ããã
</p>
<p>
- ããã³ãã¼ã¬ããã§ãªãã©ã¤ã»ã³ã¹ã®å
·ä½çãªä¾ãæãããå
´åãç¹ã«å¥½ã¿ããªããã°ããã®ç¹å®ã®åé¡ããªãä¾ãé¸ã¶ããã«ãã¦ãã
ããããã¨ãã°ããX11ã¹ã¿ã¤ã«ãã®ã©ã¤ã»ã³ã¹ã«ã¤ãã¦èªãã®ã§ããã°ã人ã
ã«X11ããã©ã¤ã»ã³ã¹ãã³ãã¼ãããã¨ãä¿ãã§ããããããã¦ã人ã
ã¯ãã¯ã£ããã¨å®£ä¼æ¡é
ãé¿ããäºã¤ã®BSDã©ã¤ã»ã³ã¹ã®ãã¡ãã²ã¨ã¤ãã©ã³ãã
ã«é¸ãã§ãã¾ããªã¹ã¯ãåããã¨ããªãã§ãããã
+ ããã³ãã¼ã¬ããã§ãªãã©ã¤ã»ã³ã¹ã®å
·ä½çãªä¾ãæãããå
´åãç¹ã«å¥½ã¿ããªããã°ããã®ç¹å®ã®åé¡ããªãä¾ãé¸ã¶ããã«ãã¦ãã
ããããã¨ãã°ããX11ã¹ã¿ã¤ã«ãã®ã©ã¤ã»ã³ã¹ã«ã¤ãã¦èªãã®ã§ããã°ã人ã
ã«X11ããã©ã¤ã»ã³ã¹ãã³ãã¼ãããã¨ãä¿ãã§ããããããã¦ã人ã
ã¯ãã¯ã£ããã¨å®£ä¼æ¡é
ãé¿ãã(äºã¤ã®)BSDã©ã¤ã»ã³ã¹ã®ãã¡ãã²ã¨ã¤ãã©ã³ãã
ã«é¸ãã§ãã¾ããªã¹ã¯ãåããã¨ããªãã§ãããã
+</p>
+<p>
+ ãããã¯ã<a
+href="/licenses/license-recommendations.html">ããããã¡ãä»ã®ã³ãã¼ã¬ããã§ãªãã©ã¤ã»ã³ã¹ãããæ¨å¥¨ãã</a>ã³ãã¼ã¬ããã§ãªãã©ã¤ã»ã³ã¹ã«ã¤ãã¦ãè¿°ã¹ããã¨ãã§ããã§ããã:
+Apache 2.0 ã©ã¤ã»ã³ã¹ã¯ç¹è¨±ã«ããèä¿¡è¡çºãé²æ¢ããæ¡é
ã®å
¥ã£ãã©ã¤ã»ã³ã¹ã§ãã
</p>
<p>
BSDã©ã¤ã»ã³ã¹ã®ãã¡ã®ä¸ã¤ãåç
§ãããæã¯ã常ã«ã©ã¡ãããªã®ããã¤ã¾ããããªãªã¸ãã«BSDã©ã¤ã»ã³ã¹ããªã®ããæ¹è¨çBSDã©ã¤ã»ã³ã¹ããªã®ããè¿°ã¹ãããã«ãã¦ãã
ããã
@@ -133,7 +138,7 @@
<!-- timestamp start -->
æçµæ´æ°:
-$Date: 2012/06/12 08:39:27 $
+$Date: 2012/09/03 00:28:30 $
<!-- timestamp end -->
</p>
Index: philosophy/po/bsd.ja-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/bsd.ja-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy/po/bsd.ja-en.html 12 Jun 2012 08:39:46 -0000 1.5
+++ philosophy/po/bsd.ja-en.html 3 Sep 2012 00:28:45 -0000 1.6
@@ -132,10 +132,16 @@
example which has no particular problem. For instance, if you talk
about “X11-style licenses”, you will encourage people to copy
the
license from X11, which avoids the advertising clause for certain,
- rather than take a risk by randomly choosing one of the two BSD
+ rather than take a risk by randomly choosing one of the BSD
licenses.
</p>
<p>
+ Or you could mention the non-copyleft license
+ which <a href="/licenses/license-recommendations.html"> we
+ recommend over the other non-copyleft licenses</a>: the Apache 2.0
+ license, which has a clause to prevent patent treachery.
+</p>
+<p>
When you want to refer specifically to one of the BSD licenses,
please always state which one: the “original BSD license” or
the
“revised BSD license”.
@@ -180,7 +186,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2012/06/12 08:39:46 $
+$Date: 2012/09/03 00:28:45 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy/po/bsd.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/bsd.ja.po,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy/po/bsd.ja.po 3 Sep 2012 00:13:13 -0000 1.11
+++ philosophy/po/bsd.ja.po 3 Sep 2012 00:28:45 -0000 1.12
@@ -274,10 +274,10 @@
"licenses</a>: the Apache 2.0 license, which has a clause to prevent patent "
"treachery."
msgstr ""
-"ãããã¯ã<a href=\"/licenses/"
-"license-recommendations.html\">ããããã¡ãä»ã®ã³ãã¼ã¬ããã§ãªãã©ã¤ã»ã³ã¹ãã"
-"ãæ¨å¥¨ãã</a>ã³ãã¼ã¬ããã§ãªãã©ã¤ã»ã³ã¹ã«ã¤ãã¦ãè¿°ã¹ããã¨ãã§ããã§ããã:
"
-"Apache 2.0 ã©ã¤ã»ã³ã¹ã¯ç¹è¨±ã«ããèä¿¡è¡çºãé²æ¢ããæ¡é
ã®å
¥ã£ãã©ã¤ã»ã³ã¹ã§ãã"
+"ãããã¯ã<a
href=\"/licenses/license-recommendations.html\">ããããã¡ãä»ã®"
+"ã³ãã¼ã¬ããã§ãªãã©ã¤ã»ã³ã¹ãããæ¨å¥¨ãã</a>ã³ãã¼ã¬ããã§ãªãã©ã¤ã»ã³ã¹ã«"
+"ã¤ãã¦ãè¿°ã¹ããã¨ãã§ããã§ããã: Apache 2.0
ã©ã¤ã»ã³ã¹ã¯ç¹è¨±ã«ããèä¿¡è¡çº"
+"ãé²æ¢ããæ¡é
ã®å
¥ã£ãã©ã¤ã»ã³ã¹ã§ãã"
# type: Content of: <p>
#. type: Content of: <p>
Index: software/software.ja.html
===================================================================
RCS file: /web/www/www/software/software.ja.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- software/software.ja.html 12 Jun 2012 08:42:28 -0000 1.5
+++ software/software.ja.html 3 Sep 2012 00:28:55 -0000 1.6
@@ -107,23 +107,26 @@
href="gv/">gv</a>), gicqd, <a
href="http://directory.fsf.org/project/giptables/";>giptables</a>, <a
href="http://directory.fsf.org/project/gnochive/";>gnochive</a>, gnotary, <a
-href="http://directory.fsf.org/project/gnotepad/";>gnotepad+</a>, gnubios,
-gnucad, <a href="gnufi/">gnufi</a>, gnupedia (see <a
-href="http://wikipedia.org";>wikipedia</a>), <a href="gnusql">gnusql</a>, <a
-href="gnustep-db/">gnustep-db</a>, <a href="gnuts/">gnuts</a>, <a
-href="goose/">goose</a>, <a href="gphoto/">gphoto</a>, <a
-href="graphics/">graphics</a>, grover, <a href="gtkeditor/">gtkeditor</a>,
-<a href="gtkeyboard/">gtkeyboard</a>, <a href="guss/">guss</a>, <a
-href="hegemonie/">hegemonie</a>, <a href="lengualibre">lengualibre</a>,
-leonardo, libopts (see <a href="autogen/">autogen</a>), mana, <a
-href="messenger/">messenger</a>, <a href="mgcp/">mgcp</a>, <a
-href="mll2html/">mll2html</a>, <a href="obst/">obst</a>, <a
-href="octal/">octal</a>, p2c, <a href="patchwork/">patchwork</a>, <a
-href="pips/">pips</a>, <a href="poc/">poc</a>, <a href="rat/">rat</a>, <a
+href="http://directory.fsf.org/project/gnotepad/";>gnotepad+</a>, gnubios, <a
+href="gnu-queue/">gnu-queue</a>, gnucad, <a href="gnufi/">gnufi</a>,
+gnupedia (see <a href="http://wikipedia.org";>wikipedia</a>), <a
+href="gnusql">gnusql</a>, <a href="gnustep-db/">gnustep-db</a>, <a
+href="gnuts/">gnuts</a>, <a href="goldwater/">goldwater</a>, <a
+href="goodbye/">goodbye</a>, <a href="goose/">goose</a>, <a
+href="gphoto/">gphoto</a>, <a href="graphics/">graphics</a>, grover, <a
+href="gtkeditor/">gtkeditor</a>, <a href="gtkeyboard/">gtkeyboard</a>, <a
+href="guss/">guss</a>, <a href="hegemonie/">hegemonie</a>, <a
+href="lengualibre">lengualibre</a>, leonardo, libopts (see <a
+href="autogen/">autogen</a>), mana, <a href="messenger/">messenger</a>, <a
+href="mgcp/">mgcp</a>, <a href="mll2html/">mll2html</a>, <a
+href="obst/">obst</a>, <a href="octal/">octal</a>, p2c, <a
+href="patchwork/">patchwork</a>, <a href="pips/">pips</a>, <a
+href="poc/">poc</a>, <a href="proto/">proto</a>, <a href="rat/">rat</a>, <a
href="songanizer/">songanizer</a>, <a href="sweater/">sweater</a>, <a
-href="toutdoux/">toutdoux</a>, <a href="webpublish/">webpublish</a>, <a
-href="xbase/">xbase</a>, <a href="xinfo/">xinfo</a>, <a
-href="xmhtml/">xmhtml</a>, <a href="zebra/">zebra</a>.
+href="sxml/">sxml</a>, <a href="toutdoux/">toutdoux</a>, <a
+href="webpublish/">webpublish</a>, <a href="xbase/">xbase</a>, <a
+href="xinfo/">xinfo</a>, <a href="xmhtml/">xmhtml</a>, <a
+href="zebra/">zebra</a>.
</p>
@@ -152,7 +155,7 @@
href="/server/standards/README.translations.html">翻訳
README</a>ãã覧ãã ããã
</p>
-<p>Copyright © 2011 Free Software Foundation, Inc.</p>
+<p>Copyright © 2012 Free Software Foundation, Inc.</p>
<p>ãã®ãã¼ã¸ã¯<a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative Commons
Attribution-NoDerivs 3.0 United States
License</a>ã®æ¡ä»¶ã§è¨±è«¾ããã¾ãã
@@ -168,7 +171,7 @@
<p><!-- timestamp start -->
æçµæ´æ°:
-$Date: 2012/06/12 08:42:28 $
+$Date: 2012/09/03 00:28:55 $
<!-- timestamp end -->
</p>
Index: software/po/software.ja-en.html
===================================================================
RCS file: /web/www/www/software/po/software.ja-en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- software/po/software.ja-en.html 12 Jun 2012 08:42:45 -0000 1.5
+++ software/po/software.ja-en.html 3 Sep 2012 00:29:06 -0000 1.6
@@ -133,6 +133,7 @@
href="mailto:address@hidden";><address@hidden></a>. Here
is the list; we leave the old project pages up (when they existed):
+<a href="aeneas/">aeneas</a>,
<a href="aroundme/">aroundme</a>,
<a href="gnu3dkit/">3dkit</a>,
<a href="abcsh/">abcsh</a>,
@@ -156,12 +157,15 @@
gnotary,
<a href="http://directory.fsf.org/project/gnotepad/";>gnotepad+</a>,
gnubios,
+<a href="gnu-queue/">gnu-queue</a>,
gnucad,
<a href="gnufi/">gnufi</a>,
gnupedia (see <a href="http://wikipedia.org";>wikipedia</a>),
<a href="gnusql">gnusql</a>,
<a href="gnustep-db/">gnustep-db</a>,
<a href="gnuts/">gnuts</a>,
+<a href="goldwater/">goldwater</a>,
+<a href="goodbye/">goodbye</a>,
<a href="goose/">goose</a>,
<a href="gphoto/">gphoto</a>,
<a href="graphics/">graphics</a>,
@@ -183,9 +187,11 @@
<a href="patchwork/">patchwork</a>,
<a href="pips/">pips</a>,
<a href="poc/">poc</a>,
+<a href="proto/">proto</a>,
<a href="rat/">rat</a>,
<a href="songanizer/">songanizer</a>,
<a href="sweater/">sweater</a>,
+<a href="sxml/">sxml</a>,
<a href="toutdoux/">toutdoux</a>,
<a href="webpublish/">webpublish</a>,
<a href="xbase/">xbase</a>,
@@ -215,7 +221,7 @@
translations of this article.
</p>
-<p>Copyright © 2011 Free Software Foundation,
+<p>Copyright © 2012 Free Software Foundation,
Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/3.0/us/";>Creative
@@ -224,7 +230,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2012/06/12 08:42:45 $
+$Date: 2012/09/03 00:29:06 $
<!-- timestamp end -->
</p>
</div>
- www distros/po/common-distros.de.po distros/po/...,
GNUN <=