You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/08/04 20:11:22 UTC

svn commit: r1369382 [6/19] - in /ofbiz/branches/20120329_portletWidget: ./ applications/accounting/script/org/ofbiz/accounting/payment/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accounting/webapp/accounting/WEB-INF/ applic...

Modified: ofbiz/branches/20120329_portletWidget/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/config/CommonUiLabels.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/config/CommonUiLabels.xml Sat Aug  4 18:11:00 2012
@@ -126,13 +126,6 @@
         <value xml:lang="fr">Gestion des catalogues, Catégories, Articles, Promotions, Règles de prix, Centres de profit </value>
         <value xml:lang="vi">Quản lý Phân loại Trình diễn, Phân loại Quản lý, Sản phẩm, Công thức giá, Khuyến mãi, Cửa hàng</value>
     </property>
-    <!--#Bam# portlet-example -->
-    <!-- used by uiLabelMap.Common${indicatorField}} -->
-    <property key="Common">
-        <value xml:lang="en"> </value>
-    </property>
-    <!--#Eam# portlet-example -->
-
     <property key="CommonAbort">
         <value xml:lang="en">Abort</value>
         <value xml:lang="es">Cancelar</value>
@@ -11474,10 +11467,6 @@
         <value xml:lang="zh">行小计</value>
         <value xml:lang="zh-TW">行小計</value>
     </property>
-    <property key="FormFieldTitle_lookupName">
-        <value xml:lang="en">URI to used for lookup</value>
-        <value xml:lang="fr">URI à utiliser pour le lookup</value>
-    </property>
     <property key="FormFieldTitle_maxRecurrenceCount">
         <value xml:lang="de">Maximale Wiederholungen</value>
         <value xml:lang="en">Max Recurrence Count</value>
@@ -11490,10 +11479,6 @@
         <value xml:lang="zh">最大并发数量</value>
         <value xml:lang="zh-TW">最大並發數量</value>
     </property>
-    <property key="FormFieldTitle_mgmtPageId">
-        <value xml:lang="en">portal Page Id for Mgmt</value>
-        <value xml:lang="fr">Id. de la page portail management</value>
-    </property>
     <property key="FormFieldTitle_modifiedByUserLoginId">
         <value xml:lang="de">Geändert von Benutzer-Id</value>
         <value xml:lang="en">Modified By User Login Id</value>
@@ -11506,10 +11491,6 @@
         <value xml:lang="zh">由用户登录标识修改</value>
         <value xml:lang="zh-TW">修改的使用者</value>
     </property>
-    <property key="FormFieldTitle_newPageId">
-        <value xml:lang="en">portal Page Id for Create</value>
-        <value xml:lang="fr">Id. de la page portail création</value>
-    </property>
     <property key="FormFieldTitle_originalPortalPageId">
         <value xml:lang="de">Originalseite</value>
         <value xml:lang="en">original page</value>
@@ -11552,13 +11533,6 @@
         <value xml:lang="pt-BR">Nome da página do Portal</value>
         <value xml:lang="vi">Tên Cổng thông tin</value>
     </property>
-    <!--#Bam# example-help -->
-    <property key="FormFieldTitle_portletName">
-        <value xml:lang="en">Portlet name</value>
-        <value xml:lang="fr">Portlet</value>
-    </property>
-    <!--#Eam# example-help -->
-
     <property key="FormFieldTitle_price">
         <value xml:lang="ar">السعر</value>
         <value xml:lang="de">Preis</value>
@@ -11592,10 +11566,6 @@
         <value xml:lang="zh">数量</value>
         <value xml:lang="zh-TW">數量</value>
     </property>
-    <property key="FormFieldTitle_recapPageId">
-        <value xml:lang="en">portal Page Id for Recap</value>
-        <value xml:lang="fr">Id. de la page portail récapitulative</value>
-    </property>
     <property key="FormFieldTitle_rejectButton">
         <value xml:lang="ar">إضافة</value>
         <value xml:lang="de">Ablehnen</value>
@@ -11697,14 +11667,6 @@
         <value xml:lang="zh">序号数字</value>
         <value xml:lang="zh-TW">序號數</value>
     </property>
-    <property key="FormFieldTitle_showEditButton">
-        <value xml:lang="en">Show Add, Update, Delete button (or icon) in screenlet bar</value>
-        <value xml:lang="fr">Afficher les bouttons (ou l'icônes) de gestion (ajout, modifier, supprimer</value>
-    </property>
-    <property key="FormFieldTitle_showScreenletMenu">
-        <value xml:lang="en">Display screenlet menu (Y/N)</value>
-        <value xml:lang="fr">Afficher le menu de la portlet (Y/N)</value>
-    </property>
     <property key="FormFieldTitle_statusId">
         <value xml:lang="ar">دليل الوضعية</value>
         <value xml:lang="de">Status ID</value>
@@ -11740,10 +11702,6 @@
         <value xml:lang="zh">提交</value>
         <value xml:lang="zh-TW">提交</value>
     </property>
-    <property key="FormFieldTitle_targetPageId">
-        <value xml:lang="en">Target portal Page Id</value>
-        <value xml:lang="fr">Id. de la page portail cible</value>
-    </property>
     <property key="FormFieldTitle_taxAuthGeoId">
         <value xml:lang="ar">الرمز الجغرافي للسلطة الضريبية</value>
         <value xml:lang="de">Steuerbehörde GeoID</value>
@@ -12309,37 +12267,6 @@
         <value xml:lang="zh">你不拥有页面'${portalPage.portalPageName}' [${portalPage.portalPageId}]，所以你不能修改它！</value>
         <value xml:lang="zh-TW">你不擁有頁面'${portalPage.portalPageName}' [${portalPage.portalPageId}]，所以你不能修改它！</value>
     </property>
-    <!--#Bam# portletWidget -->
-    <property key="PortalPortletFieldActionsBefore">
-        <value xml:lang="en">Actions, before showing </value>
-        <value xml:lang="fr">Actions, avant l'affichage</value>
-    </property>
-    <property key="PortalPortletFieldAjaxEditArea">
-        <value xml:lang="en">Ajax update area (cf portletType) </value>
-        <value xml:lang="fr">Zones de mise à jours de contenu en ajax (cf types de portlets)</value>
-    </property>
-    <property key="PortalPortletFieldAttributeMgmt">
-        <value xml:lang="en">To manage attributes (edit it, if there are some) </value>
-        <value xml:lang="fr">Pour gérer les attribues (les éditer, s'il y en a)</value>
-    </property>
-    <property key="PortalPortletFieldContent">
-        <value xml:lang="en">portlet technical content (default value, look to portletType) </value>
-        <value xml:lang="fr">Contenu technique de la portlet (valeurs par défaut, voir les types de portlets)</value>
-    </property>
-    <property key="PortalPortletFieldFunctions">
-        <value xml:lang="en">Portlet field showing its function</value>
-        <value xml:lang="fr">Champs liés à la fonction de la portlet</value>
-    </property>
-    <property key="PortalPortletFieldHelp">
-        <value xml:lang="en">Associated Help (not mandatory)</value>
-        <value xml:lang="fr">Gestion de l'aide (non obligatoire)</value>
-    </property>
-    <property key="PortalPortletFieldSecurity">
-        <value xml:lang="en">Security (not mandatory, no default value)</value>
-        <value xml:lang="fr">Sécurité (non obligatoire, pas de valeurs par défaut)</value>
-    </property>
-    <!--#Eam# portletWidget -->
-
     <property key="Project">
         <value xml:lang="de">Projekt</value>
         <value xml:lang="en">Project</value>
@@ -12712,943 +12639,4 @@
         <value xml:lang="zh-CN">中文</value>
         <value xml:lang="zh-TW">中文</value>
     </property>
-
-    <!--#Bam# icons-purpose -->
-    <property key="IconsTooltips_Accounting"><!-- currently copy from AccountingAccounting but will change to more detail -->
-        <value xml:lang="de">Buchhaltung</value>
-        <value xml:lang="en">Accounting</value>
-        <value xml:lang="fr">Comptabilité</value>
-        <value xml:lang="hi_IN">लेखांकन</value>
-        <value xml:lang="it">Contabilità</value>
-        <value xml:lang="nl">Boekhouding</value>
-        <value xml:lang="pt">Contabilidade</value>
-        <value xml:lang="th">การบัญชี</value>
-        <value xml:lang="zh">è®°è´¦</value>
-        <value xml:lang="zh_TW">會計</value>
-    </property>
-    <property key="IconsTooltips_Activate">
-        <value xml:lang="en">Activate</value>
-        <value xml:lang="fr">Activer</value>
-    </property>
-    <property key="IconsTooltips_Add"><!-- currently copy from CommonAdd but will change to more detail -->
-        <value xml:lang="ar">إضافة</value>
-        <value xml:lang="cs">Přidat</value>
-        <value xml:lang="de">Hinzufügen</value>
-        <value xml:lang="en">Add</value>
-        <value xml:lang="es">Añadir</value>
-        <value xml:lang="fr">Ajouter</value>
-        <value xml:lang="hi_IN">जोड़ें</value>
-        <value xml:lang="it">Aggiungi</value>
-        <value xml:lang="nl">Toevoegen</value>
-        <value xml:lang="pt">Adicionar</value>
-        <value xml:lang="ro">Adauga</value>
-        <value xml:lang="ru">Добавить</value>
-        <value xml:lang="th">เพิ่ม</value>
-        <value xml:lang="zh">新建</value>
-        <value xml:lang="zh_CN">添加</value>
-        <value xml:lang="zh_TW">增加</value>
-    </property>
-    <property key="IconsTooltips_Address"><!-- currently copy from CommonAddress1 -->
-        <value xml:lang="ar">عنوان</value>
-        <value xml:lang="de">Adresse</value>
-        <value xml:lang="en">Address</value>
-        <value xml:lang="es">Dirección</value>
-        <value xml:lang="fr">Adresse</value>
-        <value xml:lang="hi_IN">पता</value>
-        <value xml:lang="it">Indirizzo</value>
-        <value xml:lang="nl">Adres</value>
-        <value xml:lang="pt">Endereço</value>
-        <value xml:lang="ro">Adresa</value>
-        <value xml:lang="ru">Адрес</value>
-        <value xml:lang="th">ที่อยู่ที่</value>
-        <value xml:lang="zh">地址一</value>
-        <value xml:lang="zh_CN">地址</value>
-        <value xml:lang="zh_TW">地址</value>
-    </property>
-    <property key="IconsTooltips_Adm">
-        <value xml:lang="en">Administration / preference</value>
-        <value xml:lang="fr">Administration / préférence</value>
-    </property>
-    <property key="IconsTooltips_Alarm">
-        <value xml:lang="en">Alarm</value>
-        <value xml:lang="fr">Alarme</value>
-    </property>
-    <property key="IconsTooltips_AppNext">
-        <value xml:lang="en">Next Parent</value>
-        <value xml:lang="fr">Parent suivant</value>
-    </property>
-    <property key="IconsTooltips_AppPrev">
-        <value xml:lang="en">Previous Parent</value>
-        <value xml:lang="fr">Parent précédent</value>
-    </property>
-    <property key="IconsTooltips_Associate">
-        <value xml:lang="en">Associate</value>
-        <value xml:lang="fr">Associer</value>
-    </property>
-    <property key="IconsTooltips_Attach">
-        <value xml:lang="en">Document files associated list</value>
-        <value xml:lang="fr">Liste des documents associés</value>
-    </property>
-    <property key="IconsTooltips_Calendar"><!-- currently copy from WorkEffortCalendar but will change to more detail -->
-        <value xml:lang="de">Kalender</value>
-        <value xml:lang="en">Calendar</value>
-        <value xml:lang="es">Calendario</value>
-        <value xml:lang="fr">Calendrier</value>
-        <value xml:lang="it">Calendario</value>
-        <value xml:lang="nl">Kalender</value>
-        <value xml:lang="ro">Calendar</value>
-        <value xml:lang="ru">Календарь</value>
-        <value xml:lang="th">ปฏิทิน</value>
-        <value xml:lang="zh">日历</value>
-        <value xml:lang="zh_TW">日歷</value>
-    </property>
-    <property key="IconsTooltips_Cancel"><!-- Copy from CommonCancel but changed in french -->
-        <value xml:lang="ar">إلغاء</value>
-        <value xml:lang="cs">Storno</value>
-        <value xml:lang="de">Abbrechen</value>
-        <value xml:lang="en">Cancel</value>
-        <value xml:lang="es">Cancelar</value>
-        <value xml:lang="fr">Annuler l'usage de cet objet</value>
-        <value xml:lang="hi_IN">रद्द करें</value>
-        <value xml:lang="it">Annulla</value>
-        <value xml:lang="nl">Annuleer</value>
-        <value xml:lang="pt">Cancelar</value>
-        <value xml:lang="ro">Sterge</value>
-        <value xml:lang="ru">Отменить</value>
-        <value xml:lang="th">ยกเลิก</value>
-        <value xml:lang="zh">取消</value>
-        <value xml:lang="zh_CN">取消</value>
-        <value xml:lang="zh_TW">取消</value>
-    </property>
-    <property key="IconsTooltips_Category"><!-- Copy from ContentCategory but change in french, english, nl-->
-        <value xml:lang="ar">الفئة</value>
-        <value xml:lang="da">Kategori</value>
-        <value xml:lang="de">Kategorie</value>
-        <value xml:lang="en">Categories</value>
-        <value xml:lang="es">Categoría</value>
-        <value xml:lang="fr">Catégories</value>
-        <value xml:lang="it">Categoria</value>
-        <value xml:lang="nl">Categories</value>
-        <value xml:lang="pt">Categoria</value>
-        <value xml:lang="ro">Categoria</value>
-        <value xml:lang="th">หมวดหมู่</value>
-        <value xml:lang="zh">分类</value>
-        <value xml:lang="zh_TW">分類</value>
-    </property>
-    <property key="IconsTooltips_Chart"><!-- currently copy from CommonChart but will change to more detail -->
-        <value xml:lang="ar">رسوم بيانية</value>
-        <value xml:lang="de">Diagramme</value>
-        <value xml:lang="en">Charts</value>
-        <value xml:lang="es">Gráficas</value>
-        <value xml:lang="fr">Graphiques</value>
-        <value xml:lang="hi_IN">चार्ट</value>
-        <value xml:lang="it">Grafici</value>
-        <value xml:lang="nl">Grafiek</value>
-        <value xml:lang="pt">Gráficos</value>
-        <value xml:lang="ro">Grafice</value>
-        <value xml:lang="ru">Диаграммы</value>
-        <value xml:lang="th">แผนภูมิ</value>
-        <value xml:lang="zh">图表</value>
-        <value xml:lang="zh_CN">图表</value>
-        <value xml:lang="zh_TW">圖表</value>
-    </property>
-    <property key="IconsTooltips_Child">
-        <value xml:lang="en">Child object</value>
-        <value xml:lang="fr">Objets fils</value>
-    </property>
-    <property key="IconsTooltips_Contact"><!-- currently copy from CommonContacts but will change to more detail -->
-        <value xml:lang="ar">وصلات</value>
-        <value xml:lang="de">Kontakte</value>
-        <value xml:lang="en">Contacts</value>
-        <value xml:lang="es">Contactos</value>
-        <value xml:lang="fr">Contacts</value>
-        <value xml:lang="hi_IN">संपर्क</value>
-        <value xml:lang="it">Contatti</value>
-        <value xml:lang="nl">Contacten</value>
-        <value xml:lang="pt">Contactos</value>
-        <value xml:lang="pt_BR">Contatos</value>
-        <value xml:lang="ro">Contacte</value>
-        <value xml:lang="ru">Контакты    </value>
-        <value xml:lang="th">ติดต่อ</value>
-        <value xml:lang="zh">联系</value>
-        <value xml:lang="zh_CN">联系</value>
-        <value xml:lang="zh_TW">連絡</value>
-    </property>
-    <property key="IconsTooltips_ContactMech"><!-- currently copy from PartyContactMechs but will change to more detail -->
-        <value xml:lang="de">Kontaktmechanismus</value>
-        <value xml:lang="en">ContactMechs</value>
-        <value xml:lang="es">Mecanismos de Contacto</value>
-        <value xml:lang="fr">Coordonnées</value>
-        <value xml:lang="hi_IN">संपर्क यांत्रिक</value>
-        <value xml:lang="it">Contatto</value>
-        <value xml:lang="pt_BR">Mecanismos de contato</value>
-        <value xml:lang="ro">Contact</value>
-        <value xml:lang="ru">СпособСвязи</value>
-        <value xml:lang="th">วิธีการติดต่อ</value>
-        <value xml:lang="zh">联系方式</value>
-        <value xml:lang="zh_TW">連絡方式</value>
-    </property>
-    <property key="IconsTooltips_Date"><!-- currently copy from CommonDate but will change to more detail -->
-        <value xml:lang="ar">تاريخ</value>
-        <value xml:lang="cs">Datum</value>
-        <value xml:lang="de">Datum</value>
-        <value xml:lang="en">Date</value>
-        <value xml:lang="es">Fecha</value>
-        <value xml:lang="fr">Date</value>
-        <value xml:lang="hi_IN">दिनांक</value>
-        <value xml:lang="it">Data</value>
-        <value xml:lang="nl">Datum</value>
-        <value xml:lang="pt">Data</value>
-        <value xml:lang="ro">Data</value>
-        <value xml:lang="ru">Дата</value>
-        <value xml:lang="th">วันที่</value>
-        <value xml:lang="zh">日期</value>
-        <value xml:lang="zh_CN">日期</value>
-        <value xml:lang="zh_TW">日期</value>
-    </property>
-    <property key="IconsTooltips_Deactivate">
-        <value xml:lang="en">Deactivate</value>
-        <value xml:lang="fr">Déactiver</value>
-    </property>
-    <property key="IconsTooltips_Delete"><!-- currently copy from CommonDelete but will change to more detail -->
-        <value xml:lang="ar">حذف</value>
-        <value xml:lang="cs">Smazat</value>
-        <value xml:lang="de">Löschen</value>
-        <value xml:lang="en">Delete</value>
-        <value xml:lang="es">Eliminar</value>
-        <value xml:lang="fr">Supprimer</value>
-        <value xml:lang="hi_IN">मिटाए</value>
-        <value xml:lang="it">Cancella</value>
-        <value xml:lang="nl">Wis</value>
-        <value xml:lang="pt">Apagar</value>
-        <value xml:lang="pt_BR">Excluir</value>
-        <value xml:lang="pt_PT">Eliminar</value>
-        <value xml:lang="ro">Sterge</value>
-        <value xml:lang="ru">Удалить</value>
-        <value xml:lang="th">ลบ</value>
-        <value xml:lang="zh">删除</value>
-        <value xml:lang="zh_CN">删除</value>
-        <value xml:lang="zh_TW">刪除</value>
-    </property>
-    <property key="IconsTooltips_Details"><!-- copy from CommonDetails but changed in french -->
-        <value xml:lang="ar">تفاصيل</value>
-        <value xml:lang="cs">Detaily</value>
-        <value xml:lang="de">Details</value>
-        <value xml:lang="en">Details</value>
-        <value xml:lang="es">Detalles</value>
-        <value xml:lang="fr">Afficher la vue de synthèse (ou détaillée)</value>
-        <value xml:lang="hi_IN">विस्तृत सूचना</value>
-        <value xml:lang="it">Dettagli</value>
-        <value xml:lang="nl">Details</value>
-        <value xml:lang="pt">Detalhes</value>
-        <value xml:lang="ro">Detalii</value>
-        <value xml:lang="ru">Подробности</value>
-        <value xml:lang="th">รายละเอียด</value>
-        <value xml:lang="zh">详细</value>
-        <value xml:lang="zh_CN">细节</value>
-        <value xml:lang="zh_TW">詳細</value>
-    </property>
-    <property key="IconsTooltips_Disabled"><!-- copy from CommonDisabled but changed in french -->
-        <value xml:lang="ar">غير شغال</value>
-        <value xml:lang="de">Deaktiviert</value>
-        <value xml:lang="en">Disabled</value>
-        <value xml:lang="es">Deshabilitado</value>
-        <value xml:lang="fr">Désactiver</value>
-        <value xml:lang="hi_IN">निष्क्रिय</value>
-        <value xml:lang="it">Disabilitato</value>
-        <value xml:lang="nl">Onbeschikbaar</value>
-        <value xml:lang="pt">Desactivado</value>
-        <value xml:lang="pt_BR">Desabilitado</value>
-        <value xml:lang="ro">Dizabilitat</value>
-        <value xml:lang="ru">Недоступно</value>
-        <value xml:lang="th">ไม่สามารถใช้ได้</value>
-        <value xml:lang="zh">无效</value>
-        <value xml:lang="zh_CN">禁用</value>
-        <value xml:lang="zh_TW">無效</value>
-    </property>
-    <property key="IconsTooltips_Done"><!-- copy from CommonDone -->
-        <value xml:lang="de">Erledigt</value>
-        <value xml:lang="en">Done</value>
-        <value xml:lang="es">Terminar</value>
-        <value xml:lang="fr">Terminer</value>
-        <value xml:lang="hi_IN">हो गया</value>
-        <value xml:lang="it">Fatto</value>
-        <value xml:lang="nl">Klaar</value>
-        <value xml:lang="pt">Feito</value>
-        <value xml:lang="pt_BR">Terminar</value>
-        <value xml:lang="ro">Executa</value>
-        <value xml:lang="ru">Выполнить</value>
-        <value xml:lang="zh">完成</value>
-        <value xml:lang="zh_CN">完成</value>
-        <value xml:lang="zh_TW">完成</value>
-    </property>
-    <property key="IconsTooltips_Docfusion">
-        <value xml:lang="en">Merge data and template to create a document</value>
-        <value xml:lang="fr">Compléter un modèle avec des données pour obtenir un document</value>
-    </property>
-    <property key="IconsTooltips_Duplicate"><!-- currently copy from CommonDelete but will change to more detail -->
-        <value xml:lang="ar">مضاعفة</value>
-        <value xml:lang="de">Verdoppeln</value>
-        <value xml:lang="en">Duplicate</value>
-        <value xml:lang="es">Duplicar</value>
-        <value xml:lang="fr">Dupliquer</value>
-        <value xml:lang="hi_IN">दोहरा</value>
-        <value xml:lang="it">Duplica</value>
-        <value xml:lang="nl">Dubbel</value>
-        <value xml:lang="pt">Duplicar</value>
-        <value xml:lang="ro">Dubleaza</value>
-        <value xml:lang="ru">Дублировать</value>
-        <value xml:lang="th">จำลอง</value>
-        <value xml:lang="zh">重复</value>
-        <value xml:lang="zh_CN">副本</value>
-        <value xml:lang="zh_TW">重複</value>
-    </property>
-    <property key="IconsTooltips_Download"><!-- copy from ContentDownload but changed in french -->
-        <value xml:lang="da">Download</value>
-        <value xml:lang="en">Download</value>
-        <value xml:lang="fr">Télécharger le document en local</value>
-        <value xml:lang="it">Scarica</value>
-        <value xml:lang="nl">Download</value>
-    </property>
-    <property key="IconsTooltips_Edit"><!-- currently copy from CommonEdit but will change to more detail -->
-        <value xml:lang="ar">تحرير</value>
-        <value xml:lang="cs">Zpracovat</value>
-        <value xml:lang="de">Bearbeiten</value>
-        <value xml:lang="en">Edit</value>
-        <value xml:lang="es">Editar</value>
-        <value xml:lang="fr">Modifier</value>
-        <value xml:lang="hi_IN">संपादित करें</value>
-        <value xml:lang="it">Aggiorna</value>
-        <value xml:lang="nl">Wijzigen</value>
-        <value xml:lang="pt">Editar</value>
-        <value xml:lang="ro">Actualizare</value>
-        <value xml:lang="ru">Редактировать</value>
-        <value xml:lang="th">แก้ไข</value>
-        <value xml:lang="zh">编辑</value>
-        <value xml:lang="zh_CN">编辑</value>
-        <value xml:lang="zh_TW">編輯</value>
-    </property>
-    <property key="IconsTooltips_Email"><!-- currently copy from CommonEmail but will change to more detail -->
-        <value xml:lang="ar">البريد الإلكتروني</value>
-        <value xml:lang="de">E-Mail</value>
-        <value xml:lang="en">Email</value>
-        <value xml:lang="es">Correo electrónico</value>
-        <value xml:lang="fr">Courriel</value>
-        <value xml:lang="hi_IN">ईमेल</value>
-        <value xml:lang="it">Email</value>
-        <value xml:lang="pt">Email</value>
-        <value xml:lang="pt_BR">E-mail</value>
-        <value xml:lang="ro">Email</value>
-        <value xml:lang="ru">Эл. почта</value>
-        <value xml:lang="th">อีเมล</value>
-        <value xml:lang="zh">电子邮件</value>
-        <value xml:lang="zh_TW">電子郵件</value>
-    </property>
-    <property key="IconsTooltips_EmailAttach">
-        <value xml:lang="en">Attach Email</value>
-        <value xml:lang="fr">Associer un courriel</value>
-    </property>
-    <property key="IconsTooltips_EmailEdit">
-        <value xml:lang="en">Email Edit</value>
-        <value xml:lang="fr">Editer un courriel</value>
-    </property>
-    <property key="IconsTooltips_EmailGo">
-        <value xml:lang="en">Email send</value>
-        <value xml:lang="fr">Envoyer un courriel</value>
-    </property>
-    <property key="IconsTooltips_EmailOpen">
-        <value xml:lang="en">Email Open</value>
-        <value xml:lang="fr">Courriel lu</value>
-    </property>
-    <property key="IconsTooltips_EventCom">
-        <value xml:lang="en">Communication events</value>
-        <value xml:lang="fr">Evènements de communication</value>
-    </property>
-    <property key="IconsTooltips_Expire"><!-- Copy from CommonExpire but changed in french -->
-        <value xml:lang="ar">نهاية الصلاحية</value>
-        <value xml:lang="cs">Vypršet</value>
-        <value xml:lang="de">Ablaufen</value>
-        <value xml:lang="en">Expire</value>
-        <value xml:lang="es">Expiración</value>
-        <value xml:lang="fr">Mettre à jour la date de fin de validité avec [maintenant]</value>
-        <value xml:lang="hi_IN">निश्वासन</value>
-        <value xml:lang="it">Scade</value>
-        <value xml:lang="nl">Maak verlopen</value>
-        <value xml:lang="pt">Expirar</value>
-        <value xml:lang="pt_PT">Terminar</value>
-        <value xml:lang="ro">Expira</value>
-        <value xml:lang="ru">Прекратить</value>
-        <value xml:lang="th">หมดเขต</value>
-        <value xml:lang="zh">过期</value>
-        <value xml:lang="zh_CN">过期</value>
-        <value xml:lang="zh_TW">過期</value>
-    </property>
-    <property key="IconsTooltips_Filter"><!-- Copy from CommonFilter but changed for french -->
-        <value xml:lang="ar">مصفاة</value>
-        <value xml:lang="de">Filter</value>
-        <value xml:lang="en">Filter</value>
-        <value xml:lang="es">Filtro</value>
-        <value xml:lang="fr">Rechercher, filtrer</value>
-        <value xml:lang="hi_IN">फ़िल्टर</value>
-        <value xml:lang="it">Filtra</value>
-        <value xml:lang="pt">Filtrar</value>
-        <value xml:lang="pt_BR">Filtro</value>
-        <value xml:lang="ro">Filtreaza</value>
-        <value xml:lang="ru">Фильтр</value>
-        <value xml:lang="th">Filter</value>
-        <value xml:lang="zh">过滤器</value>
-        <value xml:lang="zh_TW">過濾器</value>
-    </property>
-    <property key="IconsTooltips_Gantt"><!-- currently copy from ProjectMgrGanttChart but will change to more detail -->
-        <value xml:lang="de">Gantt Chart</value>
-        <value xml:lang="en">Gantt Chart</value>
-        <value xml:lang="fr">Diagramme de Gantt</value>
-        <value xml:lang="it">Grafico gantt</value>
-        <value xml:lang="nl">GANT chart</value>
-        <value xml:lang="th">แผนผังคุมการกำหนดงาน</value>
-        <value xml:lang="zh">甘特图</value>
-    </property>
-    <property key="IconsTooltips_Grants"><!-- copy from PartySecurityGroup but changed for french -->
-        <value xml:lang="de">Sicherheitsgruppe</value>
-        <value xml:lang="en">Security Group</value>
-        <value xml:lang="es">Grupo de Seguridad</value>
-        <value xml:lang="fr">Gestion des autorisations d'accés</value>
-        <value xml:lang="hi_IN">सुरक्षा समूह</value>
-        <value xml:lang="it">Gruppo Sicurezza</value>
-        <value xml:lang="nl">Beveiligingsgroep</value>
-        <value xml:lang="pt_BR">Grupo de segurança</value>
-        <value xml:lang="ro">Grup De Siguranta</value>
-        <value xml:lang="ru">Группа безопасности</value>
-        <value xml:lang="th">กลุ่มความปลอดภัย</value>
-        <value xml:lang="zh">安全组</value>
-        <value xml:lang="zh_TW">安全群組</value>
-    </property>
-    <property key="IconsTooltips_GeoLoc"><!-- currently copy from CommonGeoLocation but will change to more detail -->
-        <value xml:lang="en">Geo Location</value>
-        <value xml:lang="fr">Géolocalisation</value>
-        <value xml:lang="hi_IN">भू स्थान</value>
-        <value xml:lang="it">Localizzazione geografica</value>
-        <value xml:lang="pt_BR">Localização geográfica</value>
-        <value xml:lang="zh">地理位置</value>
-        <value xml:lang="zh_TW">地理位置</value>
-    </property>
-    <property key="IconsTooltips_Group"><!-- currently copy from CommonGroup -->
-        <value xml:lang="ar">مجموعة</value>
-        <value xml:lang="de">Gruppe</value>
-        <value xml:lang="en">Group</value>
-        <value xml:lang="es">Grupo</value>
-        <value xml:lang="fr">Groupe</value>
-        <value xml:lang="hi_IN">समूह</value>
-        <value xml:lang="it">Gruppo</value>
-        <value xml:lang="nl">Groep</value>
-        <value xml:lang="pt">Grupo</value>
-        <value xml:lang="ro">Grup</value>
-        <value xml:lang="ru">Группа</value>
-        <value xml:lang="th">กลุ่ม</value>
-        <value xml:lang="zh">组</value>
-        <value xml:lang="zh_CN">组</value>
-        <value xml:lang="zh_TW">組</value>
-    </property>
-    <property key="IconsTooltips_Hierarchy"><!-- copy from ProductRollup but changed for french and english -->
-        <value xml:lang="de">Kategoriezuordnung</value>
-        <value xml:lang="en">Rollup</value>
-        <value xml:lang="es">Jerarquía</value>
-        <value xml:lang="fr">Hiérarchie</value>
-        <value xml:lang="it">Gerarchia</value>
-        <value xml:lang="nl">Hiërarchie</value>
-        <value xml:lang="ro">Sosire</value>
-        <value xml:lang="ru">Иерархия</value>
-        <value xml:lang="th">Rollup</value>
-        <value xml:lang="zh">汇总</value>
-        <value xml:lang="zh_TW">匯總</value>
-    </property>
-    <property key="IconsTooltips_HideHistory"><!-- copy from PartyHideOld--> 
-        <value xml:lang="cs">Skrýt původní</value>
-        <value xml:lang="de">Altes ausblenden</value>
-        <value xml:lang="en">Hide Old</value>
-        <value xml:lang="es">Guardar historial</value>
-        <value xml:lang="fr">Masquer l'historique</value>
-        <value xml:lang="hi_IN">पुराना हटाइये</value>
-        <value xml:lang="it">Nascondi storia</value>
-        <value xml:lang="ja">Hide Old</value>
-        <value xml:lang="nl">Verberg oude versie</value>
-        <value xml:lang="pt_BR">Salvar histórico</value>
-        <value xml:lang="pt_PT">Ocultar Idade</value>
-        <value xml:lang="ro">Ascunde pe cel Vechi</value>
-        <value xml:lang="ru">Hide Old</value>
-        <value xml:lang="th">อายุ</value>
-        <value xml:lang="zh">隐藏过去的</value>
-        <value xml:lang="zh_TW">隱藏過去的</value>
-    </property>
-    <property key="IconsTooltips_History"><!-- copy from PartyShowOld but changed for french and english -->
-        <value xml:lang="cs">Ukázat původní</value>
-        <value xml:lang="de">Altes zeigen</value>
-        <value xml:lang="en">Show Old</value>
-        <value xml:lang="es">Mostrar historial</value>
-        <value xml:lang="fr">Affiche l'historique</value>
-        <value xml:lang="hi_IN">पुराना दिखाइये</value>
-        <value xml:lang="it">Storia</value>
-        <value xml:lang="ja">Show history</value>
-        <value xml:lang="nl">Laat de oude versie zien</value>
-        <value xml:lang="pt_BR">Mostrar antigos</value>
-        <value xml:lang="pt_PT">Mostrar Idade</value>
-        <value xml:lang="ro">Afiseaza Vechea</value>
-        <value xml:lang="ru">Показать старые</value>
-        <value xml:lang="th">แสดงอันเดิม</value>
-        <value xml:lang="zh">显示旧信息</value>
-        <value xml:lang="zh_TW">顯示舊資訊</value>
-    </property>
-    <property key="IconsTooltips_Items"><!-- currently copy from CommonItems but will change to more detail -->
-        <value xml:lang="ar">أسطر</value>
-        <value xml:lang="de">Artikel</value>
-        <value xml:lang="en">Items</value>
-        <value xml:lang="es">Ítems</value>
-        <value xml:lang="fr">Lignes</value>
-        <value xml:lang="hi_IN">मदे</value>
-        <value xml:lang="it">Righe</value>
-        <value xml:lang="nl">Items</value>
-        <value xml:lang="pt">Items</value>
-        <value xml:lang="pt_BR">Itens</value>
-        <value xml:lang="ro">Linii</value>
-        <value xml:lang="ru">Пункты</value>
-        <value xml:lang="th">ไอเทม</value>
-        <value xml:lang="zh">明细</value>
-        <value xml:lang="zh_CN">东西</value>
-        <value xml:lang="zh_TW">明細</value>
-    </property>
-    <property key="IconsTooltips_Note"><!-- currently copy from CommonNotes but will change to more detail -->
-        <value xml:lang="ar">مذكرات</value>
-        <value xml:lang="de">Anmerkungen</value>
-        <value xml:lang="en">Notes</value>
-        <value xml:lang="es">Notas</value>
-        <value xml:lang="fr">Notes</value>
-        <value xml:lang="hi_IN">नोट्स</value>
-        <value xml:lang="it">Note</value>
-        <value xml:lang="nl">Nota's</value>
-        <value xml:lang="pt">Notas</value>
-        <value xml:lang="ro">Note</value>
-        <value xml:lang="ru">Заметки</value>
-        <value xml:lang="th">Note : หมายเหตุ</value>
-        <value xml:lang="zh">便笺</value>
-        <value xml:lang="zh_CN">注释</value>
-        <value xml:lang="zh_TW">便箋</value>
-    </property>
-    <property key="IconsTooltips_Order"><!-- copy from OrderOrder but changed for french -->
-        <value xml:lang="cs">Objednávka</value>
-        <value xml:lang="de">Bestellung</value>
-        <value xml:lang="en">Order</value>
-        <value xml:lang="es">Pedido</value>
-        <value xml:lang="fr">Commande</value>
-        <value xml:lang="hi_IN">आर्डर</value>
-        <value xml:lang="it">Ordine</value>
-        <value xml:lang="ja">Order</value>
-        <value xml:lang="nl">Bestelling</value>
-        <value xml:lang="pt_BR">Pedido</value>
-        <value xml:lang="pt_PT">Encomenda</value>
-        <value xml:lang="ro">Comanda</value>
-        <value xml:lang="ru">Заказ</value>
-        <value xml:lang="th">การสั่งซื้อสินค้า</value>
-        <value xml:lang="zh">订单</value>
-        <value xml:lang="zh_CN">订单</value>
-        <value xml:lang="zh_TW">訂單</value>
-    </property>
-    <property key="IconsTooltips_Overview"><!-- copy from CommonOverview but changed for french -->
-        <value xml:lang="de">Überblick</value>
-        <value xml:lang="en">Overview</value>
-        <value xml:lang="es">Sumario</value>
-        <value xml:lang="fr">Aller à la page récapitulative (vue de l'ensemble des portlets)</value>
-        <value xml:lang="hi_IN">समीक्षा</value>
-        <value xml:lang="it">Sommario</value>
-        <value xml:lang="pt_BR">Resumo</value>
-        <value xml:lang="zh">概览</value>
-        <value xml:lang="zh_TW">概覽</value>
-    </property>
-    <property key="IconsTooltips_Party"><!-- copy from PartyParties but changed for french -->
-        <value xml:lang="de">Akteure</value>
-        <value xml:lang="en">Parties</value>
-        <value xml:lang="es">Participante</value>
-        <value xml:lang="fr">Liste des acteurs associés</value>
-        <value xml:lang="hi_IN">पार्टियाँ</value>
-        <value xml:lang="it">Soggetti</value>
-        <value xml:lang="nl">Relaties</value>
-        <value xml:lang="pt_BR">Participantes</value>
-        <value xml:lang="pt_PT">Secções</value>
-        <value xml:lang="ro">Subiecti </value>
-        <value xml:lang="ru">Участники</value>
-        <value xml:lang="th">กลุ่มผู้ใช้</value>
-        <value xml:lang="zh">会员</value>
-        <value xml:lang="zh_TW">成員</value>
-    </property>
-    <property key="IconsTooltips_Pause">
-        <value xml:lang="de">Pause</value>
-        <value xml:lang="en">Pause</value>
-        <value xml:lang="fr">Pause</value>
-        <value xml:lang="it">Pausa</value>
-        <value xml:lang="pt">Pausar</value>
-        <value xml:lang="ro">Pausa</value>
-        <value xml:lang="th">หยุด</value>
-        <value xml:lang="zh">文件间暂停</value>
-        <value xml:lang="zh_TW">文件間暫停</value>
-    </property>
-    <property key="IconsTooltips_Payment"><!-- currently copy from AccountingPayment but will change to more detail -->
-        <value xml:lang="ar">تسديد</value>
-        <value xml:lang="de">Bezahlung</value>
-        <value xml:lang="en">Payment</value>
-        <value xml:lang="es">Pago</value>
-        <value xml:lang="fr">Paiement</value>
-        <value xml:lang="hi_IN">भुगतान</value>
-        <value xml:lang="it">Pagamento</value>
-        <value xml:lang="nl">Betaling</value>
-        <value xml:lang="pt_BR">Pagamento</value>
-        <value xml:lang="pt_PT">Pagamento</value>
-        <value xml:lang="ro">Plata</value>
-        <value xml:lang="ru">платеж</value>
-        <value xml:lang="th">การชำระเงิน</value>
-        <value xml:lang="zh">支付</value>
-        <value xml:lang="zh_TW">支付</value>
-    </property>
-    <property key="IconsTooltips_PDF"><!-- come from ContentPDF -->
-        <value xml:lang="ar">PDF تعريف محتوى</value>
-        <value xml:lang="da">PDF indholds</value>
-        <value xml:lang="de">PDF Inhalt</value>
-        <value xml:lang="en">(generate and) Show PDF document</value>
-        <value xml:lang="fr">(génère et) Affiche le Document au format Pdf</value>
-        <value xml:lang="it">Contenuto PDF</value>
-        <value xml:lang="ro">Continut PDF</value>
-        <value xml:lang="th">หัวข้อ PDF</value>
-        <value xml:lang="zh">PDF内容标识</value>
-        <value xml:lang="zh_TW">PDF內容</value>
-    </property>
-    <property key="IconsTooltips_Phone"><!-- currently copy from PartyPhoneNumber but will change to more detail -->
-        <value xml:lang="cs">Telefonní číslo</value>
-        <value xml:lang="de">Telefonnummer</value>
-        <value xml:lang="en">Phone Number</value>
-        <value xml:lang="es">Número de Teléfono</value>
-        <value xml:lang="fr">N° de téléphone</value>
-        <value xml:lang="hi_IN">फोन नम्बर</value>
-        <value xml:lang="it">Numero di telefono</value>
-        <value xml:lang="ja">Phone Number</value>
-        <value xml:lang="nl">Telefoonnummer</value>
-        <value xml:lang="pt_BR">Número de telefone</value>
-        <value xml:lang="pt_PT">Número de Telefone</value>
-        <value xml:lang="ro">Numar Telefon</value>
-        <value xml:lang="ru">Телефонный номер</value>
-        <value xml:lang="th">เบอร์โทรศัพท์</value>
-        <value xml:lang="zh">电话号码</value>
-        <value xml:lang="zh_TW">電話號碼</value>
-    </property>
-    <property key="IconsTooltips_Phase">
-        <value xml:lang="en">Phase(s)</value>
-        <value xml:lang="fr">Phase(s)</value>
-    </property>
-    <property key="IconsTooltips_Plan">
-        <value xml:lang="en">Planning</value>
-        <value xml:lang="fr">Planification</value>
-    </property>
-    <property key="IconsTooltips_Print"><!-- copy from CommonPrint  -->
-        <value xml:lang="ar">نسخ</value>
-        <value xml:lang="de">Drucken</value>
-        <value xml:lang="en">Print</value>
-        <value xml:lang="es">Imprimir</value>
-        <value xml:lang="fr">Imprimer</value>
-        <value xml:lang="hi_IN">प्रिंट</value>
-        <value xml:lang="it">Stampa</value>
-        <value xml:lang="pt">Imprimir</value>
-        <value xml:lang="ro">Tipareste</value>
-        <value xml:lang="ru">Печать</value>
-        <value xml:lang="th">พิมพ์</value>
-        <value xml:lang="zh">打印</value>
-        <value xml:lang="zh_TW">列印</value>
-    </property>
-    <property key="IconsTooltips_Product"><!-- copy from ProductProduct but but changed for french  -->
-        <value xml:lang="de">Produkt</value>
-        <value xml:lang="en">Product</value>
-        <value xml:lang="es">Producto</value>
-        <value xml:lang="fr">Liste des articles associés</value>
-        <value xml:lang="it">Prodotto</value>
-        <value xml:lang="ro">Produs</value>
-        <value xml:lang="ru">Наименование</value>
-        <value xml:lang="th">สินค้า</value>
-        <value xml:lang="zh">产品</value>
-        <value xml:lang="zh_TW">產品</value>
-    </property>
-    <property key="IconsTooltips_Project"><!-- currently copy from ProjectMgrProjects but will change to more detail -->
-        <value xml:lang="de">Projekte</value>
-        <value xml:lang="en">Project</value>
-        <value xml:lang="fr">Projet</value>
-        <value xml:lang="it">Progetti</value>
-        <value xml:lang="nl">Projecten</value>
-        <value xml:lang="zh">项目</value>
-    </property>
-    <property key="IconsTooltips_Quote"><!-- copy from OrderOrderQuote but but changed for french  -->
-        <value xml:lang="de">Offerte</value>
-        <value xml:lang="de_DE">Angebot</value>
-        <value xml:lang="en">Quote</value>
-        <value xml:lang="es">Presupuesto</value>
-        <value xml:lang="fr">Devis</value>
-        <value xml:lang="it">Preventivo</value>
-        <value xml:lang="nl">Offerte</value>
-        <value xml:lang="pt_BR">Cotação</value>
-        <value xml:lang="ro">Oferte</value>
-        <value xml:lang="ru">Предложение</value>
-        <value xml:lang="th">คำร้อง</value>
-        <value xml:lang="zh">询价</value>
-        <value xml:lang="zh_CN">报价</value>
-        <value xml:lang="zh_TW">報價</value>
-    </property>
-    <property key="IconsTooltips_Refresh"><!-- copy from CommonRefresh -->
-        <value xml:lang="ar">تحديث</value>
-        <value xml:lang="de">Aktualisieren</value>
-        <value xml:lang="en">Refresh</value>
-        <value xml:lang="es">Refrescar</value>
-        <value xml:lang="fr">Rafraichir</value>
-        <value xml:lang="hi_IN">पुनश्चर्या(Refresh)</value>
-        <value xml:lang="it">Rinfresca</value>
-        <value xml:lang="nl">Ververs</value>
-        <value xml:lang="pt">Actualizar</value>
-        <value xml:lang="pt_BR">Atualizar</value>
-        <value xml:lang="ro">Reimprospateaza</value>
-        <value xml:lang="ru">Обновить</value>
-        <value xml:lang="th">รีเฟรช</value>
-        <value xml:lang="zh">刷新</value>
-        <value xml:lang="zh_CN">刷新</value>
-        <value xml:lang="zh_TW">更新</value>
-    </property>
-    <property key="IconsTooltips_Resource">
-        <value xml:lang="en">Material Resource</value>
-        <value xml:lang="fr">Ressource matériel</value>
-    </property>
-    <property key="IconsTooltips_Revision">
-        <value xml:lang="en">Revisions</value>
-        <value xml:lang="fr">Révisions</value>
-    </property>
-    <property key="IconsTooltips_Role">
-        <value xml:lang="en">Role</value>
-        <value xml:lang="fr">Rôle</value>
-    </property>
-    <property key="IconsTooltips_Run"><!-- copy from CommonRun but changed for french -->
-        <value xml:lang="ar">بدء</value>
-        <value xml:lang="de">Starten</value>
-        <value xml:lang="en">Run</value>
-        <value xml:lang="es">Iniciar</value>
-        <value xml:lang="fr">Démarrer la tâche (l'opération)</value>
-        <value xml:lang="hi_IN">चलाये</value>
-        <value xml:lang="it">Esegui</value>
-        <value xml:lang="nl">Run</value>
-        <value xml:lang="pt">Executar</value>
-        <value xml:lang="ro">Executa</value>
-        <value xml:lang="ru">Выполнить</value>
-        <value xml:lang="th">ดำเนินการ</value>
-        <value xml:lang="zh">运行</value>
-        <value xml:lang="zh_CN">运行</value>
-        <value xml:lang="zh_TW">運行</value>
-    </property>
-    <property key="IconsTooltips_Save"><!-- Copy from CommonSave -->
-        <value xml:lang="ar">حفظ</value>
-        <value xml:lang="cs">Uložit</value>
-        <value xml:lang="de">Speichern</value>
-        <value xml:lang="en">Save</value>
-        <value xml:lang="es">Guardar</value>
-        <value xml:lang="fr">Enregistrer</value>
-        <value xml:lang="hi_IN">सुरक्षित करे</value>
-        <value xml:lang="it">Salva</value>
-        <value xml:lang="nl">Opslaan</value>
-        <value xml:lang="pt">Guardar</value>
-        <value xml:lang="pt_BR">Salvar</value>
-        <value xml:lang="ro">Salveaza</value>
-        <value xml:lang="ru">Сохранить</value>
-        <value xml:lang="th">บันทึก</value>
-        <value xml:lang="zh">保存</value>
-        <value xml:lang="zh_CN">保存</value>
-        <value xml:lang="zh_TW">儲存</value>
-    </property>
-    <property key="IconsTooltips_Select"><!-- copy from CommonSelect but changed for french -->
-        <value xml:lang="ar">إختر</value>
-        <value xml:lang="de">Auswählen</value>
-        <value xml:lang="en">Select</value>
-        <value xml:lang="es">Seleccionar</value>
-        <value xml:lang="fr">Afficher (et modifier) les critères de sélection de la liste</value>
-        <value xml:lang="hi_IN">चुनें</value>
-        <value xml:lang="it">Seleziona</value>
-        <value xml:lang="nl">Selecteer</value>
-        <value xml:lang="pt">Seleccionar</value>
-        <value xml:lang="pt_BR">Selecionar</value>
-        <value xml:lang="ro">Selectioneaza</value>
-        <value xml:lang="ru">Выбрать</value>
-        <value xml:lang="th">เลือก</value>
-        <value xml:lang="zh">选择</value>
-        <value xml:lang="zh_CN">选择</value>
-        <value xml:lang="zh_TW">選擇</value>
-    </property>
-    <property key="IconsTooltips_Server"><!-- copy from CommonServer but changed for french -->
-        <value xml:lang="en">Server</value>
-        <value xml:lang="fr">Serveur</value>
-    </property>
-    <property key="IconsTooltips_Shipment">
-        <value xml:lang="en">Shipment</value>
-        <value xml:lang="fr">Expédition</value>
-    </property>
-    <property key="IconsTooltips_Skills">
-        <value xml:lang="en">Skills</value>
-        <value xml:lang="fr">Compétences</value>
-    </property>
-    <property key="IconsTooltips_Stop">
-        <value xml:lang="en">Stop the current task</value>
-        <value xml:lang="fr">Arrêter la tâche (ou l'opération) en cours</value>
-    </property>
-    <property key="IconsTooltips_Switch">
-        <value xml:lang="en">Switch the type</value>
-        <value xml:lang="fr">Changer le type</value>
-    </property>
-    <property key="IconsTooltips_Synchronize">
-        <value xml:lang="en">Synchronize</value>
-        <value xml:lang="fr">Synchroniser</value>
-    </property>
-    <property key="IconsTooltips_Task">
-        <value xml:lang="en">Task(s)</value>
-        <value xml:lang="fr">Tâche(s)</value>
-    </property>
-    <property key="IconsTooltips_Telephone"><!-- currently copy from PartyPhoneNumber but will change to more detail -->
-        <value xml:lang="cs">Telefonní číslo</value>
-        <value xml:lang="de">Telefonnummer</value>
-        <value xml:lang="en">Phone Number</value>
-        <value xml:lang="es">Número de Teléfono</value>
-        <value xml:lang="fr">N° de téléphone</value>
-        <value xml:lang="hi_IN">फोन नम्बर</value>
-        <value xml:lang="it">Numero di telefono</value>
-        <value xml:lang="ja">Phone Number</value>
-        <value xml:lang="nl">Telefoonnummer</value>
-        <value xml:lang="pt_BR">Número de telefone</value>
-        <value xml:lang="pt_PT">Número de Telefone</value>
-        <value xml:lang="ro">Numar Telefon</value>
-        <value xml:lang="ru">Телефонный номер</value>
-        <value xml:lang="th">เบอร์โทรศัพท์</value>
-        <value xml:lang="zh">电话号码</value>
-        <value xml:lang="zh_TW">電話號碼</value>
-    </property>
-    <property key="IconsTooltips_Template"><!-- currently copy from ContentTemplate but will change to more detail -->
-        <value xml:lang="ar">نموذج</value>
-        <value xml:lang="da">Skabelon</value>
-        <value xml:lang="de">Vorlage</value>
-        <value xml:lang="en">Template</value>
-        <value xml:lang="es">Plantilla</value>
-        <value xml:lang="fr">Modèle</value>
-        <value xml:lang="it">Template</value>
-        <value xml:lang="ro">Template</value>
-        <value xml:lang="th">รูปแบบ</value>
-        <value xml:lang="zh">模板</value>
-        <value xml:lang="zh_TW">範本</value>
-    </property>
-    <property key="IconsTooltips_TimeEntry">
-        <value xml:lang="en">Time Entry</value>
-        <value xml:lang="fr">Saisie(s) de temps</value>
-    </property>
-    <property key="IconsTooltips_Tools">
-        <value xml:lang="en">Tools</value>
-        <value xml:lang="fr">Outils</value>
-    </property>
-    <property key="IconsTooltips_Upload"><!-- copy from CommonUpload but changed for french -->
-        <value xml:lang="ar">الشحن الفوقي</value>
-        <value xml:lang="de">Hinaufladen</value>
-        <value xml:lang="en">Upload</value>
-        <value xml:lang="es">Cargar</value>
-        <value xml:lang="fr">Ajouter un document (télécharger celui-ci sur le serveur)</value>
-        <value xml:lang="hi_IN">अपलोड करें</value>
-        <value xml:lang="it">Carica</value>
-        <value xml:lang="nl">Upload</value>
-        <value xml:lang="pt">Upload</value>
-        <value xml:lang="pt_BR">Enviar</value>
-        <value xml:lang="ro">Incarca</value>
-        <value xml:lang="ru">Загрузить</value>
-        <value xml:lang="th">อัพโหลด</value>
-        <value xml:lang="zh">上传</value>
-        <value xml:lang="zh_CN">上传</value>
-        <value xml:lang="zh_TW">上傳</value>
-    </property>
-    <property key="IconsTooltips_UserAvAvai">
-        <value xml:lang="en">User Available</value>
-        <value xml:lang="fr">Utilisateur disponible</value>
-    </property>
-    <property key="IconsTooltips_UserAvAway">
-        <value xml:lang="en">User Away</value>
-        <value xml:lang="fr">Utilisateur absent</value>
-    </property>
-    <property key="IconsTooltips_UserAvBusy">
-        <value xml:lang="en">User Busy</value>
-        <value xml:lang="fr">Utilisateur occupé</value>
-    </property>
-    <property key="IconsTooltips_UserAvUnkn">
-        <value xml:lang="en">User Unknown</value>
-        <value xml:lang="fr">Utilisateur déconnecté</value>
-    </property>
-    <property key="IconsTooltips_UserLogin"><!-- copy from PartyUserLogin but changed for french -->
-        <value xml:lang="de">Benutzeranmeldung</value>
-        <value xml:lang="en">User Login</value>
-        <value xml:lang="es">Usuario</value>
-        <value xml:lang="fr">Identifiant de connexion associé</value>
-        <value xml:lang="hi_IN">प्रयोक्ता लॉगिन</value>
-        <value xml:lang="it">Utente Login</value>
-        <value xml:lang="nl">Gebruikersnaam</value>
-        <value xml:lang="pt_BR">Nome de usuário</value>
-        <value xml:lang="pt_PT">Início de Secção </value>
-        <value xml:lang="ro">Utilizator Login</value>
-        <value xml:lang="ru">Имя пользователя</value>
-        <value xml:lang="th">ผู้เข้าใช้ระบบ</value>
-        <value xml:lang="zh">用户登录</value>
-        <value xml:lang="zh_TW">用戶登錄</value>
-    </property>
-    <property key="IconsTooltips_Validate"><!-- copy from CommonValidate but changed for french -->
-        <value xml:lang="ar">الموافقة</value>
-        <value xml:lang="de">Überprüfen</value>
-        <value xml:lang="en">Validate</value>
-        <value xml:lang="es">Validar</value>
-        <value xml:lang="fr">Valider l'objet (passage au statut validé ou terminé ou fini)</value>
-        <value xml:lang="hi_IN">मान्य</value>
-        <value xml:lang="it">Validare</value>
-        <value xml:lang="nl">Testen</value>
-        <value xml:lang="pt">Validade</value>
-        <value xml:lang="pt_BR">Validar</value>
-        <value xml:lang="ro">Validare</value>
-        <value xml:lang="ru">Проверить достоверность</value>
-        <value xml:lang="th">มีผลวันที่</value>
-        <value xml:lang="zh">验证</value>
-        <value xml:lang="zh_CN">验证</value>
-        <value xml:lang="zh_TW">驗証</value>
-    </property>
-    <property key="IconsTooltips_View"><!-- copy from CommonView but changed for french -->
-        <value xml:lang="ar">مشهد</value>
-        <value xml:lang="cs">Náhled</value>
-        <value xml:lang="de">Sichten</value>
-        <value xml:lang="en">View</value>
-        <value xml:lang="es">Ver</value>
-        <value xml:lang="fr">Visualiser</value>
-        <value xml:lang="hi_IN">देखे</value>
-        <value xml:lang="it">Mostra</value>
-        <value xml:lang="nl">Bekijk</value>
-        <value xml:lang="pt">Vêr</value>
-        <value xml:lang="pt_BR">Visualizar</value>
-        <value xml:lang="ro">Afiseaza</value>
-        <value xml:lang="ru">Просмотреть</value>
-        <value xml:lang="th">แสดง</value>
-        <value xml:lang="zh">浏览</value>
-        <value xml:lang="zh_CN">查看</value>
-        <value xml:lang="zh_TW">瀏覽</value>
-    </property>
-    <property key="IconsTooltips_Www"><!-- copy from CommonWebSite but will change to more detail -->
-        <value xml:lang="ar">موقع الويب</value>
-        <value xml:lang="de">Webseite</value>
-        <value xml:lang="en">Website</value>
-        <value xml:lang="es">Sitio web</value>
-        <value xml:lang="fr">Site web</value>
-        <value xml:lang="hi_IN">वेबसाइट</value>
-        <value xml:lang="it">Sito web</value>
-        <value xml:lang="nl">Website</value>
-        <value xml:lang="pt">Website</value>
-        <value xml:lang="ro">Sit Web</value>
-        <value xml:lang="ru">Web сайт</value>
-        <value xml:lang="th">เว็บไซต์</value>
-        <value xml:lang="zh">网站</value>
-        <value xml:lang="zh_TW">網站</value>
-    </property>
-    <!--#Eam# icons-purpose -->
 </resource>

Modified: ofbiz/branches/20120329_portletWidget/framework/common/config/SecurityUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/config/SecurityUiLabels.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/config/SecurityUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/config/SecurityUiLabels.xml Sat Aug  4 18:11:00 2012
@@ -66,7 +66,7 @@
         <value xml:lang="de">Benutzeranmeldung zur Sicherheitsgruppe hinzufügen</value>
         <value xml:lang="en">Add User Login to Security Group</value>
         <value xml:lang="es">Añadir usuario a grupo de seguridad</value>
-        <value xml:lang="fr">Ajouter un identifiant de connexion à un groupe de sécurité</value>
+        <value xml:lang="fr">Ajouter un identifiant de connexion à ce groupe de sécurité</value>
         <value xml:lang="hi_IN">सुरक्षा समूह में प्रयोक्तालॉगिन जोड़ें</value>
         <value xml:lang="it">Aggiungi utente al gruppo sicurezza</value>
         <value xml:lang="nl">Loginnaam gebruiker aan beveiligingsgroep toevoegen</value>

Modified: ofbiz/branches/20120329_portletWidget/framework/common/data/CommonPortletData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/data/CommonPortletData.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/data/CommonPortletData.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/data/CommonPortletData.xml Sat Aug  4 18:11:00 2012
@@ -30,13 +30,4 @@
     <PortalPortlet portalPortletId="GricScltAjaxWithMenu" portletName="Screenlet with one screen, and one menu called by ajax" screenName="GenericScreenletAjaxWithMenu" screenLocation="component://common/widget/PortalPageScreens.xml" editFormName="GenericScreenletAjaxWithMenuParam" editFormLocation="component://common/widget/PortletEditForms.xml" description="Simple portlet using screenlet with a menu, with one screen which was update by ajax process, so with a div. This portlet has 6 mandatory parameters." securityServiceName="" securityMainAction="VIEW"/>
     <PortletPortletCategory portalPortletId="GricScltAjaxWithMenu" portletCategoryId="GENERIC_PORTLET"/>
     <PortalPage portalPageId="_NA_" sequenceNum="000" portalPageName="For using genericPortletScreen" description="To be able to have parameters at the portlet level, not PortletPage level" ownerUserLoginId="_NA_"/>
-  <!--#Bam# portletWidget -->
-  <PortletType portletTypeId="Decorator" screenName="portletUiLabelDecorator" description="use screen and screen location in the portletDecorator" screenLocation="component://common/widget/PortletTypeScreens.xml"/>
-  <PortletType portletTypeId="Screenlet" screenName="Screenlet" description="depending of scriptName, menuName and screenName exist a screen with call (or not) scriptName in action and include a screenlet with include formName (or screenName) and include (or not) menuName" screenLocation="component://common/widget/PortletTypeScreens.xml"/>
-  <PortletType portletTypeId="ScreenletList" screenName="ScreenletList" description="include a list type form (do not use screenName) and an editing area, depending of scriptName and menuName exist a screen with call (or not) scriptName in action and include a screenlet with include formName and include (or not) menuName" screenLocation="component://common/widget/PortletTypeScreens.xml"/>
-  <PortletType portletTypeId="Empty" screenName="Empty" description="a empty screen, used to define a areaId" screenLocation="component://common/widget/PortletTypeScreens.xml"/>
-  <!--#Eam# portletWidget -->
-  <!--#Bam# portletExample can be use for all portal page build like exampleMgmt-->
-  <PortalPortlet portalPortletId="CommonDetail" portletName="Common detail portlet place" description="Use this portlet to say where detail portlet call from a menu will be show" portletTypeId="Empty" component="common" subComponent="Common" securityServiceName="" securityMainAction="VIEW"/>
-  <!--#Eam# portletExample -->
 </entity-engine-xml>

Modified: ofbiz/branches/20120329_portletWidget/framework/common/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/entitydef/entitymodel.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/entitydef/entitymodel.xml Sat Aug  4 18:11:00 2012
@@ -701,51 +701,18 @@ under the License.
     <!-- org.ofbiz.common.portal -->
     <!-- ============================ -->
 
-    <entity entity-name="PortalPortlet" package-name="org.ofbiz.common.portal" title="Defines a Portlet to be used in Portals" default-resource-name="CommonPortalEntityLabels">
-        <!--#Eam# PortletWidget : default-resource-name is used to contain description field, currentlty all FieldDescription are done.
-               If you want have information to each field go to portlet editPortlet and read hint about each field label -->
+    <entity entity-name="PortalPortlet" package-name="org.ofbiz.common.portal" title="Defines a Portlet to be used in Portals">
         <field name="portalPortletId" type="id-ne"></field>
-        <field name="portletLongId" type="id-long"></field>
         <field name="portletName" type="name"></field>
-        <field name="portletTypeId" type="id"></field>
-        <field name="component" type="id"></field>
-        <field name="subComponent" type="id"></field>
-        <field name="webapp" type="id"></field>
-        <field name="useScreen" type="indicator"></field>
         <field name="screenName" type="long-varchar"></field>
         <field name="screenLocation" type="long-varchar"></field>
-        <field name="useScript" type="indicator"></field>
-        <field name="scriptName" type="long-varchar"></field>
-        <field name="uiLabelLocation" type="long-varchar"></field>
-        <field name="formName" type="long-varchar"></field>
-        <field name="formLocation" type="long-varchar"></field>
-        <field name="pkIdName" type="short-varchar"></field>
-<!--        <field name="areaDivId" type="short-varchar"></field>  with id build with portalPageId portalPortletId portletSeqId, it seem, it's no more necessary because alway unique -->
-        <field name="editAreaDivId" type="short-varchar"></field>
-        <field name="subAreaDivId" type="short-varchar"></field>
-        <field name="titleLabel" type="short-varchar"></field>
-        <field name="useMenu" type="indicator"></field>
-        <field name="menuName" type="short-varchar"></field>
-        <field name="menuLocation" type="long-varchar"></field>
-        <field name="helpName" type="short-varchar"></field>
         <field name="editFormName" type="long-varchar"></field>
         <field name="editFormLocation" type="long-varchar"></field>
         <field name="description" type="description"></field>
         <field name="screenshot" type="url"></field>
         <field name="securityServiceName" type="long-varchar"><description>The service named here is used to see if current user can see the portlet on the list of available portlets; the screen that the portlet calls should also call this service to check permission and not render; the service named here must implement the "permissionInterface" service just like services used for service permissions</description></field>
-        <field name="securityPermission" type="short-varchar"></field>
         <field name="securityMainAction" type="short-varchar"><description>The main action which can be done with this portlet, possible values: CREATE UPDATE VIEW DELETE</description></field>
         <prim-key field="portalPortletId"/>
-        <relation rel-entity-name="PortletType" type="one" fk-name="PPORTLET_TYPE">
-          <key-map field-name="portletTypeId"/>
-        </relation>
-    </entity>
-    <entity entity-name="PortletType" package-name="org.ofbiz.common.portal" title="Portlet Type Entity">
-      <field name="portletTypeId" type="id-ne"/>
-      <field name="description" type="description"/>
-      <field name="screenName" type="long-varchar"></field>
-      <field name="screenLocation" type="long-varchar"></field>
-      <prim-key field="portletTypeId"/>
     </entity>
     <entity entity-name="PortletCategory" package-name="org.ofbiz.common.portal" title="Portlet Category Entity">
       <field name="portletCategoryId" type="id-ne"/>
@@ -809,7 +776,6 @@ under the License.
         <field name="columnSeqId" type="id-ne"></field>
         <field name="columnWidthPixels" type="numeric"></field>
         <field name="columnWidthPercentage" type="numeric"></field>
-        <field name="newLine" type="indicator"/>
         <prim-key field="portalPageId"/>
         <prim-key field="columnSeqId"/>
         <relation type="one" fk-name="PRTL_PGCOL_PAGE" rel-entity-name="PortalPage">
@@ -845,8 +811,7 @@ under the License.
             <key-map field-name="portalPortletId"/>
         </view-link>
     </view-entity>
-    <entity entity-name="PortletAttribute" package-name="org.ofbiz.common.portal" title="Allows to set different attribute values for each instance of the same portlet"
-                                           default-resource-name="CommonPortalEntityLabels">
+    <entity entity-name="PortletAttribute" package-name="org.ofbiz.common.portal" title="Allows to set different attribute values for each instance of the same portlet">
         <field name="portalPageId" type="id-ne"></field>
         <field name="portalPortletId" type="id-ne"></field>
         <field name="portletSeqId" type="id-ne"></field>

Modified: ofbiz/branches/20120329_portletWidget/framework/common/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/servicedef/services.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/servicedef/services.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/servicedef/services.xml Sat Aug  4 18:11:00 2012
@@ -787,4 +787,20 @@ under the License.
         <attribute name="encoding" mode="IN" type="String" optional="true" default-value="UTF-8"></attribute>
     </service>
 
+    <!-- Metrics services -->
+    <service name="getAllMetrics" auth="true" use-transaction="false"
+            engine="java" location="org.ofbiz.common.CommonServices" invoke="getAllMetrics">
+        <description>
+            Get all metrics. Returns a List of Maps - one Map per metric. Each Map includes the following keys:
+            name, serviceRate, threshold, totalEvents. See org.ofbiz.base.metrics.Metrics.
+        </description>
+        <attribute name="metricsList" mode="OUT" type="java.util.List" optional="false" />
+    </service>
+
+    <service name="resetMetric" auth="true" use-transaction="false"
+         engine="java" location="org.ofbiz.common.CommonServices" invoke="resetMetric">
+        <description>Resets a metric. See org.ofbiz.base.metrics.Metrics.</description>
+        <attribute name="name" mode="IN" type="String" optional="false"/>
+    </service>
+
 </services>

Modified: ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/CommonServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/CommonServices.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/CommonServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/CommonServices.java Sat Aug  4 18:11:00 2012
@@ -18,11 +18,14 @@
  *******************************************************************************/
 package org.ofbiz.common;
 
+import static org.ofbiz.base.util.UtilGenerics.checkList;
+import static org.ofbiz.base.util.UtilGenerics.checkMap;
+
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.RandomAccessFile;
@@ -43,14 +46,14 @@ import javolution.util.FastMap;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
+import org.ofbiz.base.metrics.Metrics;
+import org.ofbiz.base.metrics.MetricsFactory;
 import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.StringUtil;
 import org.ofbiz.base.util.UtilDateTime;
-import org.ofbiz.base.util.UtilValidate;
-
-import static org.ofbiz.base.util.UtilGenerics.checkList;
-import static org.ofbiz.base.util.UtilGenerics.checkMap;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
+import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.GenericValue;
@@ -63,6 +66,7 @@ import org.ofbiz.service.ModelService;
 import org.ofbiz.service.ServiceUtil;
 import org.ofbiz.service.ServiceXaWrapper;
 import org.ofbiz.service.mail.MimeMessageWrapper;
+import org.owasp.esapi.errors.EncodingException;
 
 /**
  * Common Services
@@ -541,4 +545,35 @@ public class CommonServices {
         }
     }
 
+    public static Map<String, Object> getAllMetrics(DispatchContext dctx, Map<String, ?> context) {
+        List<Map<String, Object>> metricsMapList = FastList.newInstance();
+        List<Metrics> metricsList = MetricsFactory.getMetrics();
+        for (Metrics metrics : metricsList) {
+            Map<String, Object> metricsMap = FastMap.newInstance();
+            metricsMap.put("name", metrics.getName());
+            metricsMap.put("serviceRate", metrics.getServiceRate());
+            metricsMap.put("threshold", metrics.getThreshold());
+            metricsMap.put("totalEvents", metrics.getTotalEvents());
+            metricsMapList.add(metricsMap);
+        }
+        Map<String, Object> result = ServiceUtil.returnSuccess();
+        result.put("metricsList", metricsMapList);
+        return result;
+    }
+
+    public static Map<String, Object> resetMetric(DispatchContext dctx, Map<String, ?> context) {
+        String name = (String) context.get("name");
+        try {
+            name = StringUtil.defaultWebEncoder.decodeFromURL(name);
+        } catch (EncodingException e) {
+            return ServiceUtil.returnError("Exception thrown while decoding metric name \"" + name + "\"");
+        }
+        Metrics metric = MetricsFactory.getMetric(name);
+        if (metric != null) {
+            metric.reset();
+            return ServiceUtil.returnSuccess();
+
+        }
+        return ServiceUtil.returnError("Metric \"" + name + "\" not found.");
+    }
 }

Modified: ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/authentication/api/Authenticator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/authentication/api/Authenticator.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/authentication/api/Authenticator.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/authentication/api/Authenticator.java Sat Aug  4 18:11:00 2012
@@ -33,7 +33,7 @@ public interface Authenticator {
     /**
      * Method called when authenticator is first initialized (the delegator
      * object can be obtained from the LocalDispatcher)
-     * @param dispatcher The ServiceDispatcher to use for this Authenticator
+     * @param dispatcher The LocalDispatcher to use for this Authenticator
      */
     public void initialize(LocalDispatcher dispatcher);
 

Modified: ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/authentication/example/TestFailAuthenticator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/authentication/example/TestFailAuthenticator.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/authentication/example/TestFailAuthenticator.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/authentication/example/TestFailAuthenticator.java Sat Aug  4 18:11:00 2012
@@ -39,7 +39,7 @@ public class TestFailAuthenticator imple
      * Method called when authenticator is first initialized (the delegator
      * object can be obtained from the LocalDispatcher)
      *
-     * @param dispatcher The ServiceDispatcher to use for this Authenticator
+     * @param dispatcher The LocalDispatcher to use for this Authenticator
      */
     public void initialize(LocalDispatcher dispatcher) {
         this.dispatcher = dispatcher;

Modified: ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/scripting/ContextHelper.java Sat Aug  4 18:11:00 2012
@@ -40,7 +40,6 @@ import org.ofbiz.base.util.string.Flexib
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.GenericValue;
 import org.ofbiz.security.Security;
-import org.ofbiz.security.authz.Authorization;
 import org.ofbiz.service.LocalDispatcher;
 import org.ofbiz.service.ModelService;
 
@@ -78,10 +77,6 @@ public final class ContextHelper {
         return FlexibleStringExpander.expandString(original, getBindings());
     }
 
-    public Authorization getAuthz() {
-        return (Authorization) this.context.getAttribute("authz");
-    }
-
     public Map<String, Object> getBindings() {
         return this.context.getBindings(ScriptContext.ENGINE_SCOPE);
     }

Modified: ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/common-controller.xml Sat Aug  4 18:11:00 2012
@@ -44,7 +44,6 @@ under the License.
     <handler name="screenfop" type="view" class="org.ofbiz.widget.screen.ScreenFopViewHandler"/>
     <handler name="jsp" type="view" class="org.ofbiz.webapp.view.JspViewHandler"/>
     <handler name="http" type="view" class="org.ofbiz.webapp.view.HttpViewHandler"/>
-    <handler name="birt" type="view" class="org.ofbiz.birt.webapp.view.BirtViewHandler"/>
 
     <preprocessor>
         <!-- Events to run on every request before security (chains exempt) -->

Modified: ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/portal-controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/portal-controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/webcommon/WEB-INF/portal-controller.xml Sat Aug  4 18:11:00 2012
@@ -27,10 +27,6 @@ under the License.
         <security https="true" auth="true"/>
         <response name="success" type="view" value="showPortlet"/>
     </request-map>
-    <request-map uri="refreshPortlet">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="showPortlet"/>
-    </request-map>
     <request-map uri="showPortletMainDecorator">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="showPortletMainDecorator"/>
@@ -39,8 +35,6 @@ under the License.
         <security https="true" auth="true"/>
         <response name="success" type="view" value="showPortletSimpleDecorator"/>
     </request-map>
-    <request-map uri="showCommonDetailPortlet"><security https="true" auth="true"/><response name="success" type="view" value="showCommonDetailPortlet"/></request-map><!--#Eam# portletExample can be use for all portalPage build like exampleMgmt -->
-
     <!-- Portlet editing requests -->
     <request-map uri="editPortalPortletAttributes">
         <security https="true" auth="true"/>
@@ -84,12 +78,6 @@ under the License.
         <response name="success" type="view-last" value="main" save-last-view="true"/>
         <response name="error" type="request" value="main"/>
     </request-map>
-    <request-map uri="updatePortalPagePortletSeq">
-        <security https="true" auth="true"/>
-        <event type="service" invoke="updatePortalPagePortletSeq"/>
-        <response name="success" type="view-last" value="main" save-last-view="true"/>
-        <response name="error" type="request" value="main"/>
-    </request-map>
     <request-map uri="updatePortletSeqDragDrop">
         <security https="true" auth="true"/>
         <event type="service" invoke="updatePortletSeqDragDrop"/>
@@ -172,11 +160,8 @@ under the License.
     <!-- View Mappings -->
     <view-map name="showPortalPage" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortalPage"/>
     <view-map name="showPortlet" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortlet"/>
-    <view-map name="showPortletUiLabelDecorator" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortletUiLabelDecorator"/>
     <view-map name="showPortletMainDecorator" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortletMainDecorator"/>
     <view-map name="showPortletSimpleDecorator" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortletSimpleDecorator"/>
-    <view-map name="showCommonDetailPortlet" type="screen" page="component://common/widget/CommonScreens.xml#ShowCommonDetailPortlet"/> <!--#Eam# portletExample can be use for all portalPage build like exampleMgmt -->
-
     <view-map name="ManagePortalPages" type="screen" page="component://common/widget/PortalPageScreens.xml#ManagePortalPages"/>
     <view-map name="NewPortalPage" type="screen" page="component://common/widget/PortalPageScreens.xml#NewPortalPage"/>
     <view-map name="addPortlet" type="screen" page="component://common/widget/PortalPageScreens.xml#AddPortlet"/>