JBoss Portal SVN: r10834 - in branches/JBoss_Portal_Branch_2_6: core/src/resources/portal-core-sar/conf/bundles and 20 other directories. - portal-commits

Thursday, 29 May 2008

Author: thomas.heute(a)jboss.com
Date: 2008-05-29 05:43:27 -0400 (Thu, 29 May 2008)
New Revision: 10834

Added:
  
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ru.properties
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties
  
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/
  
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties
  
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties
  
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_ru.properties
  
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_ru.properties
  
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_ru.properties
  
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/
  
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
  
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_ru.properties
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties
Removed:
  
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties
  
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties
  
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
  
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties
Modified:
  
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
  
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
  
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml
  
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml
  
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml
  
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml
  
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
  
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml
  
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
  
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml
   branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties
  
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml
   branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp
Log:
- Merging Chris' i18n on Branch_2_6
- Adding Russian l10n from Anton in Branch_2_6 ! Thanks !

Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css
===================================================================

--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css	2008-05-29
09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css	2008-05-29
09:43:27 UTC (rev 10834)
@@ -22,14 +22,12 @@
 
 input.login-button {
    bottom: 20px;
-   width: 60px;
    right: 90px
 }
 
 input.cancel-button {
    bottom: 20px;
    right: 10px;
-   width: 70px;
 }
 
 div.login-container div.login-header {

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -21,14 +21,12 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
 ################################################################################
 
-# This file is deprecated, use the display-name on objects directly
-PAGENAME_default=Home
-PAGENAME_Admin=Admin
-PAGENAME_Test=Test
-PAGENAME_News=News 
+ACCOUNT_DISABLED=Your account is disabled
+ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=The user doesn't exist or the password is
incorrect
+ACCOUNT_NOTASSIGNEDTOROLE=The user doesn't have the correct role
 
 LOGIN_TITLE=JBoss Portal Login
 LOGIN_USERNAME=Username
 LOGIN_PASSWORD=Password
 LOGIN_CANCEL=Cancel
-LOGIN_SUBMIT=Submit
\ No newline at end of file
+LOGIN_SUBMIT=Submit

Deleted:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -1,28 +0,0 @@
-################################################################################
-# JBoss, a division of Red Hat                                                 #
-# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
-# contributors as indicated by the @authors tag. See the                       #
-# copyright.txt in the distribution for a full listing of                      #
-# individual contributors.                                                     #
-#                                                                              #
-# This is free software; you can redistribute it and/or modify it              #
-# under the terms of the GNU Lesser General Public License as                  #
-# published by the Free Software Foundation; either version 2.1 of             #
-# the License, or (at your option) any later version.                          #
-#                                                                              #
-# This software is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
-# Lesser General Public License for more details.                              #
-#                                                                              #
-# You should have received a copy of the GNU Lesser General Public             #
-# License along with this software; if not, write to the Free                  #
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
-################################################################################
-
-# This file is deprecated, use the display-name on objects directly
-PAGENAME_default=Home
-PAGENAME_Admin=Admin
-PAGENAME_Test=Test
-PAGENAME_News=News 
\ No newline at end of file

Deleted:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -1,28 +0,0 @@
-################################################################################
-# JBoss, a division of Red Hat                                                 #
-# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
-# contributors as indicated by the @authors tag. See the                       #
-# copyright.txt in the distribution for a full listing of                      #
-# individual contributors.                                                     #
-#                                                                              #
-# This is free software; you can redistribute it and/or modify it              #
-# under the terms of the GNU Lesser General Public License as                  #
-# published by the Free Software Foundation; either version 2.1 of             #
-# the License, or (at your option) any later version.                          #
-#                                                                              #
-# This software is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
-# Lesser General Public License for more details.                              #
-#                                                                              #
-# You should have received a copy of the GNU Lesser General Public             #
-# License along with this software; if not, write to the Free                  #
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
-################################################################################
-
-# This file is deprecated, use the display-name on objects directly
-PAGENAME_default=Home
-PAGENAME_Admin=Administraci�n
-PAGENAME_Test=Ejemplos
-PAGENAME_News=Noticias
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -21,8 +21,12 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
 ################################################################################
 
-# This file is deprecated, use the display-name on objects directly
-PAGENAME_default=Accueil
-PAGENAME_Admin=Admin
-PAGENAME_Test=Test
-PAGENAME_News=Actualit\u00E9s
\ No newline at end of file
+ACCOUNT_DISABLED=Votre compte n'est pas actif 
+ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=L'utilisateur n'existe pas ou le mot de
passe est incorrect
+ACCOUNT_NOTASSIGNEDTOROLE=L'utilisateur n'a pas le role requis
+
+LOGIN_TITLE=Connexion JBoss Portal
+LOGIN_USERNAME=Nom d'utilisateur
+LOGIN_PASSWORD=Mot de passe
+LOGIN_CANCEL=Annuler
+LOGIN_SUBMIT=Se connecter

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -22,13 +22,8 @@
 ################################################################################
 
 # Navigation Portlet
-PAGENAME_default=Home
-PAGENAME_Admin=Amministrazione
-PAGENAME_Test=Test
-PAGENAME_News=Novit\u00e0 
-
 LOGIN_TITLE=JBoss Portal Login
 LOGIN_USERNAME=Nome utente
 LOGIN_PASSWORD=Password
 LOGIN_CANCEL=Annulla
-LOGIN_SUBMIT=Invia
\ No newline at end of file
+LOGIN_SUBMIT=Invia

Copied:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_ru.properties
(from rev 10820,
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_ru.properties)
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_ru.properties	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_ru.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -0,0 +1,32 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
+ACCOUNT_DISABLED=Your account is disabled
+ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=The user doesn't exist or the password is
incorrect
+ACCOUNT_NOTASSIGNEDTOROLE=The user doesn't have the correct role
+
+LOGIN_TITLE=JBoss Portal Login
+LOGIN_USERNAME=Username
+LOGIN_PASSWORD=Password
+LOGIN_CANCEL=Cancel
+LOGIN_SUBMIT=Submit
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml	2008-05-29
09:43:27 UTC (rev 10834)
@@ -140,6 +140,7 @@
             <display-name xml:lang="it">Home</display-name>
             <display-name xml:lang="es">Home</display-name>
             <display-name xml:lang="fr">Accueil</display-name>
+            <display-name xml:lang="ru">Домой</display-name>
             <properties>
                <property>
                   <name>order</name>
@@ -295,6 +296,7 @@
             <display-name xml:lang="it">Home</display-name>
             <display-name xml:lang="es">Home</display-name>
             <display-name xml:lang="fr">Accueil</display-name>
+            <display-name xml:lang="ru">Домой</display-name>
             <properties>
                <property>
                   <name>order</name>
@@ -353,6 +355,7 @@
             <display-name
xml:lang="it">Amministrazione</display-name>
             <display-name
xml:lang="es">Administración</display-name>
             <display-name
xml:lang="fr">Administration</display-name>
+            <display-name
xml:lang="ru">Администрирование</display-name>
             <window>
                <window-name>AdminPortletWindow</window-name>
                <instance-ref>AdminPortletInstance</instance-ref>
@@ -376,6 +379,7 @@
             <page-name>Members</page-name>
             <display-name xml:lang="en">Members</display-name>
             <display-name xml:lang="it">Membri</display-name>
+            <display-name
xml:lang="fr">Utilisateurs</display-name>
             <window>
                <window-name>IdentityAdminPortletWindow</window-name>
                <instance-ref>IdentityAdminPortletInstance</instance-ref>

Copied:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties
(from rev 10820,
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties)
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -0,0 +1,324 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
+_ASREGISTERED=\u0423 \u0432\u0430\u0441 \u0435\u0449\u0435 \u043d\u0435\u0442
\u0443\u0447\u0435\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438? 
\u041c\u043e\u0436\u0435\u0442\u0435 <a
href\="">\u0441\u043e\u0437\u0434\u0430\u0442\u044c</a>.
+_BLOCKNICKNAME=\u0418\u043c\u044f
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+_BLOCKPASSWORD=\u041f\u0430\u0440\u043e\u043b\u044c
+
+
+
+MessageOrder=\u0421\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f
+Ascending=\u041f\u043e
\u0432\u043e\u0437\u0440\u0430\u0441\u0442\u0430\u043d\u0438\u044e
+Descending=\u041f\u043e \u0443\u0431\u044b\u0432\u0430\u043d\u0438\u044e
+
+AIM=\u0410\u0434\u0440\u0435\u0441 AIM
+ICQ=\u041d\u043e\u043c\u0435\u0440 ICQ
+YIM=\u041d\u043e\u043c\u0435\u0440 YIM
+MSNM=MSN Messenger
+
+YourAIM=\u0412\u0430\u0448 AIM \u0430\u0434\u0440\u0435\u0441
+YourICQ=\u0412\u0430\u0448 ICQ \u043d\u043e\u043c\u0435\u0440
+YourYIM=\u0412\u0430\u0448 YIM \u043d\u043e\u043c\u0435\u0440
+YourMSNM=\u0412\u0430\u0448 MSN Messenger
+
+MyEmail=\u041c\u043e\u0439 e-mail
+MyHomePage=\u041c\u043e\u044f \u0434\u043e\u043c\u0430\u0448\u043d\u044f\u044f
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430
+
+Question=\u0421\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439
\u0432\u043e\u043f\u0440\u043e\u0441
+Answer=\u041e\u0442\u0432\u0435\u0442 \u043d\u0430
\u0441\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439
\u0432\u043e\u043f\u0440\u043e\u0441
+Location=\u041c\u0435\u0441\u0442\u043e\u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435
+Occupation=\u0420\u043e\u0434 \u0437\u0430\u043d\u044f\u0442\u0438\u0439
+Interests=\u0418\u043d\u0442\u0435\u0440\u0435\u0441\u044b
+ExtraInfo=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u0430\u044f
\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f
+YourLocation=\u0412\u0430\u0448\u0435
\u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435
+YourOccupation=\u0412\u0430\u0448 \u0440\u043e\u0434
\u0437\u0430\u043d\u044f\u0442\u0438\u0439
+YourInterests=\u0412\u0430\u0448\u0438 \u0438\u043d\u0442\u0435\u0440\u0435\u0441\u044b
+Signature=\u041f\u043e\u0434\u043f\u0438\u0441\u044c
+
+LoginSite=\u0412\u0445\u043e\u0434.
+Register=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f.
+
+UserExist=\u0422\u0430\u043a\u043e\u0439
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
\u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442
+ToChangeInfo=\u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0430\u0448\u0443
\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e
+EmailVerify=\u0421\u0441\u044b\u043b\u043a\u0430
\u0430\u043a\u0442\u0438\u0432\u0430\u0446\u0438\u0438
\u043e\u0442\u043e\u0441\u043b\u0430\u043d\u0430!
\u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435
\u043f\u043e\u0447\u0442\u043e\u0432\u044b\u0439 \u044f\u0449\u0438\u0435 \u0438
\u0449\u0435\u043b\u043a\u043d\u0438\u0442\u0435 \u043d\u0430
\u0441\u0441\u044b\u043b\u043a\u0435, \u0447\u0442\u043e\u0431\u044b
\u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0432\u0430\u0448\u0443 \u0443\u0447\u0435\u0442\u043d\u0443\u044e
\u0437\u0430\u043f\u0438\u0441\u044c.
+AccountActivated=\u0423\u0447\u0435\u0442\u043d\u0430\u044f
\u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0441\u043f\u0435\u0448\u043d\u043e
\u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u0430!
+UnableActivate=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e
\u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u043d\u043e\u0432\u043e\u0433\u043e
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f.
+LoggingYou=\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0435\u043c
\u0432\u0430\u0448\u0443 \u043b\u0438\u0447\u043d\u043e\u0441\u0442\u044c,
\u0434\u0435\u0440\u0436\u0438\u0442\u0435\u0441\u044c\!
+YouAreLoggedOut=\u0412\u044b \u0441\u0435\u0439\u0447\u0430\u0441
\u0432\u044b\u0448\u043b\u0438 \u0438\u0437 \u0443\u0447\u0435\u0442\u043d\u043e\u0439
\u0437\u0430\u043f\u0438\u0441\u0438\!
+PassDifferent=\u041f\u0430\u0440\u043e\u043b\u0438
\u0440\u0430\u0437\u043b\u0438\u0447\u0430\u044e\u0442\u0441\u044f. \u041e\u043d\u0438
\u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c
\u043e\u0434\u0438\u043d\u0430\u043a\u043e\u0432\u044b\u043c\u0438.
+YourPassMustBe=\u0418\u0437\u0432\u0438\u043d\u0438\u0442\u0435, \u0432\u0430\u0448
\u043f\u0430\u0440\u043e\u043b\u044c \u0434\u043e\u043b\u0436\u0435\u043d
\u0431\u044b\u0442\u044c \u0432 \u0434\u043b\u0438\u043d\u0443 \u043f\u043e
\u043a\u0440\u0430\u0439\u043d\u0435\u0439 \u043c\u0435\u0440\u0435
+CharLong=\u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432
+UserNotExist=\u0422\u0430\u043a\u043e\u0439
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043d\u0435
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442\!
+UserRegLogin=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f/\u0432\u0445\u043e\u0434
+SelectOption=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430,
\u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043e\u043f\u0446\u0438\u044e
\u0438\u0437 \u043c\u0435\u043d\u044e \u0432\u043d\u0438\u0437\u0443\:
+RetrievePass=\u0412\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c
\u043f\u043e\u0442\u0435\u0440\u044f\u043d\u043d\u044b\u0439
\u043f\u0430\u0440\u043e\u043b\u044c.
+RegNewUser=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f
\u043d\u043e\u0432\u043e\u0433\u043e
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+PasswordAgain=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435
\u0432\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c
+Email=E-mail
+Options=\u041e\u043f\u0446\u0438\u0438
+AllowEmailView=\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c
\u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u043c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f\u043c
\u0432\u0438\u0434\u0435\u0442\u044c \u043c\u043e\u0439 e-mail
+AsRegUser=\u0412 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435
\u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u043e\u0433\u043e
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0432\u044b
\u043c\u043e\u0436\u0435\u0442\u0435\:
+AsReg6=\u0412\u044b\u0431\u0438\u0440\u0430\u0442\u044c
\u0440\u0430\u0437\u043b\u0438\u0447\u043d\u044b\u0435 \u0442\u0435\u043c\u044b
+AsReg5=Customize the comments
+AsReg4=\u0412\u044b\u0431\u0438\u0440\u0430\u0442\u044c
\u0441\u043a\u043e\u043b\u044c\u043a\u043e
\u043d\u043e\u0432\u043e\u0441\u0442\u043d\u044b\u0445
\u0441\u044e\u0436\u0435\u0442\u043e\u0432
\u043f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u043d\u0430
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435
+AsReg3=Have a personal box on the homepage
+AsReg2=\u0420\u0430\u0441\u0441\u044b\u043b\u0430\u0442\u044c
\u043d\u043e\u0432\u043e\u0441\u0442\u0438 \u043e\u0442
\u0432\u0430\u0448\u0435\u0433\u043e \u0438\u043c\u0435\u043d\u0438
+AsReg1=\u041e\u0441\u0442\u0430\u0432\u043b\u044f\u0442\u044c
\u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0438 \u043e\u0442
\u0432\u0430\u0448\u0435\u0433\u043e \u0438\u043c\u0435\u043d\u0438
+RegisterNow=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0443\u0439\u0442\u0435\u0441\u044c
\u0441\u0435\u0439\u0447\u0430\u0441\! \u042d\u0442\u043e
\u0431\u0435\u0441\u043f\u043b\u0430\u0442\u043d\u043e\!
+WeDontGive=\u041c\u044b \u043d\u0435 \u0431\u0443\u0434\u0435\u043c
\u043f\u0440\u043e\u0434\u0430\u0432\u0430\u0442\u044c/\u0440\u0430\u0441\u0441\u044b\u043b\u0430\u0442\u044c
\u043a\u043e\u043c\u0443-\u0442\u043e \u043d\u0438 \u0431\u044b\u043b\u043e
\u0432\u0430\u0448\u0438
\u043f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0435
\u0434\u0430\u043d\u043d\u044b\u0435.
+WelcomeTo=\u0414\u043e\u0431\u0440\u043e
\u043f\u043e\u0436\u0430\u043b\u043e\u0432\u0430\u0442\u044c
+Registration=\u0432 \u043e\u0431\u043b\u0430\u0441\u0442\u044c
\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438.
+
+Over13_1=\u041c\u043d\u0435
+Over13_2=\u0438\u043b\u0438 \u0441\u0442\u0430\u0440\u0448\u0435 \u0438\u043b\u0438
\u0443 \u043c\u0435\u043d\u044f
\u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439
\u043d\u0430\u0434\u0437\u043e\u0440 \u043a
\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438
+MustBe_1=\u0412\u0430\u043c \u0434\u043e\u043b\u0436\u043d\u043e
\u0431\u044b\u0442\u044c
+MustBe_2=\u0438\u043b\u0438 \u0431\u043e\u043b\u044c\u0448\u0435, \u0438\u043b\u0438
\u0443 \u0432\u0430\u0441 \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c
\u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435
\u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u0434\u043b\u044f
\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
\u0437\u0434\u0435\u0441\u044c.
+Consent_1=(\u0429\u0435\u043b\u043a\u0430\u044f \u043d\u0430
\u0441\u0441\u044b\u043b\u043a\u0435 \u0441\u0432\u0435\u0440\u0445\u0443 \u0432\u044b
\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0430\u0435\u0442\u0435,
\u0447\u0442\u043e \u0432\u0430\u043c<br>
+Consent_2=\u0438\u043b\u0438 \u0431\u043e\u043b\u044c\u0448\u0435, \u0438\u043b\u0438
\u0443 \u0432\u0430\u0441 \u0435\u0441\u0442\u044c
\u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435
\u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u0434\u043b\u044f
\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
\u0437\u0434\u0435\u0441\u044c.)
+Under13_1=\u041c\u043d\u0435 \u043c\u0435\u043d\u044c\u0448\u0435
+Under13_2=\u0438 \u0443 \u043c\u0435\u043d\u044f \u043d\u0435\u0442
\u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0433\u043e
\u043d\u0430\u0434\u0437\u043e\u0440\u0430 \u043a
\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438.
+
+Sorry=\u0418\u0437\u0432\u0438\u043d\u0438\u0442\u0435.
+Click=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430,
\u0449\u0435\u043b\u043a\u043d\u0438\u0442\u0435
+Here=\u0437\u0434\u0435\u0441\u044c
+Return=\u0447\u0442\u043e\u0431\u044b
\u0432\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f \u043d\u0430
\u0433\u043b\u0430\u0432\u043d\u0443\u044e
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443.
+UserName=\u0418\u043c\u044f
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+GoBack=\u041d\u0430\u0437\u0430\u0434
+Finish=\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c
+PersonalInfo=\u041f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u0430\u044f
\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f
+RealName=\u041d\u0430\u0441\u0442\u043e\u044f\u0449\u0435\u0435 \u0438\u043c\u044f
+Optional=(\u043e\u043f\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u043e)
+CanKnowAbout=(\u041d\u0430\u043f\u0438\u0448\u0438\u0442\u0435, \u0447\u0442\u043e
\u0431\u044b\u043b\u043e \u0431\u044b
\u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u043c
\u0438\u043d\u0442\u0435\u0440\u0435\u0441\u043d\u043e \u043e \u0432\u0430\u0441.
\u041c\u0430\u043a\u0441\u0438\u043c\u0443\u043c 255
\u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432)
+Language=\u042f\u0437\u044b\u043a
+255CharMax=(\u041d\u0430\u043f\u0438\u0448\u0438\u0442\u0435 \u0432\u0430\u0448\u0443
\u043f\u043e\u0434\u043f\u0438\u0441\u044c \u0432 HTML-\u0444\u043e\u0440\u043c\u0435.
\u041c\u0430\u043a\u0441\u0438\u043c\u0443\u043c 255
\u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432)
+YourAvatar=\u0412\u0430\u0448 \u0430\u0432\u0430\u0442\u0430\u0440
+YourHomePage=\u0412\u0430\u0448 \u0432\u0435\u0431-\u0441\u0430\u0439\u0442
+TimeZoneOffset=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f
\u0437\u043e\u043d\u0430
+EmailNotPublic=(\u042d\u0442\u043e\u0442
\u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441 \u043d\u0435 \u0431\u0443\u0434\u0435\u0442
\u0432\u0438\u0434\u0435\u043d, \u043d\u043e
\u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u0435\u043d. \u041e\u043d
\u0431\u0443\u0434\u0435\u0442
\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d \u0434\u043b\u044f
\u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f
\u043f\u0430\u0440\u043e\u043b\u044f \u0432 \u0441\u043b\u0443\u0447\u0430\u0435
\u0435\u0433\u043e \u043f\u043e\u0442\u0435\u0440\u0438)
+EmailPublic=(\u042d\u0442\u043e\u0442
\u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441 \u0431\u0443\u0434\u0435\u0442
\u0432\u0438\u0434\u0435\u043d. \u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0442\u043e,
\u0447\u0442\u043e \u0441\u0447\u0438\u0442\u0430\u0435\u0442\u0435
\u043d\u0443\u0436\u043d\u044b\u043c.
\u041d\u0435\u043a\u0440\u0438\u0442\u0438\u0447\u043d\u043e \u043a
\u0441\u043f\u0430\u043c\u0443)
+RealEmail=\u041d\u0430\u0441\u0442\u043e\u044f\u0449\u0438\u0439 e-mail
+FakeEmail=\u0412\u044b\u0434\u0443\u043c\u0430\u043d\u043d\u044b\u0439 e-mail
+NewUser=\u041d\u043e\u0432\u044b\u0439
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
+SaveChanges=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f
+SaveChange=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435
+TypeNewPassword=(\u0432\u0432\u0435\u0434\u0438\u0442\u0435
\u0434\u0432\u0430\u0436\u0434\u044b \u043f\u0430\u0440\u043e\u043b\u044c
\u0434\u043b\u044f \u0435\u0433\u043e \u0441\u043c\u0435\u043d\u044b)
+Search=\u041f\u043e\u0438\u0441\u043a
+All=\u0412\u0441\u0435
+UsersFoundFor=\u043d\u0430\u0439\u0434\u0435\u043d\u043e
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
+Pages=\u0441\u0442\u0440\u0430\u043d\u0438\u0446
+UsersShown=\u043f\u043e\u043a\u0430\u0437\u0430\u043d\u043e
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
+Delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
+Edit=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
+Ok=Ok
+Cancel=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c
+AreYouSureToDeleteUser=\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b,
\u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435
\u0443\u0434\u0430\u043b\u0438\u0442\u044c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f?
+UserDeleted=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
\u0443\u0434\u0430\u0447\u043d\u043e \u0443\u0434\u0430\u043b\u0435\u043d
+ReturnToMemberList=\u0412\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f \u043a
\u0441\u043f\u0438\u0441\u043a\u0443
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
+Avatar=\u0410\u0432\u0430\u0442\u0430\u0440
+AdminFunctions=\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043d\u044b\u0435
\u0444\u0443\u043d\u043a\u0446\u0438\u0438
+URL=URL
+UpdateUser=\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+UserID=User ID
+ForChanges=(\u0422\u043e\u043b\u044c\u043a\u043e \u0434\u043b\u044f
\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0439)
+MemberList=\u0421\u043f\u0438\u0441\u043e\u043a
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
+SearchTip=\u041f\u043e\u0434\u0441\u043a\u0430\u0437\u043a\u0430:
\u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0431\u0443\u043a\u0432\u0443,
\u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0432\u0441\u0435\u0445
\u0438\u043b\u0438 \u0438\u0441\u043a\u0430\u0442\u044c
\u043a\u043e\u043d\u043a\u0440\u0435\u0442\u043d\u043e\u0433\u043e
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f  
+
+ThemeText1=\u042d\u0442\u0430 \u043e\u043f\u0446\u0438\u044f
\u0437\u0430\u0442\u0440\u043e\u043d\u0435\u0442 \u043e\u0431\u043b\u0438\u043a
\u0432\u0441\u0435\u0433\u043e \u0441\u0430\u0439\u0442\u0430.
+ThemeText2=\u042d\u0442\u0430 \u043e\u043f\u0446\u0438\u044f
\u0437\u0430\u0442\u0440\u043e\u043d\u0435\u0442 \u0442\u043e\u043b\u044c\u043a\u043e
\u0432\u0430\u0448\u0443
\u043f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u0443\u044e
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443.
+ThemeText3=\u041a\u0430\u0436\u0434\u044b\u0439
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
\u043c\u043e\u0436\u0435\u0442 \u0432\u0438\u0434\u0435\u0442\u044c
\u0441\u0430\u0439\u0442 \u0441
\u0438\u043d\u0434\u0438\u0432\u0438\u0434\u0443\u0430\u043b\u044c\u043d\u043e\u0439
\u0442\u0435\u043c\u043e\u0439.
+SelectTheme=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0442\u0435\u043c\u0443
+ThemeSelection=\u0412\u044b\u0431\u043e\u0440 \u0442\u0435\u043c
+
+CannotLogin=Cannot proceed to login
+
+LoginInvalidName=\u0438\u043c\u044f
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
\u043d\u0435\u0432\u0435\u0440\u043d\u043e
+LoginNoSuchUser=\u0434\u0430\u043d\u043d\u044b\u0439
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043d\u0435
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442
+LoginBadPassword=\u0432\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c \u043d\u0435
\u0441\u043e\u0432\u043f\u0430\u0434\u0430\u0435\u0442
+LoginUnexpectedError=\u043d\u0435\u043e\u0436\u0438\u0434\u0430\u043d\u043d\u0430\u044f
\u043e\u0448\u0438\u0431\u043a\u0430
+LoginUserDisabled=\u0432\u0430\u0448\u0430 \u0443\u0447\u0435\u0442\u043d\u0430\u044f
\u0437\u0430\u043f\u0438\u0441\u044c \u0431\u044b\u043b\u0430
\u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0430\u043d\u0430.
\u041e\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044c \u043a
\u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0443.
+
+Enable=Enable
+Disable=Disable
+StatusChanged=\u0421\u0442\u0430\u0442\u0443\u0441
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
\u0443\u0434\u0430\u0447\u043d\u043e \u0438\u0437\u043c\u0435\u043d\u0435\u043d
+
+NotAuth=\u0412\u0430\u043c \u043d\u0435
\u0440\u0430\u0437\u0440\u0435\u0448\u0430\u0435\u0442\u0441\u044f
\u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c
\u0443\u043a\u0430\u0437\u0430\u043d\u043d\u0443\u044e
\u043e\u043f\u0435\u0440\u0430\u0446\u0438\u044e
+
+
+REMEMBERME=\u0417\u0430\u043f\u043e\u043c\u043d\u0438\u0442\u044c
\u043c\u0435\u043d\u044f
+LOGIN=\u0412\u0445\u043e\u0434
+USERNAME=\u0418\u043c\u044f
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+PASSWORD=\u041f\u0430\u0440\u043e\u043b\u044c
+USERLOGIN=\u0412\u0430\u0448 \u0432\u0445\u043e\u0434
+
+OPTIONAL=\u041e\u043f\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u043e
+REQUIRED=\u041e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e
+
+255MAX=(\u041f\u043e\u0434\u043f\u0438\u0441\u044c -
\u043c\u0430\u043a\u0441\u0438\u043c\u0443\u043c 255
\u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432)
+
+NAMENOTAVAILABLE=N/A
+
+MODIFIED_PROFILE=\u0412\u0430\u0448 \u043f\u0440\u043e\u0444\u0438\u043b\u044c
\u0431\u044b\u043b \u0438\u0437\u043c\u0435\u043d\u0435\u043d, \u043d\u043e
\u043f\u043e\u0440\u0442\u0430\u043b \u0431\u0443\u0434\u0435\u0442
\u0440\u0430\u0431\u043e\u0442\u0430\u0442\u044c \u0441 \u0432\u0430\u0448\u0438\u043c
\u0442\u0435\u043a\u0443\u0449\u0438\u043c
\u043f\u0440\u043e\u0444\u0438\u043b\u0435\u043c, \u043f\u043e\u043a\u0430 \u0432\u044b
\u0437\u0430\u043d\u043e\u0432\u043e \u043d\u0435
\u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0443\u0435\u0442\u0435\u0441\u044c.
+
+# Registration
+REGISTER_NOT_LOGGED_IN=\u0412\u044b \u043f\u043e\u043a\u0430 \u043d\u0435
\u043f\u0440\u043e\u0448\u043b\u0438
\u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u044e.
+REGISTER_REGISTER=\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435
\u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0443\u0447\u0435\u0442\u043d\u0443\u044e
\u0437\u0430\u043f\u0438\u0441\u044c.
+REGISTER_REGISTER_LINK=\u0421\u043e\u0437\u0434\u0430\u0442\u044c
+REGISTER_REGISTER_ADMIN_LINK=\u0421\u043e\u0437\u0434\u0430\u0442\u044c
\u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c
+REGISTER_TY=\u0421\u043f\u0430\u0441\u0438\u0431\u043e \u0437\u0430
\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044e.
+REGISTER_BASICINFO=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435
+REGISTER_IM=\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u044b
IM-\u043a\u043b\u0438\u0435\u043d\u0442\u043e\u0432
+REGISTER_ADDITIONAL=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u0430\u044f
\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435
+REGISTER_NEWUSER=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f
\u043d\u043e\u0432\u043e\u0433\u043e
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+REGISTER_PASSWORDAGAIN=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435
\u0432\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c
+REGISTER_REALEMAIL=\u0414\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439
e-mail
+REGISTER_EMAILNOTPUBLIC=(\u042d\u0442\u043e\u0442
\u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441 \u043d\u0435 \u0431\u0443\u0434\u0435\u0442
\u0432\u0438\u0434\u0435\u043d, \u043d\u043e
\u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u0435\u043d \u043f\u0440\u0438
\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438. \u041e\u043d
\u0431\u0443\u0434\u0435\u0442
\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d \u0434\u043b\u044f
\u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0432\u0430\u043c
\u043f\u0430\u0440\u043e\u043b\u044f, \u0432 \u0441\u043b\u0443\u0447\u0430\u0435
\u0435\u0433\u043e \u043f\u043e\u0442\u0435\u0440\u0438)
+REGISTER_FAKEEMAIL=\u0412\u044b\u0434\u0443\u043c\u0430\u043d\u043d\u044b\u0439 e-mail
+REGISTER_EMAILPUBLIC=(\u042d\u0442\u043e\u0442
\u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441 \u0431\u0443\u0434\u0435\u043d
\u0432\u0438\u0434\u0435\u043d. \u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0442\u043e,
\u0447\u0442\u043e \u0441\u0447\u0438\u0442\u0430\u0435\u0442\u0435
\u043d\u0443\u0436\u043d\u044b\u043c.
\u041d\u0435\u043a\u0440\u0438\u0442\u0438\u0447\u043d\u043e \u043a
\u0441\u043f\u0430\u043c\u0443)
+REGISTER_FAKEEMAIL_EXPLAIN=\u0415\u0441\u043b\u0438 \u044d\u0442\u043e
\u043f\u043e\u043b\u0435 \u043d\u0435 \u043f\u0443\u0441\u0442\u043e, \u0442\u043e
\u043d\u0430 \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0438\u0439 email
\u0431\u0443\u0434\u0443\u0442
\u0440\u0430\u0441\u0441\u044b\u043b\u0430\u0442\u044c\u0441\u044f
\u0442\u043e\u043b\u044c\u043a\u043e
\u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f
+REGISTER_QUESTION=\u0421\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439
\u0432\u043e\u043f\u0440\u043e\u0441
+REGISTER_ANSWER=\u041e\u0442\u0432\u0435\u0442 \u043d\u0430
\u0441\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439
\u0432\u043e\u043f\u0440\u043e\u0441
+REGISTER_ASREGUSER=\u0411\u0443\u0434\u0443\u0447\u0438
\u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u043c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c
\u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435:
+REGISTER_ASREG6=\u0412\u044b\u0431\u0438\u0440\u0430\u0442\u044c
\u0440\u0430\u0437\u043b\u0438\u0447\u043d\u044b\u0435 \u0442\u0435\u043c\u044b
+REGISTER_ASREG5=Customize the comments
+REGISTER_ASREG4=\u0412\u044b\u0431\u0438\u0440\u0430\u0442\u044c,
\u0441\u043a\u043e\u043b\u044c\u043a\u043e
\u043d\u043e\u0432\u043e\u0441\u0442\u043d\u044b\u0445
\u0441\u044e\u0436\u0435\u0442\u043e\u0432
\u043f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u043d\u0430
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435
+REGISTER_ASREG3=\u0418\u043c\u0435\u0442\u044c
\u043f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0439
\u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u044f\u0449\u0438\u0435 \u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435
+REGISTER_ASREG2=\u0420\u0430\u0441\u0441\u044b\u043b\u0430\u0442\u044c
\u043d\u043e\u0432\u043e\u0441\u0442\u0438 \u043e\u0442
\u0432\u0430\u0448\u0435\u0433\u043e \u0438\u043c\u0435\u043d\u0438
+REGISTER_ASREG1=\u041e\u0441\u0442\u0430\u0432\u043b\u044f\u0442\u044c
\u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0438 \u043e\u0442
\u0432\u0430\u0448\u0435\u0433\u043e \u0438\u043c\u0435\u043d\u0438
+REGISTER_REGISTERNOW=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0443\u0439\u0442\u0435\u0441\u044c
\u0441\u0435\u0439\u0447\u0430\u0441! \u042d\u0442\u043e
\u0431\u0435\u0441\u043f\u043b\u0430\u0442\u043d\u043e!
+REGISTER_WEDONTGIVE=\u041c\u044b \u043d\u0435 \u0431\u0443\u0434\u0435\u0442
\u043f\u0440\u043e\u0434\u0430\u0432\u0430\u0442\u044c/\u043f\u0443\u0431\u043b\u0438\u043a\u043e\u0432\u0430\u0442\u044c
\u0432\u0430\u0448\u0438 \u043b\u0438\u0447\u043d\u044b\u0435
\u0434\u0430\u043d\u043d\u044b\u0435.
+REGISTER_ALREADYHAVEACCOUNT=\u0423 \u0432\u0430\u0441 \u0443\u0436\u0435
\u0435\u0441\u0442\u044c \u0443\u0447\u0435\u0442\u043d\u0430\u044f
\u0437\u0430\u043f\u0438\u0441\u044c:
+REGISTER_SIGNIN=\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f
+REGISTER_GIVENNAME=\u0418\u043c\u044f
+REGISTER_FAMILYNAME=\u0424\u0430\u043c\u0438\u043b\u0438\u044f
+REGISTER_PERSONALINFO=\u041f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u0430\u044f
\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f
+REGISTER_VIEWREALEMAIL=\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c
\u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u043c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f\u043c
\u0432\u0438\u0434\u0435\u0442\u044c \u043c\u043e\u0439
\u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0438\u0439 e-mail
+REGISTER_HOMEPAGE=\u0410\u0434\u0440\u0435\u0441 \u0432\u0430\u0448\u0435\u0433\u043e
\u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0433\u043e
\u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u0430
+REGISTER_TIMEZONEOFFSET=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f
\u0437\u043e\u043d\u0430
+REGISTER_THEME=\u0422\u0435\u043c\u0430
+REGISTER_DEFAULT_THEME=\u041e\u0431\u043b\u0438\u043a \u0441\u0430\u0439\u0442\u0430
\u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e
+REGISTER_ICQ=ICQ id
+REGISTER_AIM=AIM id
+REGISTER_YIM=Yahoo id
+REGISTER_MSNM=MSN messenger id
+REGISTER_SKYPE=Skype id
+REGISTER_XMMP=XMMP id
+REGISTER_LOCATION=\u041c\u0435\u0441\u0442\u043e\u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435
+REGISTER_LANGUAGE=\u041f\u0440\u0435\u0434\u043f\u043e\u0447\u0438\u0442\u0430\u0435\u043c\u044b\u0439
\u044f\u0437\u044b\u043a
+REGISTER_OCCUPATION=\u0420\u043e\u0434
\u0434\u0435\u044f\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438
+REGISTER_INTERESTS=\u0418\u043d\u0442\u0435\u0440\u0435\u0441\u044b
+REGISTER_SIGNATURE=\u041f\u043e\u0434\u043f\u0438\u0441\u044c
+REGISTER_EXTRAINFO=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u0430\u044f
\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f
+REGISTER_CANKNOWABOUT=(\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0442\u043e,
\u0447\u0442\u043e \u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u043c
\u0431\u0443\u0434\u0435\u0442 \u0438\u043d\u0442\u0435\u0440\u0435\u0441\u043d\u043e
\u0443\u0437\u043d\u0430\u0442\u044c \u043e \u0432\u0430\u0441.
\u041c\u0430\u043a\u0441\u0438\u043c\u0443\u043c 255
\u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432)
+REGISTER_SAVECHANGES=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f
+REGISTER_CONFIRMATIONEMAIL=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c
\u043d\u0430 email
+
+REGISTER_SHOWMENU=\u0412\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f \u0432
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0435
\u043c\u0435\u043d\u044e
+
+REGISTER_ERROR_INVALIDUSERNAME=\u0418\u043c\u044f
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
\u043d\u0435\u0432\u0435\u0440\u043d\u043e
+REGISTER_ERROR_EXISTINGUSERNAME=\u042d\u0442\u043e \u0438\u043c\u044f
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
\u0443\u0436\u0435
\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f
+REGISTER_ERROR_INVALIDPASSWORD1=\u041f\u0430\u0440\u043e\u043b\u044c
\u043d\u0435\u0432\u0435\u0440\u0435\u043d
+REGISTER_ERROR_INVALIDPASSWORD2=\u041f\u0430\u0440\u043e\u043b\u044c
\u043d\u0435\u0432\u0435\u0440\u0435\u043d
+REGISTER_ERROR_PASSWORDMISMATCH=\u041f\u0430\u0440\u043e\u043b\u0438 \u043d\u0435
\u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0442
+REGISTER_ERROR_INVALIDREALEMAIL=\u042d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441 \u043d\u0435\u0432\u0435\u0440\u0435\u043d
+
+REGISTER_CONFIRM=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
\u0443\u0434\u0430\u0447\u043d\u043e \u0441\u043e\u0437\u0434\u0430\u043d.
+REGISTER_ADMIN_SEARCH=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c/\u041e\u0442\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
+
+
+MENU_LOGOUT=\u0412\u044b\u0439\u0442\u0438
+MENU_EDITPROFILE=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0432\u0430\u0448 \u043f\u0440\u043e\u0444\u0438\u043b\u044c
+MENU_LISTUSERS=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c
\u0432\u0441\u0435\u0445
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
+
+LIST_FILTERS=\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c
\u0444\u0438\u043b\u044c\u0442\u0440\u044b \u043a \u0441\u043f\u0438\u0441\u043a\u0443
+LIST_USERSPERPAGE=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
\u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443
+LIST_USERNAMECONTAINS=\u0418\u043c\u044f
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
\u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442
+LIST_FULLNAME=\u041f\u043e\u043b\u043d\u043e\u0435 \u0438\u043c\u044f
+LIST_USERNAME=\u0418\u043c\u044f \u0443\u0447\u0435\u0442\u043d\u043e\u0439
\u0437\u0430\u043f\u0438\u0441\u0438
+LIST_FIRSTNAME=\u0418\u043c\u044f
+LIST_LASTNAME=\u0424\u0430\u043c\u0438\u043b\u0438\u044f
+LIST_ROLES=\u0420\u043e\u043b\u0438
+LIST_ACTIONS=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044f
+LIST_ACTIONSSHOWPROFILE=\u041f\u0440\u043e\u0444\u0438\u043b\u044c
+LIST_ACTIONADDROLESTOUSER=\u0420\u043e\u043b\u0438
+LIST_ACTIONEDITROLES=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0440\u043e\u043b\u0438
+LIST_ACTIONDELETEUSER=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+LIST_CONFIRMDELETEUSER=\u0412\u044b
\u0441\u043e\u0431\u0438\u0440\u0430\u0435\u0442\u0435\u0441\u044c
\u0443\u0434\u0430\u043b\u0438\u0442\u044c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+LIST_SEARCHRESULTS=\u041f\u043e\u0438\u0441\u043a\u0430\u0442\u044c
\u0434\u0430\u043d\u043d\u044b\u0435
+LIST_MATCHING=\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u044f
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
+FILTER=\u0424\u0438\u043b\u044c\u0442\u0440
+
+NEXTPAGE=\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0430\u044f
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430
+PREVIOUSPAGE=\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0430\u044f
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430
+
+ASSIGNROLES=\u041d\u0430\u0437\u043d\u0430\u0447\u0438\u0442\u044c
\u0440\u043e\u043b\u0438
+ASSIGNEDROLES=\u0420\u043e\u043b\u0438 \u043a
\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044e
+ROLESAVAILABLE=\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0435
\u0440\u043e\u043b\u0438
+EDITROLESFORUSER=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0440\u043e\u043b\u0438
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+
+
+ROLE_THEREARE=\u041e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e
+ROLE_THEREIS=\u041e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0430
+ROLE_ROLESDEFINED=\u0440\u043e\u043b\u0435\u0439
+ROLE_ROLEDEFINED=\u0440\u043e\u043b\u044c
+
+ROLE_NAME=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043d\u043e\u0432\u043e\u0439
\u0440\u043e\u043b\u0438
+ROLE_DISPLAYNAME=\u0412\u044b\u0432\u043e\u0434\u0438\u0442\u044c \u0438\u043c\u044f
\u0440\u043e\u043b\u0438
+ROLE_NEWDISPLAYNAME=New display name for the role
+ROLE_SELECTONETOMODIFY= \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435
\u0440\u043e\u043b\u0438 \u0434\u043b\u044f
\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f
+ROLE_SELECTONETODELETE= \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435
\u0440\u043e\u043b\u044c \u0434\u043b\u044f
\u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f
+ROLE_CREATE=\u0421\u043e\u0437\u0434\u0430\u0442\u044c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0443\u044e
\u0440\u043e\u043b\u044c
+ROLE_UPDATE=\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0440\u043e\u043b\u044c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+ROLE_EDIT=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0440\u043e\u043b\u044c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+ROLE_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
\u0432\u044b\u0431\u0440\u0430\u043d\u043d\u0443\u044e \u0440\u043e\u043b\u044c
+ROLE_CONFIRM_DELETE=\u0412\u044b
\u0441\u043e\u0431\u0438\u0440\u0430\u0435\u0442\u0435\u0441\u044c
\u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0440\u043e\u043b\u044c
+ROLE_DELETED=\u0420\u043e\u043b\u044c \u0443\u0434\u0430\u043b\u0435\u043d\u0430
+ROLE_EDIT_MEMBERS=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0447\u043b\u0435\u043d\u043e\u0432 \u0440\u043e\u043b\u0438
+ROLE_MAINLIST=\u041d\u0430\u0437\u0430\u0434 \u043a
\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044e
\u0440\u043e\u043b\u0438
+ROLE_EDIT_USER=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
\u0440\u043e\u043b\u0438
+ROLE_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0440\u043e\u043b\u0438
+ROLE_REMOVE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0440\u043e\u043b\u0438
+
+ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=\u0423\u0436\u0435
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u0440\u043e\u043b\u044c
\u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e
\u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u043e\u0433\u043e
\u0438\u043c\u0435\u043d\u0438
+ROLE_ERROR_NAMEALREADYEXISTS=\u0423\u0436\u0435
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u0440\u043e\u043b\u044c
\u0441 \u044d\u0442\u0438\u043c \u0438\u043c\u0435\u043d\u0435\u043c
+ROLE_ERROR_NAMEEMPTY=\u0418\u043c\u044f \u0440\u043e\u043b\u0438 \u043d\u0435
\u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c
\u043f\u0443\u0441\u0442\u044b\u043c
+ROLE_ERROR_DISPLAYNAMEEMPTY=\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u043e\u0435
\u0438\u043c\u044f \u0440\u043e\u043b\u0438 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442
\u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c
+ROLE_ERROR_DELETE_FAILED=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e
\u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0440\u043e\u043b\u044c
+
+MENU_CREATEROLE=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u043e\u0432\u0443\u044e
\u0440\u043e\u043b\u044c
+MENU_EDITROLE=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0443\u044e
\u0440\u043e\u043b\u044c
+MENU_EDITROLEMEMBERS=\u0427\u043b\u0435\u043d \u0440\u043e\u043b\u0438
+
+ROLE_TEXT_1=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435
\u044d\u0442\u043e\u0442 \u043f\u043e\u0440\u0442\u043b\u0435\u0442 \u0434\u043b\u044f
\u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f,
\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f,
\u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f \u0438\u043b\u0438
\u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u043a
\u0440\u043e\u043b\u044f\u043c.
+ROLE_TEXT_2=\u042d\u0442\u0438 \u0440\u043e\u043b\u0438
\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044e\u0442\u0441\u044f \u0432
\u043f\u043e\u0440\u0442\u043b\u0435\u0442\u0435
\u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0434\u043b\u044f
\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u043f\u0440\u0430\u0432.
+
+PERMISSION_PICKPORTLET=\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
\u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0439 \u0434\u043b\u044f
\u043f\u043e\u0440\u0442\u043b\u0435\u0442\u043e\u0432
+PERMISSION_PERMISSIONS=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c
\u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f
+PERMISSION_TOP=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435
\u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u0434\u043b\u044f
\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f
+PERMISSION_FINERGRAIN=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435
\u0441\u0443\u0431-\u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442
\u0434\u043b\u044f \u0437\u0430\u0434\u0430\u043d\u0438\u044f \u0435\u0433\u043e
\u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0439
+PERMISSION_MODIFYROLES=\u0423\u0430\u043b\u0438\u0442\u044c/\u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c
\u0440\u043e\u043b\u0438
+PERMISSION_MODIFYINGROLES=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c
\u0440\u043e\u043b\u0438 \u0434\u043b\u044f
+PERMISSION_DOMAIN=\u0434\u043e\u043c\u0435\u043d\u0430
+PERMISSION_DOMAIN_MOD=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c
\u0434\u043e\u043c\u0435\u043d
+PERMISSION_DEFINEDROLES=\u041e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0435
\u0440\u043e\u043b\u0438
+PERMISSION_IMPLIEDROLES=\u041f\u043e\u0434\u0440\u0430\u0437\u0443\u043c\u0435\u0432\u0430\u0435\u043c\u044b\u0435
\u0440\u043e\u043b\u0438
+ 

Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp	2008-05-29
09:43:27 UTC (rev 10834)
@@ -28,9 +28,17 @@
 %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@page import="org.jboss.portal.identity.UserStatus"%>
+<%@page import="org.jboss.portal.common.i18n.ResourceBundleFactory"%>
+<%@page import="java.util.ResourceBundle"%>
+
+<%
+      ResourceBundle rb = ResourceBundle.getBundle("conf.bundles.Resource",
request.getLocale());
+%>
+
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-   <title>Login</title>
+   <title><%= rb.getString("LOGIN_TITLE")  %></title>
    <style type="text/css">
       /* <![CDATA[ */
       body {
@@ -58,13 +66,29 @@
 
 <div class="login-container">
 
+           
    <div class="login-header">
       <h2><%= rb.getString("LOGIN_TITLE") %></h2>
    </div>
    <div class="login-content">
+   
       <div class="error-message"
-          
style="<%=(request.getAttribute("org.jboss.portal.loginError") != null ?
"" : "display:none")%>;"><%=
-           (request.getAttribute("org.jboss.portal.loginError") == null ?
"" : request.getAttribute("org.jboss.portal.loginError"))%>
+          
style="<%=(request.getAttribute(!UserStatus.OK.equals("org.jboss.portal.userStatus")
? "" : "display:none"))%>;">
+           <%
+           
+               if
(UserStatus.DISABLE.equals(request.getAttribute("org.jboss.portal.userStatus")))
+               {
+                  out.println(rb.getString("ACCOUNT_DISABLED"));
+               }
+               else if
(UserStatus.WRONGPASSWORD.equals(request.getAttribute("org.jboss.portal.userStatus"))
||
UserStatus.UNEXISTING.equals(request.getAttribute("org.jboss.portal.userStatus")))
+               {
+                 
out.println(rb.getString("ACCOUNT_INEXISTING_OR_WRONG_PASSWORD"));
+               }
+               else if
(UserStatus.NOTASSIGNEDTOROLE.equals(request.getAttribute("org.jboss.portal.userStatus")))
+               {
+                  out.println(rb.getString("ACCOUNT_NOTASSIGNEDTOROLE"));
+               }
+			%>
       </div>
       <form method="post" action="<%=
response.encodeURL("j_security_check") %>" name="loginform"
id="loginForm"
             target="_parent">

Copied:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ru.properties
(from rev 10820,
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ru.properties)
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ru.properties	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ru.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -0,0 +1,96 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
+## CMS ADMIN PORTLET
+TITLE_HEAD=\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
CMS
+TITLE_BROWSE=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
\u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0438
+TITLE_FILEBROWSE=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
\u0444\u0430\u0439\u043b\u043e\u0432
+TITLE_DELETECONFIRM=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435
\u043d\u0430 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435
+TITLE_CREATECOLLCONFIRM=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435
\u043d\u0430 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435
\u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0438
+TITLE_COPYCONFIRM=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435
\u043d\u0430 \u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
\u0440\u0435\u0441\u0443\u0440\u0441\u0430
+TITLE_MOVECONFIRM=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435
\u043d\u0430 \u043f\u0435\u0440\u0435\u043d\u043e\u0441
\u0440\u0435\u0441\u0443\u0440\u0441\u0430
+TITLE_VIEWFILE=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
\u0441\u0432\u043e\u0439\u0441\u0442\u0432 \u0444\u0430\u0439\u043b\u0430
+TITLE_EDIT=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
\u0444\u0430\u0439\u043b\u0430
+TITLE_CREATE=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435
\u0444\u0430\u0439\u043b\u0430
+TITLE_UPLOAD=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430
\u0444\u0430\u0439\u043b\u0430
+TITLE_SECURECONFIRM=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c
\u0440\u0435\u0436\u0438\u043c\u0430 \u0434\u043e\u0441\u0442\u0443\u043f\u0430
+
+CMS_SEARCH=\u041f\u043e\u0438\u0441\u043a
+CMS_SEARCHNORESULT=\u041d\u0435\u0442
\u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 \u0434\u043b\u044f
\u0434\u0430\u043d\u043d\u043e\u0433\u043e \u0437\u0430\u043f\u0440\u043e\u0441\u0430
+CMS_MENU=\u041c\u0435\u043d\u044e \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439
+CMS_ACTION=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435
+CMS_NAME=\u0418\u043c\u044f
+CMS_TYPE=\u0422\u0438\u043f
+CMS_CREATED=\u0421\u043e\u0437\u0434\u0430\u043d\u043e
+CMS_MODIFIED=\u041c\u043e\u0434\u0438\u0444\u0438\u0446\u0438\u0440\u043e\u0432\u0430\u043d\u043e
+CMS_DESCRIPTION=\u041e\u0431\u043e\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435
+CMS_VIEW=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
+CMS_COPY=\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c
+CMS_MOVE=\u041f\u0435\u0440\u0435\u043c\u0435\u0441\u0442\u0438\u0442\u044c
+CMS_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
+CMS_FOLDER=\u041a\u0430\u0442\u0430\u043b\u043e\u0433
+CMS_FILE=\u0424\u0430\u0439\u043b
+CMS_CREATE=\u0421\u043e\u0437\u0434\u0430\u0442\u044c
+CMS_CANCEL=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c
+CMS_EDIT=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
+CMS_UPLOAD=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c
+CMS_MODIFY=\u041c\u043e\u0434\u0438\u0444\u0438\u0446\u0438\u0440\u043e\u0432\u0430\u0442\u044c
+CMS_CREATEFOLDER=\u0421\u043e\u0437\u0434\u0430\u0442\u044c
\u043a\u0430\u0442\u0430\u043b\u043e\u0433
+CMS_CREATEFILE=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0444\u0430\u0439\u043b
+CMS_UPLOADARCHIVE=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c
\u0430\u0440\u0445\u0438\u0432
+CMS_BACKTOBROWSER=\u0412\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f \u043a
\u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0443
\u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0439
+CMS_TRANSFER=\u0418\u043c\u043f\u043e\u0440\u0442/\u042d\u043a\u0441\u043f\u043e\u0440\u0442
+CMS_EXPORTARCHIVE=\u042d\u043a\u0441\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u043a\u0430\u0442\u0430\u043b\u043e\u0433
+CMS_SECURE=\u0420\u0435\u0436\u0438\u043c \u0434\u043e\u0441\u0442\u0443\u043f\u0430
+CMS_PREVIEW=\u041f\u0440\u0435\u0434\u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
+
+CMS_CREATEFILEINDIR=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435
\u0444\u0430\u0439\u043b\u0430 \u0432
\u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0438
+CMS_FILENAME=\u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430
+CMS_TITLE=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435
+CMS_LANGUAGE=\u042f\u0437\u044b\u043a
+
+CMS_DELETEPATH=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435
\u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435
+CMS_DELETEWARN1=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435!
\u0414\u0430\u043d\u043d\u043e\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435
\u043d\u0435\u043b\u044c\u0437\u044f \u0431\u0443\u0434\u0435\u0442
\u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c\!
+CMS_DELETEWARN2=\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b,
\u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435
\u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442
\u0440\u0435\u0441\u0443\u0440\u0441\?
+
+CMS_DESTINATION=\u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435
+CMS_SOURCE=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a
+
+CMS_EDITING=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
\u0444\u0430\u0439\u043b\u0430
+CMS_LIVE=\u0421\u0434\u0435\u043b\u0430\u0442\u044c
\"\u0436\u0438\u0432\u044b\u043c\"
+CMS_VERSION=\u0412\u0435\u0440\u0441\u0438\u044f
+CMS_WYSIWYG=WYSIWYG-\u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440
+
+CMS_LIVEVERSION=\u0416\u0438\u0432\u0430\u044f \u0432\u0435\u0440\u0441\u0438\u044f
+CMS_SIZE=\u0420\u0430\u0437\u043c\u0435\u0440
+
+CMS_CONTENT_DIR=\u0421\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435
\u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0438
+CMS_CONTENT_DIR_USE=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435
\u0434\u0435\u0440\u0435\u0432\u043e \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0430
\u0434\u043b\u044f \u043d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u0438 \u043f\u043e
\u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0435
\u043f\u043e\u0440\u0442\u0430\u043b\u0430.
+CMS_MAIN_USE=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435
\u043f\u043e\u0440\u0442\u043b\u0435\u0442
"\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
CMS" \u0434\u043b\u044f \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f
\u0441\u043e\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u044b\u043c
\u0432\u0430\u0448\u0435\u0433\u043e \u043f\u043e\u0440\u0442\u0430\u043b\u0430.
+CMS_MANAGE=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435
\u0441\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u044b\u043c
+
+CMS_CREATED_BY=\u0421\u043e\u0437\u0434\u0430\u043d\u043e
+CMS_APPROVE=\u041e\u0434\u043e\u0431\u0440\u0435\u043d\u043e
+CMS_DENY=\u0417\u0430\u043f\u0435\u0440\u0438\u0442\u044c
+CMS_APPROVAL=\u041c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u044b \u0434\u043b\u044f
\u043e\u0434\u043e\u0431\u0440\u0435\u043d\u0438\u044f
+CMS_PATH=\u0420\u0430\u0437\u043c\u0435\u0449\u0435\u043d\u0438\u0435

Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml	2008-05-29
09:43:27 UTC (rev 10834)
@@ -41,6 +41,7 @@
       <supported-locale>en</supported-locale>
       <supported-locale>fr</supported-locale>
       <supported-locale>es</supported-locale>
+      <supported-locale>ru</supported-locale>
       <resource-bundle>Resource</resource-bundle>
       <portlet-info>
          <title>CMS</title>

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -178,4 +178,7 @@
 
 # Example usage for dynamic values
 IDENTITY_DYNAMIC_VALUE_TEST=test label
-IDENTITY_DYNAMIC_VALUE_TEST2=test label2
\ No newline at end of file
+IDENTITY_DYNAMIC_VALUE_TEST2=test label2
+
+javax.portlet.title=User profile
+javax.portlet.keywords=management,user
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -292,3 +292,5 @@
 IDENTITY_XMMP = Identifiant XMMP
 
 IDENTITY_YIM = Identifiant Yahoo
+
+javax.portlet.title=Utilisateur

Copied:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties
(from rev 10820,
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties)
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -0,0 +1,178 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
+IDENTITY_APPLICATION_NOT_AVAILABLE=\u0414\u0430\u043d\u043d\u044b\u0439
\u043f\u043e\u0440\u0442\u043b\u0435\u0442
\u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d.
\u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0432\u0430\u0448\u0443
\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e, \u0430
\u0442\u0430\u043a\u0436\u0435 \u0436\u0443\u0440\u043d\u0430\u043b
\u043e\u0448\u0438\u0431\u043e\u043a \u0434\u043b\u044f \u0431\u043e\u043b\u0435\u0435
\u0434\u0435\u0442\u0430\u043b\u044c\u043d\u043e\u0439
\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438.
+
+IDENTITY_WELCOME=\u0414\u043e\u0431\u0440\u043e
\u043f\u043e\u0436\u0430\u043b\u043e\u0432\u0430\u0442\u044c
+IDENTITY_REGISTER=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f
+IDENTITY_LOST_PASSWORD=\u041f\u043e\u0442\u0435\u0440\u044f\u043b
\u043f\u0430\u0440\u043e\u043b\u044c
+IDENTITY_NOT_LOGGED_IN=\u0412\u044b \u0435\u0449\u0435 \u043d\u0435
\u0430\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043b\u0438\u0441\u044c.
+IDENTITY_CREATE_ACCOUNT=\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435
\u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0443\u0447\u0435\u0442\u043d\u0443\u044e
\u0437\u0430\u043f\u0438\u0441\u044c.
+IDENTITY_BUTTON_SUBMIT=\u0414\u0430
+IDENTITY_BUTTON_EDIT=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
+IDENTITY_BUTTON_CANCEL=\u041e\u0442\u043c\u0435\u043d\u0430
+
+IDENTITY_REGISTER_TITLE=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f
\u043e\u0442 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435
+IDENTITY_REGISTER_TITLE_CONFIRM=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435
+IDENTITY_REGISTER_PASSWORD_CONFIRM=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c
\u043f\u0430\u0440\u043e\u043b\u044c
+IDENTITY_REGISTER_STATUS_TITLE=\u0421\u0442\u0430\u0442\u0443\u0441
\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
+IDENTITY_REGISTER_SUCCESS_TITLE=\u0412\u0430\u0448\u0430
\u0443\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c
\u0441\u043e\u0437\u0434\u0430\u043d\u0430. \u0412\u044b
\u043c\u043e\u0436\u0435\u0442\u0435
\u0430\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f.
+IDENTITY_REGISTER_PENDING_TITLE=\u041f\u043e\u0447\u0442\u043e\u0432\u043e\u0435
\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 \u0431\u044b\u043b\u043e
\u043e\u0442\u043e\u0441\u043b\u0430\u043d\u043e \u043d\u0430 \u0432\u0430\u0448
\u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441.
+IDENTITY_REGISTER_REQUIRED_INFORMATION=\u043e\u0437\u043d\u0430\u0447\u0430\u0435\u0442
\u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0435
\u043f\u043e\u043b\u0435.  
+
+IDENTITY_LOST_PASSWORD_TITLE=\u0417\u0430\u0431\u044b\u043b\u0438
\u0432\u0430\u0448\u0438
\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0435
\u0434\u0430\u043d\u043d\u044b\u0435?
+IDENTITY_LOST_PASSWORD_DESCRIPTION=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430,
\u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u0432\u0430\u0448\u0435
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0435
\u0438\u043c\u044f \u0434\u043b\u044f \u0441\u0431\u0440\u043e\u0441\u0430
\u043f\u0430\u0440\u043e\u043b\u044f.
+IDENTITY_LOST_PASSWORD_ERROR=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c
\u0441\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c.
+IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL=\u0412\u044b
\u043f\u043e\u043b\u0443\u0447\u0438\u0442\u0435
\u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0435
\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 \u0441
\u0432\u0430\u0448\u0438\u043c \u043d\u043e\u0432\u044b\u043c
\u043f\u0430\u0440\u043e\u043b\u0435\u043c.
+IDENTITY_LOST_PASSWORD_STATUS_404=\u0423\u0447\u0435\u0442\u043d\u0430\u044f
\u0437\u0430\u043f\u0438\u0441\u044c \u043d\u0435
\u043d\u0430\u0439\u0434\u0435\u043d\u0430.
+IDENTITY_LOST_PASSWORD_STATUS_TITLE=\u041f\u043e\u0442\u0435\u0440\u044f\u043d
\u043f\u0430\u0440\u043e\u043b\u044c
+
+IDENTITY_EDIT_PROFILE_ERROR=\u041f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430
\u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438
\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0438
\u043f\u0440\u043e\u0444\u0438\u043b\u044f.
+IDENTITY_EDIT_PASSWORD_TITLE=\u0421\u043c\u0435\u043d\u0438\u0442\u044c
\u0432\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c
+IDENTITY_EDIT_PASSWORD_CURRENT=\u0422\u0435\u043a\u0443\u0449\u0438\u0439
\u043f\u0430\u0440\u043e\u043b\u044c
+IDENTITY_EDIT_CHANGE_PASSWORD=\u0421\u043c\u0435\u043d\u0438\u0442\u044c
\u043f\u0430\u0440\u043e\u043b\u044c
+IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=\u041d\u0435
\u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043c\u0435\u043d\u0438\u0442\u044c
\u0432\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c.
+IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=\u0412\u0430\u0448
\u043f\u0430\u0440\u043e\u043b\u044c \u0431\u044b\u043b
\u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d.
+
+IDENTITY_EDIT_EMAIL_TITLE=\u0421\u043c\u0435\u043d\u0430
\u0432\u0430\u0448\u0435\u0433\u043e
\u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0433\u043e
\u0430\u0434\u0440\u0435\u0441\u0430
+IDENTITY_EDIT_EMAIL_NEW=\u041d\u043e\u0432\u044b\u0439
\u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441
+IDENTITY_EDIT_CHANGE_EMAIL=\u041f\u043e\u043c\u0435\u043d\u044f\u0442\u044c
\u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441
+IDENTITY_EDIT_CHANGE_EMAIL_ERROR=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c
\u043f\u043e\u043c\u0435\u043d\u044f\u0442\u044c
\u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=\u041f\u0438\u0441\u044c\u043c\u043e \u0441
\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435\u043c
\u0431\u044b\u043b\u043e \u043e\u0442\u043e\u0441\u043b\u0430\u043d\u043e \u043d\u0430
\u0432\u0430\u0448 \u0430\u0434\u0440\u0435\u0441.
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=\u0412\u0430\u0448
\u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441 \u0431\u044b\u043b \u0441\u043c\u0435\u043d\u0435\u043d.
+
+IDENTITY_EDIT_PROFILE_TITLE=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
\u043f\u0440\u043e\u0444\u0438\u043b\u044f
+IDENTITY_VIEW_PROFILE_TITLE=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
\u043f\u0440\u043e\u0444\u0438\u043b\u044f
+
+IDENTITY_USERNAME=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0435
\u0438\u043c\u044f
+IDENTITY_PASSWORD=\u041f\u0430\u0440\u043e\u043b\u044c
+IDENTITY_EMAIL=\u042d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441
+IDENTITY_GIVENNAME=\u0418\u043c\u044f
+IDENTITY_FAMILYNAME=\u0424\u0430\u043c\u0438\u043b\u0438\u044f
+IDENTITY_SKYPE=Skype ID
+IDENTITY_LOCATION=\u041c\u0435\u0441\u0442\u043e\u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435
+IDENTITY_OCCUPATION=\u0421\u0444\u0435\u0440\u0430
\u0434\u0435\u044f\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438
+IDENTITY_EXTRA=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e
+IDENTITY_SIGNATURE=\u041f\u043e\u0434\u043f\u0438\u0441\u044c
+IDENTITY_INTERESTS=\u0418\u043d\u0442\u0435\u0440\u0435\u0441\u044b
+IDENTITY_LOCALE=\u041b\u043e\u043a\u0430\u043b\u044c
+IDENTITY_ICQ=Icq ID
+IDENTITY_AIM=Aim ID
+IDENTITY_MSNM= MSN messenger ID
+IDENTITY_YIM=Yahoo ID
+IDENTITY_XMMP=Xmmp ID
+IDENTITY_HOMEPAGE=\u0414\u043e\u043c\u0430\u0448\u043d\u044f\u044f
\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430
+IDENTITY_TIMEZONE=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f
\u0437\u043e\u043d\u0430
+IDENTITY_THEME=\u0422\u0435\u043c\u0430
+IDENTITY_SECURITY_QUESTION=\u0421\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439
\u0432\u043e\u043f\u0440\u043e\u0441
+IDENTITY_SECURITY_ANSWER=\u041e\u0442\u0432\u0435\u0442 \u043d\u0430
\u0441\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439
\u0432\u043e\u043f\u0440\u043e\u0441
+IDENTITY_LAST_LOGIN=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439
\u0432\u0445\u043e\u0434 \u0441 \u0441\u0438\u0441\u0442\u0435\u043c\u0443
+IDENTITY_REIGSTRATION_DATE=\u0414\u0430\u0442\u0430
\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438
+IDENTITY_ENABLED=\u0410\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u043e
+
+IDENTITY_CATEGORY_GENERAL=\u041e\u0441\u043d\u043e\u0432\u043d\u044b\u0435
\u043f\u0440\u0435\u0434\u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438
+IDENTITY_CATEGORY_PERSONAL=\u041f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u0430\u044f
\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f
+IDENTITY_CATEGORY_INSTANT=\u0414\u0430\u043d\u043d\u044b\u0435 \u043e\u0431
IM-\u043a\u043b\u0438\u0435\u043d\u0442\u0430\u0445
+IDENTITY_CATEGORY_ADDITIONAL=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u0430\u044f
\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f
+
+IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(\u0421\u0438\u0433\u043d\u0430\u0442\u0443\u0440\u0430
- \u043c\u0430\u043a\u0441\u0438\u043c\u0443\u043c 255
\u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432)
+IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(\u041c\u0430\u043a\u0441\u0438\u043c\u0443\u043c 255
\u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432)
+
+IDENTITY_MANAGEMENT_ACTION=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044f
+IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+IDENTITY_MANAGEMENT_ACTION_ROLES=\u0420\u043e\u043b\u0438
+IDENTITY_MANAGEMENT_ACTION_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
+IDENTITY_MANAGEMENT_USER_MANAGEMENT=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f\u043c\u0438
+IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435
\u0440\u043e\u043b\u044f\u043c\u0438
+IDENTITY_MANAGEMENT_SEARCH_USER=\u041f\u043e\u0438\u0441\u043a
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
+IDENTITY_MANAGEMENT_CREATE_USER=\u0421\u043e\u0437\u0434\u0430\u0442\u044c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0443\u044e
\u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c
+IDENTITY_MANAGEMENT_CREATE_USER_CREATED=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
\u0441\u043e\u0437\u0434\u0430\u043d
+IDENTITY_MANAGEMENT_USER_DELETED=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c
\u0443\u0434\u0430\u043b\u0435\u043d
+IDENTITY_MANAGEMENT_ROLE=\u0420\u043e\u043b\u044c
+IDENTITY_MANAGEMENT_ROLE_DISPLAY=\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u043e\u0435
\u0438\u043c\u044f
+IDENTITY_MANAGEMENT_ROLE_MEMBERS=\u0427\u043b\u0435\u043d\u044b
+IDENTITY_MANAGEMENT_ROLE_ASSIGNED=\u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044b\u0435
\u0440\u043e\u043b\u0438
+IDENTITY_MANAGEMENT_CREATE_ROLE=\u0421\u043e\u0437\u0434\u0430\u0442\u044c
\u043d\u043e\u0432\u0443\u044e \u0440\u043e\u043b\u044c
+IDENTITY_MANAGEMENT_EDIT_ROLE=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0440\u043e\u043b\u044c
+IDENTITY_MANAGEMENT_CREATE_ROLE=\u0421\u043e\u0437\u0434\u0430\u0442\u044c
\u0440\u043e\u043b\u044c
+IDENTITY_MANAGEMENT_DISABLE=\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c
+IDENTITY_MANAGEMENT_ENABLE=\u0410\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c
+IDENTITY_MANAGEMENT_RESET_PASSWORD=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c
\u043f\u0430\u0440\u043e\u043b\u044c
+IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c
\u043f\u0430\u0440\u043e\u043b\u044c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044e
\u0431\u0443\u0434\u0435\u0442 \u043e\u0442\u043e\u0441\u043b\u0430\u043d\u043e
\u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 \u0441\u043e
\u0441\u043b\u0443\u0447\u0430\u0439\u043d\u043e
\u0441\u0433\u0435\u043d\u0435\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u043c
\u043f\u0430\u0440\u043e\u043b\u0435\u043c.
+IDENTITY_MANAGEMENT_ASSIGN_ROLES=\u041d\u0430\u0437\u043d\u0430\u0447\u0438\u0442\u044c
\u0440\u043e\u043b\u0438
+IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438,
\u0442\u0440\u0435\u0431\u0443\u044e\u0449\u0438\u0435
\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f
+IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438
+IDENTITY_MANAGEMENT_APPROVE_ALL=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c
\u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0435
+IDENTITY_MANAGEMENT_REJECT_ALL=\u041e\u0442\u0432\u0435\u0440\u0433\u043d\u0443\u0442\u044c
\u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0435
+IDENTITY_MANAGEMENT_SELECT_ALL=\u0432\u044b\u0431\u0440\u0430\u0442\u044c
\u0432\u0441\u0435
+IDENTITY_MANAGEMENT_UNSELECT_ALL=\u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c
\u0432\u044b\u0431\u043e\u0440
+IDENTITY_MANAGEMENT_MATRIX=\u041c\u0430\u0442\u0440\u0438\u0446\u0430
+IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES=\u0420\u0435\u0436\u0438\u043c\u044b
\u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438
+
+IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438,
\u0442\u0440\u0435\u0431\u0443\u044e\u0449\u0438\u0435
\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f
+IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id
+IDENTITY_MANAGEMENT_PENDING_APPROVE=\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c
+IDENTITY_MANAGEMENT_PENDING_REJECT=\u043e\u0442\u0432\u0435\u0440\u0433\u043d\u0443\u0442\u044c
+
+IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE=\u0420\u0435\u0436\u0438\u043c
\u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438
+IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE=\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043d\u044b\u0439
\u0440\u0435\u0436\u0438\u043c \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=\u0412\u044b\u0431\u0438\u0440\u0430\u0435\u043c\u044b\u0439
\u0440\u0435\u0436\u0438\u043c \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439
\u0440\u0435\u0436\u0438\u043c -
\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f
\u043f\u043e no e-mail \u043d\u0435\u0442,
\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f
\u043e\u0442
\u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430
\u043d\u0435\u0442.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435
\u043f\u043e e-mail \u0435\u0441\u0442\u044c,
\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f
\u043e\u0442
\u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430
\u043d\u0435\u0442.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f
\u043f\u043e e-mail \u0438 \u043e\u0442
\u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430
\u0435\u0441\u0442\u044c.
+
+IDENTITY_REGISTER_VERIFY_CAPTCHA=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435
\u043a\u043e\u0434 \u0440\u0438\u0441\u0443\u043d\u043a\u0430
+IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=\u041e\u0441\u0442\u043e\u0440\u043e\u0436\u043d\u043e:
\u043e\u043f\u0435\u0440\u0430\u0446\u0438\u044f
\u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f
+IDENTITY_WARNING_CONFIRM_DELETE_USER=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435!
\u0412\u044b \u0441\u043e\u0431\u0438\u0440\u0430\u0435\u0442\u0435\u0441\u044c
\u0443\u0434\u0430\u043b\u0438\u0442\u044c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
+IDENTITY_WARNING_CONFIRM_DELETE_ROLE=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435!
\u0412\u044b \u0441\u043e\u0431\u0438\u0440\u0430\u0435\u0442\u0435\u0441\u044c
\u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0440\u043e\u043b\u044c
+IDENTITY_REGISTER_CONFIRMATIONEMAIL=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435
\u0432\u0430\u0448\u0435\u0439 \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438
+
+IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=\u0421\u0431\u0440\u043e\u0441
\u0432\u0430\u0448\u0435\u0433\u043e \u043f\u0430\u0440\u043e\u043b\u044f
+IDENTITY_MAIL_SUBJECT_REGISTER=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c
\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044e
+IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c
\u0432\u0430\u0448 \u044d\u043b\u0435\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441
+
+IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=\u041d\u0435
\u0443\u0434\u0430\u043b\u043e\u0441\u044c
\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438
\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u0441 \u044d\u0442\u043e\u0439
\u0440\u043e\u043b\u044c\u044e. \u0414\u043b\u044f \u0431\u043e\u043b\u0435\u0435
\u0434\u0435\u0442\u0430\u043b\u044c\u043d\u043e\u0439
\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438
\u043e\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044c \u043a
\u0436\u0443\u0440\u043d\u0430\u043b\u0443 \u043e\u0448\u0438\u0431\u043e\u043a.
+IDENTITY_MANAGEMENT_ERROR_ACTION_USER=\u041d\u0435
\u0443\u0434\u0430\u043b\u043e\u0441\u044c
\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438
\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u0441 \u044d\u0442\u0438\u043c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c.
\u0414\u043b\u044f \u0431\u043e\u043b\u0435\u0435
\u0434\u0435\u0442\u0430\u043b\u044c\u043d\u043e\u0439
\u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438
\u043e\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044c \u043a
\u0436\u0443\u0440\u043d\u0430\u043b\u0443 \u043e\u0448\u0438\u0431\u043e\u043a.
+
+IDENTITY_VERIFICATION_RETURN=\u0412\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f
\u043d\u0430 \u043f\u043e\u0440\u0442\u0430\u043b
+IDENTITY_VERIFICATION_LOGIN=\u0412\u043e\u0439\u0442\u0438
+IDENTITY_VERIFICATION_STATUS_EROOR=\u041e\u0448\u0438\u0431\u043a\u0430
\u043f\u0440\u0438
\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0438
\u044d\u043b\u0435\u0442\u0440\u043e\u043d\u043d\u043e\u0433\u043e
\u0430\u0434\u0440\u0435\u0441\u0430.
+IDENTITY_VERIFICATION_STATUS_FAILED=\u041d\u0435
\u0443\u0434\u0430\u043b\u043e\u0441\u044c
\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c
\u044d\u043b\u0435\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441.
+IDENTITY_VERIFICATION_STATUS_VALIDATED=\u042d\u043b\u0435\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441
\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d.
+IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=\u0412\u0430\u0448\u0430
\u0443\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c
\u0443\u0441\u043f\u0435\u0448\u043d\u043e
\u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u0430.
\u0422\u0435\u043f\u0435\u0440\u044c \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435
\u0430\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f.
+IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=\u0412\u0430\u0448
\u044d\u043b\u0435\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441 \u0431\u044b\u043b
\u043f\u0440\u043e\u0432\u0435\u0440\u0435\u043d, \u043d\u043e
\u0443\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c
\u0442\u0435\u043f\u0435\u0440\u044c \u0434\u043e\u043b\u0436\u043d\u0430
\u0431\u044b\u0442\u044c \u043e\u0434\u043e\u0431\u0440\u0435\u043d\u0430
\u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u043e\u043c.
+IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=\u0412\u0430\u0448\u0430
\u0443\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c
\u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u0430.
\u0422\u0435\u043f\u0435\u0440\u044c \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435
\u0430\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f.
+
+IDENTITY_VALIDATION_ERROR_REGISTRATION=\u041d\u0435
\u0443\u0434\u0430\u043b\u043e\u0441\u044c
\u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f.
+IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=\u042d\u0442\u043e \u0438\u043c\u044f
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
\u0443\u0436\u0435
\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f. 
+IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=\u041e\u0448\u0438\u0431\u043a\u0430
\u043f\u0440\u0438
\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0438
\u0438\u043c\u0435\u043d\u0438
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f.
+IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=\u041f\u0430\u0440\u043e\u043b\u0438
\u043d\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0442.
+IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=\u041e\u0448\u0438\u0431\u043a\u0430
\u043f\u0440\u0438
\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0438
\u043f\u0430\u0440\u043e\u043b\u044f.
+IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439
\u044d\u043b\u0435\u0442\u0440\u043e\u043d\u043d\u044b\u0439
\u0430\u0434\u0440\u0435\u0441.
+IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0439
\u043f\u0430\u0440\u043e\u043b\u044c
+IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0439
\u043a\u043e\u0434 \u0441 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438
+
+# Example usage for dynamic values
+IDENTITY_DYNAMIC_VALUE_TEST=test label
+IDENTITY_DYNAMIC_VALUE_TEST2=test label2

Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml	2008-05-29
09:43:27 UTC (rev 10834)
@@ -43,12 +43,10 @@
          <portlet-mode>VIEW</portlet-mode>
       </supports>
       <supported-locale>fr</supported-locale>
+      <supported-locale>ru</supported-locale>
       <supported-locale>en</supported-locale>
       <supported-locale>it</supported-locale>
-      <portlet-info>
-         <title>User portlet</title>
-         <keywords>management,user</keywords>
-      </portlet-info>
+      <resource-bundle>conf.bundles.Identity</resource-bundle>
       <portlet-preferences>
       	<preference>
       		<!-- Use captcha verification -->

Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml	2008-05-29
09:43:27 UTC (rev 10834)
@@ -36,6 +36,7 @@
          <display-name xml:lang="it">Test</display-name>
          <display-name xml:lang="es">Ejemplos</display-name>
          <display-name xml:lang="fr">Test</display-name>
+         <display-name xml:lang="ru">Тест</display-name>
          <properties>
             <property>
                <name>order</name>

Copied:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes
(from rev 10822,
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes)

Deleted:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties	2008-05-27
09:00:03 UTC (rev 10822)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -1,2 +0,0 @@
-javax.portlet.title=Greetings !
-javax.portlet.keywords=sample,test
\ No newline at end of file

Copied:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties
(from rev 10822,
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties)
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -0,0 +1,2 @@
+javax.portlet.title=Greetings !
+javax.portlet.keywords=sample,test
\ No newline at end of file

Deleted:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties	2008-05-27
09:00:03 UTC (rev 10822)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -1,2 +0,0 @@
-javax.portlet.title=Bienvenue !
-javax.portlet.keywords=exemple,test
\ No newline at end of file

Copied:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties
(from rev 10822,
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties)
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -0,0 +1,2 @@
+javax.portlet.title=Bienvenue !
+javax.portlet.keywords=exemple,test
\ No newline at end of file

Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml	2008-05-29
09:43:27 UTC (rev 10834)
@@ -36,9 +36,6 @@
          <mime-type>text/html</mime-type>
          <portlet-mode>VIEW</portlet-mode>
       </supports>
-      <portlet-info>
-         <title>Greetings!</title>
-         <keywords>sample,test</keywords>
-      </portlet-info>
+      <resource-bundle>Resource</resource-bundle>
    </portlet>
 </portlet-app>

Copied:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_ru.properties
(from rev 10820,
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_ru.properties)
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_ru.properties	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_ru.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -0,0 +1,25 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
+javax.portlet.preference.name.RssXml=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a
RSS
+javax.portlet.preference.name.expires=\u0422\u0430\u0439\u043c-\u0430\u0443\u0442

Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml	2008-05-29
09:43:27 UTC (rev 10834)
@@ -36,6 +36,7 @@
          <display-name xml:lang="it">Novita'</display-name>
          <display-name xml:lang="es">Noticias</display-name>
          <display-name xml:lang="fr">Actualités</display-name>
+         <display-name xml:lang="ru">Новости</display-name>
          <properties>
             <property>
                <name>order</name>

Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml	2008-05-29
09:43:27 UTC (rev 10834)
@@ -54,6 +54,7 @@
       <supported-locale>en</supported-locale>
       <supported-locale>fr</supported-locale>
       <supported-locale>it</supported-locale>
+      <supported-locale>ru</supported-locale>
       <resource-bundle>NewsResource</resource-bundle>
       <portlet-info>
          <title>News Feeds</title>

Copied:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_ru.properties
(from rev 10820,
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_ru.properties)
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_ru.properties	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_ru.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -0,0 +1,32 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
+NO_USERS_ONLINE=\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043d\u043d\u044b\u0445
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439
\u043d\u0435\u0442
+ONE_USER_ONLINE_0=\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043d
<b>
+ONE_USER_ONLINE_1=</b>
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c:
+ONE_USER_IS_0=<b>
+ONE_USER_IS_1=</b>
+USERS_ONLINE_0=\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043d\u043e
<b>
+USERS_ONLINE_1=</b>
\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f(\u0439):
+USERS_ARE_0=<b>
+USERS_ARE_1=</b>

Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml	2008-05-29
09:43:27 UTC (rev 10834)
@@ -40,6 +40,7 @@
       <supported-locale>en</supported-locale>
       <supported-locale>it</supported-locale>
       <supported-locale>fr</supported-locale>
+      <supported-locale>ru</supported-locale>
       <resource-bundle>Resource</resource-bundle>
       <portlet-info>
          <title>Current users</title>

Copied:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_ru.properties
(from rev 10820,
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_ru.properties)
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_ru.properties	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_ru.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -0,0 +1,28 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
+javax.portlet.preference.name.RssXml=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a
RSS
+javax.portlet.preference.name.expires=\u0422\u0430\u0439\u043c-\u0430\u0443\u0442
+org.jboss.portal.object.name.Weather=\u041f\u043e\u0433\u043e\u0434\u0430
+
+org.jboss.portal.instance.name.WeatherPortletInstance=\u041c\u0435\u0442\u0435\u043e\u0441\u0432\u043e\u0434\u043a\u0430

Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml	2008-05-29
09:43:27 UTC (rev 10834)
@@ -54,6 +54,7 @@
       <supported-locale>fr</supported-locale>
       <supported-locale>en</supported-locale>
       <supported-locale>it</supported-locale>
+      <supported-locale>ru</supported-locale>
       <resource-bundle>WeatherResource</resource-bundle>
       <portlet-info>
          <title>Weather Portlet</title>

Copied:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes
(from rev 10827,
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes)

Deleted:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties	2008-05-27
17:05:45 UTC (rev 10827)
+++
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -1,35 +0,0 @@
-################################################################################
-# JBoss, a division of Red Hat                                                 #
-# Copyright 2008, Red Hat Middleware, LLC, and individual                      #
-# contributors as indicated by the @authors tag. See the                       #
-# copyright.txt in the distribution for a full listing of                      #
-# individual contributors.                                                     #
-#                                                                              #
-# This is free software; you can redistribute it and/or modify it              #
-# under the terms of the GNU Lesser General Public License as                  #
-# published by the Free Software Foundation; either version 2.1 of             #
-# the License, or (at your option) any later version.                          #
-#                                                                              #
-# This software is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
-# Lesser General Public License for more details.                              #
-#                                                                              #
-# You should have received a copy of the GNU Lesser General Public             #
-# License along with this software; if not, write to the Free                  #
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
-################################################################################
-# JBoss Portal display information
-org.jboss.portal.object.name.WSRPConfigurationPortlet           = WSRP Configuration
-org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = WSRP Configuration
Portlet
-
-nav_tabs_consumers = Consumers Configuration
-nav_tabs_producer_config = Producer Configuration
-nav_tabs_producer_management = Producer Management
-
-path_consumers_root = Consumers
-path_consumers_consumer = Consumer ''{0}'' configuration
-path_consumers_active = active
-path_consumers_inactive = inactive
-path_consumers_refreshNeeded = refresh needed

Copied:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
(from rev 10827,
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties)
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -0,0 +1,35 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2008, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+# JBoss Portal display information
+org.jboss.portal.object.name.WSRPConfigurationPortlet           = WSRP Configuration
+org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = WSRP Configuration
Portlet
+
+nav_tabs_consumers = Consumers Configuration
+nav_tabs_producer_config = Producer Configuration
+nav_tabs_producer_management = Producer Management
+
+path_consumers_root = Consumers
+path_consumers_consumer = Consumer ''{0}'' configuration
+path_consumers_active = active
+path_consumers_inactive = inactive
+path_consumers_refreshNeeded = refresh needed

Deleted:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties	2008-05-27
17:05:45 UTC (rev 10827)
+++
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -1,35 +0,0 @@
-################################################################################
-# JBoss, a division of Red Hat                                                 #
-# Copyright 2008, Red Hat Middleware, LLC, and individual                      #
-# contributors as indicated by the @authors tag. See the                       #
-# copyright.txt in the distribution for a full listing of                      #
-# individual contributors.                                                     #
-#                                                                              #
-# This is free software; you can redistribute it and/or modify it              #
-# under the terms of the GNU Lesser General Public License as                  #
-# published by the Free Software Foundation; either version 2.1 of             #
-# the License, or (at your option) any later version.                          #
-#                                                                              #
-# This software is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
-# Lesser General Public License for more details.                              #
-#                                                                              #
-# You should have received a copy of the GNU Lesser General Public             #
-# License along with this software; if not, write to the Free                  #
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
-################################################################################
-# JBoss Portal display information
-org.jboss.portal.object.name.WSRPConfigurationPortlet           = Configuration WSRP
-org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = Portlet de
Configuration pour WSRP
-
-nav_tabs_consumers = Configuration Consommateurs
-nav_tabs_producer_config = Configuration Producteur
-nav_tabs_producer_management = Gestion Producteur
-
-path_consumers_root = Consommateurs
-path_consumers_consumer = Configuration du consommateur ''{0}''
-path_consumers_active = actif
-path_consumers_inactive = inactif
-path_consumers_refreshNeeded = rafra\u00eechissement requis

Copied:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
(from rev 10827,
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties)
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties	
                       (rev 0)
+++
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties	2008-05-29
09:43:27 UTC (rev 10834)
@@ -0,0 +1,35 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2008, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+# JBoss Portal display information
+org.jboss.portal.object.name.WSRPConfigurationPortlet           = Configuration WSRP
+org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = Portlet de
Configuration pour WSRP
+
+nav_tabs_consumers = Configuration Consommateurs
+nav_tabs_producer_config = Configuration Producteur
+nav_tabs_producer_management = Gestion Producteur
+
+path_consumers_root = Consommateurs
+path_consumers_consumer = Configuration du consommateur ''{0}''
+path_consumers_active = actif
+path_consumers_inactive = inactif
+path_consumers_refreshNeeded = rafra\u00eechissement requis

Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml	2008-05-29
09:43:27 UTC (rev 10834)
@@ -1,5 +1,7 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core">
+                xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core"
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+   <f:loadBundle basename="WSRPConfigurationResource"
var="i18n"/>
    <div class="wsrp-consumers-ui">
       <ui:insert name="topnav">Top navigation</ui:insert>
 

Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml	2008-05-29
09:43:27 UTC (rev 10834)
@@ -7,10 +7,10 @@
    <ui:define name="topnav">
       <h:form>
          <ul class="topnav">
-            <li id="currentTab">Consumers Configuration</li>
-            <li><h:commandLink value="Producer Configuration"
action="producer"/></li>
+            <li id="currentTab">#{i18n.nav_tabs_consumers}</li>
+            <li><h:commandLink
value="#{i18n.nav_tabs_producer_config}"
action="producer"/></li>
             <ui:remove>
-            <li><h:commandLink value="Producer Management"
action="management"/></li>
+            <li><h:commandLink
value="#{i18n.nav_tabs_producer_management}"
action="management"/></li>
             </ui:remove>
          </ul>
       </h:form>
@@ -20,14 +20,17 @@
       <h:form>
          <ul class="objectpath">
             <li class="#{!empty title ? 'selected' :
'pathItem'}">
-               <h:commandLink action="#{consumersMgr.listConsumers}"
value="Consumers"/>
+               <h:commandLink action="#{consumersMgr.listConsumers}"
value="#{i18n.path_consumers_root}"/>
             </li>
             <c:if test="#{empty title}">
                <li class="pathSeparator"><h:graphicImage
url="/img/pathSeparator.png" alt=">"/></li>
                <li
                   class="#{consumer.active ? 'active' : 'inactive'}
#{consumer.refreshNeeded ? 'needsRefresh' : ''}">
-                  Consumer '#{consumer.id}' configuration (#{consumer.active ?
'active' : 'inactive'})
-                  #{consumer.refreshNeeded ? '(refresh needed)' : ''}
+                  <h:outputFormat
value="#{i18n.path_consumers_consumer}">
+                     <f:param value="#{consumer.id}"/>
+                  </h:outputFormat> (<h:outputText
value="#{i18n.path_consumers_active}"
rendered="#{consumer.active}"/>
+                  <h:outputText value="#{i18n.path_consumers_inactive}"
rendered="#{!consumer.active}"/>)
+                  (<h:outputText
value="#{i18n.path_consumers_refreshNeeded}"
rendered="#{consumer.refreshNeeded}"/>)
                </li>
             </c:if>
          </ul>

Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml	2008-05-29
09:32:44 UTC (rev 10833)
+++
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml	2008-05-29
09:43:27 UTC (rev 10834)
@@ -21,26 +21,29 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
 <portlet-app
-   xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1...
http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-   version="1.0">
-   <portlet>
-      <description>Configuration portlet for WSRP.</description>
-      <portlet-name>WSRPConfigurationPortlet</portlet-name>
-      <display-name>WSRP Configuration</display-name>
-     
<portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class>
-      <init-param>
-         <name>default-view</name>
-         <value>/WEB-INF/jsf/consumers/consumers.xhtml</value>
-      </init-param>
-      <supports>
-         <mime-type>text/html</mime-type>
-         <portlet-mode>VIEW</portlet-mode>
-      </supports>
-      <portlet-info>
-         <title>WSRP Configuration</title>
-         <keywords>management,admin,wsrp</keywords>
-      </portlet-info>
-   </portlet>
+        xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1...
http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+        version="1.0">
+  <portlet>
+    <description>Configuration portlet for WSRP.</description>
+    <portlet-name>WSRPConfigurationPortlet</portlet-name>
+    <display-name>WSRP Configuration</display-name>
+   
<portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class>
+    <init-param>
+      <name>default-view</name>
+      <value>/WEB-INF/jsf/consumers/consumers.xhtml</value>
+    </init-param>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <supported-locale>fr</supported-locale>
+    <resource-bundle>WSRPConfigurationResource</resource-bundle>
+    <portlet-info>
+      <title>WSRP Configuration</title>
+      <keywords>management,admin,wsrp</keywords>
+    </portlet-info>
+  </portlet>
 </portlet-app>
\ No newline at end of file


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

JBoss Portal SVN: r10834 - in branches/JBoss_Portal_Branch_2_6: core/src/resources/portal-core-sar/conf/bundles and 20 other directories.