diff --git a/lib/alert/AlertContent.inc b/lib/alert/AlertContent.inc
index 8241fb7..48103c4 100644
--- a/lib/alert/AlertContent.inc
+++ b/lib/alert/AlertContent.inc
@@ -49,83 +49,71 @@ class AlertContent {
      * @return string the alert content
      */
     function getSubscriptionAlert($iSubscriptionAlertType, $aValues) {
-        $sSubject = "DMS Subscription Alert- ";
-        $aAlertSubject = array(SubscriptionConstants::subscriptionAlertType("AddFolder") => $sSubject . "New Folder",
-                               SubscriptionConstants::subscriptionAlertType("RemoveSubscribedFolder") => $sSubject . "Removed Folder",
-                               SubscriptionConstants::subscriptionAlertType("RemoveChildFolder") => $sSubject . "Removed Folder",
-                               SubscriptionConstants::subscriptionAlertType("AddDocument") => $sSubject . "New Document",
-                               SubscriptionConstants::subscriptionAlertType("RemoveSubscribedDocument") => $sSubject . "Removed Document",
-                               SubscriptionConstants::subscriptionAlertType("RemoveChildDocument") => $sSubject . "Removed Document",
-                               SubscriptionConstants::subscriptionAlertType("ModifyDocument") => $sSubject . "Modified Document",
-                               SubscriptionConstants::subscriptionAlertType("CheckInDocument") => $sSubject . "Checked In Document",
-                               SubscriptionConstants::subscriptionAlertType("CheckOutDocument") => $sSubject . "Checked Out Document",
-                               SubscriptionConstants::subscriptionAlertType("MovedDocument") => $sSubject . "Moved Document",
-                               SubscriptionConstants::subscriptionAlertType("ArchivedDocument") => $sSubject . "Archived Document",
-                               SubscriptionConstants::subscriptionAlertType("RestoredArchivedDocument") => $sSubject . "Restored Document");
+        $sSubject = _("DMS Subscription Alert") . " - ";
+        $aAlertSubject = array(SubscriptionConstants::subscriptionAlertType("AddFolder") => $sSubject . _("New Folder"),
+                               SubscriptionConstants::subscriptionAlertType("RemoveSubscribedFolder") => $sSubject . _("Removed Folder"),
+                               SubscriptionConstants::subscriptionAlertType("RemoveChildFolder") => $sSubject . _("Removed Folder"),
+                               SubscriptionConstants::subscriptionAlertType("AddDocument") => $sSubject . _("New Document"),
+                               SubscriptionConstants::subscriptionAlertType("RemoveSubscribedDocument") => $sSubject . _("Removed Document"),
+                               SubscriptionConstants::subscriptionAlertType("RemoveChildDocument") => $sSubject . _("Removed Document"),
+                               SubscriptionConstants::subscriptionAlertType("ModifyDocument") => $sSubject . _("Modified Document"),
+                               SubscriptionConstants::subscriptionAlertType("CheckInDocument") => $sSubject . _("Checked In Document"),
+                               SubscriptionConstants::subscriptionAlertType("CheckOutDocument") => $sSubject . _("Checked Out Document"),
+                               SubscriptionConstants::subscriptionAlertType("MovedDocument") => $sSubject . _("Moved Document"),
+                               SubscriptionConstants::subscriptionAlertType("ArchivedDocument") => $sSubject . _("Archived Document"),
+                               SubscriptionConstants::subscriptionAlertType("RestoredArchivedDocument") => $sSubject . _("Restored Document"));
 
         $sViewAlertParams = "fSubscriptionID=" . $aValues["subscriptionID"] . "&fSubscriptionType=" . $aValues["subscriptionType"];
         $oUser = User::get($_SESSION["userID"]);
         $sAttribution = $oUser ? " by " . $oUser->getName() : "";
         $aAlertContent = array(SubscriptionConstants::subscriptionAlertType("AddFolder") =>
-                               "A new folder '" . $aValues["newFolderName"] . "' has been added to folder '" . $aValues["parentFolderName"] . "'$sAttribution.<br>" .
-                               "Please clear this subscription alert by clicking on the following link: " .
-                               generateControllerLink("viewAlert", $sViewAlertParams, $aValues["parentFolderName"]),
+                               			sprintf(_("A new folder ' %s ' has been added to folder ' %s '%s.<br>Please clear this subscription alert by clicking on the following link: %s"), $aValues["newFolderName"], $aValues["parentFolderName"],$sAttribution,  
+                               			generateControllerLink("viewAlert", $sViewAlertParams, $aValues["parentFolderName"])),
 
                                SubscriptionConstants::subscriptionAlertType("RemoveSubscribedFolder") =>
-                                       "The folder '" . $aValues["removedFolderName"] . "' has been removed from folder '" . $aValues["parentFolderName"] . "'$sAttribution.<br>" .
-                                       "Your subscription to this folder has been removed also.",
+                                       sprintf(_("The folder '%s' has been removed from folder '%s'%s.<br>Your subscription to this folder has been removed also."),$aValues["removedFolderName"],$aValues["parentFolderName"], $sAttribution),
                                        
                                SubscriptionConstants::subscriptionAlertType("RemoveChildFolder") =>
-                                       "The folder '" . $aValues["removedFolderName"] . "' has been removed from folder '" . $aValues["parentFolderName"] . "'$sAttribution.<br>" .
-                                       "Please clear this subscription alert by clicking on the following link: " .
+                                       sprintf(_("The folder '%s' has been removed from folder '%s'%s.<br>Please clear this subscription alert by clicking on the following link: "), $aValues["removedFolderName"], $aValues["parentFolderName"], $sAttribution) .
                                        generateControllerLink("viewAlert", $sViewAlertParams, $aValues["parentFolderName"]),
 
                                SubscriptionConstants::subscriptionAlertType("AddDocument") =>
-                                       "A new document '" . $aValues["newDocumentName"] . "' has been added to folder '" . $aValues["folderName"] . "'$sAttribution.<br>" .
-                                       "Please clear this subscription alert by clicking on the following link: " .
+                                       sprintf(_("A new document '%s' has been added to folder '%s'%s.<br>Please clear this subscription alert by clicking on the following link: "), $aValues["newDocumentName"], $aValues["folderName"], $sAttribution) .
                                        generateControllerLink("viewAlert", $sViewAlertParams, $aValues["newDocumentName"]),
 
                                SubscriptionConstants::subscriptionAlertType("RemoveChildDocument") =>
-                                       "The document '" . $aValues["removedDocumentName"] . "' has been removed from folder '" . $aValues["folderName"] . "'$sAttribution.<br>" .
-                                       "Please clear this subscription alert by clicking on the following link: " .
+                                       sprintf(_("The document '%s' has been removed from folder '%s'.<br>Please clear this subscription alert by clicking on the following link: "), $aValues["removedDocumentName"], $aValues["folderName"], $sAttribution) .
                                        generateControllerLink("viewAlert", $sViewAlertParams, $aValues["removedDocumentName"]),
                                        
                                SubscriptionConstants::subscriptionAlertType("RemoveSubscribedDocument") =>
-                                       "The document '" . $aValues["removedDocumentName"] . "' has been removed from folder '" . $aValues["folderName"] . "'$sAttribution.<br>" .
-                                       "Your subscription to this document has been removed also.",
+                                       sprintf(_("The document '%s' has been removed from folder '%s'%s.<br>Your subscription to this document has been removed also."), $aValues["removedDocumentName"], $aValues["folderName"], $sAttribution),
 
                                SubscriptionConstants::subscriptionAlertType("ModifyDocument") =>
-                                       "The document '" . $aValues["modifiedDocumentName"] . "' has been modified$sAttribution.<br>" .
-                                       "Please clear this subscription alert by clicking on the following link: " .
+                                       sprintf(_("The document '%s' has been modified%s.<br>Please clear this subscription alert by clicking on the following link: "), $aValues["modifiedDocumentName"], $sAttribution) .
                                        generateControllerLink("viewAlert", $sViewAlertParams, $aValues["modifiedDocumentName"]),
 
                                SubscriptionConstants::subscriptionAlertType("CheckInDocument") =>
-                                       "The document '" . $aValues["modifiedDocumentName"] . "' has been checked in$sAttribution.<br>" .
-                                       "Please clear this subscription alert by clicking on the following link: " .
+                                       sprintf(_("The document '%s' has been checked in%s.<br>Please clear this subscription alert by clicking on the following link: "), $aValues["modifiedDocumentName"], $sAttribution) .
                                        generateControllerLink("viewAlert", $sViewAlertParams, $aValues["modifiedDocumentName"]),
                                        
                                SubscriptionConstants::subscriptionAlertType("CheckOutDocument") =>
-                                       "The document '" . $aValues["modifiedDocumentName"] . "' has been checked out$sAttribution.<br>" .
-                                       "Please clear this subscription alert by clicking on the following link: " .
+                                       sprintf(_("The document '%s' has been checked out%s.<br>Please clear this subscription alert by clicking on the following link: "), $aValues["modifiedDocumentName"], $sAttribution) .
                                        generateControllerLink("viewAlert", $sViewAlertParams, $aValues["modifiedDocumentName"]),
                                        
                                SubscriptionConstants::subscriptionAlertType("MovedDocument") =>
-                                       "The document '" . $aValues["modifiedDocumentName"] . "' has been moved from folder '" . $aValues["oldFolderName"] . "' to folder '" . $aValues["newFolderName"] . "'$sAttribution.<br>" .
-                                       "Please clear this subscription alert by clicking on the following link: " .
+                                       sprintf(_("The document '%s' has been moved from folder '%s' to folder '%s'%s.<br>Please clear this subscription alert by clicking on the following link: "), $aValues["modifiedDocumentName"], $aValues["oldFolderName"], $aValues["newFolderName"], $sAttribution) .
                                        generateControllerLink("viewAlert", $sViewAlertParams, $aValues["modifiedDocumentName"]),
 
                                SubscriptionConstants::subscriptionAlertType("ArchivedDocument") =>
-                                       "The document '" . $aValues["modifiedDocumentName"] . "' has been archived$sAttribution.<br>" .
-                                       "Please clear this subscription alert by clicking on the following link: " .
+                                       sprintf(_("The document '%s' has been archived%s.<br>Please clear this subscription alert by clicking on the following link: "), $aValues["modifiedDocumentName"], $sAttribution) .
                                        generateControllerLink("viewAlert", $sViewAlertParams, $aValues["modifiedDocumentName"]),
                                                                               
                                SubscriptionConstants::subscriptionAlertType("RestoredArchivedDocument") =>
-                                       "The document '" . $aValues["modifiedDocumentName"] . "' has been restored from the archive$sAttribution.<br>" .
-                                       "Please clear this subscription alert by clicking on the following link: " .
+                                       sprintf(_("The document '%s' has been restored from the archive%s.<br>Please clear this subscription alert by clicking on the following link: "), $aValues["modifiedDocumentName"], $sAttribution) .
                                        generateControllerLink("viewAlert", $sViewAlertParams, $aValues["modifiedDocumentName"]));
 
         return array ("subject" => $aAlertSubject[$iSubscriptionAlertType],
-                      "text" => "Hello " . $aValues["subscriberName"] . ",<br><br>" . $aAlertContent[$iSubscriptionAlertType]);
+                      "text" => sprintf(_("Hello %s"), $aValues["subscriberName"]) . ",<br><br>" . $aAlertContent[$iSubscriptionAlertType]);
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/browse/DocumentTypeBrowser.inc b/lib/browse/DocumentTypeBrowser.inc
index 95d68da..f3df60a 100644
--- a/lib/browse/DocumentTypeBrowser.inc
+++ b/lib/browse/DocumentTypeBrowser.inc
@@ -117,6 +117,6 @@ class DocumentTypeBrowser extends Browser {
     }
     
     function getSectionName() {
-    	return "Manage Document Types";
+    	return _("Manage Document Types");
     }    
 }
diff --git a/lib/email/Email.inc b/lib/email/Email.inc
index 2513781..784e353 100644
--- a/lib/email/Email.inc
+++ b/lib/email/Email.inc
@@ -233,7 +233,7 @@ class Email {
         $this->oMailer->FromName = $FromName;
         $this->oMailer->AddAddress($ToEmail);
         $this->oMailer->Subject = stripslashes($Subj)  . ' ' . $hyperlink; //only difference from above
-        $this->oMailer->Body = stripslashes($EmailBody) . " <br>This bug can be found on this page: " . "<a href = ". $hyperlink .">". $hyperlink ."</a>";
+        $this->oMailer->Body = stripslashes($EmailBody) . " <br>" . _("This bug can be found on this page") . ": " . "<a href = ". $hyperlink .">". $hyperlink ."</a>";
 
         //send the email
         if(!$this->oMailer->Send()) {
diff --git a/lib/visualpatterns/PatternBrowsableSearchResults.inc b/lib/visualpatterns/PatternBrowsableSearchResults.inc
index a3fd456..c2d8e07 100644
--- a/lib/visualpatterns/PatternBrowsableSearchResults.inc
+++ b/lib/visualpatterns/PatternBrowsableSearchResults.inc
@@ -131,7 +131,7 @@ class PatternBrowseableSearchResults {
 			//no results
 			$sToRender .= "<table width=\"100%\" height=\"80%\">\n";		
 			$sToRender .= "<tr>\n";		
-			$sToRender .= "<td><p class=\"errorText\">No results matched your criteria</p></td>\n";
+			$sToRender .= "<td><p class=\"errorText\">" . _("No results matched your criteria") . "</p></td>\n";
 			$sToRender .= "</tr>\n";
 			$sToRender .= "</table>\n";
 		} else {
@@ -142,10 +142,10 @@ class PatternBrowseableSearchResults {
 			$iEndIndex = $this->iStartIndex+$this->iResultsToDisplay-1 < $iTotalResults ? $this->iStartIndex+$this->iResultsToDisplay-1 : $iTotalResults;
 			
 			if ($this->sSearchText) {
-                            $sToRender .= "<tr><td colspan=\"3\">Searched the KnowledgeTree for '$this->sSearchText'.</td></tr>";
-                        }
+                $sToRender .= "<tr><td colspan=\"3\">" . sprintf(_("Searched the KnowledgeTree for '%s'."), $this->sSearchText) . "</td></tr>";
+            }
 
-			$sToRender .= "<tr><td colspan=\"3\" align=\"right\">Displaying results $this->iStartIndex - $iEndIndex of $iTotalResults</td></tr>\n";
+			$sToRender .= "<tr><td colspan=\"3\" align=\"right\">" . sprintf(_("Displaying results %s - %s of %s"), $this->iStartIndex, $iEndIndex, $iTotalResults) . "</td></tr>\n";
 					
 			$sToRender .= "<tr>\n";		
 			for ($i = 0; $i < count($this->aColumnHeadings); $i++) {
diff --git a/lib/visualpatterns/PatternEditableListFromQuery.inc b/lib/visualpatterns/PatternEditableListFromQuery.inc
index 47172c0..1f9a946 100644
--- a/lib/visualpatterns/PatternEditableListFromQuery.inc
+++ b/lib/visualpatterns/PatternEditableListFromQuery.inc
@@ -178,7 +178,9 @@ class PatternEditableListFromQuery {
 			$sToRender .= "</table>\n";
 		} else {			
 			$sToRender .= "<tr>\n";					
-			$sToRender .= "<td colspan=" . count($this->aDisplayColumns) . ">No " . (isset($this->sTableHeading) ? "$this->sTableHeading" : "") . " data</td>\n";
+			$sToRender .= "<td colspan=" . count($this->aDisplayColumns) . ">" .
+                sprintf(_("No %s data"), (isset($this->sTableHeading) ? "$this->sTableHeading" : "")) .
+                "</td>\n";
 			$sToRender .= "</tr>\n";			
 		}
 		
diff --git a/lib/visualpatterns/PatternEditableTableSqlQuery.inc b/lib/visualpatterns/PatternEditableTableSqlQuery.inc
index fdeab1f..acf0908 100644
--- a/lib/visualpatterns/PatternEditableTableSqlQuery.inc
+++ b/lib/visualpatterns/PatternEditableTableSqlQuery.inc
@@ -139,7 +139,9 @@ class PatternEditableTableSqlQuery {
 			if (isset($this->sEmptyTableMessage)) {
 				$sToRender .= "<td colspan=" . count($this->aStoreColumnNames) . ">$this->sEmptyTableMessage</td>\n";
 			} else {
-				$sToRender .= "<td colspan=" . count($this->aStoreColumnNames) . ">No " . (isset($this->sTableCaption) ? $this->sTableCaption : "") . " data</td>\n";
+				$sToRender .= "<td colspan=" . count($this->aStoreColumnNames) . ">" .
+                    sprintf(_("No %s data"), (isset($this->sTableCaption) ? $this->sTableCaption : "")) .
+                    "</td>\n";
 			}
 			$sToRender .= "</tr>\n";		
 		} else {
@@ -203,7 +205,7 @@ class PatternEditableTableSqlQuery {
 							}							
 							break;
 						case 3:
-							$sToRender .= "<b>The column type for drop downs is not implemented yet</b>\n";
+							$sToRender .= "<b>" . _("The column type for drop downs is not implemented yet") . "</b>\n";
 							break;
 						case 4:
 							//meta data
@@ -227,7 +229,10 @@ class PatternEditableTableSqlQuery {
 							
 							break;
 						default:							
-							$sToRender .= "<b>You are attempting to render an unknown column type " . ($this->aColumnTypes[$i]) . " in PatternEditableTableSqlQuery</b>\n";
+							$sToRender .= "<b>" .
+                                sprintf(_("You are attempting to render an unknown column type %s in PatternEditableTableSqlQuery"),
+                                    ($this->aColumnTypes[$i])) .
+                                "</b>\n";
 							break;
 					}
 
diff --git a/lib/visualpatterns/PatternListFromQuery.inc b/lib/visualpatterns/PatternListFromQuery.inc
index bb0b77a..32496ca 100644
--- a/lib/visualpatterns/PatternListFromQuery.inc
+++ b/lib/visualpatterns/PatternListFromQuery.inc
@@ -112,7 +112,9 @@ class PatternListFromQuery {
 			if (isset($this->sEmptyTableMessage)) {
 				$sToRender .= "<td colspan=" . count($this->aColumns) . ">$this->sEmptyTableMessage</td>\n";
 			} else {
-				$sToRender .= "<td colspan=" . count($this->aColumns) . ">No " . (isset($this->sTableHeading) ? "$this->sTableHeading" : "") . " data</td>\n";
+				$sToRender .= "<td colspan=" . count($this->aColumns) . ">" .
+                    sprintf(_("No %s data"), (isset($this->sTableHeading) ? "$this->sTableHeading" : "")) .
+                    "</td>\n";
 			}
 			$sToRender .= "</tr>\n";
 		} else {
diff --git a/lib/visualpatterns/PatternTableGeneric.inc b/lib/visualpatterns/PatternTableGeneric.inc
index f611390..9217f1f 100644
--- a/lib/visualpatterns/PatternTableGeneric.inc
+++ b/lib/visualpatterns/PatternTableGeneric.inc
@@ -121,7 +121,9 @@ class PatternTableGeneric {
             if (isset($this->sEmptyTableMessage)) {
                 $sToRender .= "<td colspan=" . count($this->aColumns) . ">$this->sEmptyTableMessage</td>\n";
             } else {
-                $sToRender .= "<td colspan=" . count($this->aColumns) . ">No " . (isset($this->sTableHeading) ? $this->sTableHeading : "") . " data</td>\n";
+                $sToRender .= "<td colspan=" . count($this->aColumns) . ">" .
+                    sprintf(_("No %s data admin"), (isset($this->sTableHeading) ? $this->sTableHeading : "")) .
+                    "</td>\n";
             }
             $sToRender .= "</tr>\n";
         } else {
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php
index eef4c37..62fe917 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsBL.php
@@ -98,7 +98,7 @@ if (checkSession()) {
 						// Redirect edit groups page
 						redirect($_SERVER["PHP_SELF"] . "?fUserID=$fUserID");
 					} else {
-						$main->setErrorMessage("Some problems in updating groups. Please contact your administrator");
+						$main->setErrorMessage(_("Some problems in updating groups") . ".  " .  _("Please contact your administrator") . ".");
 					}
 				}
 		}
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc
index 3d3c3fd..80b0399 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc
@@ -46,9 +46,9 @@ function renderGroupPicker($iUserID){
 
 	// Headings
 	$sToRender .= "<tr>";
-	$sToRender .= "<td ><strong>Assigned User to</strong></td>";
+	$sToRender .= "<td ><strong>" . _("Assigned Groups") . "</strong></td>";
 	$sToRender .= "<td></td>";
- 	$sToRender .= "<td ><strong>Available Groups</strong></td>";
+ 	$sToRender .= "<td ><strong>" . _("Available Groups") . "</strong></td>";
 	$sToRender .= "</tr>";
 
 	// Initialise structure
@@ -78,9 +78,9 @@ function renderGroupPicker($iUserID){
 
 	// Filter Button
 	$sToRender .= "<tr>";	
-	$sToRender .= "<td>Filter <BR><input type=\"text\" name=\"filterUG\" onkeyup=\"optGroup.sortSelectMatch(groupSelect, this.value)\" onchange=\"optGroup.sortSelectMatch(groupSelect, this.value)\"></td>";
+	$sToRender .= "<td>" . _("Filter") . " <BR><input type=\"text\" name=\"filterUG\" onkeyup=\"optGroup.sortSelectMatch(groupSelect, this.value)\" onchange=\"optGroup.sortSelectMatch(groupSelect, this.value)\"></td>";
 	$sToRender .= "<td></td>";
-	$sToRender .= "<td>Filter <BR><input type=\"text\" name=\"filterOG\" onkeyup=\"optGroup.sortSelectMatch(chosenGroups, this.value)\" onchange=\"optGroup.sortSelectMatch(chosenGroups, this.value)\"></td>";
+	$sToRender .= "<td>" . _("Filter") . " <BR><input type=\"text\" name=\"filterOG\" onkeyup=\"optGroup.sortSelectMatch(chosenGroups, this.value)\" onchange=\"optGroup.sortSelectMatch(chosenGroups, this.value)\"></td>";
 	$sToRender .= "</tr>";
 
 	// Assign/Cancel button
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/passwordManagementUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/passwordManagementUI.inc
index bb35ce0..798f7c8 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/passwordManagementUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/passwordManagementUI.inc
@@ -31,15 +31,15 @@ function getPage($sUserName) {
 	$sToRender .= "<br>\n";	
 	$sToRender .= "<table cellpadding=\"5\">\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td bgcolor=\"6699FF\">User name: </td>\n";
+	$sToRender .= "<td bgcolor=\"6699FF\">" . _("User name") . ": </td>\n";
 	$sToRender .= "<td bgcolor=\"F5F6EE\">$sUserName</td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td bgcolor=\"6699FF\">New password: </td>\n";
+	$sToRender .= "<td bgcolor=\"6699FF\">" . _("New password") . ": </td>\n";
 	$sToRender .= "<td><input type=\"password\" name=\"fNewPassword\"></td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td bgcolor=\"6699FF\">Confirm password: </td>\n";
+	$sToRender .= "<td bgcolor=\"6699FF\">" . _("Confirm password") . ": </td>\n";
 	$sToRender .= "<td bgcolor=\"F5F6EE\"><input type=\"password\" name=\"fNewPasswordConfirm\"></td>\n";
 	$sToRender .= "</tr>\n";
 	$sToRender .= "<tr>\n";
@@ -61,7 +61,7 @@ function getPasswordUpdateSuccessPage() {
 	$sToRender .= renderHeading(_("Update user password"));
 	$sToRender .= "<br>\n";
 	$sToRender .= "<table>\n";	
-	$sToRender .= "<tr><td>The user's password was successfully updated</td></tr>\n";
+	$sToRender .= "<tr><td>" . _("The user's password was successfully updated") . ".</td></tr>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr></tr>\n";
 	$sToRender .= "<tr>\n";
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/bulkUploadBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/bulkUploadBL.php
index 014c811..12b85dd 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/bulkUploadBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/bulkUploadBL.php
@@ -57,8 +57,8 @@ $oPatternCustom = & new PatternCustom();
 /* CHECK: system has required features to handle bulk upload */
 if (!BulkUploadManager::isBulkUploadCapable()) {
     // can't do bulk uploading
-    $sErrorMessage = "This system is not capable of handling bulk uploads. <br/>\n"
-        . "Please contact your system administrator.<br />\n"
+    $sErrorMessage = _("This system is not capable of handling bulk uploads") . ". <br/>\n"
+        . _("Please contact your system administrator") . "<br />\n"
         . getCancelButton($fFolderID);
     $main->setErrorMessage($sErrorMessage);
     $main->setCentralPayload($oPatternCustom);
@@ -72,7 +72,7 @@ if (isset($fFolderID)) {
 } else {
     // no folder id was set when coming to this page,
     // so display an error message
-    $sErrorMessage = "You haven't selected a folder to bulk upload to.";
+    $sErrorMessage = _("You haven't selected a folder to bulk upload to") . ".";
     $main->setErrorMessage($sErrorMessage);
     $main->setCentralPayload($oPatternCustom);
     $main->render();
@@ -83,7 +83,7 @@ if (isset($fFolderID)) {
 if (!Permission::userHasFolderWritePermission($oFolder)) {
     // user does not have write permission for this folder
     $sErrorMessage = getCancelButton($fFolderID)
-        . "You do not have permission to add a document to this folder.";
+        . _("You do not have permission to add a document to this folder") . ".";
     $main->setErrorMessage($sErrorMessage);
     $main->setCentralPayload($oPatternCustom);
     $main->render();
@@ -192,7 +192,7 @@ while ($aIndividualFiles) {
     $oDocument->setDocumentTypeID($fDocumentTypeID);
 
     if (Document::documentExists($oDocument->getFileName(), $oDocument->getFolderID())) {
-        $aFileStatus[$sBasename] = "A document with this file name already exists in this folder.";
+        $aFileStatus[$sBasename] = _("A document with this file name already exists in this folder") . ".";
         continue;
     }
 
@@ -200,14 +200,14 @@ while ($aIndividualFiles) {
 
     if (!$oDocument->create()) {
         $default->log->error("bulkUploadBL.php DB error storing document in folder $sFolderPath id=$fFolderID");
-        $aFileStatus[$sBasename] = "An error occured while storing the document in the database, please try again. Error code 0127.";
+        $aFileStatus[$sBasename] = _("An error occured while storing the document in the database, please try again") . ".";
         continue;
     }
 
     // if the document was successfully created in the db, store it on the file system
     if (!PhysicalDocumentManager::uploadPhysicalDocument($oDocument, $fFolderID, "None", $oFile->sFilename)) {
         $default->log->error("bulkUploadBL.php DB error storing document in folder $sFolderPath id=$fFolderID");
-        $aFileStatus[$sBasename] = "An error occured while storing the document in the database, please try again. Error code 0128.";
+        $aFileStatus[$sBasename] = _("An error occured while storing the document in the database, please try again") . ".";
         continue;
     }
 
@@ -248,7 +248,7 @@ while ($aIndividualFiles) {
     /* display a status page with per-file results for bulk upload */
     $default->log->info("bulkUploadBL.php successfully added document " . $oDocument->getFileName() . " to folder $sFolderPath id=$fFolderID");
     /* store status for this document for later display */ 
-    $aFileStatus[$oDocument->getName()] = "Successfully added document";
+    $aFileStatus[$oDocument->getName()] = _("Successfully added document");
 }
 $oPatternCustom->setHtml(getStatusPage($fFolderID, $aFileStatus));
 
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/bulkUploadUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/bulkUploadUI.inc
index d2a7f60..53fd847 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/bulkUploadUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/bulkUploadUI.inc
@@ -109,7 +109,7 @@ function getDocumentType($iFolderID) {
     $oPatternListBox = & new PatternListBox("$default->document_types_table", "name", "id", "fDocumentTypeID",$sWhereClause);
     $oPatternListBox->setIncludeDefaultValue(false);
     $oPatternListBox->setFromClause("INNER JOIN $default->folder_doctypes_table AS FDL ON ST.id = FDL.document_type_id");
-    $oPatternListBox->setEmptyErrorMessage("No document types defined! Please contact an Administrator");
+    $oPatternListBox->setEmptyErrorMessage(_("No document types defined") . "!  " . _("Please contact an Administrator"));
 
     $sHeading = "Please select the document type:";
 
@@ -159,13 +159,13 @@ function getPage($iFolderID, $iDocumentTypeID) {
     $sToRender .= "<input type=\"hidden\" name=\"fStore\" value=\"1\">";
     $sToRender .= "<table>\n";
     $sToRender .= "<tr>\n";
-    $sToRender .= "<td colspan=\"2\"><b>Bulk Upload Zipfile: <b></td>\n";
+    $sToRender .= "<td colspan=\"2\"><b>" . _("Bulk Upload Zipfile") . ": <b></td>\n";
     $sToRender .= "</tr>\n";
     $sToRender .= "<tr><td>File: </td><td><input type=\"file\" name=\"fFile\"></td></tr>\n";
-    $sToRender .= "<tr><td colspan=\"2\">(Note: file should be a ZIP file without subdirectories. Details entered below apply to ALL documents to be added.)</td></tr>\n";
+    $sToRender .= "<tr><td colspan=\"2\">(" . _("Note: file should be a ZIP file without subdirectories. Details entered below apply to ALL documents to be added.") . ")</td></tr>\n";
     $sToRender .= "</table>\n";
 
-    $sToRender .= "<table><tr><td><b>Document Type<b></td></tr><tr><td>" . lookupName($default->document_types_table, $iDocumentTypeID) . "</td></tr></table>";
+    $sToRender .= "<table><tr><td><b>" . _("Document Type") . "<b></td></tr><tr><td>" . lookupName($default->document_types_table, $iDocumentTypeID) . "</td></tr></table>";
     $sToRender .= getMetaDataForm($iFolderID, $iDocumentTypeID);
 
     // create "BACK" button (to go back to choose document type id)
@@ -184,13 +184,13 @@ function getPage($iFolderID, $iDocumentTypeID) {
 function getStatusPage ($iFolderID, $aFileStatus) {
     global $default;
 
-    $sToRender .= "Bulk Upload completed for ".count($aFileStatus)." documents. <br/>\n";
+    $sToRender = sprintf(_("Bulk Upload completed for %s documents.  <br/>"), count($aFileStatus));
     if ($aFileStatus) {
         $sToRender .= "<table>\n";
         $sToRender .= "<tr>\n";
-        $sToRender .= "<th> Document </th>\n";
+        $sToRender .= "<th> " . _("Document") . " </th>\n";
         $sToRender .= "<th> &nbsp; </th>\n";
-        $sToRender .= "<th> Status </th>\n";
+        $sToRender .= "<th> " . _("Status") . " </th>\n";
         $sToRender .= "</tr>\n";
         foreach ($aFileStatus as $sDocumentName => $sUploadStatus) {
             $sToRender .= "<tr>\n";
@@ -209,8 +209,8 @@ function getStatusPage ($iFolderID, $aFileStatus) {
 }
 
 function getInvalidBulkUploadErrorMsg() {
-    return "You did not select a valid document to upload. <br />\n"
-           ."Bulk upload currently only supports .ZIP files without subdirectories.<br />\n";
+    return _("You did not select a valid document to upload") . ". <br />\n" .
+           _("Bulk upload currently only supports .ZIP files without subdirectories") . ".<br />\n";
 }
 
 // image link ... BACK (try bulk upload again)
diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc
index 6d9405e..f3233b7 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc
@@ -35,7 +35,7 @@ function getConfirmationPage($iFolderID, $iDocumentIDs) {
 
 	  $oDocument = & Document::get($iDocumentIDs[$i]);
 	
-	  $sToRender .= "<tr><td><strong>" . $oDocument->getDisplayPath() . "</strong> <td>&nbsp;to&nbsp;</td> </td>\n";
+	  $sToRender .= "<tr><td><strong>" . $oDocument->getDisplayPath() . "</strong> <td>&nbsp;" . _("to") . "&nbsp;</td> </td>\n";
 	  $sToRender .= "<td><strong>" . Folder::getFolderDisplayPath($iFolderID) . " > " . $oDocument->getFileName() . "</strong></td>\n";
 	  $sQueryString .= "fDocumentIDs[]=$iDocumentIDs[$i]&";
 	}
@@ -85,7 +85,7 @@ function getPage($iFolderID, $iDocumentIDs, $sErrorMessage = "") {
 function renderErrorPage($sErrorMessage, $iDocumentID = "") {
   global $default;
   if ($iDocumentID) {
-    return statusPage("Delete Document", "", $sErrorMessage, "viewDocument", "fDocumentID=$iDocumentID");
+    return statusPage(_("Delete Document"), "", $sErrorMessage, "viewDocument", "fDocumentID=$iDocumentID");
   } else {
     $sToRender  = renderHeading(_("Delete Document"));
     $sToRender .= "<table>\n";
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
index a6b5e40..4937687 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php
@@ -152,7 +152,7 @@ if (checkSession()) {
 					   
                 	if (Folder::folderIsUnitRootFolder($fFolderID) && $bUnitHasGroups) {
 						// you can't delete a unit root folder
-						$oPatternCustom->setHtml(statusPage("Delete Folder", "", "You can't delete this folder because it is a Unit Root Folder and in use.", "browse", "fFolderID=" . $iFolderID));
+						$oPatternCustom->setHtml(statusPage("Delete Folder", "", _("You can't delete this folder because it is a Unit Root Folder and in use") . ".", "browse", "fFolderID=" . $iFolderID));
 
                 	} else {
 	                    // get confirmation first
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
index 8a152d0..1ec819b 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc
@@ -48,7 +48,7 @@ function getFolderData($iFolderID, $sDivName, $sStatusMessage = "") {
 	$aColumnTypes = array(1,1,2);
 	
 	$oPatternListFromQuery = & new PatternListFromQuery($sQuery, $aColumns, $aColumnHeaders, $aColumnTypes);
-	$oPatternListFromQuery->setTableHeading("Folder Data");
+	$oPatternListFromQuery->setTableHeading(_("Folder Data"));
 	$oPatternListFromQuery->setTableWidth("610");
 	
 	$sToRender .= "<table>";
@@ -85,7 +85,7 @@ function getFolderRouting($iFolderID, $sDivName, $bCollaboration) {
 	$aLinkURLs = array(4=>"$default->rootUrl/control.php?action=modifyFolderCollaboration",5=>"$default->rootUrl/control.php?action=deleteFolderCollaboration", 6=>"$default->rootUrl/control.php?action=viewDependantDocument");
 	
 	$oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "610", $aLinkURLs, $aDBColumnArray,$aQueryStringVariableNames);
-	$oPatternTableSqlQuery->setTableHeading("Document Routing");
+	$oPatternTableSqlQuery->setTableHeading(_("Document Routing"));
 	$oPatternTableSqlQuery->setDisplayColumnHeadings(true);
 	
 	$sToRender .= "<table>";
@@ -119,7 +119,7 @@ function getFolderDocTypes($iFolderID, $sDivName) {
 	$aLinkURLs = array(1=>"$default->rootUrl/control.php?action=deleteFolderDocType");
 	
 	$oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "610", $aLinkURLs, $aDBColumnArray,$aQueryStringVariableNames);
-	$oPatternTableSqlQuery->setTableHeading("Document Types");
+	$oPatternTableSqlQuery->setTableHeading(_("Document Types"));
 	$oPatternTableSqlQuery->setDisplayColumnHeadings(true);
 	
 	$sToRender .= "<table>";
@@ -166,11 +166,11 @@ function getFolderGroupAccess($iFolderID, $sDivName) {
 	$aLinkURLs = array(3=>"$default->rootUrl/control.php?action=modifyGroupFolderLink",4=>"$default->rootUrl/control.php?action=deleteGroupFolderLink");
 	
 	$oPatternTableSqlQuery = & new PatternTableSqlQuery(array($sQuery, $iInheritedFolderID), $aColumns, $aColumnTypes, $aColumnHeaders, "610", $aLinkURLs, $aDBColumnArray,$aQueryStringVariableNames);
-	$oPatternTableSqlQuery->setTableHeading("Folder Permissions");
+	$oPatternTableSqlQuery->setTableHeading(_("Folder Permissions"));
 	$oPatternTableSqlQuery->setDisplayColumnHeadings(true);
         if ($bInherited === true) {
             $oPatternTableSqlQuery->setDisabled(true);
-            $oPatternTableSqlQuery->setTableHeading("Folder Permissions (inherited)");
+            $oPatternTableSqlQuery->setTableHeading(_("Folder Permissions") . "(" . _("inherited") . ")");
         }
 	$sToRender .= "<table>";
 	$sToRender .= "<tr><td>" . $oPatternTableSqlQuery->render() . "</td></tr>";
diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataUI.inc
index 8bcb96f..6faed00 100644
--- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/modifyFolderDataUI.inc
@@ -41,7 +41,7 @@ function getFolderData($iFolderID, $sStatusMessage = "") {
 	$sToRender .= "<table>";
 	$sToRender .= "<tr><td>";
 	$sToRender .= "<table cellpadding=\"5\" border=\"0\" width=\"610\">\n";
-	$sToRender .= "<caption><strong>Folder Data</strong></caption>";
+	$sToRender .= "<caption><strong>" . _("Folder Data") . "</strong></caption>";
 	if ($sql->next_record()) {
 		$sToRender .= "<tr>\n";
 		$sToRender .= "<td bgcolor=\"" . $sTDBGColour . "\">Name</td>\n";