Index: branches/wheeljack/tmpl/cms/dialog_list_assets.tmpl
===================================================================
--- branches/wheeljack/tmpl/cms/dialog_list_assets.tmpl (revision 948)
+++ branches/wheeljack/tmpl/cms/dialog_list_assets.tmpl (revision 987)
@@ -52,5 +52,5 @@
     <h2><span class="weblog-title-highlight"><TMPL_IF NAME=EDIT_BLOG_ID><TMPL_VAR NAME=BLOG_NAME ESCAPE=HTML><TMPL_ELSE><MT_TRANS phrase="System-wide"></TMPL_IF>: </span> <MT_TRANS phrase="Assets"></h2>
 
-    <span class="modal_added"><MT_TRANS phrase="Select the [_1] you would like to insert, or upload a new one." params="<TMPL_IF NAME=IS_IMAGE>image<TMPL_ELSE>file</TMPL_IF>"></span>
+    <span class="modal_added"><TMPL_IF NAME=IS_IMAGE><MT_TRANS phrase="Select the image you would like to insert, or upload a new one."><TMPL_ELSE><MT_TRANS phrase="Select the file you would like to insert, or upload a new one."></TMPL_IF></span>
 
     <p class="page-desc upload_from_dialog">
@@ -58,5 +58,5 @@
         <TMPL_IF NAME=CAN_UPLOAD>
             <img src="<TMPL_VAR NAME=STATIC_URI>images/status_icons/create.gif" alt="<MT_TRANS phrase="Upload New Asset">" width="9" height="9" />
-            <a href="<TMPL_VAR NAME=SCRIPT_URL>?__mode=start_upload&amp;_type=asset&amp;blog_id=<TMPL_VAR NAME=BLOG_ID>&amp;dialog_view=1&amp;entry_insert=1&amp;edit_field=<TMPL_VAR NAME=EDIT_FIELD>&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>')"><MT_TRANS phrase="Upload New [_1]" params="<TMPL_IF NAME=IS_IMAGE>Image<TMPL_ELSE>File</TMPL_IF>"></a>
+            <a href="<TMPL_VAR NAME=SCRIPT_URL>?__mode=start_upload&amp;_type=asset&amp;blog_id=<TMPL_VAR NAME=BLOG_ID>&amp;dialog_view=1&amp;entry_insert=1&amp;edit_field=<TMPL_VAR NAME=EDIT_FIELD>&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>')"><TMPL_IF NAME=IS_IMAGE><MT_TRANS phrase="Upload New Image"><TMPL_ELSE><MT_TRANS phrase="Upload New File"></TMPL_IF></a>
         </TMPL_IF>
     </TMPL_IF>
@@ -149,5 +149,5 @@
         <form action="" method="get" onsubmit="return false">
         <input class="cancel" type="button" value="<MT_TRANS phrase="Cancel">" />
-        <input class="close" type="submit" value="<MT_TRANS phrase="[_1]" params="<TMPL_IF NAME=IS_IMAGE>Next<TMPL_ELSE>Insert</TMPL_IF>">" disabled="disabled" />
+        <input class="close" type="submit" value="<TMPL_IF NAME=IS_IMAGE><MT_TRANS phrase="Next"><TMPL_ELSE><MT_TRANS phrase="Insert"></TMPL_IF>" disabled="disabled" />
         </form>
         </div>
Index: branches/wheeljack/tmpl/cms/backup_restore.tmpl
===================================================================
--- branches/wheeljack/tmpl/cms/backup_restore.tmpl (revision 960)
+++ branches/wheeljack/tmpl/cms/backup_restore.tmpl (revision 987)
@@ -10,5 +10,5 @@
             if (el_name) {
                 el_name.style.display = 'block';
-                el_name.innerHTML = '(<MT_TRANS phrase="None Selected.">)';
+                el_name.innerHTML = '(<MT_TRANS phrase="None selected.">)';
             }
             openDialog(false, 'dialog_select_weblog');
@@ -93,5 +93,5 @@
 </TMPL_IF>
 </select>
-<p><MT_TRANS phrase="Maximum file size per backup file."> <a href="#" onclick="return openManual('backup_restore', 'backup_num_size')" class="help">?</a></p>
+<p><MT_TRANS phrase="Approximate file size per backup file."> <a href="#" onclick="return openManual('backup_restore', 'backup_num_size')" class="help">?</a></p>
 </div>
 </div>
@@ -112,5 +112,5 @@
 <fieldset style="margin-top: 0px;">
 
-<h3>Upload Single File</h3>
+<h3><MT_TRANS phrase="Upload Single File"></h3>
 <div class="setting">
 <div class="label"><label><MT_TRANS phrase="Upload backup file: (optional)"></label></div>
Index: branches/wheeljack/tmpl/cms/restore_end.tmpl
===================================================================
--- branches/wheeljack/tmpl/cms/restore_end.tmpl (revision 795)
+++ branches/wheeljack/tmpl/cms/restore_end.tmpl (revision 987)
@@ -14,5 +14,5 @@
 <p><strong><MT_TRANS phrase="All data restored successfully!"></strong></p>
 <TMPL_UNLESS NAME=RESTORE_UPLOAD>
-<p><MT_TRANS phrase="Make sure that you remove the files that you imported from the 'import' folder, so that if/when you run the import process again, those files will not be re-imported."></p>
+<p><MT_TRANS phrase="Make sure that you remove the files that you restored from the 'import' folder, so that if/when you run the restore process again, those files will not be re-restored."></p>
 </TMPL_UNLESS>
 <TMPL_ELSE>
Index: branches/wheeljack/tmpl/cms/asset_image_options.tmpl
===================================================================
--- branches/wheeljack/tmpl/cms/asset_image_options.tmpl (revision 974)
+++ branches/wheeljack/tmpl/cms/asset_image_options.tmpl (revision 987)
@@ -81,5 +81,5 @@
 
             <input type="hidden" name="wrap_text" value="1" />
-            <p><MT_TRANS phrase="Alignment">: <span class="align_left_icon"><img align="absbottom" src="<TMPL_VAR NAME=STATIC_URI>images/spacer.gif" alt="<MT_TRANS phrase="Align Image Left"> width="16" height="17" /></span> <input type="radio" name="align" value="left" <TMPL_IF NAME=ALIGN_LEFT>checked="checked" </TMPL_IF>/> <MT_TRANS phrase="Left"> <span class="align_center_icon"><img align="absbottom" src="<TMPL_VAR NAME=STATIC_URI>images/spacer.gif" alt="<MT_TRANS phrase="Align Image Center"> width="16" height="17" /></span> <input type="radio" name="align" value="center" <TMPL_IF NAME=ALIGN_CENTER>checked="checked" </TMPL_IF>/> <MT_TRANS phrase="Center"> <span class="align_right_icon"><img align="absbottom" src="<TMPL_VAR NAME=STATIC_URI>images/spacer.gif" alt="<MT_TRANS phrase="Align Image Right"> width="16" height="17" /></span> <input type="radio" name="align" value="right" <TMPL_IF NAME=ALIGN_RIGHT>checked="checked" </TMPL_IF>/> <MT_TRANS phrase="Right"></p>
+            <p><MT_TRANS phrase="Alignment">: <span class="align_left_icon"><img align="absbottom" src="<TMPL_VAR NAME=STATIC_URI>images/spacer.gif" alt="<MT_TRANS phrase="Align Image Left">" width="16" height="17" /></span> <input type="radio" name="align" value="left" <TMPL_IF NAME=ALIGN_LEFT>checked="checked" </TMPL_IF>/> <MT_TRANS phrase="Left"> <span class="align_center_icon"><img align="absbottom" src="<TMPL_VAR NAME=STATIC_URI>images/spacer.gif" alt="<MT_TRANS phrase="Align Image Center">" width="16" height="17" /></span> <input type="radio" name="align" value="center" <TMPL_IF NAME=ALIGN_CENTER>checked="checked" </TMPL_IF>/> <MT_TRANS phrase="Center"> <span class="align_right_icon"><img align="absbottom" src="<TMPL_VAR NAME=STATIC_URI>images/spacer.gif" alt="<MT_TRANS phrase="Align Image Right">" width="16" height="17" /></span> <input type="radio" name="align" value="right" <TMPL_IF NAME=ALIGN_RIGHT>checked="checked" </TMPL_IF>/> <MT_TRANS phrase="Right"></p>
 
             <TMPL_IF NAME=DO_THUMB>
Index: branches/wheeljack/tmpl/cms/upload_complete.tmpl
===================================================================
--- branches/wheeljack/tmpl/cms/upload_complete.tmpl (revision 941)
+++ branches/wheeljack/tmpl/cms/upload_complete.tmpl (revision 987)
@@ -36,5 +36,5 @@
 </TMPL_UNLESS>
 
-<h2><span class="weblog-title-highlight"><TMPL_VAR NAME=BLOG_NAME ESCAPE=HTML>:</span> <MT_TRANS phrase="[_1] [_2]" params="<TMPL_IF NAME=ENTRY_INSERT>Insert<TMPL_ELSE>Upload</TMPL_IF>%%<TMPL_IF NAME=IS_IMAGE>Image<TMPL_ELSE>File</TMPL_IF>"></h2>
+<h2><span class="weblog-title-highlight"><TMPL_VAR NAME=BLOG_NAME ESCAPE=HTML>:</span> <TMPL_IF NAME=ENTRY_INSERT><TMPL_IF NAME=IS_IMAGE><MT_TRANS phrase="Insert Image"><TMPL_ELSE><MT_TRANS phrase="Insert File"></TMPL_IF><TMPL_ELSE><TMPL_IF NAME=IS_IMAGE><MT_TRANS phrase="Upload Image"><TMPL_ELSE><MT_TRANS phrase="Upload File"></TMPL_IF></TMPL_IF></h2>
 
 <div class="items-wrapper">