Various updates/fixes from rel_2_0

Fixes for bugs 721 (templating), 727, and 734

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 8223e94..fb5dd71 100644 (file)
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -1658,11 +1658,11 @@ aqorderbreakdown tables of the Koha database.
 sub getsingleorder {
   my ($ordnum)=@_;
   my $dbh = C4::Context->dbh;
-  my $sth=$dbh->prepare("Select * from biblio,biblioitems,aqorders,aqorderbreakdown
+  my $sth=$dbh->prepare("Select * from biblio,biblioitems,aqorders left join aqorderbreakdown
+  on aqorders.ordernumber=aqorderbreakdown.ordernumber
   where aqorders.ordernumber=?
-  and biblio.biblionumber=aqorders.biblionumber and
-  biblioitems.biblioitemnumber=aqorders.biblioitemnumber and
-  aqorders.ordernumber=aqorderbreakdown.ordernumber");
+  and biblio.biblionumber=aqorders.biblionumber
+  and biblioitems.biblioitemnumber=aqorders.biblioitemnumber");
   $sth->execute($ordnum);
   my $data=$sth->fetchrow_hashref;
   $sth->finish;
@@ -2193,6 +2193,10 @@ Paul POULAIN paul.poulain@free.fr
 
 # $Id$
 # $Log$
+# Revision 1.82  2004/03/07 05:47:31  acli
+# Various updates/fixes from rel_2_0
+# Fixes for bugs 721 (templating), 727, and 734
+#
 # Revision 1.81  2004/03/06 20:26:13  tipaul
 # adding seealso feature in MARC searches
 #

diff --git a/C4/Catalogue.pm b/C4/Catalogue.pm
index 0d7135b..0bc15b0 100644 (file)
--- a/C4/Catalogue.pm
+++ b/C4/Catalogue.pm
@@ -264,7 +264,11 @@ sub modorder {
   $sth->finish;
   $sth=$dbh->prepare("update aqorderbreakdown set bookfundid=? where
   ordernumber=?");
-  $sth->execute($bookfund,$ordnum);
+  if ($sth->execute($bookfund,$ordnum) == 0) { # zero rows affected [Bug 734]
+    $query="insert into aqorderbreakdown (ordernumber,bookfundid) values (?,?)";
+    $sth=$dbh->prepare($query);
+    $sth->execute($ordnum,$bookfund);
+  }
   $sth->finish;
 }
 
@@ -450,11 +454,11 @@ aqorderbreakdown tables of the Koha database.
 sub getsingleorder {
   my ($ordnum)=@_;
   my $dbh = C4::Context->dbh;
-  my $sth=$dbh->prepare("Select * from biblio,biblioitems,aqorders,aqorderbreakdown
+  my $sth=$dbh->prepare("Select * from biblio,biblioitems,aqorders left join aqorderbreakdown
+  on aqorders.ordernumber=aqorderbreakdown.ordernumber
   where aqorders.ordernumber=?
   and biblio.biblionumber=aqorders.biblionumber and
-  biblioitems.biblioitemnumber=aqorders.biblioitemnumber and
-  aqorders.ordernumber=aqorderbreakdown.ordernumber");
+  biblioitems.biblioitemnumber=aqorders.biblioitemnumber");
   $sth->execute($ordnum);
   my $data=$sth->fetchrow_hashref;
   $sth->finish;

diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
index 955e0a2..1502529 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc
@@ -96,7 +96,7 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
                                                <a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&type=intranet" class="submenu2">Add biblio</a>
                                        </td>
                                        <td>
-                                               <a href="/cgi-bin/koha/maint/catmaintain.pl" target="window0" class="submenu">Cat maintenance</a>
+                                               <a href="/cgi-bin/koha/maint/catmaintain.pl" class="submenu">Cat maintenance</a>
                                        </td>
                                </tr>
                        </table>

diff --git a/koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl b/koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl
new file mode 100755 (executable)
index 0000000..07fa795
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl
@@ -0,0 +1,95 @@
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+
+
+<!-- TMPL_IF name=allsub-p -->
+<!-- TMPL_LOOP name=loop -->
+"<a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&sub=<!-- TMPL_VAR name=sub escape=url -->" onclick='messenger("/cgi-bin/koha/maint/catmaintain.pl?type=modsub&sub=<!-- TMPL_VAR name=sub2 escape=url -->");window1.focus()'><!-- TMPL_VAR name=subject escape=html -->"</a><br>
+<!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF name=modsub-p -->
+<form action="/cgi-bin/koha/maint/catmaintain.pl">
+Subject:<input type=text value="<!-- TMPL_VAR name=sub escape=html -->" name=sub size=40><br>
+<input type=hidden name=type value=upsub>
+<input type=hidden name=oldsub value="<!-- TMPL_VAR name=sub escape=html -->">
+<input type=submit value=modify>
+</form>
+<p>This will change the subject headings on all the biblios this subject is applied to.
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF name=upsub-p -->
+Successfully modified <!-- TMPL_VAR name=oldsub escape=html -->
+is now <!-- TMPL_VAR name=sub escape=html -->
+<!-- <![ IGNORE [
+<p><a href="/cgi-bin/koha/maint/catmaintain.pl" onclick="window0.focus()">Back to catalogue maintenance</a><br>
+<a href=nowhere onclick="self.close()">Close this window</a>
+]]> -->
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF name=undel-p -->
+<table border=0>
+<thead>
+<tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
+<tbody>
+<!-- TMPL_LOOP name=loop -->
+<tr>
+<td><!-- TMPL_VAR name=title escape=html --></td>
+<td><!-- TMPL_VAR name=author escape=html --></td>
+<td><a href="/cgi-bin/koha/maint/catmaintain.pl?<!-- TMPL_VAR name=undelete escape=url -->">Undelete</a></td>
+</tr>
+<!-- /TMPL_LOOP -->
+</table>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF name=finun-p -->
+Succesfully undeleted
+<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF name=fixitemtype-p -->
+<form method=post action="/cgi-bin/koha/maint/catmaintain.pl">
+<input type=hidden name=bi value="<!-- TMPL_VAR name=bi escape=html>">
+<input type=hidden name=type value=updatetype>
+Itemtype:<input type=text name=itemtype value="<!-- TMPL_VAR name=item escape=html>"><br>
+<input type=submit value=Change>
+</form>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF name=updatetype-p -->
+Updated successfully
+<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF name=mainmenu-p -->
+<B>Subject Maintenance</b><br>
+<form action="/cgi-bin/koha/maint/catmaintain.pl" method=post>
+<input type=hidden name=type value=allsub>
+Show all subjects beginning with <input type=text name=sub><br>
+<input type=submit value=Show>
+</form>
+<p>
+<B>Group Maintenance</b></br>
+<form action="/cgi-bin/koha/search.pl" method=post>
+<input type=hidden name=type value=catmain>
+Show all Titles beginning with <input type=text name=title><br>
+Item Number <INPUT TYPE="text" SIZE="25" NAME="item"><br>
+<input type=submit value=Show>
+</form>
+<p>
+<B>Undelete Biblio</b></br>
+<form action="/cgi-bin/koha/maint/catmaintain.pl" method=post>
+<input type=hidden name=type value=undel>
+Show all Titles beginning with <input type=text name=title><br>
+<input type=submit value=Show>
+</form>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

diff --git a/maint/catmaintain.pl b/maint/catmaintain.pl
index 51671c8..f29b1c8 100755 (executable)
--- a/maint/catmaintain.pl
+++ b/maint/catmaintain.pl
@@ -24,94 +24,82 @@
 
 use strict;
 use CGI;
+use C4::Auth;
 use C4::Output;
+use C4::Interface::CGI::Output;
 use C4::Maintainance;
+use HTML::Template;
 
 my $input = new CGI;
-print $input->header;
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name   => 'maint/catmaintain.tmpl',
+                             query           => $input,
+                             type            => 'intranet',
+                             authnotrequired => 0,
+                             flagsrequired   => {catalogue => 1},
+                             debug           => 1,
+                             });
+
+my %params = ();
+
+
 my $type=$input->param('type');
-print startpage();
-print startmenu('catalog');
 my $blah;
 my $num=0;
 my $offset=0;
 if ($type eq 'allsub'){
   my $sub=$input->param('sub');
   my ($count,$results)=listsubjects($sub,$num,$offset);
+  my @it = ();
   for (my $i=0;$i<$count;$i++){
     my $sub2=$results->[$i]->{'subject'};
-    $sub2=~ s/ /%20/g;
-      $sub2=~ s/\'/%27/g;
-    print "\"<a href=\"/cgi-bin/koha/maint/catmaintain.pl?type=allsub&sub=$sub\" onclick=\'messenger(\"/cgi-bin/koha/maint/catmaintain.pl?type=modsub&sub=$sub2\");window1.focus()\'>$results->[$i]->{'subject'}\"</a><br>\n";
+    push @it, {'sub2' => $sub2, 'subject' => $results->[$i]->{'subject'}};
   }
+  %params = ('sub' => $sub, 'loop' => \@it);
+
 } elsif ($type eq 'modsub'){
-  my $sub=$input->param('sub');
-  print "<form action=/cgi-bin/koha/maint/catmaintain.pl>";
-  print "Subject:<input type=text value=\"$sub\" name=sub size=40><br>\n";
-  print "<input type=hidden name=type value=upsub>";
-  print "<input type=hidden name=oldsub value=\"$sub\">";
-  print "<input type=submit value=modify>";
-#  print "<a href=\"nowhere\" onclick=\"document.forms[0].submit();\">Modify</a>";
-  print "</form>";
-  print "<p> This will change the subject headings on all the biblios this subject is applied to"
+  %params = ('sub' => $input->param('sub'));
+
 } elsif ($type eq 'upsub'){
   my $sub=$input->param('sub');
   my $oldsub=$input->param('oldsub');
   updatesub($sub,$oldsub);
-  print "Successfully modified $oldsub is now $sub";
-  print "<p><a href=/cgi-bin/koha/maint/catmaintain.pl target=window0 onclick=\"window0.focus()\">Back to catalogue maintenance</a><br>";
-  print "<a href=nowhere onclick=\"self.close()\">Close this window</a>";
+  %params = ('sub' => $sub, 'oldsub' => $oldsub);
+
 } elsif ($type eq 'undel'){
   my $title=$input->param('title');
   my ($count,$results)=deletedbib($title);
-  print "<table border=0>";
-  print "<tr><td><b>Title</b></td><td><b>Author</b></td><td><b>Undelete</b></td></tr>";
+  my @it = ();
   for (my $i=0;$i<$count;$i++){
-    print "<tr><td>$results->[$i]->{'title'}</td><td>$results->[$i]->{'author'}</td><td><a href=/cgi-bin/koha/maint/catmaintain.pl?type=finun&bib=$results->[$i]->{'biblionumber'}>Undelete</a></td>\n";
+    push @it, {
+       'title'    => $results->[$i]->{'title'},
+       'author'   => $results->[$i]->{'author'},
+       'undelete' => "type=finun&bib=$results->[$i]->{'biblionumber'}",
+      };
   }
-  print "</table>";
+  %params = ('loop' => \@it);
+
 } elsif ($type eq 'finun'){
   my $bib=$input->param('bib');
   undeletebib($bib);
-  print "Succesfully undeleted";
-  print "<p><a href=/cgi-bin/koha/maint/catmaintain.pl>Back to Catalogue Maintenance</a>";
+
 } elsif ($type eq 'fixitemtype'){
   my $bi=$input->param('bi');
   my $item=$input->param('item');
-  print "<form method=post action=/cgi-bin/koha/maint/catmaintain.pl>";
-  print "<input type=hidden name=bi value=$bi>";
-  print "<input type=hidden name=type value=updatetype>";
-  print "Itemtype:<input type=text name=itemtype value=$item><br>\n";
-  print "<input type=submit value=Change>";
-  print "</form>";
+  %params = ('bi' => $bi, 'item' => $item);
+
 } elsif ($type eq 'updatetype'){
   my $bi=$input->param('bi');
   my $itemtype=$input->param('itemtype');
   updatetype($bi,$itemtype);
-  print "Updated successfully";
-  print "<p><a href=/cgi-bin/koha/maint/catmaintain.pl>Back to Catalogue Maintenance</a>";
+
 } else {
-  print "<B>Subject Maintenance</b><br>";
-  print "<form action=/cgi-bin/koha/maint/catmaintain.pl method=post>";
-  print "<input type=hidden name=type value=allsub>";
-  print "Show all subjects beginning with <input type=text name=sub><br>";
-  print "<input type=submit value=Show>";
-  print "</form>";
-  print "<p>";
-  print "<B>Group Maintenance</b></br>";
-  print "<form action=/cgi-bin/koha/search.pl method=post>";
-  print "<input type=hidden name=type value=catmain>";
-  print "Show all Titles beginning with <input type=text name=title><br>";
-  print "Item Number <INPUT TYPE=\"text\"  SIZE=\"25\"   NAME=\"item\"><br>";
-  print "<input type=submit value=Show>";
-  print "</form>";
-  print "<p>";
-  print "<B>Undelete Biblio</b></br>";
-  print "<form action=/cgi-bin/koha/maint/catmaintain.pl method=post>";
-  print "<input type=hidden name=type value=undel>";
-  print "Show all Titles beginning with <input type=text name=title><br>";
-  print "<input type=submit value=Show>";
-  print "</form>";
+  $type = 'mainmenu'; # NOTE
+
 }
-print endmenu('catalog');
-print endpage();
+
+$template->param(type => 'intranet',
+                "$type-p" => 1,
+                 %params);
+
+output_html_with_http_headers $input, $cookie, $template->output;

diff --git a/misc/translator/intranet.zh_TW b/misc/translator/intranet.zh_TW
index 252145c..6cc2978 100644 (file)
--- a/misc/translator/intranet.zh_TW
+++ b/misc/translator/intranet.zh_TW
@@ -23,7 +23,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Koha INTRANET 2.1cvs\n"
-"POT-Creation-Date: 2004-02-29 19:22-0500\n"
+"POT-Creation-Date: 2004-03-07 00:14-0500\n"
 "PO-Revision-Date: 2004-02-23 17:20-0500\n"
 "Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -31,6 +31,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. %1$s: TMPL_VAR name=subject
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:6
+#, c-format
+msgid "\"<a1>%s\"</a>"
+msgstr "\"<a1>%s\"</a>"
+
 #  NOTE = Replacement Cost (after tax)
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:14
 msgid "$ rrp"
@@ -590,9 +596,8 @@ msgid "&nbsp; &nbsp; - - Year to Date"
 msgstr "　　- 全年累積"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc:197
-#, fuzzy
 msgid "&nbsp; &nbsp; - Accept Delivery"
-msgstr "　　- 移除"
+msgstr "　　- 收貨"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc:126
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc:137
@@ -2247,6 +2252,7 @@ msgstr "容許值"
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:304
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:16
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:35
 msgid "Author"
 msgstr "著者"
 
@@ -2337,6 +2343,11 @@ msgstr "預算案及書籍採購資金"
 msgid "Back"
 msgstr "返回"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:50
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:66
+msgid "Back to Catalogue Maintenance"
+msgstr "返回目錄維護"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/marcimport.tmpl:18
 msgid "Back to acquisition"
 msgstr "返回採購模組"
@@ -2759,6 +2770,11 @@ msgid "Category: %s"
 msgstr "類別：%s"
 
 #. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:59
+msgid "Change"
+msgstr "修改"
+
+#. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:86
 msgid "Change Password"
 msgstr "修改密碼"
@@ -2980,17 +2996,15 @@ msgstr "數量"
 msgid "Copyright"
 msgstr "版權"
 
-# FIXME This is likely WRONG
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:91
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:49
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbib.tmpl:26
 msgid "Copyright Date"
-msgstr "版權日期"
+msgstr "著作年份"
 
-# FIXME This is likely WRONG
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio-nomarc.tmpl:38
 msgid "Copyright Date:"
-msgstr "版權日期："
+msgstr "著作年份："
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:33
@@ -3306,8 +3320,8 @@ msgid ""
 "Each box needs to be filled in with fine,time to start charging,charging "
 "cycle"
 msgstr ""
-"每欄須填寫罰款金額、過多少日開始計算罰款、以及每隔多少日罰款一次。"
-"ä¸\89å\80\8bæ\95¸å­\97é \88以å\8d\8aå½¢é\80\97è\99\9få\88\86é\9a\94ã\80\82"
+"每欄須填寫罰款金額、過多少日開始計算罰款、以及每隔多少日罰款一次。三個數字須"
+"以半形逗號分隔。"
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-class-list.inc:5
@@ -3648,6 +3662,10 @@ msgstr "Glen Stewart"
 msgid "Go"
 msgstr "執行"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:78
+msgid "Group Maintenance"
+msgstr "群組維護"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl:101
 msgid "Group:"
 msgstr "群組："
@@ -3814,16 +3832,15 @@ msgid ""
 "If an ISBN already exists in the breeding farm, you can choose whether to "
 "ignore the new one or overwrite the old one."
 msgstr ""
-"假如國際標準書號已在Breeding Farm之內，您可選擇忽略新的書目記錄，"
-"也可選擇覆蓋原有的那個記錄。"
+"假如國際標準書號已在Breeding Farm之內，您可選擇忽略新的書目記錄，也可選擇覆蓋"
+"原有的那個記錄。"
 
 #  NOTE 譯文更動 by Arthur
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl:25
 msgid ""
 "If the ISBN or title is found in the biblio table, it will be retrieved and "
 "can be modified."
-msgstr ""
-"如果國際標準書號已在書目表內，書目記錄將被取出，您可修改這些書目記錄。"
+msgstr "如果國際標準書號已在書目表內，書目記錄將被取出，您可修改這些書目記錄。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbooks.tmpl:26
 msgid ""
@@ -4016,6 +4033,10 @@ msgstr "數量"
 msgid "Item Location (items.bulk) between"
 msgstr "圖書資料位於 (items.bulk) "
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:82
+msgid "Item Number"
+msgstr "圖書資料號碼"
+
 #. %1$s: TMPL_VAR name=barcode
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl:12
 #, c-format
@@ -4116,6 +4137,10 @@ msgstr "圖書資料"
 msgid "Itemtype"
 msgstr "圖書資料類別"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:58
+msgid "Itemtype:"
+msgstr "圖書資料類別："
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:49
 msgid "Jo Ransom"
 msgstr "Jo Ransom"
@@ -5156,7 +5181,7 @@ msgstr "訂單詳情"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:15
 msgid "OS version (from 'uname -a'):"
-msgstr "作業系統版本 (經由 uname -a 取得)："
+msgstr "作業系統版本<br>(經由 uname -a 取得)："
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc:275
 msgid "OTHER"
@@ -5703,8 +5728,8 @@ msgid ""
 "search. Type a borrower name, part of a name, or number in the field above "
 "and hit the enter key to activate search"
 msgstr ""
-"續借圖書資料、登記新讀者、或給現有的讀者更新或刪除記錄，統統都由這個查詢開始。在"
-"上列空格內輸入讀者姓名、姓名的一部分、或借書證編號，再按輸入鍵即可。"
+"續借圖書資料、登記新讀者、或給現有的讀者更新或刪除記錄，統統都由這個查詢開"
+"始。在上列空格內輸入讀者姓名、姓名的一部分、或借書證編號，再按輸入鍵即可。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:145
 msgid "Renewable"
@@ -6049,8 +6074,8 @@ msgid ""
 "Select a file to import into the breeding farm. It will be parsed, and for "
 "each ISBN found, a new baby will be created in the breeding farm."
 msgstr ""
-"請選擇希望匯入Breeding Farm之檔案。系統將會分析檔案，凡是找到有國際標準書號的記錄，"
-"系統會在Breeding Farm內建立相應的新書目。"
+"請選擇希望匯入Breeding Farm之檔案。系統將會分析檔案，凡是找到有國際標準書號的"
+"記錄，系統會在Breeding Farm內建立相應的新書目。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptMarcUpload.tmpl:3
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/uploadmarc.tmpl:7
@@ -6122,8 +6147,8 @@ msgid ""
 "purchased locally or gifted. In this case the quantity \"ordered\" will also "
 "be entered into the database as the quantity received."
 msgstr ""
-"如有已購買或獲贈之圖書資料，可用有底色之欄位做個「快速」採購，"
-"è³\87æ\96\99庫å\85§ç\9a\84ã\80\8cè¨\82è³¼ã\80\8dæ\95¸é\87\8få°\87被設æ\88\90è·\9fæ\89\80æ\94¶æ\95¸é\87\8fç\9b¸å\90\8cã\80\82"
+"如有已購買或獲贈之圖書資料，可用有底色之欄位做個「快速」採購，資料庫內的「訂"
+"購」數量將被設成跟所收數量相同。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:118
 msgid "Shelf List"
@@ -6142,6 +6167,23 @@ msgstr "虛擬書架一覽"
 msgid "Shopping Basket For: %s"
 msgstr "%s 的購物藍"
 
+# FIXME Strictly speaking untranslatable. Arguably a template bug, but difficult to fix
+#. INPUT type=submit
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:75
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:90
+msgid "Show"
+msgstr "顯示"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:81
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:89
+msgid "Show all Titles beginning with"
+msgstr ""
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:74
+msgid "Show all subjects beginning with"
+msgstr ""
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:54
 msgid "Sir"
 msgstr "爵士"
@@ -6260,6 +6302,14 @@ msgstr "主題"
 msgid "Subject Headings:"
 msgstr "主題標目："
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:71
+msgid "Subject Maintenance"
+msgstr "主題維護"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:13
+msgid "Subject:"
+msgstr "主題："
+
 # NOTE 譯文更動 by Arthur
 #. INPUT type=submit name=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/newmember.tmpl:226
@@ -6277,6 +6327,17 @@ msgstr "副題"
 msgid "Subtitle:"
 msgstr "副題："
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:49
+msgid "Succesfully undeleted"
+msgstr ""
+
+#. %1$s: TMPL_VAR name=oldsub
+#. %2$s: TMPL_VAR name=sub
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:23
+#, c-format
+msgid "Successfully modified %s is now %s"
+msgstr ""
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:14
 msgid "Sundry"
 msgstr "雜項"
@@ -6471,8 +6532,7 @@ msgstr "下列的欄位含不容許的值。請您按瀏覽器的「往後」(Ba
 msgid ""
 "The total at the bottom of the page should be within a few cents of the "
 "total for the invoice."
-msgstr ""
-"這頁最底下所列出的總額，和發票上所列出者，差別應該在只在幾分錢以內。"
+msgstr "這頁最底下所列出的總額，和發票上所列出者，差別應該在只在幾分錢以內。"
 
 #  TODO 譯文有待改進
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:108
@@ -6550,12 +6610,17 @@ msgstr ""
 msgid "This type only : <b>%s %s</b>"
 msgstr "只此類別 : <b>%s %s</b>"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:18
+msgid ""
+"This will change the subject headings on all the biblios this subject is "
+"applied to."
+msgstr ""
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl:71
 msgid ""
 "Tick ALL barcodes that changes are to apply too. Those left un-ticked will "
 "keep the original group record."
-msgstr ""
-"請點選需要修改的圖書資料的條碼。不被點選者將維持原有的群組記錄。"
+msgstr "請點選需要修改的圖書資料的條碼。不被點選者將維持原有的群組記錄。"
 
 # NOTE Please make sure "Title" only means book title; use "Salutation" for personal titles
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbasket.tmpl:20
@@ -6581,6 +6646,7 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:304
 #: ../../koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl:15
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:35
 msgid "Title"
 msgstr "題名"
 
@@ -6619,8 +6685,7 @@ msgstr "新增書目或圖書資料，掃描或輸入ISBN/ISSN即可："
 msgid ""
 "To change any of the catalogue or accounting information attached to an "
 "order, click on the title."
-msgstr ""
-"修改任何書目或會計方面的訂單資料，按一按圖書資料的題名即可。"
+msgstr "修改任何書目或會計方面的訂單資料，按一按圖書資料的題名即可。"
 
 #  XXX 根本沒有「confirm basket」按鈕，暫時不要理會這個字串
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:110
@@ -6737,6 +6802,15 @@ msgstr "UNIMARC 欄 700-4 建立程序"
 msgid "URL"
 msgstr "網址"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:41
+msgid "Undelete"
+msgstr "反移除"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:86
+msgid "Undelete Biblio"
+msgstr "反移除書目"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/modbib.tmpl:42
 msgid "Unititle"
 msgstr "劃一題名"
@@ -6750,6 +6824,10 @@ msgstr "更新讀者的個人資料"
 msgid "Update this Website Link"
 msgstr "更新這個網站的連結"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:65
+msgid "Updated successfully"
+msgstr ""
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl:25
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptMarcUpload.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/ListFileRecords.tmpl:5
@@ -6931,9 +7009,8 @@ msgid ""
 "subfield is not entered through a free field, but though a list of "
 "authorised values."
 msgstr ""
-"當您定義機讀格式的分欄結構時，您可以把分欄連結至一個容許值類別；"
-"當有使用者新增或修改書目時，這個分欄就不以自由形態輸入，"
-"而是由容許值的列表選取。"
+"當您定義機讀格式的分欄結構時，您可以把分欄連結至一個容許值類別；當有使用者新"
+"增或修改書目時，這個分欄就不以自由形態輸入，而是由容許值的列表選取。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:65
 msgid "When you have finished this invoice save the changes."
@@ -7377,6 +7454,7 @@ msgstr "登入"
 #. INPUT type=image name=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:28
 #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:16
 msgid "modify"
 msgstr "修改"