www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www home-staged.ar.html home-staged.bg.html hom...


From: GNUN
Subject: www home-staged.ar.html home-staged.bg.html hom...
Date: Mon, 27 Feb 2012 03:04:58 +0000

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     12/02/27 03:04:57

Modified files:
        .              : home-staged.ar.html home-staged.bg.html 
                         home-staged.ca.html home-staged.de.html 
                         home-staged.el.html home-staged.es.html 
                         home-staged.fa.html home-staged.html 
                         home.ar.html home.bg.html home.ca.html 
                         home.de.html home.el.html home.es.html 
                         home.fa.html 
        philosophy/po  : free-sw.ja.po philosophy.ja.po 
        po             : home-staged.de-en.html home-staged.es-en.html 
                         home.de-en.html home.es-en.html 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/home-staged.ar.html?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/home-staged.bg.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/home-staged.ca.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/home-staged.de.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/home-staged.el.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/home-staged.es.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/home-staged.fa.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/home-staged.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/home.ar.html?cvsroot=www&r1=1.63&r2=1.64
http://web.cvs.savannah.gnu.org/viewcvs/www/home.bg.html?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/home.ca.html?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/home.de.html?cvsroot=www&r1=1.68&r2=1.69
http://web.cvs.savannah.gnu.org/viewcvs/www/home.el.html?cvsroot=www&r1=1.68&r2=1.69
http://web.cvs.savannah.gnu.org/viewcvs/www/home.es.html?cvsroot=www&r1=1.73&r2=1.74
http://web.cvs.savannah.gnu.org/viewcvs/www/home.fa.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.ja.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/philosophy.ja.po?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home-staged.de-en.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home-staged.es-en.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.de-en.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/po/home.es-en.html?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: home-staged.ar.html
===================================================================
RCS file: /web/www/www/home-staged.ar.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- home-staged.ar.html 24 Feb 2012 22:01:15 -0000      1.31
+++ home-staged.ar.html 27 Feb 2012 03:02:43 -0000      1.32
@@ -266,7 +266,7 @@
  <p><!-- timestamp start -->
 آخر تحديث:
 
-$Date: 2012/02/24 22:01:15 $
+$Date: 2012/02/27 03:02:43 $
 
 <!-- timestamp end -->
 </p>

Index: home-staged.bg.html
===================================================================
RCS file: /web/www/www/home-staged.bg.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- home-staged.bg.html 24 Feb 2012 22:01:15 -0000      1.28
+++ home-staged.bg.html 27 Feb 2012 03:02:49 -0000      1.29
@@ -278,7 +278,7 @@
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2012/02/24 22:01:15 $
+$Date: 2012/02/27 03:02:49 $
 
 <!-- timestamp end -->
 </p>

Index: home-staged.ca.html
===================================================================
RCS file: /web/www/www/home-staged.ca.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- home-staged.ca.html 24 Feb 2012 22:01:15 -0000      1.28
+++ home-staged.ca.html 27 Feb 2012 03:03:14 -0000      1.29
@@ -279,7 +279,7 @@
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2012/02/24 22:01:15 $
+$Date: 2012/02/27 03:03:14 $
 
 <!-- timestamp end -->
 </p>

Index: home-staged.de.html
===================================================================
RCS file: /web/www/www/home-staged.de.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- home-staged.de.html 24 Feb 2012 23:03:00 -0000      1.34
+++ home-staged.de.html 27 Feb 2012 03:03:39 -0000      1.35
@@ -297,7 +297,7 @@
  <p><!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2012/02/24 23:03:00 $
+$Date: 2012/02/27 03:03:39 $
 
 <!-- timestamp end -->
 </p>

Index: home-staged.el.html
===================================================================
RCS file: /web/www/www/home-staged.el.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- home-staged.el.html 24 Feb 2012 22:01:16 -0000      1.25
+++ home-staged.el.html 27 Feb 2012 03:03:41 -0000      1.26
@@ -284,7 +284,7 @@
  <p><!-- timestamp start -->
 Ενημερώθηκε:
 
-$Date: 2012/02/24 22:01:16 $
+$Date: 2012/02/27 03:03:41 $
 
 <!-- timestamp end -->
 </p>

Index: home-staged.es.html
===================================================================
RCS file: /web/www/www/home-staged.es.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- home-staged.es.html 25 Feb 2012 22:00:53 -0000      1.29
+++ home-staged.es.html 27 Feb 2012 03:03:41 -0000      1.30
@@ -283,7 +283,7 @@
  <p><!-- timestamp start -->
 Actualizado: 
 
-$Date: 2012/02/25 22:00:53 $
+$Date: 2012/02/27 03:03:41 $
 
 <!-- timestamp end -->
 </p>

Index: home-staged.fa.html
===================================================================
RCS file: /web/www/www/home-staged.fa.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- home-staged.fa.html 24 Feb 2012 22:01:16 -0000      1.21
+++ home-staged.fa.html 27 Feb 2012 03:03:42 -0000      1.22
@@ -268,7 +268,7 @@
  <p><!-- timestamp start -->
 آخرین به‌روزرسانی:
 
-$Date: 2012/02/24 22:01:16 $
+$Date: 2012/02/27 03:03:42 $
 
 <!-- timestamp end -->
 </p>

Index: home-staged.html
===================================================================
RCS file: /web/www/www/home-staged.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- home-staged.html    24 Feb 2012 21:06:10 -0000      1.20
+++ home-staged.html    27 Feb 2012 03:03:58 -0000      1.21
@@ -267,7 +267,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/02/24 21:06:10 $
+$Date: 2012/02/27 03:03:58 $
 <!-- timestamp end -->
 </p>
 

Index: home.ar.html
===================================================================
RCS file: /web/www/www/home.ar.html,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- home.ar.html        24 Feb 2012 21:06:13 -0000      1.63
+++ home.ar.html        27 Feb 2012 03:04:01 -0000      1.64
@@ -266,7 +266,7 @@
  <p><!-- timestamp start -->
 آخر تحديث:
 
-$Date: 2012/02/24 21:06:13 $
+$Date: 2012/02/27 03:04:01 $
 
 <!-- timestamp end -->
 </p>

Index: home.bg.html
===================================================================
RCS file: /web/www/www/home.bg.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- home.bg.html        24 Feb 2012 21:06:13 -0000      1.40
+++ home.bg.html        27 Feb 2012 03:04:02 -0000      1.41
@@ -278,7 +278,7 @@
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2012/02/24 21:06:13 $
+$Date: 2012/02/27 03:04:02 $
 
 <!-- timestamp end -->
 </p>

Index: home.ca.html
===================================================================
RCS file: /web/www/www/home.ca.html,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- home.ca.html        24 Feb 2012 21:06:14 -0000      1.56
+++ home.ca.html        27 Feb 2012 03:04:02 -0000      1.57
@@ -283,7 +283,7 @@
  <p><!-- timestamp start -->
 Updated:
 
-$Date: 2012/02/24 21:06:14 $
+$Date: 2012/02/27 03:04:02 $
 
 <!-- timestamp end -->
 </p>

Index: home.de.html
===================================================================
RCS file: /web/www/www/home.de.html,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- home.de.html        25 Feb 2012 22:00:53 -0000      1.68
+++ home.de.html        27 Feb 2012 03:04:02 -0000      1.69
@@ -287,7 +287,7 @@
  <p><!-- timestamp start -->
 Aktualisierung:
 
-$Date: 2012/02/25 22:00:53 $
+$Date: 2012/02/27 03:04:02 $
 
 <!-- timestamp end -->
 </p>

Index: home.el.html
===================================================================
RCS file: /web/www/www/home.el.html,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- home.el.html        24 Feb 2012 21:06:14 -0000      1.68
+++ home.el.html        27 Feb 2012 03:04:02 -0000      1.69
@@ -292,7 +292,7 @@
  <p><!-- timestamp start -->
 Ενημερώθηκε:
 
-$Date: 2012/02/24 21:06:14 $
+$Date: 2012/02/27 03:04:02 $
 
 <!-- timestamp end -->
 </p>

Index: home.es.html
===================================================================
RCS file: /web/www/www/home.es.html,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- home.es.html        26 Feb 2012 12:05:37 -0000      1.73
+++ home.es.html        27 Feb 2012 03:04:02 -0000      1.74
@@ -282,7 +282,7 @@
  <p><!-- timestamp start -->
 Actualizado: 
 
-$Date: 2012/02/26 12:05:37 $
+$Date: 2012/02/27 03:04:02 $
 
 <!-- timestamp end -->
 </p>

Index: home.fa.html
===================================================================
RCS file: /web/www/www/home.fa.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- home.fa.html        24 Feb 2012 21:06:14 -0000      1.46
+++ home.fa.html        27 Feb 2012 03:04:03 -0000      1.47
@@ -268,7 +268,7 @@
  <p><!-- timestamp start -->
 آخرین به‌روزرسانی:
 
-$Date: 2012/02/24 21:06:14 $
+$Date: 2012/02/27 03:04:03 $
 
 <!-- timestamp end -->
 </p>

Index: philosophy/po/free-sw.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.ja.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- philosophy/po/free-sw.ja.po 27 Feb 2012 01:39:13 -0000      1.15
+++ philosophy/po/free-sw.ja.po 27 Feb 2012 03:04:15 -0000      1.16
@@ -71,6 +71,13 @@
 "ご覧ください。"
 
 #. 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/po/philosophy.ja.po
===================================================================
RCS file: /web/www/www/philosophy/po/philosophy.ja.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- philosophy/po/philosophy.ja.po      27 Feb 2012 01:39:13 -0000      1.6
+++ philosophy/po/philosophy.ja.po      27 Feb 2012 03:04:16 -0000      1.7
@@ -7,14 +7,20 @@
 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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Outdated-Since: 2012-02-26 12:25-0500\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -29,6 +35,12 @@
 
 #. 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."
@@ -36,9 +48,39 @@
 "<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 "
@@ -61,6 +103,7 @@
 
"う点で異なります。これらの容易性がソフトウェアが有用である理由です。開"
 "発者だけでなく、プログラムの利用者
もこういった容易性を自由に活用できる"
 "べきだと、わたしたちは信じています。"
+>>>>>>> 1.6
 
 #. type: Content of: <p>
 msgid "For further reading, please select a section from the menu above."

Index: po/home-staged.de-en.html
===================================================================
RCS file: /web/www/www/po/home-staged.de-en.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- po/home-staged.de-en.html   24 Feb 2012 23:04:05 -0000      1.17
+++ po/home-staged.de-en.html   27 Feb 2012 03:04:30 -0000      1.18
@@ -267,7 +267,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/02/24 23:04:05 $
+$Date: 2012/02/27 03:04:30 $
 <!-- timestamp end -->
 </p>
 

Index: po/home-staged.es-en.html
===================================================================
RCS file: /web/www/www/po/home-staged.es-en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- po/home-staged.es-en.html   25 Feb 2012 22:01:00 -0000      1.8
+++ po/home-staged.es-en.html   27 Feb 2012 03:04:30 -0000      1.9
@@ -267,7 +267,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/02/25 22:01:00 $
+$Date: 2012/02/27 03:04:30 $
 <!-- timestamp end -->
 </p>
 

Index: po/home.de-en.html
===================================================================
RCS file: /web/www/www/po/home.de-en.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- po/home.de-en.html  25 Feb 2012 22:01:00 -0000      1.16
+++ po/home.de-en.html  27 Feb 2012 03:04:30 -0000      1.17
@@ -267,7 +267,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/02/25 22:01:00 $
+$Date: 2012/02/27 03:04:30 $
 <!-- timestamp end -->
 </p>
 

Index: po/home.es-en.html
===================================================================
RCS file: /web/www/www/po/home.es-en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- po/home.es-en.html  26 Feb 2012 12:06:35 -0000      1.6
+++ po/home.es-en.html  27 Feb 2012 03:04:30 -0000      1.7
@@ -267,7 +267,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/02/26 12:06:35 $
+$Date: 2012/02/27 03:04:30 $
 <!-- timestamp end -->
 </p>
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]