diff --git a/workflow/engine/classes/class.net.php b/workflow/engine/classes/class.net.php index 6eaf59799..770987969 100755 --- a/workflow/engine/classes/class.net.php +++ b/workflow/engine/classes/class.net.php @@ -395,7 +395,7 @@ class NET @oci_close($link); } else { - $this->error = "the user $this->db_user don't has privileges to run queries!"; + $this->error = "the user $this->db_user doesn't has privileges to run queries!"; $this->errstr = "NET::ORACLE->Couldn't execute any query on this server!"; $this->errno = 40010; } diff --git a/workflow/engine/classes/class.pmTable.php b/workflow/engine/classes/class.pmTable.php index 1ae713490..a99097b6e 100755 --- a/workflow/engine/classes/class.pmTable.php +++ b/workflow/engine/classes/class.pmTable.php @@ -349,7 +349,7 @@ class PmTable $stmt->executeQuery("DROP TABLE {$tableName}"); } catch (Exception $e) { - throw new Exception("Phisical table '$tableName' does not exist!"); + throw new Exception("Physical table '$tableName' does not exist!"); } } } diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php index 7ee1ca588..021057a77 100755 --- a/workflow/engine/classes/class.processes.php +++ b/workflow/engine/classes/class.processes.php @@ -2571,7 +2571,7 @@ class Processes { throw ( new Exception ( 'Unable to read uploaded file, please check permissions. ')); if (! filesize($pmFilename) >= 9 ) - throw ( new Exception ( 'Uploaded file is corrupted, please check the file before continue. ')); + throw ( new Exception ( 'Uploaded file is corrupted, please check the file before continuing. ')); clearstatcache(); $fp = fopen( $pmFilename, "rb"); $fsData = intval( fread ( $fp, 9)); //reading the size of $oData diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 8b1f1ce7a..2c7b495f4 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -3856,8 +3856,8 @@ msgstr "Field \"table\" is required" # TRANSLATION # JAVASCRIPT/ID_ASSIGN_RULES #: JAVASCRIPT/ID_ASSIGN_RULES -msgid "Error: There is a problem with next tasks of this process, one of them have manual assignment. Manual assignment shouldn't be used with subprocesses" -msgstr "Error: There is a problem with next tasks of this process, one of them have manual assignment. Manual assignment shouldn't be used with subprocesses" +msgid "Error: There is a problem with the next tasks of this process. One of them has manual assignment. Manual assignment shouldn't be used with subprocesses" +msgstr "Error: There is a problem with the next tasks of this process. One of them has manual assignment. Manual assignment shouldn't be used with subprocesses" # TRANSLATION # LABEL/ID_FIELD_INVALID @@ -3880,8 +3880,8 @@ msgstr "Saved" # TRANSLATION # LABEL/ID_ASSIGN_RULES #: LABEL/ID_ASSIGN_RULES -msgid "Error: There is a problem with next tasks of this process, one of them have manual assignment. Manual assignment shouldn't be used with subprocesses" -msgstr "Error: There is a problem with next tasks of this process, one of them have manual assignment. Manual assignment shouldn't be used with subprocesses" +msgid "Error: There is a problem with the next tasks of this process. One of them has manual assignment. Manual assignment shouldn't be used with subprocesses" +msgstr "Error: There is a problem with the next tasks of this process. One of them has manual assignment. Manual assignment shouldn't be used with subprocesses" # TRANSLATION # LABEL/ID_SELECT_OPTION_TABLE @@ -5572,8 +5572,8 @@ msgstr "Do you want to delete all selected processes?" # TRANSLATION # LABEL/ID_PROCESS_CANT_DELETE #: LABEL/ID_PROCESS_CANT_DELETE -msgid "You can't delete the process \"{0}\" because has {1} cases." -msgstr "You can't delete the process \"{0}\" because has {1} cases." +msgid "You can't delete the process \"{0}\" because it has {1} cases." +msgstr "You can't delete the process \"{0}\" because it has {1} cases." # TRANSLATION # LABEL/ID_FILE @@ -5812,8 +5812,8 @@ msgstr "The root password has been updated successfully!" # TRANSLATION # LABEL/ID_MESSAGE_ROOT_CHANGE_FAILURE #: LABEL/ID_MESSAGE_ROOT_CHANGE_FAILURE -msgid "The root password has can't be updated !" -msgstr "The root password has can't be updated !" +msgid "The root password can't be updated!" +msgstr "The root password can't be updated!" # TRANSLATION # LABEL/ID_LAN_TRANSLATOR diff --git a/workflow/engine/data/mssql/insert.sql b/workflow/engine/data/mssql/insert.sql index 78d542df7..c138870dd 100755 --- a/workflow/engine/data/mssql/insert.sql +++ b/workflow/engine/data/mssql/insert.sql @@ -2683,7 +2683,7 @@ SELECT 'JAVASCRIPT','ID_FIELD_FOREIGN_TABLE','en','Field "table" is required','2 ; INSERT INTO [TRANSLATION] ([TRN_CATEGORY],[TRN_ID],[TRN_LANG],[TRN_VALUE],[TRN_UPDATE_DATE]) -SELECT 'JAVASCRIPT','ID_ASSIGN_RULES','en','Error: There is a problem with next tasks of this process, one of them have manual assignment. Manual assignment shouldn''t be used with subprocesses','2012-02-02' +SELECT 'JAVASCRIPT','ID_ASSIGN_RULES','en','Error: There is a problem with next tasks of this process, one of them have manual assignment. Manual assignment shouldn''t be used with subprocesses','2012-02-02' UNION ALL SELECT 'LABEL','ID_FIELD_INVALID','en','Field Invalid','2012-02-02' UNION ALL @@ -2691,7 +2691,7 @@ SELECT 'LABEL','ID_WARNING','en','WARNING','2012-02-02' UNION ALL SELECT 'LABEL','ID_SAVED','en','Saved','2012-02-02' UNION ALL -SELECT 'LABEL','ID_ASSIGN_RULES','en','Error: There is a problem with next tasks of this process, one of them have manual assignment. Manual assignment shouldn''t be used with subprocesses','2012-02-02' +SELECT 'LABEL','ID_ASSIGN_RULES','en','Error: There is a problem with next tasks of this process, one of them have manual assignment. Manual assignment shouldn''t be used with subprocesses','2012-02-02' UNION ALL SELECT 'LABEL','ID_SELECT_OPTION_TABLE','en','Select a option to export schema or data from the selected table(s).','2012-02-02' UNION ALL @@ -3261,7 +3261,7 @@ SELECT 'LABEL','ID_PROCESS_DELETE_LABEL','en','Do you want to delete the selecte UNION ALL SELECT 'LABEL','ID_PROCESS_DELETE_ALL_LABEL','en','Do you want to delete all selected processes?','2012-02-02' UNION ALL -SELECT 'LABEL','ID_PROCESS_CANT_DELETE','en','You can''t delete the process "{0}" because has {1} cases.','2012-02-02' +SELECT 'LABEL','ID_PROCESS_CANT_DELETE','en','You can''t delete the process \"{0}\" because it has {1} cases.','2012-02-02' UNION ALL SELECT 'LABEL','ID_FILE','en','File','2012-02-02' UNION ALL @@ -3343,7 +3343,7 @@ SELECT 'LABEL','ID_VERSION','en','Version','2012-02-02' UNION ALL SELECT 'LABEL','ID_MESSAGE_ROOT_CHANGE_SUCESS','en','The root password has been updated successfully!','2012-02-02' UNION ALL -SELECT 'LABEL','ID_MESSAGE_ROOT_CHANGE_FAILURE','en','The root password has can''t be updated !','2012-02-02' +SELECT 'LABEL','ID_MESSAGE_ROOT_CHANGE_FAILURE','en','The root password can''t be updated!','2012-02-02' UNION ALL SELECT 'LABEL','ID_LAN_TRANSLATOR','en','Translator','2012-02-02' UNION ALL diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index ac17daeb7..f114106c7 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -2335,7 +2335,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'JAVASCRIPT','ID_REQ_TITLE','en','You forgot to fill the Title field!','2012-02-02') , ( 'LABEL','ID_PROCESS_DELETE_LABEL','en','Do you want to delete the selected process?','2012-02-02') , ( 'LABEL','ID_PROCESS_DELETE_ALL_LABEL','en','Do you want to delete all selected processes?','2012-02-02') , -( 'LABEL','ID_PROCESS_CANT_DELETE','en','You can''t delete the process "{0}" because has {1} cases.','2012-02-02') , +( 'LABEL','ID_PROCESS_CANT_DELETE','en','You can''t delete the process \"{0}\" because it has {1} cases.','2012-02-02') , ( 'LABEL','ID_FILE','en','File','2012-02-02') , ( 'LABEL','ID_OUT_PUT_DOC_UPLOAD_TITLE','en','Upload Output Document Template File','2012-02-02') , ( 'LABEL','ID_UPLOADING_FILE','en','Uploading file...','2012-02-02') , @@ -2377,7 +2377,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_CONFIGURE','en','Configure','2012-02-02') , ( 'LABEL','ID_VERSION','en','Version','2012-02-02') , ( 'LABEL','ID_MESSAGE_ROOT_CHANGE_SUCESS','en','The root password has been updated successfully!','2012-02-02') , -( 'LABEL','ID_MESSAGE_ROOT_CHANGE_FAILURE','en','The root password has can''t be updated !','2012-02-02') , +( 'LABEL','ID_MESSAGE_ROOT_CHANGE_FAILURE','en','The root password can''t be updated!','2012-02-02') , ( 'LABEL','ID_LAN_TRANSLATOR','en','Translator','2012-02-02') , ( 'LABEL','ID_LOCALE','en','Locale','2012-02-02') , ( 'LABEL','DATE_LABEL','en','Date','2012-02-02') ,