portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vku...@apache.org
Subject svn commit: r702919 [1/2] - /portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/
Date Wed, 08 Oct 2008 16:15:04 GMT
Author: vkumar
Date: Wed Oct  8 09:15:03 2008
New Revision: 702919

URL: http://svn.apache.org/viewvc?rev=702919&view=rev
Log:
Adding keyed messages in properties files

Modified:
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties
    portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh_TW.properties

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties?rev=702919&r1=702918&r2=702919&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages.properties Wed Oct  8 09:15:03 2008
@@ -19,7 +19,8 @@
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
-org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more required {1} {2} associations.   
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
@@ -60,6 +61,7 @@
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not allowed.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
@@ -78,6 +80,7 @@
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not allowed.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
@@ -96,6 +99,7 @@
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties?rev=702919&r1=702918&r2=702919&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_en.properties Wed Oct  8 09:15:03 2008
@@ -19,6 +19,7 @@
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
@@ -59,6 +60,7 @@
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not allowed.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
@@ -77,6 +79,7 @@
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not allowed.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
@@ -95,6 +98,7 @@
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties?rev=702919&r1=702918&r2=702919&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ja.properties Wed Oct  8 09:15:03 2008
@@ -19,6 +19,7 @@
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
@@ -59,6 +60,7 @@
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not supported.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
@@ -77,6 +79,7 @@
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not supported.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
@@ -95,6 +98,7 @@
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties?rev=702919&r1=702918&r2=702919&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ko.properties Wed Oct  8 09:15:03 2008
@@ -1,107 +1,111 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_DOES_NOT_EXIST = principal {0} \uc774 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ALREADY_EXISTS = The principal {0} already exists.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
-org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to principal {1} from another {2}.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
-org.apache.jetspeed.security.SecurityException.ATTRIBUTE_IS_READ_ONLY = The principal attribute {0} is read only.
-org.apache.jetspeed.security.SecurityException.ATTRIBUTE_IS_REQUIRED = The principal attribute {0} is required.
-org.apache.jetspeed.security.SecurityException.ATTRIBUTES_ARE_READ_ONLY = The principal attributes are read only.
-org.apache.jetspeed.security.SecurityException.ATTRIBUTE_NOT_EXTENDABLE = Adding new principal attributes is not supported.
-
-org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = permission {0} \uc774 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.PERMISSION_ALREADY_EXISTS = The permission {0} already exists.
-org.apache.jetspeed.security.SecurityException.EMPTY_PARAMETER = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \ub110 \uac12 \ub610\ub294 \ube48 \ud30c\ub77c\ubbf8\ud130\uc785\ub2c8\ub2e4: {0}.
-org.apache.jetspeed.security.SecurityException.INVALID_PASSWORD = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \ube44\ubc00\ubc88\ud638.
-org.apache.jetspeed.security.SecurityException.INVALID_NEW_PASSWORD = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc0c8 \ube44\ubc00\ubc88\ud638.
-org.apache.jetspeed.security.SecurityException.INCORRECT_PASSWORD = \ubd80\uc815\ud655\ud55c \ube44\ubc00\ubc88\ud638.
-org.apache.jetspeed.security.SecurityException.PASSWORD_REQUIRED = \ube44\ubc00\ubc88\ud638\uac00 \ud544\uc218\uc801\uc73c\ub85c \uc81c\uacf5\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.INVALID_AUTHENTICATION_PROVIDER = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc778\uc99d \uc81c\uacf5\uc790\uc785\ub2c8\ub2e4:  {0}.
-org.apache.jetspeed.security.SecurityException.PASSWORD_ALREADY_USED = \uc774\ubbf8 \uc0ac\uc6a9\ub418\uc5c8\ub358 \ube44\ubc00\ubc88\ud638\uc785\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.ANONYMOUS_USER_PROTECTED = \uc0ac\uc6a9\uc790, {0} \uc740 \ubcf4\ud638 \ubaa8\ub4dc\uc5d0 \uc788\uc2b5\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.UNEXPECTED = \uc608\uae30\uce58 \uc54a\uc740 \ubcf4\uc548 \uc624\ub958\uc785\ub2c8\ub2e4: at {0} from {1}: {2}
-org.apache.jetspeed.security.SecurityException.INVALID_UID = UID\ub294 \uc815\uaddc\uc2dd \ud45c\ud604\uc774\ub098 \uba54\ud0c0 \ubb38\uc790\uac00 \ud3ec\ud568\ub420 \uc218 \uc5c6\uc73c\uba70, \ub110 \uac12\uc774\uac70\ub098 \ube48 \uac12\uc774\uba74 \uc548\ub429\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.INVALID_DN = DN\uc740 \ub110 \uac12\uc774\uac70\ub098 \ube48 \uac12\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-
-#### deprecated resource strings: see SecurityException #####
-org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \uc0ac\uc6a9\uc790, {0} \uc740 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \uc0ac\uc6a9\uc790, {0} \uc740 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.ROLE_ALREADY_EXISTS = \uc5ed\ud560, {0} \uc740 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.ROLE_DOES_NOT_EXIST = \uc5ed\ud560, {0} \uc740 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.GROUP_ALREADY_EXISTS = \uadf8\ub8f9, {0} \uc740 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.
-org.apache.jetspeed.security.SecurityException.GROUP_DOES_NOT_EXIST = \uadf8\ub8f9, {0} \uc740 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-
-# resource strings for specific principal, user
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_DOES_NOT_EXIST = The user {0} does not exist.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ALREADY_EXISTS = The user {0} already exists.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_IS_READ_ONLY = The user {0} is read-only.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
-org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not supported.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to user {1} from another user.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
-org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_IS_READ_ONLY = The user attribute {0} is read only.
-org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_IS_REQUIRED = The user attribute {0} is required.
-org.apache.jetspeed.security.SecurityException.user.ATTRIBUTES_ARE_READ_ONLY = The user attributes are read only.
-org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_NOT_EXTENDABLE = Adding new user attributes is not supported.
-
-# resource strings for specific principal, role
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_DOES_NOT_EXIST = The role {0} does not exist.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ALREADY_EXISTS = The role {0} already exists.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_IS_READ_ONLY = The role {0} is read-only.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
-org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not supported.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to role {1} from another role.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
-org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_IS_READ_ONLY = The role attribute {0} is read only.
-org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_IS_REQUIRED = The role attribute {0} is required.
-org.apache.jetspeed.security.SecurityException.role.ATTRIBUTES_ARE_READ_ONLY = The role attributes are read only.
-org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_NOT_EXTENDABLE = Adding new role attributes is not supported.
-
-# resource strings for specific principal, group
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_DOES_NOT_EXIST = The group {0} does not exist.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = The group {0} already exists.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = The group {0} is read-only.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
-org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to principal {1} from another group.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_READ_ONLY = The group attribute {0} is read only.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_REQUIRED = The group attribute {0} is required.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTES_ARE_READ_ONLY = The group attributes are read only.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_NOT_EXTENDABLE = Adding new group attributes is not supported.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_DOES_NOT_EXIST = principal {0} \uc774 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ALREADY_EXISTS = The principal {0} already exists.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to principal {1} from another {2}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
+org.apache.jetspeed.security.SecurityException.ATTRIBUTE_IS_READ_ONLY = The principal attribute {0} is read only.
+org.apache.jetspeed.security.SecurityException.ATTRIBUTE_IS_REQUIRED = The principal attribute {0} is required.
+org.apache.jetspeed.security.SecurityException.ATTRIBUTES_ARE_READ_ONLY = The principal attributes are read only.
+org.apache.jetspeed.security.SecurityException.ATTRIBUTE_NOT_EXTENDABLE = Adding new principal attributes is not supported.
+
+org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = permission {0} \uc774 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.PERMISSION_ALREADY_EXISTS = The permission {0} already exists.
+org.apache.jetspeed.security.SecurityException.EMPTY_PARAMETER = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \ub110 \uac12 \ub610\ub294 \ube48 \ud30c\ub77c\ubbf8\ud130\uc785\ub2c8\ub2e4: {0}.
+org.apache.jetspeed.security.SecurityException.INVALID_PASSWORD = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \ube44\ubc00\ubc88\ud638.
+org.apache.jetspeed.security.SecurityException.INVALID_NEW_PASSWORD = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc0c8 \ube44\ubc00\ubc88\ud638.
+org.apache.jetspeed.security.SecurityException.INCORRECT_PASSWORD = \ubd80\uc815\ud655\ud55c \ube44\ubc00\ubc88\ud638.
+org.apache.jetspeed.security.SecurityException.PASSWORD_REQUIRED = \ube44\ubc00\ubc88\ud638\uac00 \ud544\uc218\uc801\uc73c\ub85c \uc81c\uacf5\ub418\uc5b4\uc57c \ud569\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.INVALID_AUTHENTICATION_PROVIDER = \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc778\uc99d \uc81c\uacf5\uc790\uc785\ub2c8\ub2e4:  {0}.
+org.apache.jetspeed.security.SecurityException.PASSWORD_ALREADY_USED = \uc774\ubbf8 \uc0ac\uc6a9\ub418\uc5c8\ub358 \ube44\ubc00\ubc88\ud638\uc785\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.ANONYMOUS_USER_PROTECTED = \uc0ac\uc6a9\uc790, {0} \uc740 \ubcf4\ud638 \ubaa8\ub4dc\uc5d0 \uc788\uc2b5\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.UNEXPECTED = \uc608\uae30\uce58 \uc54a\uc740 \ubcf4\uc548 \uc624\ub958\uc785\ub2c8\ub2e4: at {0} from {1}: {2}
+org.apache.jetspeed.security.SecurityException.INVALID_UID = UID\ub294 \uc815\uaddc\uc2dd \ud45c\ud604\uc774\ub098 \uba54\ud0c0 \ubb38\uc790\uac00 \ud3ec\ud568\ub420 \uc218 \uc5c6\uc73c\uba70, \ub110 \uac12\uc774\uac70\ub098 \ube48 \uac12\uc774\uba74 \uc548\ub429\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.INVALID_DN = DN\uc740 \ub110 \uac12\uc774\uac70\ub098 \ube48 \uac12\uc77c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
+
+#### deprecated resource strings: see SecurityException #####
+org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \uc0ac\uc6a9\uc790, {0} \uc740 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \uc0ac\uc6a9\uc790, {0} \uc740 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.ROLE_ALREADY_EXISTS = \uc5ed\ud560, {0} \uc740 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.ROLE_DOES_NOT_EXIST = \uc5ed\ud560, {0} \uc740 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.GROUP_ALREADY_EXISTS = \uadf8\ub8f9, {0} \uc740 \uc774\ubbf8 \uc874\uc7ac\ud569\ub2c8\ub2e4.
+org.apache.jetspeed.security.SecurityException.GROUP_DOES_NOT_EXIST = \uadf8\ub8f9, {0} \uc740 \uc874\uc7ac\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
+
+# resource strings for specific principal, user
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_DOES_NOT_EXIST = The user {0} does not exist.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ALREADY_EXISTS = The user {0} already exists.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_IS_READ_ONLY = The user {0} is read-only.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not supported.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to user {1} from another user.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
+org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_IS_READ_ONLY = The user attribute {0} is read only.
+org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_IS_REQUIRED = The user attribute {0} is required.
+org.apache.jetspeed.security.SecurityException.user.ATTRIBUTES_ARE_READ_ONLY = The user attributes are read only.
+org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_NOT_EXTENDABLE = Adding new user attributes is not supported.
+
+# resource strings for specific principal, role
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_DOES_NOT_EXIST = The role {0} does not exist.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ALREADY_EXISTS = The role {0} already exists.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_IS_READ_ONLY = The role {0} is read-only.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not supported.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to role {1} from another role.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
+org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_IS_READ_ONLY = The role attribute {0} is read only.
+org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_IS_REQUIRED = The role attribute {0} is required.
+org.apache.jetspeed.security.SecurityException.role.ATTRIBUTES_ARE_READ_ONLY = The role attributes are read only.
+org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_NOT_EXTENDABLE = Adding new role attributes is not supported.
+
+# resource strings for specific principal, group
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_DOES_NOT_EXIST = The group {0} does not exist.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = The group {0} already exists.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = The group {0} is read-only.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to principal {1} from another group.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_READ_ONLY = The group attribute {0} is read only.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_REQUIRED = The group attribute {0} is required.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTES_ARE_READ_ONLY = The group attributes are read only.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_NOT_EXTENDABLE = Adding new group attributes is not supported.

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties?rev=702919&r1=702918&r2=702919&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_nl.properties Wed Oct  8 09:15:03 2008
@@ -19,6 +19,7 @@
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Opslaan van de principal {0} is mislukt.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = De principal {0} mag niet worden verwijderd.
 org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = De principal {0} heeft een of meer veplichte {1} {2} koppelingen.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = De principal {0} heeft al een koppeling met {1}.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = Een {0} {1} koppeling is vereist.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = Een {0} {1} koppeling is niet mogelijk.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Slechts een {0} koppeling is toegestaan van principal {1} naar een andere {2}.
@@ -59,6 +60,7 @@
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Opslaan van de gebruiker {0} is mislukt.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = De gebruiker {0} mag niet worden verwijderd.
 org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = De gebruiker {0} heeft een of meer verplichte {1} {2} koppelingen.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = De principal {0} heeft al een koppeling met {1}.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = Een user {0} {1} koppeling is vereist.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = Een user {0} {1} koppeling is niet mogelijk.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Slechts een {0} koppeling is toegestaan van gebruiker {1} naar een andere gebruiker.
@@ -77,6 +79,7 @@
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Opslaan van de rol {0} is mislukt.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = De rol {0} mag niet worden verwijderd.
 org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = De rol {0} heeft een of meer verplichte {1} {2} koppelingen.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = De principal {0} heeft al een koppeling met {1}.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = Een role {0} {1} koppeling is vereist.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = Een role {0} {1} koppeling is niet mogelijk.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Slechts een {0} koppeling is toegestaan van rol {1} naar een andere rol.
@@ -95,6 +98,7 @@
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Opslaan van de groep {0} is mislukt.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = De groep {0} mag niet worden verwijderd.
 org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = De groep {0} heeft een of meer verplichte {1} {2} koppelingen.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = De principal {0} heeft al een koppeling met {1}.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = Een group {0} {1} koppeling is vereist.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = Een group {0} {1} koppeling is niet mogelijk.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Slechts een {0} koppeling is toegestaan van groep {1} naar een andere groep.

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties?rev=702919&r1=702918&r2=702919&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_ua.properties Wed Oct  8 09:15:03 2008
@@ -1,37 +1,38 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_DOES_NOT_EXIST = \u041f\u0440\u0438\u043d\u0446\u0438\u043f\u0430\u043b\u0430 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ALREADY_EXISTS = The principal {0} already exists.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
-org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to principal {1} from another {2}.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
-org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
-org.apache.jetspeed.security.SecurityException.ATTRIBUTE_IS_READ_ONLY = The principal attribute {0} is read only.
-org.apache.jetspeed.security.SecurityException.ATTRIBUTE_IS_REQUIRED = The principal attribute {0} is required.
-org.apache.jetspeed.security.SecurityException.ATTRIBUTES_ARE_READ_ONLY = The principal attributes are read only.
-org.apache.jetspeed.security.SecurityException.ATTRIBUTE_NOT_EXTENDABLE = Adding new principal attributes is not supported.
-
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ALREADY_EXISTS = The principal {0} already exists.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_IS_READ_ONLY = The principal {0} is read-only.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to principal {1} from another {2}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
+org.apache.jetspeed.security.SecurityException.ATTRIBUTE_IS_READ_ONLY = The principal attribute {0} is read only.
+org.apache.jetspeed.security.SecurityException.ATTRIBUTE_IS_REQUIRED = The principal attribute {0} is required.
+org.apache.jetspeed.security.SecurityException.ATTRIBUTES_ARE_READ_ONLY = The principal attributes are read only.
+org.apache.jetspeed.security.SecurityException.ATTRIBUTE_NOT_EXTENDABLE = Adding new principal attributes is not supported.
+
 org.apache.jetspeed.security.SecurityException.PERMISSION_DOES_NOT_EXIST = \u0414\u043e\u0437\u0432\u043e\u043b\u0443 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454.
-org.apache.jetspeed.security.SecurityException.PERMISSION_ALREADY_EXISTS = The permission {0} already exists.
+org.apache.jetspeed.security.SecurityException.PERMISSION_ALREADY_EXISTS = The permission {0} already exists.
 org.apache.jetspeed.security.SecurityException.EMPTY_PARAMETER = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u0439 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440 {0}.
 org.apache.jetspeed.security.SecurityException.INVALID_PASSWORD = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.
 org.apache.jetspeed.security.SecurityException.INVALID_NEW_PASSWORD = \u041d\u0435\u0432\u0456\u0440\u043d\u0438\u0439 \u043d\u043e\u0432\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c.
@@ -43,65 +44,68 @@
 org.apache.jetspeed.security.SecurityException.UNEXPECTED = \u041d\u0435\u043e\u0447\u0456\u043a\u0443\u0432\u0430\u043d\u0430 \u043f\u043e\u043c\u0438\u043b\u043a\u0430 \u0431\u0435\u0437\u043f\u0435\u043a\u0438 \u043d\u0430 {0} \u0437 {1}: {2}
 org.apache.jetspeed.security.SecurityException.INVALID_UID = uid \u043d\u0435 \u043c\u043e\u0436\u0435 \u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u043c\u0435\u0442\u0430\u0441\u0438\u043c\u0432\u043e\u043b\u0438 \u0441\u0442\u0430\u043b\u043e\u0433\u043e \u0432\u0438\u0440\u0430\u0437\u0443, \u0430 \u0442\u0430\u043a\u043e\u0436 \u0431\u0443\u0442\u0438 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u043c.
 org.apache.jetspeed.security.SecurityException.INVALID_DN = dn \u043d\u0435 \u043c\u043e\u0436\u0435 \u0431\u0443\u0442\u0438 null \u0430\u0431\u043e \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u043c.
-
-#### deprecated resource strings: see SecurityException #####
-org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447 {0} \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
-org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0430 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
-org.apache.jetspeed.security.SecurityException.ROLE_ALREADY_EXISTS = \u0420\u043e\u043b\u044c {0} \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
-org.apache.jetspeed.security.SecurityException.ROLE_DOES_NOT_EXIST = \u0420\u043e\u043b\u0456 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
-org.apache.jetspeed.security.SecurityException.GROUP_ALREADY_EXISTS = \u0413\u0440\u0443\u043f\u0430 {0} \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
-org.apache.jetspeed.security.SecurityException.GROUP_DOES_NOT_EXIST = \u0413\u0440\u0443\u043f\u0438 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
-
-# resource strings for specific principal, user
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_DOES_NOT_EXIST = The user {0} does not exist.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ALREADY_EXISTS = The user {0} already exists.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_IS_READ_ONLY = The user {0} is read-only.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
-org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not supported.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to user {1} from another user.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
-org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
-org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_IS_READ_ONLY = The user attribute {0} is read only.
-org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_IS_REQUIRED = The user attribute {0} is required.
-org.apache.jetspeed.security.SecurityException.user.ATTRIBUTES_ARE_READ_ONLY = The user attributes are read only.
-org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_NOT_EXTENDABLE = Adding new user attributes is not supported.
-
-# resource strings for specific principal, role
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_DOES_NOT_EXIST = The role {0} does not exist.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ALREADY_EXISTS = The role {0} already exists.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_IS_READ_ONLY = The role {0} is read-only.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
-org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not supported.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to role {1} from another role.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
-org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
-org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_IS_READ_ONLY = The role attribute {0} is read only.
-org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_IS_REQUIRED = The role attribute {0} is required.
-org.apache.jetspeed.security.SecurityException.role.ATTRIBUTES_ARE_READ_ONLY = The role attributes are read only.
-org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_NOT_EXTENDABLE = Adding new role attributes is not supported.
-
-# resource strings for specific principal, group
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_DOES_NOT_EXIST = The group {0} does not exist.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = The group {0} already exists.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = The group {0} is read-only.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
-org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more required {1} {2} associations.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to principal {1} from another group.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
-org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_READ_ONLY = The group attribute {0} is read only.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_REQUIRED = The group attribute {0} is required.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTES_ARE_READ_ONLY = The group attributes are read only.
-org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_NOT_EXTENDABLE = Adding new group attributes is not supported.
+
+#### deprecated resource strings: see SecurityException #####
+org.apache.jetspeed.security.SecurityException.USER_ALREADY_EXISTS = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447 {0} \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
+org.apache.jetspeed.security.SecurityException.USER_DOES_NOT_EXIST = \u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0430 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
+org.apache.jetspeed.security.SecurityException.ROLE_ALREADY_EXISTS = \u0420\u043e\u043b\u044c {0} \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
+org.apache.jetspeed.security.SecurityException.ROLE_DOES_NOT_EXIST = \u0420\u043e\u043b\u0456 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
+org.apache.jetspeed.security.SecurityException.GROUP_ALREADY_EXISTS = \u0413\u0440\u0443\u043f\u0430 {0} \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
+org.apache.jetspeed.security.SecurityException.GROUP_DOES_NOT_EXIST = \u0413\u0440\u0443\u043f\u0438 {0} \u043d\u0435 \u0456\u0441\u043d\u0443\u0454 \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0456.
+
+# resource strings for specific principal, user
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_DOES_NOT_EXIST = The user {0} does not exist.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ALREADY_EXISTS = The user {0} already exists.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_IS_READ_ONLY = The user {0} is read-only.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not supported.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to user {1} from another user.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
+org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_IS_READ_ONLY = The user attribute {0} is read only.
+org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_IS_REQUIRED = The user attribute {0} is required.
+org.apache.jetspeed.security.SecurityException.user.ATTRIBUTES_ARE_READ_ONLY = The user attributes are read only.
+org.apache.jetspeed.security.SecurityException.user.ATTRIBUTE_NOT_EXTENDABLE = Adding new user attributes is not supported.
+
+# resource strings for specific principal, role
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_DOES_NOT_EXIST = The role {0} does not exist.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ALREADY_EXISTS = The role {0} already exists.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_IS_READ_ONLY = The role {0} is read-only.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not supported.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to role {1} from another role.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
+org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_IS_READ_ONLY = The role attribute {0} is read only.
+org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_IS_REQUIRED = The role attribute {0} is required.
+org.apache.jetspeed.security.SecurityException.role.ATTRIBUTES_ARE_READ_ONLY = The role attributes are read only.
+org.apache.jetspeed.security.SecurityException.role.ATTRIBUTE_NOT_EXTENDABLE = Adding new role attributes is not supported.
+
+# resource strings for specific principal, group
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_DOES_NOT_EXIST = The group {0} does not exist.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ALREADY_EXISTS = The group {0} already exists.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_IS_READ_ONLY = The group {0} is read-only.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
+org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_DOMINANT = Only one {0} association is allowed to principal {1} from another group.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR_MIXED = Only one {0} association is allowed from principal {1} to a {2}.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_DOMINANT_MIXED = Only one {0} association is allowed to principal {1} from a {2}.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_READ_ONLY = The group attribute {0} is read only.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_IS_REQUIRED = The group attribute {0} is required.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTES_ARE_READ_ONLY = The group attributes are read only.
+org.apache.jetspeed.security.SecurityException.group.ATTRIBUTE_NOT_EXTENDABLE = Adding new group attributes is not supported.

Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties?rev=702919&r1=702918&r2=702919&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/exception/JetspeedExceptionMessages_zh.properties Wed Oct  8 09:15:03 2008
@@ -19,6 +19,7 @@
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_UPDATE_FAILURE = Failed to update principal {0}.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_NOT_REMOVABLE = The principal {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.DEPENDENT_PRINCIPAL_EXISTS = The principal {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_REQUIRED = A {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A {0} {1} association is not allowed.
 org.apache.jetspeed.security.SecurityException.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another {2}.
@@ -59,6 +60,7 @@
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_UPDATE_FAILURE = Failed to update user {0}.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_NOT_REMOVABLE = The user {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.user.DEPENDENT_PRINCIPAL_EXISTS = The user {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_REQUIRED = A user {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A user {0} {1} association is not supported.
 org.apache.jetspeed.security.SecurityException.user.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from user {1} to another user.
@@ -77,6 +79,7 @@
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_UPDATE_FAILURE = Failed to update role {0}.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_NOT_REMOVABLE = The role {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.role.DEPENDENT_PRINCIPAL_EXISTS = The role {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_REQUIRED = A role {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A role {0} {1} association is not supported.
 org.apache.jetspeed.security.SecurityException.role.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from role {1} to another role.
@@ -95,6 +98,7 @@
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_UPDATE_FAILURE = Failed to update group {0}.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_NOT_REMOVABLE = The group {0} cannot be removed.
 org.apache.jetspeed.security.SecurityException.group.DEPENDENT_PRINCIPAL_EXISTS = The group {0} has one or more required {1} {2} associations.
+org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_ALREADY_EXISTS = The Principal {0} already has association with {1}.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_REQUIRED = A group {0} {1} association is required.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_UNSUPPORTED = A group {0} {1} association is not supported.
 org.apache.jetspeed.security.SecurityException.group.PRINCIPAL_ASSOCIATION_SINGULAR = Only one {0} association is allowed from principal {1} to another group.



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message