Sync to new en template

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 75e192c..ad7b171 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/zh-TW/parameters/branches.tmpl
@@ -1,115 +1,232 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href="/cgi-bin/koha/opac-user.pl">µn¤J</a> <span lang=mi>Koha</span></p>
-</TMPL_IF>
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<TMPL_IF name="add">
-<form action='<TMPL_VAR name=action>' name=Aform method=post>
+<!-- TMPL_IF name="add" -->
+<h1 lang=en><!-- 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>¤ÀÀ]½s½X</td><td><input type=text name=branchcode size=5 maxlength=5 value='<TMPL_VAR name=branchcode escape="HTML">'</td></tr>
-<tr><td>À]¦W</td><td><input type=text name=branchname size=40 maxlength=80 value="<TMPL_VAR name=branchname escape="HTML">">&nbsp;</td></tr>
-<FONT SIZE=6><em><TMPL_VAR name=head></em></FONT><br>
-<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></tr>
-</TMPL_LOOP>
-<tr><td>¦a§}</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></tr>
-<tr><td>&nbsp;</td><td><input type=text name=branchaddress3 value='<TMPL_VAR name=branchaddress3 escape="HTML">'></td></tr>
-<tr><td>¹q¸Ü</td><td><input type=text name=branchphone value='<TMPL_VAR name=branchphone escape="HTML">'></td></tr>
-<tr><td>¶Ç¯u</td><td><input type=text name=branchfax value='<TMPL_VAR name=branchfax escape="HTML">'></td></tr>
-<tr><td>¹q¶l</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='Submit'></td></tr>
+       <tr>
+               <td>¤ÀÀ]½s½X</td>
+               <td>
+                       <!-- TMPL_IF name="branchcode" -->
+                               <input type=hidden name=branchcode value='<!-- TMPL_VAR name=branchcode escape="HTML" -->'>
+                               <span class=en><!-- TMPL_VAR name="branchcode" --></span>
+                       <!-- TMPL_ELSE -->
+                               <input type=text name=branchcode size=5 maxlength=5 value='<!-- TMPL_VAR name=branchcode escape="HTML" -->'>
+                       <!-- /TMPL_IF -->
+               </td>
+       </tr>
+       <tr>
+               <td>À]¦W</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" -->
+                                       <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>
+                                       </tr>
+                               <!-- /TMPL_LOOP -->
+               </td>
+       </tr>
+       <tr>
+               <td>¦a§}</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>
+       </tr>
+       <tr>
+               <td>&nbsp;</td>
+               <td><input type=text name=branchaddress3 value='<!-- TMPL_VAR name=branchaddress3 escape="HTML" -->'></td>
+       </tr>
+       <tr>
+               <td>¹q¸Ü</td>
+               <td><input type=text name=branchphone value='<!-- TMPL_VAR name=branchphone escape="HTML" -->'></td>
+       </tr>
+       <tr>
+               <td>¶Ç¯u</td>
+               <td><input type=text name=branchfax value='<!-- TMPL_VAR name=branchfax escape="HTML" -->'></td>
+       </tr>
+       <tr>
+               <td>¹q¶l</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="¦n" class='button'></td>
+       </tr>
 </table>
 </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirm">
-Confirm delete:
-<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=YES></form>
-<form action='<TMPL_VAR name=action>' method=post><input type='hidden' name='op' value=''>
-<input type=submit value=NO></form>
-</TMPL_IF>
+<!-- TMPL_IF name="delete_confirm" -->
+       ½T©w­n²¾°£¶Ü¡H
+       <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=''>
+               <input type="submit" value="¨ú®ø" class="button">
+       </form>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="else">
-<FONT SIZE=6><em><TMPL_VAR name=head></em></FONT><br>
-<font color='red'><TMPL_VAR name="message"></font>
-<form action=<TMPL_VAR name=action> method=post><input type='hidden' name='op' value='add'><input type=submit value='¥[¤@·sÀ]'></form>
-<table border='1' cellpadding='5' cellspacing='0' width='100%'>
-<tr> <th colspan='5' align='left' bgcolor='#99cc33'>
-<font size='5'><b>¤ÀÀ]¤@Äý</b></font></th> </tr>
-<tr bgcolor='#889999'>
-<td width='175'><b>À]¦W</b></td>
-<td width='25'><b>½s½X</b></td>
-<td width='175'><b>¦a§}</b></td>
-<td width='175'><b>Ãþ§O</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>
-(¨S¦³¿é¤J¦a§})
-<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>¹q¸Ü¡G<TMPL_VAR name=branchphone escape="HTML"></TMPL_IF>
-<TMPL_IF name=branchfax>
-<br>¶Ç¯u¡G<TMPL_VAR name=branchfax escape="HTML"></TMPL_IF>
-<TMPL_IF name=branchemail>
-<br>¹q¶l¡G<TMPL_VAR name=branchemail escape="HTML"></TMPL_IF>
-</TMPL_IF>
-    </td>
-    <td align='left' valign='top'>
-<TMPL_IF name=no-categories-p>
-(¨S¦³³]©wÃþ§O)
-<TMPL_ELSE>
-<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="§ó§ï">
-</form>
-<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="§R°£">
-</form></td>
-</tr>
-</TMPL_LOOP>
-</table>
-<br>
-<form action=<TMPL_VAR name=action> method=post><input type='hidden' name='op' value='add_cat'><input type=submit value='¥[¤@Ãþ§O'></form>
-<table border='1' cellpadding='5' cellspacing='0'>
-<tr> <th colspan='5' align='left' bgcolor='#99cc33'>
-<font size='5'><b>¤ÀÀ]Ãþ§O</b></font></th> </tr> 
-<tr bgcolor='#889999'> 
-<td width='175'><b>Ãþ§O</b></td> 
-<td width='25'><b>½s½X</b></td> 
-<td width='200'><b>»¡©ú</b></td>
-</tr>
-<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>
-</tr>
-</table>
-</TMPL_IF>
+<!-- TMPL_IF name="else" -->
+       <h1 lang=en><!-- TMPL_VAR name=head --></h1><br>
+       <font color='red' lang=en><!-- 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>
+               </tr>
+               <tr bgcolor='#889999'>
+                       <td width='175'><b>À]¦W</b></td>
+                       <td width='25'><b>½s½X</b></td>
+                       <td width='175'><b>¦a§}</b></td>
+                       <td width='175'><b>Ãþ§O</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'><span class=en><!-- TMPL_VAR name=branch_code escape="HTML" --></span></td>
+                               <td align='left' valign='top'>
+                                       <!-- TMPL_IF name=address-empty-p -->
+                                               (¨S¦³¿é¤J¦a§})
+                                       <!-- 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>¹q¸Ü¡G<!-- TMPL_VAR name=branchphone escape="HTML" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name=branchfax -->
+                                                       <br>¶Ç¯u¡G<!-- TMPL_VAR name=branchfax escape="HTML" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name=branchemail -->
+                                                       <br>¹q¶l¡G<!-- TMPL_VAR name=branchemail escape="HTML" --><!-- /TMPL_IF -->
+                                       <!-- /TMPL_IF -->
+                               </td>
+                               <td align='left' valign='top'>
+                                       <!-- TMPL_IF name=no-categories-p -->
+                                               (¨S¦³³]©wÃþ§O)
+                                       <!-- TMPL_ELSE -->
+                                               <!-- 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">
+                                       </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">
+                                       </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='·s¼W¤ÀÀ]'>
+       </form>
+
+       <br>
+       <table border='1' cellpadding='5' cellspacing='0'>
+       <tr>
+               <th colspan='5' align='left' bgcolor='#99cc33'>
+                       <font size='5'><b>¤ÀÀ]Ãþ§O</b></font>
+               </th>
+       </tr>
+       <tr bgcolor='#889999'>
+               <td width='175'><b>Ãþ§O</b></td>
+               <td width='25'><b>½s½X</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'><span class=en><!-- TMPL_VAR name=categorycode --></span></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">
+                       </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='·s¼WÃþ§O'>
+       </form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="editcategory" -->
+       <h1 lang=en><!-- 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>Ãþ§O½s½X</td>
+                       <td>
+                               <!-- TMPL_IF name="categorycode" -->
+                                       <input type=hidden name=categorycode value='<!-- TMPL_VAR name=categorycode escape="HTML" -->'>
+                                       <span class=en><!-- TMPL_VAR name="categorycode" --></span>
+                               <!-- TMPL_ELSE -->
+                                       <input type=text name=categorycode size=5 maxlength=5 value='<!-- TMPL_VAR name=categorycode escape="HTML" -->'>
+                               <!-- /TMPL_IF -->
+                       </td>
+               </tr>
+               <tr>
+                       <td>¦WºÙ</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>
+               </tr>
+               <tr>
+                       <td colspan=2 align="center"><input type="submit" value="¦n" class="button"></td>
+               </tr>
+       </table>
+       </form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="delete_category" -->
+       ½T©w­n²¾°£¶Ü¡H
+       <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=''>
+               <input type="submit" value="¨ú®ø" class="button">
+       </form>
+<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->