diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/addbiblio-nomarc.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/addbiblio-nomarc.tmpl
index 6e36900715..e944f28911 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/addbiblio-nomarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/addbiblio-nomarc.tmpl
@@ -47,7 +47,7 @@
 <td><textarea cols="30" rows="6" name="notes"></textarea></td>
 </tr>
 <tr valign="top">
-<td colspan="2"><center><input type="submit" value="Submit"></center></td>
+<td colspan="2"><center><input type="submit" value="遞交"></center></td>
 </tr>
 </table>
 </FORM>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/addbiblio.tmpl
index 1b3a0c2ccb..5e34cceadd 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/addbiblio.tmpl
@@ -45,7 +45,7 @@
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
 	<!-- TMPL_LOOP name="0XX" -->
 			<!-- TMPL_IF name="tag" -->
-				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a</td></tr>
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
@@ -81,7 +81,7 @@
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
 	<!-- TMPL_LOOP name="1XX" -->
 			<!-- TMPL_IF name="tag" -->
-				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a</td></tr>
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
@@ -118,7 +118,7 @@
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
 	<!-- TMPL_LOOP name="2XX" -->
 			<!-- TMPL_IF name="tag" -->
-				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a</td></tr>
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
@@ -155,7 +155,7 @@
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
 	<!-- TMPL_LOOP name="3XX" -->
 			<!-- TMPL_IF name="tag" -->
-				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a</td></tr>
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
@@ -192,7 +192,7 @@
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
 	<!-- TMPL_LOOP name="4XX" -->
 			<!-- TMPL_IF name="tag" -->
-				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a</td></tr>
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
@@ -229,7 +229,7 @@
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
 	<!-- TMPL_LOOP name="5XX" -->
 			<!-- TMPL_IF name="tag" -->
-				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a</td></tr>
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
@@ -266,7 +266,7 @@
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
 	<!-- TMPL_LOOP name="6XX" -->
 			<!-- TMPL_IF name="tag" -->
-				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a</td></tr>
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
@@ -303,7 +303,7 @@
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
 	<!-- TMPL_LOOP name="7XX" -->
 			<!-- TMPL_IF name="tag" -->
-				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a</td></tr>
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
@@ -340,7 +340,7 @@
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
 	<!-- TMPL_LOOP name="8XX" -->
 			<!-- TMPL_IF name="tag" -->
-				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a</td></tr>
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
@@ -377,7 +377,7 @@
     <table width=100%  cellspacing=0 cellpadding=2 border=0>
 	<!-- TMPL_LOOP name="9XX" -->
 			<!-- TMPL_IF name="tag" -->
-				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a</td></tr>
+				<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=4><b><!-- TMPL_VAR name="tag" -->  <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->"><input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a></td></tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP name="subfield_loop" -->
 				<tr>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/addbooks.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/addbooks.tmpl
index 77b2b6b35c..e0f6dee7af 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/addbooks.tmpl
@@ -49,7 +49,7 @@
 <form action="websitesearch.pl" method="post">
 	<table>
 	<tr>
-		<td>關鍵字：</td>
+		<td>關鍵詞：</td>
 		<td><input type="text" name="keyword" /></td>
 		<td><input type="submit" value="執行" class="button"></td>
 	</tr>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/additem-nomarc.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/additem-nomarc.tmpl
index 7a81b1b65f..e8ef49d426 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/additem-nomarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/additem-nomarc.tmpl
@@ -28,7 +28,8 @@
 <!-- TMPL_IF NAME="WEB" -->
 <tr valign="top" bgcolor="#CCCC99">
 <td
-background="/images/background-mem.gif"><B><!-- TMPL_VAR NAME="biblioitemnumber" --> 群組 - <!-- TMPL_VAR NAME="itemtype" --> </b></td>
+background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="biblioitemnumber" --> 群組 - <!-- TMPL_VAR NAME="itemtype" -->
+</b></td>
 </tr>
 <tr valign="top">
 <td><b>網址：</b><!-- TMPL_VAR NAME="url" --><br>
@@ -38,11 +39,11 @@ background="/images/background-mem.gif"><B><!-- TMPL_VAR NAME="biblioitemnumber"
 <!-- TMPL_ELSE -->
 <tr valign="top" bgcolor="#CCCC99">
 <td
-background="/images/background-mem.gif"><B><!-- TMPL_VAR NAME="biblioitemnumber" --> 群組 - <!-- TMPL_VAR NAME="itemtype" --></b></td>
+background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="biblioitemnumber" --> 群組 - <!-- TMPL_VAR NAME="itemtype" --></b></td>
 </tr>
 <tr valign="top">
 <td><b>ISBN：</b><!-- TMPL_VAR NAME="isbn" --><br>
-<b>杜威：</b><!-- TMPL_VAR NAME="dewey" --><br>
+<b>杜威分類號：</b><!-- TMPL_VAR NAME="dewey" --><br>
 <b>出版者：</b><!-- TMPL_VAR NAME="publishercode" --><br>
 <b>出版地：</b><!-- TMPL_VAR NAME="place" --><br>
 <b>日期：</b><!-- TMPL_VAR NAME="publicationyear" --></td>
@@ -65,8 +66,7 @@ background="/images/background-mem.gif"><B><!-- TMPL_VAR NAME="biblioitemnumber"
 <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="BIBNUM" -->">
 <table border="1" cellspacing="0" cellpadding="5">
 <tr valign="top" bgcolor="#CCCC99">
-<td background="/images/background-mem.gif" colspan="2"><b>新增
-圖書資料：</b><br>
+<td background="/images/background-mem.gif" colspan="2"><b>新增圖書資料：</b><br>
 <small><i>若是網站，只需填寫群組即可</i></small></td>
 </tr>
 <tr valign="top">
@@ -110,8 +110,7 @@ background="/images/background-mem.gif"><B><!-- TMPL_VAR NAME="biblioitemnumber"
 <td colspan="2" align="center"><input type="submit" name="existinggroup" value="新增圖書資料至既有之群組"></td>
 </tr>
 <tr valign="top" bgcolor="#CCCC99">
-<td colspan="2" background="/images/background-mem.gif"><b>OR Add to a new
-群組：</b></td>
+<td colspan="2" background="/images/background-mem.gif"><b>或新增至新群組：</b></td>
 </tr>
 <tr valign="top">
 <td>格式：</td>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/additem.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/additem.tmpl
index 97b54b4e84..fde8a7c952 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/additem.tmpl
@@ -15,7 +15,7 @@
 	<table width="100%" border=0 cellpadding=0 cellspacing=0>
 		<tr>
 			<td width=8%><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->"><img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"></td>
-			<td width=8%><a href="../detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->">Normal</a></td>
+			<td width=8%><a href="../detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->">一般</a></td>
 			<td align="center"><b>機讀格式書目：<!-- TMPL_VAR name="biblionumber" --></b></td>
 		</tr>
 	</table>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/isbnsearch.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/isbnsearch.tmpl
index ba480cf414..c432d786a9 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/isbnsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/isbnsearch.tmpl
@@ -66,7 +66,7 @@
 		<td><b>題名</b></td>
 		<td><b>著者</b></td>
 		<td><b>ISBN</b></td>
-		<td><b>coming from</b></td>
+		<td><b>源自</b></td>
 		<td><b>&nbsp;</b></td>
 		<td>&nbsp;</td>
 	</tr>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/marcimport.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/marcimport.tmpl
index 1ff75f4c74..ac7cec2073 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/marcimport.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui.simple/marcimport.tmpl
@@ -39,14 +39,14 @@
 		</td>
 	</tr>
 	<tr valign="top">
-		<td>Character encoding (MARC21 or UNIMARC)</td>
+		<td>編碼 (MARC21 或 UNIMARC)</td>
 		<td>
 			<select name="syntax"/><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select><br/>
 		</td>
 	</tr>
 	<tr valign="top">
 		<td>若其國際標準書號已在Breeding Farm內： </td>
-		<td><input type="radio" name="overwrite_biblio" value="0" checked>Ignore this one, keep the existing one<br/>
+		<td><input type="radio" name="overwrite_biblio" value="0" checked>忽略這個記錄 (保留原有的記錄)<br/>
 			<input type="radio" name="overwrite_biblio" value="1">用這個覆蓋現有的</td>
 	</tr>
 	<tr valign="top">
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/acqui-home.tmpl
index d7c9d16532..6a80017553 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/acqui-home.tmpl
@@ -48,7 +48,7 @@
 				<!-- TMPL_VAR name="currency" -->
 			</td>
 			<td>
-				<INPUT TYPE="text"  SIZE="10"   NAME="<!-- TMPL_VAR name="currency" -->" value=<!-- TMPL_VAR name="rate" -->>
+				<INPUT TYPE="text"  SIZE="10"  NAME="<!-- TMPL_VAR name="currency" -->" value=<!-- TMPL_VAR name="rate" -->>
 			</td>
 		</TR>
 	<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/acquire.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/acquire.tmpl
index b18a009c27..94348ede0e 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/acquire.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/acquire.tmpl
@@ -30,7 +30,7 @@
 	<P>
 	<CENTER>
 	<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
-		<tr valign=top bgcolor=#99cc33>
+		<tr valign=top bgcolor="#99cc33" >
 			<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2>
 				<B>目錄細節</B>
 			</td>
@@ -66,11 +66,11 @@
 			<TD>分館</td>
 			<td><!-- TMPL_VAR name="CGIbranch" --></td>
 		</tr>
-		<TR VALIGN=TOP bgcolor=#ffffcc >
+		<TR VALIGN=TOP bgcolor="#ffffcc" >
 			<TD><B>圖書資料之條碼 *</B></td>
 			<td><input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->"></td>
 		</tr>
-		<TR VALIGN=TOP bgcolor=#ffffcc >
+		<TR VALIGN=TOP bgcolor="#ffffcc" >
 			<TD><B>Volume Info (for serials) *</B></td>
 			<td><input type=text size=20 name=volinf></td>
 		</tr>
@@ -91,7 +91,7 @@
 		</tr>
 	</table>
 	<table border=1 cellspacing=0 cellpadding=5 width="40%">
-		<tr valign=top bgcolor=#99cc33>
+		<tr valign=top bgcolor="#99cc33">
 			<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>會計細節</B></td>
 		</tr>
 		<TR VALIGN=TOP>
@@ -103,7 +103,7 @@
 			<td><input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->">
 			</td>
 		</tr>
-		<TR VALIGN=TOP bgcolor=#ffffcc>
+		<TR VALIGN=TOP bgcolor="#ffffcc">
 			<TD><B>收到數量</B></td>
 			<td><input type=text size=20 name=quantityrec value="<!-- TMPL_VAR name="quantityreceived" -->">
 			</td>
@@ -116,11 +116,11 @@
 			<TD>預算成本 </td>
 			<td><input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->"></td>
 		</tr>
-		<TR VALIGN=TOP bgcolor=#ffffcc>
+		<TR VALIGN=TOP bgcolor="#ffffcc">
 			<TD><B>實際成本 *</B></td>
 			<td><input type=text size=20 name=cost value="<!-- TMPL_VAR name="unitprice" -->"></td>
 		</tr>
-		<TR VALIGN=TOP bgcolor=#ffffcc>
+		<TR VALIGN=TOP bgcolor="#ffffcc">
 			<TD>發票號碼</td>
 			<td>
 				<!-- TMPL_VAR name="invoice" -->
@@ -139,7 +139,7 @@
 <!-- TMPL_ELSE -->
 	<br />
 	<center>
-	<table width=80%>
+	<table width="80%">
 	<tr valign=top bgcolor="#ffdf61">
 		<td><b>購物籃</b></td>
 		<td><b>ISBN</b></td>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/basket.tmpl
index 1b923c62ce..94b9a6c27d 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/basket.tmpl
@@ -52,7 +52,7 @@ Our Reference: <b><!-- TMPL_VAR name="entrydate" --></b>, #<b><!-- TMPL_VAR name
 			<FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
 				<input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
 				<input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
-				<b> 新增訂單：請輸入關鍵字或題名 </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
+				<b> 新增訂單：請輸入關鍵詞或題名 </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
 			</form>
 		</td>
 	</tr>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/newbasket.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/newbasket.tmpl
index 9856d1e737..eb90d97525 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/newbasket.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/newbasket.tmpl
@@ -9,7 +9,7 @@
 <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
 <input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
 <input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
-<b> 以關鍵字或題名查詢： </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
+<b> 以關鍵詞或題名查詢： </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
 
 </form>
 
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/newbiblio.tmpl
index d1cc8db408..6b1103d617 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/newbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/newbiblio.tmpl
@@ -66,8 +66,7 @@ win.document.write("</font></body></html>");
 	<input type=hidden name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->">
 <!-- /TMPL_LOOP -->
 <!-- TMPL_IF name="orderexists" --><input type=hidden name=orderexists value=yes><!-- /TMPL_IF -->
-<a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->" class="button">查看購物籃</a>
-<H1><!-- TMPL_VAR name="ordnum" --> - 訂單細節</H1><br>
+<a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->" class="button">查看購物籃</a> <h1><!-- TMPL_VAR name="ordnum" --> - 訂單細節</h1><br>
 <!-- TMPL_VAR name="name" --> 的購物藍
 <P>
 <CENTER>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/recieve.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/recieve.tmpl
index 9ebbdd6955..5a525ed40a 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/recieve.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/recieve.tmpl
@@ -25,7 +25,7 @@
 		<td><b>ISBN</b></td>
 		<td><b>題名</b></td>
 		<td><b>著者</b></td>
-		<td><b>ACTUAL</b></td>
+		<td><b>實際</b></td>
 		<td><b>P&P</b></td>
 		<td><b>數量</b></td>
 		<td><b>總計</b></td>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/supplier.tmpl
index 1189053b78..38c39439f3 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/acqui/supplier.tmpl
@@ -94,11 +94,9 @@
 		<TD>供應商為</td>
 		<td>
 			 <!-- TMPL_IF name="active" -->
-				<input type="radio" name="status" value="1" checked>使用中
-				<input type="radio" name="status" value="0">不使用</td>
+				<input type="radio" name="status" value="1" checked>Active  <input type="radio" name="status" value="0">Inactive</td>
 			<!-- TMPL_ELSE -->
-				<input type="radio" name="status" value="1">使用中
-				<input type="radio" name="status" value="0" checked>不使用</td>
+				<input type="radio" name="status" value="1">Active  <input type="radio" name="status" value="0" checked>Inactive</td>
 			<!-- /TMPL_IF -->
 	</tr>
 	<tr valign=top bgcolor="#ffdf61">
@@ -132,22 +130,19 @@
 	<TR VALIGN=TOP>
 		<TD>已登記貨勞稅號碼</td>
 		<td>
-			<input type=radio name=gst value=1 <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>是
-			<input type=radio name=gst value=0 <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>否
+			<input type=radio name=gst value=1 <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>是 <input type=radio name=gst value=0 <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>否
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
-		<TD>List Item Price Includes GST</td>
+		<TD>圖書資料的標價已連貨勞稅</td>
 		<td>
-			<input type=radio name=list_gst value=1 <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>是
-			<input type=radio name=list_gst value=0 <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>否
+			<input type=radio name=list_gst value=1 <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>是 <input type=radio name=list_gst value=0 <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>否
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
 		<TD>發票上之價錢已包括貨勞稅</td>
 		<td>
-			<input type=radio name=invoice_gst value=1 <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>是
-			<input type=radio name=invoice_gst value=0 <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>否
+			<input type=radio name=invoice_gst value=1 <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>是 <input type=radio name=invoice_gst value=0 <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>否
 		</td>
 	</tr>
 	<TR VALIGN=TOP>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/boraccount.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/boraccount.tmpl
index abc93135e4..fe765c54e8 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/boraccount.tmpl
@@ -3,9 +3,7 @@
 <!-- The manual invoice and credit buttons -->
 
 <h1><a href="moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->"><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></a> 之賬戶</h1><P>
-<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME=bornum -->">人手建立發票</a>
-&nbsp;
-<a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME=bornum -->">Create Manual Credit</a>
+<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME=bornum -->">Create Manual Invoice</a> &nbsp; <a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME=bornum -->">Create Manual Credit</a>
 <center>
 <p>
 
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/MARCdetail.tmpl
index bacc2978e1..14753ed756 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/MARCdetail.tmpl
@@ -7,38 +7,38 @@
 	font-size:10pt;}
 </STYLE>
 
-<table width="100%" cellspacing=0 cellpadding=5>
+<table width="100%" cellspacing="0" cellpadding="5">
 <tr>
 	<td width="80%">
-		<table width=100% cellspacing=0 cellpadding=5 border=1>
+		<table width="100%" cellspacing="0" cellpadding="5" border="1">
 		<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
 			<td>
-			<table width="100%" border=0 cellpadding=0 cellspacing=0>
+			<table width="100%" border="0" cellpadding="0" cellspacing="0">
 				<tr>
-					<td width=8%><a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->"><img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"></td>
-					<td width=8%><a href="javascript:confirm_deletion()"><img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png"></td>
-					<td width=8%><a href="detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->">Normal</a></td>
-					<td width=8%><a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')">列印</a></td>
+					<td width="8%"><a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->"><img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"></td>
+					<td width="8%"><a href="javascript:confirm_deletion()"><img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png"></td>
+					<td width="8%"><a href="detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->">一般</a></td>
+					<td width="8%"><a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')">列印</a></td>
 					<td align="center"><b>機讀格式書目：<!-- TMPL_VAR name="bibid" --></b></td>
 				</tr>
 			</table>
 			</td>
 		</tr>
 		<tr>
-			<td colspan=3>
-			<table width=100% border=0 colspacing=0 cellpadding=0>
+			<td colspan="3">
+			<table width="100%" border="0" colspacing=0 cellpadding="0">
 			<tr>
-				<td width=9% align="center"><a href="javascript:active(0)"><div id="link0">0</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(1)" ><div id="link1">1</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(2)"><div  id="link2">2</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(3)"><div  id="link3">3</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(4)"><div  id="link4">4</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(5)"><div  id="link5">5</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(6)"><div  id="link6">6</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(7)"><div  id="link7">7</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(8)"><div  id="link8">8</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(9)"><div  id="link9">9</div></a></td>
-				<td width=10% align="center"><a href="javascript:active(10)"><div  id="link10">圖書資料</div></a></td>
+				<td width="9%" align="center"><a href="javascript:active(0)"><div id="link0">0</div></a></td>
+				<td width="9%" align="center"><a href="javascript:active(1)" ><div id="link1">1</div></a></td>
+				<td width="9%" align="center"><a href="javascript:active(2)"><div  id="link2">2</div></a></td>
+				<td width="9%" align="center"><a href="javascript:active(3)"><div  id="link3">3</div></a></td>
+				<td width="9%" align="center"><a href="javascript:active(4)"><div  id="link4">4</div></a></td>
+				<td width="9%" align="center"><a href="javascript:active(5)"><div  id="link5">5</div></a></td>
+				<td width="9%" align="center"><a href="javascript:active(6)"><div  id="link6">6</div></a></td>
+				<td width="9%" align="center"><a href="javascript:active(7)"><div  id="link7">7</div></a></td>
+				<td width="9%" align="center"><a href="javascript:active(8)"><div  id="link8">8</div></a></td>
+				<td width="9%" align="center"><a href="javascript:active(9)"><div  id="link9">9</div></a></td>
+				<td width="10%" align="center"><a href="javascript:active(10)"><div  id="link10">圖書資料</div></a></td>
 			</tr>
 			</table>
 			</td>
@@ -55,9 +55,9 @@
 </table>
 
    <DIV name="0XX" id="0XX" style="position:absolute;visibility:visible;width:90%">
-    <table width=100%  cellspacing=0 cellpadding=5 border=0>
+    <table width="100%"  cellspacing="0" cellpadding="5" border="0">
 	<!-- TMPL_LOOP name="0XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
 	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
@@ -72,9 +72,9 @@
      </DIV>
 
     <DIV name="1XX" id="1XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=100%  cellspacing=0 cellpadding=5 border=0>
+    <table width="100%"  cellspacing="0" cellpadding="5" border="0">
 	<!-- TMPL_LOOP name="1XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
 	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
@@ -89,9 +89,9 @@
      </DIV>
 
     <DIV name="2XX" id="2XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=100% cellspacing=0 cellpadding=5  border=0>
+    <table width="100%" cellspacing="0" cellpadding="5"  border="0">
 	<!-- TMPL_LOOP name="2XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
 	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
@@ -106,9 +106,9 @@
      </DIV>
 
     <DIV name="3XX" id="3XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=100% cellspacing=0 cellpadding=5  border=0>
+    <table width="100%" cellspacing="0" cellpadding="5"  border="0">
 	<!-- TMPL_LOOP name="3XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
 	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
@@ -123,9 +123,9 @@
      </DIV>
 
     <DIV name="4XX" id="4XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=100%  cellspacing=0 cellpadding=5 border=0>
+    <table width="100%"  cellspacing="0" cellpadding="5" border="0">
 	<!-- TMPL_LOOP name="4XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
 	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
@@ -140,9 +140,9 @@
      </DIV>
 
     <DIV name="5XX" id="5XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=100% cellspacing=0 cellpadding=5  border=0>
+    <table width="100%" cellspacing="0" cellpadding="5"  border="0">
 	<!-- TMPL_LOOP name="5XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
 	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
@@ -157,9 +157,9 @@
      </DIV>
 
 	<DIV name="6XX" id="6XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=90% cellspacing=0 cellpadding=5  border=0>
+    <table width="90%" cellspacing="0" cellpadding="5"  border="0">
 	<!-- TMPL_LOOP name="6XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
 	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
@@ -174,9 +174,9 @@
      </DIV>
 
     <DIV name="7XX" id="7XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=100%  cellspacing=0 cellpadding=5 border=0>
+    <table width="100%"  cellspacing="0" cellpadding="5" border="0">
 	<!-- TMPL_LOOP name="7XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
 	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
@@ -191,9 +191,9 @@
      </DIV>
 
     <DIV name="8XX" id="8XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=100% cellspacing=0 cellpadding=5  border=0>
+    <table width="100%" cellspacing="0" cellpadding="5"  border="0">
 	<!-- TMPL_LOOP name="8XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
 	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
@@ -208,9 +208,9 @@
      </DIV>
 
     <DIV name="9XX" id="9XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=90% cellspacing=0 cellpadding=5  border=0>
+    <table width="90%" cellspacing="0" cellpadding="5"  border="0">
 	<!-- TMPL_LOOP name="9XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan=5><b><tmpl_var name="tag"></td></tr>
+	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
 	<!-- TMPL_LOOP name="subfield" -->
 	<tr>
          <td width="3%">&nbsp;</td>
@@ -225,7 +225,7 @@
      </DIV>
 
     <DIV name="10XX" id="10XX" style="position:absolute;visibility:hidden;width:90%">
-    <table border=1 cellspacing=0 cellpadding=5>
+    <table border="1" cellspacing="0" cellpadding="5">
 		<tr  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
 			<!-- TMPL_LOOP name="item_header_loop" --><th><tmpl_var name="header_value"></th><!-- /TMPL_LOOP -->
 		</tr>
@@ -237,7 +237,7 @@
      </table>
      </DIV>
 
-<script LANGUAGE="JavaScript">
+<script language="JavaScript" type="text/javascript">
 function active(numlayer)
 {
 for (i=0; i <= 10 ; i++ ) {
@@ -255,7 +255,7 @@ for (i=0; i <= 10 ; i++ ) {
 }
 }
 function confirm_deletion() {
-	var is_confirmed = confirm('Confirmez vous la suppression ?');
+	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
 	if (is_confirmed) {
 		window.location="acqui.simple/addbiblio.pl?op=delete&bibid=<!-- TMPL_VAR name="bibid" -->";
 	}
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/catalogue-home.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/catalogue-home.tmpl
index 4fcd987fe7..3fc254a0dc 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/catalogue-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/catalogue-home.tmpl
@@ -36,15 +36,14 @@
 
 <TABLE border=0>
 	<TR VALIGN=TOP>
-		<TD>關鍵字</TD>
+		<TD>關鍵詞</TD>
 		<TD><INPUT TYPE="text"  SIZE="25"   NAME="keyword"></TD>
 	</TR>
 	<TR VALIGN=TOP>
 		<TD>題名</TD>
 		<TD><INPUT TYPE="text"  SIZE="25" NAME="title"></TD>
 		<td>
-			<input type=radio name=ttype value=normal checked>Normal
-			<input type=radio name=ttype value=exact>Exact
+			<input type=radio name=ttype value=normal checked>一般 <input type=radio name=ttype value=exact>完全吻合
 		</td>
 	</TR>
 	<TR VALIGN=TOP>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/detail.tmpl
index f58146e151..69d2a20c14 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/detail.tmpl
@@ -113,14 +113,14 @@ background="/images/background-mem.gif"><b>Abstract</b></td>
 <p />
 <table border="1" cellspacing="0" cellpadding="5" width="90%">
 <tr valign="top">
-<td bgcolor="$main" background="/images/background-mem.gif"><b>連結至
-相關網站<b></td>
+<td bgcolor="$main" background="/images/background-mem.gif"><b>Links to
+Associated Websites<b></td>
 </tr>
 <!-- TMPL_LOOP NAME="SITE_RESULTS" -->
 <tr>
-<td><b>題名：</b><!-- TMPL_VAR name="title" --><br>
-<b>說明：</b><!-- TMPL_VAR name="description" --><br>
-<b>網址：</b><a href="http://<!-- TMPL_VAR name="url" -->">http://<TMPL_VAR
+<td><b>Title:</b> <!-- TMPL_VAR name="title" --><br>
+<b>Description:</b> <!-- TMPL_VAR name="description" --><br>
+<b>URL:</b><a href="http://<!-- TMPL_VAR name="url" -->">http://<TMPL_VAR
 name="url"></a><br>
 </td>
 </tr>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/moredetail.tmpl
index fce7be787e..0b6d300c72 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/moredetail.tmpl
@@ -54,7 +54,7 @@ href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&type=intr
 <img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=16 height=300 align=left>
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=220 >
 <TR VALIGN=TOP>
-<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>條碼 <!-- TMPL_VAR NAME="barcode" --></B></TD>
+<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>條碼 <!-- TMPL_VAR NAME="barcode" --></b></TD>
 </TR>
 <tr VALIGN=TOP>
 <TD width=220>
@@ -72,12 +72,12 @@ href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&type=intr
 <!-- on issue bit -->
 <!-- TMPL_VAR NAME="issue" -->
 <!-- after -->
-<b>上次借書讀者1：</b><!-- TMPL_VAR NAME="card0" --><br>
-<b>上次借書讀者2：</b><!-- TMPL_VAR NAME="card1" --><br>
+<b>上次借閱者1：</b><!-- TMPL_VAR NAME="card0" --><br>
+<b>上次借閱者2：</b><!-- TMPL_VAR NAME="card1" --><br>
 <b>目前館別：</b><!-- TMPL_VAR NAME="holdingbranch" --><br>
 <b>書價：</b><!-- TMPL_VAR NAME="replacementprice" --><br>
 <b>圖書資料已遺失：</b><!-- TMPL_VAR NAME="itemlost" --><br>
-<b>Paid for:</b> <!-- TMPL_VAR NAME="paidfor" --><br>
+<b>賠償：</b><!-- TMPL_VAR NAME="paidfor" --><br>
 <b>備註：</b><!-- TMPL_VAR NAME="itemnotes" --><br>
 <b>續借：</b><!-- TMPL_VAR NAME="renewals" --><br>
 <b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&catview=yes">登錄</a>日期：<!-- TMPL_VAR NAME="dateaccessioned" --><br>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/searchresults.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/searchresults.tmpl
index 80dbb5e426..d5d8f85a3c 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/searchresults.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/catalogue/searchresults.tmpl
@@ -62,7 +62,7 @@
 <tr <!-- TMPL_IF NAME="opac" -->bgcolor=#99cccc background=<!-- TMPL_VAR name="themelang" -->/images/background-opac.gif<!-- TMPL_ELSE -->bgcolor=#ccccff background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->>
 	<td colspan=6>
 		<table border=0 cellpadding=0 cellspacing=0 width="100%">
-			<tr <!-- TMPL_IF NAME="opac" -->bgcolor="#99cccc" background="<!-- TMPL_VAR name="themelang" -->/images/background-opac.gif"<!-- TMPL_ELSE -->bgcolor="#ccccff" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->>
+			<tr <!-- TMPL_IF NAME="opac" -->bgcolor=#99cccc background=<!-- TMPL_VAR name="themelang" -->/images/background-opac.gif<!-- TMPL_ELSE -->bgcolor=#ccccff background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->>
 			<td align=left>
 				<!-- TMPL_IF NAME=displayprev -->
 				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->">上一筆</a>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/circ/branchtransfers.tmpl
index cb3d73ddc2..18ac9530df 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/circ/branchtransfers.tmpl
@@ -1,10 +1,7 @@
 <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
 
 <table align=right cellpadding=10><tr><td>
-<a class="button" href=circulation.pl>
-下一個讀者</a>
-<a class="button" href=returns.pl>
-還書
+<a class="button" href=circulation.pl>下個讀者</a> <a class="button" href=returns.pl>還書
 </td></tr></table>
 
 <h1>Circulation: Transfers</h1><br>
@@ -99,7 +96,7 @@
 			請還給讀者所屬的分館：<!-- TMPL_VAR Name="msg" -->
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF Name="errdesteqholding" -->
-			Item is already at destination branch.
+			圖書資料已在目的分館。
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF Name="errwasreturned" -->
 			圖書資料借了給 <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"
@@ -114,7 +111,7 @@ onClick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR Name=
 	<table border=1 cellpadding=5 cellspacing=0 align=left>
 	<tr><td colspan=2 align=center background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
 	<font color=black><b>選擇分館</b></font></td></tr>
-	<tr><td>Destination Branch:</td>
+	<tr><td>目的分館：</td>
 		<td><select name=tobranchcd>
 			<!-- TMPL_LOOP Name="branchoptionloop" -->
 				<option value=<!-- TMPL_VAR Name="code" --> <!-- TMPL_VAR Name="selected" -->><!-- TMPL_VAR Name="name" --> <br>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/circ/circulation.tmpl
index 9764d17e80..7fb0a6de99 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/circ/circulation.tmpl
@@ -4,12 +4,7 @@
 	<table align="right" cellpadding="10">
 		<tr>
 			<td>
-				<a class="button" href="circulation.pl?branch=<!-- TMPL_VAR name="branch" -->&amp;printer=<!-- TMPL_VAR name="printer" -->&amp;print=yes">
-				下一個讀者</a>&nbsp;
-				<a class="button" href="returns.pl">
-				還書</a>&nbsp;
-				<a class="button" href="branchtransfers.pl">
-				Transfers</a>
+				<a class="button" href="circulation.pl?branch=<!-- TMPL_VAR name="branch" -->&amp;printer=<!-- TMPL_VAR name="printer" -->&amp;print=yes">  Next Borrower</a>&nbsp;  <a class="button" href="returns.pl">  Returns</a>&nbsp;  <a class="button" href="branchtransfers.pl">  Transfers</a>
 			</td>
 		</tr>
 	</table>
@@ -21,13 +16,7 @@
 	<table align="right" cellpadding="10">
 		<tr>
 			<td>
-				<a href="returns.pl" class="button">
-					還書
-				</a>
-				&nbsp;
-				<a href="branchtransfers.pl" class="button">
-					Transfers
-				</a>
+				<a href="returns.pl" class="button">  Returns  </a>  &nbsp;  <a href="branchtransfers.pl" class="button">  Transfers  </a>
 			</td>
 		</tr>
 	</table>
@@ -52,7 +41,7 @@
 				<table border="0" cellpadding="10">
 					<tr>
 						<td>
-							Attempting to issue <!-- TMPL_VAR name="title" -->  by <!-- TMPL_VAR name="author" --> to <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->.
+							<!-- TMPL_VAR name="author" --> 嘗試借《<!-- TMPL_VAR name="title" -->》給 <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
 							<p><!-- TMPL_VAR name="question" -->
 						</td>
 					</tr>
@@ -118,7 +107,7 @@
 <!-- TMPL_IF name="message" -->
 	<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
 		<tr><th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">訊息</th></tr>
-		<tr><td><!-- TMPL_VAR name="message" --></td></tr>
+		<tr><td>找不到讀者乎合 <!-- TMPL_VAR name="message" --></td></tr>
 	</table>
 <!-- /TMPL_IF -->
 
@@ -235,7 +224,7 @@
 <tr><td valign="top"><font color="red">已遺失</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->>讀者遺失借書證</td></tr>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="dbarred" -->
-<tr><td valign="top"><font color="red">DBARRED</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->>禁止此讀者</td></tr>
+<tr><td valign="top"><font color="red">被禁</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->>禁止此讀者</td></tr>
 <!-- /TMPL_IF -->
 	<!-- TMPL_IF name="charges" -->
 		<tr><td valign="top"><font color="red">費用</font></td><td bgcolor=<!-- TMPL_VAR name="color" -->><a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->" onClick="openWindow(this, 'Payment', 480,640)">Payment</a></td></tr>
@@ -303,7 +292,7 @@
 			<th>到期日</th><th>條碼</th><th>題名</th><th>著者</th><th>類別</th>
 		</tr>
 	<!-- TMPL_LOOP name="previssues" -->
-	    <tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="tcolor" -->"><!-- TMPL_VAR NAME="dd" --></td>
+	    <tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="tcolor" -->"><!-- TMPL_IF NAME="od" --><font color="red"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="dd" --><!-- TMPL_IF NAME="od" --></font><!-- /TMPL_IF --></td>
 	    <td align="center" bgcolor="<!-- TMPL_VAR NAME="tcolor" -->">
 	    <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcode" --></a></td>
 	    <td bgcolor="<!-- TMPL_VAR NAME="tcolor" -->"><!-- TMPL_VAR NAME="title" --></td>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/circ/returns.tmpl
index 916499133a..5addd4d80c 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/circ/returns.tmpl
@@ -1,10 +1,7 @@
 <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
 
 <table align="right" cellpadding=10><tr><td>
-	<a class="button" href=circulation.pl>
-	借出</a>&nbsp;
-	<a class="button" href=branchtransfers.pl>
-	Transfers</a>
+	<a class="button" href=circulation.pl>  Issues</a>&nbsp;  <a class="button" href=branchtransfers.pl>  Transfers</a>
 </td></tr></table>
 <h1>流通：還書</h1><br>
 <b>館別：</b><!-- TMPL_VAR Name="genbrname" -->　　<b>打印機：</b><!-- TMPL_VAR Name="genprname" --><br>
@@ -157,8 +154,7 @@ Phone: <!-- TMPL_VAR Name="borphone" -->
 		<tr><td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
 		<font color=black><b>讀者資料</b></font></td></tr>
 		<tr><td colspan=2>
-		<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->','Member'); return false;"><!-- TMPL_VAR Name="riborcnum" --></a>
-		<!-- TMPL_VAR Name="riborsurname" --> <!-- TMPL_VAR Name="riborfirstname" --> <!-- TMPL_VAR Name="ribortitle" --><br>
+		<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->','Member'); return false;"><!-- TMPL_VAR Name="riborcnum" --></a> <!-- TMPL_VAR Name="riborsurname" --> <!-- TMPL_VAR Name="riborfirstname" --> <!-- TMPL_VAR Name="ribortitle" --><br>
 		</td></tr>
 		<!-- TMPL_IF Name="flagset" -->
 			<tr><td  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2>
@@ -171,7 +167,7 @@ Phone: <!-- TMPL_VAR Name="borphone" -->
 				<!-- TMPL_IF Name="waiting" -->
 					<td bgcolor=<!-- TMPL_VAR Name="color" -->>
 					<!-- TMPL_LOOP Name="itemloop" -->
-						<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionum" -->&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionum" -->&type=intra','Item'); return false;"><!-- TMPL_VAR Name="barcode" --></a><!-- TMPL_VAR Name="title" -->(<!-- TMPL_VAR Name="brname" --><br>
+						<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionum" -->&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionum" -->&type=intra','Item'); return false;"><!-- TMPL_VAR Name="barcode" --></a><!-- TMPL_VAR Name="title" -->(<!-- TMPL_VAR Name="brname" -->)<br>
 					<!-- /TMPL_LOOP -->
 					</td></tr>
 				<!-- /TMPL_IF -->
@@ -195,13 +191,13 @@ Phone: <!-- TMPL_VAR Name="borphone" -->
 	</td>
 	<tr>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF Name="returneditems" -->
+<!-- TMPL_IF Name="riloop" -->
     <tr><td colspan=2>
 		<table border=1 cellpadding=5 cellspacing=0>
 		<tr><th colspan=6 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
 		<font color=black>已還圖書資料</font></th></tr>
 		<tr><th>到期日</th><th>條碼</th><th>題名</th><th>著者</th><th>類別</th><th>讀者</th></tr>
-		<!-- TMPL_LOOP Name="returneditemloop" -->
+		<!-- TMPL_LOOP Name="riloop" -->
 			<tr><td bgcolor=<!-- TMPL_VAR Name="color" -->>
 				<!-- TMPL_IF Name="duedate" -->
 					<!-- TMPL_IF Name="early" -->
@@ -215,7 +211,8 @@ Phone: <!-- TMPL_VAR Name="borphone" -->
 					沒有借出。
 				<!-- /TMPL_IF -->
 			</td>
-			<td align=center bgcolor=<!-- TMPL_VAR Name="color" -->>> <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra', 'Item'); return false;"><!-- TMPL_VAR Name="barcode" --></a></td>
+			<td align=center bgcolor=<!-- TMPL_VAR Name="color" -->>
+			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra', 'Item'); return false;"><!-- TMPL_VAR Name="barcode" --></a></td>
 			<td bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="itemtitle" --></td>
 			<td bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="itemauthor" --></td>
 			<td align=center bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="itemtype" --></td>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/circ/selectbranchprinter.tmpl
index 41c09a4032..d68ea88c11 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/circ/selectbranchprinter.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/circ/selectbranchprinter.tmpl
@@ -33,7 +33,7 @@
 </td></tr>
 </table>
 <input type="hidden" name="setcookies" value=1>
-<input type="submit" value="Submit" type="changesettings">
+<input value="遞交" type="changesettings">
 </form>
 </center>
 
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/export/marc.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/export/marc.tmpl
index 1cb7e32d89..6edb212720 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/export/marc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/export/marc.tmpl
@@ -4,8 +4,7 @@
 <h1>匯出機讀格式書目</h1><br /><br /><br />
 以機讀格式匯出下列書目：
 <form method="post">
-<p>由書目記錄號碼 <input type="text" name="start_bib">
-至書目記錄號碼： <input type="text" name="end_bib"></p>
+<p>由書目記錄號碼 <input type="text" name="start_bib"> 至書目記錄號碼：<input type="text" name="end_bib"></p>
 <input type="hidden" name="op" value="export">
 <input type="submit" value="匯出">
 </form>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/import/breeding.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/import/breeding.tmpl
index fd271835d6..dc0e5954cc 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/import/breeding.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/import/breeding.tmpl
@@ -39,14 +39,14 @@
 		</td>
 	</tr>
 	<tr valign="top">
-		<td>Character encoding (MARC21 or UNIMARC)</td>
+		<td>編碼 (MARC21 或 UNIMARC)</td>
 		<td>
 			<select name="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select><br/>
 		</td>
 	</tr>
 	<tr valign="top">
 		<td>若其國際標準書號已在Breeding Farm內： </td>
-		<td><input type="radio" name="overwrite_biblio" value="0" checked>Ignore this one, keep the existing one<br/>
+		<td><input type="radio" name="overwrite_biblio" value="0" checked>忽略這個記錄 (保留原有的記錄)<br/>
 			<input type="radio" name="overwrite_biblio" value="1">用這個覆蓋現有的</td>
 	</tr>
 	<tr valign="top">
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/about-top.inc b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/about-top.inc
index 081717c472..0935a11832 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/about-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/about-top.inc
@@ -75,5 +75,5 @@ a.about:hover {
 <!-- TMPL_IF NAME="loggedinusername" -->
     <p align=left>目前身份：<!-- TMPL_VAR NAME="loggedinusername" --> 【<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>登出</a>】</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>登入</a> Koha</p>
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>登入</a>Koha</p>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/acquisitions-top.inc b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/acquisitions-top.inc
index da035348a6..78f137c962 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/acquisitions-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/acquisitions-top.inc
@@ -73,5 +73,5 @@ a.acquisition:hover {
 <!-- TMPL_IF NAME="loggedinusername" -->
     <p align=left>目前身份：<!-- TMPL_VAR NAME="loggedinusername" --> 【<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>登出</a>】</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>登入</a> Koha</p>
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>登入</a>Koha</p>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/cat-top.inc b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/cat-top.inc
index 0e303744ae..b8a743cf11 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/cat-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/cat-top.inc
@@ -108,5 +108,5 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
 <!-- TMPL_IF NAME="loggedinusername" -->
     <p align=left>目前身份：<!-- TMPL_VAR NAME="loggedinusername" --> 【<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>登出</a>】</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>登入</a> Koha</p>
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>登入</a>Koha</p>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/circulation-top.inc b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/circulation-top.inc
index e1e844b570..05e56c46a3 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/circulation-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/circulation-top.inc
@@ -101,5 +101,5 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 onLoad="javascript:focusOn
 <!-- TMPL_IF NAME="loggedinusername" -->
     <p align=left>目前身份：<!-- TMPL_VAR NAME="loggedinusername" --> 【<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>登出</a>】</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>登入</a> Koha</p>
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>登入</a>Koha</p>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/issues-top.inc b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/issues-top.inc
index 90f3f375fb..48f7264f71 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/issues-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/issues-top.inc
@@ -253,17 +253,17 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">　　- - 今年遺失
 
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">-----------------------------------
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43>->  Borrower Enquiry
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">->  Borrower Enquiry
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - All Books Out
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - Overdues
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">　　- 過期
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - History
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - Messages
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - Reports
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - - Average Borrowings
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - - Total Borrowings
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">　　- 報表
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">　　- - 借書平均次數
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">　　- - 借書總次數
 
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">-----------------------------------
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">->  Advanced Reports
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">-> 進階報表
 			</select>
 			</form>
 		</TD>
@@ -272,33 +272,33 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 			<form name=choose2>
 			<select name=dest size=1 onChange="leapto(this.form)">
 
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=57">OTHER
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">-> OPAC
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - Catalogue Search
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=57">其他
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">-> 線上目錄
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">　　- 查詢館藏
 
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - Renew Books
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">　　- 續借
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - Member Details
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - - Update Details
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">　　- - 更新細節
 
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">-----------------------------------
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">-> Resources
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - Fundview CD
 
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">-----------------------------------
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43"> ->  Library Website
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43"> -> 圖書館網站
 
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">-----------------------------------
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43"> ->  End of Year
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - Stocktake
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - Set New Budgets
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">　　- 建立新預算案
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - Audit Reports
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">-----------------------------------
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43"> ->  Help
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43"> -> 線上說明
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - Telnet Help
 			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - Intranet Help
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">&nbsp; &nbsp; - Searching Help
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43">　　- 查詢說明
 
-			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43"> ->  Advanced Reports
+			<option value="/cgi-bin/tododisplay.pl?user=Rachel&todo=43"> -> 進階報表
 			</select>
 			</form>
 		</td>
@@ -312,7 +312,7 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 						<font size=1 face="arial">
 						<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=223 height=12 alt=" " hspace=0 vspace=0>
 						<br>
-						<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=26 height=17 align=right alt=" " hspace=0 vspace=0>you are in <A HREF="index.html">ISSUES & RETURNS</a><br>
+						<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=26 height=17 align=right alt=" " hspace=0 vspace=0>你在此：<A HREF="index.html">借出及還書</a><br>
 						<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=223 height=1 alt=" " hspace=0 vspace=0></FONT>
 					</td>
 				</TR>
@@ -327,7 +327,7 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 </table>
 <BLOCKQUOTE>
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>]</p>
+    <p align=left>目前身份：<!-- TMPL_VAR NAME="loggedinusername" --> 【<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">登出</a>】</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href="/cgi-bin/koha/opac-user.pl">Log In</a> to Koha</p>
+    <p align=left><a href="/cgi-bin/koha/opac-user.pl">登入</a>Koha</p>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/members-top.inc b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/members-top.inc
index b61d996a2d..8556e847a3 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/members-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/members-top.inc
@@ -88,5 +88,5 @@ a.members:hover {
 <!-- TMPL_IF NAME="loggedinusername" -->
     <p align=left>目前身份：<!-- TMPL_VAR NAME="loggedinusername" --> 【<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>登出</a>】</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>登入</a> Koha</p>
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>登入</a>Koha</p>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc
index c3045d4d2e..4b000a772f 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/parameters-top.inc
@@ -94,5 +94,5 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
 <!-- TMPL_IF NAME="loggedinusername" -->
     <p align=left>目前身份：<!-- TMPL_VAR NAME="loggedinusername" --> 【<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>登出</a>】</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>登入</a> Koha</p>
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>登入</a>Koha</p>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/reports-top.inc b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/reports-top.inc
index 8b9b14ba60..3af0c6f4a6 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/includes/reports-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/includes/reports-top.inc
@@ -73,5 +73,5 @@ a.reports:hover {
 <!-- TMPL_IF NAME="loggedinusername" -->
     <p align=left>目前身份：<!-- TMPL_VAR NAME="loggedinusername" --> 【<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>登出</a>】</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>登入</a> Koha</p>
+    <p align=left><a href=/cgi-bin/koha/opac-user.pl>登入</a>Koha</p>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/maninvoice.tmpl
index 7a2d6ff12d..c4a298b53f 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/maninvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/maninvoice.tmpl
@@ -11,7 +11,7 @@
 <option value=F>罰款</option>
 <option value=A>Account Management Fee</option>
 <option value=N>新借書證</option>
-<option value=M>Sundry</option>
+<option value=M>雜項</option>
 <option value=REF>現金退款</option>
 </select>
 </td></tr>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/members/jmemberentry.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/members/jmemberentry.tmpl
index f2d890d713..7a71dff936 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/members/jmemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/members/jmemberentry.tmpl
@@ -64,8 +64,7 @@
 		<td><input type=text name=surname_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></td>
 		<td><input type=text name=dateofbirth_child_<!-- TMPL_VAR NAME=i --> size=10 value=""></TD>
 		<TD>
-			<input type="radio" name="sex_child_<!-- TMPL_VAR NAME=i -->" value="F"><b>F</b>
-			<input type="radio" name="sex_child_<!-- TMPL_VAR NAME=i -->" value="M"><b>男*</b>
+			<input type="radio" name="sex_child_<!-- TMPL_VAR NAME=i -->" value="F"><b>女</b> <input type="radio" name="sex_child_<!-- TMPL_VAR NAME=i -->" value="M"><b>男*</b>
 		</td>
 		<TD align=right><input type=text name=school_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></TD>
 	</tr>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/members/member.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/members/member.tmpl
index 8839445f9e..898c089684 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/members/member.tmpl
@@ -42,7 +42,6 @@
 
 <form action=/cgi-bin/koha/simpleredirect.pl method=post>
 <input type=submit class="button" value="新增讀者" title="新增讀者" alt="新增讀者">
-<INPUT TYPE="radio" name="chooseform" value="adult" checked>成人
-<INPUT TYPE="radio" name="chooseform" value="organisation" >社團
+<INPUT TYPE="radio" name="chooseform" value="adult" checked>成人 <INPUT TYPE="radio" name="chooseform" value="organisation" >社團/機構
 </form>
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/members/memberentry.tmpl
index 7bf13f6993..eb39543459 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/members/memberentry.tmpl
@@ -27,10 +27,7 @@
 
 	<tr valign=top>
 		<td COLSPAN=3 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>讀者個人資料</b></td>
-		<td COLSPAN=2 ALIGN=RIGHT background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">*
-		<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME=female --> checked<!-- /TMPL_IF -->>F
-		<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS NAME=female --> checked<!-- /TMPL_UNLESS -->> 男　　<b>出生日期</b> (<!-- TMPL_VAR NAME=dateformat -->)
-		<input type=text name=dateofbirth size=10 value="<!-- TMPL_VAR NAME=dateofbirth -->">
+		<td COLSPAN=2 ALIGN=RIGHT background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">* <input type="radio" name="sex" value="F"<!-- TMPL_IF NAME=female --> checked<!-- /TMPL_IF -->>女 <input type="radio" name="sex" value="M"<!-- TMPL_UNLESS NAME=female --> checked<!-- /TMPL_UNLESS -->>男　　<b>出生日期</b> (<!-- TMPL_VAR NAME=dateformat -->) <input type=text name=dateofbirth size=10 value="<!-- TMPL_VAR NAME=dateofbirth -->">
 		</td>
 	</tr>
 
@@ -189,8 +186,7 @@
 		<!-- TMPL_LOOP NAME=flagloop -->
 		<tr>
 			<td COLSPAN=2><!-- TMPL_VAR NAME=html --></td>
-			<td COLSPAN=3><input type=radio name="<!-- TMPL_VAR NAME=name -->" value="1" <!-- TMPL_VAR NAME=yes -->>是
-			<input type=radio name="<!-- TMPL_VAR NAME=name -->" value="0" <!-- TMPL_VAR NAME=no -->>否
+			<td COLSPAN=3><input type=radio name="<!-- TMPL_VAR NAME=name -->" value="1" <!-- TMPL_VAR NAME=yes -->>是 <input type=radio name="<!-- TMPL_VAR NAME=name -->" value="0" <!-- TMPL_VAR NAME=no -->>否
 			</td>
 		</tr>
 		<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/members/moremember.tmpl
index 59f5177133..74e8008a37 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/members/moremember.tmpl
@@ -87,7 +87,7 @@
 		</form>
 		<form action=/cgi-bin/koha/member-flags.pl method=post>
 			<input type=hidden name=member value=<!-- TMPL_VAR NAME=bornum -->>
-			<input type=submit class="button" value="Modify User Flags">
+			<input type=submit class="button" value="修改使用者旗標">
 		</form>
 
 	</TD>
@@ -114,12 +114,7 @@
 	<TD colspan=2 align=right>
 		<p>
 			<br>
-			<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
-				查看帳戶
-			</a>
-			<a class="button" href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
-				繳交罰款
-			</a>
+			<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">查看帳戶</a> <a class="button" href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">繳交罰款</a>
 			<br><br>
 		</p>
 	</td>
@@ -158,8 +153,7 @@
 		<!-- TMPL_IF NAME=norenew -->
 			<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">On Request - no renewals</a>
 		<!-- TMPL_ELSE -->
-			<input type=radio name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value=y>Y
-			<input type=radio name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value=n>N
+			<input type=radio name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value=y>Y  <input type=radio name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value=n>N
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME=red --></font><!-- /TMPL_IF -->
 		</td>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/members/pay.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/members/pay.tmpl
index cece861f70..2958db3b98 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/members/pay.tmpl
@@ -12,9 +12,7 @@
 	<input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->">
 <!-- TMPL_LOOP name="loop_pay" -->
 <tr VALIGN=TOP  >
-	<TD><input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="no" checked>未付款
-	<input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="yes">繳交
-	<input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="wo">註銷
+	<TD><input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="no" checked>未付 <input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="yes">付款 <input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="wo">註銷
 	<input type=hidden name="itemnumber<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="itemnumber" -->">
 	<input type=hidden name="accounttype<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accounttype" -->">
 	<input type=hidden name="amount<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amount'}" -->">
@@ -42,7 +40,7 @@
 <p> &nbsp; </p>
 
 <br>
-<a href="moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->">返回</a> 至讀者記錄
+<a href="moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->">返回</a>至讀者記錄
 
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/members/readingrec.tmpl
index 87e08e2afa..ffe9fa0d22 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/members/readingrec.tmpl
@@ -48,7 +48,7 @@
 </TABLE>
 
 <br>
-<a href="moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->">返回</a> 至讀者記錄
+<a href="moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->">返回</a>至讀者記錄
 
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/modbibitem.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/modbibitem.tmpl
index c8cae35c65..87048f2a6a 100755
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/modbibitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/modbibitem.tmpl
@@ -67,7 +67,7 @@
 	<TABLE  cellspacing=0 cellpadding=5 border=0 >
 
 		<TR VALIGN=TOP  bgcolor="99cc33">
-			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=5 ><b>CHANGES TO AFFECT THESE BARCODES<br>
+			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=5 ><b>修改將會影響下列條碼<br>
 			Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.</td>
 		</tr>
 
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/moditem.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/moditem.tmpl
index 1c89a8d83c..a93a11d875 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/moditem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/moditem.tmpl
@@ -18,18 +18,12 @@
 
 <td>遺失</td>
 <td>
-<input type=radio name=Lost value=1 <!-- TMPL_IF Name="itemlost" -->  checked <!-- /TMPL_IF --> >
-是
-<input type=radio name=Lost value=0 <!-- TMPL_UNLESS Name="itemlost" --> checked <!-- /TMPL_UNLESS --> >
-否
+<input type=radio name=Lost value=1 <!-- TMPL_IF Name="itemlost" -->  checked <!-- /TMPL_IF --> >是 <input type=radio name=Lost value=0 <!-- TMPL_UNLESS Name="itemlost" --> checked <!-- /TMPL_UNLESS --> >否
 </td>
 </tr>
 <tr valign=top bgcolor=white>
 <td>已取消</td>
-<td><input type=radio name=withdrawn value=1 <!-- TMPL_IF Name="withdrawn" --> checked <!-- /TMPL_IF --> >
-是
-<input type=radio name=withdrawn value=0 <!-- TMPL_UNLESS Name="withdrawn" --> checked <!-- /TMPL_UNLESS --> >
-否
+<td><input type=radio name=withdrawn value=1 <!-- TMPL_IF Name="withdrawn" --> checked <!-- /TMPL_IF --> >是 <input type=radio name=withdrawn value=0 <!-- TMPL_UNLESS Name="withdrawn" --> checked <!-- /TMPL_UNLESS --> >否
 </td>
 </tr>
 <input type=hidden name=bibnum value="<!-- TMPL_VAR Name="biblionumber" -->">
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/newjmember.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/newjmember.tmpl
index 4461260d7d..58fbcf01f8 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/newjmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/newjmember.tmpl
@@ -78,7 +78,7 @@
 		<!-- TMPL_LOOP NAME=inputsloop -->
 			<input type=hidden name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
 		<!-- /TMPL_LOOP -->
-		<input type=submit name=submit value=submit>
+		<input type=submit name=submit value="遞交">
 	</form>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/newmember.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/newmember.tmpl
index c08a18f7b6..8398dd3bd0 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/newmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/newmember.tmpl
@@ -223,7 +223,7 @@
 			<!-- TMPL_LOOP NAME=inputsloop -->
 				<input type=hidden name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
 			<!-- /TMPL_LOOP -->
-			<input type=submit name=submit value=Submit>
+			<input type=submit name=submit value="遞交">
 		</form>
 <!-- TMPL_ELSE -->
 	<h1>錯誤</H1>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/opac-main.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/opac-main.tmpl
index 47661dd22e..7e80c17d8c 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/opac-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/opac-main.tmpl
@@ -75,7 +75,7 @@ cellspacing=0 cellpadding=0 border=0 >
 	<!-- TMPL_IF NAME="loggedinuser" -->
 	    <p align=left>目前身份：<!-- TMPL_VAR NAME="loggedinuser" --> 【<a href=/cgi-bin/koha/logout.pl>登出</a>】</p>
 	<!-- TMPL_ELSE -->
-	    <p align=left><a href=/cgi-bin/koha/userpage.pl>登入</a> Koha</p>
+	    <p align=left><a href=/cgi-bin/koha/userpage.pl>登入</a>Koha</p>
 	<!-- /TMPL_IF -->
 	</td>
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/aqbudget.tmpl
index 7963d4614d..035dbeee16 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/aqbudget.tmpl
@@ -7,7 +7,7 @@
 	<br>您查詢 <b><!-- TMPL_VAR name=searchfield --></b><p><br>
 	<!-- /TMPL_IF -->
 	<table border=0 cellspacing=0 cellpadding=5>
-	<tr valign=top bgcolor=#99cc33><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>書籍購置資金</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Start date</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>End date</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>預算金額</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td></tr>
+	<tr valign=top bgcolor=#99cc33><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>書籍購置資金</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>開始日期</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>End date</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>預算金額</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td></tr>
 	<!-- TMPL_LOOP name="budget" -->
 		<tr valign=top bgcolor=<!-- TMPL_VAR name="toggle" --> >
 			<td><!-- TMPL_VAR name="bookfundid" --> (<!-- TMPL_VAR name="bookfundname" -->)</td>
@@ -91,7 +91,7 @@
 	<tr><td>書籍購置資金</td><td><input type=hidden name=bookfundid size=5 maxlength=5 value="<!-- TMPL_VAR name="bookfundid" -->"><!-- TMPL_VAR name="bookfundid" --></td></tr>
 <!-- /TMPL_IF -->
 
-<tr><td>Start date <i>(<!-- TMPL_VAR NAME=dateformat -->)</i></td><td><input type=text name=startdate size=11 value='<!-- TMPL_VAR name="startdate" -->'>&nbsp;</td></tr>
+<tr><td>開始日期 <i>(<!-- TMPL_VAR NAME=dateformat -->)</i></td><td><input type=text name=startdate size=11 value='<!-- TMPL_VAR name="startdate" -->'>&nbsp;</td></tr>
 <tr><td>End date <i>(<!-- TMPL_VAR NAME=dateformat -->)</i></td><td><input type=text name=enddate size=11 value='<!-- TMPL_VAR name="enddate" -->'></td></tr>
 <tr><td>預算金額</td><td><input type=text name=budgetamount value='<!-- TMPL_VAR name="budgetamount" -->'></td></tr>
 <tr><td>&nbsp;</td><td><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->"><input type=button value="好！" onclick='Check(this.form)'></td></tr>
@@ -121,7 +121,7 @@
 
 	<form action='<!-- TMPL_VAR name="action" -->' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=aqbudgetid value='<!-- TMPL_VAR name="aqbudgetid" -->'>
 	<tr>
-		<td>Start date</td>
+		<td>開始日期</td>
 		<td><!-- TMPL_VAR name="startdate" --></td>
 	</tr>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/authorised_values.tmpl
index 543136fb88..15147e6102 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/authorised_values.tmpl
@@ -15,7 +15,7 @@
 		<td><input type=text name="authorised_value" value='<!-- TMPL_VAR name="authorised_value" escape=HTML -->'></td>
 	</tr>
 	<tr>
-		<td>Lib</td>
+		<td>說明</td>
 		<td><input type=text name="lib" value='<!-- TMPL_VAR name="lib" -->'></td>
 	</tr>
 	<tr>
@@ -33,7 +33,7 @@
 <table border=0 cellspacing=0 cellpadding=2>
 	<tr valign=top bgcolor=#99cc33>
 		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>變數</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Lib</b></td>
+		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>說明</b></td>
 		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="searchfield" --></b></td>
 	</tr>
 	<tr><td>值</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
@@ -59,7 +59,7 @@
 <tr valign=top bgcolor=#99cc33>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>類別</b></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>容許值</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Lib</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>說明</b></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>修改</b></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>移除</b></td>
 <!-- TMPL_LOOP name="loop" -->
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl
index bacfbbb682..7c4a0528d0 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl
@@ -1,231 +1,231 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<!-- TMPL_IF name="add" -->
+<!-- TMPL_IF NAME="add" -->
 
-<h1><!-- TMPL_VAR name=head --></h1><br>
-<form action='<!-- TMPL_VAR name=action -->' name=Aform method=post>
-<input type=hidden name=op value='add_validate'>
+<h1><!-- TMPL_VAR NAME="head" --></h1><br>
+<form action="<!-- TMPL_VAR NAME="action" -->" name="Aform" method="post">
+<input type="hidden" name="op" value="add_validate">
 <table>
 	<tr>
 		<td>分館編號</td>
 		<td>
-			<!-- TMPL_IF name="branchcode" -->
-				<input type=hidden name=branchcode value='<!-- TMPL_VAR name=branchcode escape="HTML" -->'>
-				<!-- TMPL_VAR name="branchcode" -->
+			<!-- TMPL_IF NAME="branchcode" -->
+				<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" escape="HTML" -->">
+				<!-- TMPL_VAR NAME="branchcode" -->
 			<!-- TMPL_ELSE -->
-				<input type=text name=branchcode size=5 maxlength=5 value='<!-- TMPL_VAR name=branchcode escape="HTML" -->'>
+				<input type="text" name="branchcode" size="4" maxlength="4" value="<!-- TMPL_VAR NAME="branchcode" escape="HTML" -->">
 			<!-- /TMPL_IF -->
 		</td>
 	</tr>
 	<tr>
 		<td>名稱</td>
-		<td><input type=text name=branchname size=40 maxlength=80 value="<!-- TMPL_VAR name=branchname escape="HTML" -->">&nbsp;</td>
+		<td><input type="text" name="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="branchname" escape="HTML" -->">&nbsp;</td>
 	</tr>
 
 	<tr>
-		<td><!-- TMPL_LOOP name="categoryloop" -->
+		<td><!-- TMPL_LOOP NAME="categoryloop" -->
 					<tr>
-						<td><!-- TMPL_VAR name=categoryname --></td>
-						<td><INPUT TYPE="checkbox" NAME="<!-- TMPL_VAR name=categorycode -->" <!-- TMPL_VAR name=checked -->><!-- TMPL_VAR name=codedescription --></td>
+						<td><!-- TMPL_VAR NAME="categoryname" --></td>
+						<td><INPUT TYPE="checkbox" NAME="<!-- TMPL_VAR NAME="categorycode" -->" <!-- TMPL_VAR NAME="checked" -->><!-- TMPL_VAR NAME="codedescription" --></td>
 					</tr>
 				<!-- /TMPL_LOOP -->
 		</td>
 	</tr>
 	<tr>
 		<td>地址</td>
-		<td><input type=text name=branchaddress1 value='<!-- TMPL_VAR name=branchaddress1 escape="HTML" -->'></td>
+		<td><input type="text" name="branchaddress1" value="<!-- TMPL_VAR NAME="branchaddress1" escape="HTML" -->"></td>
 	</tr>
 	<tr>
 		<td>&nbsp;</td>
-		<td><input type=text name=branchaddress2 value='<!-- TMPL_VAR name=branchaddress2 escape="HTML" -->'></td>
+		<td><input type="text" name="branchaddress2" value="<!-- TMPL_VAR NAME="branchaddress2" escape="HTML" -->"></td>
 	</tr>
 	<tr>
 		<td>&nbsp;</td>
-		<td><input type=text name=branchaddress3 value='<!-- TMPL_VAR name=branchaddress3 escape="HTML" -->'></td>
+		<td><input type="text" name="branchaddress3" value="<!-- TMPL_VAR NAME="branchaddress3" escape="HTML" -->"></td>
 	</tr>
 	<tr>
 		<td>電話</td>
-		<td><input type=text name=branchphone value='<!-- TMPL_VAR name=branchphone escape="HTML" -->'></td>
+		<td><input type="text" name="branchphone" value="<!-- TMPL_VAR NAME="branchphone" escape="HTML" -->"></td>
 	</tr>
 	<tr>
 		<td>傳真</td>
-		<td><input type=text name=branchfax value='<!-- TMPL_VAR name=branchfax escape="HTML" -->'></td>
+		<td><input type="text" name="branchfax" value="<!-- TMPL_VAR NAME="branchfax" escape="HTML" -->"></td>
 	</tr>
 	<tr>
 		<td>電郵</td>
-		<td><input type=text name=branchemail value='<!-- TMPL_VAR name=branchemail escape="HTML" -->'></td>
+		<td><input type="text" name="branchemail" value="<!-- TMPL_VAR NAME="branchemail" escape="HTML" -->"></td>
 	</tr>
 	<tr>
 		<td>&nbsp;</td>
-		<td><input type=submit value="儲存" class="button"></td>
+		<td><input type="submit" value="儲存" class="button"></td>
 	</tr>
 </table>
 </form>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="delete_confirm" -->
+<!-- TMPL_IF NAME="delete_confirm" -->
 	請確認移除：
-	<form action='<!-- TMPL_VAR name=action -->' method=post>
-		<input type='hidden' name='op' value='delete_confirmed'>
-		<input type='hidden' name='branchcode' value=<!-- TMPL_VAR name=branchcode escape="HTML" -->>
+	<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+		<input type="hidden" name="op" value="delete_confirmed">
+		<input type="hidden" name="branchcode" value=<!-- TMPL_VAR NAME="branchcode" escape="HTML" -->>
 		<input type="submit" value="是" class="button">
 	</form>
-	<form action='<!-- TMPL_VAR name=action -->' method=post><input type='hidden' name='op' value=''>
+	<form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="hidden" name="op" value="">
 		<input type="submit" value="否" class="button">
 	</form>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="else" -->
-	<h1><!-- TMPL_VAR name=head --></h1><br>
-	<font color='red'><!-- TMPL_VAR name="message" --></font>
-	<table border='1' cellpadding='5' cellspacing='0'>
+<!-- TMPL_IF NAME="else" -->
+	<h1><!-- TMPL_VAR NAME="head" --></h1><br>
+	<font color="red"><!-- TMPL_VAR NAME="message" --></font>
+	<table border="1" cellpadding="5" cellspacing="0">
 		<tr>
-			<th colspan='6' align='left' bgcolor='#99cc33'>
-				<font size='5'><b>分館</b></font>
+			<th colspan="6" align="left" bgcolor="#99cc33">
+				<font size="5"><b>分館</b></font>
 			</th>
 		</tr>
-		<tr bgcolor='#889999'>
-			<td width='175'><b>名稱</b></td>
-			<td width='25'><b>編碼</b></td>
-			<td width='175'><b>地址</b></td>
-			<td width='175'><b>類別</b></td>
-			<td width='50'><b>&nbsp;</b></td>
-			<td width='50'><b>&nbsp;</b></td>
+		<tr bgcolor="#889999">
+			<td width="175"><b>名稱</b></td>
+			<td width="25"><b>編碼</b></td>
+			<td width="175"><b>地址</b></td>
+			<td width="175"><b>類別</b></td>
+			<td width="50"><b>&nbsp;</b></td>
+			<td width="50"><b>&nbsp;</b></td>
 		</tr>
-		<!-- TMPL_LOOP name="branches" -->
-			<tr bgcolor='<!-- TMPL_VAR name=color -->'>
-				<td align='left' valign='top'><!-- TMPL_VAR name=branch_name escape="HTML" --></td>
-				<td align='left' valign='top'><!-- TMPL_VAR name=branch_code escape="HTML" --></td>
-				<td align='left' valign='top'>
-					<!-- TMPL_IF name=address-empty-p -->
+		<!-- TMPL_LOOP NAME="branches" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+				<td align="left" valign="top"><!-- TMPL_VAR NAME="branch_name" escape="HTML" --></td>
+				<td align="left" valign="top"><!-- TMPL_VAR NAME="branch_code" escape="HTML" --></td>
+				<td align="left" valign="top">
+					<!-- TMPL_IF NAME="address-empty-p" -->
 						(沒有輸入)
 					<!-- TMPL_ELSE -->
-						<!-- TMPL_IF name=branchaddress1 -->
-							<!-- TMPL_VAR name=branchaddress1 escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name=branchaddress2 -->
-							<br><!-- TMPL_VAR name=branchaddress2 escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name=branchaddress3 -->
-							<br><!-- TMPL_VAR name=branchaddress3 escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name=branchphone -->
-							<br>電話：<!-- TMPL_VAR name=branchphone escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name=branchfax -->
-							<br>傳真：<!-- TMPL_VAR name=branchfax escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name=branchemail -->
-							<br>電郵：<!-- TMPL_VAR name=branchemail escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="branchaddress1" -->
+							<!-- TMPL_VAR NAME="branchaddress1" escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="branchaddress2" -->
+							<br><!-- TMPL_VAR NAME="branchaddress2" escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="branchaddress3" -->
+							<br><!-- TMPL_VAR NAME="branchaddress3" escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="branchphone" -->
+							<br>電話：<!-- TMPL_VAR NAME="branchphone" escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="branchfax" -->
+							<br>傳真：<!-- TMPL_VAR NAME="branchfax" escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="branchemail" -->
+							<br>電郵：<!-- TMPL_VAR NAME="branchemail" escape="HTML" --><!-- /TMPL_IF -->
 					<!-- /TMPL_IF -->
 				</td>
-				<td align='left' valign='top'>
-					<!-- TMPL_IF name=no-categories-p -->
+				<td align="left" valign="top">
+					<!-- TMPL_IF NAME="no-categories-p" -->
 						(沒有設定類別)
 					<!-- TMPL_ELSE -->
-						<!-- TMPL_LOOP name=category_list -->
-							<!-- TMPL_VAR name=categoryname --><br>
+						<!-- TMPL_LOOP NAME="category_list" -->
+							<!-- TMPL_VAR NAME="categoryname" --><br>
 						<!-- /TMPL_LOOP -->
 					<!-- /TMPL_IF -->
 				</td>
-				<td align='left' valign='top'>
-					<form action='<!-- TMPL_VAR name=action -->' method=post>
-					<input type='hidden' name='op' value='edit'>
-					<input type='hidden' name='branchcode' value='<!-- TMPL_VAR name=value escape="HTML" -->'>
-					<input type=submit value="修改" class="button">
+				<td align="left" valign="top">
+					<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+					<input type="hidden" name="op" value="edit">
+					<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="value" escape="HTML" -->">
+					<input type="submit" value="修改" class="button">
 					</form>
 				</td>
-				<td align='left' valign='top'>
-					<form action='<!-- TMPL_VAR name=action -->' method=post>
-					<input type='hidden' name='branchcode' value='<!-- TMPL_VAR name=value escape="HTML" -->'>
-					<input type='hidden' name='op' value='delete'><input type=submit value="移除" class="button">
+				<td align="left" valign="top">
+					<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+					<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="value" escape="HTML" -->">
+					<input type="hidden" name="op" value="delete"><input type="submit" value="移除" class="button">
 					</form>
 				</td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
 	<br>
-	<form action=<!-- TMPL_VAR name=action --> method=post>
-		<input type='hidden' name='op' value='add'>
-		<input type=submit class="button" value="新增分館">
+	<form action=<!-- TMPL_VAR NAME="action" --> method="post">
+		<input type="hidden" name="op" value="add">
+		<input type="submit" class="button" value="新增分館">
 	</form>
 
 	<br>
-	<table border='1' cellpadding='5' cellspacing='0'>
+	<table border="1" cellpadding="5" cellspacing="0">
 	<tr>
-		<th colspan='5' align='left' bgcolor='#99cc33'>
-			<font size='5'><b>分館類別</b></font>
+		<th colspan="5" align="left" bgcolor="#99cc33">
+			<font size="5"><b>分館類別</b></font>
 		</th>
 	</tr>
-	<tr bgcolor='#889999'>
-		<td width='175'><b>名稱</b></td>
-		<td width='25'><b>編碼</b></td>
-		<td width='200'><b>說明</b></td>
+	<tr bgcolor="#889999">
+		<td width="175"><b>名稱</b></td>
+		<td width="25"><b>編碼</b></td>
+		<td width="200"><b>說明</b></td>
 		<td>&nbsp;</td>
 		<td>&nbsp;</td>
 	</tr>
-	<!-- TMPL_LOOP name="branchcategories" -->
-		<tr bgcolor='<!-- TMPL_VAR name="color" -->'>
-		<td align='left' valign='top'><!-- TMPL_VAR name=categoryname --></td>
-		<td align='left' valign='top'><!-- TMPL_VAR name=categorycode --></td>
-		<td align='left' valign='top'><!-- TMPL_VAR name=codedescription --></td>
-		<td align='left' valign='top'>
-			<form action='<!-- TMPL_VAR name=action -->' method=post>
-			<input type='hidden' name='op' value='editcategory'>
-			<input type='hidden' name='categorycode' value='<!-- TMPL_VAR name=categorycode escape="HTML" -->'>
+	<!-- TMPL_LOOP NAME="branchcategories" -->
+		<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+		<td align="left" valign="top"><!-- TMPL_VAR NAME="categoryname" --></td>
+		<td align="left" valign="top"><!-- TMPL_VAR NAME="categorycode" --></td>
+		<td align="left" valign="top"><!-- TMPL_VAR NAME="codedescription" --></td>
+		<td align="left" valign="top">
+			<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+			<input type="hidden" name="op" value="editcategory">
+			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->">
 			<input type="submit" value="修改" class="button">
 			</form>
 		</td>
-		<td align='left' valign='top'>
-			<form action='<!-- TMPL_VAR name=action -->' method=post>
-			<input type='hidden' name='categorycode' value='<!-- TMPL_VAR name=categorycode escape="HTML" -->'>
-			<input type='hidden' name='op' value='delete_category'><input type="submit" value="移除" class="button">
+		<td align="left" valign="top">
+			<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->">
+			<input type="hidden" name="op" value="delete_category"><input type="submit" value="移除" class="button">
 			</form>
 		</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 	</table>
 	<br />
-	<form action=<!-- TMPL_VAR name=action --> method=post>
-		<input type='hidden' name='op' value='editcategory'>
-		<input type=submit class="button" value="新增類別">
+	<form action=<!-- TMPL_VAR NAME="action" --> method="post">
+		<input type="hidden" name="op" value="editcategory">
+		<input type="submit" class="button" value="新增類別">
 	</form>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="editcategory" -->
-	<h1><!-- TMPL_VAR name=head --></h1><br>
-	<form action='<!-- TMPL_VAR name=action -->' name=Aform method=post>
-	<input type=hidden name=op value='addcategory_validate'>
+<!-- TMPL_IF NAME="editcategory" -->
+	<h1><!-- TMPL_VAR NAME="head" --></h1><br>
+	<form action="<!-- TMPL_VAR NAME="action" -->" name="Aform" method="post">
+	<input type="hidden" name="op" value="addcategory_validate">
 	<table>
 		<tr>
 			<td>類別編號</td>
 			<td>
-				<!-- TMPL_IF name="categorycode" -->
-					<input type=hidden name=categorycode value='<!-- TMPL_VAR name=categorycode escape="HTML" -->'>
-					<!-- TMPL_VAR name="categorycode" -->
+				<!-- TMPL_IF NAME="categorycode" -->
+					<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->">
+					<!-- TMPL_VAR NAME="categorycode" -->
 				<!-- TMPL_ELSE -->
-					<input type=text name=categorycode size=5 maxlength=5 value='<!-- TMPL_VAR name=categorycode escape="HTML" -->'>
+					<input type="text" name="categorycode" size="5" maxlength="5" value="<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->">
 				<!-- /TMPL_IF -->
 			</td>
 		</tr>
 		<tr>
 			<td>名稱</td>
-			<td><input type=text name=categoryname size=40 maxlength=80 value="<!-- TMPL_VAR name=categoryname escape="HTML" -->">&nbsp;</td>
+			<td><input type="text" name="categoryname" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="categoryname" escape="HTML" -->">&nbsp;</td>
 		</tr>
 		<tr>
 			<td>說明</td>
-			<td><input type="text" name="codedescription" size=40 maxlength=80 value="<!-- TMPL_VAR name="codedescription" escape="HTML" -->">&nbsp;</td>
+			<td><input type="text" name="codedescription" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="codedescription" escape="HTML" -->">&nbsp;</td>
 		</tr>
 		<tr>
-			<td colspan=2 align="center"><input type="submit" value="好！" class="button"></td>
+			<td colspan="2" align="center"><input type="submit" value="好！" class="button"></td>
 		</tr>
 	</table>
 	</form>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="delete_category" -->
+<!-- TMPL_IF NAME="delete_category" -->
 	請確認移除：
-	<form action='<!-- TMPL_VAR name=action -->' method=post>
-		<input type='hidden' name='op' value='categorydelete_confirmed'>
-		<input type='hidden' name='categorycode' value='<!-- TMPL_VAR name=categorycode escape="HTML" -->'>
+	<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+		<input type="hidden" name="op" value="categorydelete_confirmed">
+		<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->">
 		<input type="submit" value="是" class="button">
 	</form>
-	<form action='<!-- TMPL_VAR name=action -->' method=post><input type='hidden' name='op' value=''>
+	<form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="hidden" name="op" value="">
 		<input type="submit" value="否" class="button">
 	</form>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/categorie.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/categorie.tmpl
index 3e164ab0f3..93a2b5c3fa 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/categorie.tmpl
@@ -210,7 +210,7 @@
 		</tr>
 		<!-- TMPL_IF NAME=totalgtzero -->
                 <tr>
-			<td colspan=2 align=center><b>This record is used <!-- TMPL_VAR NAME=total --> times. Deletion not possible</b></td>
+			<td colspan=2 align=center><b>這個記錄目前用了 <!-- TMPL_VAR NAME=total --> 次，不可移除</b></td>
 		</tr>
                <tr>
 			<td colspan=2>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/categoryitem.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/categoryitem.tmpl
index d473e2dc2f..4dc3061b9b 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/categoryitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/categoryitem.tmpl
@@ -217,7 +217,7 @@
                 </tr>
                 <!-- TMPL_IF NAME=totalgtzero -->
                 <tr>
-                        <td colspan=2 align=center><b>This record is used <!-- TMPL_VAR NAME=total --> times. Deletion not possible</b></td>
+                        <td colspan=2 align=center><b>這個記錄目前用了 <!-- TMPL_VAR NAME=total --> 次，不可移除</b></td>
                 </tr>
                <tr>
                         <td colspan=2>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/checkmarc.tmpl
index d91a103145..212b8697cc 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/checkmarc.tmpl
@@ -122,7 +122,7 @@
 <!-- TMPL_ELSE -->
 	<tr>
 		<td>&nbsp;</td>
-		<td><b>Configuration OK, you don't have errors in your MARC parameters table</b></td>
+		<td><b>設定無誤──在您的機讀格式設定內找不到錯誤</b></td>
 	</tr>
 <!-- /TMPL_IF -->
 </table>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/currency.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/currency.tmpl
index 8bb9ffdf42..94c44b99d5 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/currency.tmpl
@@ -122,7 +122,7 @@
 		<!-- TMPL_IF NAME=totalgtzero -->
 		<tr>
 			<td colspan=2 align=center>
-				<b>This record is used <!-- TMPL_VAR NAME=total --> times. Deletion not possible</b>
+				<b>這個記錄目前用了 <!-- TMPL_VAR NAME=total --> 次，不可移除</b>
 			</td>
 		</tr>
 		<tr>
@@ -197,7 +197,7 @@
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 	<!-- TMPL_IF NAME=ltcount -->
-		<a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">下一頁 >></a>	
+		<a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">下一頁 &gt;&gt;</a>	
 	<!-- /TMPL_iF -->
 
         <br>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/itemtypes.tmpl
index 6584d2e2bd..499eac2b0c 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/itemtypes.tmpl
@@ -92,8 +92,7 @@ function Check(f) {
 			<tr>
 				<td>借閱期限</td>
 				<td>
-					<input type=text name=loanlength size=10 value='<!-- TMPL_VAR name="loanlength" -->'>
-					只適用於可以外借之圖書資料
+					<input type=text name=loanlength size=10 value='<!-- TMPL_VAR name="loanlength" -->'> (只適用於可以外借之圖書資料)
 				</td>
 			</tr>
 			<tr>
@@ -125,7 +124,7 @@ function Check(f) {
 	<tr><td>續借</td><td><!-- TMPL_IF name="renewalsallowed" -->批准<!-- TMPL_ELSE -->不可<!-- /TMPL_IF --></td></tr>
 	<tr><td>借書費用</td><td><!-- TMPL_VAR name="rentalcharge" --></td></tr>
 	<!-- TMPL_IF name="total" -->
-		<tr><td colspan=2 align=center><b>This record is used <!-- TMPL_VAR name="total" --> times. Deletion not possible</b></td></tr>
+		<tr><td colspan=2 align=center><b>這個記錄目前用了 <!-- TMPL_VAR name="total" --> 次，不可移除</b></td></tr>
 		<tr><td colspan=2></form><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value="好！"></form></td></tr>
 	<!-- TMPL_ELSE -->
 		<tr><td colspan=2 align=center>確定要移除嗎</td></tr>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/koha2marclinks.tmpl
index 51cc539056..469fbf6f91 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/koha2marclinks.tmpl
@@ -166,7 +166,7 @@
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>Koha欄位</b> <span style="font-size:8;color:red" title="鏈結至此分欄的 Koha 資料庫欄位">?</span></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>欄</b></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>分欄</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=42%><b>Lib</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=42%><b>說明</b></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%>
 <!-- TMPL_LOOP name="loop" -->
 <tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/marc_subfields_structure.tmpl
index 6e13e21295..3995212e4f 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/marc_subfields_structure.tmpl
@@ -10,7 +10,7 @@
 	<input type=hidden name=op value='add_validate'>
 	<table>
 	<tr><th>欄位</th>
-		<th>Lib for librarians / for opac</th>
+		<th>給圖書館員 / 大眾的說明</th>
 		<th>可重覆</th>
 		<th>必備</th>
 		<th>Koha欄位</th>
@@ -74,7 +74,7 @@
 <table border=0 cellspacing=0 cellpadding=2 width="80%">
 <tr valign=top bgcolor=#99cc33>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>分欄</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=30%><b>Lib</b></td>
+	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=30%><b>說明</b></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>Koha欄位</b> <span style="font-size:8;color:red" title="鏈結至此分欄的 Koha 資料庫欄位">?</span></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>可重覆</b> <span style="font-size:8;color:red" title="分欄是否可重覆 (1=可重覆，0=不可重覆)">?</span></td>
 	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>必備</b> <span style="font-size:8;color:red" title="分欄是否必備 (1=必備，0=自由使用)">?</span></td>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/marctagstructure.tmpl
index 940bb35d22..cd3be35179 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/marctagstructure.tmpl
@@ -58,8 +58,8 @@
 	<input type=hidden name=op value='add_validate'>
 	<table>
 	<tr><td>欄</td><td><!-- TMPL_VAR name="searchfield" --></td></tr>
-	<tr><td>Lib for librarians</td><td><input type="text" name="liblibrarian" value='<!-- TMPL_VAR name="liblibrarian" escape=HTML -->' size=80 maxlength=100></td></tr>
-	<tr><td>Lib for opac</td><td><input type="text" name="libopac" value='<!-- TMPL_VAR name="libopac" escape=HTML -->' size=80 maxlength=100></td></tr>
+	<tr><td>給圖書館員的說明</td><td><input type="text" name="liblibrarian" value='<!-- TMPL_VAR name="liblibrarian" escape=HTML -->' size=80 maxlength=100></td></tr>
+	<tr><td>給大眾的說明</td><td><input type="text" name="libopac" value='<!-- TMPL_VAR name="libopac" escape=HTML -->' size=80 maxlength=100></td></tr>
 	<tr><td>可重覆</td><td><!-- TMPL_VAR name="repeatable" --></td></tr>
 	<tr><td>必備</td><td><!-- TMPL_VAR name="mandatory" --></td></tr>
 	<tr><td>容許值</td><td><!-- TMPL_VAR name="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</td></tr>
@@ -102,7 +102,7 @@
 <table border=0 cellspacing=0 cellpadding=2>
 <tr valign=top bgcolor=#99cc33>
 	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>欄</b></td>
-	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Lib</b></td>
+	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>說明</b></td>
 	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>可重覆</b></td>
 	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>必備</b></td>
 	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Authorised<br />值</b></td>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/printers.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/printers.tmpl
index 65bb8bd610..aef05754e7 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/printers.tmpl
@@ -190,7 +190,7 @@
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 	<!-- TMPL_IF NAME=ltcount -->
-		<a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">下一頁 >></a>	
+		<a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">下一頁 &gt;&gt;</a>	
 	<!-- /TMPL_iF -->
 
         <br>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/stopwords.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/stopwords.tmpl
index 216e3976a4..edd1622dfe 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/stopwords.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/stopwords.tmpl
@@ -162,7 +162,7 @@
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
         <!-- TMPL_IF NAME=ltcount -->
-                <a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">下一頁 >></a>
+                <a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">下一頁 &gt;&gt;</a>
         <!-- /TMPL_iF -->
 
         <br>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/thesaurus.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/thesaurus.tmpl
index aa1908f4a7..409e0dd0f1 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/thesaurus.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/thesaurus.tmpl
@@ -77,7 +77,7 @@
 <!---------------------------------------------------------------------------->
 	<table border=0 cellspacing=0 cellpadding=2>
 		<tr valign=top bgcolor=#99cc33>
-			<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>lib</b></td>
+			<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>說明</b></td>
 			<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="search_category" --></b></td>
 		</tr>
 		<tr><td>值</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/z3950servers.tmpl
index aed877c3a2..90a2e5fe8d 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/z3950servers.tmpl
@@ -275,7 +275,7 @@
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
         <!-- TMPL_IF NAME=ltcount -->
-                <a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">下一頁 >></a>
+                <a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">下一頁 &gt;&gt;</a>
         <!-- /TMPL_iF -->
                 
         <br>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/reports/inventory.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/reports/inventory.tmpl
index 0a01f2cbe9..68ca7cdfd8 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/reports/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/reports/inventory.tmpl
@@ -4,7 +4,7 @@
 	<table>
 		<tr>
 			<th colspan=2>
-				Select items you want to check
+				選擇您希望核對的項目
 			</th>
 		</tr>
 		<tr>
@@ -12,7 +12,7 @@
 					圖書資料在 (items.bulk) 右列位置之間
 			</td>
 			<td>
-				 <input type="text" name="minlocation" value="<!-- TMPL_VAR name="minlocation" -->"> 及 <input type="text" name="maxlocation" value="<!-- TMPL_VAR name="maxlocation" -->">
+				 <input type="text" name="minlocation" value="<!-- TMPL_VAR name="minlocation" -->"> 及 <input type="text" name="maxlocation" value="<!-- TMPL_VAR name="maxlocation" -->"> 之間
 			</td>
 		</tr>
 		<tr>
@@ -28,9 +28,7 @@
 					顯示
 			</td>
 			<td>
-				<input type="text" name="pagesize" value="<!-- TMPL_VAR name="pagesize" -->">
-				<i> items beginning at offset</i>
-				 <input type="text" name="offset" value="<!-- TMPL_VAR name="offset" -->">
+				<input type="text" name="pagesize" value="<!-- TMPL_VAR name="pagesize" -->">  <i> items beginning at offset</i>  <input type="text" name="offset" value="<!-- TMPL_VAR name="offset" -->">
 			</td>
 		</tr>
 		<tr colspan=2>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/search.marc/result.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/search.marc/result.tmpl
index 32a0cd6216..fa71f57fbe 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/search.marc/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/search.marc/result.tmpl
@@ -35,7 +35,7 @@
 <!-- TMPL_IF name=total -->
 &nbsp<b>共<!-- TMPL_VAR name="total" -->筆記錄中的第<!-- TMPL_VAR name="from" -->至<!-- TMPL_VAR name="to" -->項</b><br><br>
 <!-- TMPL_ELSE -->
-　找不到。<br>
+　什麼也找不到。<br>
 <!-- /TMPL_IF -->
 
 <center>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_100.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_100.tmpl
index 7d77497b01..53928a6b00 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_100.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_100.tmpl
@@ -20,11 +20,11 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Ann�e d�but</td>
+		<td>創刊年份</td>
 		<td><input type="text" name="f3" maxlength=4 size=5 value="<!-- TMPL_VAR name="f3" -->"></td>
 	</tr>
 	<tr>
-	<td>Ann�e fin</td>
+	<td>停刊年份</td>
 	<td><input type="text" name="f4" maxlength=4 size=5 value="<!-- TMPL_VAR name="f4" -->"></td>
 	</tr>
 	<tr><td colspan=2><input type="submit" value="好！"></td></tr>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_105.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_105.tmpl
index 7d77497b01..53928a6b00 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_105.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_105.tmpl
@@ -20,11 +20,11 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Ann�e d�but</td>
+		<td>創刊年份</td>
 		<td><input type="text" name="f3" maxlength=4 size=5 value="<!-- TMPL_VAR name="f3" -->"></td>
 	</tr>
 	<tr>
-	<td>Ann�e fin</td>
+	<td>停刊年份</td>
 	<td><input type="text" name="f4" maxlength=4 size=5 value="<!-- TMPL_VAR name="f4" -->"></td>
 	</tr>
 	<tr><td colspan=2><input type="submit" value="好！"></td></tr>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_60X.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_60X.tmpl
index dd205b2e27..658c02ce6d 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_60X.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_60X.tmpl
@@ -25,32 +25,7 @@
 		<textarea name="result" rows=10 cols=50><!-- TMPL_VAR name="result" --></textarea>
 		<br/><input type="button" value="好！" onclick="javascript:finish()">
 		<p><h2>查詢</h2>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=A">A</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=B">B</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=C">C</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=D">D</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=E">E</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=F">F</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=G">G</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=H">H</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=I">I</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=J">J</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=K">K</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=L">L</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=M">M</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=N">N</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=O">O</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=P">P</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=Q">Q</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=R">R</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=S">S</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=T">T</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=U">U</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=V">V</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=W">W</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=X">X</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=Y">Y</a>
-			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=Z">Z</a>
+			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=A">A</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=B">B</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=C">C</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=D">D</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=E">E</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=F">F</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=G">G</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=H">H</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=I">I</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=J">J</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=K">K</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=L">L</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=M">M</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=N">N</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=O">O</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=P">P</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=Q">Q</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=R">R</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=S">S</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=T">T</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=U">U</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=V">V</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=W">W</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=X">X</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=Y">Y</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=Z">Z</a>
 			<br/>
 			<input type="text" name="search_string" value="<!-- TMPL_VAR name="search_string" -->">
 			<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_700-4.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_700-4.tmpl
index 70e5171a73..6ba077f8cd 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_700-4.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/value_builder/unimarc_field_700-4.tmpl
@@ -9,7 +9,7 @@
 	<tr>
 		<td>出版日期碼 </td><td><select name="f1" size="1">
 		<option value="075 - postface" <!-- TMPL_IF name="f1_075" -->SELECTED<!-- /TMPL_IF -->>書後語</option>
-			<option value="651 - dir. de publication" <!-- TMPL_IF name="f1_651" -->SELECTED<!-- /TMPL_IF -->>dir. de publication</option>
+			<option value="651 - dir. de publication" <!-- TMPL_IF name="f1_651" -->SELECTED<!-- /TMPL_IF -->>編輯</option>
 			<option value="440 - illustrateur" <!-- TMPL_IF name="f1_440" -->SELECTED<!-- /TMPL_IF -->>繪圖</option>
 			<option value="080 - pr�face, notes" <!-- TMPL_IF name="f1_080" -->SELECTED<!-- /TMPL_IF -->>前言、註釋</option>
 			<option value="730 - traducteur" <!-- TMPL_IF name="f1_730" -->SELECTED<!-- /TMPL_IF -->>譯者</option>
diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/z3950/searchresult.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/z3950/searchresult.tmpl
index fb7cfd02f7..aa50011101 100644
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/z3950/searchresult.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/z3950/searchresult.tmpl
@@ -1,4 +1,5 @@
 <HTML>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <!-- TMPL_IF name="refresh" -->
 	<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR name="refresh" -->">
 <!-- /TMPL_IF -->
@@ -14,7 +15,7 @@
 		<td><b>題名</b></td>
 		<td><b>著者</b></td>
 		<td><b>ISBN</b></td>
-		<td><b>coming from</b></td>
+		<td><b>源自</b></td>
 		<td><b>&nbsp;</b></td>
 		<td>&nbsp;</td>
 	</tr>
diff --git a/koha-tmpl/opac-tmpl/default/zh-TW/images/front-arrow-small.gif b/koha-tmpl/opac-tmpl/default/zh-TW/images/front-arrow-small.gif
new file mode 100644
index 0000000000..fcebabbee1
Binary files /dev/null and b/koha-tmpl/opac-tmpl/default/zh-TW/images/front-arrow-small.gif differ
diff --git a/koha-tmpl/opac-tmpl/default/zh-TW/includes/cat-class-list.inc b/koha-tmpl/opac-tmpl/default/zh-TW/includes/cat-class-list.inc
index f517c62ee4..55d69d69f1 100644
--- a/koha-tmpl/opac-tmpl/default/zh-TW/includes/cat-class-list.inc
+++ b/koha-tmpl/opac-tmpl/default/zh-TW/includes/cat-class-list.inc
@@ -4,8 +4,8 @@
 -->
 <option value="E">淺易/圖畫書
 <option value="ER">淺易讀本	
-<option value="JNF">兒童非小說類
-<option value="JF">兒童小說類
+<option value="JNF">學童/初級非小說
+<option value="JF">學童/初級小說
 <option value="TREF">教師參考書
 <option value="FYA">青年小說類	
 <option value="REF">參考書
diff --git a/koha-tmpl/opac-tmpl/default/zh-TW/includes/opac-top.inc b/koha-tmpl/opac-tmpl/default/zh-TW/includes/opac-top.inc
index 9c3c0b6de1..b9826baa11 100644
--- a/koha-tmpl/opac-tmpl/default/zh-TW/includes/opac-top.inc
+++ b/koha-tmpl/opac-tmpl/default/zh-TW/includes/opac-top.inc
@@ -43,6 +43,6 @@
 <!-- TMPL_IF NAME="loggedinusername" -->
     <p align="left">目前身份：<!-- TMPL_VAR NAME="loggedinusername" --> 【<a href="/cgi-bin/koha/opac-user.pl">個人主頁</a>】【<a href="/cgi-bin/koha/opac-main.pl?logout.x=1">登出</a>】</p>
 <!-- TMPL_ELSE -->
-    <p align="left"><a href="/cgi-bin/koha/opac-user.pl">登入</a> Koha</p>
+    <p align="left"><a href="/cgi-bin/koha/opac-user.pl">登入</a>Koha</p>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/opac-tmpl/default/zh-TW/kohaerror.tmpl b/koha-tmpl/opac-tmpl/default/zh-TW/kohaerror.tmpl
index 603cd9cc93..0e9b7fb519 100644
--- a/koha-tmpl/opac-tmpl/default/zh-TW/kohaerror.tmpl
+++ b/koha-tmpl/opac-tmpl/default/zh-TW/kohaerror.tmpl
@@ -3,7 +3,7 @@
 <table border="1" cellspacing="5" bgcolor="#FF0000" align="center">
 <tr><td>
 <table border="0" bgcolor="#DDDDDD">
-<tr><th>發生了錯誤</th></tr>
+<tr><th>發生錯誤</th></tr>
 <tr><td><!-- TMPL_VAR NAME="errormessage" --></td></tr>
 </table>
 </td></tr>
diff --git a/koha-tmpl/opac-tmpl/default/zh-TW/opac-detail.tmpl b/koha-tmpl/opac-tmpl/default/zh-TW/opac-detail.tmpl
index 7a9486f796..9300d25d4d 100644
--- a/koha-tmpl/opac-tmpl/default/zh-TW/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/default/zh-TW/opac-detail.tmpl
@@ -46,7 +46,7 @@
 	<tr bgcolor="#99cccc">
 		<th>圖書資料類別</th>
 		<th>地點</th>
-		<th>到期日</th>
+		<th>歸還日期</th>
 		<th>最近出現</th>
 		<th>條碼</th>
 	</tr>
@@ -63,8 +63,8 @@
 		<tr>
 			<td><!-- TMPL_VAR NAME="itemtype" --></td>
 			<td>網站</td>
-			<td>上線</td>
-			<td>仍在館內</td>
+			<td>網上</td>
+			<td>在館內</td>
 			<td>&nbsp;</td>
 			<td><!-- TMPL_VAR NAME="url" --></td>
 		</tr>
diff --git a/koha-tmpl/opac-tmpl/default/zh-TW/opac-main.tmpl b/koha-tmpl/opac-tmpl/default/zh-TW/opac-main.tmpl
index b9aeb9886b..10b6b103ed 100644
--- a/koha-tmpl/opac-tmpl/default/zh-TW/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/default/zh-TW/opac-main.tmpl
@@ -84,7 +84,7 @@ input {
 				<form action="/cgi-bin/koha/opac-searchresults.pl" name="catsearch" id="catsearch">
 					<input type="hidden" name="type" value="opac">
 					<input type="text" name="keyword" size="27"><br>
-					<b>在空格輸入後，再按回車鍵即可。</b><br>
+					<b>在空格輸入後，再按輸入鍵即可。</b><br>
 					<a href="/cgi-bin/koha/opac-search.pl">
 						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/front-arrow-small.gif" alt="-" width="20" height="16" hspace="0" vspace="0" border="0" align="middle">
 						進階查詢（更多選項）
@@ -102,7 +102,7 @@ input {
 						新書
 				</font><br>
 					<form action="/cgi-bin/koha/opac-new.pl" name="new">
-						<!-- TMPL_VAR name="CGIitemtype" --> <b>acquired in the last <input type="text" name="duration" value="30" size=3> 日</b>
+						<b>最近<input type="text" name="duration" value="30" size=3>日內新到的</b><!-- TMPL_VAR name="CGIitemtype" -->
 						<input type="submit" value="好!">
 					</form>
 			</td>
diff --git a/koha-tmpl/opac-tmpl/default/zh-TW/opac-moredetail.tmpl b/koha-tmpl/opac-tmpl/default/zh-TW/opac-moredetail.tmpl
index 0beb2f1905..7344215a0f 100644
--- a/koha-tmpl/opac-tmpl/default/zh-TW/opac-moredetail.tmpl
+++ b/koha-tmpl/opac-tmpl/default/zh-TW/opac-moredetail.tmpl
@@ -16,7 +16,7 @@ href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&type=intr
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left>
 <TR VALIGN=TOP>
 <td  bgcolor="99cc33" background="/images/background-mem.gif"
-><b><!-- TMPL_VAR NAME="biblioitemnumber" --> 群組 - <!-- TMPL_VAR NAME="description" --></b> </TD>
+><B><!-- TMPL_VAR NAME="biblioitemnumber" --> 群組 - <!-- TMPL_VAR NAME="description" --> </b> </TD>
 </TR>
 <tr VALIGN=TOP  >
 <TD width=210 >
@@ -66,12 +66,12 @@ href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&type=intr
 <b>最近出現：</b><!-- TMPL_VAR NAME="datelastseen" --><br>
 <b>最近借出：</b><!-- TMPL_VAR NAME="timestamp0" --><br>
 借出 <!-- FIXME - What's this, then? -->
-<b>最近借書之讀者1：</b><!-- TMPL_VAR NAME="card0" --><br>
-<b>最近借書之讀者2：</b><!-- TMPL_VAR NAME="card1" --><br>
-<b>目前館別：</b><!-- TMPL_VAR NAME="holdingbranch" --><br>
+<b>最近借閱者1：</b><!-- TMPL_VAR NAME="card0" --><br>
+<b>最近借閱者2：</b><!-- TMPL_VAR NAME="card1" --><br>
+<b>目前分館：</b><!-- TMPL_VAR NAME="holdingbranch" --><br>
 <b>書價：</b><!-- TMPL_VAR NAME="replacementprice" --><br>
 <b>遺失圖書資料：</b><!-- TMPL_VAR NAME="itemlost" --><br>
-<b>Paid for:</b> <!-- TMPL_VAR NAME="paidfor" --><br>
+<b>賠償：</b><!-- TMPL_VAR NAME="paidfor" --><br>
 <b>備註：</b><!-- TMPL_VAR NAME="itemnotes" --><br>
 <b>續借次數：</b><!-- TMPL_VAR NAME="renewals" --><br>
 <b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&catview=yes">登錄</a>日期：<!-- TMPL_VAR NAME="dateaccessioned" --><br>
diff --git a/koha-tmpl/opac-tmpl/default/zh-TW/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/default/zh-TW/opac-reserve.tmpl
index 2ade134524..97b1725144 100644
--- a/koha-tmpl/opac-tmpl/default/zh-TW/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/default/zh-TW/opac-reserve.tmpl
@@ -41,11 +41,11 @@
 			<!-- /TMPL_LOOP -->
 		</table>
 		<p>
-		請指定您希望在哪間圖書館取書《<!-- TMPL_VAR NAME="CGIbranch" -->》
+		請指定您希望在哪間分館取書《<!-- TMPL_VAR NAME="CGIbranch" -->》
 		</p>
 		<table border="0" cellspacing="0" cellpadding="0">
 			<tr>
-				<td>預約在這一日終止：</td>
+				<td>由這日開始預約：</td>
 				<td>
 					<select name="required-day"><option value="0">日</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option><option value="11">11</option><option value="12">12</option><option value="13">13</option><option value="14">14</option><option value="15">15</option><option value="16">16</option><option value="17">17</option><option value="18">18</option><option value="19">19</option><option value="20">20</option><option value="21">21</option><option value="22">22</option><option value="23">23</option><option value="24">24</option><option value="25">25</option><option value="26">26</option><option value="27">27</option><option value="28">28</option><option value="29">29</option><option value="30">30</option><option value="31">31</option>
 </select>
@@ -75,7 +75,7 @@
 				</td>
 			</tr>
 		</table>
-		<p><input type="submit" value="Submit"></p>
+		<p><input type="submit" value="遞交"></p>
 	</form>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/opac-tmpl/default/zh-TW/opac-search.tmpl b/koha-tmpl/opac-tmpl/default/zh-TW/opac-search.tmpl
index 7fda7c21c2..c138de64c8 100644
--- a/koha-tmpl/opac-tmpl/default/zh-TW/opac-search.tmpl
+++ b/koha-tmpl/opac-tmpl/default/zh-TW/opac-search.tmpl
@@ -5,7 +5,7 @@
 
 
 <tr>
-	<td>關鍵字</td>
+	<td>關鍵詞</td>
 	<td colspan="2"><input type="text"  size="25"   name="keyword"></td>
 </tr>
 
@@ -24,7 +24,7 @@
 <tr>
 	<td>題名</td>
 	<td><input type="text"  size="25"   name="title"></td>
-	<td><input type="radio" name="ttype" value="normal" checked="checked">一般<input type="radio" name="ttype" value="exact">Exact</td>
+	<td><input type="radio" name="ttype" value="normal" checked="checked">一般<input type="radio" name="ttype" value="exact">完全吻合</td>
 </tr>
 
 <tr>
@@ -41,7 +41,7 @@
 <td>類別</td>
 	<td colspan="2">
 	<select size="1"  name="class">
-	<option value="">無所謂</option>
+	<option value="">任何</option>
 	<!-- fetch class list -->
 	<!-- TMPL_VAR name="classlist" -->
 	<!--#include virtual="/includes/cat-class-list.inc" -->
@@ -56,11 +56,11 @@
 
 <tr>
 	<td><input type="submit" value="開始查詢"></td>
-	<td colspan="2"><input type="reset" value="清空"></td>
+	<td colspan="2"><input type="reset" value="全部清空"></td>
 </tr>
 
 <tr>
-	<td colspan="3">注意：一旦輸入了「關鍵字」，即使在其他欄位輸入了其他查詢條件，也只會使用關鍵字。</td>
+	<td colspan="3">注意：一旦輸入了「關鍵詞」，即使在其他欄位輸入了其他查詢條件，也只會使用關鍵字。</td>
 </tr>
 
 </table>
diff --git a/koha-tmpl/opac-tmpl/default/zh-TW/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/default/zh-TW/opac-searchresults.tmpl
index 0d73f0aa1a..a0875d64d6 100644
--- a/koha-tmpl/opac-tmpl/default/zh-TW/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/default/zh-TW/opac-searchresults.tmpl
@@ -6,7 +6,7 @@
     您查詢<b><!-- TMPL_VAR NAME="searchdesc" --></b>
 <!-- TMPL_ELSE -->
 	<!-- TMPL_IF name="searchnew" -->
-		最近<b><!-- TMPL_VAR name="duration" --></b>日內新到的<!-- TMPL_VAR name="itemtype" -->圖書資料<br>
+		最近<b><!-- TMPL_VAR name="duration" --></b>日內新到的<!-- TMPL_VAR name="itemtype" --><br>
 	<!-- TMPL_ELSE -->
 		您沒有指定任何查詢條件。<br>
 	<!-- /TMPL_IF -->
@@ -119,7 +119,7 @@
 	<!-- /TMPL_IF -->
 
 <br>
-<div align="center">	共<i><!-- TMPL_VAR NAME="numrecords" --></i>筆結果中的第<i><!-- TMPL_VAR NAME="startfrom" --></i>至<i><!-- TMPL_VAR NAME="endat" --></i>項結果</div>
+<div align="center">	共<i><!-- TMPL_VAR NAME="numrecords" --></i>項結果中的第<i><!-- TMPL_VAR NAME="startfrom" --></i>至<i><!-- TMPL_VAR NAME="endat" --></i>項結果</div>
 	<hr>
 
 
diff --git a/koha-tmpl/opac-tmpl/default/zh-TW/opac-user.tmpl b/koha-tmpl/opac-tmpl/default/zh-TW/opac-user.tmpl
index 2fda9ebcde..4af98a4591 100644
--- a/koha-tmpl/opac-tmpl/default/zh-TW/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/default/zh-TW/opac-user.tmpl
@@ -11,9 +11,9 @@
 			<!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="title" -->) <br>
 			<!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --><br>
 			<!-- TMPL_VAR NAME="phone" --> (住宅)<br>
-			<!-- TMPL_VAR NAME="faxnumber" --> (辦公)<br>
+			<!-- TMPL_VAR NAME="faxnumber" --> (辦公室)<br>
 			<!-- TMPL_VAR NAME="emailaddress" --><br>
-			<br>有沒有要更新的？<br><br>
+			<br>有沒有更新？<br><br>
 			<a href="/cgi-bin/koha/opac-userupdate.pl">更新紀錄</a>
 			</font>
 		</td>
@@ -25,7 +25,7 @@
 	<table cellpadding="5" cellspacing="0" border="1">
 		<tr bgcolor="#fecc99">
 			<td>
-				<font face="arial, helvetica, sans-serif" color="red" size="+2"><b>您尚欠罰款或其他費用<!-- TMPL_VAR NAME="amountoutstanding" --></b></font>
+				<font face="arial, helvetica, sans-serif" color="red" size="+2"><b>您尚欠款項 <!-- TMPL_VAR NAME="amountoutstanding" --></b></font>
 			</td>
 		</tr>
 	</table>
@@ -36,7 +36,7 @@
 		<tr bgcolor="#fecc99">
 			<td>
 				<font face="arial, helvetica, sans-serif" size="+2">
-					<b>您尚欠罰款或其他費用<!-- TMPL_VAR NAME="amountoutstanding" --></b>
+					<b>您尚欠款項 <!-- TMPL_VAR NAME="amountoutstanding" --></b>
 				</font>
 			</td>
 		</tr>
@@ -63,7 +63,7 @@
 		<tr bgcolor="#fecc99" >
 			<td colspan="4">
 				<font color="red" face="arial, helvetica, sans-serif" size="+2">
-					<b>	您有預約了的圖書資料可以取書：</b>
+					<b>	您可取書的預約圖書資料：</b>
 				</font>
 			</td>
 		</tr>
@@ -71,7 +71,7 @@
 			<th>題名</th>
 			<th>著者</th>
 			<th>預約日期</th>
-			<th>取書處</th>
+			<th>取書分館</th>
 		</tr>
 		<!-- TMPL_LOOP NAME="WAITING" -->
 			<tr>
@@ -92,7 +92,7 @@
 		<tr valign="top" bgcolor="#99CCCC" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-opac.gif">
 			<th>題名</th>
 			<th>著者</th>
-			<th>到期日</th>
+			<th>歸還日期</th>
 			<th>圖書資料類別</th>
 			<th>費用</th>
 			<th>目前狀態</th>
diff --git a/koha-tmpl/opac-tmpl/default/zh-TW/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/default/zh-TW/opac-userupdate.tmpl
index 295c3de09d..55e024c0b7 100644
--- a/koha-tmpl/opac-tmpl/default/zh-TW/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/default/zh-TW/opac-userupdate.tmpl
@@ -36,7 +36,7 @@
 
 
 <tr>
-<td colspan="2"><input type="submit" value="Submit"></td>
+<td colspan="2"><input type="submit" value="遞交"></td>
 </tr>
 
 </table>
diff --git a/koha-tmpl/opac-tmpl/default/zh-TW/subject.tmpl b/koha-tmpl/opac-tmpl/default/zh-TW/subject.tmpl
index ce5af0280e..5f32e9edc9 100644
--- a/koha-tmpl/opac-tmpl/default/zh-TW/subject.tmpl
+++ b/koha-tmpl/opac-tmpl/default/zh-TW/subject.tmpl
@@ -12,7 +12,7 @@
 &nbsp;</td></tr>
 </table>
 <br>
-共<!-- TMPL_VAR NAME="numrecords" -->筆結果中的第<!-- TMPL_VAR NAME="startfrom" -->至<!-- TMPL_VAR NAME="endat" -->項結果
+共<!-- TMPL_VAR NAME="numrecords" -->項結果中的第<!-- TMPL_VAR NAME="startfrom" -->至<!-- TMPL_VAR NAME="endat" -->項結果
 <br>
     <!-- TMPL_IF NAME="displayprev" -->
 	<a href="./dosearch.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!-- TMPL_LOOP NAME="FORMINPUTS" -->&amp;<!-- TMPL_VAR NAME="field" -->=<!-- TMPL_VAR NAME="value" ESCAPE="URL" --><!-- /TMPL_LOOP -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" width="15" height="14" border="0" alt="上一頁"></a>