www/philosophy/po free-sw.ja.po philosophy.ja.po

[NIIBE Yutaka]

CVSROOT:        /web/www
Module name:    www
Changes by:     NIIBE Yutaka <gniibe>   12/02/27 03:48:03

Modified files:
        philosophy/po  : free-sw.ja.po philosophy.ja.po 

Log message:
        Update Japanese Translations again

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ja.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.ja.po?cvsroot=www&r1=1.7&r2=1.8

Patches:
Index: free-sw.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ja.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- free-sw.ja.po       27 Feb 2012 03:04:15 -0000      1.16
+++ free-sw.ja.po       27 Feb 2012 03:47:45 -0000      1.17
@@ -71,13 +71,6 @@
 "ご覧ください。"
 
 #. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "&ldquo;Free software&rdquo; means software that respects users' freedom "
-#| "and community.  Roughly, the users have the freedom to run, copy, "
-#| "distribute, study, change and improve the software.  With these freedoms, "
-#| "the users (both individually and collectively) control the program and "
-#| "what it does for them."
 msgid ""
 "&ldquo;Free software&rdquo; means software that respects users' freedom and "
 "community.  Roughly, <b>the users have the freedom to run, copy, distribute, "

Index: philosophy.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.ja.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy.ja.po    27 Feb 2012 03:04:16 -0000      1.7
+++ philosophy.ja.po    27 Feb 2012 03:47:46 -0000      1.8
@@ -7,13 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: philosophy.html\n"
-<<<<<<< philosophy.ja.po
-"POT-Creation-Date: 2012-02-26 12:25-0500\n"
-"PO-Revision-Date: 2012-01-31 21:30+0900\n"
-=======
 "POT-Creation-Date: 2012-02-26 12:25-0500\n"
 "PO-Revision-Date: 2012-02-27 10:11+0900\n"
->>>>>>> 1.6
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
 "Language: ja\n"
@@ -35,12 +30,6 @@
 
 #. type: Content of: <p>
 msgid ""
-<<<<<<< philosophy.ja.po
-"<em>Free software</em> means that the software's users have freedom.  (The "
-"issue is not about price.)  We developed the GNU operating system so that "
-"users can have freedom in their computing."
-msgstr ""
-=======
 "<em>Free software</em> means that the software's users have freedom.  (The "
 "issue is not about price.)  We developed the GNU operating system so that "
 "users can have freedom in their computing."
@@ -48,39 +37,6 @@
 "<em>自由ソフトウェア</em>は、ソフトウェアの利用者
に自由があることを意味します。(値段の"
 "問題ではありません。) 
コンピューティングに関して利用者が自由を有するよう、"
 "わたしたちはGNUオペレーティング・システム
を開発しました。"
->>>>>>> 1.6
-
-#. type: Content of: <p>
-msgid ""
-<<<<<<< philosophy.ja.po
-"Specifically, free software means users have the <a href=\"/philosophy/free-"
-"sw.html\">four essential freedoms</a>: (0) to run the program, (1) to study "
-"and change the program in source code form, (2) to redistribute exact "
-"copies, and (3) to distribute modified versions."
-msgstr ""
-
-#. type: Content of: <p>
-#, fuzzy
-#| msgid ""
-#| "Free software is a matter of freedom: people should be free to use "
-#| "software in all the ways that are socially useful.  Software differs from "
-#| "material objects&mdash;such as chairs, sandwiches, and gasoline&mdash;in "
-#| "that it can be copied and changed much more easily.  These possibilities "
-#| "make software as useful as it is; we believe software users should be "
-#| "able to make use of them."
-msgid ""
-"Software differs from material objects&mdash;such as chairs, sandwiches, and "
-"gasoline&mdash;in that it can be copied and changed much more easily.  These "
-"facilities are why software is useful; we believe a program's users should "
-"be free to take advantage of them, not solely its developer."
-msgstr ""
-"自由ソフトウェアで問題となるのは自由です。社会的に有益であれば、人びとがどの"
-"ような方法でソフトウェアを使うのも自由であるべきです。ソフトウェアは物質的な"
-"もの&mdash;たとえば椅
子、サンドウィッチ、ガソリンなど&mdash;とは、それをコ"
-"ピーしたり改変したりするのが簡単であるという点で異なります。これらの可能性が"
-"ソフトウェアの便利さを最大限に引き出すのです。わたしたちは、ソフトウェアの利"
-"用者
はこういった可能性を利用できるべきであると信じています。"
-=======
 "Specifically, free software means users have the <a href=\"/philosophy/free-"
 "sw.html\">four essential freedoms</a>: (0) to run the program, (1) to study "
 "and change the program in source code form, (2) to redistribute exact "
@@ -103,7 +59,6 @@
 
"う点で異なります。これらの容易性がソフトウェアが有用である理由です。開"
 "発者だけでなく、プログラムの利用者
もこういった容易性を自由に活用できる"
 "べきだと、わたしたちは信じています。"
->>>>>>> 1.6
 
 #. type: Content of: <p>
 msgid "For further reading, please select a section from the menu above."