From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0

---
 opends/src/messages/messages/log_ja.properties |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/opends/src/messages/messages/log_ja.properties b/opends/src/messages/messages/log_ja.properties
index 4738821..c7714d4 100644
--- a/opends/src/messages/messages/log_ja.properties
+++ b/opends/src/messages/messages/log_ja.properties
@@ -21,14 +21,10 @@
 # CDDL HEADER END
 #
 #      Copyright 2006-2008 Sun Microsystems, Inc.
-
-
-
 #
 # Global directives
 #
 global.category=LOG
-
 #
 # Format string definitions
 #
@@ -47,15 +43,23 @@
 #
 # ORDINAL is an integer unique among other ordinals in this file
 #
-SEVERE_ERR_LOGGER_ERROR_WRITING_RECORD_1=Error occurred while writing log record for logger %s: %s. Any further write errors will be ignored
-SEVERE_ERR_LOGGER_ERROR_OPENING_FILE_2=Error occurred while opening log file %s for logger %s: %s
-SEVERE_ERR_LOGGER_ERROR_CLOSING_FILE_3=Error occurred while closing log file for logger %s: %s
-SEVERE_ERR_LOGGER_ERROR_FLUSHING_BUFFER_4=Error occurred while flushing writer buffer for logger %s: %s
+###SEVERE_ERR_LOGGER_ERROR_WRITING_RECORD_1=Error occurred while writing log \
+### record for logger %s: %s. Any further write errors will be ignored
+###SEVERE_ERR_LOGGER_ERROR_OPENING_FILE_2=Error occurred while opening log file \
+### %s for logger %s: %s
+###SEVERE_ERR_LOGGER_ERROR_CLOSING_FILE_3=Error occurred while closing log file \
+### for logger %s: %s
+###SEVERE_ERR_LOGGER_ERROR_FLUSHING_BUFFER_4=Error occurred while flushing \
+### writer buffer for logger %s: %s
 MILD_WARN_ERROR_LOGGER_INVALID_SEVERITY_5=\u7121\u52b9\u306a\u30a8\u30e9\u30fc\u30ed\u30b0\u91cd\u8981\u5ea6 "%s"
 MILD_WARN_ERROR_LOGGER_INVALID_CATEGORY_6=\u7121\u52b9\u306a\u30a8\u30e9\u30fc\u30ed\u30b0\u30ab\u30c6\u30b4\u30ea "%s"
 MILD_WARN_ERROR_LOGGER_INVALID_OVERRIDE_SEVERITY_7=\u91cd\u8981\u5ea6 "%s" \u306e\u7121\u52b9\u306a\u4e0a\u66f8\u304d
-SEVERE_WARN_LOGGER_SET_PERMISSION_FAILED_8=Error occurred while setting file permissions for the log file %s: %s
+###SEVERE_WARN_LOGGER_SET_PERMISSION_FAILED_8=Error occurred while setting file \
+### permissions for the log file %s: %s
 MILD_WARN_LOGGER_UNABLE_SET_PERMISSIONS_9=\u3053\u306e\u30d7\u30e9\u30c3\u30c8\u30d5\u30a9\u30fc\u30e0\u306f\u30ed\u30b0\u30d5\u30a1\u30a4\u30eb %2$s \u3078\u306e\u30d5\u30a1\u30a4\u30eb\u30a2\u30af\u30bb\u30b9\u6a29 %1$s \u306e\u8a2d\u5b9a\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u3066\u3044\u307e\u305b\u3093
-SEVERE_ERR_LOGGER_ERROR_LISTING_FILES_10=Error occured while listing log files named by policy with initial file name %s
-SEVERE_ERR_LOGGER_ERROR_OBTAINING_FREE_SPACE_11=Error occured while obtaining free disk space in the partition containing log file %s: %s
-SEVERE_ERR_LOGGER_ERROR_ENFORCING_RETENTION_POLICY_12=Error occured while enforcing retention policy %s for logger %s: %s
+###SEVERE_ERR_LOGGER_ERROR_LISTING_FILES_10=Error occured while listing log files \
+###  named by policy with initial file name %s
+###SEVERE_ERR_LOGGER_ERROR_OBTAINING_FREE_SPACE_11=Error occured while obtaining \
+###  free disk space in the partition containing log file %s: %s
+###SEVERE_ERR_LOGGER_ERROR_ENFORCING_RETENTION_POLICY_12=Error occured while \
+###  enforcing retention policy %s for logger %s: %s

--
Gitblit v1.10.0