Make the page headings translatable while trying not to break old templates

diff --git a/admin/aqbookfund.pl b/admin/aqbookfund.pl
index 29e626b..3c099d6 100755 (executable)
--- a/admin/aqbookfund.pl
+++ b/admin/aqbookfund.pl
@@ -83,10 +83,10 @@ my ($template, $borrowernumber, $cookie)
 
 if ($op) {
 $template->param(script_name => $script_name,
-                                               $op              => 1); # we show only the TMPL_VAR names $op
+               $op              => 1); # we show only the TMPL_VAR names $op
 } else {
 $template->param(script_name => $script_name,
-                                               else              => 1); # we show only the TMPL_VAR names $op
+               else              => 1); # we show only the TMPL_VAR names $op
 }
 $template->param(action => $script_name);
 
@@ -106,10 +106,13 @@ if ($op eq 'add_form') {
            }
        if ($bookfundid) {
            $header = "Modify book fund";
+           $template->param('header-is-modify-p' => 1);
        } else {
            $header = "Add book fund";
+           $template->param('header-is-add-p' => 1);
        }
-       $template->param(header => $header);
+       $template->param('use-header-flags-p' => 1);
+       $template->param(header => $header); # NOTE deprecated
        my $add_or_modify=0;
        if ($bookfundid) {
            $add_or_modify=1;

diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index cd735a8..9faa930 100755 (executable)
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -87,11 +87,15 @@ if ($op eq 'add_form') {
        }
        if ($searchfield) {
                $template->param(action => "Modify authorised value");
+               $template->param('heading-modify-authorized-value-p' => 1);
        } elsif ( ! $data->{'category'} ) {
                $template->param(action => "Add new category");
+               $template->param('heading-add-new-category-p' => 1);
        } else {
                $template->param(action => "Add authorised value");
+               $template->param('heading-add-authorized-value-p' => 1);
        }
+       $template->param('use-heading-flags-p' => 1);
        $template->param(category => $data->{'category'},
                                                        authorised_value => $data->{'authorised_value'},
                                                        lib => $data->{'lib'},

diff --git a/admin/branches.pl b/admin/branches.pl
index 808f19a..b2cde60 100755 (executable)
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -10,13 +10,18 @@
 #        TMPL_LOOP'ized; doing this properly will fix bug 130; need to
 #        notify translators
 # FIXME: need to implement the branch categories stuff
-# FIXME: heading() need to be moved to templates, need to notify translators
 # FIXME: there are too many TMPL_IF's; the proper way to do it is to have
 #        separate templates for each individual action; need to notify
 #        translators
 # FIXME: there are lots of error messages exported to the template; a lot
 #        of these should be converted into exported booleans / counters etc
 #        so that the error messages can be localized; need to notify translators
+#
+# NOTE:  heading() should now be called like this:
+#        1. Use heading() as before
+#        2. $template->param('heading-LISPISHIZED-HEADING-p' => 1);
+#        3. $template->param('use-heading-flags-p' => 1);
+#        This ensures that both converted and unconverted templates work
 
 # Finlay working on this file from 26-03-2002
 # Reorganising this branches admin page.....
@@ -81,11 +86,15 @@ $template->param(action => $script_name);
 if ($op eq 'add') {
        # If the user has pressed the "add new branch" button.
        heading("Branches: Add Branch");
+       $template->param('heading-branches-add-branch-p' => 1);
+       $template->param('use-heading-flags-p' => 1);
        editbranchform();
 
 } elsif ($op eq 'edit') {
        # if the user has pressed the "edit branch settings" button.
        heading("Branches: Edit Branch");
+       $template->param('heading-branches-edit-branch-p' => 1);
+       $template->param('use-heading-flags-p' => 1);
        $template->param(add => 1);
        editbranchform($branchcode);
 } elsif ($op eq 'add_validate') {
@@ -114,8 +123,10 @@ if ($op eq 'add') {
        $template->param(else => 1);
        default("The branch with code $branchcode has been deleted.");
 } elsif ($op eq 'editcategory') {
-       # If the user has pressed the "add new category" button.
+       # If the user has pressed the "add new category" or "modify" buttons.
        heading("Branches: Edit Category");
+       $template->param('heading-branches-edit-category-p' => 1);
+       $template->param('use-heading-flags-p' => 1);
        editcatform($categorycode);
 } elsif ($op eq 'addcategory_validate') {
        # confirm settings change...
@@ -157,6 +168,8 @@ if ($op eq 'add') {
 sub default {
        my ($message) = @_;
        heading("Branches");
+       $template->param('heading-branches-p' => 1);
+       $template->param('use-heading-flags-p' => 1);
        $template->param(message => $message);
        $template->param(action => $script_name);
        branchinfotable();

diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index 2564e85..53558fd 100755 (executable)
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -101,10 +101,13 @@ if ($op eq 'add_form') {
        if ($searchfield) {
                $template->param(action => "Modify tag",
                                                                searchfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$searchfield\" />$searchfield");
+               $template->param('heading-modify-tag-p' => 1);
        } else {
                $template->param(action => "Add tag",
                                                                searchfield => "<input type=\"text\" name=\"tagfield\" size=\"5\" maxlength=\"3\" />");
+               $template->param('heading-add-tag-p' => 1);
        }
+       $template->param('use-heading-flags-p' => 1);
        $template->param(liblibrarian => $data->{'liblibrarian'},
                                                        libopac => $data->{'libopac'},
                                                        repeatable => CGI::checkbox('repeatable',$data->{'repeatable'}?'checked':'',1,''),

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl
index ee328d2..09c2ac1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl
@@ -101,7 +101,14 @@
                }
        }
        </SCRIPT>
-<h1><!-- TMPL_VAR name="header" --></h1>
+<h1>
+<!-- TMPL_IF name=use-header-flags-p -->
+<!-- TMPL_IF name=header-is-add-p -->Add book fund<!-- /TMPL_IF -->
+<!-- TMPL_IF name=header-is-modify-p -->Modify book fund<!-- /TMPL_IF -->
+<!-- TMPL_ELSE -->
+<!-- TMPL_VAR name="header" -->
+<!-- /TMPL_IF -->
+</h1>
 <form action='<!-- TMPL_VAR name="action" -->' name=Aform method=post>
 <input type=hidden name=op value='add_validate'>
 <input type=hidden name=checked value=0>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl
index e09f770..ad16b8b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl
@@ -2,7 +2,13 @@
 
 <!-- TMPL_IF name="add_form" -->
 <!---------------------------------------------------------------------------->
-       <H1><!-- TMPL_VAR name="action" --></H1>
+       <H1>
+       <!-- TMPL_IF NAME="use-heading-flags-p" -->
+       <!-- TMPL_IF NAME="heading-modify-authorized-value-p" -->Modify authorised value<!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="heading-add-new-category-p" -->Add new category<!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="heading-add-authorized-value-p" -->Add authorised value<!-- /TMPL_IF -->
+       <!-- TMPL_ELSE --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+       </H1>
        <form action='<!-- TMPL_VAR name="script_name" -->' name=Aform method=post>
        <input type=hidden name=op value='add_validate'>
        <table>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
index 0e1c9b5..eb90dbc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl
@@ -2,7 +2,15 @@
 
 <!-- TMPL_IF NAME="add" -->
 
-<h1><!-- TMPL_VAR NAME="head" --></h1><br>
+<h1>
+<!-- TMPL_IF NAME="use-heading-flags-p" -->
+<!-- TMPL_IF NAME="heading-branches-p" -->Branches<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="heading-branches-add-branch-p" -->Branches: Add Branch<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="heading-branches-edit-branch-p" -->Branches: Edit Branch<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="heading-branches-edit-category-p" -->Branches: Edit Category<!-- /TMPL_IF -->
+<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="head" --><!-- /TMPL_IF -->
+</h1>
+
 <form action="<!-- TMPL_VAR NAME="action" -->" name="Aform" method="post">
 <input type="hidden" name="op" value="add_validate">
 <table>
@@ -76,7 +84,15 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="else" -->
-       <h1><!-- TMPL_VAR NAME="head" --></h1><br>
+       <h1>
+       <!-- TMPL_IF NAME="use-heading-flags-p" -->
+       <!-- TMPL_IF NAME="heading-branches-p" -->Branches<!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="heading-branches-add-branch-p" -->Branches: Add Branch<!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="heading-branches-edit-branch-p" -->Branches: Edit Branch<!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="heading-branches-edit-category-p" -->Branches: Edit Category<!-- /TMPL_IF -->
+       <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="head" --><!-- /TMPL_IF -->
+       </h1>
+
        <font color="red"><!-- TMPL_VAR NAME="message" --></font>
        <table border="1" cellpadding="5" cellspacing="0">
                <tr>
@@ -188,7 +204,15 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="editcategory" -->
-       <h1><!-- TMPL_VAR NAME="head" --></h1><br>
+       <h1>
+       <!-- TMPL_IF NAME="use-heading-flags-p" -->
+       <!-- TMPL_IF NAME="heading-branches-p" -->Branches<!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="heading-branches-add-branch-p" -->Branches: Add Branch<!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="heading-branches-edit-branch-p" -->Branches: Edit Branch<!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="heading-branches-edit-category-p" -->Branches: Edit Category<!-- /TMPL_IF -->
+       <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="head" --><!-- /TMPL_IF -->
+       </h1>
+
        <form action="<!-- TMPL_VAR NAME="action" -->" name="Aform" method="post">
        <input type="hidden" name="op" value="addcategory_validate">
        <table>

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
index 3e41786..5a3501a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
@@ -54,7 +54,12 @@
 
 <!-- TMPL_IF name="add_form" -->
 <!---------------------------------------------------------------------------->
-       <H1><!-- TMPL_VAR name="action" --></H1>
+       <h1>
+       <!-- TMPL_IF NAME="use-heading-flags-p" -->
+       <!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF -->
+       <!-- TMPL_ELSE --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+       </h1>
        <form action='<!-- TMPL_VAR name="script_name" -->' name="Aform" method="post">
        <input type=hidden name=op value='add_validate'>
        <table>

diff --git a/misc/translator/intranet.zh_TW b/misc/translator/intranet.zh_TW
index d0b66a6..bf1b69b 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-03-10 02:48-0500\n"
+"POT-Creation-Date: 2004-03-11 00:44-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"
@@ -242,7 +242,7 @@ msgstr "%s (%s) %s"
 
 #  TODO 暫譯，譯文有待改進
 #. %1$s: TMPL_VAR name=authorised_value
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:71
 #, c-format
 msgid ""
 "%s (if you select a value here, the indicators will be limited to the "
@@ -854,11 +854,11 @@ msgstr "(如適用)"
 msgid "(leave blank to export every biblio)"
 msgstr "(如欲匯出所有書目，請留空此欄)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:119
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:135
 msgid "(no categories set)"
 msgstr "(沒有設定類別)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:101
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:117
 msgid "(nothing entered)"
 msgstr "(沒有輸入)"
 
@@ -1776,7 +1776,7 @@ msgid "Add"
 msgstr "新增"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:99
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:105
 msgid "Add Authorised value"
 msgstr "新增容許值"
 
@@ -1809,12 +1809,12 @@ msgid "Add New Biblio"
 msgstr "新增書目"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:145
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:161
 msgid "Add New Branch"
 msgstr "新增分館"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:186
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:202
 msgid "Add New Category"
 msgstr "新增類別"
 
@@ -1863,7 +1863,7 @@ msgid "Add System preference"
 msgstr "新增系統偏好"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:133
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:138
 msgid "Add Tag"
 msgstr "新增欄"
 
@@ -1898,10 +1898,14 @@ msgid "Add another Website Link"
 msgstr "新增網站連結"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:99
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:105
 msgid "Add authorised Value"
 msgstr "新增容許值"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:9
+msgid "Add authorised value"
+msgstr "新增容許值"
+
 #. INPUT type=button
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/isbnsearch.tmpl:83
@@ -1909,6 +1913,10 @@ msgstr "新增容許值"
 msgid "Add biblio"
 msgstr "新增書目"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:106
+msgid "Add book fund"
+msgstr "新增書籍採購資金"
+
 #. IMG
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:26
 msgid "Add budget"
@@ -1955,6 +1963,10 @@ msgstr "新增讀者"
 msgid "Add new Institution"
 msgstr "新增機構"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:8
+msgid "Add new category"
+msgstr "新增類別"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:135
 msgid "Add or Remove Book Shelves"
 msgstr "新增或移除虛擬書架"
@@ -1978,6 +1990,10 @@ msgstr "新增打印機"
 msgid "Add supplier"
 msgstr "新增供應商"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:60
+msgid "Add tag"
+msgstr "新增欄"
+
 #. INPUT type=image
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:31
 msgid "Add thesaurus entry"
@@ -2018,8 +2034,8 @@ msgid "Additional authors"
 msgstr "附加著者"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:19
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:35
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:43
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:106
 msgid "Address"
 msgstr "地址"
 
@@ -2162,13 +2178,13 @@ msgid "Author:"
 msgstr "著者："
 
 #  NOTE 下文為「Value」，全文為「Authorised Value」(^^;)
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:114
 msgid "Authorised"
 msgstr "容許"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:14
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:61
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:20
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:67
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:71
 msgid "Authorised value"
 msgstr "容許值"
 
@@ -2180,7 +2196,7 @@ msgstr "容許值或"
 msgid "Authorised values"
 msgstr "容許值"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:57
 msgid "Authorised values admin"
 msgstr "容許值管理"
 
@@ -2326,9 +2342,9 @@ msgid "Bold fields must be filled in to create a new bibilo and item."
 msgstr "新增書目記錄及圖書資料，必須輸入所有粗體欄位。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:11
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:110
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:112
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:129
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:117
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:119
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:136
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:87
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:116
@@ -2408,7 +2424,7 @@ msgstr "讀者號碼"
 msgid "Branch"
 msgstr "分館"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:10
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:18
 msgid "Branch code"
 msgstr "分館編號"
 
@@ -2427,14 +2443,35 @@ msgstr "館別："
 msgid "Branch: %s"
 msgstr "分館：%s"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:84
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:7
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:89
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:100
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:209
 msgid "Branches"
 msgstr "分館"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:168
 msgid "Branches Categories"
 msgstr "分館類別"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:8
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:210
+msgid "Branches: Add Branch"
+msgstr "分館：新增分館"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:9
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:211
+msgid "Branches: Edit Branch"
+msgstr "分館：修改分館"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:10
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:92
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:212
+msgid "Branches: Edit Category"
+msgstr "分館：修改分館類別"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:68
 msgid "Brig C. McCoy"
 msgstr "Brig C. McCoy"
@@ -2523,11 +2560,11 @@ msgstr "子女 %s"
 msgid "COMPANY DETAILS"
 msgstr "公司詳情"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:132
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:139
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:135
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:44
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:50
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:56
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:87
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:97
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:225
@@ -2648,13 +2685,13 @@ msgstr "目錄"
 msgid "Catalogue Search"
 msgstr "館藏查詢"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:91
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:107
 msgid "Categories"
 msgstr "類別"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:10
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:60
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:16
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:66
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:46
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:256
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:263
@@ -2666,7 +2703,7 @@ msgstr "類別"
 msgid "Category admin"
 msgstr "類別管理"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:196
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:220
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:76
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:84
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:167
@@ -2828,8 +2865,8 @@ msgstr "按<a1>這裏</a>查看讀者資料。"
 msgid "Click submit to force the subject"
 msgstr "要強迫修改主題，按「遞交」即可"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:89
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:157
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:105
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:173
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:143
 msgid "Code"
 msgstr "編碼"
@@ -2872,8 +2909,8 @@ msgstr "確認密碼"
 msgid "Confirm Record"
 msgstr "請核對記錄"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:67
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:222
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:75
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:246
 msgid "Confirm delete:"
 msgstr "請確認移除："
 
@@ -2982,10 +3019,10 @@ msgid ""
 "Data about the current version of Koha for bug reports (or general interest)."
 msgstr "有關這個Koha版本的資料 (報告錯誤用的資訊以及其他一般的資訊)："
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:145
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:144
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:62
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:88
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:93
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:105
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:236
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:243
@@ -2996,7 +3033,7 @@ msgstr "有關這個Koha版本的資料 (報告錯誤用的資訊以及其他一
 msgid "Data deleted"
 msgstr "資料已移除"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:121
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:128
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:106
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:82
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:155
@@ -3091,12 +3128,12 @@ msgstr "移除"
 
 #. INPUT type=submit
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:82
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:136
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:177
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:152
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:193
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:14
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:64
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:70
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:85
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:117
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:132
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:21
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:121
@@ -3132,8 +3169,8 @@ msgstr ""
 #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:19
 #: ../../koha-tmpl/intranet-tmpl/default/en/modwebsites.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/default/en/modwebsites.tmpl:39
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:158
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:211
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:174
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:235
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:79
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:124
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:144
@@ -3212,7 +3249,7 @@ msgstr "應歸還日期"
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl:78
 #: ../../koha-tmpl/intranet-tmpl/default/en/newimember.tmpl:105
 #: ../../koha-tmpl/intranet-tmpl/default/en/newmember.tmpl:157
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:63
 msgid "E-mail"
 msgstr "電郵"
 
@@ -3267,11 +3304,11 @@ msgid "Ed Summers"
 msgstr "Ed Summers"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:88
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:130
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:171
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:146
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:187
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:13
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:63
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:111
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:69
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:116
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:131
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:120
@@ -3297,7 +3334,7 @@ msgid "Email"
 msgstr "電郵"
 
 #. %1$s: TMPL_VAR name=branchemail
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:114
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:130
 #, c-format
 msgid "Email: %s"
 msgstr "電郵：%s"
@@ -3423,14 +3460,14 @@ msgstr "旗標"
 #: ../../koha-tmpl/intranet-tmpl/default/en/newmember.tmpl:149
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl:83
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:126
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:51
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:59
 msgid "Fax"
 msgstr "傳真"
 
 #. For the first occurrence,
 #. %1$s: TMPL_VAR name=faxnumber
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:22
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:112
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:128
 #, c-format
 msgid "Fax: %s"
 msgstr "傳真：%s"
@@ -4289,16 +4326,16 @@ msgstr "最近出現"
 msgid "Last seen at branch"
 msgstr "最近出現在分館"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:18
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:36
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:62
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:24
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:42
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:68
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:169
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:77
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:106
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:111
 msgid "Lib"
 msgstr "說明"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:62
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:67
 msgid "Lib for librarians"
 msgstr "給圖書館員的說明"
 
@@ -4306,7 +4343,7 @@ msgstr "給圖書館員的說明"
 msgid "Lib for librarians / for opac"
 msgstr "給圖書館員 / 大眾的說明"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:63
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:68
 msgid "Lib for opac"
 msgstr "給大眾的說明"
 
@@ -4441,7 +4478,7 @@ msgstr "%s 之機讀格式分欄結構管理"
 msgid "MARC tag structure"
 msgstr "機讀格式欄位結構"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:96
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:101
 msgid "MARC tag structure admin"
 msgstr "機讀格式欄位結構管理"
 
@@ -4516,8 +4553,8 @@ msgstr "同義字典及權威檔案的管理"
 msgid "Mand"
 msgstr "必備"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:65
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:108
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:70
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:113
 msgid "Mandatory"
 msgstr "必備"
 
@@ -4697,6 +4734,14 @@ msgstr "修改Z39.50伺服器"
 msgid "Modify a system preference"
 msgstr "修改系統偏好"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:7
+msgid "Modify authorised value"
+msgstr "修改容許值"
+
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:107
+msgid "Modify book fund"
+msgstr "修改書籍採購資金"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:64
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:63
 msgid "Modify category"
@@ -4719,6 +4764,10 @@ msgstr "修改圖書資料類別"
 msgid "Modify printer"
 msgstr "修改打印機"
 
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:59
+msgid "Modify tag"
+msgstr "修改欄"
+
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl:57
 msgid "Modify word"
 msgstr "修改字眼"
@@ -4765,13 +4814,13 @@ msgid "NEW MEMBER"
 msgstr "新增讀者"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:74
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:229
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:133
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:82
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:253
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:140
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:138
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:46
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:52
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:57
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:88
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:98
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:92
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:133
@@ -4795,7 +4844,7 @@ msgstr ""
 "rebuildnonmarc.pl。"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:158
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:97
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:102
 msgid ""
 "NOTE : if you change the link between a MARC subfield and a non-MARC field, "
 "ask your administrator to run misc/rebuildnonmarc.pl script."
@@ -4814,13 +4863,13 @@ msgstr "備註"
 #: ../../koha-tmpl/intranet-tmpl/default/en/newjmember.tmpl:20
 #: ../../koha-tmpl/intranet-tmpl/default/en/newmember.tmpl:13
 #: ../../koha-tmpl/intranet-tmpl/default/en/newmember.tmpl:178
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:21
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:88
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:156
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:207
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:29
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:104
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:172
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:231
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:12
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:114
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:131
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:121
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:138
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl:167
 #: ../../koha-tmpl/intranet-tmpl/default/en/stats.tmpl:6
 msgid "Name"
@@ -4866,7 +4915,7 @@ msgstr "新增記錄"
 msgid "New UserID:"
 msgstr "新的使用者ID："
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:61
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:108
 msgid "New category..."
 msgstr "新增類別..."
@@ -4910,8 +4959,8 @@ msgstr "Nicolas Morin (法文翻譯)"
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:206
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:91
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:92
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:117
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:118
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:123
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:156
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:126
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:202
@@ -5071,15 +5120,15 @@ msgstr "過期未還"
 #: ../../koha-tmpl/intranet-tmpl/default/en/newimember.tmpl:175
 #: ../../koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl:8
 #: ../../koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl:26
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:215
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:115
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:123
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:140
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:239
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:130
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:147
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:98
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:108
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:146
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:24
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:55
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:30
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:61
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:17
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:30
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:43
@@ -5093,8 +5142,8 @@ msgstr "過期未還"
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:161
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:35
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:64
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:67
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:72
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:95
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:75
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:84
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:107
@@ -5333,7 +5382,7 @@ msgid "Personal Authorities builder"
 msgstr ""
 
 #. %1$s: TMPL_VAR name=branchphone
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:126
 #, c-format
 msgid "Ph: %s"
 msgstr "電話：%s"
@@ -5351,7 +5400,7 @@ msgstr "電話：%s，傳真：%s"
 #: ../../koha-tmpl/intranet-tmpl/default/en/newmember.tmpl:186
 #: ../../koha-tmpl/intranet-tmpl/default/en/overdue.tmpl:10
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:158
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:47
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:55
 msgid "Phone"
 msgstr "電話"
 
@@ -5778,8 +5827,8 @@ msgstr "您填寫的借書費用並非數字"
 msgid "Rep"
 msgstr "可重覆"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:64
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:107
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:69
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:112
 msgid "Repeatable"
 msgstr "可重覆"
 
@@ -6013,7 +6062,7 @@ msgstr "稱號"
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:56
 #: ../../koha-tmpl/intranet-tmpl/default/en/shelves.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:33
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:60
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:68
 msgid "Save"
 msgstr "儲存"
 
@@ -6331,7 +6380,7 @@ msgstr "子類別"
 msgid "Subfield"
 msgstr "分欄"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:110
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:115
 msgid "Subfields"
 msgstr "分欄"
 
@@ -6482,8 +6531,8 @@ msgid "Tab"
 msgstr "在第幾格顯示"
 
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/koha2marclinks.tmpl:167
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:61
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:105
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:66
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:110
 msgid "Tag"
 msgstr "欄"
 
@@ -6641,7 +6690,7 @@ msgid ""
 msgstr ""
 "這個畫面顯示跟已選取的欄相關的各個分欄。要修改或新增分欄，按「修改」即可。"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:52
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:58
 msgid ""
 "This table is used in MARC definition. You can define as many categories as "
 "you want, and as many authorised values as you want in each category."
@@ -6944,7 +6993,7 @@ msgstr "建立此值"
 msgid "Valid values. click OK to confirm this new borrower"
 msgstr "輸入的值有效。請按「好！」以確定您要新增這位讀者"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:39
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:45
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:73
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:95
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:122
@@ -6964,7 +7013,7 @@ msgstr "值建立程序"
 msgid "Values related to %s (%s)"
 msgstr "與 %s (%s) 相關的值"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:35
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:41
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:69
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:71
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:92
@@ -7055,7 +7104,7 @@ msgid "Website URL:"
 msgstr "網站網址："
 
 #  XXX 譯文有待改進
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:53
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:59
 msgid ""
 "When you define the MARC subfield structure, you can link a subfield to an "
 "authorised-value category. When the user adds or modifies a biblio, the "
@@ -7089,13 +7138,13 @@ msgid "Worked off"
 msgstr "已以工作抵償"
 
 #. INPUT type=submit
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:71
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:226
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:133
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:79
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/branches.tmpl:250
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:140
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:138
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:45
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:51
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:57
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:88
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:98
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:91
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:133
@@ -7118,8 +7167,8 @@ msgstr "年%0.0s"
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:207
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:91
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:92
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:117
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:118
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:122
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:123
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:156
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:127
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:202
@@ -7341,6 +7390,11 @@ msgstr "biblioitems.itemtype 已設定"
 msgid "biblionumber and biblioitemnumber mapped correctly"
 msgstr "biblionumber 及 biblioitemnumber 已鏈結妥當"
 
+#. SCRIPT
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:103
+msgid "bookfundid missing"
+msgstr "沒有填寫書籍採購資金代號"
+
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:103
 msgid "bookfundname missing"
@@ -7376,7 +7430,7 @@ msgstr "「預設使用」只可填 0 或者 1"
 #: ../../koha-tmpl/intranet-tmpl/default/en/members/member.tmpl:9
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbookfund.tmpl:5
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/aqbudget.tmpl:5
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:100
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:105
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/systempreferences.tmpl:116
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categoryitem.tmpl:258
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/currency.tmpl:167
@@ -7564,9 +7618,9 @@ msgid "needs to be transfered to <b>%s</b>"
 msgstr "須移交至 <b>%s</b>"
 
 #. INPUT type=image
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:90
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:96
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:106
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:145
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:150
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:172
 msgid "next"
 msgstr "下一頁"
@@ -7628,9 +7682,9 @@ msgid "postface"
 msgstr "書後語"
 
 #. INPUT type=image
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:83
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authorised_values.tmpl:89
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:105
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:138
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:143
 #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:171
 msgid "previous"
 msgstr "上一頁"
@@ -7728,7 +7782,7 @@ msgstr "分欄在那一格顯示 (0-9號，抑或「圖書資料」格)"
 msgid "subfield may be repeated (1=yes, 0=no)"
 msgstr "分欄是否可重覆 (1=可重覆，0=不可重覆)"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:120
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:125
 msgid "subfields"
 msgstr "分欄"
 
@@ -7738,7 +7792,7 @@ msgstr "分欄"
 msgid "submit"
 msgstr "遞交"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:77
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:82
 msgid "tag"
 msgstr "欄號"
 
@@ -7831,7 +7885,7 @@ msgstr "更新"
 msgid "upperagelimit is not a number"
 msgstr "您填寫的年齡上限並非數字"
 
-#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:109
+#: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:114
 msgid "value"
 msgstr "值"