svn commit: r731602 - in /ofbiz/trunk/framework: common/config/CommonEntityLabels.xml common/config/CommonUiLabels.xml common/config/SecurityextUiLabels.xml webapp/config/WebappEntityLabels.xml webapp/config/WebappUiLabels.xml

Mon, 05 Jan 2009 07:42:03 -0800 

Author: jleroux
Date: Mon Jan  5 07:41:39 2009
New Revision: 731602

URL: http://svn.apache.org/viewvc?rev=731602&view=rev
Log:
cleanup_labels29.patch from Marco Risaliti 'Clean up labels" 
(https://issues.apache.org/jira/browse/OFBIZ-1780) - OFBIZ-1780

Modified:
    ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml
    ofbiz/trunk/framework/common/config/SecurityextUiLabels.xml
    ofbiz/trunk/framework/webapp/config/WebappEntityLabels.xml
    ofbiz/trunk/framework/webapp/config/WebappUiLabels.xml

Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.xml?rev=731602&r1=731601&r2=731602&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonEntityLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonEntityLabels.xml Mon Jan  5 
07:41:39 2009
@@ -5732,6 +5732,7 @@
         <value xml:lang="de">Angenommen</value>
         <value xml:lang="en">Accepted</value>
         <value xml:lang="es">Aceptado</value>
+        <value xml:lang="fr">Accepté</value>
         <value xml:lang="it">Accettata</value>
         <value xml:lang="pt">Aceite</value>
         <value xml:lang="ro">Acceptata</value>
@@ -5743,6 +5744,7 @@
         <value xml:lang="de">Wartend auf Annahme</value>
         <value xml:lang="en">Pending Acceptance</value>
         <value xml:lang="es">Pendiente de aceptar</value>
+        <value xml:lang="fr">Acceptation en attente</value>
         <value xml:lang="it">Accettazione Sospesa</value>
         <value xml:lang="pt">Aceitação Pendente</value>
         <value xml:lang="ro">Aceptare Suspendata</value>
@@ -5754,6 +5756,7 @@
         <value xml:lang="de">Abgelehnt</value>
         <value xml:lang="en">Rejected</value>
         <value xml:lang="es">Rechazado</value>
+        <value xml:lang="fr">Refué</value>
         <value xml:lang="it">Rifiutata</value>
         <value xml:lang="pt">Rejeitada</value>
         <value xml:lang="ro">Refuzata</value>
@@ -7603,6 +7606,7 @@
         <value xml:lang="de">Kontaktliste Akteur</value>
         <value xml:lang="en">Contact List Party</value>
         <value xml:lang="es">Lista de contactos Participante</value>
+        <value xml:lang="fr">Acteur de liste de contact</value>
         <value xml:lang="it">Liste di Contatto Soggetto</value>
         <value xml:lang="pt">Lista de Contactos de Participante</value>
         <value xml:lang="ro">Lista de Contact Subiecti</value>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=731602&r1=731601&r2=731602&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Mon Jan  5 07:41:39 
2009
@@ -3350,7 +3350,7 @@
         <value xml:lang="en">Main</value>
         <value xml:lang="es">Principal</value>
         <value xml:lang="fr">Page d'accueil</value>
-        <value xml:lang="it">Pagina Principale</value>
+        <value xml:lang="it">Pagina principale</value>
         <value xml:lang="nl">HoofdMenu</value>
         <value xml:lang="pt">Início</value>
         <value xml:lang="pt_PT">Entrada</value>
@@ -7962,6 +7962,38 @@
         <value xml:lang="zh">新建数据源类型</value>
         <value xml:lang="zh_CN">增加新数据源类型</value>
     </property>
+    <property key="PageTitleLogin">
+        <value xml:lang="cs">přihlášení</value>
+        <value xml:lang="de">Anmeldung</value>
+        <value xml:lang="en">Login</value>
+        <value xml:lang="es">Entrada</value>
+        <value xml:lang="fr">Connexion</value>
+        <value xml:lang="it">Login</value>
+        <value xml:lang="ja">ログイン</value>
+        <value xml:lang="nl">Aanmelden</value>
+        <value xml:lang="pt_BR">Entrada</value>
+        <value xml:lang="pt_PT">Início</value>
+        <value xml:lang="ro">Login</value>
+        <value xml:lang="ru">Логин</value>
+        <value xml:lang="th">เข้าสู่ระบบ</value>
+        <value xml:lang="zh">登录</value>
+    </property>
+    <property key="PageTitleMain">
+        <value xml:lang="cs">úvodní strana</value>
+        <value xml:lang="de">Startseite</value>
+        <value xml:lang="en">Main Page</value>
+        <value xml:lang="es">Página Principal</value>
+        <value xml:lang="fr">Page d'accueil</value>
+        <value xml:lang="hi_IN">मुख्य पृष्ठ</value>
+        <value xml:lang="it">Pagina principale</value>
+        <value xml:lang="ja">メインページ</value>
+        <value xml:lang="nl">Hoofdpagina</value>
+        <value xml:lang="pt_PT">Página de Entrada</value>
+        <value xml:lang="ro">Pagina Principala</value>
+        <value xml:lang="ru">Основная страница</value>
+        <value xml:lang="th">หน้าหลัก</value>
+        <value xml:lang="zh">首页</value>
+    </property>
     <property key="PageTitleViewBlocked">
         <value xml:lang="en">View Blocked</value>
         <value xml:lang="fr">Page bloquée</value>

Modified: ofbiz/trunk/framework/common/config/SecurityextUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/SecurityextUiLabels.xml?rev=731602&r1=731601&r2=731602&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/SecurityextUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/SecurityextUiLabels.xml Mon Jan  5 
07:41:39 2009
@@ -17,7 +17,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
     <property key="loginevents.error_accessing_password">
         <value xml:lang="de">Fehler beim Zugriff auf Passwort: 
${errorMessage}.</value>
         <value xml:lang="en">Error accessing password: ${errorMessage}.</value>
@@ -80,14 +81,16 @@
         <value xml:lang="it">Il seguente errore è accaduto durante 
l'autenticazione: ${errorMessage}</value>
         <value xml:lang="nl">De volgende fout kwam voor tijdens het inloggen: 
${errorMessage}</value>
         <value xml:lang="ro">A aparut urmatoarea eroare in timpul logarii: 
${errorMessage}</value>
+        <value xml:lang="ru">Во время регистрации в 
системе произошла следующая ошибка: 
${errorMessage}</value>
         <value 
xml:lang="th">ผิดพลาดตามสิ่งที่เกิดขึ้นระหว่างการลอกอินเข้าสู่ระบบ:
 ${errorMessage}</value>
+        <value 
xml:lang="zh">登录时发生下列错误：${errorMessage}</value>
     </property>
     <property key="loginevents.new_password_createdandsent_check_email">
         <value xml:lang="de">Ein neues Passwort wurde erzeugt und Ihnen per 
E-Mail zugeschickt. Überprüfen sie Ihren E-Mail-Eingang.</value>
         <value xml:lang="en">A new password has been created and sent to you. 
Please check your Email.</value>
         <value xml:lang="es">Un nuevo password ha sido creado y enviado. Por 
favor revise su e-mail</value>
         <value xml:lang="fr">Un nouveau mot de passe a été crée et envoyé. 
Merci de vérifier votre courriel.</value>
-        <value xml:lang="it">Una nuova password è stata creata ed inviata. 
Controlla la tua Email.</value>
+        <value xml:lang="it">Una nuova password è stata creata ed inviata. 
Controlla le email.</value>
         <value xml:lang="nl">A new password has been created and sent to you. 
Please check your Email.</value>
         <value xml:lang="ro">Ti-a fost creata si trimisa  o noua parola. Te 
rugam sa controlezi posta ta Email.</value>
         <value xml:lang="ru">Новый пароль создан и 
выслан вам. Пожалуйста, проверьте свою эл. 
почту.</value>
@@ -99,7 +102,7 @@
         <value xml:lang="en">Your password has been sent to you. Please check 
your Email.</value>
         <value xml:lang="es">Su password ha sido enviado. Revise su 
e-mail</value>
         <value xml:lang="fr">Votre nouveau mot de passe vous a été envoyé. 
Merci de vérifier votre courriel.</value>
-        <value xml:lang="it">La tua password ti è stata inviata. Controlla la 
tua Email.</value>
+        <value xml:lang="it">La tua password ti è stata inviata. Controlla le 
email.</value>
         <value xml:lang="nl">Your password has been sent to you. Please check 
your Email.</value>
         <value xml:lang="ro">Parola ta a fost trimisa. Te rugam s controlezi 
posta Email.</value>
         <value xml:lang="ru">Ваш пароль был выслан в ваш 
адрес. Пожалуйста, проверьте свою эл. 
почту.</value>
@@ -123,7 +126,7 @@
         <value xml:lang="en">No Primary Email Address has been set, please 
contact customer service.</value>
         <value xml:lang="es">No se ha actualizado dirección e-mail.</value>
         <value xml:lang="fr">Pas d'adresse courriel créée, merci de 
contacter votre service commercial.</value>
-        <value xml:lang="it">Indirizzo Email primario non impostato, prego 
contattare il servizio clienti.</value>
+        <value xml:lang="it">Indirizzo email primario non impostato, prego 
contattare il servizio clienti.</value>
         <value xml:lang="nl">No Primary Email Address has been set, please 
contact customer service.</value>
         <value xml:lang="ro">Nici-o Adresa Primara Email a fost inregistrata, 
Va rugam contactati serviciul clienti.</value>
         <value xml:lang="ru">Не установлен основной 
адрес эл. почты, пожалуйста связывайтесь со 
службой поддержки.</value>
@@ -147,10 +150,12 @@
         <value xml:lang="en">password was empty reenter</value>
         <value xml:lang="es">El password no puede ser vacío</value>
         <value xml:lang="fr">Le mot de passe était vide, SVP 
recommencez.</value>
-        <value xml:lang="it">La password è vuota, prego inserirla.</value>
+        <value xml:lang="it">La password è vuota, prego inserirla 
dinuovo.</value>
         <value xml:lang="nl">Het wachtwoord is leeg, toets aub opnieuw 
in.</value>
         <value xml:lang="ro">Parola este goala, va rugam 
re-introduceti.</value>
+        <value xml:lang="ru">Пароль пустой, введите 
повторно.</value>
         <value 
xml:lang="th">กลับเข้าไปสู่รหัสผ่านที่ว่างเปล่า</value>
+        <value xml:lang="zh">密码是空的，请重新输入。</value>
     </property>
     <property 
key="loginevents.problems_with_configuration_contact_customer_service">
         <value xml:lang="de">Fehler bei der Konfiguration; bitte wenden Sie 
sich an den Kundenservice.</value>
@@ -169,9 +174,10 @@
         <value xml:lang="en">unable to login this application</value>
         <value xml:lang="es">No puedo conectarse a esta aplicación (faltan 
permisos)</value>
         <value xml:lang="fr"><b>Impossible de se connecter à cette 
application.</b></value>
-        <value xml:lang="it">L'autenticazione per questa applicazione non è 
stata completata (permessi non sufficenti).</value>
+        <value xml:lang="it">L'autenticazione per questa applicazione non è 
stata completata (permessi non sufficienti).</value>
         <value xml:lang="nl">Login for this application couldn't be completed 
(required permissions missing).</value>
         <value xml:lang="ro">Autentificarea acestei aplicatii nu a fost 
completata (drepturi insuficiente).</value>
+        <value xml:lang="ru">Регистрация для этого 
приложения не может быть завершена 
(отсутствуют требуемые права).</value>
         <value 
xml:lang="th">ไม่สามารถลอกอินเข้าสู่โปรแกรมประยุกต์นี้</value>
     </property>
     <property key="loginevents.user_already_logged_in">
@@ -191,7 +197,7 @@
         <value xml:lang="en">A user with the Username "${userLoginId}" was not 
found, please re-enter.</value>
         <value xml:lang="es">El usuario "${userLoginId}" no fue encontrado, 
por favor intente de nuevo.</value>
         <value xml:lang="fr">Le nom d'utilisateur "${userLoginId}" est 
inconnu, taper le de nouveau SVP.</value>
-        <value xml:lang="it">L'utente con Nome Utente "${userLoginId}" non è 
stato trovato, riprovare prego.</value>
+        <value xml:lang="it">L'utente "${userLoginId}" non è stato trovato, 
prego inserirlo dinuovo.</value>
         <value xml:lang="nl">A user with the username "${userLoginId}" was not 
found, please re-enter.</value>
         <value xml:lang="ro">Utilizatorul cu nume "${userLoginId}" nu a fost 
gasit, va rog re-introduceti.</value>
         <value xml:lang="ru">Пользователь с именем 
"${userLoginId}" не найден, пожалуйста повторите 
ввод.</value>
@@ -203,7 +209,7 @@
         <value xml:lang="en">The Username was not found, please 
re-enter.</value>
         <value xml:lang="es">El usuario "${userLoginId}" no fue encontrado, 
por favor intente de nuevo.</value>
         <value xml:lang="fr">Le nom d'utilisateur est inconnu, taper le de 
nouveau SVP.</value>
-        <value xml:lang="it">Il Nome Utente non è stato trovato, riprovare 
prego.</value>
+        <value xml:lang="it">L'utente non è stato trovato, prego inserirlo 
dinuovo.</value>
         <value xml:lang="nl">De gebruikersnaam is niet gevonden,toets aub 
opnieuw in.</value>
         <value xml:lang="ro">Nume Utilizator nu a fost gasit, va rugam 
reintroduceti.</value>
         <value xml:lang="ru">Это имя пользователя не 
найдено, введите повторно.</value>
@@ -215,9 +221,10 @@
         <value xml:lang="en">username was empty reenter</value>
         <value xml:lang="es">El usuario no puede ser vacío, por favor intente 
de nuevo.</value>
         <value xml:lang="fr">Le nom d'utilisateur est vide, taper le de 
nouveau SVP.</value>
-        <value xml:lang="it">Il Nome Utente è vuoto, riprovare prego.</value>
+        <value xml:lang="it">L'utente è vuoto, prego inserirlo 
dinuovo.</value>
         <value xml:lang="nl">De gebruikersnaam is leeg, toets aub opnieuw 
in.</value>
         <value xml:lang="ro">Nume Utilizator este gol, va rugam 
reintroduceti.</value>
+        <value xml:lang="ru">Имя пользователя пустое, 
введите повторно.</value>
         <value 
xml:lang="th">ชื่อผู้เข้าใช้ว่าง, 
กรุณากรอกข้อมูลอีกครั้ง</value>
     </property>
     <property key="loginmapprocs.new_password_missing">

Modified: ofbiz/trunk/framework/webapp/config/WebappEntityLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/WebappEntityLabels.xml?rev=731602&r1=731601&r2=731602&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/config/WebappEntityLabels.xml (original)
+++ ofbiz/trunk/framework/webapp/config/WebappEntityLabels.xml Mon Jan  5 
07:41:39 2009
@@ -17,12 +17,13 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
     <property key="ServerHitType.description.ENTITY">
         <value xml:lang="de">Entität</value>
         <value xml:lang="en">Entity</value>
         <value xml:lang="es">Entidad</value>
-        <value xml:lang="it">Entité</value>
+        <value xml:lang="it">Entità</value>
         <value xml:lang="ro">Entitate</value>
         <value xml:lang="ru">Сущность</value>
         <value xml:lang="th">เอกลักษณ์</value>

Modified: ofbiz/trunk/framework/webapp/config/WebappUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/WebappUiLabels.xml?rev=731602&r1=731601&r2=731602&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/config/WebappUiLabels.xml (original)
+++ ofbiz/trunk/framework/webapp/config/WebappUiLabels.xml Mon Jan  5 07:41:39 
2009
@@ -17,7 +17,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
     <property key="coreEvents.delegator_not_passed">
         <value xml:lang="de">Benötigter Parameter 'delegator' fehlt.</value>
         <value xml:lang="en">Required parameter 'delegator' not passed.</value>
@@ -253,44 +254,6 @@
         <value xml:lang="th">SERVICE_TIME 
ผ่านเรียบร้อยแล้ว</value>
         <value xml:lang="zh">SERVICE_TIME已经传递了</value>
     </property>
-    <property key="loginevents.following_error_occurred_during_login">
-        <value xml:lang="de">Der folgende Fehler ist beim Anmelden 
aufgetreten: ${errorMessage}</value>
-        <value xml:lang="en">The following error occurred during login: 
${errorMessage}</value>
-        <value xml:lang="fr">L'erreur suivante est apparue lors de la 
connexion: ${errorMessage}</value>
-        <value xml:lang="it">Il seguente errore è avvenuto durante il login: 
${errorMessage}</value>
-        <value xml:lang="ru">Во время регистрации в 
системе произошла следующая ошибка: 
${errorMessage}</value>
-        <value 
xml:lang="th">เกิดความผิดพลาดระหว่างการเข้าสู่ระบบ:
 ${errorMessage}
-        </value>
-        <value 
xml:lang="zh">登录时发生下列错误：${errorMessage}</value>
-    </property>
-    <property key="loginevents.password_was_empty_reenter">
-        <value xml:lang="de">Passwort war leer, bitte erneut eingeben.</value>
-        <value xml:lang="en">The Password was empty, please re-enter.</value>
-        <value xml:lang="fr">Le mot de passe est vide, merci de le 
saisir</value>
-        <value xml:lang="it">La password è vuota, prego inserirla di 
nuovo.</value>
-        <value xml:lang="ru">Пароль пустой, введите 
повторно.</value>
-        <value 
xml:lang="th">รหัสผ่านเป็นค่าว่าง 
กรุณากรอกอีกครั้ง</value>
-        <value xml:lang="zh">密码是空的，请重新输入。</value>
-    </property>
-    <property key="loginevents.unable_to_login_this_application">
-        <value xml:lang="de">Sie können sich nicht bei dieser Anwendung 
anmelden (benötigte Berechtigungen fehlen).</value>
-        <value xml:lang="en">Login for this application couldn't be completed 
(required permissions missing).</value>
-        <value xml:lang="fr">La connexion à cette application n'a pas pu 
être effectuée (cet utilisateur n'a pas le niveau d'autorisation 
nécessaire)</value>
-        <value xml:lang="it">Impossibile accedere a questa applicazione 
(utente con privilegi insufficienti)</value>
-        <value xml:lang="ru">Регистрация для этого 
приложения не может быть завершена 
(отсутствуют требуемые права).</value>
-        <value 
xml:lang="th">การเข้าสู่ระบบสำหรับโปรแกรมประยุกต์นี้ไม่เสร็จสมบูรณ์
 
(ไม่ได้รับอนุญาตตามความต้องการ)
-        </value>
-        <value xml:lang="zh">无法完成登录这个应用 
(找不到所需权限)。</value>
-    </property>
-    <property key="loginevents.username_was_empty_reenter">
-        <value xml:lang="de">Der Benutzername ist leer, bitte erneut 
eingeben.</value>
-        <value xml:lang="en">The Username was empty, please re-enter.</value>
-        <value xml:lang="fr">Le nom d'utilisateur est vide, merci de le 
saisir</value>
-        <value xml:lang="it">Il nome utente è vuoto, prego inserirlo di 
nuovo.</value>
-        <value xml:lang="ru">Имя пользователя пустое, 
введите повторно.</value>
-        <value 
xml:lang="th">ชื่อผู้ใช้เป็นค่าว่าง 
กรุณากรอกอีกครั้ง</value>
-        <value xml:lang="zh">用户名是空的，请重新输入。</value>
-    </property>
     <property key="protectedviewevents.blocked_message">
         <value xml:lang="en">This is the blocked message (to be 
adapted).</value>
         <value xml:lang="fr">Ceci est le message de bloquage (à 
adapter).</value>

Reply via email to