diff --git a/templates/kt3/document/edit.smarty b/templates/kt3/document/edit.smarty
index e46c5e2..2c9dbaa 100644
--- a/templates/kt3/document/edit.smarty
+++ b/templates/kt3/document/edit.smarty
@@ -11,7 +11,7 @@
 
 {$context->oPage->requireCSSResource('resources/css/kt-treewidget.css')}
 
-<h2>Editing: {$document->getName()}</h2>
+<h2>{i18n}Editing{/i18n}: {$document->getName()}</h2>
 <p class="descriptiveText"><strong>FIXME</strong>:  do we need assisting text here?</p>
   
 <form method="POST">
@@ -25,5 +25,5 @@
 
 
 <div class="form_actions">
-    <input class="save" type="submit" value="Save Changes" />
-</div>
\ No newline at end of file
+    <input class="save" type="submit" value="{i18n}Save Changes{/i18n}" />
+</div>
diff --git a/templates/kt3/document/metadata_history.smarty b/templates/kt3/document/metadata_history.smarty
index fd82714..78d1e66 100644
--- a/templates/kt3/document/metadata_history.smarty
+++ b/templates/kt3/document/metadata_history.smarty
@@ -1,16 +1,16 @@
-<h2>Metadata History: {$document->getName()}</h2>
+<h2>{i18n}Metadata History{/i18n}: {$document->getName()}</h2>
 
-<p class="descriptiveText">This lists the older versions of the document, as the metadata about it has been changed.</p>
+<p class="descriptiveText">{i18n}This lists the older versions of the document, as the metadata about it has been changed.{/i18n}</p>
 
 
-    <table class="document_history" summary="Document History for KnowledgeTree New UI Presentation" cellspacing="0">
+    <table class="document_history" summary="{i18n}Document History for KnowledgeTree New UI Presentation{/i18n}" cellspacing="0">
 
         <thead>
             <tr>
-                <th class="username">User</th>
-                <th class="date">Metadata Version</th>
-                <th class="date">Content Version</th>
-                <th class="compare">Compare</th>
+                <th class="username">{i18n}User{/i18n}</th>
+                <th class="date">{i18n}Metadata Version{/i18n}</th>
+                <th class="date">{i18n}Content Version{/i18n}</th>
+                <th class="compare">{i18n}Compare{/i18n}</th>
 
             </tr>
         </thead>
@@ -19,7 +19,7 @@
                 <td class="username">{$context->getUserForId($document->getModifiedUserId())}</td>
                 <td class="date">{$document->getMetadataVersion()}</td>
                 <td class="date">{$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()}</td>
-                <td class="compare">Current</td>                
+                <td class="compare">{i18n}Current{/i18n}</td>                
             </tr>
 
           {foreach item=oVersion from=$versions}
@@ -27,7 +27,7 @@
                 <td class="username">{$context->getUserForId($oVersion->getModifiedUserId())}</td>
                 <td class="date">{$oVersion->getMetadataVersion()}</td>
                 <td class="date">{$oVersion->getMajorVersionNumber()}.{$oVersion->getMinorVersionNumber()}</td>
-                <td class="compare"><a href="{$smarty.server.PHP_SELF}?action=viewComparison&fDocumentId={$document->getId()}&fComparisonVersion={$oVersion->getId()}">compare with current</a></td>                
+                <td class="compare"><a href="{$smarty.server.PHP_SELF}?action=viewComparison&fDocumentId={$document->getId()}&fComparisonVersion={$oVersion->getId()}">{i18n}compare with current{/i18n}</a></td>                
             </tr>
             {/foreach}
         </tbody>
diff --git a/templates/kt3/document/view.smarty b/templates/kt3/document/view.smarty
index f0775c2..878ff16 100644
--- a/templates/kt3/document/view.smarty
+++ b/templates/kt3/document/view.smarty
@@ -1,6 +1,9 @@
 <h2>{$document->getName()}</h2>
-<p class="descriptiveText">showing information for <strong>version {$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()}</strong> </p>
+{capture assign=version}
+{$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()}
+{/capture}
+<p class="descriptiveText">{i18n arg_version=$version}showing information for <strong>version #version#</strong>{/i18n}</p>
     
 {foreach item=oFieldset from=$fieldsets}
 {$oFieldset->render($document_data)}
-{/foreach}
\ No newline at end of file
+{/foreach}
diff --git a/templates/kt3/fields/base.smarty b/templates/kt3/fields/base.smarty
index 8022e27..08c33f5 100644
--- a/templates/kt3/fields/base.smarty
+++ b/templates/kt3/fields/base.smarty
@@ -1,5 +1,5 @@
     <div class="field {if ($has_errors)}error{/if}">
-      <label for="{$name}">{$label}{if ($required === true)}<span class="required">(Required)</span>{/if}</label>
+      <label for="{$name}">{$label}{if ($required === true)}<span class="required">({i18n}Required{/i18n})</span>{/if}</label>
       <p class="descriptiveText">{$description}</p>
       {if ($has_errors)}
       {foreach item=sError from=$errors}
@@ -12,4 +12,4 @@
       {/if}
 
       <input type="text" name="{$name}" {if $has_id}id="{$id}"{/if} {if $has_value}value="{$value}"{/if}/><input type="hidden" name="kt_core_fieldsets_expect[{$name}]" value ="1"  />
-     </div>
\ No newline at end of file
+     </div>
diff --git a/templates/kt3/fields/checkbox.smarty b/templates/kt3/fields/checkbox.smarty
index 847855c..3300bdc 100644
--- a/templates/kt3/fields/checkbox.smarty
+++ b/templates/kt3/fields/checkbox.smarty
@@ -1,5 +1,5 @@
     <div class="field {if ($has_errors)}error{/if}">
-      <label for="{$name}">{$label}{if ($required === true)}<span class="required">(Required)</span>{/if}</label>
+      <label for="{$name}">{$label}{if ($required === true)}<span class="required">({i18n}Required{/i18n})</span>{/if}</label>
       <p class="descriptiveText">{$description}</p>
       {if ($has_errors)}
       {foreach item=sError from=$errors}
@@ -12,4 +12,4 @@
       {/if}
 
       <input type="checkbox" name="{$name}" {if $has_id}id="{$id}"{/if} {if ($has_value && ($value == true))}checked="checked"{/if}/><input type="hidden" name="kt_core_fieldsets_expect[{$name}]" value ="1"  />
-     </div>
\ No newline at end of file
+     </div>
diff --git a/templates/kt3/fields/fileupload.smarty b/templates/kt3/fields/fileupload.smarty
index 1268879..93e2140 100644
--- a/templates/kt3/fields/fileupload.smarty
+++ b/templates/kt3/fields/fileupload.smarty
@@ -1,5 +1,5 @@
     <div class="field {if ($has_errors)}error{/if}">
-      <label for="{$name}">{$label}{if ($required === true)}<span class="required">(Required)</span>{/if}</label>
+      <label for="{$name}">{$label}{if ($required === true)}<span class="required">({i18n}Required{/i18n})</span>{/if}</label>
       <p class="descriptiveText">{$description}</p>
       {if ($has_errors)}
       {foreach item=sError from=$errors}
diff --git a/templates/kt3/fields/lookup.smarty b/templates/kt3/fields/lookup.smarty
index 984060c..8c6f8e5 100644
--- a/templates/kt3/fields/lookup.smarty
+++ b/templates/kt3/fields/lookup.smarty
@@ -1,5 +1,5 @@
     <div class="field {if ($has_errors)}error{/if}">
-      <label for="{$name}">{$label}{if ($required === true)}<span class="required">(Required)</span>{/if}</label>
+      <label for="{$name}">{$label}{if ($required === true)}<span class="required">({i18n}Required{/i18n})</span>{/if}</label>
       <p class="descriptiveText">{$description}</p>
       {if ($has_errors)}
       {foreach item=sError from=$errors}
@@ -17,4 +17,4 @@
       {/foreach}
       </select>
       <input type="hidden" name="kt_core_fieldsets_expect[{$name}]" value ="1" />
-     </div>
\ No newline at end of file
+     </div>
diff --git a/templates/kt3/fields/password.smarty b/templates/kt3/fields/password.smarty
index 66c3a31..e608e9b 100644
--- a/templates/kt3/fields/password.smarty
+++ b/templates/kt3/fields/password.smarty
@@ -1,5 +1,5 @@
     <div class="field {if ($has_errors)}error{/if}">
-      <label for="{$name}">{$label}{if ($required === true)}<span class="required">(Required)</span>{/if}</label>
+      <label for="{$name}">{$label}{if ($required === true)}<span class="required">({i18n}Required{/i18n})</span>{/if}</label>
       <p class="descriptiveText">{$description}</p>
       {if ($has_errors)}
       {foreach item=sError from=$errors}
@@ -12,4 +12,4 @@
       {/if}
 
       <input type="password" name="{$name}" {if $has_id}id="{$id}"{/if} {if $has_value}value="{$value}"{/if}/><input type="hidden" name="kt_core_fieldsets_expect[{$name}]" value ="1"  />
-     </div>
\ No newline at end of file
+     </div>
diff --git a/templates/kt3/fields/statictext.smarty b/templates/kt3/fields/statictext.smarty
index d89486a..0cfd427 100644
--- a/templates/kt3/fields/statictext.smarty
+++ b/templates/kt3/fields/statictext.smarty
@@ -1,5 +1,5 @@
     <div class="field {if ($has_errors)}error{/if}">
-      <label for="{$name}">{$label}{if ($required === true)}<span class="required">(Required)</span>{/if}</label>
+      <label for="{$name}">{$label}{if ($required === true)}<span class="required">({i18n}Required{/i18n})</span>{/if}</label>
       <p class="descriptiveText">{$description}</p>
       {if ($has_errors)}
       {foreach item=sError from=$errors}
diff --git a/templates/kt3/fields/text.smarty b/templates/kt3/fields/text.smarty
index b036f2b..543ea0c 100644
--- a/templates/kt3/fields/text.smarty
+++ b/templates/kt3/fields/text.smarty
@@ -1,5 +1,5 @@
     <div class="field {if ($has_errors)}error{/if}">
-      <label for="{$name}">{$label}{if ($required === true)}<span class="required">(Required)</span>{/if}</label>
+      <label for="{$name}">{$label}{if ($required === true)}<span class="required">({i18n}Required{/i18n})</span>{/if}</label>
       <p class="descriptiveText">{$description}</p>
       {if ($has_errors)}
       {foreach item=sError from=$errors}
diff --git a/templates/kt3/fields/tree.smarty b/templates/kt3/fields/tree.smarty
index cc02002..1fabe70 100644
--- a/templates/kt3/fields/tree.smarty
+++ b/templates/kt3/fields/tree.smarty
@@ -1,5 +1,5 @@
     <div class="field {if ($has_errors)}error{/if}">
-      <label for="{$name}">{$label}{if ($required === true)}<span class="required">(Required)</span>{/if}</label>
+      <label for="{$name}">{$label}{if ($required === true)}<span class="required">({i18n}Required{/i18n})</span>{/if}</label>
       <p class="descriptiveText">{$description}</p>
       {if ($has_errors)}
       {foreach item=sError from=$errors}
@@ -13,4 +13,4 @@
       
       {$options.tree}
       <input type="hidden" name="kt_core_fieldsets_expect[{$name}]" value ="1" />
-     </div>
\ No newline at end of file
+     </div>
diff --git a/templates/kt3/fieldsets/conditional_editable.smarty b/templates/kt3/fieldsets/conditional_editable.smarty
index 9c29b0f..3223e82 100644
--- a/templates/kt3/fieldsets/conditional_editable.smarty
+++ b/templates/kt3/fieldsets/conditional_editable.smarty
@@ -6,11 +6,11 @@
     </p>
     
     <div class="conditional_target">
-    conditional data.
+    {i18n}conditional data.{/i18n}
     </div>
     
 </fieldset>
 <!--
 <table id="brad-log"><tbody></tbody>
 </table>
--->
\ No newline at end of file
+-->
diff --git a/templates/kt3/fieldsets/generic.smarty b/templates/kt3/fieldsets/generic.smarty
index 6ce00de..c7f4cca 100644
--- a/templates/kt3/fieldsets/generic.smarty
+++ b/templates/kt3/fieldsets/generic.smarty
@@ -1,30 +1,31 @@
 <div class="detail_fieldset">
-    <h3>Generic Information</h3>
+    <h3>{i18n}Generic Information{/i18n}</h3>
     <p class="descriptiveText">
-        The information in this section is stored by the KnowledgeTree&trade; for every
-        document.
+        {i18n}The information in this section is stored by the KnowledgeTree&trade; for every
+        document.{/i18n}
     </p>
     <dl class="metadata">
-        <dt>File is a </dt>
+        <dt>{i18n}File is a{/i18n} </dt>
         <dd>{$context->_mimeHelper($document->getMimeTypeID())} ({$context->_sizeHelper($document->getSize())})</dd>
 
-        <dt>Created by</dt>
+        <dt>{i18n}Created by{/i18n}</dt>
         <dd>{$creator} ({$creation_date})</dd>
 
-        <dt>Last update by</dt>
+        <dt>{i18n}Last update by{/i18n}</dt>
         <dd>{$last_modified_by} ({$last_modified_date})</dd>
 
-        <dt>Document Type</dt>
+        <dt>{i18n}Document Type{/i18n}</dt>
         <dd>{$document_type}</dd>
 
-        <dt>Workflow status</dt>
+        <dt>{i18n}Workflow status{/i18n}</dt>
         <dd>
 {if $workflow_state}
 {$workflow_state->getName()}
 {else}
-No workflow
+{i18n}No workflow{/i18n}
 {/if}
-(<a href="{$rootUrl}/action.php/ktcore.actions.document.workflow?fDocumentId={$document->getId()}">manage workflow</a>)
+(<a
+href="{$rootUrl}/action.php/ktcore.actions.document.workflow?fDocumentId={$document->getId()}">{i18n}manage workflow{/i18n}</a>)
 </dd>
     </dl>
     <div class="floatClear"><!-- --> </div>
diff --git a/templates/kt3/fieldsets/generic_versioned.smarty b/templates/kt3/fieldsets/generic_versioned.smarty
index 67241ce..a3fcde5 100644
--- a/templates/kt3/fieldsets/generic_versioned.smarty
+++ b/templates/kt3/fieldsets/generic_versioned.smarty
@@ -1,51 +1,48 @@
 <div class="detail_fieldset">
-    <h3>Generic Information</h3>
+    <h3>{i18n}Generic Information{/i18n}</h3>
     <p class="descriptiveText">
-        The information in this section is stored by the KnowledgeTree&trade; for every
-        document.
+        {i18n}The information in this section is stored by the KnowledgeTree&trade; for every
+        document.{/i18n}
     </p>
     <dl class="metadata versioned">
-        <dt>File is a </dt>
+        <dt>{i18n}File is a{/i18n} </dt>
         <dd>
             <div class="current">{$context->_mimeHelper($document->getMimeTypeID())} ({$context->_sizeHelper($document->getSize())})</div>
             <div class="previous">{$context->_mimeHelper($comparison_document->getMimeTypeID())} ({$context->_sizeHelper($comparison_document->getSize())})</div>
         </dd>
 
-        <dt>Created by</dt>
+        <dt>{i18n}Created by{/i18n}</dt>
         <dd>
-            {$creator} ({$creation_date}) <span class="descriptiveText">(this cannot not change between versions)</span>
+            {$creator} ({$creation_date}) <span class="descriptiveText">({i18n}this cannot not change between versions{/i18n})</span>
         </dd>
 
-        <dt>Last update by</dt>
+        <dt>{i18n}Last update by{/i18n}</dt>
         <dd>
             <div class="current">{$last_modified_by} ({$last_modified_date})</div>
             <div class="previous">{$last_modified_by} ({$comparison_last_modified_date})</div>
         </dd>
 
 
-        <dt>Document Type</dt>
+        <dt>{i18n}Document Type{/i18n}</dt>
         <dd>
             <div class="current">{$document_type}</div>
             <div class="previous">{$comparison_document_type}</div>
         </dd>
 
-        <dt>Workflow status</dt>
+        <dt>{i18n}Workflow status{/i18n}</dt>
         <dd>
             <div class="current">
 {if $workflow_state}
 {$workflow_state->getName()}
 {else}
-No workflow
+{i18n}No workflow{/i18n}
 {/if}
-(<a
-href="{$rootUrl}/action.php/ktcore.actions.document.workflow?fDocumentId={$document->getId()}">manage
-workflow</a>)
 </div>
             <div class="previous">
 {if $comparison_workflow_state}
 {$comparison_workflow_state->getName()}
 {else}
-No workflow
+{i18n}No workflow{/i18n}
 {/if}
 </div>
         </dd>
diff --git a/templates/kt3/fieldsets/simple.smarty b/templates/kt3/fieldsets/simple.smarty
index 7c1a024..b175023 100644
--- a/templates/kt3/fieldsets/simple.smarty
+++ b/templates/kt3/fieldsets/simple.smarty
@@ -1,16 +1,19 @@
 <div class="detail_fieldset">
     <h3>{$fieldset->getName()}</h3>
     <p class="descriptiveText">
-        This is the data assigned to the <strong>{$fieldset->getName()}</strong> aspect of this document.
+{capture assign=name}
+{$fieldset->getName()}
+{/capture}
+        {i18n arg_name=$name}This is the data assigned to the <strong>#name#</strong> aspect of this document.{/i18n}
     </p>
     
     <dl class="metadata">
       {foreach item=aFieldPair from=$fieldset_values}
         <dt>{$aFieldPair.field->getName()}</dt>
         <dd>{if ($aFieldPair.value !== null)}{$aFieldPair.value}
-            {else}<span class="descriptiveText">no value</span>{/if}</dd>
+            {else}<span class="descriptiveText">{i18n}no value{/i18n}</span>{/if}</dd>
       {/foreach}
     </dl>
     
     <div class="floatClear"><!-- --> </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/kt3/fieldsets/simple_versioned.smarty b/templates/kt3/fieldsets/simple_versioned.smarty
index bcd5e5c..5f29b6b 100644
--- a/templates/kt3/fieldsets/simple_versioned.smarty
+++ b/templates/kt3/fieldsets/simple_versioned.smarty
@@ -1,7 +1,11 @@
 <div class="detail_fieldset">
     <h3>{$fieldset->getName()}</h3>
     <p class="descriptiveText">
-        This is the data assigned to the <strong>{$fieldset->getName()}</strong> aspect of this document.
+	{capture assign=name}
+	{$fieldset->getName()}
+	{/capture
+        {i18n arg_name=$name}This is the data assigned to the
+<strong>#name#</strong> aspect of this document.{/i18n}
     </p>
     
     <dl class="metadata versioned">
@@ -19,4 +23,4 @@
     </dl>
     
     <div class="floatClear"><!-- --> </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/kt3/notifications/subscriptions.smarty b/templates/kt3/notifications/subscriptions.smarty
index 3d0d860..9f82a76 100644
--- a/templates/kt3/notifications/subscriptions.smarty
+++ b/templates/kt3/notifications/subscriptions.smarty
@@ -4,12 +4,12 @@
 {if ($info.event_type == 'AddDocument')}
     The document "{$info.object_name}" was added{if ($info.location_name !== null)} to "{$info.location_name}"{/if}.
     <div class="actionoptions">
-    <a href="{$rootUrl}/notify.php?id={$info.notify_id}">Read Document</a> | 
-    <a href="{$rootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">Clear Alert</a>
+    <a href="{$rootUrl}/notify.php?id={$info.notify_id}">{i18n}Read Document{/i18n}</a> | 
+    <a href="{$rootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
     </div>
 {else} <!-- fallback. -->
 {/if}
     <div class="actionoptions">
-    <a href="{$rootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">Clear Alert</a>
+    <a href="{$rootUrl}/notify.php?id={$info.notify_id}&notify_action=clear">{i18n}Clear Alert{/i18n}</a>
     </div>
-</dd>
\ No newline at end of file
+</dd>
diff --git a/templates/kt3/portlets/search_portlet.smarty b/templates/kt3/portlets/search_portlet.smarty
index e65662a..9b871fa 100644
--- a/templates/kt3/portlets/search_portlet.smarty
+++ b/templates/kt3/portlets/search_portlet.smarty
@@ -1,6 +1,6 @@
 <form action="{$rootUrl}/presentation/lookAndFeel/knowledgeTree/search/simpleSearch.php" method="GET">
-<input type="text" name="fSearchableText" id="portlet-search-text" size="15" /><input type="submit" value="search" class="searchbutton" />
+<input type="text" name="fSearchableText" id="portlet-search-text" size="15" /><input type="submit" value="{i18n}search{/i18n}" class="searchbutton" />
 </form>
 <ul class="actionlist">
-<li><a href="{$rootUrl}/presentation/lookAndFeel/knowledgeTree/search/booleanSearch.php">Boolean Search</a></li>
+<li><a href="{$rootUrl}/presentation/lookAndFeel/knowledgeTree/search/booleanSearch.php">{i18n}Boolean Search{/i18n}</a></li>
 </ul>
diff --git a/templates/kt3/standard_page.smarty b/templates/kt3/standard_page.smarty
index 8219a51..a71f81f 100644
--- a/templates/kt3/standard_page.smarty
+++ b/templates/kt3/standard_page.smarty
@@ -73,7 +73,7 @@
 </div>
 
 <div id="breadcrumbs">
-<span class="additional">You are here: </span>
+<span class="additional">{i18n}You are here{/i18n}: </span>
 {if ($page->breadcrumbSection !== false)}
    {if ($page->breadcrumbSection.url) }
         <a href="{$page->breadcrumbSection.url}" class="primary">{$page->breadcrumbSection.label}</a> 
diff --git a/templates/kt3/view_document.smarty b/templates/kt3/view_document.smarty
index f0775c2..81132d8 100644
--- a/templates/kt3/view_document.smarty
+++ b/templates/kt3/view_document.smarty
@@ -1,6 +1,10 @@
 <h2>{$document->getName()}</h2>
-<p class="descriptiveText">showing information for <strong>version {$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()}</strong> </p>
+{capture assign=version}
+{$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()}
+{/capture}
+<p class="descriptiveText">{i18n arg_version=$version}showing information for <strong>version
+#version#</strong>{/i18n}</p>
     
 {foreach item=oFieldset from=$fieldsets}
 {$oFieldset->render($document_data)}
-{/foreach}
\ No newline at end of file
+{/foreach}
diff --git a/templates/kt3/view_document_history.smarty b/templates/kt3/view_document_history.smarty
index 76e67ab..a610f25 100644
--- a/templates/kt3/view_document_history.smarty
+++ b/templates/kt3/view_document_history.smarty
@@ -1,17 +1,18 @@
-<h2>Document History: {$document->getName()}</h2>
+<h2>{i18n}Document History{/i18n}: {$document->getName()}</h2>
 
-<p class="descriptiveText">This allows you to have a brief overview of the history of the document.</p>
+<p class="descriptiveText">{i18n}This allows you to have a brief
+overview of the history of the document.{/i18n}</p>
 
 
-    <table class="document_history" summary="Document History for KnowledgeTree New UI Presentation" cellspacing="0">
+    <table class="document_history" summary="{i18n}Document History for KnowledgeTree New UI Presentation{/i18n}" cellspacing="0">
 
         <thead>
             <tr>
-                <th class="username">User</th>
-                <th class="action">Action</th>
-                <th class="date">Date</th>
-                <th class="contentversion">Content version</th>
-                <th class="comment">Comment</th>
+                <th class="username">{i18n}User{/i18n}</th>
+                <th class="action">{i18n}Action{/i18n}</th>
+                <th class="date">{i18n}Date{/i18n}</th>
+                <th class="contentversion">{i18n}Content version{/i18n}</th>
+                <th class="comment">{i18n}Comment{/i18n}</th>
             </tr>
         </thead>
         <tbody>
diff --git a/templates/ktcore/authentication/manage.smarty b/templates/ktcore/authentication/manage.smarty
index 80b00f6..a2037db 100644
--- a/templates/ktcore/authentication/manage.smarty
+++ b/templates/ktcore/authentication/manage.smarty
@@ -1,8 +1,8 @@
-<h2>Authentication Sources</h2>
+<h2>{i18n}Authentication Sources{/i18n}</h2>
 
 {if $providers}
 <form method="POST">
-<fieldset><legend>Add an authentication source</legend>
+<fieldset><legend>{i18n}Add an authentication source{/i18n}</legend>
 <input type="hidden" name="action" value="newsource" />
 
 {foreach from=$fields item=oWidget}
@@ -10,14 +10,14 @@
 {/foreach}
 
 <div class="form_actions ">
-  <input type="submit" name="submit" value="Add a new source">
+  <input type="submit" name="submit" value="{i18n}Add a new source{/i18n}" />
 </div>
 </fieldset>
 </form>
 {/if}
 
 {if $sources}
-<h3>Existing sources</h3>
+<h3>{i18n}Existing sources{/i18n}</h3>
 
 <ul>
 {foreach from=$sources item=oSource}
diff --git a/templates/ktcore/authentication/viewsource.smarty b/templates/ktcore/authentication/viewsource.smarty
index c018958..49eca06 100644
--- a/templates/ktcore/authentication/viewsource.smarty
+++ b/templates/ktcore/authentication/viewsource.smarty
@@ -1,20 +1,20 @@
 
-<fieldset><legend>Standard configuration</legend>
+<fieldset><legend>{i18n}Standard configuration{/i18n}</legend>
 <dl>
-  <dt>Name</dt>
+  <dt>{i18n}Name{/i18n}</dt>
   <dd>{$source->getName()}</dd>
 </dl>
 <dl>
-  <dt>Provider</dt>
+  <dt>{i18n}Provider{/i18n}</dt>
   <dd>{$provider->getName()}</dd>
 </dl>
-<a href="?action=editsource&source_id={$source->getId()}">Edit standard configuration</a>
+<a href="?action=editsource&source_id={$source->getId()}">{i18n}Edit standard configuration{/i18n}</a>
 </fieldset>
 
 {assign var=provider_stuff value=$provider->showSource($source)}
 {if $provider_stuff}
-<fieldset><legend>Provider configuration</legend>
+<fieldset><legend>{i18n}Provider configuration{/i18n}</legend>
 {$provider_stuff}
-<a href="?action=editsourceprovider&source_id={$source->getId()}">Edit provider configuration</a>
+<a href="?action=editsourceprovider&source_id={$source->getId()}">{i18n}Edit provider configuration{/i18n}</a>
 </fieldset>
 {/if}
diff --git a/templates/ktcore/boolean_search.smarty b/templates/ktcore/boolean_search.smarty
index f92e42a..7b112f7 100644
--- a/templates/ktcore/boolean_search.smarty
+++ b/templates/ktcore/boolean_search.smarty
@@ -44,27 +44,36 @@ legend { border: 1px dotted #999;}
     </select>
 </div>
 
-<h2>{$title|default:"Boolean Search"}</h2>
+{capture assign=defaulttitle}
+{i18n}Boolean Search{/i18n}
+{/capture}
+<h2>{$title|default:$defaulttitle}</h2>
 
 <form method="POST">
     <input type="hidden" name="action" value="performSearch" />
 {if $sNameTitle}
     {$sNameTitle}: <input type="text" name="name" value="" /> <br />
 {/if}
-    
-   <p class="helpText">Return items which match &nbsp;<select
-name="boolean_search[join]"><option value="AND">all</option><option value="OR">any</option></select> of the <strong>criteria groups</strong> specified.</p>    
+
+{capture assign=options}
+<select name="boolean_search[join]"><option value="AND">all</option><option value="OR">any</option></select>
+{/capture}
+
+   <p class="helpText">{i18n arg_options=$options}Return items which match &nbsp;#options# of the <strong>criteria groups</strong> specified.{/i18n}</p>    
     
     <fieldset>
-        <legend>Criteria Group</legend>
+        <legend>{i18n}Criteria Group{/i18n}</legend>
 
-        <p class="helpText">Return items which match &nbsp;<select name="boolean_search[subgroup][0][join]"><option value="AND">all</option><option value="OR">any</option></select> of the criteria specified.</p>
+	{capture assign=options}
+	<select name="boolean_search[subgroup][0][join]"><option value="AND">all</option><option value="OR">any</option></select>
+	{/capture}
+        <p class="helpText">{i18n arg_options=$options}Return items which match &nbsp;#options# of the criteria specified.{/i18n}</p>
 
         <table class="advanced-search-form">
             <tbody>
                 <tr>
-                <th>Criteria</th>
-                <th>Values</th>
+                <th>{i18n}Criteria{/i18n}</th>
+                <th>{i18n}Values{/i18n}</th>
                 <th>&nbsp;</th>
                 </tr>
                 <tr>
@@ -74,18 +83,21 @@ name="boolean_search[join]"><option value="AND">all</option><option value="OR">a
                         {/foreach}
                         </select>
                         </td>
-                    <td><p class="helpText">first select a type of query</p></td>
-                    <td><input type="button" value="Add" onclick="addNewCriteria(this);" /></td>                    
+                    <td><p class="helpText">{i18n}first select a type of query{/i18n}</p></td>
+                    <td><input type="button" value="{i18n}Add{/i18n}" onclick="addNewCriteria(this);" /></td>                    
                 </tr>
             </tbody>
         </table>
 
     </fieldset>
     
-    <input type="button" value="add another set of criteria" onclick="addBooleanGroup(this)"/>
+    <input type="button" value="{i18n}add another set of criteria{/i18n}" onclick="addBooleanGroup(this)" />
     
     
-    <input type="submit" name="submit" value="{$searchButton|default:"Search"}" />
+{capture assign=defaultsubmit}
+{i18n}Search{/i18n}
+{/capture}
+    <input type="submit" name="submit" value="{$searchButton|default:$defaultsubmit}" />
 </form>
 
 <!--
diff --git a/templates/ktcore/fields/edit.smarty b/templates/ktcore/fields/edit.smarty
index 1386251..0f03b9b 100644
--- a/templates/ktcore/fields/edit.smarty
+++ b/templates/ktcore/fields/edit.smarty
@@ -1,62 +1,62 @@
-<h2>Fieldset: {$oFieldset->getName()|escape}</h2>
+<h2>{i18n}Fieldset{/i18n}: {$oFieldset->getName()|escape}</h2>
 
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-<legend>Fieldset properties</legend>
-<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
-<input type="hidden" name="action" value="editobject">
+<legend>{i18n}Fieldset properties{/i18n}</legend>
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
+<input type="hidden" name="action" value="editobject" />
 <table class="prettysw" cellpadding="0" cellspacing="0">
   <tr>
-    <th>Name</th>
-    <td><input type="textbox" name="name" value="{$oFieldset->getName()|escape}"></td>
+    <th>{i18n}Name{/i18n}</th>
+    <td><input type="textbox" name="name" value="{$oFieldset->getName()|escape}" /></td>
   </tr>
   <tr>
-    <th>Namespace</th>
-    <td><input type="textbox" name="namespace" value="{$oFieldset->getNamespace()|escape}"></td>
+    <th>{i18n}Namespace{/i18n}</th>
+    <td><input type="textbox" name="namespace" value="{$oFieldset->getNamespace()|escape}" /></td>
   </tr>
 </table>
-<input type="submit" name="submit" value="Change">
+<input type="submit" name="submit" value="{i18n}Change{/i18n}" />
 </fieldset>
 </form>
 
-<h2>Fieldset members</h2>
+<h2>{i18n}Fieldset members{/i18n}</h2>
 
 {if $oFieldset->getFields() }
-<h3>Existing members</h3>
+<h3>{i18n}Existing members{/i18n}</h3>
 <form action="{$smarty.server.PHP_SELF}" method="POST">
-<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
 <ul>
 {foreach from=$oFieldset->getFields() item=oField}
   <li><label><input type="checkbox"
 name="fieldsetids[]"
-value="{$oField->getId()}">{$oField->getName()|escape}</label></li>
+value="{$oField->getId()}" />{$oField->getName()|escape}</label></li>
 {/foreach}
 </ul>
-<input type="submit" name="submit" value="Remove fields">
+<input type="submit" name="submit" value="{i18n}Remove fields{/i18n}" />
 </form>
 {/if}
 
-<h3>Add a new field</h3>
+<h3>{i18n}Add a new field{/i18n}</h3>
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
-<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
-<input type="hidden" name="action" value="newfield">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
+<input type="hidden" name="action" value="newfield" />
 <table class="prettysw" cellpadding="0" cellspacing="0">
   <tr>
-    <th>Name</th>
+    <th>{i18n}Name{/i18n}</th>
     <td><input type="textbox" name="name" />
   </tr>
   <tr>
-    <th>Type</th>
+    <th>{i18n}Type{/i18n}</th>
     <td>
 <select name="type">
-<option value="normal">Normal</option>
-<option value="lookup">Lookup</option>
-<option value="tree">Tree</option>
+<option value="normal">{i18n}Normal{/i18n}</option>
+<option value="lookup">{i18n}Lookup{/i18n}</option>
+<option value="tree">{i18n}Tree{/i18n}</option>
 </select>
     </td>
   </tr>
 </table>
-<input type="submit" name="submit" value="Add field">
+<input type="submit" name="submit" value="{i18n}Add field{/i18n}" />
 </form>
diff --git a/templates/ktcore/fields/list.smarty b/templates/ktcore/fields/list.smarty
index 4b94994..45a02bb 100644
--- a/templates/ktcore/fields/list.smarty
+++ b/templates/ktcore/fields/list.smarty
@@ -1,21 +1,21 @@
-<h1>Document Fields</h1>
+<h1>{i18n}Document Fields{/i18n}</h1>
 
 { if $fieldsets}
-<h2>Existing generic document fields</h2>
+<h2>{i18n}Existing generic document fields{/i18n}</h2>
 
 <table class="pretty" cellspacing="0" cellpadding="0">
   <thead>
     <tr>
-      <th colspan="2">Name</th>
-      <th>Generic</th>
-      <th>Fields</th>
+      <th colspan="2">{i18n}Name{/i18n}</th>
+      <th>{i18n}Generic{/i18n}</th>
+      <th>{i18n}Fields{/i18n}</th>
     </tr>
   </thead>
   <tbody>
 {foreach from=$fieldsets item=oFieldset}
     <tr>
 	  <td>
-        <a href="?action=edit&fFieldsetId={$oFieldset->getId()}" class="ktAction ktDelete">Delete</a> 	  
+        <a href="?action=edit&fFieldsetId={$oFieldset->getId()}" class="ktAction ktDelete">{i18n}Delete{/i18n}</a> 	  
 	  </td>
       <td>
         
@@ -25,9 +25,9 @@
       </td>
       <td>
 {if $oFieldset->getIsGeneric()}
-	Yes
+	{i18n}Yes{/i18n}
 {else}
-	No
+	{i18n}No{/i18n}
 {/if}
       </td>
       <td>
@@ -43,10 +43,10 @@
 </table>
 {/if}
 
-<h2>Create a new document field set</h2>
+<h2>{i18n}Create a new document field set{/i18n}</h2>
 
 <form method="POST">
-<input type="hidden" name="action" value="new">
-<input type="textbox" name="name">
-<input type="submit" name="submit" value="Create">
+<input type="hidden" name="action" value="new" />
+<input type="textbox" name="name" />
+<input type="submit" name="submit" value="{i18n}Create{/i18n}" />
 </form>
diff --git a/templates/ktcore/login.smarty b/templates/ktcore/login.smarty
index 8368497..e27cc84 100644
--- a/templates/ktcore/login.smarty
+++ b/templates/ktcore/login.smarty
@@ -2,7 +2,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
 <head>
-    <title>Login | KnowledgeTree</title>
+    <title>{i18n}Login{/i18n} | KnowledgeTree</title>
     
     <link rel="stylesheet" href="{$rootUrl}/resources/css/kt-login.css" type="text/css" />
 
@@ -16,19 +16,19 @@
         <input type="hidden" name="redirect" value="{$redirect|escape}" />
             <img src="{$rootUrl}/resources/graphics/ktlogo-topbar-right.png" alt="KnowledgeTree DMS" class="logoimage" width="252" height="50"/><br />
             {if ($errorMessage == null)}
-            <p class="descriptiveText">Please enter your details below to login.</p>
+            <p class="descriptiveText">{i18n}Please enter your details below to login.{/i18n}</p>
             {else}
             <div class="ktError"><p>{$errorMessage}</p></div>
             {/if}
             
-            <label for="username">Username</label>
+            <label for="username">{i18n}Username{/i18n}</label>
             <input type="text" id="username" name="username"/>
             
-            <label for="password">Password</label>
+            <label for="password">{i18n}Password{/i18n}</label>
             <input type="password" id="password" name="password"/>
             
             <div class="form_actions">
-                <input type="submit" value="login" />
+                <input type="submit" value="{i18n}login{/i18n}" />
             </div>
         </form>
     </div>
diff --git a/templates/ktcore/metadata/conditional/editcomplex.smarty b/templates/ktcore/metadata/conditional/editcomplex.smarty
index cbc96b9..681cefc 100644
--- a/templates/ktcore/metadata/conditional/editcomplex.smarty
+++ b/templates/ktcore/metadata/conditional/editcomplex.smarty
@@ -35,7 +35,7 @@ addLoadEvent(updateActiveFields);
 {/capture}
 {$context->oPage->requireJSStandalone($sJS)}
 
-<h2>Edit Complex Conditional Metadata</h2>
+<h2>{i18n}Edit Complex Conditional Metadata{/i18n}</h2>
 <form>
 <input type="hidden" name="fieldset_id" id="global-fieldset-id" value="{$fieldset_id}" />
 
@@ -52,10 +52,10 @@ addLoadEvent(updateActiveFields);
 {foreach from=$aFields item=oField}
   <td class="inactive" id="md_{$oField->getId()}">
 	<h3>{$oField->getName()}</h3>
-     <p class="inactivity_message">This column is not active.</p>
-     <p class="fixed_message">Editing behaviour <strong>Jack</strong></p>
+     <p class="inactivity_message">{i18n}This column is not active.{/i18n}</p>
+     <p class="fixed_message">{i18n}Editing behaviour <strong>Jack</strong>{/i18n}</p>
      <div class="unassigned_items">
-     <h3>Unassigned/Unavailable</h3>
+     <h3>{i18n}Unassigned/Unavailable{/i18n}</h3>
          <select class="item_list" multiple="true">
 		  <!--     These are orphaned - we fire a "activate" command on load / available.
             <option value="-1">Test 1</option>
@@ -64,7 +64,7 @@ addLoadEvent(updateActiveFields);
             <option value="-4">Test 4</option>
 		  -->
          </select>
-     <p><strong>Assign to behaviour</strong></p>
+     <p><strong>{i18n}Assign to behaviour{/i18n}</strong></p>
      <select class="available_behaviours" onchange="assignToBehaviour(this, {$oField->getId()});">
          <option>Select a behaviour</option>
 	     <!-- ditto 
@@ -74,15 +74,15 @@ addLoadEvent(updateActiveFields);
          <option value="4">Behaviour 4</option>
 		 -->
      </select> <br />
-     <strong>or</strong> to a new behaviour called <br />
+     {i18n}<strong>or</strong> to a new behaviour called{/i18n} <br />
      <input type="text" name="new_behaviour" class="new_behaviour" />
-     <input type="button" value="create behaviour" onclick="assignToNewBehaviour({$oField->getId()});" />
+     <input type="button" value="{i18n}create behaviour{/i18n}" onclick="assignToNewBehaviour({$oField->getId()});" />
      </div>
      <div class="behaviour_edit_options">
-     <h3>Edit Behaviour</h3>
+     <h3>{i18n}Edit Behaviour{/i18n}</h3>
      <p class="helpText">
-        Select a behaviour from this list to change the
-        items which are available.
+        {i18n}Select a behaviour from this list to change the
+        items which are available.{/i18n}
      </p>
          <select class="edit_behaviours" onchange="editBehaviour(this, {$oField->getId()});">
          <option>Select a behaviour</option>
@@ -94,7 +94,8 @@ addLoadEvent(updateActiveFields);
 		 -->
          </select>
      <br />
-     <a href="#" onclick="changeAssignments({$oField->getId()}); return false;">Change Assignments for this field.</a>
+     <a href="#" onclick="changeAssignments({$oField->getId()}); return
+false;">{i18n}Change Assignments for this field.{/i18n}</a>
      </div>
   </td>
 {/foreach}
diff --git a/templates/ktcore/metadata/conditional/editsimple.smarty b/templates/ktcore/metadata/conditional/editsimple.smarty
index 9755a8d..249eeb8 100644
--- a/templates/ktcore/metadata/conditional/editsimple.smarty
+++ b/templates/ktcore/metadata/conditional/editsimple.smarty
@@ -59,7 +59,7 @@ addLoadEvent(partial(editSimpleField, {$iMasterFieldId}));
 
 
 
-<h2>Editing Fieldset Rules (Simple)</h2>
+<h2>{i18n}Editing Fieldset Rules (Simple){/i18n}</h2>
 
 <form>
 <input type="hidden" name="fieldset_id" id="global-fieldset-id" value="{$fieldset_id}" />
@@ -74,7 +74,7 @@ addLoadEvent(partial(editSimpleField, {$iMasterFieldId}));
 
 {foreach from=$aFields item=oField}
   <td class="inactive" id="md_{$oField->getId()}">
-     <p class="inactivity_message">This field is not controlled by the currently active group.</p>
+     <p class="inactivity_message">{i18n}This field is not controlled by the currently active group.{/i18n}</p>
      <div class="lookup_items">
      <h3>Field: {$oField->getName()}</h3>
          <select class="item_list">
@@ -83,9 +83,9 @@ addLoadEvent(partial(editSimpleField, {$iMasterFieldId}));
   {/foreach}
            </select>
          <div class="buttonset">
-             <input type="button" value="edit" class="edit_button" onclick="editSimpleField({$oField->getId()})" />
-             <input type="button" value="save" class="save_button" onclick="saveSimpleField({$oField->getId()})" />
-             <input type="button" value="done" class="done_button" onclick="finishSimpleField({$oField->getId()})" />
+             <input type="button" value="{i18n}edit{/i18n}" class="edit_button" onclick="editSimpleField({$oField->getId()})" />
+             <input type="button" value="{i18n}save{/i18n}" class="save_button" onclick="saveSimpleField({$oField->getId()})" />
+             <input type="button" value="{i18n}done{/i18n}" class="done_button" onclick="finishSimpleField({$oField->getId()})" />
          </div>
      </div>
   </td>
diff --git a/templates/ktcore/metadata/conditional/manageConditional.smarty b/templates/ktcore/metadata/conditional/manageConditional.smarty
index 4a7d0ac..965af13 100644
--- a/templates/ktcore/metadata/conditional/manageConditional.smarty
+++ b/templates/ktcore/metadata/conditional/manageConditional.smarty
@@ -1,88 +1,88 @@
-<h2>Manage conditional fieldset<h2>
+<h2>{i18n}Manage conditional fieldset{/i18n}<h2>
 
 {if $sIncomplete || !$oFieldset->getIsComplete()}
 <div class="ktError">
-<p>This conditional fieldset is marked such that it
+<p>{i18n}This conditional fieldset is marked such that it
 cannot be used.  This happens when the fieldset has been edited and has
 not been set to complete.  Setting the fieldset to complete will do a
-check to see if the fieldset is usable by the user.</p>
+check to see if the fieldset is usable by the user.{/i18n}</p>
 </div>
 
 {if $sIncomplete}
 <div class="ktError">
-<p>This error prevents this fieldset from being set
-to complete: {$sIncomplete|escape}</p>
+<p>{i18n}This error prevents this fieldset from being set
+to complete{/i18n}: {$sIncomplete|escape}</p>
 </div>
 {else}
 
-Try to set to complete:
+{i18n}Try to set to complete{/i18n}:
 <form action="{$smarty.server.PHP_SELF}" method="POST">
-<input type="hidden" name="action" value="checkComplete">
-<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
-<input type="submit" name="submit" value="Check completeness">
+<input type="hidden" name="action" value="checkComplete" />
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
+<input type="submit" name="submit" value="{i18n}Check completeness{/i18n}" />
 </form>
 {/if}
 {/if}
 
-<h2>Conditional type</h2>
+<h2>{i18n}Conditional type{/i18n}</h2>
 
 {if $oFieldset->getIsComplex()}
-Complex: <a
-href="{$config->get("urls/uiUrl")}/administration/docfieldmanagement/conditional/manageConditionals.php?action=editComplexFieldset&fieldset_id={$oFieldset->getId()}">Manage
-complex conditional</a>
+{i18n}Complex{/i18n}: <a
+href="{$config->get("urls/uiUrl")}/administration/docfieldmanagement/conditional/manageConditionals.php?action=editComplexFieldset&fieldset_id={$oFieldset->getId()}">{i18n}Manage
+complex conditional{/i18n}</a>
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
-<input type="hidden" name="action" value="changeToSimple">
-<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
-<input type="submit" name="submit" value="Change to simple">
+<input type="hidden" name="action" value="changeToSimple" />
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
+<input type="submit" name="submit" value="{i18n}Change to simple{/i18n}" />
 </form>
 
 {else}
 
-Simple: <a
-href="{$config->get("urls/uiUrl")}/administration/docfieldmanagement/conditional/manageConditionals.php?action=editFieldset&fieldset_id={$oFieldset->getId()}">Manage simple conditional</a>
+{i18n}Simple{/i18n}: <a
+href="{$config->get("urls/uiUrl")}/administration/docfieldmanagement/conditional/manageConditionals.php?action=editFieldset&fieldset_id={$oFieldset->getId()}">{i18n}Manage simple conditional{/i18n}</a>
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
-<input type="hidden" name="action" value="changeToComplex">
-<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
-<input type="submit" name="submit" value="Change to complex">
+<input type="hidden" name="action" value="changeToComplex" />
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
+<input type="submit" name="submit" value="{i18n}Change to complex{/i18n}" />
 </form>
 
 {/if}
 
-<p>Changing the conditional type set will remove all existing field
-ordering!</p>
+<p>{i18n}Changing the conditional type set will remove all existing field
+ordering!{/i18n}</p>
 
 <h2>Master field</h2>
 
 {if !$oMasterField}
-No master field is set, please select the master field:
+{i18n}No master field is set, please select the master field{/i18n}:
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
-<input type="hidden" name="action" value="setMasterField">
-<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<input type="hidden" name="action" value="setMasterField" />
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
 
 {entity_select entities=$oFieldset->getFields() name="fFieldId"}
-<input type="submit" name="submit" value="Set master field">
+<input type="submit" name="submit" value="{i18n}Set master field{/i18n}" />
 </form>
 
 {else}
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
-<input type="hidden" name="action" value="setMasterField">
-<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
+<input type="hidden" name="action" value="setMasterField" />
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
 
 {entity_select entities=$oFieldset->getFields() name="fFieldId" selected=$oMasterField->getId()}
-<input type="submit" name="submit" value="Change master field">
+<input type="submit" name="submit" value="{i18n}Change master field{/i18n}" />
 </form>
 
-<p>Changing the master field set will remove all existing field
-ordering!</p>
+<p>{i18n}Changing the master field set will remove all existing field
+ordering!{/i18n}</p>
 
-<h2>Field ordering</h2>
+<h2>{i18n}Field ordering{/i18n}</h2>
 
 {if $aFieldOrders}
-<h3>Existing ordering</h2>
+<h3>{i18n}Existing ordering{/i18n}</h2>
 
 <ul>
 {foreach from=$aFieldOrders item=aRow}
@@ -100,11 +100,11 @@ affects the values available in
 {/if}
 
 { if $free_fields }
-<h3>Order fields</h2>
+<h3>{i18n}Order fields{/i18n}</h2>
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
-<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}">
-<input type="hidden" name="action" value="orderFields">
+<input type="hidden" name="fFieldsetId" value="{$oFieldset->getId()}" />
+<input type="hidden" name="action" value="orderFields" />
 
 The available values of the selected fields:
 <br />
@@ -114,7 +114,7 @@ are conditional on the values of this field:
 <br />
 {entity_select entities=$parent_fields name="fParentFieldId"}
 <br />
-<input type="submit" name="submit" value="Order">
+<input type="submit" name="submit" value="{i18n}Order{/i18n}" />
 </form>
 {/if}
 
diff --git a/templates/ktcore/metadata/conditional/select_fieldset.smarty b/templates/ktcore/metadata/conditional/select_fieldset.smarty
index 9552616..a1ed64a 100644
--- a/templates/ktcore/metadata/conditional/select_fieldset.smarty
+++ b/templates/ktcore/metadata/conditional/select_fieldset.smarty
@@ -1,9 +1,9 @@
-<h2>Select Fieldset</h2>
+<h2>{i18n}Select Fieldset{/i18n}</h2>
 
 <form>
 <fieldset>
-<legend>Current Conditional Fieldsets</legend>
-<p>Fieldsets that are marked as conditional.</p>
+<legend>{i18n}Current Conditional Fieldsets{/i18n}</legend>
+<p>{i18n}Fieldsets that are marked as conditional.{/i18n}</p>
 
 <input type="hidden" name="action" value="editFieldset" />
 
@@ -12,7 +12,7 @@
 {/foreach}
 
 <div>
-<input type="submit" name="submit" value="Edit">
+<input type="submit" name="submit" value="{i18n}Edit{/i18n}" />
 </div>
 </fieldset>
 </form>
diff --git a/templates/ktcore/widget_fieldset_conditional.smarty b/templates/ktcore/widget_fieldset_conditional.smarty
index 8cb99ac..66c33cb 100644
--- a/templates/ktcore/widget_fieldset_conditional.smarty
+++ b/templates/ktcore/widget_fieldset_conditional.smarty
@@ -126,11 +126,11 @@ function triggerUpdate(formname) {
 <input type="hidden" name="fieldset_id" class="resolved_conditional" value="{$fieldset_id}" />
 <!-- add items to handle save here. -->
 
-<input type="button" value="Undo change" onclick="doConditionalUndo(); return false;"/>
+<input type="button" value="{i18n}Undo change{/i18n}" onclick="doConditionalUndo(); return false;" />
 
 <fieldset id="conditional_field">
-<legend>Project Details</legend>
-<p>Please be aware that - depending on your selections - new values may become available.</p>
+<legend>{i18n}Project Details{/i18n}</legend>
+<p>{i18n}Please be aware that - depending on your selections - new values may become available.{/i18n}</p>
 
 <div > 
 <!-- how do we add these after-the-fact, especially given that we need to add columns later? -->
@@ -149,7 +149,7 @@ function triggerUpdate(formname) {
 
 </fieldset>
 
-<input type="submit" value="save" />
+<input type="submit" value="{i18n}save{/i18n}" />
 </form>
 
 
diff --git a/templates/ktcore/workflow/documentWorkflow.smarty b/templates/ktcore/workflow/documentWorkflow.smarty
index c185ca0..63be35a 100644
--- a/templates/ktcore/workflow/documentWorkflow.smarty
+++ b/templates/ktcore/workflow/documentWorkflow.smarty
@@ -1,47 +1,47 @@
-<h2>Document Workflow</h2>
+<h2>{i18n}Document Workflow{/i18n}</h2>
 
 <p class="descriptiveText">
-Workflow is a description of a document's lifecycle.  It is made up of
+{i18n}Workflow is a description of a document's lifecycle.  It is made up of
 workflow states, which describe where in the lifecycle the document is,
 and workflow transitions, which describe the next steps within the
-lifecycle of the document.
+lifecycle of the document.{/i18n}
 </p>
 
 {if !$oWorkflow}
-<h3>No workflow</h3>
+<h3>{i18n}No workflow{/i18n}</h3>
 
-<p>Document has no assigned workflow.</p>
+<p>{i18n}Document has no assigned workflow.{/i18n}</p>
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
-<fieldset><legend>Start workflow on document</legend>
+<fieldset><legend>{i18n}Start workflow on document{/i18n}</legend>
 <input type="hidden" name="action" value="startWorkflow" />
 <input type="hidden" name="fDocumentId" value="{$oDocument->getId()}" />
 {entity_select entities=$aWorkflows name=fWorkflowId}
 <div class="form_actions">
-<input type="submit" name="submit" value="Start Workflow" />
+<input type="submit" name="submit" value="{i18n}Start Workflow{/i18n}" />
 </div>
 </fieldset>
 </form>
 
 {else}
 
-<h3>Current workflow settings</h3>
+<h3>{i18n}Current workflow settings{/i18n}</h3>
 
 <dl class="metadata">
-<dt>Workflow</dt><dd>{$oWorkflow->getName()}</dd>
-<dt>State</dt><dd>{$oState->getName()}</dd>
+<dt>{i18n}Workflow{/i18n}</dt><dd>{$oWorkflow->getName()}</dd>
+<dt>{i18n}State{/i18n}</dt><dd>{$oState->getName()}</dd>
 </dl>
 
 {if $aTransitions}
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <input type="hidden" name="action" value="performTransition" />
 <input type="hidden" name="fDocumentId" value="{$oDocument->getId()}" />
-<fieldset><legend>Transition to another workflow state</legend>
+<fieldset><legend>{i18n}Transition to another workflow state{/i18n}</legend>
 {foreach from=$transition_fields item=oWidget }
   {$oWidget->render()}
 {/foreach}
 <div class="form_actions">
-<input type="submit" name="submit" value="Perform Transition" />
+<input type="submit" name="submit" value="{i18n}Perform Transition{/i18n}" />
 </div>
 </fieldset>
 </form>
diff --git a/templates/ktcore/workflow/editState.smarty b/templates/ktcore/workflow/editState.smarty
index b42d739..0e9d85e 100644
--- a/templates/ktcore/workflow/editState.smarty
+++ b/templates/ktcore/workflow/editState.smarty
@@ -1,14 +1,14 @@
-<h2>State: {$oState->getName()|escape}</h2>
+<h2>{i18n}State{/i18n}: {$oState->getName()|escape}</h2>
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-<legend>Edit state properties</legend>
+<legend>{i18n}Edit state properties{/i18n}</legend>
 <input type="hidden" name="action" value="saveState" />
 <input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
 <input type="hidden" name="fStateId" value="{$oState->getId()}" />
 <input type="textbox" name="fName" value="{$oState->getName()|escape}" />
 <div class="form_actions">
-    <input type="submit" name="submit" value="Save" />
+    <input type="submit" name="submit" value="{i18n}Save{/i18n}" />
 </div>
 </fieldset>
 </form>
@@ -19,30 +19,30 @@
 <input type="hidden" name="fStateId" value="{$oState->getId()}" />
 
 <fieldset>
-<legend>Inform Which Users?</legend>
-<p class="descriptiveText">Please select which roles or groups should be
-informed when this state is reached.</p>
+<legend>{i18n}Inform Which Users?{/i18n}</legend>
+<p class="descriptiveText">{i18n}Please select which roles or groups should be
+informed when this state is reached.{/i18n}</p>
 
 
-<h3>Roles</h3>
+<h3>{i18n}Roles{/i18n}</h3>
 {entity_checkboxes entities=$aRoles name="fRoleIds" multiple="true" selected=$aInformed.role assign=aBoxes}
 {foreach from=$aBoxes item=sBox}
 {$sBox}<br />
 {/foreach}
 
-<h3>Groups</h3>
+<h3>{i18n}Groups{/i18n}</h3>
 {entity_checkboxes entities=$aGroups name="fGroupIds" multiple="true" selected=$aInformed.group assign=aBoxes}
 {foreach from=$aBoxes item=sBox}
 {$sBox}<br />
 {/foreach}
 
 {*
-<h3>Users</h3>
+<h3>{i18n}Users{/i18n}</h3>
 {entity_checkboxes entities=$aUsers name="fUserIds" multiple="true" selected=$aInformed.user assign=aBoxes}
 {foreach from=$aBoxes item=sBox}
 {$sBox}<br />
 {/foreach}
-<input type="submit" name="submit" value="Save" />
+<input type="submit" name="submit" value="{i18n}Save{/i18n}" />
 
 </form>
 *}
@@ -50,19 +50,19 @@ informed when this state is reached.</p>
 </fieldset>
 
 
-<h3>Assigned Permissions</h3>
-<p class="descriptiveText">While in this workflow state, additional permissions
+<h3>{i18n}Assigned Permissions{/i18n}</h3>
+<p class="descriptiveText">{i18n}While in this workflow state, additional permissions
 may be given.  This is done either to expose the document to more users
 or to allow a particular role to be fulfilled before a workflow
-transition can be accomplished.</p>
+transition can be accomplished.{/i18n}</p>
 
 
 <fieldset>
-<legend>Transitions</legend>
+<legend>{i18n}Transitions{/i18n}</legend>
 {if $aTransitionsTo}
 
 
-<h3>Transitions to this state</h3>
+<h3>{i18n}Transitions to this state{/i18n}</h3>
 {if (!empty($aTransitionsTo))}
 <ul>
 {foreach from=$aTransitionsTo item=oTransition}
@@ -73,12 +73,12 @@ title="Transition
 {/foreach}
 </ul>
 {else}
-No transitions lead to this state.
+{i18n}No transitions lead to this state.{/i18n}
 {/if}
 
 {/if}
 
-<h3>Transitions from this state</h3>
+<h3>{i18n}Transitions from this state{/i18n}</h3>
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <input type="hidden" name="action" value="saveTransitions" />
 <input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
@@ -87,10 +87,10 @@ No transitions lead to this state.
 {if (!empty($aTransitions))}
 {entity_checkboxes entities=$aTransitions name="fTransitionIds" multiple="true" selected=$aTransitionsSelected}
 <div class="form_actions">
-<input type="submit" name="submit" value="Save" />
+<input type="submit" name="submit" value="{i18n}Save{/i18n}" />
 </div>
 {else}
-No transitions defined.
+{i18n}No transitions defined.{/i18n}
 {/if}
 </form>
 </fieldset>
diff --git a/templates/ktcore/workflow/editTransition.smarty b/templates/ktcore/workflow/editTransition.smarty
index 0c98b08..4f15f00 100644
--- a/templates/ktcore/workflow/editTransition.smarty
+++ b/templates/ktcore/workflow/editTransition.smarty
@@ -1,15 +1,15 @@
-<h2>Transition: {$oTransition->getName()|escape}</h2>
+<h2>{i18n}Transition{/i18n}: {$oTransition->getName()|escape}</h2>
 
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-<legend>Edit transition properties</legend>
+<legend>{i18n}Edit transition properties{/i18n}</legend>
 
-<p class="helpText">Select the target state of the transition, and
+<p class="helpText">{i18n}Select the target state of the transition, and
 select the permission, group, and/or role necessary to perform the
 transition.  Selecting more than one of permission, group, or role will
 require that the user wishing to perform the transition fulfil every
-requirement.</p>
+requirement.{/i18n}</p>
 
 <input type="hidden" name="action" value="saveTransition" />
 <input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
@@ -20,7 +20,7 @@ requirement.</p>
 {/foreach}
 
 <div class="form_actions">
-<input type="submit" name="submit" value="Save" />
+<input type="submit" name="submit" value="{i18n}Save{/i18n}" />
 </div>
 </fieldset>
 </form>
diff --git a/templates/ktcore/workflow/editWorkflow.smarty b/templates/ktcore/workflow/editWorkflow.smarty
index 606b03b..2f12065 100644
--- a/templates/ktcore/workflow/editWorkflow.smarty
+++ b/templates/ktcore/workflow/editWorkflow.smarty
@@ -1,10 +1,10 @@
-<h2>Workflow: {$oWorkflow->getName()|escape}</h2>
+<h2>{i18n}Workflow{/i18n}: {$oWorkflow->getName()|escape}</h2>
 
 
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-<legend>Edit workflow properties</legend>
+<legend>{i18n}Edit workflow properties{/i18n}</legend>
 <input type="hidden" name="action" value="saveWorkflow" />
 <input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
 
@@ -13,7 +13,7 @@
 {/foreach}
 
 <div class="form_actions">
-<input type="submit" name="submit" value="Update workflow properties" />
+<input type="submit" name="submit" value="{i18n}Update workflow properties{/i18n}" />
 </div>
 </fieldset>
 </form>
@@ -22,7 +22,7 @@
 <p class="descriptiveText"><strong>FIXME</strong> insert intelligent help.</p>
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-<legend>Create a new state</legend>
+<legend>{i18n}Create a new state{/i18n}</legend>
 <input type="hidden" name="action" value="newState" />
 <input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
 
@@ -32,14 +32,14 @@
 {/foreach}
 
 <div class="form_actions">
-<input type="submit" name="submit" value="Create state" />
+<input type="submit" name="submit" value="{i18n}Create state{/i18n}" />
 </div>
 </fieldset>
 </form>
 
 {if $aStates}
-<h4>Existing states</h4>
-<p class="descriptiveText">Select a state to update its properties.</p>
+<h4>{i18n}Existing states{/i18n}</h4>
+<p class="descriptiveText">{i18n}Select a state to update its properties.{/i18n}</p>
 <ul>
 {foreach from=$aStates item=oState}
   <li><a
@@ -53,13 +53,13 @@ title="State {$oState->getId()}">{$oState->getName()|escape}</a></li>
 
 
 
-<h3>Transitions</h3>
+<h3>{i18n}Transitions{/i18n}</h3>
 
 <p class="descriptiveText"><strong>FIXME</strong> insert intelligent help.</p>
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-<legend>Create a new transition</legend>
+<legend>{i18n}Create a new transition{/i18n}</legend>
 <input type="hidden" name="action" value="newTransition" />
 <input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
 
@@ -69,14 +69,14 @@ title="State {$oState->getId()}">{$oState->getName()|escape}</a></li>
 {/foreach}
 
 <div class="form_actions">
-<input type="submit" name="submit" value="Create transition" />
+<input type="submit" name="submit" value="{i18n}Create transition{/i18n}" />
 </div>
 </fieldset>
 </form>
 
 
 {if $aTransitions}
-<h3>Existing transitions</h3>
+<h3>{i18n}Existing transitions{/i18n}</h3>
 
 <ul>
 {foreach from=$aTransitions item=oTransition}
@@ -92,7 +92,7 @@ title="Transition {$oTransition->getId()}">{$oTransition->getName()|escape}</a><
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-<legend>Actions controlled</legend>
+<legend>{i18n}Actions controlled{/i18n}</legend>
 
 <p class="descriptiveText"><strong>FIXME</strong> be helpful</p>
 
@@ -106,7 +106,7 @@ title="Transition {$oTransition->getId()}">{$oTransition->getName()|escape}</a><
 {/foreach}
 </ul>
 <div class="form_actions">
-   <input type="submit" name="submit" value="Set controlled actions" />
+   <input type="submit" name="submit" value="{i18n}Set controlled actions{/i18n}" />
 </div>
 </fieldset>
 </form>
diff --git a/templates/ktcore/workflow/listWorkflows.smarty b/templates/ktcore/workflow/listWorkflows.smarty
index fbbca58..760b95b 100644
--- a/templates/ktcore/workflow/listWorkflows.smarty
+++ b/templates/ktcore/workflow/listWorkflows.smarty
@@ -1,8 +1,8 @@
-<h2>Workflow</h2>
+<h2>{i18n}Workflow{/i18n}</h2>
 
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-<legend>Create a new workflow</legend>
+<legend>{i18n}Create a new workflow{/i18n}</legend>
 
 <input type="hidden" name="action" value="newWorkflow" />
 
@@ -12,15 +12,15 @@
 {/foreach}
 
 <div class="form_actions">
-  <input type="submit" name="submit" value="Create" />
+  <input type="submit" name="submit" value="{i18n}Create{/i18n}" />
 </div>
 </fieldset>
 </form>
 
 
 {if $aWorkflow}
-<h3>Existing workflows</h3>
-<p class="descriptiveText">Select a workflow to modify.</p>
+<h3>{i18n}Existing workflows{/i18n}</h3>
+<p class="descriptiveText">{i18n}Select a workflow to modify.{/i18n}</p>
 <ul>
 {foreach from=$aWorkflow item=oWorkflow}
   <li><a href="?action=editWorkflow&fWorkflowId={$oWorkflow->getId()}" title="Workflow: {$oWorkflow->getId()}">{$oWorkflow->getName()}</a></li>
diff --git a/templates/ktstandard/action/discussion.smarty b/templates/ktstandard/action/discussion.smarty
index e7de77c..6ec5912 100644
--- a/templates/ktstandard/action/discussion.smarty
+++ b/templates/ktstandard/action/discussion.smarty
@@ -1,13 +1,13 @@
 {if $threads}
-<h3>Existing threads</h3>
+<h3>{i18n}Existing threads{/i18n}</h3>
 <table class="listing" cellspacing="0" cellpadding="0">
   <thead>
     <tr>
-      <th>Subject</th>
-      <th>Creator</th>
-      <th>Views</th>
-      <th>Replies</th>
-      <th>Last activity</th>
+      <th>{i18n}Subject{/i18n}</th>
+      <th>{i18n}Creator{/i18n}</th>
+      <th>{i18n}Views{/i18n}</th>
+      <th>{i18n}Replies{/i18n}</th>
+      <th>{i18n}Last activity{/i18n}</th>
     </tr>
   </thead>
   <tbody>
@@ -17,19 +17,19 @@
   </tbody>
 </table>
 {else}
-    <p class="descriptiveText">There are no existing threads for this document</p>
+    <p class="descriptiveText">{i18n}There are no existing threads for this document{/i18n}</p>
 {/if}
 
 <form method="POST" action="{$smarty.server.PHP_SELF}">
 <input type="hidden" name="action" value="newthread" />
 <input type="hidden" name="fDocumentId" value="{$context->oDocument->getId()}" />
-<fieldset><legend>Create a new thread</legend>
+<fieldset><legend>{i18n}Create a new thread{/i18n}</legend>
 {foreach from=$fields item=oWidget}
     {$oWidget->render()}
 {/foreach}
 
 <div class="form_actions ">
-  <input type="submit" name="submit" value="Create a new thread">
+  <input type="submit" name="submit" value="{i18n}Create a new thread{/i18n}" />
 </div>
 </fieldset>
 </form>
diff --git a/templates/ktstandard/action/discussion_comment_list_item.smarty b/templates/ktstandard/action/discussion_comment_list_item.smarty
index 000e44a..fb57cfa 100644
--- a/templates/ktstandard/action/discussion_comment_list_item.smarty
+++ b/templates/ktstandard/action/discussion_comment_list_item.smarty
@@ -10,8 +10,14 @@ dl.kt-discussion-comment > dt {
 {$context->oPage->requireCSSStandalone($sCSS)}
 
 <dl class="kt-discussion-comment">
-  <dt>Posted</dt>
-  <dd>by {$creator->getName()} at {$comment->getDate()}</dd>
+  <dt>{i18n}Posted{/i18n}</dt>
+  {capture name=$name}
+  {$creator->getName()}
+  {/capture}
+  {capture name=$date}
+  {$comment->getDate()}
+  {/capture}
+  <dd>{i18n arg_name=$name arg_date=$date}by #name# at #date#{/i18n}</dd>
   <dt>Subject</dt>
   <dd>{$comment->getSubject()}</dd>
 
@@ -19,4 +25,4 @@ dl.kt-discussion-comment > dt {
   <dd>{$comment->getBody()}</dd>
 </dl>
 
-<a class="kt-discussion-post-link" href="#kt-discussion-post">Post a reply</a>
+<a class="kt-discussion-post-link" href="#kt-discussion-post">{i18n}Post a reply{/i18n}</a>
diff --git a/templates/ktstandard/action/discussion_thread.smarty b/templates/ktstandard/action/discussion_thread.smarty
index 7fadd48..41c3fea 100644
--- a/templates/ktstandard/action/discussion_thread.smarty
+++ b/templates/ktstandard/action/discussion_thread.smarty
@@ -6,14 +6,14 @@
 <input type="hidden" name="action" value="postreply" />
 <input type="hidden" name="fDocumentId" value="{$context->oDocument->getId()}" />
 <input type="hidden" name="fThreadId" value="{$thread->getId()}" />
-<fieldset><legend>Post a reply</legend>
+<fieldset><legend>{i18n}Post a reply{/i18n}</legend>
 <a name="kt-discussion-post"></a>
 {foreach from=$fields item=oWidget}
     {$oWidget->render()}
 {/foreach}
 
 <div class="form_actions ">
-  <input type="submit" name="submit" value="Post a reply" />
+  <input type="submit" name="submit" value="{i18n}Post a reply{/i18n}" />
 </div>
 </fieldset>
 </form>
diff --git a/templates/ktstandard/action/email.smarty b/templates/ktstandard/action/email.smarty
index 9aa8178..ac9d738 100644
--- a/templates/ktstandard/action/email.smarty
+++ b/templates/ktstandard/action/email.smarty
@@ -37,7 +37,7 @@ addLoadEvent(kt_email_onload);
 {/capture}
 {$context->oPage->requireJSStandalone($sJavascript)}
 
-<h2>Email document</h2>
+<h2>{i18n}Email document{/i18n}</h2>
 
 <form id="kt-email-form" method="POST">
 <input type="hidden" name="action" value="email" />
@@ -70,7 +70,7 @@ Administrator</OPTION>
 {/foreach}
 
 <div class="form_actions ">
-  <input type="submit" name="submit" value="Email">
+  <input type="submit" name="submit" value="{i18n}Email{/i18n}" />
 </div>
 
 <input type="hidden" name="groupNewLeft" />
diff --git a/templates/ktstandard/authentication/ldapadduser.smarty b/templates/ktstandard/authentication/ldapadduser.smarty
index 03921ad..3aaa349 100644
--- a/templates/ktstandard/authentication/ldapadduser.smarty
+++ b/templates/ktstandard/authentication/ldapadduser.smarty
@@ -3,14 +3,14 @@
    <input type="hidden" name="action" value="addUserFromSource" />
    <input type="hidden" name="source_id" value="{$source->getId()}" />
    <fieldset>
-      <legend>Create a new user</legend>
+      <legend>{i18n}Create a new user{/i18n}</legend>
       {foreach item=oWidget from=$fields}
         {$oWidget->render()}
       {/foreach}
       <input type="hidden" name="dn" value="{$dn}" />
       <div class="form_actions">
-         <input type="submit" name="submit[create]" value="create user" />
-         <a href="?action=main" class="ktCancelLink">Cancel</a>
+         <input type="submit" name="submit[create]" value="{i18n}create user{/i18n}" />
+         <a href="?action=main" class="ktCancelLink">{i18n}Cancel{/i18n}</a>
       </div>
    </fieldset>
    </form>
diff --git a/templates/ktstandard/authentication/ldapeditsource.smarty b/templates/ktstandard/authentication/ldapeditsource.smarty
index 975659c..0b834e7 100644
--- a/templates/ktstandard/authentication/ldapeditsource.smarty
+++ b/templates/ktstandard/authentication/ldapeditsource.smarty
@@ -5,6 +5,6 @@
   {$oWidget->render()}
 {/foreach}
 <div class="form_actions ">
-  <input type="submit" name="submit" value="Save" />
+  <input type="submit" name="submit" value="{i18n}Save{/i18n}" />
 </div>
 </form>
diff --git a/templates/ktstandard/authentication/ldapedituser.smarty b/templates/ktstandard/authentication/ldapedituser.smarty
index 8d238df..91741a4 100644
--- a/templates/ktstandard/authentication/ldapedituser.smarty
+++ b/templates/ktstandard/authentication/ldapedituser.smarty
@@ -5,6 +5,6 @@
   {$oWidget->render()}
 {/foreach}
 <div class="form_actions ">
-  <input type="submit" name="submit[save]" value="Save" />
+  <input type="submit" name="submit[save]" value="{i18n}Save{/i18n}" />
 </div>
 </form>
diff --git a/templates/ktstandard/authentication/ldapsearchuser.smarty b/templates/ktstandard/authentication/ldapsearchuser.smarty
index 7e2db1b..295e3e3 100644
--- a/templates/ktstandard/authentication/ldapsearchuser.smarty
+++ b/templates/ktstandard/authentication/ldapsearchuser.smarty
@@ -1,6 +1,7 @@
 <form method="POST" action="{$smarty.server.PHP_SELF}">
-<p class="descriptiveText">Since there may be many users in the system, please
-provider a few letters from the person's user name to begin.</p>
+<p class="descriptiveText">{i18n}Since there may be many users in the
+system, please provider a few letters from the person's user name to
+begin.{/i18n}</p>
 
 <input type="hidden" name="action" value="addUserFromSource" />
 <input type="hidden" name="source_id" value="{$source->getId()}" />
@@ -9,15 +10,15 @@ provider a few letters from the person's user name to begin.</p>
   {$oWidget->render()}
 {/foreach}
 <div class="form_actions">
-   <input type="submit" value="search for users" />
-</div class="form_actions">
+   <input type="submit" value="{i18n}search for users{/i18n}" />
+</div>
 </fieldset>
 </form>
 
 {if !$search_results}
       <div class="ktInfo">
          <!-- never show a very large set, if you can help it. -->
-         <p>No search specified, or no results for your search.  Please choose some criteria from the list above to find users.</p>
+         <p>{i18n}No search specified, or no results for your search.  Please choose some criteria from the list above to find users.{/i18n}</p>
       </div>
 {else}
 <form method="POST" action="{$smarty.server.PHP_SELF}">
@@ -26,9 +27,9 @@ provider a few letters from the person's user name to begin.</p>
 <table class="listing">
 <thead>
    <tr>
-      <th>Name</th>
-      <th>LDAP User Name</th>
-      <th>Distinguished Name (LDAP DN)</th>
+      <th>{i18n}Name{/i18n}</th>
+      <th>{i18n}LDAP User Name{/i18n}</th>
+      <th>{i18n}Distinguished Name (LDAP DN){/i18n}</th>
    </tr>
 </thead>
 <tbody>
@@ -46,6 +47,6 @@ value="{$potential_user.$identifier_field}" />{$potential_user.cn}</td>
 -->
 </tbody>
 </table>
-<input type="submit" name="submit[chosen]" value="Add" />
+<input type="submit" name="submit[chosen]" value="{i18n}Add{/i18n}" />
 </form>
 {/if}
diff --git a/templates/ktstandard/subscriptions/manage.smarty b/templates/ktstandard/subscriptions/manage.smarty
index e24e21c..e2fd56d 100644
--- a/templates/ktstandard/subscriptions/manage.smarty
+++ b/templates/ktstandard/subscriptions/manage.smarty
@@ -1,16 +1,17 @@
 {if !$aFolderSubscriptions && !$aDocumentSubscriptions}
 <div class="ktError">
-<p>You have no subscriptions</p>
+<p>{i18n}You have no subscriptions{/i18n}</p>
 </div>
 {else}
 
-<p class="descriptiveText">You are subscribed to the folders listed
-below.  You can remove your subscription by selecting the folders to
-which you no longer wish to subscribe.</p>
+<p class="descriptiveText">{i18n}You are subscribed to the folders and
+documents listed below.  You can remove your subscription by selecting
+the folders and documents to which you no longer wish to
+subscribe.{/i18n}</p>
 
 <form method="POST" action="{$smarty.server.PHP_SELF}">
 <input type="hidden" name="action" value="removeSubscriptions" />
-<fieldset><legend>Subscriptions</legend>
+<fieldset><legend>{i18n}Subscriptions{/i18n}</legend>
 
 {if $aFolderSubscriptions}
 {entity_checkboxes name="foldersubscriptions" entities=$aFolderSubscriptions method=getContentLink assign=aCheckboxes}
@@ -27,7 +28,7 @@ which you no longer wish to subscribe.</p>
 {/if}
 
 <div class="form_actions ">
-  <input type="submit" name="submit" value="Remove subscription" />
+  <input type="submit" name="submit" value="{i18n}Remove subscription{/i18n}" />
 </div>
 </fieldset>
 </form>