From d585d5a2bc3ef8e31fac30e718d3effb71c681f9 Mon Sep 17 00:00:00 2001 From: kados Date: Tue, 3 Jul 2007 18:19:49 +0000 Subject: [PATCH] This is a language commit. I've gone through most of the templates and based on user feedback I've made the following changes: Borrower, Member => Patron Debarred => Restricted Issues => Checkouts Reserves => Holds --- installer/install.pl | 2 + .../prog/en/admin/admin-home.tmpl | 16 +++--- .../prog/en/admin/finesrules.tmpl | 14 ++--- .../prog/en/admin/issuingrules.tmpl | 10 ++-- .../prog/en/catalogue/advsearch.tmpl | 2 +- .../prog/en/catalogue/moredetail.tmpl | 4 +- .../prog/en/cataloguing/additem-nomarc.tmpl | 4 +- .../intranet-tmpl/prog/en/circ/bookcount.tmpl | 12 ++-- .../prog/en/circ/branchoverdues.tmpl | 6 +- .../prog/en/circ/branchtransfers.tmpl | 8 +-- .../prog/en/circ/circulation.tmpl | 56 +++++++++---------- .../prog/en/circ/pendingreserves.tmpl | 14 ++--- .../intranet-tmpl/prog/en/circ/returns.tmpl | 14 ++--- .../prog/en/circ/selectbranchprinter.tmpl | 6 +- .../intranet-tmpl/prog/en/circ/stats.tmpl | 4 +- .../prog/en/circ/transferstodo.tmpl | 10 ++-- .../prog/en/circ/transferstoreceive.tmpl | 2 +- .../prog/en/circ/waitingreserves.tmpl | 22 ++++---- .../intranet-tmpl/prog/en/export/marc.tmpl | 4 +- .../prog/en/includes/alt_menu-serials.inc | 2 +- .../intranet-tmpl/prog/en/includes/members.js | 6 +- .../prog/en/includes/menu-admin.inc | 2 +- .../intranet-tmpl/prog/en/includes/menus.inc | 6 +- .../prog/en/members/borrowers_details.tmpl | 16 +++--- .../prog/en/members/deletemem.tmpl | 10 ++-- .../prog/en/members/maninvoice.tmpl | 2 +- .../intranet-tmpl/prog/en/members/member.tmpl | 4 +- .../prog/en/members/memberentryA.tmpl | 12 ++-- .../prog/en/members/memberentryC.tmpl | 12 ++-- .../prog/en/members/memberentryI.tmpl | 10 ++-- .../prog/en/members/memberentryP.tmpl | 16 +++--- .../prog/en/members/moremember.tmpl | 20 +++---- .../prog/en/reports/bor_issues_top.tmpl | 10 ++-- .../prog/en/reports/borrowers_out.tmpl | 8 +-- .../prog/en/reports/borrowers_stats.tmpl | 8 +-- .../prog/en/reports/cat_issues_top.tmpl | 8 +-- .../prog/en/reports/catalogue_out.tmpl | 2 +- .../prog/en/reports/issues_avg_stats.tmpl | 4 +- .../reports/issues_by_borrower_category.tmpl | 4 +- .../prog/en/reports/issues_stats.tmpl | 12 ++-- .../prog/en/reports/reports-home.tmpl | 12 ++-- .../prog/en/reports/reservereport.tmpl | 4 +- .../prog/en/reserve/request.tmpl | 28 +++++----- 43 files changed, 214 insertions(+), 214 deletions(-) diff --git a/installer/install.pl b/installer/install.pl index 47ba99694b..eab66d84e6 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -226,6 +226,7 @@ if ($step && $step==1){ my %hashlevel; # sort by filename -> prepend with numbers to specify order of insertion. my @fnames = sort { my @aa = split /\/|\\/, ($a); my @bb = split /\/|\\/, ($b); $aa[-1] lt $bb[-1] } $query->param('framework') ; + $dbh->do('SET FOREIGN_KEY_CHECKS=0'); my $request=$dbh->prepare("SELECT value FROM systempreferences WHERE variable='FrameworksLoaded'"); $request->execute; my ($systempreference)=$request->fetchrow; @@ -264,6 +265,7 @@ if ($step && $step==1){ $template->param("fwklanguage"=>$fwk_language, "list"=>\@list); $template->param("$op"=>1); + $dbh->do('SET FOREIGN_KEY_CHECKS=1'); } elsif ( $op && $op eq 'selectframeworks'){ #Framework Selection #sql data for import are supposed to be located in misc/sql-datas// diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl index a9c9ce66b0..9daf5a78d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl @@ -37,28 +37,28 @@ -Borrowers and circulation +Patrons and circulation - Borrower categories - Define borrower categories. + Patron categories + Define patron categories. Cities and towns - Define cities and towns that your borrowers live in. + Define cities and towns that your patrons live in. Road types - Define road types. Fill this table to get a list of road types when adding/editing borrowers (can be used in Geographic statistics). + Define road types. Fill this table to get a list of road types when adding/editing patrons (can be used in Geographic statistics). - Issuing rules - Define issuing rules in a matrix for branches / borrowers / item types (number of issues, duration, cost...). + Circulation rules + Define circulation rules in a matrix for libraries / patrons / itemtypes (number of checkouts, duration, cost...). Fines rules - Define fines in a matrix for branches / borrowers / item types (cost, grace period...). + Define fines in a matrix for libraries / patrons / itemtypes (cost, grace period...). Catalogue diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl index ee1b082fa3..cb3f7ba811 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl @@ -17,16 +17,16 @@

Default values

If a cell is not filled, the 1st of the following value is searched :

    -
  • same branch and same borrower category, itemtype *
    • -
  • same branch and same itemtype, borrower category *
    • -
  • same itemtype and borrower category, branch *
    • -
  • branch * and itemtype *, same borrower category
    • -
  • branch * and borrower category *, same itemtype
    • -
  • branch * and borrower category *, itemtype *
    • +
  • same library and same patron category, itemtype *
    • +
  • same patron and same itemtype, patron category *
    • +
  • same itemtype and patron category, library *
    • +
  • library * and itemtype *, same patron category
    • +
  • library * and patron category *, same itemtype
    • +
  • library * and patron category *, itemtype *
- + @@ -36,7 +36,7 @@ " /> - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl index d1c9ba25e0..4a6b1cc95e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl @@ -418,7 +418,7 @@
Location and availability:

- diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl index a66222562d..1100bfd373 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl @@ -44,8 +44,8 @@ NAME="biblionumber"-->&itemnumber=">Modify | &itemnumber=">Delete
- Home Branch:
- Current Branch:
+ Home Library:
+ Current Library:
Last seen:
Last borrowed:
Item Status: On issue to ">Available
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem-nomarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem-nomarc.tmpl index 5cabf4fc42..618cf81313 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem-nomarc.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem-nomarc.tmpl @@ -33,7 +33,7 @@ Sorry, that barcode is already in use

- + @@ -47,7 +47,7 @@ Sorry, that barcode is already in use -
Defining issuing rules for Defining circulation rules for
 
Item:
Home Branch:
Home Library:
Notes:
Add New Item
">
">">">">
" name="biblionumber">
- - - + + +
Home Branch:
Current Branch:
Date arrived at current branch:
Home Library:
Current Library:
Date arrived at current library:
Number of issues since since the above date :
- - - + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl index 982ee90998..bbddbb5835 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/circ/branchoverdues.tmpl @@ -4,7 +4,7 @@ -

Circulation: Branch Overdues at

+

Circulation: Library Overdues at

@@ -37,8 +37,8 @@
- - + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl index 844955bdaf..ba90e2d4dc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl @@ -91,7 +91,7 @@ Reserve Cancelled
- Item should now be waiting at branch:
+ Item should now be waiting at library:
@@ -99,10 +99,10 @@ No Item with barcode: - Please return item to home branch: + Please return item to home library: - Item is already at destination branch. + Item is already at destination library. Item was on loan to "> @@ -116,7 +116,7 @@
Branch No. of Issues Last seen at branchLibraryNo. of times checked outLibrary last seen at
Date_due TitleBorrowerLocationPatronLibrary Overdue status Notify by
- + @@ -684,17 +684,17 @@ No patron matched
- This document is available + This hold is available
- This document has been transfered from library : + This hold has been transfered from library : the :
- This document hasn't been transfered yet from library : + This hold hasn't been transfered yet from library : @@ -733,7 +733,7 @@ No patron matched - + @@ -782,7 +782,7 @@ No patron matched - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl index 85900ddd7b..760ee14d33 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/circ/pendingreserves.tmpl @@ -1,5 +1,5 @@ -Koha › Circulation › Reserve +Koha › Circulation › Holds @@ -13,7 +13,7 @@ -

Pending reserves as of

+

Pending holds as of


@@ -93,8 +93,8 @@ Calendar.setup(

-

The following reserves have not be affected to any item.

-

Please go in the shelves, pickup a book and do a return on them :

+

The following holds have not been filled.

+

Please retrieve them and check them in

@@ -105,7 +105,7 @@ Calendar.setup( Priority Sort -
- diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl index 99636f2f38..9a1323c6ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl @@ -17,7 +17,7 @@ "> - +
Transfer
Destination branch:Destination library:

@@ -128,7 +128,7 @@
-Please Confirm Issue +Please Confirm Checkout
    @@ -152,7 +152,7 @@ -
  • Too many issues (already issued / max : )
    • +
  • Too many checked out (already checked out / max : )
@@ -181,7 +181,7 @@ " />
- +
@@ -190,7 +190,7 @@ " />
- +
@@ -199,7 +199,7 @@ -

Item issued

+

Item Checked out

@@ -214,13 +214,13 @@ No patron matched
- Borrower selection + Patron selection " /> " />

- +

@@ -241,10 +241,10 @@ No patron matched
- Issue an item + Checkout an item

- + @@ -273,7 +273,7 @@ No patron matched -

  • Patron is debarred
    • +
  • Patron is restricted
    • @@ -587,7 +587,7 @@ No patron matched
    Today issuesToday checkouts
    Renew?
    Reserve Date + Hold Date Sort Patron @@ -114,8 +114,8 @@ Calendar.setup( Title Sort - Location + + Library
    Reserved for:
    Hold for: diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/reservereport.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/reservereport.tmpl index 03f1b800bc..7928c7fc69 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/reports/reservereport.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/reports/reservereport.tmpl @@ -1,9 +1,9 @@ -Koha › Reserve Report › All Reserves +Koha › Hold Report › All Holds - +
    NameReserve DateTitleClass
    NameHold DateTitleClass
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl index e03b8eaa35..0f7feb2b8d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl @@ -34,14 +34,14 @@ if (document.form.alreadyreserved.value == "1"){ } if (count_reserv == "0"){ - msg += ("- Please select a document to reserve\n"); + msg += ("- Please select an item to place a hold\n"); } if (count_reserv >= "2"){ msg += ("- You can select only one type of document\n by item, or by the first item returned\n"); } if (alreadyreserved > "0"){ - msg += ("- This borrower had already reserved this document\n Please cancel the previous reserve first \n"); + msg += ("- This patron had already placed a hold on this item\n Please cancel the previous hold first \n"); } if (msg == "") return(true); @@ -53,15 +53,15 @@ if (alreadyreserved > "0"){
    -

    Reserve find for the document()must transfered

    -

    This documen is reserved by : at the library : , Please put this document in transfer . +

    Hold found for (), please transfer

    +

    Hold placed by : at : , Please transfer this item.

    -

    Reserves

    +

    Holds

    Biblio informations

    ">

    @@ -72,7 +72,7 @@ if (alreadyreserved > "0"){
    " method="post" onSubmit="request.pl" name="getborrower">

    - + (type card number or part of a name)

    "> @@ -86,16 +86,16 @@ if (alreadyreserved > "0"){

    - - Currently, this member has too much active reserves. + + Currently, this patron has too many holds.


    - - The card of this member is expired + + This patron's account has expired

    @@ -109,12 +109,12 @@ if (alreadyreserved > "0"){

    - This borrower had already make a reserve for this document + This patron already has a hold on this item

    -
    Carrefull,there is no borrower with this name, Please, try an other
    +
    No patron with this name, Please, try an other

    Reserve properties

    @@ -124,7 +124,7 @@ if (alreadyreserved > "0"){ "> "> -

    +

    (card number: ) @@ -245,7 +245,7 @@ if (alreadyreserved > "0"){ - + -- 2.39.5
    PriorityMemberPatron Notes Date Pick up location