[Web-erp-svn] SF.net SVN: web-erp:[5788] trunk

[<dai...@us...>]

Revision: 5788
          http://sourceforge.net/p/web-erp/reponame/5788
Author:   daintree
Date:     2013-01-02 03:22:38 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
fix english strings per Thomas Lie

Modified Paths:
--------------
    trunk/AccountGroups.php
    trunk/InternalStockCategoriesByRole.php
    trunk/PDFLowGP.php
    trunk/UpgradeDatabase.php
    trunk/WorkOrderReceive.php
    trunk/Z_ImportFixedAssets.php
    trunk/doc/Change.log

Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php	2012-12-31 07:17:02 UTC (rev 5787)
+++ trunk/AccountGroups.php	2013-01-02 03:22:38 UTC (rev 5788)
@@ -44,7 +44,7 @@
 if (isset($_POST['MoveGroup'])) {
 	$sql="UPDATE chartmaster SET group_='" . $_POST['DestinyAccountGroup'] . "' WHERE group_='" . $_POST['OriginalAccountGroup'] . "'";
 	$ErrMsg = _('An error occurred in moving the account group');
-	$DbgMsg = _('The SQL that was used to moving the account group was');
+	$DbgMsg = _('The SQL that was used to move the account group was');
 	$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
 	echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">' . _('Review Account Groups') . '</a></div>';
 	prnMsg( _('All accounts in the account group:') . ' ' . $_POST['OriginalAccountGroup'] . ' ' . _('have been changed to the account group:') . ' ' . $_POST['DestinyAccountGroup'],'success');

Modified: trunk/InternalStockCategoriesByRole.php
===================================================================
--- trunk/InternalStockCategoriesByRole.php	2012-12-31 07:17:02 UTC (rev 5787)
+++ trunk/InternalStockCategoriesByRole.php	2013-01-02 03:22:38 UTC (rev 5788)
@@ -19,9 +19,9 @@
 	$SelectedType='';
 }
 
-if (!isset($_GET['delete']) and (ContainsIllegalCharacters($SelectedType) OR mb_strpos($SelectedType,' ')>0)){
+if (!isset($_GET['delete']) AND (ContainsIllegalCharacters($SelectedType) OR mb_strpos($SelectedType,' ')>0)){
 	$InputError = 1;
-	prnMsg(_('The  contain any of the following characters " \' - &amp; or a space'),'error');
+	prnMsg(_('The contain spaces nor any of the following characters') / ': " & \' -';,'error');
 }
 if (isset($_POST['SelectedRole'])){
 	$SelectedRole = mb_strtoupper($_POST['SelectedRole']);
@@ -119,7 +119,7 @@
 	$result = DB_query($SQL,$db);
 	echo '<option value="">' . _('Not Yet Selected') . '</option>';
 	while ($myrow = DB_fetch_array($result)) {
-		if (isset($SelectedRole) and $myrow['secroleid']==$SelectedRole) {
+		if (isset($SelectedRole) AND $myrow['secroleid']==$SelectedRole) {
 			echo '<option selected="selected" value="';
 		} else {
 			echo '<option value="';

Modified: trunk/PDFLowGP.php
===================================================================
--- trunk/PDFLowGP.php	2012-12-31 07:17:02 UTC (rev 5787)
+++ trunk/PDFLowGP.php	2013-01-02 03:22:38 UTC (rev 5788)
@@ -136,7 +136,7 @@
 					<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="ToDate" size="10" maxlength="10" value="' . $_POST['ToDate'] . '" /></td>
 			</tr>';
 
-		echo '<tr><td>' . _('Show sales with GP') . '%' . _('below') . ':</td>
+		echo '<tr><td>' . _('Show sales with GP % below') . ':</td>
 				<td><input type="text" class="number" name="GPMin" maxlength="3" size="3" value="' . $_POST['GPMin'] . '" /></td>
 			</tr>';
 

Modified: trunk/UpgradeDatabase.php
===================================================================
--- trunk/UpgradeDatabase.php	2012-12-31 07:17:02 UTC (rev 5787)
+++ trunk/UpgradeDatabase.php	2013-01-02 03:22:38 UTC (rev 5788)
@@ -162,7 +162,7 @@
 					break;
 			} //end switch
 		}
-	} else { //dbType is not mysql or mysqli
+	} else { //$DBType is not mysql or mysqli
 		prnMsg(_('Only mysql upgrades are performed seamlessly at this time. Your database will need to be manually updated'),'info');
 	}
 

Modified: trunk/WorkOrderReceive.php
===================================================================
--- trunk/WorkOrderReceive.php	2012-12-31 07:17:02 UTC (rev 5787)
+++ trunk/WorkOrderReceive.php	2013-01-02 03:22:38 UTC (rev 5788)
@@ -373,7 +373,7 @@
 			$SQL = "UPDATE workorders SET
 						costissued = costissued+" . ($AutoIssueCompRow['qtypu'] * $QuantityReceived * $AutoIssueCompRow['cost']) ."
 					WHERE wo='" . $_POST['WO'] . "'";
-			$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Could not be update the work order cost for an auto-issue component because');
+			$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('Could not update the work order cost for an auto-issue component because');
 			$DbgMsg =  _('The following SQL to update the work order cost was used');
 			$Result = DB_query($SQL, $db, $ErrMsg, $DbgMsg, true);
 

Modified: trunk/Z_ImportFixedAssets.php
===================================================================
--- trunk/Z_ImportFixedAssets.php	2012-12-31 07:17:02 UTC (rev 5787)
+++ trunk/Z_ImportFixedAssets.php	2013-01-02 03:22:38 UTC (rev 5788)
@@ -55,7 +55,7 @@
 	$i = 0;
 	foreach ($HeaderRow as $FieldName) {
 		if ( mb_strtoupper($FieldName) != mb_strtoupper($FieldNames[$i]) ) {
-			prnMsg (_('The selected file contains fields in the incorrect order ('. mb_strtoupper($FieldName). ' != '. mb_strtoupper($FieldNames[$i]). _('. Download a template and ensuer that fields are in the same sequence as the template.')),'error');
+			prnMsg (_('The selected file contains fields in the incorrect order ('. mb_strtoupper($FieldName). ' != '. mb_strtoupper($FieldNames[$i]). '. ' ._('Download a template and ensure that fields are in the same sequence as the template.')),'error');
 			fclose($FileHandle);
 			include('includes/footer.inc');
 			exit;

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2012-12-31 07:17:02 UTC (rev 5787)
+++ trunk/doc/Change.log	2013-01-02 03:22:38 UTC (rev 5788)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+2/1/13 Thomas Lie: corrections to various strings where English was suspect!!
 29/12/12 Phil: on log out destroy session and show the login form - avoiding nasty errors
 29/12/12 Phil: Proper casing of $Title $RootPath $Theme $DBType $DBUser $DBPassword $AllowDemoMode variables - may make upgrade tricky!!
 24/12/12 Ricard: OutstandingGRNs.php now has show on screen option