Merge commit 'pianohacker-koha/prefs-submit' into master

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / includes / admin-menu.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
index 2db5b50..b2209cb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -1,14 +1,13 @@
 <h5>System Preferences</h5>
 <ul>
-       <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li>
+       <li><a href="/cgi-bin/koha/admin/preferences.pl">System Preferences</a></li>
 </ul>
 
 <h5>Basic parameters</h5>
 <ul>
        <li><a href="/cgi-bin/koha/admin/branches.pl">Libraries, branches, groups</a></li>
-       <li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds and budgets</a></li>
-       <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></li>
-       <li><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types and circulation codes</a></li>
+       <li><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></li>
+       <li><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a></li>
 </ul>
 
 <h5>Patrons and circulation</h5>
@@ -17,14 +16,13 @@
        <li><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></li>
        <li><a href="/cgi-bin/koha/admin/roadtype.pl">Road types</a></li>
        <li><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></li>
-       <li><a href="/cgi-bin/koha/admin/issuingrules.pl">Circulation rules</a></li>
-       <li><a href="/cgi-bin/koha/admin/smart-rules.pl">Alternate circulation rules</a></li>
-       <li><a href="/cgi-bin/koha/admin/finesrules.pl">Fines rules</a></li>
+       <li><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></li>
+       <li><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></li>
+       <li><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></li>
 </ul>
 
-<h5>Catalogue</h5>
+<h5>Catalog</h5>
 <ul>
-       <li><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></li>
        <li><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Bibliographic framework</a></li>
        <li><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></li>
        <li><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Bibliographic framework test</a></li>
@@ -33,9 +31,18 @@
     <li><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></li>
 </ul>
 
+<h5>Acquisition parameters</h5>
+
+<ul>
+       <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></li>
+       <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Budgets, periods, planning</a></li>
+       <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Root Budgets</a></li>
+</ul>
+
 <h5>Additional parameters</h5>
 
 <ul>
-       <li><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></li>
+       <!-- TMPL_IF NAME="NoZebra" --><li><a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a></li><!-- /TMPL_IF -->
+       <!-- <li><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></li> -->
        <li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Client Targets</a></li>
 </ul>