[jboss-cvs] JBossAS SVN: r68267 - projects/docs/trunk/Server_Configuration_Guide/ja-JP.

[jboss-cvs-commits at lists.jboss.org]

Author: xhuang at jboss.com
Date: 2007-12-13 22:01:45 -0500 (Thu, 13 Dec 2007)
New Revision: 68267

Modified:
   projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_EJBs.po
   projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_Entity_EJBs.po
   projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_HTTP.po
   projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_Intro.po
   projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_JMS.po
   projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_JNDI.po
   projects/docs/trunk/Server_Configuration_Guide/ja-JP/Naming.po
Log:
remove conflicts

Modified: projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_EJBs.po
===================================================================
--- projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_EJBs.po	2007-12-14 02:37:10 UTC (rev 68266)
+++ projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_EJBs.po	2007-12-14 03:01:45 UTC (rev 68267)
@@ -1,12 +1,13 @@
-# Language ja-JP translations for PACKAGE package.
+# Language /tmp/mike/JBEAP420/JBAS translations for JBEAP package.
+# Copyright (C) 2007 Free Software Foundation, Inc.
 # Automatically generated, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: JBEAP 420\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2007-12-10 22:33+0000\n"
-"PO-Revision-Date: 2007-12-10 22:33+0000\n"
+"PO-Revision-Date: 2001-02-09 01:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"

Modified: projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_Entity_EJBs.po
===================================================================
--- projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_Entity_EJBs.po	2007-12-14 02:37:10 UTC (rev 68266)
+++ projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_Entity_EJBs.po	2007-12-14 03:01:45 UTC (rev 68267)
@@ -1,12 +1,13 @@
-# Language ja-JP translations for PACKAGE package.
+# Language /tmp/mike/JBEAP420/JBAS translations for JBEAP package.
+# Copyright (C) 2007 Free Software Foundation, Inc.
 # Automatically generated, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: JBEAP 420\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2007-12-10 22:33+0000\n"
-"PO-Revision-Date: 2007-12-10 22:33+0000\n"
+"PO-Revision-Date: 2001-02-09 01:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"

Modified: projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_HTTP.po
===================================================================
--- projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_HTTP.po	2007-12-14 02:37:10 UTC (rev 68266)
+++ projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_HTTP.po	2007-12-14 03:01:45 UTC (rev 68267)
@@ -1,12 +1,13 @@
-# Language ja-JP translations for PACKAGE package.
+# Language /tmp/mike/JBEAP420/JBAS translations for JBEAP package.
+# Copyright (C) 2007 Free Software Foundation, Inc.
 # Automatically generated, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: JBEAP 420\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2007-12-10 22:33+0000\n"
-"PO-Revision-Date: 2007-12-10 22:33+0000\n"
+"PO-Revision-Date: 2001-02-09 01:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"

Modified: projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_Intro.po
===================================================================
--- projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_Intro.po	2007-12-14 02:37:10 UTC (rev 68266)
+++ projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_Intro.po	2007-12-14 03:01:45 UTC (rev 68267)
@@ -1,12 +1,13 @@
-# Language ja-JP translations for PACKAGE package.
+# Language /tmp/mike/JBEAP420/JBAS translations for JBEAP package.
+# Copyright (C) 2007 Free Software Foundation, Inc.
 # Automatically generated, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: JBEAP 420\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2007-12-10 22:33+0000\n"
-"PO-Revision-Date: 2007-12-10 22:33+0000\n"
+"PO-Revision-Date: 2001-02-09 01:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"

Modified: projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_JMS.po
===================================================================
--- projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_JMS.po	2007-12-14 02:37:10 UTC (rev 68266)
+++ projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_JMS.po	2007-12-14 03:01:45 UTC (rev 68267)
@@ -1,12 +1,13 @@
-# Language ja-JP translations for PACKAGE package.
+# Language /tmp/mike/JBEAP420/JBAS translations for JBEAP package.
+# Copyright (C) 2007 Free Software Foundation, Inc.
 # Automatically generated, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: JBEAP 420\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2007-12-10 22:33+0000\n"
-"PO-Revision-Date: 2007-12-10 22:33+0000\n"
+"PO-Revision-Date: 2001-02-09 01:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"

Modified: projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_JNDI.po
===================================================================
--- projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_JNDI.po	2007-12-14 02:37:10 UTC (rev 68266)
+++ projects/docs/trunk/Server_Configuration_Guide/ja-JP/Clustering_Guide_JNDI.po	2007-12-14 03:01:45 UTC (rev 68267)
@@ -1,12 +1,13 @@
-# Language ja-JP translations for PACKAGE package.
+# Language /tmp/mike/JBEAP420/JBAS translations for JBEAP package.
+# Copyright (C) 2007 Free Software Foundation, Inc.
 # Automatically generated, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: JBEAP 420\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2007-12-10 22:33+0000\n"
-"PO-Revision-Date: 2007-12-10 22:33+0000\n"
+"PO-Revision-Date: 2001-02-09 01:25+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"

Modified: projects/docs/trunk/Server_Configuration_Guide/ja-JP/Naming.po
===================================================================
--- projects/docs/trunk/Server_Configuration_Guide/ja-JP/Naming.po	2007-12-14 02:37:10 UTC (rev 68266)
+++ projects/docs/trunk/Server_Configuration_Guide/ja-JP/Naming.po	2007-12-14 03:01:45 UTC (rev 68267)
@@ -6,21 +6,12 @@
 # Noriko Mizumoto <noriko at redhat.com>, 2007.
 msgid ""
 msgstr ""
-<<<<<<< .mine
-"Project-Id-Version: JBEAP 420\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2007-11-05 06:01+0000\n"
-"PO-Revision-Date: 2001-02-09 01:25+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-=======
 "Project-Id-Version: Naming\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2007-11-07 00:56+0000\n"
 "PO-Revision-Date: 2007-11-22 11:36+1000\n"
 "Last-Translator: Noriko Mizumoto <noriko at redhat.com>\n"
 "Language-Team: Japanese <fedora-trans-ja at redhat.com>\n"
->>>>>>> .r67753
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"