diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index c669831ae..bafec829f 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -1,8 +1,8 @@ msgid "" msgstr "" -"Project-Id-Version: ProcessMaker (Branch 2.0-experimental) dummy-126-g6fb2f2d\n" +"Project-Id-Version: ProcessMaker (Branch master) 2.0.41-testing.4-83-g1eee9e8\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2012-05-31 19:14:21\n" +"PO-Revision-Date: 2012-06-18 19:24:33\n" "Last-Translator: \n" "Language-Team: Colosa Developers Team \n" "MIME-Version: 1.0\n" @@ -424,8 +424,8 @@ msgstr "Members" # TRANSLATION # LABEL/ID_MSG_CONFIRM_DELETE_GROUP #: LABEL/ID_MSG_CONFIRM_DELETE_GROUP -msgid "Draft" -msgstr "Draft" +msgid "Are you sure to delete this group?" +msgstr "Are you sure to delete this group?" # TRANSLATION # LABEL/ID_INCORRECT_EMAIL @@ -568,7 +568,7 @@ msgstr "Not sent" # TRANSLATION # LABEL/ID_DRAFT #: LABEL/ID_DRAFT -msgid "[LABEL/ID_DRAFT] Draft" +msgid "Draft" msgstr "Draft" # TRANSLATION @@ -1060,14 +1060,14 @@ msgstr "Before Assignment" # TRANSLATION # LABEL/ID_BEFORE_DERIVATION #: LABEL/ID_BEFORE_DERIVATION -msgid "Before Derivation" -msgstr "Before Derivation" +msgid "Before Routing" +msgstr "Before Routing" # TRANSLATION # LABEL/ID_AFTER_DERIVATION #: LABEL/ID_AFTER_DERIVATION -msgid "After Derivation" -msgstr "After Derivation" +msgid "After Routing" +msgstr "After Routing" # TRANSLATION # LABEL/ID_BEFORE @@ -1102,8 +1102,8 @@ msgstr "Enabled" # TRANSLATION # JAVASCRIPT/ID_NO_DERIVATIONS_DEFINED #: JAVASCRIPT/ID_NO_DERIVATIONS_DEFINED -msgid "No derivations were defined." -msgstr "No derivations were defined." +msgid "No routings were defined." +msgstr "No routings were defined." # TRANSLATION # LABEL/ID_ROWS @@ -7954,8 +7954,8 @@ msgstr "Map Type" # TRANSLATION # LABEL/ID_DERIVATION_HISTORY #: LABEL/ID_DERIVATION_HISTORY -msgid "Derivation History" -msgstr "Derivation History" +msgid "Routing History" +msgstr "Routing History" # TRANSLATION # LABEL/ID_MESSAGES_HISTORY @@ -12451,6 +12451,48 @@ msgstr "Import Report Table" msgid "Displaying Report Tables {0} - {1} of {2}" msgstr "Displaying Report Tables {0} - {1} of {2}" +# TRANSLATION +# LABEL/ID_SKIN_EXCEPTION +#: LABEL/ID_SKIN_EXCEPTION +msgid "Skin Engine Exception" +msgstr "Skin Engine Exception" + +# TRANSLATION +# LABEL/ID_SKIN_LAYOUT_NOT_FOUND +#: LABEL/ID_SKIN_LAYOUT_NOT_FOUND +msgid "Layout not Found" +msgstr "Layout not Found" + +# TRANSLATION +# LABEL/ID_SKIN_INCORRECT_VERIFY_URL +#: LABEL/ID_SKIN_INCORRECT_VERIFY_URL +msgid "You're trying to get a resource from an incorrect skin, please verify your url." +msgstr "You're trying to get a resource from an incorrect skin, please verify your url." + +# TRANSLATION +# LABEL/ID_REDIRECT_URL +#: LABEL/ID_REDIRECT_URL +msgid "The System can try to redirect to the correct url. Try Now." +msgstr "The System can try to redirect to the correct url. Try Now." + +# TRANSLATION +# LABEL/ID_PASSWORD_TESTING +#: LABEL/ID_PASSWORD_TESTING +msgid "Testing password" +msgstr "Testing password" + +# TRANSLATION +# LABEL/ID_TRUE +#: LABEL/ID_TRUE +msgid "TRUE" +msgstr "TRUE" + +# TRANSLATION +# LABEL/ID_FALSE +#: LABEL/ID_FALSE +msgid "FALSE" +msgstr "FALSE" + # additionalTables/additionalTablesData.xml?ADD_TAB_NAME # additionalTables/additionalTablesData.xml #: text - ADD_TAB_NAME @@ -13363,10 +13405,10 @@ msgstr "Import" msgid "[authSources/authSources_SearchUsers.xml?BTN_CANCEL] Cancel" msgstr "Cancel" -# authSources/authSources_SearchUsers.xml?CheckboxSelectAll -# authSources/authSources_SearchUsers.xml -#: Checkbox - CheckboxSelectAll -msgid "[authSources/authSources_SearchUsers.xml?CheckboxSelectAll] " +# authSources/authSources_SearchUsersMenu.xml?SelectAll +# authSources/authSources_SearchUsersMenu.xml +#: link - SelectAll +msgid "[authSources/authSources_SearchUsersMenu.xml?SelectAll] " msgstr "" # authSources/authSources_SelectType.xml?TITLE @@ -13498,7 +13540,7 @@ msgstr "Yes" # authSources/ldapEdit.xml?AUTH_SOURCE_SEARCH_USER # authSources/ldapEdit.xml #: text - AUTH_SOURCE_SEARCH_USER -msgid "[authSources/ldapEdit.xml?AUTH_SOURCE_SEARCH_USER] Search User" +msgid "Search User" msgstr "Search User" # authSources/ldapEdit.xml?AUTH_SOURCE_PASSWORD @@ -17255,7 +17297,7 @@ msgstr "In Progress" # cases/cases_TransferHistory.xml #: dropdown - APP_TYPE - msgid "[cases/cases_TransferHistory.xml?APP_TYPE-]" -msgstr "Derivated" +msgstr "Routed" # cases/cases_TransferHistory.xml?APP_TYPE-REASSIGN # cases/cases_TransferHistory.xml @@ -21539,42 +21581,6 @@ msgstr "Send Request" msgid "[login/forgotPassword.xml?BCANCEL] Cancel" msgstr "Cancel" -# login/login (copy).xml?TITLE -# login/login (copy).xml -#: title - TITLE -msgid "[login/login (copy).xml?TITLE] Login" -msgstr "Login" - -# login/login (copy).xml?USR_USERNAME -# login/login (copy).xml -#: text - USR_USERNAME -msgid "[login/login (copy).xml?USR_USERNAME] User" -msgstr "User" - -# login/login (copy).xml?USR_PASSWORD -# login/login (copy).xml -#: password - USR_PASSWORD -msgid "[login/login (copy).xml?USR_PASSWORD] Password" -msgstr "Password" - -# login/login (copy).xml?USER_LANG -# login/login (copy).xml -#: dropdown - USER_LANG -msgid "[login/login (copy).xml?USER_LANG] Language" -msgstr "Language" - -# login/login (copy).xml?BSUBMIT -# login/login (copy).xml -#: submit - BSUBMIT -msgid "[login/login (copy).xml?BSUBMIT] Login" -msgstr "Login" - -# login/login (copy).xml?FORGOT_PASWORD_LINK -# login/login (copy).xml -#: link - FORGOT_PASWORD_LINK -msgid "[login/login (copy).xml?FORGOT_PASWORD_LINK] Forgot Password" -msgstr "Forgot Password" - # login/login.xml?TITLE # login/login.xml #: title - TITLE @@ -23300,8 +23306,8 @@ msgstr "- Default summary Dynaform -" # processes/processes_Edit.xml?PRO_DERIVATION_SCREEN_TPL # processes/processes_Edit.xml #: dropdown - PRO_DERIVATION_SCREEN_TPL -msgid "Derivation Screen Template" -msgstr "Derivation Screen Template" +msgid "Routing Screen Template" +msgstr "Routing Screen Template" # processes/processes_Edit.xml?PRO_DERIVATION_SCREEN_TPL- # processes/processes_Edit.xml @@ -28808,8 +28814,8 @@ msgstr "Variable for Case priority" # tasks/tasks_Definition.xml?TAS_DERIVATION_SCREEN_TPL # tasks/tasks_Definition.xml #: dropdown - TAS_DERIVATION_SCREEN_TPL -msgid "[tasks/tasks_Definition.xml?TAS_DERIVATION_SCREEN_TPL] Derivation Screen Template" -msgstr "Derivation Screen Template" +msgid "[tasks/tasks_Definition.xml?TAS_DERIVATION_SCREEN_TPL] Routing Screen Template" +msgstr "Routing Screen Template" # tasks/tasks_Definition.xml?TAS_DERIVATION_SCREEN_TPL- # tasks/tasks_Definition.xml @@ -29252,8 +29258,8 @@ msgstr "Edit" # tracker/tracker_Configuration.xml?CT_DERIVATION_HISTORY # tracker/tracker_Configuration.xml #: checkbox - CT_DERIVATION_HISTORY -msgid "[tracker/tracker_Configuration.xml?CT_DERIVATION_HISTORY] Derivation History" -msgstr "Derivation History" +msgid "[tracker/tracker_Configuration.xml?CT_DERIVATION_HISTORY] Routing History" +msgstr "Routing History" # tracker/tracker_Configuration.xml?CT_MESSAGE_HISTORY # tracker/tracker_Configuration.xml @@ -29487,7 +29493,7 @@ msgstr "Cancelled" # tracker/tracker_TransferHistory.xml #: dropdown - APP_TYPE - msgid "[tracker/tracker_TransferHistory.xml?APP_TYPE-]" -msgstr "Derivated" +msgstr "Routed" # tracker/tracker_ViewAnyInputDocument.xml?FILENAME # tracker/tracker_ViewAnyInputDocument.xml diff --git a/workflow/engine/data/mssql/insert.sql b/workflow/engine/data/mssql/insert.sql index 1f8b1932c..8e17b2043 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -3,7 +3,8 @@ SELECT '00000000000000000000000000000001','admin','21232f297a57a5a743894a0e4a801 INSERT INTO [CONTENT] ([CON_CATEGORY],[CON_PARENT],[CON_ID],[CON_LANG],[CON_VALUE]) SELECT 'ROL_NAME','','00000000000000000000000000000002','en','System Administrator' UNION ALL -SELECT 'ROL_NAME','','00000000000000000000000000000003','en','Operator'; +SELECT 'ROL_NAME','','00000000000000000000000000000003','en','Operator' UNION ALL +SELECT 'ROL_NAME','','00000000000000000000000000000004','en','Manager'; INSERT INTO [LANGUAGE] ([LAN_ID],[LAN_NAME],[LAN_NATIVE_NAME],[LAN_DIRECTION],[LAN_WEIGHT],[LAN_ENABLED],[LAN_CALENDAR]) SELECT 'aa','Afar','','L','0','0','GREGORIAN' UNION ALL @@ -1523,7 +1524,7 @@ SELECT 'LABEL','ID_NEW_GROUP','en','New','2012-06-01' UNION ALL SELECT 'LABEL','ID_MEMBERS','en','Members','2012-06-01' UNION ALL -SELECT 'LABEL','ID_MSG_CONFIRM_DELETE_GROUP','en','Draft','2012-06-01' +SELECT 'LABEL','ID_MSG_CONFIRM_DELETE_GROUP','en','Are you sure to delete this group?','2012-06-11' UNION ALL SELECT 'LABEL','ID_INCORRECT_EMAIL','en','Your E-mail address is not valid.','2012-06-01' UNION ALL @@ -1739,9 +1740,9 @@ SELECT 'LABEL','ID_PROCESS_MAP','en','Process Map','2012-06-01' UNION ALL SELECT 'LABEL','ID_BEFORE_ASSIGNMENT','en','Before Assignment','2012-06-01' UNION ALL -SELECT 'LABEL','ID_BEFORE_DERIVATION','en','Before Derivation','2012-06-01' +SELECT 'LABEL','ID_BEFORE_DERIVATION','en','Before Routing','2012-06-18' UNION ALL -SELECT 'LABEL','ID_AFTER_DERIVATION','en','After Derivation','2012-06-01' +SELECT 'LABEL','ID_AFTER_DERIVATION','en','After Routing','2012-06-18' UNION ALL SELECT 'LABEL','ID_BEFORE','en','Before','2012-06-01' UNION ALL @@ -1753,7 +1754,7 @@ SELECT 'LABEL','ID_TRANSFER_HISTORY','en','Transfer History','2012-06-01' UNION ALL SELECT 'LABEL','ID_ENABLED','en','Enabled','2012-06-01' UNION ALL -SELECT 'JAVASCRIPT','ID_NO_DERIVATIONS_DEFINED','en','No derivations were defined.','2012-06-01' +SELECT 'JAVASCRIPT','ID_NO_DERIVATIONS_DEFINED','en','No routings were defined.','2012-06-01' UNION ALL SELECT 'LABEL','ID_ROWS','en','Rows','2012-06-01' UNION ALL @@ -4065,7 +4066,7 @@ SELECT 'LABEL','ID_FAILURE','en','Failure','2012-06-01' UNION ALL SELECT 'LABEL','ID_MAP_TYPE','en','Map Type','2012-06-01' UNION ALL -SELECT 'LABEL','ID_DERIVATION_HISTORY','en','Derivation History','2012-06-01' +SELECT 'LABEL','ID_DERIVATION_HISTORY','en','Routing History','2012-06-18' UNION ALL SELECT 'LABEL','ID_MESSAGES_HISTORY','en','Messages History','2012-06-01' UNION ALL @@ -5582,7 +5583,22 @@ SELECT 'LABEL','ID_NODELETEOPTIONALL','en','You must add all the days that you h SELECT 'LABEL','ID_IMPORT_RT','en','Import Report Table','2012-06-01' UNION ALL SELECT 'LABEL','ID_GRID_PAGE_DISPLAYING_REPORTABLES_MESSAGE','en','Displaying Report Tables {0} - {1} of {2}','2012-06-01' + UNION ALL +SELECT 'LABEL','ID_SKIN_EXCEPTION','en','Skin Engine Exception','2012-06-04' + UNION ALL +SELECT 'LABEL','ID_SKIN_LAYOUT_NOT_FOUND','en','Layout not Found','2012-06-04' + UNION ALL +SELECT 'LABEL','ID_SKIN_INCORRECT_VERIFY_URL','en','You''re trying to get a resource from an incorrect skin, please verify your url.','2012-06-04' + UNION ALL +SELECT 'LABEL','ID_REDIRECT_URL','en','The System can try to redirect to the correct url. Try Now.','2012-06-04' + UNION ALL +SELECT 'LABEL','ID_PASSWORD_TESTING','en','Testing password','2012-06-05' + UNION ALL +SELECT 'LABEL','ID_TRUE','en','TRUE','2012-06-06' + UNION ALL +SELECT 'LABEL','ID_FALSE','en','FALSE','2012-06-06' ; +; INSERT INTO ISO_LOCATION ([IC_UID],[IL_UID],[IL_NAME],[IL_NORMAL_NAME],[IS_UID]) SELECT 'AD','','','','' UNION ALL diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 534608d80..e18a3f1fa 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -3,7 +3,7 @@ INSERT INTO USERS (USR_UID,USR_USERNAME,USR_PASSWORD,USR_FIRSTNAME,USR_LASTNAME, INSERT INTO CONTENT (CON_CATEGORY,CON_PARENT,CON_ID,CON_LANG,CON_VALUE) VALUES ('ROL_NAME','','00000000000000000000000000000002','en','System Administrator'), -('ROL_NAME','','00000000000000000000000000000003','en','Operator'); +('ROL_NAME','','00000000000000000000000000000003','en','Operator'), ('ROL_NAME','','00000000000000000000000000000004','en','Manager'); INSERT INTO LANGUAGE (LAN_ID,LAN_NAME,LAN_NATIVE_NAME,LAN_DIRECTION,LAN_WEIGHT,LAN_ENABLED,LAN_CALENDAR) VALUES @@ -1456,7 +1456,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_START_CASE','en','New','2012-06-01') , ( 'LABEL','ID_NEW_GROUP','en','New','2012-06-01') , ( 'LABEL','ID_MEMBERS','en','Members','2012-06-01') , -( 'LABEL','ID_MSG_CONFIRM_DELETE_GROUP','en','Draft','2012-06-01') , +( 'LABEL','ID_MSG_CONFIRM_DELETE_GROUP','en','Are you sure to delete this group?','2012-06-11') , ( 'LABEL','ID_INCORRECT_EMAIL','en','Your E-mail address is not valid.','2012-06-01') , ( 'LABEL','ID_USER_NOT_REGISTERED','en','User not registered!','2012-06-01') , ( 'LABEL','ID_USER_INACTIVE','en','User inactive!','2012-06-01') , @@ -1566,14 +1566,14 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_CANCEL','en','Cancel','2012-06-01') , ( 'LABEL','ID_PROCESS_MAP','en','Process Map','2012-06-01') , ( 'LABEL','ID_BEFORE_ASSIGNMENT','en','Before Assignment','2012-06-01') , -( 'LABEL','ID_BEFORE_DERIVATION','en','Before Derivation','2012-06-01') , -( 'LABEL','ID_AFTER_DERIVATION','en','After Derivation','2012-06-01') , +( 'LABEL','ID_BEFORE_DERIVATION','en','Before Routing','2012-06-18') , +( 'LABEL','ID_AFTER_DERIVATION','en','After Routing','2012-06-18') , ( 'LABEL','ID_BEFORE','en','Before','2012-06-01') , ( 'LABEL','ID_AFTER','en','After','2012-06-01') , ( 'JAVASCRIPT','ID_TRANSFER_HISTORY','en','Transfer History','2012-06-01') , ( 'LABEL','ID_TRANSFER_HISTORY','en','Transfer History','2012-06-01') , ( 'LABEL','ID_ENABLED','en','Enabled','2012-06-01') , -( 'JAVASCRIPT','ID_NO_DERIVATIONS_DEFINED','en','No derivations were defined.','2012-06-01') , +( 'JAVASCRIPT','ID_NO_DERIVATIONS_DEFINED','en','No routings were defined.','2012-06-01') , ( 'LABEL','ID_ROWS','en','Rows','2012-06-01') , ( 'LABEL','ID_MEMBER','en','Member','2012-06-01') , ( 'LABEL','ID_USER','en','User','2012-06-01') , @@ -2743,7 +2743,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_PROCESS_FILE_MANAGER','en','Process File Manager','2012-06-01') , ( 'LABEL','ID_FAILURE','en','Failure','2012-06-01') , ( 'LABEL','ID_MAP_TYPE','en','Map Type','2012-06-01') , -( 'LABEL','ID_DERIVATION_HISTORY','en','Derivation History','2012-06-01') , +( 'LABEL','ID_DERIVATION_HISTORY','en','Routing History','2012-06-18') , ( 'LABEL','ID_MESSAGES_HISTORY','en','Messages History','2012-06-01') , ( 'LABEL','ID_CASE_PROPERTIES_SAVE','en','Case Tracker Properties Saved Successfully','2012-06-01') , ( 'LABEL','ID_CASE_TRACKERS','en','Case trackers','2012-06-01') , @@ -3510,7 +3510,15 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_3DAYSMINIMUM','en','3 days at least','2012-06-01') , ( 'LABEL','ID_NODELETEOPTIONALL','en','You must add all the days that you have selected in work days, otherwise you should leave at least an "-- ALL --" option.','2012-06-01') , ( 'LABEL','ID_IMPORT_RT','en','Import Report Table','2012-06-01') , -( 'LABEL','ID_GRID_PAGE_DISPLAYING_REPORTABLES_MESSAGE','en','Displaying Report Tables {0} - {1} of {2}','2012-06-01') ; +( 'LABEL','ID_GRID_PAGE_DISPLAYING_REPORTABLES_MESSAGE','en','Displaying Report Tables {0} - {1} of {2}','2012-06-01') , +( 'LABEL','ID_SKIN_EXCEPTION','en','Skin Engine Exception','2012-06-04') , +( 'LABEL','ID_SKIN_LAYOUT_NOT_FOUND','en','Layout not Found','2012-06-04') , +( 'LABEL','ID_SKIN_INCORRECT_VERIFY_URL','en','You''re trying to get a resource from an incorrect skin, please verify your url.','2012-06-04') , +( 'LABEL','ID_REDIRECT_URL','en','The System can try to redirect to the correct url. Try Now.','2012-06-04') , +( 'LABEL','ID_PASSWORD_TESTING','en','Testing password','2012-06-05') , +( 'LABEL','ID_TRUE','en','TRUE','2012-06-06') , +( 'LABEL','ID_FALSE','en','FALSE','2012-06-06') ; +; INSERT INTO ISO_LOCATION (IC_UID,IL_UID,IL_NAME,IL_NORMAL_NAME,IS_UID) VALUES ('AD','','',' ','') , diff --git a/workflow/engine/xmlform/cases/cases_TransferHistory.xml b/workflow/engine/xmlform/cases/cases_TransferHistory.xml index 47ae9f385..bd5d10c5d 100755 --- a/workflow/engine/xmlform/cases/cases_TransferHistory.xml +++ b/workflow/engine/xmlform/cases/cases_TransferHistory.xml @@ -29,7 +29,7 @@ - Action + Action @@ -43,4 +43,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/workflow/engine/xmlform/processes/processes_Edit.xml b/workflow/engine/xmlform/processes/processes_Edit.xml index d9e953806..4069368d4 100755 --- a/workflow/engine/xmlform/processes/processes_Edit.xml +++ b/workflow/engine/xmlform/processes/processes_Edit.xml @@ -40,7 +40,7 @@ SELECT FILE,NAME FROM _TEMPLATES1 - Derivation Screen Template + Routing Screen Template diff --git a/workflow/engine/xmlform/tasks/tasks_Definition.xml b/workflow/engine/xmlform/tasks/tasks_Definition.xml index 3df2f5b33..621ddda84 100755 --- a/workflow/engine/xmlform/tasks/tasks_Definition.xml +++ b/workflow/engine/xmlform/tasks/tasks_Definition.xml @@ -23,7 +23,7 @@ SELECT FILE,NAME FROM _TEMPLATES1 - Derivation Screen Template + Routing Screen Template diff --git a/workflow/engine/xmlform/tracker/tracker_Configuration.xml b/workflow/engine/xmlform/tracker/tracker_Configuration.xml index bbf05b516..fea72b18b 100755 --- a/workflow/engine/xmlform/tracker/tracker_Configuration.xml +++ b/workflow/engine/xmlform/tracker/tracker_Configuration.xml @@ -1,6 +1,6 @@ - + @@ -12,7 +12,7 @@ - Derivation History + Routing History diff --git a/workflow/engine/xmlform/tracker/tracker_TransferHistory.xml b/workflow/engine/xmlform/tracker/tracker_TransferHistory.xml index 136258d2c..ae27dadd2 100755 --- a/workflow/engine/xmlform/tracker/tracker_TransferHistory.xml +++ b/workflow/engine/xmlform/tracker/tracker_TransferHistory.xml @@ -1,4 +1,4 @@ - + Task @@ -29,7 +29,7 @@ - Action + Action \ No newline at end of file