Index: applications/content/widget/SurveyMenus.xml
===================================================================
--- applications/content/widget/SurveyMenus.xml	(revision 730996)
+++ applications/content/widget/SurveyMenus.xml	(working copy)
@@ -21,19 +21,19 @@
 <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
     <menu name="SurveyTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
           default-menu-item-name="Survey">
-        <menu-item name="Survey" title="${uiLabelMap.SurveySurveyId}">
+        <menu-item name="Survey" title="${uiLabelMap.ContentSurveySurveyId}">
             <link target="EditSurvey?surveyId=${surveyId}"/>
         </menu-item>
-        <menu-item name="SurveyMultiResps" title="${uiLabelMap.SurveyMultiResps}">
+        <menu-item name="SurveyMultiResps" title="${uiLabelMap.ContentSurveyMultiResps}">
             <link target="EditSurveyMultiResps?surveyId=${surveyId}"/>
         </menu-item>
-        <menu-item name="SurveyQuestions" title="${uiLabelMap.SurveyQuestions}">
+        <menu-item name="SurveyQuestions" title="${uiLabelMap.ContentSurveyQuestions}">
             <link target="EditSurveyQuestions?surveyId=${surveyId}"/>
         </menu-item>
-        <menu-item name="FindSurveyResponse" title="${uiLabelMap.SurveyFindResponse}">
+        <menu-item name="FindSurveyResponse" title="${uiLabelMap.ContentSurveyFindResponse}">
             <link target="FindSurveyResponse?surveyId=${surveyId}"/>
         </menu-item>
-        <menu-item name="SurveyResponses" title="${uiLabelMap.SurveyResponseSummary}">
+        <menu-item name="SurveyResponses" title="${uiLabelMap.ContentSurveyResponseSummary}">
             <link target="ViewSurveyResponses?surveyId=${surveyId}"/>
         </menu-item>
     </menu>
Index: applications/content/webapp/content/survey/ViewSurveyResponses.ftl
===================================================================
--- applications/content/webapp/content/survey/ViewSurveyResponses.ftl	(revision 730996)
+++ applications/content/webapp/content/survey/ViewSurveyResponses.ftl	(working copy)
@@ -114,7 +114,7 @@
       </#list>
     <#else>
       <tr>
-        <td class="label">${uiLabelMap.SurveyNoQuestions}</div></td>
+        <td class="label">${uiLabelMap.ContentSurveyNoQuestions}</div></td>
       </tr>
     </#if>
   </table>
\ No newline at end of file
Index: applications/content/webapp/content/survey/SurveyForms.xml
===================================================================
--- applications/content/webapp/content/survey/SurveyForms.xml	(revision 730996)
+++ applications/content/webapp/content/survey/SurveyForms.xml	(working copy)
@@ -44,7 +44,7 @@
             </service>
         </actions>
         <auto-fields-entity entity-name="Survey" default-field-type="display"/>
-        <field name="surveyId" title="${uiLabelMap.SurveySurveyId}" widget-style="buttontext">
+        <field name="surveyId" title="${uiLabelMap.ContentSurveySurveyId}" widget-style="buttontext">
             <hyperlink description="${surveyId}" target="EditSurvey?surveyId=${surveyId}" also-hidden="false"/>
         </field>
         <on-event-update-area event-type="paginate" area-id="search-results" area-target="ListFindSurveySearchResults"/>
@@ -77,7 +77,7 @@
         <field name="contentId" map-name="empty" title="${uiLabelMap.ContentPDF}">      
             <lookup target-form-name="LookupContent"/>
         </field>
-        <field name="submitButton" title="${uiLabelMap.SurveyGenerateQuestions}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.ContentSurveyGenerateQuestions}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
     <form name="BuildSurveyResponseFromPdf" type="single" target="buildSurveyResponseFromPdf" title="" default-map-name="survey"
@@ -89,7 +89,7 @@
         <field name="contentId" map-name="empty" title="${uiLabelMap.ContentPDF}">
             <lookup target-form-name="LookupContent"/>
         </field>
-        <field name="submitButton" title="${uiLabelMap.SurveyBuildRespondeFromPDF}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" title="${uiLabelMap.ContentSurveyBuildRespondeFromPDF}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
 
     <!-- SurveyMultiResp & SurveyMultiRespColumn -->
@@ -269,7 +269,7 @@
     <form name="lookupSurvey" target="LookupSurvey" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="Survey" default-field-type="find"/>
-        <field name="surveyId" title="${uiLabelMap.SurveySurveyId}"><text-find/></field>
+        <field name="surveyId" title="${uiLabelMap.ContentSurveySurveyId}"><text-find/></field>
         <field name="isAnonymous"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
         <field name="allowMultiple"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
         <field name="allowUpdate"><drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down></field>
Index: applications/content/widget/WebSiteScreens.xml
===================================================================
--- applications/content/widget/WebSiteScreens.xml	(revision 730996)
+++ applications/content/widget/WebSiteScreens.xml	(working copy)
@@ -205,6 +205,7 @@
                 <set field="tabButtonItem" value="EditWebSiteParties"/>
                 <set field="labelTitleProperty" value="PageTitleEditWebSiteParties"/>
                 <set field="webSiteId" from-field="parameters.webSiteId"/>
+                <property-map map-name="uiLabelMap" resource="PartyUiLabels"/>
                 <entity-one entity-name="WebSite" value-name="webSite"/>
                 <script location="component://content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy"/>
             </actions>
Index: applications/content/widget/forum/ForumForms.xml
===================================================================
--- applications/content/widget/forum/ForumForms.xml	(revision 730996)
+++ applications/content/widget/forum/ForumForms.xml	(working copy)
@@ -41,7 +41,7 @@
         <field name="contentIdTo"><hidden value="${caContentIdTo}"/></field>
         <field name="contentAssocTypeId"><hidden value="${caContentAssocTypeId}"/></field>
         <field name="contentTypeId"><hidden/></field>
-        <field name="select" widget-style="buttontext" entry-name="contentId" parameter-name="contentId"><hyperlink target="findForumMessages?forumGroupId=${parameters.forumGroupId}&amp;forumId=${contentId}" description="${uiLabelMap.ForumMessages}"/></field>
+        <field name="select" widget-style="buttontext" entry-name="contentId" parameter-name="contentId"><hyperlink target="findForumMessages?forumGroupId=${parameters.forumGroupId}&amp;forumId=${contentId}" description="${uiLabelMap.ContentForumMessages}"/></field>
         <field name="forumName" entry-name="contentName" parameter-name="contentName"><text/></field>
         <field name="forumDescription" entry-name="description" parameter-name="description"><text/></field>
         <field name="thruDate" entry-name="caThruDate"><date-time/></field>
Index: applications/content/widget/SurveyScreens.xml
===================================================================
--- applications/content/widget/SurveyScreens.xml	(revision 730996)
+++ applications/content/widget/SurveyScreens.xml	(working copy)
@@ -37,7 +37,7 @@
                             <widgets>
                                 <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
                                     <decorator-section name="menu-bar">
-                                        <container style="button-bar"><link  text="${uiLabelMap.SurveyCreate}" target="EditSurvey" style="buttontext"/></container>
+                                        <container style="button-bar"><link  text="${uiLabelMap.ContentSurveyCreate}" target="EditSurvey" style="buttontext"/></container>
                                     </decorator-section>
                                     <decorator-section name="search-options">
                                         <include-form name="FindSurvey" location="component://content/webapp/content/survey/SurveyForms.xml"/>
@@ -75,7 +75,7 @@
                                     <condition><not><if-empty field-name="surveyId"/></not></condition>
                                     <widgets>
                                         <include-menu name="SurveyTabBar" location="component://content/widget/SurveyMenus.xml"/>
-                                        <container><link  text="${uiLabelMap.SurveyCreate}" target="EditSurvey" style="buttontext"/></container>
+                                        <container><link  text="${uiLabelMap.ContentSurveyCreate}" target="EditSurvey" style="buttontext"/></container>
                                     </widgets>
                                 </section>
                                 
@@ -127,7 +127,7 @@
                                 <container style="screenlet">
                                     <container style="screenlet-title-bar">
                                         <container style="h3">
-                                            <label text="${uiLabelMap.PageTitleEditSurvey} ${uiLabelMap.SurveySurveyId} ${surveyId}"/>
+                                            <label text="${uiLabelMap.PageTitleEditSurvey} ${uiLabelMap.ContentSurveySurveyId} ${surveyId}"/>
                                         </container>
                                     </container>
                                     <container style="screenlet-body">
@@ -163,14 +163,14 @@
             <widgets>
                 <decorator-screen name="CommonSurveyDecorator">
                     <decorator-section name="body">
-                        <container><label style="h1">${uiLabelMap.PageTitleEditSurveyMultiResps} ${uiLabelMap.SurveySurveyId} ${surveyId}</label></container>
+                        <container><label style="h1">${uiLabelMap.PageTitleEditSurveyMultiResps} ${uiLabelMap.ContentSurveySurveyId} ${surveyId}</label></container>
                         <iterate-section entry-name="surveyMultiResp" list-name="surveyMultiRespList">
                             <section>
                                 <widgets>
                                     <container style="screenlet">
                                         <container style="screenlet-title-bar">
                                             <container style="h3">
-                                                <label text="${uiLabelMap.SurveyEditSurveyMultiResp}"/>
+                                                <label text="${uiLabelMap.ContentSurveyEditSurveyMultiResp}"/>
                                             </container>
                                         </container>
                                         <container style="screenlet-body">
@@ -185,7 +185,7 @@
                                     <container style="screenlet">
                                         <container style="screenlet-title-bar">
                                             <container style="h3">
-                                                <label text="${uiLabelMap.SurveyAddSurveyMultiRespColumn}"/>
+                                                <label text="${uiLabelMap.ContentSurveyAddSurveyMultiRespColumn}"/>
                                             </container>
                                         </container>
                                         <container style="screenlet-body">
@@ -202,7 +202,7 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.SurveyAddSurveyMultiResp}"/>
+                                    <label text="${uiLabelMap.ContentSurveyAddSurveyMultiResp}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
@@ -241,7 +241,7 @@
                         <include-form name="CreateSurveyQuestion" location="component://content/webapp/content/survey/SurveyForms.xml"/>
                         -->
 
-                        <screenlet id="SurveyPagePanel" title="${uiLabelMap.PageTitleEditSurveyPages} ${uiLabelMap.SurveySurveyId} ${surveyId}" collapsible="true">
+                        <screenlet id="SurveyPagePanel" title="${uiLabelMap.PageTitleEditSurveyPages} ${uiLabelMap.ContentSurveySurveyId} ${surveyId}" collapsible="true">
                             <include-form name="AddSurveyPage" location="component://content/webapp/content/survey/SurveyForms.xml"/>
                         </screenlet>
                         <include-form name="ListSurveyPages" location="component://content/webapp/content/survey/SurveyForms.xml"/>
@@ -270,13 +270,13 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleFindSurveyResponse} ${uiLabelMap.SurveySurveyId} ${surveyId}"/>
+                                    <label text="${uiLabelMap.PageTitleFindSurveyResponse} ${uiLabelMap.ContentSurveySurveyId} ${surveyId}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
                                 <section>
                                     <widgets>    
-                                        <container><link  text="${uiLabelMap.SurveyCreateResponse}" target="EditSurveyResponse?surveyId=${surveyId}" style="buttontext"/></container>
+                                        <container><link  text="${uiLabelMap.ContentSurveyCreateResponse}" target="EditSurveyResponse?surveyId=${surveyId}" style="buttontext"/></container>
                                         <include-form name="FindSurveyResponse" location="component://content/webapp/content/survey/SurveyForms.xml"/>
                                     </widgets>
                                 </section>
@@ -285,7 +285,7 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.SurveyBuildRespondeFromPDF}"/>
+                                    <label text="${uiLabelMap.ContentSurveyBuildRespondeFromPDF}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
@@ -330,11 +330,11 @@
             <widgets>
                 <decorator-screen name="CommonSurveyDecorator">
                     <decorator-section name="body">
-                        <container><link  text="${uiLabelMap.SurveyCreateResponse}" target="EditSurveyResponse?surveyId=${surveyId}" style="buttontext"/></container>
+                        <container><link  text="${uiLabelMap.ContentSurveyCreateResponse}" target="EditSurveyResponse?surveyId=${surveyId}" style="buttontext"/></container>
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.PageTitleViewSurveyResponses} ${uiLabelMap.SurveySurveyId} ${surveyId}"/>
+                                    <label text="${uiLabelMap.PageTitleViewSurveyResponses} ${uiLabelMap.ContentSurveySurveyId} ${surveyId}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
@@ -371,7 +371,7 @@
             <widgets>
                 <decorator-screen name="CommonSurveyDecorator">
                     <decorator-section name="body">
-                        <container><label style="h1">${uiLabelMap.PageTitleEditSurveyResponse}, ${uiLabelMap.SurveyResponse}: ${parameters.surveyResponseId}, ${uiLabelMap.SurveySurveyId}: ${surveyId}</label></container>
+                        <container><label style="h1">${uiLabelMap.PageTitleEditSurveyResponse}, ${uiLabelMap.ContentSurveyResponse}: ${parameters.surveyResponseId}, ${uiLabelMap.ContentSurveySurveyId}: ${surveyId}</label></container>
                         <platform-specific><html><html-template location="component://content/webapp/content/survey/EditSurveyResponse.ftl"/></html></platform-specific>
                         <include-form name="BuildSurveyResponseFromPdf" location="component://content/webapp/content/survey/SurveyForms.xml"/>
                     </decorator-section>
Index: applications/content/webapp/content/layout/LayoutMenus.xml
===================================================================
--- applications/content/webapp/content/layout/LayoutMenus.xml	(revision 730996)
+++ applications/content/webapp/content/layout/LayoutMenus.xml	(working copy)
@@ -22,7 +22,7 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
     <menu name="layout" default-menu-item-name="content" default-associated-content-id="${userLogin.userLoginId}" title="" type="simple"
         menu-container-style="button-bar tab-bar" default-selected-style="selected">
-        <menu-item name="ListLayout" title="${uiLabelMap.ListOwnCreatedTemplates}" >
+        <menu-item name="ListLayout" title="${uiLabelMap.ContentListOwnCreatedTemplates}" >
             <link target="ListLayout" target-window="_top" style="tabButton" />
         </menu-item>
         <menu-item name="FindLayout" title="${uiLabelMap.CommonFind}" >
Index: applications/order/config/OrderUiLabels.xml
===================================================================
--- applications/order/config/OrderUiLabels.xml	(revision 731038)
+++ applications/order/config/OrderUiLabels.xml	(working copy)
@@ -2840,8 +2840,10 @@
         <value xml:lang="es">Problemas de autorización</value>
         <value xml:lang="fr">Problèmes d'autorisation CB</value>
         <value xml:lang="it">problemi di Autorizzazione</value>
+        <value xml:lang="ro">Probleme de Autorizatie</value>
         <value xml:lang="ru">Проблемы авторизации</value>
         <value xml:lang="th">ปัญหาการอนุญาต</value>
+        <value xml:lang="zh">授权问题</value>
     </property>
     <property key="OrderFilterInventoryProblems">
         <value xml:lang="de">Probleme Lager</value>
@@ -2849,6 +2851,7 @@
         <value xml:lang="es">Problemas de almacén</value>
         <value xml:lang="fr">Problèmes de stock</value>
         <value xml:lang="it">problemi di inventario</value>
+        <value xml:lang="ro">Probleme de Inventar</value>
         <value xml:lang="ru">Проблемы с материальным обеспечением</value>
         <value xml:lang="th">ปัญหาสินค้าคงเหลือ</value>
         <value xml:lang="zh">库存问题</value>
@@ -9623,28 +9626,6 @@
         <value xml:lang="zh">年合计</value>
         <value xml:lang="zh_CN">YTD</value>
     </property>
-    <property key="OrderfilterAuthProblems">
-        <value xml:lang="de">Problem Zahlungsverarbeitung</value>
-        <value xml:lang="en">Authorization Problems</value>
-        <value xml:lang="es">Problema de autorización</value>
-        <value xml:lang="fr">Problèmes d'autorisation de paiement</value>
-        <value xml:lang="it">Problemi di Autorizzazioni</value>
-        <value xml:lang="ro">Probleme de Autorizatie</value>
-        <value xml:lang="ru">Проблемы авторизации</value>
-        <value xml:lang="th">ปัญหาการอนุญาต</value>
-        <value xml:lang="zh">授权问题</value>
-    </property>
-    <property key="OrderfilterInventoryProblems">
-        <value xml:lang="de">Problem Lager</value>
-        <value xml:lang="en">Inventory Problems</value>
-        <value xml:lang="es">Problema de existencias</value>
-        <value xml:lang="fr">problèmes d'inventaire</value>
-        <value xml:lang="it">Problemi di Inventario</value>
-        <value xml:lang="ro">Probleme de Inventar</value>
-        <value xml:lang="ru">Проблемы материального обеспечения</value>
-        <value xml:lang="th">ปัญหาสินค้าคงเหลือ</value>
-        <value xml:lang="zh">库存问题</value>
-    </property>
     <property key="PageTitleCreateQuoteForCustRequest">
         <value xml:lang="de">Neue Offerte und Offertelement für Kundenanfrage erstellen</value>
         <value xml:lang="en">Create a new Quote and QuoteItem for a CustRequest</value>
Index: applications/content/config/ContentUiLabels.xml
===================================================================
--- applications/content/config/ContentUiLabels.xml	(revision 730996)
+++ applications/content/config/ContentUiLabels.xml	(working copy)
@@ -417,6 +417,82 @@
         <value xml:lang="th">ความคิดเห็น</value>
         <value xml:lang="zh">论坛</value>
     </property>
+    <property key="ContentForumAddPurposeTo">
+        <value xml:lang="ar">إضافة هدف إلى</value>
+        <value xml:lang="de">Zweck hinzufügen zu</value>
+        <value xml:lang="en">Add purpose to</value>
+        <value xml:lang="fr">Ajouter le but à</value>
+        <value xml:lang="it">Aggiungi funzione a</value>
+        <value xml:lang="ro">Adauga functie la </value>
+        <value xml:lang="th">เพิ่มวัตถุประสงค์ถึง</value>
+        <value xml:lang="zh">把目的添加到</value>
+    </property>
+    <property key="ContentForumAddResponseToMessage">
+        <value xml:lang="de">Antwort hinzufügen zu Meldung</value>
+        <value xml:lang="en">Add a response to message</value>
+        <value xml:lang="fr">Ajouter une réponse au message</value>
+        <value xml:lang="it">Aggiungi una risposta al messaggio</value>
+        <value xml:lang="th">ผลตอบรับถึงข้อความ</value>
+    </property>
+    <property key="ContentForumAddRoleTo">
+        <value xml:lang="ar">إضافة  جور إلى</value>
+        <value xml:lang="de">Rolle hinzufügen zu</value>
+        <value xml:lang="en">Add role to</value>
+        <value xml:lang="fr">Ajoutez le rôle à</value>
+        <value xml:lang="it">Aggiungi ruolo a</value>
+        <value xml:lang="ro">Adauga Drept la</value>
+        <value xml:lang="th">เพิ่มสถานะถึง</value>
+        <value xml:lang="zh">把角色添加到</value>
+    </property>
+    <property key="ContentForumAddThreadTo">
+        <value xml:lang="ar">إضافة سلك جديد إلى هذا المنتدى</value>
+        <value xml:lang="de">Ein neues Thema zu diesem Forum hinzufügen</value>
+        <value xml:lang="en">Add new thread to this Forum</value>
+        <value xml:lang="fr">Ajouter un nouveau fil de discussion à ce forum</value>
+        <value xml:lang="it">Aggiungi nuova discussione a questo forum</value>
+        <value xml:lang="ro">Adauga nou thread la acest Forum</value>
+        <value xml:lang="th">เพิ่มเรื่องเข้าสู่ความคิดเห็นนี้</value>
+        <value xml:lang="zh">在这个论坛新建话题</value>
+    </property>
+    <property key="ContentForumAddTo">
+        <value xml:lang="ar">إضافة منتدى إلى</value>
+        <value xml:lang="de">Forum hinzufügen zu</value>
+        <value xml:lang="en">Add forum to</value>
+        <value xml:lang="fr">Ajouter le forum à</value>
+        <value xml:lang="it">Aggiungi al forum</value>
+        <value xml:lang="ro">Adauga la forum</value>
+        <value xml:lang="th">เพิ่มความคิดเห็นถึง</value>
+        <value xml:lang="zh">把论坛添加到</value>
+    </property>
+    <property key="ContentForumGroupCreate">
+        <value xml:lang="ar">إستحداث مجموعة منتدى جديد</value>
+        <value xml:lang="de">Neue Forumsgruppe erstellen</value>
+        <value xml:lang="en">Create new forum group</value>
+        <value xml:lang="fr">Créer un nouveau groupe de forum</value>
+        <value xml:lang="it">Creare nuovo gruppo forum</value>
+        <value xml:lang="ro">Creare un nou grup forum</value>
+        <value xml:lang="th">สร้างกลุ่มความคิดเห็นใหม่</value>
+        <value xml:lang="zh">新建论坛组</value>
+    </property>
+    <property key="ContentForumMessage">
+        <value xml:lang="de">Meldung</value>
+        <value xml:lang="en">Message</value>
+        <value xml:lang="it">Messaggio</value>
+        <value xml:lang="th">ข้อความ</value>
+    </property>
+    <property key="ContentForumMessages">
+        <value xml:lang="de">Meldungen</value>
+        <value xml:lang="en">Messages</value>
+        <value xml:lang="it">Messaggi</value>
+        <value xml:lang="th">ข้อความ</value>
+    </property>
+    <property key="ContentForumThread">
+        <value xml:lang="de">Thema</value>
+        <value xml:lang="en">Thread</value>
+        <value xml:lang="fr">Fil de discussion</value>
+        <value xml:lang="it">Discussione</value>
+        <value xml:lang="th">Thread</value>
+    </property>
     <property key="ContentGoToContent">
         <value xml:lang="en">Go to Content</value>
     </property>
@@ -495,6 +571,12 @@
         <value xml:lang="th">แผนงาน</value>
         <value xml:lang="zh">版式</value>
     </property>
+    <property key="ContentListOwnCreatedTemplates">
+        <value xml:lang="de">Liste der selber erstellten Vorlagen</value>
+        <value xml:lang="en">List own created Templates</value>
+        <value xml:lang="fr">Voir vos propres modèles</value>
+        <value xml:lang="it">Lista templates personali creati</value>
+    </property>
     <property key="ContentMain">
         <value xml:lang="ar">الرئيسية</value>
         <value xml:lang="de">Primärer</value>
@@ -700,6 +782,297 @@
         <value xml:lang="th">สำรวจ</value>
         <value xml:lang="zh">调查</value>
     </property>
+    <property key="ContentSurveyAddSurveyMultiResp">
+        <value xml:lang="ar">إضافة مجموعة جواب متعدد للتصويت</value>
+        <value xml:lang="de">Befragung Mehrfachantwortgruppe hinzufügen</value>
+        <value xml:lang="en">Add Survey Multi-Response Group</value>
+        <value xml:lang="es">Añadir Grupo de respuestas a encuesta</value>
+        <value xml:lang="fr">Ajouter un groupe multi-réponses au sondage</value>
+        <value xml:lang="it">Aggiungi risposte multiple gruppo sondaggio</value>
+        <value xml:lang="ro">Adauga Raspunsuri Multiple Grup Sondaj</value>
+        <value xml:lang="th">เพิ่มการสำรวจกลุ่มคำตอบ</value>
+        <value xml:lang="zh">新建有多个回答的调查的组</value>
+    </property>
+    <property key="ContentSurveyAddSurveyMultiRespColumn">
+        <value xml:lang="ar">إضافة عمود جواب متعدد للتصويت</value>
+        <value xml:lang="de">Mehrfachantworten Spalte hinzufügen</value>
+        <value xml:lang="en">Add Survey Multi-Resp Column</value>
+        <value xml:lang="es">Añadir Columna de Grupo de respuestas</value>
+        <value xml:lang="fr">Ajouter une colonne multi-réponses au sondage</value>
+        <value xml:lang="it">Aggiungi risposte multiple colonna sondaggio</value>
+        <value xml:lang="ro">Adauga Raspunsuri Multiple Coloana Sondaj</value>
+        <value xml:lang="th">เพิ่มแถวการสำรวจคำตอบ</value>
+        <value xml:lang="zh">新建调查的多个回答的列</value>
+    </property>
+    <property key="ContentSurveyApplyQuestionFromCategory">
+        <value xml:lang="ar">تكبيق الأسئلة من الفئة</value>
+        <value xml:lang="de">Frage(n) anwenden von Kategorie</value>
+        <value xml:lang="en">Apply Question(s) From Category</value>
+        <value xml:lang="fr">Appliquer les questions à partir de la catégorie</value>
+        <value xml:lang="it">Applica domanda(e) dalla categoria</value>
+        <value xml:lang="ro">Aplica Intrebare(i) De la Categoria</value>
+        <value xml:lang="th">ใช้คำถามจากหมวดหมู่</value>
+        <value xml:lang="zh">从分类引用问题</value>
+    </property>
+    <property key="ContentSurveyBuildRespondeFromPDF">
+        <value xml:lang="ar">بناء جواب التصويت من PDF</value>
+        <value xml:lang="de">Befragung Antwort erstellen von PDF</value>
+        <value xml:lang="en">Build Survey Response from PDF</value>
+        <value xml:lang="fr">Construire une réponse de sondage depuis le PDF</value>
+        <value xml:lang="it">Prepare risposte sondaggio dal PDF</value>
+        <value xml:lang="ro">Prepara Raspuns Sondaj De la PDF</value>
+        <value xml:lang="th">สร้างการสำรวจคำตอบจาก PDF</value>
+        <value xml:lang="zh">从PDF建立调查回答</value>
+    </property>
+    <property key="ContentSurveryCategory">
+        <value xml:lang="ar">فئة</value>
+        <value xml:lang="de">Kategorie</value>
+        <value xml:lang="en">Category</value>
+        <value xml:lang="fr">Catégorie</value>
+        <value xml:lang="it">Categoria</value>
+        <value xml:lang="ro">Categoria</value>
+        <value xml:lang="th">หมวดหมู่</value>
+        <value xml:lang="zh">分类</value>
+    </property>
+    <property key="ContentSurveyCreate">
+        <value xml:lang="ar">إضافة تصويت</value>
+        <value xml:lang="de">Befragung erstellen</value>
+        <value xml:lang="en">Create Survey</value>
+        <value xml:lang="es">Crear Encuesta</value>
+        <value xml:lang="fr">Créer un sondage</value>
+        <value xml:lang="it">Creare sondaggio</value>
+        <value xml:lang="ro">Creare Sondaj</value>
+        <value xml:lang="th">สร้างการสำรวจ</value>
+        <value xml:lang="zh">新建调查</value>
+    </property>
+    <property key="ContentSurveyCreateQuestion">
+        <value xml:lang="ar">إضافة سؤال جديد</value>
+        <value xml:lang="de">Neue Frage erstellen</value>
+        <value xml:lang="en">Create New Question</value>
+        <value xml:lang="fr">Créer une nouvelle question</value>
+        <value xml:lang="it">Creare nuova domanda</value>
+        <value xml:lang="ro">Creare Noua Intrebare</value>
+        <value xml:lang="th">สร้างคำถามใหม่</value>
+        <value xml:lang="zh">新建问题</value>
+    </property>
+    <property key="ContentSurveyCreateQuestionCategory">
+        <value xml:lang="ar">إضافة فئة سؤال</value>
+        <value xml:lang="de">Fragenkategorie erstellen</value>
+        <value xml:lang="en">Create Question Category</value>
+        <value xml:lang="fr">Créer la catégorie question</value>
+        <value xml:lang="it">Creare categoria domanda</value>
+        <value xml:lang="ro">Creare Categorie Intrebare</value>
+        <value xml:lang="th">สร้างคำถามหมวดหมู่คำถาม</value>
+        <value xml:lang="zh">新建问题分类</value>
+    </property>
+    <property key="ContentSurveyCreateQuestionOption">
+        <value xml:lang="ar">إضافة زيادة سؤال</value>
+        <value xml:lang="de">Frage Wahlmöglichkeit erstellen</value>
+        <value xml:lang="en">Create Question Option</value>
+        <value xml:lang="fr">Créer la question option</value>
+        <value xml:lang="it">Creare opzione domanda</value>
+        <value xml:lang="ro">Creare Optiune Intrebare</value>
+        <value xml:lang="th">สร้างทางเลือกคำถาม</value>
+        <value xml:lang="zh">新建问题选项</value>
+    </property>
+    <property key="ContentSurveyCreateResponse">
+        <value xml:lang="ar">إضافة جواب تصويت</value>
+        <value xml:lang="de">Befragung Anwort erstellen</value>
+        <value xml:lang="en">Create Survey Response</value>
+        <value xml:lang="es">Crear respuesta</value>
+        <value xml:lang="fr">Créer la réponse de sondage</value>
+        <value xml:lang="it">Creare risposta sondaggio</value>
+        <value xml:lang="ro">Creare Raspuns Sondaj</value>
+        <value xml:lang="th">สร้างคำตอบ</value>
+        <value xml:lang="zh">新建调查回答</value>
+    </property>
+    <property key="ContentSurveyEditQuestionOption">
+        <value xml:lang="ar">تحرير زيادة سؤال</value>
+        <value xml:lang="de">Frage Wahlmöglichkeit bearbeiten</value>
+        <value xml:lang="en">Edit Question Option</value>
+        <value xml:lang="fr">Modifier la question option</value>
+        <value xml:lang="it">Aggiorna opzione domanda</value>
+        <value xml:lang="ro">Actualizeaza Optiune Intrebare</value>
+        <value xml:lang="th">แก้ไขลักษณะคำถาม</value>
+        <value xml:lang="zh">编辑问题选项</value>
+    </property>
+    <property key="ContentSurveyEditSurveyMultiResp">
+        <value xml:lang="ar">تحرير مجموعة جواب متعدد للتصويت</value>
+        <value xml:lang="de">Befragung Mehrfachantwortgruppe bearbeiten</value>
+        <value xml:lang="en">Edit Survey Multi-Response Group</value>
+        <value xml:lang="es">Modificar grupo multi-respuesta</value>
+        <value xml:lang="fr">Modifier le groupe multi-réponses</value>
+        <value xml:lang="it">Aggiorna risposte multiple gruppo sondaggio</value>
+        <value xml:lang="ro">Actualizeaza Raspunsuri Multiple Grup Sondaj</value>
+        <value xml:lang="th">แก้ไขการสำรวจกลุ่มคำตอบ</value>
+        <value xml:lang="zh">编辑调查的多个回答的组</value>
+    </property>
+    <property key="ContentSurveyFindResponse">
+        <value xml:lang="ar">إيجاد جواب</value>
+        <value xml:lang="de">Antwort suchen</value>
+        <value xml:lang="en">Find Response</value>
+        <value xml:lang="es">Buscar respuesta</value>
+        <value xml:lang="fr">Rechercher la réponse</value>
+        <value xml:lang="it">Ricerca risposta</value>
+        <value xml:lang="ro">Cautare Raspuns</value>
+        <value xml:lang="th">ค้นหาคำตอบ</value>
+        <value xml:lang="zh">查找回答</value>
+    </property>
+    <property key="ContentSurveyGenerateQuestions">
+        <value xml:lang="ar">لإستخراج الأسئلة من إستمارة أكرو PDF</value>
+        <value xml:lang="de">Fragen von AcroForm PDF erstellen</value>
+        <value xml:lang="en">Generate Questions from AcroForm PDF</value>
+        <value xml:lang="fr">Générer les questions depuis AcroForm PDF</value>
+        <value xml:lang="it">Genera domande da PDF</value>
+        <value xml:lang="ro">GenereazaIntrebari de la  AcroForm PDF</value>
+        <value xml:lang="th">สร้างคำถามจากรูปแบบใน PDF</value>
+        <value xml:lang="zh">从AcroForm PDF生成问题</value>
+    </property>
+    <property key="ContentSurveyMultiResp">
+        <value xml:lang="ar">جواب متعدد</value>
+        <value xml:lang="de">Mehrfach-Antwort</value>
+        <value xml:lang="en">Multi-Resp</value>
+        <value xml:lang="fr">multi-réponses</value>
+        <value xml:lang="it">Risposta multipla</value>
+        <value xml:lang="ro">Raspuns Multiplu</value>
+        <value xml:lang="th">หลายคำตอบ</value>
+        <value xml:lang="zh">多个回答</value>
+    </property>
+    <property key="ContentSurveyMultiRespColumn">
+        <value xml:lang="ar">عمود جواب متعدد</value>
+        <value xml:lang="de">Mehrfach-Antwort Spalte</value>
+        <value xml:lang="en">Multi-Resp Column</value>
+        <value xml:lang="fr">Colonne multi-réponses</value>
+        <value xml:lang="it">Colonna risposta multipla</value>
+        <value xml:lang="ro">Coloana Raspuns Multiplu</value>
+        <value xml:lang="th">ช่องของหลายคำตอบ</value>
+        <value xml:lang="zh">多个回答列</value>
+    </property>
+    <property key="ContentSurveyMultiResps">
+        <value xml:lang="ar">أجوبة متعددة</value>
+        <value xml:lang="de">Mehrfach Antworten</value>
+        <value xml:lang="en">Multi-Resps</value>
+        <value xml:lang="es">Multi-respuesta</value>
+        <value xml:lang="fr">Multi-réponses</value>
+        <value xml:lang="it">Risposte multiple</value>
+        <value xml:lang="ro">Raspunsuri Multiple</value>
+        <value xml:lang="th">หลายคำตอบ</value>
+        <value xml:lang="zh">多个回答</value>
+    </property>
+    <property key="ContentSurveyNoQuestions">
+        <value xml:lang="ar">لا أسئلة في التصويت, لا يمكن إيجاد أجوية</value>
+        <value xml:lang="de">Keine Fragen in Befragung; keine Antworten können gefunden werden.</value>
+        <value xml:lang="en">No questions in survey; no responses can be located.</value>
+        <value xml:lang="fr">Aucune question dans le sondage, aucune réponse ne peut être localisée.</value>
+        <value xml:lang="it">Nessuna domanda nel sondaggio; nessuna risposta può essere localizzata.</value>
+        <value xml:lang="ro">Nici-o intrebare in sondaj; nu poate fi localizat nici-un raspuns.</value>
+        <value xml:lang="th">ไม่มีคำถามในการสำรวจ;ไม่สามารถสร้างคำตอบได้</value>
+        <value xml:lang="zh">调查中没有问题；无法定位回答。</value>
+    </property>
+    <property key="ContentSurveyOption">
+        <value xml:lang="ar">إختيار</value>
+        <value xml:lang="de">Auswahl</value>
+        <value xml:lang="en">Option</value>
+        <value xml:lang="fr">Option</value>
+        <value xml:lang="it">Opzione</value>
+        <value xml:lang="ro">Optiune</value>
+        <value xml:lang="th">ทางเลือก</value>
+        <value xml:lang="zh">选项</value>
+    </property>
+    <property key="ContentSurveyOptions">
+        <value xml:lang="ar">إختيارات التصويت</value>
+        <value xml:lang="de">Befragung Auswahl</value>
+        <value xml:lang="en">Survey Options</value>
+        <value xml:lang="fr">Options du sondage</value>
+        <value xml:lang="it">Opzioni sondaggio</value>
+        <value xml:lang="ro">Optiune Sondaj</value>
+        <value xml:lang="th">การสำรวจทางเลือก</value>
+        <value xml:lang="zh">调查选项</value>
+    </property>
+    <property key="ContentSurveyQuestion">
+        <value xml:lang="ar">سؤال</value>
+        <value xml:lang="de">Frage</value>
+        <value xml:lang="en">Question</value>
+        <value xml:lang="fr">Question</value>
+        <value xml:lang="it">Domanda</value>
+        <value xml:lang="ro">Intrebare</value>
+        <value xml:lang="th">คำถาม</value>
+        <value xml:lang="zh">问题</value>
+    </property>
+    <property key="ContentSurveyQuestions">
+        <value xml:lang="ar">أسئلة</value>
+        <value xml:lang="de">Fragen</value>
+        <value xml:lang="en">Questions</value>
+        <value xml:lang="es">Preguntas</value>
+        <value xml:lang="fr">Questions</value>
+        <value xml:lang="it">Domande</value>
+        <value xml:lang="ro">Intrebari</value>
+        <value xml:lang="th">คำถาม</value>
+        <value xml:lang="zh">问题</value>
+    </property>
+    <property key="ContentSurveyResponse">
+        <value xml:lang="ar">جواب</value>
+        <value xml:lang="de">Antwort</value>
+        <value xml:lang="en">Response</value>
+        <value xml:lang="fr">Réponse</value>
+        <value xml:lang="it">Risposta</value>
+        <value xml:lang="ro">Raspuns</value>
+        <value xml:lang="th">คำตอบ</value>
+        <value xml:lang="zh">回答</value>
+    </property>
+    <property key="ContentSurveyResponseSummary">
+        <value xml:lang="ar">ماخص الجواب</value>
+        <value xml:lang="de">Antwort Zusammenfassung</value>
+        <value xml:lang="en">Response Summary</value>
+        <value xml:lang="es">Resumen de respuestas</value>
+        <value xml:lang="fr">Résumé de réponse</value>
+        <value xml:lang="it">Sommario risposta</value>
+        <value xml:lang="ro">Sumar Raspuns</value>
+        <value xml:lang="th">คำตอบโดยสรุป</value>
+        <value xml:lang="zh">回答摘要</value>
+    </property>
+    <property key="ContentSurveyResponses">
+        <value xml:lang="ar">أجوية</value>
+        <value xml:lang="de">Antworten</value>
+        <value xml:lang="en">Responses</value>
+        <value xml:lang="es">Respuestas</value>
+        <value xml:lang="fr">Réponses</value>
+        <value xml:lang="it">Risposte</value>
+        <value xml:lang="ro">Raspunsuri</value>
+        <value xml:lang="th">คำตอบ</value>
+        <value xml:lang="zh">回答</value>
+    </property>
+    <property key="ContentSurveySurveyId">
+        <value xml:lang="ar">تعريف التصويت</value>
+        <value xml:lang="de">Befragung ID</value>
+        <value xml:lang="en">Survey ID</value>
+        <value xml:lang="es">Id de Encuesta</value>
+        <value xml:lang="fr">Réf. de sondage</value>
+        <value xml:lang="it">Numero sondaggio</value>
+        <value xml:lang="ro">Numer Sondaj</value>
+        <value xml:lang="th">รหัสการสำรวจ</value>
+        <value xml:lang="zh">调查编号</value>
+    </property>
+    <property key="ContentSurveyWithOption">
+        <value xml:lang="ar">مع إختيار</value>
+        <value xml:lang="de">Mit Auswahl</value>
+        <value xml:lang="en">W/Option</value>
+        <value xml:lang="fr">Avec option</value>
+        <value xml:lang="it">Con opzione</value>
+        <value xml:lang="ro">Cu Optiune</value>
+        <value xml:lang="th">W/ทางเลือก </value>
+        <value xml:lang="zh">带有选项</value>
+    </property>
+    <property key="ContentSurveyWithQuestion">
+        <value xml:lang="ar">مع سؤال</value>
+        <value xml:lang="de">Mit Frage</value>
+        <value xml:lang="en">W/Question</value>
+        <value xml:lang="fr">Avec question</value>
+        <value xml:lang="it">Con domanda</value>
+        <value xml:lang="ro">Cu Intrebare</value>
+        <value xml:lang="th">W/คำถาม</value>
+        <value xml:lang="zh">带有问题</value>
+    </property>
     <property key="ContentTemplate">
         <value xml:lang="ar">نموذج</value>
         <value xml:lang="de">Vorlage</value>
@@ -1715,7 +2088,7 @@
         <value xml:lang="de">Meldungsthema</value>
         <value xml:lang="en">Msgs Thread</value>
         <value xml:lang="fr">Fil de discussion des msgs</value>
-        <value xml:lang="it">Thread Messaggi</value>
+        <value xml:lang="it">Messaggi discussione</value>
         <value xml:lang="ro">Thread Mesaje</value>
         <value xml:lang="th">ข้อความต่อเนื่อง</value>
         <value xml:lang="zh">消息线索</value>
@@ -2268,86 +2641,6 @@
         <value xml:lang="th">มาตรฐานน้ำหนัก</value>
         <value xml:lang="zh">重量系数</value>
     </property>
-    <property key="ForumAddPurposeTo">
-        <value xml:lang="ar">إضافة هدف إلى</value>
-        <value xml:lang="de">Zweck hinzufügen zu</value>
-        <value xml:lang="en">Add purpose to</value>
-        <value xml:lang="fr">Ajouter le but à</value>
-        <value xml:lang="it">Aggiungi funzione a</value>
-        <value xml:lang="ro">Adauga functie la </value>
-        <value xml:lang="th">เพิ่มวัตถุประสงค์ถึง</value>
-        <value xml:lang="zh">把目的添加到</value>
-    </property>
-    <property key="ForumAddResponseToMessage">
-        <value xml:lang="de">Antwort hinzufügen zu Meldung</value>
-        <value xml:lang="en">Add a response to message</value>
-        <value xml:lang="fr">Ajouter une réponse au message</value>
-        <value xml:lang="it">Aggiungi una risposta al messaggio</value>
-        <value xml:lang="th">ผลตอบรับถึงข้อความ</value>
-    </property>
-    <property key="ForumAddRoleTo">
-        <value xml:lang="ar">إضافة  جور إلى</value>
-        <value xml:lang="de">Rolle hinzufügen zu</value>
-        <value xml:lang="en">Add role to</value>
-        <value xml:lang="fr">Ajoutez le rôle à</value>
-        <value xml:lang="it">Aggiungi ruolo a</value>
-        <value xml:lang="ro">Adauga Drept la</value>
-        <value xml:lang="th">เพิ่มสถานะถึง</value>
-        <value xml:lang="zh">把角色添加到</value>
-    </property>
-    <property key="ForumAddThreadTo">
-        <value xml:lang="ar">إضافة سلك جديد إلى هذا المنتدى</value>
-        <value xml:lang="de">Ein neues Thema zu diesem Forum hinzufügen</value>
-        <value xml:lang="en">Add new thread to this Forum</value>
-        <value xml:lang="fr">Ajouter un nouveau fil de discussion à ce forum</value>
-        <value xml:lang="it">Aggiungi nuovo thread a questo Forum</value>
-        <value xml:lang="ro">Adauga nou thread la acest Forum</value>
-        <value xml:lang="th">เพิ่มเรื่องเข้าสู่ความคิดเห็นนี้</value>
-        <value xml:lang="zh">在这个论坛新建话题</value>
-    </property>
-    <property key="ForumAddTo">
-        <value xml:lang="ar">إضافة منتدى إلى</value>
-        <value xml:lang="de">Forum hinzufügen zu</value>
-        <value xml:lang="en">Add forum to</value>
-        <value xml:lang="fr">Ajouter le forum à</value>
-        <value xml:lang="it">Aggiungi al forum</value>
-        <value xml:lang="ro">Adauga la forum</value>
-        <value xml:lang="th">เพิ่มความคิดเห็นถึง</value>
-        <value xml:lang="zh">把论坛添加到</value>
-    </property>
-    <property key="ForumGroupCreate">
-        <value xml:lang="ar">إستحداث مجموعة منتدى جديد</value>
-        <value xml:lang="de">Neue Forumsgruppe erstellen</value>
-        <value xml:lang="en">Create new forum group</value>
-        <value xml:lang="fr">Créer un nouveau groupe de forum</value>
-        <value xml:lang="it">Creare nuovo gruppo forum</value>
-        <value xml:lang="ro">Creare un nou grup forum</value>
-        <value xml:lang="th">สร้างกลุ่มความคิดเห็นใหม่</value>
-        <value xml:lang="zh">新建论坛组</value>
-    </property>
-    <property key="ForumMessage">
-        <value xml:lang="de">Meldung</value>
-        <value xml:lang="en">Message</value>
-        <value xml:lang="it">Messaggio</value>
-        <value xml:lang="th">ข้อความ</value>
-    </property>
-    <property key="ForumMessages">
-        <value xml:lang="de">Meldungen</value>
-        <value xml:lang="en">Messages</value>
-        <value xml:lang="it">Messaggi</value>
-        <value xml:lang="th">ข้อความ</value>
-    </property>
-    <property key="ForumThread">
-        <value xml:lang="de">Thema</value>
-        <value xml:lang="en">Thread</value>
-        <value xml:lang="fr">Fil de discussion</value>
-        <value xml:lang="th">Thread</value>
-    </property>
-    <property key="ListOwnCreatedTemplates">
-        <value xml:lang="de">Liste der selber erstellten Vorlagen</value>
-        <value xml:lang="en">List own created Templates</value>
-        <value xml:lang="fr">Voir vos propres modèles</value>
-    </property>
     <property key="PageTitleAddAssociation">
         <value xml:lang="ar">إضافة إرتباط</value>
         <value xml:lang="de">Eine Zuordnung hinzufügen</value>
@@ -3269,325 +3562,4 @@
         <value xml:lang="it">Sito Web CMS Contenuto</value>
         <value xml:lang="th">เว็บไซต์หัวข้อ CMS</value>
     </property>
-    <property key="PartyParties">
-        <value xml:lang="ar">الأطراف</value>
-        <value xml:lang="de">Akteure</value>
-        <value xml:lang="en">Parties</value>
-        <value xml:lang="fr">Acteurs</value>
-        <value xml:lang="it">Soggetti</value>
-        <value xml:lang="ro">Parteneri</value>
-        <value xml:lang="th">กลุ่มผู้ใช้</value>
-        <value xml:lang="zh">会员</value>
-    </property>
-    <property key="PartyPartyId">
-        <value xml:lang="ar">تعريف الطرف</value>
-        <value xml:lang="de">Akteur ID</value>
-        <value xml:lang="en">Party Id</value>
-        <value xml:lang="fr">Réf. d'acteur</value>
-        <value xml:lang="it">Codice Soggetto</value>
-        <value xml:lang="ro">Cod Partener</value>
-        <value xml:lang="th">รหัสกลุ่มผู้ใช้</value>
-        <value xml:lang="zh">会员标识</value>
-    </property>
-    <property key="ProductFeatures">
-        <value xml:lang="ar">خواص المنتوج</value>
-        <value xml:lang="de">Produktmerkmal</value>
-        <value xml:lang="en">Product Features</value>
-        <value xml:lang="fr">Caractéristiques de produit</value>
-        <value xml:lang="it">Caratteristiche Prodotto</value>
-        <value xml:lang="ro">Caracteristici Produs</value>
-        <value xml:lang="th">ลักษณะสินค้า</value>
-        <value xml:lang="zh">产品特征</value>
-    </property>
-    <property key="SurveryCategory">
-        <value xml:lang="ar">فئة</value>
-        <value xml:lang="de">Kategorie</value>
-        <value xml:lang="en">Category</value>
-        <value xml:lang="fr">Catégorie</value>
-        <value xml:lang="it">Categoria</value>
-        <value xml:lang="ro">Categoria</value>
-        <value xml:lang="th">หมวดหมู่</value>
-        <value xml:lang="zh">分类</value>
-    </property>
-    <property key="SurveyAddSurveyMultiResp">
-        <value xml:lang="ar">إضافة مجموعة جواب متعدد للتصويت</value>
-        <value xml:lang="de">Befragung Mehrfachantwortgruppe hinzufügen</value>
-        <value xml:lang="en">Add Survey Multi-Response Group</value>
-        <value xml:lang="es">Añadir Grupo de respuestas a encuesta</value>
-        <value xml:lang="fr">Ajouter un groupe multi-réponses au sondage</value>
-        <value xml:lang="it">Aggiungi Risposte Multiple Gruppo Sondaggio</value>
-        <value xml:lang="ro">Adauga Raspunsuri Multiple Grup Sondaj</value>
-        <value xml:lang="th">เพิ่มการสำรวจกลุ่มคำตอบ</value>
-        <value xml:lang="zh">新建有多个回答的调查的组</value>
-    </property>
-    <property key="SurveyAddSurveyMultiRespColumn">
-        <value xml:lang="ar">إضافة عمود جواب متعدد للتصويت</value>
-        <value xml:lang="de">Mehrfachantworten Spalte hinzufügen</value>
-        <value xml:lang="en">Add Survey Multi-Resp Column</value>
-        <value xml:lang="es">Añadir Columna de Grupo de respuestas</value>
-        <value xml:lang="fr">Ajouter une colonne multi-réponses au sondage</value>
-        <value xml:lang="it">Aggiungi Risposte Multiple Colonna Sondaggio</value>
-        <value xml:lang="ro">Adauga Raspunsuri Multiple Coloana Sondaj</value>
-        <value xml:lang="th">เพิ่มแถวการสำรวจคำตอบ</value>
-        <value xml:lang="zh">新建调查的多个回答的列</value>
-    </property>
-    <property key="SurveyApplyQuestionFromCategory">
-        <value xml:lang="ar">تكبيق الأسئلة من الفئة</value>
-        <value xml:lang="de">Frage(n) anwenden von Kategorie</value>
-        <value xml:lang="en">Apply Question(s) From Category</value>
-        <value xml:lang="fr">Appliquer les questions à partir de la catégorie</value>
-        <value xml:lang="it">Applica Domanda(e) Dalla Categoria</value>
-        <value xml:lang="ro">Aplica Intrebare(i) De la Categoria</value>
-        <value xml:lang="th">ใช้คำถามจากหมวดหมู่</value>
-        <value xml:lang="zh">从分类引用问题</value>
-    </property>
-    <property key="SurveyBuildRespondeFromPDF">
-        <value xml:lang="ar">بناء جواب التصويت من PDF</value>
-        <value xml:lang="de">Befragung Antwort erstellen von PDF</value>
-        <value xml:lang="en">Build Survey Response from PDF</value>
-        <value xml:lang="fr">Construire une réponse de sondage depuis le PDF</value>
-        <value xml:lang="it">Prepare Risposte Sondaggio Dal PDF</value>
-        <value xml:lang="ro">Prepara Raspuns Sondaj De la PDF</value>
-        <value xml:lang="th">สร้างการสำรวจคำตอบจาก PDF</value>
-        <value xml:lang="zh">从PDF建立调查回答</value>
-    </property>
-    <property key="SurveyCreate">
-        <value xml:lang="ar">إضافة تصويت</value>
-        <value xml:lang="de">Befragung erstellen</value>
-        <value xml:lang="en">Create Survey</value>
-        <value xml:lang="es">Crear Encuesta</value>
-        <value xml:lang="fr">Créer un sondage</value>
-        <value xml:lang="it">Creare Sondaggio</value>
-        <value xml:lang="ro">Creare Sondaj</value>
-        <value xml:lang="th">สร้างการสำรวจ</value>
-        <value xml:lang="zh">新建调查</value>
-    </property>
-    <property key="SurveyCreateQuestion">
-        <value xml:lang="ar">إضافة سؤال جديد</value>
-        <value xml:lang="de">Neue Frage erstellen</value>
-        <value xml:lang="en">Create New Question</value>
-        <value xml:lang="fr">Créer une nouvelle question</value>
-        <value xml:lang="it">Creare Nuova Domanda</value>
-        <value xml:lang="ro">Creare Noua Intrebare</value>
-        <value xml:lang="th">สร้างคำถามใหม่</value>
-        <value xml:lang="zh">新建问题</value>
-    </property>
-    <property key="SurveyCreateQuestionCategory">
-        <value xml:lang="ar">إضافة فئة سؤال</value>
-        <value xml:lang="de">Fragenkategorie erstellen</value>
-        <value xml:lang="en">Create Question Category</value>
-        <value xml:lang="fr">Créer la catégorie question</value>
-        <value xml:lang="it">Creare Categoria Domanda</value>
-        <value xml:lang="ro">Creare Categorie Intrebare</value>
-        <value xml:lang="th">สร้างคำถามหมวดหมู่คำถาม</value>
-        <value xml:lang="zh">新建问题分类</value>
-    </property>
-    <property key="SurveyCreateQuestionOption">
-        <value xml:lang="ar">إضافة زيادة سؤال</value>
-        <value xml:lang="de">Frage Wahlmöglichkeit erstellen</value>
-        <value xml:lang="en">Create Question Option</value>
-        <value xml:lang="fr">Créer la question option</value>
-        <value xml:lang="it">Creare Opzione Domanda</value>
-        <value xml:lang="ro">Creare Optiune Intrebare</value>
-        <value xml:lang="th">สร้างทางเลือกคำถาม</value>
-        <value xml:lang="zh">新建问题选项</value>
-    </property>
-    <property key="SurveyCreateResponse">
-        <value xml:lang="ar">إضافة جواب تصويت</value>
-        <value xml:lang="de">Befragung Anwort erstellen</value>
-        <value xml:lang="en">Create Survey Response</value>
-        <value xml:lang="es">Crear respuesta</value>
-        <value xml:lang="fr">Créer la réponse de sondage</value>
-        <value xml:lang="it">Creare Risposta Sondaggio</value>
-        <value xml:lang="ro">Creare Raspuns Sondaj</value>
-        <value xml:lang="th">สร้างคำตอบ</value>
-        <value xml:lang="zh">新建调查回答</value>
-    </property>
-    <property key="SurveyEditQuestionOption">
-        <value xml:lang="ar">تحرير زيادة سؤال</value>
-        <value xml:lang="de">Frage Wahlmöglichkeit bearbeiten</value>
-        <value xml:lang="en">Edit Question Option</value>
-        <value xml:lang="fr">Modifier la question option</value>
-        <value xml:lang="it">Aggiorna Opzione Domanda</value>
-        <value xml:lang="ro">Actualizeaza Optiune Intrebare</value>
-        <value xml:lang="th">แก้ไขลักษณะคำถาม</value>
-        <value xml:lang="zh">编辑问题选项</value>
-    </property>
-    <property key="SurveyEditSurveyMultiResp">
-        <value xml:lang="ar">تحرير مجموعة جواب متعدد للتصويت</value>
-        <value xml:lang="de">Befragung Mehrfachantwortgruppe bearbeiten</value>
-        <value xml:lang="en">Edit Survey Multi-Response Group</value>
-        <value xml:lang="es">Modificar grupo multi-respuesta</value>
-        <value xml:lang="fr">Modifier le groupe multi-réponses</value>
-        <value xml:lang="it">Aggiorna Risposte Multiple Gruppo Sondaggio</value>
-        <value xml:lang="ro">Actualizeaza Raspunsuri Multiple Grup Sondaj</value>
-        <value xml:lang="th">แก้ไขการสำรวจกลุ่มคำตอบ</value>
-        <value xml:lang="zh">编辑调查的多个回答的组</value>
-    </property>
-    <property key="SurveyFindResponse">
-        <value xml:lang="ar">إيجاد جواب</value>
-        <value xml:lang="de">Antwort suchen</value>
-        <value xml:lang="en">Find Response</value>
-        <value xml:lang="es">Buscar respuesta</value>
-        <value xml:lang="fr">Rechercher la réponse</value>
-        <value xml:lang="it">Ricerca Risposta</value>
-        <value xml:lang="ro">Cautare Raspuns</value>
-        <value xml:lang="th">ค้นหาคำตอบ</value>
-        <value xml:lang="zh">查找回答</value>
-    </property>
-    <property key="SurveyGenerateQuestions">
-        <value xml:lang="ar">لإستخراج الأسئلة من إستمارة أكرو PDF</value>
-        <value xml:lang="de">Fragen von AcroForm PDF erstellen</value>
-        <value xml:lang="en">Generate Questions from AcroForm PDF</value>
-        <value xml:lang="fr">Générer les questions depuis AcroForm PDF</value>
-        <value xml:lang="it">Genera Domande da AcroForm PDF</value>
-        <value xml:lang="ro">GenereazaIntrebari de la  AcroForm PDF</value>
-        <value xml:lang="th">สร้างคำถามจากรูปแบบใน PDF</value>
-        <value xml:lang="zh">从AcroForm PDF生成问题</value>
-    </property>
-    <property key="SurveyMultiResp">
-        <value xml:lang="ar">جواب متعدد</value>
-        <value xml:lang="de">Mehrfach-Antwort</value>
-        <value xml:lang="en">Multi-Resp</value>
-        <value xml:lang="fr">multi-réponses</value>
-        <value xml:lang="it">Risposta Multipla</value>
-        <value xml:lang="ro">Raspuns Multiplu</value>
-        <value xml:lang="th">หลายคำตอบ</value>
-        <value xml:lang="zh">多个回答</value>
-    </property>
-    <property key="SurveyMultiRespColumn">
-        <value xml:lang="ar">عمود جواب متعدد</value>
-        <value xml:lang="de">Mehrfach-Antwort Spalte</value>
-        <value xml:lang="en">Multi-Resp Column</value>
-        <value xml:lang="fr">Colonne multi-réponses</value>
-        <value xml:lang="it">Colonna Risposta Multipla</value>
-        <value xml:lang="ro">Coloana Raspuns Multiplu</value>
-        <value xml:lang="th">ช่องของหลายคำตอบ</value>
-        <value xml:lang="zh">多个回答列</value>
-    </property>
-    <property key="SurveyMultiResps">
-        <value xml:lang="ar">أجوبة متعددة</value>
-        <value xml:lang="de">Mehrfach Antworten</value>
-        <value xml:lang="en">Multi-Resps</value>
-        <value xml:lang="es">Multi-respuesta</value>
-        <value xml:lang="fr">Multi-réponses</value>
-        <value xml:lang="it">Risposte Multiple</value>
-        <value xml:lang="ro">Raspunsuri Multiple</value>
-        <value xml:lang="th">หลายคำตอบ</value>
-        <value xml:lang="zh">多个回答</value>
-    </property>
-    <property key="SurveyNoQuestions">
-        <value xml:lang="ar">لا أسئلة في التصويت, لا يمكن إيجاد أجوية</value>
-        <value xml:lang="de">Keine Fragen in Befragung; keine Antworten können gefunden werden.</value>
-        <value xml:lang="en">No questions in survey; no responses can be located.</value>
-        <value xml:lang="fr">Aucune question dans le sondage, aucune réponse ne peut être localisée.</value>
-        <value xml:lang="it">Nessuna domanda nel sondaggio; nessuna risposta può essere localizzata.</value>
-        <value xml:lang="ro">Nici-o intrebare in sondaj; nu poate fi localizat nici-un raspuns.</value>
-        <value xml:lang="th">ไม่มีคำถามในการสำรวจ;ไม่สามารถสร้างคำตอบได้</value>
-        <value xml:lang="zh">调查中没有问题；无法定位回答。</value>
-    </property>
-    <property key="SurveyOption">
-        <value xml:lang="ar">إختيار</value>
-        <value xml:lang="de">Auswahl</value>
-        <value xml:lang="en">Option</value>
-        <value xml:lang="fr">Option</value>
-        <value xml:lang="it">Opzione</value>
-        <value xml:lang="ro">Optiune</value>
-        <value xml:lang="th">ทางเลือก</value>
-        <value xml:lang="zh">选项</value>
-    </property>
-    <property key="SurveyOptions">
-        <value xml:lang="ar">إختيارات التصويت</value>
-        <value xml:lang="de">Befragung Auswahl</value>
-        <value xml:lang="en">Survey Options</value>
-        <value xml:lang="fr">Options du sondage</value>
-        <value xml:lang="it">Opzioni Sondaggio</value>
-        <value xml:lang="ro">Optiune Sondaj</value>
-        <value xml:lang="th">การสำรวจทางเลือก</value>
-        <value xml:lang="zh">调查选项</value>
-    </property>
-    <property key="SurveyQuestion">
-        <value xml:lang="ar">سؤال</value>
-        <value xml:lang="de">Frage</value>
-        <value xml:lang="en">Question</value>
-        <value xml:lang="fr">Question</value>
-        <value xml:lang="it">Domanda</value>
-        <value xml:lang="ro">Intrebare</value>
-        <value xml:lang="th">คำถาม</value>
-        <value xml:lang="zh">问题</value>
-    </property>
-    <property key="SurveyQuestions">
-        <value xml:lang="ar">أسئلة</value>
-        <value xml:lang="de">Fragen</value>
-        <value xml:lang="en">Questions</value>
-        <value xml:lang="es">Preguntas</value>
-        <value xml:lang="fr">Questions</value>
-        <value xml:lang="it">Domande</value>
-        <value xml:lang="ro">Intrebari</value>
-        <value xml:lang="th">คำถาม</value>
-        <value xml:lang="zh">问题</value>
-    </property>
-    <property key="SurveyResponse">
-        <value xml:lang="ar">جواب</value>
-        <value xml:lang="de">Antwort</value>
-        <value xml:lang="en">Response</value>
-        <value xml:lang="fr">Réponse</value>
-        <value xml:lang="it">Risposta</value>
-        <value xml:lang="ro">Raspuns</value>
-        <value xml:lang="th">คำตอบ</value>
-        <value xml:lang="zh">回答</value>
-    </property>
-    <property key="SurveyResponseSummary">
-        <value xml:lang="ar">ماخص الجواب</value>
-        <value xml:lang="de">Antwort Zusammenfassung</value>
-        <value xml:lang="en">Response Summary</value>
-        <value xml:lang="es">Resumen de respuestas</value>
-        <value xml:lang="fr">Résumé de réponse</value>
-        <value xml:lang="it">Sommario Risposta</value>
-        <value xml:lang="ro">Sumar Raspuns</value>
-        <value xml:lang="th">คำตอบโดยสรุป</value>
-        <value xml:lang="zh">回答摘要</value>
-    </property>
-    <property key="SurveyResponses">
-        <value xml:lang="ar">أجوية</value>
-        <value xml:lang="de">Antworten</value>
-        <value xml:lang="en">Responses</value>
-        <value xml:lang="es">Respuestas</value>
-        <value xml:lang="fr">Réponses</value>
-        <value xml:lang="it">Risposte</value>
-        <value xml:lang="ro">Raspunsuri</value>
-        <value xml:lang="th">คำตอบ</value>
-        <value xml:lang="zh">回答</value>
-    </property>
-    <property key="SurveySurveyId">
-        <value xml:lang="ar">تعريف التصويت</value>
-        <value xml:lang="de">Befragung ID</value>
-        <value xml:lang="en">Survey ID</value>
-        <value xml:lang="es">Id de Encuesta</value>
-        <value xml:lang="fr">Réf. de sondage</value>
-        <value xml:lang="it">Numero Sondaggio</value>
-        <value xml:lang="ro">Numer Sondaj</value>
-        <value xml:lang="th">รหัสการสำรวจ</value>
-        <value xml:lang="zh">调查编号</value>
-    </property>
-    <property key="SurveyWithOption">
-        <value xml:lang="ar">مع إختيار</value>
-        <value xml:lang="de">Mit Auswahl</value>
-        <value xml:lang="en">W/Option</value>
-        <value xml:lang="fr">Avec option</value>
-        <value xml:lang="it">Con Opzione</value>
-        <value xml:lang="ro">Cu Optiune</value>
-        <value xml:lang="th">W/ทางเลือก </value>
-        <value xml:lang="zh">带有选项</value>
-    </property>
-    <property key="SurveyWithQuestion">
-        <value xml:lang="ar">مع سؤال</value>
-        <value xml:lang="de">Mit Frage</value>
-        <value xml:lang="en">W/Question</value>
-        <value xml:lang="fr">Avec question</value>
-        <value xml:lang="it">Con Domanda</value>
-        <value xml:lang="ro">Cu Intrebare</value>
-        <value xml:lang="th">W/คำถาม</value>
-        <value xml:lang="zh">带有问题</value>
-    </property>
 </resource>
Index: applications/content/widget/cms/CMSScreens.xml
===================================================================
--- applications/content/widget/cms/CMSScreens.xml	(revision 730996)
+++ applications/content/widget/cms/CMSScreens.xml	(working copy)
@@ -238,6 +238,7 @@
                 <set field="title" value="CMS Search Page"/>
                 <set field="titleProperty" value="PageTitleSearchContent"/>
                 <set field="currentCMSMenuItemName" value="search" to-scope="user"/>
+                <property-map map-name="uiLabelMap" resource="ProductUiLabels"/>
             </actions>
             <widgets>
                 <decorator-screen name="commonCmsDecorator" location="${parameters.mainDecoratorLocation}">
Index: applications/content/widget/forum/ForumScreens.xml
===================================================================
--- applications/content/widget/forum/ForumScreens.xml	(revision 730996)
+++ applications/content/widget/forum/ForumScreens.xml	(working copy)
@@ -71,7 +71,7 @@
             <widgets>
                 <decorator-screen name="commonForumDecorator" location="${parameters.forumDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet id="ForumGroupPanel" title="${uiLabelMap.ForumGroupCreate}" collapsible="true">
+                        <screenlet id="ForumGroupPanel" title="${uiLabelMap.ContentForumGroupCreate}" collapsible="true">
                             <include-form name="AddForumGroup" location="component://content/widget/forum/ForumForms.xml"/>
                         </screenlet>
                         <include-form name="ListForumGroups" location="component://content/widget/forum/ForumForms.xml"/>
@@ -100,7 +100,7 @@
             <widgets>
                 <decorator-screen name="commonForumDecorator" location="${parameters.forumDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet id="AddForumToForumGroupPanel" title="${uiLabelMap.ForumAddTo} ${forumGroup.contentName}" collapsible="true">
+                        <screenlet id="AddForumToForumGroupPanel" title="${uiLabelMap.ContentForumAddTo} ${forumGroup.contentName}" collapsible="true">
                             <include-form name="AddForum" location="component://content/widget/forum/ForumForms.xml"/>
                         </screenlet>
                         <include-form name="ListForums" location="component://content/widget/forum/ForumForms.xml"/>
@@ -129,7 +129,7 @@
             <widgets>
                 <decorator-screen name="commonForumDecorator" location="${parameters.forumDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet id="ForumGroupRolePanel" title="${uiLabelMap.ForumAddRoleTo} ${forumGroup.contentName} [${forumGroup.contentId}]" collapsible="true">
+                        <screenlet id="ForumGroupRolePanel" title="${uiLabelMap.ContentForumAddRoleTo} ${forumGroup.contentName} [${forumGroup.contentId}]" collapsible="true">
                             <include-form name="AddForumGroupRole" location="component://content/widget/forum/ForumForms.xml"/>
                         </screenlet>
                         <include-form name="ForumGroupRoles" location="component://content/widget/forum/ForumForms.xml"/>
@@ -158,7 +158,7 @@
             <widgets>
                 <decorator-screen name="commonForumDecorator" location="${parameters.forumDecoratorLocation}">
                     <decorator-section name="body">
-                        <screenlet id="ForumGroupPurposePanel" title="${uiLabelMap.ForumAddPurposeTo} ${forumGroup.contentName} [${forumGroup.contentId}]" collapsible="true">
+                        <screenlet id="ForumGroupPurposePanel" title="${uiLabelMap.ContentForumAddPurposeTo} ${forumGroup.contentName} [${forumGroup.contentId}]" collapsible="true">
                             <include-form name="AddForumGroupPurpose" location="component://content/widget/forum/ForumForms.xml"/>
                         </screenlet>
                         <include-form name="ForumGroupPurposes" location="component://content/widget/forum/ForumForms.xml"/>
@@ -195,7 +195,7 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.ForumAddThreadTo} ${forum.description}"/>
+                                    <label text="${uiLabelMap.ContentForumAddThreadTo} ${forum.description}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
@@ -258,7 +258,7 @@
                                 <container style="screenlet">
                                     <container style="screenlet-title-bar">
                                         <container style="h3">
-                                            <label text="${uiLabelMap.ForumThread} ${parameters.forumThreadId}"/>
+                                            <label text="${uiLabelMap.ContentForumThread} ${parameters.forumThreadId}"/>
                                         </container>
                                     </container>
                                     <container style="screenlet-body">
@@ -279,7 +279,7 @@
                                         <container style="screenlet">
                                             <container style="screenlet-title-bar">
                                                 <container style="h3">
-                                                    <label text="${uiLabelMap.ForumMessage} ${parameters.forumMessageId}"/>
+                                                    <label text="${uiLabelMap.ContentForumMessage} ${parameters.forumMessageId}"/>
                                                 </container>
                                             </container>
                                             <container style="screenlet-body">
@@ -314,7 +314,7 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.ForumAddResponseToMessage} ${contentData.resultData.content.description}"/>
+                                    <label text="${uiLabelMap.ContentForumAddResponseToMessage} ${contentData.resultData.content.description}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
@@ -350,7 +350,7 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.ForumAddResponseToMessage} ${forumMessage.description}"/>
+                                    <label text="${uiLabelMap.ContentForumAddResponseToMessage} ${forumMessage.description}"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
@@ -386,7 +386,7 @@
                         <container style="screenlet">
                             <container style="screenlet-title-bar">
                                 <container style="h3">
-                                    <label text="${uiLabelMap.ForumAddResponseToMessage} ${forumMessage.description} [${forumMessage.contentId}]"/>
+                                    <label text="${uiLabelMap.ContentForumAddResponseToMessage} ${forumMessage.description} [${forumMessage.contentId}]"/>
                                 </container>
                             </container>
                             <container style="screenlet-body">
Index: applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
===================================================================
--- applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl	(revision 730996)
+++ applications/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl	(working copy)
@@ -387,7 +387,7 @@
           <div id="shippingOptionSummaryPanel" class="screenlet-body" style="display: none;">
             <div><h3><span><a class="buttontext" href="javascript:void(0);" id="openShippingOptionPanel">${uiLabelMap.EcommerceClickHereToEdit}</a></span></h3></div>
             <div class="completed" id="shippingOptionCompleted">
-              <div align="center" id="openShippingOption"><h3>${uiLabelMap.FacilityShipping} ${uiLabelMap.SurveyOption} ${uiLabelMap.EcommerceSummary}</h3></div>
+              <div align="center" id="openShippingOption"><h3>${uiLabelMap.FacilityShipping} ${uiLabelMap.ContentSurveyOption} ${uiLabelMap.EcommerceSummary}</h3></div>
               <table cellpadding="0" cellspacing="0">
                 <tbody>
                   <tr>
Index: applications/product/config/ProductUiLabels.xml
===================================================================
--- applications/product/config/ProductUiLabels.xml	(revision 730996)
+++ applications/product/config/ProductUiLabels.xml	(working copy)
@@ -10517,6 +10517,7 @@
         <value xml:lang="fr">Interaction entre caractéristiques</value>
     </property>
     <property key="ProductFeatures">
+        <value xml:lang="ar">خواص المنتوج</value>
         <value xml:lang="de">Merkmale</value>
         <value xml:lang="en">Features</value>
         <value xml:lang="es">Características</value>
Index: applications/content/webapp/content/survey/EditSurveyQuestions.ftl
===================================================================
--- applications/content/webapp/content/survey/EditSurveyQuestions.ftl	(revision 730996)
+++ applications/content/webapp/content/survey/EditSurveyQuestions.ftl	(working copy)
@@ -19,7 +19,7 @@
 <div class="screenlet">
   <div class="screenlet-title-bar">
     <ul>
-      <li class="h3">${uiLabelMap.PageTitleEditSurveyQuestions} ${uiLabelMap.SurveySurveyId} ${surveyId}</li>
+      <li class="h3">${uiLabelMap.PageTitleEditSurveyQuestions} ${uiLabelMap.ContentSurveySurveyId} ${surveyId}</li>
     </ul>
     <br class="clear"/>
   </div>  
@@ -28,16 +28,16 @@
         <tr class="header-row">
           <td>${uiLabelMap.CommonId}</td>
           <td>${uiLabelMap.CommonType}</td>
-          <td>${uiLabelMap.SurveryCategory}</td>
+          <td>${uiLabelMap.ContentSurveryCategory}</td>
           <td>${uiLabelMap.CommonDescription}</td>
-          <td>${uiLabelMap.SurveyQuestion}</td>
+          <td>${uiLabelMap.ContentSurveyQuestion}</td>
           <td>${uiLabelMap.CommonPage}</td>
-          <td>${uiLabelMap.SurveyMultiResp}</td>
-          <td>${uiLabelMap.SurveyMultiRespColumn}</td>
+          <td>${uiLabelMap.ContentSurveyMultiResp}</td>
+          <td>${uiLabelMap.ContentSurveyMultiRespColumn}</td>
           <td>${uiLabelMap.CommonRequired}</td>
           <td>${uiLabelMap.CommonSequenceNum}</td>
-          <td>${uiLabelMap.SurveyWithQuestion}</td>
-          <td>${uiLabelMap.SurveyWithOption}</td>
+          <td>${uiLabelMap.ContentSurveyWithQuestion}</td>
+          <td>${uiLabelMap.ContentSurveyWithOption}</td>
           <td>&nbsp;</td>
           <td>&nbsp;</td>
           <td>&nbsp;</td>
@@ -115,7 +115,7 @@
               <td><input type="text" name="withSurveyQuestionId" size="5" value="${surveyQuestionAndAppl.withSurveyQuestionId?if_exists}"/></td>
               <td><input type="text" name="withSurveyOptionSeqId" size="5" value="${surveyQuestionAndAppl.withSurveyOptionSeqId?if_exists}"/></td>
               <td><input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/></td>
-              <td><a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${surveyQuestionAndAppl.surveyQuestionId}#edit</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}&nbsp;${uiLabelMap.SurveyQuestion}</a></td>
+              <td><a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${surveyQuestionAndAppl.surveyQuestionId}#edit</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}&nbsp;${uiLabelMap.ContentSurveyQuestion}</a></td>
               <td><a href="<@ofbizUrl>removeSurveyQuestionAppl?surveyId=${surveyQuestionAndAppl.surveyId}&surveyQuestionId=${surveyQuestionAndAppl.surveyQuestionId}&fromDate=${surveyQuestionAndAppl.fromDate}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a></td>
             </tr>
           </form>
@@ -129,7 +129,7 @@
     <div class="screenlet">
       <div class="screenlet-title-bar">
         <ul>
-          <li class="h3">${uiLabelMap.SurveyApplyQuestionFromCategory} - ${surveyQuestionCategory.description?if_exists} [${surveyQuestionCategory.surveyQuestionCategoryId}]</li>
+          <li class="h3">${uiLabelMap.ContentSurveyApplyQuestionFromCategory} - ${surveyQuestionCategory.description?if_exists} [${surveyQuestionCategory.surveyQuestionCategoryId}]</li>
         </ul>
         <br class="clear"/>
       </div>  
@@ -140,14 +140,14 @@
                 <td>${uiLabelMap.CommonId}</td>
                 <td>${uiLabelMap.CommonDescription}</td>
                 <td>${uiLabelMap.CommonType}</td>
-                <td>${uiLabelMap.SurveyQuestion}</td>
+                <td>${uiLabelMap.ContentSurveyQuestion}</td>
                 <td>${uiLabelMap.CommonPage}</td>
-                <td>${uiLabelMap.SurveyMultiResp}</td>
-                <td>${uiLabelMap.SurveyMultiRespColumn}</td>
+                <td>${uiLabelMap.ContentSurveyMultiResp}</td>
+                <td>${uiLabelMap.ContentSurveyMultiRespColumn}</td>
                 <td>${uiLabelMap.CommonRequired}</td>
                 <td>${uiLabelMap.CommonSequenceNum}</td>
-                <td>${uiLabelMap.SurveyWithQuestion}</td>
-                <td>${uiLabelMap.SurveyWithOption}</td>
+                <td>${uiLabelMap.ContentSurveyWithQuestion}</td>
+                <td>${uiLabelMap.ContentSurveyWithOption}</td>
                 <td>&nbsp;</td>
               </tr>
           <#assign alt_row = false>
@@ -200,7 +200,7 @@
 <div class="screenlet">
   <div class="screenlet-title-bar">
     <ul>
-      <li class="h3">${uiLabelMap.SurveyApplyQuestionFromCategory}</li>
+      <li class="h3">${uiLabelMap.ContentSurveyApplyQuestionFromCategory}</li>
     </ul>
     <br class="clear"/>
   </div>  
@@ -222,19 +222,19 @@
   <#if requestParameters.newCategory?default("N") == "Y">
     <div class="screenlet-title-bar">
       <ul>
-        <li class="h3">${uiLabelMap.SurveyCreateQuestionCategory}</li>
+        <li class="h3">${uiLabelMap.ContentSurveyCreateQuestionCategory}</li>
       </ul>
       <br class="clear"/>
     </div>  
     <div class="screenlet-body">
-      <a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.SurveyQuestion}</a>
+      <a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.ContentSurveyQuestion}</a>
       <br/><br/>
       ${createSurveyQuestionCategoryWrapper.renderFormString(context)}
   <#else>
     <#if surveyQuestionId?has_content>
     <div class="screenlet-title-bar">
       <ul>
-        <li class="h3">${uiLabelMap.CommonEdit} ${uiLabelMap.SurveyQuestion}</li>
+        <li class="h3">${uiLabelMap.CommonEdit} ${uiLabelMap.ContentSurveyQuestion}</li>
       </ul>
       <br class="clear"/>
     </div>  
@@ -243,13 +243,13 @@
     <#else>
     <div class="screenlet-title-bar">
       <ul>
-        <li class="h3">${uiLabelMap.SurveyCreateQuestion}</li>
+        <li class="h3">${uiLabelMap.ContentSurveyCreateQuestion}</li>
       </ul>
       <br class="clear"/>
     </div>  
     <div class="screenlet-body">
     </#if>
-    <a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&newCategory=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.SurveyQuestion} ${uiLabelMap.SurveryCategory}</a>
+    <a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&newCategory=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNew} ${uiLabelMap.ContentSurveyQuestion} ${uiLabelMap.ContentSurveryCategory}</a>
     <br/><br/>
     ${createSurveyQuestionWrapper.renderFormString(context)}
   </#if>
@@ -259,7 +259,7 @@
 <div class="screenlet">
   <div class="screenlet-title-bar">
     <ul>
-      <li class="h3">${uiLabelMap.SurveyOptions} - ${uiLabelMap.CommonId} ${surveyQuestion.surveyQuestionId?if_exists}</li>
+      <li class="h3">${uiLabelMap.ContentSurveyOptions} - ${uiLabelMap.CommonId} ${surveyQuestion.surveyQuestionId?if_exists}</li>
     </ul>
     <br class="clear"/>
   </div>  
@@ -288,7 +288,7 @@
     <#if !surveyQuestionOption?has_content>
     <div class="screenlet-title-bar">
       <ul>
-        <li class="h3">${uiLabelMap.SurveyCreateQuestionOption}</li>
+        <li class="h3">${uiLabelMap.ContentSurveyCreateQuestionOption}</li>
       </ul>
       <br class="clear"/>
     </div>  
@@ -296,12 +296,12 @@
     <#else>
     <div class="screenlet-title-bar">
       <ul>
-        <li class="h3">${uiLabelMap.SurveyEditQuestionOption}}</li>
+        <li class="h3">${uiLabelMap.ContentSurveyEditQuestionOption}</li>
       </ul>
       <br class="clear"/>
     </div>  
     <div class="screenlet-body">
-      <a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${surveyQuestionOption.surveyQuestionId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNew} ${uiLabelMap.SurveyOption}]</a>
+      <a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${surveyQuestionOption.surveyQuestionId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNew} ${uiLabelMap.ContentSurveyOption}]</a>
     </#if>
     ${createSurveyOptionWrapper.renderFormString()}
   </#if>